From nobody Fri Dec 19 17:33:58 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8BAB6C32771 for ; Mon, 26 Sep 2022 11:27:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237958AbiIZL1U (ORCPT ); Mon, 26 Sep 2022 07:27:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35276 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234847AbiIZL0Z (ORCPT ); Mon, 26 Sep 2022 07:26:25 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3BABC69F4A; Mon, 26 Sep 2022 03:40:48 -0700 (PDT) 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 dfw.source.kernel.org (Postfix) with ESMTPS id E96BD609FE; Mon, 26 Sep 2022 10:40:47 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E5914C433D6; Mon, 26 Sep 2022 10:40:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1664188847; bh=p308GEKL87lFJ0U7hsKmHpyPZR1lRw7skm/TfB2cL2M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zuHlKXhZbIAHBmVBkAccjAayF6SWl3sQQZ15IR3QcsDASjpPC48EXE5ElRyQAwYGu 4LaaJRR43i+m5FKUmoeNOqWd2fblt5hwhMSh//3op+6jL9ZMk9qaSYvjkhF6pqEGSJ RTPFonfz7dHPHUdE+kdRR2SUEOQhT5kICH8ezjT0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arthur Marsh , Hamza Mahfooz , Alex Deucher , Sasha Levin Subject: [PATCH 5.15 140/148] drm/amdgpu: dont register a dirty callback for non-atomic Date: Mon, 26 Sep 2022 12:12:54 +0200 Message-Id: <20220926100801.461684305@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220926100756.074519146@linuxfoundation.org> References: <20220926100756.074519146@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Alex Deucher [ Upstream commit abbc7a3dafb91b9d4ec56b70ec9a7520f8e13334 ] Some asics still support non-atomic code paths. Fixes: 66f99628eb2440 ("drm/amdgpu: use dirty framebuffer helper") Reported-by: Arthur Marsh Reviewed-by: Hamza Mahfooz Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/= amd/amdgpu/amdgpu_display.c index 47fb722ab374..d3d2c214554e 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c @@ -36,6 +36,7 @@ #include #include #include +#include #include #include #include @@ -491,6 +492,11 @@ bool amdgpu_display_ddc_probe(struct amdgpu_connector = *amdgpu_connector, static const struct drm_framebuffer_funcs amdgpu_fb_funcs =3D { .destroy =3D drm_gem_fb_destroy, .create_handle =3D drm_gem_fb_create_handle, +}; + +static const struct drm_framebuffer_funcs amdgpu_fb_funcs_atomic =3D { + .destroy =3D drm_gem_fb_destroy, + .create_handle =3D drm_gem_fb_create_handle, .dirty =3D drm_atomic_helper_dirtyfb, }; =20 @@ -1111,7 +1117,10 @@ int amdgpu_display_gem_fb_verify_and_init( if (ret) goto err; =20 - ret =3D drm_framebuffer_init(dev, &rfb->base, &amdgpu_fb_funcs); + if (drm_drv_uses_atomic_modeset(dev)) + ret =3D drm_framebuffer_init(dev, &rfb->base, &amdgpu_fb_funcs_atomic); + else + ret =3D drm_framebuffer_init(dev, &rfb->base, &amdgpu_fb_funcs); if (ret) goto err; =20 --=20 2.35.1