From e868d0e941574596cb8d9a257e1a34c323ababaa Mon Sep 17 00:00:00 2001 From: Sean Paul Date: Tue, 19 Feb 2013 12:25:20 -0500 Subject: [PATCH] drm/exynos: Remove apply() callback MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Remove the apply() callback from the panel and controller ops, it really doesn't make sense. BUG=None TEST=Booted snow, suspend/resume/hotplug no regressions Change-Id: I1df3a368409aa2bbd0d69866f365d6baa0786025 Signed-off-by: Sean Paul Reviewed-on: https://gerrit.chromium.org/gerrit/43516 Reviewed-by: Stéphane Marchesin --- drivers/gpu/drm/exynos/exynos_drm_display.h | 4 ---- drivers/gpu/drm/exynos/exynos_drm_encoder.c | 7 ------- drivers/gpu/drm/exynos/exynos_drm_fimd.c | 1 - drivers/gpu/drm/exynos/exynos_hdmi.c | 6 ------ drivers/gpu/drm/exynos/exynos_mixer.c | 3 +-- 5 files changed, 1 insertion(+), 20 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_display.h b/drivers/gpu/drm/exynos/exynos_drm_display.h index a8d74d4508c9..dfc386c46d65 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_display.h +++ b/drivers/gpu/drm/exynos/exynos_drm_display.h @@ -26,7 +26,6 @@ * @mode_fixup: Copies and optionally alters mode to adjusted_mode * @mode_set: Sets the panel to output mode * @commit: Commits changes to the panel from mode_set - * @apply: Same as commit in most cases * @get_max_res: Returns the maximum resolution in width/height */ struct exynos_panel_ops { @@ -41,7 +40,6 @@ struct exynos_panel_ops { struct drm_display_mode *adjusted_mode); void (*mode_set)(void *ctx, struct drm_display_mode *mode); void (*commit)(void *ctx); - void (*apply)(void *ctx); void (*get_max_res)(void *ctx, unsigned int *width, unsigned int *height); }; @@ -57,7 +55,6 @@ struct exynos_panel_ops { * @dpms: Same as power, but called in different places. Best to avoid it * @mode_set: Sets the controller to output mode * @commit: Applies controller level settings (as opposed to window level) - * @apply: Commits the changes on all of the controller's windows * @win_commit: Commits the changes on only one window * @win_disable: Disables one of the controller's windows */ @@ -70,7 +67,6 @@ struct exynos_controller_ops { int (*dpms)(void *ctx, int mode); void (*mode_set)(void *ctx, struct exynos_drm_overlay *overlay); void (*commit)(void *ctx); - void (*apply)(void *ctx); void (*win_commit)(void *ctx, int zpos); void (*win_disable)(void *ctx, int zpos); }; diff --git a/drivers/gpu/drm/exynos/exynos_drm_encoder.c b/drivers/gpu/drm/exynos/exynos_drm_encoder.c index 46bed2808dd4..040f4778ed3e 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_encoder.c +++ b/drivers/gpu/drm/exynos/exynos_drm_encoder.c @@ -117,7 +117,6 @@ int exynos_drm_encoder_get_dpms(struct drm_encoder *encoder) void exynos_drm_encoder_dpms(struct drm_encoder *encoder, int mode) { struct drm_device *dev = encoder->dev; - struct exynos_drm_display *display = exynos_drm_get_display(encoder); struct exynos_drm_encoder *exynos_encoder = to_exynos_encoder(encoder); DRM_DEBUG_KMS("%s, encoder dpms: %d\n", __FILE__, mode); @@ -132,12 +131,6 @@ void exynos_drm_encoder_dpms(struct drm_encoder *encoder, int mode) switch (mode) { case DRM_MODE_DPMS_ON: - if (display->controller_ops->apply) - display->controller_ops->apply(display->controller_ctx); - - if (display->panel_ops->apply) - display->panel_ops->apply(display->panel_ctx); - exynos_drm_display_power(encoder, mode); break; case DRM_MODE_DPMS_STANDBY: diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c index 20d63d688216..82ca11a67a5b 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c @@ -699,7 +699,6 @@ static struct exynos_controller_ops fimd_controller_ops = { .power = fimd_power, .mode_set = fimd_win_mode_set, .commit = fimd_commit, - .apply = fimd_apply, .win_commit = fimd_win_commit, .win_disable = fimd_win_disable, }; diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c index 12e58715707c..d06e2bd45c06 100644 --- a/drivers/gpu/drm/exynos/exynos_hdmi.c +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c @@ -1901,11 +1901,6 @@ static void hdmi_commit(void *ctx) hdata->enabled = true; } -static void hdmi_apply(void *ctx) -{ - hdmi_commit(ctx); -} - static int hdmiphy_update_bits(struct i2c_client *client, u8 *reg_cache, u8 reg, u8 mask, u8 val) { @@ -2089,7 +2084,6 @@ static struct exynos_panel_ops hdmi_ops = { .mode_fixup = hdmi_mode_fixup, .mode_set = hdmi_mode_set, .commit = hdmi_commit, - .apply = hdmi_apply, }; /* diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c index a9d23f98dd12..5d41c9b82a87 100644 --- a/drivers/gpu/drm/exynos/exynos_mixer.c +++ b/drivers/gpu/drm/exynos/exynos_mixer.c @@ -1042,7 +1042,7 @@ static void mixer_resource_poweron(struct mixer_context *mctx) mixer_enable_vblank(mctx, mctx->pipe); mctx->is_mixer_powered_on = true; - mixer_win_commit(mctx, 0); + mixer_apply(mctx); } static void mixer_resource_poweroff(struct mixer_context *mctx) @@ -1103,7 +1103,6 @@ static struct exynos_controller_ops mixer_ops = { /* overlay */ .mode_set = mixer_win_mode_set, - .apply = mixer_apply, .win_commit = mixer_win_commit, .win_disable = mixer_win_disable, }; -- 2.20.1