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=-5.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, UNWANTED_LANGUAGE_BODY,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 49213C43331 for ; Tue, 24 Mar 2020 16:44:00 +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 218B22076F for ; Tue, 24 Mar 2020 16:44:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 218B22076F 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=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 784F6898BE; Tue, 24 Mar 2020 16:43:59 +0000 (UTC) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9F3D3898BE; Tue, 24 Mar 2020 16:43:58 +0000 (UTC) IronPort-SDR: Bl1VTCO3nKM3lU5rire7fZVfuAb/jnhmkR7PdzFPpa8isy6/B+fBmI94YZQzpbcQyzqokFoDDE RIXq10AQCbSA== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Mar 2020 09:43:57 -0700 IronPort-SDR: Sp8MFoWvFSVOmBjiUc+tML0En1ordJt68pPQD5Gd5MP6mWOFmFc1Ew4uawL7exaYlWuH22GZ9s xDGMt7cvYMkw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,301,1580803200"; d="scan'208";a="235637810" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.174]) by orsmga007.jf.intel.com with SMTP; 24 Mar 2020 09:43:53 -0700 Received: by stinkbox (sSMTP sendmail emulation); Tue, 24 Mar 2020 18:43:51 +0200 Date: Tue, 24 Mar 2020 18:43:51 +0200 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: "Laxminarayan Bharadiya, Pankaj" Subject: Re: [PATCH v2 3/5] drm/i915: Introduce scaling filter related registers and bit fields. Message-ID: <20200324164351.GY13686@intel.com> References: <20200319102103.28895-1-pankaj.laxminarayan.bharadiya@intel.com> <20200319102103.28895-4-pankaj.laxminarayan.bharadiya@intel.com> <20200323143924.GT13686@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Patchwork-Hint: comment User-Agent: Mutt/1.10.1 (2018-07-13) 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: , Cc: "Lattannavar, Sameer" , "daniels@collabora.com" , David Airlie , "intel-gfx@lists.freedesktop.org" , "dri-devel@lists.freedesktop.org" , "Vivi, Rodrigo" Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Tue, Mar 24, 2020 at 02:36:10PM +0000, Laxminarayan Bharadiya, Pankaj wr= ote: > = > = > > -----Original Message----- > > From: Ville Syrj=E4l=E4 > > Sent: 23 March 2020 20:09 > > To: Laxminarayan Bharadiya, Pankaj > > > > Cc: Lattannavar, Sameer ; > > jani.nikula@linux.intel.com; daniel@ffwll.ch; intel-gfx@lists.freedeskt= op.org; > > dri-devel@lists.freedesktop.org; daniels@collabora.com; Joonas Lahtinen > > ; Vivi, Rodrigo ; > > David Airlie > > Subject: Re: [PATCH v2 3/5] drm/i915: Introduce scaling filter related = registers > > and bit fields. > > = > > On Thu, Mar 19, 2020 at 03:51:01PM +0530, Pankaj Bharadiya wrote: > > > Introduce scaler registers and bit fields needed to configure the > > > scaling filter in prgrammed mode and configure scaling filter > > > coefficients. > > > > > > changes since v1: > > > * None > > > changes since RFC: > > > * Parametrize scaler coeffient macros by 'set' (Ville) > > > > > > Signed-off-by: Shashank Sharma > > > Signed-off-by: Ankit Nautiyal > > > Signed-off-by: Pankaj Bharadiya > > > > > > --- > > > drivers/gpu/drm/i915/i915_reg.h | 48 > > > +++++++++++++++++++++++++++++++++ > > > 1 file changed, 48 insertions(+) > > > > > > diff --git a/drivers/gpu/drm/i915/i915_reg.h > > > b/drivers/gpu/drm/i915/i915_reg.h index 9c53fe918be6..d40f12d2a6b5 > > > 100644 > > > --- a/drivers/gpu/drm/i915/i915_reg.h > > > +++ b/drivers/gpu/drm/i915/i915_reg.h > > > @@ -7205,6 +7205,7 @@ enum { > > > #define PS_PLANE_SEL(plane) (((plane) + 1) << 25) > > > #define PS_FILTER_MASK (3 << 23) > > > #define PS_FILTER_MEDIUM (0 << 23) > > > +#define PS_FILTER_PROGRAMMED (1 << 23) > > > #define PS_FILTER_EDGE_ENHANCE (2 << 23) > > > #define PS_FILTER_BILINEAR (3 << 23) > > > #define PS_VERT3TAP (1 << 21) > > > @@ -7219,6 +7220,10 @@ enum { > > > #define PS_VADAPT_MODE_MOST_ADAPT (3 << 5) #define > > > PS_PLANE_Y_SEL_MASK (7 << 5) #define PS_PLANE_Y_SEL(plane) (((plane) > > > + 1) << 5) > > > +#define PS_Y_VERT_FILTER_SELECT(set) ((set) << 4) > > > +#define PS_Y_HORZ_FILTER_SELECT(set) ((set) << 3) > > > +#define PS_UV_VERT_FILTER_SELECT(set) ((set) << 2) #define > > > +PS_UV_HORZ_FILTER_SELECT(set) ((set) << 1) > > > > > > #define _PS_PWR_GATE_1A 0x68160 > > > #define _PS_PWR_GATE_2A 0x68260 > > > @@ -7281,6 +7286,25 @@ enum { > > > #define _PS_ECC_STAT_2B 0x68AD0 > > > #define _PS_ECC_STAT_1C 0x691D0 > > > > > > +#define _PS_COEF_SET0_INDEX_1A 0x68198 > > > +#define _PS_COEF_SET0_INDEX_2A 0x68298 > > > +#define _PS_COEF_SET0_INDEX_1B 0x68998 > > > +#define _PS_COEF_SET0_INDEX_2B 0x68A98 > > > +#define _PS_COEF_SET1_INDEX_1A 0x681A0 > > > +#define _PS_COEF_SET1_INDEX_2A 0x682A0 > > > +#define _PS_COEF_SET1_INDEX_1B 0x689A0 > > > +#define _PS_COEF_SET1_INDEX_2B 0x68AA0 > > > +#define PS_COEE_INDEX_AUTO_INC (1 << 10) > > > + > > > +#define _PS_COEF_SET0_DATA_1A 0x6819C > > > +#define _PS_COEF_SET0_DATA_2A 0x6829C > > > +#define _PS_COEF_SET0_DATA_1B 0x6899C > > > +#define _PS_COEF_SET0_DATA_2B 0x68A9C > > > +#define _PS_COEF_SET1_DATA_1A 0x681A4 > > > +#define _PS_COEF_SET1_DATA_2A 0x682A4 > > > +#define _PS_COEF_SET1_DATA_1B 0x689A4 > > > +#define _PS_COEF_SET1_DATA_2B 0x68AA4 > > > + > > > #define _ID(id, a, b) _PICK_EVEN(id, a, b) > > > #define SKL_PS_CTRL(pipe, id) _MMIO_PIPE(pipe, \ > > > _ID(id, _PS_1A_CTRL, _PS_2A_CTRL), \ > > > @@ -7310,6 +7334,30 @@ enum { > > > _ID(id, _PS_ECC_STAT_1A, _PS_ECC_STAT_2A), \ > > > _ID(id, _PS_ECC_STAT_1B, _PS_ECC_STAT_2B)) > > > > > > +#define _SKL_PS_COEF_INDEX_SET0(pipe, id) _ID(pipe, \ > > > + _ID(id, _PS_COEF_SET0_INDEX_1A, > > _PS_COEF_SET0_INDEX_2A), \ > > > + _ID(id, _PS_COEF_SET0_INDEX_1B, > > _PS_COEF_SET0_INDEX_2B)) > > > + > > > +#define _SKL_PS_COEF_INDEX_SET1(pipe, id) _ID(pipe, \ > > > + _ID(id, _PS_COEF_SET1_INDEX_1A, > > _PS_COEF_SET1_INDEX_2A), \ > > > + _ID(id, _PS_COEF_SET1_INDEX_1B, > > _PS_COEF_SET1_INDEX_2B)) > > > + > > > +#define _SKL_PS_COEF_DATA_SET0(pipe, id) _ID(pipe, \ > > > + _ID(id, _PS_COEF_SET0_DATA_1A, > > _PS_COEF_SET0_DATA_2A), \ > > > + _ID(id, _PS_COEF_SET0_DATA_1B, > > _PS_COEF_SET0_DATA_2B)) > > > + > > > +#define _SKL_PS_COEF_DATA_SET1(pipe, id) _ID(pipe, \ > > > + _ID(id, _PS_COEF_SET1_DATA_1A, > > _PS_COEF_SET1_DATA_2A), \ > > > + _ID(id, _PS_COEF_SET1_DATA_1B, > > _PS_COEF_SET1_DATA_2B)) > > > + > > > +#define SKL_PS_COEF_INDEX_SET(pipe, id, set) \ > > > + _MMIO_PIPE(set, _SKL_PS_COEF_INDEX_SET0(pipe, id), > > \ > > > + _SKL_PS_COEF_INDEX_SET1(pipe, id)) > > > + > > > +#define SKL_PS_COEF_DATA_SET(pipe, id, set) \ > > > + _MMIO_PIPE(set, _SKL_PS_COEF_DATA_SET0(pipe, id), > > \ > > > + _SKL_PS_COEF_DATA_SET1(pipe, id)) > > = > > I'd name those CNL_PS_COEF_{DATA,INDEX}(). Or maybe eeven GLK_ since it > > already has this despite not being officially supported. > = > All other existing scaler macros start will SKL_PS_*, adding new CNL_PS= _* may > lead to confusion IMO since we will end up in using mixed SKL_PS_* and CN= L_PS_* name > to configure scaler. = They are called SKL_ because skl is where they got introduced. > = > > = > > Also I'd probably just have used +(set)*8 instead of adding another tri= p through > > _PICK_EVEN(). It's getting a bit hard to read this. > = > OK. > How does this sound like? - > = > +#define SKL_PS_COEF_INDEX_SET(pipe, id, set) _MMIO_PIPE(pipe, \ > + _ID(id, _PS_COEF_SET0_INDEX_1A, _PS_COEF_SET0_IND= EX_2A) + (set) * 8, \ > + _ID(id, _PS_COEF_SET0_INDEX_1B, _PS_COEF_SET0_IND= EX_2B) + (set) * 8) > = > +#define SKL_PS_COEF_DATA_SET(pipe, id, set) _MMIO_PIPE(pipe, \ > + _ID(id, _PS_COEF_SET0_DATA_1A, _PS_COEF_SET0_DATA= _2A) + (set) * 8, \ > + _ID(id, _PS_COEF_SET0_DATA_1B, _PS_COEF_SET0_DATA= _2B) + (set) * 8) Looks all right. > = > Thanks, > Pankaj > > = > > > + > > > /* legacy palette */ > > > #define _LGC_PALETTE_A 0x4a000 > > > #define _LGC_PALETTE_B 0x4a800 > > > -- > > > 2.23.0 > > = > > -- > > Ville Syrj=E4l=E4 > > Intel -- = Ville Syrj=E4l=E4 Intel _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel