From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ben Skeggs Subject: [mesa 4/9] nouveau: return nouveau_screen from hw-specific creation functions Date: Thu, 26 Nov 2015 17:14:58 +1000 Message-ID: <1448522103-4925-4-git-send-email-skeggsb@gmail.com> References: <1448522103-4925-1-git-send-email-skeggsb@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1448522103-4925-1-git-send-email-skeggsb-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: nouveau-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Nouveau" To: nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: Ben Skeggs List-Id: nouveau.vger.kernel.org RnJvbTogQmVuIFNrZWdncyA8YnNrZWdnc0ByZWRoYXQuY29tPgoKS2lsbHMgb2ZmIGEgdm9pZCBj YXN0LgoKU2lnbmVkLW9mZi1ieTogQmVuIFNrZWdncyA8YnNrZWdnc0ByZWRoYXQuY29tPgotLS0K IHNyYy9nYWxsaXVtL2RyaXZlcnMvbm91dmVhdS9ub3V2ZWF1X3dpbnN5cy5oICAgICAgICB8IDYg KysrLS0tCiBzcmMvZ2FsbGl1bS9kcml2ZXJzL25vdXZlYXUvbnYzMC9udjMwX3NjcmVlbi5jICAg ICAgfCA0ICsrLS0KIHNyYy9nYWxsaXVtL2RyaXZlcnMvbm91dmVhdS9udjUwL252NTBfc2NyZWVu LmMgICAgICB8IDQgKystLQogc3JjL2dhbGxpdW0vZHJpdmVycy9ub3V2ZWF1L252YzAvbnZjMF9z Y3JlZW4uYyAgICAgIHwgNCArKy0tCiBzcmMvZ2FsbGl1bS93aW5zeXMvbm91dmVhdS9kcm0vbm91 dmVhdV9kcm1fd2luc3lzLmMgfCA0ICsrLS0KIDUgZmlsZXMgY2hhbmdlZCwgMTEgaW5zZXJ0aW9u cygrKSwgMTEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvc3JjL2dhbGxpdW0vZHJpdmVycy9u b3V2ZWF1L25vdXZlYXVfd2luc3lzLmggYi9zcmMvZ2FsbGl1bS9kcml2ZXJzL25vdXZlYXUvbm91 dmVhdV93aW5zeXMuaAppbmRleCAxMzE5YzMyLi4zYTY4NmJkIDEwMDY0NAotLS0gYS9zcmMvZ2Fs bGl1bS9kcml2ZXJzL25vdXZlYXUvbm91dmVhdV93aW5zeXMuaAorKysgYi9zcmMvZ2FsbGl1bS9k cml2ZXJzL25vdXZlYXUvbm91dmVhdV93aW5zeXMuaApAQCAtNzksMTMgKzc5LDEzIEBAIG5vdXZl YXVfc2NyZWVuX3RyYW5zZmVyX2ZsYWdzKHVuc2lnbmVkIHBpcGUpCiAgICByZXR1cm4gZmxhZ3M7 CiB9CiAKLWV4dGVybiBzdHJ1Y3QgcGlwZV9zY3JlZW4gKgorZXh0ZXJuIHN0cnVjdCBub3V2ZWF1 X3NjcmVlbiAqCiBudjMwX3NjcmVlbl9jcmVhdGUoc3RydWN0IG5vdXZlYXVfZGV2aWNlICopOwog Ci1leHRlcm4gc3RydWN0IHBpcGVfc2NyZWVuICoKK2V4dGVybiBzdHJ1Y3Qgbm91dmVhdV9zY3Jl ZW4gKgogbnY1MF9zY3JlZW5fY3JlYXRlKHN0cnVjdCBub3V2ZWF1X2RldmljZSAqKTsKIAotZXh0 ZXJuIHN0cnVjdCBwaXBlX3NjcmVlbiAqCitleHRlcm4gc3RydWN0IG5vdXZlYXVfc2NyZWVuICoK IG52YzBfc2NyZWVuX2NyZWF0ZShzdHJ1Y3Qgbm91dmVhdV9kZXZpY2UgKik7CiAKICNlbmRpZgpk aWZmIC0tZ2l0IGEvc3JjL2dhbGxpdW0vZHJpdmVycy9ub3V2ZWF1L252MzAvbnYzMF9zY3JlZW4u YyBiL3NyYy9nYWxsaXVtL2RyaXZlcnMvbm91dmVhdS9udjMwL252MzBfc2NyZWVuLmMKaW5kZXgg MTU0YzNkMy4uZWEyOTgxMSAxMDA2NDQKLS0tIGEvc3JjL2dhbGxpdW0vZHJpdmVycy9ub3V2ZWF1 L252MzAvbnYzMF9zY3JlZW4uYworKysgYi9zcmMvZ2FsbGl1bS9kcml2ZXJzL25vdXZlYXUvbnYz MC9udjMwX3NjcmVlbi5jCkBAIC00MTcsNyArNDE3LDcgQEAgbnYzMF9zY3JlZW5fZGVzdHJveShz dHJ1Y3QgcGlwZV9zY3JlZW4gKnBzY3JlZW4pCiAgICAgICByZXR1cm4gTlVMTDsgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBcCiAgICB9IHdoaWxlKDApCiAKLXN0cnVjdCBwaXBl X3NjcmVlbiAqCitzdHJ1Y3Qgbm91dmVhdV9zY3JlZW4gKgogbnYzMF9zY3JlZW5fY3JlYXRlKHN0 cnVjdCBub3V2ZWF1X2RldmljZSAqZGV2KQogewogICAgc3RydWN0IG52MzBfc2NyZWVuICpzY3Jl ZW4gPSBDQUxMT0NfU1RSVUNUKG52MzBfc2NyZWVuKTsKQEAgLTY5Myw1ICs2OTMsNSBAQCBudjMw X3NjcmVlbl9jcmVhdGUoc3RydWN0IG5vdXZlYXVfZGV2aWNlICpkZXYpCiAgICBub3V2ZWF1X3B1 c2hidWZfa2ljayhwdXNoLCBwdXNoLT5jaGFubmVsKTsKIAogICAgbm91dmVhdV9mZW5jZV9uZXco JnNjcmVlbi0+YmFzZSwgJnNjcmVlbi0+YmFzZS5mZW5jZS5jdXJyZW50LCBmYWxzZSk7Ci0gICBy ZXR1cm4gcHNjcmVlbjsKKyAgIHJldHVybiAmc2NyZWVuLT5iYXNlOwogfQpkaWZmIC0tZ2l0IGEv c3JjL2dhbGxpdW0vZHJpdmVycy9ub3V2ZWF1L252NTAvbnY1MF9zY3JlZW4uYyBiL3NyYy9nYWxs aXVtL2RyaXZlcnMvbm91dmVhdS9udjUwL252NTBfc2NyZWVuLmMKaW5kZXggYzE1MjFkYi4uODAw ZjdjZSAxMDA2NDQKLS0tIGEvc3JjL2dhbGxpdW0vZHJpdmVycy9ub3V2ZWF1L252NTAvbnY1MF9z Y3JlZW4uYworKysgYi9zcmMvZ2FsbGl1bS9kcml2ZXJzL25vdXZlYXUvbnY1MC9udjUwX3NjcmVl bi5jCkBAIC03NDcsNyArNzQ3LDcgQEAgaW50IG52NTBfdGxzX3JlYWxsb2Moc3RydWN0IG52NTBf c2NyZWVuICpzY3JlZW4sIHVuc2lnbmVkIHRsc19zcGFjZSkKICAgIHJldHVybiAxOwogfQogCi1z dHJ1Y3QgcGlwZV9zY3JlZW4gKgorc3RydWN0IG5vdXZlYXVfc2NyZWVuICoKIG52NTBfc2NyZWVu X2NyZWF0ZShzdHJ1Y3Qgbm91dmVhdV9kZXZpY2UgKmRldikKIHsKICAgIHN0cnVjdCBudjUwX3Nj cmVlbiAqc2NyZWVuOwpAQCAtOTYxLDcgKzk2MSw3IEBAIG52NTBfc2NyZWVuX2NyZWF0ZShzdHJ1 Y3Qgbm91dmVhdV9kZXZpY2UgKmRldikKIAogICAgbm91dmVhdV9mZW5jZV9uZXcoJnNjcmVlbi0+ YmFzZSwgJnNjcmVlbi0+YmFzZS5mZW5jZS5jdXJyZW50LCBmYWxzZSk7CiAKLSAgIHJldHVybiBw c2NyZWVuOworICAgcmV0dXJuICZzY3JlZW4tPmJhc2U7CiAKIGZhaWw6CiAgICBudjUwX3NjcmVl bl9kZXN0cm95KHBzY3JlZW4pOwpkaWZmIC0tZ2l0IGEvc3JjL2dhbGxpdW0vZHJpdmVycy9ub3V2 ZWF1L252YzAvbnZjMF9zY3JlZW4uYyBiL3NyYy9nYWxsaXVtL2RyaXZlcnMvbm91dmVhdS9udmMw L252YzBfc2NyZWVuLmMKaW5kZXggYjdlNDRlNy4uYmI3ZGQzMiAxMDA2NDQKLS0tIGEvc3JjL2dh bGxpdW0vZHJpdmVycy9ub3V2ZWF1L252YzAvbnZjMF9zY3JlZW4uYworKysgYi9zcmMvZ2FsbGl1 bS9kcml2ZXJzL25vdXZlYXUvbnZjMC9udmMwX3NjcmVlbi5jCkBAIC02MjEsNyArNjIxLDcgQEAg bnZjMF9zY3JlZW5fcmVzaXplX3Rsc19hcmVhKHN0cnVjdCBudmMwX3NjcmVlbiAqc2NyZWVuLAog ICAgICAgcmV0dXJuIE5VTEw7ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAog ICAgfSB3aGlsZSgwKQogCi1zdHJ1Y3QgcGlwZV9zY3JlZW4gKgorc3RydWN0IG5vdXZlYXVfc2Ny ZWVuICoKIG52YzBfc2NyZWVuX2NyZWF0ZShzdHJ1Y3Qgbm91dmVhdV9kZXZpY2UgKmRldikKIHsK ICAgIHN0cnVjdCBudmMwX3NjcmVlbiAqc2NyZWVuOwpAQCAtMTA2Miw3ICsxMDYyLDcgQEAgbnZj MF9zY3JlZW5fY3JlYXRlKHN0cnVjdCBub3V2ZWF1X2RldmljZSAqZGV2KQogCiAgICBub3V2ZWF1 X2ZlbmNlX25ldygmc2NyZWVuLT5iYXNlLCAmc2NyZWVuLT5iYXNlLmZlbmNlLmN1cnJlbnQsIGZh bHNlKTsKIAotICAgcmV0dXJuIHBzY3JlZW47CisgICByZXR1cm4gJnNjcmVlbi0+YmFzZTsKIAog ZmFpbDoKICAgIG52YzBfc2NyZWVuX2Rlc3Ryb3kocHNjcmVlbik7CmRpZmYgLS1naXQgYS9zcmMv Z2FsbGl1bS93aW5zeXMvbm91dmVhdS9kcm0vbm91dmVhdV9kcm1fd2luc3lzLmMgYi9zcmMvZ2Fs bGl1bS93aW5zeXMvbm91dmVhdS9kcm0vbm91dmVhdV9kcm1fd2luc3lzLmMKaW5kZXggM2VkNjQ0 ZS4uZTExN2RmYyAxMDA2NDQKLS0tIGEvc3JjL2dhbGxpdW0vd2luc3lzL25vdXZlYXUvZHJtL25v dXZlYXVfZHJtX3dpbnN5cy5jCisrKyBiL3NyYy9nYWxsaXVtL3dpbnN5cy9ub3V2ZWF1L2RybS9u b3V2ZWF1X2RybV93aW5zeXMuYwpAQCAtNTgsNyArNTgsNyBAQCBQVUJMSUMgc3RydWN0IHBpcGVf c2NyZWVuICoKIG5vdXZlYXVfZHJtX3NjcmVlbl9jcmVhdGUoaW50IGZkKQogewogCXN0cnVjdCBu b3V2ZWF1X2RldmljZSAqZGV2ID0gTlVMTDsKLQlzdHJ1Y3QgcGlwZV9zY3JlZW4gKigqaW5pdCko c3RydWN0IG5vdXZlYXVfZGV2aWNlICopOworCXN0cnVjdCBub3V2ZWF1X3NjcmVlbiAqKCppbml0 KShzdHJ1Y3Qgbm91dmVhdV9kZXZpY2UgKik7CiAJc3RydWN0IG5vdXZlYXVfc2NyZWVuICpzY3Jl ZW47CiAJaW50IHJldCwgZHVwZmQgPSAtMTsKIApAQCAtMTE2LDcgKzExNiw3IEBAIG5vdXZlYXVf ZHJtX3NjcmVlbl9jcmVhdGUoaW50IGZkKQogCQlnb3RvIGVycjsKIAl9CiAKLQlzY3JlZW4gPSAo c3RydWN0IG5vdXZlYXVfc2NyZWVuKilpbml0KGRldik7CisJc2NyZWVuID0gaW5pdChkZXYpOwog CWlmICghc2NyZWVuKQogCQlnb3RvIGVycjsKIAotLSAKMi42LjMKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCk5vdXZlYXUgbWFpbGluZyBsaXN0Ck5vdXZl YXVAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9ub3V2ZWF1Cg==