From: John.C.Harrison@Intel.com Subject: [PATCH v6 05/34] drm/i915: Re-instate request->uniq because it is extremely useful Date: Wed, 20 Apr 2016 18:13:23 +0100 Message-ID: <1461172435-4256-6-git-send-email-John.C.Harrison@Intel.com> References: <1461172435-4256-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 mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 011C06EA89 for ; Wed, 20 Apr 2016 17:14:02 +0000 (UTC) In-Reply-To: <1461172435-4256-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 IGY5Nzg1MzkuLjc0OTJjZTcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMjAxMiw2ICsy MDEyLDggQEAgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgewogCiAJc3RydWN0IGludGVsX2VuY29k ZXIgKmRpZ19wb3J0X21hcFtJOTE1X01BWF9QT1JUU107CiAKKwl1aW50MzJfdCByZXF1ZXN0X3Vu aXE7CisKIAkvKgogCSAqIE5PVEU6IFRoaXMgaXMgdGhlIGRyaTEvdW1zIGR1bmdlb24sIGRvbid0 IGFkZCBzdHVmZiBoZXJlLiBZb3VyIHBhdGNoCiAJICogd2lsbCBiZSByZWplY3RlZC4gSW5zdGVh ZCBsb29rIGZvciBhIGJldHRlciBwbGFjZS4KQEAgLTIyODcsNiArMjI4OSw5IEBAIHN0cnVjdCBk cm1faTkxNV9nZW1fcmVxdWVzdCB7CiAJICAqLwogCXUzMiBzZXFubzsKIAorCS8qIFVuaXF1ZSBp ZGVudGlmaWVyIHdoaWNoIGNhbiBiZSB1c2VkIGZvciB0cmFjZSBwb2ludHMgJiBkZWJ1ZyAqLwor CXVpbnQzMl90IHVuaXE7CisKIAkvKiogUG9zaXRpb24gaW4gdGhlIHJpbmdidWZmZXIgb2YgdGhl IHN0YXJ0IG9mIHRoZSByZXF1ZXN0ICovCiAJdTMyIGhlYWQ7CiAKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bS5jCmluZGV4IDIxZmNlNjcuLmE2MzIyNzYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAt MzAwOCw3ICszMDA4LDggQEAgc3RhdGljIHZvaWQgaTkxNV9nZW1fcmVxdWVzdF9mZW5jZV92YWx1 ZV9zdHIoc3RydWN0IGZlbmNlICpyZXFfZmVuY2UsCiAKIAlyZXEgPSBjb250YWluZXJfb2YocmVx X2ZlbmNlLCB0eXBlb2YoKnJlcSksIGZlbmNlKTsKIAotCXNucHJpbnRmKHN0ciwgc2l6ZSwgIiVk IFslZF0iLCByZXEtPmZlbmNlLnNlcW5vLCByZXEtPnNlcW5vKTsKKwlzbnByaW50ZihzdHIsIHNp emUsICIlZCBbJWQ6JWRdIiwgcmVxLT5mZW5jZS5zZXFubywgcmVxLT51bmlxLAorCQkgcmVxLT5z ZXFubyk7CiB9CiAKIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZmVuY2Vfb3BzIGk5MTVfZ2VtX3JlcXVl c3RfZm9wcyA9IHsKQEAgLTMwODUsNiArMzA4Niw3IEBAIF9faTkxNV9nZW1fcmVxdWVzdF9hbGxv YyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsCiAKIAlyZXEtPmk5MTUgPSBkZXZfcHJp djsKIAlyZXEtPmVuZ2luZSA9IGVuZ2luZTsKKwlyZXEtPnVuaXEgPSBkZXZfcHJpdi0+cmVxdWVz dF91bmlxKys7CiAJcmVxLT5jdHggID0gY3R4OwogCWk5MTVfZ2VtX2NvbnRleHRfcmVmZXJlbmNl KHJlcS0+Y3R4KTsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV90cmFj ZS5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV90cmFjZS5oCmluZGV4IGI3YzcwMzEuLjU5 YTYyNjYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfdHJhY2UuaAorKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3RyYWNlLmgKQEAgLTQ1OCw2ICs0NTgsNyBAQCBU UkFDRV9FVkVOVChpOTE1X2dlbV9yaW5nX3N5bmNfdG8sCiAJCQkgICAgIF9fZmllbGQodTMyLCBk ZXYpCiAJCQkgICAgIF9fZmllbGQodTMyLCBzeW5jX2Zyb20pCiAJCQkgICAgIF9fZmllbGQodTMy LCBzeW5jX3RvKQorCQkJICAgICBfX2ZpZWxkKHUzMiwgdW5pcV90bykKIAkJCSAgICAgX19maWVs ZCh1MzIsIHNlcW5vKQogCQkJICAgICApLAogCkBAIC00NjUsMTMgKzQ2NiwxNCBAQCBUUkFDRV9F VkVOVChpOTE1X2dlbV9yaW5nX3N5bmNfdG8sCiAJCQkgICBfX2VudHJ5LT5kZXYgPSBmcm9tLT5k ZXYtPnByaW1hcnktPmluZGV4OwogCQkJICAgX19lbnRyeS0+c3luY19mcm9tID0gZnJvbS0+aWQ7 CiAJCQkgICBfX2VudHJ5LT5zeW5jX3RvID0gdG9fcmVxLT5lbmdpbmUtPmlkOworCQkJICAgX19l bnRyeS0+dW5pcV90byA9IHRvX3JlcS0+dW5pcTsKIAkJCSAgIF9fZW50cnktPnNlcW5vID0gaTkx NV9nZW1fcmVxdWVzdF9nZXRfc2Vxbm8ocmVxKTsKIAkJCSAgICksCiAKLQkgICAgVFBfcHJpbnRr KCJkZXY9JXUsIHN5bmMtZnJvbT0ldSwgc3luYy10bz0ldSwgc2Vxbm89JXUiLAorCSAgICBUUF9w cmludGsoImRldj0ldSwgc3luYy1mcm9tPSV1LCBzeW5jLXRvPSV1LCBzZXFubz0ldSwgdG9fdW5p cT0ldSIsCiAJCSAgICAgIF9fZW50cnktPmRldiwKIAkJICAgICAgX19lbnRyeS0+c3luY19mcm9t LCBfX2VudHJ5LT5zeW5jX3RvLAotCQkgICAgICBfX2VudHJ5LT5zZXFubykKKwkJICAgICAgX19l bnRyeS0+c2Vxbm8sIF9fZW50cnktPnVuaXFfdG8pCiApOwogCiBUUkFDRV9FVkVOVChpOTE1X2dl bV9yaW5nX2Rpc3BhdGNoLApAQCAtNDgxLDYgKzQ4Myw3IEBAIFRSQUNFX0VWRU5UKGk5MTVfZ2Vt X3JpbmdfZGlzcGF0Y2gsCiAJICAgIFRQX1NUUlVDVF9fZW50cnkoCiAJCQkgICAgIF9fZmllbGQo dTMyLCBkZXYpCiAJCQkgICAgIF9fZmllbGQodTMyLCByaW5nKQorCQkJICAgICBfX2ZpZWxkKHUz MiwgdW5pcSkKIAkJCSAgICAgX19maWVsZCh1MzIsIHNlcW5vKQogCQkJICAgICBfX2ZpZWxkKHUz MiwgZmxhZ3MpCiAJCQkgICAgICksCkBAIC00OTAsMTMgKzQ5MywxNSBAQCBUUkFDRV9FVkVOVChp OTE1X2dlbV9yaW5nX2Rpc3BhdGNoLAogCQkJCQkJaTkxNV9nZW1fcmVxdWVzdF9nZXRfZW5naW5l KHJlcSk7CiAJCQkgICBfX2VudHJ5LT5kZXYgPSBlbmdpbmUtPmRldi0+cHJpbWFyeS0+aW5kZXg7 CiAJCQkgICBfX2VudHJ5LT5yaW5nID0gZW5naW5lLT5pZDsKKwkJCSAgIF9fZW50cnktPnVuaXEg PSByZXEtPnVuaXE7CiAJCQkgICBfX2VudHJ5LT5zZXFubyA9IGk5MTVfZ2VtX3JlcXVlc3RfZ2V0 X3NlcW5vKHJlcSk7CiAJCQkgICBfX2VudHJ5LT5mbGFncyA9IGZsYWdzOwogCQkJICAgaTkxNV90 cmFjZV9pcnFfZ2V0KGVuZ2luZSwgcmVxKTsKIAkJCSAgICksCiAKLQkgICAgVFBfcHJpbnRrKCJk ZXY9JXUsIHJpbmc9JXUsIHNlcW5vPSV1LCBmbGFncz0leCIsCi0JCSAgICAgIF9fZW50cnktPmRl diwgX19lbnRyeS0+cmluZywgX19lbnRyeS0+c2Vxbm8sIF9fZW50cnktPmZsYWdzKQorCSAgICBU UF9wcmludGsoImRldj0ldSwgcmluZz0ldSwgdW5pcT0ldSwgc2Vxbm89JXUsIGZsYWdzPSV4IiwK KwkJICAgICAgX19lbnRyeS0+ZGV2LCBfX2VudHJ5LT5yaW5nLCBfX2VudHJ5LT51bmlxLAorCQkg ICAgICBfX2VudHJ5LT5zZXFubywgX19lbnRyeS0+ZmxhZ3MpCiApOwogCiBUUkFDRV9FVkVOVChp OTE1X2dlbV9yaW5nX2ZsdXNoLApAQCAtNTA2LDYgKzUxMSw3IEBAIFRSQUNFX0VWRU5UKGk5MTVf Z2VtX3JpbmdfZmx1c2gsCiAJICAgIFRQX1NUUlVDVF9fZW50cnkoCiAJCQkgICAgIF9fZmllbGQo dTMyLCBkZXYpCiAJCQkgICAgIF9fZmllbGQodTMyLCByaW5nKQorCQkJICAgICBfX2ZpZWxkKHUz MiwgdW5pcSkKIAkJCSAgICAgX19maWVsZCh1MzIsIGludmFsaWRhdGUpCiAJCQkgICAgIF9fZmll bGQodTMyLCBmbHVzaCkKIAkJCSAgICAgKSwKQEAgLTUxMywxMiArNTE5LDEzIEBAIFRSQUNFX0VW RU5UKGk5MTVfZ2VtX3JpbmdfZmx1c2gsCiAJICAgIFRQX2Zhc3RfYXNzaWduKAogCQkJICAgX19l bnRyeS0+ZGV2ID0gcmVxLT5lbmdpbmUtPmRldi0+cHJpbWFyeS0+aW5kZXg7CiAJCQkgICBfX2Vu dHJ5LT5yaW5nID0gcmVxLT5lbmdpbmUtPmlkOworCQkJICAgX19lbnRyeS0+dW5pcSA9IHJlcS0+ dW5pcTsKIAkJCSAgIF9fZW50cnktPmludmFsaWRhdGUgPSBpbnZhbGlkYXRlOwogCQkJICAgX19l bnRyeS0+Zmx1c2ggPSBmbHVzaDsKIAkJCSAgICksCiAKLQkgICAgVFBfcHJpbnRrKCJkZXY9JXUs IHJpbmc9JXgsIGludmFsaWRhdGU9JTA0eCwgZmx1c2g9JTA0eCIsCi0JCSAgICAgIF9fZW50cnkt PmRldiwgX19lbnRyeS0+cmluZywKKwkgICAgVFBfcHJpbnRrKCJkZXY9JXUsIHJpbmc9JXgsIHJl cXVlc3Q9JXUsIGludmFsaWRhdGU9JTA0eCwgZmx1c2g9JTA0eCIsCisJCSAgICAgIF9fZW50cnkt PmRldiwgX19lbnRyeS0+cmluZywgX19lbnRyeS0+dW5pcSwKIAkJICAgICAgX19lbnRyeS0+aW52 YWxpZGF0ZSwgX19lbnRyeS0+Zmx1c2gpCiApOwogCkBAIC01MjksNiArNTM2LDcgQEAgREVDTEFS RV9FVkVOVF9DTEFTUyhpOTE1X2dlbV9yZXF1ZXN0LAogCSAgICBUUF9TVFJVQ1RfX2VudHJ5KAog CQkJICAgICBfX2ZpZWxkKHUzMiwgZGV2KQogCQkJICAgICBfX2ZpZWxkKHUzMiwgcmluZykKKwkJ CSAgICAgX19maWVsZCh1MzIsIHVuaXEpCiAJCQkgICAgIF9fZmllbGQodTMyLCBzZXFubykKIAkJ CSAgICAgKSwKIApAQCAtNTM3LDExICs1NDUsMTMgQEAgREVDTEFSRV9FVkVOVF9DTEFTUyhpOTE1 X2dlbV9yZXF1ZXN0LAogCQkJCQkJaTkxNV9nZW1fcmVxdWVzdF9nZXRfZW5naW5lKHJlcSk7CiAJ CQkgICBfX2VudHJ5LT5kZXYgPSBlbmdpbmUtPmRldi0+cHJpbWFyeS0+aW5kZXg7CiAJCQkgICBf X2VudHJ5LT5yaW5nID0gZW5naW5lLT5pZDsKKwkJCSAgIF9fZW50cnktPnVuaXEgPSByZXEgPyBy ZXEtPnVuaXEgOiAwOwogCQkJICAgX19lbnRyeS0+c2Vxbm8gPSBpOTE1X2dlbV9yZXF1ZXN0X2dl dF9zZXFubyhyZXEpOwogCQkJICAgKSwKIAotCSAgICBUUF9wcmludGsoImRldj0ldSwgcmluZz0l dSwgc2Vxbm89JXUiLAotCQkgICAgICBfX2VudHJ5LT5kZXYsIF9fZW50cnktPnJpbmcsIF9fZW50 cnktPnNlcW5vKQorCSAgICBUUF9wcmludGsoImRldj0ldSwgcmluZz0ldSwgdW5pcT0ldSwgc2Vx bm89JXUiLAorCQkgICAgICBfX2VudHJ5LT5kZXYsIF9fZW50cnktPnJpbmcsIF9fZW50cnktPnVu aXEsCisJCSAgICAgIF9fZW50cnktPnNlcW5vKQogKTsKIAogREVGSU5FX0VWRU5UKGk5MTVfZ2Vt X3JlcXVlc3QsIGk5MTVfZ2VtX3JlcXVlc3RfYWRkLApAQCAtNTkwLDYgKzYwMCw3IEBAIFRSQUNF X0VWRU5UKGk5MTVfZ2VtX3JlcXVlc3Rfd2FpdF9iZWdpbiwKIAkgICAgVFBfU1RSVUNUX19lbnRy eSgKIAkJCSAgICAgX19maWVsZCh1MzIsIGRldikKIAkJCSAgICAgX19maWVsZCh1MzIsIHJpbmcp CisJCQkgICAgIF9fZmllbGQodTMyLCB1bmlxKQogCQkJICAgICBfX2ZpZWxkKHUzMiwgc2Vxbm8p CiAJCQkgICAgIF9fZmllbGQoYm9vbCwgYmxvY2tpbmcpCiAJCQkgICAgICksCkBAIC02MDUsMTMg KzYxNiwxNCBAQCBUUkFDRV9FVkVOVChpOTE1X2dlbV9yZXF1ZXN0X3dhaXRfYmVnaW4sCiAJCQkJ CQlpOTE1X2dlbV9yZXF1ZXN0X2dldF9lbmdpbmUocmVxKTsKIAkJCSAgIF9fZW50cnktPmRldiA9 IGVuZ2luZS0+ZGV2LT5wcmltYXJ5LT5pbmRleDsKIAkJCSAgIF9fZW50cnktPnJpbmcgPSBlbmdp bmUtPmlkOworCQkJICAgX19lbnRyeS0+dW5pcSA9IHJlcSA/IHJlcS0+dW5pcSA6IDA7CiAJCQkg ICBfX2VudHJ5LT5zZXFubyA9IGk5MTVfZ2VtX3JlcXVlc3RfZ2V0X3NlcW5vKHJlcSk7CiAJCQkg ICBfX2VudHJ5LT5ibG9ja2luZyA9CiAJCQkJICAgICBtdXRleF9pc19sb2NrZWQoJmVuZ2luZS0+ ZGV2LT5zdHJ1Y3RfbXV0ZXgpOwogCQkJICAgKSwKIAotCSAgICBUUF9wcmludGsoImRldj0ldSwg cmluZz0ldSwgc2Vxbm89JXUsIGJsb2NraW5nPSVzIiwKLQkJICAgICAgX19lbnRyeS0+ZGV2LCBf X2VudHJ5LT5yaW5nLAorCSAgICBUUF9wcmludGsoImRldj0ldSwgcmluZz0ldSwgdW5pcT0ldSwg c2Vxbm89JXUsIGJsb2NraW5nPSVzIiwKKwkJICAgICAgX19lbnRyeS0+ZGV2LCBfX2VudHJ5LT5y aW5nLCBfX2VudHJ5LT51bmlxLAogCQkgICAgICBfX2VudHJ5LT5zZXFubywgX19lbnRyeS0+Ymxv Y2tpbmcgPyAgInllcyAoTkIpIiA6ICJubyIpCiApOwogCi0tIAoxLjkuMQoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlz dApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==