diff options
Diffstat (limited to 'drivers/gpu/drm/exynos/exynos7_drm_decon.c')
-rw-r--r-- | drivers/gpu/drm/exynos/exynos7_drm_decon.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/exynos/exynos7_drm_decon.c b/drivers/gpu/drm/exynos/exynos7_drm_decon.c index fe31e413324f..31210bef3ece 100644 --- a/drivers/gpu/drm/exynos/exynos7_drm_decon.c +++ b/drivers/gpu/drm/exynos/exynos7_drm_decon.c | |||
@@ -383,7 +383,7 @@ static void decon_shadow_protect_win(struct decon_context *ctx, | |||
383 | writel(val, ctx->regs + SHADOWCON); | 383 | writel(val, ctx->regs + SHADOWCON); |
384 | } | 384 | } |
385 | 385 | ||
386 | static void decon_win_commit(struct exynos_drm_crtc *crtc, unsigned int win) | 386 | static void decon_update_plane(struct exynos_drm_crtc *crtc, unsigned int win) |
387 | { | 387 | { |
388 | struct decon_context *ctx = crtc->ctx; | 388 | struct decon_context *ctx = crtc->ctx; |
389 | struct drm_display_mode *mode = &crtc->base.state->adjusted_mode; | 389 | struct drm_display_mode *mode = &crtc->base.state->adjusted_mode; |
@@ -493,7 +493,7 @@ static void decon_win_commit(struct exynos_drm_crtc *crtc, unsigned int win) | |||
493 | writel(val, ctx->regs + DECON_UPDATE); | 493 | writel(val, ctx->regs + DECON_UPDATE); |
494 | } | 494 | } |
495 | 495 | ||
496 | static void decon_win_disable(struct exynos_drm_crtc *crtc, unsigned int win) | 496 | static void decon_disable_plane(struct exynos_drm_crtc *crtc, unsigned int win) |
497 | { | 497 | { |
498 | struct decon_context *ctx = crtc->ctx; | 498 | struct decon_context *ctx = crtc->ctx; |
499 | struct exynos_drm_plane *plane; | 499 | struct exynos_drm_plane *plane; |
@@ -599,7 +599,7 @@ static void decon_disable(struct exynos_drm_crtc *crtc) | |||
599 | * a destroyed buffer later. | 599 | * a destroyed buffer later. |
600 | */ | 600 | */ |
601 | for (i = 0; i < WINDOWS_NR; i++) | 601 | for (i = 0; i < WINDOWS_NR; i++) |
602 | decon_win_disable(crtc, i); | 602 | decon_disable_plane(crtc, i); |
603 | 603 | ||
604 | clk_disable_unprepare(ctx->vclk); | 604 | clk_disable_unprepare(ctx->vclk); |
605 | clk_disable_unprepare(ctx->eclk); | 605 | clk_disable_unprepare(ctx->eclk); |
@@ -619,8 +619,8 @@ static const struct exynos_drm_crtc_ops decon_crtc_ops = { | |||
619 | .enable_vblank = decon_enable_vblank, | 619 | .enable_vblank = decon_enable_vblank, |
620 | .disable_vblank = decon_disable_vblank, | 620 | .disable_vblank = decon_disable_vblank, |
621 | .wait_for_vblank = decon_wait_for_vblank, | 621 | .wait_for_vblank = decon_wait_for_vblank, |
622 | .win_commit = decon_win_commit, | 622 | .update_plane = decon_update_plane, |
623 | .win_disable = decon_win_disable, | 623 | .disable_plane = decon_disable_plane, |
624 | }; | 624 | }; |
625 | 625 | ||
626 | 626 | ||