Fix the merge conflict resolution in
commit 13feae00ee99e0fc8b6f1748fc4c70281a7d6939
Merge: eb284f4b37817 3c064aea46d07
Author: Dave Airlie <[email protected]>
Date: Fri Jan 5 13:19:40 2024 +1000
Merge remote-tracking branch 'drm/drm-next' into drm-tip
# Conflicts:
# drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
# drivers/gpu/drm/i915/display/intel_dmc.c
@@@ -6916,7 -7007,8 +7009,7 @@@ static int dm_encoder_helper_atomic_che
if (IS_ERR(mst_state))
return PTR_ERR(mst_state);
- if (!mst_state->pbn_div.full)
- mst_state->pbn_div.full =
dfixed_const(dm_mst_get_pbn_divider(aconnector->mst_root->dc_link));
+ mst_state->pbn_div =
dm_mst_get_pbn_divider(aconnector->mst_root->dc_link);
resulting from the following two changes:
commit 191dc43935d1ece82bc6c9653463b3b1cd8198fb
Author: Imre Deak <[email protected]>
Date: Thu Nov 16 15:18:31 2023 +0200
drm/dp_mst: Store the MST PBN divider value in fixed point format
commit 9cdef4f720376ef0fb0febce1ed2377c19e531f9
Author: Wayne Lin <[email protected]>
Date: Mon Dec 4 10:09:33 2023 +0800
drm/amd/display: pbn_div need be updated for hotplug event
Cc: Wayne Lin <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: Dave Airlie <[email protected]>
Signed-off-by: Imre Deak <[email protected]>
---
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 5d82bac1a51ab..f9714dd6fe8ed 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -7009,7 +7009,7 @@ static int dm_encoder_helper_atomic_check(struct
drm_encoder *encoder,
if (IS_ERR(mst_state))
return PTR_ERR(mst_state);
- mst_state->pbn_div =
dm_mst_get_pbn_divider(aconnector->mst_root->dc_link);
+ mst_state->pbn_div.full =
dfixed_const(dm_mst_get_pbn_divider(aconnector->mst_root->dc_link));
if (!state->duplicated) {
int max_bpc = conn_state->max_requested_bpc;
--
2.39.2
