From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 32/62] drm/i915: Rename intel_pin_and_map_ring() Date: Fri, 3 Jun 2016 17:36:57 +0100 Message-ID: <1464971847-15809-33-git-send-email-chris@chris-wilson.co.uk> References: <1464971847-15809-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 549F96EE31 for ; Fri, 3 Jun 2016 16:38:06 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id a136so630840wme.0 for ; Fri, 03 Jun 2016 09:38:06 -0700 (PDT) In-Reply-To: <1464971847-15809-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 Rm9yIG1vcmUgY29uc2lzdGVudCBvb3AtbmFtaW5nLCB3ZSB3b3VsZCB1c2UgaW50ZWxfcmluZ192 ZXJiLCBzbyBwaWNrCmludGVsX3JpbmdfcGluKCkgYW5kIGludGVsX3JpbmdfdW5waW4oKS4KClNp Z25lZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgotLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jICAgICAgICB8ICA0ICsrLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYyB8IDM4ICsrKysrKysrKysrKysrKyst LS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5o IHwgIDUgKystLS0KIDMgZmlsZXMgY2hhbmdlZCwgMjMgaW5zZXJ0aW9ucygrKSwgMjQgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwppbmRleCBmZDA5M2VmZmZlODUuLmU4Njg1 Y2U0ZDJhNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKQEAgLTk1NCw3ICs5NTQsNyBAQCBz dGF0aWMgaW50IGludGVsX2xyX2NvbnRleHRfcGluKHN0cnVjdCBpOTE1X2dlbV9jb250ZXh0ICpj dHgsCiAKIAlscmNfcmVnX3N0YXRlID0gdmFkZHIgKyBMUkNfU1RBVEVfUE4gKiBQQUdFX1NJWkU7 CiAKLQlyZXQgPSBpbnRlbF9waW5fYW5kX21hcF9yaW5nKGRldl9wcml2LCBjZS0+cmluZyk7CisJ cmV0ID0gaW50ZWxfcmluZ19waW4oY2UtPnJpbmcpOwogCWlmIChyZXQpCiAJCWdvdG8gdW5waW5f bWFwOwogCkBAIC05OTIsNyArOTkyLDcgQEAgdm9pZCBpbnRlbF9scl9jb250ZXh0X3VucGluKHN0 cnVjdCBpOTE1X2dlbV9jb250ZXh0ICpjdHgsCiAJaWYgKC0tY2UtPnBpbl9jb3VudCkKIAkJcmV0 dXJuOwogCi0JaW50ZWxfdW5waW5fcmluZyhjZS0+cmluZyk7CisJaW50ZWxfcmluZ191bnBpbihj ZS0+cmluZyk7CiAKIAlpOTE1X2dlbV9vYmplY3RfdW5waW5fbWFwKGNlLT5zdGF0ZSk7CiAJaTkx NV9nZW1fb2JqZWN0X2dndHRfdW5waW4oY2UtPnN0YXRlKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3JpbmdidWZmZXIuYwppbmRleCBkNjQzNjk4ZGE4MzAuLjA3YzI0NzBjMjRmOSAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwpAQCAtMTg5NCwyNCArMTg5NCw5IEBA IHN0YXRpYyBpbnQgaW5pdF9waHlzX3N0YXR1c19wYWdlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg KmVuZ2luZSkKIAlyZXR1cm4gMDsKIH0KIAotdm9pZCBpbnRlbF91bnBpbl9yaW5nKHN0cnVjdCBp bnRlbF9yaW5nICpyaW5nKQotewotCUdFTV9CVUdfT04ocmluZy0+dm1hID09IE5VTEwpOwotCUdF TV9CVUdfT04ocmluZy0+dmFkZHIgPT0gTlVMTCk7Ci0KLQlpZiAoSEFTX0xMQyhyaW5nLT5vYmot PmJhc2UuZGV2KSAmJiAhcmluZy0+b2JqLT5zdG9sZW4pCi0JCWk5MTVfZ2VtX29iamVjdF91bnBp bl9tYXAocmluZy0+b2JqKTsKLQllbHNlCi0JCWk5MTVfdm1hX3VucGluX2lvbWFwKHJpbmctPnZt YSk7Ci0JcmluZy0+dmFkZHIgPSBOVUxMOwotCi0JaTkxNV9nZW1fb2JqZWN0X2dndHRfdW5waW4o cmluZy0+b2JqKTsKLQlyaW5nLT52bWEgPSBOVUxMOwotfQotCi1pbnQgaW50ZWxfcGluX2FuZF9t YXBfcmluZyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCi0JCQkgICBzdHJ1Y3Qg aW50ZWxfcmluZyAqcmluZykKK2ludCBpbnRlbF9yaW5nX3BpbihzdHJ1Y3QgaW50ZWxfcmluZyAq cmluZykKIHsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSByaW5nLT5lbmdp bmUtPmk5MTU7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiA9IHJpbmctPm9iajsK IAkvKiBSaW5nIHdyYXBhcm91bmQgYXQgb2Zmc2V0IDAgc29tZXRpbWVzIGhhbmdzLiBObyBpZGVh IHdoeS4gKi8KIAl1bnNpZ25lZCBmbGFncyA9IFBJTl9PRkZTRVRfQklBUyB8IDQwOTY7CkBAIC0x OTYxLDYgKzE5NDYsMjEgQEAgZXJyX3VucGluOgogCXJldHVybiByZXQ7CiB9CiAKK3ZvaWQgaW50 ZWxfcmluZ191bnBpbihzdHJ1Y3QgaW50ZWxfcmluZyAqcmluZykKK3sKKwlHRU1fQlVHX09OKHJp bmctPnZtYSA9PSBOVUxMKTsKKwlHRU1fQlVHX09OKHJpbmctPnZhZGRyID09IE5VTEwpOworCisJ aWYgKEhBU19MTEMocmluZy0+ZW5naW5lLT5pOTE1KSAmJiAhcmluZy0+b2JqLT5zdG9sZW4pCisJ CWk5MTVfZ2VtX29iamVjdF91bnBpbl9tYXAocmluZy0+b2JqKTsKKwllbHNlCisJCWk5MTVfdm1h X3VucGluX2lvbWFwKHJpbmctPnZtYSk7CisJcmluZy0+dmFkZHIgPSBOVUxMOworCisJaTkxNV9n ZW1fb2JqZWN0X2dndHRfdW5waW4ocmluZy0+b2JqKTsKKwlyaW5nLT52bWEgPSBOVUxMOworfQor CiBzdGF0aWMgdm9pZCBpbnRlbF9kZXN0cm95X3JpbmdidWZmZXJfb2JqKHN0cnVjdCBpbnRlbF9y aW5nICpyaW5nKQogewogCWk5MTVfZ2VtX29iamVjdF9wdXQocmluZy0+b2JqKTsKQEAgLTIxMzcs NyArMjEzNyw3IEBAIHN0YXRpYyBpbnQgaW50ZWxfaW5pdF9lbmdpbmUoc3RydWN0IGRybV9kZXZp Y2UgKmRldiwKIAkJCWdvdG8gZXJyb3I7CiAJfQogCi0JcmV0ID0gaW50ZWxfcGluX2FuZF9tYXBf cmluZyhkZXZfcHJpdiwgcmluZyk7CisJcmV0ID0gaW50ZWxfcmluZ19waW4ocmluZyk7CiAJaWYg KHJldCkgewogCQlEUk1fRVJST1IoIkZhaWxlZCB0byBwaW4gYW5kIG1hcCByaW5nYnVmZmVyICVz OiAlZFxuIiwKIAkJCQllbmdpbmUtPm5hbWUsIHJldCk7CkBAIC0yMTY5LDcgKzIxNjksNyBAQCB2 b2lkIGludGVsX2VuZ2luZV9jbGVhbnVwKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkK IAkJaW50ZWxfZW5naW5lX3N0b3AoZW5naW5lKTsKIAkJV0FSTl9PTighSVNfR0VOMihkZXZfcHJp dikgJiYgKEk5MTVfUkVBRF9NT0RFKGVuZ2luZSkgJiBNT0RFX0lETEUpID09IDApOwogCi0JCWlu dGVsX3VucGluX3JpbmcoZW5naW5lLT5idWZmZXIpOworCQlpbnRlbF9yaW5nX3VucGluKGVuZ2lu ZS0+YnVmZmVyKTsKIAkJaW50ZWxfcmluZ19mcmVlKGVuZ2luZS0+YnVmZmVyKTsKIAkJZW5naW5l LT5idWZmZXIgPSBOVUxMOwogCX0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3JpbmdidWZmZXIuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIu aAppbmRleCBlZjAxMzMxODhhNjUuLjU0MDNjYzYxNDA5NSAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3JpbmdidWZmZXIuaApAQCAtNDUwLDkgKzQ1MCw4IEBAIGludGVsX3dyaXRlX3N0YXR1 c19wYWdlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwKIAogc3RydWN0IGludGVsX3Jp bmcgKgogaW50ZWxfZW5naW5lX2NyZWF0ZV9yaW5nKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVu Z2luZSwgaW50IHNpemUpOwotaW50IGludGVsX3Bpbl9hbmRfbWFwX3Jpbmcoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2LAotCQkJICAgc3RydWN0IGludGVsX3JpbmcgKnJpbmcpOwot dm9pZCBpbnRlbF91bnBpbl9yaW5nKHN0cnVjdCBpbnRlbF9yaW5nICpyaW5nKTsKK2ludCBpbnRl bF9yaW5nX3BpbihzdHJ1Y3QgaW50ZWxfcmluZyAqcmluZyk7Cit2b2lkIGludGVsX3JpbmdfdW5w aW4oc3RydWN0IGludGVsX3JpbmcgKnJpbmcpOwogdm9pZCBpbnRlbF9yaW5nX2ZyZWUoc3RydWN0 IGludGVsX3JpbmcgKnJpbmcpOwogCiB2b2lkIGludGVsX2VuZ2luZV9zdG9wKHN0cnVjdCBpbnRl bF9lbmdpbmVfY3MgKmVuZ2luZSk7Ci0tIAoyLjguMQoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==