From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 39/55] drm/i915: Update ring->add_request() to take a request structure Date: Fri, 29 May 2015 17:44:00 +0100 Message-ID: <1432917856-12261-40-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 86BCE6EDF9 for ; Fri, 29 May 2015 09:45:00 -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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KClVwZGF0ZWQg dGhlIHZhcmlvdXMgcmluZy0+YWRkX3JlcXVlc3QoKSBpbXBsZW1lbnRhdGlvbnMgdG8gdGFrZSBh IHJlcXVlc3QKaW5zdGVhZCBvZiBhIHJpbmcuIFRoaXMgcmVtb3ZlcyB0aGVpciByZWxpYW5jZSBv biB0aGUgT0xSIHRvIG9idGFpbiB0aGUgc2Vxbm8KdmFsdWUgdGhhdCB0aGUgcmVxdWVzdCBzaG91 bGQgYmUgdGFnZ2VkIHdpdGguCgpGb3I6IFZJWi01MTE1ClNpZ25lZC1vZmYtYnk6IEpvaG4gSGFy cmlzb24gPEpvaG4uQy5IYXJyaXNvbkBJbnRlbC5jb20+ClJldmlld2VkLWJ5OiBUb21hcyBFbGYg PHRvbWFzLmVsZkBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0u YyAgICAgICAgIHwgICAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZl ci5jIHwgICAyNiArKysrKysrKysrKystLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfcmluZ2J1ZmZlci5oIHwgICAgMiArLQogMyBmaWxlcyBjaGFuZ2VkLCAxNCBpbnNl cnRpb25zKCspLCAxNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCAy NzgzNmJjLi5jMDM1YjlhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTI1MjQsNyArMjUy NCw3IEBAIHZvaWQgX19pOTE1X2FkZF9yZXF1ZXN0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVz dCAqcmVxdWVzdCwKIAlpZiAoaTkxNS5lbmFibGVfZXhlY2xpc3RzKQogCQlyZXQgPSByaW5nLT5l bWl0X3JlcXVlc3QocmluZ2J1ZiwgcmVxdWVzdCk7CiAJZWxzZSB7Ci0JCXJldCA9IHJpbmctPmFk ZF9yZXF1ZXN0KHJpbmcpOworCQlyZXQgPSByaW5nLT5hZGRfcmVxdWVzdChyZXF1ZXN0KTsKIAog CQlyZXF1ZXN0LT50YWlsID0gaW50ZWxfcmluZ19nZXRfdGFpbChyaW5nYnVmKTsKIAl9CmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKaW5kZXggMzIzYjI5NS4uZTJhZDNiOCAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwpAQCAtMTI3OCwxNiArMTI3 OCwxNiBAQCBzdGF0aWMgaW50IGdlbjZfc2lnbmFsKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnNp Z25hbGxlciwKIAogLyoqCiAgKiBnZW42X2FkZF9yZXF1ZXN0IC0gVXBkYXRlIHRoZSBzZW1hcGhv cmUgbWFpbGJveCByZWdpc3RlcnMKLSAqIAotICogQHJpbmcgLSByaW5nIHRoYXQgaXMgYWRkaW5n IGEgcmVxdWVzdAotICogQHNlcW5vIC0gcmV0dXJuIHNlcW5vIHN0dWNrIGludG8gdGhlIHJpbmcK KyAqCisgKiBAcmVxdWVzdCAtIHJlcXVlc3QgdG8gd3JpdGUgdG8gdGhlIHJpbmcKICAqCiAgKiBV cGRhdGUgdGhlIG1haWxib3ggcmVnaXN0ZXJzIGluIHRoZSAqb3RoZXIqIHJpbmdzIHdpdGggdGhl IGN1cnJlbnQgc2Vxbm8uCiAgKiBUaGlzIGFjdHMgbGlrZSBhIHNpZ25hbCBpbiB0aGUgY2Fub25p Y2FsIHNlbWFwaG9yZS4KICAqLwogc3RhdGljIGludAotZ2VuNl9hZGRfcmVxdWVzdChzdHJ1Y3Qg aW50ZWxfZW5naW5lX2NzICpyaW5nKQorZ2VuNl9hZGRfcmVxdWVzdChzdHJ1Y3QgZHJtX2k5MTVf Z2VtX3JlcXVlc3QgKnJlcSkKIHsKKwlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nID0gcmVx LT5yaW5nOwogCWludCByZXQ7CiAKIAlpZiAocmluZy0+c2VtYXBob3JlLnNpZ25hbCkKQEAgLTEz MDAsOCArMTMwMCw3IEBAIGdlbjZfYWRkX3JlcXVlc3Qoc3RydWN0IGludGVsX2VuZ2luZV9jcyAq cmluZykKIAogCWludGVsX3JpbmdfZW1pdChyaW5nLCBNSV9TVE9SRV9EV09SRF9JTkRFWCk7CiAJ aW50ZWxfcmluZ19lbWl0KHJpbmcsIEk5MTVfR0VNX0hXU19JTkRFWCA8PCBNSV9TVE9SRV9EV09S RF9JTkRFWF9TSElGVCk7Ci0JaW50ZWxfcmluZ19lbWl0KHJpbmcsCi0JCSAgICBpOTE1X2dlbV9y ZXF1ZXN0X2dldF9zZXFubyhyaW5nLT5vdXRzdGFuZGluZ19sYXp5X3JlcXVlc3QpKTsKKwlpbnRl bF9yaW5nX2VtaXQocmluZywgaTkxNV9nZW1fcmVxdWVzdF9nZXRfc2Vxbm8ocmVxKSk7CiAJaW50 ZWxfcmluZ19lbWl0KHJpbmcsIE1JX1VTRVJfSU5URVJSVVBUKTsKIAlfX2ludGVsX3JpbmdfYWR2 YW5jZShyaW5nKTsKIApAQCAtMTM5OCw4ICsxMzk3LDkgQEAgZG8gewkJCQkJCQkJCVwKIH0gd2hp bGUgKDApCiAKIHN0YXRpYyBpbnQKLXBjX3JlbmRlcl9hZGRfcmVxdWVzdChzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICpyaW5nKQorcGNfcmVuZGVyX2FkZF9yZXF1ZXN0KHN0cnVjdCBkcm1faTkxNV9n ZW1fcmVxdWVzdCAqcmVxKQogeworCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcgPSByZXEt PnJpbmc7CiAJdTMyIHNjcmF0Y2hfYWRkciA9IHJpbmctPnNjcmF0Y2guZ3R0X29mZnNldCArIDIg KiBDQUNIRUxJTkVfQllURVM7CiAJaW50IHJldDsKIApAQCAtMTQxOSw4ICsxNDE5LDcgQEAgcGNf cmVuZGVyX2FkZF9yZXF1ZXN0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCiAJCQlQSVBF X0NPTlRST0xfV1JJVEVfRkxVU0ggfAogCQkJUElQRV9DT05UUk9MX1RFWFRVUkVfQ0FDSEVfSU5W QUxJREFURSk7CiAJaW50ZWxfcmluZ19lbWl0KHJpbmcsIHJpbmctPnNjcmF0Y2guZ3R0X29mZnNl dCB8IFBJUEVfQ09OVFJPTF9HTE9CQUxfR1RUKTsKLQlpbnRlbF9yaW5nX2VtaXQocmluZywKLQkJ ICAgIGk5MTVfZ2VtX3JlcXVlc3RfZ2V0X3NlcW5vKHJpbmctPm91dHN0YW5kaW5nX2xhenlfcmVx dWVzdCkpOworCWludGVsX3JpbmdfZW1pdChyaW5nLCBpOTE1X2dlbV9yZXF1ZXN0X2dldF9zZXFu byhyZXEpKTsKIAlpbnRlbF9yaW5nX2VtaXQocmluZywgMCk7CiAJUElQRV9DT05UUk9MX0ZMVVNI KHJpbmcsIHNjcmF0Y2hfYWRkcik7CiAJc2NyYXRjaF9hZGRyICs9IDIgKiBDQUNIRUxJTkVfQllU RVM7IC8qIHdyaXRlIHRvIHNlcGFyYXRlIGNhY2hlbGluZXMgKi8KQEAgLTE0MzksOCArMTQzOCw3 IEBAIHBjX3JlbmRlcl9hZGRfcmVxdWVzdChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQog CQkJUElQRV9DT05UUk9MX1RFWFRVUkVfQ0FDSEVfSU5WQUxJREFURSB8CiAJCQlQSVBFX0NPTlRS T0xfTk9USUZZKTsKIAlpbnRlbF9yaW5nX2VtaXQocmluZywgcmluZy0+c2NyYXRjaC5ndHRfb2Zm c2V0IHwgUElQRV9DT05UUk9MX0dMT0JBTF9HVFQpOwotCWludGVsX3JpbmdfZW1pdChyaW5nLAot CQkgICAgaTkxNV9nZW1fcmVxdWVzdF9nZXRfc2Vxbm8ocmluZy0+b3V0c3RhbmRpbmdfbGF6eV9y ZXF1ZXN0KSk7CisJaW50ZWxfcmluZ19lbWl0KHJpbmcsIGk5MTVfZ2VtX3JlcXVlc3RfZ2V0X3Nl cW5vKHJlcSkpOwogCWludGVsX3JpbmdfZW1pdChyaW5nLCAwKTsKIAlfX2ludGVsX3JpbmdfYWR2 YW5jZShyaW5nKTsKIApAQCAtMTYwOSw4ICsxNjA3LDkgQEAgYnNkX3JpbmdfZmx1c2goc3RydWN0 IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCiB9CiAKIHN0YXRpYyBpbnQKLWk5eHhfYWRkX3Jl cXVlc3Qoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKK2k5eHhfYWRkX3JlcXVlc3Qoc3Ry dWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpCiB7CisJc3RydWN0IGludGVsX2VuZ2luZV9j cyAqcmluZyA9IHJlcS0+cmluZzsKIAlpbnQgcmV0OwogCiAJcmV0ID0gaW50ZWxfcmluZ19iZWdp bihyaW5nLCA0KTsKQEAgLTE2MTksOCArMTYxOCw3IEBAIGk5eHhfYWRkX3JlcXVlc3Qoc3RydWN0 IGludGVsX2VuZ2luZV9jcyAqcmluZykKIAogCWludGVsX3JpbmdfZW1pdChyaW5nLCBNSV9TVE9S RV9EV09SRF9JTkRFWCk7CiAJaW50ZWxfcmluZ19lbWl0KHJpbmcsIEk5MTVfR0VNX0hXU19JTkRF WCA8PCBNSV9TVE9SRV9EV09SRF9JTkRFWF9TSElGVCk7Ci0JaW50ZWxfcmluZ19lbWl0KHJpbmcs Ci0JCSAgICBpOTE1X2dlbV9yZXF1ZXN0X2dldF9zZXFubyhyaW5nLT5vdXRzdGFuZGluZ19sYXp5 X3JlcXVlc3QpKTsKKwlpbnRlbF9yaW5nX2VtaXQocmluZywgaTkxNV9nZW1fcmVxdWVzdF9nZXRf c2Vxbm8ocmVxKSk7CiAJaW50ZWxfcmluZ19lbWl0KHJpbmcsIE1JX1VTRVJfSU5URVJSVVBUKTsK IAlfX2ludGVsX3JpbmdfYWR2YW5jZShyaW5nKTsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf cmluZ2J1ZmZlci5oCmluZGV4IDBiOWZlY2QuLjkxZDM3OWIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9yaW5nYnVmZmVyLmgKQEAgLTE2MSw3ICsxNjEsNyBAQCBzdHJ1Y3QgIGludGVsX2Vu Z2luZV9jcyB7CiAJaW50IF9fbXVzdF9jaGVjayAoKmZsdXNoKShzdHJ1Y3QgZHJtX2k5MTVfZ2Vt X3JlcXVlc3QgKnJlcSwKIAkJCQkgIHUzMglpbnZhbGlkYXRlX2RvbWFpbnMsCiAJCQkJICB1MzIJ Zmx1c2hfZG9tYWlucyk7Ci0JaW50CQkoKmFkZF9yZXF1ZXN0KShzdHJ1Y3QgaW50ZWxfZW5naW5l X2NzICpyaW5nKTsKKwlpbnQJCSgqYWRkX3JlcXVlc3QpKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVx dWVzdCAqcmVxKTsKIAkvKiBTb21lIGNoaXBzZXRzIGFyZSBub3QgcXVpdGUgYXMgY29oZXJlbnQg YXMgYWR2ZXJ0aXNlZCBhbmQgbmVlZAogCSAqIGFuIGV4cGVuc2l2ZSBraWNrIHRvIGZvcmNlIGEg dHJ1ZSByZWFkIG9mIHRoZSB1cC10by1kYXRlIHNlcW5vLgogCSAqIEhvd2V2ZXIsIHRoZSB1cC10 by1kYXRlIHNlcW5vIGlzIG5vdCBhbHdheXMgcmVxdWlyZWQgYW5kIHRoZSBsYXN0Ci0tIAoxLjcu OS41CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRl bC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDov L2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=