From: John.C.Harrison@Intel.com Subject: [PATCH 40/51] drm/i915: Update ring->add_request() to take a request structure Date: Fri, 13 Feb 2015 11:48:49 +0000 Message-ID: <1423828140-10653-41-git-send-email-John.C.Harrison@Intel.com> References: <1423828140-10653-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 831EE720DB for ; Fri, 13 Feb 2015 03:49:44 -0800 (PST) In-Reply-To: <1423828140-10653-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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KClVwZGF0ZWQg dGhlIHZhcmlvdXMgcmluZy0+YWRkX3JlcXVlc3QoKSBpbXBsZW1lbnRhdGlvbnMgdG8gdGFrZSBh IHJlcXVlc3QKaW5zdGVhZCBvZiBhIHJpbmcuIFRoaXMgcmVtb3ZlcyB0aGVpciByZWxpYW5jZSBv biB0aGUgT0xSIHRvIG9idGFpbiB0aGUgc2Vxbm8KdmFsdWUgdGhhdCB0aGUgcmVxdWVzdCBzaG91 bGQgYmUgdGFnZ2VkIHdpdGguCgpGb3I6IFZJWi01MTE1ClNpZ25lZC1vZmYtYnk6IEpvaG4gSGFy cmlzb24gPEpvaG4uQy5IYXJyaXNvbkBJbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW0uYyAgICAgICAgIHwgICAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfcmluZ2J1ZmZlci5jIHwgICAyNiArKysrKysrKysrKystLS0tLS0tLS0tLS0tLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oIHwgICAgMiArLQogMyBmaWxlcyBjaGFu Z2VkLCAxNCBpbnNlcnRpb25zKCspLCAxNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW0uYwppbmRleCBhNzI4ZjkxLi42MTZiMzRhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAg LTI0NTIsNyArMjQ1Miw3IEBAIGludCBfX2k5MTVfYWRkX3JlcXVlc3Qoc3RydWN0IGRybV9pOTE1 X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0LAogCWlmIChpOTE1LmVuYWJsZV9leGVjbGlzdHMpCiAJCXJl dCA9IHJpbmctPmVtaXRfcmVxdWVzdChyaW5nYnVmLCByZXF1ZXN0KTsKIAllbHNlCi0JCXJldCA9 IHJpbmctPmFkZF9yZXF1ZXN0KHJpbmcpOworCQlyZXQgPSByaW5nLT5hZGRfcmVxdWVzdChyZXF1 ZXN0KTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9yaW5nYnVmZmVyLmMKaW5kZXggMmY5YmE3OS4uY2UxZGFiNCAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3JpbmdidWZmZXIuYwpAQCAtMTA4MSwxNiArMTA4MSwxNiBAQCBzdGF0aWMgaW50 IGdlbjZfc2lnbmFsKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnNpZ25hbGxlciwKIAogLyoqCiAg KiBnZW42X2FkZF9yZXF1ZXN0IC0gVXBkYXRlIHRoZSBzZW1hcGhvcmUgbWFpbGJveCByZWdpc3Rl cnMKLSAqIAotICogQHJpbmcgLSByaW5nIHRoYXQgaXMgYWRkaW5nIGEgcmVxdWVzdAotICogQHNl cW5vIC0gcmV0dXJuIHNlcW5vIHN0dWNrIGludG8gdGhlIHJpbmcKKyAqCisgKiBAcmVxdWVzdCAt IHJlcXVlc3QgdG8gd3JpdGUgdG8gdGhlIHJpbmcKICAqCiAgKiBVcGRhdGUgdGhlIG1haWxib3gg cmVnaXN0ZXJzIGluIHRoZSAqb3RoZXIqIHJpbmdzIHdpdGggdGhlIGN1cnJlbnQgc2Vxbm8uCiAg KiBUaGlzIGFjdHMgbGlrZSBhIHNpZ25hbCBpbiB0aGUgY2Fub25pY2FsIHNlbWFwaG9yZS4KICAq Lwogc3RhdGljIGludAotZ2VuNl9hZGRfcmVxdWVzdChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpy aW5nKQorZ2VuNl9hZGRfcmVxdWVzdChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSkK IHsKKwlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nID0gcmVxLT5yaW5nOwogCWludCByZXQ7 CiAKIAlpZiAocmluZy0+c2VtYXBob3JlLnNpZ25hbCkKQEAgLTExMDMsOCArMTEwMyw3IEBAIGdl bjZfYWRkX3JlcXVlc3Qoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKIAogCWludGVsX3Jp bmdfZW1pdChyaW5nLCBNSV9TVE9SRV9EV09SRF9JTkRFWCk7CiAJaW50ZWxfcmluZ19lbWl0KHJp bmcsIEk5MTVfR0VNX0hXU19JTkRFWCA8PCBNSV9TVE9SRV9EV09SRF9JTkRFWF9TSElGVCk7Ci0J aW50ZWxfcmluZ19lbWl0KHJpbmcsCi0JCSAgICBpOTE1X2dlbV9yZXF1ZXN0X2dldF9zZXFubyhy aW5nLT5vdXRzdGFuZGluZ19sYXp5X3JlcXVlc3QpKTsKKwlpbnRlbF9yaW5nX2VtaXQocmluZywg aTkxNV9nZW1fcmVxdWVzdF9nZXRfc2Vxbm8ocmVxKSk7CiAJaW50ZWxfcmluZ19lbWl0KHJpbmcs IE1JX1VTRVJfSU5URVJSVVBUKTsKIAlfX2ludGVsX3JpbmdfYWR2YW5jZShyaW5nKTsKIApAQCAt MTIwMSw4ICsxMjAwLDkgQEAgZG8gewkJCQkJCQkJCVwKIH0gd2hpbGUgKDApCiAKIHN0YXRpYyBp bnQKLXBjX3JlbmRlcl9hZGRfcmVxdWVzdChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQor cGNfcmVuZGVyX2FkZF9yZXF1ZXN0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxKQog eworCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcgPSByZXEtPnJpbmc7CiAJdTMyIHNjcmF0 Y2hfYWRkciA9IHJpbmctPnNjcmF0Y2guZ3R0X29mZnNldCArIDIgKiBDQUNIRUxJTkVfQllURVM7 CiAJaW50IHJldDsKIApAQCAtMTIyMiw4ICsxMjIyLDcgQEAgcGNfcmVuZGVyX2FkZF9yZXF1ZXN0 KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCiAJCQlQSVBFX0NPTlRST0xfV1JJVEVfRkxV U0ggfAogCQkJUElQRV9DT05UUk9MX1RFWFRVUkVfQ0FDSEVfSU5WQUxJREFURSk7CiAJaW50ZWxf cmluZ19lbWl0KHJpbmcsIHJpbmctPnNjcmF0Y2guZ3R0X29mZnNldCB8IFBJUEVfQ09OVFJPTF9H TE9CQUxfR1RUKTsKLQlpbnRlbF9yaW5nX2VtaXQocmluZywKLQkJICAgIGk5MTVfZ2VtX3JlcXVl c3RfZ2V0X3NlcW5vKHJpbmctPm91dHN0YW5kaW5nX2xhenlfcmVxdWVzdCkpOworCWludGVsX3Jp bmdfZW1pdChyaW5nLCBpOTE1X2dlbV9yZXF1ZXN0X2dldF9zZXFubyhyZXEpKTsKIAlpbnRlbF9y aW5nX2VtaXQocmluZywgMCk7CiAJUElQRV9DT05UUk9MX0ZMVVNIKHJpbmcsIHNjcmF0Y2hfYWRk cik7CiAJc2NyYXRjaF9hZGRyICs9IDIgKiBDQUNIRUxJTkVfQllURVM7IC8qIHdyaXRlIHRvIHNl cGFyYXRlIGNhY2hlbGluZXMgKi8KQEAgLTEyNDIsOCArMTI0MSw3IEBAIHBjX3JlbmRlcl9hZGRf cmVxdWVzdChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQogCQkJUElQRV9DT05UUk9MX1RF WFRVUkVfQ0FDSEVfSU5WQUxJREFURSB8CiAJCQlQSVBFX0NPTlRST0xfTk9USUZZKTsKIAlpbnRl bF9yaW5nX2VtaXQocmluZywgcmluZy0+c2NyYXRjaC5ndHRfb2Zmc2V0IHwgUElQRV9DT05UUk9M X0dMT0JBTF9HVFQpOwotCWludGVsX3JpbmdfZW1pdChyaW5nLAotCQkgICAgaTkxNV9nZW1fcmVx dWVzdF9nZXRfc2Vxbm8ocmluZy0+b3V0c3RhbmRpbmdfbGF6eV9yZXF1ZXN0KSk7CisJaW50ZWxf cmluZ19lbWl0KHJpbmcsIGk5MTVfZ2VtX3JlcXVlc3RfZ2V0X3NlcW5vKHJlcSkpOwogCWludGVs X3JpbmdfZW1pdChyaW5nLCAwKTsKIAlfX2ludGVsX3JpbmdfYWR2YW5jZShyaW5nKTsKIApAQCAt MTQ3NCw4ICsxNDcyLDkgQEAgYnNkX3JpbmdfZmx1c2goc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1 ZXN0ICpyZXEsCiB9CiAKIHN0YXRpYyBpbnQKLWk5eHhfYWRkX3JlcXVlc3Qoc3RydWN0IGludGVs X2VuZ2luZV9jcyAqcmluZykKK2k5eHhfYWRkX3JlcXVlc3Qoc3RydWN0IGRybV9pOTE1X2dlbV9y ZXF1ZXN0ICpyZXEpCiB7CisJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyA9IHJlcS0+cmlu ZzsKIAlpbnQgcmV0OwogCiAJcmV0ID0gaW50ZWxfcmluZ19iZWdpbihyaW5nLCA0KTsKQEAgLTE0 ODQsOCArMTQ4Myw3IEBAIGk5eHhfYWRkX3JlcXVlc3Qoc3RydWN0IGludGVsX2VuZ2luZV9jcyAq cmluZykKIAogCWludGVsX3JpbmdfZW1pdChyaW5nLCBNSV9TVE9SRV9EV09SRF9JTkRFWCk7CiAJ aW50ZWxfcmluZ19lbWl0KHJpbmcsIEk5MTVfR0VNX0hXU19JTkRFWCA8PCBNSV9TVE9SRV9EV09S RF9JTkRFWF9TSElGVCk7Ci0JaW50ZWxfcmluZ19lbWl0KHJpbmcsCi0JCSAgICBpOTE1X2dlbV9y ZXF1ZXN0X2dldF9zZXFubyhyaW5nLT5vdXRzdGFuZGluZ19sYXp5X3JlcXVlc3QpKTsKKwlpbnRl bF9yaW5nX2VtaXQocmluZywgaTkxNV9nZW1fcmVxdWVzdF9nZXRfc2Vxbm8ocmVxKSk7CiAJaW50 ZWxfcmluZ19lbWl0KHJpbmcsIE1JX1VTRVJfSU5URVJSVVBUKTsKIAlfX2ludGVsX3JpbmdfYWR2 YW5jZShyaW5nKTsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmlu Z2J1ZmZlci5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCmluZGV4 IDM3M2ViZjMuLmUzM2UwMTAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3JpbmdidWZmZXIuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVy LmgKQEAgLTE1MCw3ICsxNTAsNyBAQCBzdHJ1Y3QgIGludGVsX2VuZ2luZV9jcyB7CiAJaW50IF9f bXVzdF9jaGVjayAoKmZsdXNoKShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwKIAkJ CQkgIHUzMglpbnZhbGlkYXRlX2RvbWFpbnMsCiAJCQkJICB1MzIJZmx1c2hfZG9tYWlucyk7Ci0J aW50CQkoKmFkZF9yZXF1ZXN0KShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKTsKKwlpbnQJ CSgqYWRkX3JlcXVlc3QpKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxKTsKIAkvKiBT b21lIGNoaXBzZXRzIGFyZSBub3QgcXVpdGUgYXMgY29oZXJlbnQgYXMgYWR2ZXJ0aXNlZCBhbmQg bmVlZAogCSAqIGFuIGV4cGVuc2l2ZSBraWNrIHRvIGZvcmNlIGEgdHJ1ZSByZWFkIG9mIHRoZSB1 cC10by1kYXRlIHNlcW5vLgogCSAqIEhvd2V2ZXIsIHRoZSB1cC10by1kYXRlIHNlcW5vIGlzIG5v dCBhbHdheXMgcmVxdWlyZWQgYW5kIHRoZSBsYXN0Ci0tIAoxLjcuOS41CgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0 CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=