From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 44/55] drm/i915: Update ring->signal() to take a request structure Date: Fri, 29 May 2015 17:44:05 +0100 Message-ID: <1432917856-12261-45-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 12AF27215A for ; Fri, 29 May 2015 09:45:34 -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+c2lnbmFsKCkgaW1wbGVtZW50YXRpb25zIHRvIHRha2UgYSByZXF1 ZXN0IGluc3RlYWQgb2YKYSByaW5nLiBUaGlzIHJlbW92ZXMgdGhlaXIgcmVsaWFuY2Ugb24gdGhl IE9MUiB0byBvYnRhaW4gdGhlIHNlcW5vIHZhbHVlIHRoYXQKc2hvdWxkIGJlIHVzZWQgZm9yIHRo ZSBzaWduYWwuCgpGb3I6IFZJWi01MTE1ClNpZ25lZC1vZmYtYnk6IEpvaG4gSGFycmlzb24gPEpv aG4uQy5IYXJyaXNvbkBJbnRlbC5jb20+ClJldmlld2VkLWJ5OiBUb21hcyBFbGYgPHRvbWFzLmVs ZkBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5j IHwgICAyMCArKysrKysrKysrLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf cmluZ2J1ZmZlci5oIHwgICAgMiArLQogMiBmaWxlcyBjaGFuZ2VkLCAxMSBpbnNlcnRpb25zKCsp LCAxMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9yaW5nYnVmZmVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMK aW5kZXggYTc5YTY3Ni4uZDNkMzg0YSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfcmluZ2J1ZmZlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Jpbmdi dWZmZXIuYwpAQCAtMTE2MSwxMCArMTE2MSwxMSBAQCBzdGF0aWMgdm9pZCByZW5kZXJfcmluZ19j bGVhbnVwKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCiAJaW50ZWxfZmluaV9waXBlX2Nv bnRyb2wocmluZyk7CiB9CiAKLXN0YXRpYyBpbnQgZ2VuOF9yY3Nfc2lnbmFsKHN0cnVjdCBpbnRl bF9lbmdpbmVfY3MgKnNpZ25hbGxlciwKK3N0YXRpYyBpbnQgZ2VuOF9yY3Nfc2lnbmFsKHN0cnVj dCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqc2lnbmFsbGVyX3JlcSwKIAkJCSAgIHVuc2lnbmVkIGlu dCBudW1fZHdvcmRzKQogewogI2RlZmluZSBNQk9YX1VQREFURV9EV09SRFMgOAorCXN0cnVjdCBp bnRlbF9lbmdpbmVfY3MgKnNpZ25hbGxlciA9IHNpZ25hbGxlcl9yZXEtPnJpbmc7CiAJc3RydWN0 IGRybV9kZXZpY2UgKmRldiA9IHNpZ25hbGxlci0+ZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJc3RydWN0IGludGVsX2VuZ2luZV9j cyAqd2FpdGVyOwpAQCAtMTE4NCw4ICsxMTg1LDcgQEAgc3RhdGljIGludCBnZW44X3Jjc19zaWdu YWwoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqc2lnbmFsbGVyLAogCQlpZiAoZ3R0X29mZnNldCA9 PSBNSV9TRU1BUEhPUkVfU1lOQ19JTlZBTElEKQogCQkJY29udGludWU7CiAKLQkJc2Vxbm8gPSBp OTE1X2dlbV9yZXF1ZXN0X2dldF9zZXFubygKLQkJCQkJICAgc2lnbmFsbGVyLT5vdXRzdGFuZGlu Z19sYXp5X3JlcXVlc3QpOworCQlzZXFubyA9IGk5MTVfZ2VtX3JlcXVlc3RfZ2V0X3NlcW5vKHNp Z25hbGxlcl9yZXEpOwogCQlpbnRlbF9yaW5nX2VtaXQoc2lnbmFsbGVyLCBHRlhfT1BfUElQRV9D T05UUk9MKDYpKTsKIAkJaW50ZWxfcmluZ19lbWl0KHNpZ25hbGxlciwgUElQRV9DT05UUk9MX0dM T0JBTF9HVFRfSVZCIHwKIAkJCQkJICAgUElQRV9DT05UUk9MX1FXX1dSSVRFIHwKQEAgLTEyMDIs MTAgKzEyMDIsMTEgQEAgc3RhdGljIGludCBnZW44X3Jjc19zaWduYWwoc3RydWN0IGludGVsX2Vu Z2luZV9jcyAqc2lnbmFsbGVyLAogCXJldHVybiAwOwogfQogCi1zdGF0aWMgaW50IGdlbjhfeGNz X3NpZ25hbChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpzaWduYWxsZXIsCitzdGF0aWMgaW50IGdl bjhfeGNzX3NpZ25hbChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnNpZ25hbGxlcl9yZXEs CiAJCQkgICB1bnNpZ25lZCBpbnQgbnVtX2R3b3JkcykKIHsKICNkZWZpbmUgTUJPWF9VUERBVEVf RFdPUkRTIDYKKwlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpzaWduYWxsZXIgPSBzaWduYWxsZXJf cmVxLT5yaW5nOwogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBzaWduYWxsZXItPmRldjsKIAlz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCXN0 cnVjdCBpbnRlbF9lbmdpbmVfY3MgKndhaXRlcjsKQEAgLTEyMjUsOCArMTIyNiw3IEBAIHN0YXRp YyBpbnQgZ2VuOF94Y3Nfc2lnbmFsKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnNpZ25hbGxlciwK IAkJaWYgKGd0dF9vZmZzZXQgPT0gTUlfU0VNQVBIT1JFX1NZTkNfSU5WQUxJRCkKIAkJCWNvbnRp bnVlOwogCi0JCXNlcW5vID0gaTkxNV9nZW1fcmVxdWVzdF9nZXRfc2Vxbm8oCi0JCQkJCSAgIHNp Z25hbGxlci0+b3V0c3RhbmRpbmdfbGF6eV9yZXF1ZXN0KTsKKwkJc2Vxbm8gPSBpOTE1X2dlbV9y ZXF1ZXN0X2dldF9zZXFubyhzaWduYWxsZXJfcmVxKTsKIAkJaW50ZWxfcmluZ19lbWl0KHNpZ25h bGxlciwgKE1JX0ZMVVNIX0RXICsgMSkgfAogCQkJCQkgICBNSV9GTFVTSF9EV19PUF9TVE9SRURX KTsKIAkJaW50ZWxfcmluZ19lbWl0KHNpZ25hbGxlciwgbG93ZXJfMzJfYml0cyhndHRfb2Zmc2V0 KSB8CkBAIC0xMjQxLDkgKzEyNDEsMTAgQEAgc3RhdGljIGludCBnZW44X3hjc19zaWduYWwoc3Ry dWN0IGludGVsX2VuZ2luZV9jcyAqc2lnbmFsbGVyLAogCXJldHVybiAwOwogfQogCi1zdGF0aWMg aW50IGdlbjZfc2lnbmFsKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnNpZ25hbGxlciwKK3N0YXRp YyBpbnQgZ2VuNl9zaWduYWwoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpzaWduYWxsZXJf cmVxLAogCQkgICAgICAgdW5zaWduZWQgaW50IG51bV9kd29yZHMpCiB7CisJc3RydWN0IGludGVs X2VuZ2luZV9jcyAqc2lnbmFsbGVyID0gc2lnbmFsbGVyX3JlcS0+cmluZzsKIAlzdHJ1Y3QgZHJt X2RldmljZSAqZGV2ID0gc2lnbmFsbGVyLT5kZXY7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICp1 c2VsZXNzOwpAQCAtMTI2MSw4ICsxMjYyLDcgQEAgc3RhdGljIGludCBnZW42X3NpZ25hbChzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICpzaWduYWxsZXIsCiAJZm9yX2VhY2hfcmluZyh1c2VsZXNzLCBk ZXZfcHJpdiwgaSkgewogCQl1MzIgbWJveF9yZWcgPSBzaWduYWxsZXItPnNlbWFwaG9yZS5tYm94 LnNpZ25hbFtpXTsKIAkJaWYgKG1ib3hfcmVnICE9IEdFTjZfTk9TWU5DKSB7Ci0JCQl1MzIgc2Vx bm8gPSBpOTE1X2dlbV9yZXF1ZXN0X2dldF9zZXFubygKLQkJCQkJICAgc2lnbmFsbGVyLT5vdXRz dGFuZGluZ19sYXp5X3JlcXVlc3QpOworCQkJdTMyIHNlcW5vID0gaTkxNV9nZW1fcmVxdWVzdF9n ZXRfc2Vxbm8oc2lnbmFsbGVyX3JlcSk7CiAJCQlpbnRlbF9yaW5nX2VtaXQoc2lnbmFsbGVyLCBN SV9MT0FEX1JFR0lTVEVSX0lNTSgxKSk7CiAJCQlpbnRlbF9yaW5nX2VtaXQoc2lnbmFsbGVyLCBt Ym94X3JlZyk7CiAJCQlpbnRlbF9yaW5nX2VtaXQoc2lnbmFsbGVyLCBzZXFubyk7CkBAIC0xMjkx LDcgKzEyOTEsNyBAQCBnZW42X2FkZF9yZXF1ZXN0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVz dCAqcmVxKQogCWludCByZXQ7CiAKIAlpZiAocmluZy0+c2VtYXBob3JlLnNpZ25hbCkKLQkJcmV0 ID0gcmluZy0+c2VtYXBob3JlLnNpZ25hbChyaW5nLCA0KTsKKwkJcmV0ID0gcmluZy0+c2VtYXBo b3JlLnNpZ25hbChyZXEsIDQpOwogCWVsc2UKIAkJcmV0ID0gaW50ZWxfcmluZ19iZWdpbihyaW5n LCA0KTsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZl ci5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCmluZGV4IDZiOGEy ZGUuLmY3OGVmNDkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Jpbmdi dWZmZXIuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKQEAg LTIzMyw3ICsyMzMsNyBAQCBzdHJ1Y3QgIGludGVsX2VuZ2luZV9jcyB7CiAJCWludAkoKnN5bmNf dG8pKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqdG9fcmVxLAogCQkJCSAgIHN0cnVjdCBp bnRlbF9lbmdpbmVfY3MgKmZyb20sCiAJCQkJICAgdTMyIHNlcW5vKTsKLQkJaW50CSgqc2lnbmFs KShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpzaWduYWxsZXIsCisJCWludAkoKnNpZ25hbCkoc3Ry dWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpzaWduYWxsZXJfcmVxLAogCQkJCSAgLyogbnVtX2R3 b3JkcyBuZWVkZWQgYnkgY2FsbGVyICovCiAJCQkJICB1bnNpZ25lZCBpbnQgbnVtX2R3b3Jkcyk7 CiAJfSBzZW1hcGhvcmU7Ci0tIAoxLjcuOS41CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2ludGVsLWdmeAo=