| From foo@baz Wed Aug 22 09:42:09 CEST 2018 |
| From: Marek Szyprowski <m.szyprowski@samsung.com> |
| Date: Thu, 7 Jun 2018 13:07:49 +0200 |
| Subject: drm/exynos: decon5433: Fix WINCONx reset value |
| |
| From: Marek Szyprowski <m.szyprowski@samsung.com> |
| |
| [ Upstream commit 7b7aa62c05eac9789c208b946f515983a9255d8d ] |
| |
| 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> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c |
| +++ b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c |
| @@ -199,7 +199,7 @@ static void decon_win_set_pixfmt(struct |
| unsigned long val; |
| |
| val = readl(ctx->addr + DECON_WINCONx(win)); |
| - val &= ~WINCONx_BPPMODE_MASK; |
| + val &= WINCONx_ENWIN_F; |
| |
| switch (fb->pixel_format) { |
| case DRM_FORMAT_XRGB1555: |
