From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Gordon Subject: [PATCH v5 08/11] drm/i915: two small moves towards more consistency Date: Fri, 5 Feb 2016 18:33:45 +0000 Message-ID: <1454697228-33164-9-git-send-email-david.s.gordon@intel.com> References: <1454697228-33164-1-git-send-email-david.s.gordon@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 BA8CF6EA54 for ; Fri, 5 Feb 2016 10:34:10 -0800 (PST) In-Reply-To: <1454697228-33164-1-git-send-email-david.s.gordon@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 RnJvbTogTmljayBIb2F0aCA8bmljaG9sYXMuaG9hdGhAaW50ZWwuY29tPgoKUmVuYW1lIGk5MTVf Z2VtX2NsZWFudXBfcmluZ2J1ZmZlcigpIHRvIGk5MTVfZ2VtX2NsZWFudXBfZW5naW5lcygpLAp0 byByZWxlY3Qgd2hhdCBpdCBhY3R1YWxseSBkb2VzIChjbGVhbiB1cCBhbGwgdGhlIGVuZ2luZXMs IG5vdCBhCnNpbmdsZSByaW5nYnVmZmVyKS4gVGhlIG5hbWUgaXMgcHJvYmFibHkgYSBsZWdhY3kg ZnJvbSB0aGUgZGF5cwp3aGVuIHRoZXJlIHdhcyBvbmx5IG9uZSAicmluZyIgKGkuZS4gZW5naW5l KSBhbmQgb25lIHJpbmdidWZmZXIhCgpXaGlsZSB3ZSdyZSBsb29raW5nIGF0IHRoaXMgZnVuY3Rp b24sIHRoZXJlJ3MgYSBzdHJhbmdlbHktZm9ybWF0dGVkCmNvbW1lbnQgYmxvY2sgdGhhdCBsb29r cyB1Z2x5LCBzbyBsZXQncyBwcmV0dGlmeSBpdC4KClNpZ25lZC1vZmYtYnk6IE5pY2sgSG9hdGgg PG5pY2hvbGFzLmhvYXRoQGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogRGF2aWQgR29yZG9uIDxk YXZpZC5zLmdvcmRvbkBpbnRlbC5jb20+CkNjOiBNaWthIEt1b3BwYWxhIDxtaWthLmt1b3BwYWxh QGxpbnV4LmludGVsLmNvbT4KQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNv LnVrPgpTaWduZWQtb2ZmLWJ5OiBEYXZlIEdvcmRvbiA8ZGF2aWQucy5nb3Jkb25AaW50ZWwuY29t PgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZG1hLmMgfCAgNCArKy0tCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtLmMgfCAyMyArKysrKysrKysrKystLS0tLS0tLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCAx NSBpbnNlcnRpb25zKCspLCAxNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2RtYS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kbWEuYwpp bmRleCBhNDJlYjU4Li41ZDk1YzgwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2RtYS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZG1hLmMKQEAgLTQ0NCw3 ICs0NDQsNyBAQCBzdGF0aWMgaW50IGk5MTVfbG9hZF9tb2Rlc2V0X2luaXQoc3RydWN0IGRybV9k ZXZpY2UgKmRldikKIAogY2xlYW51cF9nZW06CiAJbXV0ZXhfbG9jaygmZGV2LT5zdHJ1Y3RfbXV0 ZXgpOwotCWk5MTVfZ2VtX2NsZWFudXBfcmluZ2J1ZmZlcihkZXYpOworCWk5MTVfZ2VtX2NsZWFu dXBfZW5naW5lcyhkZXYpOwogCWk5MTVfZ2VtX2NvbnRleHRfZmluaShkZXYpOwogCW11dGV4X3Vu bG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwogY2xlYW51cF9pcnE6CkBAIC0xMjUzLDcgKzEyNTMs NyBAQCBpbnQgaTkxNV9kcml2ZXJfdW5sb2FkKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAKIAlp bnRlbF9ndWNfdWNvZGVfZmluaShkZXYpOwogCW11dGV4X2xvY2soJmRldi0+c3RydWN0X211dGV4 KTsKLQlpOTE1X2dlbV9jbGVhbnVwX3JpbmdidWZmZXIoZGV2KTsKKwlpOTE1X2dlbV9jbGVhbnVw X2VuZ2luZXMoZGV2KTsKIAlpOTE1X2dlbV9jb250ZXh0X2ZpbmkoZGV2KTsKIAltdXRleF91bmxv Y2soJmRldi0+c3RydWN0X211dGV4KTsKIAlpbnRlbF9mYmNfY2xlYW51cF9jZmIoZGV2X3ByaXYp OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggODIxNjY2NS4uZTExZWVmMSAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2Rydi5oCkBAIC0zMDU4LDcgKzMwNTgsNyBAQCBpbnQgaTkxNV9nZW1faW5pdF9y aW5ncyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIGludCBfX211c3RfY2hlY2sgaTkxNV9nZW1f aW5pdF9odyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIGludCBpOTE1X2dlbV9sM19yZW1hcChz dHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwgaW50IHNsaWNlKTsKIHZvaWQgaTkxNV9n ZW1faW5pdF9zd2l6emxpbmcoc3RydWN0IGRybV9kZXZpY2UgKmRldik7Ci12b2lkIGk5MTVfZ2Vt X2NsZWFudXBfcmluZ2J1ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKK3ZvaWQgaTkxNV9n ZW1fY2xlYW51cF9lbmdpbmVzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogaW50IF9fbXVzdF9j aGVjayBpOTE1X2dwdV9pZGxlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogaW50IF9fbXVzdF9j aGVjayBpOTE1X2dlbV9zdXNwZW5kKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogdm9pZCBfX2k5 MTVfYWRkX3JlcXVlc3Qoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW0uYwppbmRleCAyYmQ1YjVmLi5jODUwMjliIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtLmMKQEAgLTQ5MTMsNyArNDkxMyw3IEBAIGludCBpOTE1X2dlbV9pbml0X3JpbmdzKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYpCiAJCXJlcSA9IGk5MTVfZ2VtX3JlcXVlc3RfYWxsb2MocmluZywg TlVMTCk7CiAJCWlmIChJU19FUlIocmVxKSkgewogCQkJcmV0ID0gUFRSX0VSUihyZXEpOwotCQkJ aTkxNV9nZW1fY2xlYW51cF9yaW5nYnVmZmVyKGRldik7CisJCQlpOTE1X2dlbV9jbGVhbnVwX2Vu Z2luZXMoZGV2KTsKIAkJCWdvdG8gb3V0OwogCQl9CiAKQEAgLTQ5MjYsNyArNDkyNiw3IEBAIGlu dCBpOTE1X2dlbV9pbml0X3JpbmdzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCWlmIChyZXQg JiYgcmV0ICE9IC1FSU8pIHsKIAkJCURSTV9FUlJPUigiUFBHVFQgZW5hYmxlIHJpbmcgIyVkIGZh aWxlZCAlZFxuIiwgaSwgcmV0KTsKIAkJCWk5MTVfZ2VtX3JlcXVlc3RfY2FuY2VsKHJlcSk7Ci0J CQlpOTE1X2dlbV9jbGVhbnVwX3JpbmdidWZmZXIoZGV2KTsKKwkJCWk5MTVfZ2VtX2NsZWFudXBf ZW5naW5lcyhkZXYpOwogCQkJZ290byBvdXQ7CiAJCX0KIApAQCAtNDkzNCw3ICs0OTM0LDcgQEAg aW50IGk5MTVfZ2VtX2luaXRfcmluZ3Moc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJaWYgKHJl dCAmJiByZXQgIT0gLUVJTykgewogCQkJRFJNX0VSUk9SKCJDb250ZXh0IGVuYWJsZSByaW5nICMl ZCBmYWlsZWQgJWRcbiIsIGksIHJldCk7CiAJCQlpOTE1X2dlbV9yZXF1ZXN0X2NhbmNlbChyZXEp OwotCQkJaTkxNV9nZW1fY2xlYW51cF9yaW5nYnVmZmVyKGRldik7CisJCQlpOTE1X2dlbV9jbGVh bnVwX2VuZ2luZXMoZGV2KTsKIAkJCWdvdG8gb3V0OwogCQl9CiAKQEAgLTUwMTIsNyArNTAxMiw3 IEBAIGludCBpOTE1X2dlbV9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB9CiAKIHZvaWQK LWk5MTVfZ2VtX2NsZWFudXBfcmluZ2J1ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQoraTkx NV9nZW1fY2xlYW51cF9lbmdpbmVzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7CiAJc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3Qg aW50ZWxfZW5naW5lX2NzICpyaW5nOwpAQCAtNTAyMSwxMyArNTAyMSwxNCBAQCBpbnQgaTkxNV9n ZW1faW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWZvcl9lYWNoX3JpbmcocmluZywgZGV2 X3ByaXYsIGkpCiAJCWRldl9wcml2LT5ndC5jbGVhbnVwX3JpbmcocmluZyk7CiAKLSAgICBpZiAo aTkxNS5lbmFibGVfZXhlY2xpc3RzKQotICAgICAgICAgICAgLyoKLSAgICAgICAgICAgICAqIE5l aXRoZXIgdGhlIEJJT1MsIG91cnNlbHZlcyBvciBhbnkgb3RoZXIga2VybmVsCi0gICAgICAgICAg ICAgKiBleHBlY3RzIHRoZSBzeXN0ZW0gdG8gYmUgaW4gZXhlY2xpc3RzIG1vZGUgb24gc3RhcnR1 cCwKLSAgICAgICAgICAgICAqIHNvIHdlIG5lZWQgdG8gcmVzZXQgdGhlIEdQVSBiYWNrIHRvIGxl Z2FjeSBtb2RlLgotICAgICAgICAgICAgICovCi0gICAgICAgICAgICBpbnRlbF9ncHVfcmVzZXQo ZGV2KTsKKwlpZiAoaTkxNS5lbmFibGVfZXhlY2xpc3RzKSB7CisJCS8qCisJCSAqIE5laXRoZXIg dGhlIEJJT1MsIG91cnNlbHZlcyBvciBhbnkgb3RoZXIga2VybmVsCisJCSAqIGV4cGVjdHMgdGhl IHN5c3RlbSB0byBiZSBpbiBleGVjbGlzdHMgbW9kZSBvbiBzdGFydHVwLAorCQkgKiBzbyB3ZSBu ZWVkIHRvIHJlc2V0IHRoZSBHUFUgYmFjayB0byBsZWdhY3kgbW9kZS4KKwkJICovCisJCWludGVs X2dwdV9yZXNldChkZXYpOworCX0KIH0KIAogc3RhdGljIHZvaWQKLS0gCjEuOS4xCgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGlu ZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=