[19/26] drm/i915: use new cursor in intel_prepare_plane_fb

Message ID	20210913131707.45639-20-christian.koenig@amd.com
State	New
Headers	show Return-Path: <linux-media-owner@kernel.org> From: "=?UTF-8?q?Christian=20K=C3=B6nig?=" <ckoenig.leichtzumerken@gmail.com> To: linaro-mm-sig@lists.linaro.org, dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org Cc: daniel@ffwll.ch, intel-gfx@lists.freedesktop.org Subject: [PATCH 19/26] drm/i915: use new cursor in intel_prepare_plane_fb Date: Mon, 13 Sep 2021 15:17:00 +0200 Message-Id: <20210913131707.45639-20-christian.koenig@amd.com> In-Reply-To: <20210913131707.45639-1-christian.koenig@amd.com> References: <20210913131707.45639-1-christian.koenig@amd.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	[01/26] dma-buf: add dma_resv_for_each_fence_unlocked \| expand [01/26] dma-buf: add dma_resv_for_each_fence_unlocked [02/26] dma-buf: add dma_resv_for_each_fence [03/26] dma-buf: use new iterator in dma_resv_copy_fences [08/26] drm/amdgpu: use the new iterator in amdgpu_sync_resv [12/26] drm/scheduler: use new iterator in drm_sched_job_add_implicit_dependencies [13/26] drm/i915: use the new iterator in i915_gem_busy_ioctl [14/26] drm/i915: use the new iterator in i915_sw_fence_await_reservation [15/26] drm/i915: use the new iterator in i915_request_await_object [18/26] drm/i915: use new iterator in i915_gem_object_last_write_engine [19/26] drm/i915: use new cursor in intel_prepare_plane_fb [20/26] drm: use new iterator in drm_gem_fence_array_add_implicit [22/26] drm/nouveau: use the new iterator in nouveau_fence_sync [23/26] drm/nouveau: use the new interator in nv50_wndw_prepare_fb [24/26] drm/etnaviv: use new iterator in etnaviv_gem_describe

Message ID

20210913131707.45639-20-christian.koenig@amd.com

State

New

Headers

From: "=?UTF-8?q?Christian=20K=C3=B6nig?=" 
	<ckoenig.leichtzumerken@gmail.com>
To: linaro-mm-sig@lists.linaro.org, dri-devel@lists.freedesktop.org,
	linux-media@vger.kernel.org
Cc: daniel@ffwll.ch, intel-gfx@lists.freedesktop.org
Subject: [PATCH 19/26] drm/i915: use new cursor in intel_prepare_plane_fb
Date: Mon, 13 Sep 2021 15:17:00 +0200
Message-Id: <20210913131707.45639-20-christian.koenig@amd.com>
In-Reply-To: <20210913131707.45639-1-christian.koenig@amd.com>
References: <20210913131707.45639-1-christian.koenig@amd.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

[01/26] dma-buf: add dma_resv_for_each_fence_unlocked | expand

Commit Message

Christian König Sept. 13, 2021, 1:17 p.m. UTC

Simplifying the code a bit.

Signed-off-by: Christian König <christian.koenig@amd.com>
---
 drivers/gpu/drm/i915/display/intel_display.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index eec6c9e9cda7..11c38e0f7fe0 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -11133,6 +11133,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_cursor cursor;
 		struct dma_fence *fence;
 
 		ret = i915_sw_fence_await_reservation(&state->commit_ready,
@@ -11143,11 +11144,10 @@  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_for_each_fence_unlocked(obj->base.resv, &cursor, false,
+						 fence) {
 			add_rps_boost_after_vblank(new_plane_state->hw.crtc,
 						   fence);
-			dma_fence_put(fence);
 		}
 	} else {
 		add_rps_boost_after_vblank(new_plane_state->hw.crtc,

[19/26] drm/i915: use new cursor in intel_prepare_plane_fb

Commit Message

Patch