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 CD46EFDEE2C for ; Thu, 23 Apr 2026 16:54:14 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 69E5810F1CB; Thu, 23 Apr 2026 16:54:14 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="W3gyRKiZ"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) by gabe.freedesktop.org (Postfix) with ESMTPS id A36F510F1CB; Thu, 23 Apr 2026 16:54:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1776963253; x=1808499253; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=IQffNwHDh8n79oi0AYov1RGm6Z42pynpNH2CrRuhxRA=; b=W3gyRKiZFRQeXAGqWX9WPzuqYSw2IykZoT6WB0tQdtsoBmHEIiQlKF9X ulbsKp/4pmrAFWxbOzgLQXDDPgyUk0MP3y5zoteA45NlurAQsbFijwaTa /4YxWZd5JtVREqpy90618dF+hFC+Fh6QMjh6Dux6aE1+7El/4uo4UWLsu ptFzWDwdqThzOfXWx5XQAGVDp6fQ3v+PlPVSSZ+jq+Ua+F2FRdN9ZyaJ8 y5acnyb2kGrqun2GNy0eFVTBOI5x5Fc371QWVBPTHHxVJ6GwBRVhKt4af fuuQhGmR/Q0xzFdj/WWtre/i3PFEcemjznKxOp+L/SByUDkpgENQ7xYHY Q==; X-CSE-ConnectionGUID: 2UNTGK6gRzSjZhMltBsQmg== X-CSE-MsgGUID: 2mc+Z0V9RmKmP/CgsEE33w== X-IronPort-AV: E=McAfee;i="6800,10657,11765"; a="88245194" X-IronPort-AV: E=Sophos;i="6.23,195,1770624000"; d="scan'208";a="88245194" 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:13 -0700 X-CSE-ConnectionGUID: jTFUc5TdSpSdYLJ1G9hsYQ== X-CSE-MsgGUID: /tHqpKboSxSYsi5L9DRlUg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,195,1770624000"; d="scan'208";a="237765214" 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:12 -0700 From: Ville Syrjala To: intel-gfx@lists.freedesktop.org Cc: intel-xe@lists.freedesktop.org Subject: [PATCH 05/16] drm/i915: Introduce i915_fb_pin_dpt_(un)pin() Date: Thu, 23 Apr 2026 19:53:34 +0300 Message-ID: <20260423165346.20884-6-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-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" From: Ville Syrjälä Extract the inner DPT parts of intel_plane_(un)pin() into the i915_fb_pin_dpt_(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 | 76 ++++++++++++++++++++++-------- 1 file changed, 56 insertions(+), 20 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_fb_pin.c b/drivers/gpu/drm/i915/i915_fb_pin.c index bc2e185b4573..0019f570d843 100644 --- a/drivers/gpu/drm/i915/i915_fb_pin.c +++ b/drivers/gpu/drm/i915/i915_fb_pin.c @@ -257,6 +257,49 @@ intel_plane_fb_vtd_guard(const struct intel_plane_state *plane_state) plane_state->hw.rotation); } +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, + struct i915_vma **out_ggtt_vma, + u32 *out_offset) +{ + struct i915_vma *ggtt_vma, *dpt_vma; + + WARN_ON(!dpt); + + ggtt_vma = i915_dpt_pin_to_ggtt(dpt, pin_params->alignment / 512); + if (IS_ERR(ggtt_vma)) + return PTR_ERR(ggtt_vma); + + dpt_vma = intel_fb_pin_to_dpt(obj, dpt, pin_params); + if (IS_ERR(dpt_vma)) { + i915_dpt_unpin_from_ggtt(dpt); + return PTR_ERR(dpt_vma); + } + + drm_WARN_ON(obj->dev, ggtt_vma == dpt_vma); + + *out_ggtt_vma = ggtt_vma; + *out_dpt_vma = dpt_vma; + + *out_offset = i915_ggtt_offset(ggtt_vma); + + return 0; +} + +static void i915_fb_pin_dpt_unpin(struct intel_dpt *dpt, + struct i915_vma *dpt_vma, + struct i915_vma *ggtt_vma) +{ + WARN_ON(!dpt); + WARN_ON(!!dpt_vma != !!ggtt_vma); + + if (dpt_vma) + intel_fb_unpin_vma(dpt_vma, -1); + if (ggtt_vma) + i915_dpt_unpin_from_ggtt(dpt); +} + int intel_plane_pin_fb(struct intel_plane_state *plane_state, const struct intel_plane_state *old_plane_state) { @@ -268,6 +311,7 @@ int intel_plane_pin_fb(struct intel_plane_state *plane_state, struct i915_vma *dpt_vma = NULL; int fence_id = -1; u32 offset; + int ret; if (!intel_fb_uses_dpt(&fb->base)) { struct intel_fb_pin_params pin_params = { @@ -306,19 +350,11 @@ int intel_plane_pin_fb(struct intel_plane_state *plane_state, .needs_cpu_lmem_access = intel_fb_needs_cpu_access(&fb->base), }; - ggtt_vma = i915_dpt_pin_to_ggtt(fb->dpt, pin_params.alignment / 512); - if (IS_ERR(ggtt_vma)) - return PTR_ERR(ggtt_vma); - - dpt_vma = intel_fb_pin_to_dpt(intel_fb_bo(&fb->base), fb->dpt, &pin_params); - if (IS_ERR(dpt_vma)) { - i915_dpt_unpin_from_ggtt(fb->dpt); - return PTR_ERR(dpt_vma); - } - - WARN_ON(ggtt_vma == dpt_vma); - - offset = i915_ggtt_offset(ggtt_vma); + ret = i915_fb_pin_dpt_pin(intel_fb_bo(&fb->base), fb->dpt, + &pin_params, &dpt_vma, + &ggtt_vma, &offset); + if (ret) + return ret; } plane_state->dpt_vma = dpt_vma; @@ -333,22 +369,22 @@ 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); - struct i915_vma *vma; if (!intel_fb_uses_dpt(&fb->base)) { + struct i915_vma *vma; + 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; } } else { - vma = fetch_and_zero(&old_plane_state->dpt_vma); - if (vma) - intel_fb_unpin_vma(vma, -1); + i915_fb_pin_dpt_unpin(fb->dpt, + old_plane_state->dpt_vma, + old_plane_state->ggtt_vma); - vma = fetch_and_zero(&old_plane_state->ggtt_vma); - if (vma) - i915_dpt_unpin_from_ggtt(fb->dpt); + old_plane_state->dpt_vma = NULL; + old_plane_state->ggtt_vma = NULL; } } -- 2.52.0