67 lines
2.7 KiB
Diff
67 lines
2.7 KiB
Diff
From 3503db39bf4a2123dfc35bb390a6ed2e612ca7ae Mon Sep 17 00:00:00 2001
|
|
From: Ondrej Jirman <megous@megous.com>
|
|
Date: Tue, 28 Jan 2020 00:26:17 +0100
|
|
Subject: [PATCH 314/478] drm: sun4i-drm: Recover from occasional HW failures
|
|
|
|
Layer can be disabled automatically by HW (HW clears the bit in
|
|
some unknown situations). We need to always update this bit,
|
|
so that DE2 will not fail.
|
|
|
|
Signed-off-by: Ondrej Jirman <megous@megous.com>
|
|
---
|
|
drivers/gpu/drm/sun4i/sun8i_ui_layer.c | 13 ++++++-------
|
|
drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 13 ++++++-------
|
|
2 files changed, 12 insertions(+), 14 deletions(-)
|
|
|
|
diff --git a/drivers/gpu/drm/sun4i/sun8i_ui_layer.c b/drivers/gpu/drm/sun4i/sun8i_ui_layer.c
|
|
index ed0d6b2910e5..ccbf36800037 100644
|
|
--- a/drivers/gpu/drm/sun4i/sun8i_ui_layer.c
|
|
+++ b/drivers/gpu/drm/sun4i/sun8i_ui_layer.c
|
|
@@ -36,13 +36,12 @@ static void sun8i_ui_layer_enable(struct sun8i_mixer *mixer, int channel,
|
|
DRM_DEBUG_DRIVER("%sabling channel %d overlay %d\n",
|
|
enable ? "En" : "Dis", channel, overlay);
|
|
|
|
- if (!was_enabled != !enable) {
|
|
- val = enable ? SUN8I_MIXER_CHAN_UI_LAYER_ATTR_EN : 0;
|
|
-
|
|
- regmap_update_bits(mixer->engine.regs,
|
|
- SUN8I_MIXER_CHAN_UI_LAYER_ATTR(ch_base, overlay),
|
|
- SUN8I_MIXER_CHAN_UI_LAYER_ATTR_EN, val);
|
|
- }
|
|
+ /* We always update the layer enable bit, because it can clear
|
|
+ * spontaneously for unknown reasons. */
|
|
+ val = enable ? SUN8I_MIXER_CHAN_UI_LAYER_ATTR_EN : 0;
|
|
+ regmap_update_bits(mixer->engine.regs,
|
|
+ SUN8I_MIXER_CHAN_UI_LAYER_ATTR(ch_base, overlay),
|
|
+ SUN8I_MIXER_CHAN_UI_LAYER_ATTR_EN, val);
|
|
|
|
/*
|
|
* If this layer was enabled and is being disabled or if it is
|
|
diff --git a/drivers/gpu/drm/sun4i/sun8i_vi_layer.c b/drivers/gpu/drm/sun4i/sun8i_vi_layer.c
|
|
index 3929b0e38a10..7d20fe583695 100644
|
|
--- a/drivers/gpu/drm/sun4i/sun8i_vi_layer.c
|
|
+++ b/drivers/gpu/drm/sun4i/sun8i_vi_layer.c
|
|
@@ -30,13 +30,12 @@ static void sun8i_vi_layer_enable(struct sun8i_mixer *mixer, int channel,
|
|
DRM_DEBUG_DRIVER("%sabling VI channel %d overlay %d\n",
|
|
enable ? "En" : "Dis", channel, overlay);
|
|
|
|
- if (!was_enabled != !enable) {
|
|
- val = enable ? SUN8I_MIXER_CHAN_VI_LAYER_ATTR_EN : 0;
|
|
-
|
|
- regmap_update_bits(mixer->engine.regs,
|
|
- SUN8I_MIXER_CHAN_VI_LAYER_ATTR(ch_base, overlay),
|
|
- SUN8I_MIXER_CHAN_VI_LAYER_ATTR_EN, val);
|
|
- }
|
|
+ /* We always update the layer enable bit, because it can clear
|
|
+ * spontaneously for unknown reasons. */
|
|
+ val = enable ? SUN8I_MIXER_CHAN_VI_LAYER_ATTR_EN : 0;
|
|
+ regmap_update_bits(mixer->engine.regs,
|
|
+ SUN8I_MIXER_CHAN_VI_LAYER_ATTR(ch_base, overlay),
|
|
+ SUN8I_MIXER_CHAN_VI_LAYER_ATTR_EN, val);
|
|
|
|
/*
|
|
* If this layer was enabled and is being disabled or if it is
|
|
--
|
|
2.35.3
|
|
|