Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92ead494 authored by Andrzej Hajda's avatar Andrzej Hajda Committed by Inki Dae
Browse files

drm/exynos/decon5433: fix DECON standalone update 



DECON should be updated after un-protecting windows and after changing
output parameters, otherwise image is not displayed in case of HDMI path.

Signed-off-by: default avatarAndrzej Hajda <a.hajda@samsung.com>
Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
parent 11f3022e

drivers/gpu/drm/exynos/exynos5433_drm_decon.c

+8 −7
Original line number Diff line number Diff line
@@ -187,6 +187,8 @@ static void decon_commit(struct exynos_drm_crtc *crtc) 


	/* enable output and display signal */

	decon_set_bits(ctx, DECON_VIDCON0, VIDCON0_ENVID | VIDCON0_ENVID_F, ~0);



	decon_set_bits(ctx, DECON_UPDATE, STANDALONE_UPDATE_F, ~0);

}



static void decon_win_set_pixfmt(struct decon_context *ctx, unsigned int win,
@@ -312,9 +314,6 @@ static void decon_update_plane(struct exynos_drm_crtc *crtc, 


	/* window enable */

	decon_set_bits(ctx, DECON_WINCONx(win), WINCONx_ENWIN_F, ~0);



	/* standalone update */

	decon_set_bits(ctx, DECON_UPDATE, STANDALONE_UPDATE_F, ~0);

}



static void decon_disable_plane(struct exynos_drm_crtc *crtc,
@@ -332,9 +331,6 @@ static void decon_disable_plane(struct exynos_drm_crtc *crtc, 
	decon_set_bits(ctx, DECON_WINCONx(win), WINCONx_ENWIN_F, 0);



	decon_shadow_protect_win(ctx, win, false);



	/* standalone update */

	decon_set_bits(ctx, DECON_UPDATE, STANDALONE_UPDATE_F, ~0);

}



static void decon_atomic_flush(struct exynos_drm_crtc *crtc)
@@ -348,6 +344,9 @@ static void decon_atomic_flush(struct exynos_drm_crtc *crtc) 
	for (i = ctx->first_win; i < WINDOWS_NR; i++)

		decon_shadow_protect_win(ctx, i, false);



	/* standalone update */

	decon_set_bits(ctx, DECON_UPDATE, STANDALONE_UPDATE_F, ~0);



	if (ctx->out_type == IFTYPE_I80)

		set_bit(BIT_WIN_UPDATED, &ctx->flags);

}
@@ -459,8 +458,10 @@ static void decon_clear_channels(struct exynos_drm_crtc *crtc) 
		decon_shadow_protect_win(ctx, win, true);

		decon_set_bits(ctx, DECON_WINCONx(win), WINCONx_ENWIN_F, 0);

		decon_shadow_protect_win(ctx, win, false);

		decon_set_bits(ctx, DECON_UPDATE, STANDALONE_UPDATE_F, ~0);

	}



	decon_set_bits(ctx, DECON_UPDATE, STANDALONE_UPDATE_F, ~0);



	/* TODO: wait for possible vsync */

	msleep(50);