From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH 10/13] drm/i915: Pass crtc to our update/disable_plane hooks Date: Tue, 6 Aug 2013 22:24:09 +0300 Message-ID: <1375817052-32310-11-git-send-email-ville.syrjala@linux.intel.com> References: <1375817052-32310-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 mga03.intel.com (mga03.intel.com [143.182.124.21]) by gabe.freedesktop.org (Postfix) with ESMTP id 5A950E5EAD for ; Tue, 6 Aug 2013 12:24:49 -0700 (PDT) In-Reply-To: <1375817052-32310-1-git-send-email-ville.syrjala@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCldl J3JlIGdvaW5nIHRvIHdhbnQgdG8ga25vdyB3aGljaCBDUlRDIHdlJ3JlIGRlYWxpbmcgd2l0aCwg c28gcGFzcyBpdApkb3duIHRvIHRoZSB1cGRhdGUvZGlzYWJsZV9wbGFuZSBob29rcy4KClNpZ25l ZC1vZmYtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+ Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAgfCAgNCArKystCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYyB8IDIxICsrKysrKysrKysrKy0tLS0tLS0t LQogMiBmaWxlcyBjaGFuZ2VkLCAxNSBpbnNlcnRpb25zKCspLCAxMCBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IDAzNjZiY2EuLjJlNjE2NjUgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rydi5oCkBAIC0zNTgsMTMgKzM1OCwxNSBAQCBzdHJ1Y3QgaW50ZWxfcGxhbmUg ewogCXN0cnVjdCBpbnRlbF9wbGFuZV93bV9wYXJhbWV0ZXJzIHdtOwogCiAJdm9pZCAoKnVwZGF0 ZV9wbGFuZSkoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCisJCQkgICAgIHN0cnVjdCBkcm1fY3J0 YyAqY3J0YywKIAkJCSAgICAgc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIsCiAJCQkgICAgIHN0 cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosCiAJCQkgICAgIGludCBjcnRjX3gsIGludCBj cnRjX3ksCiAJCQkgICAgIHVuc2lnbmVkIGludCBjcnRjX3csIHVuc2lnbmVkIGludCBjcnRjX2gs CiAJCQkgICAgIHVpbnQzMl90IHgsIHVpbnQzMl90IHksCiAJCQkgICAgIHVpbnQzMl90IHNyY193 LCB1aW50MzJfdCBzcmNfaCk7Ci0Jdm9pZCAoKmRpc2FibGVfcGxhbmUpKHN0cnVjdCBkcm1fcGxh bmUgKnBsYW5lKTsKKwl2b2lkICgqZGlzYWJsZV9wbGFuZSkoc3RydWN0IGRybV9wbGFuZSAqcGxh bmUsCisJCQkgICAgICBzdHJ1Y3QgZHJtX2NydGMgKmNydGMpOwogCWludCAoKnVwZGF0ZV9jb2xv cmtleSkoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJCQkgICAgICAgc3RydWN0IGRybV9pbnRl bF9zcHJpdGVfY29sb3JrZXkgKmtleSk7CiAJdm9pZCAoKmdldF9jb2xvcmtleSkoc3RydWN0IGRy bV9wbGFuZSAqcGxhbmUsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9z cHJpdGUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCmluZGV4IDVhMzZh ZmIuLmQ0ZTA1OTIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0 ZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCkBAIC0zOCw3ICsz OCw4IEBACiAjaW5jbHVkZSAiaTkxNV9kcnYuaCIKIAogc3RhdGljIHZvaWQKLXZsdl91cGRhdGVf cGxhbmUoc3RydWN0IGRybV9wbGFuZSAqZHBsYW5lLCBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpm YiwKK3Zsdl91cGRhdGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqZHBsYW5lLCBzdHJ1Y3QgZHJt X2NydGMgKmNydGMsCisJCSBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiwKIAkJIHN0cnVjdCBk cm1faTkxNV9nZW1fb2JqZWN0ICpvYmosIGludCBjcnRjX3gsIGludCBjcnRjX3ksCiAJCSB1bnNp Z25lZCBpbnQgY3J0Y193LCB1bnNpZ25lZCBpbnQgY3J0Y19oLAogCQkgdWludDMyX3QgeCwgdWlu dDMyX3QgeSwKQEAgLTE0MCw3ICsxNDEsNyBAQCB2bHZfdXBkYXRlX3BsYW5lKHN0cnVjdCBkcm1f cGxhbmUgKmRwbGFuZSwgc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIsCiB9CiAKIHN0YXRpYyB2 b2lkCi12bHZfZGlzYWJsZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpkcGxhbmUpCit2bHZfZGlz YWJsZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpkcGxhbmUsIHN0cnVjdCBkcm1fY3J0YyAqY3J0 YykKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gZHBsYW5lLT5kZXY7CiAJc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKQEAgLTIwNyw3ICsy MDgsOCBAQCB2bHZfZ2V0X2NvbG9ya2V5KHN0cnVjdCBkcm1fcGxhbmUgKmRwbGFuZSwKIH0KIAog c3RhdGljIHZvaWQKLWl2Yl91cGRhdGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsIHN0 cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiLAoraXZiX3VwZGF0ZV9wbGFuZShzdHJ1Y3QgZHJtX3Bs YW5lICpwbGFuZSwgc3RydWN0IGRybV9jcnRjICpjcnRjLAorCQkgc3RydWN0IGRybV9mcmFtZWJ1 ZmZlciAqZmIsCiAJCSBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLCBpbnQgY3J0Y194 LCBpbnQgY3J0Y195LAogCQkgdW5zaWduZWQgaW50IGNydGNfdywgdW5zaWduZWQgaW50IGNydGNf aCwKIAkJIHVpbnQzMl90IHgsIHVpbnQzMl90IHksCkBAIC0zMjAsNyArMzIyLDcgQEAgaXZiX3Vw ZGF0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwgc3RydWN0IGRybV9mcmFtZWJ1ZmZl ciAqZmIsCiB9CiAKIHN0YXRpYyB2b2lkCi1pdmJfZGlzYWJsZV9wbGFuZShzdHJ1Y3QgZHJtX3Bs YW5lICpwbGFuZSkKK2l2Yl9kaXNhYmxlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLCBz dHJ1Y3QgZHJtX2NydGMgKmNydGMpCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHBsYW5l LT5kZXY7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJp dmF0ZTsKQEAgLTQwMCw3ICs0MDIsOCBAQCBpdmJfZ2V0X2NvbG9ya2V5KHN0cnVjdCBkcm1fcGxh bmUgKnBsYW5lLCBzdHJ1Y3QgZHJtX2ludGVsX3Nwcml0ZV9jb2xvcmtleSAqa2V5KQogfQogCiBz dGF0aWMgdm9pZAotaWxrX3VwZGF0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwgc3Ry dWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIsCitpbGtfdXBkYXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxh bmUgKnBsYW5lLCBzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCisJCSBzdHJ1Y3QgZHJtX2ZyYW1lYnVm ZmVyICpmYiwKIAkJIHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosIGludCBjcnRjX3gs IGludCBjcnRjX3ksCiAJCSB1bnNpZ25lZCBpbnQgY3J0Y193LCB1bnNpZ25lZCBpbnQgY3J0Y19o LAogCQkgdWludDMyX3QgeCwgdWludDMyX3QgeSwKQEAgLTQ4OCw3ICs0OTEsNyBAQCBpbGtfdXBk YXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLCBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVy ICpmYiwKIH0KIAogc3RhdGljIHZvaWQKLWlsa19kaXNhYmxlX3BsYW5lKHN0cnVjdCBkcm1fcGxh bmUgKnBsYW5lKQoraWxrX2Rpc2FibGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsIHN0 cnVjdCBkcm1fY3J0YyAqY3J0YykKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gcGxhbmUt PmRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2 YXRlOwpAQCAtODIzLDExICs4MjYsMTEgQEAgaW50ZWxfdXBkYXRlX3BsYW5lKHN0cnVjdCBkcm1f cGxhbmUgKnBsYW5lLCBzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJCWludGVsX2VuYWJsZV9wcmlt YXJ5KGNydGMpOwogCiAJaWYgKHZpc2libGUpCi0JCWludGVsX3BsYW5lLT51cGRhdGVfcGxhbmUo cGxhbmUsIGZiLCBvYmosCisJCWludGVsX3BsYW5lLT51cGRhdGVfcGxhbmUocGxhbmUsIGNydGMs IGZiLCBvYmosCiAJCQkJCSAgY3J0Y194LCBjcnRjX3ksIGNydGNfdywgY3J0Y19oLAogCQkJCQkg IHNyY194LCBzcmNfeSwgc3JjX3csIHNyY19oKTsKIAllbHNlCi0JCWludGVsX3BsYW5lLT5kaXNh YmxlX3BsYW5lKHBsYW5lKTsKKwkJaW50ZWxfcGxhbmUtPmRpc2FibGVfcGxhbmUocGxhbmUsIGNy dGMpOwogCiAJaWYgKGRpc2FibGVfcHJpbWFyeSkKIAkJaW50ZWxfZGlzYWJsZV9wcmltYXJ5KGNy dGMpOwpAQCAtODYyLDcgKzg2NSw3IEBAIGludGVsX2Rpc2FibGVfcGxhbmUoc3RydWN0IGRybV9w bGFuZSAqcGxhbmUpCiAKIAlpZiAocGxhbmUtPmNydGMpCiAJCWludGVsX2VuYWJsZV9wcmltYXJ5 KHBsYW5lLT5jcnRjKTsKLQlpbnRlbF9wbGFuZS0+ZGlzYWJsZV9wbGFuZShwbGFuZSk7CisJaW50 ZWxfcGxhbmUtPmRpc2FibGVfcGxhbmUocGxhbmUsIHBsYW5lLT5jcnRjKTsKIAogCWlmICghaW50 ZWxfcGxhbmUtPm9iaikKIAkJZ290byBvdXQ7Ci0tIAoxLjguMS41CgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=