Skip to content

Commit 5b7b1b7

Browse files
tobiasjakobidaeinki
authored andcommitted
drm/exynos: simplify set_pixfmt() in DECON and FIMD drivers
DRM core already checks the validity of the pixelformat. Signed-off-by: Tobias Jakobi <[email protected]> Signed-off-by: Inki Dae <[email protected]>
1 parent ac60944 commit 5b7b1b7

File tree

3 files changed

+3
-16
lines changed

3 files changed

+3
-16
lines changed

drivers/gpu/drm/exynos/exynos5433_drm_decon.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -279,13 +279,11 @@ static void decon_win_set_pixfmt(struct decon_context *ctx, unsigned int win,
279279
val |= WINCONx_BURSTLEN_16WORD;
280280
break;
281281
case DRM_FORMAT_ARGB8888:
282+
default:
282283
val |= WINCONx_BPPMODE_32BPP_A8888;
283284
val |= WINCONx_WSWP_F | WINCONx_BLD_PIX_F | WINCONx_ALPHA_SEL_F;
284285
val |= WINCONx_BURSTLEN_16WORD;
285286
break;
286-
default:
287-
DRM_ERROR("Proper pixel format is not set\n");
288-
return;
289287
}
290288

291289
DRM_DEBUG_KMS("cpp = %u\n", fb->format->cpp[0]);

drivers/gpu/drm/exynos/exynos7_drm_decon.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -309,16 +309,11 @@ static void decon_win_set_pixfmt(struct decon_context *ctx, unsigned int win,
309309
val |= WINCONx_BURSTLEN_16WORD;
310310
break;
311311
case DRM_FORMAT_BGRA8888:
312+
default:
312313
val |= WINCONx_BPPMODE_32BPP_BGRA | WINCONx_BLD_PIX |
313314
WINCONx_ALPHA_SEL;
314315
val |= WINCONx_BURSTLEN_16WORD;
315316
break;
316-
default:
317-
DRM_DEBUG_KMS("invalid pixel size so using unpacked 24bpp.\n");
318-
319-
val |= WINCONx_BPPMODE_24BPP_xRGB;
320-
val |= WINCONx_BURSTLEN_16WORD;
321-
break;
322317
}
323318

324319
DRM_DEBUG_KMS("cpp = %d\n", fb->format->cpp[0]);

drivers/gpu/drm/exynos/exynos_drm_fimd.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -583,18 +583,12 @@ static void fimd_win_set_pixfmt(struct fimd_context *ctx, unsigned int win,
583583
val |= WINCONx_BURSTLEN_16WORD;
584584
break;
585585
case DRM_FORMAT_ARGB8888:
586+
default:
586587
val |= WINCON1_BPPMODE_25BPP_A1888
587588
| WINCON1_BLD_PIX | WINCON1_ALPHA_SEL;
588589
val |= WINCONx_WSWP;
589590
val |= WINCONx_BURSTLEN_16WORD;
590591
break;
591-
default:
592-
DRM_DEBUG_KMS("invalid pixel size so using unpacked 24bpp.\n");
593-
594-
val |= WINCON0_BPPMODE_24BPP_888;
595-
val |= WINCONx_WSWP;
596-
val |= WINCONx_BURSTLEN_16WORD;
597-
break;
598592
}
599593

600594
/*

0 commit comments

Comments
 (0)