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 21F23C433E6 for ; Thu, 11 Mar 2021 16:21:02 +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 8917A64F97 for ; Thu, 11 Mar 2021 16:21:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8917A64F97 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.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 BEE0D6EE57; Thu, 11 Mar 2021 16:21:00 +0000 (UTC) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id B82EC6EE57 for ; Thu, 11 Mar 2021 16:20:59 +0000 (UTC) IronPort-SDR: ornq5bhMAKo4Hiwt92hvekKWmIbtOdjs24zPt6XKxZfw3cahKoR8jxy3JFB731+bkDGtmjpIyO e1Y4J88sHROA== X-IronPort-AV: E=McAfee;i="6000,8403,9920"; a="188789162" X-IronPort-AV: E=Sophos;i="5.81,241,1610438400"; d="scan'208";a="188789162" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Mar 2021 08:20:58 -0800 IronPort-SDR: RNjYiAXKuREigZ9FRtuQVshPFl232KgJMQotCCQhCJkHX46bPmhIXv/9fRdwm+vTq84gJHhFqn mE/sa1hm9vGw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,241,1610438400"; d="scan'208";a="377406170" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.171]) by fmsmga007.fm.intel.com with SMTP; 11 Mar 2021 08:20:56 -0800 Received: by stinkbox (sSMTP sendmail emulation); Thu, 11 Mar 2021 18:20:55 +0200 Date: Thu, 11 Mar 2021 18:20:55 +0200 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Imre Deak Message-ID: References: <20210310221736.2963264-1-imre.deak@intel.com> <20210310221736.2963264-11-imre.deak@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210310221736.2963264-11-imre.deak@intel.com> X-Patchwork-Hint: comment Subject: Re: [Intel-gfx] [PATCH 10/23] drm/i915/intel_fb: Pull FB plane functions from intel_sprite.c 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: , 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 12:17:23AM +0200, Imre Deak wrote: > Move the FB plane specific function from intel_sprite.c to intel_fb.c > = > Signed-off-by: Imre Deak Only used by intel_plane_compute_gtt() so makese sense. Reviewed-by: Ville Syrj=E4l=E4 > --- > drivers/gpu/drm/i915/display/intel_fb.c | 32 +++++++++++++++++++++ > drivers/gpu/drm/i915/display/intel_fb.h | 4 +++ > drivers/gpu/drm/i915/display/intel_sprite.c | 32 --------------------- > drivers/gpu/drm/i915/display/intel_sprite.h | 1 - > 4 files changed, 36 insertions(+), 33 deletions(-) > = > diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i9= 15/display/intel_fb.c > index 74157d5f2d7f..8ebcded6a472 100644 > --- a/drivers/gpu/drm/i915/display/intel_fb.c > +++ b/drivers/gpu/drm/i915/display/intel_fb.c > @@ -64,3 +64,35 @@ int skl_main_to_aux_plane(const struct drm_framebuffer= *fb, int main_plane) > else > return 0; > } > + > +int intel_plane_check_stride(const struct intel_plane_state *plane_state) > +{ > + struct intel_plane *plane =3D to_intel_plane(plane_state->uapi.plane); > + const struct drm_framebuffer *fb =3D plane_state->hw.fb; > + unsigned int rotation =3D plane_state->hw.rotation; > + u32 stride, max_stride; > + > + /* > + * We ignore stride for all invisible planes that > + * can be remapped. Otherwise we could end up > + * with a false positive when the remapping didn't > + * kick in due the plane being invisible. > + */ > + if (intel_plane_can_remap(plane_state) && > + !plane_state->uapi.visible) > + return 0; > + > + /* FIXME other color planes? */ > + stride =3D plane_state->color_plane[0].stride; > + max_stride =3D plane->max_stride(plane, fb->format->format, > + fb->modifier, rotation); > + > + if (stride > max_stride) { > + DRM_DEBUG_KMS("[FB:%d] stride (%d) exceeds [PLANE:%d:%s] max stride (%= d)\n", > + fb->base.id, stride, > + plane->base.base.id, plane->base.name, max_stride); > + return -EINVAL; > + } > + > + return 0; > +} > diff --git a/drivers/gpu/drm/i915/display/intel_fb.h b/drivers/gpu/drm/i9= 15/display/intel_fb.h > index 6ea220438f9a..8c15f4c9561b 100644 > --- a/drivers/gpu/drm/i915/display/intel_fb.h > +++ b/drivers/gpu/drm/i915/display/intel_fb.h > @@ -10,6 +10,8 @@ > = > struct drm_framebuffer; > = > +struct intel_plane_state; > + > bool is_ccs_plane(const struct drm_framebuffer *fb, int plane); > bool is_gen12_ccs_plane(const struct drm_framebuffer *fb, int plane); > bool is_gen12_ccs_cc_plane(const struct drm_framebuffer *fb, int plane); > @@ -20,4 +22,6 @@ int main_to_ccs_plane(const struct drm_framebuffer *fb,= int main_plane); > int skl_ccs_to_main_plane(const struct drm_framebuffer *fb, int ccs_plan= e); > int skl_main_to_aux_plane(const struct drm_framebuffer *fb, int main_pla= ne); > = > +int intel_plane_check_stride(const struct intel_plane_state *plane_state= ); > + > #endif /* __INTEL_FB_H__ */ > diff --git a/drivers/gpu/drm/i915/display/intel_sprite.c b/drivers/gpu/dr= m/i915/display/intel_sprite.c > index 4cbdb8fd4bb1..0815f10b2246 100644 > --- a/drivers/gpu/drm/i915/display/intel_sprite.c > +++ b/drivers/gpu/drm/i915/display/intel_sprite.c > @@ -49,38 +49,6 @@ > #include "i9xx_plane.h" > #include "intel_vrr.h" > = > -int intel_plane_check_stride(const struct intel_plane_state *plane_state) > -{ > - struct intel_plane *plane =3D to_intel_plane(plane_state->uapi.plane); > - const struct drm_framebuffer *fb =3D plane_state->hw.fb; > - unsigned int rotation =3D plane_state->hw.rotation; > - u32 stride, max_stride; > - > - /* > - * We ignore stride for all invisible planes that > - * can be remapped. Otherwise we could end up > - * with a false positive when the remapping didn't > - * kick in due the plane being invisible. > - */ > - if (intel_plane_can_remap(plane_state) && > - !plane_state->uapi.visible) > - return 0; > - > - /* FIXME other color planes? */ > - stride =3D plane_state->color_plane[0].stride; > - max_stride =3D plane->max_stride(plane, fb->format->format, > - fb->modifier, rotation); > - > - if (stride > max_stride) { > - DRM_DEBUG_KMS("[FB:%d] stride (%d) exceeds [PLANE:%d:%s] max stride (%= d)\n", > - fb->base.id, stride, > - plane->base.base.id, plane->base.name, max_stride); > - return -EINVAL; > - } > - > - return 0; > -} > - > int intel_plane_check_src_coordinates(struct intel_plane_state *plane_st= ate) > { > const struct drm_framebuffer *fb =3D plane_state->hw.fb; > diff --git a/drivers/gpu/drm/i915/display/intel_sprite.h b/drivers/gpu/dr= m/i915/display/intel_sprite.h > index f6989da2dc4b..c085eb87705c 100644 > --- a/drivers/gpu/drm/i915/display/intel_sprite.h > +++ b/drivers/gpu/drm/i915/display/intel_sprite.h > @@ -35,7 +35,6 @@ int intel_sprite_set_colorkey_ioctl(struct drm_device *= dev, void *data, > struct drm_file *file_priv); > void intel_pipe_update_start(const struct intel_crtc_state *new_crtc_sta= te); > void intel_pipe_update_end(struct intel_crtc_state *new_crtc_state); > -int intel_plane_check_stride(const struct intel_plane_state *plane_state= ); > int intel_plane_check_src_coordinates(struct intel_plane_state *plane_st= ate); > int chv_plane_check_rotation(const struct intel_plane_state *plane_state= ); > = > -- = > 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