drm/exynos: remove struct exynos_drm_panel_info

struct exynos_drm_panel_info is not used anymore, except exynos_dp,
which can integrate useful fields directly into its context.

Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>

diff --git a/drivers/gpu/drm/exynos/exynos7_drm_decon.c b/drivers/gpu/drm/exynos/exynos7_drm_decon.c
index 52bda3b42fe017346266181aa83f3c0141f6b4e3..93361073af9aa667471753843fe7f335ab1077aa 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos7_drm_decon.c
+++ b/drivers/gpu/drm/exynos/exynos7_drm_decon.c
@@ -60,7 +60,6 @@ struct decon_context {
        wait_queue_head_t               wait_vsync_queue;
        atomic_t                        wait_vsync_event;
 
-       struct exynos_drm_panel_info panel;
        struct drm_encoder *encoder;
 };
 

diff --git a/drivers/gpu/drm/exynos/exynos_dp_core.c b/drivers/gpu/drm/exynos/exynos_dp_core.c
index 9fd12c621270b65c9eae9688bcf8ecf55a174c26..cff8dc7888202d3fc54a7fa1afaee067ce47c525 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_dp_core.c
+++ b/drivers/gpu/drm/exynos/exynos_dp_core.c
@@ -977,9 +977,7 @@ static int exynos_dp_get_modes(struct drm_connector *connector)
                return 0;
        }
 
-       drm_display_mode_from_videomode(&dp->priv.vm, mode);
-       mode->width_mm = dp->priv.width_mm;
-       mode->height_mm = dp->priv.height_mm;
+       drm_display_mode_from_videomode(&dp->vm, mode);
        connector->display_info.width_mm = mode->width_mm;
        connector->display_info.height_mm = mode->height_mm;
 
@@ -1241,8 +1239,7 @@ static int exynos_dp_dt_parse_panel(struct exynos_dp_device *dp)
 {
        int ret;
 
-       ret = of_get_videomode(dp->dev->of_node, &dp->priv.vm,
-                       OF_USE_NATIVE_MODE);
+       ret = of_get_videomode(dp->dev->of_node, &dp->vm, OF_USE_NATIVE_MODE);
        if (ret) {
                DRM_ERROR("failed: of_get_videomode() : %d\n", ret);
                return ret;

diff --git a/drivers/gpu/drm/exynos/exynos_dp_core.h b/drivers/gpu/drm/exynos/exynos_dp_core.h
index 66eec4b2d5c657e6bbe99647caa8487bc3b0ade8..b5c2d8f47f9ce744f62e7fb0641cb61d4189507d 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_dp_core.h
+++ b/drivers/gpu/drm/exynos/exynos_dp_core.h
@@ -16,6 +16,7 @@
 #include <drm/drm_crtc.h>
 #include <drm/drm_dp_helper.h>
 #include <drm/exynos_drm.h>
+#include <video/videomode.h>
 
 #include "exynos_drm_drv.h"
 
@@ -164,8 +165,7 @@ struct exynos_dp_device {
        struct phy              *phy;
        int                     dpms_mode;
        int                     hpd_gpio;
-
-       struct exynos_drm_panel_info priv;
+       struct videomode        vm;
 };
 
 /* exynos_dp_reg.c */

diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
index 0a445119a4e714c6e82ffb788294d1d0c96bcb00..51d484ae9f498c17a07ba43a0891ef8ebe0dd3a4 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
@@ -182,7 +182,6 @@ struct fimd_context {
        atomic_t                        win_updated;
        atomic_t                        triggering;
 
-       struct exynos_drm_panel_info panel;
        struct fimd_driver_data *driver_data;
        struct drm_encoder *encoder;
 };

diff --git a/include/drm/exynos_drm.h b/include/drm/exynos_drm.h
index cb65fa14acfcd28eeff9587e4a88c822e898d733..e9fb2bd971aa490fc565349208a1ea4244bddcd2 100644 (file)
--- a/include/drm/exynos_drm.h
+++ b/include/drm/exynos_drm.h
@@ -17,28 +17,13 @@
 #include <uapi/drm/exynos_drm.h>
 #include <video/videomode.h>
 
-/**
- * A structure for lcd panel information.
- *
- * @timing: default video mode for initializing
- * @width_mm: physical size of lcd width.
- * @height_mm: physical size of lcd height.
- */
-struct exynos_drm_panel_info {
-       struct videomode vm;
-       u32 width_mm;
-       u32 height_mm;
-};
-
 /**
  * Platform Specific Structure for DRM based FIMD.
  *
- * @panel: default panel info for initializing
  * @default_win: default window layer number to be used for UI.
  * @bpp: default bit per pixel.
  */
 struct exynos_drm_fimd_pdata {
-       struct exynos_drm_panel_info panel;
        u32                             vidcon0;
        u32                             vidcon1;
        unsigned int                    default_win;