drm/amd/display: Fix assignment of integer to fixed point pbn_div
Subsystems (3)
PATCH 1/1 drm/amd/display: Fix assignment of integer to fixed point pbn_div
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
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1 -1
@@ -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;
Signature · 1 line
2.39.2
[Public]
Thanks, Imre Deak!
Quoted 75 lines
-----Original Message-----
From: Imre Deak <[email protected]>
Sent: Friday, January 5, 2024 5:56 PM
To: [email protected]
Cc: Lin, Wayne <[email protected]>; [email protected]; Dave Airlie <[email protected]>
Subject: [PATCH] drm/amd/display: Fix assignment of integer to fixed pointpbn_divFix the merge conflict resolution in
commit
13feae00ee99e0fc8b6f1748fc4c70281a7d6939
Merge:eb284f4b378173c064aea46d07
Author: Dave Airlie <[email protected]>
Date: Fri Jan 5 13:19:40 2024 +1000Merge 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(quoted diff) +0
-0@@@ -6916,7 -7007,8 +7009,7 @@@ static int
dm_encoder_helper_atomic_cheif (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-Quoted 1 line
dc_link);resulting from the following two changes:
commit
191dc43935d1ece82bc6c9653463b3b1cd8198fbAuthor: Imre Deak <[email protected]> Date: Thu Nov 16 15:18:31 2023 +0200drm/dp_mst: Store the MST PBN divider value in fixed point format
commit
9cdef4f720376ef0fb0febce1ed2377c19e531f9Author: Wayne Lin <[email protected]> Date: Mon Dec 4 10:09:33 2023 +0800drm/amd/display:
pbn_divneed be updated for hotplug eventCc Wayne Lin <[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(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-1@@ -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