Received: by 2002:a05:6358:11c7:b0:104:8066:f915 with SMTP id i7csp5267688rwl; Mon, 3 Apr 2023 17:35:00 -0700 (PDT) X-Google-Smtp-Source: AKy350ZcgicPDa1ge8ROx4wdPZMDlaOt4Oj/39k67uObSb69cOLh5mE4K5nJT5NbQbq5q5LgxEBc X-Received: by 2002:aa7:d955:0:b0:502:a700:dc8b with SMTP id l21-20020aa7d955000000b00502a700dc8bmr768375eds.9.1680568499742; Mon, 03 Apr 2023 17:34:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680568499; cv=none; d=google.com; s=arc-20160816; b=TFkEF6mMS57Go0K6SrNstR06AhqbameHV8PyO6eDvKNMRMmfuBEHJTXpMasMPySIb1 afOXOMyyiytcIf3x9hmeTrggThMvY+nMGgEvxGrWiPqHVRpWtZkhGgNEOwdr4MURSbCg ZsetSZIFJ37O7UkNEeF1yhu19vf75rdlfGU2chDsPMvSPoQxtHJnVhDgHGTpCebNhbzy M3iOta4GBuyPgy4nKiMSXXHkQwBQgU233xSht2YDHdGVl3b1Pow+JE1y+/r7D6VvAxqZ u6zvBRARXrJnjhAJOpgzSqfztlxHI+ThUHuy6czp0x6vzFQVt3ZNIAqMl50Hgs0SVXw+ Gshg== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=ANyDgUlFZw2AcrRV0IxQJ2iSMTL1341z+Q8L+rwAzTE=; b=ZR6PCU5XOmXkHOY62Ze7NikU06zOdUBYZTEJ8Xlw9nWYyM0Y3oikHNzKpl557DhuWk WD4tPU2/FIMoHFaT8TJBFu+P+97dWe09s+8WRblQv24lLGdoVpYSR6h7a8Eiuus3BoCB cXPbL8u2kkq2IVvz5hPD+HuoOn4GPezaHj3cPJh8Aapngc/wVgGIpRUkKbGB8bYHYSJm C3z8ZHTZBojMjPyDjWUoEiI+FucZbXbJ1FMcCOaeQAw0qCkwdEd0fRDaOMmCpB1bxf1v N+PiSv1Ug9bmrsEyNDvQU+Ka7YmNfzUz3xSDMjS/A1U6n4gWOilpDcp14SrHr/qVvUP2 oJfw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@163.com header.s=s110527 header.b=bnFrPf4g; 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=163.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m13-20020a056402050d00b004bda466175dsi9258201edv.196.2023.04.03.17.34.33; Mon, 03 Apr 2023 17:34:59 -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=@163.com header.s=s110527 header.b=bnFrPf4g; 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=163.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232004AbjDDA2d (ORCPT + 99 others); Mon, 3 Apr 2023 20:28:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47388 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231910AbjDDA2b (ORCPT ); Mon, 3 Apr 2023 20:28:31 -0400 Received: from m12.mail.163.com (m12.mail.163.com [220.181.12.215]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id D49224200 for ; Mon, 3 Apr 2023 17:28:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=ANyDg UlFZw2AcrRV0IxQJ2iSMTL1341z+Q8L+rwAzTE=; b=bnFrPf4g/1eGQ5GM+txOl L9v3oao7JSDyNHhLfO9muKJKnaZOpyGlLXZrwXDSOqj5fWD90oOXEgoFGOKoYcgf C/mDvGe8NL/2xOGRSt9faROU+oenyWvM68q2mdAIBASosAEN+IwlyLB/ZfToePIe F1Xml34YNvIlQ0JEsItgnk= Received: from yuq-Aspire-4738G.lan (unknown [116.225.76.16]) by zwqz-smtp-mta-g3-0 (Coremail) with SMTP id _____wBHK4Tkbitk8woAAg--.8076S2; Tue, 04 Apr 2023 08:27:24 +0800 (CST) From: yq882255@163.com To: dri-devel@lists.freedesktop.org Cc: Erico Nunes , Lucas Stach , Stephen Rothwell , =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= , David Airlie , Daniel Vetter , lima@lists.freedesktop.org, linux-kernel@vger.kernel.org, Qiang Yu Subject: [PATCH 0/3] Revert lima fdinfo patchset Date: Tue, 4 Apr 2023 08:25:58 +0800 Message-Id: <20230404002601.24136-1-yq882255@163.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID: _____wBHK4Tkbitk8woAAg--.8076S2 X-Coremail-Antispam: 1Uf129KBjvdXoWrtr1xJrW5GF43Gw4xury5XFb_yoWfGFX_Ga y7JFy7WF1UAF1qyw17XwsrWryYka42vFZ5Jw1Uta9akry3Zr1DZr1DGrW5XryUXF42yF1k Ja10vF1fXanagjkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IU8lApUUUUUU== X-Originating-IP: [116.225.76.16] X-CM-SenderInfo: d1tymjqsvvqiywtou0bp/1tbiVg1HGlqzxIGuIAAAsk X-Spam-Status: No, score=0.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM, SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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 From: Qiang Yu Upstream has reverted the dependant commit df622729ddbf ("drm/scheduler: track GPU active time per entity""), but this patchset has been pushed to drm-misc-next which still has that commit. To avoid other branch build fail after merge drm-misc-next, just revert the lima patchset on drm-misc-next too. Qiang Yu (3): Revert "drm/lima: add show_fdinfo for drm usage stats" Revert "drm/lima: allocate unique id per drm_file" Revert "drm/lima: add usage counting method to ctx_mgr" drivers/gpu/drm/lima/lima_ctx.c | 30 +-------------------- drivers/gpu/drm/lima/lima_ctx.h | 3 --- drivers/gpu/drm/lima/lima_device.h | 3 --- drivers/gpu/drm/lima/lima_drv.c | 43 +----------------------------- drivers/gpu/drm/lima/lima_drv.h | 1 - 5 files changed, 2 insertions(+), 78 deletions(-) -- 2.25.1