Skip to content

Commit 4b0eb9c

Browse files
Rodrigo Siqueiraalexdeucher
authored andcommitted
Documentation/amdgpu: Fix duplicate declaration
Address the below kernel doc warning: Documentation/gpu/amdgpu/display/display-manager:134: drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h:3: WARNING: Duplicate C declaration, also defined at gpu/amdgpu/display/dcn-blocks:101. Declaration is '.. c:struct:: mpcc_blnd_cfg'. Documentation/gpu/amdgpu/display/display-manager:146: drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h:3: WARNING: Duplicate C declaration, also defined at gpu/amdgpu/display/dcn-blocks:3. Declaration is '.. c:enum:: mpcc_alpha_blend_mode'. To address the above warnings, this commit uses the 'no-identifiers' option in the dcn-blocks to avoid duplication with the previous use of this function doc in the display-manager file. Finally, replaces the deprecated ':function:' in favor of ':identifiers:'. Cc: Alex Deucher <[email protected]> Acked-by: Alex Deucher <[email protected]> Reported-by: Stephen Rothwell <[email protected]> Signed-off-by: Rodrigo Siqueira <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent 91ca34c commit 4b0eb9c

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

Documentation/gpu/amdgpu/display/dcn-blocks.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ MPC
3434

3535
.. kernel-doc:: drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h
3636
:internal:
37+
:no-identifiers: mpcc_blnd_cfg mpcc_alpha_blend_mode
3738

3839
OPP
3940
---

Documentation/gpu/amdgpu/display/display-manager.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ The DRM blend mode and its elements are then mapped by AMDGPU display manager
132132
(MPC), as follows:
133133

134134
.. kernel-doc:: drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h
135-
:functions: mpcc_blnd_cfg
135+
:identifiers: mpcc_blnd_cfg
136136

137137
Therefore, the blending configuration for a single MPCC instance on the MPC
138138
tree is defined by :c:type:`mpcc_blnd_cfg`, where
@@ -144,7 +144,7 @@ alpha and plane alpha values. It sets one of the three modes for
144144
:c:type:`MPCC_ALPHA_BLND_MODE`, as described below.
145145

146146
.. kernel-doc:: drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h
147-
:functions: mpcc_alpha_blend_mode
147+
:identifiers: mpcc_alpha_blend_mode
148148

149149
DM then maps the elements of `enum mpcc_alpha_blend_mode` to those in the DRM
150150
blend formula, as follows:

0 commit comments

Comments
 (0)