diff options
author | Wolfram Sang <wsa@kernel.org> | 2023-04-24 13:50:20 +0300 |
---|---|---|
committer | Wolfram Sang <wsa@kernel.org> | 2023-04-24 13:50:20 +0300 |
commit | 38c87827ffd3c7e1dd61eee9a7dea13d487dc2ed (patch) | |
tree | e6bd1c3ae56823874a736c1512409c123c9a4219 /drivers/gpu/drm/meson/meson_vpp.c | |
parent | 9496fffcb28f39e0352779a0199b6e61861c9221 (diff) | |
parent | d663d93bb47e7ab45602b227701022d8aa16040a (diff) | |
download | linux-38c87827ffd3c7e1dd61eee9a7dea13d487dc2ed.tar.xz |
Merge branch 'i2c/for-current' into i2c/for-mergewindow
This should have been in 6.3, but sadly I missed it.
Diffstat (limited to 'drivers/gpu/drm/meson/meson_vpp.c')
-rw-r--r-- | drivers/gpu/drm/meson/meson_vpp.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/meson/meson_vpp.c b/drivers/gpu/drm/meson/meson_vpp.c index 154837688ab0..5df1957c8e41 100644 --- a/drivers/gpu/drm/meson/meson_vpp.c +++ b/drivers/gpu/drm/meson/meson_vpp.c @@ -100,6 +100,8 @@ void meson_vpp_init(struct meson_drm *priv) priv->io_base + _REG(VPP_DOLBY_CTRL)); writel_relaxed(0x1020080, priv->io_base + _REG(VPP_DUMMY_DATA1)); + writel_relaxed(0x42020, + priv->io_base + _REG(VPP_DUMMY_DATA)); } else if (meson_vpu_is_compatible(priv, VPU_COMPATIBLE_G12A)) writel_relaxed(0xf, priv->io_base + _REG(DOLBY_PATH_CTRL)); |