| From foo@baz Fri Mar 16 15:43:17 CET 2018 |
| From: Jernej Skrabec <jernej.skrabec@siol.net> |
| Date: Fri, 1 Dec 2017 07:05:24 +0100 |
| Subject: drm/sun4i: Fix format mask in DE2 driver |
| |
| From: Jernej Skrabec <jernej.skrabec@siol.net> |
| |
| |
| [ Upstream commit a2407f4bd1f3001d6b46f6d32eb1cc98a60f5a43 ] |
| |
| Format mask is one bit too short. Fix it. |
| |
| Fixes: 9d75b8c0b999 (drm/sun4i: add support for Allwinner DE2 mixers) |
| |
| Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net> |
| Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> |
| Link: https://patchwork.freedesktop.org/patch/msgid/20171201060550.10392-2-jernej.skrabec@siol.net |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/gpu/drm/sun4i/sun8i_mixer.h | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/gpu/drm/sun4i/sun8i_mixer.h |
| +++ b/drivers/gpu/drm/sun4i/sun8i_mixer.h |
| @@ -80,7 +80,7 @@ |
| |
| #define SUN8I_MIXER_CHAN_UI_LAYER_ATTR_EN BIT(0) |
| #define SUN8I_MIXER_CHAN_UI_LAYER_ATTR_ALPHA_MODE_MASK GENMASK(2, 1) |
| -#define SUN8I_MIXER_CHAN_UI_LAYER_ATTR_FBFMT_MASK GENMASK(11, 8) |
| +#define SUN8I_MIXER_CHAN_UI_LAYER_ATTR_FBFMT_MASK GENMASK(12, 8) |
| #define SUN8I_MIXER_CHAN_UI_LAYER_ATTR_ALPHA_MASK GENMASK(31, 24) |
| #define SUN8I_MIXER_CHAN_UI_LAYER_ATTR_ALPHA_MODE_DEF (1 << 1) |
| #define SUN8I_MIXER_CHAN_UI_LAYER_ATTR_FBFMT_ARGB8888 (0 << 8) |