[PATCH 10/10] drm/vmwgfx: Use drm_plane_mask() & co.

Ville Syrjälä ville.syrjala at linux.intel.com
Tue Jul 3 12:34:36 UTC 2018


On Mon, Jul 02, 2018 at 10:00:35AM -0700, Sinclair Yeh wrote:
> Reviewed-by: Sinclair Yeh <syeh at vmware.com>
> 
> I assume you'll upstream this as part of your series?

Already pushed actually. In my haste I failed to realize I was
still missing an ack/rb for vmwgfx. Sorry about that.

> 
> On Tue, Jun 26, 2018 at 10:47:16PM +0300, Ville Syrjala wrote:
> > From: Ville Syrjälä <ville.syrjala at linux.intel.com>
> > 
> > Use drm_{plane,connector}_mask() where appropriate.
> > 
> > Cc: VMware Graphics <linux-graphics-maintainer at vmware.com>
> > Cc: Sinclair Yeh <syeh at vmware.com>
> > Cc: Thomas Hellstrom <thellstrom at vmware.com>
> > Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> > ---
> >  drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
> > index ef96ba7432ad..17e01423ead1 100644
> > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
> > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
> > @@ -535,9 +535,9 @@ int vmw_du_crtc_atomic_check(struct drm_crtc *crtc,
> >  			     struct drm_crtc_state *new_state)
> >  {
> >  	struct vmw_display_unit *du = vmw_crtc_to_du(new_state->crtc);
> > -	int connector_mask = 1 << drm_connector_index(&du->connector);
> > +	int connector_mask = drm_connector_mask(&du->connector);
> >  	bool has_primary = new_state->plane_mask &
> > -			   BIT(drm_plane_index(crtc->primary));
> > +			   drm_plane_mask(crtc->primary);
> >  
> >  	/* We always want to have an active plane with an active CRTC */
> >  	if (has_primary != new_state->enable)
> > -- 
> > 2.16.4
> > 

-- 
Ville Syrjälä
Intel


More information about the dri-devel mailing list