From: Ville Syrjälä Date: Mon, 4 Mar 2019 13:12:17 +0000 (+0200) Subject: drm/i915: Fix the state checker for ICL Y planes X-Git-Tag: v5.4-rc1~498^2~29^2~586 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3e1d87ddcf6298fd32ba4857173edd9e559897cf;p=platform%2Fkernel%2Flinux-rpi.git drm/i915: Fix the state checker for ICL Y planes The plane used to scan out NV12 luma on ICL is logically off but actually on. Fix the state checker to account for this. Cc: Imre Deak Cc: Maarten Lankhorst Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109457 Signed-off-by: Ville Syrjälä Link: https://patchwork.freedesktop.org/patch/msgid/20190304131217.4338-1-ville.syrjala@linux.intel.com Reviewed-by: Imre Deak Reviewed-by: Maarten Lankhorst --- diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 7c5e84ef..b49e789 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -12589,7 +12589,8 @@ intel_verify_planes(struct intel_atomic_state *state) for_each_new_intel_plane_in_state(state, plane, plane_state, i) - assert_plane(plane, plane_state->base.visible); + assert_plane(plane, plane_state->slave || + plane_state->base.visible); } static void