]> git.baikalelectronics.ru Git - kernel.git/commit
drm/meson: fix G12A primary plane disabling
authorNeil Armstrong <narmstrong@baylibre.com>
Wed, 5 Jun 2019 14:12:53 +0000 (16:12 +0200)
committerNeil Armstrong <narmstrong@baylibre.com>
Fri, 7 Jun 2019 08:05:05 +0000 (10:05 +0200)
commitf914c1af34a9658dd862dfdb7509c415869e7b60
tree4c7d0ad2f0d0df674ed31a17345991d17c3963c9
parent97f0d5c526a920a7e6de02d9b0a3d2e7464d59fd
drm/meson: fix G12A primary plane disabling

The G12A Primary plane was disabled by writing in the OSD1 configuration
registers, but this caused the plane blender to stall instead of continuing
to blend only the overlay plane.

Fix this by disabling the OSD1 plane in the blender registers, and also
enabling it back using the same register.

Fixes: c9561ed8ca40 ("drm/meson: Add G12A support for OSD1 Plane")
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Reviewed-by: Kevin Hilman <khilman@baylibre.com>
[narmstrong: fixed nit in commit log]
Link: https://patchwork.freedesktop.org/patch/msgid/20190605141253.24165-3-narmstrong@baylibre.com
drivers/gpu/drm/meson/meson_crtc.c
drivers/gpu/drm/meson/meson_plane.c
drivers/gpu/drm/meson/meson_viu.c