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 5392EC27C75 for ; Thu, 13 Jun 2024 10:33:51 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6DD3A10EA1A; Thu, 13 Jun 2024 10:33:49 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="cb2/x+rS"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.12]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4BE0510EA11; Thu, 13 Jun 2024 10:33:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1718274826; x=1749810826; h=date:from:to:cc:subject:message-id:reply-to:references: mime-version:content-transfer-encoding:in-reply-to; bh=Rwwr5CvQxX2szfetmqGf7CdkIVf4w72VbyLoeX/LaeI=; b=cb2/x+rSglxAVyeLxgWiGhWi8VixNxRiQ4B3fqiYYvWDsUAsyaF0w5jw XMAdJhBap8h50AmVSzQ4kDgbpx0AtMLKF4js/7uijtdViSCrh2xHezXsc iPs0b6TdAq0VbcyZhND1LoeOJeNx8prZR/Fu9JfuKM9fy2VliJOjYte5Y Iz+DWtOJH7hix+G5b2eymDUPsl6Li46gNpVCKOAsHO6bD+MebIEHFq3qI gBfXP/T8XN+bHKtHpDSr4tYP1o8vQr53w0n/GyJtoDQJgggzXcySGETR/ FQ22Ls4n6mWFD8nzNd7CwGaCQCbTIivmoxrWxJNGaD2rH4QaJS/jxXbtY Q==; X-CSE-ConnectionGUID: tHXyCscXQOOTvMspqgcMCQ== X-CSE-MsgGUID: DAz5MWCISqqt0/kgqLeNOw== X-IronPort-AV: E=McAfee;i="6700,10204,11101"; a="18942371" X-IronPort-AV: E=Sophos;i="6.08,234,1712646000"; d="scan'208";a="18942371" Received: from fmviesa009.fm.intel.com ([10.60.135.149]) by fmvoesa106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jun 2024 03:33:46 -0700 X-CSE-ConnectionGUID: loSg8trgQ4KXBO+tbq+Tag== X-CSE-MsgGUID: k5lxsBk2RI2d4qWjq+o1MA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,234,1712646000"; d="scan'208";a="40205987" Received: from ideak-desk.fi.intel.com ([10.237.72.78]) by fmviesa009-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jun 2024 03:33:44 -0700 Date: Thu, 13 Jun 2024 13:33:52 +0300 From: Imre Deak To: Ville Syrjala Cc: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: Re: [PATCH v2 4/9] drm/i915: Introduce fb->min_alignment Message-ID: References: <20240612204712.31404-1-ville.syrjala@linux.intel.com> <20240612204712.31404-5-ville.syrjala@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20240612204712.31404-5-ville.syrjala@linux.intel.com> X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: imre.deak@intel.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Wed, Jun 12, 2024 at 11:47:07PM +0300, Ville Syrjala wrote: > From: Ville Syrjälä > > Different planes could have different alignment requirements > even for the same format/modifier. Collect the alignment > requirements across all planes capable of scanning out the > fb such that the alignment is satisfactory to all those > planes. > > So far this was sort of handle by making sure intel_surf_alignment() > declares the superset of all planes' alignment requirements, > but maintaining that manually is annoying. So we're going to move > towards each plane declaring only its own requirements, and thus > we need code to generate the superset. > > v2: Drop the borked per-plane vma optimization (Imre) > Assert that the plane's declared alignment is POT (Imre) > > Cc: Imre Deak > Signed-off-by: Ville Syrjälä Reviewed-by: Imre Deak > --- > .../drm/i915/display/intel_display_types.h | 2 ++ > drivers/gpu/drm/i915/display/intel_fb.c | 29 +++++++++++++++++++ > drivers/gpu/drm/i915/display/intel_fb_pin.c | 5 ++-- > drivers/gpu/drm/i915/display/intel_fbdev.c | 18 +----------- > 4 files changed, 34 insertions(+), 20 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h > index 0c165572fbd0..af7cc3d6c82b 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_types.h > +++ b/drivers/gpu/drm/i915/display/intel_display_types.h > @@ -146,6 +146,8 @@ struct intel_framebuffer { > }; > > struct i915_address_space *dpt_vm; > + > + unsigned int min_alignment; > }; > > enum intel_hotplug_state { > diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c > index b3a48754a417..0abb80972885 100644 > --- a/drivers/gpu/drm/i915/display/intel_fb.c > +++ b/drivers/gpu/drm/i915/display/intel_fb.c > @@ -11,6 +11,7 @@ > > #include "gem/i915_gem_object.h" > #include "i915_drv.h" > +#include "intel_atomic_plane.h" > #include "intel_display.h" > #include "intel_display_types.h" > #include "intel_dpt.h" > @@ -1617,6 +1618,32 @@ bool intel_fb_supports_90_270_rotation(const struct intel_framebuffer *fb) > fb->base.modifier == I915_FORMAT_MOD_Yf_TILED; > } > > +static unsigned int intel_fb_min_alignment(const struct drm_framebuffer *fb) > +{ > + struct drm_i915_private *i915 = to_i915(fb->dev); > + struct intel_plane *plane; > + unsigned int min_alignment = 0; > + > + for_each_intel_plane(&i915->drm, plane) { > + unsigned int plane_min_alignment; > + > + if (!drm_plane_has_format(&plane->base, fb->format->format, fb->modifier)) > + continue; > + > + plane_min_alignment = plane->min_alignment(plane, fb, 0); > + > + drm_WARN_ON(&i915->drm, plane_min_alignment && > + !is_power_of_2(plane_min_alignment)); > + > + if (intel_plane_needs_physical(plane)) > + continue; > + > + min_alignment = max(min_alignment, plane_min_alignment); > + } > + > + return min_alignment; > +} > + > int intel_fill_fb_info(struct drm_i915_private *i915, struct intel_framebuffer *fb) > { > struct drm_i915_gem_object *obj = intel_fb_obj(&fb->base); > @@ -1699,6 +1726,8 @@ int intel_fill_fb_info(struct drm_i915_private *i915, struct intel_framebuffer * > return -EINVAL; > } > > + fb->min_alignment = intel_fb_min_alignment(&fb->base); > + > return 0; > } > > diff --git a/drivers/gpu/drm/i915/display/intel_fb_pin.c b/drivers/gpu/drm/i915/display/intel_fb_pin.c > index 9b0f1ea41b70..575b271e012b 100644 > --- a/drivers/gpu/drm/i915/display/intel_fb_pin.c > +++ b/drivers/gpu/drm/i915/display/intel_fb_pin.c > @@ -233,10 +233,9 @@ void intel_fb_unpin_vma(struct i915_vma *vma, unsigned long flags) > static unsigned int > intel_plane_fb_min_alignment(const struct intel_plane_state *plane_state) > { > - struct intel_plane *plane = to_intel_plane(plane_state->uapi.plane); > - const struct drm_framebuffer *fb = plane_state->hw.fb; > + const struct intel_framebuffer *fb = to_intel_framebuffer(plane_state->hw.fb); > > - return plane->min_alignment(plane, fb, 0); > + return fb->min_alignment; > } > > static unsigned int > diff --git a/drivers/gpu/drm/i915/display/intel_fbdev.c b/drivers/gpu/drm/i915/display/intel_fbdev.c > index 6e5f88f20482..49a1ac4f5491 100644 > --- a/drivers/gpu/drm/i915/display/intel_fbdev.c > +++ b/drivers/gpu/drm/i915/display/intel_fbdev.c > @@ -47,7 +47,6 @@ > #include "gem/i915_gem_object.h" > > #include "i915_drv.h" > -#include "intel_crtc.h" > #include "intel_display_types.h" > #include "intel_fb.h" > #include "intel_fb_pin.h" > @@ -173,21 +172,6 @@ static const struct fb_ops intelfb_ops = { > > __diag_pop(); > > -static unsigned int intel_fbdev_min_alignment(const struct drm_framebuffer *fb) > -{ > - struct drm_i915_private *i915 = to_i915(fb->dev); > - struct intel_plane *plane; > - struct intel_crtc *crtc; > - > - crtc = intel_first_crtc(i915); > - if (!crtc) > - return 0; > - > - plane = to_intel_plane(crtc->base.primary); > - > - return plane->min_alignment(plane, fb, 0); > -} > - > static int intelfb_create(struct drm_fb_helper *helper, > struct drm_fb_helper_surface_size *sizes) > { > @@ -245,7 +229,7 @@ static int intelfb_create(struct drm_fb_helper *helper, > * BIOS is suitable for own access. > */ > vma = intel_fb_pin_to_ggtt(&fb->base, &view, > - intel_fbdev_min_alignment(&fb->base), 0, > + fb->min_alignment, 0, > false, &flags); > if (IS_ERR(vma)) { > ret = PTR_ERR(vma); > -- > 2.44.2 >