[igt-dev] [PATCH i-g-t] tests/kms_panel_fitting: Do not use scaling on haswell.

[Ville Syrjälä]

On Thu, May 24, 2018 at 12:50:27PM +0200, Maarten Lankhorst wrote:
> Op 24-05-18 om 12:40 schreef Ville Syrjälä:
> > On Thu, May 24, 2018 at 09:03:44AM +0200, Maarten Lankhorst wrote:
> >> Haswell doesn't support scaling the sprite planes,
> > HSW/BDW/VLV/CHV
> Oh right, read it wrong in intel_sprite.c
> 
> Just blacklist gen7 != IVB && gen8?

Whatever works I guess.

> >> 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 at 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 at lists.freedesktop.org
> >> https://lists.freedesktop.org/mailman/listinfo/igt-dev
> 

-- 
Ville Syrjälä
Intel