From: Alexandre Courbot Subject: [PATCH] Revert "drm/nouveau/fifo/gk104: kick channels when deactivating them" Date: Wed, 12 Aug 2015 13:17:38 +0900 Message-ID: <1439353058-10001-1-git-send-email-acourbot@nvidia.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: nouveau-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Nouveau" To: David Airlie , Ben Skeggs Cc: nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, Eric Biggers , linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org List-Id: dri-devel@lists.freedesktop.org VGhpcyByZXZlcnRzIGNvbW1pdCAxYWRkYzEyNjQ4NTIKClRoaXMgY29tbWl0IHNlZW1zIHRvIGNh dXNlIGNyYXNoZXMgaW4gZ2sxMDRfZmlmb19pbnRyX3J1bmxpc3QoKSBieQpyZXR1cm5pbmcgMHhi YWQwZGEwMCB3aGVuIHJlZ2lzdGVyIDB4MmEwMCBpcyByZWFkLiBTaW5jZSB0aGlzIGNvbW1pdCB3 YXMKaW50ZW5kZWQgZm9yIEdNMjBCIHdoaWNoIGlzIG5vdCBjb21wbGV0ZWx5IHN1cHBvcnRlZCB5 ZXQsIGxldCdzIHJldmVydAppdCBmb3IgdGhlIHRpbWUgYmVpbmcuCgpSZXBvcnRlZC1ieTogRXJp YyBCaWdnZXJzIDxlYmlnZ2VyczNAZ21haWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBBbGV4YW5kcmUg Q291cmJvdCA8YWNvdXJib3RAbnZpZGlhLmNvbT4KLS0tCkRhdmlkLCBpdCB3b3VsZCBiZSBncmVh dCBpZiB0aGlzIGNvdWxkIGJlIG1lcmdlZCBmb3IgNC4yIHNpbmNlIGxvdHMgb2YKdXNlcnMgY291 bGQgcG90ZW50aWFsbHkgZXhwZXJpZW5jZSB0aGlzIGlzc3VlLiBUaGFua3MhCgogZHJpdmVycy9n cHUvZHJtL25vdXZlYXUvbnZrbS9lbmdpbmUvZmlmby9nazEwNC5jIHwgMjkgKysrKysrKy0tLS0t LS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgOCBpbnNlcnRpb25zKCspLCAyMSBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9udmttL2VuZ2luZS9m aWZvL2drMTA0LmMgYi9kcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9udmttL2VuZ2luZS9maWZvL2dr MTA0LmMKaW5kZXggNTJjMjJiMDI2MDA1Li5lMTBmOTY0NDE0MGYgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9ub3V2ZWF1L252a20vZW5naW5lL2ZpZm8vZ2sxMDQuYworKysgYi9kcml2ZXJz L2dwdS9kcm0vbm91dmVhdS9udmttL2VuZ2luZS9maWZvL2drMTA0LmMKQEAgLTE2NiwzMCArMTY2 LDE0IEBAIGdrMTA0X2ZpZm9fY29udGV4dF9hdHRhY2goc3RydWN0IG52a21fb2JqZWN0ICpwYXJl bnQsCiB9CiAKIHN0YXRpYyBpbnQKLWdrMTA0X2ZpZm9fY2hhbl9raWNrKHN0cnVjdCBnazEwNF9m aWZvX2NoYW4gKmNoYW4pCi17Ci0Jc3RydWN0IG52a21fb2JqZWN0ICpvYmogPSAodm9pZCAqKWNo YW47Ci0Jc3RydWN0IGdrMTA0X2ZpZm9fcHJpdiAqcHJpdiA9ICh2b2lkICopb2JqLT5lbmdpbmU7 Ci0KLQludl93cjMyKHByaXYsIDB4MDAyNjM0LCBjaGFuLT5iYXNlLmNoaWQpOwotCWlmICghbnZf d2FpdChwcml2LCAweDAwMjYzNCwgMHgxMDAwMDAsIDB4MDAwMDAwKSkgewotCQludl9lcnJvcihw cml2LCAiY2hhbm5lbCAlZCBbJXNdIGtpY2sgdGltZW91dFxuIiwKLQkJCSBjaGFuLT5iYXNlLmNo aWQsIG52a21fY2xpZW50X25hbWUoY2hhbikpOwotCQlyZXR1cm4gLUVCVVNZOwotCX0KLQotCXJl dHVybiAwOwotfQotCi1zdGF0aWMgaW50CiBnazEwNF9maWZvX2NvbnRleHRfZGV0YWNoKHN0cnVj dCBudmttX29iamVjdCAqcGFyZW50LCBib29sIHN1c3BlbmQsCiAJCQkgIHN0cnVjdCBudmttX29i amVjdCAqb2JqZWN0KQogewogCXN0cnVjdCBudmttX2JhciAqYmFyID0gbnZrbV9iYXIocGFyZW50 KTsKKwlzdHJ1Y3QgZ2sxMDRfZmlmb19wcml2ICpwcml2ID0gKHZvaWQgKilwYXJlbnQtPmVuZ2lu ZTsKIAlzdHJ1Y3QgZ2sxMDRfZmlmb19iYXNlICpiYXNlID0gKHZvaWQgKilwYXJlbnQtPnBhcmVu dDsKIAlzdHJ1Y3QgZ2sxMDRfZmlmb19jaGFuICpjaGFuID0gKHZvaWQgKilwYXJlbnQ7CiAJdTMy IGFkZHI7Ci0JaW50IHJldDsKIAogCXN3aXRjaCAobnZfZW5naWR4KG9iamVjdC0+ZW5naW5lKSkg ewogCWNhc2UgTlZERVZfRU5HSU5FX1NXICAgIDogcmV0dXJuIDA7CkBAIC0yMDQsOSArMTg4LDEz IEBAIGdrMTA0X2ZpZm9fY29udGV4dF9kZXRhY2goc3RydWN0IG52a21fb2JqZWN0ICpwYXJlbnQs IGJvb2wgc3VzcGVuZCwKIAkJcmV0dXJuIC1FSU5WQUw7CiAJfQogCi0JcmV0ID0gZ2sxMDRfZmlm b19jaGFuX2tpY2soY2hhbik7Ci0JaWYgKHJldCAmJiBzdXNwZW5kKQotCQlyZXR1cm4gcmV0Owor CW52X3dyMzIocHJpdiwgMHgwMDI2MzQsIGNoYW4tPmJhc2UuY2hpZCk7CisJaWYgKCFudl93YWl0 KHByaXYsIDB4MDAyNjM0LCAweGZmZmZmZmZmLCBjaGFuLT5iYXNlLmNoaWQpKSB7CisJCW52X2Vy cm9yKHByaXYsICJjaGFubmVsICVkIFslc10ga2ljayB0aW1lb3V0XG4iLAorCQkJIGNoYW4tPmJh c2UuY2hpZCwgbnZrbV9jbGllbnRfbmFtZShjaGFuKSk7CisJCWlmIChzdXNwZW5kKQorCQkJcmV0 dXJuIC1FQlVTWTsKKwl9CiAKIAlpZiAoYWRkcikgewogCQludl93bzMyKGJhc2UsIGFkZHIgKyAw eDAwLCAweDAwMDAwMDAwKTsKQEAgLTMzMSw3ICszMTksNiBAQCBnazEwNF9maWZvX2NoYW5fZmlu aShzdHJ1Y3QgbnZrbV9vYmplY3QgKm9iamVjdCwgYm9vbCBzdXNwZW5kKQogCQlnazEwNF9maWZv X3J1bmxpc3RfdXBkYXRlKHByaXYsIGNoYW4tPmVuZ2luZSk7CiAJfQogCi0JZ2sxMDRfZmlmb19j aGFuX2tpY2soY2hhbik7CiAJbnZfd3IzMihwcml2LCAweDgwMDAwMCArIChjaGlkICogOCksIDB4 MDAwMDAwMDApOwogCXJldHVybiBudmttX2ZpZm9fY2hhbm5lbF9maW5pKCZjaGFuLT5iYXNlLCBz dXNwZW5kKTsKIH0KLS0gCjIuNS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpOb3V2ZWF1IG1haWxpbmcgbGlzdApOb3V2ZWF1QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vbm91 dmVhdQo=