From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH v5 05/35] drm/i915: Re-instate request->uniq because it is extremely useful Date: Thu, 18 Feb 2016 14:26:53 +0000 Message-ID: <1455805644-6450-6-git-send-email-John.C.Harrison@Intel.com> References: <1455805644-6450-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 mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id 452086EBE5 for ; Thu, 18 Feb 2016 14:27:34 +0000 (UTC) In-Reply-To: <1455805644-6450-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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KClRoZSBzZXFu byB2YWx1ZSBjYW5ub3QgYWx3YXlzIGJlIHVzZWQgd2hlbiBkZWJ1Z2dpbmcgaXNzdWVzIHZpYSB0 cmFjZQpwb2ludHMuIFRoaXMgaXMgYmVjYXVzZSBpdCBjYW4gYmUgcmVzZXQgYmFjayB0byBzdGFy dCwgZXNwZWNpYWxseQpkdXJpbmcgVERSIHR5cGUgdGVzdHMuIEFsc28sIHdoZW4gdGhlIHNjaGVk dWxlciBhcnJpdmVzIHRoZSBzZXFubyBpcwpvbmx5IHZhbGlkIHdoaWxlIGEgZ2l2ZW4gcmVxdWVz dCBpcyBleGVjdXRpbmcgb24gdGhlIGhhcmR3YXJlLiBXaGlsZQp0aGUgcmVxdWVzdCBpcyBzaW1w bHkgcXVldWVkIHdhaXRpbmcgZm9yIHN1Ym1pc3Npb24sIGl0J3Mgc2Vxbm8gdmFsdWUKd2lsbCBi ZSB6ZXJvIChtZWFuaW5nIGludmFsaWQpLgoKdjQ6IFdyYXBwZWQgYSBsb25nIGxpbmUgdG8ga2Vl cCB0aGUgc3R5bGUgY2hlY2tlciBoYXBweS4KCnY1OiBBZGRlZCB1bmlxIHRvIHRoZSBkaXNwYXRj aCB0cmFjZSBwb2ludCBbU3ZldGxhbmEgS3VrYW5vdmFdCgpGb3I6IFZJWi01MTE1ClNpZ25lZC1v ZmYtYnk6IEpvaG4gSGFycmlzb24gPEpvaG4uQy5IYXJyaXNvbkBJbnRlbC5jb20+ClJldmlld2Vk LWJ5OiBUb21hcyBFbGYgPHRvbWFzLmVsZkBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuaCAgIHwgIDUgKysrKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtLmMgICB8ICA0ICsrKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfdHJhY2UuaCB8IDMy ICsrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDMwIGlu c2VydGlvbnMoKyksIDExIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4 IDhkZDgxMWUuLmY0NDg3YjkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMTk4Niw2ICsx OTg2LDggQEAgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgewogCiAJc3RydWN0IGludGVsX2VuY29k ZXIgKmRpZ19wb3J0X21hcFtJOTE1X01BWF9QT1JUU107CiAKKwl1aW50MzJfdCByZXF1ZXN0X3Vu aXE7CisKIAkvKgogCSAqIE5PVEU6IFRoaXMgaXMgdGhlIGRyaTEvdW1zIGR1bmdlb24sIGRvbid0 IGFkZCBzdHVmZiBoZXJlLiBZb3VyIHBhdGNoCiAJICogd2lsbCBiZSByZWplY3RlZC4gSW5zdGVh ZCBsb29rIGZvciBhIGJldHRlciBwbGFjZS4KQEAgLTIyNDIsNiArMjI0NCw5IEBAIHN0cnVjdCBk cm1faTkxNV9nZW1fcmVxdWVzdCB7CiAJICAqLwogCXUzMiBzZXFubzsKIAorCS8qIFVuaXF1ZSBp ZGVudGlmaWVyIHdoaWNoIGNhbiBiZSB1c2VkIGZvciB0cmFjZSBwb2ludHMgJiBkZWJ1ZyAqLwor CXVpbnQzMl90IHVuaXE7CisKIAkvKiogUG9zaXRpb24gaW4gdGhlIHJpbmdidWZmZXIgb2YgdGhl IHN0YXJ0IG9mIHRoZSByZXF1ZXN0ICovCiAJdTMyIGhlYWQ7CiAKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bS5jCmluZGV4IGJmMzljYTQuLmRmZTQzZWEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAt Mjk2MCw3ICsyOTYwLDggQEAgc3RhdGljIHZvaWQgaTkxNV9nZW1fcmVxdWVzdF9mZW5jZV92YWx1 ZV9zdHIoc3RydWN0IGZlbmNlICpyZXFfZmVuY2UsCiAKIAlyZXEgPSBjb250YWluZXJfb2YocmVx X2ZlbmNlLCB0eXBlb2YoKnJlcSksIGZlbmNlKTsKIAotCXNucHJpbnRmKHN0ciwgc2l6ZSwgIiVk IFslZF0iLCByZXEtPmZlbmNlLnNlcW5vLCByZXEtPnNlcW5vKTsKKwlzbnByaW50ZihzdHIsIHNp emUsICIlZCBbJWQ6JWRdIiwgcmVxLT5mZW5jZS5zZXFubywgcmVxLT51bmlxLAorCQkgcmVxLT5z ZXFubyk7CiB9CiAKIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZmVuY2Vfb3BzIGk5MTVfZ2VtX3JlcXVl c3RfZm9wcyA9IHsKQEAgLTMwMzYsNiArMzAzNyw3IEBAIGludCBpOTE1X2dlbV9yZXF1ZXN0X2Fs bG9jKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCiAKIAlyZXEtPmk5MTUgPSBkZXZfcHJp djsKIAlyZXEtPnJpbmcgPSByaW5nOworCXJlcS0+dW5pcSA9IGRldl9wcml2LT5yZXF1ZXN0X3Vu aXErKzsKIAlyZXEtPmN0eCAgPSBjdHg7CiAJaTkxNV9nZW1fY29udGV4dF9yZWZlcmVuY2UocmVx LT5jdHgpOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3RyYWNlLmgg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3RyYWNlLmgKaW5kZXggY2ZlNGYwMy4uNDU1YzIx NSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV90cmFjZS5oCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfdHJhY2UuaApAQCAtNDY5LDYgKzQ2OSw3IEBAIFRSQUNF X0VWRU5UKGk5MTVfZ2VtX3Jpbmdfc3luY190bywKIAkJCSAgICAgX19maWVsZCh1MzIsIGRldikK IAkJCSAgICAgX19maWVsZCh1MzIsIHN5bmNfZnJvbSkKIAkJCSAgICAgX19maWVsZCh1MzIsIHN5 bmNfdG8pCisJCQkgICAgIF9fZmllbGQodTMyLCB1bmlxX3RvKQogCQkJICAgICBfX2ZpZWxkKHUz Miwgc2Vxbm8pCiAJCQkgICAgICksCiAKQEAgLTQ3NiwxMyArNDc3LDE0IEBAIFRSQUNFX0VWRU5U KGk5MTVfZ2VtX3Jpbmdfc3luY190bywKIAkJCSAgIF9fZW50cnktPmRldiA9IGZyb20tPmRldi0+ cHJpbWFyeS0+aW5kZXg7CiAJCQkgICBfX2VudHJ5LT5zeW5jX2Zyb20gPSBmcm9tLT5pZDsKIAkJ CSAgIF9fZW50cnktPnN5bmNfdG8gPSB0b19yZXEtPnJpbmctPmlkOworCQkJICAgX19lbnRyeS0+ dW5pcV90byA9IHRvX3JlcS0+dW5pcTsKIAkJCSAgIF9fZW50cnktPnNlcW5vID0gaTkxNV9nZW1f cmVxdWVzdF9nZXRfc2Vxbm8ocmVxKTsKIAkJCSAgICksCiAKLQkgICAgVFBfcHJpbnRrKCJkZXY9 JXUsIHN5bmMtZnJvbT0ldSwgc3luYy10bz0ldSwgc2Vxbm89JXUiLAorCSAgICBUUF9wcmludGso ImRldj0ldSwgc3luYy1mcm9tPSV1LCBzeW5jLXRvPSV1LCBzZXFubz0ldSwgdG9fdW5pcT0ldSIs CiAJCSAgICAgIF9fZW50cnktPmRldiwKIAkJICAgICAgX19lbnRyeS0+c3luY19mcm9tLCBfX2Vu dHJ5LT5zeW5jX3RvLAotCQkgICAgICBfX2VudHJ5LT5zZXFubykKKwkJICAgICAgX19lbnRyeS0+ c2Vxbm8sIF9fZW50cnktPnVuaXFfdG8pCiApOwogCiBUUkFDRV9FVkVOVChpOTE1X2dlbV9yaW5n X2Rpc3BhdGNoLApAQCAtNDkyLDYgKzQ5NCw3IEBAIFRSQUNFX0VWRU5UKGk5MTVfZ2VtX3Jpbmdf ZGlzcGF0Y2gsCiAJICAgIFRQX1NUUlVDVF9fZW50cnkoCiAJCQkgICAgIF9fZmllbGQodTMyLCBk ZXYpCiAJCQkgICAgIF9fZmllbGQodTMyLCByaW5nKQorCQkJICAgICBfX2ZpZWxkKHUzMiwgdW5p cSkKIAkJCSAgICAgX19maWVsZCh1MzIsIHNlcW5vKQogCQkJICAgICBfX2ZpZWxkKHUzMiwgZmxh Z3MpCiAJCQkgICAgICksCkBAIC01MDEsMTMgKzUwNCwxNSBAQCBUUkFDRV9FVkVOVChpOTE1X2dl bV9yaW5nX2Rpc3BhdGNoLAogCQkJCQkJaTkxNV9nZW1fcmVxdWVzdF9nZXRfcmluZyhyZXEpOwog CQkJICAgX19lbnRyeS0+ZGV2ID0gcmluZy0+ZGV2LT5wcmltYXJ5LT5pbmRleDsKIAkJCSAgIF9f ZW50cnktPnJpbmcgPSByaW5nLT5pZDsKKwkJCSAgIF9fZW50cnktPnVuaXEgPSByZXEtPnVuaXE7 CiAJCQkgICBfX2VudHJ5LT5zZXFubyA9IGk5MTVfZ2VtX3JlcXVlc3RfZ2V0X3NlcW5vKHJlcSk7 CiAJCQkgICBfX2VudHJ5LT5mbGFncyA9IGZsYWdzOwogCQkJICAgaTkxNV90cmFjZV9pcnFfZ2V0 KHJpbmcsIHJlcSk7CiAJCQkgICApLAogCi0JICAgIFRQX3ByaW50aygiZGV2PSV1LCByaW5nPSV1 LCBzZXFubz0ldSwgZmxhZ3M9JXgiLAotCQkgICAgICBfX2VudHJ5LT5kZXYsIF9fZW50cnktPnJp bmcsIF9fZW50cnktPnNlcW5vLCBfX2VudHJ5LT5mbGFncykKKwkgICAgVFBfcHJpbnRrKCJkZXY9 JXUsIHJpbmc9JXUsIHVuaXE9JXUsIHNlcW5vPSV1LCBmbGFncz0leCIsCisJCSAgICAgIF9fZW50 cnktPmRldiwgX19lbnRyeS0+cmluZywgX19lbnRyeS0+dW5pcSwKKwkJICAgICAgX19lbnRyeS0+ c2Vxbm8sIF9fZW50cnktPmZsYWdzKQogKTsKIAogVFJBQ0VfRVZFTlQoaTkxNV9nZW1fcmluZ19m bHVzaCwKQEAgLTUxNyw2ICs1MjIsNyBAQCBUUkFDRV9FVkVOVChpOTE1X2dlbV9yaW5nX2ZsdXNo LAogCSAgICBUUF9TVFJVQ1RfX2VudHJ5KAogCQkJICAgICBfX2ZpZWxkKHUzMiwgZGV2KQogCQkJ ICAgICBfX2ZpZWxkKHUzMiwgcmluZykKKwkJCSAgICAgX19maWVsZCh1MzIsIHVuaXEpCiAJCQkg ICAgIF9fZmllbGQodTMyLCBpbnZhbGlkYXRlKQogCQkJICAgICBfX2ZpZWxkKHUzMiwgZmx1c2gp CiAJCQkgICAgICksCkBAIC01MjQsMTIgKzUzMCwxMyBAQCBUUkFDRV9FVkVOVChpOTE1X2dlbV9y aW5nX2ZsdXNoLAogCSAgICBUUF9mYXN0X2Fzc2lnbigKIAkJCSAgIF9fZW50cnktPmRldiA9IHJl cS0+cmluZy0+ZGV2LT5wcmltYXJ5LT5pbmRleDsKIAkJCSAgIF9fZW50cnktPnJpbmcgPSByZXEt PnJpbmctPmlkOworCQkJICAgX19lbnRyeS0+dW5pcSA9IHJlcS0+dW5pcTsKIAkJCSAgIF9fZW50 cnktPmludmFsaWRhdGUgPSBpbnZhbGlkYXRlOwogCQkJICAgX19lbnRyeS0+Zmx1c2ggPSBmbHVz aDsKIAkJCSAgICksCiAKLQkgICAgVFBfcHJpbnRrKCJkZXY9JXUsIHJpbmc9JXgsIGludmFsaWRh dGU9JTA0eCwgZmx1c2g9JTA0eCIsCi0JCSAgICAgIF9fZW50cnktPmRldiwgX19lbnRyeS0+cmlu ZywKKwkgICAgVFBfcHJpbnRrKCJkZXY9JXUsIHJpbmc9JXgsIHJlcXVlc3Q9JXUsIGludmFsaWRh dGU9JTA0eCwgZmx1c2g9JTA0eCIsCisJCSAgICAgIF9fZW50cnktPmRldiwgX19lbnRyeS0+cmlu ZywgX19lbnRyeS0+dW5pcSwKIAkJICAgICAgX19lbnRyeS0+aW52YWxpZGF0ZSwgX19lbnRyeS0+ Zmx1c2gpCiApOwogCkBAIC01NDAsNiArNTQ3LDcgQEAgREVDTEFSRV9FVkVOVF9DTEFTUyhpOTE1 X2dlbV9yZXF1ZXN0LAogCSAgICBUUF9TVFJVQ1RfX2VudHJ5KAogCQkJICAgICBfX2ZpZWxkKHUz MiwgZGV2KQogCQkJICAgICBfX2ZpZWxkKHUzMiwgcmluZykKKwkJCSAgICAgX19maWVsZCh1MzIs IHVuaXEpCiAJCQkgICAgIF9fZmllbGQodTMyLCBzZXFubykKIAkJCSAgICAgKSwKIApAQCAtNTQ4 LDExICs1NTYsMTMgQEAgREVDTEFSRV9FVkVOVF9DTEFTUyhpOTE1X2dlbV9yZXF1ZXN0LAogCQkJ CQkJaTkxNV9nZW1fcmVxdWVzdF9nZXRfcmluZyhyZXEpOwogCQkJICAgX19lbnRyeS0+ZGV2ID0g cmluZy0+ZGV2LT5wcmltYXJ5LT5pbmRleDsKIAkJCSAgIF9fZW50cnktPnJpbmcgPSByaW5nLT5p ZDsKKwkJCSAgIF9fZW50cnktPnVuaXEgPSByZXEgPyByZXEtPnVuaXEgOiAwOwogCQkJICAgX19l bnRyeS0+c2Vxbm8gPSBpOTE1X2dlbV9yZXF1ZXN0X2dldF9zZXFubyhyZXEpOwogCQkJICAgKSwK IAotCSAgICBUUF9wcmludGsoImRldj0ldSwgcmluZz0ldSwgc2Vxbm89JXUiLAotCQkgICAgICBf X2VudHJ5LT5kZXYsIF9fZW50cnktPnJpbmcsIF9fZW50cnktPnNlcW5vKQorCSAgICBUUF9wcmlu dGsoImRldj0ldSwgcmluZz0ldSwgdW5pcT0ldSwgc2Vxbm89JXUiLAorCQkgICAgICBfX2VudHJ5 LT5kZXYsIF9fZW50cnktPnJpbmcsIF9fZW50cnktPnVuaXEsCisJCSAgICAgIF9fZW50cnktPnNl cW5vKQogKTsKIAogREVGSU5FX0VWRU5UKGk5MTVfZ2VtX3JlcXVlc3QsIGk5MTVfZ2VtX3JlcXVl c3RfYWRkLApAQCAtNjAxLDYgKzYxMSw3IEBAIFRSQUNFX0VWRU5UKGk5MTVfZ2VtX3JlcXVlc3Rf d2FpdF9iZWdpbiwKIAkgICAgVFBfU1RSVUNUX19lbnRyeSgKIAkJCSAgICAgX19maWVsZCh1MzIs IGRldikKIAkJCSAgICAgX19maWVsZCh1MzIsIHJpbmcpCisJCQkgICAgIF9fZmllbGQodTMyLCB1 bmlxKQogCQkJICAgICBfX2ZpZWxkKHUzMiwgc2Vxbm8pCiAJCQkgICAgIF9fZmllbGQoYm9vbCwg YmxvY2tpbmcpCiAJCQkgICAgICksCkBAIC02MTYsMTMgKzYyNywxNCBAQCBUUkFDRV9FVkVOVChp OTE1X2dlbV9yZXF1ZXN0X3dhaXRfYmVnaW4sCiAJCQkJCQlpOTE1X2dlbV9yZXF1ZXN0X2dldF9y aW5nKHJlcSk7CiAJCQkgICBfX2VudHJ5LT5kZXYgPSByaW5nLT5kZXYtPnByaW1hcnktPmluZGV4 OwogCQkJICAgX19lbnRyeS0+cmluZyA9IHJpbmctPmlkOworCQkJICAgX19lbnRyeS0+dW5pcSA9 IHJlcSA/IHJlcS0+dW5pcSA6IDA7CiAJCQkgICBfX2VudHJ5LT5zZXFubyA9IGk5MTVfZ2VtX3Jl cXVlc3RfZ2V0X3NlcW5vKHJlcSk7CiAJCQkgICBfX2VudHJ5LT5ibG9ja2luZyA9CiAJCQkJICAg ICBtdXRleF9pc19sb2NrZWQoJnJpbmctPmRldi0+c3RydWN0X211dGV4KTsKIAkJCSAgICksCiAK LQkgICAgVFBfcHJpbnRrKCJkZXY9JXUsIHJpbmc9JXUsIHNlcW5vPSV1LCBibG9ja2luZz0lcyIs Ci0JCSAgICAgIF9fZW50cnktPmRldiwgX19lbnRyeS0+cmluZywKKwkgICAgVFBfcHJpbnRrKCJk ZXY9JXUsIHJpbmc9JXUsIHVuaXE9JXUsIHNlcW5vPSV1LCBibG9ja2luZz0lcyIsCisJCSAgICAg IF9fZW50cnktPmRldiwgX19lbnRyeS0+cmluZywgX19lbnRyeS0+dW5pcSwKIAkJICAgICAgX19l bnRyeS0+c2Vxbm8sIF9fZW50cnktPmJsb2NraW5nID8gICJ5ZXMgKE5CKSIgOiAibm8iKQogKTsK IAotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdm eAo=