Skip to content

Commit fdfabdc

Browse files
committed
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: Dave Airlie <airlied@redhat.com> From: Inki Dae <inki.dae@samsung.com> Link: https://lore.kernel.org/r/20250423143044.46165-1-inki.dae@samsung.com
2 parents a5f793e + c171ad1 commit fdfabdc

File tree

5 files changed

+5
-9
lines changed

5 files changed

+5
-9
lines changed

drivers/gpu/drm/exynos/exynos7_drm_decon.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@ struct decon_data {
4343
unsigned int wincon_burstlen_shift;
4444
};
4545

46-
static struct decon_data exynos7_decon_data = {
46+
static const struct decon_data exynos7_decon_data = {
4747
.vidw_buf_start_base = 0x80,
4848
.shadowcon_win_protect_shift = 10,
4949
.wincon_burstlen_shift = 11,
5050
};
5151

52-
static struct decon_data exynos7870_decon_data = {
52+
static const struct decon_data exynos7870_decon_data = {
5353
.vidw_buf_start_base = 0x880,
5454
.shadowcon_win_protect_shift = 8,
5555
.wincon_burstlen_shift = 10,

drivers/gpu/drm/exynos/exynos_drm_drv.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -355,8 +355,7 @@ static void exynos_drm_platform_shutdown(struct platform_device *pdev)
355355
{
356356
struct drm_device *drm = platform_get_drvdata(pdev);
357357

358-
if (drm)
359-
drm_atomic_helper_shutdown(drm);
358+
drm_atomic_helper_shutdown(drm);
360359
}
361360

362361
static struct platform_driver exynos_drm_platform_driver = {

drivers/gpu/drm/exynos/exynos_drm_fimc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -908,7 +908,7 @@ static void fimc_dst_set_buf_seq(struct fimc_context *ctx, u32 buf_id,
908908
u32 buf_num;
909909
u32 cfg;
910910

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

913913
spin_lock_irqsave(&ctx->lock, flags);
914914

drivers/gpu/drm/exynos/exynos_drm_fimd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -731,7 +731,7 @@ static void fimd_win_set_pixfmt(struct fimd_context *ctx, unsigned int win,
731731
/*
732732
* Setting dma-burst to 16Word causes permanent tearing for very small
733733
* buffers, e.g. cursor buffer. Burst Mode switching which based on
734-
* plane size is not recommended as plane size varies alot towards the
734+
* plane size is not recommended as plane size varies a lot towards the
735735
* end of the screen and rapid movement causes unstable DMA, but it is
736736
* still better to change dma-burst than displaying garbage.
737737
*/

drivers/gpu/drm/exynos/exynos_drm_vidi.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -312,9 +312,6 @@ static int vidi_get_modes(struct drm_connector *connector)
312312
else
313313
drm_edid = drm_edid_alloc(fake_edid_info, sizeof(fake_edid_info));
314314

315-
if (!drm_edid)
316-
return 0;
317-
318315
drm_edid_connector_update(connector, drm_edid);
319316

320317
count = drm_edid_connector_add_modes(connector);

0 commit comments

Comments
 (0)