From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 30/64] drm/i915: Rename residual ringbuf parameters Date: Thu, 7 Jul 2016 09:41:36 +0100 Message-ID: <1467880930-23082-30-git-send-email-chris@chris-wilson.co.uk> References: <1467880930-23082-1-git-send-email-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 638DA6E75B for ; Thu, 7 Jul 2016 08:43:02 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id 187so3802879wmz.1 for ; Thu, 07 Jul 2016 01:43:02 -0700 (PDT) In-Reply-To: <1467880930-23082-1-git-send-email-chris@chris-wilson.co.uk> 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 Tm93IHRoYXQgd2UgaGF2ZSBhIGNsZWFyIHJpbmcvZW5naW5lIHNwbGl0IGFuZCBhIHN0cnVjdCBp bnRlbF9yaW5nLCB3ZQpubyBsb25nZXIgbmVlZCB0aGUgc3RvcGdhcCByaW5nYnVmIG5hbWVzLgoK U2lnbmVkLW9mZi1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+Ci0t LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jIHwgNjYgKysrKysrKysr KysrKysrKy0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5n YnVmZmVyLmggfCAgNiArLS0KIDIgZmlsZXMgY2hhbmdlZCwgMzYgaW5zZXJ0aW9ucygrKSwgMzYg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmlu Z2J1ZmZlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCmluZGV4 IDlhYzU2ZGUxOGJkNC4uMjE0ZDUxZjI5MWU1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf cmluZ2J1ZmZlci5jCkBAIC00NywxNSArNDcsMTUgQEAgaW50IF9faW50ZWxfcmluZ19zcGFjZShp bnQgaGVhZCwgaW50IHRhaWwsIGludCBzaXplKQogCXJldHVybiBzcGFjZSAtIEk5MTVfUklOR19G UkVFX1NQQUNFOwogfQogCi12b2lkIGludGVsX3JpbmdfdXBkYXRlX3NwYWNlKHN0cnVjdCBpbnRl bF9yaW5nICpyaW5nYnVmKQordm9pZCBpbnRlbF9yaW5nX3VwZGF0ZV9zcGFjZShzdHJ1Y3QgaW50 ZWxfcmluZyAqcmluZykKIHsKLQlpZiAocmluZ2J1Zi0+bGFzdF9yZXRpcmVkX2hlYWQgIT0gLTEp IHsKLQkJcmluZ2J1Zi0+aGVhZCA9IHJpbmdidWYtPmxhc3RfcmV0aXJlZF9oZWFkOwotCQlyaW5n YnVmLT5sYXN0X3JldGlyZWRfaGVhZCA9IC0xOworCWlmIChyaW5nLT5sYXN0X3JldGlyZWRfaGVh ZCAhPSAtMSkgeworCQlyaW5nLT5oZWFkID0gcmluZy0+bGFzdF9yZXRpcmVkX2hlYWQ7CisJCXJp bmctPmxhc3RfcmV0aXJlZF9oZWFkID0gLTE7CiAJfQogCi0JcmluZ2J1Zi0+c3BhY2UgPSBfX2lu dGVsX3Jpbmdfc3BhY2UocmluZ2J1Zi0+aGVhZCAmIEhFQURfQUREUiwKLQkJCQkJICAgIHJpbmdi dWYtPnRhaWwsIHJpbmdidWYtPnNpemUpOworCXJpbmctPnNwYWNlID0gX19pbnRlbF9yaW5nX3Nw YWNlKHJpbmctPmhlYWQgJiBIRUFEX0FERFIsCisJCQkJCSByaW5nLT50YWlsLCByaW5nLT5zaXpl KTsKIH0KIAogc3RhdGljIHZvaWQgX19pbnRlbF9lbmdpbmVfc3VibWl0KHN0cnVjdCBpbnRlbF9l bmdpbmVfY3MgKmVuZ2luZSkKQEAgLTE5ODIsMjUgKzE5ODIsMjUgQEAgc3RhdGljIGludCBpbml0 X3BoeXNfc3RhdHVzX3BhZ2Uoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogCXJldHVy biAwOwogfQogCi12b2lkIGludGVsX3VucGluX3Jpbmcoc3RydWN0IGludGVsX3JpbmcgKnJpbmdi dWYpCit2b2lkIGludGVsX3VucGluX3Jpbmcoc3RydWN0IGludGVsX3JpbmcgKnJpbmcpCiB7Ci0J R0VNX0JVR19PTighcmluZ2J1Zi0+dm1hKTsKLQlHRU1fQlVHX09OKCFyaW5nYnVmLT52YWRkcik7 CisJR0VNX0JVR19PTighcmluZy0+dm1hKTsKKwlHRU1fQlVHX09OKCFyaW5nLT52YWRkcik7CiAK LQlpZiAoSEFTX0xMQyhyaW5nYnVmLT5vYmotPmJhc2UuZGV2KSAmJiAhcmluZ2J1Zi0+b2JqLT5z dG9sZW4pCi0JCWk5MTVfZ2VtX29iamVjdF91bnBpbl9tYXAocmluZ2J1Zi0+b2JqKTsKKwlpZiAo SEFTX0xMQyhyaW5nLT5vYmotPmJhc2UuZGV2KSAmJiAhcmluZy0+b2JqLT5zdG9sZW4pCisJCWk5 MTVfZ2VtX29iamVjdF91bnBpbl9tYXAocmluZy0+b2JqKTsKIAllbHNlCi0JCWk5MTVfdm1hX3Vu cGluX2lvbWFwKHJpbmdidWYtPnZtYSk7Ci0JcmluZ2J1Zi0+dmFkZHIgPSBOVUxMOworCQlpOTE1 X3ZtYV91bnBpbl9pb21hcChyaW5nLT52bWEpOworCXJpbmctPnZhZGRyID0gTlVMTDsKIAotCWk5 MTVfZ2VtX29iamVjdF9nZ3R0X3VucGluKHJpbmdidWYtPm9iaik7Ci0JcmluZ2J1Zi0+dm1hID0g TlVMTDsKKwlpOTE1X2dlbV9vYmplY3RfZ2d0dF91bnBpbihyaW5nLT5vYmopOworCXJpbmctPnZt YSA9IE5VTEw7CiB9CiAKIGludCBpbnRlbF9waW5fYW5kX21hcF9yaW5nKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiwKLQkJCSAgIHN0cnVjdCBpbnRlbF9yaW5nICpyaW5nYnVmKQor CQkJICAgc3RydWN0IGludGVsX3JpbmcgKnJpbmcpCiB7Ci0Jc3RydWN0IGRybV9pOTE1X2dlbV9v YmplY3QgKm9iaiA9IHJpbmdidWYtPm9iajsKKwlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAq b2JqID0gcmluZy0+b2JqOwogCS8qIFJpbmcgd3JhcGFyb3VuZCBhdCBvZmZzZXQgMCBzb21ldGlt ZXMgaGFuZ3MuIE5vIGlkZWEgd2h5LiAqLwogCXVuc2lnbmVkIGZsYWdzID0gUElOX09GRlNFVF9C SUFTIHwgNDA5NjsKIAl2b2lkICphZGRyOwpAQCAtMjA0MCw4ICsyMDQwLDggQEAgaW50IGludGVs X3Bpbl9hbmRfbWFwX3Jpbmcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQl9 CiAJfQogCi0JcmluZ2J1Zi0+dmFkZHIgPSBhZGRyOwotCXJpbmdidWYtPnZtYSA9IGk5MTVfZ2Vt X29ial90b19nZ3R0KG9iaik7CisJcmluZy0+dmFkZHIgPSBhZGRyOworCXJpbmctPnZtYSA9IGk5 MTVfZ2VtX29ial90b19nZ3R0KG9iaik7CiAJcmV0dXJuIDA7CiAKIGVycl91bnBpbjoKQEAgLTIw NDksMjkgKzIwNDksMjkgQEAgZXJyX3VucGluOgogCXJldHVybiByZXQ7CiB9CiAKLXN0YXRpYyB2 b2lkIGludGVsX2Rlc3Ryb3lfcmluZ2J1ZmZlcl9vYmooc3RydWN0IGludGVsX3JpbmcgKnJpbmdi dWYpCitzdGF0aWMgdm9pZCBpbnRlbF9kZXN0cm95X3JpbmdidWZmZXJfb2JqKHN0cnVjdCBpbnRl bF9yaW5nICpyaW5nKQogewotCWk5MTVfZ2VtX29iamVjdF9wdXQocmluZ2J1Zi0+b2JqKTsKLQly aW5nYnVmLT5vYmogPSBOVUxMOworCWk5MTVfZ2VtX29iamVjdF9wdXQocmluZy0+b2JqKTsKKwly aW5nLT5vYmogPSBOVUxMOwogfQogCiBzdGF0aWMgaW50IGludGVsX2FsbG9jX3JpbmdidWZmZXJf b2JqKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCi0JCQkJICAgICAgc3RydWN0IGludGVsX3Jpbmcg KnJpbmdidWYpCisJCQkJICAgICAgc3RydWN0IGludGVsX3JpbmcgKnJpbmcpCiB7CiAJc3RydWN0 IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iajsKIAogCW9iaiA9IE5VTEw7CiAJaWYgKCFIQVNfTExD KGRldikpCi0JCW9iaiA9IGk5MTVfZ2VtX29iamVjdF9jcmVhdGVfc3RvbGVuKGRldiwgcmluZ2J1 Zi0+c2l6ZSk7CisJCW9iaiA9IGk5MTVfZ2VtX29iamVjdF9jcmVhdGVfc3RvbGVuKGRldiwgcmlu Zy0+c2l6ZSk7CiAJaWYgKG9iaiA9PSBOVUxMKQotCQlvYmogPSBpOTE1X2dlbV9vYmplY3RfY3Jl YXRlKGRldiwgcmluZ2J1Zi0+c2l6ZSk7CisJCW9iaiA9IGk5MTVfZ2VtX29iamVjdF9jcmVhdGUo ZGV2LCByaW5nLT5zaXplKTsKIAlpZiAoSVNfRVJSKG9iaikpCiAJCXJldHVybiBQVFJfRVJSKG9i aik7CiAKIAkvKiBtYXJrIHJpbmcgYnVmZmVycyBhcyByZWFkLW9ubHkgZnJvbSBHUFUgc2lkZSBi eSBkZWZhdWx0ICovCiAJb2JqLT5ndF9ybyA9IDE7CiAKLQlyaW5nYnVmLT5vYmogPSBvYmo7CisJ cmluZy0+b2JqID0gb2JqOwogCiAJcmV0dXJuIDA7CiB9CkBAIC0yMTc5LDcgKzIxNzksNyBAQCBz dGF0aWMgaW50IGludGVsX2luaXRfZW5naW5lKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQkg ICAgIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7Ci0Jc3RydWN0IGludGVsX3JpbmcgKnJp bmdidWY7CisJc3RydWN0IGludGVsX3JpbmcgKnJpbmc7CiAJaW50IHJldDsKIAogCVdBUk5fT04o ZW5naW5lLT5idWZmZXIpOwpAQCAtMjIwOSwxMiArMjIwOSwxMiBAQCBzdGF0aWMgaW50IGludGVs X2luaXRfZW5naW5lKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJaWYgKHJldCkKIAkJZ290byBl cnJvcjsKIAotCXJpbmdidWYgPSBpbnRlbF9lbmdpbmVfY3JlYXRlX3JpbmcoZW5naW5lLCAzMiAq IFBBR0VfU0laRSk7Ci0JaWYgKElTX0VSUihyaW5nYnVmKSkgewotCQlyZXQgPSBQVFJfRVJSKHJp bmdidWYpOworCXJpbmcgPSBpbnRlbF9lbmdpbmVfY3JlYXRlX3JpbmcoZW5naW5lLCAzMiAqIFBB R0VfU0laRSk7CisJaWYgKElTX0VSUihyaW5nKSkgeworCQlyZXQgPSBQVFJfRVJSKHJpbmcpOwog CQlnb3RvIGVycm9yOwogCX0KLQllbmdpbmUtPmJ1ZmZlciA9IHJpbmdidWY7CisJZW5naW5lLT5i dWZmZXIgPSByaW5nOwogCiAJaWYgKEk5MTVfTkVFRF9HRlhfSFdTKGRldl9wcml2KSkgewogCQly ZXQgPSBpbml0X3N0YXR1c19wYWdlKGVuZ2luZSk7CkBAIC0yMjI3LDExICsyMjI3LDExIEBAIHN0 YXRpYyBpbnQgaW50ZWxfaW5pdF9lbmdpbmUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJCWdv dG8gZXJyb3I7CiAJfQogCi0JcmV0ID0gaW50ZWxfcGluX2FuZF9tYXBfcmluZyhkZXZfcHJpdiwg cmluZ2J1Zik7CisJcmV0ID0gaW50ZWxfcGluX2FuZF9tYXBfcmluZyhkZXZfcHJpdiwgcmluZyk7 CiAJaWYgKHJldCkgewogCQlEUk1fRVJST1IoIkZhaWxlZCB0byBwaW4gYW5kIG1hcCByaW5nYnVm ZmVyICVzOiAlZFxuIiwKIAkJCQllbmdpbmUtPm5hbWUsIHJldCk7Ci0JCWludGVsX2Rlc3Ryb3lf cmluZ2J1ZmZlcl9vYmoocmluZ2J1Zik7CisJCWludGVsX2Rlc3Ryb3lfcmluZ2J1ZmZlcl9vYmoo cmluZyk7CiAJCWdvdG8gZXJyb3I7CiAJfQogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9yaW5nYnVmZmVyLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5n YnVmZmVyLmgKaW5kZXggNTkwZTlkMDA2YTk1Li4xNGZjMGEzOGVkNTggMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAorKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKQEAgLTQ3MCw3ICs0NzAsNyBAQCBzdGF0aWMgaW5s aW5lIHZvaWQgaW50ZWxfcmluZ19hZHZhbmNlKHN0cnVjdCBpbnRlbF9yaW5nICpyaW5nKQogfQog CiBpbnQgX19pbnRlbF9yaW5nX3NwYWNlKGludCBoZWFkLCBpbnQgdGFpbCwgaW50IHNpemUpOwot dm9pZCBpbnRlbF9yaW5nX3VwZGF0ZV9zcGFjZShzdHJ1Y3QgaW50ZWxfcmluZyAqcmluZ2J1Zik7 Cit2b2lkIGludGVsX3JpbmdfdXBkYXRlX3NwYWNlKHN0cnVjdCBpbnRlbF9yaW5nICpyaW5nKTsK IAogaW50IF9fbXVzdF9jaGVjayBpbnRlbF9lbmdpbmVfaWRsZShzdHJ1Y3QgaW50ZWxfZW5naW5l X2NzICplbmdpbmUpOwogdm9pZCBpbnRlbF9lbmdpbmVfaW5pdF9zZXFubyhzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICplbmdpbmUsIHUzMiBzZXFubyk7CkBAIC00OTQsOSArNDk0LDkgQEAgc3RhdGlj IGlubGluZSB1MzIgaW50ZWxfZW5naW5lX2dldF9zZXFubyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICplbmdpbmUpCiAKIGludCBpbml0X3dvcmthcm91bmRzX3Jpbmcoc3RydWN0IGludGVsX2VuZ2lu ZV9jcyAqZW5naW5lKTsKIAotc3RhdGljIGlubGluZSB1MzIgaW50ZWxfcmluZ19nZXRfdGFpbChz dHJ1Y3QgaW50ZWxfcmluZyAqcmluZ2J1ZikKK3N0YXRpYyBpbmxpbmUgdTMyIGludGVsX3Jpbmdf Z2V0X3RhaWwoc3RydWN0IGludGVsX3JpbmcgKnJpbmcpCiB7Ci0JcmV0dXJuIHJpbmdidWYtPnRh aWw7CisJcmV0dXJuIHJpbmctPnRhaWw7CiB9CiAKIC8qCi0tIAoyLjguMQoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlz dApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==