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 26053FDEE2B for ; Thu, 23 Apr 2026 16:54:18 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D878E10E341; Thu, 23 Apr 2026 16:54:17 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="Jal2H7VZ"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) by gabe.freedesktop.org (Postfix) with ESMTPS id F34A310E341; Thu, 23 Apr 2026 16:54:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1776963257; x=1808499257; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=i7q3AG4MPSqObFj84WeFtnmHk0Wpazya8KXBRd4Pwfs=; b=Jal2H7VZ5bUK74BZsc1qvwiW4koUaiBc48pAiXF8yh+ezuRXGypOiolW Y74itZN7M3Itsgnxc56l5OaghfalYq8AmKWiNcnaOMXhxsWsJgRiS4/T1 K8I+7gkzO1owlL4qtGZlc/FLptlEnXPt8REuxdwAg5u2OKxNehK22Mx7L jWrUiEZe8IOro+fIg+DiSc+SqcpHbSTIijA7cXvKRuL4GSJQqGvQHruGL wjgsL7oZ++o0hIe/a7RZoRDa6P00MxUVNYeYdqWV9gLkDDQmn/CgH/txi /8ekJBH3htHSL2HqCeY7VfoLxx+AhoaopCWGJTniPWCSQvC3Qw4KlxFry w==; X-CSE-ConnectionGUID: TUliSiUIS3+z7c4uUvxPbQ== X-CSE-MsgGUID: Z7nVB5oxSKK4f6TgG2Z59g== X-IronPort-AV: E=McAfee;i="6800,10657,11765"; a="88245202" X-IronPort-AV: E=Sophos;i="6.23,195,1770624000"; d="scan'208";a="88245202" Received: from orviesa005.jf.intel.com ([10.64.159.145]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Apr 2026 09:54:17 -0700 X-CSE-ConnectionGUID: mvvSYC28TRWvPkmUWUNRXg== X-CSE-MsgGUID: tU9eFhtdQO6muXZ6cbCyYA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,195,1770624000"; d="scan'208";a="237765231" Received: from ijarvine-mobl1.ger.corp.intel.com (HELO localhost) ([10.245.244.188]) by orviesa005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Apr 2026 09:54:16 -0700 From: Ville Syrjala To: intel-gfx@lists.freedesktop.org Cc: intel-xe@lists.freedesktop.org Subject: [PATCH 06/16] drm/i915: Introduce i915_fb_pin_ggtt_(un)pin() Date: Thu, 23 Apr 2026 19:53:35 +0300 Message-ID: <20260423165346.20884-7-ville.syrjala@linux.intel.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260423165346.20884-1-ville.syrjala@linux.intel.com> References: <20260423165346.20884-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 i915_fb_pin_ggtt_(un)pin(). These will become part of the new fb_pin parent interface. Signed-off-by: Ville Syrjälä --- drivers/gpu/drm/i915/i915_fb_pin.c | 68 +++++++++++++++++++----------- 1 file changed, 44 insertions(+), 24 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_fb_pin.c b/drivers/gpu/drm/i915/i915_fb_pin.c index 0019f570d843..e14d2c1fb81f 100644 --- a/drivers/gpu/drm/i915/i915_fb_pin.c +++ b/drivers/gpu/drm/i915/i915_fb_pin.c @@ -257,6 +257,41 @@ intel_plane_fb_vtd_guard(const struct intel_plane_state *plane_state) plane_state->hw.rotation); } +static int i915_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 = intel_fb_pin_to_ggtt(obj, pin_params, out_fence_id); + if (IS_ERR(ggtt_vma)) + return PTR_ERR(ggtt_vma); + + *out_ggtt_vma = ggtt_vma; + + /* + * Pre-populate the dma address before we enter the vblank + * evade critical section as i915_gem_object_get_dma_address() + * will trigger might_sleep() even if it won't actually sleep, + * which is the case when the fb has already been pinned. + */ + if (pin_params->needs_physical) + *out_offset = i915_gem_object_get_dma_address(to_intel_bo(obj), 0); + else + *out_offset = i915_ggtt_offset(ggtt_vma); + + return 0; +} + +static void i915_fb_pin_ggtt_unpin(struct i915_vma *ggtt_vma, + int fence_id) +{ + if (ggtt_vma) + intel_fb_unpin_vma(ggtt_vma, fence_id); +} + static int i915_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, @@ -325,24 +360,11 @@ int intel_plane_pin_fb(struct intel_plane_state *plane_state, .needs_fence = intel_plane_needs_fence(display), }; - ggtt_vma = intel_fb_pin_to_ggtt(intel_fb_bo(&fb->base), &pin_params, - intel_plane_uses_fence(plane_state) ? &fence_id : NULL); - if (IS_ERR(ggtt_vma)) - return PTR_ERR(ggtt_vma); - - /* - * Pre-populate the dma address before we enter the vblank - * evade critical section as i915_gem_object_get_dma_address() - * will trigger might_sleep() even if it won't actually sleep, - * which is the case when the fb has already been pinned. - */ - if (intel_plane_needs_physical(plane)) { - struct drm_i915_gem_object *obj = to_intel_bo(intel_fb_bo(&fb->base)); - - offset = i915_gem_object_get_dma_address(obj, 0); - } else { - offset = i915_ggtt_offset(ggtt_vma); - } + ret = i915_fb_pin_ggtt_pin(intel_fb_bo(&fb->base), + &pin_params, &ggtt_vma, &offset, + intel_plane_uses_fence(plane_state) ? &fence_id : NULL); + if (ret) + return ret; } else { struct intel_fb_pin_params pin_params = { .view = &plane_state->view.gtt, @@ -371,13 +393,11 @@ void intel_plane_unpin_fb(struct intel_plane_state *old_plane_state) to_intel_framebuffer(old_plane_state->hw.fb); if (!intel_fb_uses_dpt(&fb->base)) { - struct i915_vma *vma; + i915_fb_pin_ggtt_unpin(old_plane_state->ggtt_vma, + old_plane_state->fence_id); - vma = fetch_and_zero(&old_plane_state->ggtt_vma); - if (vma) { - intel_fb_unpin_vma(vma, old_plane_state->fence_id); - old_plane_state->fence_id = -1; - } + old_plane_state->ggtt_vma = NULL; + old_plane_state->fence_id = -1; } else { i915_fb_pin_dpt_unpin(fb->dpt, old_plane_state->dpt_vma, -- 2.52.0