Commit cc0c43a0 authored by Neil Armstrong's avatar Neil Armstrong

drm/meson: Use crtc_state for hdisplay and fix atomic flush/enable sync for vsync commit

Clean the crtc_enable by using the proper crtc_state instead of the state
of the primary plane state data.

Also fix the dependency to commit the plane changes even if enable is called
after the flush.
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
parent 386d3299
...@@ -82,11 +82,18 @@ static const struct drm_crtc_funcs meson_crtc_funcs = { ...@@ -82,11 +82,18 @@ static const struct drm_crtc_funcs meson_crtc_funcs = {
static void meson_crtc_enable(struct drm_crtc *crtc) static void meson_crtc_enable(struct drm_crtc *crtc)
{ {
struct meson_crtc *meson_crtc = to_meson_crtc(crtc); struct meson_crtc *meson_crtc = to_meson_crtc(crtc);
struct drm_plane *plane = meson_crtc->priv->primary_plane; struct drm_crtc_state *crtc_state = crtc->state;
struct meson_drm *priv = meson_crtc->priv; struct meson_drm *priv = meson_crtc->priv;
DRM_DEBUG_DRIVER("\n");
if (!crtc_state) {
DRM_ERROR("Invalid crtc_state\n");
return;
}
/* Enable VPP Postblend */ /* Enable VPP Postblend */
writel(plane->state->crtc_w, writel(crtc_state->mode.hdisplay,
priv->io_base + _REG(VPP_POSTBLEND_H_SIZE)); priv->io_base + _REG(VPP_POSTBLEND_H_SIZE));
writel_bits_relaxed(VPP_POSTBLEND_ENABLE, VPP_POSTBLEND_ENABLE, writel_bits_relaxed(VPP_POSTBLEND_ENABLE, VPP_POSTBLEND_ENABLE,
...@@ -101,6 +108,7 @@ static void meson_crtc_disable(struct drm_crtc *crtc) ...@@ -101,6 +108,7 @@ static void meson_crtc_disable(struct drm_crtc *crtc)
struct meson_drm *priv = meson_crtc->priv; struct meson_drm *priv = meson_crtc->priv;
priv->viu.osd1_enabled = false; priv->viu.osd1_enabled = false;
priv->viu.osd1_commit = false;
/* Disable VPP Postblend */ /* Disable VPP Postblend */
writel_bits_relaxed(VPP_POSTBLEND_ENABLE, 0, writel_bits_relaxed(VPP_POSTBLEND_ENABLE, 0,
...@@ -137,7 +145,6 @@ static void meson_crtc_atomic_flush(struct drm_crtc *crtc, ...@@ -137,7 +145,6 @@ static void meson_crtc_atomic_flush(struct drm_crtc *crtc,
struct meson_crtc *meson_crtc = to_meson_crtc(crtc); struct meson_crtc *meson_crtc = to_meson_crtc(crtc);
struct meson_drm *priv = meson_crtc->priv; struct meson_drm *priv = meson_crtc->priv;
if (priv->viu.osd1_enabled)
priv->viu.osd1_commit = true; priv->viu.osd1_commit = true;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment