From: "Bartminski, Jakub" Subject: Re: [PATCH 1/3] drm/i915/guc: Fix GuC pin bias and WOPCM initialization order Date: Tue, 17 Jul 2018 12:43:08 +0000 Message-ID: <781ad97b229a34299711d380082344d090ce779b.camel@intel.com> References: <20180717115600.5938-1-jakub.bartminski@intel.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0158765990==" Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id C52156E6FF for ; Tue, 17 Jul 2018 12:43:17 +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 --===============0158765990== Content-Language: en-US Content-Type: multipart/signed; micalg=sha-1; protocol="application/x-pkcs7-signature"; boundary="=-K5V6uuDEb7KRp1SehNPk" --=-K5V6uuDEb7KRp1SehNPk Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Tue, 2018-07-17 at 14:19 +0200, Michal Wajdeczko wrote: > On Tue, 17 Jul 2018 13:55:58 +0200, Jakub Bartmi=C5=84ski =20 > wrote: >=20 > > It would seem that we are using uninitialized WOPCM variables when > > setting the GuC pin bias. The pin bias has to be set after the > > WOPCM, > > but before the call to i915_gem_contexts_init where the first > > contexts > > are pinned so the safest place to set it seems to be right after > > initializing the relevant variables in intel_wopcm_init. > >=20 > > Signed-off-by: Jakub Bartmi=C5=84ski > > Cc: Chris Wilson > > Cc: Micha=C5=82 Winiarski > > Cc: Michal Wajdeczko > > --- > > drivers/gpu/drm/i915/intel_guc.c | 21 --------------------- > > drivers/gpu/drm/i915/intel_wopcm.c | 19 +++++++++++++++++++ > > 2 files changed, 19 insertions(+), 21 deletions(-) > >=20 > > diff --git a/drivers/gpu/drm/i915/intel_guc.c =20 > > b/drivers/gpu/drm/i915/intel_guc.c > > index e12bd259df17..47cacd59ac32 100644 > > --- a/drivers/gpu/drm/i915/intel_guc.c > > +++ b/drivers/gpu/drm/i915/intel_guc.c > > @@ -27,8 +27,6 @@ > > #include "intel_guc_submission.h" > > #include "i915_drv.h" > > -static void guc_init_ggtt_pin_bias(struct intel_guc *guc); > > - > > static void gen8_guc_raise_irq(struct intel_guc *guc) > > { > > struct drm_i915_private *dev_priv =3D guc_to_i915(guc); > > @@ -142,8 +140,6 @@ int intel_guc_init_misc(struct intel_guc *guc) > > struct drm_i915_private *i915 =3D guc_to_i915(guc); > > int ret; > > - guc_init_ggtt_pin_bias(guc); > > - > > ret =3D guc_init_wq(guc); > > if (ret) > > return ret; > > @@ -611,23 +607,6 @@ int intel_guc_resume(struct intel_guc *guc) > > * actual GuC WOPCM size. > > */ > > -/** > > - * guc_init_ggtt_pin_bias() - Initialize the GuC ggtt_pin_bias > > value. > > - * @guc: intel_guc structure. > > - * > > - * This function will calculate and initialize the ggtt_pin_bias > > value =20 > > based on > > - * overall WOPCM size and GuC WOPCM size. > > - */ > > -static void guc_init_ggtt_pin_bias(struct intel_guc *guc) > > -{ > > - struct drm_i915_private *i915 =3D guc_to_i915(guc); > > - > > - GEM_BUG_ON(!i915->wopcm.size); > > - GEM_BUG_ON(i915->wopcm.size < i915->wopcm.guc.base); > > - > > - guc->ggtt_pin_bias =3D i915->wopcm.size - i915- > > >wopcm.guc.base; > > -} > > - > > /** > > * intel_guc_allocate_vma() - Allocate a GGTT VMA for GuC usage > > * @guc: the guc > > diff --git a/drivers/gpu/drm/i915/intel_wopcm.c =20 > > b/drivers/gpu/drm/i915/intel_wopcm.c > > index 74bf76f3fddc..02f602db9548 100644 > > --- a/drivers/gpu/drm/i915/intel_wopcm.c > > +++ b/drivers/gpu/drm/i915/intel_wopcm.c > > @@ -140,6 +140,23 @@ static inline int > > check_hw_restriction(struct =20 > > drm_i915_private *i915, > > return err; > > } > > +/** > > + * wopcm_init_guc_ggtt_pin_bias() - Initialize the GuC > > ggtt_pin_bias =20 > > value. > > + * @wopcm: pointer to intel_wopcm. > > + * > > + * This function will calculate and initialize the GuC > > ggtt_pin_bias =20 > > value based > > + * on overall WOPCM size and GuC WOPCM size. > > + */ > > +static void wopcm_init_guc_ggtt_pin_bias(struct intel_wopcm > > *wopcm) > > +{ > > + struct drm_i915_private *i915 =3D wopcm_to_i915(wopcm); > > + > > + GEM_BUG_ON(!wopcm->size); > > + GEM_BUG_ON(wopcm->size < wopcm->guc.base); > > + > > + i915->guc.ggtt_pin_bias =3D wopcm->size - wopcm->guc.base; >=20 > Hmm, I don't like the idea to modify GuC (or GGTT later on) internals > directly from WOPCM private functions. >=20 > Maybe you can change your series to first move pin_bias from GuC to > GGTT and then immediately setup it inside i915_gem_init_ggtt() which > is called after intel_wopcm_init() and before > i915_gem_contexts_init() >=20 > Michal >=20 >=20 > > +} > > + > > /** > > * intel_wopcm_init() - Initialize the WOPCM structure. > > * @wopcm: pointer to intel_wopcm. > > @@ -207,6 +224,8 @@ int intel_wopcm_init(struct intel_wopcm *wopcm) > > wopcm->guc.base =3D guc_wopcm_base; > > wopcm->guc.size =3D guc_wopcm_size; > > + wopcm_init_guc_ggtt_pin_bias(wopcm); > > + > > return 0; > > } Indeed, since I don't think that the mock tests use this initialization path, we should be able to decide on how to set the new ggtt pin_bias value with the USES_GUC macro inside i915_gem_init_ggtt without raising any assertion failures. I will also take into account Chris's suggestions and resend. -Jakub --=-K5V6uuDEb7KRp1SehNPk Content-Type: application/x-pkcs7-signature; name="smime.p7s" Content-Disposition: attachment; filename="smime.p7s" Content-Transfer-Encoding: base64 MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIIKeTCCBOsw ggPToAMCAQICEDabxALowUBS+21KC0JI8fcwDQYJKoZIhvcNAQEFBQAwbzELMAkGA1UEBhMCU0Ux FDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRUcnVzdCBFeHRlcm5hbCBUVFAgTmV0 d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0EgUm9vdDAeFw0xMzEyMTEwMDAwMDBa Fw0yMDA1MzAxMDQ4MzhaMHkxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEUMBIGA1UEBxMLU2Fu dGEgQ2xhcmExGjAYBgNVBAoTEUludGVsIENvcnBvcmF0aW9uMSswKQYDVQQDEyJJbnRlbCBFeHRl cm5hbCBCYXNpYyBJc3N1aW5nIENBIDRCMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA yzuW/y/g0bznz8BD48M94luFzqHaqY9yGN9H/W0J7hOVBpl0rTQJ6kZ7z7hyDb9kf2UW4ZU25alC i+q5m6NwHg+z9pcN7bQ84SSBueaYF7cXlAg7z3XyZbzSEYP7raeuWRf5fYvYzq8/uI7VNR8o/43w PtDP10YDdO/0J5xrHxnC/9/aU+wTFSVsPqxsd7C58mnu7G4VRJ0n9PG4SfmYNC0h/5fLWuOWhxAv 6MuiK7MmvTPHLMclULgJqVSqG1MbBs0FbzoRHne4Cx0w6rtzPTrzo+bTRqhruaU18lQkzBk6OnyJ UthtaDQIlfyGy2IlZ5F6QEyjItbdKcHHdjBX8wIDAQABo4IBdzCCAXMwHwYDVR0jBBgwFoAUrb2Y ejS0Jvf6xCZU7wO94CTLVBowHQYDVR0OBBYEFNpBI5xaj3GvV4M+INPjZdsMywvbMA4GA1UdDwEB /wQEAwIBhjASBgNVHRMBAf8ECDAGAQH/AgEAMDYGA1UdJQQvMC0GCCsGAQUFBwMEBgorBgEEAYI3 CgMEBgorBgEEAYI3CgMMBgkrBgEEAYI3FQUwFwYDVR0gBBAwDjAMBgoqhkiG+E0BBQFpMEkGA1Ud HwRCMEAwPqA8oDqGOGh0dHA6Ly9jcmwudHJ1c3QtcHJvdmlkZXIuY29tL0FkZFRydXN0RXh0ZXJu YWxDQVJvb3QuY3JsMDoGCCsGAQUFBwEBBC4wLDAqBggrBgEFBQcwAYYeaHR0cDovL29jc3AudHJ1 c3QtcHJvdmlkZXIuY29tMDUGA1UdHgQuMCygKjALgQlpbnRlbC5jb20wG6AZBgorBgEEAYI3FAID oAsMCWludGVsLmNvbTANBgkqhkiG9w0BAQUFAAOCAQEAp9XGgH85hk/3IuN8F4nrFd24MAoau7Uq M/of09XtyYg2dV0TIPqtxPZw4813r78WwsGIbvtO8VQ18dNktIxaq6+ym2zebqDh0z6Bvo63jKE/ HMj8oNV3ovnuo+7rGpCppcda4iVBG2CetB3WXbUVr82EzECN+wxmC4H9Rup+gn+t+qeBTaXulQfV TYOvZ0eZPO+DyC2pVv5q5+xHljyUsVqpzsw89utuO8ZYaMsQGBRuFGOncRLEOhCtehy5B5aCI571 i4dDAv9LPODrEzm3PBfrNhlp8C0skak15VXWFzNuHd00AsxXxWSUT4TG8RiAH61Ua5GXsP1BIZwl 4WjK8DCCBYYwggRuoAMCAQICEzMAAGUdS+0yypIGyYkAAAAAZR0wDQYJKoZIhvcNAQEFBQAweTEL MAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRQwEgYDVQQHEwtTYW50YSBDbGFyYTEaMBgGA1UEChMR SW50ZWwgQ29ycG9yYXRpb24xKzApBgNVBAMTIkludGVsIEV4dGVybmFsIEJhc2ljIElzc3Vpbmcg Q0EgNEIwHhcNMTgwNzA0MDc1NzQ1WhcNMTkwNjI5MDc1NzQ1WjBHMRowGAYDVQQDExFCYXJ0bWlu c2tpLCBKYWt1YjEpMCcGCSqGSIb3DQEJARYaamFrdWIuYmFydG1pbnNraUBpbnRlbC5jb20wggEi MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCfa5P9LlWmo0/1PmpJSHwEkNXXtpoXiQGTLQ6R 5a8FAGx1lhU/tA1fV5wZwVvXc5c7qk4DoJJ9Ho6lIk5EthP4eKE0udZQ+3HueM85AnmYp2CqUUCe 6QyYop6aMZKsjMo0vLxQ1UbdiNLJWtkL8PjcjdKUhH3ZciSlXbg6DEsfwy4njcKbgcvjIpSjx9oM NoRY3HxZgA+/gxyUGNyvYRpqiiEBbzsXCsYL3Bmr0qy6M2Ckncsh4mq604bslPOGC2FiYs7XG93q uvVnAjleYMOrChDNg+OpPpdzrR03qnzI6moBZx1k3EUjeFeU2y8OVvUq2jIfNAWz7o77jqORmWan AgMBAAGjggI3MIICMzAdBgNVHQ4EFgQUH6RObNmFv0TpiclOpTZcehHXvd8wHwYDVR0jBBgwFoAU 2kEjnFqPca9Xgz4g0+Nl2wzLC9swZQYDVR0fBF4wXDBaoFigVoZUaHR0cDovL3d3dy5pbnRlbC5j b20vcmVwb3NpdG9yeS9DUkwvSW50ZWwlMjBFeHRlcm5hbCUyMEJhc2ljJTIwSXNzdWluZyUyMENB JTIwNEIuY3JsMIGfBggrBgEFBQcBAQSBkjCBjzAiBggrBgEFBQcwAYYWaHR0cDovL29jc3AuaW50 ZWwuY29tLzBpBggrBgEFBQcwAoZdaHR0cDovL3d3dy5pbnRlbC5jb20vcmVwb3NpdG9yeS9jZXJ0 aWZpY2F0ZXMvSW50ZWwlMjBFeHRlcm5hbCUyMEJhc2ljJTIwSXNzdWluZyUyMENBJTIwNEIuY3J0 MAsGA1UdDwQEAwIHgDA8BgkrBgEEAYI3FQcELzAtBiUrBgEEAYI3FQiGw4x1hJnlUYP9gSiFjp9T gpHACWeB3r05lfBDAgFkAgEJMB8GA1UdJQQYMBYGCCsGAQUFBwMEBgorBgEEAYI3CgMMMCkGCSsG AQQBgjcVCgQcMBowCgYIKwYBBQUHAwQwDAYKKwYBBAGCNwoDDDBRBgNVHREESjBIoCoGCisGAQQB gjcUAgOgHAwaamFrdWIuYmFydG1pbnNraUBpbnRlbC5jb22BGmpha3ViLmJhcnRtaW5za2lAaW50 ZWwuY29tMA0GCSqGSIb3DQEBBQUAA4IBAQCDTFu7WGmrrwWMGs8r3aPpGbK/UHuYHvvkP2iccWVT p9PHuhyKCJfi2A17riISxlo5EqeBKaGLEdFpd1eGlGs+FOM90qc66rYfD4QcsPUgGzp6kAG/GJuH NM6u5Ww1LfJwx2N6zg4okdmRmf7Yymp8bpwKV40ac+TTk1dDUcIQVSc5Ls1JWfpyw1xUCR2Z/2az uZseIDptDgPQPPJa0j6d4NG48sk34c5JotI6B+zbOXJDH/lFWUSTJ/iLYl3N00eATIyar0Ar68FQ aeWaWIE7+hJoxgIKAldb6ptzEy8PfMSqaqqo4gytJSl6WGBvMcIFIQUB5KgoKKttGqxWlmo2MYIC FzCCAhMCAQEwgZAweTELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRQwEgYDVQQHEwtTYW50YSBD bGFyYTEaMBgGA1UEChMRSW50ZWwgQ29ycG9yYXRpb24xKzApBgNVBAMTIkludGVsIEV4dGVybmFs IEJhc2ljIElzc3VpbmcgQ0EgNEICEzMAAGUdS+0yypIGyYkAAAAAZR0wCQYFKw4DAhoFAKBdMBgG CSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJKoZIhvcNAQkFMQ8XDTE4MDcxNzEyNDMwNlowIwYJ KoZIhvcNAQkEMRYEFM3iHpEQgdw5JdTpSwAfoxe9s1Y6MA0GCSqGSIb3DQEBAQUABIIBAG4nJKRI RQ1ITcENO+nVLUnikN7A0+rgxK8jzMLqBvJteSh+kbJFrlKhYND2I2ugVaUx4KmWRSMIfhTOF4BJ Peym5WUb7jUF3oHUlGHqTzPRnHZ9v6LhOqsq89COzbxTGf7oFOvo+23SsqfWfOXCTMHfkwM4fCR2 wdpW0ZpUHWWIYBicZOcUJxGevPFuSI7D0L1/scokM9cEVRX5DUju4oUJNLcHNA2J4RBYBuCZXJA0 45sTK0RyCai+EF2r2prJsnwcLBKPMi16jHMQun4Hyl0ZV36WtgYaAYp7aXLae6JvIiIsuNuck8Dv b322DOuzD55RAZN3Ez+0oPhMD/0PY1oAAAAAAAA= --=-K5V6uuDEb7KRp1SehNPk-- --===============0158765990== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg== --===============0158765990==--