From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michel Thierry Subject: Re: [PATCH v2] drm/i915: limit PPGTT size to 2GB in 32-bit platforms Date: Fri, 29 May 2015 09:58:33 +0100 Message-ID: <55682A39.4070501@intel.com> References: <1432826687-8158-1-git-send-email-michel.thierry@intel.com> <1432832974-5658-1-git-send-email-michel.thierry@intel.com> <20150528211450.GJ19710@nuc-i3427.alporthouse.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0896476935==" Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 696C36ECCB for ; Fri, 29 May 2015 01:58:35 -0700 (PDT) In-Reply-To: <20150528211450.GJ19710@nuc-i3427.alporthouse.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Chris Wilson , intel-gfx@lists.freedesktop.org, Mika Kuoppala List-Id: intel-gfx@lists.freedesktop.org This is a cryptographically signed message in MIME format. --===============0896476935== Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha1; boundary="------------ms020201020402050509080304" This is a cryptographically signed message in MIME format. --------------ms020201020402050509080304 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: quoted-printable On 5/28/2015 10:14 PM, Chris Wilson wrote: > On Thu, May 28, 2015 at 06:09:34PM +0100, Michel Thierry wrote: >> And prevent overflow warning during compilation. We already set this l= imit >> for the GGTT. >> >> This is a temporary patch until a full replacement of size_t variables= >> (inadequate in 32-bit kernel) is in place. >> >> Regression from: >> commit a4e0bedca678c81eea4cd79a4bd502335639f73a >> Author: Michel Thierry >> Date: Wed Apr 8 12:13:35 2015 +0100 >> >> drm/i915: Use complete address space in true PPGTT >> >> v2: Prettify code and explain why this is needed. (Chris) >> >> Suggested-by: Daniel Vetter >> Cc: Mika Kuoppala >> Cc: Chris Wilson >> Signed-off-by: Michel Thierry >> --- >> drivers/gpu/drm/i915/i915_gem_gtt.c | 11 ++++++++++- >> 1 file changed, 10 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i91= 5/i915_gem_gtt.c >> index 17b7df0..0653c28 100644 >> --- a/drivers/gpu/drm/i915/i915_gem_gtt.c >> +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c >> @@ -951,7 +951,16 @@ static int gen8_ppgtt_init(struct i915_hw_ppgtt *= ppgtt) >> gen8_initialize_pd(&ppgtt->base, ppgtt->scratch_pd); >> =20 >> ppgtt->base.start =3D 0; >> - ppgtt->base.total =3D 1ULL << 32; >> +#ifdef CONFIG_X86_32 >> + /* While we have a proliferation of size_t variables >> + * we cannot represent the full ppgtt size on 32bit, >> + * so limit it to the same size as the GGTT (currently >> + * 2GiB). >> + */ >> + ppgtt->base.total =3D to_i915(ppgtt->base.dev)->gtt.base.total; >> +#else >> + ppgtt->base.total =3D 1ULL << 32; >> +#endif > You missed the point of having it always compiled. Part of that is that= > the compiler warning here is important. > -Chris I was under the impression that Daniel wanted to get rid of the warning=20 too, that's why I didn't use IS_ENABLED(). --------------ms020201020402050509080304 Content-Type: application/pkcs7-signature; name="smime.p7s" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="smime.p7s" Content-Description: S/MIME Cryptographic Signature MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIIRkjCC BOswggPToAMCAQICEFLpAsoR6ESdlGU4L6MaMLswDQYJKoZIhvcNAQEFBQAwbzELMAkGA1UE BhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRUcnVzdCBFeHRlcm5h bCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0EgUm9vdDAeFw0x MzAzMTkwMDAwMDBaFw0yMDA1MzAxMDQ4MzhaMHkxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJD QTEUMBIGA1UEBxMLU2FudGEgQ2xhcmExGjAYBgNVBAoTEUludGVsIENvcnBvcmF0aW9uMSsw KQYDVQQDEyJJbnRlbCBFeHRlcm5hbCBCYXNpYyBJc3N1aW5nIENBIDRBMIIBIjANBgkqhkiG 9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4LDMgJ3YSVX6A9sE+jjH3b+F3Xa86z3LLKu/6WvjIdvU bxnoz2qnvl9UKQI3sE1zURQxrfgvtP0bPgt1uDwAfLc6H5eqnyi+7FrPsTGCR4gwDmq1WkTQ gNDNXUgb71e9/6sfq+WfCDpi8ScaglyLCRp7ph/V60cbitBvnZFelKCDBh332S6KG3bAdnNG B/vk86bwDlY6omDs6/RsfNwzQVwo/M3oPrux6y6zyIoRulfkVENbM0/9RrzQOlyK4W5Vk4EE sfW2jlCV4W83QKqRccAKIUxw2q/HoHVPbbETrrLmE6RRZ/+eWlkGWl+mtx42HOgOmX0BRdTR o9vH7yeBowIDAQABo4IBdzCCAXMwHwYDVR0jBBgwFoAUrb2YejS0Jvf6xCZU7wO94CTLVBow HQYDVR0OBBYEFB5pKrTcKP5HGE4hCz+8rBEv8Jj1MA4GA1UdDwEB/wQEAwIBhjASBgNVHRMB Af8ECDAGAQH/AgEAMDYGA1UdJQQvMC0GCCsGAQUFBwMEBgorBgEEAYI3CgMEBgorBgEEAYI3 CgMMBgkrBgEEAYI3FQUwFwYDVR0gBBAwDjAMBgoqhkiG+E0BBQFpMEkGA1UdHwRCMEAwPqA8 oDqGOGh0dHA6Ly9jcmwudHJ1c3QtcHJvdmlkZXIuY29tL0FkZFRydXN0RXh0ZXJuYWxDQVJv b3QuY3JsMDoGCCsGAQUFBwEBBC4wLDAqBggrBgEFBQcwAYYeaHR0cDovL29jc3AudHJ1c3Qt cHJvdmlkZXIuY29tMDUGA1UdHgQuMCygKjALgQlpbnRlbC5jb20wG6AZBgorBgEEAYI3FAID oAsMCWludGVsLmNvbTANBgkqhkiG9w0BAQUFAAOCAQEAKcLNo/2So1Jnoi8G7W5Q6FSPq1fm yKW3sSDf1amvyHkjEgd25n7MKRHGEmRxxoziPKpcmbfXYU+J0g560nCo5gPF78Wd7ZmzcmCc m1UFFfIxfw6QA19bRpTC8bMMaSSEl8y39Pgwa+HENmoPZsM63DdZ6ziDnPqcSbcfYs8qd/m5 d22rpXq5IGVUtX6LX7R/hSSw/3sfATnBLgiJtilVyY7OGGmYKCAS2I04itvSS1WtecXTt9OZ DyNbl7LtObBrgMLhZkpJW+pOR9f3h5VG2S5uKkA7Th9NC9EoScdwQCAIw+UWKbSQ0Isj2UFL 7fHKvmqWKVTL98sRzvI3seNC4DCCBiowggUSoAMCAQICChZNwGIAAAAAT+swDQYJKoZIhvcN AQEFBQAweTELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRQwEgYDVQQHEwtTYW50YSBDbGFy YTEaMBgGA1UEChMRSW50ZWwgQ29ycG9yYXRpb24xKzApBgNVBAMTIkludGVsIEV4dGVybmFs IEJhc2ljIElzc3VpbmcgQ0EgNEEwHhcNMTQwNDI4MTIyMzQ3WhcNMTcwNDEyMTIyMzQ3WjBD MRgwFgYDVQQDEw9UaGllcnJ5LCBNaWNoZWwxJzAlBgkqhkiG9w0BCQEWGG1pY2hlbC50aGll cnJ5QGludGVsLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKuvwFQqpb2d bD6xItCPUz74nZG7NRczIbUcL8TFaJXQPU+wJhpZBXYhTv+Qme/ZgAlIF/caUKQZ0uYGcYVY yf7dPp+lShl6+CYqz/NDvSb28jxvMgK/3MLQaVQP/82V7nYbe/2JPpAXJVDW/PQk6j+I/tgK zAIxbr1IZB91KecP3p3ksnKuohDkJA4FEK/f9LWo18lSa92yYDhJ6kEV90a2VPA4l6UYngGs OYhVAAsRoba+ROSiuVG5yDyrKwrAhAXdSbpIH1KO91MsCNlUPEtKdunnSL6eoFXfe9cA9+iZ qrvddLWCmDkjsqCsXrBJs87gE8lj733wU+rUiIPnq08CAwEAAaOCAugwggLkMAsGA1UdDwQE AwIHgDA8BgkrBgEEAYI3FQcELzAtBiUrBgEEAYI3FQiGw4x1hJnlUYP9gSiFjp9TgpHACWeB 3r05lfBDAgFkAgEIMB0GA1UdDgQWBBRFUVbAqJvKLf4iKYvg6Gx6sRNhZjAfBgNVHSMEGDAW gBQeaSq03Cj+RxhOIQs/vKwRL/CY9TCByQYDVR0fBIHBMIG+MIG7oIG4oIG1hlRodHRwOi8v d3d3LmludGVsLmNvbS9yZXBvc2l0b3J5L0NSTC9JbnRlbCUyMEV4dGVybmFsJTIwQmFzaWMl MjBJc3N1aW5nJTIwQ0ElMjA0QS5jcmyGXWh0dHA6Ly9jZXJ0aWZpY2F0ZXMuaW50ZWwuY29t L3JlcG9zaXRvcnkvQ1JML0ludGVsJTIwRXh0ZXJuYWwlMjBCYXNpYyUyMElzc3VpbmclMjBD QSUyMDRBLmNybDCB7wYIKwYBBQUHAQEEgeIwgd8waQYIKwYBBQUHMAKGXWh0dHA6Ly93d3cu aW50ZWwuY29tL3JlcG9zaXRvcnkvY2VydGlmaWNhdGVzL0ludGVsJTIwRXh0ZXJuYWwlMjBC YXNpYyUyMElzc3VpbmclMjBDQSUyMDRBLmNydDByBggrBgEFBQcwAoZmaHR0cDovL2NlcnRp ZmljYXRlcy5pbnRlbC5jb20vcmVwb3NpdG9yeS9jZXJ0aWZpY2F0ZXMvSW50ZWwlMjBFeHRl cm5hbCUyMEJhc2ljJTIwSXNzdWluZyUyMENBJTIwNEEuY3J0MB8GA1UdJQQYMBYGCCsGAQUF BwMEBgorBgEEAYI3CgMMMCkGCSsGAQQBgjcVCgQcMBowCgYIKwYBBQUHAwQwDAYKKwYBBAGC NwoDDDBNBgNVHREERjBEoCgGCisGAQQBgjcUAgOgGgwYbWljaGVsLnRoaWVycnlAaW50ZWwu Y29tgRhtaWNoZWwudGhpZXJyeUBpbnRlbC5jb20wDQYJKoZIhvcNAQEFBQADggEBAMYpBdhi VzoxuD58VMj2xc6Zsz7cg0Bpiji7sfDrhswhYwWogsBukXFwhukKmSqRIwvdSIoWfBDA4kIS qvgrMTYPtDl59awxdvn+jWx/P0APyC3tBg4z+1u0waM3smppq5/8f8Hew2S0IWP7tIJeQ+NY IE+iX5NclbuK4mFNJa74Rw7uaWBY+4zBNDaaaCgosmPfP5sBQnJzYL0jnNJTWXZP74JUPj/7 9SXg+C0dSORUqkkIsCy0jPGzT3ypk75JJ80znb0uoO4kgW2hO7dAAEe1GkONG4Ab1Bsk4zJl 1FaFkOf5aAepzm4rwnVtRMpaL8rjce3VOfpCvcIg+WDFXUAwggZxMIIFWaADAgECAgoWTN75 AAAAAE/qMA0GCSqGSIb3DQEBBQUAMHkxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEUMBIG A1UEBxMLU2FudGEgQ2xhcmExGjAYBgNVBAoTEUludGVsIENvcnBvcmF0aW9uMSswKQYDVQQD EyJJbnRlbCBFeHRlcm5hbCBCYXNpYyBJc3N1aW5nIENBIDRBMB4XDTE0MDQyODEyMjI0OVoX DTE3MDQxMjEyMjI0OVowQzEYMBYGA1UEAxMPVGhpZXJyeSwgTWljaGVsMScwJQYJKoZIhvcN AQkBFhhtaWNoZWwudGhpZXJyeUBpbnRlbC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw ggEKAoIBAQDECX/a/YWv0J8ABUwU61b73w7YCBE18G1fMdlsadEZUpg0BbpMOu0rx68iUq9x zU575ggweIlkt/qBGnGZvDVP8Iit5hFLmtlPnds0OelpjzE1o9nsgdrGEoT2BgjoTja+yLnv wDldEPqAszih/nCQcqtyH4vEmmnBxsUwMR7oD9U+U8sRLmpqbE1g0OGEh+X5zLrdNBEMZAGu iE2VeqvgS3poayRiJ2nc43ufMDtDlUnozq2H7+CRXU6yFsprpVTx29YHIrJLZxp+rBOlNQAy 8Ba5zyKq/lRRs79YLH8qzCdZJS7PfLpgBn8B8vl+Kp9iMMKdxhIMms46S+Grv+7FAgMBAAGj ggMvMIIDKzALBgNVHQ8EBAMCBDAwPQYJKwYBBAGCNxUHBDAwLgYmKwYBBAGCNxUIhsOMdYSZ 5VGD/YEohY6fU4KRwAlnhLnZQYeE/04CAWQCAQ0wRAYJKoZIhvcNAQkPBDcwNTAOBggqhkiG 9w0DAgICAIAwDgYIKoZIhvcNAwQCAgCAMAcGBSsOAwIHMAoGCCqGSIb3DQMHMB0GA1UdDgQW BBRBzUHVb22UOyhMUTmF2b9/Rh7RMTAfBgNVHSMEGDAWgBQeaSq03Cj+RxhOIQs/vKwRL/CY 9TCByQYDVR0fBIHBMIG+MIG7oIG4oIG1hlRodHRwOi8vd3d3LmludGVsLmNvbS9yZXBvc2l0 b3J5L0NSTC9JbnRlbCUyMEV4dGVybmFsJTIwQmFzaWMlMjBJc3N1aW5nJTIwQ0ElMjA0QS5j cmyGXWh0dHA6Ly9jZXJ0aWZpY2F0ZXMuaW50ZWwuY29tL3JlcG9zaXRvcnkvQ1JML0ludGVs JTIwRXh0ZXJuYWwlMjBCYXNpYyUyMElzc3VpbmclMjBDQSUyMDRBLmNybDCB7wYIKwYBBQUH AQEEgeIwgd8waQYIKwYBBQUHMAKGXWh0dHA6Ly93d3cuaW50ZWwuY29tL3JlcG9zaXRvcnkv Y2VydGlmaWNhdGVzL0ludGVsJTIwRXh0ZXJuYWwlMjBCYXNpYyUyMElzc3VpbmclMjBDQSUy MDRBLmNydDByBggrBgEFBQcwAoZmaHR0cDovL2NlcnRpZmljYXRlcy5pbnRlbC5jb20vcmVw b3NpdG9yeS9jZXJ0aWZpY2F0ZXMvSW50ZWwlMjBFeHRlcm5hbCUyMEJhc2ljJTIwSXNzdWlu ZyUyMENBJTIwNEEuY3J0MB8GA1UdJQQYMBYGCCsGAQUFBwMEBgorBgEEAYI3CgMEMCkGCSsG AQQBgjcVCgQcMBowCgYIKwYBBQUHAwQwDAYKKwYBBAGCNwoDBDBNBgNVHREERjBEoCgGCisG AQQBgjcUAgOgGgwYbWljaGVsLnRoaWVycnlAaW50ZWwuY29tgRhtaWNoZWwudGhpZXJyeUBp bnRlbC5jb20wDQYJKoZIhvcNAQEFBQADggEBAGrtUHqoTWHttQxVewb/Uv6uL0YnPOVyFZs2 UKlnDV8zoUf4enk4FBIOKEqZIZ1Ektx5P1BaIHGfCVBP0Y4FIo2Twi4VHuWzkmECEKvjaur1 YTcuUHT3xQMsRS2CgUb2ttxGr381zG4CDKM9esAv0lDPzH+KgWhK1U+/gpq04AzLOQUHi5cP 1ZCINbo8AnunzRKhzegbQ6nr7frQlCUlrLMstzquhI0t8QjdFO3GKAjXF3wJf3aKnYNeFAWE xwLkdjM+TevhMpiNeBRJoEeUcGRRhe0YlhIoiryD5sZIeWGPBAhwOpZFGRdlXAcfbpwQ3K7a we2yqKeiU606TCcfppgxggO2MIIDsgIBATCBhzB5MQswCQYDVQQGEwJVUzELMAkGA1UECBMC Q0ExFDASBgNVBAcTC1NhbnRhIENsYXJhMRowGAYDVQQKExFJbnRlbCBDb3Jwb3JhdGlvbjEr MCkGA1UEAxMiSW50ZWwgRXh0ZXJuYWwgQmFzaWMgSXNzdWluZyBDQSA0QQIKFk3AYgAAAABP 6zAJBgUrDgMCGgUAoIICAzAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3DQEJ BTEPFw0xNTA1MjkwODU4MzNaMCMGCSqGSIb3DQEJBDEWBBQd1ApvOSM6ixEd853mk1BzHeGC 7TBsBgkqhkiG9w0BCQ8xXzBdMAsGCWCGSAFlAwQBKjALBglghkgBZQMEAQIwCgYIKoZIhvcN AwcwDgYIKoZIhvcNAwICAgCAMA0GCCqGSIb3DQMCAgFAMAcGBSsOAwIHMA0GCCqGSIb3DQMC AgEoMIGYBgkrBgEEAYI3EAQxgYowgYcweTELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRQw EgYDVQQHEwtTYW50YSBDbGFyYTEaMBgGA1UEChMRSW50ZWwgQ29ycG9yYXRpb24xKzApBgNV BAMTIkludGVsIEV4dGVybmFsIEJhc2ljIElzc3VpbmcgQ0EgNEECChZM3vkAAAAAT+owgZoG CyqGSIb3DQEJEAILMYGKoIGHMHkxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEUMBIGA1UE BxMLU2FudGEgQ2xhcmExGjAYBgNVBAoTEUludGVsIENvcnBvcmF0aW9uMSswKQYDVQQDEyJJ bnRlbCBFeHRlcm5hbCBCYXNpYyBJc3N1aW5nIENBIDRBAgoWTN75AAAAAE/qMA0GCSqGSIb3 DQEBAQUABIIBAJK3oIqb7bW3+tU0UfCD6w9Y2E3/9tPfbkv1hbbeRgnmrW9XuG5naYTHLK7L MwwTRbH5CrAHR/MODMV2USA9Z7DaCqT8IwT23HkHYWozEhYKSsL33mfURkwUSAr8/4UKZWeS mkbmb8B4i/nWJWl2/CIFdSyicm/P0k1tVvxXJqkOvlGFlAZdSyuuJvjfAKuyN+DJ67dl133t bNaQELgcoD1YOqolRhE9igLgS1MM2M8yUt2iBfoCw6xKo2Uv6eN4GsPPUdvo+FM1bDywMtSJ ZXNti4cSi2JOWmR0+/kfpc8buXZa32ExyZniIXnA53WBRX6VO9k1QUrAKqwAqvrdOwgAAAAA AAA= --------------ms020201020402050509080304-- --===============0896476935== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK --===============0896476935==--