From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH 3/4] drm/i915: Rename local struct intel_ringbuffer variables Date: Wed, 16 Mar 2016 15:40:54 +0000 Message-ID: <1458142855-3988-3-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1458142855-3988-1-git-send-email-tvrtko.ursulin@linux.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 AAF396E97C for ; Wed, 16 Mar 2016 15:41:17 +0000 (UTC) In-Reply-To: <1458142855-3988-1-git-send-email-tvrtko.ursulin@linux.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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCk1ham9yaXR5 IG9mIHRoZSBjb2RlIGNhbGxzIHRoZXNlIHJpbmdidWYgc28gZml4IHVwIGEgZmV3CnBsYWNlcyB3 aGljaCB1c2Ugc29tZXRoaW5nIGVsc2UgdG8gYmUgY29uc2lzdGVudC4KCkNvY2NpbmVsbGUgc2Ny aXB0IG9mOgoKQEAKZXhwcmVzc2lvbiBFOwppZGVudGlmaWVyIHI7CkBACi0gc3RydWN0IGludGVs X3JpbmdidWZmZXIgKnIgPSBFOworIHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmID0g RTsKPCsuLi4KLSByCisgcmluZ2J1ZgouLi4rPgpAQAppZGVudGlmaWVyIHI7CkBACi0gc3RydWN0 IGludGVsX3JpbmdidWZmZXIgKnI7Cisgc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWY7 CjwrLi4uCi0gcgorIHJpbmdidWYKLi4uKz4KClNpZ25lZC1vZmYtYnk6IFR2cnRrbyBVcnN1bGlu IDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9nZW0uYyAgICAgICAgIHwgIDggKysrKy0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2xyYy5jICAgICAgICB8ICAzICsrLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbW9jcy5j ICAgICAgIHwgMTEgKysrKysrKy0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Jpbmdi dWZmZXIuYyB8IDI4ICsrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0KIDQgZmlsZXMgY2hhbmdl ZCwgMjcgaW5zZXJ0aW9ucygrKSwgMjMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt LmMKaW5kZXggMDQyY2I0MTJlNjUyLi40YTBmOWJkODdjMzQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW0uYwpAQCAtMjgyMSw3ICsyODIxLDcgQEAgc3RhdGljIHZvaWQgaTkxNV9nZW1fcmVzZXRfZW5n aW5lX3N0YXR1cyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiBzdGF0aWMgdm9p ZCBpOTE1X2dlbV9yZXNldF9lbmdpbmVfY2xlYW51cChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYsCiAJCQkJCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIHsKLQlzdHJ1 Y3QgaW50ZWxfcmluZ2J1ZmZlciAqYnVmZmVyOworCXN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpy aW5nYnVmOwogCiAJd2hpbGUgKCFsaXN0X2VtcHR5KCZlbmdpbmUtPmFjdGl2ZV9saXN0KSkgewog CQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqOwpAQCAtMjg3NCw5ICsyODc0LDkgQEAg c3RhdGljIHZvaWQgaTkxNV9nZW1fcmVzZXRfZW5naW5lX2NsZWFudXAoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2LAogCSAqIHVwb24gcmVzZXQgaXMgbGVzcyB0aGFuIHdoZW4gd2Ug c3RhcnQuIERvIG9uZSBtb3JlIHBhc3Mgb3ZlcgogCSAqIGFsbCB0aGUgcmluZ2J1ZmZlcnMgdG8g cmVzZXQgbGFzdF9yZXRpcmVkX2hlYWQuCiAJICovCi0JbGlzdF9mb3JfZWFjaF9lbnRyeShidWZm ZXIsICZlbmdpbmUtPmJ1ZmZlcnMsIGxpbmspIHsKLQkJYnVmZmVyLT5sYXN0X3JldGlyZWRfaGVh ZCA9IGJ1ZmZlci0+dGFpbDsKLQkJaW50ZWxfcmluZ191cGRhdGVfc3BhY2UoYnVmZmVyKTsKKwls aXN0X2Zvcl9lYWNoX2VudHJ5KHJpbmdidWYsICZlbmdpbmUtPmJ1ZmZlcnMsIGxpbmspIHsKKwkJ cmluZ2J1Zi0+bGFzdF9yZXRpcmVkX2hlYWQgPSByaW5nYnVmLT50YWlsOworCQlpbnRlbF9yaW5n X3VwZGF0ZV9zcGFjZShyaW5nYnVmKTsKIAl9CiB9CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMK aW5kZXggN2M2MzZiM2RiMTU2Li5iYzMxODNlMWMwYWYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2xyYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xy Yy5jCkBAIC0xMDAxLDcgKzEwMDEsOCBAQCBpbnQgaW50ZWxfZXhlY2xpc3RzX3N1Ym1pc3Npb24o c3RydWN0IGk5MTVfZXhlY2J1ZmZlcl9wYXJhbXMgKnBhcmFtcywKIAkJaW50ZWxfbG9naWNhbF9y aW5nX2VtaXQocmluZ2J1ZiwgTUlfTk9PUCk7CiAJCWludGVsX2xvZ2ljYWxfcmluZ19lbWl0KHJp bmdidWYsIE1JX0xPQURfUkVHSVNURVJfSU1NKDEpKTsKIAkJaW50ZWxfbG9naWNhbF9yaW5nX2Vt aXRfcmVnKHJpbmdidWYsIElOU1RQTSk7Ci0JCWludGVsX2xvZ2ljYWxfcmluZ19lbWl0KHJpbmdi dWYsIGluc3RwX21hc2sgPDwgMTYgfCBpbnN0cF9tb2RlKTsKKwkJaW50ZWxfbG9naWNhbF9yaW5n X2VtaXQocmluZ2J1ZiwKKwkJCQkJaW5zdHBfbWFzayA8PCAxNiB8IGluc3RwX21vZGUpOwogCQlp bnRlbF9sb2dpY2FsX3JpbmdfYWR2YW5jZShyaW5nYnVmKTsKIAogCQlkZXZfcHJpdi0+cmVsYXRp dmVfY29uc3RhbnRzX21vZGUgPSBpbnN0cF9tb2RlOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfbW9jcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbW9jcy5j CmluZGV4IDNjNzI1ZGRlMTZlZC4uOGVmN2UyYjI5ZDcxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9tb2NzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf bW9jcy5jCkBAIC0yMTAsNyArMjEwLDggQEAgc3RhdGljIGludCBlbWl0X21vY3NfY29udHJvbF90 YWJsZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwKIAkJCQlNSV9MT0FEX1JFR0lT VEVSX0lNTShHRU45X05VTV9NT0NTX0VOVFJJRVMpKTsKIAogCWZvciAoaW5kZXggPSAwOyBpbmRl eCA8IHRhYmxlLT5zaXplOyBpbmRleCsrKSB7Ci0JCWludGVsX2xvZ2ljYWxfcmluZ19lbWl0X3Jl ZyhyaW5nYnVmLCBtb2NzX3JlZ2lzdGVyKHJpbmcsIGluZGV4KSk7CisJCWludGVsX2xvZ2ljYWxf cmluZ19lbWl0X3JlZyhyaW5nYnVmLAorCQkJCQkgICAgbW9jc19yZWdpc3RlcihyaW5nLCBpbmRl eCkpOwogCQlpbnRlbF9sb2dpY2FsX3JpbmdfZW1pdChyaW5nYnVmLAogCQkJCQl0YWJsZS0+dGFi bGVbaW5kZXhdLmNvbnRyb2xfdmFsdWUpOwogCX0KQEAgLTIyNCw4ICsyMjUsMTAgQEAgc3RhdGlj IGludCBlbWl0X21vY3NfY29udHJvbF90YWJsZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3Qg KnJlcSwKIAkgKiB0aGF0IHZhbHVlIHRvIGFsbCB0aGUgdXNlZCBlbnRyaWVzLgogCSAqLwogCWZv ciAoOyBpbmRleCA8IEdFTjlfTlVNX01PQ1NfRU5UUklFUzsgaW5kZXgrKykgewotCQlpbnRlbF9s b2dpY2FsX3JpbmdfZW1pdF9yZWcocmluZ2J1ZiwgbW9jc19yZWdpc3RlcihyaW5nLCBpbmRleCkp OwotCQlpbnRlbF9sb2dpY2FsX3JpbmdfZW1pdChyaW5nYnVmLCB0YWJsZS0+dGFibGVbMF0uY29u dHJvbF92YWx1ZSk7CisJCWludGVsX2xvZ2ljYWxfcmluZ19lbWl0X3JlZyhyaW5nYnVmLAorCQkJ CQkgICAgbW9jc19yZWdpc3RlcihyaW5nLCBpbmRleCkpOworCQlpbnRlbF9sb2dpY2FsX3Jpbmdf ZW1pdChyaW5nYnVmLAorCQkJCQl0YWJsZS0+dGFibGVbMF0uY29udHJvbF92YWx1ZSk7CiAJfQog CiAJaW50ZWxfbG9naWNhbF9yaW5nX2VtaXQocmluZ2J1ZiwgTUlfTk9PUCk7CkBAIC0yNjYsNyAr MjY5LDcgQEAgc3RhdGljIGludCBlbWl0X21vY3NfbDNjY190YWJsZShzdHJ1Y3QgZHJtX2k5MTVf Z2VtX3JlcXVlc3QgKnJlcSwKIAl9CiAKIAlpbnRlbF9sb2dpY2FsX3JpbmdfZW1pdChyaW5nYnVm LAotCQkJTUlfTE9BRF9SRUdJU1RFUl9JTU0oR0VOOV9OVU1fTU9DU19FTlRSSUVTIC8gMikpOwor CQkJCU1JX0xPQURfUkVHSVNURVJfSU1NKEdFTjlfTlVNX01PQ1NfRU5UUklFUyAvIDIpKTsKIAog CWZvciAoaSA9IDAsIGNvdW50ID0gMDsgaSA8IHRhYmxlLT5zaXplIC8gMjsgaSsrLCBjb3VudCAr PSAyKSB7CiAJCXZhbHVlID0gKHRhYmxlLT50YWJsZVtjb3VudF0ubDNjY192YWx1ZSAmIDB4ZmZm ZikgfApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCmluZGV4IGI3YzhmYzFh NzNhMy4uYTc4YThmYWU0NzgwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9yaW5nYnVmZmVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZl ci5jCkBAIC0yMTc3LDQxICsyMTc3LDQxIEBAIHN0YXRpYyBpbnQgaW50ZWxfYWxsb2NfcmluZ2J1 ZmZlcl9vYmooc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVy ICoKIGludGVsX2VuZ2luZV9jcmVhdGVfcmluZ2J1ZmZlcihzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICplbmdpbmUsIGludCBzaXplKQogewotCXN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nOwor CXN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmOwogCWludCByZXQ7CiAKLQlyaW5nID0g a3phbGxvYyhzaXplb2YoKnJpbmcpLCBHRlBfS0VSTkVMKTsKLQlpZiAocmluZyA9PSBOVUxMKSB7 CisJcmluZ2J1ZiA9IGt6YWxsb2Moc2l6ZW9mKCpyaW5nYnVmKSwgR0ZQX0tFUk5FTCk7CisJaWYg KHJpbmdidWYgPT0gTlVMTCkgewogCQlEUk1fREVCVUdfRFJJVkVSKCJGYWlsZWQgdG8gYWxsb2Nh dGUgcmluZ2J1ZmZlciAlc1xuIiwKIAkJCQkgZW5naW5lLT5uYW1lKTsKIAkJcmV0dXJuIEVSUl9Q VFIoLUVOT01FTSk7CiAJfQogCi0JcmluZy0+ZW5naW5lID0gZW5naW5lOwotCWxpc3RfYWRkKCZy aW5nLT5saW5rLCAmZW5naW5lLT5idWZmZXJzKTsKKwlyaW5nYnVmLT5lbmdpbmUgPSBlbmdpbmU7 CisJbGlzdF9hZGQoJnJpbmdidWYtPmxpbmssICZlbmdpbmUtPmJ1ZmZlcnMpOwogCi0JcmluZy0+ c2l6ZSA9IHNpemU7CisJcmluZ2J1Zi0+c2l6ZSA9IHNpemU7CiAJLyogV29ya2Fyb3VuZCBhbiBl cnJhdHVtIG9uIHRoZSBpODMwIHdoaWNoIGNhdXNlcyBhIGhhbmcgaWYKIAkgKiB0aGUgVEFJTCBw b2ludGVyIHBvaW50cyB0byB3aXRoaW4gdGhlIGxhc3QgMiBjYWNoZWxpbmVzCiAJICogb2YgdGhl IGJ1ZmZlci4KIAkgKi8KLQlyaW5nLT5lZmZlY3RpdmVfc2l6ZSA9IHNpemU7CisJcmluZ2J1Zi0+ ZWZmZWN0aXZlX3NpemUgPSBzaXplOwogCWlmIChJU19JODMwKGVuZ2luZS0+ZGV2KSB8fCBJU184 NDVHKGVuZ2luZS0+ZGV2KSkKLQkJcmluZy0+ZWZmZWN0aXZlX3NpemUgLT0gMiAqIENBQ0hFTElO RV9CWVRFUzsKKwkJcmluZ2J1Zi0+ZWZmZWN0aXZlX3NpemUgLT0gMiAqIENBQ0hFTElORV9CWVRF UzsKIAotCXJpbmctPmxhc3RfcmV0aXJlZF9oZWFkID0gLTE7Ci0JaW50ZWxfcmluZ191cGRhdGVf c3BhY2UocmluZyk7CisJcmluZ2J1Zi0+bGFzdF9yZXRpcmVkX2hlYWQgPSAtMTsKKwlpbnRlbF9y aW5nX3VwZGF0ZV9zcGFjZShyaW5nYnVmKTsKIAotCXJldCA9IGludGVsX2FsbG9jX3JpbmdidWZm ZXJfb2JqKGVuZ2luZS0+ZGV2LCByaW5nKTsKKwlyZXQgPSBpbnRlbF9hbGxvY19yaW5nYnVmZmVy X29iaihlbmdpbmUtPmRldiwgcmluZ2J1Zik7CiAJaWYgKHJldCkgewogCQlEUk1fREVCVUdfRFJJ VkVSKCJGYWlsZWQgdG8gYWxsb2NhdGUgcmluZ2J1ZmZlciAlczogJWRcbiIsCiAJCQkJIGVuZ2lu ZS0+bmFtZSwgcmV0KTsKLQkJbGlzdF9kZWwoJnJpbmctPmxpbmspOwotCQlrZnJlZShyaW5nKTsK KwkJbGlzdF9kZWwoJnJpbmdidWYtPmxpbmspOworCQlrZnJlZShyaW5nYnVmKTsKIAkJcmV0dXJu IEVSUl9QVFIocmV0KTsKIAl9CiAKLQlyZXR1cm4gcmluZzsKKwlyZXR1cm4gcmluZ2J1ZjsKIH0K IAogdm9pZAotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2lu dGVsLWdmeAo=