From patchwork Mon Oct 24 11:26:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9276 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp462677wru; Mon, 24 Oct 2022 06:46:22 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7HFUcK2q3pVSmcZFzDw/RIYPMPKp780urfQTI9AytT6syrs4+M7ltOchfi5a7zEM3hWFpf X-Received: by 2002:a17:907:6e28:b0:7a0:b6b5:5103 with SMTP id sd40-20020a1709076e2800b007a0b6b55103mr10776933ejc.300.1666619182201; Mon, 24 Oct 2022 06:46:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666619182; cv=none; d=google.com; s=arc-20160816; b=iTnwSNnlryDuZ6HXcpSFLgsAeK338+9QRFvZRkM4zETbkgC+OqBaftrIzm2gvTg3Io IlcNiYVQHL+YdDauYe9sub8qmAKnvWs+pDYQE6D17zNWAoDGtsthKgCCsdN6GORPfsLd usbz1nyo4zSoFmVGVutsmaN6/F0f87rs0xYInDszvcMEwj55jSew1NAHIbrfemgpQCva AAAm/7m/Nf3YtdXiCIkQLicKlsKDjzYydQqFdCN5OUeakTTSMheToGQhgRXkCT5Ws3iw csmFfkUbxYVR3iOyBqR9cFMe6CU6G+EiU1op+g7hLtFbP/pBSDjY9ecirdxkNQ+GZ6Wi 9FgQ== 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=RbMeTsfmGJ79yXFaT/cicd16v8iQQp4JNkpyEwOVQ/8=; b=QuhyuIzjHz/qpsg/cV6w2VSx28mxdncvuRV6ElXdFPpAnoOW5nvxlJPEtscUSGRd9f 6t8znuT8bFzUudBp0VwsbS4ftWZRk6RR3gqnjSm4luhs/U5DbwfGIEd/QyqsIusG3bMD 4/RZvxKHB4Y3dcHtoSxyFo9vGVMK6BRTiLY8S4dw7RPTGxJVfvqJ69gKrpmU+beLAqjK DTEtT6oW8pk1glIzPBUIi0gw3gK77unLfRA7NbN8BantOr65kFEKtoWGChXkfZHmxeL0 zAMIi2ePrhl5tNDQWEa7ujS8kLj0LzlJ8U4LQBATvu6GL9BoIrzOssqbtSiIxDbSUK+A MZ5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=DrOsWBWx; 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 l16-20020aa7cad0000000b00459c1e64776si24850250edt.412.2022.10.24.06.45.58; Mon, 24 Oct 2022 06:46:22 -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=DrOsWBWx; 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 S236317AbiJXNno (ORCPT + 99 others); Mon, 24 Oct 2022 09:43:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40488 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236572AbiJXNkn (ORCPT ); Mon, 24 Oct 2022 09:40:43 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C305FB3B12; Mon, 24 Oct 2022 05:37:38 -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 EDA85612BB; Mon, 24 Oct 2022 12:35:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 086BCC433C1; Mon, 24 Oct 2022 12:35:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666614912; bh=p3GXiVr5YR4RO0NRzMuEbRh05Hvssbnu1YzSmUJ70h4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DrOsWBWxk4iXK6JVizr+RedtRyUF30pceNwfehDXZJdj46aglcVM5zTXpi834kUId Cy5SVRuWcEFiQIzBbCqar+pq6pzt3lY3aKskv2gx/qNhvjomhH0mudf6PCRV3YYAHy MQ8PGMR0dlAXZ28/8CNNed0O5TDWgC+Q82q6X5Y0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hamza Mahfooz , Alex Deucher Subject: [PATCH 5.15 050/530] Revert "drm/amdgpu: use dirty framebuffer helper" Date: Mon, 24 Oct 2022 13:26:34 +0200 Message-Id: <20221024113047.284017470@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113044.976326639@linuxfoundation.org> References: <20221024113044.976326639@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?1747576876000300956?= X-GMAIL-MSGID: =?utf-8?q?1747576876000300956?= From: Hamza Mahfooz commit 17d819e2828cacca2e4c909044eb9798ed379cd2 upstream. This reverts commit 66f99628eb24409cb8feb5061f78283c8b65f820. Unfortunately, that commit causes performance regressions on non-PSR setups. So, just revert it until FB_DAMAGE_CLIPS support can be added. Cc: stable@vger.kernel.org Link: https://gitlab.freedesktop.org/drm/amd/-/issues/2189 Link: https://bugzilla.kernel.org/show_bug.cgi?id=216554 Fixes: 66f99628eb2440 ("drm/amdgpu: use dirty framebuffer helper") Fixes: abbc7a3dafb91b ("drm/amdgpu: don't register a dirty callback for non-atomic") Signed-off-by: Hamza Mahfooz Acked-by: Alex Deucher Signed-off-by: Alex Deucher Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c @@ -35,8 +35,6 @@ #include #include #include -#include -#include #include #include #include @@ -494,12 +492,6 @@ static const struct drm_framebuffer_func .create_handle = drm_gem_fb_create_handle, }; -static const struct drm_framebuffer_funcs amdgpu_fb_funcs_atomic = { - .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, uint64_t bo_flags) { @@ -1117,10 +1109,8 @@ int amdgpu_display_gem_fb_verify_and_ini if (ret) goto err; - if (drm_drv_uses_atomic_modeset(dev)) - ret = drm_framebuffer_init(dev, &rfb->base, &amdgpu_fb_funcs_atomic); - else - ret = drm_framebuffer_init(dev, &rfb->base, &amdgpu_fb_funcs); + ret = drm_framebuffer_init(dev, &rfb->base, &amdgpu_fb_funcs); + if (ret) goto err;