From: Dave Gordon Subject: [PATCH 1/2] drm/i915/guc: prefer 'dev_priv' to 'dev' for static functions Date: Fri, 10 Jun 2016 18:29:25 +0100 Message-ID: <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 483A26E16D for ; Fri, 10 Jun 2016 17:29:30 +0000 (UTC) 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 Q29udmVydCBhbGwgc3RhdGljIGZ1bmN0aW9ucyBpbiBpOTE1X2d1Y19zdWJtaXNzaW9uLmMgdGhh dCBjdXJyZW50bHkKdGFrZSBhICdkZXYnIHBvaW50ZXIgdG8gdGFrZSAnZGV2X3ByaXYnIGluc3Rl YWQgKHRoZXJlIGFyZSB0aHJlZSwKZ3VjX2NsaWVudF9hbGxvYygpLCBndWNfY2xpZW50X2ZyZWUo KSwgYW5kIGdlbV9hbGxvY2F0ZV9ndWNfb2JqKCkuCgpTaWduZWQtb2ZmLWJ5OiBEYXZlIEdvcmRv biA8ZGF2aWQucy5nb3Jkb25AaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ3VjX3N1Ym1pc3Npb24uYyB8IDM5ICsrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLQog MSBmaWxlIGNoYW5nZWQsIDE5IGluc2VydGlvbnMoKyksIDIwIGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYwppbmRleCAyZGIxMTgyLi4xYmQw ZmFjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9u LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCkBAIC01 OTEsNyArNTkxLDcgQEAgaW50IGk5MTVfZ3VjX3N1Ym1pdChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3Jl cXVlc3QgKnJxKQogCiAvKioKICAqIGdlbV9hbGxvY2F0ZV9ndWNfb2JqKCkgLSBBbGxvY2F0ZSBn ZW0gb2JqZWN0IGZvciBHdUMgdXNhZ2UKLSAqIEBkZXY6CWRybSBkZXZpY2UKKyAqIEBkZXZfcHJp djoJZHJpdmVyIHByaXZhdGUgZGF0YSBzdHJ1Y3R1cmUKICAqIEBzaXplOglzaXplIG9mIG9iamVj dAogICoKICAqIFRoaXMgaXMgYSB3cmFwcGVyIHRvIGNyZWF0ZSBhIGdlbSBvYmouIEluIG9yZGVy IHRvIHVzZSBpdCBpbnNpZGUgR3VDLCB0aGUKQEAgLTYwMCwxMyArNjAwLDEyIEBAIGludCBpOTE1 X2d1Y19zdWJtaXQoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpycSkKICAqCiAgKiBSZXR1 cm46CUEgZHJtX2k5MTVfZ2VtX29iamVjdCBpZiBzdWNjZXNzZnVsLCBvdGhlcndpc2UgTlVMTC4K ICAqLwotc3RhdGljIHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpnZW1fYWxsb2NhdGVfZ3Vj X29iaihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAotCQkJCQkJCXUzMiBzaXplKQorc3RhdGljIHN0 cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICoKK2dlbV9hbGxvY2F0ZV9ndWNfb2JqKHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgdTMyIHNpemUpCiB7Ci0Jc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgZHJtX2k5MTVf Z2VtX29iamVjdCAqb2JqOwogCi0Jb2JqID0gaTkxNV9nZW1fb2JqZWN0X2NyZWF0ZShkZXYsIHNp emUpOworCW9iaiA9IGk5MTVfZ2VtX29iamVjdF9jcmVhdGUoZGV2X3ByaXYtPmRldiwgc2l6ZSk7 CiAJaWYgKElTX0VSUihvYmopKQogCQlyZXR1cm4gTlVMTDsKIApAQCAtNjQyLDEwICs2NDEsMTAg QEAgc3RhdGljIHZvaWQgZ2VtX3JlbGVhc2VfZ3VjX29iaihzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29i amVjdCAqb2JqKQogCWRybV9nZW1fb2JqZWN0X3VucmVmZXJlbmNlKCZvYmotPmJhc2UpOwogfQog Ci1zdGF0aWMgdm9pZCBndWNfY2xpZW50X2ZyZWUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKLQkJ CSAgICBzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpjbGllbnQpCitzdGF0aWMgdm9pZAorZ3VjX2Ns aWVudF9mcmVlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKKwkJc3RydWN0IGk5 MTVfZ3VjX2NsaWVudCAqY2xpZW50KQogewotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJc3RydWN0IGludGVsX2d1YyAqZ3VjID0gJmRldl9w cml2LT5ndWM7CiAKIAlpZiAoIWNsaWVudCkKQEAgLTY4OCw3ICs2ODcsNyBAQCBzdGF0aWMgdm9p ZCBndWNfY2xpZW50X2ZyZWUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAogLyoqCiAgKiBndWNf Y2xpZW50X2FsbG9jKCkgLSBBbGxvY2F0ZSBhbiBpOTE1X2d1Y19jbGllbnQKLSAqIEBkZXY6CWRy bSBkZXZpY2UKKyAqIEBkZXZfcHJpdjoJZHJpdmVyIHByaXZhdGUgZGF0YSBzdHJ1Y3R1cmUKICAq IEBwcmlvcml0eToJZm91ciBsZXZlbHMgcHJpb3JpdHkgX0NSSVRJQ0FMLCBfSElHSCwgX05PUk1B TCBhbmQgX0xPVwogICogCQlUaGUga2VybmVsIGNsaWVudCB0byByZXBsYWNlIEV4ZWNMaXN0IHN1 Ym1pc3Npb24gaXMgY3JlYXRlZCB3aXRoCiAgKiAJCU5PUk1BTCBwcmlvcml0eS4gUHJpb3JpdHkg b2YgYSBjbGllbnQgZm9yIHNjaGVkdWxlciBjYW4gYmUgSElHSCwKQEAgLTY5OCwxMiArNjk3LDEy IEBAIHN0YXRpYyB2b2lkIGd1Y19jbGllbnRfZnJlZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAog ICoKICAqIFJldHVybjoJQW4gaTkxNV9ndWNfY2xpZW50IG9iamVjdCBpZiBzdWNjZXNzLCBlbHNl IE5VTEwuCiAgKi8KLXN0YXRpYyBzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpndWNfY2xpZW50X2Fs bG9jKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCi0JCQkJCQl1aW50MzJfdCBwcmlvcml0eSwKLQkJ CQkJCXN0cnVjdCBpOTE1X2dlbV9jb250ZXh0ICpjdHgpCitzdGF0aWMgc3RydWN0IGk5MTVfZ3Vj X2NsaWVudCAqCitndWNfY2xpZW50X2FsbG9jKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiwKKwkJIHVpbnQzMl90IHByaW9yaXR5LAorCQkgc3RydWN0IGk5MTVfZ2VtX2NvbnRleHQg KmN0eCkKIHsKIAlzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpjbGllbnQ7Ci0Jc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgaW50ZWxf Z3VjICpndWMgPSAmZGV2X3ByaXYtPmd1YzsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAq b2JqOwogCkBAIC03MjQsNyArNzIzLDcgQEAgc3RhdGljIHN0cnVjdCBpOTE1X2d1Y19jbGllbnQg Kmd1Y19jbGllbnRfYWxsb2Moc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAl9CiAKIAkvKiBUaGUg Zmlyc3QgcGFnZSBpcyBkb29yYmVsbC9wcm9jX2Rlc2MuIFR3byBmb2xsb3dlZCBwYWdlcyBhcmUg d3EuICovCi0Jb2JqID0gZ2VtX2FsbG9jYXRlX2d1Y19vYmooZGV2LCBHVUNfREJfU0laRSArIEdV Q19XUV9TSVpFKTsKKwlvYmogPSBnZW1fYWxsb2NhdGVfZ3VjX29iaihkZXZfcHJpdiwgR1VDX0RC X1NJWkUgKyBHVUNfV1FfU0laRSk7CiAJaWYgKCFvYmopCiAJCWdvdG8gZXJyOwogCkBAIC03Njgs NyArNzY3LDcgQEAgc3RhdGljIHN0cnVjdCBpOTE1X2d1Y19jbGllbnQgKmd1Y19jbGllbnRfYWxs b2Moc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIGVycjoKIAlEUk1fRVJST1IoIkZBSUxFRCB0byBj cmVhdGUgcHJpb3JpdHkgJXUgR3VDIGNsaWVudCFcbiIsIHByaW9yaXR5KTsKIAotCWd1Y19jbGll bnRfZnJlZShkZXYsIGNsaWVudCk7CisJZ3VjX2NsaWVudF9mcmVlKGRldl9wcml2LCBjbGllbnQp OwogCXJldHVybiBOVUxMOwogfQogCkBAIC03OTMsNyArNzkyLDcgQEAgc3RhdGljIHZvaWQgZ3Vj X2NyZWF0ZV9sb2coc3RydWN0IGludGVsX2d1YyAqZ3VjKQogCiAJb2JqID0gZ3VjLT5sb2dfb2Jq OwogCWlmICghb2JqKSB7Ci0JCW9iaiA9IGdlbV9hbGxvY2F0ZV9ndWNfb2JqKGRldl9wcml2LT5k ZXYsIHNpemUpOworCQlvYmogPSBnZW1fYWxsb2NhdGVfZ3VjX29iaihkZXZfcHJpdiwgc2l6ZSk7 CiAJCWlmICghb2JqKSB7CiAJCQkvKiBsb2dnaW5nIHdpbGwgYmUgb2ZmICovCiAJCQlpOTE1Lmd1 Y19sb2dfbGV2ZWwgPSAtMTsKQEAgLTg1Myw3ICs4NTIsNyBAQCBzdGF0aWMgdm9pZCBndWNfY3Jl YXRlX2FkcyhzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpCiAKIAlvYmogPSBndWMtPmFkc19vYmo7CiAJ aWYgKCFvYmopIHsKLQkJb2JqID0gZ2VtX2FsbG9jYXRlX2d1Y19vYmooZGV2X3ByaXYtPmRldiwg UEFHRV9BTElHTihzaXplKSk7CisJCW9iaiA9IGdlbV9hbGxvY2F0ZV9ndWNfb2JqKGRldl9wcml2 LCBQQUdFX0FMSUdOKHNpemUpKTsKIAkJaWYgKCFvYmopCiAJCQlyZXR1cm47CiAKQEAgLTkyNSw3 ICs5MjQsNyBAQCBpbnQgaTkxNV9ndWNfc3VibWlzc2lvbl9pbml0KHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYpCiAJaWYgKGd1Yy0+Y3R4X3Bvb2xfb2JqKQogCQlyZXR1cm4gMDsgLyogYWxyZWFkeSBh bGxvY2F0ZWQgKi8KIAotCWd1Yy0+Y3R4X3Bvb2xfb2JqID0gZ2VtX2FsbG9jYXRlX2d1Y19vYmoo ZGV2X3ByaXYtPmRldiwgZ2Vtc2l6ZSk7CisJZ3VjLT5jdHhfcG9vbF9vYmogPSBnZW1fYWxsb2Nh dGVfZ3VjX29iaihkZXZfcHJpdiwgZ2Vtc2l6ZSk7CiAJaWYgKCFndWMtPmN0eF9wb29sX29iaikK IAkJcmV0dXJuIC1FTk9NRU07CiAKQEAgLTk0Myw3ICs5NDIsNyBAQCBpbnQgaTkxNV9ndWNfc3Vi bWlzc2lvbl9lbmFibGUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlzdHJ1Y3QgaTkxNV9ndWNf Y2xpZW50ICpjbGllbnQ7CiAKIAkvKiBjbGllbnQgZm9yIGV4ZWNidWYgc3VibWlzc2lvbiAqLwot CWNsaWVudCA9IGd1Y19jbGllbnRfYWxsb2MoZGV2LAorCWNsaWVudCA9IGd1Y19jbGllbnRfYWxs b2MoZGV2X3ByaXYsCiAJCQkJICBHVUNfQ1RYX1BSSU9SSVRZX0tNRF9OT1JNQUwsCiAJCQkJICBk ZXZfcHJpdi0+a2VybmVsX2NvbnRleHQpOwogCWlmICghY2xpZW50KSB7CkBAIC05NjMsNyArOTYy LDcgQEAgdm9pZCBpOTE1X2d1Y19zdWJtaXNzaW9uX2Rpc2FibGUoc3RydWN0IGRybV9kZXZpY2Ug KmRldikKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2 YXRlOwogCXN0cnVjdCBpbnRlbF9ndWMgKmd1YyA9ICZkZXZfcHJpdi0+Z3VjOwogCi0JZ3VjX2Ns aWVudF9mcmVlKGRldiwgZ3VjLT5leGVjYnVmX2NsaWVudCk7CisJZ3VjX2NsaWVudF9mcmVlKGRl dl9wcml2LCBndWMtPmV4ZWNidWZfY2xpZW50KTsKIAlndWMtPmV4ZWNidWZfY2xpZW50ID0gTlVM TDsKIH0KIAotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2lu dGVsLWdmeAo=