From patchwork Fri Feb 25 16:37:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 12760538 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A586AC433EF for ; Fri, 25 Feb 2022 16:37:58 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 169E310E5FD; Fri, 25 Feb 2022 16:37:58 +0000 (UTC) Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by gabe.freedesktop.org (Postfix) with ESMTPS id B78E510E5C3 for ; Fri, 25 Feb 2022 16:37:56 +0000 (UTC) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 79D86B83284; Fri, 25 Feb 2022 16:37:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0A2B9C340E7; Fri, 25 Feb 2022 16:37:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1645807072; bh=dRaPP8U/qTouq/QANC7IxWpVYFkRYB9CeMb80MzSHhk=; h=From:To:Cc:Subject:Date:From; b=Vf69LTEOSafT8UIUHydSmL5goIF3wOUmpFO31AQYB5oJbw7Rj9odEjyRadWBN6ery J2HiB7MOxCc7Bmago6rwxetuKUcBDSX9MqhBdCOCnVpkFTX2vyJsxZ3wnhJTJNhqy5 mGh+HPKOsbLDLF/8B1AICFiV2CBCjT6VerROgKyK6zYnDtp0yLBuYg7jtkAGvDsFb7 e4j17/59RU/+XMHpa2tiNV4BhUizfk5OeggdVf+y3dJlYDpKqBvIuEUjB0Rd7U9/hA eFO39VhRcyGtqOfRrzIuX85Yj6qU7bAsFyK6u3ouiuDz/50aYfbrSd02VFHTofN4qA c6njHZguMFh7A== From: broonie@kernel.org To: Dave Airlie , DRI Subject: linux-next: manual merge of the drm tree with the drm-fixes tree Date: Fri, 25 Feb 2022 16:37:47 +0000 Message-Id: <20220225163747.888284-1-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Guchun Chen , Daniel Vetter , Linux Kernel Mailing List , Linux Next Mailing List , Alex Deucher , Leslie Shi , Tomohito Esaki Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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. +++ 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); diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_display.c index c4387b38229c2,9e5fc4cdb8ec9..0000000000000 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c