From: John.C.Harrison@Intel.com Subject: [PATCH 45/53] drm/i915: Update ring->signal() to take a request structure Date: Thu, 19 Feb 2015 17:17:57 +0000 Message-ID: <1424366285-29232-46-git-send-email-John.C.Harrison@Intel.com> References: <1423828140-10653-1-git-send-email-John.C.Harrison@Intel.com> <1424366285-29232-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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 083F3720AC for ; Thu, 19 Feb 2015 09:18:53 -0800 (PST) In-Reply-To: <1424366285-29232-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 aW5nYnVmZmVyLmMKaW5kZXggNzY3YmFiMS4uNDQwMzU2ZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3JpbmdidWZmZXIuYwpAQCAtMTEwNSwxMCArMTEwNSwxMSBAQCBzdGF0aWMgdm9pZCBy ZW5kZXJfcmluZ19jbGVhbnVwKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCiAJaW50ZWxf ZmluaV9waXBlX2NvbnRyb2wocmluZyk7CiB9CiAKLXN0YXRpYyBpbnQgZ2VuOF9yY3Nfc2lnbmFs KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnNpZ25hbGxlciwKK3N0YXRpYyBpbnQgZ2VuOF9yY3Nf c2lnbmFsKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqc2lnbmFsbGVyX3JlcSwKIAkJCSAg IHVuc2lnbmVkIGludCBudW1fZHdvcmRzKQogewogI2RlZmluZSBNQk9YX1VQREFURV9EV09SRFMg OAorCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnNpZ25hbGxlciA9IHNpZ25hbGxlcl9yZXEtPnJp bmc7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHNpZ25hbGxlci0+ZGV2OwogCXN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJc3RydWN0IGlu dGVsX2VuZ2luZV9jcyAqd2FpdGVyOwpAQCAtMTEyOCw4ICsxMTI5LDcgQEAgc3RhdGljIGludCBn ZW44X3Jjc19zaWduYWwoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqc2lnbmFsbGVyLAogCQlpZiAo Z3R0X29mZnNldCA9PSBNSV9TRU1BUEhPUkVfU1lOQ19JTlZBTElEKQogCQkJY29udGludWU7CiAK LQkJc2Vxbm8gPSBpOTE1X2dlbV9yZXF1ZXN0X2dldF9zZXFubygKLQkJCQkJICAgc2lnbmFsbGVy LT5vdXRzdGFuZGluZ19sYXp5X3JlcXVlc3QpOworCQlzZXFubyA9IGk5MTVfZ2VtX3JlcXVlc3Rf Z2V0X3NlcW5vKHNpZ25hbGxlcl9yZXEpOwogCQlpbnRlbF9yaW5nX2VtaXQoc2lnbmFsbGVyLCBH RlhfT1BfUElQRV9DT05UUk9MKDYpKTsKIAkJaW50ZWxfcmluZ19lbWl0KHNpZ25hbGxlciwgUElQ RV9DT05UUk9MX0dMT0JBTF9HVFRfSVZCIHwKIAkJCQkJICAgUElQRV9DT05UUk9MX1FXX1dSSVRF IHwKQEAgLTExNDYsMTAgKzExNDYsMTEgQEAgc3RhdGljIGludCBnZW44X3Jjc19zaWduYWwoc3Ry dWN0IGludGVsX2VuZ2luZV9jcyAqc2lnbmFsbGVyLAogCXJldHVybiAwOwogfQogCi1zdGF0aWMg aW50IGdlbjhfeGNzX3NpZ25hbChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpzaWduYWxsZXIsCitz dGF0aWMgaW50IGdlbjhfeGNzX3NpZ25hbChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnNp Z25hbGxlcl9yZXEsCiAJCQkgICB1bnNpZ25lZCBpbnQgbnVtX2R3b3JkcykKIHsKICNkZWZpbmUg TUJPWF9VUERBVEVfRFdPUkRTIDYKKwlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpzaWduYWxsZXIg PSBzaWduYWxsZXJfcmVxLT5yaW5nOwogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBzaWduYWxs ZXItPmRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9w cml2YXRlOwogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKndhaXRlcjsKQEAgLTExNjksOCArMTE3 MCw3IEBAIHN0YXRpYyBpbnQgZ2VuOF94Y3Nfc2lnbmFsKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg KnNpZ25hbGxlciwKIAkJaWYgKGd0dF9vZmZzZXQgPT0gTUlfU0VNQVBIT1JFX1NZTkNfSU5WQUxJ RCkKIAkJCWNvbnRpbnVlOwogCi0JCXNlcW5vID0gaTkxNV9nZW1fcmVxdWVzdF9nZXRfc2Vxbm8o Ci0JCQkJCSAgIHNpZ25hbGxlci0+b3V0c3RhbmRpbmdfbGF6eV9yZXF1ZXN0KTsKKwkJc2Vxbm8g PSBpOTE1X2dlbV9yZXF1ZXN0X2dldF9zZXFubyhzaWduYWxsZXJfcmVxKTsKIAkJaW50ZWxfcmlu Z19lbWl0KHNpZ25hbGxlciwgKE1JX0ZMVVNIX0RXICsgMSkgfAogCQkJCQkgICBNSV9GTFVTSF9E V19PUF9TVE9SRURXKTsKIAkJaW50ZWxfcmluZ19lbWl0KHNpZ25hbGxlciwgbG93ZXJfMzJfYml0 cyhndHRfb2Zmc2V0KSB8CkBAIC0xMTg1LDkgKzExODUsMTAgQEAgc3RhdGljIGludCBnZW44X3hj c19zaWduYWwoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqc2lnbmFsbGVyLAogCXJldHVybiAwOwog fQogCi1zdGF0aWMgaW50IGdlbjZfc2lnbmFsKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnNpZ25h bGxlciwKK3N0YXRpYyBpbnQgZ2VuNl9zaWduYWwoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0 ICpzaWduYWxsZXJfcmVxLAogCQkgICAgICAgdW5zaWduZWQgaW50IG51bV9kd29yZHMpCiB7CisJ c3RydWN0IGludGVsX2VuZ2luZV9jcyAqc2lnbmFsbGVyID0gc2lnbmFsbGVyX3JlcS0+cmluZzsK IAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gc2lnbmFsbGVyLT5kZXY7CiAJc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICp1c2VsZXNzOwpAQCAtMTIwNSw4ICsxMjA2LDcgQEAgc3RhdGljIGludCBnZW42 X3NpZ25hbChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpzaWduYWxsZXIsCiAJZm9yX2VhY2hfcmlu Zyh1c2VsZXNzLCBkZXZfcHJpdiwgaSkgewogCQl1MzIgbWJveF9yZWcgPSBzaWduYWxsZXItPnNl bWFwaG9yZS5tYm94LnNpZ25hbFtpXTsKIAkJaWYgKG1ib3hfcmVnICE9IEdFTjZfTk9TWU5DKSB7 Ci0JCQl1MzIgc2Vxbm8gPSBpOTE1X2dlbV9yZXF1ZXN0X2dldF9zZXFubygKLQkJCQkJICAgc2ln bmFsbGVyLT5vdXRzdGFuZGluZ19sYXp5X3JlcXVlc3QpOworCQkJdTMyIHNlcW5vID0gaTkxNV9n ZW1fcmVxdWVzdF9nZXRfc2Vxbm8oc2lnbmFsbGVyX3JlcSk7CiAJCQlpbnRlbF9yaW5nX2VtaXQo c2lnbmFsbGVyLCBNSV9MT0FEX1JFR0lTVEVSX0lNTSgxKSk7CiAJCQlpbnRlbF9yaW5nX2VtaXQo c2lnbmFsbGVyLCBtYm94X3JlZyk7CiAJCQlpbnRlbF9yaW5nX2VtaXQoc2lnbmFsbGVyLCBzZXFu byk7CkBAIC0xMjM1LDcgKzEyMzUsNyBAQCBnZW42X2FkZF9yZXF1ZXN0KHN0cnVjdCBkcm1faTkx NV9nZW1fcmVxdWVzdCAqcmVxKQogCWludCByZXQ7CiAKIAlpZiAocmluZy0+c2VtYXBob3JlLnNp Z25hbCkKLQkJcmV0ID0gcmluZy0+c2VtYXBob3JlLnNpZ25hbChyaW5nLCA0KTsKKwkJcmV0ID0g cmluZy0+c2VtYXBob3JlLnNpZ25hbChyZXEsIDQpOwogCWVsc2UKIAkJcmV0ID0gaW50ZWxfcmlu Z19iZWdpbihyaW5nLCA0KTsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfcmluZ2J1ZmZlci5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5o CmluZGV4IDY1ZmUxNTEuLjdjMWUwZjUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3JpbmdidWZmZXIuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5n YnVmZmVyLmgKQEAgLTIyMiw3ICsyMjIsNyBAQCBzdHJ1Y3QgIGludGVsX2VuZ2luZV9jcyB7CiAJ CWludAkoKnN5bmNfdG8pKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqdG9fcmVxLAogCQkJ CSAgIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmZyb20sCiAJCQkJICAgdTMyIHNlcW5vKTsKLQkJ aW50CSgqc2lnbmFsKShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpzaWduYWxsZXIsCisJCWludAko KnNpZ25hbCkoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpzaWduYWxsZXJfcmVxLAogCQkJ CSAgLyogbnVtX2R3b3JkcyBuZWVkZWQgYnkgY2FsbGVyICovCiAJCQkJICB1bnNpZ25lZCBpbnQg bnVtX2R3b3Jkcyk7CiAJfSBzZW1hcGhvcmU7Ci0tIAoxLjcuOS41CgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=