From: Matt Roper Subject: [PATCH 6/6] drm/i915: Replace intel_set_property() with transitional helper Date: Thu, 15 Jan 2015 18:34:24 -0800 Message-ID: <1421375664-30550-7-git-send-email-matthew.d.roper@intel.com> References: <1421375664-30550-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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 3C69F89A88 for ; Thu, 15 Jan 2015 18:35:03 -0800 (PST) In-Reply-To: <1421375664-30550-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 aW5kZXggN2RiMThkMTYuLmQzNGE4Y2EgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5 LmMKQEAgLTExNzc0LDYgKzExNzc0LDEwIEBAIGludGVsX2NoZWNrX3ByaW1hcnlfcGxhbmUoc3Ry dWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJY3J0YyA9IGNydGMgPyBjcnRjIDogcGxhbmUtPmNydGM7 CiAJaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CiAKKwkvKiBDUlRDIG1heSBiZSB1 bnNldCBpZiB3ZSdyZSB1cGRhdGluZyBhIHByb3BlcnR5IG9mIGEgZGlzYWJsZWQgcGxhbmUgKi8K KwlpZiAoIWNydGMpCisJCXJldHVybiAwOworCiAJcmV0ID0gZHJtX3BsYW5lX2hlbHBlcl9jaGVj a191cGRhdGUocGxhbmUsIGNydGMsIGZiLAogCQkJCQkgICAgc3JjLCBkZXN0LCBjbGlwLAogCQkJ CQkgICAgRFJNX1BMQU5FX0hFTFBFUl9OT19TQ0FMSU5HLApAQCAtMTE5NzMsNyArMTE5NzcsNyBA QCBjb25zdCBzdHJ1Y3QgZHJtX3BsYW5lX2Z1bmNzIGludGVsX3BsYW5lX2Z1bmNzID0gewogCS51 cGRhdGVfcGxhbmUgPSBkcm1fcGxhbmVfaGVscGVyX3VwZGF0ZSwKIAkuZGlzYWJsZV9wbGFuZSA9 IGRybV9wbGFuZV9oZWxwZXJfZGlzYWJsZSwKIAkuZGVzdHJveSA9IGludGVsX3BsYW5lX2Rlc3Ry b3ksCi0JLnNldF9wcm9wZXJ0eSA9IGludGVsX3BsYW5lX3NldF9wcm9wZXJ0eSwKKwkuc2V0X3By b3BlcnR5ID0gZHJtX3BsYW5lX2hlbHBlcl9zZXRfcHJvcGVydHksCiAJLmF0b21pY19nZXRfcHJv cGVydHkgPSBpbnRlbF9wbGFuZV9hdG9taWNfZ2V0X3Byb3BlcnR5LAogCS5hdG9taWNfc2V0X3By b3BlcnR5ID0gaW50ZWxfcGxhbmVfYXRvbWljX3NldF9wcm9wZXJ0eSwKIAkuYXRvbWljX2R1cGxp Y2F0ZV9zdGF0ZSA9IGludGVsX3BsYW5lX2R1cGxpY2F0ZV9zdGF0ZSwKQEAgLTEyMDU4LDYgKzEy MDYyLDEwIEBAIGludGVsX2NoZWNrX2N1cnNvcl9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFu ZSwKIAljcnRjID0gY3J0YyA/IGNydGMgOiBwbGFuZS0+Y3J0YzsKIAlpbnRlbF9jcnRjID0gdG9f aW50ZWxfY3J0YyhjcnRjKTsKIAorCS8qIENSVEMgbWF5IGJlIHVuc2V0IGlmIHdlJ3JlIHVwZGF0 aW5nIGEgcHJvcGVydHkgb2YgYSBkaXNhYmxlZCBwbGFuZSAqLworCWlmICghY3J0YykKKwkJcmV0 dXJuIDA7CisKIAlyZXQgPSBkcm1fcGxhbmVfaGVscGVyX2NoZWNrX3VwZGF0ZShwbGFuZSwgY3J0 YywgZmIsCiAJCQkJCSAgICBzcmMsIGRlc3QsIGNsaXAsCiAJCQkJCSAgICBEUk1fUExBTkVfSEVM UEVSX05PX1NDQUxJTkcsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k cnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IDk3YzNhY2UuLjJk OWU5YTQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC0xMjQ2LDkgKzEyNDYsNiBAQCBi b29sIGludGVsX3Nkdm9faW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1aW50MzJfdCBzZHZv X3JlZywgYm9vbCBpc19zZHZvYik7CiBpbnQgaW50ZWxfcGxhbmVfaW5pdChzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2LCBlbnVtIHBpcGUgcGlwZSwgaW50IHBsYW5lKTsKIHZvaWQgaW50ZWxfZmx1c2hf cHJpbWFyeV9wbGFuZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCQkgICAg ICAgZW51bSBwbGFuZSBwbGFuZSk7Ci1pbnQgaW50ZWxfcGxhbmVfc2V0X3Byb3BlcnR5KHN0cnVj dCBkcm1fcGxhbmUgKnBsYW5lLAotCQkJICAgICBzdHJ1Y3QgZHJtX3Byb3BlcnR5ICpwcm9wLAot CQkJICAgICB1aW50NjRfdCB2YWwpOwogaW50IGludGVsX3BsYW5lX3Jlc3RvcmUoc3RydWN0IGRy bV9wbGFuZSAqcGxhbmUpOwogaW50IGludGVsX3Nwcml0ZV9zZXRfY29sb3JrZXkoc3RydWN0IGRy bV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIAkJCSAgICAgIHN0cnVjdCBkcm1fZmlsZSAqZmls ZV9wcml2KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKaW5kZXggOGFmNGM2OS4uYzYy ZjI2MyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKQEAgLTEwOTQsNiArMTA5NCwx MCBAQCBpbnRlbF9jaGVja19zcHJpdGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAK IAlpbnRlbF9jcnRjID0gaW50ZWxfY3J0YyA/IGludGVsX2NydGMgOiB0b19pbnRlbF9jcnRjKHBs YW5lLT5jcnRjKTsKIAorCS8qIENSVEMgbWF5IGJlIHVuc2V0IGlmIHdlJ3JlIHVwZGF0aW5nIGEg cHJvcGVydHkgb2YgYSBkaXNhYmxlZCBwbGFuZSAqLworCWlmICghaW50ZWxfY3J0YykKKwkJcmV0 dXJuIDA7CisKIAlpZiAoIWZiKSB7CiAJCXN0YXRlLT52aXNpYmxlID0gZmFsc2U7CiAJCWdvdG8g ZmluaXNoOwpAQCAtMTM2NywzMyArMTM3MSw2IEBAIG91dF91bmxvY2s6CiAJcmV0dXJuIHJldDsK IH0KIAotaW50IGludGVsX3BsYW5lX3NldF9wcm9wZXJ0eShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFu ZSwKLQkJCSAgICAgc3RydWN0IGRybV9wcm9wZXJ0eSAqcHJvcCwKLQkJCSAgICAgdWludDY0X3Qg dmFsKQotewotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBwbGFuZS0+ZGV2OwotCXN0cnVjdCBp bnRlbF9wbGFuZV9zdGF0ZSAqc3RhdGUgPSB0b19pbnRlbF9wbGFuZV9zdGF0ZShwbGFuZS0+c3Rh dGUpOwotCXVpbnQ2NF90IG9sZF92YWw7Ci0JaW50IHJldCA9IC1FTk9FTlQ7Ci0KLQlpZiAocHJv cCA9PSBkZXYtPm1vZGVfY29uZmlnLnJvdGF0aW9uX3Byb3BlcnR5KSB7Ci0JCS8qIGV4YWN0bHkg b25lIHJvdGF0aW9uIGFuZ2xlIHBsZWFzZSAqLwotCQlpZiAoaHdlaWdodDMyKHZhbCAmIDB4Zikg IT0gMSkKLQkJCXJldHVybiAtRUlOVkFMOwotCi0JCWlmIChzdGF0ZS0+cm90YXRpb24gPT0gdmFs KQotCQkJcmV0dXJuIDA7Ci0KLQkJb2xkX3ZhbCA9IHN0YXRlLT5yb3RhdGlvbjsKLQkJc3RhdGUt PnJvdGF0aW9uID0gdmFsOwotCQlyZXQgPSBpbnRlbF9wbGFuZV9yZXN0b3JlKHBsYW5lKTsKLQkJ aWYgKHJldCkKLQkJCXN0YXRlLT5yb3RhdGlvbiA9IG9sZF92YWw7Ci0JfQotCi0JcmV0dXJuIHJl dDsKLX0KLQogaW50IGludGVsX3BsYW5lX3Jlc3RvcmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUp CiB7CiAJaWYgKCFwbGFuZS0+Y3J0YyB8fCAhcGxhbmUtPmZiKQotLSAKMS44LjUuMQoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxp bmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK