From patchwork Thu Sep 23 07:56:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christian_K=C3=B6nig?= X-Patchwork-Id: 12512495 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C207FC4332F for ; Thu, 23 Sep 2021 11:58:31 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 957A261107 for ; Thu, 23 Sep 2021 11:58:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 957A261107 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 857D46ED12; Thu, 23 Sep 2021 11:58:28 +0000 (UTC) Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by gabe.freedesktop.org (Postfix) with ESMTPS id 10E956ECF8 for ; Thu, 23 Sep 2021 07:56:27 +0000 (UTC) Received: by mail-wr1-x42b.google.com with SMTP id q11so14488527wrr.9 for ; Thu, 23 Sep 2021 00:56:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=ETFFVmDbRxb5cxrXOen58gkxhSGsPJL2Y8O/7sOAJto=; b=CWmaT6p+IP5wmKpo0j6GfDewzCHSGfP7rKr6Na4PmWmJeHeZVhnkSxiGMkjzGf08P7 cqjlArXG96JGEZmsPCLLMM4rBblNXCg0pEstUfRuwh980hU+INLdSqISEmO6t4P8VELJ TGPBr6C2uSmHM+1SJKwcXLHiQqbbynxq7rDxkxM19a7uUTlVapiqwXahI3Q0/K83cFkW oVzumxUItaXeFPIvQkC/9IzSpIKW7eGbKRp6bgyz08xD4aWsVFw5ZnOPiIF/nKJg6pF8 sPQMn8pNMp8NZNEWP2r5QTzlAyMxgrGs9z/0Cw77GapcfIjA8NMNd6Vs9QDcmmz952J8 RAcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ETFFVmDbRxb5cxrXOen58gkxhSGsPJL2Y8O/7sOAJto=; b=ei1wPZqaTdY2X6ja7eWZCndJgMchHvP/FHVBMrNDtoTpL5fJTWfaU6BqsFioFdaUK2 R3rREmxzxnme4rVhqul16GWTUjFhboFFCdcIM5X+Q5ebwECzyxMW4h4KN4Gr/8HhIBj0 ibpAheCqUNb6uBbVMU+80TlTWGrZXqLyGXQfZUJYZeRADoBEOOrVj29jOdzBwM1XHb8N K/J7j0uwfn/g3cBDIC5kwrroHCvYoLGmzAb53en2woI6sRWMJ2P1z78CqM9VCF9fI4cp C7qbMABccpkylWu5689T9pv5L89+VI9DwLhEkzSP7mKxE6cq8vAbhEciCtEXspNVNmvV OMLA== X-Gm-Message-State: AOAM530Z8mBAcWr1Egf08629UmeJTDBL7ErG+o0qU2nP/ztx7GhkasJO Vo6MM851Kz3cmfO2xstJax+Xk5lq+rM= X-Google-Smtp-Source: ABdhPJyMplS32YX6/Lk8UVzT0hEEJhan8X6KIgu4LXwrqOXerdrsAGL4sJjwldYkvKQEO0zLeocoKg== X-Received: by 2002:a1c:9dd2:: with SMTP id g201mr14287569wme.46.1632383785566; Thu, 23 Sep 2021 00:56:25 -0700 (PDT) Received: from abel.fritz.box (p5b0ea1b5.dip0.t-ipconnect.de. [91.14.161.181]) by smtp.gmail.com with ESMTPSA id k19sm4280704wmr.21.2021.09.23.00.56.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Sep 2021 00:56:25 -0700 (PDT) From: " =?utf-8?q?Christian_K=C3=B6nig?= " X-Google-Original-From: =?utf-8?q?Christian_K=C3=B6nig?= To: intel-gfx@lists.freedesktop.org Date: Thu, 23 Sep 2021 09:56:02 +0200 Message-Id: <20210923075608.2873-19-christian.koenig@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210923075608.2873-1-christian.koenig@amd.com> References: <20210923075608.2873-1-christian.koenig@amd.com> MIME-Version: 1.0 X-Mailman-Approved-At: Thu, 23 Sep 2021 11:57:22 +0000 Subject: [Intel-gfx] [PATCH 19/25] drm/i915: use new cursor in intel_prepare_plane_fb X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Simplifying the code a bit. Signed-off-by: Christian König --- drivers/gpu/drm/i915/display/intel_display.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index 134a6acbd8fb..d32137a84694 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -11290,6 +11290,7 @@ intel_prepare_plane_fb(struct drm_plane *_plane, i915_gem_object_flush_frontbuffer(obj, ORIGIN_DIRTYFB); if (!new_plane_state->uapi.fence) { /* implicit fencing */ + struct dma_resv_iter cursor; struct dma_fence *fence; ret = i915_sw_fence_await_reservation(&state->commit_ready, @@ -11300,12 +11301,12 @@ intel_prepare_plane_fb(struct drm_plane *_plane, if (ret < 0) goto unpin_fb; - fence = dma_resv_get_excl_unlocked(obj->base.resv); - if (fence) { + dma_resv_iter_begin(&cursor, obj->base.resv, false); + dma_resv_for_each_fence_unlocked(&cursor, fence) { add_rps_boost_after_vblank(new_plane_state->hw.crtc, fence); - dma_fence_put(fence); } + dma_resv_iter_end(&cursor); } else { add_rps_boost_after_vblank(new_plane_state->hw.crtc, new_plane_state->uapi.fence);