From mboxrd@z Thu Jan 1 00:00:00 1970 From: Krzysztof Kolasa Subject: Re: [PATCH] drm/i915: Initialize obj->pages before use by i915_gem_object_do_bit17_swizzle() Date: Fri, 19 Oct 2012 18:29:03 +0200 Message-ID: <50817FCF.5050307@winsoft.pl> References: <5081419F.4080605@winsoft.pl> <1350658266-13158-1-git-send-email-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0297362497==" Return-path: Received: from winsoft.com.pl (winsoft.com.pl [109.234.111.213]) by gabe.freedesktop.org (Postfix) with ESMTP id 0CA1E9EEE7 for ; Fri, 19 Oct 2012 09:56:29 -0700 (PDT) In-Reply-To: <1350658266-13158-1-git-send-email-chris@chris-wilson.co.uk> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Chris Wilson Cc: daniel.vetter@ffwll.ch, intel-gfx@lists.freedesktop.org, stable@vger.kernel.org List-Id: intel-gfx@lists.freedesktop.org This is a cryptographically signed message in MIME format. --===============0297362497== Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha1; boundary="------------ms010108050509080503090902" This is a cryptographically signed message in MIME format. --------------ms010108050509080503090902 Content-Type: text/plain; charset=ISO-8859-2; format=flowed Content-Transfer-Encoding: quoted-printable On 19.10.2012 16:51, Chris Wilson wrote: > If we leave obj->pages set to NULL before attempting to deswizzle them,= > then an OOPS is well deserved. > > Fixes regression introduced in commit 9da3da660d8c19a54f6e93361d147509b= e3fff84 > Author: Chris Wilson > Date: Fri Jun 1 15:20:22 2012 +0100 > > drm/i915: Replace the array of pages with a scatterlist > > Reported-by: Krzysztof Kolasa > Signed-off-by: Chris Wilson > Cc: stable@vger.kernel.org > --- > drivers/gpu/drm/i915/i915_gem.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i91= 5_gem.c > index ad2ed75..6ab7c68 100644 > --- a/drivers/gpu/drm/i915/i915_gem.c > +++ b/drivers/gpu/drm/i915/i915_gem.c > @@ -1953,10 +1953,11 @@ i915_gem_object_get_pages_gtt(struct drm_i915_g= em_object *obj) > sg_set_page(sg, page, PAGE_SIZE, 0); > } > =20 > + obj->pages =3D st; > + > if (i915_gem_object_needs_bit17_swizzle(obj)) > i915_gem_object_do_bit_17_swizzle(obj); > =20 > - obj->pages =3D st; > return 0; > =20 > err_pages: Patch solves the problem. Thanks. Krzysztof --------------ms010108050509080503090902 Content-Type: application/pkcs7-signature; name="smime.p7s" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="smime.p7s" Content-Description: S/MIME Cryptographic Signature MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIIKSTCC BDUwggMdoAMCAQICAwR6UjANBgkqhkiG9w0BAQUFADA+MQswCQYDVQQGEwJQTDEbMBkGA1UE ChMSVW5pemV0byBTcC4geiBvLm8uMRIwEAYDVQQDEwlDZXJ0dW0gQ0EwHhcNMDkwMzAzMTI1 MzE4WhcNMjQwMzAzMTI1MzE4WjB3MQswCQYDVQQGEwJQTDEiMCAGA1UEChMZVW5pemV0byBU ZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9y aXR5MRswGQYDVQQDExJDZXJ0dW0gTGV2ZWwgSUkgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IB DwAwggEKAoIBAQDgsTQjHDyHkul6v20dW1mRYi6PFiw9WBRkAF5lmBCwpN0mNoZU/rgH+iIR Xkd3cDFGppnt1FGx/g+D89JL/aYdFBD9IfdcAJusMea5wO9iC1T9ahnKn13o9dU9jiPsnm3/ naz4RtkPmzBK5AsaNn2LCD2xdfcl0n1PL4HfPzSiJqOkrQHCoDGtxfcN6QQ6SePsuQA4rqK5 AojzlESPghVv2QPsoohZ0hIZt8vgTOH9M/nV7Qv9aFMnuUdsdtHMV89T+iLdDK3m0R7Gs8p7 7o34mt6N1vlhrs17e0q6MNTsqVs752enMUftUeQE8lxAntBSums9qpWxWDcknU9dOpWfAgMB AAGjggEBMIH+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSA YhHewGunEOEI8FW0MIO/+o8IYDBSBgNVHSMESzBJoUKkQDA+MQswCQYDVQQGEwJQTDEbMBkG A1UEChMSVW5pemV0byBTcC4geiBvLm8uMRIwEAYDVQQDEwlDZXJ0dW0gQ0GCAwEAIDAsBgNV HR8EJTAjMCGgH6AdhhtodHRwOi8vY3JsLmNlcnR1bS5wbC9jYS5jcmwwOgYDVR0gBDMwMTAv BgRVHSAAMCcwJQYIKwYBBQUHAgEWGWh0dHBzOi8vd3d3LmNlcnR1bS5wbC9DUFMwDQYJKoZI hvcNAQEFBQADggEBALDY158kfBcPskynVAEJYYSvpIqF4YdOjcZ+5qxVgxwWcBYw76dbqQl6 S6fuGuSfJ1yuVCzC4oqQavoAjk8PyQRvRzhIXQjvNNicRg0y+u5RwMRAgFZBlSCdvvt6fepv 4qJpHN2WQ6lWBuwVk9WM7BzlozcZg8CNG0SHB6jcMHY7v0R4z/NtsEFoUdTeIxYPFHI1I0qY pwE/ZE5+2lQA3qoboXc7WluMk2KaUTbMcksEoZP3NDQtqdLIk9B9ZPprslIq6I0xlxbHNhVH K/DELRbldj3oj+0LPvuGjgemnLuUTn+G5ylqVs+bDJLVNm/OPaGJEt0WxIWq/+9f3DJGG6ww ggYMMIIE9KADAgECAhBKCv5zChVLZk43YKp8Nn9CMA0GCSqGSIb3DQEBBQUAMHcxCzAJBgNV BAYTAlBMMSIwIAYDVQQKExlVbml6ZXRvIFRlY2hub2xvZ2llcyBTLkEuMScwJQYDVQQLEx5D ZXJ0dW0gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxGzAZBgNVBAMTEkNlcnR1bSBMZXZlbCBJ SSBDQTAeFw0xMTEwMjIwMDAwMDBaFw0xMzEwMjEwMDAwMDBaMIGKMSEwHwYJKoZIhvcNAQkB FhJra29sYXNhQHdpbnNvZnQucGwxGTAXBgNVBAMMEEtyenlzenRvZiBLb2xhc2ExETAPBgNV BAsMCFNvZnR3YXJlMSowKAYDVQQKDCFQLkguVS4gIldJTlNPRlQiIEtyenlzenRvZiBLb2xh c2ExCzAJBgNVBAYTAlBMMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnrBFUe6c 994BmOtZmxgH+F8F/TK4PyneWGqj83krHeSwK1JmqQbTpKG9K+b3SLL0U368KM2Qi1AOT6yd NcyiDpsZK7RQVPnt3Er0EmX0BAbSUuhfL1ayEnxGDEdZE7Ibo9KoOBCrUnHpLKw/kA2emb0T 3iAZ7/+SATNpds6wAO9PYZGhgS7Qy2O5Zd8yZZA+3sLdOMpAOm2JRWfXz713tii0ImkVMf+n Vh8lRtnrQHSoVuqG4q7K3dW6ox8qgMMrxIhgUI7qnq5D73W8s0+VV8ELnbg3Oz/jfIIKx0vC 0mpuu+tlqAoMhXqV+lwyx7Gfi9FhFiz9AyGtncMJ41rPeQIDAQABo4ICfjCCAnowDAYDVR0T AQH/BAIwADAsBgNVHR8EJTAjMCGgH6AdhhtodHRwOi8vY3JsLmNlcnR1bS5wbC9sMi5jcmww WgYIKwYBBQUHAQEETjBMMCEGCCsGAQUFBzABhhVodHRwOi8vb2NzcC5jZXJ0dW0ucGwwJwYI KwYBBQUHMAKGG2h0dHA6Ly93d3cuY2VydHVtLnBsL2wyLmNlcjAfBgNVHSMEGDAWgBSAYhHe wGunEOEI8FW0MIO/+o8IYDAdBgNVHQ4EFgQUR7qmeC1ehqSaZpUA0RELXaKDN9kwDgYDVR0P AQH/BAQDAgSwMIIBPQYDVR0gBIIBNDCCATAwggEsBgoqhGgBhvZ3AgICMIIBHDAlBggrBgEF BQcCARYZaHR0cHM6Ly93d3cuY2VydHVtLnBsL0NQUzCB8gYIKwYBBQUHAgIwgeUwIBYZVW5p emV0byBUZWNobm9sb2dpZXMgUy5BLjADAgEBGoHAVXNhZ2Ugb2YgdGhpcyBjZXJ0aWZpY2F0 ZSBpcyBzdHJpY3RseSBzdWJqZWN0ZWQgdG8gdGhlIENFUlRVTSBDZXJ0aWZpY2F0aW9uIFBy YWN0aWNlIFN0YXRlbWVudCAoQ1BTKSBpbmNvcnBvcmF0ZWQgYnkgcmVmZXJlbmNlIGhlcmVp biBhbmQgaW4gdGhlIHJlcG9zaXRvcnkgYXQgaHR0cHM6Ly93d3cuY2VydHVtLnBsL3JlcG9z aXRvcnkuMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDBDARBglghkgBhvhCAQEEBAMC BaAwHQYDVR0RBBYwFIESa2tvbGFzYUB3aW5zb2Z0LnBsMA0GCSqGSIb3DQEBBQUAA4IBAQC8 awTTYI9X/r8JzuSDH0Rv4E5nCwKvC3pg3nY0d6PSQp/PGPHX8NMmJr9d7X8Ybg/m3OSevQWL ualksFdNuv9EmmdB1tUSMb/Kfa77aijFCzSFyJ1i0cVe5AvdEKujmc1a5HTbXW9EfOI65LOU VUefXBnp5GxC0hISPjaBHddLHdE1iMkDLqa7P6whoIhKFcxeb7/GT26/YY8dt5R68y3UL8iC DzsL33w4VjhB28p874N7BLtczMe/CpnGIGtDY5S0Ug2qKVsh6eLyFP6dkDjfZqpnzt5hOz9J yg870PMYYDG0FvP+n2RL/Byap4sHoApb55ERwwUgwM+fCFpCkaVxMYIDwjCCA74CAQEwgYsw dzELMAkGA1UEBhMCUEwxIjAgBgNVBAoTGVVuaXpldG8gVGVjaG5vbG9naWVzIFMuQS4xJzAl BgNVBAsTHkNlcnR1bSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEbMBkGA1UEAxMSQ2VydHVt IExldmVsIElJIENBAhBKCv5zChVLZk43YKp8Nn9CMAkGBSsOAwIaBQCgggILMBgGCSqGSIb3 DQEJAzELBgkqhkiG9w0BBwEwHAYJKoZIhvcNAQkFMQ8XDTEyMTAxOTE2MjkwM1owIwYJKoZI hvcNAQkEMRYEFJbvoNFHSwmBBvV1Kg6il0/1irbUMGwGCSqGSIb3DQEJDzFfMF0wCwYJYIZI AWUDBAEqMAsGCWCGSAFlAwQBAjAKBggqhkiG9w0DBzAOBggqhkiG9w0DAgICAIAwDQYIKoZI hvcNAwICAUAwBwYFKw4DAgcwDQYIKoZIhvcNAwICASgwgZwGCSsGAQQBgjcQBDGBjjCBizB3 MQswCQYDVQQGEwJQTDEiMCAGA1UEChMZVW5pemV0byBUZWNobm9sb2dpZXMgUy5BLjEnMCUG A1UECxMeQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRswGQYDVQQDExJDZXJ0dW0g TGV2ZWwgSUkgQ0ECEEoK/nMKFUtmTjdgqnw2f0IwgZ4GCyqGSIb3DQEJEAILMYGOoIGLMHcx CzAJBgNVBAYTAlBMMSIwIAYDVQQKExlVbml6ZXRvIFRlY2hub2xvZ2llcyBTLkEuMScwJQYD VQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxGzAZBgNVBAMTEkNlcnR1bSBM ZXZlbCBJSSBDQQIQSgr+cwoVS2ZON2CqfDZ/QjANBgkqhkiG9w0BAQEFAASCAQBIlTrHhfJG p0g5kX15cm5nUeDH+07crdmy4dj2t5qc5Q1X3MtXfZDEF9U4375+zciH+sqOV37naNo4dc9G 1MQghc4ChoUj3pEYOw/RR/X6fjXCUMvdWFu7HgAWh4bxmn15tlJDVhflbeasucufN97fu5Ot +4RCBgLvJXrVLLF/hkudXtXX1oyDLNmFqcktpwgbjgdlyI4edGLtFgCsgRS3Tn8roOhyIChK MjdG+zDyu5yiCkuAIvLJ4Y2WQ4iNzVkRlrktW9XQmqtUbcdEvEQQWk+2n30EksX1n8otQ6f7 etdymHK00vaAv27imFAFC40OySBk9VyMe7yDGoF/9+1pAAAAAAAA --------------ms010108050509080503090902-- --===============0297362497== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx --===============0297362497==--