From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 31/64] drm/i915: Rename intel_pin_and_map_ring() Date: Thu, 7 Jul 2016 09:41:37 +0100 Message-ID: <1467880930-23082-31-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-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id A67CD6E756 for ; Thu, 7 Jul 2016 08:43:03 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id 187so3803020wmz.1 for ; Thu, 07 Jul 2016 01:43:03 -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 Rm9yIG1vcmUgY29uc2lzdGVudCBvb3AtbmFtaW5nLCB3ZSB3b3VsZCB1c2UgaW50ZWxfcmluZ192 ZXJiLCBzbyBwaWNrCmludGVsX3JpbmdfcGluKCkgYW5kIGludGVsX3JpbmdfdW5waW4oKS4KClNp Z25lZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgotLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jICAgICAgICB8ICA0ICsrLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYyB8IDM4ICsrKysrKysrKysrKysrKyst LS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5o IHwgIDUgKystLS0KIDMgZmlsZXMgY2hhbmdlZCwgMjMgaW5zZXJ0aW9ucygrKSwgMjQgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwppbmRleCAwZThiMmNkODlhY2EuLmQ1ZmQ1 ZmZmN2VjYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKQEAgLTk3Niw3ICs5NzYsNyBAQCBz dGF0aWMgaW50IGludGVsX2xyX2NvbnRleHRfcGluKHN0cnVjdCBpOTE1X2dlbV9jb250ZXh0ICpj dHgsCiAKIAlscmNfcmVnX3N0YXRlID0gdmFkZHIgKyBMUkNfU1RBVEVfUE4gKiBQQUdFX1NJWkU7 CiAKLQlyZXQgPSBpbnRlbF9waW5fYW5kX21hcF9yaW5nKGRldl9wcml2LCBjZS0+cmluZyk7CisJ cmV0ID0gaW50ZWxfcmluZ19waW4oY2UtPnJpbmcpOwogCWlmIChyZXQpCiAJCWdvdG8gdW5waW5f bWFwOwogCkBAIC0xMDE0LDcgKzEwMTQsNyBAQCB2b2lkIGludGVsX2xyX2NvbnRleHRfdW5waW4o c3RydWN0IGk5MTVfZ2VtX2NvbnRleHQgKmN0eCwKIAlpZiAoLS1jZS0+cGluX2NvdW50KQogCQly ZXR1cm47CiAKLQlpbnRlbF91bnBpbl9yaW5nKGNlLT5yaW5nKTsKKwlpbnRlbF9yaW5nX3VucGlu KGNlLT5yaW5nKTsKIAogCWk5MTVfZ2VtX29iamVjdF91bnBpbl9tYXAoY2UtPnN0YXRlKTsKIAlp OTE1X2dlbV9vYmplY3RfZ2d0dF91bnBpbihjZS0+c3RhdGUpOwpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfcmluZ2J1ZmZlci5jCmluZGV4IDIxNGQ1MWYyOTFlNS4uOGQ5MzE1NTJlOWUwIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCkBAIC0xOTgyLDI0ICsxOTgyLDkg QEAgc3RhdGljIGludCBpbml0X3BoeXNfc3RhdHVzX3BhZ2Uoc3RydWN0IGludGVsX2VuZ2luZV9j cyAqZW5naW5lKQogCXJldHVybiAwOwogfQogCi12b2lkIGludGVsX3VucGluX3Jpbmcoc3RydWN0 IGludGVsX3JpbmcgKnJpbmcpCi17Ci0JR0VNX0JVR19PTighcmluZy0+dm1hKTsKLQlHRU1fQlVH X09OKCFyaW5nLT52YWRkcik7Ci0KLQlpZiAoSEFTX0xMQyhyaW5nLT5vYmotPmJhc2UuZGV2KSAm JiAhcmluZy0+b2JqLT5zdG9sZW4pCi0JCWk5MTVfZ2VtX29iamVjdF91bnBpbl9tYXAocmluZy0+ b2JqKTsKLQllbHNlCi0JCWk5MTVfdm1hX3VucGluX2lvbWFwKHJpbmctPnZtYSk7Ci0JcmluZy0+ dmFkZHIgPSBOVUxMOwotCi0JaTkxNV9nZW1fb2JqZWN0X2dndHRfdW5waW4ocmluZy0+b2JqKTsK LQlyaW5nLT52bWEgPSBOVUxMOwotfQotCi1pbnQgaW50ZWxfcGluX2FuZF9tYXBfcmluZyhzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCi0JCQkgICBzdHJ1Y3QgaW50ZWxfcmluZyAq cmluZykKK2ludCBpbnRlbF9yaW5nX3BpbihzdHJ1Y3QgaW50ZWxfcmluZyAqcmluZykKIHsKKwlz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSByaW5nLT5lbmdpbmUtPmk5MTU7CiAJ c3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiA9IHJpbmctPm9iajsKIAkvKiBSaW5nIHdy YXBhcm91bmQgYXQgb2Zmc2V0IDAgc29tZXRpbWVzIGhhbmdzLiBObyBpZGVhIHdoeS4gKi8KIAl1 bnNpZ25lZCBmbGFncyA9IFBJTl9PRkZTRVRfQklBUyB8IDQwOTY7CkBAIC0yMDQ5LDYgKzIwMzQs MjEgQEAgZXJyX3VucGluOgogCXJldHVybiByZXQ7CiB9CiAKK3ZvaWQgaW50ZWxfcmluZ191bnBp bihzdHJ1Y3QgaW50ZWxfcmluZyAqcmluZykKK3sKKwlHRU1fQlVHX09OKCFyaW5nLT52bWEpOwor CUdFTV9CVUdfT04oIXJpbmctPnZhZGRyKTsKKworCWlmIChIQVNfTExDKHJpbmctPmVuZ2luZS0+ aTkxNSkgJiYgIXJpbmctPm9iai0+c3RvbGVuKQorCQlpOTE1X2dlbV9vYmplY3RfdW5waW5fbWFw KHJpbmctPm9iaik7CisJZWxzZQorCQlpOTE1X3ZtYV91bnBpbl9pb21hcChyaW5nLT52bWEpOwor CXJpbmctPnZhZGRyID0gTlVMTDsKKworCWk5MTVfZ2VtX29iamVjdF9nZ3R0X3VucGluKHJpbmct Pm9iaik7CisJcmluZy0+dm1hID0gTlVMTDsKK30KKwogc3RhdGljIHZvaWQgaW50ZWxfZGVzdHJv eV9yaW5nYnVmZmVyX29iaihzdHJ1Y3QgaW50ZWxfcmluZyAqcmluZykKIHsKIAlpOTE1X2dlbV9v YmplY3RfcHV0KHJpbmctPm9iaik7CkBAIC0yMjI3LDcgKzIyMjcsNyBAQCBzdGF0aWMgaW50IGlu dGVsX2luaXRfZW5naW5lKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQlnb3RvIGVycm9yOwog CX0KIAotCXJldCA9IGludGVsX3Bpbl9hbmRfbWFwX3JpbmcoZGV2X3ByaXYsIHJpbmcpOworCXJl dCA9IGludGVsX3JpbmdfcGluKHJpbmcpOwogCWlmIChyZXQpIHsKIAkJRFJNX0VSUk9SKCJGYWls ZWQgdG8gcGluIGFuZCBtYXAgcmluZ2J1ZmZlciAlczogJWRcbiIsCiAJCQkJZW5naW5lLT5uYW1l LCByZXQpOwpAQCAtMjI1OSw3ICsyMjU5LDcgQEAgdm9pZCBpbnRlbF9lbmdpbmVfY2xlYW51cChz dHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAJCWludGVsX2VuZ2luZV9zdG9wKGVuZ2lu ZSk7CiAJCVdBUk5fT04oIUlTX0dFTjIoZGV2X3ByaXYpICYmIChJOTE1X1JFQURfTU9ERShlbmdp bmUpICYgTU9ERV9JRExFKSA9PSAwKTsKIAotCQlpbnRlbF91bnBpbl9yaW5nKGVuZ2luZS0+YnVm ZmVyKTsKKwkJaW50ZWxfcmluZ191bnBpbihlbmdpbmUtPmJ1ZmZlcik7CiAJCWludGVsX3Jpbmdf ZnJlZShlbmdpbmUtPmJ1ZmZlcik7CiAJCWVuZ2luZS0+YnVmZmVyID0gTlVMTDsKIAl9CmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmggYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKaW5kZXggMTRmYzBhMzhlZDU4Li5kYmMx N2M0YWM5OGIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZm ZXIuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKQEAgLTQ0 MCw5ICs0NDAsOCBAQCBpbnRlbF93cml0ZV9zdGF0dXNfcGFnZShzdHJ1Y3QgaW50ZWxfZW5naW5l X2NzICplbmdpbmUsCiAKIHN0cnVjdCBpbnRlbF9yaW5nICoKIGludGVsX2VuZ2luZV9jcmVhdGVf cmluZyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsIGludCBzaXplKTsKLWludCBpbnRl bF9waW5fYW5kX21hcF9yaW5nKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKLQkJ CSAgIHN0cnVjdCBpbnRlbF9yaW5nICpyaW5nKTsKLXZvaWQgaW50ZWxfdW5waW5fcmluZyhzdHJ1 Y3QgaW50ZWxfcmluZyAqcmluZyk7CitpbnQgaW50ZWxfcmluZ19waW4oc3RydWN0IGludGVsX3Jp bmcgKnJpbmcpOwordm9pZCBpbnRlbF9yaW5nX3VucGluKHN0cnVjdCBpbnRlbF9yaW5nICpyaW5n KTsKIHZvaWQgaW50ZWxfcmluZ19mcmVlKHN0cnVjdCBpbnRlbF9yaW5nICpyaW5nKTsKIAogdm9p ZCBpbnRlbF9lbmdpbmVfc3RvcChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpOwotLSAK Mi44LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCklu dGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw czovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=