From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH 16/15] drm/i915: Pass intel_crtc to intel_disable_pipe() and intel_wait_for_pipe_off() Date: Fri, 6 Jun 2014 22:47:41 +0300 Message-ID: <1402084063-31871-1-git-send-email-ville.syrjala@linux.intel.com> References: <1401984964-25441-1-git-send-email-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id B4C896EACD for ; Fri, 6 Jun 2014 12:48:00 -0700 (PDT) In-Reply-To: <1401984964-25441-1-git-send-email-ville.syrjala@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org Cc: Thomas Richter List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkp1 c3QgcGFzcyB0aGUgaW50ZWxfY3J0YyBhcm91bmQgaW5zdGVhZCBvZiBkZXZfcHJpditwaXBlLgoK QWxzbyBtYWtlIGludGVsX3dhaXRfZm9yX3BpcGVfb2ZmKCkgc3RhdGljIHNpbmNlIGl0J3Mgb25s eSB1c2VkIGluCmludGVsX2Rpc3BsYXkuYy4KClNpZ25lZC1vZmYtYnk6IFZpbGxlIFN5cmrDpGzD pCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZGlzcGxheS5jIHwgMzcgKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0t LS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgfCAgMSAtCiAyIGZpbGVz IGNoYW5nZWQsIDE3IGluc2VydGlvbnMoKyksIDIxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCAyNDZlMjFlLi5mZGRhMmNmIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC05NTAsOCArOTUwLDcgQEAgc3RhdGljIGJvb2wgcGlw ZV9kc2xfc3RvcHBlZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBlbnVtIHBpcGUgcGlwZSkKIAog LyoKICAqIGludGVsX3dhaXRfZm9yX3BpcGVfb2ZmIC0gd2FpdCBmb3IgcGlwZSB0byB0dXJuIG9m ZgotICogQGRldjogZHJtIGRldmljZQotICogQHBpcGU6IHBpcGUgdG8gd2FpdCBmb3IKKyAqIEBj cnRjOiBjcnRjIHdob3NlIHBpcGUgdG8gd2FpdCBmb3IKICAqCiAgKiBBZnRlciBkaXNhYmxpbmcg YSBwaXBlLCB3ZSBjYW4ndCB3YWl0IGZvciB2YmxhbmsgaW4gdGhlIHVzdWFsIHdheSwKICAqIHNw aW5uaW5nIG9uIHRoZSB2YmxhbmsgaW50ZXJydXB0IHN0YXR1cyBiaXQsIHNpbmNlIHdlIHdvbid0 IGFjdHVhbGx5CkBAIC05NjUsMTEgKzk2NCwxMiBAQCBzdGF0aWMgYm9vbCBwaXBlX2RzbF9zdG9w cGVkKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGVudW0gcGlwZSBwaXBlKQogICogICBlbmRzIHVw IHN0b3BwaW5nIGF0IHRoZSBzdGFydCBvZiB0aGUgbmV4dCBmcmFtZSkuCiAgKgogICovCi12b2lk IGludGVsX3dhaXRfZm9yX3BpcGVfb2ZmKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGludCBwaXBl KQorc3RhdGljIHZvaWQgaW50ZWxfd2FpdF9mb3JfcGlwZV9vZmYoc3RydWN0IGludGVsX2NydGMg KmNydGMpCiB7CisJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmJhc2UuZGV2OwogCXN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7Ci0JZW51 bSB0cmFuc2NvZGVyIGNwdV90cmFuc2NvZGVyID0gaW50ZWxfcGlwZV90b19jcHVfdHJhbnNjb2Rl cihkZXZfcHJpdiwKLQkJCQkJCQkJICAgICAgcGlwZSk7CisJZW51bSB0cmFuc2NvZGVyIGNwdV90 cmFuc2NvZGVyID0gY3J0Yy0+Y29uZmlnLmNwdV90cmFuc2NvZGVyOworCWVudW0gcGlwZSBwaXBl ID0gY3J0Yy0+cGlwZTsKIAogCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA0KSB7CiAJCWlu dCByZWcgPSBQSVBFQ09ORihjcHVfdHJhbnNjb2Rlcik7CkBAIC0yMDkxLDIxICsyMDkxLDE5IEBA IHN0YXRpYyB2b2lkIGludGVsX2VuYWJsZV9waXBlKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQog CiAvKioKICAqIGludGVsX2Rpc2FibGVfcGlwZSAtIGRpc2FibGUgYSBwaXBlLCBhc3NlcnRpbmcg cmVxdWlyZW1lbnRzCi0gKiBAZGV2X3ByaXY6IGk5MTUgcHJpdmF0ZSBzdHJ1Y3R1cmUKLSAqIEBw aXBlOiBwaXBlIHRvIGRpc2FibGUKKyAqIEBjcnRjOiBjcnRjIHdob3NlIHBpcGVzIGlzIHRvIGJl IGRpc2FibGVkCiAgKgotICogRGlzYWJsZSBAcGlwZSwgbWFraW5nIHN1cmUgdGhhdCB2YXJpb3Vz IGhhcmR3YXJlIHNwZWNpZmljIHJlcXVpcmVtZW50cwotICogYXJlIG1ldCwgaWYgYXBwbGljYWJs ZSwgZS5nLiBwbGFuZSBkaXNhYmxlZCwgcGFuZWwgZml0dGVyIG9mZiwgZXRjLgotICoKLSAqIEBw aXBlIHNob3VsZCBiZSAlUElQRV9BIG9yICVQSVBFX0IuCisgKiBEaXNhYmxlIHRoZSBwaXBlIG9m IEBjcnRjLCBtYWtpbmcgc3VyZSB0aGF0IHZhcmlvdXMgaGFyZHdhcmUKKyAqIHNwZWNpZmljIHJl cXVpcmVtZW50cyBhcmUgbWV0LCBpZiBhcHBsaWNhYmxlLCBlLmcuIHBsYW5lCisgKiBkaXNhYmxl ZCwgcGFuZWwgZml0dGVyIG9mZiwgZXRjLgogICoKICAqIFdpbGwgd2FpdCB1bnRpbCB0aGUgcGlw ZSBoYXMgc2h1dCBkb3duIGJlZm9yZSByZXR1cm5pbmcuCiAgKi8KLXN0YXRpYyB2b2lkIGludGVs X2Rpc2FibGVfcGlwZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCi0JCQkgICAg ICAgZW51bSBwaXBlIHBpcGUpCitzdGF0aWMgdm9pZCBpbnRlbF9kaXNhYmxlX3BpcGUoc3RydWN0 IGludGVsX2NydGMgKmNydGMpCiB7Ci0JZW51bSB0cmFuc2NvZGVyIGNwdV90cmFuc2NvZGVyID0g aW50ZWxfcGlwZV90b19jcHVfdHJhbnNjb2RlcihkZXZfcHJpdiwKLQkJCQkJCQkJICAgICAgcGlw ZSk7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gY3J0Yy0+YmFzZS5kZXYt PmRldl9wcml2YXRlOworCWVudW0gdHJhbnNjb2RlciBjcHVfdHJhbnNjb2RlciA9IGNydGMtPmNv bmZpZy5jcHVfdHJhbnNjb2RlcjsKKwllbnVtIHBpcGUgcGlwZSA9IGNydGMtPnBpcGU7CiAJaW50 IHJlZzsKIAl1MzIgdmFsOwogCkBAIC0yMTI4LDcgKzIxMjYsNyBAQCBzdGF0aWMgdm9pZCBpbnRl bF9kaXNhYmxlX3BpcGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQlyZXR1 cm47CiAKIAlJOTE1X1dSSVRFKHJlZywgdmFsICYgflBJUEVDT05GX0VOQUJMRSk7Ci0JaW50ZWxf d2FpdF9mb3JfcGlwZV9vZmYoZGV2X3ByaXYtPmRldiwgcGlwZSk7CisJaW50ZWxfd2FpdF9mb3Jf cGlwZV9vZmYoY3J0Yyk7CiB9CiAKIC8qCkBAIC00MjE2LDcgKzQyMTQsNyBAQCBzdGF0aWMgdm9p ZCBpcm9ubGFrZV9jcnRjX2Rpc2FibGUoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCWlmIChpbnRl bF9jcnRjLT5jb25maWcuaGFzX3BjaF9lbmNvZGVyKQogCQlpbnRlbF9zZXRfcGNoX2ZpZm9fdW5k ZXJydW5fcmVwb3J0aW5nKGRldiwgcGlwZSwgZmFsc2UpOwogCi0JaW50ZWxfZGlzYWJsZV9waXBl KGRldl9wcml2LCBwaXBlKTsKKwlpbnRlbF9kaXNhYmxlX3BpcGUoaW50ZWxfY3J0Yyk7CiAKIAlp cm9ubGFrZV9wZml0X2Rpc2FibGUoaW50ZWxfY3J0Yyk7CiAKQEAgLTQyNjYsNyArNDI2NCw2IEBA IHN0YXRpYyB2b2lkIGhhc3dlbGxfY3J0Y19kaXNhYmxlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykK IAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwog CXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKIAlz dHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlcjsKLQlpbnQgcGlwZSA9IGludGVsX2NydGMtPnBp cGU7CiAJZW51bSB0cmFuc2NvZGVyIGNwdV90cmFuc2NvZGVyID0gaW50ZWxfY3J0Yy0+Y29uZmln LmNwdV90cmFuc2NvZGVyOwogCiAJaWYgKCFpbnRlbF9jcnRjLT5hY3RpdmUpCkBAIC00MjgxLDcg KzQyNzgsNyBAQCBzdGF0aWMgdm9pZCBoYXN3ZWxsX2NydGNfZGlzYWJsZShzdHJ1Y3QgZHJtX2Ny dGMgKmNydGMpCiAKIAlpZiAoaW50ZWxfY3J0Yy0+Y29uZmlnLmhhc19wY2hfZW5jb2RlcikKIAkJ aW50ZWxfc2V0X3BjaF9maWZvX3VuZGVycnVuX3JlcG9ydGluZyhkZXYsIFRSQU5TQ09ERVJfQSwg ZmFsc2UpOwotCWludGVsX2Rpc2FibGVfcGlwZShkZXZfcHJpdiwgcGlwZSk7CisJaW50ZWxfZGlz YWJsZV9waXBlKGludGVsX2NydGMpOwogCiAJaW50ZWxfZGRpX2Rpc2FibGVfdHJhbnNjb2Rlcl9m dW5jKGRldl9wcml2LCBjcHVfdHJhbnNjb2Rlcik7CiAKQEAgLTQ3ODYsNyArNDc4Myw3IEBAIHN0 YXRpYyB2b2lkIGk5eHhfY3J0Y19kaXNhYmxlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAlpZiAo SVNfR0VOMihkZXYpKQogCQlpbnRlbF93YWl0X2Zvcl92YmxhbmsoZGV2LCBwaXBlKTsKIAotCWlu dGVsX2Rpc2FibGVfcGlwZShkZXZfcHJpdiwgcGlwZSk7CisJaW50ZWxfZGlzYWJsZV9waXBlKGlu dGVsX2NydGMpOwogCiAJaTl4eF9wZml0X2Rpc2FibGUoaW50ZWxfY3J0Yyk7CiAKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZHJ2LmgKaW5kZXggNzhkNDEyNC4uMjRiYjEzMSAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZHJ2LmgKQEAgLTc0MSw3ICs3NDEsNiBAQCBpbnQgaW50ZWxfZ2V0X3BpcGVfZnJvbV9jcnRj X2lkKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiBlbnVtIHRyYW5zY29kZXIg aW50ZWxfcGlwZV90b19jcHVfdHJhbnNjb2RlcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYsCiAJCQkJCSAgICAgZW51bSBwaXBlIHBpcGUpOwogdm9pZCBpbnRlbF93YWl0X2Zvcl92 Ymxhbmsoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgaW50IHBpcGUpOwotdm9pZCBpbnRlbF93YWl0 X2Zvcl9waXBlX29mZihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBpbnQgcGlwZSk7CiBpbnQgaXJv bmxha2VfZ2V0X2xhbmVzX3JlcXVpcmVkKGludCB0YXJnZXRfY2xvY2ssIGludCBsaW5rX2J3LCBp bnQgYnBwKTsKIHZvaWQgdmx2X3dhaXRfcG9ydF9yZWFkeShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYsCiAJCQkgc3RydWN0IGludGVsX2RpZ2l0YWxfcG9ydCAqZHBvcnQpOwotLSAK MS44LjUuNQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K SW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK