From: broonie@kernel.org To: Dave Airlie <airlied@linux.ie>, DRI <dri-devel@lists.freedesktop.org> Cc: Alex Deucher <alexander.deucher@amd.com>, Daniel Vetter <daniel.vetter@ffwll.ch>, Guchun Chen <guchun.chen@amd.com>, Leslie Shi <Yuliang.Shi@amd.com>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next Mailing List <linux-next@vger.kernel.org>, Tomohito Esaki <etom@igel.co.jp> Subject: linux-next: manual merge of the drm tree with the drm-fixes tree Date: Fri, 25 Feb 2022 16:37:47 +0000 [thread overview] Message-ID: <20220225163747.888284-1-broonie@kernel.org> (raw) 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: e2b993302f40c ("drm/amdgpu: bypass tiling flag check in virtual display case (v2)") from the drm-fixes tree and commit: 2af104290da5e ("drm: introduce fb_modifiers_not_supported flag in mode_config") 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. diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_display.c index c4387b38229c2,9e5fc4cdb8ec9..0000000000000 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c @@@ -1141,7 -1148,7 +1148,7 @@@ 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);
WARNING: multiple messages have this Message-ID (diff)
From: broonie@kernel.org To: Dave Airlie <airlied@linux.ie>, DRI <dri-devel@lists.freedesktop.org> Cc: Guchun Chen <guchun.chen@amd.com>, Daniel Vetter <daniel.vetter@ffwll.ch>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next Mailing List <linux-next@vger.kernel.org>, Alex Deucher <alexander.deucher@amd.com>, Leslie Shi <Yuliang.Shi@amd.com>, Tomohito Esaki <etom@igel.co.jp> Subject: linux-next: manual merge of the drm tree with the drm-fixes tree Date: Fri, 25 Feb 2022 16:37:47 +0000 [thread overview] Message-ID: <20220225163747.888284-1-broonie@kernel.org> (raw) 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: e2b993302f40c ("drm/amdgpu: bypass tiling flag check in virtual display case (v2)") from the drm-fixes tree and commit: 2af104290da5e ("drm: introduce fb_modifiers_not_supported flag in mode_config") 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. diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_display.c index c4387b38229c2,9e5fc4cdb8ec9..0000000000000 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c @@@ -1141,7 -1148,7 +1148,7 @@@ 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);
next reply other threads:[~2022-02-25 16:37 UTC|newest] Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-02-25 16:37 broonie [this message] 2022-02-25 16:37 ` linux-next: manual merge of the drm tree with the drm-fixes tree broonie -- strict thread matches above, loose matches on Subject: below -- 2023-08-18 1:53 Stephen Rothwell 2023-08-18 1:53 ` Stephen Rothwell 2023-02-13 0:23 Stephen Rothwell 2023-02-13 0:23 ` Stephen Rothwell 2022-09-26 17:49 broonie 2022-09-26 17:49 ` broonie 2022-02-24 16:33 broonie 2022-02-24 16:33 ` broonie 2021-08-06 12:04 Mark Brown 2021-08-10 11:56 ` Geert Uytterhoeven 2021-08-10 11:56 ` Geert Uytterhoeven 2021-08-10 12:53 ` Stephen Rothwell 2020-07-10 2:28 Stephen Rothwell 2020-07-10 2:28 ` Stephen Rothwell 2019-08-23 3:20 Stephen Rothwell 2019-08-23 3:20 ` Stephen Rothwell 2019-07-05 2:50 Stephen Rothwell 2019-03-01 2:23 Stephen Rothwell 2019-03-01 23:29 ` Alex Deucher 2019-03-01 23:29 ` Alex Deucher 2019-03-04 0:54 ` Stephen Rothwell 2019-03-04 0:54 ` Stephen Rothwell 2019-03-11 12:36 ` Daniel Vetter 2019-03-11 12:36 ` Daniel Vetter 2018-12-14 1:51 Stephen Rothwell 2018-12-07 2:38 Stephen Rothwell 2018-12-07 2:38 ` Stephen Rothwell 2018-12-07 2:31 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=20220225163747.888284-1-broonie@kernel.org \ --to=broonie@kernel.org \ --cc=Yuliang.Shi@amd.com \ --cc=airlied@linux.ie \ --cc=alexander.deucher@amd.com \ --cc=daniel.vetter@ffwll.ch \ --cc=dri-devel@lists.freedesktop.org \ --cc=etom@igel.co.jp \ --cc=guchun.chen@amd.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-next@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.