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

Commit 2e76f856 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'exynos-drm-fixes' of... 

Merge branch 'exynos-drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-fixes

Just regression fixups to resolve page fault issue of DECON device.

* 'exynos-drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos:
  drm/exynos/decon5433: set STANDALONE_UPDATE_F on output enablement
  drm/exynos/decon5433: fix CMU programming
  drm/exynos/decon5433: do not disable video after reset
  drm/exynos/decon5433: set STANDALONE_UPDATE_F also if planes are disabled
  drm/exynos/decon5433: update shadow registers iff there are active windows
parents 484205df 11d8bcef

drivers/gpu/drm/exynos/exynos5433_drm_decon.c

+6 −9
Original line number Diff line number Diff line
@@ -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 {
@@ -141,12 +142,6 @@ static void decon_commit(struct exynos_drm_crtc *crtc) 
		m->crtc_vsync_end = m->crtc_vsync_start + 1;

	}



	decon_set_bits(ctx, DECON_VIDCON0, VIDCON0_ENVID, 0);



	/* enable clock gate */

	val = CMU_CLKGAGE_MODE_SFR_F | CMU_CLKGAGE_MODE_MEM_F;

	writel(val, ctx->addr + DECON_CMU);



	if (ctx->out_type & (IFTYPE_I80 | I80_HW_TRG))

		decon_setup_trigger(ctx);
@@ -315,6 +310,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,
@@ -327,6 +323,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)
@@ -340,7 +337,7 @@ 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 */

	if (test_and_clear_bit(BIT_REQUEST_UPDATE, &ctx->flags))

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



	if (ctx->out_type & IFTYPE_I80)