From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 05/73] drm/i915: Rename residual ringbuf parameters Date: Mon, 1 Aug 2016 10:10:13 +0100 Message-ID: <1470042681-25318-6-git-send-email-chris@chris-wilson.co.uk> References: <1470042681-25318-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-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id BB6B06E1E1 for ; Mon, 1 Aug 2016 09:11:38 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id o80so25247524wme.0 for ; Mon, 01 Aug 2016 02:11:38 -0700 (PDT) In-Reply-To: <1470042681-25318-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+Ckxp bms6IGh0dHA6Ly9wYXRjaHdvcmsuZnJlZWRlc2t0b3Aub3JnL3BhdGNoL21zZ2lkLzE0Njk0MzI2 ODctMjI3NTYtMTYtZ2l0LXNlbmQtZW1haWwtY2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrClJldmll d2VkLWJ5OiBKb29uYXMgTGFodGluZW4gPGpvb25hcy5sYWh0aW5lbkBsaW51eC5pbnRlbC5jb20+ Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jIHwgNjYgKysrKysr KysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9y aW5nYnVmZmVyLmggfCAgNiArLS0KIDIgZmlsZXMgY2hhbmdlZCwgMzYgaW5zZXJ0aW9ucygrKSwg MzYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf cmluZ2J1ZmZlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCmlu ZGV4IGFjYmFiYmRlY2VjZC4uNWRkNzIwZTdmZWFhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfcmluZ2J1ZmZlci5jCkBAIC00NywxNSArNDcsMTUgQEAgaW50IF9faW50ZWxfcmluZ19zcGFj ZShpbnQgaGVhZCwgaW50IHRhaWwsIGludCBzaXplKQogCXJldHVybiBzcGFjZSAtIEk5MTVfUklO R19GUkVFX1NQQUNFOwogfQogCi12b2lkIGludGVsX3JpbmdfdXBkYXRlX3NwYWNlKHN0cnVjdCBp bnRlbF9yaW5nICpyaW5nYnVmKQordm9pZCBpbnRlbF9yaW5nX3VwZGF0ZV9zcGFjZShzdHJ1Y3Qg aW50ZWxfcmluZyAqcmluZykKIHsKLQlpZiAocmluZ2J1Zi0+bGFzdF9yZXRpcmVkX2hlYWQgIT0g LTEpIHsKLQkJcmluZ2J1Zi0+aGVhZCA9IHJpbmdidWYtPmxhc3RfcmV0aXJlZF9oZWFkOwotCQly aW5nYnVmLT5sYXN0X3JldGlyZWRfaGVhZCA9IC0xOworCWlmIChyaW5nLT5sYXN0X3JldGlyZWRf aGVhZCAhPSAtMSkgeworCQlyaW5nLT5oZWFkID0gcmluZy0+bGFzdF9yZXRpcmVkX2hlYWQ7CisJ CXJpbmctPmxhc3RfcmV0aXJlZF9oZWFkID0gLTE7CiAJfQogCi0JcmluZ2J1Zi0+c3BhY2UgPSBf X2ludGVsX3Jpbmdfc3BhY2UocmluZ2J1Zi0+aGVhZCAmIEhFQURfQUREUiwKLQkJCQkJICAgIHJp bmdidWYtPnRhaWwsIHJpbmdidWYtPnNpemUpOworCXJpbmctPnNwYWNlID0gX19pbnRlbF9yaW5n X3NwYWNlKHJpbmctPmhlYWQgJiBIRUFEX0FERFIsCisJCQkJCSByaW5nLT50YWlsLCByaW5nLT5z aXplKTsKIH0KIAogc3RhdGljIHZvaWQgX19pbnRlbF9lbmdpbmVfc3VibWl0KHN0cnVjdCBpbnRl bF9lbmdpbmVfY3MgKmVuZ2luZSkKQEAgLTE5OTMsMjUgKzE5OTMsMjUgQEAgc3RhdGljIGludCBp bml0X3BoeXNfc3RhdHVzX3BhZ2Uoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogCXJl dHVybiAwOwogfQogCi12b2lkIGludGVsX3VucGluX3Jpbmcoc3RydWN0IGludGVsX3JpbmcgKnJp bmdidWYpCit2b2lkIGludGVsX3VucGluX3Jpbmcoc3RydWN0IGludGVsX3JpbmcgKnJpbmcpCiB7 Ci0JR0VNX0JVR19PTighcmluZ2J1Zi0+dm1hKTsKLQlHRU1fQlVHX09OKCFyaW5nYnVmLT52YWRk cik7CisJR0VNX0JVR19PTighcmluZy0+dm1hKTsKKwlHRU1fQlVHX09OKCFyaW5nLT52YWRkcik7 CiAKLQlpZiAoSEFTX0xMQyhyaW5nYnVmLT5vYmotPmJhc2UuZGV2KSAmJiAhcmluZ2J1Zi0+b2Jq LT5zdG9sZW4pCi0JCWk5MTVfZ2VtX29iamVjdF91bnBpbl9tYXAocmluZ2J1Zi0+b2JqKTsKKwlp ZiAoSEFTX0xMQyhyaW5nLT5vYmotPmJhc2UuZGV2KSAmJiAhcmluZy0+b2JqLT5zdG9sZW4pCisJ CWk5MTVfZ2VtX29iamVjdF91bnBpbl9tYXAocmluZy0+b2JqKTsKIAllbHNlCi0JCWk5MTVfdm1h X3VucGluX2lvbWFwKHJpbmdidWYtPnZtYSk7Ci0JcmluZ2J1Zi0+dmFkZHIgPSBOVUxMOworCQlp OTE1X3ZtYV91bnBpbl9pb21hcChyaW5nLT52bWEpOworCXJpbmctPnZhZGRyID0gTlVMTDsKIAot CWk5MTVfZ2VtX29iamVjdF9nZ3R0X3VucGluKHJpbmdidWYtPm9iaik7Ci0JcmluZ2J1Zi0+dm1h ID0gTlVMTDsKKwlpOTE1X2dlbV9vYmplY3RfZ2d0dF91bnBpbihyaW5nLT5vYmopOworCXJpbmct PnZtYSA9IE5VTEw7CiB9CiAKIGludCBpbnRlbF9waW5fYW5kX21hcF9yaW5nKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiwKLQkJCSAgIHN0cnVjdCBpbnRlbF9yaW5nICpyaW5nYnVm KQorCQkJICAgc3RydWN0IGludGVsX3JpbmcgKnJpbmcpCiB7Ci0Jc3RydWN0IGRybV9pOTE1X2dl bV9vYmplY3QgKm9iaiA9IHJpbmdidWYtPm9iajsKKwlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVj dCAqb2JqID0gcmluZy0+b2JqOwogCS8qIFJpbmcgd3JhcGFyb3VuZCBhdCBvZmZzZXQgMCBzb21l dGltZXMgaGFuZ3MuIE5vIGlkZWEgd2h5LiAqLwogCXVuc2lnbmVkIGZsYWdzID0gUElOX09GRlNF VF9CSUFTIHwgNDA5NjsKIAl2b2lkICphZGRyOwpAQCAtMjA1Miw4ICsyMDUyLDggQEAgaW50IGlu dGVsX3Bpbl9hbmRfbWFwX3Jpbmcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAog CQl9CiAJfQogCi0JcmluZ2J1Zi0+dmFkZHIgPSBhZGRyOwotCXJpbmdidWYtPnZtYSA9IGk5MTVf Z2VtX29ial90b19nZ3R0KG9iaik7CisJcmluZy0+dmFkZHIgPSBhZGRyOworCXJpbmctPnZtYSA9 IGk5MTVfZ2VtX29ial90b19nZ3R0KG9iaik7CiAJcmV0dXJuIDA7CiAKIGVycl91bnBpbjoKQEAg LTIwNjEsMjkgKzIwNjEsMjkgQEAgZXJyX3VucGluOgogCXJldHVybiByZXQ7CiB9CiAKLXN0YXRp YyB2b2lkIGludGVsX2Rlc3Ryb3lfcmluZ2J1ZmZlcl9vYmooc3RydWN0IGludGVsX3JpbmcgKnJp bmdidWYpCitzdGF0aWMgdm9pZCBpbnRlbF9kZXN0cm95X3JpbmdidWZmZXJfb2JqKHN0cnVjdCBp bnRlbF9yaW5nICpyaW5nKQogewotCWk5MTVfZ2VtX29iamVjdF9wdXQocmluZ2J1Zi0+b2JqKTsK LQlyaW5nYnVmLT5vYmogPSBOVUxMOworCWk5MTVfZ2VtX29iamVjdF9wdXQocmluZy0+b2JqKTsK KwlyaW5nLT5vYmogPSBOVUxMOwogfQogCiBzdGF0aWMgaW50IGludGVsX2FsbG9jX3JpbmdidWZm ZXJfb2JqKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCi0JCQkJICAgICAgc3RydWN0IGludGVsX3Jp bmcgKnJpbmdidWYpCisJCQkJICAgICAgc3RydWN0IGludGVsX3JpbmcgKnJpbmcpCiB7CiAJc3Ry dWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iajsKIAogCW9iaiA9IE5VTEw7CiAJaWYgKCFIQVNf TExDKGRldikpCi0JCW9iaiA9IGk5MTVfZ2VtX29iamVjdF9jcmVhdGVfc3RvbGVuKGRldiwgcmlu Z2J1Zi0+c2l6ZSk7CisJCW9iaiA9IGk5MTVfZ2VtX29iamVjdF9jcmVhdGVfc3RvbGVuKGRldiwg cmluZy0+c2l6ZSk7CiAJaWYgKG9iaiA9PSBOVUxMKQotCQlvYmogPSBpOTE1X2dlbV9vYmplY3Rf Y3JlYXRlKGRldiwgcmluZ2J1Zi0+c2l6ZSk7CisJCW9iaiA9IGk5MTVfZ2VtX29iamVjdF9jcmVh dGUoZGV2LCByaW5nLT5zaXplKTsKIAlpZiAoSVNfRVJSKG9iaikpCiAJCXJldHVybiBQVFJfRVJS KG9iaik7CiAKIAkvKiBtYXJrIHJpbmcgYnVmZmVycyBhcyByZWFkLW9ubHkgZnJvbSBHUFUgc2lk ZSBieSBkZWZhdWx0ICovCiAJb2JqLT5ndF9ybyA9IDE7CiAKLQlyaW5nYnVmLT5vYmogPSBvYmo7 CisJcmluZy0+b2JqID0gb2JqOwogCiAJcmV0dXJuIDA7CiB9CkBAIC0yMTkwLDcgKzIxOTAsNyBA QCBzdGF0aWMgdm9pZCBpbnRlbF9yaW5nX2NvbnRleHRfdW5waW4oc3RydWN0IGk5MTVfZ2VtX2Nv bnRleHQgKmN0eCwKIHN0YXRpYyBpbnQgaW50ZWxfaW5pdF9yaW5nX2J1ZmZlcihzdHJ1Y3QgaW50 ZWxfZW5naW5lX2NzICplbmdpbmUpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2ID0gZW5naW5lLT5pOTE1OwotCXN0cnVjdCBpbnRlbF9yaW5nICpyaW5nYnVmOworCXN0cnVj dCBpbnRlbF9yaW5nICpyaW5nOwogCWludCByZXQ7CiAKIAlXQVJOX09OKGVuZ2luZS0+YnVmZmVy KTsKQEAgLTIyMTUsMTIgKzIyMTUsMTIgQEAgc3RhdGljIGludCBpbnRlbF9pbml0X3JpbmdfYnVm ZmVyKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAlpZiAocmV0KQogCQlnb3RvIGVy cm9yOwogCi0JcmluZ2J1ZiA9IGludGVsX2VuZ2luZV9jcmVhdGVfcmluZyhlbmdpbmUsIDMyICog UEFHRV9TSVpFKTsKLQlpZiAoSVNfRVJSKHJpbmdidWYpKSB7Ci0JCXJldCA9IFBUUl9FUlIocmlu Z2J1Zik7CisJcmluZyA9IGludGVsX2VuZ2luZV9jcmVhdGVfcmluZyhlbmdpbmUsIDMyICogUEFH RV9TSVpFKTsKKwlpZiAoSVNfRVJSKHJpbmcpKSB7CisJCXJldCA9IFBUUl9FUlIocmluZyk7CiAJ CWdvdG8gZXJyb3I7CiAJfQotCWVuZ2luZS0+YnVmZmVyID0gcmluZ2J1ZjsKKwllbmdpbmUtPmJ1 ZmZlciA9IHJpbmc7CiAKIAlpZiAoSTkxNV9ORUVEX0dGWF9IV1MoZGV2X3ByaXYpKSB7CiAJCXJl dCA9IGluaXRfc3RhdHVzX3BhZ2UoZW5naW5lKTsKQEAgLTIyMzMsMTEgKzIyMzMsMTEgQEAgc3Rh dGljIGludCBpbnRlbF9pbml0X3JpbmdfYnVmZmVyKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVu Z2luZSkKIAkJCWdvdG8gZXJyb3I7CiAJfQogCi0JcmV0ID0gaW50ZWxfcGluX2FuZF9tYXBfcmlu ZyhkZXZfcHJpdiwgcmluZ2J1Zik7CisJcmV0ID0gaW50ZWxfcGluX2FuZF9tYXBfcmluZyhkZXZf cHJpdiwgcmluZyk7CiAJaWYgKHJldCkgewogCQlEUk1fRVJST1IoIkZhaWxlZCB0byBwaW4gYW5k IG1hcCByaW5nYnVmZmVyICVzOiAlZFxuIiwKIAkJCQllbmdpbmUtPm5hbWUsIHJldCk7Ci0JCWlu dGVsX2Rlc3Ryb3lfcmluZ2J1ZmZlcl9vYmoocmluZ2J1Zik7CisJCWludGVsX2Rlc3Ryb3lfcmlu Z2J1ZmZlcl9vYmoocmluZyk7CiAJCWdvdG8gZXJyb3I7CiAJfQogCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9yaW5nYnVmZmVyLmgKaW5kZXggOGY5NGU5MzQ1ODE5Li4yZGZjNDE4YzUxMDIgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAorKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKQEAgLTQ3MSw3ICs0NzEsNyBA QCBzdGF0aWMgaW5saW5lIHZvaWQgaW50ZWxfcmluZ19hZHZhbmNlKHN0cnVjdCBpbnRlbF9yaW5n ICpyaW5nKQogfQogCiBpbnQgX19pbnRlbF9yaW5nX3NwYWNlKGludCBoZWFkLCBpbnQgdGFpbCwg aW50IHNpemUpOwotdm9pZCBpbnRlbF9yaW5nX3VwZGF0ZV9zcGFjZShzdHJ1Y3QgaW50ZWxfcmlu ZyAqcmluZ2J1Zik7Cit2b2lkIGludGVsX3JpbmdfdXBkYXRlX3NwYWNlKHN0cnVjdCBpbnRlbF9y aW5nICpyaW5nKTsKIAogaW50IF9fbXVzdF9jaGVjayBpbnRlbF9lbmdpbmVfaWRsZShzdHJ1Y3Qg aW50ZWxfZW5naW5lX2NzICplbmdpbmUpOwogdm9pZCBpbnRlbF9lbmdpbmVfaW5pdF9zZXFubyhz dHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsIHUzMiBzZXFubyk7CkBAIC00OTgsOSArNDk4 LDkgQEAgc3RhdGljIGlubGluZSB1MzIgaW50ZWxfZW5naW5lX2dldF9zZXFubyhzdHJ1Y3QgaW50 ZWxfZW5naW5lX2NzICplbmdpbmUpCiAKIGludCBpbml0X3dvcmthcm91bmRzX3Jpbmcoc3RydWN0 IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKTsKIAotc3RhdGljIGlubGluZSB1MzIgaW50ZWxfcmlu Z19nZXRfdGFpbChzdHJ1Y3QgaW50ZWxfcmluZyAqcmluZ2J1ZikKK3N0YXRpYyBpbmxpbmUgdTMy IGludGVsX3JpbmdfZ2V0X3RhaWwoc3RydWN0IGludGVsX3JpbmcgKnJpbmcpCiB7Ci0JcmV0dXJu IHJpbmdidWYtPnRhaWw7CisJcmV0dXJuIHJpbmctPnRhaWw7CiB9CiAKIC8qCi0tIAoyLjguMQoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==