aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/exynos/exynos_drm_drv.h
diff options
context:
space:
mode:
authorGustavo Padovan <gustavo.padovan@collabora.co.uk>2014-11-05 19:51:35 -0200
committerInki Dae <daeinki@gmail.com>2015-01-25 21:28:07 +0900
commit5d1741ad4b61bc5a7fbc783199aa2b8805877e76 (patch)
tree9b8c6a390b9f273746c81c1a407ad3b65140a753 /drivers/gpu/drm/exynos/exynos_drm_drv.h
parentdrm/exynos: remove pipe member of struct exynos_drm_manager (diff)
downloadlinux-dev-5d1741ad4b61bc5a7fbc783199aa2b8805877e76.tar.xz
linux-dev-5d1741ad4b61bc5a7fbc783199aa2b8805877e76.zip
drm/exynos: move 'type' from manager to crtc struct
'type' is now part of the struct exynos_drm_crtc. This is just another step in the struct exynos_drm_manager removal. 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/exynos_drm_drv.h')
-rw-r--r--drivers/gpu/drm/exynos/exynos_drm_drv.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.h b/drivers/gpu/drm/exynos/exynos_drm_drv.h
index 1d024c0421a8..a3ae95f1a40b 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_drv.h
+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.h
@@ -204,7 +204,6 @@ struct exynos_drm_manager_ops {
* Exynos drm common manager structure, maps 1:1 with a crtc
*
* @list: the list entry for this manager
- * @type: one of EXYNOS_DISPLAY_TYPE_LCD and HDMI.
* @drm_dev: pointer to the drm device
* @crtc: crtc object.
* @ops: pointer to callbacks for exynos drm specific functionality
@@ -212,7 +211,6 @@ struct exynos_drm_manager_ops {
*/
struct exynos_drm_manager {
struct list_head list;
- enum exynos_drm_output_type type;
struct drm_device *drm_dev;
struct drm_crtc *crtc;
struct exynos_drm_manager_ops *ops;
@@ -228,6 +226,7 @@ enum exynos_crtc_mode {
*
* @base: crtc object.
* @manager: the manager associated with this crtc
+ * @type: one of EXYNOS_DISPLAY_TYPE_LCD and HDMI.
* @pipe: a crtc index created at load() with a new crtc object creation
* and the crtc object would be set to private->crtc array
* to get a crtc object corresponding to this pipe from private->crtc
@@ -241,6 +240,7 @@ enum exynos_crtc_mode {
struct exynos_drm_crtc {
struct drm_crtc base;
struct exynos_drm_manager *manager;
+ enum exynos_drm_output_type type;
unsigned int pipe;
unsigned int dpms;
enum exynos_crtc_mode mode;