Skip to contentSkip to conversation

drm/amd/display: Fix indentation in commit_planes_for_stream()

PATCH In review Alex Deucher 2 participants 3 messages Aug 30, 2022 – Aug 31, 2022

Subsystems (3)
lore
Share & tools
lore

Alex Deucher

author maintainer
#0 lore raw

PATCH 1/2 drm/amd/display: Fix indentation in commit_planes_for_stream()

Fixes a build failure.

Fixes e990bd60716d ("drm/amd/display: Only commit SubVP state after pipe programming")
Cc Alvin Lee <[email protected]>
Cc Jun Lei <[email protected]>
Cc Harry Wentland <[email protected]>
---
 drivers/gpu/drm/amd/display/dc/core/dc.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc.c +3 -3
index b49237390cce..1a4ea9639049 100644
@@ -3507,9 +3507,9 @@ static void commit_planes_for_stream(struct dc *dc,
 
 	if (update_type != UPDATE_TYPE_FAST)
 		dc->hwss.post_unlock_program_front_end(dc, context);
-		if (update_type != UPDATE_TYPE_FAST)
-			if (dc->hwss.commit_subvp_config)
-				dc->hwss.commit_subvp_config(dc, context);
+	if (update_type != UPDATE_TYPE_FAST)
+		if (dc->hwss.commit_subvp_config)
+			dc->hwss.commit_subvp_config(dc, context);
 
 	/* Since phantom pipe programming is moved to post_unlock_program_front_end,
 	 * move the SubVP lock to after the phantom pipes have been setup
Signature · 1 line
2.37.1
author maintainer
#1 lore raw

PATCH 2/2 drm/amd/display: fix documentation for amdgpu_dm_update_freesync_caps()

Document missing parameter.

Fixes 8889a13f99e5 ("drm/amd/display: Add some extra kernel doc to amdgpu_dm")
Cc Rodrigo Siqueira <[email protected]>
Cc Harry Wentland <[email protected]>
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1 -0
index 15d51d300b34..4e24b75efcfe 100644
@@ -9938,6 +9938,7 @@ static int parse_hdmi_amd_vsdb(struct amdgpu_dm_connector *aconnector,
  * amdgpu_dm_update_freesync_caps - Update Freesync capabilities
  *
  * @aconnector: Connector to query.
+ * @edid: EDID from monitor
  *
  * Amdgpu supports Freesync in DP and HDMI displays, and it is required to keep
  * track of some of the display information in the internal data struct used by
Signature · 1 line
2.37.1
#2 lore raw

Re: [PATCH 2/2] drm/amd/display: fix documentation for amdgpu_dm_update_freesync_caps()

Hi Alex,

Quoted 27 lines · On Tue, 30 Aug 2022 09:32:17 -0400 Alex Deucher <[email protected]>…

Document missing parameter.

Fixes 8889a13f99e5 ("drm/amd/display: Add some extra kernel doc to amdgpu_dm")
Cc Rodrigo Siqueira <[email protected]>
Cc Harry Wentland <[email protected]>
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1 -0
index 15d51d300b34..4e24b75efcfe 100644
@@ -9938,6 +9938,7 @@ static int parse_hdmi_amd_vsdb(struct amdgpu_dm_connector *aconnector,
  * amdgpu_dm_update_freesync_caps - Update Freesync capabilities
  *
  * @aconnector: Connector to query.
+ * @edid: EDID from monitor
  *
  * Amdgpu supports Freesync in DP and HDMI displays, and it is required to keep
  * track of some of the display information in the internal data struct used by
Signature · 1 line
2.37.1

That is not the problem I reported (though that also needed fixing)

I reported:

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c:9951: warning: Excess function parameter 'aconnector' description in 'amdgpu_dm_update_freesync_caps'

The parameter is actually "connector" (no 'a'), so the line above the one you added needs fixing as well.

Signature · 2 lines
Cheers,
Stephen Rothwell