lkml.org 
[lkml]   [2020]   [Jun]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 7/9] drm/vc4: crtc: Move the txp_armed function to the TXP
    Date
    The TXP driver is the only place where we need to set the txp_armed flag,
    so let's move the function in the TXP driver.

    Reviewed-by: Eric Anholt <eric@anholt.net>
    Signed-off-by: Maxime Ripard <maxime@cerno.tech>
    ---
    drivers/gpu/drm/vc4/vc4_crtc.c | 7 -------
    drivers/gpu/drm/vc4/vc4_drv.h | 1 -
    drivers/gpu/drm/vc4/vc4_txp.c | 9 ++++++++-
    3 files changed, 8 insertions(+), 9 deletions(-)

    diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c
    index e30a5036d2e6..82ebdf8da108 100644
    --- a/drivers/gpu/drm/vc4/vc4_crtc.c
    +++ b/drivers/gpu/drm/vc4/vc4_crtc.c
    @@ -390,13 +390,6 @@ static void vc4_crtc_atomic_disable(struct drm_crtc *crtc,
    }
    }

    -void vc4_crtc_txp_armed(struct drm_crtc_state *state)
    -{
    - struct vc4_crtc_state *vc4_state = to_vc4_crtc_state(state);
    -
    - vc4_state->txp_armed = true;
    -}
    -
    static void vc4_crtc_atomic_enable(struct drm_crtc *crtc,
    struct drm_crtc_state *old_state)
    {
    diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h
    index 1c49c27a564f..fa19160c801f 100644
    --- a/drivers/gpu/drm/vc4/vc4_drv.h
    +++ b/drivers/gpu/drm/vc4/vc4_drv.h
    @@ -808,7 +808,6 @@ void vc4_crtc_destroy_state(struct drm_crtc *crtc,
    struct drm_crtc_state *state);
    void vc4_crtc_reset(struct drm_crtc *crtc);
    void vc4_crtc_handle_vblank(struct vc4_crtc *crtc);
    -void vc4_crtc_txp_armed(struct drm_crtc_state *state);
    void vc4_crtc_get_margins(struct drm_crtc_state *state,
    unsigned int *right, unsigned int *left,
    unsigned int *top, unsigned int *bottom);
    diff --git a/drivers/gpu/drm/vc4/vc4_txp.c b/drivers/gpu/drm/vc4/vc4_txp.c
    index bf720206727f..d9a8ab87ad25 100644
    --- a/drivers/gpu/drm/vc4/vc4_txp.c
    +++ b/drivers/gpu/drm/vc4/vc4_txp.c
    @@ -222,6 +222,13 @@ static const u32 txp_fmts[] = {
    TXP_FORMAT_BGRA8888,
    };

    +static void vc4_txp_armed(struct drm_crtc_state *state)
    +{
    + struct vc4_crtc_state *vc4_state = to_vc4_crtc_state(state);
    +
    + vc4_state->txp_armed = true;
    +}
    +
    static int vc4_txp_connector_atomic_check(struct drm_connector *conn,
    struct drm_atomic_state *state)
    {
    @@ -256,7 +263,7 @@ static int vc4_txp_connector_atomic_check(struct drm_connector *conn,
    if (fb->pitches[0] & GENMASK(3, 0))
    return -EINVAL;

    - vc4_crtc_txp_armed(crtc_state);
    + vc4_txp_armed(crtc_state);

    return 0;
    }
    --
    git-series 0.9.1
    \
     
     \ /
      Last update: 2020-06-11 15:39    [W:5.754 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site