From: Thierry Reding Subject: [PATCH] drm/irq: More pipe/crtc consistency cleanups Date: Thu, 13 Aug 2015 11:38:51 +0200 Message-ID: <1439458731-26763-1-git-send-email-thierry.reding@gmail.com> References: <1439391635-29166-9-git-send-email-thierry.reding@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com [209.85.212.181]) by gabe.freedesktop.org (Postfix) with ESMTPS id 488756E3B8 for ; Thu, 13 Aug 2015 02:39:47 -0700 (PDT) Received: by wicja10 with SMTP id ja10so144167915wic.1 for ; Thu, 13 Aug 2015 02:39:45 -0700 (PDT) In-Reply-To: <1439391635-29166-9-git-send-email-thierry.reding@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: Daniel Vetter List-Id: dri-devel@lists.freedesktop.org RnJvbTogVGhpZXJyeSBSZWRpbmcgPHRyZWRpbmdAbnZpZGlhLmNvbT4KCkNvbW1pdCBjYzFlZjEx OGZjMDkgKCJkcm0vaXJxOiBNYWtlIHBpcGUgdW5zaWduZWQgYW5kIG5hbWUgY29uc2lzdGVudCIp Cm1pc3NlZCBhIGZldyBvY2N1cnJlbmNlcyBvZiBpbnQgcGlwZS9jcnRjIGFjcm9zcyB2YXJpb3Vz IHJlYmFzZXMuIENsZWFuCnRoZSByZW1haW5pbmcgb25lcyB1cCBub3cuCgpTaWduZWQtb2ZmLWJ5 OiBUaGllcnJ5IFJlZGluZyA8dHJlZGluZ0BudmlkaWEuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2Ry bS9kcm1faXJxLmMgfCAxNiArKysrKysrKy0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgOCBpbnNl cnRpb25zKCspLCA4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9k cm1faXJxLmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2lycS5jCmluZGV4IDIwY2Y1Nzc2Y2U3MC4u Mzk2MDE2ODUwM2YxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2lycS5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9kcm1faXJxLmMKQEAgLTc0LDExICs3NCwxMSBAQCBtb2R1bGVfcGFy YW1fbmFtZWQodmJsYW5rb2ZmZGVsYXksIGRybV92Ymxhbmtfb2ZmZGVsYXksIGludCwgMDYwMCk7 CiBtb2R1bGVfcGFyYW1fbmFtZWQodGltZXN0YW1wX3ByZWNpc2lvbl91c2VjLCBkcm1fdGltZXN0 YW1wX3ByZWNpc2lvbiwgaW50LCAwNjAwKTsKIG1vZHVsZV9wYXJhbV9uYW1lZCh0aW1lc3RhbXBf bW9ub3RvbmljLCBkcm1fdGltZXN0YW1wX21vbm90b25pYywgaW50LCAwNjAwKTsKIAotc3RhdGlj IHZvaWQgc3RvcmVfdmJsYW5rKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGludCBjcnRjLAorc3Rh dGljIHZvaWQgc3RvcmVfdmJsYW5rKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHVuc2lnbmVkIGlu dCBwaXBlLAogCQkJIHUzMiB2YmxhbmtfY291bnRfaW5jLAogCQkJIHN0cnVjdCB0aW1ldmFsICp0 X3ZibGFuaykKIHsKLQlzdHJ1Y3QgZHJtX3ZibGFua19jcnRjICp2YmxhbmsgPSAmZGV2LT52Ymxh bmtbY3J0Y107CisJc3RydWN0IGRybV92YmxhbmtfY3J0YyAqdmJsYW5rID0gJmRldi0+dmJsYW5r W3BpcGVdOwogCXUzMiB0c2xvdDsKIAogCWFzc2VydF9zcGluX2xvY2tlZCgmZGV2LT52Ymxhbmtf dGltZV9sb2NrKTsKQEAgLTg4LDcgKzg4LDcgQEAgc3RhdGljIHZvaWQgc3RvcmVfdmJsYW5rKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYsIGludCBjcnRjLAogCQkgKiB0aGUgbGF0Y2hpbmcgb2YgdmJs YW5rLT5jb3VudCBiZWxvdy4KIAkJICovCiAJCXRzbG90ID0gdmJsYW5rLT5jb3VudCArIHZibGFu a19jb3VudF9pbmM7Ci0JCXZibGFua3RpbWVzdGFtcChkZXYsIGNydGMsIHRzbG90KSA9ICp0X3Zi bGFuazsKKwkJdmJsYW5rdGltZXN0YW1wKGRldiwgcGlwZSwgdHNsb3QpID0gKnRfdmJsYW5rOwog CX0KIAogCS8qCkBAIC04NjcsNyArODY3LDcgQEAgZHJtX2dldF9sYXN0X3ZibHRpbWVzdGFtcChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1bnNpZ25lZCBpbnQgcGlwZSwKICAqIFJldHVybnM6CiAg KiBUaGUgc29mdHdhcmUgdmJsYW5rIGNvdW50ZXIuCiAgKi8KLXUzMiBkcm1fdmJsYW5rX2NvdW50 KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGludCBwaXBlKQordTMyIGRybV92YmxhbmtfY291bnQo c3RydWN0IGRybV9kZXZpY2UgKmRldiwgdW5zaWduZWQgaW50IHBpcGUpCiB7CiAJc3RydWN0IGRy bV92YmxhbmtfY3J0YyAqdmJsYW5rID0gJmRldi0+dmJsYW5rW3BpcGVdOwogCkBAIC0xMjkyLDcg KzEyOTIsNyBAQCBFWFBPUlRfU1lNQk9MKGRybV9jcnRjX3ZibGFua19vZmYpOwogCiAvKioKICAq IGRybV9jcnRjX3ZibGFua19yZXNldCAtIHJlc2V0IHZibGFuayBzdGF0ZSB0byBvZmYgb24gYSBD UlRDCi0gKiBAZHJtX2NydGM6IENSVEMgaW4gcXVlc3Rpb24KKyAqIEBjcnRjOiBDUlRDIGluIHF1 ZXN0aW9uCiAgKgogICogRHJpdmVycyBjYW4gdXNlIHRoaXMgZnVuY3Rpb24gdG8gcmVzZXQgdGhl IHZibGFuayBzdGF0ZSB0byBvZmYgYXQgbG9hZCB0aW1lLgogICogRHJpdmVycyBzaG91bGQgdXNl IHRoaXMgdG9nZXRoZXIgd2l0aCB0aGUgZHJtX2NydGNfdmJsYW5rX29mZigpIGFuZApAQCAtMTMw MCwxMiArMTMwMCwxMiBAQCBFWFBPUlRfU1lNQk9MKGRybV9jcnRjX3ZibGFua19vZmYpOwogICog ZHJtX2NydGNfdmJsYW5rX29mZigpIGlzIHRoYXQgdGhpcyBmdW5jdGlvbiBkb2Vzbid0IHNhdmUg dGhlIHZibGFuayBjb3VudGVyCiAgKiBhbmQgaGVuY2UgZG9lc24ndCBuZWVkIHRvIGNhbGwgYW55 IGRyaXZlciBob29rcy4KICAqLwotdm9pZCBkcm1fY3J0Y192YmxhbmtfcmVzZXQoc3RydWN0IGRy bV9jcnRjICpkcm1fY3J0YykKK3ZvaWQgZHJtX2NydGNfdmJsYW5rX3Jlc2V0KHN0cnVjdCBkcm1f Y3J0YyAqY3J0YykKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gZHJtX2NydGMtPmRldjsK IAl1bnNpZ25lZCBsb25nIGlycWZsYWdzOwotCWludCBjcnRjID0gZHJtX2NydGNfaW5kZXgoZHJt X2NydGMpOwotCXN0cnVjdCBkcm1fdmJsYW5rX2NydGMgKnZibGFuayA9ICZkZXYtPnZibGFua1tj cnRjXTsKKwl1bnNpZ25lZCBpbnQgcGlwZSA9IGRybV9jcnRjX2luZGV4KGNydGMpOworCXN0cnVj dCBkcm1fdmJsYW5rX2NydGMgKnZibGFuayA9ICZkZXYtPnZibGFua1twaXBlXTsKIAogCXNwaW5f bG9ja19pcnFzYXZlKCZkZXYtPnZibF9sb2NrLCBpcnFmbGFncyk7CiAJLyoKLS0gCjIuNC41Cgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwg bWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=