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 X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 08BB6C433E0 for ; Thu, 11 Mar 2021 17:02:33 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id A001B64ECB for ; Thu, 11 Mar 2021 17:02:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A001B64ECB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 12D5D6E03E; Thu, 11 Mar 2021 17:02:32 +0000 (UTC) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 670D86EA99 for ; Thu, 11 Mar 2021 17:02:30 +0000 (UTC) IronPort-SDR: 8J2lnuVcZObXAGQMVI4N9xtDGyAPilB3MgqtySoGy1Zsmr98+KJl97yzc65AKilczForWsNPRp 7bPmLlPgIDTA== X-IronPort-AV: E=McAfee;i="6000,8403,9920"; a="252716893" X-IronPort-AV: E=Sophos;i="5.81,241,1610438400"; d="scan'208";a="252716893" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Mar 2021 09:02:29 -0800 IronPort-SDR: m9tQdcft7rWQ9weKZYqh9R2WySkVGWBe8ki8xx8hb4j2qLJXipLcKJsui81p8nhMbyCh/M0IQy JZmxlatbOWxA== X-IronPort-AV: E=Sophos;i="5.81,241,1610438400"; d="scan'208";a="410673319" Received: from ideak-desk.fi.intel.com ([10.237.68.141]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Mar 2021 09:02:27 -0800 Date: Thu, 11 Mar 2021 19:02:23 +0200 From: Imre Deak To: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Message-ID: <20210311170223.GF2970909@ideak-desk.fi.intel.com> References: <20210310221736.2963264-1-imre.deak@intel.com> <20210310221736.2963264-17-imre.deak@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Subject: Re: [Intel-gfx] [PATCH 16/23] drm/i915/intel_fb: Factor out calc_plane_normal_size() 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: , Reply-To: imre.deak@intel.com Cc: intel-gfx@lists.freedesktop.org Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Thu, Mar 11, 2021 at 06:52:26PM +0200, Ville Syrj=E4l=E4 wrote: > On Thu, Mar 11, 2021 at 12:17:29AM +0200, Imre Deak wrote: > > Factor out to a new function the logic to calculate an FB plane's > > normal-view size. > > = > > Instead of using intel_remapped_plane_info, which is related only to > > remapping, add a helper to get the tile pitch and rows for an FB plane, > > so these helpers can be used both by the normal size calculation and the > > remapping code. > > = > > Also add a new fb_plane_view_dims struct in which we can pass around the > > view (either FB plane or plane source) and tile dimensions conveniently > > to functions calculating further view parameters. > > = > > Signed-off-by: Imre Deak > > --- > > drivers/gpu/drm/i915/display/intel_fb.c | 82 ++++++++++++++++++------- > > 1 file changed, 61 insertions(+), 21 deletions(-) > > = > > diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/= i915/display/intel_fb.c > > index 62a8e37dca38..f661b21b119d 100644 > > --- a/drivers/gpu/drm/i915/display/intel_fb.c > > +++ b/drivers/gpu/drm/i915/display/intel_fb.c > > @@ -634,6 +634,59 @@ static u32 setup_fb_rotation(int plane, const stru= ct intel_remapped_plane_info * > > return plane_info->width * plane_info->height; > > } > > = > > +struct fb_plane_view_dims { > > + unsigned int width, height; > > + unsigned int tile_width, tile_height; > > +}; > > + > > +static void init_plane_view_dims(const struct intel_framebuffer *fb, i= nt color_plane, > > + unsigned int width, unsigned int height, > > + struct fb_plane_view_dims *dims) > > +{ > > + dims->width =3D width; > > + dims->height =3D height; > > + > > + intel_tile_dims(&fb->base, color_plane, &dims->tile_width, &dims->til= e_height); > > +} > > + > > +static unsigned int plane_view_stride_tiles(const struct intel_framebu= ffer *fb, int color_plane, > > + const struct fb_plane_view_dims *dims) > > +{ > > + const struct drm_framebuffer *drm_fb =3D &fb->base; > > + > > + return DIV_ROUND_UP(drm_fb->pitches[color_plane], > > + dims->tile_width * drm_fb->format->cpp[color_plane]); > = > plane_view_fb_stride_tiles() maybe to make it clear it's the fb stride > we're talking about here? Ok. > > +} > > + > > +static unsigned int plane_view_tile_rows(const struct intel_framebuffe= r *fb, int color_plane, > > + const struct fb_plane_view_dims *dims, > > + int y) > > +{ > > + return DIV_ROUND_UP(y + dims->height, dims->tile_height); > > +} > > + > > +static int calc_plane_normal_size(const struct intel_framebuffer *fb, = int color_plane, > > + const struct fb_plane_view_dims *dims, > > + int x, int y) > > +{ > > + const struct drm_framebuffer *drm_fb =3D &fb->base; > > + struct drm_i915_private *i915 =3D to_i915(drm_fb->dev); > > + int pages; > = > 'tiles'? Ok, not always pages. > > + > > + if (is_surface_linear(drm_fb, color_plane)) { > > + unsigned int size; > > + > > + size =3D (y + dims->height) * drm_fb->pitches[color_plane] + > > + x * drm_fb->format->cpp[color_plane]; > > + pages =3D DIV_ROUND_UP(size, intel_tile_size(i915)); > > + } else { > > + pages =3D plane_view_stride_tiles(fb, color_plane, dims) * > > + plane_view_tile_rows(fb, color_plane, dims, y); > > + } > > + > > + return pages; > > +} > > + > > int intel_fill_fb_info(struct drm_i915_private *i915, struct drm_frame= buffer *fb) > > { > > struct intel_framebuffer *intel_fb =3D to_intel_framebuffer(fb); > > @@ -644,6 +697,7 @@ int intel_fill_fb_info(struct drm_i915_private *i91= 5, struct drm_framebuffer *fb > > unsigned int tile_size =3D intel_tile_size(i915); > > = > > for (i =3D 0; i < num_planes; i++) { > > + struct fb_plane_view_dims view_dims; > > unsigned int width, height; > > unsigned int cpp, size; > > u32 offset; > > @@ -669,6 +723,8 @@ int intel_fill_fb_info(struct drm_i915_private *i91= 5, struct drm_framebuffer *fb > > if (ret) > > return ret; > > = > > + init_plane_view_dims(intel_fb, i, width, height, &view_dims); > > + > > /* > > * First pixel of the framebuffer from > > * the start of the normal gtt mapping. > > @@ -680,38 +736,22 @@ int intel_fill_fb_info(struct drm_i915_private *i= 915, struct drm_framebuffer *fb > > = > > if (!is_surface_linear(fb, i)) { > > struct intel_remapped_plane_info plane_info; > > - unsigned int tile_width, tile_height; > > - > > - intel_tile_dims(fb, i, &tile_width, &tile_height); > > = > > plane_info.offset =3D offset; > > - plane_info.stride =3D DIV_ROUND_UP(fb->pitches[i], > > - tile_width * cpp); > > - plane_info.width =3D DIV_ROUND_UP(x + width, tile_width); > > - plane_info.height =3D DIV_ROUND_UP(y + height, > > - tile_height); > > - > > - /* how many tiles does this plane need */ > > - size =3D plane_info.stride * plane_info.height; > > - /* > > - * If the plane isn't horizontally tile aligned, > > - * we need one more tile. > > - */ > > - if (x !=3D 0) > > - size++; > = > Where did that go? Arg, thanks for catching it. > > + plane_info.stride =3D plane_view_stride_tiles(intel_fb, i, &view_di= ms); > > + plane_info.width =3D DIV_ROUND_UP(x + width, view_dims.tile_width); > = > Why this doesn't have its own function? Can move it to a plane_view_fb_width_tiles() helper (and maybe also s/plane_view_tile_rows/plane_view_fb_height_tiles). > = > > + plane_info.height =3D plane_view_tile_rows(intel_fb, i, &view_dims,= y); > > = > > gtt_offset_rotated +=3D > > setup_fb_rotation(i, &plane_info, > > gtt_offset_rotated, > > x, y, width, height, > > tile_size, > > - tile_width, tile_height, > > + view_dims.tile_width, view_dims.tile_height, > > fb); > > - } else { > > - size =3D DIV_ROUND_UP((y + height) * fb->pitches[i] + > > - x * cpp, tile_size); > > } > > = > > + size =3D calc_plane_normal_size(intel_fb, i, &view_dims, x, y); > > /* how many tiles in total needed in the bo */ > > max_size =3D max(max_size, offset + size); > > } > > -- = > > 2.25.1 > > = > > _______________________________________________ > > Intel-gfx mailing list > > Intel-gfx@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/intel-gfx > = > -- = > Ville Syrj=E4l=E4 > Intel _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx