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 24/26] drm: kirin: Add alloc_hw_ctx/clean_hw_ctx ops in driver data
    Date
    From: Xu YiPing <xuyiping@hisilicon.com>

    As part of refactoring the kirin driver to better support
    different hardware revisions, this patch changes the
    alloc/clean_hw_ctx functions to be called via driver_data
    specific funciton pointers.

    This will allow the ade_drm_init to later be made generic and
    moved to kirin_drm_drv.c

    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 ++++++++-
    drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h | 5 +++++
    2 files changed, 13 insertions(+), 1 deletion(-)

    diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
    index 09dc2c07533d..f729a1de6e14 100644
    --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
    +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
    @@ -999,7 +999,7 @@ static int ade_drm_init(struct platform_device *pdev)
    return -ENOMEM;
    }

    - ctx = ade_hw_ctx_alloc(pdev, &ade->crtc.base);
    + ctx = ade_driver_data.alloc_hw_ctx(pdev, &ade->crtc.base);
    if (IS_ERR(ctx)) {
    DRM_ERROR("failed to initialize kirin_priv hw ctx\n");
    return -EINVAL;
    @@ -1038,6 +1038,10 @@ static int ade_drm_init(struct platform_device *pdev)
    return 0;
    }

    +static void ade_hw_ctx_cleanup(void *hw_ctx)
    +{
    +}
    +
    static void ade_drm_cleanup(struct platform_device *pdev)
    {
    }
    @@ -1090,6 +1094,9 @@ struct kirin_drm_data ade_driver_data = {
    .plane_funcs = &ade_plane_funcs,
    .mode_config_funcs = &ade_mode_config_funcs,

    + .alloc_hw_ctx = ade_hw_ctx_alloc,
    + .cleanup_hw_ctx = ade_hw_ctx_cleanup,
    +
    .init = ade_drm_init,
    .cleanup = ade_drm_cleanup
    };
    diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h
    index 95f56c9960d5..1663610d2cd8 100644
    --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h
    +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h
    @@ -49,6 +49,11 @@ struct kirin_drm_data {
    const struct drm_plane_helper_funcs *plane_helper_funcs;
    const struct drm_plane_funcs *plane_funcs;
    const struct drm_mode_config_funcs *mode_config_funcs;
    +
    + void *(*alloc_hw_ctx)(struct platform_device *pdev,
    + struct drm_crtc *crtc);
    + void (*cleanup_hw_ctx)(void *hw_ctx);
    +
    int (*init)(struct platform_device *pdev);
    void (*cleanup)(struct platform_device *pdev);
    };
    --
    2.17.1
    \
     
     \ /
      Last update: 2019-08-14 20:48    [W:2.571 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site