[PATCH stable] drm: bridge: dw-hdmi: Fix overflow workaround for Amlogic Meson GX SoCs

[PATCH stable] drm: bridge: dw-hdmi: Fix overflow workaround for Amlogic Meson GX SoCs

[Neil Armstrong]

commit 9c305eb442f3b371fc722ade827bbf673514123e upstream

The Amlogic Meson GX SoCs, embedded the v2.01a controller, has been also
identified needing this workaround.
This patch adds the corresponding version to enable a single iteration for
this specific version.

Fixes: be41fc55f1aa ("drm: bridge: dw-hdmi: Handle overflow workaround based on device version")
Acked-by: Archit Taneja <architt@codeaurora.org>
[narmstrong: s/identifies/identified and rebased against Jernej's change]
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1519386277-25902-1-git-send-email-narmstrong at baylibre.com
[narmstrong: v4.14 to v4.16 backport]
Cc: <stable@vger.kernel.org> # 4.14.x
---
 drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
index bf14214..4db31b8 100644
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
@@ -1634,6 +1634,8 @@ static void dw_hdmi_clear_overflow(struct dw_hdmi *hdmi)
 	 * (and possibly on the platform). So far only i.MX6Q (v1.30a) and
 	 * i.MX6DL (v1.31a) have been identified as needing the workaround, with
 	 * 4 and 1 iterations respectively.
+	 * The Amlogic Meson GX SoCs (v2.01a) have been identified as needing
+	 * the workaround with a single iteration.
 	 */
 
 	switch (hdmi->version) {
@@ -1641,6 +1643,7 @@ static void dw_hdmi_clear_overflow(struct dw_hdmi *hdmi)
 		count = 4;
 		break;
 	case 0x131a:
+	case 0x201a:
 		count = 1;
 		break;
 	default:
-- 
2.7.4

[PATCH stable] drm: bridge: dw-hdmi: Fix overflow workaround for Amlogic Meson GX SoCs

[Greg KH]

On Thu, Apr 19, 2018 at 10:54:08AM +0200, Neil Armstrong wrote:
> commit 9c305eb442f3b371fc722ade827bbf673514123e upstream
> 
> The Amlogic Meson GX SoCs, embedded the v2.01a controller, has been also
> identified needing this workaround.
> This patch adds the corresponding version to enable a single iteration for
> this specific version.
> 
> Fixes: be41fc55f1aa ("drm: bridge: dw-hdmi: Handle overflow workaround based on device version")
> Acked-by: Archit Taneja <architt@codeaurora.org>
> [narmstrong: s/identifies/identified and rebased against Jernej's change]
> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
> Link: https://patchwork.freedesktop.org/patch/msgid/1519386277-25902-1-git-send-email-narmstrong at baylibre.com
> [narmstrong: v4.14 to v4.16 backport]
> Cc: <stable@vger.kernel.org> # 4.14.x

Now applied, thanks.

greg k-h