linux-kernel - linux-next: manual merge of the drm tree with the drm-fixes tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20220225163747.888284-1-broonie@kernel.org>
Date:   Fri, 25 Feb 2022 16:37:47 +0000
From:   broonie@...nel.org
To:     Dave Airlie <airlied@...ux.ie>,
        DRI <dri-devel@...ts.freedesktop.org>
Cc:     Alex Deucher <alexander.deucher@....com>,
        Daniel Vetter <daniel.vetter@...ll.ch>,
        Guchun Chen <guchun.chen@....com>,
        Leslie Shi <Yuliang.Shi@....com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Tomohito Esaki <etom@...l.co.jp>
Subject: linux-next: manual merge of the drm tree with the drm-fixes tree

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);