From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Daniel Vetter <daniel.vetter@ffwll•ch>,
Jani Nikula <jani.nikula@linux•intel.com>,
Joonas Lahtinen <joonas.lahtinen@linux•intel.com>,
Rodrigo Vivi <rodrigo.vivi@intel•com>,
Alex Deucher <alexdeucher@gmail•com>
Cc: "Intel Graphics" <intel-gfx@lists•freedesktop.org>,
DRI <dri-devel@lists•freedesktop.org>,
"Alex Deucher" <alexander.deucher@amd•com>,
"Fangzhi Zuo" <jerry.zuo@amd•com>,
"Imre Deak" <imre.deak@intel•com>,
"Linux Kernel Mailing List" <linux-kernel@vger•kernel.org>,
"Linux Next Mailing List" <linux-next@vger•kernel.org>,
"Ville Syrjälä" <ville.syrjala@linux•intel.com>
Subject: linux-next: manual merge of the drm-intel tree with the amdgpu tree
Date: Mon, 20 Nov 2023 12:28:18 +1100 [thread overview]
Message-ID: <20231120122818.09bb6f35@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2023-11-20 1:28 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-20 1:28 Stephen Rothwell [this message]
2023-11-24 0:00 ` linux-next: manual merge of the drm-intel tree with the amdgpu tree Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231120122818.09bb6f35@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=alexander.deucher@amd$(echo .)com \
--cc=alexdeucher@gmail$(echo .)com \
--cc=daniel.vetter@ffwll$(echo .)ch \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=imre.deak@intel$(echo .)com \
--cc=intel-gfx@lists$(echo .)freedesktop.org \
--cc=jani.nikula@linux$(echo .)intel.com \
--cc=jerry.zuo@amd$(echo .)com \
--cc=joonas.lahtinen@linux$(echo .)intel.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rodrigo.vivi@intel$(echo .)com \
--cc=ville.syrjala@linux$(echo .)intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox