From mboxrd@z Thu Jan 1 00:00:00 1970 From: Russell King Subject: [PATCH 07/25] drm/armada: clean up armada_drm_crtc_plane_disable() Date: Fri, 08 Dec 2017 12:29:32 +0000 Message-ID: References: <20171208122754.GA20895@n2100.armlinux.org.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from pandora.armlinux.org.uk (pandora.armlinux.org.uk [IPv6:2001:4d48:ad52:3201:214:fdff:fe10:1be6]) by gabe.freedesktop.org (Postfix) with ESMTPS id 50A806E8F3 for ; Fri, 8 Dec 2017 12:29:37 +0000 (UTC) In-Reply-To: <20171208122754.GA20895@n2100.armlinux.org.uk> Content-Disposition: inline List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: David Airlie Cc: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org TWVyZ2UgYXJtYWRhX2RybV9wcmltYXJ5X2Rpc2FibGUoKSBpbnRvIGFybWFkYV9kcm1fY3J0Y19w bGFuZV9kaXNhYmxlKCkKYW5kIHJlbmFtZSB0byBhcm1hZGFfZHJtX3BsYW5lX2Rpc2FibGUoKS4g IFVzZSB0aGlzIHRvIHNpbXBsaWZ5CmFybWFkYV9vdmxfcGxhbmVfZGlzYWJsZSgpLgoKU2lnbmVk LW9mZi1ieTogUnVzc2VsbCBLaW5nIDxybWsra2VybmVsQGFybWxpbnV4Lm9yZy51az4KLS0tCiBk cml2ZXJzL2dwdS9kcm0vYXJtYWRhL2FybWFkYV9jcnRjLmMgICAgfCAyMSArKysrKysrKystLS0t LS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9hcm1hZGEvYXJtYWRhX2NydGMuaCAgICB8ICA0ICsr LS0KIGRyaXZlcnMvZ3B1L2RybS9hcm1hZGEvYXJtYWRhX292ZXJsYXkuYyB8ICA5ICsrKy0tLS0t LQogMyBmaWxlcyBjaGFuZ2VkLCAxNCBpbnNlcnRpb25zKCspLCAyMCBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYXJtYWRhL2FybWFkYV9jcnRjLmMgYi9kcml2ZXJz L2dwdS9kcm0vYXJtYWRhL2FybWFkYV9jcnRjLmMKaW5kZXggN2Y3ZjIxMTY2NDg4Li4zMjg3Yjcy ZTQ4Y2MgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hcm1hZGEvYXJtYWRhX2NydGMuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vYXJtYWRhL2FybWFkYV9jcnRjLmMKQEAgLTExMjMsMTIgKzEx MjMsMTYgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBkcm1fY3J0Y19mdW5jcyBhcm1hZGFfY3J0Y19m dW5jcyA9IHsKIAkuZGlzYWJsZV92YmxhbmsJPSBhcm1hZGFfZHJtX2NydGNfZGlzYWJsZV92Ymxh bmssCiB9OwogCi12b2lkIGFybWFkYV9kcm1fY3J0Y19wbGFuZV9kaXNhYmxlKHN0cnVjdCBhcm1h ZGFfY3J0YyAqZGNydGMsCi0Jc3RydWN0IGRybV9wbGFuZSAqcGxhbmUpCitpbnQgYXJtYWRhX2Ry bV9wbGFuZV9kaXNhYmxlKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAorCQkJICAgICBzdHJ1Y3Qg ZHJtX21vZGVzZXRfYWNxdWlyZV9jdHggKmN0eCkKIHsKIAlzdHJ1Y3QgYXJtYWRhX3BsYW5lICpk cGxhbmUgPSBkcm1fdG9fYXJtYWRhX3BsYW5lKHBsYW5lKTsKKwlzdHJ1Y3QgYXJtYWRhX2NydGMg KmRjcnRjOwogCXUzMiBzcmFtX3BhcmExLCBkbWFfY3RybDBfbWFzazsKIAorCWlmICghcGxhbmUt PmNydGMpCisJCXJldHVybiAwOworCiAJLyoKIAkgKiBEcm9wIG91ciByZWZlcmVuY2Ugb24gYW55 IGZyYW1lYnVmZmVyIGF0dGFjaGVkIHRvIHRoaXMgcGxhbmUuCiAJICogV2UgZG9uJ3QgbmVlZCB0 byBOVUxMIHRoaXMgb3V0IGFzIGRybV9wbGFuZV9mb3JjZV9kaXNhYmxlKCksCkBAIC0xMTUwLDYg KzExNTQsOCBAQCB2b2lkIGFybWFkYV9kcm1fY3J0Y19wbGFuZV9kaXNhYmxlKHN0cnVjdCBhcm1h ZGFfY3J0YyAqZGNydGMsCiAJCWRtYV9jdHJsMF9tYXNrID0gQ0ZHX0RNQV9FTkE7CiAJfQogCisJ ZGNydGMgPSBkcm1fdG9fYXJtYWRhX2NydGMocGxhbmUtPmNydGMpOworCiAJLyogV2FpdCBmb3Ig YW55IHByZWNlZGluZyB3b3JrIHRvIGNvbXBsZXRlLCBidXQgZG9uJ3Qgd2VkZ2UgKi8KIAlpZiAo V0FSTl9PTighYXJtYWRhX2RybV9wbGFuZV93b3JrX3dhaXQoZHBsYW5lLCBIWikpKQogCQlhcm1h ZGFfZHJtX3BsYW5lX3dvcmtfY2FuY2VsKGRjcnRjLCBkcGxhbmUpOwpAQCAtMTE1OSwyMiArMTE2 NSwxMyBAQCB2b2lkIGFybWFkYV9kcm1fY3J0Y19wbGFuZV9kaXNhYmxlKHN0cnVjdCBhcm1hZGFf Y3J0YyAqZGNydGMsCiAJc3Bpbl91bmxvY2tfaXJxKCZkY3J0Yy0+aXJxX2xvY2spOwogCiAJYXJt YWRhX3VwZGF0ZWwoc3JhbV9wYXJhMSwgMCwgZGNydGMtPmJhc2UgKyBMQ0RfU1BVX1NSQU1fUEFS QTEpOwotfQotCi1zdGF0aWMgaW50IGFybWFkYV9kcm1fcHJpbWFyeV9kaXNhYmxlKHN0cnVjdCBk cm1fcGxhbmUgKnBsYW5lLAotCQkJCSAgICAgIHN0cnVjdCBkcm1fbW9kZXNldF9hY3F1aXJlX2N0 eCAqY3R4KQotewotCWlmIChwbGFuZS0+Y3J0YykgewotCQlzdHJ1Y3QgYXJtYWRhX2NydGMgKmRj cnRjID0gZHJtX3RvX2FybWFkYV9jcnRjKHBsYW5lLT5jcnRjKTsKIAotCQlhcm1hZGFfZHJtX2Ny dGNfcGxhbmVfZGlzYWJsZShkY3J0YywgcGxhbmUpOwotCX0KIAlyZXR1cm4gMDsKIH0KIAogc3Rh dGljIGNvbnN0IHN0cnVjdCBkcm1fcGxhbmVfZnVuY3MgYXJtYWRhX3ByaW1hcnlfcGxhbmVfZnVu Y3MgPSB7CiAJLnVwZGF0ZV9wbGFuZQk9IGRybV9wcmltYXJ5X2hlbHBlcl91cGRhdGUsCi0JLmRp c2FibGVfcGxhbmUJPSBhcm1hZGFfZHJtX3ByaW1hcnlfZGlzYWJsZSwKKwkuZGlzYWJsZV9wbGFu ZQk9IGFybWFkYV9kcm1fcGxhbmVfZGlzYWJsZSwKIAkuZGVzdHJveQk9IGRybV9wcmltYXJ5X2hl bHBlcl9kZXN0cm95LAogfTsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FybWFkYS9h cm1hZGFfY3J0Yy5oIGIvZHJpdmVycy9ncHUvZHJtL2FybWFkYS9hcm1hZGFfY3J0Yy5oCmluZGV4 IGMyNjgxNGMyY2UwOC4uNTIxYWU1YjZhZDg2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v YXJtYWRhL2FybWFkYV9jcnRjLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FybWFkYS9hcm1hZGFf Y3J0Yy5oCkBAIC0xMDYsOCArMTA2LDggQEAgc3RydWN0IGFybWFkYV9jcnRjIHsKIAogdm9pZCBh cm1hZGFfZHJtX2NydGNfdXBkYXRlX3JlZ3Moc3RydWN0IGFybWFkYV9jcnRjICosIHN0cnVjdCBh cm1hZGFfcmVncyAqKTsKIAotdm9pZCBhcm1hZGFfZHJtX2NydGNfcGxhbmVfZGlzYWJsZShzdHJ1 Y3QgYXJtYWRhX2NydGMgKmRjcnRjLAotCXN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lKTsKK2ludCBh cm1hZGFfZHJtX3BsYW5lX2Rpc2FibGUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCisJCQkgICAg IHN0cnVjdCBkcm1fbW9kZXNldF9hY3F1aXJlX2N0eCAqY3R4KTsKIAogZXh0ZXJuIHN0cnVjdCBw bGF0Zm9ybV9kcml2ZXIgYXJtYWRhX2xjZF9wbGF0Zm9ybV9kcml2ZXI7CiAKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9hcm1hZGEvYXJtYWRhX292ZXJsYXkuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9hcm1hZGEvYXJtYWRhX292ZXJsYXkuYwppbmRleCBjZjg0NDI1ODNiZmMuLmE1M2U3ZGQyNmIw YiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FybWFkYS9hcm1hZGFfb3ZlcmxheS5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9hcm1hZGEvYXJtYWRhX292ZXJsYXkuYwpAQCAtMjY0LDE1ICsy NjQsMTIgQEAgc3RhdGljIGludCBhcm1hZGFfb3ZsX3BsYW5lX2Rpc2FibGUoc3RydWN0IGRybV9w bGFuZSAqcGxhbmUsCiB7CiAJc3RydWN0IGFybWFkYV9vdmxfcGxhbmUgKmRwbGFuZSA9IGRybV90 b19hcm1hZGFfb3ZsX3BsYW5lKHBsYW5lKTsKIAlzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYjsK LQlzdHJ1Y3QgYXJtYWRhX2NydGMgKmRjcnRjOwogCi0JaWYgKCFkcGxhbmUtPmJhc2UuYmFzZS5j cnRjKQotCQlyZXR1cm4gMDsKKwlhcm1hZGFfZHJtX3BsYW5lX2Rpc2FibGUocGxhbmUsIGN0eCk7 CiAKLQlkY3J0YyA9IGRybV90b19hcm1hZGFfY3J0YyhkcGxhbmUtPmJhc2UuYmFzZS5jcnRjKTsK LQlhcm1hZGFfZHJtX2NydGNfcGxhbmVfZGlzYWJsZShkY3J0YywgcGxhbmUpOworCWlmIChkcGxh bmUtPmJhc2UuYmFzZS5jcnRjKQorCQlkcm1fdG9fYXJtYWRhX2NydGMoZHBsYW5lLT5iYXNlLmJh c2UuY3J0YyktPnBsYW5lID0gTlVMTDsKIAotCWRjcnRjLT5wbGFuZSA9IE5VTEw7CiAJZHBsYW5l LT5iYXNlLnN0YXRlLmN0cmwwID0gMDsKIAogCWZiID0geGNoZygmZHBsYW5lLT5vbGRfZmIsIE5V TEwpOwotLSAKMi43LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1k ZXZlbAo=