From patchwork Tue Nov 16 10:24:29 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: 12622429 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 02CADC433FE for ; Tue, 16 Nov 2021 14:05:23 +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 BF2BD61B48 for ; Tue, 16 Nov 2021 14:05:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org BF2BD61B48 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 7A6F26EAE3; Tue, 16 Nov 2021 14:05:17 +0000 (UTC) Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by gabe.freedesktop.org (Postfix) with ESMTPS id D8A826E1B5; Tue, 16 Nov 2021 10:24:39 +0000 (UTC) Received: by mail-wr1-x42a.google.com with SMTP id i5so36561612wrb.2; Tue, 16 Nov 2021 02:24:39 -0800 (PST) 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=/4l9UpfpZvlcAJNqS1oueUKAgaTadj3L3dcu3aCeFd0=; b=X6YtO8fQFgHeAM78h1drfhlaE/8TTV0MtTOgWsG8UaHat9K//dTItofi9o1fVhvDWx i6doqxMw0iVQUGtbGygBljZWhYVi5WCpcxiTeCOsNRtx3MMzV25YqR5j2DyUgc2lCMCy p23QrtoCC8i41mDpvMCD3V1d4bC9Qn8gZEABZMRn2UQkYKkrUQtUoQWFgBTyItNISpgL OomRNHhv56CwICwHWrCcqYxURZSW6fqQgVDqAI5EwD+01Ozj3/kEmzehIxlKg5TDzfvP BdjBoft5Y2bZemAnKgJcSyjKNWQNJqIm9ZDj0ygTyiZCGZ0V6CaaDu1b9BwhxJAwEcPD CdyA== 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=/4l9UpfpZvlcAJNqS1oueUKAgaTadj3L3dcu3aCeFd0=; b=SuI5ZQSzURGBY9t6udLowMbI4WMHm6dsNt9HDVK+x00xCucK7pQS/eEK6osoNCnui2 kxNa9r3r2fzRMeP24C2fszSsjUUoWOaaWVQb7zmkAqN0+kQCEjWRZL5p1f5a43sabKfE xUWQriNv64GXPu7p1JJCUBRn54xHqlLgqwawUCOG5ZegUBxzKHCh8F61nJihyn3C6f9L fAwuEiDyzmx/KTxj27mphrRp2GK++1JpzNR4zoPUCwbvlorirJmsR0tHrbpZU1nvI1rj +WvBnctBbCkT6zWJE6T0Aj/Pfo8KfXmXizN9xSncESWiq1Qq9LzZGVTeSVHiIU9sddQB 1YkQ== X-Gm-Message-State: AOAM530NVeF58/SWGA724ObBdMOIw8mETQ45hvcxiI9tuAsnJfwKRImw bq0DzyapjL+Q8fjhGf9tzvhYFKW34m4OLQ== X-Google-Smtp-Source: ABdhPJzBbsuMAlzgo6pQRHAkbRYqahbSlTQixxFF9G+xUmm2lvGRQeddunENZlSax7WELSUAX1/xvA== X-Received: by 2002:adf:fa81:: with SMTP id h1mr7890427wrr.27.1637058278542; Tue, 16 Nov 2021 02:24:38 -0800 (PST) Received: from abel.fritz.box (p57b0b77b.dip0.t-ipconnect.de. [87.176.183.123]) by smtp.gmail.com with ESMTPSA id 4sm22119334wrz.90.2021.11.16.02.24.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Nov 2021 02:24:38 -0800 (PST) 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, dri-devel@lists.freedesktop.org Date: Tue, 16 Nov 2021 11:24:29 +0100 Message-Id: <20211116102431.198905-5-christian.koenig@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211116102431.198905-1-christian.koenig@amd.com> References: <20211116102431.198905-1-christian.koenig@amd.com> MIME-Version: 1.0 X-Mailman-Approved-At: Tue, 16 Nov 2021 14:05:08 +0000 Subject: [Intel-gfx] [PATCH 4/6] drm/i915: use new cursor in intel_prepare_plane_fb v2 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. v2: rebased Signed-off-by: Christian König Acked-by: Daniel Vetter --- drivers/gpu/drm/i915/display/intel_atomic_plane.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_atomic_plane.c b/drivers/gpu/drm/i915/display/intel_atomic_plane.c index 0be8c00e3db9..cdc68fb51ba6 100644 --- a/drivers/gpu/drm/i915/display/intel_atomic_plane.c +++ b/drivers/gpu/drm/i915/display/intel_atomic_plane.c @@ -738,6 +738,7 @@ intel_prepare_plane_fb(struct drm_plane *_plane, i915_gem_object_wait_priority(obj, 0, &attr); 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, @@ -748,12 +749,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);