Commit fdfabdc2 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'exynos-drm-fixes-for-v6.15-rc4' of... 

Merge tag 'exynos-drm-fixes-for-v6.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos

 into drm-fixes

Several fixups
- fix spelling error
- remove redundant error handling in exynos_drm_vidi.c module.
- marks struct decon_data as const in the exynos7_drm_decon driver since it is only read.

Cleanup
- Remove unnecessary checking in exynos_drm_drv.c module

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Inki Dae <inki.dae@samsung.com>
Link: https://lore.kernel.org/r/20250423143044.46165-1-inki.dae@samsung.com
parents a5f793e1 c171ad1e

drivers/gpu/drm/exynos/exynos7_drm_decon.c

+2 −2
Original line number Diff line number Diff line
@@ -43,13 +43,13 @@ struct decon_data { 
	unsigned int wincon_burstlen_shift;

};



static struct decon_data exynos7_decon_data = {

static const struct decon_data exynos7_decon_data = {

	.vidw_buf_start_base = 0x80,

	.shadowcon_win_protect_shift = 10,

	.wincon_burstlen_shift = 11,

};



static struct decon_data exynos7870_decon_data = {

static const struct decon_data exynos7870_decon_data = {

	.vidw_buf_start_base = 0x880,

	.shadowcon_win_protect_shift = 8,

	.wincon_burstlen_shift = 10,

drivers/gpu/drm/exynos/exynos_drm_drv.c

+1 −2
Original line number Diff line number Diff line
@@ -355,7 +355,6 @@ static void exynos_drm_platform_shutdown(struct platform_device *pdev) 
{

	struct drm_device *drm = platform_get_drvdata(pdev);



	if (drm)

	drm_atomic_helper_shutdown(drm);

}

drivers/gpu/drm/exynos/exynos_drm_fimc.c

+1 −1
Original line number Diff line number Diff line
@@ -908,7 +908,7 @@ static void fimc_dst_set_buf_seq(struct fimc_context *ctx, u32 buf_id, 
	u32 buf_num;

	u32 cfg;



	DRM_DEV_DEBUG_KMS(ctx->dev, "buf_id[%d]enqueu[%d]\n", buf_id, enqueue);

	DRM_DEV_DEBUG_KMS(ctx->dev, "buf_id[%d]enqueue[%d]\n", buf_id, enqueue);



	spin_lock_irqsave(&ctx->lock, flags);

drivers/gpu/drm/exynos/exynos_drm_vidi.c

+0 −3
Original line number Diff line number Diff line
@@ -312,9 +312,6 @@ static int vidi_get_modes(struct drm_connector *connector) 
	else

		drm_edid = drm_edid_alloc(fake_edid_info, sizeof(fake_edid_info));



	if (!drm_edid)

		return 0;



	drm_edid_connector_update(connector, drm_edid);



	count = drm_edid_connector_add_modes(connector);

drivers/gpu/drm/exynos/exynos_drm_fimd.c

+1 −1

File changed.

Contains only whitespace changes.