linux-next: manual merge of the drm tree with Linus' tree

Stephen Rothwell
2022-02-28T03:18:07Z

[-- Attachment #1: Type: text/plain, Size: 1498 bytes --]

Hi all,

Today's linux-next merge of the drm tree got a conflict in:

drivers/gpu/drm/amd/amdgpu/amdgpu_display.c

between commit:

e2b993302f40 ("drm/amdgpu: bypass tiling flag check in virtual display case (v2)")

from Linus' tree and commit:

2af104290da5 ("drm: introduce fb_modifiers_not_supported flag in mode_config")

from the drm tree.

I fixed it up (I think - 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/amdgpu/amdgpu_display.c
index c4387b38229c,9e5fc4cdb8ec..000000000000
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
@@@ -1141,7 -1148,7 +1148,8 @@@ int amdgpu_display_framebuffer_init(str
if (ret)
return ret;

- if (!dev->mode_config.allow_fb_modifiers && !adev->enable_virtual_display) {
- if (dev->mode_config.fb_modifiers_not_supported) {
++ if (dev->mode_config.fb_modifiers_not_supported &&
++ !adev->enable_virtual_display) {
drm_WARN_ONCE(dev, adev->family >= AMDGPU_FAMILY_AI,
"GFX9+ requires FB check based on format modifier\n");
ret = check_tiling_flags_gfx6(rfb);

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]