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

Commit 5b7b1b7f authored by Tobias Jakobi's avatar Tobias Jakobi Committed by Inki Dae
Browse files

drm/exynos: simplify set_pixfmt() in DECON and FIMD drivers 



DRM core already checks the validity of the pixelformat.

Signed-off-by: default avatarTobias Jakobi <tjakobi@math.uni-bielefeld.de>
Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
parent ac60944c

drivers/gpu/drm/exynos/exynos5433_drm_decon.c

+1 −3
Original line number Diff line number Diff line
@@ -279,13 +279,11 @@ static void decon_win_set_pixfmt(struct decon_context *ctx, unsigned int win, 
		val |= WINCONx_BURSTLEN_16WORD;

		break;

	case DRM_FORMAT_ARGB8888:

	default:

		val |= WINCONx_BPPMODE_32BPP_A8888;

		val |= WINCONx_WSWP_F | WINCONx_BLD_PIX_F | WINCONx_ALPHA_SEL_F;

		val |= WINCONx_BURSTLEN_16WORD;

		break;

	default:

		DRM_ERROR("Proper pixel format is not set\n");

		return;

	}



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

drivers/gpu/drm/exynos/exynos7_drm_decon.c

+1 −6
Original line number Diff line number Diff line
@@ -309,16 +309,11 @@ static void decon_win_set_pixfmt(struct decon_context *ctx, unsigned int win, 
		val |= WINCONx_BURSTLEN_16WORD;

		break;

	case DRM_FORMAT_BGRA8888:

	default:

		val |= WINCONx_BPPMODE_32BPP_BGRA | WINCONx_BLD_PIX |

			WINCONx_ALPHA_SEL;

		val |= WINCONx_BURSTLEN_16WORD;

		break;

	default:

		DRM_DEBUG_KMS("invalid pixel size so using unpacked 24bpp.\n");



		val |= WINCONx_BPPMODE_24BPP_xRGB;

		val |= WINCONx_BURSTLEN_16WORD;

		break;

	}



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

drivers/gpu/drm/exynos/exynos_drm_fimd.c

+1 −7
Original line number Diff line number Diff line
@@ -583,18 +583,12 @@ static void fimd_win_set_pixfmt(struct fimd_context *ctx, unsigned int win, 
		val |= WINCONx_BURSTLEN_16WORD;

		break;

	case DRM_FORMAT_ARGB8888:

	default:

		val |= WINCON1_BPPMODE_25BPP_A1888

			| WINCON1_BLD_PIX | WINCON1_ALPHA_SEL;

		val |= WINCONx_WSWP;

		val |= WINCONx_BURSTLEN_16WORD;

		break;

	default:

		DRM_DEBUG_KMS("invalid pixel size so using unpacked 24bpp.\n");



		val |= WINCON0_BPPMODE_24BPP_888;

		val |= WINCONx_WSWP;

		val |= WINCONx_BURSTLEN_16WORD;

		break;

	}



	/*