diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-06-17 13:06:34 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-06-17 13:06:34 +0300 |
| commit | 410df0c5748f6c5a53847d2acb163dc7cd8b6c51 (patch) | |
| tree | 0c0f547f90a73ec6d30851f93720e0eb24f353eb /drivers/gpu/drm/meson/meson_viu.c | |
| parent | fff9b6c7d26943a8eb32b58364b7ec6b9369746a (diff) | |
| parent | 9e0babf2c06c73cda2c0cd37a1653d823adb40ec (diff) | |
| download | linux-410df0c5748f6c5a53847d2acb163dc7cd8b6c51.tar.xz | |
Merge tag 'v5.2-rc5' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/meson/meson_viu.c')
| -rw-r--r-- | drivers/gpu/drm/meson/meson_viu.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/meson/meson_viu.c b/drivers/gpu/drm/meson/meson_viu.c index 462c7cb3e1bd..4b2b3024d371 100644 --- a/drivers/gpu/drm/meson/meson_viu.c +++ b/drivers/gpu/drm/meson/meson_viu.c @@ -405,8 +405,7 @@ void meson_viu_init(struct meson_drm *priv) 0 << 16 | 1, priv->io_base + _REG(VIU_OSD_BLEND_CTRL)); - writel_relaxed(3 << 8 | - 1 << 20, + writel_relaxed(1 << 20, priv->io_base + _REG(OSD1_BLEND_SRC_CTRL)); writel_relaxed(1 << 20, priv->io_base + _REG(OSD2_BLEND_SRC_CTRL)); |