From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 51/59] drm/i915: Add *_ring_begin() to request allocation Date: Thu, 19 Mar 2015 12:30:56 +0000 Message-ID: <1426768264-16996-52-git-send-email-John.C.Harrison@Intel.com> References: <1426768264-16996-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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 116A46EA36 for ; Thu, 19 Mar 2015 05:32:10 -0700 (PDT) In-Reply-To: <1426768264-16996-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 YWRkX3JlcXVlc3QoKSBjYWxsIGRvZXMgYWN0dWFsbHkgZ2V0IHJlc2VydmVkLgoKRm9yOiBWSVot NTExNQpTaWduZWQtb2ZmLWJ5OiBKb2huIEhhcnJpc29uIDxKb2huLkMuSGFycmlzb25ASW50ZWwu Y29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgICAgICAgICB8ICAgMTYg KysrKy0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgICAgICAg IHwgICAxNSArKysrKysrKysrKysrKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5o ICAgICAgICB8ICAgIDEgKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5j IHwgICAyOCArKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9yaW5nYnVmZmVyLmggfCAgICAzICsrLQogNSBmaWxlcyBjaGFuZ2VkLCAzOSBpbnNl cnRpb25zKCspLCAyNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCBi MDQ3NjkzLi5mZTJkZTIxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTI1NjEsMTkgKzI1 NjEsMTEgQEAgaW50IGk5MTVfZ2VtX3JlcXVlc3RfYWxsb2Moc3RydWN0IGludGVsX2VuZ2luZV9j cyAqcmluZywKIAkgKiBpOTE1X2FkZF9yZXF1ZXN0KCkgY2FsbCBjYW4ndCBmYWlsLiBOb3RlIHRo YXQgdGhlIHJlc2VydmUgbWF5IG5lZWQKIAkgKiB0byBiZSByZWRvbmUgaWYgdGhlIHJlcXVlc3Qg aXMgbm90IGFjdHVhbGx5IHN1Ym1pdHRlZCBzdHJhaWdodAogCSAqIGF3YXksIGUuZy4gYmVjYXVz ZSBhIEdQVSBzY2hlZHVsZXIgaGFzIGRlZmVycmVkIGl0LgotCSAqCi0JICogTm90ZSBmdXJ0aGVy IHRoYXQgdGhpcyBjYWxsIG1lcmVseSBub3RlcyB0aGUgcmVzZXJ2ZSByZXF1ZXN0LiBBCi0JICog c3Vic2VxdWVudCBjYWxsIHRvICpfcmluZ19iZWdpbigpIGlzIHJlcXVpcmVkIHRvIGFjdHVhbGx5 IGVuc3VyZQotCSAqIHRoYXQgdGhlIHJlc2VydmF0aW9uIGlzIGF2YWlsYWJsZS4gV2l0aG91dCB0 aGUgYmVnaW4sIGlmIHRoZQotCSAqIHJlcXVlc3QgY3JlYXRvciBpbW1lZGlhdGVseSBzdWJtaXR0 ZWQgdGhlIHJlcXVlc3Qgd2l0aG91dCBhZGRpbmcKLQkgKiBhbnkgY29tbWFuZHMgdG8gaXQgdGhl biB0aGVyZSBtaWdodCBub3QgYWN0dWFsbHkgYmUgc3VmZmljaWVudAotCSAqIHJvb20gZm9yIHRo ZSBzdWJtaXNzaW9uIGNvbW1hbmRzLiBVbmZvcnR1bmF0ZWx5LCB0aGUgY3VycmVudAotCSAqICpf cmluZ19iZWdpbigpIGltcGxlbWVudGF0aW9ucyBwb3RlbnRpYWxseSBjYWxsIGJhY2sgaGVyZSB0 bwotCSAqIGk5MTVfZ2VtX3JlcXVlc3RfYWxsb2MoKS4gVGh1cyBjYWxsaW5nIF9iZWdpbigpIGhl cmUgd291bGQgbGVhZCB0bwotCSAqIGluZmluaXRlIHJlY3Vyc2lvbiEgVW50aWwgdGhhdCBiYWNr IGNhbGwgcGF0aCBpcyByZW1vdmVkLCBpdCBpcwotCSAqIG5lY2Vzc2FyeSB0byBkbyBhIG1hbnVh bCBfYmVnaW4oKSBvdXRzaWRlLgogCSAqLwotCXJldCA9IGludGVsX3JpbmdfcmVzZXJ2ZWRfc3Bh Y2VfcmVzZXJ2ZShyZXF1ZXN0LT5yaW5nYnVmLCBNSU5fU1BBQ0VfRk9SX0FERF9SRVFVRVNUKTsK KwlpZiAoaTkxNS5lbmFibGVfZXhlY2xpc3RzKQorCQlyZXQgPSBsb2dpY2FsX3JpbmdfcmVzZXJ2 ZWRfc3BhY2VfcmVzZXJ2ZShyZXF1ZXN0KTsKKwllbHNlCisJCXJldCA9IGxlZ2FjeV9yaW5nX3Jl c2VydmVkX3NwYWNlX3Jlc2VydmUocmVxdWVzdCk7CiAJaWYgKHJldCkgewogCQkvKgogCQkgKiBB dCB0aGlzIHBvaW50LCB0aGUgcmVxdWVzdCBpcyBmdWxseSBhbGxvY2F0ZWQgZXZlbiBpZiBub3QK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKaW5kZXggYzE2ZDcyNi4uOGNiMzRjNiAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfbHJjLmMKQEAgLTgyOSw2ICs4MjksMjEgQEAgc3RhdGljIGludCBpbnRlbF9s b2dpY2FsX3JpbmdfYmVnaW4oc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCiAJcmV0 dXJuIDA7CiB9CiAKK2ludCBsb2dpY2FsX3JpbmdfcmVzZXJ2ZWRfc3BhY2VfcmVzZXJ2ZShzdHJ1 Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QpCit7CisJLyoKKwkgKiBUaGUgZmlyc3Qg Y2FsbCBtZXJlbHkgbm90ZXMgdGhlIHJlc2VydmUgcmVxdWVzdCBhbmQgaXMgY29tbW9uIGZvcgor CSAqIGFsbCBiYWNrIGVuZHMuIFRoZSBzdWJzZXF1ZW50IGxvY2FsaXNlZCBfYmVnaW4oKSBjYWxs IGFjdHVhbGx5CisJICogZW5zdXJlcyB0aGF0IHRoZSByZXNlcnZhdGlvbiBpcyBhdmFpbGFibGUu IFdpdGhvdXQgdGhlIGJlZ2luLCBpZgorCSAqIHRoZSByZXF1ZXN0IGNyZWF0b3IgaW1tZWRpYXRl bHkgc3VibWl0dGVkIHRoZSByZXF1ZXN0IHdpdGhvdXQKKwkgKiBhZGRpbmcgYW55IGNvbW1hbmRz IHRvIGl0IHRoZW4gdGhlcmUgbWlnaHQgbm90IGFjdHVhbGx5IGJlCisJICogc3VmZmljaWVudCBy b29tIGZvciB0aGUgc3VibWlzc2lvbiBjb21tYW5kcy4KKwkgKi8KKwlpbnRlbF9yaW5nX3Jlc2Vy dmVkX3NwYWNlX3Jlc2VydmUocmVxdWVzdC0+cmluZ2J1ZiwgTUlOX1NQQUNFX0ZPUl9BRERfUkVR VUVTVCk7CisKKwlyZXR1cm4gaW50ZWxfbG9naWNhbF9yaW5nX2JlZ2luKHJlcXVlc3QsIDApOwor fQorCiAvKioKICAqIGV4ZWNsaXN0c19zdWJtaXNzaW9uKCkgLSBzdWJtaXQgYSBiYXRjaGJ1ZmZl ciBmb3IgZXhlY3V0aW9uLCBFeGVjbGlzdHMgc3R5bGUKICAqIEBkZXY6IERSTSBkZXZpY2UuCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuaCBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2xyYy5oCmluZGV4IDA0NGMwZTUuLjkwNWE4M2UgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2xyYy5oCkBAIC0zNyw2ICszNyw3IEBACiAKIC8qIExvZ2ljYWwgUmluZ3MgKi8K IGludCBpbnRlbF9sb2dpY2FsX3JpbmdfYWxsb2NfcmVxdWVzdF9leHRyYXMoc3RydWN0IGRybV9p OTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0KTsKK2ludCBsb2dpY2FsX3JpbmdfcmVzZXJ2ZWRfc3Bh Y2VfcmVzZXJ2ZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QpOwogdm9pZCBp bnRlbF9sb2dpY2FsX3Jpbmdfc3RvcChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKTsKIHZv aWQgaW50ZWxfbG9naWNhbF9yaW5nX2NsZWFudXAoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmlu Zyk7CiBpbnQgaW50ZWxfbG9naWNhbF9yaW5nc19pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYp OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCmluZGV4IDZmMTk4ZGYuLmM3 ZGNhYmQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKQEAgLTIyMDUs MjEgKzIyMDUsMjcgQEAgaW50IGludGVsX3JpbmdfYWxsb2NfcmVxdWVzdF9leHRyYXMoc3RydWN0 IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0KQogCXJldHVybiAwOwogfQogCi1pbnQgaW50 ZWxfcmluZ19yZXNlcnZlZF9zcGFjZV9yZXNlcnZlKHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpy aW5nYnVmLCBpbnQgc2l6ZSkKK2ludCBsZWdhY3lfcmluZ19yZXNlcnZlZF9zcGFjZV9yZXNlcnZl KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdCkKIHsKLQkvKiBOQjogVW50aWwg cmVxdWVzdCBtYW5hZ2VtZW50IGlzIGZ1bGx5IHRpZGllZCB1cCBhbmQgdGhlIE9MUiBpcwotCSAq IHJlbW92ZWQsIHRoZXJlIGFyZSB0b28gbWFueSB3YXlzIGZvciBnZXQgZmFsc2UgaGl0cyBvbiB0 aGlzCi0JICogYW50aS1yZWN1cnNpb24gY2hlY2shICovCi0JLypXQVJOX09OKHJpbmdidWYtPnJl c2VydmVkX3NpemUpOyovCisJLyoKKwkgKiBUaGUgZmlyc3QgY2FsbCBtZXJlbHkgbm90ZXMgdGhl IHJlc2VydmUgcmVxdWVzdCBhbmQgaXMgY29tbW9uIGZvcgorCSAqIGFsbCBiYWNrIGVuZHMuIFRo ZSBzdWJzZXF1ZW50IGxvY2FsaXNlZCBfYmVnaW4oKSBjYWxsIGFjdHVhbGx5CisJICogZW5zdXJl cyB0aGF0IHRoZSByZXNlcnZhdGlvbiBpcyBhdmFpbGFibGUuIFdpdGhvdXQgdGhlIGJlZ2luLCBp ZgorCSAqIHRoZSByZXF1ZXN0IGNyZWF0b3IgaW1tZWRpYXRlbHkgc3VibWl0dGVkIHRoZSByZXF1 ZXN0IHdpdGhvdXQKKwkgKiBhZGRpbmcgYW55IGNvbW1hbmRzIHRvIGl0IHRoZW4gdGhlcmUgbWln aHQgbm90IGFjdHVhbGx5IGJlCisJICogc3VmZmljaWVudCByb29tIGZvciB0aGUgc3VibWlzc2lv biBjb21tYW5kcy4KKwkgKi8KKwlpbnRlbF9yaW5nX3Jlc2VydmVkX3NwYWNlX3Jlc2VydmUocmVx dWVzdC0+cmluZ2J1ZiwgTUlOX1NQQUNFX0ZPUl9BRERfUkVRVUVTVCk7CisKKwlyZXR1cm4gaW50 ZWxfcmluZ19iZWdpbihyZXF1ZXN0LCAwKTsKK30KKwordm9pZCBpbnRlbF9yaW5nX3Jlc2VydmVk X3NwYWNlX3Jlc2VydmUoc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYsIGludCBzaXpl KQoreworCVdBUk5fT04ocmluZ2J1Zi0+cmVzZXJ2ZWRfc2l6ZSk7CiAJV0FSTl9PTihyaW5nYnVm LT5yZXNlcnZlZF9pbl91c2UpOwogCiAJcmluZ2J1Zi0+cmVzZXJ2ZWRfc2l6ZSA9IHNpemU7Ci0K LQkvKgotCSAqIFJlYWxseSBuZWVkIHRvIGNhbGwgX2JlZ2luKCkgaGVyZSBidXQgdGhhdCBjdXJy ZW50bHkgbGVhZHMgdG8KLQkgKiByZWN1cnNpb24gcHJvYmxlbXMhIFNvIGp1c3QgcmV0dXJuIHpl cm8gYW5kIGhvcGUgZm9yIHRoZSBiZXN0Li4uCi0JICovCi0JcmV0dXJuIDA7CiB9CiAKIHZvaWQg aW50ZWxfcmluZ19yZXNlcnZlZF9zcGFjZV91c2Uoc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJp bmdidWYsIGludCBzaXplKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf cmluZ2J1ZmZlci5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCmlu ZGV4IGY2YWI2YmIuLjM2NWI5OGQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3JpbmdidWZmZXIuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVm ZmVyLmgKQEAgLTQ0Miw3ICs0NDIsOCBAQCBpbnRlbF9yaW5nX2dldF9yZXF1ZXN0KHN0cnVjdCBp bnRlbF9lbmdpbmVfY3MgKnJpbmcpCiAKICNkZWZpbmUgTUlOX1NQQUNFX0ZPUl9BRERfUkVRVUVT VAkxMjgKIAotaW50IGludGVsX3JpbmdfcmVzZXJ2ZWRfc3BhY2VfcmVzZXJ2ZShzdHJ1Y3QgaW50 ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiwgaW50IHNpemUpOworaW50IGxlZ2FjeV9yaW5nX3Jlc2Vy dmVkX3NwYWNlX3Jlc2VydmUoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0KTsK K3ZvaWQgaW50ZWxfcmluZ19yZXNlcnZlZF9zcGFjZV9yZXNlcnZlKHN0cnVjdCBpbnRlbF9yaW5n YnVmZmVyICpyaW5nYnVmLCBpbnQgc2l6ZSk7CiB2b2lkIGludGVsX3JpbmdfcmVzZXJ2ZWRfc3Bh Y2VfdXNlKHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmLCBpbnQgc2l6ZSk7CiB2b2lk IGludGVsX3JpbmdfcmVzZXJ2ZWRfc3BhY2VfZW5kKHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpy aW5nYnVmKTsKIAotLSAKMS43LjkuNQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9pbnRlbC1nZngK