From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH 1/4] drm/i915: Do not use atomic modesets in hw readout. Date: Fri, 12 Jun 2015 11:15:39 +0200 Message-ID: <1434100542-15301-2-git-send-email-maarten.lankhorst@linux.intel.com> References: <1434100542-15301-1-git-send-email-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mblankhorst.nl (mblankhorst.nl [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTP id 440016E1EC for ; Fri, 12 Jun 2015 02:15:54 -0700 (PDT) In-Reply-To: <1434100542-15301-1-git-send-email-maarten.lankhorst@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 List-Id: intel-gfx@lists.freedesktop.org VGhpcyBzaG91bGQgZml4IGZhbGxvdXQgY2F1c2VkIGJ5IG1ha2luZyBpbnRlbF9jcnRjX2NvbnRy b2wKYW5kIHVwZGF0ZV9kcG1zIGF0b21pYywgd2hpY2ggYmVjYW1lIGEgcHJvYmxlbSBhZnRlciBy ZXZlcnRpbmcgdGhlCmF0b21pYyBodyByZWFkb3V0IHBhdGNoLgoKQnVnemlsbGE6IGh0dHBzOi8v YnVncy5mcmVlZGVza3RvcC5vcmcvc2hvd19idWcuY2dpP2lkPTkwOTI5ClJlcG9ydGVkLWJ5OiBW aWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgpTaWduZWQtb2Zm LWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29t PgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDc1ICsrKysrKysr KysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDMyIGluc2VydGlv bnMoKyksIDQzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpp bmRleCA1Y2MyMjYzZGIxOTkuLjdhYmFmZmVkYTdjZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rpc3BsYXkuYwpAQCAtNjE4NywzMSArNjE4NywzNSBAQCBzdGF0aWMgdm9pZCBpOXh4X2NydGNf ZGlzYWJsZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVj dF9tdXRleCk7CiB9CiAKK3N0YXRpYyB2b2lkIGludGVsX2NydGNfZGlzYWJsZV9ub2F0b21pYyhz dHJ1Y3QgZHJtX2NydGMgKmNydGMpCit7CisJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMg PSB0b19pbnRlbF9jcnRjKGNydGMpOworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diA9IHRvX2k5MTUoY3J0Yy0+ZGV2KTsKKwllbnVtIGludGVsX2Rpc3BsYXlfcG93ZXJfZG9tYWlu IGRvbWFpbjsKKwl1bnNpZ25lZCBsb25nIGRvbWFpbnM7CisKKwlpZiAoIWludGVsX2NydGMtPmFj dGl2ZSkKKwkJcmV0dXJuOworCisJaW50ZWxfY3J0Y19kaXNhYmxlX3BsYW5lcyhjcnRjKTsKKwlk ZXZfcHJpdi0+ZGlzcGxheS5jcnRjX2Rpc2FibGUoY3J0Yyk7CisKKwlkb21haW5zID0gaW50ZWxf Y3J0Yy0+ZW5hYmxlZF9wb3dlcl9kb21haW5zOworCWZvcl9lYWNoX3Bvd2VyX2RvbWFpbihkb21h aW4sIGRvbWFpbnMpCisJCWludGVsX2Rpc3BsYXlfcG93ZXJfcHV0KGRldl9wcml2LCBkb21haW4p OworCWludGVsX2NydGMtPmVuYWJsZWRfcG93ZXJfZG9tYWlucyA9IDA7Cit9CisKIC8qCiAgKiB0 dXJuIGFsbCBjcnRjJ3Mgb2ZmLCBidXQgZG8gbm90IGFkanVzdCBzdGF0ZQogICogVGhpcyBoYXMg dG8gYmUgcGFpcmVkIHdpdGggYSBjYWxsIHRvIGludGVsX21vZGVzZXRfc2V0dXBfaHdfc3RhdGUu CiAgKi8KIHZvaWQgaW50ZWxfZGlzcGxheV9zdXNwZW5kKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYp CiB7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwog CXN0cnVjdCBkcm1fY3J0YyAqY3J0YzsKIAotCWZvcl9lYWNoX2NydGMoZGV2LCBjcnRjKSB7Ci0J CXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKLQkJ ZW51bSBpbnRlbF9kaXNwbGF5X3Bvd2VyX2RvbWFpbiBkb21haW47Ci0JCXVuc2lnbmVkIGxvbmcg ZG9tYWluczsKLQotCQlpZiAoIWludGVsX2NydGMtPmFjdGl2ZSkKLQkJCWNvbnRpbnVlOwotCi0J CWludGVsX2NydGNfZGlzYWJsZV9wbGFuZXMoY3J0Yyk7Ci0JCWRldl9wcml2LT5kaXNwbGF5LmNy dGNfZGlzYWJsZShjcnRjKTsKLQotCQlkb21haW5zID0gaW50ZWxfY3J0Yy0+ZW5hYmxlZF9wb3dl cl9kb21haW5zOwotCQlmb3JfZWFjaF9wb3dlcl9kb21haW4oZG9tYWluLCBkb21haW5zKQotCQkJ aW50ZWxfZGlzcGxheV9wb3dlcl9wdXQoZGV2X3ByaXYsIGRvbWFpbik7Ci0JCWludGVsX2NydGMt PmVuYWJsZWRfcG93ZXJfZG9tYWlucyA9IDA7Ci0JfQorCWZvcl9lYWNoX2NydGMoZGV2LCBjcnRj KQorCQlpbnRlbF9jcnRjX2Rpc2FibGVfbm9hdG9taWMoY3J0Yyk7CiB9CiAKIC8qIE1hc3RlciBm dW5jdGlvbiB0byBlbmFibGUvZGlzYWJsZSBDUlRDIGFuZCBjb3JyZXNwb25kaW5nIHBvd2VyIHdl bGxzICovCkBAIC0xNTEyMCw3ICsxNTEyNCw5IEBAIHN0YXRpYyB2b2lkIGludGVsX3Nhbml0aXpl X2NydGMoc3RydWN0IGludGVsX2NydGMgKmNydGMpCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRl diA9IGNydGMtPmJhc2UuZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9 IGRldi0+ZGV2X3ByaXZhdGU7CisJc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXI7CiAJdTMy IHJlZzsKKwlib29sIGVuYWJsZTsKIAogCS8qIENsZWFyIGFueSBmcmFtZSBzdGFydCBkZWxheXMg dXNlZCBmb3IgZGVidWdnaW5nIGxlZnQgYnkgdGhlIEJJT1MgKi8KIAlyZWcgPSBQSVBFQ09ORihj cnRjLT5jb25maWctPmNwdV90cmFuc2NvZGVyKTsKQEAgLTE1MTM3LDcgKzE1MTQzLDYgQEAgc3Rh dGljIHZvaWQgaW50ZWxfc2FuaXRpemVfY3J0YyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIAkg KiBkaXNhYmxlIHRoZSBjcnRjIChhbmQgaGVuY2UgY2hhbmdlIHRoZSBzdGF0ZSkgaWYgaXQgaXMg d3JvbmcuIE5vdGUKIAkgKiB0aGF0IGdlbjQrIGhhcyBhIGZpeGVkIHBsYW5lIC0+IHBpcGUgbWFw cGluZy4gICovCiAJaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuIDwgNCAmJiAhaW50ZWxfY2hlY2tf cGxhbmVfbWFwcGluZyhjcnRjKSkgewotCQlzdHJ1Y3QgaW50ZWxfY29ubmVjdG9yICpjb25uZWN0 b3I7CiAJCWJvb2wgcGxhbmU7CiAKIAkJRFJNX0RFQlVHX0tNUygiW0NSVEM6JWRdIHdyb25nIHBs YW5lIGNvbm5lY3Rpb24gZGV0ZWN0ZWQhXG4iLApAQCAtMTUxNDksMjkgKzE1MTU0LDggQEAgc3Rh dGljIHZvaWQgaW50ZWxfc2FuaXRpemVfY3J0YyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIAkJ cGxhbmUgPSBjcnRjLT5wbGFuZTsKIAkJdG9faW50ZWxfcGxhbmVfc3RhdGUoY3J0Yy0+YmFzZS5w cmltYXJ5LT5zdGF0ZSktPnZpc2libGUgPSB0cnVlOwogCQljcnRjLT5wbGFuZSA9ICFwbGFuZTsK LQkJaW50ZWxfY3J0Y19jb250cm9sKCZjcnRjLT5iYXNlLCBmYWxzZSk7CisJCWludGVsX2NydGNf ZGlzYWJsZV9ub2F0b21pYygmY3J0Yy0+YmFzZSk7CiAJCWNydGMtPnBsYW5lID0gcGxhbmU7Ci0K LQkJLyogLi4uIGFuZCBicmVhayBhbGwgbGlua3MuICovCi0JCWZvcl9lYWNoX2ludGVsX2Nvbm5l Y3RvcihkZXYsIGNvbm5lY3RvcikgewotCQkJaWYgKGNvbm5lY3Rvci0+ZW5jb2Rlci0+YmFzZS5j cnRjICE9ICZjcnRjLT5iYXNlKQotCQkJCWNvbnRpbnVlOwotCi0JCQljb25uZWN0b3ItPmJhc2Uu ZHBtcyA9IERSTV9NT0RFX0RQTVNfT0ZGOwotCQkJY29ubmVjdG9yLT5iYXNlLmVuY29kZXIgPSBO VUxMOwotCQl9Ci0JCS8qIG11bHRpcGxlIGNvbm5lY3RvcnMgbWF5IGhhdmUgdGhlIHNhbWUgZW5j b2RlcjoKLQkJICogIGhhbmRsZSB0aGVtIGFuZCBicmVhayBjcnRjIGxpbmsgc2VwYXJhdGVseSAq LwotCQlmb3JfZWFjaF9pbnRlbF9jb25uZWN0b3IoZGV2LCBjb25uZWN0b3IpCi0JCQlpZiAoY29u bmVjdG9yLT5lbmNvZGVyLT5iYXNlLmNydGMgPT0gJmNydGMtPmJhc2UpIHsKLQkJCQljb25uZWN0 b3ItPmVuY29kZXItPmJhc2UuY3J0YyA9IE5VTEw7Ci0JCQkJY29ubmVjdG9yLT5lbmNvZGVyLT5j b25uZWN0b3JzX2FjdGl2ZSA9IGZhbHNlOwotCQkJfQotCi0JCVdBUk5fT04oY3J0Yy0+YWN0aXZl KTsKLQkJY3J0Yy0+YmFzZS5zdGF0ZS0+ZW5hYmxlID0gZmFsc2U7Ci0JCWNydGMtPmJhc2Uuc3Rh dGUtPmFjdGl2ZSA9IGZhbHNlOwotCQljcnRjLT5iYXNlLmVuYWJsZWQgPSBmYWxzZTsKIAl9CiAK IAlpZiAoZGV2X3ByaXYtPnF1aXJrcyAmIFFVSVJLX1BJUEVBX0ZPUkNFICYmCkBAIC0xNTE4NSwx MyArMTUxNjksMTggQEAgc3RhdGljIHZvaWQgaW50ZWxfc2FuaXRpemVfY3J0YyhzdHJ1Y3QgaW50 ZWxfY3J0YyAqY3J0YykKIAogCS8qIEFkanVzdCB0aGUgc3RhdGUgb2YgdGhlIG91dHB1dCBwaXBl IGFjY29yZGluZyB0byB3aGV0aGVyIHdlCiAJICogaGF2ZSBhY3RpdmUgY29ubmVjdG9ycy9lbmNv ZGVycy4gKi8KLQlpbnRlbF9jcnRjX3VwZGF0ZV9kcG1zKCZjcnRjLT5iYXNlKTsKKwllbmFibGUg PSBmYWxzZTsKKwlmb3JfZWFjaF9lbmNvZGVyX29uX2NydGMoZGV2LCAmY3J0Yy0+YmFzZSwgZW5j b2RlcikKKwkJZW5hYmxlIHw9IGVuY29kZXItPmNvbm5lY3RvcnNfYWN0aXZlOworCisJaWYgKCFl bmFibGUpCisJCWludGVsX2NydGNfZGlzYWJsZV9ub2F0b21pYygmY3J0Yy0+YmFzZSk7CiAKIAlp ZiAoY3J0Yy0+YWN0aXZlICE9IGNydGMtPmJhc2Uuc3RhdGUtPmFjdGl2ZSkgewotCQlzdHJ1Y3Qg aW50ZWxfZW5jb2RlciAqZW5jb2RlcjsKIAogCQkvKiBUaGlzIGNhbiBoYXBwZW4gZWl0aGVyIGR1 ZSB0byBidWdzIGluIHRoZSBnZXRfaHdfc3RhdGUKLQkJICogZnVuY3Rpb25zIG9yIGJlY2F1c2Ug dGhlIHBpcGUgaXMgZm9yY2UtZW5hYmxlZCBkdWUgdG8gdGhlCisJCSAqIGZ1bmN0aW9ucyBvciBi ZWNhdXNlIG9mIGNhbGxzIHRvIGludGVsX2NydGNfZGlzYWJsZV9ub2F0b21pYywKKwkJICogb3Ig YmVjYXVzZSB0aGUgcGlwZSBpcyBmb3JjZS1lbmFibGVkIGR1ZSB0byB0aGUKIAkJICogcGlwZSBB IHF1aXJrLiAqLwogCQlEUk1fREVCVUdfS01TKCJbQ1JUQzolZF0gaHcgc3RhdGUgYWRqdXN0ZWQs IHdhcyAlcywgbm93ICVzXG4iLAogCQkJICAgICAgY3J0Yy0+YmFzZS5iYXNlLmlkLAotLSAKMi4x LjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVs LWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8v bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==