[Intel-gfx] [PATCH v10 09/11] drm/i915: Add bigjoiner aware plane clipping checks

[Ville Syrjälä]

On Mon, Oct 19, 2020 at 03:56:37PM -0700, Navare, Manasi wrote:
> On Mon, Oct 19, 2020 at 07:20:31PM +0300, Ville Syrjälä wrote:
> > On Thu, Oct 08, 2020 at 02:45:33PM -0700, Manasi Navare wrote:
> > > From: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
> > > 
> > > We need to look at hw.fb for the framebuffer, and add the translation
> > > for the slave_plane_state. With these changes we set the correct
> > > rectangle on the bigjoiner slave, and don't set incorrect
> > > src/dst/visibility on the slave plane.
> > > 
> > > v2:
> > > * Manual rebase (Manasi)
> > > 
> > > Signed-off-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
> > > Signed-off-by: Manasi Navare <manasi.d.navare at intel.com>
> > > ---
> > >  .../gpu/drm/i915/display/intel_atomic_plane.c | 60 +++++++++++++++++++
> > >  .../gpu/drm/i915/display/intel_atomic_plane.h |  4 ++
> > >  drivers/gpu/drm/i915/display/intel_display.c  | 19 +++---
> > >  drivers/gpu/drm/i915/display/intel_sprite.c   | 21 +++----
> > >  4 files changed, 80 insertions(+), 24 deletions(-)
> > > 
> > > diff --git a/drivers/gpu/drm/i915/display/intel_atomic_plane.c b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
> > > index a8f1fd85a6c0..09cb3adc36da 100644
> > > --- a/drivers/gpu/drm/i915/display/intel_atomic_plane.c
> > > +++ b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
> > > @@ -267,6 +267,9 @@ void intel_plane_copy_uapi_to_hw_state(const struct intel_crtc_state *crtc_state
> > >  	plane_state->hw.rotation = from_plane_state->uapi.rotation;
> > >  	plane_state->hw.color_encoding = from_plane_state->uapi.color_encoding;
> > >  	plane_state->hw.color_range = from_plane_state->uapi.color_range;
> > > +
> > > +	plane_state->uapi.src = drm_plane_state_src(&from_plane_state->uapi);
> > > +	plane_state->uapi.dst = drm_plane_state_dest(&from_plane_state->uapi);
> > >  }
> > >  
> > >  void intel_plane_set_invisible(struct intel_crtc_state *crtc_state,
> > > @@ -519,6 +522,63 @@ void i9xx_update_planes_on_crtc(struct intel_atomic_state *state,
> > >  	}
> > >  }
> > >  
> > > +int intel_atomic_plane_check_clipping(struct intel_plane_state *plane_state,
> > > +				      struct intel_crtc_state *crtc_state,
> > > +				      int min_scale, int max_scale,
> > > +				      bool can_position)
> > > +{
> > > +	struct drm_framebuffer *fb = plane_state->hw.fb;
> > > +	struct drm_rect *src = &plane_state->uapi.src;
> > > +	struct drm_rect *dst = &plane_state->uapi.dst;
> > > +	unsigned int rotation = plane_state->uapi.rotation;
> > 
> > hw.rotation
> 
> So use hw.rotation instead of uapi.rotation ?

Yes.

-- 
Ville Syrjälä
Intel