From mboxrd@z Thu Jan 1 00:00:00 1970 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 A513ECD3436 for ; Fri, 8 May 2026 14:35:20 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5DB8210F510; Fri, 8 May 2026 14:35:20 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="kPeubaLP"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0F37910F510; Fri, 8 May 2026 14:35:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1778250920; x=1809786920; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=lpKJFCmSEQZQmGkNxjlocBOc7i09OP4o+3Fl5r5cYxM=; b=kPeubaLPBxKaAqiSp6dLS7mNT1uagJjl2OEqg9/y+hVaPI3uEEFDCdpp LvOrjHN0mpNNzgx8/0j/kNZVcWCC+3xTTIv3Ofmlb7sZTjTMtV/XkjIIY tmJtQp38/2T0t4cQ1DiDn1o+KBBlemSb2ayg8LvEUH9GvEYRoQAdbO3jO 0X1lFH/VQwE0fe6iH6PUE6oSPPp/2VxZiXWPUqKXdUAZpkndQQShXf5m6 612W3MyDmJq5Yublu5EC5hIGK8/t7KGMC3clvT4dkLIceapy0lnJ5YUpN cbfgN/F6ghg1kgfzz9ogw0nXnhIfJz9M7AjTz/1mAODJkF7e9gEzgGZP5 A==; X-CSE-ConnectionGUID: /i+tHlH1RPaxV9kflJSKrQ== X-CSE-MsgGUID: nNcxiwaDS5u0jc64RxIgRQ== X-IronPort-AV: E=McAfee;i="6800,10657,11780"; a="96644341" X-IronPort-AV: E=Sophos;i="6.23,223,1770624000"; d="scan'208";a="96644341" Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 May 2026 07:35:20 -0700 X-CSE-ConnectionGUID: KvEpQ+MNSuWjnFwKetq38Q== X-CSE-MsgGUID: qSyDAW0PS3i74xXyi+S4lA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,223,1770624000"; d="scan'208";a="238566517" Received: from egrumbac-mobl6.ger.corp.intel.com (HELO localhost) ([10.245.244.104]) by fmviesa004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 May 2026 07:35:18 -0700 From: Ville Syrjala To: intel-gfx@lists.freedesktop.org Cc: intel-xe@lists.freedesktop.org, Jani Nikula Subject: [PATCH v2 11/16] drm/xe: Introduce xe_fb_pin_ggtt_(un)pin() Date: Fri, 8 May 2026 17:34:21 +0300 Message-ID: <20260508143426.26504-12-ville.syrjala@linux.intel.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260508143426.26504-1-ville.syrjala@linux.intel.com> References: <20260508143426.26504-1-ville.syrjala@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Organization: Intel Finland Oy - BIC 0357606-4 - c/o Alberga Business Park, 6 krs Bertel Jungin Aukio 5, 02600 Espoo, Finland Content-Transfer-Encoding: 8bit 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: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" From: Ville Syrjälä Extract the inner DPT parts of intel_plane_(un)pin() into the xe_fb_pin_ggtt_(un)pin(). These will become part of the new fb_pin parent interface. Reviewed-by: Jani Nikula Signed-off-by: Ville Syrjälä --- drivers/gpu/drm/xe/display/xe_fb_pin.c | 41 ++++++++++++++++++++++---- 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/xe/display/xe_fb_pin.c b/drivers/gpu/drm/xe/display/xe_fb_pin.c index 0257fafdb0df..1db72c73f11e 100644 --- a/drivers/gpu/drm/xe/display/xe_fb_pin.c +++ b/drivers/gpu/drm/xe/display/xe_fb_pin.c @@ -428,6 +428,34 @@ void intel_fb_unpin_vma(struct i915_vma *vma, int fence_id) __xe_unpin_fb_vma(vma); } +static int xe_fb_pin_ggtt_pin(struct drm_gem_object *obj, + const struct intel_fb_pin_params *pin_params, + struct i915_vma **out_ggtt_vma, + u32 *out_offset, + int *out_fence_id) +{ + struct i915_vma *ggtt_vma; + + ggtt_vma = __xe_pin_fb_vma(obj, false, pin_params); + if (IS_ERR(ggtt_vma)) + return PTR_ERR(ggtt_vma); + + *out_ggtt_vma = ggtt_vma; + *out_offset = xe_ggtt_node_addr(ggtt_vma->node); + if (out_fence_id) + *out_fence_id = -1; + + return 0; +} + +static void xe_fb_pin_ggtt_unpin(struct i915_vma *ggtt_vma, + int fence_id) +{ + WARN_ON(fence_id >= 0); + + __xe_unpin_fb_vma(ggtt_vma); +} + static int xe_fb_pin_dpt_pin(struct drm_gem_object *obj, struct intel_dpt *dpt, const struct intel_fb_pin_params *pin_params, struct i915_vma **out_dpt_vma, @@ -513,11 +541,10 @@ int intel_plane_pin_fb(struct intel_plane_state *new_plane_state, return 0; if (!intel_fb_uses_dpt(&fb->base)) { - ggtt_vma = __xe_pin_fb_vma(obj, false, &pin_params); - if (IS_ERR(ggtt_vma)) - return PTR_ERR(ggtt_vma); - - offset = xe_ggtt_node_addr(ggtt_vma->node); + ret = xe_fb_pin_ggtt_pin(obj, &pin_params, + &ggtt_vma, &offset, NULL); + if (ret) + return ret; } else { ret = xe_fb_pin_dpt_pin(obj, fb->dpt, &pin_params, &dpt_vma, &ggtt_vma, &offset); @@ -538,9 +565,11 @@ void intel_plane_unpin_fb(struct intel_plane_state *old_plane_state) const struct intel_framebuffer *fb = to_intel_framebuffer(old_plane_state->hw.fb); if (!intel_fb_uses_dpt(&fb->base)) { - __xe_unpin_fb_vma(old_plane_state->ggtt_vma); + xe_fb_pin_ggtt_unpin(old_plane_state->ggtt_vma, + old_plane_state->fence_id); old_plane_state->ggtt_vma = NULL; + old_plane_state->fence_id = -1; } else { xe_fb_pin_dpt_unpin(fb->dpt, old_plane_state->dpt_vma, old_plane_state->ggtt_vma); -- 2.52.0