On 9/16/24 06:15, Stephen Rothwell wrote:
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c
between commit:
e835d5144f5e ("drm/amd/display: Avoid race between dcn35_set_drr() and dc_state_destruct()")
from Linus' tree and commit:
be7a6a517164 ("drm/amd/display: Check stream pointer is initialized before accessing")
from the drm 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.
On close inspection it might be worthwhile to take the same precautions
that we now take with tg, also with pipe_ctx[i]->stream.
@Alex: What do you think?
With best wishes,
Tobias
