| From 6632cea8122ed41b9771539e7e2a116bffd71cd1 Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Wed, 29 Apr 2015 00:05:56 +0300 |
| Subject: [PATCH 074/129] drm: rcar-du: Embed rcar_du_planes structure into |
| rcar_du_group |
| |
| The rcar_du_planes structure contains a single field and is only |
| instantiated in the rcar_du_group structure. Embed it directly and |
| remove the rcar_du_planes structure. |
| |
| Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| (cherry picked from commit 99caede11d84af4c0a16fd07f7d7ce9de94f6109) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 10 +++++----- |
| drivers/gpu/drm/rcar-du/rcar_du_group.h | 2 +- |
| drivers/gpu/drm/rcar-du/rcar_du_kms.c | 6 +++--- |
| drivers/gpu/drm/rcar-du/rcar_du_plane.c | 3 +-- |
| drivers/gpu/drm/rcar-du/rcar_du_plane.h | 4 ---- |
| 5 files changed, 10 insertions(+), 15 deletions(-) |
| |
| diff --git a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c |
| index 7d0b8ef9bea2..b5f66b78cbb2 100644 |
| --- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c |
| +++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c |
| @@ -213,8 +213,8 @@ static void rcar_du_crtc_update_planes(struct rcar_du_crtc *rcrtc) |
| u32 dptsr = 0; |
| u32 dspr = 0; |
| |
| - for (i = 0; i < ARRAY_SIZE(rcrtc->group->planes.planes); ++i) { |
| - struct rcar_du_plane *plane = &rcrtc->group->planes.planes[i]; |
| + for (i = 0; i < ARRAY_SIZE(rcrtc->group->planes); ++i) { |
| + struct rcar_du_plane *plane = &rcrtc->group->planes[i]; |
| unsigned int j; |
| |
| if (plane->plane.state->crtc != &rcrtc->crtc) |
| @@ -427,8 +427,8 @@ void rcar_du_crtc_resume(struct rcar_du_crtc *rcrtc) |
| rcar_du_crtc_start(rcrtc); |
| |
| /* Commit the planes state. */ |
| - for (i = 0; i < ARRAY_SIZE(rcrtc->group->planes.planes); ++i) { |
| - struct rcar_du_plane *plane = &rcrtc->group->planes.planes[i]; |
| + for (i = 0; i < ARRAY_SIZE(rcrtc->group->planes); ++i) { |
| + struct rcar_du_plane *plane = &rcrtc->group->planes[i]; |
| |
| if (plane->plane.state->crtc != &rcrtc->crtc) |
| continue; |
| @@ -592,7 +592,7 @@ int rcar_du_crtc_create(struct rcar_du_group *rgrp, unsigned int index) |
| rcrtc->enabled = false; |
| |
| ret = drm_crtc_init_with_planes(rcdu->ddev, crtc, |
| - &rgrp->planes.planes[index % 2].plane, |
| + &rgrp->planes[index % 2].plane, |
| NULL, &crtc_funcs); |
| if (ret < 0) |
| return ret; |
| diff --git a/drivers/gpu/drm/rcar-du/rcar_du_group.h b/drivers/gpu/drm/rcar-du/rcar_du_group.h |
| index ed36433fbe84..ea02bb02f3e1 100644 |
| --- a/drivers/gpu/drm/rcar-du/rcar_du_group.h |
| +++ b/drivers/gpu/drm/rcar-du/rcar_du_group.h |
| @@ -40,7 +40,7 @@ struct rcar_du_group { |
| |
| struct mutex lock; |
| |
| - struct rcar_du_planes planes; |
| + struct rcar_du_plane planes[RCAR_DU_NUM_KMS_PLANES]; |
| }; |
| |
| u32 rcar_du_group_read(struct rcar_du_group *rgrp, u32 reg); |
| diff --git a/drivers/gpu/drm/rcar-du/rcar_du_kms.c b/drivers/gpu/drm/rcar-du/rcar_du_kms.c |
| index 5fd6f8c07ec2..4012afacab5f 100644 |
| --- a/drivers/gpu/drm/rcar-du/rcar_du_kms.c |
| +++ b/drivers/gpu/drm/rcar-du/rcar_du_kms.c |
| @@ -291,7 +291,7 @@ static int rcar_du_atomic_check(struct drm_device *dev, |
| * plane(s) as freed. |
| */ |
| if (!plane_state->format) { |
| - index = plane - plane->group->planes.planes; |
| + index = plane - plane->group->planes; |
| group_freed_planes[plane->group->index] |= 1 << index; |
| plane_state->hwindex = -1; |
| continue; |
| @@ -304,7 +304,7 @@ static int rcar_du_atomic_check(struct drm_device *dev, |
| groups |= 1 << plane->group->index; |
| needs_realloc = true; |
| |
| - index = plane - plane->group->planes.planes; |
| + index = plane - plane->group->planes; |
| group_freed_planes[plane->group->index] |= 1 << index; |
| plane_state->hwindex = -1; |
| } |
| @@ -327,7 +327,7 @@ static int rcar_du_atomic_check(struct drm_device *dev, |
| unsigned int used_planes = 0; |
| |
| for (i = 0; i < RCAR_DU_NUM_KMS_PLANES; ++i) { |
| - struct rcar_du_plane *plane = &group->planes.planes[i]; |
| + struct rcar_du_plane *plane = &group->planes[i]; |
| struct rcar_du_plane_state *plane_state; |
| struct drm_plane_state *s; |
| |
| diff --git a/drivers/gpu/drm/rcar-du/rcar_du_plane.c b/drivers/gpu/drm/rcar-du/rcar_du_plane.c |
| index b5565417f673..99fefcaf6597 100644 |
| --- a/drivers/gpu/drm/rcar-du/rcar_du_plane.c |
| +++ b/drivers/gpu/drm/rcar-du/rcar_du_plane.c |
| @@ -389,7 +389,6 @@ static const uint32_t formats[] = { |
| |
| int rcar_du_planes_init(struct rcar_du_group *rgrp) |
| { |
| - struct rcar_du_planes *planes = &rgrp->planes; |
| struct rcar_du_device *rcdu = rgrp->dev; |
| unsigned int num_planes; |
| unsigned int num_crtcs; |
| @@ -409,7 +408,7 @@ int rcar_du_planes_init(struct rcar_du_group *rgrp) |
| enum drm_plane_type type = i < num_crtcs |
| ? DRM_PLANE_TYPE_PRIMARY |
| : DRM_PLANE_TYPE_OVERLAY; |
| - struct rcar_du_plane *plane = &planes->planes[i]; |
| + struct rcar_du_plane *plane = &rgrp->planes[i]; |
| |
| plane->group = rgrp; |
| |
| diff --git a/drivers/gpu/drm/rcar-du/rcar_du_plane.h b/drivers/gpu/drm/rcar-du/rcar_du_plane.h |
| index 6b17b1f4f414..d1fb9b16a060 100644 |
| --- a/drivers/gpu/drm/rcar-du/rcar_du_plane.h |
| +++ b/drivers/gpu/drm/rcar-du/rcar_du_plane.h |
| @@ -38,10 +38,6 @@ static inline struct rcar_du_plane *to_rcar_plane(struct drm_plane *plane) |
| return container_of(plane, struct rcar_du_plane, plane); |
| } |
| |
| -struct rcar_du_planes { |
| - struct rcar_du_plane planes[RCAR_DU_NUM_KMS_PLANES]; |
| -}; |
| - |
| /** |
| * struct rcar_du_plane_state - Driver-specific plane state |
| * @state: base DRM plane state |
| -- |
| 2.6.2 |
| |