mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-14 06:35:12 +00:00
Code Issues Releases Wiki Activity

drm: kirin: Add alloc_hw_ctx/clean_hw_ctx ops in driver data

Browse source 
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>
Acked-by: Xinliang Liu <z.liuxinliang@hisilicon.com>
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>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20190820230626.23253-24-john.stultz@linaro.org
This commit is contained in:
Xu YiPing 2019-08-20 23:06:24 +00:00 committed by Sam Ravnborg
parent 27dd04a591
commit 2e89b4fbca
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
View file

@ -1000,7 +1000,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;
@ -1040,6 +1040,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)
{
}
@ -1089,6 +1093,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
};

5
drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h
View file

@ -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);
};