From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: Re: [PATCH v3.5 03/22] drm/i915: use intel_crtc_control everywhere, v3. Date: Thu, 21 May 2015 14:34:43 +0200 Message-ID: <555DD0E3.8090300@linux.intel.com> References: <1432129094-11765-1-git-send-email-maarten.lankhorst@linux.intel.com> <1432129094-11765-4-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 mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id 857EC6E0D1 for ; Thu, 21 May 2015 05:34:44 -0700 (PDT) In-Reply-To: <1432129094-11765-4-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 SGF2aW5nIGEgc2luZ2xlIHBhdGggZm9yIGV2ZXJ5dGhpbmcgbWFrZXMgaXQgYSBsb3QgZWFzaWVy IHRvIGtlZXAKY3J0Y19zdGF0ZS0+YWN0aXZlIGluIHN5bmMgd2l0aCBpbnRlbF9jcnRjLT5hY3Rp dmUuCgpBIGNydGMgY2Fubm90IGJlIGNoYW5nZWQgdG8gYWN0aXZlIHdoZW4gbm90IGVuYWJsZWQs IGJlY2F1c2UgaXQgbWVhbnMKbm8gbW9kZSBpcyBzZXQgYW5kIG5vIGNvbm5lY3RvcnMgYXJlIGNv bm5lY3RlZC4KClRoaXMgc2hvdWxkIGFsc28gbWFrZSBpbnRlbF9jcnRjLT5hY3RpdmUgbWF0Y2gg Y3J0Y19zdGF0ZS0+YWN0aXZlLgoKQ2hhbmdlcyBzaW5jZSB2MToKLSBSZXdvcmRlZCBjb21taXQg bWVzc2FnZSwgdGhlcmUncyBubyBpbnRlbF9jcnRjX3RvZ2dsZS4KQ2hhbmdlcyBzaW5jZSB2MjoK LSBDaGFuZ2Ugc29tZSBjYWxsZXJzIG9mIGludGVsX2NydGNfY29udHJvbCB0byBpbnRlbF9kaXNw bGF5X3N1c3BlbmQuCgpTaWduZWQtb2ZmLWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5s YW5raG9yc3RAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZGVidWdmcy5jICB8IDE4ICsrKysrKysrKystLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGlzcGxheS5jIHwgNTQgKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgfCAgMSAtCiAzIGZpbGVzIGNoYW5nZWQs IDM1IGluc2VydGlvbnMoKyksIDM4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k ZWJ1Z2ZzLmMKaW5kZXggYTMyYjY2OWJhYjg5Li44YmYyMWU4YWJkOTMgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZGVidWdmcy5jCkBAIC0zNjA2LDEyICszNjA2LDE4IEBAIHN0YXRpYyB2b2lkIGhz d190cmFuc19lZHBfcGlwZV9BX2NyY193YShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCSAqLwog CWlmIChjcnRjLT5jb25maWctPmNwdV90cmFuc2NvZGVyID09IFRSQU5TQ09ERVJfRURQICYmCiAJ ICAgICFjcnRjLT5jb25maWctPnBjaF9wZml0LmVuYWJsZWQpIHsKKwkJYm9vbCBhY3RpdmUgPSBj cnRjLT5hY3RpdmU7CisKKwkJaWYgKGFjdGl2ZSkKKwkJCWludGVsX2NydGNfY29udHJvbCgmY3J0 Yy0+YmFzZSwgZmFsc2UpOworCiAJCWNydGMtPmNvbmZpZy0+cGNoX3BmaXQuZm9yY2VfdGhydSA9 IHRydWU7CiAKIAkJaW50ZWxfZGlzcGxheV9wb3dlcl9nZXQoZGV2X3ByaXYsCiAJCQkJCVBPV0VS X0RPTUFJTl9QSVBFX1BBTkVMX0ZJVFRFUihQSVBFX0EpKTsKIAotCQlpbnRlbF9jcnRjX3Jlc2V0 KGNydGMpOworCQlpZiAoYWN0aXZlKQorCQkJaW50ZWxfY3J0Y19jb250cm9sKCZjcnRjLT5iYXNl LCB0cnVlKTsKIAl9CiAJZHJtX21vZGVzZXRfdW5sb2NrX2FsbChkZXYpOwogfQpAQCAtMzYzMCwx MiArMzYzNiwxOCBAQCBzdGF0aWMgdm9pZCBoc3dfdW5kb190cmFuc19lZHBfcGlwZV9BX2NyY193 YShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCSAqIHJvdXRpbmcuCiAJICovCiAJaWYgKGNydGMt PmNvbmZpZy0+cGNoX3BmaXQuZm9yY2VfdGhydSkgewotCQljcnRjLT5jb25maWctPnBjaF9wZml0 LmZvcmNlX3RocnUgPSBmYWxzZTsKKwkJYm9vbCBhY3RpdmUgPSBjcnRjLT5hY3RpdmU7CiAKLQkJ aW50ZWxfY3J0Y19yZXNldChjcnRjKTsKKwkJaWYgKGFjdGl2ZSkKKwkJCWludGVsX2NydGNfY29u dHJvbCgmY3J0Yy0+YmFzZSwgZmFsc2UpOworCisJCWNydGMtPmNvbmZpZy0+cGNoX3BmaXQuZm9y Y2VfdGhydSA9IGZhbHNlOwogCiAJCWludGVsX2Rpc3BsYXlfcG93ZXJfcHV0KGRldl9wcml2LAog CQkJCQlQT1dFUl9ET01BSU5fUElQRV9QQU5FTF9GSVRURVIoUElQRV9BKSk7CisKKwkJaWYgKGFj dGl2ZSkKKwkJCWludGVsX2NydGNfY29udHJvbCgmY3J0Yy0+YmFzZSwgdHJ1ZSk7CiAJfQogCWRy bV9tb2Rlc2V0X3VubG9ja19hbGwoZGV2KTsKIH0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs YXkuYwppbmRleCA4ZDUwYzRjYTU2MWYuLjdkMzg2NTYxNTMxZiAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rpc3BsYXkuYwpAQCAtMzE4OSwxOSArMzE4OSw2IEBAIHN0YXRpYyB2b2lkIGludGVs X3VwZGF0ZV9wcmltYXJ5X3BsYW5lcyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCX0KIH0KIAot dm9pZCBpbnRlbF9jcnRjX3Jlc2V0KHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQotewotCXN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoY3J0Yy0+YmFzZS5kZXYpOwot Ci0JaWYgKCFjcnRjLT5hY3RpdmUpCi0JCXJldHVybjsKLQotCWludGVsX2NydGNfZGlzYWJsZV9w bGFuZXMoJmNydGMtPmJhc2UpOwotCWRldl9wcml2LT5kaXNwbGF5LmNydGNfZGlzYWJsZSgmY3J0 Yy0+YmFzZSk7Ci0JZGV2X3ByaXYtPmRpc3BsYXkuY3J0Y19lbmFibGUoJmNydGMtPmJhc2UpOwot CWludGVsX2NydGNfZW5hYmxlX3BsYW5lcygmY3J0Yy0+YmFzZSk7Ci19Ci0KIHZvaWQgaW50ZWxf cHJlcGFyZV9yZXNldChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogewogCS8qIG5vIHJlc2V0IHN1 cHBvcnQgZm9yIGdlbjIgKi8KQEAgLTMyMTMsNyArMzIwMCw2IEBAIHZvaWQgaW50ZWxfcHJlcGFy ZV9yZXNldChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlyZXR1cm47CiAKIAlkcm1fbW9kZXNl dF9sb2NrX2FsbChkZXYpOwotCiAJLyoKIAkgKiBEaXNhYmxpbmcgdGhlIGNydGNzIGdyYWNlZnVs bHkgc2VlbXMgbmljZXIuIEFsc28gdGhlCiAJICogZzMzIGRvY3Mgc2F5IHdlIHNob3VsZCBhdCBs ZWFzdCBkaXNhYmxlIGFsbCB0aGUgcGxhbmVzLgpAQCAtNjAzNiwyNiArNjAyMiwyOSBAQCB2b2lk IGludGVsX2NydGNfY29udHJvbChzdHJ1Y3QgZHJtX2NydGMgKmNydGMsIGJvb2wgZW5hYmxlKQog CWVudW0gaW50ZWxfZGlzcGxheV9wb3dlcl9kb21haW4gZG9tYWluOwogCXVuc2lnbmVkIGxvbmcg ZG9tYWluczsKIAorCWlmIChlbmFibGUgPT0gaW50ZWxfY3J0Yy0+YWN0aXZlKQorCQlyZXR1cm47 CisKKwlpZiAoZW5hYmxlICYmICFjcnRjLT5zdGF0ZS0+ZW5hYmxlKQorCQlyZXR1cm47CisKKwlj cnRjLT5zdGF0ZS0+YWN0aXZlID0gZW5hYmxlOwogCWlmIChlbmFibGUpIHsKLQkJaWYgKCFpbnRl bF9jcnRjLT5hY3RpdmUpIHsKLQkJCWRvbWFpbnMgPSBnZXRfY3J0Y19wb3dlcl9kb21haW5zKGNy dGMpOwotCQkJZm9yX2VhY2hfcG93ZXJfZG9tYWluKGRvbWFpbiwgZG9tYWlucykKLQkJCQlpbnRl bF9kaXNwbGF5X3Bvd2VyX2dldChkZXZfcHJpdiwgZG9tYWluKTsKLQkJCWludGVsX2NydGMtPmVu YWJsZWRfcG93ZXJfZG9tYWlucyA9IGRvbWFpbnM7CisJCWRvbWFpbnMgPSBnZXRfY3J0Y19wb3dl cl9kb21haW5zKGNydGMpOworCQlmb3JfZWFjaF9wb3dlcl9kb21haW4oZG9tYWluLCBkb21haW5z KQorCQkJaW50ZWxfZGlzcGxheV9wb3dlcl9nZXQoZGV2X3ByaXYsIGRvbWFpbik7CisJCWludGVs X2NydGMtPmVuYWJsZWRfcG93ZXJfZG9tYWlucyA9IGRvbWFpbnM7CiAKLQkJCWRldl9wcml2LT5k aXNwbGF5LmNydGNfZW5hYmxlKGNydGMpOwotCQkJaW50ZWxfY3J0Y19lbmFibGVfcGxhbmVzKGNy dGMpOwotCQl9CisJCWRldl9wcml2LT5kaXNwbGF5LmNydGNfZW5hYmxlKGNydGMpOworCQlpbnRl bF9jcnRjX2VuYWJsZV9wbGFuZXMoY3J0Yyk7CiAJfSBlbHNlIHsKLQkJaWYgKGludGVsX2NydGMt PmFjdGl2ZSkgewotCQkJaW50ZWxfY3J0Y19kaXNhYmxlX3BsYW5lcyhjcnRjKTsKLQkJCWRldl9w cml2LT5kaXNwbGF5LmNydGNfZGlzYWJsZShjcnRjKTsKKwkJaW50ZWxfY3J0Y19kaXNhYmxlX3Bs YW5lcyhjcnRjKTsKKwkJZGV2X3ByaXYtPmRpc3BsYXkuY3J0Y19kaXNhYmxlKGNydGMpOwogCi0J CQlkb21haW5zID0gaW50ZWxfY3J0Yy0+ZW5hYmxlZF9wb3dlcl9kb21haW5zOwotCQkJZm9yX2Vh Y2hfcG93ZXJfZG9tYWluKGRvbWFpbiwgZG9tYWlucykKLQkJCQlpbnRlbF9kaXNwbGF5X3Bvd2Vy X3B1dChkZXZfcHJpdiwgZG9tYWluKTsKLQkJCWludGVsX2NydGMtPmVuYWJsZWRfcG93ZXJfZG9t YWlucyA9IDA7Ci0JCX0KKwkJZG9tYWlucyA9IGludGVsX2NydGMtPmVuYWJsZWRfcG93ZXJfZG9t YWluczsKKwkJZm9yX2VhY2hfcG93ZXJfZG9tYWluKGRvbWFpbiwgZG9tYWlucykKKwkJCWludGVs X2Rpc3BsYXlfcG93ZXJfcHV0KGRldl9wcml2LCBkb21haW4pOworCQlpbnRlbF9jcnRjLT5lbmFi bGVkX3Bvd2VyX2RvbWFpbnMgPSAwOwogCX0KIH0KIApAQCAtNjA3Miw4ICs2MDYxLDYgQEAgdm9p ZCBpbnRlbF9jcnRjX3VwZGF0ZV9kcG1zKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAkJZW5hYmxl IHw9IGludGVsX2VuY29kZXItPmNvbm5lY3RvcnNfYWN0aXZlOwogCiAJaW50ZWxfY3J0Y19jb250 cm9sKGNydGMsIGVuYWJsZSk7Ci0KLQljcnRjLT5zdGF0ZS0+YWN0aXZlID0gZW5hYmxlOwogfQog CiB2b2lkIGludGVsX2VuY29kZXJfZGVzdHJveShzdHJ1Y3QgZHJtX2VuY29kZXIgKmVuY29kZXIp CkBAIC0xNDU2NSw4ICsxNDU1Miw3IEBAIHN0YXRpYyB2b2lkIGludGVsX3Nhbml0aXplX2NydGMo c3RydWN0IGludGVsX2NydGMgKmNydGMpCiAJCXBsYW5lID0gY3J0Yy0+cGxhbmU7CiAJCXRvX2lu dGVsX3BsYW5lX3N0YXRlKGNydGMtPmJhc2UucHJpbWFyeS0+c3RhdGUpLT52aXNpYmxlID0gdHJ1 ZTsKIAkJY3J0Yy0+cGxhbmUgPSAhcGxhbmU7Ci0JCWludGVsX2NydGNfZGlzYWJsZV9wbGFuZXMo JmNydGMtPmJhc2UpOwotCQlkZXZfcHJpdi0+ZGlzcGxheS5jcnRjX2Rpc2FibGUoJmNydGMtPmJh c2UpOworCQlpbnRlbF9jcnRjX2NvbnRyb2woJmNydGMtPmJhc2UsIGZhbHNlKTsKIAkJY3J0Yy0+ cGxhbmUgPSBwbGFuZTsKIAogCQkvKiAuLi4gYW5kIGJyZWFrIGFsbCBsaW5rcy4gKi8KZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXggYzI0ZDY3MDUyOWUzLi4xNDY4NWFiZjFiM2QgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC05OTQsNyArOTk0LDYgQEAgdm9pZCBpbnRlbF9tYXJr X2lkbGUoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CiB2b2lkIGludGVsX2NydGNfcmVzdG9yZV9t b2RlKHN0cnVjdCBkcm1fY3J0YyAqY3J0Yyk7CiB2b2lkIGludGVsX2Rpc3BsYXlfc3VzcGVuZChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIHZvaWQgaW50ZWxfY3J0Y19jb250cm9sKHN0cnVjdCBk cm1fY3J0YyAqY3J0YywgYm9vbCBlbmFibGUpOwotdm9pZCBpbnRlbF9jcnRjX3Jlc2V0KHN0cnVj dCBpbnRlbF9jcnRjICpjcnRjKTsKIHZvaWQgaW50ZWxfY3J0Y191cGRhdGVfZHBtcyhzdHJ1Y3Qg ZHJtX2NydGMgKmNydGMpOwogdm9pZCBpbnRlbF9lbmNvZGVyX2Rlc3Ryb3koc3RydWN0IGRybV9l bmNvZGVyICplbmNvZGVyKTsKIGludCBpbnRlbF9jb25uZWN0b3JfaW5pdChzdHJ1Y3QgaW50ZWxf Y29ubmVjdG9yICopOwotLSAKMi4xLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGlu Zm8vaW50ZWwtZ2Z4Cg==