* linux-next: manual merge of the drm-intel tree with the amdgpu tree
@ 2023-11-20 1:28 Stephen Rothwell
2023-11-24 0:00 ` Stephen Rothwell
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2023-11-20 1:28 UTC (permalink / raw)
To: Daniel Vetter, Jani Nikula, Joonas Lahtinen, Rodrigo Vivi,
Alex Deucher
Cc: Intel Graphics, DRI, Alex Deucher, Fangzhi Zuo, Imre Deak,
Linux Kernel Mailing List, Linux Next Mailing List,
Ville Syrjälä
[-- Attachment #1: Type: text/plain, Size: 1605 bytes --]
Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in:
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
between commits:
a58555359a9f ("drm/amd/display: Fix DSC not Enabled on Direct MST Sink")
c29085d29562 ("drm/amd/display: Enable DSC Flag in MST Mode Validation")
from the amdgpu tree and commit:
7707dd602259 ("drm/dp_mst: Fix fractional DSC bpp handling")
from the drm-intel tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
index 8d7d4024f285,2afd1bc74978..000000000000
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
@@@ -1650,7 -1636,8 +1650,7 @@@ enum dc_status dm_dp_mst_is_port_suppor
} else {
/* check if mode could be supported within full_pbn */
bpp = convert_dc_color_depth_into_bpc(stream->timing.display_color_depth) * 3;
- pbn = drm_dp_calc_pbn_mode(stream->timing.pix_clk_100hz / 10, bpp, false);
+ pbn = drm_dp_calc_pbn_mode(stream->timing.pix_clk_100hz / 10, bpp << 4);
-
if (pbn > aconnector->mst_output_port->full_pbn)
return DC_FAIL_BANDWIDTH_VALIDATE;
}
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: linux-next: manual merge of the drm-intel tree with the amdgpu tree
2023-11-20 1:28 linux-next: manual merge of the drm-intel tree with the amdgpu tree Stephen Rothwell
@ 2023-11-24 0:00 ` Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2023-11-24 0:00 UTC (permalink / raw)
To: Alex Deucher, Dave Airlie
Cc: Daniel Vetter, Jani Nikula, Joonas Lahtinen, Rodrigo Vivi,
Intel Graphics, DRI, Alex Deucher, Fangzhi Zuo, Imre Deak,
Linux Kernel Mailing List, Linux Next Mailing List,
Ville Syrjälä
[-- Attachment #1: Type: text/plain, Size: 1874 bytes --]
Hi all,
On Mon, 20 Nov 2023 12:28:18 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the drm-intel tree got a conflict in:
>
> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
>
> between commits:
>
> a58555359a9f ("drm/amd/display: Fix DSC not Enabled on Direct MST Sink")
> c29085d29562 ("drm/amd/display: Enable DSC Flag in MST Mode Validation")
>
> from the amdgpu tree and commit:
>
> 7707dd602259 ("drm/dp_mst: Fix fractional DSC bpp handling")
>
> from the drm-intel tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
> index 8d7d4024f285,2afd1bc74978..000000000000
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
> @@@ -1650,7 -1636,8 +1650,7 @@@ enum dc_status dm_dp_mst_is_port_suppor
> } else {
> /* check if mode could be supported within full_pbn */
> bpp = convert_dc_color_depth_into_bpc(stream->timing.display_color_depth) * 3;
> - pbn = drm_dp_calc_pbn_mode(stream->timing.pix_clk_100hz / 10, bpp, false);
> + pbn = drm_dp_calc_pbn_mode(stream->timing.pix_clk_100hz / 10, bpp << 4);
> -
> if (pbn > aconnector->mst_output_port->full_pbn)
> return DC_FAIL_BANDWIDTH_VALIDATE;
> }
This is now a conflict between the amdgpu tree and the drm tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-11-24 0:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-11-20 1:28 linux-next: manual merge of the drm-intel tree with the amdgpu tree Stephen Rothwell
2023-11-24 0:00 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox