From: Matt Roper Date: Thu, 24 Sep 2015 22:53:17 +0000 (-0700) Subject: drm/i915: Don't set plane visible during HW readout if CRTC is off X-Git-Tag: MMI-PSA29.97-13-9~7427^2~45^2~1257 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=19b8d3875e21f4f7e5c999350892f1a788f4e977;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git drm/i915: Don't set plane visible during HW readout if CRTC is off We already ensure that pstate->visible = false when crtc->active = false during runtime programming; make sure we follow the same logic when reading out initial hardware state. Signed-off-by: Matt Roper Reviewed-by: Maarten Lankhorst Smoke-tested-by: Paulo Zanoni Link: http://patchwork.freedesktop.org/patch/59564/ --- diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 259fc342dfc3..3874b3563e63 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -15175,7 +15175,7 @@ static void readout_plane_state(struct intel_crtc *crtc) struct intel_plane_state *plane_state = to_intel_plane_state(primary->state); - plane_state->visible = + plane_state->visible = crtc->active && primary_get_hw_state(to_intel_plane(primary)); if (plane_state->visible)