Skip to contentSkip to conversation

FAILED: patch "[PATCH] drm/amd/display: Fix ineffective setting of max bpc property" failed to apply to 5.7-stable tree

PATCH [email protected] 2 participants 2 messages Jun 29, 2020 – Jul 2, 2020

Subsystems (4)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 5.7-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From fa7041d9d2fc7401cece43f305eb5b87b7017fc4 Mon Sep 17 00:00:00 2001
From: Stylon Wang <[email protected]>
Date: Fri, 12 Jun 2020 19:04:18 +0800
Subject: [PATCH] drm/amd/display: Fix ineffective setting of max bpc property

[Why]
Regression was introduced where setting max bpc property has no effect on the atomic check and final commit. It has the same effect as max bpc being stuck at 8.

[How]
Correctly propagate max bpc with the new connector state.

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +2 -1
index 7ced9f87be97..10ac8076d4f2 100644
@@ -5024,7 +5024,8 @@ create_validate_stream_for_sink(struct amdgpu_dm_connector *aconnector,
 	struct drm_connector *connector = &aconnector->base;
 	struct amdgpu_device *adev = connector->dev->dev_private;
 	struct dc_stream_state *stream;
-	int requested_bpc = connector->state ? connector->state->max_requested_bpc : 8;
+	const struct drm_connector_state *drm_state = dm_state ? &dm_state->base : NULL;
+	int requested_bpc = drm_state ? drm_state->max_requested_bpc : 8;
 	enum dc_status dc_result = DC_OK;
 
 	do {
maintainer
#1 lore raw
Quoted 22 lines · On Mon, Jun 29, 2020 at 01:33:43PM +0200, [email protected] wrote:

The patch below does not apply to the 5.7-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From fa7041d9d2fc7401cece43f305eb5b87b7017fc4 Mon Sep 17 00:00:00 2001
From: Stylon Wang <[email protected]>
Date: Fri, 12 Jun 2020 19:04:18 +0800
Subject: [PATCH] drm/amd/display: Fix ineffective setting of max bpc property

[Why]
Regression was introduced where setting max bpc property has no effect on the atomic check and final commit. It has the same effect as max bpc being stuck at 8.

Quoted 8 lines

[How]
Correctly propagate max bpc with the new connector state.

I've grabbed this patch as a dependency and queued both for 5.7:
cbd14ae7ea93 ("drm/amd/display: Fix incorrectly pruned modes with deep color").

Signature · 2 lines
Thanks,
Sasha