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 A424DFED3C5 for ; Fri, 24 Apr 2026 12:54:20 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6B0FB10F58C; Fri, 24 Apr 2026 12:54:20 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="nAgRUw+L"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) by gabe.freedesktop.org (Postfix) with ESMTPS id 13DEA10F588; Fri, 24 Apr 2026 12:54:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1777035259; x=1808571259; h=from:to:cc:subject:in-reply-to:references:date: message-id:mime-version:content-transfer-encoding; bh=F7fVqqyGz11k58pQuZgjyvlpB0N/6Ks5MOoOPm/+T3Q=; b=nAgRUw+LEcWYsM25bwrRBkHbjqZAj+IwATIhzE0hv/k5XLmhXlzBK+cR G2sI91/zYB4CFEIhpHp5Ic51Kt+P+LWjAsg7JY8ZDFHlfz3tfOOdWJr4s Kfhxq9F55Z2XMfi/4nrJ+xeCDDKHbvi5SIEd3sNlqEqgOZoznh5exlIpN Ds8dvzDGpKDF8m8m4Q7XCOo9oB59BkII3ccNTfMWsdwsn6lH1fOGS7VFs X+hJ+vdPujLFM3FKTQUjVkKAlkPQjJ4TpGCTq7gdJoh+Pu96TTKkk0HGO hcS7PI9O+uQH8Tt3CvVCVC8n74qbNshVIsxNv0JQjmoK1MfMEvQ/MLjae A==; X-CSE-ConnectionGUID: jup6yHWjTYmc+jCJwhLyIg== X-CSE-MsgGUID: KOfrhtlcSyyqeivxnieezw== X-IronPort-AV: E=McAfee;i="6800,10657,11765"; a="95575706" X-IronPort-AV: E=Sophos;i="6.23,196,1770624000"; d="scan'208";a="95575706" Received: from orviesa006.jf.intel.com ([10.64.159.146]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Apr 2026 05:54:18 -0700 X-CSE-ConnectionGUID: lW+G8RduTrivjwSd0QDOHQ== X-CSE-MsgGUID: Nbk1FAwOTKamF90mP+rqVw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,196,1770624000"; d="scan'208";a="231936084" Received: from smoticic-mobl1.ger.corp.intel.com (HELO localhost) ([10.245.245.89]) by orviesa006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Apr 2026 05:54:18 -0700 From: Jani Nikula To: Ville Syrjala , intel-gfx@lists.freedesktop.org Cc: intel-xe@lists.freedesktop.org Subject: Re: [PATCH 14/16] drm/i915/fbdev: Use intel_parent_fb_pin_ggtt_(un)pin() In-Reply-To: <20260423165346.20884-15-ville.syrjala@linux.intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - c/o Alberga Business Park, 6 krs Bertel Jungin Aukio 5, 02600 Espoo, Finland References: <20260423165346.20884-1-ville.syrjala@linux.intel.com> <20260423165346.20884-15-ville.syrjala@linux.intel.com> Date: Fri, 24 Apr 2026 15:54:14 +0300 Message-ID: <9a2adaacf189bc66e1a3ef29665dcdbf5ae0ce80@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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" On Thu, 23 Apr 2026, Ville Syrjala wrote: > From: Ville Syrj=C3=A4l=C3=A4 > > Replace the intel_fb_pin_to_ggtt() and intel_fb_unpin_vma() with the > new abstract parent interface (intel_parent_fb_pin_ggtt_(un)pin()). > > xe no longer needs intel_fb_unpin_vma(), and in i915 it now > becomes and internal function to i915_fb_pin. > > Signed-off-by: Ville Syrj=C3=A4l=C3=A4 Reviewed-by: Jani Nikula > --- > drivers/gpu/drm/i915/display/intel_fb_pin.h | 2 -- > drivers/gpu/drm/i915/display/intel_fbdev.c | 14 +++++++------- > drivers/gpu/drm/i915/i915_fb_pin.c | 2 +- > drivers/gpu/drm/xe/display/xe_fb_pin.c | 5 ----- > 4 files changed, 8 insertions(+), 15 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_fb_pin.h b/drivers/gpu/dr= m/i915/display/intel_fb_pin.h > index 84530f20d7d1..6ff17d3e2cf5 100644 > --- a/drivers/gpu/drm/i915/display/intel_fb_pin.h > +++ b/drivers/gpu/drm/i915/display/intel_fb_pin.h > @@ -20,8 +20,6 @@ intel_fb_pin_to_ggtt(struct drm_gem_object *obj, > const struct intel_fb_pin_params *pin_params, > int *out_fence_id); >=20=20 > -void intel_fb_unpin_vma(struct i915_vma *vma, int fence_id); > - > int intel_plane_pin_fb(struct intel_plane_state *new_plane_state, > const struct intel_plane_state *old_plane_state); > void intel_plane_unpin_fb(struct intel_plane_state *old_plane_state); > diff --git a/drivers/gpu/drm/i915/display/intel_fbdev.c b/drivers/gpu/drm= /i915/display/intel_fbdev.c > index aa2701795caa..8463f88149a5 100644 > --- a/drivers/gpu/drm/i915/display/intel_fbdev.c > +++ b/drivers/gpu/drm/i915/display/intel_fbdev.c > @@ -53,7 +53,6 @@ > #include "intel_display_rpm.h" > #include "intel_display_types.h" > #include "intel_fb.h" > -#include "intel_fb_pin.h" > #include "intel_fbdev.h" > #include "intel_frontbuffer.h" > #include "intel_parent.h" > @@ -133,6 +132,7 @@ static int intel_fbdev_mmap(struct fb_info *info, str= uct vm_area_struct *vma) > static void intel_fbdev_fb_destroy(struct fb_info *info) > { > struct drm_fb_helper *fb_helper =3D info->par; > + struct intel_display *display =3D to_intel_display(fb_helper->client.de= v); > struct intel_fbdev *ifbdev =3D to_intel_fbdev(fb_helper); >=20=20 > drm_fb_helper_fini(fb_helper); > @@ -142,7 +142,7 @@ static void intel_fbdev_fb_destroy(struct fb_info *in= fo) > * the info->screen_base mmaping. Leaking the VMA is simpler than > * trying to rectify all the possible error paths leading here. > */ > - intel_fb_unpin_vma(ifbdev->vma, -1); > + intel_parent_fb_pin_ggtt_unpin(display, ifbdev->vma, -1); > drm_framebuffer_remove(fb_helper->fb); >=20=20 > drm_client_release(&fb_helper->client); > @@ -274,6 +274,7 @@ int intel_fbdev_driver_fbdev_probe(struct drm_fb_help= er *helper, > struct i915_vma *vma; > bool prealloc =3D false; > struct drm_gem_object *obj; > + u32 offset; > int ret; >=20=20 > ifbdev->fb =3D NULL; > @@ -321,11 +322,10 @@ int intel_fbdev_driver_fbdev_probe(struct drm_fb_he= lper *helper, > DRM_MODE_ROTATE_0); > pin_params.needs_low_address =3D intel_plane_needs_low_address(display); >=20=20 > - vma =3D intel_fb_pin_to_ggtt(obj, &pin_params, NULL); > - if (IS_ERR(vma)) { > - ret =3D PTR_ERR(vma); > + ret =3D intel_parent_fb_pin_ggtt_pin(display, obj, &pin_params, > + &vma, &offset, NULL); > + if (ret) > goto out_unlock; > - } >=20=20 > helper->funcs =3D &intel_fb_helper_funcs; > helper->fb =3D &fb->base; > @@ -356,7 +356,7 @@ int intel_fbdev_driver_fbdev_probe(struct drm_fb_help= er *helper, > return 0; >=20=20 > out_unpin: > - intel_fb_unpin_vma(vma, -1); > + intel_parent_fb_pin_ggtt_unpin(display, vma, -1); > out_unlock: > intel_display_rpm_put(display, wakeref); >=20=20 > diff --git a/drivers/gpu/drm/i915/i915_fb_pin.c b/drivers/gpu/drm/i915/i9= 15_fb_pin.c > index 1f08e364d569..cedefee46fbf 100644 > --- a/drivers/gpu/drm/i915/i915_fb_pin.c > +++ b/drivers/gpu/drm/i915/i915_fb_pin.c > @@ -222,7 +222,7 @@ intel_fb_pin_to_ggtt(struct drm_gem_object *_obj, > return vma; > } >=20=20 > -void intel_fb_unpin_vma(struct i915_vma *vma, int fence_id) > +static void intel_fb_unpin_vma(struct i915_vma *vma, int fence_id) > { > if (fence_id >=3D 0) > i915_vma_unpin_fence(vma); > diff --git a/drivers/gpu/drm/xe/display/xe_fb_pin.c b/drivers/gpu/drm/xe/= display/xe_fb_pin.c > index e2b6ce3686a3..c3171625d150 100644 > --- a/drivers/gpu/drm/xe/display/xe_fb_pin.c > +++ b/drivers/gpu/drm/xe/display/xe_fb_pin.c > @@ -424,11 +424,6 @@ intel_fb_pin_to_ggtt(struct drm_gem_object *obj, > return __xe_pin_fb_vma(obj, false, pin_params); > } >=20=20 > -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, --=20 Jani Nikula, Intel