korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-19 10:14:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
This commit is contained in:
Neil Armstrong 2017-04-04 14:15:21 +02:00
parent 386d3299ef
commit cc0c43a045
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/gpu/drm/meson/meson_crtc.c
View File

@ -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)
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,8 +145,7 @@ 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;
} }
static const struct drm_crtc_helper_funcs meson_crtc_helper_funcs = { static const struct drm_crtc_helper_funcs meson_crtc_helper_funcs = {