Re: [PATCH] drm/amd/display: add prefix to amdgpu_dm_plane.h functions
On Mon, Mar 6, 2023 at 3:23 AM David Tadokoro wrote:
>
> From: David Tadokoro
>
> The amdgpu_dm_plane.h functions didn't have names that indicated where
> they were declared.
>
> To better filter results in debug tools like ftrace, prefix these
> functions with 'amdgpu_dm_plane_'.
>
> Note that we may want to make this same change in other files like
> amdgpu_dm_crtc.h.
>
> Signed-off-by: David Tadokoro
Applied. Thanks!
Alex
> ---
> .../gpu/amdgpu/display/display-manager.rst| 2 +-
> .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 14 ++---
> .../amd/display/amdgpu_dm/amdgpu_dm_plane.c | 20 +--
> .../amd/display/amdgpu_dm/amdgpu_dm_plane.h | 12 +--
> 4 files changed, 24 insertions(+), 24 deletions(-)
>
> diff --git a/Documentation/gpu/amdgpu/display/display-manager.rst
> b/Documentation/gpu/amdgpu/display/display-manager.rst
> index b7abb18cfc82..be2651ecdd7f 100644
> --- a/Documentation/gpu/amdgpu/display/display-manager.rst
> +++ b/Documentation/gpu/amdgpu/display/display-manager.rst
> @@ -173,7 +173,7 @@ The alpha blending equation is configured from DRM to DC
> interface by the
> following path:
>
> 1. When updating a :c:type:`drm_plane_state `, DM calls
> - :c:type:`fill_blending_from_plane_state()` that maps
> + :c:type:`amdgpu_dm_plane_fill_blending_from_plane_state()` that maps
> :c:type:`drm_plane_state ` attributes to
> :c:type:`dc_plane_info ` struct to be handled in the
> OS-agnostic component (DC).
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> index 4217ebe6391b..f7111acd45cc 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -2923,7 +2923,7 @@ const struct amdgpu_ip_block_version dm_ip_block =
>
> static const struct drm_mode_config_funcs amdgpu_dm_mode_funcs = {
> .fb_create = amdgpu_display_user_framebuffer_create,
> - .get_format_info = amd_get_format_info,
> + .get_format_info = amdgpu_dm_plane_get_format_info,
> .output_poll_changed = drm_fb_helper_output_poll_changed,
> .atomic_check = amdgpu_dm_atomic_check,
> .atomic_commit = drm_atomic_helper_commit,
> @@ -4948,7 +4948,7 @@ fill_dc_plane_info_and_addr(struct amdgpu_device *adev,
> if (ret)
> return ret;
>
> - ret = fill_plane_buffer_attributes(adev, afb, plane_info->format,
> + ret = amdgpu_dm_plane_fill_plane_buffer_attributes(adev, afb,
> plane_info->format,
>plane_info->rotation, tiling_flags,
>&plane_info->tiling_info,
>&plane_info->plane_size,
> @@ -4957,7 +4957,7 @@ fill_dc_plane_info_and_addr(struct amdgpu_device *adev,
> if (ret)
> return ret;
>
> - fill_blending_from_plane_state(
> + amdgpu_dm_plane_fill_blending_from_plane_state(
> plane_state, &plane_info->per_pixel_alpha,
> &plane_info->pre_multiplied_alpha,
> &plane_info->global_alpha, &plane_info->global_alpha_value);
>
> @@ -4976,7 +4976,7 @@ static int fill_dc_plane_attributes(struct
> amdgpu_device *adev,
> int ret;
> bool force_disable_dcc = false;
>
> - ret = fill_dc_scaling_info(adev, plane_state, &scaling_info);
> + ret = amdgpu_dm_plane_fill_dc_scaling_info(adev, plane_state,
> &scaling_info);
> if (ret)
> return ret;
>
> @@ -7882,7 +7882,7 @@ static void amdgpu_dm_commit_cursors(struct
> drm_atomic_state *state)
> */
> for_each_old_plane_in_state(state, plane, old_plane_state, i)
> if (plane->type == DRM_PLANE_TYPE_CURSOR)
> - handle_cursor_update(plane, old_plane_state);
> + amdgpu_dm_plane_handle_cursor_update(plane,
> old_plane_state);
> }
>
> static void amdgpu_dm_commit_planes(struct drm_atomic_state *state,
> @@ -7967,7 +7967,7 @@ static void amdgpu_dm_commit_planes(struct
> drm_atomic_state *state,
>
> bundle->surface_updates[planes_count].gamut_remap_matrix =
> &dc_plane->gamut_remap_matrix;
> }
>
> - fill_dc_scaling_info(dm->adev, new_plane_state,
> + amdgpu_dm_plane_fill_dc_scaling_info(dm->adev,
> new_plane_state,
> &bundle->scaling_infos[planes_count]);
>
> bundle->surface_updates[planes_count].scaling_info =
> @@ -9634,7 +9634,7 @@ static int dm_update_plane_state(struct dc *dc,
> if (!needs_reset)
> return 0;
>
> - ret = dm_plane_helper_check_state(new_plane_state,
> new_crtc_state);
> + ret = amdgpu_dm_plane_helper_check_state(new_plane_state,
> new_crtc_state);
> if (ret)
> return ret;
[PATCH] drm/amd/display: add prefix to amdgpu_dm_plane.h functions
From: David Tadokoro
The amdgpu_dm_plane.h functions didn't have names that indicated where
they were declared.
To better filter results in debug tools like ftrace, prefix these
functions with 'amdgpu_dm_plane_'.
Note that we may want to make this same change in other files like
amdgpu_dm_crtc.h.
Signed-off-by: David Tadokoro
---
.../gpu/amdgpu/display/display-manager.rst| 2 +-
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 14 ++---
.../amd/display/amdgpu_dm/amdgpu_dm_plane.c | 20 +--
.../amd/display/amdgpu_dm/amdgpu_dm_plane.h | 12 +--
4 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/Documentation/gpu/amdgpu/display/display-manager.rst
b/Documentation/gpu/amdgpu/display/display-manager.rst
index b7abb18cfc82..be2651ecdd7f 100644
--- a/Documentation/gpu/amdgpu/display/display-manager.rst
+++ b/Documentation/gpu/amdgpu/display/display-manager.rst
@@ -173,7 +173,7 @@ The alpha blending equation is configured from DRM to DC
interface by the
following path:
1. When updating a :c:type:`drm_plane_state `, DM calls
- :c:type:`fill_blending_from_plane_state()` that maps
+ :c:type:`amdgpu_dm_plane_fill_blending_from_plane_state()` that maps
:c:type:`drm_plane_state ` attributes to
:c:type:`dc_plane_info ` struct to be handled in the
OS-agnostic component (DC).
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 4217ebe6391b..f7111acd45cc 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -2923,7 +2923,7 @@ const struct amdgpu_ip_block_version dm_ip_block =
static const struct drm_mode_config_funcs amdgpu_dm_mode_funcs = {
.fb_create = amdgpu_display_user_framebuffer_create,
- .get_format_info = amd_get_format_info,
+ .get_format_info = amdgpu_dm_plane_get_format_info,
.output_poll_changed = drm_fb_helper_output_poll_changed,
.atomic_check = amdgpu_dm_atomic_check,
.atomic_commit = drm_atomic_helper_commit,
@@ -4948,7 +4948,7 @@ fill_dc_plane_info_and_addr(struct amdgpu_device *adev,
if (ret)
return ret;
- ret = fill_plane_buffer_attributes(adev, afb, plane_info->format,
+ ret = amdgpu_dm_plane_fill_plane_buffer_attributes(adev, afb,
plane_info->format,
plane_info->rotation, tiling_flags,
&plane_info->tiling_info,
&plane_info->plane_size,
@@ -4957,7 +4957,7 @@ fill_dc_plane_info_and_addr(struct amdgpu_device *adev,
if (ret)
return ret;
- fill_blending_from_plane_state(
+ amdgpu_dm_plane_fill_blending_from_plane_state(
plane_state, &plane_info->per_pixel_alpha,
&plane_info->pre_multiplied_alpha,
&plane_info->global_alpha, &plane_info->global_alpha_value);
@@ -4976,7 +4976,7 @@ static int fill_dc_plane_attributes(struct amdgpu_device
*adev,
int ret;
bool force_disable_dcc = false;
- ret = fill_dc_scaling_info(adev, plane_state, &scaling_info);
+ ret = amdgpu_dm_plane_fill_dc_scaling_info(adev, plane_state,
&scaling_info);
if (ret)
return ret;
@@ -7882,7 +7882,7 @@ static void amdgpu_dm_commit_cursors(struct
drm_atomic_state *state)
*/
for_each_old_plane_in_state(state, plane, old_plane_state, i)
if (plane->type == DRM_PLANE_TYPE_CURSOR)
- handle_cursor_update(plane, old_plane_state);
+ amdgpu_dm_plane_handle_cursor_update(plane,
old_plane_state);
}
static void amdgpu_dm_commit_planes(struct drm_atomic_state *state,
@@ -7967,7 +7967,7 @@ static void amdgpu_dm_commit_planes(struct
drm_atomic_state *state,
bundle->surface_updates[planes_count].gamut_remap_matrix =
&dc_plane->gamut_remap_matrix;
}
- fill_dc_scaling_info(dm->adev, new_plane_state,
+ amdgpu_dm_plane_fill_dc_scaling_info(dm->adev, new_plane_state,
&bundle->scaling_infos[planes_count]);
bundle->surface_updates[planes_count].scaling_info =
@@ -9634,7 +9634,7 @@ static int dm_update_plane_state(struct dc *dc,
if (!needs_reset)
return 0;
- ret = dm_plane_helper_check_state(new_plane_state,
new_crtc_state);
+ ret = amdgpu_dm_plane_helper_check_state(new_plane_state,
new_crtc_state);
if (ret)
return ret;
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
index 28fb1f02591a..dc23c788cdba 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgp
