From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Souza, Jose" Subject: Re: [PATCH 2/2] drm/i915: Just use icl+ definition for PLANE_WM blocks field Date: Thu, 7 Feb 2019 00:21:15 +0000 Message-ID: References: <20190205205056.30081-1-ville.syrjala@linux.intel.com> <20190205205056.30081-2-ville.syrjala@linux.intel.com> <8f3d01ea525025c2613bfbb8207e11daf216d3c5.camel@intel.com> <20190206131847.GC20097@intel.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1878035645==" Return-path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id EFFC26E2EC for ; Thu, 7 Feb 2019 00:21:16 +0000 (UTC) In-Reply-To: <20190206131847.GC20097@intel.com> Content-Language: en-US List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: "ville.syrjala@linux.intel.com" Cc: "intel-gfx@lists.freedesktop.org" List-Id: intel-gfx@lists.freedesktop.org --===============1878035645== Content-Language: en-US Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="=-S9+wIO4sWyASSdTaOL2U" --=-S9+wIO4sWyASSdTaOL2U Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, 2019-02-06 at 15:18 +0200, Ville Syrj=C3=A4l=C3=A4 wrote: > On Wed, Feb 06, 2019 at 01:04:19AM +0000, Souza, Jose wrote: > > On Tue, 2019-02-05 at 22:50 +0200, Ville Syrjala wrote: > > > From: Ville Syrj=C3=A4l=C3=A4 > > >=20 > > > The unused bits on PLANE_WM & co. are hardwired to zero. So no > > > need to worry about reading the extra bit on pre-icl. > > >=20 > >=20 > > Reviewed-by: Jos=C3=A9 Roberto de Souza >=20 > Thanks. Both patches pushes to dinq. >=20 > Do you still have enough motivation left to to read through > https://patchwork.freedesktop.org/patch/281614/ as well? Ops I missed that one, now reviewed. >=20 > > > Signed-off-by: Ville Syrj=C3=A4l=C3=A4 > > > --- > > > drivers/gpu/drm/i915/i915_reg.h | 3 +-- > > > drivers/gpu/drm/i915/intel_pm.c | 9 ++------- > > > 2 files changed, 3 insertions(+), 9 deletions(-) > > >=20 > > > diff --git a/drivers/gpu/drm/i915/i915_reg.h > > > b/drivers/gpu/drm/i915/i915_reg.h > > > index 2be34e13af78..638a586469f9 100644 > > > --- a/drivers/gpu/drm/i915/i915_reg.h > > > +++ b/drivers/gpu/drm/i915/i915_reg.h > > > @@ -6784,8 +6784,7 @@ enum { > > > =20 > > > #define _PLANE_BUF_CFG_1_B 0x7127c > > > #define _PLANE_BUF_CFG_2_B 0x7137c > > > -#define SKL_DDB_ENTRY_MASK 0x3FF > > > -#define ICL_DDB_ENTRY_MASK 0x7FF > > > +#define DDB_ENTRY_MASK 0x7FF /* skl+: > > > 10 bits, icl+ 11 bits */ > > > #define DDB_ENTRY_END_SHIFT 16 > > > #define _PLANE_BUF_CFG_1(pipe) \ > > > _PIPE(pipe, _PLANE_BUF_CFG_1_A, _PLANE_BUF_CFG_1_B) > > > diff --git a/drivers/gpu/drm/i915/intel_pm.c > > > b/drivers/gpu/drm/i915/intel_pm.c > > > index 737005bf6816..0f15685529a0 100644 > > > --- a/drivers/gpu/drm/i915/intel_pm.c > > > +++ b/drivers/gpu/drm/i915/intel_pm.c > > > @@ -3927,14 +3927,9 @@ static unsigned int > > > skl_cursor_allocation(int > > > num_active) > > > static void skl_ddb_entry_init_from_hw(struct drm_i915_private > > > *dev_priv, > > > struct skl_ddb_entry *entry, u32 > > > reg) > > > { > > > - u16 mask; > > > =20 > > > - if (INTEL_GEN(dev_priv) >=3D 11) > > > - mask =3D ICL_DDB_ENTRY_MASK; > > > - else > > > - mask =3D SKL_DDB_ENTRY_MASK; > > > - entry->start =3D reg & mask; > > > - entry->end =3D (reg >> DDB_ENTRY_END_SHIFT) & mask; > > > + entry->start =3D reg & DDB_ENTRY_MASK; > > > + entry->end =3D (reg >> DDB_ENTRY_END_SHIFT) & DDB_ENTRY_MASK; > > > =20 > > > if (entry->end) > > > entry->end +=3D 1; >=20 >=20 --=-S9+wIO4sWyASSdTaOL2U Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iQEzBAABCAAdFiEEVNG051EijGa0MiaQVenbO/mOWkkFAlxbefkACgkQVenbO/mO Wkmm2wf/ViQoxSeBKsPq2iYLAjKJNfjxsi4sC1JTAHnk3qzrwD/8np/HZPPRursg uYuAXnoYMmjcL1pxHqfOZUnfIRdOFJQOHw+ZQqjDI/tNiioIUKJnIrZFdVNApag4 I6uGyTsm6XCsbyoeiz6ot0BXIpHlZf0VhPodVRE2wl2w/h6tox+7lwTJmEVYsfyP aCfYqxj9gIG3mrZ4uyd89HJh4weq8GTWk7eGbIb/ct4D8eB+OD3hTBGEhj/2B/CV 0KnMmSKyqLs3GLAA9nbKb3qtQk/1a6uh+aQZDfgLACMM+uyIMoBVItOf8dhAvg5e YX5QBOcJGF/7CE8GTkOwY3VFd2ApsA== =1gf5 -----END PGP SIGNATURE----- --=-S9+wIO4sWyASSdTaOL2U-- --===============1878035645== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg== --===============1878035645==--