drm/exynos: Rename display_op power_on to dpms

This patch renames the display_op power_on to dpms to accurately reflect
what the function does.

The side-effect of this patch is that the new hdmi dpms callback is now
invoked twice in the dpms path. This is safe and will be dealt with when
the exynos_drm shim goes away.

Signed-off-by: Sean Paul <seanpaul@chromium.org>
Reviewed-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>

diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.h b/drivers/gpu/drm/exynos/exynos_drm_drv.h
index 5912841cdf2f5c53590fa58b71ecea144dad9a7f..cf65f65d6c68e2f59287a7a9638b8fbf7ad03df3 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_drv.h
+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.h
@@ -128,7 +128,7 @@ struct exynos_drm_overlay {
  * @get_edid: get edid modes from display driver.
  * @get_panel: get panel object from display driver.
  * @check_mode: check if mode is valid or not.
- * @power_on: display device on or off.
+ * @dpms: display device on or off.
  */
 struct exynos_drm_display_ops {
        enum exynos_drm_output_type type;
@@ -138,7 +138,7 @@ struct exynos_drm_display_ops {
                        struct drm_connector *connector);
        void *(*get_panel)(struct device *dev);
        int (*check_mode)(struct device *dev, struct drm_display_mode *mode);
-       int (*power_on)(struct device *dev, int mode);
+       int (*dpms)(struct device *dev, int mode);
 };
 
 /*

diff --git a/drivers/gpu/drm/exynos/exynos_drm_encoder.c b/drivers/gpu/drm/exynos/exynos_drm_encoder.c
index df4b2852b2d1cb994e83071a7d6d19049e128232..5bf1e1e2329b93bccc8747c8352ca3524c6ed55e 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_encoder.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_encoder.c
@@ -50,8 +50,8 @@ static void exynos_drm_encoder_dpms(struct drm_encoder *encoder, int mode)
                return;
        }
 
-       if (display_ops && display_ops->power_on)
-               display_ops->power_on(manager->ctx, mode);
+       if (display_ops && display_ops->dpms)
+               display_ops->dpms(manager->ctx, mode);
 
        exynos_encoder->dpms = mode;
 }

diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
index 810c61fa77e1c08d0056609cd4ab9cb27f75731c..ff1ba947700264e1da0c6b62944ccf64bfd24cd4 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
@@ -169,19 +169,11 @@ static int fimd_check_mode(struct device *dev, struct drm_display_mode *mode)
        return 0;
 }
 
-static int fimd_display_power_on(struct device *dev, int mode)
-{
-       /* TODO */
-
-       return 0;
-}
-
 static struct exynos_drm_display_ops fimd_display_ops = {
        .type = EXYNOS_DISPLAY_TYPE_LCD,
        .is_connected = fimd_display_is_connected,
        .get_panel = fimd_get_panel,
        .check_mode = fimd_check_mode,
-       .power_on = fimd_display_power_on,
 };
 
 static int fimd_mgr_initialize(struct exynos_drm_manager *mgr,

diff --git a/drivers/gpu/drm/exynos/exynos_drm_hdmi.c b/drivers/gpu/drm/exynos/exynos_drm_hdmi.c
index c5de00a66c2be2ac6af2403808bfe796c0561b8b..f9a9324a8d21b24f6a1985f1dd2395a9389923b5 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_hdmi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_hdmi.c
@@ -159,12 +159,12 @@ static int drm_hdmi_check_mode(struct device *dev,
        return drm_hdmi_check_mode_ctx(ctx, mode);
 }
 
-static int drm_hdmi_power_on(struct device *dev, int mode)
+static int drm_hdmi_display_dpms(struct device *dev, int mode)
 {
        struct drm_hdmi_context *ctx = to_context(dev);
 
-       if (hdmi_ops && hdmi_ops->power_on)
-               return hdmi_ops->power_on(ctx->hdmi_ctx->ctx, mode);
+       if (hdmi_ops && hdmi_ops->dpms)
+               hdmi_ops->dpms(ctx->hdmi_ctx->ctx, mode);
 
        return 0;
 }
@@ -175,7 +175,7 @@ static struct exynos_drm_display_ops drm_hdmi_display_ops = {
        .is_connected = drm_hdmi_is_connected,
        .get_edid = drm_hdmi_get_edid,
        .check_mode = drm_hdmi_check_mode,
-       .power_on = drm_hdmi_power_on,
+       .dpms = drm_hdmi_display_dpms,
 };
 
 static int drm_hdmi_enable_vblank(struct exynos_drm_manager *mgr)

diff --git a/drivers/gpu/drm/exynos/exynos_drm_hdmi.h b/drivers/gpu/drm/exynos/exynos_drm_hdmi.h
index cf7b1da67aba56cdba6a9e89a29bd8a25c04b2e2..923239bdd7e91805e3f8ebb20c0b00f91b6be5be 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_hdmi.h
+++ b/drivers/gpu/drm/exynos/exynos_drm_hdmi.h
@@ -33,14 +33,13 @@ struct exynos_hdmi_ops {
        struct edid *(*get_edid)(void *ctx,
                        struct drm_connector *connector);
        int (*check_mode)(void *ctx, struct drm_display_mode *mode);
-       int (*power_on)(void *ctx, int mode);
+       void (*dpms)(void *ctx, int mode);
 
        /* manager */
        void (*mode_set)(void *ctx, struct drm_display_mode *mode);
        void (*get_max_resol)(void *ctx, unsigned int *width,
                                unsigned int *height);
        void (*commit)(void *ctx);
-       void (*dpms)(void *ctx, int mode);
 };
 
 struct exynos_mixer_ops {

diff --git a/drivers/gpu/drm/exynos/exynos_drm_vidi.c b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
index 838edb08f214990aec061eded1ac2a28a38537bc..8d1fdc4e6bcbef1306cc95350758278868a431a5 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_vidi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
@@ -136,20 +136,12 @@ static int vidi_check_mode(struct device *dev, struct drm_display_mode *mode)
        return 0;
 }
 
-static int vidi_display_power_on(struct device *dev, int mode)
-{
-       /* TODO */
-
-       return 0;
-}
-
 static struct exynos_drm_display_ops vidi_display_ops = {
        .type = EXYNOS_DISPLAY_TYPE_VIDI,
        .is_connected = vidi_display_is_connected,
        .get_edid = vidi_get_edid,
        .get_panel = vidi_get_panel,
        .check_mode = vidi_check_mode,
-       .power_on = vidi_display_power_on,
 };
 
 static void vidi_dpms(struct exynos_drm_manager *mgr, int mode)

diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
index d9521a9a624a1d7dc4d941681158a227621e33e5..b51672f538088993266db8e2fb434ebce88115e6 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_hdmi.c
+++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
@@ -1813,12 +1813,12 @@ static struct exynos_hdmi_ops hdmi_ops = {
        .is_connected   = hdmi_is_connected,
        .get_edid       = hdmi_get_edid,
        .check_mode     = hdmi_check_mode,
+       .dpms           = hdmi_dpms,
 
        /* manager */
        .mode_set       = hdmi_mode_set,
        .get_max_resol  = hdmi_get_max_resol,
        .commit         = hdmi_commit,
-       .dpms           = hdmi_dpms,
 };
 
 static irqreturn_t hdmi_irq_thread(int irq, void *arg)