Rename the existing color pipeline helpers so they contain "pre_blend" in the name to make them clearly distinguishable from the post-blend helpers when they're introduced.
Signed-off-by: Nícolas F. R. A. Prado <nfrapr...@collabora.com> --- drivers/gpu/drm/vkms/vkms_colorop.c | 8 +++++--- drivers/gpu/drm/vkms/vkms_drv.h | 2 +- drivers/gpu/drm/vkms/vkms_plane.c | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/vkms/vkms_colorop.c b/drivers/gpu/drm/vkms/vkms_colorop.c index 0191ac44dec0a9513e001b304f6ead32a96cdb8c..5924ae2bd40fc904048f99bc9b96308140709e25 100644 --- a/drivers/gpu/drm/vkms/vkms_colorop.c +++ b/drivers/gpu/drm/vkms/vkms_colorop.c @@ -14,7 +14,9 @@ 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_pre_blend_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; @@ -96,13 +98,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_pre_blend_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_pre_blend_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 55440ec6db5209741af1443d4e49e9471e6795c9..37ee569474223b2cf01e3cc0e4f119777533ae23 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.h +++ b/drivers/gpu/drm/vkms/vkms_drv.h @@ -305,6 +305,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_pre_blend_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 db8d26810afa8d8fcab48a6db2e691255f26a8a6..8e63a07a7e1b0a350361d0b03b7911bfa9ce3dcc 100644 --- a/drivers/gpu/drm/vkms/vkms_plane.c +++ b/drivers/gpu/drm/vkms/vkms_plane.c @@ -232,7 +232,7 @@ struct vkms_plane *vkms_plane_init(struct vkms_device *vkmsdev, DRM_COLOR_YCBCR_BT601, DRM_COLOR_YCBCR_FULL_RANGE); - vkms_initialize_colorops(&plane->base); + vkms_initialize_pre_blend_colorops(&plane->base); return plane; } -- 2.50.1