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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 40197C77B7D for ; Wed, 10 May 2023 12:13:18 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0A5FE10E487; Wed, 10 May 2023 12:13:18 +0000 (UTC) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id DC68A10E489 for ; Wed, 10 May 2023 12:13:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1683720795; x=1715256795; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ij+t9vjjHSc+qptr2YUAfp0C+YA+aYmNm0CkYtjEofk=; b=OHbF+CucEeIF7sp10Z1yVjJ4llmLrlZesTGg0vFv0jsAHX2U/T+RP26K Pzw0QWH6bf1EnZ5JYpvst6AarMR0GZ9zVt+iRfIrtg0oOcV4q21Dkjqmn 75DAhlwJ/VemJF/ouStReOeOo6b7VzhMns3Q8+Os7+sII380o+FwSUdnO GYr1gEneSTzpA1tL6LD6pHu2uGFsmzt9o+LXw9lK1K9A+9Lvxa7BP/+dD Ftr4wdES+bYyqVskyzjFRYLAwBUShNzTgD3iUTEF33a1adcdqytkZzCWv xI96NGcx5vkl5SzUeqkWXmvNHHdWqqS5k3lsnkZDVkiNDjY19Yoqb4mnP A==; X-IronPort-AV: E=McAfee;i="6600,9927,10705"; a="353268308" X-IronPort-AV: E=Sophos;i="5.99,264,1677571200"; d="scan'208";a="353268308" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 May 2023 05:13:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10705"; a="788906481" X-IronPort-AV: E=Sophos;i="5.99,264,1677571200"; d="scan'208";a="788906481" Received: from iisaev-mobl2.ger.corp.intel.com (HELO jhogande-mobl1.ger.corp.intel.com) ([10.252.62.141]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 May 2023 05:13:13 -0700 From: =?UTF-8?q?Jouni=20H=C3=B6gander?= To: intel-xe@lists.freedesktop.org Date: Wed, 10 May 2023 15:11:51 +0300 Message-Id: <20230510121152.736148-23-jouni.hogander@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230510121152.736148-1-jouni.hogander@intel.com> References: <20230510121152.736148-1-jouni.hogander@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Content-Transfer-Encoding: 8bit Subject: [Intel-xe] [RFC PATCH v2 22/23] drm/i915: Handle dma fences in dirtyfb callback X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jani.nikula@intel.com, rodrigo.vivi@kernel.org, =?UTF-8?q?Jouni=20H=C3=B6gander?= , ville.syrjala@linux.intel.com Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" Take into account dma fences in dirtyfb callback. If there is no unsignaled dma fences perform flush immediately. If there are unsignaled dma fences perform invalidate and add callback which will queue flush when the fence gets signaled. Signed-off-by: Jouni Högander --- drivers/gpu/drm/i915/display/intel_fb.c | 55 +++++++++++++++++++++++-- 1 file changed, 52 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c index fa4464d433b7..fc325f2299a4 100644 --- a/drivers/gpu/drm/i915/display/intel_fb.c +++ b/drivers/gpu/drm/i915/display/intel_fb.c @@ -8,6 +8,9 @@ #include #include +#include +#include + #include "i915_drv.h" #include "intel_display.h" #include "intel_display_types.h" @@ -1888,6 +1891,20 @@ static int intel_user_framebuffer_create_handle(struct drm_framebuffer *fb, } #ifdef I915 +struct frontbuffer_fence_cb { + struct dma_fence_cb base; + struct intel_frontbuffer *front; +}; + +static void intel_user_framebuffer_fence_wake(struct dma_fence *dma, + struct dma_fence_cb *data) +{ + struct frontbuffer_fence_cb *cb = container_of(data, typeof(*cb), base); + + intel_frontbuffer_queue_flush(cb->front); + kfree(cb); +} + static int intel_user_framebuffer_dirty(struct drm_framebuffer *fb, struct drm_file *file, unsigned int flags, unsigned int color, @@ -1895,11 +1912,43 @@ static int intel_user_framebuffer_dirty(struct drm_framebuffer *fb, unsigned int num_clips) { struct drm_i915_gem_object *obj = intel_fb_obj(fb); + struct intel_frontbuffer *front = to_intel_frontbuffer(fb); + struct dma_resv_iter cursor; + struct dma_fence *fence; + int ret; + + if (dma_resv_test_signaled(intel_bo_to_drm_bo(obj).resv, dma_resv_usage_rw(false))) { + intel_bo_flush_if_display(obj); + intel_frontbuffer_flush(front, ORIGIN_DIRTYFB); + return 0; + } - intel_bo_flush_if_display(obj); - intel_frontbuffer_flush(to_intel_frontbuffer(fb), ORIGIN_DIRTYFB); + intel_frontbuffer_invalidate(front, ORIGIN_DIRTYFB); - return 0; + dma_resv_iter_begin(&cursor, intel_bo_to_drm_bo(obj).resv, + dma_resv_usage_rw(false)); + dma_resv_for_each_fence_unlocked(&cursor, fence) { + struct frontbuffer_fence_cb *cb = + kmalloc(sizeof(struct frontbuffer_fence_cb), GFP_KERNEL); + if (!cb) { + ret = -ENOMEM; + break; + } + cb->front = front; + + ret = dma_fence_add_callback(fence, &cb->base, + intel_user_framebuffer_fence_wake); + if (ret) { + intel_user_framebuffer_fence_wake(fence, &cb->base); + if (ret == -ENOENT) + ret = 0; + else + break; + } + } + dma_resv_iter_end(&cursor); + + return ret; } #endif -- 2.34.1