diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-06-24 10:11:27 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-06-24 10:11:27 +0200 |
| commit | 25bc694a8a086bfee6e5b9dd9e53f4de721b0acf (patch) | |
| tree | a843d17b336c9ea7d4cad67843ebbf255d61ea1f /drivers/gpu/drm/meson/meson_plane.c | |
| parent | 3e26c5feed2add218046ecf91bab3cfa9bf762a6 (diff) | |
| parent | 000dd5316e1c756a1c028f22e01d06a38249dd4d (diff) | |
| download | linux-25bc694a8a086bfee6e5b9dd9e53f4de721b0acf.tar.bz2 | |
Merge back PCI power management material for v5.3.
Diffstat (limited to 'drivers/gpu/drm/meson/meson_plane.c')
| -rw-r--r-- | drivers/gpu/drm/meson/meson_plane.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/gpu/drm/meson/meson_plane.c b/drivers/gpu/drm/meson/meson_plane.c index 22490047932e..d90427b93a51 100644 --- a/drivers/gpu/drm/meson/meson_plane.c +++ b/drivers/gpu/drm/meson/meson_plane.c @@ -305,6 +305,8 @@ static void meson_plane_atomic_update(struct drm_plane *plane, meson_plane->enabled = true; } + priv->viu.osd1_enabled = true; + spin_unlock_irqrestore(&priv->drm->event_lock, flags); } @@ -316,14 +318,14 @@ static void meson_plane_atomic_disable(struct drm_plane *plane, /* Disable OSD1 */ if (meson_vpu_is_compatible(priv, "amlogic,meson-g12a-vpu")) - writel_bits_relaxed(BIT(0) | BIT(21), 0, - priv->io_base + _REG(VIU_OSD1_CTRL_STAT)); + writel_bits_relaxed(3 << 8, 0, + priv->io_base + _REG(OSD1_BLEND_SRC_CTRL)); else writel_bits_relaxed(VPP_OSD1_POSTBLEND, 0, priv->io_base + _REG(VPP_MISC)); meson_plane->enabled = false; - + priv->viu.osd1_enabled = false; } static const struct drm_plane_helper_funcs meson_plane_helper_funcs = { |