On Thu, May 15, 2014 at 06:17:27PM -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.
>
> Signed-off-by: Matt Roper <matthew.d.ro...@intel.com>
Reviewed-by: Daniel Vetter <daniel.vet...@ffwll.ch>
> ---
> 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 3afdc45..036acb2 100644
> --- a/drivers/gpu/drm/drm_crtc.c
> +++ b/drivers/gpu/drm/drm_crtc.c
> @@ -707,7 +707,7 @@ EXPORT_SYMBOL(drm_framebuffer_remove);
> */
> 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)
> {
> int ret;
> @@ -730,8 +730,11 @@ int drm_crtc_init_with_planes(struct drm_device *dev,
> struct drm_crtc *crtc,
> dev->mode_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 e5d22ff..ede384a 100644
> --- a/include/drm/drm_crtc.h
> +++ b/include/drm/drm_crtc.h
> @@ -834,7 +834,7 @@ extern void drm_warn_on_modeset_not_all_locked(struct
> drm_device *dev);
> 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,
> --
> 1.8.5.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
