drm/i915: Fix the state checker for ICL Y planes

vsyrjala · vsyrjala · commit 3e1d87ddcf62 · 2019-03-04T20:18:43.000+02:00
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 <imre.deak@intel.com> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109457 Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20190304131217.4338-1-ville.syrjala@linux.intel.com Reviewed-by: Imre Deak <imre.deak@intel.com> Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -12589,7 +12589,8 @@ intel_verify_planes(struct intel_atomic_state *state)`
`12589`	`12589`
`12590`	`12590`	`for_each_new_intel_plane_in_state(state, plane,`
`12591`	`12591`	`plane_state, i)`
`12592`		`- assert_plane(plane, plane_state->base.visible);`
	`12592`	`+ assert_plane(plane, plane_state->slave \|\|`
	`12593`	`+ plane_state->base.visible);`
`12593`	`12594`	`}`
`12594`	`12595`
`12595`	`12596`	`static void`