From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 48/55] drm/i915: Add *_ring_begin() to request allocation Date: Fri, 29 May 2015 17:44:09 +0100 Message-ID: <1432917856-12261-49-git-send-email-John.C.Harrison@Intel.com> References: <1432917856-12261-1-git-send-email-John.C.Harrison@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 1144F7215A for ; Fri, 29 May 2015 09:45:35 -0700 (PDT) In-Reply-To: <1432917856-12261-1-git-send-email-John.C.Harrison@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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KCk5vdyB0aGF0 IHRoZSAqX3JpbmdfYmVnaW4oKSBmdW5jdGlvbnMgbm8gbG9uZ2VyIGNhbGwgdGhlIHJlcXVlc3Qg YWxsb2NhdGlvbgpjb2RlLCBpdCBpcyBmaW5hbGx5IHNhZmUgZm9yIHRoZSByZXF1ZXN0IGFsbG9j YXRpb24gY29kZSB0byBjYWxsICpfcmluZ19iZWdpbigpLgpUaGlzIGlzIGltcG9ydGFudCB0byBn dWFyYW50ZWUgdGhhdCB0aGUgc3BhY2UgcmVzZXJ2ZWQgZm9yIHRoZSBzdWJzZXF1ZW50Cmk5MTVf YWRkX3JlcXVlc3QoKSBjYWxsIGRvZXMgYWN0dWFsbHkgZ2V0IHJlc2VydmVkLgoKdjI6IFJlbmFt ZWQgZnVuY3Rpb25zIGFjY29yZGluZyB0byByZXZpZXcgZmVlZGJhY2sgKFRvbWFzIEVsZikuCgpG b3I6IFZJWi01MTE1ClNpZ25lZC1vZmYtYnk6IEpvaG4gSGFycmlzb24gPEpvaG4uQy5IYXJyaXNv bkBJbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAgICAgICAg IHwgICAyNSArKysrKysrKysrKysrLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9scmMuYyAgICAgICAgfCAgIDE1ICsrKysrKysrKysrKysrKwogZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfbHJjLmggICAgICAgIHwgICAgMSArCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9yaW5nYnVmZmVyLmMgfCAgIDI5ICsrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmggfCAgICAxICsKIDUgZmlsZXMg Y2hhbmdlZCwgNDYgaW5zZXJ0aW9ucygrKSwgMjUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtLmMKaW5kZXggOWYzZTA3MTcuLjEyNjE3OTIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0u YwpAQCAtMjY4MCwxOSArMjY4MCwyMCBAQCBpbnQgaTkxNV9nZW1fcmVxdWVzdF9hbGxvYyhzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogCSAqIGk5MTVfYWRkX3JlcXVlc3QoKSBjYWxsIGNh bid0IGZhaWwuIE5vdGUgdGhhdCB0aGUgcmVzZXJ2ZSBtYXkgbmVlZAogCSAqIHRvIGJlIHJlZG9u ZSBpZiB0aGUgcmVxdWVzdCBpcyBub3QgYWN0dWFsbHkgc3VibWl0dGVkIHN0cmFpZ2h0CiAJICog YXdheSwgZS5nLiBiZWNhdXNlIGEgR1BVIHNjaGVkdWxlciBoYXMgZGVmZXJyZWQgaXQuCi0JICoK LQkgKiBOb3RlIGZ1cnRoZXIgdGhhdCB0aGlzIGNhbGwgbWVyZWx5IG5vdGVzIHRoZSByZXNlcnZl IHJlcXVlc3QuIEEKLQkgKiBzdWJzZXF1ZW50IGNhbGwgdG8gKl9yaW5nX2JlZ2luKCkgaXMgcmVx dWlyZWQgdG8gYWN0dWFsbHkgZW5zdXJlCi0JICogdGhhdCB0aGUgcmVzZXJ2YXRpb24gaXMgYXZh aWxhYmxlLiBXaXRob3V0IHRoZSBiZWdpbiwgaWYgdGhlCi0JICogcmVxdWVzdCBjcmVhdG9yIGlt bWVkaWF0ZWx5IHN1Ym1pdHRlZCB0aGUgcmVxdWVzdCB3aXRob3V0IGFkZGluZwotCSAqIGFueSBj b21tYW5kcyB0byBpdCB0aGVuIHRoZXJlIG1pZ2h0IG5vdCBhY3R1YWxseSBiZSBzdWZmaWNpZW50 Ci0JICogcm9vbSBmb3IgdGhlIHN1Ym1pc3Npb24gY29tbWFuZHMuIFVuZm9ydHVuYXRlbHksIHRo ZSBjdXJyZW50Ci0JICogKl9yaW5nX2JlZ2luKCkgaW1wbGVtZW50YXRpb25zIHBvdGVudGlhbGx5 IGNhbGwgYmFjayBoZXJlIHRvCi0JICogaTkxNV9nZW1fcmVxdWVzdF9hbGxvYygpLiBUaHVzIGNh bGxpbmcgX2JlZ2luKCkgaGVyZSB3b3VsZCBsZWFkIHRvCi0JICogaW5maW5pdGUgcmVjdXJzaW9u ISBVbnRpbCB0aGF0IGJhY2sgY2FsbCBwYXRoIGlzIHJlbW92ZWQsIGl0IGlzCi0JICogbmVjZXNz YXJ5IHRvIGRvIGEgbWFudWFsIF9iZWdpbigpIG91dHNpZGUuCiAJICovCi0JaW50ZWxfcmluZ19y ZXNlcnZlZF9zcGFjZV9yZXNlcnZlKHJlcS0+cmluZ2J1ZiwgTUlOX1NQQUNFX0ZPUl9BRERfUkVR VUVTVCk7CisJaWYgKGk5MTUuZW5hYmxlX2V4ZWNsaXN0cykKKwkJcmV0ID0gaW50ZWxfbG9naWNh bF9yaW5nX3Jlc2VydmVfc3BhY2UocmVxKTsKKwllbHNlCisJCXJldCA9IGludGVsX3JpbmdfcmVz ZXJ2ZV9zcGFjZShyZXEpOworCWlmIChyZXQpIHsKKwkJLyoKKwkJICogQXQgdGhpcyBwb2ludCwg dGhlIHJlcXVlc3QgaXMgZnVsbHkgYWxsb2NhdGVkIGV2ZW4gaWYgbm90CisJCSAqIGZ1bGx5IHBy ZXBhcmVkLiBUaHVzIGl0IGNhbiBiZSBjbGVhbmVkIHVwIHVzaW5nIHRoZSBwcm9wZXIKKwkJICog ZnJlZSBjb2RlLgorCQkgKi8KKwkJaTkxNV9nZW1fcmVxdWVzdF9jYW5jZWwocmVxKTsKKwkJcmV0 dXJuIHJldDsKKwl9CiAKIAkqcmVxX291dCA9IHJpbmctPm91dHN0YW5kaW5nX2xhenlfcmVxdWVz dCA9IHJlcTsKIAlyZXR1cm4gMDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2xyYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKaW5kZXggNTQ4YzUz ZC4uZTE2NGFjMCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKQEAgLTgyMyw2ICs4MjMsMjEg QEAgc3RhdGljIGludCBpbnRlbF9sb2dpY2FsX3JpbmdfYmVnaW4oc3RydWN0IGRybV9pOTE1X2dl bV9yZXF1ZXN0ICpyZXEsCiAJcmV0dXJuIDA7CiB9CiAKK2ludCBpbnRlbF9sb2dpY2FsX3Jpbmdf cmVzZXJ2ZV9zcGFjZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QpCit7CisJ LyoKKwkgKiBUaGUgZmlyc3QgY2FsbCBtZXJlbHkgbm90ZXMgdGhlIHJlc2VydmUgcmVxdWVzdCBh bmQgaXMgY29tbW9uIGZvcgorCSAqIGFsbCBiYWNrIGVuZHMuIFRoZSBzdWJzZXF1ZW50IGxvY2Fs aXNlZCBfYmVnaW4oKSBjYWxsIGFjdHVhbGx5CisJICogZW5zdXJlcyB0aGF0IHRoZSByZXNlcnZh dGlvbiBpcyBhdmFpbGFibGUuIFdpdGhvdXQgdGhlIGJlZ2luLCBpZgorCSAqIHRoZSByZXF1ZXN0 IGNyZWF0b3IgaW1tZWRpYXRlbHkgc3VibWl0dGVkIHRoZSByZXF1ZXN0IHdpdGhvdXQKKwkgKiBh ZGRpbmcgYW55IGNvbW1hbmRzIHRvIGl0IHRoZW4gdGhlcmUgbWlnaHQgbm90IGFjdHVhbGx5IGJl CisJICogc3VmZmljaWVudCByb29tIGZvciB0aGUgc3VibWlzc2lvbiBjb21tYW5kcy4KKwkgKi8K KwlpbnRlbF9yaW5nX3Jlc2VydmVkX3NwYWNlX3Jlc2VydmUocmVxdWVzdC0+cmluZ2J1ZiwgTUlO X1NQQUNFX0ZPUl9BRERfUkVRVUVTVCk7CisKKwlyZXR1cm4gaW50ZWxfbG9naWNhbF9yaW5nX2Jl Z2luKHJlcXVlc3QsIDApOworfQorCiAvKioKICAqIGV4ZWNsaXN0c19zdWJtaXNzaW9uKCkgLSBz dWJtaXQgYSBiYXRjaGJ1ZmZlciBmb3IgZXhlY3V0aW9uLCBFeGVjbGlzdHMgc3R5bGUKICAqIEBk ZXY6IERSTSBkZXZpY2UuCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9s cmMuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5oCmluZGV4IDA0NGMwZTUuLmY1 OTk0MGEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5oCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5oCkBAIC0zNyw2ICszNyw3IEBACiAKIC8q IExvZ2ljYWwgUmluZ3MgKi8KIGludCBpbnRlbF9sb2dpY2FsX3JpbmdfYWxsb2NfcmVxdWVzdF9l eHRyYXMoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0KTsKK2ludCBpbnRlbF9s b2dpY2FsX3JpbmdfcmVzZXJ2ZV9zcGFjZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJl cXVlc3QpOwogdm9pZCBpbnRlbF9sb2dpY2FsX3Jpbmdfc3RvcChzdHJ1Y3QgaW50ZWxfZW5naW5l X2NzICpyaW5nKTsKIHZvaWQgaW50ZWxfbG9naWNhbF9yaW5nX2NsZWFudXAoc3RydWN0IGludGVs X2VuZ2luZV9jcyAqcmluZyk7CiBpbnQgaW50ZWxfbG9naWNhbF9yaW5nc19pbml0KHN0cnVjdCBk cm1fZGV2aWNlICpkZXYpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf cmluZ2J1ZmZlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCmlu ZGV4IGJiMTBmYzIuLjBiYTU3ODcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3JpbmdidWZmZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVm ZmVyLmMKQEAgLTIxOTIsMjQgKzIxOTIsMjcgQEAgaW50IGludGVsX3JpbmdfYWxsb2NfcmVxdWVz dF9leHRyYXMoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0KQogCXJldHVybiAw OwogfQogCitpbnQgaW50ZWxfcmluZ19yZXNlcnZlX3NwYWNlKHN0cnVjdCBkcm1faTkxNV9nZW1f cmVxdWVzdCAqcmVxdWVzdCkKK3sKKwkvKgorCSAqIFRoZSBmaXJzdCBjYWxsIG1lcmVseSBub3Rl cyB0aGUgcmVzZXJ2ZSByZXF1ZXN0IGFuZCBpcyBjb21tb24gZm9yCisJICogYWxsIGJhY2sgZW5k cy4gVGhlIHN1YnNlcXVlbnQgbG9jYWxpc2VkIF9iZWdpbigpIGNhbGwgYWN0dWFsbHkKKwkgKiBl bnN1cmVzIHRoYXQgdGhlIHJlc2VydmF0aW9uIGlzIGF2YWlsYWJsZS4gV2l0aG91dCB0aGUgYmVn aW4sIGlmCisJICogdGhlIHJlcXVlc3QgY3JlYXRvciBpbW1lZGlhdGVseSBzdWJtaXR0ZWQgdGhl IHJlcXVlc3Qgd2l0aG91dAorCSAqIGFkZGluZyBhbnkgY29tbWFuZHMgdG8gaXQgdGhlbiB0aGVy ZSBtaWdodCBub3QgYWN0dWFsbHkgYmUKKwkgKiBzdWZmaWNpZW50IHJvb20gZm9yIHRoZSBzdWJt aXNzaW9uIGNvbW1hbmRzLgorCSAqLworCWludGVsX3JpbmdfcmVzZXJ2ZWRfc3BhY2VfcmVzZXJ2 ZShyZXF1ZXN0LT5yaW5nYnVmLCBNSU5fU1BBQ0VfRk9SX0FERF9SRVFVRVNUKTsKKworCXJldHVy biBpbnRlbF9yaW5nX2JlZ2luKHJlcXVlc3QsIDApOworfQorCiB2b2lkIGludGVsX3JpbmdfcmVz ZXJ2ZWRfc3BhY2VfcmVzZXJ2ZShzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiwgaW50 IHNpemUpCiB7Ci0JLyogTkI6IFVudGlsIHJlcXVlc3QgbWFuYWdlbWVudCBpcyBmdWxseSB0aWRp ZWQgdXAgYW5kIHRoZSBPTFIgaXMKLQkgKiByZW1vdmVkLCB0aGVyZSBhcmUgdG9vIG1hbnkgd2F5 cyBmb3IgZ2V0IGZhbHNlIGhpdHMgb24gdGhpcwotCSAqIGFudGktcmVjdXJzaW9uIGNoZWNrISAq LwotCS8qV0FSTl9PTihyaW5nYnVmLT5yZXNlcnZlZF9zaXplKTsqLworCVdBUk5fT04ocmluZ2J1 Zi0+cmVzZXJ2ZWRfc2l6ZSk7CiAJV0FSTl9PTihyaW5nYnVmLT5yZXNlcnZlZF9pbl91c2UpOwog CiAJcmluZ2J1Zi0+cmVzZXJ2ZWRfc2l6ZSA9IHNpemU7Ci0KLQkvKgotCSAqIFJlYWxseSBuZWVk IHRvIGNhbGwgX2JlZ2luKCkgaGVyZSBidXQgdGhhdCBjdXJyZW50bHkgbGVhZHMgdG8KLQkgKiBy ZWN1cnNpb24gcHJvYmxlbXMhIFRoaXMgd2lsbCBiZSBmaXhlZCBsYXRlciBidXQgZm9yIG5vdyBq dXN0Ci0JICogcmV0dXJuIGFuZCBob3BlIGZvciB0aGUgYmVzdC4gTm90ZSB0aGF0IHRoZXJlIGlz IG9ubHkgYSByZWFsCi0JICogcHJvYmxlbSBpZiB0aGUgY3JlYXRlIG9mIHRoZSByZXF1ZXN0IG5l dmVyIGFjdHVhbGx5IGNhbGxzIF9iZWdpbigpCi0JICogYnV0IGlmIHRoZXkgYXJlIG5vdCBzdWJt aXR0aW5nIGFueSB3b3JrIHRoZW4gd2h5IGRpZCB0aGV5IGNyZWF0ZQotCSAqIHRoZSByZXF1ZXN0 IGluIHRoZSBmaXJzdCBwbGFjZT8KLQkgKi8KIH0KIAogdm9pZCBpbnRlbF9yaW5nX3Jlc2VydmVk X3NwYWNlX2NhbmNlbChzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZikKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAppbmRleCAxNmZkOWJhLi5mNDYzM2NhIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCkBAIC00NTAsNiArNDUwLDcgQEAg aW50ZWxfcmluZ19nZXRfcmVxdWVzdChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQogCiAj ZGVmaW5lIE1JTl9TUEFDRV9GT1JfQUREX1JFUVVFU1QJMTI4CiAKK2ludCBpbnRlbF9yaW5nX3Jl c2VydmVfc3BhY2Uoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0KTsKIHZvaWQg aW50ZWxfcmluZ19yZXNlcnZlZF9zcGFjZV9yZXNlcnZlKHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVy ICpyaW5nYnVmLCBpbnQgc2l6ZSk7CiB2b2lkIGludGVsX3JpbmdfcmVzZXJ2ZWRfc3BhY2VfY2Fu Y2VsKHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmKTsKIHZvaWQgaW50ZWxfcmluZ19y ZXNlcnZlZF9zcGFjZV91c2Uoc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYpOwotLSAK MS43LjkuNQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K SW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK