From: Matt Roper Subject: [RFC 05/15] drm/i915: Lookup CRTC for plane directly Date: Wed, 20 May 2015 19:12:17 -0700 Message-ID: <1432174347-19138-6-git-send-email-matthew.d.roper@intel.com> References: <1432174347-19138-1-git-send-email-matthew.d.roper@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 0F9B76E804 for ; Wed, 20 May 2015 19:12:29 -0700 (PDT) In-Reply-To: <1432174347-19138-1-git-send-email-matthew.d.roper@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: Vivek Kasireddy List-Id: intel-gfx@lists.freedesktop.org VmFyaW91cyBwbGFjZXMgaW4gdGhlIGF0b21pYyBwbGFuZSBjb2RlIG9idGFpbiB0aGUgQ1JUQyB2 aWEKcGxhbmVfc3RhdGUtPmNydGMuICBCdXQgcGxhbmVfc3RhdGUtPmNydGMgaXMgTlVMTCB3aGVu IGRpc2FibGluZyB0aGUKcGxhbmUsIHNvIHRoZSBjb2RlIHdpbGwgZmFsbCBiYWNrIHRvIGxvb2tp bmcgYXQgdGhlIG9sZCBDUlRDIHZhbHVlIGluCnBsYW5lLT5jcnRjIGluIHRoYXQgY2FzZS4gIFRo aXMgaXNuJ3QgZ29pbmcgdG8gd29yayB3aGVuIHdlIHN0YXJ0CnN1cHBvcnRpbmcgbm9uLWJsb2Nr aW5nIGZsaXBzIChzaW5jZSB0aGUgbGVnYWN5IHBsYW5lLT5jcnRjIHBvaW50ZXIgd2lsbAphbHJl YWR5IGJlIHVwZGF0ZWQgdG8gaXRzIG5ldyB2YWx1ZSBiZWZvcmUgdGhlIGFzeW5jaHJvbm91cyB3 b3JrcXVldWUKdGFzayBydW5zIHRoZSBwbGFuZSBjb21taXQgZnVuY3Rpb24pLiAgVGhlIGNvZGUg aXMgYWxzbyBmcmFnaWxlIGluCmdlbmVyYWwgKHdlIGhhdmUgdG8gYmUgY2FyZWZ1bCB3aGVuIGRv aW5nIHN0dWZmIGxpa2UgdXBkYXRpbmcgcHJvcGVydGllcwpvbiBhIGRpc2FibGVkIHBsYW5lKS4g IFNpbmNlIEludGVsIGhhcmR3YXJlIGhhcyBhIGZpeGVkIHBsYW5lIHRvIHBpcGUKbWFwcGluZywg bGV0J3MganVzdCBsb29rdXAgdGhlIENSVEMgdmlhIHRoYXQgZml4ZWQgbWFwcGluZyBhbmQgYXZv aWQKZnV0dXJlIG1pc3Rha2VzLgoKQ2M6IFZpdmVrIEthc2lyZWRkeSA8dml2ZWsua2FzaXJlZGR5 QGludGVsLmNvbT4KUmVwb3J0ZWQtYnk6IFZpdmVrIEthc2lyZWRkeSA8dml2ZWsua2FzaXJlZGR5 QGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogTWF0dCBSb3BlciA8bWF0dGhldy5kLnJvcGVyQGlu dGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWNfcGxhbmUuYyB8 IDEyICsrKysrKy0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jICAg ICAgfCAgOCArKysrLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAgICAg ICAgfCAgNyArKysrKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYyAgICAg ICB8ICA0ICsrLS0KIDQgZmlsZXMgY2hhbmdlZCwgMTkgaW5zZXJ0aW9ucygrKSwgMTIgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljX3Bs YW5lLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWNfcGxhbmUuYwppbmRleCA3 MTRlZTI0Li4yMWM4MDhkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9h dG9taWNfcGxhbmUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWNfcGxh bmUuYwpAQCAtMTE1LDE2ICsxMTUsMTYgQEAgc3RhdGljIGludCBpbnRlbF9wbGFuZV9hdG9taWNf Y2hlY2soc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJc3RydWN0IGludGVsX3BsYW5lICppbnRl bF9wbGFuZSA9IHRvX2ludGVsX3BsYW5lKHBsYW5lKTsKIAlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3Rh dGUgKmludGVsX3N0YXRlID0gdG9faW50ZWxfcGxhbmVfc3RhdGUoc3RhdGUpOwogCi0JY3J0YyA9 IGNydGMgPyBjcnRjIDogcGxhbmUtPmNydGM7CisJY3J0YyA9IGludGVsX2dldF9jcnRjX2Zvcl9k cm1fcGxhbmUocGxhbmUpOwogCWludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOwogCiAJ LyoKLQkgKiBCb3RoIGNydGMgYW5kIHBsYW5lLT5jcnRjIGNvdWxkIGJlIE5VTEwgaWYgd2UncmUg dXBkYXRpbmcgYQotCSAqIHByb3BlcnR5IHdoaWxlIHRoZSBwbGFuZSBpcyBkaXNhYmxlZC4gIFdl IGRvbid0IGFjdHVhbGx5IGhhdmUKLQkgKiBhbnl0aGluZyBkcml2ZXItc3BlY2lmaWMgd2UgbmVl ZCB0byB0ZXN0IGluIHRoYXQgY2FzZSwgc28KLQkgKiBqdXN0IHJldHVybiBzdWNjZXNzLgorCSAq IEJvdGggc3RhdGUtPmNydGMgYW5kIHBsYW5lLT5zdGF0ZS0+Y3J0YyBjb3VsZCBiZSBOVUxMIGlm IHdlJ3JlCisJICogdXBkYXRpbmcgYSBwcm9wZXJ0eSB3aGlsZSB0aGUgcGxhbmUgaXMgZGlzYWJs ZWQuICBXZSBkb24ndCBhY3R1YWxseQorCSAqIGhhdmUgYW55dGhpbmcgZHJpdmVyLXNwZWNpZmlj IHdlIG5lZWQgdG8gdGVzdCBpbiB0aGF0IGNhc2UsIHNvIGp1c3QKKwkgKiByZXR1cm4gc3VjY2Vz cy4KIAkgKi8KLQlpZiAoIWNydGMpCisJaWYgKCFzdGF0ZS0+Y3J0YyAmJiAhcGxhbmUtPnN0YXRl LT5jcnRjKQogCQlyZXR1cm4gMDsKIAogCWNydGNfc3RhdGUgPSBpbnRlbF9jcnRjX3N0YXRlX2Zv cl9wbGFuZShpbnRlbF9zdGF0ZSk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5k ZXggMWE3ZDJhOS4uZjQzOThhNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpA QCAtMTMwOTIsNyArMTMwOTIsNyBAQCBpbnRlbF9jaGVja19wcmltYXJ5X3BsYW5lKHN0cnVjdCBk cm1fcGxhbmUgKnBsYW5lLAogCWludCBtaW5fc2NhbGUgPSBEUk1fUExBTkVfSEVMUEVSX05PX1ND QUxJTkc7CiAJaW50IHJldDsKIAotCWNydGMgPSBjcnRjID8gY3J0YyA6IHBsYW5lLT5jcnRjOwor CWNydGMgPSBpbnRlbF9nZXRfY3J0Y19mb3JfZHJtX3BsYW5lKHBsYW5lKTsKIAlpbnRlbF9jcnRj ID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKIAljcnRjX3N0YXRlID0gaW50ZWxfY3J0Y19zdGF0ZV9m b3JfcGxhbmUoc3RhdGUpOwogCkBAIC0xMzE3NCw3ICsxMzE3NCw3IEBAIGludGVsX2NvbW1pdF9w cmltYXJ5X3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCXN0cnVjdCBpbnRlbF9jcnRj ICppbnRlbF9jcnRjOwogCXN0cnVjdCBkcm1fcmVjdCAqc3JjID0gJnN0YXRlLT5zcmM7CiAKLQlj cnRjID0gY3J0YyA/IGNydGMgOiBwbGFuZS0+Y3J0YzsKKwljcnRjID0gaW50ZWxfZ2V0X2NydGNf Zm9yX2RybV9wbGFuZShwbGFuZSk7CiAJaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7 CiAKIAlwbGFuZS0+ZmIgPSBmYjsKQEAgLTEzNDA5LDcgKzEzNDA5LDcgQEAgaW50ZWxfY2hlY2tf Y3Vyc29yX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCXVuc2lnbmVkIHN0cmlkZTsK IAlpbnQgcmV0OwogCi0JY3J0YyA9IGNydGMgPyBjcnRjIDogcGxhbmUtPmNydGM7CisJY3J0YyA9 IGludGVsX2dldF9jcnRjX2Zvcl9kcm1fcGxhbmUocGxhbmUpOwogCWludGVsX2NydGMgPSB0b19p bnRlbF9jcnRjKGNydGMpOwogCiAJcmV0ID0gZHJtX3BsYW5lX2hlbHBlcl9jaGVja191cGRhdGUo cGxhbmUsIGNydGMsIGZiLApAQCAtMTM0ODIsNyArMTM0ODIsNyBAQCBpbnRlbF9jb21taXRfY3Vy c29yX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCXN0cnVjdCBkcm1faTkxNV9nZW1f b2JqZWN0ICpvYmogPSBpbnRlbF9mYl9vYmooc3RhdGUtPmJhc2UuZmIpOwogCXVpbnQzMl90IGFk ZHI7CiAKLQljcnRjID0gY3J0YyA/IGNydGMgOiBwbGFuZS0+Y3J0YzsKKwljcnRjID0gaW50ZWxf Z2V0X2NydGNfZm9yX2RybV9wbGFuZShwbGFuZSk7CiAJaW50ZWxfY3J0YyA9IHRvX2ludGVsX2Ny dGMoY3J0Yyk7CiAKIAlwbGFuZS0+ZmIgPSBzdGF0ZS0+YmFzZS5mYjsKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZHJ2LmgKaW5kZXggMWUyMmZmZS4uZWE2NzA5MyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2 LmgKQEAgLTgwMyw2ICs4MDMsMTMgQEAgaW50ZWxfZ2V0X2NydGNfZm9yX3BsYW5lKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYsIGludCBwbGFuZSkKIAlyZXR1cm4gZGV2X3ByaXYtPnBsYW5lX3RvX2Ny dGNfbWFwcGluZ1twbGFuZV07CiB9CiAKK3N0YXRpYyBpbmxpbmUgc3RydWN0IGRybV9jcnRjICoK K2ludGVsX2dldF9jcnRjX2Zvcl9kcm1fcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUpCit7 CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShwbGFuZS0+ZGV2 KTsKKwlyZXR1cm4gZGV2X3ByaXYtPnBpcGVfdG9fY3J0Y19tYXBwaW5nW3RvX2ludGVsX3BsYW5l KHBsYW5lKS0+cGlwZV07Cit9CisKIHN0cnVjdCBpbnRlbF91bnBpbl93b3JrIHsKIAlzdHJ1Y3Qg d29ya19zdHJ1Y3Qgd29yazsKIAlzdHJ1Y3QgZHJtX2NydGMgKmNydGM7CmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3Nwcml0ZS5jCmluZGV4IGJmZTkyMTMuLjIxNjRlNjMgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3Nwcml0ZS5jCkBAIC03NTIsNyArNzUyLDcgQEAgaW50ZWxfY2hlY2tfc3ByaXRlX3Bs YW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCWludCBwaXhlbF9zaXplOwogCWludCByZXQ7 CiAKLQlpbnRlbF9jcnRjID0gaW50ZWxfY3J0YyA/IGludGVsX2NydGMgOiB0b19pbnRlbF9jcnRj KHBsYW5lLT5jcnRjKTsKKwlpbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhpbnRlbF9nZXRfY3J0 Y19mb3JfZHJtX3BsYW5lKHBsYW5lKSk7CiAJY3J0Y19zdGF0ZSA9IGludGVsX2NydGNfc3RhdGVf Zm9yX3BsYW5lKHN0YXRlKTsKIAogCWlmICghZmIpIHsKQEAgLTk0Miw3ICs5NDIsNyBAQCBpbnRl bF9jb21taXRfc3ByaXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCXVuc2lnbmVk IGludCBjcnRjX3csIGNydGNfaDsKIAl1aW50MzJfdCBzcmNfeCwgc3JjX3ksIHNyY193LCBzcmNf aDsKIAotCWNydGMgPSBjcnRjID8gY3J0YyA6IHBsYW5lLT5jcnRjOworCWNydGMgPSBpbnRlbF9n ZXRfY3J0Y19mb3JfZHJtX3BsYW5lKHBsYW5lKTsKIAlpbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0 YyhjcnRjKTsKIAogCXBsYW5lLT5mYiA9IGZiOwotLSAKMS44LjUuMQoKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJ bnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK