diff mbox

[v2] drm/exynos/decon5433: set STANDALONE_UPDATE_F also if planes are disabled

Message ID 1484296979-17195-1-git-send-email-a.hajda@samsung.com (mailing list archive)
State New, archived
Headers show

Commit Message

Andrzej Hajda Jan. 13, 2017, 8:42 a.m. UTC 
STANDALONE_UPDATE_F should be set if something changed in plane configurations,
including plane disable.
The patch fixes page-faults bugs, caused by decon still using framebuffers
of disabled planes.

Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
---
v2: fixed clear-bit code (Thx Marek)
---
 drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

Comments

Joonyoung Shim Jan. 13, 2017, 8:55 a.m. UTC | #1 
Hi Andrzej,

On 01/13/2017 05:42 PM, Andrzej Hajda wrote:
> @@ -339,8 +342,10 @@ static void decon_atomic_flush(struct exynos_drm_crtc *crtc)
>  		decon_shadow_protect_win(ctx, i, false);
>  
>  	/* update iff there are active windows */
> -	if (crtc->base.state->plane_mask)
> +	if (test_bit(BIT_REQUEST_UPDATE, &ctx->flags)) {

It's better to just use test_and_clear_bit?

>  		decon_set_bits(ctx, DECON_UPDATE, STANDALONE_UPDATE_F, ~0);
> +		clear_bit(BIT_REQUEST_UPDATE, &ctx->flags);
> +	}
>  
>  	if (ctx->out_type & IFTYPE_I80)
>  		set_bit(BIT_WIN_UPDATED, &ctx->flags);
> 

I tested on TM2E board,

Tested-by: Joonyoung Shim <jy0922.shim@samsung.com>

Thanks.
diff mbox

Patch

diff --git a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c
index ef7fcb5..77a614d 100644
--- a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c
+++ b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c
@@ -46,7 +46,8 @@  enum decon_flag_bits {
 	BIT_CLKS_ENABLED,
 	BIT_IRQS_ENABLED,
 	BIT_WIN_UPDATED,
-	BIT_SUSPENDED
+	BIT_SUSPENDED,
+	BIT_REQUEST_UPDATE
 };
 
 struct decon_context {
@@ -313,6 +314,7 @@  static void decon_update_plane(struct exynos_drm_crtc *crtc,
 
 	/* window enable */
 	decon_set_bits(ctx, DECON_WINCONx(win), WINCONx_ENWIN_F, ~0);
+	set_bit(BIT_REQUEST_UPDATE, &ctx->flags);
 }
 
 static void decon_disable_plane(struct exynos_drm_crtc *crtc,
@@ -325,6 +327,7 @@  static void decon_disable_plane(struct exynos_drm_crtc *crtc,
 		return;
 
 	decon_set_bits(ctx, DECON_WINCONx(win), WINCONx_ENWIN_F, 0);
+	set_bit(BIT_REQUEST_UPDATE, &ctx->flags);
 }
 
 static void decon_atomic_flush(struct exynos_drm_crtc *crtc)
@@ -339,8 +342,10 @@  static void decon_atomic_flush(struct exynos_drm_crtc *crtc)
 		decon_shadow_protect_win(ctx, i, false);
 
 	/* update iff there are active windows */
-	if (crtc->base.state->plane_mask)
+	if (test_bit(BIT_REQUEST_UPDATE, &ctx->flags)) {
 		decon_set_bits(ctx, DECON_UPDATE, STANDALONE_UPDATE_F, ~0);
+		clear_bit(BIT_REQUEST_UPDATE, &ctx->flags);
+	}
 
 	if (ctx->out_type & IFTYPE_I80)
 		set_bit(BIT_WIN_UPDATED, &ctx->flags);