On Thu, Mar 22, 2018 at 05:22:55PM +0200, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrj...@linux.intel.com>
>
> Make the code a bit more readable by storing the plane pointer in a
> local variable rather than having to do crtc->{primary,cursor} all the
> time.
>
> Signed-off-by: Ville Syrjälä <ville.syrj...@linux.intel.com>
> ---
> drivers/gpu/drm/drm_crtc.c | 32 +++++++++++++++++++-------------
> drivers/gpu/drm/drm_plane.c | 32 ++++++++++++++++++--------------
> 2 files changed, 37 insertions(+), 27 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
> index 7a973ada7195..8552ed419056 100644
> --- a/drivers/gpu/drm/drm_crtc.c
> +++ b/drivers/gpu/drm/drm_crtc.c
> @@ -402,6 +402,7 @@ int drm_mode_getcrtc(struct drm_device *dev,
> {
> struct drm_mode_crtc *crtc_resp = data;
> struct drm_crtc *crtc;
> + struct drm_plane *plane;
>
> if (!drm_core_check_feature(dev, DRIVER_MODESET))
> return -EINVAL;
> @@ -410,21 +411,23 @@ int drm_mode_getcrtc(struct drm_device *dev,
> if (!crtc)
> return -ENOENT;
>
> + plane = crtc->primary;
> +
> crtc_resp->gamma_size = crtc->gamma_size;
>
> - drm_modeset_lock(&crtc->primary->mutex, NULL);
> - if (crtc->primary->state && crtc->primary->state->fb)
> - crtc_resp->fb_id = crtc->primary->state->fb->base.id;
> - else if (!crtc->primary->state && crtc->primary->fb)
> - crtc_resp->fb_id = crtc->primary->fb->base.id;
> + drm_modeset_lock(&plane->mutex, NULL);
> + if (plane->state && plane->state->fb)
> + crtc_resp->fb_id = plane->state->fb->base.id;
> + else if (!plane->state && plane->fb)
> + crtc_resp->fb_id = plane->fb->base.id;
> else
> crtc_resp->fb_id = 0;
>
> - if (crtc->primary->state) {
> - crtc_resp->x = crtc->primary->state->src_x >> 16;
> - crtc_resp->y = crtc->primary->state->src_y >> 16;
> + if (plane->state) {
> + crtc_resp->x = plane->state->src_x >> 16;
> + crtc_resp->y = plane->state->src_y >> 16;
> }
> - drm_modeset_unlock(&crtc->primary->mutex);
> + drm_modeset_unlock(&plane->mutex);
>
> drm_modeset_lock(&crtc->mutex, NULL);
> if (crtc->state) {
> @@ -554,6 +557,7 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data,
> struct drm_mode_config *config = &dev->mode_config;
> struct drm_mode_crtc *crtc_req = data;
> struct drm_crtc *crtc;
> + struct drm_plane *plane;
> struct drm_connector **connector_set = NULL, *connector;
> struct drm_framebuffer *fb = NULL;
> struct drm_display_mode *mode = NULL;
> @@ -580,6 +584,8 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data,
Could do the same for setconfig_internal's tmp->primary, if you're bored.
> }
> DRM_DEBUG_KMS("[CRTC:%d:%s]\n", crtc->base.id, crtc->name);
>
> + plane = crtc->primary;
> +
> mutex_lock(&crtc->dev->mode_config.mutex);
> drm_modeset_acquire_init(&ctx, DRM_MODESET_ACQUIRE_INTERRUPTIBLE);
> retry:
> @@ -590,12 +596,12 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data,
> /* If we have a mode we need a framebuffer. */
> /* If we pass -1, set the mode with the currently bound fb */
> if (crtc_req->fb_id == -1) {
> - if (!crtc->primary->fb) {
> + if (!plane->fb) {
> DRM_DEBUG_KMS("CRTC doesn't have current FB\n");
> ret = -EINVAL;
> goto out;
> }
> - fb = crtc->primary->fb;
> + fb = plane->fb;
> /* Make refcounting symmetric with the lookup path. */
> drm_framebuffer_get(fb);
> } else {
> @@ -627,8 +633,8 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data,
> * match real hardware capabilities. Skip the check in that
> * case.
> */
> - if (!crtc->primary->format_default) {
> - ret = drm_plane_check_pixel_format(crtc->primary,
> + if (!plane->format_default) {
> + ret = drm_plane_check_pixel_format(plane,
> fb->format->format,
> fb->modifier);
> if (ret) {
> diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c
> index 6d2a6e428a3e..38e2a628bfa2 100644
> --- a/drivers/gpu/drm/drm_plane.c
> +++ b/drivers/gpu/drm/drm_plane.c
> @@ -756,6 +756,7 @@ static int drm_mode_cursor_universal(struct drm_crtc
> *crtc,
> struct drm_modeset_acquire_ctx *ctx)
> {
> struct drm_device *dev = crtc->dev;
> + struct drm_plane *plane = crtc->cursor;
> struct drm_framebuffer *fb = NULL;
> struct drm_mode_fb_cmd2 fbreq = {
> .width = req->width,
> @@ -769,8 +770,8 @@ static int drm_mode_cursor_universal(struct drm_crtc
> *crtc,
> uint32_t src_w = 0, src_h = 0;
> int ret = 0;
>
> - BUG_ON(!crtc->cursor);
> - WARN_ON(crtc->cursor->crtc != crtc && crtc->cursor->crtc != NULL);
> + BUG_ON(!plane);
> + WARN_ON(plane->crtc != crtc && plane->crtc != NULL);
>
> /*
> * Obtain fb we'll be using (either new or existing) and take an extra
> @@ -790,7 +791,7 @@ static int drm_mode_cursor_universal(struct drm_crtc
> *crtc,
> fb = NULL;
> }
> } else {
> - fb = crtc->cursor->fb;
> + fb = plane->fb;
> if (fb)
> drm_framebuffer_get(fb);
> }
> @@ -810,7 +811,7 @@ static int drm_mode_cursor_universal(struct drm_crtc
> *crtc,
> src_h = fb->height << 16;
> }
>
> - ret = __setplane_internal(crtc->cursor, crtc, fb,
> + ret = __setplane_internal(plane, crtc, fb,
> crtc_x, crtc_y, crtc_w, crtc_h,
> 0, 0, src_w, src_h, ctx);
>
> @@ -931,6 +932,7 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev,
> {
> struct drm_mode_crtc_page_flip_target *page_flip = data;
> struct drm_crtc *crtc;
> + struct drm_plane *plane;
> struct drm_framebuffer *fb = NULL;
> struct drm_pending_vblank_event *e = NULL;
> u32 target_vblank = page_flip->sequence;
> @@ -959,6 +961,8 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev,
> if (!crtc)
> return -ENOENT;
>
> + plane = crtc->primary;
> +
> if (crtc->funcs->page_flip_target) {
> u32 current_vblank;
> int r;
> @@ -1003,11 +1007,11 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev,
> ret = drm_modeset_lock(&crtc->mutex, &ctx);
> if (ret)
> goto out;
> - ret = drm_modeset_lock(&crtc->primary->mutex, &ctx);
> + ret = drm_modeset_lock(&plane->mutex, &ctx);
> if (ret)
> goto out;
>
> - if (crtc->primary->fb == NULL) {
> + if (plane->fb == NULL) {
> /* The framebuffer is currently unbound, presumably
> * due to a hotplug event, that userspace has not
> * yet discovered.
> @@ -1023,7 +1027,7 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev,
> }
>
> if (crtc->state) {
> - const struct drm_plane_state *state = crtc->primary->state;
> + const struct drm_plane_state *state = plane->state;
>
> ret = drm_framebuffer_check_src_coords(state->src_x,
> state->src_y,
> @@ -1036,7 +1040,7 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev,
> if (ret)
> goto out;
>
> - if (crtc->primary->fb->format != fb->format) {
> + if (plane->fb->format != fb->format) {
> DRM_DEBUG_KMS("Page flip is not allowed to change frame buffer
> format.\n");
> ret = -EINVAL;
> goto out;
> @@ -1060,7 +1064,7 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev,
> }
> }
>
> - crtc->primary->old_fb = crtc->primary->fb;
> + plane->old_fb = plane->fb;
> if (crtc->funcs->page_flip_target)
> ret = crtc->funcs->page_flip_target(crtc, fb, e,
> page_flip->flags,
> @@ -1073,9 +1077,9 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev,
> if (page_flip->flags & DRM_MODE_PAGE_FLIP_EVENT)
> drm_event_cancel_free(dev, &e->base);
> /* Keep the old fb, don't unref it. */
> - crtc->primary->old_fb = NULL;
> + plane->old_fb = NULL;
> } else {
> - crtc->primary->fb = fb;
> + plane->fb = fb;
> /* Unref only the old framebuffer. */
> fb = NULL;
> }
> @@ -1083,9 +1087,9 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev,
> out:
> if (fb)
> drm_framebuffer_put(fb);
> - if (crtc->primary->old_fb)
> - drm_framebuffer_put(crtc->primary->old_fb);
> - crtc->primary->old_fb = NULL;
> + if (plane->old_fb)
> + drm_framebuffer_put(plane->old_fb);
> + plane->old_fb = NULL;
>
Reviewed-by: Daniel Vetter <daniel.vet...@ffwll.ch>
> if (ret == -EDEADLK) {
> ret = drm_modeset_backoff(&ctx);
> --
> 2.16.1
>
> _______________________________________________
> dri-devel mailing list
> dri-de...@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
