diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-11-04 10:28:47 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-11-04 10:28:52 -0500 |
commit | 7f16e5c1416070dc590dd333a2d677700046a4ab (patch) | |
tree | 55718bbef64431e70d5ed282be516cd45b3f75e6 /drivers/gpu/drm/i915/i915_drv.c | |
parent | 9d1cb9147dbe45f6e94dc796518ecf67cb64b359 (diff) | |
parent | 5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52 (diff) |
Merge tag 'v3.12' into drm-intel-next
I want to merge in the new Broadwell support as a late hw enabling
pull request. But since the internal branch was based upon our
drm-intel-nightly integration branch I need to resolve all the
oustanding conflicts in drm/i915 with a backmerge to make the 60+
patches apply properly.
We'll propably have some fun because Linus will come up with a
slightly different merge solution.
Conflicts:
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/intel_crt.c
drivers/gpu/drm/i915/intel_ddi.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_dp.c
drivers/gpu/drm/i915/intel_drv.h
All rather simple adjacent lines changed or partial backports from
-next to -fixes, with the exception of the thaw code in i915_dma.c.
That one needed a bit of shuffling to restore the intent.
Oh and the massive header file reordering in intel_drv.h is a bit
trouble. But not much.
v2: Also don't forget the fixup for the silent conflict that results
in compile fail ...
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 1041644030b7..a0804fa1e306 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c | |||
@@ -508,6 +508,8 @@ static int i915_drm_freeze(struct drm_device *dev) | |||
508 | intel_modeset_suspend_hw(dev); | 508 | intel_modeset_suspend_hw(dev); |
509 | } | 509 | } |
510 | 510 | ||
511 | i915_gem_suspend_gtt_mappings(dev); | ||
512 | |||
511 | i915_save_state(dev); | 513 | i915_save_state(dev); |
512 | 514 | ||
513 | intel_opregion_fini(dev); | 515 | intel_opregion_fini(dev); |
@@ -656,6 +658,9 @@ static int __i915_drm_thaw(struct drm_device *dev, bool restore_gtt_mappings) | |||
656 | 658 | ||
657 | static int i915_drm_thaw(struct drm_device *dev) | 659 | static int i915_drm_thaw(struct drm_device *dev) |
658 | { | 660 | { |
661 | if (drm_core_check_feature(dev, DRIVER_MODESET)) | ||
662 | i915_check_and_clear_faults(dev); | ||
663 | |||
659 | return __i915_drm_thaw(dev, true); | 664 | return __i915_drm_thaw(dev, true); |
660 | } | 665 | } |
661 | 666 | ||