From patchwork Mon Oct 24 11:33:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9332 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp466557wru; Mon, 24 Oct 2022 06:55:24 -0700 (PDT) X-Google-Smtp-Source: AMsMyM46+HhvDuL3zbiCH976I2xWHRAhuk0HzANbE/YfAu+HJH7MPgHnpgyOQe52ARBEsoIPvE1r X-Received: by 2002:a17:902:b210:b0:17d:c3ca:4a4f with SMTP id t16-20020a170902b21000b0017dc3ca4a4fmr32643630plr.33.1666619724331; Mon, 24 Oct 2022 06:55:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666619724; cv=none; d=google.com; s=arc-20160816; b=rsHo1JmaC639EpgVTz1GfhB9mQeXqP4rELFWwsWKTXYpeEH0nIVhWFDY4Bg5xnlWNJ RH6qj9x5Z2rriNQWsPHU077M1aBmtDmlV3o+lwcoZBOSymDGL/XjHIyrC3EexFSf+jNr WzNI+jbb10iPRV/HZJIwyEjy8O6BZcGOde5U/TpgF1Y08zo2MyOwshsqgBgmWQvEqV5C c0hSULic5chqmlezlXqTBj7UO5BkQnfxRMvv2hcSCDtXBPXVsQvKG07vwb9z1EV9KILS /3PbQqbqYWWTMWv528bSSAiGGYaryXpWP1vf+RtwUcmb5mYzG0BT/hRrmyA3Vqqed+N2 svww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=0WxvFn1hQwre//tJdjZz3m1ITOWz52m+U27nbrsjVY4=; b=xCOWvvs/LU6hcSn2yM2cJtIFqR8yVIzzKW29TBpQ+Wx51lWDwGkQ4SuxGdkHJfr61D QRBShReVBnNxgCZah/eRuliht/p+iaxXo9iU2UPxCJDPytmBjm0GVMq7s1fBLpwRQMAE nDUP9ZluyYbTBsFDEH4V+7I4Pspfn4w5ZF64T4K1TECQiyqtBQbUMoH4sLVZ71DZvka4 tARdirzBC64Ar/Z3JuhHz8H/PCWO6EmDde6PQrQYYRwmgNG6WOPfPA2aDYL7pDy07GGI yopTEUYkNoRLCnek63crEZqolAgF8R1Lgty3vVhbFU6dD2hOufgo94Rny0zIjZpqAMfp iogg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=op8mMeUZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j18-20020a170902da9200b00179f8a3f838si39508043plx.593.2022.10.24.06.55.10; Mon, 24 Oct 2022 06:55:24 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=op8mMeUZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236745AbiJXNyA (ORCPT + 99 others); Mon, 24 Oct 2022 09:54:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49024 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236600AbiJXNw7 (ORCPT ); Mon, 24 Oct 2022 09:52:59 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9B318BBE3F; Mon, 24 Oct 2022 05:43:12 -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 C19F361311; Mon, 24 Oct 2022 12:33:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D7F32C433D7; Mon, 24 Oct 2022 12:33:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666614783; bh=NPOknD0rJ0I/KWRESIDmNBsqO1xyQsFCXZyiqgfPqj0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=op8mMeUZE0neJYd3c2Ogkvzi7dQTYt3NlU/AtTGF2f0oyeUHTW8A3kiaATVt+CVOQ +wEEU7vv+UkgTGcdYD+HVY8lCT8zhpU3LPBPZe4/NoJILzyNjhtidIcyB1CfHFJ8YT AsV9Vo2CRQZzJfw0+18E8jvaBDkVDDljNn86Zrmg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Shuah Khan Subject: [PATCH 5.10 385/390] Revert "drm/amdgpu: use dirty framebuffer helper" Date: Mon, 24 Oct 2022 13:33:02 +0200 Message-Id: <20221024113039.374918348@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113022.510008560@linuxfoundation.org> References: <20221024113022.510008560@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747577444231909501?= X-GMAIL-MSGID: =?utf-8?q?1747577444231909501?= From: Shuah Khan This reverts commit 867b2b2b6802fb3995a0065fc39e0e7e20d8004d which is commit 66f99628eb24409cb8feb5061f78283c8b65f820 upstream. With this commit, dmesg fills up with the following messages and drm initialization takes a very long time. This commit has bee reverted from 5.4 [drm] Fence fallback timer expired on ring sdma0 [drm] Fence fallback timer expired on ring gfx [drm] Fence fallback timer expired on ring sdma0 [drm] Fence fallback timer expired on ring gfx [drm] Fence fallback timer expired on ring sdma0 [drm] Fence fallback timer expired on ring sdma0 [drm] Fence fallback timer expired on ring sdma0 [drm] Fence fallback timer expired on ring gfx Cc: # 5.10 Signed-off-by: Shuah Khan Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 2 -- 1 file changed, 2 deletions(-) --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c @@ -35,7 +35,6 @@ #include #include #include -#include #include #include #include @@ -499,7 +498,6 @@ bool amdgpu_display_ddc_probe(struct amd static const struct drm_framebuffer_funcs amdgpu_fb_funcs = { .destroy = drm_gem_fb_destroy, .create_handle = drm_gem_fb_create_handle, - .dirty = drm_atomic_helper_dirtyfb, }; uint32_t amdgpu_display_supported_domains(struct amdgpu_device *adev,