On Tue, 2014-06-10 at 08:28 -0700, Matt Roper wrote: > Universal plane support had placeholders for cursor planes, but didn't > actually do anything with them. Save the cursor plane reference inside > the crtc and update the cursor plane parameter from void* to drm_plane. > > Reviewed-by: Daniel Vetter <[email protected]> > Signed-off-by: Matt Roper <[email protected]> > --- > drivers/gpu/drm/drm_crtc.c | 5 ++++- > include/drm/drm_crtc.h | 2 +- > 2 files changed, 5 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c > index b5bce5b..74ad72f 100644 > --- a/drivers/gpu/drm/drm_crtc.c > +++ b/drivers/gpu/drm/drm_crtc.c > @@ -727,7 +727,7 @@ DEFINE_WW_CLASS(crtc_ww_class); > */ > int drm_crtc_init_with_planes(struct drm_device *dev, struct drm_crtc *crtc, > struct drm_plane *primary, > - void *cursor, > + struct drm_plane *cursor, > const struct drm_crtc_funcs *funcs) > { > struct drm_mode_config *config = &dev->mode_config; > @@ -752,8 +752,11 @@ int drm_crtc_init_with_planes(struct drm_device *dev, > struct drm_crtc *crtc, > config->num_crtc++; > > crtc->primary = primary; > + crtc->cursor = cursor; > if (primary) > primary->possible_crtcs = 1 << drm_crtc_index(crtc); > + if (cursor) > + cursor->possible_crtcs = 1 << drm_crtc_index(crtc); > > out: > drm_modeset_unlock_all(dev); > diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h > index b8c7a9a..4ee7e26 100644 > --- a/include/drm/drm_crtc.h > +++ b/include/drm/drm_crtc.h > @@ -856,7 +856,7 @@ struct drm_prop_enum_list { > extern int drm_crtc_init_with_planes(struct drm_device *dev, > struct drm_crtc *crtc, > struct drm_plane *primary, > - void *cursor, > + struct drm_plane *cursor, > const struct drm_crtc_funcs *funcs); > extern int drm_crtc_init(struct drm_device *dev, > struct drm_crtc *crtc,
Reviewed-by: Pallavi G <[email protected]> _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
