summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/meson/meson_drv.h
diff options
context:
space:
mode:
authorNeil Armstrong <narmstrong@baylibre.com>2019-03-25 17:18:20 +0300
committerNeil Armstrong <narmstrong@baylibre.com>2019-04-09 12:25:58 +0300
commit68679d41a3d6d7e55ed49b4e5688d1089de7c5a7 (patch)
treec5eed9e5f37207f8745ed42d61e8a97cae994f58 /drivers/gpu/drm/meson/meson_drv.h
parent11c2d4c751e5b339f8a3c6b9f19120bb331af0ef (diff)
downloadlinux-68679d41a3d6d7e55ed49b4e5688d1089de7c5a7.tar.xz
drm/meson: Add G12A support for plane handling in CRTC driver
This patch adds support for the new OSD+VD Plane blending module in the CRTC code by adding the G12A code to manage the blending module and setting the right OSD1 & VD1 plane registers. Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> Tested-by: Jerome Brunet <jbrunet@baylibre.com> Reviewed-by: Jerome Brunet <jbrunet@baylibre.com> Link: https://patchwork.freedesktop.org/patch/msgid/20190325141824.21259-8-narmstrong@baylibre.com
Diffstat (limited to 'drivers/gpu/drm/meson/meson_drv.h')
-rw-r--r--drivers/gpu/drm/meson/meson_drv.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/meson/meson_drv.h b/drivers/gpu/drm/meson/meson_drv.h
index 214a7cb18ce2..9614baa836b9 100644
--- a/drivers/gpu/drm/meson/meson_drv.h
+++ b/drivers/gpu/drm/meson/meson_drv.h
@@ -62,6 +62,10 @@ struct meson_drm {
uint32_t osd_sc_h_phase_step;
uint32_t osd_sc_h_ctrl0;
uint32_t osd_sc_v_ctrl0;
+ uint32_t osd_blend_din0_scope_h;
+ uint32_t osd_blend_din0_scope_v;
+ uint32_t osb_blend0_size;
+ uint32_t osb_blend1_size;
bool vd1_enabled;
bool vd1_commit;