diff options
| author | Rodrigo Vivi | 2017-12-08 19:15:30 +0100 |
|---|---|---|
| committer | Rodrigo Vivi | 2017-12-08 19:15:30 +0100 |
| commit | 6647852abc1fd74e9c5e0dcf404ea4cb9c929630 (patch) | |
| tree | 371aa801a5a211f5f8af87bd5488e3dae75ea975 /drivers/gpu/drm/i915/i915_drv.c | |
| parent | drm/i915: Drop fb reference on load_detect_pipe failure path (diff) | |
| parent | Merge tag 'drm-intel-next-2017-12-01' of git://anongit.freedesktop.org/drm/dr... (diff) | |
| download | kernel-qcow2-linux-6647852abc1fd74e9c5e0dcf404ea4cb9c929630.tar.gz kernel-qcow2-linux-6647852abc1fd74e9c5e0dcf404ea4cb9c929630.tar.xz kernel-qcow2-linux-6647852abc1fd74e9c5e0dcf404ea4cb9c929630.zip | |
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 b2e210b77457..5b1fd5f1defb 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) |