diff options
| author | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2017-12-08 10:15:30 -0800 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2017-12-08 10:15:30 -0800 |
| commit | 6647852abc1fd74e9c5e0dcf404ea4cb9c929630 (patch) | |
| tree | 371aa801a5a211f5f8af87bd5488e3dae75ea975 /drivers/gpu/drm/i915/i915_drv.c | |
| parent | 3e72be177cf19ab3d62b3084d424dce7e71d847f (diff) | |
| parent | 3f1f0b1c57dd617e9b0ded50efb8d6c011b85b20 (diff) | |
| download | op-kernel-dev-6647852abc1fd74e9c5e0dcf404ea4cb9c929630.zip op-kernel-dev-6647852abc1fd74e9c5e0dcf404ea4cb9c929630.tar.gz | |
Merge airlied/drm-next into drm-intel-next-queued
Chris requested this backmerge for a reconciliation on
drm_print.h between drm-misc-next and drm-intel-next-queued
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index b2e210b..5b1fd5f 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -1339,7 +1339,7 @@ int i915_driver_load(struct pci_dev *pdev, const struct pci_device_id *ent) * becaue the HDA driver may require us to enable the audio power * domain during system suspend. */ - pdev->dev_flags |= PCI_DEV_FLAGS_NEEDS_RESUME; + dev_pm_set_driver_flags(&pdev->dev, DPM_FLAG_NEVER_SKIP); ret = i915_driver_init_early(dev_priv, ent); if (ret < 0) |
