[Intel-gfx] [PATCH 21/23] drm/i915: Fix cursor src/dst rectangle with bigjoiner

[Navare, Manasi]

On Tue, Nov 17, 2020 at 05:09:06PM +0200, Ville Syrjälä wrote:
> On Mon, Nov 16, 2020 at 04:33:50PM -0800, Navare, Manasi wrote:
> > On Sat, Nov 14, 2020 at 12:03:56AM +0200, Ville Syrjala wrote:
> > > From: Ville Syrjälä <ville.syrjala at linux.intel.com>
> > > 
> > > We can't call drm_plane_state_src() this late for the slave plane since
> > > it would consult the wrong uapi state. We've alreayd done the correct
> > > uapi->hw copy earlier, so let's just preserve the unclipped src/dst
> > > rects using a temp copy across the intel_atomic_plane_check_clipping()
> > > call.
> > > 
> > > Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> > > ---
> > >  drivers/gpu/drm/i915/display/intel_display.c | 6 ++++--
> > >  1 file changed, 4 insertions(+), 2 deletions(-)
> > > 
> > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> > > index 19e9c3795265..7607bcd9b7fe 100644
> > > --- a/drivers/gpu/drm/i915/display/intel_display.c
> > > +++ b/drivers/gpu/drm/i915/display/intel_display.c
> > > @@ -11651,6 +11651,8 @@ static int intel_check_cursor(struct intel_crtc_state *crtc_state,
> > >  {
> > >  	const struct drm_framebuffer *fb = plane_state->hw.fb;
> > >  	struct drm_i915_private *i915 = to_i915(plane_state->uapi.plane->dev);
> > > +	const struct drm_rect src = plane_state->uapi.src;
> > > +	const struct drm_rect dst = plane_state->uapi.dst;
> > >  	int ret;
> > >  
> > >  	if (fb && fb->modifier != DRM_FORMAT_MOD_LINEAR) {
> > > @@ -11666,8 +11668,8 @@ static int intel_check_cursor(struct intel_crtc_state *crtc_state,
> > >  		return ret;
> > >  
> > >  	/* Use the unclipped src/dst rectangles, which we program to hw */
> > > -	plane_state->uapi.src = drm_plane_state_src(&plane_state->uapi);
> > > -	plane_state->uapi.dst = drm_plane_state_dest(&plane_state->uapi);
> > > +	plane_state->uapi.src = src;
> > > +	plane_state->uapi.dst = dst;
> > 
> > We get this for both slave and master? No slave condition needed?
> 
> Planes don't know/care about bigjoiner at this stage of the computation
> anymore. The only bigjoiner thing for planes is the
> add_affected_planes()+uapi->hw state copy.
>

Okay cool,

Reviewed-by: Manasi Navare <manasi.d.navare at intel.com>

Manasi
 
> -- 
> Ville Syrjälä
> Intel