summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Szyprowski2018-06-07 13:07:49 +0200
committerInki Dae2018-06-29 11:02:59 +0200
commit7b7aa62c05eac9789c208b946f515983a9255d8d (patch)
tree3c8dba2a0abc53e9f44f1675f136b8bcefef49c9
parentdrm/exynos: decon5433: Fix per-plane global alpha for XRGB modes (diff)
downloadkernel-qcow2-linux-7b7aa62c05eac9789c208b946f515983a9255d8d.tar.gz
kernel-qcow2-linux-7b7aa62c05eac9789c208b946f515983a9255d8d.tar.xz
kernel-qcow2-linux-7b7aa62c05eac9789c208b946f515983a9255d8d.zip
drm/exynos: decon5433: Fix WINCONx reset value
The only bits that should be preserved in decon_win_set_fmt() is WINCONx_ENWIN_F. All other bits depends on the selected pixel formats and are set by the mentioned function. Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Inki Dae <inki.dae@samsung.com>
-rw-r--r--drivers/gpu/drm/exynos/exynos5433_drm_decon.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c
index 92d28b5b1077..e868773ea509 100644
--- a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c
+++ b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c
@@ -265,7 +265,7 @@ static void decon_win_set_pixfmt(struct decon_context *ctx, unsigned int win,
unsigned long val;
val = readl(ctx->addr + DECON_WINCONx(win));
- val &= ~WINCONx_BPPMODE_MASK;
+ val &= WINCONx_ENWIN_F;
switch (fb->format->format) {
case DRM_FORMAT_XRGB1555: