From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Piorkowski, Piotr" Subject: Re: [PATCH v2] drm/i915/guc: Remove GUC_CTL_DEVICE_INFO parameter Date: Fri, 13 Apr 2018 08:55:35 +0000 Message-ID: <1523609733.3509.15.camel@intel.com> References: <20180228184225.43722-1-piotr.piorkowski@intel.com> <20180305131311.359-1-piotr.piorkowski@intel.com> <82a80c92-b43f-c50f-8a8d-35d44220f450@intel.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1148096969==" Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2B7156E7BF for ; Fri, 13 Apr 2018 08:55:38 +0000 (UTC) In-Reply-To: <82a80c92-b43f-c50f-8a8d-35d44220f450@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: "intel-gfx@lists.freedesktop.org" , "Kamble, Sagar A" List-Id: intel-gfx@lists.freedesktop.org --===============1148096969== Content-Language: en-US Content-Type: multipart/signed; micalg=sha-1; protocol="application/x-pkcs7-signature"; boundary="=-panLWs7XYHG8hY3b78Lg" --=-panLWs7XYHG8hY3b78Lg Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Tue, 2018-03-06 at 10:07 +0530, Sagar Arun Kamble wrote: >=20 > On 3/5/2018 6:43 PM, Piotr Pi=C3=B3rkowski wrote: > > It looks that GuC does not actively use GUC_CTL_DEVICE_INFO > > parameter > > where we are passing GT type and Core family values. > > Lets stop setup this parameter and remove related definitions. >=20 > Minor change to sentence above: Let's stop/remove setup of this=20 > parameter ... > >=20 > > v2: (this time without squashed HAX) > > - New title and description > > - Remove also GUC_CORE_FAMILY_* definitions (Michel) > >=20 > > Signed-off-by: Piotr Pi=C3=B3rkowski > > Cc: Sagar Arun Kamble > > Cc: Micha=C5=82 Winiarski > > Cc: John A Spotswood > > Cc: Michal Wajdeczko > > Cc: Chris Wilson > > Cc: Michel Thierry >=20 > With Michel's suggestion and then corresponding subject update patch=20 > looks good to me. > Reviewed-by: Sagar Arun Kamble > > --- > > drivers/gpu/drm/i915/intel_guc.c | 24 ---------------------- > > -- > > drivers/gpu/drm/i915/intel_guc_fwif.h | 7 ------- > > 2 files changed, 31 deletions(-) > >=20 > > diff --git a/drivers/gpu/drm/i915/intel_guc.c > > b/drivers/gpu/drm/i915/intel_guc.c > > index ff08ea0ebf49..efc413137a89 100644 > > --- a/drivers/gpu/drm/i915/intel_guc.c > > +++ b/drivers/gpu/drm/i915/intel_guc.c > > @@ -200,26 +200,6 @@ void intel_guc_fini(struct intel_guc *guc) > > guc_shared_data_destroy(guc); > > } > > =20 > > -static u32 get_gt_type(struct drm_i915_private *dev_priv) > > -{ > > - /* XXX: GT type based on PCI device ID? field seems unused > > by fw */ > > - return 0; > > -} > > - > > -static u32 get_core_family(struct drm_i915_private *dev_priv) > > -{ > > - u32 gen =3D INTEL_GEN(dev_priv); > > - > > - switch (gen) { > > - case 9: > > - return GUC_CORE_FAMILY_GEN9; > > - > > - default: > > - MISSING_CASE(gen); > > - return GUC_CORE_FAMILY_UNKNOWN; > > - } > > -} > > - > > static u32 get_log_verbosity_flags(void) > > { > > if (i915_modparams.guc_log_level > 0) { > > @@ -246,10 +226,6 @@ void intel_guc_init_params(struct intel_guc > > *guc) > > =20 > > memset(params, 0, sizeof(params)); > > =20 > > - params[GUC_CTL_DEVICE_INFO] |=3D > > - (get_gt_type(dev_priv) << GUC_CTL_GT_TYPE_SHIFT) | > > - (get_core_family(dev_priv) << > > GUC_CTL_CORE_FAMILY_SHIFT); > > - > > /* > > * GuC ARAT increment is 10 ns. GuC default scheduler > > quantum is one > > * second. This ARAR is calculated by: > > diff --git a/drivers/gpu/drm/i915/intel_guc_fwif.h > > b/drivers/gpu/drm/i915/intel_guc_fwif.h > > index 6a10aa6f04d3..5131e67e663f 100644 > > --- a/drivers/gpu/drm/i915/intel_guc_fwif.h > > +++ b/drivers/gpu/drm/i915/intel_guc_fwif.h > > @@ -23,9 +23,6 @@ > > #ifndef _INTEL_GUC_FWIF_H > > #define _INTEL_GUC_FWIF_H > > =20 > > -#define GUC_CORE_FAMILY_GEN9 12 > > -#define GUC_CORE_FAMILY_UNKNOWN 0x7fffffff > > - > > #define GUC_CLIENT_PRIORITY_KMD_HIGH 0 > > #define GUC_CLIENT_PRIORITY_HIGH 1 > > #define GUC_CLIENT_PRIORITY_KMD_NORMAL 2 > > @@ -81,10 +78,6 @@ > > #define GUC_CTL_ARAT_HIGH 1 > > #define GUC_CTL_ARAT_LOW 2 > > =20 > > -#define GUC_CTL_DEVICE_INFO 3 > > -#define GUC_CTL_GT_TYPE_SHIFT 0 > > -#define GUC_CTL_CORE_FAMILY_SHIFT 7 > > - > > #define GUC_CTL_LOG_PARAMS 4 > > #define GUC_LOG_VALID (1 << 0) > > #define GUC_LOG_NOTIFY_ON_HALF_FULL (1 << 1) >=20 >=20 What's next with this patch? Can we merge it ? --=-panLWs7XYHG8hY3b78Lg Content-Type: application/x-pkcs7-signature; name="smime.p7s" Content-Disposition: attachment; filename="smime.p7s" Content-Transfer-Encoding: base64 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 iwe0MJtz29cIjJrZPnUPkyHtgmDMTRHi6uyykDRKQvhsenWsbKPL/C3wgNMHSb0d4n+6X/78/9zL AgMBAAGjggI3MIICMzAdBgNVHQ4EFgQUR/MOmWgueksOzHfuwXuHg93rj28wHwYDVR0jBBgwFoAU 2kEjnFqPca9Xgz4g0+Nl2wzLC9swZQYDVR0fBF4wXDBaoFigVoZUaHR0cDovL3d3dy5pbnRlbC5j b20vcmVwb3NpdG9yeS9DUkwvSW50ZWwlMjBFeHRlcm5hbCUyMEJhc2ljJTIwSXNzdWluZyUyMENB JTIwNEIuY3JsMIGfBggrBgEFBQcBAQSBkjCBjzAiBggrBgEFBQcwAYYWaHR0cDovL29jc3AuaW50 ZWwuY29tLzBpBggrBgEFBQcwAoZdaHR0cDovL3d3dy5pbnRlbC5jb20vcmVwb3NpdG9yeS9jZXJ0 aWZpY2F0ZXMvSW50ZWwlMjBFeHRlcm5hbCUyMEJhc2ljJTIwSXNzdWluZyUyMENBJTIwNEIuY3J0 MAsGA1UdDwQEAwIHgDA8BgkrBgEEAYI3FQcELzAtBiUrBgEEAYI3FQiGw4x1hJnlUYP9gSiFjp9T gpHACWeB3r05lfBDAgFkAgEJMB8GA1UdJQQYMBYGCCsGAQUFBwMEBgorBgEEAYI3CgMMMCkGCSsG AQQBgjcVCgQcMBowCgYIKwYBBQUHAwQwDAYKKwYBBAGCNwoDDDBRBgNVHREESjBIoCoGCisGAQQB gjcUAgOgHAwacGlvdHIucGlvcmtvd3NraUBpbnRlbC5jb22BGnBpb3RyLnBpb3Jrb3dza2lAaW50 ZWwuY29tMA0GCSqGSIb3DQEBBQUAA4IBAQAoJI/vcHFuPtqgAhV4hIfO3BGXYnIEvhBIVRJ2awq8 tpPArc3oGBv4ITRiwB43r4B8BBkhdFBAB8Y+xQm0NJ9itUs+QVQC6wXqJ6P1WWtAhIIl28dLNdnJ 7tMV49VHeWMhtCNQrfsCORqvD2/H6EilyN+48Vh2wuiK8MRnFx8RJ+9tP+meFn1bUDChxGuE42fB TcyJv7yyF9zAFPZl5o9oxW3MQTacr6uYIrKBHmepV0BsUCh7NZXM4m0racvjt8vcWU70hGQNopN6 PN5+9YIV2ASxcPEusoifg52AjH3HFaZqG8IgzCSVlP3n0UGj4GMkM3hPKbWq3MAkZErtPcAlMYIC FzCCAhMCAQEwgZAweTELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRQwEgYDVQQHEwtTYW50YSBD bGFyYTEaMBgGA1UEChMRSW50ZWwgQ29ycG9yYXRpb24xKzApBgNVBAMTIkludGVsIEV4dGVybmFs IEJhc2ljIElzc3VpbmcgQ0EgNEICEzMAAFxPtYQ0YXrsTWoAAAAAXE8wCQYFKw4DAhoFAKBdMBgG CSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJKoZIhvcNAQkFMQ8XDTE4MDQxMzA4NTUzM1owIwYJ KoZIhvcNAQkEMRYEFFAK/8aOWb5mMymxVv4ySbOFkxPqMA0GCSqGSIb3DQEBAQUABIIBADx7MI3y Qziv8K/gSSyCCOgXp0X/+WffSgRQgFpU6DK0TsUrwvYdbYZYbtuAT4HQlMdaZUSp562dUN4KA+8x DFveTdM+ojaRfTnxgSPerwk0pcr4ZLVzx7QrqbmlL+Xm+y/5sdSOl2jhSxDF+cWC+r+YnUKZzYYp ImomYOIStysk5Vtm9gILP+lgmysPitfUgZ2V3KPeqH+mJUeqLPCmM/ucoz7/DhYQusWKyFYuMrbK kiaSTfrrzmDSilsGjaBpmSNDLFptgW77K6CQblK27xhEzgBZFVEqJsgJVRyegEo5vyV85Ej3eR9G nDQB+LL2ELHOHeKFiZWGEm64RhAok9kAAAAAAAA= --=-panLWs7XYHG8hY3b78Lg-- --===============1148096969== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg== --===============1148096969==--