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 EC562C4361B for ; Wed, 16 Dec 2020 12:16:10 +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 8073823109 for ; Wed, 16 Dec 2020 12:16:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8073823109 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 D471589C09; Wed, 16 Dec 2020 12:16:09 +0000 (UTC) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9085F89C09 for ; Wed, 16 Dec 2020 12:16:08 +0000 (UTC) IronPort-SDR: D1SnWsg0c5G9k+IRyV7Vzr0nhaMu5EA+VqNtmTKYP60Kop9GVNhKjPqicI55DlCwVEZrLXBMRR Heylnb7Cllmw== X-IronPort-AV: E=McAfee;i="6000,8403,9836"; a="174280494" X-IronPort-AV: E=Sophos;i="5.78,424,1599548400"; d="scan'208";a="174280494" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Dec 2020 04:16:08 -0800 IronPort-SDR: 2JC79GBPS7FD4lI+lLjLw3BxM3IEP1XskVNgOq5lwenXWRBUX6oCiaAiMwil4b0X8VtCX2Tbe8 fCpbI264lnwQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.78,424,1599548400"; d="scan'208";a="451946850" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.174]) by fmsmga001.fm.intel.com with SMTP; 16 Dec 2020 04:16:05 -0800 Received: by stinkbox (sSMTP sendmail emulation); Wed, 16 Dec 2020 14:16:04 +0200 Date: Wed, 16 Dec 2020 14:16:04 +0200 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Jani Nikula Message-ID: References: <80bdfd91b04f301db0e2c64752b1e10665bba7d8.1608117676.git.jani.nikula@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <80bdfd91b04f301db0e2c64752b1e10665bba7d8.1608117676.git.jani.nikula@intel.com> X-Patchwork-Hint: comment Subject: Re: [Intel-gfx] [PATCH v4 11/11] drm/i915: split fb scalable checks into g4x and skl versions 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: Dave Airlie , 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 Wed, Dec 16, 2020 at 01:29:18PM +0200, Jani Nikula wrote: > From: Dave Airlie > = > This just cleans these up a bit. > = > Signed-off-by: Dave Airlie > Signed-off-by: Jani Nikula > --- > drivers/gpu/drm/i915/display/intel_gen9_plane.c | 4 ++-- > drivers/gpu/drm/i915/display/intel_sprite.c | 7 +++---- > 2 files changed, 5 insertions(+), 6 deletions(-) > = > diff --git a/drivers/gpu/drm/i915/display/intel_gen9_plane.c b/drivers/gp= u/drm/i915/display/intel_gen9_plane.c > index 8549b262f095..c695ee990a82 100644 > --- a/drivers/gpu/drm/i915/display/intel_gen9_plane.c > +++ b/drivers/gpu/drm/i915/display/intel_gen9_plane.c > @@ -2139,7 +2139,7 @@ static int skl_check_plane_surface(struct intel_pla= ne_state *plane_state) > return 0; > } > = > -static bool intel_fb_scalable(const struct drm_framebuffer *fb) > +static bool skl_fb_scalable(const struct drm_framebuffer *fb) > { > if (!fb) > return false; > @@ -2172,7 +2172,7 @@ static int skl_plane_check(struct intel_crtc_state = *crtc_state, > return ret; > = > /* use scaler when colorkey is not required */ > - if (!plane_state->ckey.flags && intel_fb_scalable(fb)) { > + if (!plane_state->ckey.flags && skl_fb_scalable(fb)) { > min_scale =3D 1; > max_scale =3D skl_plane_max_scale(dev_priv, fb); > } > diff --git a/drivers/gpu/drm/i915/display/intel_sprite.c b/drivers/gpu/dr= m/i915/display/intel_sprite.c > index cc3bec42d04c..4cb6339d12be 100644 > --- a/drivers/gpu/drm/i915/display/intel_sprite.c > +++ b/drivers/gpu/drm/i915/display/intel_sprite.c > @@ -1282,19 +1282,18 @@ g4x_plane_get_hw_state(struct intel_plane *plane, > return ret; > } > = > -static bool intel_fb_scalable(const struct drm_framebuffer *fb) > +static bool g4x_fb_scalable(const struct drm_framebuffer *fb) > { > if (!fb) > return false; > = > switch (fb->format->format) { > case DRM_FORMAT_C8: > - return false; > case DRM_FORMAT_XRGB16161616F: > case DRM_FORMAT_ARGB16161616F: > case DRM_FORMAT_XBGR16161616F: > case DRM_FORMAT_ABGR16161616F: > - return INTEL_GEN(to_i915(fb->dev)) >=3D 11; > + return false; We could drop a bunch of the formats here since they're not supported by the g4x+ sprites anyway. But that could be a followup. Reviewed-by: Ville Syrj=E4l=E4 > default: > return true; > } > @@ -1371,7 +1370,7 @@ g4x_sprite_check(struct intel_crtc_state *crtc_stat= e, > int max_scale =3D DRM_PLANE_HELPER_NO_SCALING; > int ret; > = > - if (intel_fb_scalable(plane_state->hw.fb)) { > + if (g4x_fb_scalable(plane_state->hw.fb)) { > if (INTEL_GEN(dev_priv) < 7) { > min_scale =3D 1; > max_scale =3D 16 << 16; > -- = > 2.20.1 -- = Ville Syrj=E4l=E4 Intel _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx