From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 45/51] drm/i915: Update ring->signal() to take a request structure Date: Fri, 13 Feb 2015 11:48:54 +0000 Message-ID: <1423828140-10653-46-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 8DFFC720ED for ; Fri, 13 Feb 2015 03:49:49 -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+c2lnbmFsKCkgaW1wbGVtZW50YXRpb25zIHRvIHRha2UgYSByZXF1 ZXN0IGluc3RlYWQgb2YKYSByaW5nLiBUaGlzIHJlbW92ZXMgdGhlaXIgcmVsaWFuY2Ugb24gdGhl IE9MUiB0byBvYnRhaW4gdGhlIHNlcW5vIHZhbHVlIHRoYXQKc2hvdWxkIGJlIHVzZWQgZm9yIHRo ZSBzaWduYWwuCgpGb3I6IFZJWi01MTE1ClNpZ25lZC1vZmYtYnk6IEpvaG4gSGFycmlzb24gPEpv aG4uQy5IYXJyaXNvbkBJbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf cmluZ2J1ZmZlci5jIHwgICAyMCArKysrKysrKysrLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oIHwgICAgMiArLQogMiBmaWxlcyBjaGFuZ2VkLCAxMSBp bnNlcnRpb25zKCspLCAxMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9y aW5nYnVmZmVyLmMKaW5kZXggYWE1MjFjNy4uZTA0ZTg4MSAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3JpbmdidWZmZXIuYwpAQCAtOTY0LDEwICs5NjQsMTEgQEAgc3RhdGljIHZvaWQgcmVu ZGVyX3JpbmdfY2xlYW51cChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQogCWludGVsX2Zp bmlfcGlwZV9jb250cm9sKHJpbmcpOwogfQogCi1zdGF0aWMgaW50IGdlbjhfcmNzX3NpZ25hbChz dHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpzaWduYWxsZXIsCitzdGF0aWMgaW50IGdlbjhfcmNzX3Np Z25hbChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnNpZ25hbGxlcl9yZXEsCiAJCQkgICB1 bnNpZ25lZCBpbnQgbnVtX2R3b3JkcykKIHsKICNkZWZpbmUgTUJPWF9VUERBVEVfRFdPUkRTIDgK KwlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpzaWduYWxsZXIgPSBzaWduYWxsZXJfcmVxLT5yaW5n OwogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBzaWduYWxsZXItPmRldjsKIAlzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBpbnRl bF9lbmdpbmVfY3MgKndhaXRlcjsKQEAgLTk4Nyw4ICs5ODgsNyBAQCBzdGF0aWMgaW50IGdlbjhf cmNzX3NpZ25hbChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpzaWduYWxsZXIsCiAJCWlmIChndHRf b2Zmc2V0ID09IE1JX1NFTUFQSE9SRV9TWU5DX0lOVkFMSUQpCiAJCQljb250aW51ZTsKIAotCQlz ZXFubyA9IGk5MTVfZ2VtX3JlcXVlc3RfZ2V0X3NlcW5vKAotCQkJCQkgICBzaWduYWxsZXItPm91 dHN0YW5kaW5nX2xhenlfcmVxdWVzdCk7CisJCXNlcW5vID0gaTkxNV9nZW1fcmVxdWVzdF9nZXRf c2Vxbm8oc2lnbmFsbGVyX3JlcSk7CiAJCWludGVsX3JpbmdfZW1pdChzaWduYWxsZXIsIEdGWF9P UF9QSVBFX0NPTlRST0woNikpOwogCQlpbnRlbF9yaW5nX2VtaXQoc2lnbmFsbGVyLCBQSVBFX0NP TlRST0xfR0xPQkFMX0dUVF9JVkIgfAogCQkJCQkgICBQSVBFX0NPTlRST0xfUVdfV1JJVEUgfApA QCAtMTAwNSwxMCArMTAwNSwxMSBAQCBzdGF0aWMgaW50IGdlbjhfcmNzX3NpZ25hbChzdHJ1Y3Qg aW50ZWxfZW5naW5lX2NzICpzaWduYWxsZXIsCiAJcmV0dXJuIDA7CiB9CiAKLXN0YXRpYyBpbnQg Z2VuOF94Y3Nfc2lnbmFsKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnNpZ25hbGxlciwKK3N0YXRp YyBpbnQgZ2VuOF94Y3Nfc2lnbmFsKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqc2lnbmFs bGVyX3JlcSwKIAkJCSAgIHVuc2lnbmVkIGludCBudW1fZHdvcmRzKQogewogI2RlZmluZSBNQk9Y X1VQREFURV9EV09SRFMgNgorCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnNpZ25hbGxlciA9IHNp Z25hbGxlcl9yZXEtPnJpbmc7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHNpZ25hbGxlci0+ ZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZh dGU7CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqd2FpdGVyOwpAQCAtMTAyOCw4ICsxMDI5LDcg QEAgc3RhdGljIGludCBnZW44X3hjc19zaWduYWwoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqc2ln bmFsbGVyLAogCQlpZiAoZ3R0X29mZnNldCA9PSBNSV9TRU1BUEhPUkVfU1lOQ19JTlZBTElEKQog CQkJY29udGludWU7CiAKLQkJc2Vxbm8gPSBpOTE1X2dlbV9yZXF1ZXN0X2dldF9zZXFubygKLQkJ CQkJICAgc2lnbmFsbGVyLT5vdXRzdGFuZGluZ19sYXp5X3JlcXVlc3QpOworCQlzZXFubyA9IGk5 MTVfZ2VtX3JlcXVlc3RfZ2V0X3NlcW5vKHNpZ25hbGxlcl9yZXEpOwogCQlpbnRlbF9yaW5nX2Vt aXQoc2lnbmFsbGVyLCAoTUlfRkxVU0hfRFcgKyAxKSB8CiAJCQkJCSAgIE1JX0ZMVVNIX0RXX09Q X1NUT1JFRFcpOwogCQlpbnRlbF9yaW5nX2VtaXQoc2lnbmFsbGVyLCBsb3dlcl8zMl9iaXRzKGd0 dF9vZmZzZXQpIHwKQEAgLTEwNDQsOSArMTA0NCwxMCBAQCBzdGF0aWMgaW50IGdlbjhfeGNzX3Np Z25hbChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpzaWduYWxsZXIsCiAJcmV0dXJuIDA7CiB9CiAK LXN0YXRpYyBpbnQgZ2VuNl9zaWduYWwoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqc2lnbmFsbGVy LAorc3RhdGljIGludCBnZW42X3NpZ25hbChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnNp Z25hbGxlcl9yZXEsCiAJCSAgICAgICB1bnNpZ25lZCBpbnQgbnVtX2R3b3JkcykKIHsKKwlzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICpzaWduYWxsZXIgPSBzaWduYWxsZXJfcmVxLT5yaW5nOwogCXN0 cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBzaWduYWxsZXItPmRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBpbnRlbF9lbmdp bmVfY3MgKnVzZWxlc3M7CkBAIC0xMDY0LDggKzEwNjUsNyBAQCBzdGF0aWMgaW50IGdlbjZfc2ln bmFsKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnNpZ25hbGxlciwKIAlmb3JfZWFjaF9yaW5nKHVz ZWxlc3MsIGRldl9wcml2LCBpKSB7CiAJCXUzMiBtYm94X3JlZyA9IHNpZ25hbGxlci0+c2VtYXBo b3JlLm1ib3guc2lnbmFsW2ldOwogCQlpZiAobWJveF9yZWcgIT0gR0VONl9OT1NZTkMpIHsKLQkJ CXUzMiBzZXFubyA9IGk5MTVfZ2VtX3JlcXVlc3RfZ2V0X3NlcW5vKAotCQkJCQkgICBzaWduYWxs ZXItPm91dHN0YW5kaW5nX2xhenlfcmVxdWVzdCk7CisJCQl1MzIgc2Vxbm8gPSBpOTE1X2dlbV9y ZXF1ZXN0X2dldF9zZXFubyhzaWduYWxsZXJfcmVxKTsKIAkJCWludGVsX3JpbmdfZW1pdChzaWdu YWxsZXIsIE1JX0xPQURfUkVHSVNURVJfSU1NKDEpKTsKIAkJCWludGVsX3JpbmdfZW1pdChzaWdu YWxsZXIsIG1ib3hfcmVnKTsKIAkJCWludGVsX3JpbmdfZW1pdChzaWduYWxsZXIsIHNlcW5vKTsK QEAgLTEwOTQsNyArMTA5NCw3IEBAIGdlbjZfYWRkX3JlcXVlc3Qoc3RydWN0IGRybV9pOTE1X2dl bV9yZXF1ZXN0ICpyZXEpCiAJaW50IHJldDsKIAogCWlmIChyaW5nLT5zZW1hcGhvcmUuc2lnbmFs KQotCQlyZXQgPSByaW5nLT5zZW1hcGhvcmUuc2lnbmFsKHJpbmcsIDQpOworCQlyZXQgPSByaW5n LT5zZW1hcGhvcmUuc2lnbmFsKHJlcSwgNCk7CiAJZWxzZQogCQlyZXQgPSBpbnRlbF9yaW5nX2Jl Z2luKHJpbmcsIDQpOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9y aW5nYnVmZmVyLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKaW5k ZXggNGI0ZmQyZC4uNzBmM2Y1ZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfcmluZ2J1ZmZlci5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZm ZXIuaApAQCAtMjIyLDcgKzIyMiw3IEBAIHN0cnVjdCAgaW50ZWxfZW5naW5lX2NzIHsKIAkJaW50 CSgqc3luY190bykoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICp0b19yZXEsCiAJCQkJICAg c3RydWN0IGludGVsX2VuZ2luZV9jcyAqZnJvbSwKIAkJCQkgICB1MzIgc2Vxbm8pOwotCQlpbnQJ KCpzaWduYWwpKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnNpZ25hbGxlciwKKwkJaW50CSgqc2ln bmFsKShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnNpZ25hbGxlcl9yZXEsCiAJCQkJICAv KiBudW1fZHdvcmRzIG5lZWRlZCBieSBjYWxsZXIgKi8KIAkJCQkgIHVuc2lnbmVkIGludCBudW1f ZHdvcmRzKTsKIAl9IHNlbWFwaG9yZTsKLS0gCjEuNy45LjUKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==