aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/exynos
diff options
context:
space:
mode:
authorGustavo Padovan <gustavo.padovan@collabora.co.uk>2014-11-03 15:20:29 -0500
committerInki Dae <daeinki@gmail.com>2015-01-25 07:28:06 -0500
commit357193cd782e0716027c1b1ae5bae79e1db7d4ca (patch)
treec14c1737839c2f90c5591fa76303be9f1ec8aba9 /drivers/gpu/drm/exynos
parentfd092d7a11a237393f633bdc5b93a3624e872ea6 (diff)
drm/exynos: rename base object of struct exynos_drm_crtc to 'base'
'base' is more widely used name in the drm subsystem for the base object. Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk> Signed-off-by: Inki Dae <inki.dae@samsung.com>
Diffstat (limited to 'drivers/gpu/drm/exynos')
-rw-r--r--drivers/gpu/drm/exynos/exynos_drm_crtc.c4
-rw-r--r--drivers/gpu/drm/exynos/exynos_drm_drv.h7
2 files changed, 5 insertions, 6 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.c b/drivers/gpu/drm/exynos/exynos_drm_crtc.c
index 5b3d18225fd6..1cdf7050ee89 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_crtc.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.c
@@ -324,8 +324,8 @@ int exynos_drm_crtc_create(struct exynos_drm_manager *manager)
324 goto err_plane; 324 goto err_plane;
325 } 325 }
326 326
327 manager->crtc = &exynos_crtc->drm_crtc; 327 manager->crtc = &exynos_crtc->base;
328 crtc = &exynos_crtc->drm_crtc; 328 crtc = &exynos_crtc->base;
329 329
330 private->crtc[manager->pipe] = crtc; 330 private->crtc[manager->pipe] = crtc;
331 331
diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.h b/drivers/gpu/drm/exynos/exynos_drm_drv.h
index 187dde53625c..0a565f83be4d 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_drv.h
+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.h
@@ -23,8 +23,7 @@
23#define MAX_FB_BUFFER 4 23#define MAX_FB_BUFFER 4
24#define DEFAULT_ZPOS -1 24#define DEFAULT_ZPOS -1
25 25
26#define to_exynos_crtc(x) container_of(x, struct exynos_drm_crtc,\ 26#define to_exynos_crtc(x) container_of(x, struct exynos_drm_crtc, base)
27 drm_crtc)
28#define to_exynos_plane(x) container_of(x, struct exynos_drm_plane, base) 27#define to_exynos_plane(x) container_of(x, struct exynos_drm_plane, base)
29 28
30/* This enumerates device type. */ 29/* This enumerates device type. */
@@ -229,7 +228,7 @@ enum exynos_crtc_mode {
229/* 228/*
230 * Exynos specific crtc structure. 229 * Exynos specific crtc structure.
231 * 230 *
232 * @drm_crtc: crtc object. 231 * @base: crtc object.
233 * @manager: the manager associated with this crtc 232 * @manager: the manager associated with this crtc
234 * @pipe: a crtc index created at load() with a new crtc object creation 233 * @pipe: a crtc index created at load() with a new crtc object creation
235 * and the crtc object would be set to private->crtc array 234 * and the crtc object would be set to private->crtc array
@@ -242,7 +241,7 @@ enum exynos_crtc_mode {
242 * @mode: store the crtc mode value 241 * @mode: store the crtc mode value
243 */ 242 */
244struct exynos_drm_crtc { 243struct exynos_drm_crtc {
245 struct drm_crtc drm_crtc; 244 struct drm_crtc base;
246 struct exynos_drm_manager *manager; 245 struct exynos_drm_manager *manager;
247 unsigned int pipe; 246 unsigned int pipe;
248 unsigned int dpms; 247 unsigned int dpms;