lkml.org 
[lkml]   [2019]   [Aug]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RESEND][PATCH v3 06/26] drm: kirin: Remove out_format from ade_crtc
    Date
    From: Xu YiPing <xuyiping@hisilicon.com>

    As part of refactoring the kirin driver to better support
    different hardware revisions, this patch removes the out_format
    field in the struct ade_crtc, which was only ever set to
    LDI_OUT_RGB_888.

    Thus this patch removes the field and instead directly uses
    LDI_OUT_RGB_888.

    Cc: Rongrong Zou <zourongrong@gmail.com>
    Cc: Xinliang Liu <z.liuxinliang@hisilicon.com>
    Cc: David Airlie <airlied@linux.ie>
    Cc: Daniel Vetter <daniel@ffwll.ch>
    Cc: dri-devel <dri-devel@lists.freedesktop.org>
    Cc: Sam Ravnborg <sam@ravnborg.org>
    Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
    Signed-off-by: Xu YiPing <xuyiping@hisilicon.com>
    [jstultz: reworded commit message]
    Signed-off-by: John Stultz <john.stultz@linaro.org>
    ---
    drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 9 +++------
    1 file changed, 3 insertions(+), 6 deletions(-)

    diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
    index 756aefd5bcff..73dff21bed6a 100644
    --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
    +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
    @@ -60,7 +60,6 @@ struct ade_crtc {
    struct ade_hw_ctx *ctx;
    struct work_struct display_reset_wq;
    bool enable;
    - u32 out_format;
    };

    struct ade_plane {
    @@ -383,11 +382,10 @@ static irqreturn_t ade_irq_handler(int irq, void *data)
    return IRQ_HANDLED;
    }

    -static void ade_display_enable(struct ade_crtc *acrtc)
    +static void ade_display_enable(struct ade_hw_ctx *ctx)
    {
    - struct ade_hw_ctx *ctx = acrtc->ctx;
    void __iomem *base = ctx->base;
    - u32 out_fmt = acrtc->out_format;
    + u32 out_fmt = LDI_OUT_RGB_888;

    /* enable output overlay compositor */
    writel(ADE_ENABLE, base + ADE_OVLYX_CTL(OUT_OVLY));
    @@ -514,7 +512,7 @@ static void ade_crtc_atomic_enable(struct drm_crtc *crtc,
    }

    ade_set_medianoc_qos(ctx);
    - ade_display_enable(acrtc);
    + ade_display_enable(ctx);
    ade_dump_regs(ctx->base);
    drm_crtc_vblank_on(crtc);
    acrtc->enable = true;
    @@ -1024,7 +1022,6 @@ static int ade_drm_init(struct platform_device *pdev)
    ctx = &ade->ctx;
    acrtc = &ade->acrtc;
    acrtc->ctx = ctx;
    - acrtc->out_format = LDI_OUT_RGB_888;

    ret = ade_dts_parse(pdev, ctx);
    if (ret)
    --
    2.17.1
    \
     
     \ /
      Last update: 2019-08-14 20:49    [W:6.054 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site