From: Matt Roper Subject: [PATCH 07/13] drm/i915: Replace intel_set_property() with transitional helper Date: Mon, 19 Jan 2015 19:57:40 -0800 Message-ID: <1421726266-31941-8-git-send-email-matthew.d.roper@intel.com> References: <1421726266-31941-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 mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 95E756E59E for ; Mon, 19 Jan 2015 19:58:34 -0800 (PST) In-Reply-To: <1421726266-31941-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 List-Id: intel-gfx@lists.freedesktop.org VGhpcyBzd2l0Y2ggYWxsb3dzIHVzIHRvIGV4ZXJjaXNlIHRoZSAuYXRvbWljX3NldF9wcm9wZXJ0 eSgpIHRoYXQgd2lsbApiZSB1c2VkIGJ5IGF0b21pYy4gIFRoZSBvbmx5IHJlYWwgY2hhbmdlcyB3 ZSBuZWVkIHRvIG1ha2UgaGVyZSBhcmU6CiAqIGV4dHJhY3QgdGhlIHByb3BlcnR5IHZhbGlkYXRp b24gZnJvbSBvdXIgb2xkIHNldF9wcm9wZXJ0eSBoYW5kbGVyIGFuZAogICBzdGljayBpdCBpbiBp bnRlbF9wbGFuZV9hdG9taWNfY2hlY2soKS4KICogbWFrZSBpbnRlbF9jaGVja18qX3BsYW5lKCkg ZnVuY3Rpb25zIGNhcGFibGUgb2YgaGFuZGxpbmcgYSBOVUxMIGNydGMKICAgKHdoaWNoIHdpbGwg aGFwcGVuIGlmIHVzZXJzcGFjZSB0cmllcyB0byBzZXQgYSBwcm9wZXJ0eSB2YWx1ZSBvbiBhCiAg IGRpc2FibGVkIHBsYW5lKS4KClNpZ25lZC1vZmYtYnk6IE1hdHQgUm9wZXIgPG1hdHRoZXcuZC5y b3BlckBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljX3Bs YW5lLmMgfCAyNCArKysrKysrKysrKysrKysrKysrLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rpc3BsYXkuYyAgICAgIHwgMTAgKysrKysrKysrLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZHJ2LmggICAgICAgICAgfCAgMyAtLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3Nwcml0ZS5jICAgICAgIHwgMzEgKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQog NCBmaWxlcyBjaGFuZ2VkLCAzMiBpbnNlcnRpb25zKCspLCAzNiBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWNfcGxhbmUuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2F0b21pY19wbGFuZS5jCmluZGV4IDBiMDdiOTAuLjk2NmM5 MDggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F0b21pY19wbGFuZS5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F0b21pY19wbGFuZS5jCkBAIC0xMDQs MTMgKzEwNCwyMCBAQCBzdGF0aWMgaW50IGludGVsX3BsYW5lX2F0b21pY19jaGVjayhzdHJ1Y3Qg ZHJtX3BsYW5lICpwbGFuZSwKIAlpbnRlbF9zdGF0ZS0+ZHN0LngyID0gc3RhdGUtPmNydGNfeCAr IHN0YXRlLT5jcnRjX3c7CiAJaW50ZWxfc3RhdGUtPmRzdC55MiA9IHN0YXRlLT5jcnRjX3kgKyBz dGF0ZS0+Y3J0Y19oOwogCi0JLyogQ2xpcCBhbGwgcGxhbmVzIHRvIENSVEMgc2l6ZSwgb3IgMHgw IGlmIENSVEMgaXMgZGlzYWJsZWQgKi8KKwkvKgorCSAqIENsaXAgYWxsIHBsYW5lcyB0byBDUlRD IHNpemUsIG9yIDB4MCBpZiBDUlRDIHVuc2V0IG9yIGRpc2FibGVkLgorCSAqIE5vdGUgdGhhdCBD UlRDIG1heSBiZSB1bnNldCBpZiB3ZSdyZSBzZXR0aW5nIGEgcHJvcGVydHkgb2YgYQorCSAqIGRp c2FibGVkIHBsYW5lLgorCSAqLwogCWludGVsX3N0YXRlLT5jbGlwLngxID0gMDsKIAlpbnRlbF9z dGF0ZS0+Y2xpcC55MSA9IDA7Ci0JaW50ZWxfc3RhdGUtPmNsaXAueDIgPQotCQlpbnRlbF9jcnRj LT5hY3RpdmUgPyBpbnRlbF9jcnRjLT5jb25maWctPnBpcGVfc3JjX3cgOiAwOwotCWludGVsX3N0 YXRlLT5jbGlwLnkyID0KLQkJaW50ZWxfY3J0Yy0+YWN0aXZlID8gaW50ZWxfY3J0Yy0+Y29uZmln LT5waXBlX3NyY19oIDogMDsKKwlpZiAoY3J0YyAmJiBpbnRlbF9jcnRjLT5hY3RpdmUpIHsKKwkJ aW50ZWxfc3RhdGUtPmNsaXAueDIgPSBpbnRlbF9jcnRjLT5jb25maWctPnBpcGVfc3JjX3c7CisJ CWludGVsX3N0YXRlLT5jbGlwLnkyID0gaW50ZWxfY3J0Yy0+Y29uZmlnLT5waXBlX3NyY19oOwor CX0gZWxzZSB7CisJCWludGVsX3N0YXRlLT5jbGlwLngyID0gMDsKKwkJaW50ZWxfc3RhdGUtPmNs aXAueTIgPSAwOworCX0KIAogCS8qCiAJICogRGlzYWJsaW5nIGEgcGxhbmUgaXMgYWx3YXlzIG9r YXk7IHdlIGp1c3QgbmVlZCB0byB1cGRhdGUKQEAgLTExOCw2ICsxMjUsOSBAQCBzdGF0aWMgaW50 IGludGVsX3BsYW5lX2F0b21pY19jaGVjayhzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAkgKiBn ZXQgY2FsbGVkIGJ5IHRoZSBwbGFuZSBoZWxwZXJzLgogCSAqLwogCWlmIChzdGF0ZS0+ZmIgPT0g TlVMTCAmJiBwbGFuZS0+c3RhdGUtPmZiICE9IE5VTEwpIHsKKwkJaWYgKFdBUk5fT04oIWNydGMp KQorCQkJcmV0dXJuIC1FSU5WQUw7CisKIAkJLyoKIAkJICogJ3ByZXBhcmUnIGlzIG5ldmVyIGNh bGxlZCB3aGVuIHBsYW5lIGlzIGJlaW5nIGRpc2FibGVkLCBzbwogCQkgKiB3ZSBuZWVkIHRvIGhh bmRsZSBmcm9udGJ1ZmZlciB0cmFja2luZyBhcyBhIHNwZWNpYWwgY2FzZQpAQCAtMTI2LDYgKzEz NiwxMCBAQCBzdGF0aWMgaW50IGludGVsX3BsYW5lX2F0b21pY19jaGVjayhzdHJ1Y3QgZHJtX3Bs YW5lICpwbGFuZSwKIAkJCSgxIDw8IGRybV9wbGFuZV9pbmRleChwbGFuZSkpOwogCX0KIAorCS8q IFJvdGF0aW9uIHByb3BlcnR5IHNob3VsZCBjb250YWluIG9ubHkgYSBzaW5nbGUgcm90YXRpb24g Yml0ICovCisJaWYgKGh3ZWlnaHQzMihpbnRlbF9zdGF0ZS0+cm90YXRpb24gJiAweGYpICE9IDEp CisJCXJldHVybiAtRUlOVkFMOworCiAJcmV0dXJuIGludGVsX3BsYW5lLT5jaGVja19wbGFuZShw bGFuZSwgaW50ZWxfc3RhdGUpOwogfQogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMK aW5kZXggOTAwMDhiOC4uNTBhZTNiMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku YwpAQCAtMTE3NzQsNiArMTE3NzQsMTAgQEAgaW50ZWxfY2hlY2tfcHJpbWFyeV9wbGFuZShzdHJ1 Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAljcnRjID0gY3J0YyA/IGNydGMgOiBwbGFuZS0+Y3J0YzsK IAlpbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKIAorCS8qIENSVEMgbWF5IGJlIHVu c2V0IGlmIHdlJ3JlIHVwZGF0aW5nIGEgcHJvcGVydHkgb2YgYSBkaXNhYmxlZCBwbGFuZSAqLwor CWlmICghY3J0YykKKwkJcmV0dXJuIDA7CisKIAlyZXQgPSBkcm1fcGxhbmVfaGVscGVyX2NoZWNr X3VwZGF0ZShwbGFuZSwgY3J0YywgZmIsCiAJCQkJCSAgICBzcmMsIGRlc3QsIGNsaXAsCiAJCQkJ CSAgICBEUk1fUExBTkVfSEVMUEVSX05PX1NDQUxJTkcsCkBAIC0xMTk3Miw3ICsxMTk3Niw3IEBA IGNvbnN0IHN0cnVjdCBkcm1fcGxhbmVfZnVuY3MgaW50ZWxfcGxhbmVfZnVuY3MgPSB7CiAJLnVw ZGF0ZV9wbGFuZSA9IGRybV9wbGFuZV9oZWxwZXJfdXBkYXRlLAogCS5kaXNhYmxlX3BsYW5lID0g ZHJtX3BsYW5lX2hlbHBlcl9kaXNhYmxlLAogCS5kZXN0cm95ID0gaW50ZWxfcGxhbmVfZGVzdHJv eSwKLQkuc2V0X3Byb3BlcnR5ID0gaW50ZWxfcGxhbmVfc2V0X3Byb3BlcnR5LAorCS5zZXRfcHJv cGVydHkgPSBkcm1fcGxhbmVfaGVscGVyX3NldF9wcm9wZXJ0eSwKIAkuYXRvbWljX2dldF9wcm9w ZXJ0eSA9IGludGVsX3BsYW5lX2F0b21pY19nZXRfcHJvcGVydHksCiAJLmF0b21pY19zZXRfcHJv cGVydHkgPSBpbnRlbF9wbGFuZV9hdG9taWNfc2V0X3Byb3BlcnR5LAogCS5hdG9taWNfZHVwbGlj YXRlX3N0YXRlID0gaW50ZWxfcGxhbmVfZHVwbGljYXRlX3N0YXRlLApAQCAtMTIwNTcsNiArMTIw NjEsMTAgQEAgaW50ZWxfY2hlY2tfY3Vyc29yX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5l LAogCWNydGMgPSBjcnRjID8gY3J0YyA6IHBsYW5lLT5jcnRjOwogCWludGVsX2NydGMgPSB0b19p bnRlbF9jcnRjKGNydGMpOwogCisJLyogQ1JUQyBtYXkgYmUgdW5zZXQgaWYgd2UncmUgdXBkYXRp bmcgYSBwcm9wZXJ0eSBvZiBhIGRpc2FibGVkIHBsYW5lICovCisJaWYgKCFjcnRjKQorCQlyZXR1 cm4gMDsKKwogCXJldCA9IGRybV9wbGFuZV9oZWxwZXJfY2hlY2tfdXBkYXRlKHBsYW5lLCBjcnRj LCBmYiwKIAkJCQkJICAgIHNyYywgZGVzdCwgY2xpcCwKIAkJCQkJICAgIERSTV9QTEFORV9IRUxQ RVJfTk9fU0NBTElORywKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Ry di5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXggOTdjM2FjZS4uMmQ5 ZTlhNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTEyNDYsOSArMTI0Niw2IEBAIGJv b2wgaW50ZWxfc2R2b19pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHVpbnQzMl90IHNkdm9f cmVnLCBib29sIGlzX3Nkdm9iKTsKIGludCBpbnRlbF9wbGFuZV9pbml0KHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYsIGVudW0gcGlwZSBwaXBlLCBpbnQgcGxhbmUpOwogdm9pZCBpbnRlbF9mbHVzaF9w cmltYXJ5X3BsYW5lKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCSAgICAg ICBlbnVtIHBsYW5lIHBsYW5lKTsKLWludCBpbnRlbF9wbGFuZV9zZXRfcHJvcGVydHkoc3RydWN0 IGRybV9wbGFuZSAqcGxhbmUsCi0JCQkgICAgIHN0cnVjdCBkcm1fcHJvcGVydHkgKnByb3AsCi0J CQkgICAgIHVpbnQ2NF90IHZhbCk7CiBpbnQgaW50ZWxfcGxhbmVfcmVzdG9yZShzdHJ1Y3QgZHJt X3BsYW5lICpwbGFuZSk7CiBpbnQgaW50ZWxfc3ByaXRlX3NldF9jb2xvcmtleShzdHJ1Y3QgZHJt X2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAogCQkJICAgICAgc3RydWN0IGRybV9maWxlICpmaWxl X3ByaXYpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwppbmRleCA4YWY0YzY5Li5jNjJm MjYzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwpAQCAtMTA5NCw2ICsxMDk0LDEw IEBAIGludGVsX2NoZWNrX3Nwcml0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAog CWludGVsX2NydGMgPSBpbnRlbF9jcnRjID8gaW50ZWxfY3J0YyA6IHRvX2ludGVsX2NydGMocGxh bmUtPmNydGMpOwogCisJLyogQ1JUQyBtYXkgYmUgdW5zZXQgaWYgd2UncmUgdXBkYXRpbmcgYSBw cm9wZXJ0eSBvZiBhIGRpc2FibGVkIHBsYW5lICovCisJaWYgKCFpbnRlbF9jcnRjKQorCQlyZXR1 cm4gMDsKKwogCWlmICghZmIpIHsKIAkJc3RhdGUtPnZpc2libGUgPSBmYWxzZTsKIAkJZ290byBm aW5pc2g7CkBAIC0xMzY3LDMzICsxMzcxLDYgQEAgb3V0X3VubG9jazoKIAlyZXR1cm4gcmV0Owog fQogCi1pbnQgaW50ZWxfcGxhbmVfc2V0X3Byb3BlcnR5KHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5l LAotCQkJICAgICBzdHJ1Y3QgZHJtX3Byb3BlcnR5ICpwcm9wLAotCQkJICAgICB1aW50NjRfdCB2 YWwpCi17Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHBsYW5lLT5kZXY7Ci0Jc3RydWN0IGlu dGVsX3BsYW5lX3N0YXRlICpzdGF0ZSA9IHRvX2ludGVsX3BsYW5lX3N0YXRlKHBsYW5lLT5zdGF0 ZSk7Ci0JdWludDY0X3Qgb2xkX3ZhbDsKLQlpbnQgcmV0ID0gLUVOT0VOVDsKLQotCWlmIChwcm9w ID09IGRldi0+bW9kZV9jb25maWcucm90YXRpb25fcHJvcGVydHkpIHsKLQkJLyogZXhhY3RseSBv bmUgcm90YXRpb24gYW5nbGUgcGxlYXNlICovCi0JCWlmIChod2VpZ2h0MzIodmFsICYgMHhmKSAh PSAxKQotCQkJcmV0dXJuIC1FSU5WQUw7Ci0KLQkJaWYgKHN0YXRlLT5yb3RhdGlvbiA9PSB2YWwp Ci0JCQlyZXR1cm4gMDsKLQotCQlvbGRfdmFsID0gc3RhdGUtPnJvdGF0aW9uOwotCQlzdGF0ZS0+ cm90YXRpb24gPSB2YWw7Ci0JCXJldCA9IGludGVsX3BsYW5lX3Jlc3RvcmUocGxhbmUpOwotCQlp ZiAocmV0KQotCQkJc3RhdGUtPnJvdGF0aW9uID0gb2xkX3ZhbDsKLQl9Ci0KLQlyZXR1cm4gcmV0 OwotfQotCiBpbnQgaW50ZWxfcGxhbmVfcmVzdG9yZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSkK IHsKIAlpZiAoIXBsYW5lLT5jcnRjIHx8ICFwbGFuZS0+ZmIpCi0tIAoxLjguNS4xCgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGlu ZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=