From 3d849ab48cecab55862a4f2742f11937d66ba54b Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 14 Apr 2023 11:21:34 +0200 Subject: [PATCH] drm/vc4: fkms: Rename plane related functions The name collide with the Full KMS functions that are going to be made public. Signed-off-by: Maxime Ripard --- drivers/gpu/drm/vc4/vc4_firmware_kms.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -670,8 +670,8 @@ static int vc4_plane_to_mb(struct drm_pl return 0; } -static int vc4_plane_atomic_check(struct drm_plane *plane, - struct drm_atomic_state *state) +static int vc4_fkms_plane_atomic_check(struct drm_plane *plane, + struct drm_atomic_state *state) { struct drm_plane_state *new_plane_state = drm_atomic_get_new_plane_state(state, plane); @@ -728,7 +728,7 @@ static int vc4_plane_atomic_async_check( } /* Called during init to allocate the plane's atomic state. */ -static void vc4_plane_reset(struct drm_plane *plane) +static void vc4_fkms_plane_reset(struct drm_plane *plane) { struct vc4_plane_state *vc4_state; @@ -788,7 +788,7 @@ static bool vc4_fkms_format_mod_supporte } } -static struct drm_plane_state *vc4_plane_duplicate_state(struct drm_plane *plane) +static struct drm_plane_state *vc4_fkms_plane_duplicate_state(struct drm_plane *plane) { struct vc4_plane_state *vc4_state; @@ -809,8 +809,8 @@ static const struct drm_plane_funcs vc4_ .disable_plane = drm_atomic_helper_disable_plane, .destroy = vc4_plane_destroy, .set_property = NULL, - .reset = vc4_plane_reset, - .atomic_duplicate_state = vc4_plane_duplicate_state, + .reset = vc4_fkms_plane_reset, + .atomic_duplicate_state = vc4_fkms_plane_duplicate_state, .atomic_destroy_state = drm_atomic_helper_plane_destroy_state, .format_mod_supported = vc4_fkms_format_mod_supported, }; @@ -818,7 +818,7 @@ static const struct drm_plane_funcs vc4_ static const struct drm_plane_helper_funcs vc4_plane_helper_funcs = { .prepare_fb = drm_gem_plane_helper_prepare_fb, .cleanup_fb = NULL, - .atomic_check = vc4_plane_atomic_check, + .atomic_check = vc4_fkms_plane_atomic_check, .atomic_update = vc4_plane_atomic_update, .atomic_disable = vc4_plane_atomic_disable, .atomic_async_check = vc4_plane_atomic_async_check,