From: Dave Gordon Subject: [PATCH 2/2] drm/i915/guc: prefer 'dev_priv' to 'dev' for intra-module functions Date: Fri, 10 Jun 2016 18:29:26 +0100 Message-ID: <1465579766-31595-2-git-send-email-david.s.gordon@intel.com> References: <1465579766-31595-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 3593A6E16D for ; Fri, 10 Jun 2016 17:29:31 +0000 (UTC) In-Reply-To: <1465579766-31595-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 VGhlcmUgYXJlIGZvdXIgbm9uLXN0YXRpYyBmdW5jdGlvbnMgaW4gaTkxNV9ndWNfc3VibWlzc2lv bi5jIHRoYXQgdGFrZSBhCidkZXYnIHBhcmFtZXRlci4gQWxsIGFyZSBjYWxsZWQgb25seSBmcm9t IEd1QyBsb2FkZXIgY29kZSwgYW5kIGNhbiBiZQplYXNpbHkgY29udmVydGVkIHRvIGFjY2VwdCAn ZGV2X3ByaXYnIGluc3RlYWQuCgpTaWduZWQtb2ZmLWJ5OiBEYXZlIEdvcmRvbiA8ZGF2aWQucy5n b3Jkb25AaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1p c3Npb24uYyB8IDE0ICsrKysrLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9n dWMuaCAgICAgICAgICAgfCAgOCArKysrLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf Z3VjX2xvYWRlci5jICAgIHwgMTIgKysrKysrLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDE1IGlu c2VydGlvbnMoKyksIDE5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z3VjX3N1Ym1pc3Npb24uYwppbmRleCAxYmQwZmFjLi42NWU2N2YwIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCkBAIC05MDYsOSArOTA2LDggQEAgc3RhdGlj IHZvaWQgZ3VjX2NyZWF0ZV9hZHMoc3RydWN0IGludGVsX2d1YyAqZ3VjKQogICogU2V0IHVwIHRo ZSBtZW1vcnkgcmVzb3VyY2VzIHRvIGJlIHNoYXJlZCB3aXRoIHRoZSBHdUMuICBBdCB0aGlzIHBv aW50LAogICogd2UgcmVxdWlyZSBqdXN0IG9uZSBvYmplY3QgdGhhdCBjYW4gYmUgbWFwcGVkIHRo cm91Z2ggdGhlIEdHVFQuCiAgKi8KLWludCBpOTE1X2d1Y19zdWJtaXNzaW9uX2luaXQoc3RydWN0 IGRybV9kZXZpY2UgKmRldikKK2ludCBpOTE1X2d1Y19zdWJtaXNzaW9uX2luaXQoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJY29uc3Qgc2l6ZV90IGN0eHNpemUgPSBzaXpl b2Yoc3RydWN0IGd1Y19jb250ZXh0X2Rlc2MpOwogCWNvbnN0IHNpemVfdCBwb29sc2l6ZSA9IEdV Q19NQVhfR1BVX0NPTlRFWFRTICogY3R4c2l6ZTsKIAljb25zdCBzaXplX3QgZ2Vtc2l6ZSA9IHJv dW5kX3VwKHBvb2xzaXplLCBQQUdFX1NJWkUpOwpAQCAtOTE2LDcgKzkxNSw3IEBAIGludCBpOTE1 X2d1Y19zdWJtaXNzaW9uX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAogCS8qIFdpcGUg Yml0bWFwICYgZGVsZXRlIGNsaWVudCBpbiBjYXNlIG9mIHJlaW5pdGlhbGlzYXRpb24gKi8KIAli aXRtYXBfY2xlYXIoZ3VjLT5kb29yYmVsbF9iaXRtYXAsIDAsIEdVQ19NQVhfRE9PUkJFTExTKTsK LQlpOTE1X2d1Y19zdWJtaXNzaW9uX2Rpc2FibGUoZGV2KTsKKwlpOTE1X2d1Y19zdWJtaXNzaW9u X2Rpc2FibGUoZGV2X3ByaXYpOwogCiAJaWYgKCFpOTE1LmVuYWJsZV9ndWNfc3VibWlzc2lvbikK IAkJcmV0dXJuIDA7IC8qIG5vdCBlbmFibGVkICAqLwpAQCAtOTM1LDkgKzkzNCw4IEBAIGludCBp OTE1X2d1Y19zdWJtaXNzaW9uX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlyZXR1cm4g MDsKIH0KIAotaW50IGk5MTVfZ3VjX3N1Ym1pc3Npb25fZW5hYmxlKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYpCitpbnQgaTkxNV9ndWNfc3VibWlzc2lvbl9lbmFibGUoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2KQogewotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9 IGRldi0+ZGV2X3ByaXZhdGU7CiAJc3RydWN0IGludGVsX2d1YyAqZ3VjID0gJmRldl9wcml2LT5n dWM7CiAJc3RydWN0IGk5MTVfZ3VjX2NsaWVudCAqY2xpZW50OwogCkBAIC05NTcsMTggKzk1NSwx NiBAQCBpbnQgaTkxNV9ndWNfc3VibWlzc2lvbl9lbmFibGUoc3RydWN0IGRybV9kZXZpY2UgKmRl dikKIAlyZXR1cm4gMDsKIH0KIAotdm9pZCBpOTE1X2d1Y19zdWJtaXNzaW9uX2Rpc2FibGUoc3Ry dWN0IGRybV9kZXZpY2UgKmRldikKK3ZvaWQgaTkxNV9ndWNfc3VibWlzc2lvbl9kaXNhYmxlKHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBpbnRlbF9ndWMgKmd1 YyA9ICZkZXZfcHJpdi0+Z3VjOwogCiAJZ3VjX2NsaWVudF9mcmVlKGRldl9wcml2LCBndWMtPmV4 ZWNidWZfY2xpZW50KTsKIAlndWMtPmV4ZWNidWZfY2xpZW50ID0gTlVMTDsKIH0KIAotdm9pZCBp OTE1X2d1Y19zdWJtaXNzaW9uX2Zpbmkoc3RydWN0IGRybV9kZXZpY2UgKmRldikKK3ZvaWQgaTkx NV9ndWNfc3VibWlzc2lvbl9maW5pKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikK IHsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRl OwogCXN0cnVjdCBpbnRlbF9ndWMgKmd1YyA9ICZkZXZfcHJpdi0+Z3VjOwogCiAJZ2VtX3JlbGVh c2VfZ3VjX29iaihkZXZfcHJpdi0+Z3VjLmFkc19vYmopOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMu aAppbmRleCA0MTYwMWM3Li40ZGY4MGNjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9ndWMuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuaApAQCAt MTU2LDExICsxNTYsMTEgQEAgZXh0ZXJuIGludCBpbnRlbF9ndWNfc3VzcGVuZChzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KTsKIGV4dGVybiBpbnQgaW50ZWxfZ3VjX3Jlc3VtZShzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2KTsKIAogLyogaTkxNV9ndWNfc3VibWlzc2lvbi5jICovCi1pbnQgaTkxNV9ndWNf c3VibWlzc2lvbl9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwotaW50IGk5MTVfZ3VjX3N1 Ym1pc3Npb25fZW5hYmxlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOworaW50IGk5MTVfZ3VjX3N1 Ym1pc3Npb25faW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOworaW50IGk5 MTVfZ3VjX3N1Ym1pc3Npb25fZW5hYmxlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp dik7CiBpbnQgaTkxNV9ndWNfd3FfY2hlY2tfc3BhY2Uoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1 ZXN0ICpycSk7CiBpbnQgaTkxNV9ndWNfc3VibWl0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVz dCAqcnEpOwotdm9pZCBpOTE1X2d1Y19zdWJtaXNzaW9uX2Rpc2FibGUoc3RydWN0IGRybV9kZXZp Y2UgKmRldik7Ci12b2lkIGk5MTVfZ3VjX3N1Ym1pc3Npb25fZmluaShzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KTsKK3ZvaWQgaTkxNV9ndWNfc3VibWlzc2lvbl9kaXNhYmxlKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdik7Cit2b2lkIGk5MTVfZ3VjX3N1Ym1pc3Npb25fZmluaShzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogCiAjZW5kaWYKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2d1Y19sb2FkZXIuYwppbmRleCA0MWY3YzdkLi5kMjkxMzdmIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jCkBAIC00NTMsNyArNDUzLDcgQEAgaW50IGlu dGVsX2d1Y19zZXR1cChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlpbnRlbF9ndWNfZndfc3Rh dHVzX3JlcHIoZ3VjX2Z3LT5ndWNfZndfZmV0Y2hfc3RhdHVzKSwKIAkJaW50ZWxfZ3VjX2Z3X3N0 YXR1c19yZXByKGd1Y19mdy0+Z3VjX2Z3X2xvYWRfc3RhdHVzKSk7CiAKLQllcnIgPSBpOTE1X2d1 Y19zdWJtaXNzaW9uX2luaXQoZGV2KTsKKwllcnIgPSBpOTE1X2d1Y19zdWJtaXNzaW9uX2luaXQo ZGV2X3ByaXYpOwogCWlmIChlcnIpCiAJCWdvdG8gZmFpbDsKIApAQCAtNDkyLDcgKzQ5Miw3IEBA IGludCBpbnRlbF9ndWNfc2V0dXAoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJaW50ZWxfZ3Vj X2Z3X3N0YXR1c19yZXByKGd1Y19mdy0+Z3VjX2Z3X2xvYWRfc3RhdHVzKSk7CiAKIAlpZiAoaTkx NS5lbmFibGVfZ3VjX3N1Ym1pc3Npb24pIHsKLQkJZXJyID0gaTkxNV9ndWNfc3VibWlzc2lvbl9l bmFibGUoZGV2KTsKKwkJZXJyID0gaTkxNV9ndWNfc3VibWlzc2lvbl9lbmFibGUoZGV2X3ByaXYp OwogCQlpZiAoZXJyKQogCQkJZ290byBmYWlsOwogCQlkaXJlY3RfaW50ZXJydXB0c190b19ndWMo ZGV2X3ByaXYpOwpAQCAtNTA1LDggKzUwNSw4IEBAIGludCBpbnRlbF9ndWNfc2V0dXAoc3RydWN0 IGRybV9kZXZpY2UgKmRldikKIAkJZ3VjX2Z3LT5ndWNfZndfbG9hZF9zdGF0dXMgPSBHVUNfRklS TVdBUkVfRkFJTDsKIAogCWRpcmVjdF9pbnRlcnJ1cHRzX3RvX2hvc3QoZGV2X3ByaXYpOwotCWk5 MTVfZ3VjX3N1Ym1pc3Npb25fZGlzYWJsZShkZXYpOwotCWk5MTVfZ3VjX3N1Ym1pc3Npb25fZmlu aShkZXYpOworCWk5MTVfZ3VjX3N1Ym1pc3Npb25fZGlzYWJsZShkZXZfcHJpdik7CisJaTkxNV9n dWNfc3VibWlzc2lvbl9maW5pKGRldl9wcml2KTsKIAogCS8qCiAJICogV2UndmUgZmFpbGVkIHRv IGxvYWQgdGhlIGZpcm13YXJlIDooCkBAIC03MzEsOCArNzMxLDggQEAgdm9pZCBpbnRlbF9ndWNf ZmluaShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCiAJbXV0ZXhfbG9jaygmZGV2LT5zdHJ1Y3Rf bXV0ZXgpOwogCWRpcmVjdF9pbnRlcnJ1cHRzX3RvX2hvc3QoZGV2X3ByaXYpOwotCWk5MTVfZ3Vj X3N1Ym1pc3Npb25fZGlzYWJsZShkZXYpOwotCWk5MTVfZ3VjX3N1Ym1pc3Npb25fZmluaShkZXYp OworCWk5MTVfZ3VjX3N1Ym1pc3Npb25fZGlzYWJsZShkZXZfcHJpdik7CisJaTkxNV9ndWNfc3Vi bWlzc2lvbl9maW5pKGRldl9wcml2KTsKIAogCWlmIChndWNfZnctPmd1Y19md19vYmopCiAJCWRy bV9nZW1fb2JqZWN0X3VucmVmZXJlbmNlKCZndWNfZnctPmd1Y19md19vYmotPmJhc2UpOwotLSAK MS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCklu dGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw czovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=