From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Piorkowski, Piotr" Subject: Re: [PATCH 7/7] drm/i915/guc: Add support for define guc_log_size in megabytes. Date: Mon, 4 Jun 2018 12:53:17 +0000 Message-ID: <1528116795.27702.13.camel@intel.com> References: <20180530135334.25113-1-piotr.piorkowski@intel.com> <20180530135334.25113-7-piotr.piorkowski@intel.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0220623925==" Return-path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id A7F056EAF6 for ; Mon, 4 Jun 2018 12:53:19 +0000 (UTC) In-Reply-To: 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" , "Wajdeczko, Michal" List-Id: intel-gfx@lists.freedesktop.org --===============0220623925== Content-Language: en-US Content-Type: multipart/signed; micalg=sha-1; protocol="application/x-pkcs7-signature"; boundary="=-OfR9BozeEDf7fEZQ7q5c" --=-OfR9BozeEDf7fEZQ7q5c Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, 2018-05-30 at 18:46 +0200, Michal Wajdeczko wrote: > On Wed, 30 May 2018 15:53:34 +0200, Piotr Piorkowski =20 > wrote: >=20 > > At this moment we can define GuC logs sizes only using pages. > > But GuC also allows use for this values expressed in megabytes. > > Lets add support for define guc_log_size in megabytes when we > > debug of GuC. > >=20 > > Signed-off-by: Piotr Pi=C3=B3rkowski > > Cc: Michal Wajdeczko > > Cc: Micha=C5=82 Winiarski > > Cc: Joonas Lahtinen > > Cc: Chris Wilson > > --- > > drivers/gpu/drm/i915/intel_guc.c | 12 ++++++++++-- > > drivers/gpu/drm/i915/intel_guc_log.h | 6 ++++++ > > 2 files changed, 16 insertions(+), 2 deletions(-) > >=20 > > diff --git a/drivers/gpu/drm/i915/intel_guc.c =20 > > b/drivers/gpu/drm/i915/intel_guc.c > > index e15047fedb45..5a42db47521b 100644 > > --- a/drivers/gpu/drm/i915/intel_guc.c > > +++ b/drivers/gpu/drm/i915/intel_guc.c > > @@ -263,7 +263,13 @@ static u32 guc_ctl_log_params_flags(struct =20 > > intel_guc *guc) > > u32 offset =3D intel_guc_ggtt_offset(guc, guc->log.vma) >> > > PAGE_SHIFT; > > u32 flags; > > + #if (((CRASH_BUFFER_SIZE) % (1 << 20)) =3D=3D 0) > > + #define UNIT (1 << 20) > > + #define FLAG GUC_LOG_ALLOC_IN_MEGABYTE > > + #else > > #define UNIT (4 << 10) > > + #define FLAG 0 > > + #endif > > BUILD_BUG_ON(!CRASH_BUFFER_SIZE); > > BUILD_BUG_ON(!IS_ALIGNED(CRASH_BUFFER_SIZE, UNIT)); > > @@ -280,13 +286,15 @@ static u32 guc_ctl_log_params_flags(struct =20 > > intel_guc *guc) > > (GUC_LOG_ISR_MASK >> GUC_LOG_ISR_SHIFT)); > > flags =3D GUC_LOG_VALID | > > - GUC_LOG_NOTIFY_ON_HALF_FULL | > > - ((CRASH_BUFFER_SIZE/UNIT - 1) << > > GUC_LOG_CRASH_SHIFT) | > > + GUC_LOG_NOTIFY_ON_HALF_FULL; > > + flags |=3D FLAG; >=20 > I think you can inject FLAG into existing statement without > introducing two additional |=3D >=20 > > + flags |=3D ((CRASH_BUFFER_SIZE/UNIT - 1) << > > GUC_LOG_CRASH_SHIFT) | > > ((DPC_BUFFER_SIZE/UNIT - 1) << GUC_LOG_DPC_SHIFT) > > | > > ((ISR_BUFFER_SIZE/UNIT - 1) << GUC_LOG_ISR_SHIFT) > > | > > (offset << GUC_LOG_BUF_ADDR_SHIFT); > > #undef UNIT > > + #undef FLAG > > return flags; > > } > > diff --git a/drivers/gpu/drm/i915/intel_guc_log.h =20 > > b/drivers/gpu/drm/i915/intel_guc_log.h > > index 1b3afdae6d0d..de39b965ae7a 100644 > > --- a/drivers/gpu/drm/i915/intel_guc_log.h > > +++ b/drivers/gpu/drm/i915/intel_guc_log.h > > @@ -34,9 +34,15 @@ > > struct intel_guc; > > +#ifdef DRM_I915_DEBUG_GUC > > +#define CRASH_BUFFER_SIZE 2097152 > > +#define DPC_BUFFER_SIZE 8388608 > > +#define ISR_BUFFER_SIZE 8388608 >=20 > can we make it more friendly: (8 * 1024 * 1024) >=20 > > +#else > > #define CRASH_BUFFER_SIZE 8192 > > #define DPC_BUFFER_SIZE 32768 > > #define ISR_BUFFER_SIZE 32768 > > +#endif >=20 > btw, are these values just max possible or selected > as most valuable ? question for both debug/ndebug For debug I use the possibility of defining values in MB and I set the maximum possible values, and for ndebug I set old values of these buffers >=20 > Michal >=20 > > /* > > * While we're using plain log level in i915, GuC controls are > > much =20 > > more... --=-OfR9BozeEDf7fEZQ7q5c 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 CSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJKoZIhvcNAQkFMQ8XDTE4MDYwNDEyNTMxNVowIwYJ KoZIhvcNAQkEMRYEFHrL9pL1YMMIh0LAAeetHvi/g+xcMA0GCSqGSIb3DQEBAQUABIIBAEC5Inv/ iN3uE0p4a18/mcNr88eaEz1X7UPntURKVoGK2FfZibvy3NEfkP7clPwc2DteWj0GT5wyDyxkvlAQ EZssDLLh6ZWnPrUygY7tGQXju/OnJQcOM7jYUvowT9UHCRUOPgooxO2BP7/urms194GVEguE72vw YTLzxd6TiKYiXgRvAcsJfob4uVfG7N304nTSluV+Djki8mR1UFkQCERUQ6SPGGvdCWzD7s6L98w2 L3XUgMNM0QyP2C0lT2HfhJFNgFwhn7yEdSBwML8+xhujHouSwm1U8y90wMRfiLzh+hjM5kuGcJod P4ejniT8YhGct6b9nzksJe0X49fZnDAAAAAAAAA= --=-OfR9BozeEDf7fEZQ7q5c-- --===============0220623925== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg== --===============0220623925==--