Igt-dev Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [igt-dev] [PATCH i-g-t] tests/kms_panel_fitting: Do not use scaling on haswell.
@ 2018-05-24  7:03 Maarten Lankhorst
  2018-05-24  7:52 ` [igt-dev] ✗ Fi.CI.BAT: failure for " Patchwork
                   ` (3 more replies)
  0 siblings, 4 replies; 7+ messages in thread
From: Maarten Lankhorst @ 2018-05-24  7:03 UTC (permalink / raw)
  To: igt-dev

Haswell doesn't support scaling the sprite planes, so we fail with
-ERANGE. Do the same as we do for gen9 pipe C, and do not attempt
to scale the sprite plane. It will fail, and the kernel will no
hide the failure from us.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=106606
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
 tests/kms_panel_fitting.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/kms_panel_fitting.c b/tests/kms_panel_fitting.c
index 5dce101003c5..eacc6bc0bc11 100644
--- a/tests/kms_panel_fitting.c
+++ b/tests/kms_panel_fitting.c
@@ -134,11 +134,14 @@ static void test_panel_fitting(data_t *d)
 		igt_display_commit2(display, COMMIT_UNIVERSAL);
 
 		/*
+		 * haswell doesn't support scaling at all.
+		 *
 		 * gen9 pipe C has only 1 scaler shared with the crtc, which
 		 * means pipe scaling can't work simultaneously with panel
 		 * fitting.
 		 */
-		if (intel_gen(intel_get_drm_devid(display->drm_fd)) == 9 && pipe == PIPE_C)
+		if (IS_HASWELL(intel_get_drm_devid(display->drm_fd)) ||
+		    (intel_gen(intel_get_drm_devid(display->drm_fd)) == 9 && pipe == PIPE_C))
 			igt_plane_set_size(d->plane2, d->fb2.width-200, d->fb2.height-200);
 
 		/* enable panel fitting along with sprite scaling */
-- 
2.17.0

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2018-05-24 11:15 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-05-24  7:03 [igt-dev] [PATCH i-g-t] tests/kms_panel_fitting: Do not use scaling on haswell Maarten Lankhorst
2018-05-24  7:52 ` [igt-dev] ✗ Fi.CI.BAT: failure for " Patchwork
2018-05-24  9:59 ` [igt-dev] ✓ Fi.CI.BAT: success " Patchwork
2018-05-24 10:40 ` [igt-dev] [PATCH i-g-t] " Ville Syrjälä
2018-05-24 10:50   ` Maarten Lankhorst
2018-05-24 10:58     ` Ville Syrjälä
2018-05-24 11:15 ` [igt-dev] ✓ Fi.CI.IGT: success for " Patchwork

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox