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=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 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 43672C433E0 for ; Tue, 16 Jun 2020 17:06:55 +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 265752098B for ; Tue, 16 Jun 2020 17:06:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 265752098B 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 AE7296E911; Tue, 16 Jun 2020 17:06:54 +0000 (UTC) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 621B26E911 for ; Tue, 16 Jun 2020 17:06:53 +0000 (UTC) IronPort-SDR: M73DjVDkj7W6nQ3c5JvoGIrSqvY/EJJQUhpX/rwsJpDtBC7IlwcSvopgnkhwGfIY6bRDXVqUiz snSnVxhJxEGg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Jun 2020 10:06:52 -0700 IronPort-SDR: V4O9zQfvz8O32Qd8zGvHw2HIHk782eZ5w1QAEYa1kzd2WZGqoIKDM7/GPMth7yZps4gFqAXKSp Ploa81sUDImg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,518,1583222400"; d="scan'208";a="262278703" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.174]) by orsmga007.jf.intel.com with SMTP; 16 Jun 2020 10:06:50 -0700 Received: by stinkbox (sSMTP sendmail emulation); Tue, 16 Jun 2020 20:06:49 +0300 Date: Tue, 16 Jun 2020 20:06:49 +0300 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Matt Atwood Message-ID: <20200616170649.GH6112@intel.com> References: <20200616163406.27387-1-matthew.s.atwood@intel.com> <20200616163909.GF6112@intel.com> <20200616170140.GA28232@msatwood-mobl> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200616170140.GA28232@msatwood-mobl> X-Patchwork-Hint: comment User-Agent: Mutt/1.10.1 (2018-07-13) Subject: Re: [Intel-gfx] [PATCH] drm/i915: Apply Wa_14011264657:gen11+ 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 Tue, Jun 16, 2020 at 10:01:40AM -0700, Matt Atwood wrote: > On Tue, Jun 16, 2020 at 07:39:09PM +0300, Ville Syrj=E4l=E4 wrote: > > On Tue, Jun 16, 2020 at 09:34:06AM -0700, Matt Atwood wrote: > > > Add minimum width to planes, variable with specific formats, for gen1= 1+. > > = > > How did this suddenly become gen11+? Wasn't it rkl only before? > gen11 platforms were currently in pending, that has changed. What does "in pending" mean? > > = > > > = > > > Signed-off-by: Matt Atwood > > > --- > > > drivers/gpu/drm/i915/display/intel_display.c | 55 +++++++++++++++++-= -- > > > 1 file changed, 47 insertions(+), 8 deletions(-) > > > = > > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/g= pu/drm/i915/display/intel_display.c > > > index 7457813ef273..d4fdad6cb3b1 100644 > > > --- a/drivers/gpu/drm/i915/display/intel_display.c > > > +++ b/drivers/gpu/drm/i915/display/intel_display.c > > > @@ -3760,6 +3760,45 @@ static int glk_max_plane_width(const struct dr= m_framebuffer *fb, > > > } > > > } > > > = > > > +static int icl_min_plane_width(struct drm_i915_private *dev_priv, > > > + const struct drm_framebuffer *fb) > > > +{ > > > + /* Wa_14011264657, Wa_14011050563 */ > > > + switch (fb->format->format) { > > > + case DRM_FORMAT_C8: > > > + return 18; > > > + case DRM_FORMAT_RGB565: > > > + return 10; > > > + case DRM_FORMAT_XRGB8888: > > > + case DRM_FORMAT_XBGR8888: > > > + case DRM_FORMAT_ARGB8888: > > > + case DRM_FORMAT_ABGR8888: > > > + case DRM_FORMAT_XRGB2101010: > > > + case DRM_FORMAT_XBGR2101010: > > > + case DRM_FORMAT_ARGB2101010: > > > + case DRM_FORMAT_ABGR2101010: > > > + case DRM_FORMAT_XVYU2101010: > > > + case DRM_FORMAT_Y212: > > > + case DRM_FORMAT_Y216: > > > + return 6; > > > + case DRM_FORMAT_NV12: > > > + return 20; > > > + case DRM_FORMAT_P010: > > > + case DRM_FORMAT_P012: > > > + case DRM_FORMAT_P016: > > > + return 12; > > > + case DRM_FORMAT_XRGB16161616F: > > > + case DRM_FORMAT_XBGR16161616F: > > > + case DRM_FORMAT_ARGB16161616F: > > > + case DRM_FORMAT_ABGR16161616F: > > > + case DRM_FORMAT_XVYU12_16161616: > > > + case DRM_FORMAT_XVYU16161616: > > > + return 4; > > > + default: > > > + return 1; > > > + } > > > +} > > > + > > > static int icl_max_plane_width(const struct drm_framebuffer *fb, > > > int color_plane, > > > unsigned int rotation) > > > @@ -3831,15 +3870,15 @@ static int skl_check_main_surface(struct inte= l_plane_state *plane_state) > > > int y =3D plane_state->uapi.src.y1 >> 16; > > > int w =3D drm_rect_width(&plane_state->uapi.src) >> 16; > > > int h =3D drm_rect_height(&plane_state->uapi.src) >> 16; > > > - int max_width; > > > - int max_height; > > > - u32 alignment; > > > - u32 offset; > > > + int max_width, min_width =3D 1, max_height; > > > + u32 alignment, offset; > > > int aux_plane =3D intel_main_to_aux_plane(fb, 0); > > > u32 aux_offset =3D plane_state->color_plane[aux_plane].offset; > > > = > > > - if (INTEL_GEN(dev_priv) >=3D 11) > > > + if (INTEL_GEN(dev_priv) >=3D 11) { > > > max_width =3D icl_max_plane_width(fb, 0, rotation); > > > + min_width =3D icl_min_plane_width(dev_priv, fb); > > > + } > > > else if (INTEL_GEN(dev_priv) >=3D 10 || IS_GEMINILAKE(dev_priv)) > > > max_width =3D glk_max_plane_width(fb, 0, rotation); > > > else > > > @@ -3850,10 +3889,10 @@ static int skl_check_main_surface(struct inte= l_plane_state *plane_state) > > > else > > > max_height =3D skl_max_plane_height(); > > > = > > > - if (w > max_width || h > max_height) { > > > + if (w > max_width || w < min_width || h > max_height) { > > > drm_dbg_kms(&dev_priv->drm, > > > - "requested Y/RGB source size %dx%d too big (limit %dx%d)\n", > > > - w, h, max_width, max_height); > > > + "requested Y/RGB source size %dx%d outside limits (min: %dx1 = max: %dx%d)\n", > > > + w, h, min_width, max_width, max_height); > > > return -EINVAL; > > > } > > > = > > > -- = > > > 2.21.3 > > > = > > > _______________________________________________ > > > Intel-gfx mailing list > > > Intel-gfx@lists.freedesktop.org > > > https://lists.freedesktop.org/mailman/listinfo/intel-gfx > > = > > -- = > > Ville Syrj=E4l=E4 > > Intel -- = Ville Syrj=E4l=E4 Intel _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx