Revert "drm/sun4i: Remove R40 display pipeline compatibles"
authorChen-Yu Tsai <wens@csie.org>
Fri, 21 Sep 2018 14:27:43 +0000 (22:27 +0800)
committerSean Paul <seanpaul@chromium.org>
Thu, 27 Sep 2018 08:18:07 +0000 (04:18 -0400)
commit3dcf0f306d9d6e6657022eee287ef0ff4e5d7140
tree572293e42a56d14aba598d0ca062cae43a64effb
parent7b76d0588477d4b6097a9048b42835a45caf5c48
Revert "drm/sun4i: Remove R40 display pipeline compatibles"

This reverts commit 3510e7a7f91088159bfc67e8abdc9f9e77d28870.

During the 4.19 merge window for drm-misc, two patches critical to
supporting the display pipeline on the Allwinner R40 SoC were missed.
They were applied later but missed the merge window deadline. As a
result 4.19-rc1 kernel would crash on the R40 when it couldn't parse
the new device tree structure. We ended up removing support for the
R40 display pipeline for 4.19.

Since the missing patches are already merged for 4.20, we can now
revert the commit that removed support.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20180921142743.8711-1-wens@csie.org
drivers/gpu/drm/sun4i/sun4i_drv.c
drivers/gpu/drm/sun4i/sun8i_mixer.c
drivers/gpu/drm/sun4i/sun8i_tcon_top.c