From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lyude Paul Subject: [PATCH 2/6] drm/nouveau: Unbreak nv50_mstc->best_encoder() Date: Tue, 18 Sep 2018 19:06:18 -0400 Message-ID: <20180918230637.20700-3-lyude@redhat.com> References: <20180918230637.20700-1-lyude@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180918230637.20700-1-lyude-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: nouveau-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Nouveau" To: dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, intel-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: David Airlie , linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Sean Paul , Ben Skeggs , =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= List-Id: dri-devel@lists.freedesktop.org QXMgbWVudGlvbmVkIGluIHRoZSBwcmV2aW91cyBjb21taXQsIHdlIGN1cnJlbnRseSBwcmV2ZW50 IG5ldyBtb2Rlc2V0cwpvbiByZWNlbnRseS1yZW1vdmVkIE1TVCBjb25uZWN0b3JzIGJ5IHJldHVy bmluZyBubyBlbmNvZGVyIGZyb20gb3VyCi0+YmVzdF9lbmNvZGVyKCkgY2FsbGJhY2sgb25jZSB0 aGUgTVNUIHBvcnQgaGFzIGRpc2FwcGVhcmVkLiBUaGlzIGlzCndyb25nIGhvd2V2ZXIsIGJlY2F1 c2UgaXQgcHJldmVudHMgbGVnYWN5IG1vZGVzZXR0aW5nIHVzZXJzIGZyb20gYmVpbmcKYWJsZSB0 byBkaXNhYmxlIENSVENzIG9uIE1TVCBjb25uZWN0b3JzIGFmdGVyIHRoZSBjb25uZWN0b3IncyBy ZXNwZWN0aXZlCnRvcG9sb2d5IGhhcyBkaXNhcHBlYXJlZC4KClNvLCBmaXggdGhpcyBieSBpbnN0 ZWFkIHVzaW5nIHRoZSBuZXcKZHJtX2RwX21zdF9jb25uZWN0b3JfYXRvbWljX2NoZWNrKCkgaGVs cGVyIGluc3RlYWQgd2hpbGUgYWx3YXlzCnJldHVybmluZyBhIHZhbGlkIGVuY29kZXIgZnJvbSAt PmJlc3RfZW5jb2RlcigpLgoKU2lnbmVkLW9mZi1ieTogTHl1ZGUgUGF1bCA8bHl1ZGVAcmVkaGF0 LmNvbT4KQ2M6IHN0YWJsZUB2Z2VyLmtlcm5lbC5vcmcKLS0tCiBkcml2ZXJzL2dwdS9kcm0vbm91 dmVhdS9kaXNwbnY1MC9kaXNwLmMgfCAyNSArKysrKysrKysrKysrKystLS0tLS0tLS0tCiAxIGZp bGUgY2hhbmdlZCwgMTUgaW5zZXJ0aW9ucygrKSwgMTAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvZGlzcG52NTAvZGlzcC5jIGIvZHJpdmVycy9ncHUv ZHJtL25vdXZlYXUvZGlzcG52NTAvZGlzcC5jCmluZGV4IDlkYTBiZGZlMWUxYy4uOGQ2ZjZlZTli Yzc1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9kaXNwbnY1MC9kaXNwLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvZGlzcG52NTAvZGlzcC5jCkBAIC04ODEsMjIg Kzg4MSwxNiBAQCBudjUwX21zdGNfYXRvbWljX2Jlc3RfZW5jb2RlcihzdHJ1Y3QgZHJtX2Nvbm5l Y3RvciAqY29ubmVjdG9yLAogewogCXN0cnVjdCBudjUwX2hlYWQgKmhlYWQgPSBudjUwX2hlYWQo Y29ubmVjdG9yX3N0YXRlLT5jcnRjKTsKIAlzdHJ1Y3QgbnY1MF9tc3RjICptc3RjID0gbnY1MF9t c3RjKGNvbm5lY3Rvcik7Ci0JaWYgKG1zdGMtPnBvcnQpIHsKLQkJc3RydWN0IG52NTBfbXN0bSAq bXN0bSA9IG1zdGMtPm1zdG07Ci0JCXJldHVybiAmbXN0bS0+bXN0b1toZWFkLT5iYXNlLmluZGV4 XS0+ZW5jb2RlcjsKLQl9Ci0JcmV0dXJuIE5VTEw7CisKKwlyZXR1cm4gJm1zdGMtPm1zdG0tPm1z dG9baGVhZC0+YmFzZS5pbmRleF0tPmVuY29kZXI7CiB9CiAKIHN0YXRpYyBzdHJ1Y3QgZHJtX2Vu Y29kZXIgKgogbnY1MF9tc3RjX2Jlc3RfZW5jb2RlcihzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29u bmVjdG9yKQogewogCXN0cnVjdCBudjUwX21zdGMgKm1zdGMgPSBudjUwX21zdGMoY29ubmVjdG9y KTsKLQlpZiAobXN0Yy0+cG9ydCkgewotCQlzdHJ1Y3QgbnY1MF9tc3RtICptc3RtID0gbXN0Yy0+ bXN0bTsKLQkJcmV0dXJuICZtc3RtLT5tc3RvWzBdLT5lbmNvZGVyOwotCX0KLQlyZXR1cm4gTlVM TDsKKworCXJldHVybiAmbXN0Yy0+bXN0bS0+bXN0b1swXS0+ZW5jb2RlcjsKIH0KIAogc3RhdGlj IGVudW0gZHJtX21vZGVfc3RhdHVzCkBAIC05MjYsMTAgKzkyMCwyMSBAQCBudjUwX21zdGNfZ2V0 X21vZGVzKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IpCiAJcmV0dXJuIHJldDsKIH0K IAorc3RhdGljIGludAorbnY1MF9tc3RjX2F0b21pY19jaGVjayhzdHJ1Y3QgZHJtX2Nvbm5lY3Rv ciAqY29ubmVjdG9yLAorCQkgICAgICAgc3RydWN0IGRybV9jb25uZWN0b3Jfc3RhdGUgKnN0YXRl KQoreworCXN0cnVjdCBudjUwX21zdGMgKm1zdGMgPSBudjUwX21zdGMoY29ubmVjdG9yKTsKKwor CXJldHVybiBkcm1fZHBfbXN0X2Nvbm5lY3Rvcl9hdG9taWNfY2hlY2soY29ubmVjdG9yLCBzdGF0 ZSwKKwkJCQkJCSAmbXN0Yy0+bXN0bS0+bWdyKTsKK30KKwogc3RhdGljIGNvbnN0IHN0cnVjdCBk cm1fY29ubmVjdG9yX2hlbHBlcl9mdW5jcwogbnY1MF9tc3RjX2hlbHAgPSB7CiAJLmdldF9tb2Rl cyA9IG52NTBfbXN0Y19nZXRfbW9kZXMsCiAJLm1vZGVfdmFsaWQgPSBudjUwX21zdGNfbW9kZV92 YWxpZCwKKwkuYXRvbWljX2NoZWNrID0gbnY1MF9tc3RjX2F0b21pY19jaGVjaywKIAkuYmVzdF9l bmNvZGVyID0gbnY1MF9tc3RjX2Jlc3RfZW5jb2RlciwKIAkuYXRvbWljX2Jlc3RfZW5jb2RlciA9 IG52NTBfbXN0Y19hdG9taWNfYmVzdF9lbmNvZGVyLAogfTsKLS0gCjIuMTcuMQoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KTm91dmVhdSBtYWlsaW5nIGxp c3QKTm91dmVhdUBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9ub3V2ZWF1Cg==