From: "Nícolas F. R. A. Prado" <[email protected]> Rename the existing color pipeline helpers so they contain "plane" in the name to make them clearly distinguishable from the crtc helpers when they're introduced.
Signed-off-by: Nícolas F. R. A. Prado <[email protected]> Co-developed-by: Ariel D'Alessandro <[email protected]> Signed-off-by: Ariel D'Alessandro <[email protected]> Reviewed-by: Louis Chauvet <[email protected]> --- drivers/gpu/drm/vkms/vkms_colorop.c | 7 ++++--- drivers/gpu/drm/vkms/vkms_drv.h | 2 +- drivers/gpu/drm/vkms/vkms_plane.c | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/vkms/vkms_colorop.c b/drivers/gpu/drm/vkms/vkms_colorop.c index 5c3ffc78aea06..dd6120434690e 100644 --- a/drivers/gpu/drm/vkms/vkms_colorop.c +++ b/drivers/gpu/drm/vkms/vkms_colorop.c @@ -14,7 +14,8 @@ static const u64 supported_tfs = #define MAX_COLOR_PIPELINE_OPS 4 -static int vkms_initialize_color_pipeline(struct drm_plane *plane, struct drm_prop_enum_list *list) +static int vkms_initialize_plane_color_pipeline(struct drm_plane *plane, + struct drm_prop_enum_list *list) { struct drm_colorop *ops[MAX_COLOR_PIPELINE_OPS]; struct drm_device *dev = plane->dev; @@ -101,13 +102,13 @@ static int vkms_initialize_color_pipeline(struct drm_plane *plane, struct drm_pr return ret; } -int vkms_initialize_colorops(struct drm_plane *plane) +int vkms_initialize_plane_colorops(struct drm_plane *plane) { struct drm_prop_enum_list pipeline; int ret; /* Add color pipeline */ - ret = vkms_initialize_color_pipeline(plane, &pipeline); + ret = vkms_initialize_plane_color_pipeline(plane, &pipeline); if (ret) return ret; diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_drv.h index 0933e4ce0ff03..bdeb52623f4d6 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.h +++ b/drivers/gpu/drm/vkms/vkms_drv.h @@ -324,6 +324,6 @@ void vkms_writeback_row(struct vkms_writeback_job *wb, const struct line_buffer int vkms_enable_writeback_connector(struct vkms_device *vkmsdev, struct vkms_output *vkms_out); /* Colorops */ -int vkms_initialize_colorops(struct drm_plane *plane); +int vkms_initialize_plane_colorops(struct drm_plane *plane); #endif /* _VKMS_DRV_H_ */ diff --git a/drivers/gpu/drm/vkms/vkms_plane.c b/drivers/gpu/drm/vkms/vkms_plane.c index 19fe6acad306e..82be1b862c1da 100644 --- a/drivers/gpu/drm/vkms/vkms_plane.c +++ b/drivers/gpu/drm/vkms/vkms_plane.c @@ -247,7 +247,7 @@ struct vkms_plane *vkms_plane_init(struct vkms_device *vkmsdev, DRM_COLOR_YCBCR_FULL_RANGE); if (vkms_config_plane_get_default_pipeline(plane_cfg)) - vkms_initialize_colorops(&plane->base); + vkms_initialize_plane_colorops(&plane->base); return plane; } -- 2.51.0
