aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>2013-06-16 13:18:31 -0400
committerLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>2013-08-09 17:17:45 -0400
commit7fe99fda5f5c52a01b2c966aa68341a0b3d8ab33 (patch)
treefa18fa3454257b0231a10764c93fe700024acde6
parentae425b6a77a1118b1b4f594efe4aaa4243bf222b (diff)
drm/rcar-du: Rename rcar_du_plane_(init|register) to rcar_du_planes_*
The functions initialize or register all planes, rename them accordingly. Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
-rw-r--r--drivers/gpu/drm/rcar-du/rcar_du_kms.c4
-rw-r--r--drivers/gpu/drm/rcar-du/rcar_du_plane.c4
-rw-r--r--drivers/gpu/drm/rcar-du/rcar_du_plane.h5
3 files changed, 7 insertions, 6 deletions
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_kms.c b/drivers/gpu/drm/rcar-du/rcar_du_kms.c
index a8eef167d51a..a1343fbde57a 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_kms.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_kms.c
@@ -174,7 +174,7 @@ int rcar_du_modeset_init(struct rcar_du_device *rcdu)
174 rcdu->ddev->mode_config.max_height = 2047; 174 rcdu->ddev->mode_config.max_height = 2047;
175 rcdu->ddev->mode_config.funcs = &rcar_du_mode_config_funcs; 175 rcdu->ddev->mode_config.funcs = &rcar_du_mode_config_funcs;
176 176
177 ret = rcar_du_plane_init(rcdu); 177 ret = rcar_du_planes_init(rcdu);
178 if (ret < 0) 178 if (ret < 0)
179 return ret; 179 return ret;
180 180
@@ -215,7 +215,7 @@ int rcar_du_modeset_init(struct rcar_du_device *rcdu)
215 encoder->possible_clones = 1 << 0; 215 encoder->possible_clones = 1 << 0;
216 } 216 }
217 217
218 ret = rcar_du_plane_register(rcdu); 218 ret = rcar_du_planes_register(rcdu);
219 if (ret < 0) 219 if (ret < 0)
220 return ret; 220 return ret;
221 221
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_plane.c b/drivers/gpu/drm/rcar-du/rcar_du_plane.c
index 38ebd20e4e8d..29f21477ef0e 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_plane.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_plane.c
@@ -435,7 +435,7 @@ static const uint32_t formats[] = {
435 DRM_FORMAT_NV16, 435 DRM_FORMAT_NV16,
436}; 436};
437 437
438int rcar_du_plane_init(struct rcar_du_device *rcdu) 438int rcar_du_planes_init(struct rcar_du_device *rcdu)
439{ 439{
440 unsigned int i; 440 unsigned int i;
441 441
@@ -475,7 +475,7 @@ int rcar_du_plane_init(struct rcar_du_device *rcdu)
475 return 0; 475 return 0;
476} 476}
477 477
478int rcar_du_plane_register(struct rcar_du_device *rcdu) 478int rcar_du_planes_register(struct rcar_du_device *rcdu)
479{ 479{
480 unsigned int i; 480 unsigned int i;
481 int ret; 481 int ret;
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_plane.h b/drivers/gpu/drm/rcar-du/rcar_du_plane.h
index 5c8488ca019f..bcf6f76f56a0 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_plane.h
+++ b/drivers/gpu/drm/rcar-du/rcar_du_plane.h
@@ -67,8 +67,9 @@ struct rcar_du_planes {
67 struct drm_property *zpos; 67 struct drm_property *zpos;
68}; 68};
69 69
70int rcar_du_plane_init(struct rcar_du_device *rcdu); 70int rcar_du_planes_init(struct rcar_du_device *rcdu);
71int rcar_du_plane_register(struct rcar_du_device *rcdu); 71int rcar_du_planes_register(struct rcar_du_device *rcdu);
72
72void rcar_du_plane_setup(struct rcar_du_plane *plane); 73void rcar_du_plane_setup(struct rcar_du_plane *plane);
73void rcar_du_plane_update_base(struct rcar_du_plane *plane); 74void rcar_du_plane_update_base(struct rcar_du_plane *plane);
74void rcar_du_plane_compute_base(struct rcar_du_plane *plane, 75void rcar_du_plane_compute_base(struct rcar_du_plane *plane,