Fix garbled video on some i915 machines (rhbz 1298309)
This commit is contained in:
parent
099dace0e1
commit
9ab3e93b20
|
@ -0,0 +1,59 @@
|
|||
From d271283fd90da8cc5a4c659b1854c0d3a34b1929 Mon Sep 17 00:00:00 2001
|
||||
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
|
||||
Date: Mon, 23 Nov 2015 10:25:28 +0100
|
||||
Subject: [PATCH] drm/i915: Do a better job at disabling primary plane in the
|
||||
noatomic case.
|
||||
|
||||
When disable_noatomic is called plane_mask is not correct yet, and
|
||||
plane_state->visible = true is left as true after disabling the primary
|
||||
plane.
|
||||
|
||||
Other planes are already disabled as part of crtc sanitization, only the
|
||||
primary is left active. But the plane_mask is not updated here. It gets
|
||||
updated during fb takeover in modeset_gem_init, or set to the new value
|
||||
on resume.
|
||||
|
||||
This means that to disable the primary plane 1 << drm_plane_index(primary)
|
||||
needs to be used.
|
||||
|
||||
Afterwards because the crtc is no longer active it's forbidden to keep
|
||||
plane_state->visible set, or a WARN_ON in
|
||||
intel_plane_atomic_calc_changes triggers. There are other code points
|
||||
that rely on accurate plane_state->visible too, so make sure the bool is
|
||||
cleared.
|
||||
|
||||
The other planes are already disabled in intel_sanitize_crtc, so they
|
||||
don't have to be handled here.
|
||||
|
||||
Cc: stable@vger.kernel.org #v4.3, v4.2?
|
||||
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92655
|
||||
Tested-by: Tomas Mezzadra <tmezzadra@gmail.com>
|
||||
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
|
||||
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
|
||||
Link: http://patchwork.freedesktop.org/patch/msgid/5652DB88.9070208@linux.intel.com
|
||||
(cherry picked from commit 54a4196188eab82e6f0a5f05716626e9f18b8fb6)
|
||||
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
|
||||
---
|
||||
drivers/gpu/drm/i915/intel_display.c | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
|
||||
index b2270d576979..84eda179e3ff 100644
|
||||
--- a/drivers/gpu/drm/i915/intel_display.c
|
||||
+++ b/drivers/gpu/drm/i915/intel_display.c
|
||||
@@ -6225,9 +6225,11 @@ static void intel_crtc_disable_noatomic(struct drm_crtc *crtc)
|
||||
if (to_intel_plane_state(crtc->primary->state)->visible) {
|
||||
intel_crtc_wait_for_pending_flips(crtc);
|
||||
intel_pre_disable_primary(crtc);
|
||||
+
|
||||
+ intel_crtc_disable_planes(crtc, 1 << drm_plane_index(crtc->primary));
|
||||
+ to_intel_plane_state(crtc->primary->state)->visible = false;
|
||||
}
|
||||
|
||||
- intel_crtc_disable_planes(crtc, crtc->state->plane_mask);
|
||||
dev_priv->display.crtc_disable(crtc);
|
||||
intel_disable_shared_dpll(intel_crtc);
|
||||
|
||||
--
|
||||
2.5.0
|
||||
|
|
@ -668,6 +668,9 @@ Patch610: PNP-Add-Broadwell-to-Intel-MCH-size-workaround.patch
|
|||
#CVE-2015-7566 rhbz 1296466 1297517
|
||||
Patch623: usb-serial-visor-fix-crash-on-detecting-device-witho.patch
|
||||
|
||||
#rhbz 1298309
|
||||
Patch624: drm-i915-Do-a-better-job-at-disabling-primary-plane-.patch
|
||||
|
||||
# END OF PATCH DEFINITIONS
|
||||
|
||||
%endif
|
||||
|
@ -2111,6 +2114,9 @@ fi
|
|||
#
|
||||
#
|
||||
%changelog
|
||||
* Wed Jan 13 2016 Josh Boyer <jwboyer@fedoraproject.org>
|
||||
- Fix garbled video on some i915 machines (rhbz 1298309)
|
||||
|
||||
* Tue Jan 12 2016 Josh Boyer <jwboyer@fedoraproject.org>
|
||||
- CVE-2015-7566 usb: visor: Crash on invalid USB dev descriptors (rhbz 1296466 1297517)
|
||||
- Fix backtrace from PNP conflict on Broadwell (rhbz 1083853)
|
||||
|
|
Loading…
Reference in New Issue