It was discovered in the past by Ondrej Jirman that mixer register read may occasionally return wrong value, most likely zero. It turns out that all mixer units are affected by this issue. This becomes especially obvious with applications like video player. After a few minutes of a playback visual glitches appeared but not always in the same way. After register inspection it was clear that some bits are not set even when they should be.

Best solution would be to shuffle the code a bit to avoid read-modify-write operations and use only register writes. However, quicker solution is to enable caching support in regmap which is also used here. Such fix is also easier to backport in stable kernels.

Fixes: 9d75b8c0b999 ("drm/sun4i: add support for Allwinner DE2 mixers") Signed-off-by: Jernej Skrabec jernej.skrabec@siol.net --- drivers/gpu/drm/sun4i/sun8i_mixer.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)

diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.c b/drivers/gpu/drm/sun4i/sun8i_mixer.c index cc4fb916318f..f8f17c51c96d 100644 --- a/drivers/gpu/drm/sun4i/sun8i_mixer.c +++ b/drivers/gpu/drm/sun4i/sun8i_mixer.c @@ -303,11 +303,23 @@ static const struct sunxi_engine_ops sun8i_engine_ops = { .layers_init = sun8i_layers_init, };

+static bool sun8i_mixer_volatile_reg(struct device *dev, unsigned int reg) +{ + switch (reg) { + case SUN8I_MIXER_GLOBAL_STATUS: + case SUN8I_MIXER_GLOBAL_DBUFF: + return true; + } + return false; +} + static struct regmap_config sun8i_mixer_regmap_config = { + .cache_type = REGCACHE_FLAT, .reg_bits = 32, .val_bits = 32, .reg_stride = 4, .max_register = 0xbfffc, /* guessed */ + .volatile_reg = sun8i_mixer_volatile_reg, };

static int sun8i_mixer_of_get_id(struct device_node *node)