From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH v4 06/38] drm/i915: Re-instate request->uniq because it is extremely useful Date: Mon, 11 Jan 2016 18:42:35 +0000 Message-ID: <1452537788-32136-7-git-send-email-John.C.Harrison@Intel.com> References: <1448278774-31376-1-git-send-email-John.C.Harrison@Intel.com> <1452537788-32136-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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id F0756899A7 for ; Mon, 11 Jan 2016 10:43:16 -0800 (PST) In-Reply-To: <1452537788-32136-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 cCB0aGUgc3R5bGUgY2hlY2tlciBoYXBweS4KCkZvcjogVklaLTUxMTUKU2lnbmVkLW9mZi1ieTog Sm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IFRv bWFzIEVsZiA8dG9tYXMuZWxmQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2Rydi5oICAgfCAgNSArKysrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAg IHwgIDQgKysrLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV90cmFjZS5oIHwgMjUgKysrKysr KysrKysrKysrKystLS0tLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCAyNSBpbnNlcnRpb25zKCspLCA5 IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2 LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IDI1MjA0NTkuLjEwZGZm ZGQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMTk2Myw2ICsxOTYzLDggQEAgc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgewogCS8qIHBlcmZvcm0gUEhZIHN0YXRlIHNhbml0eSBjaGVja3M/ ICovCiAJYm9vbCBjaHZfcGh5X2Fzc2VydFsyXTsKIAorCXVpbnQzMl90IHJlcXVlc3RfdW5pcTsK KwogCS8qCiAJICogTk9URTogVGhpcyBpcyB0aGUgZHJpMS91bXMgZHVuZ2VvbiwgZG9uJ3QgYWRk IHN0dWZmIGhlcmUuIFlvdXIgcGF0Y2gKIAkgKiB3aWxsIGJlIHJlamVjdGVkLiBJbnN0ZWFkIGxv b2sgZm9yIGEgYmV0dGVyIHBsYWNlLgpAQCAtMjIxMCw2ICsyMjEyLDkgQEAgc3RydWN0IGRybV9p OTE1X2dlbV9yZXF1ZXN0IHsKIAkvKiogR0VNIHNlcXVlbmNlIG51bWJlciBhc3NvY2lhdGVkIHdp dGggdGhpcyByZXF1ZXN0LiAqLwogCXVpbnQzMl90IHNlcW5vOwogCisJLyogVW5pcXVlIGlkZW50 aWZpZXIgd2hpY2ggY2FuIGJlIHVzZWQgZm9yIHRyYWNlIHBvaW50cyAmIGRlYnVnICovCisJdWlu dDMyX3QgdW5pcTsKKwogCS8qKiBQb3NpdGlvbiBpbiB0aGUgcmluZ2J1ZmZlciBvZiB0aGUgc3Rh cnQgb2YgdGhlIHJlcXVlc3QgKi8KIAl1MzIgaGVhZDsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMK aW5kZXggNWJmN2RhNi4uY2ZmMzc2OCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9nZW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBAIC0yOTA0 LDcgKzI5MDQsOCBAQCBzdGF0aWMgdm9pZCBpOTE1X2dlbV9yZXF1ZXN0X2ZlbmNlX3ZhbHVlX3N0 cihzdHJ1Y3QgZmVuY2UgKnJlcV9mZW5jZSwKIAogCXJlcSA9IGNvbnRhaW5lcl9vZihyZXFfZmVu Y2UsIHR5cGVvZigqcmVxKSwgZmVuY2UpOwogCi0Jc25wcmludGYoc3RyLCBzaXplLCAiJWQgWyVk XSIsIHJlcS0+ZmVuY2Uuc2Vxbm8sIHJlcS0+c2Vxbm8pOworCXNucHJpbnRmKHN0ciwgc2l6ZSwg IiVkIFslZDolZF0iLCByZXEtPmZlbmNlLnNlcW5vLCByZXEtPnVuaXEsCisJCSByZXEtPnNlcW5v KTsKIH0KIAogc3RhdGljIGNvbnN0IHN0cnVjdCBmZW5jZV9vcHMgaTkxNV9nZW1fcmVxdWVzdF9m b3BzID0gewpAQCAtMjk4MCw2ICsyOTgxLDcgQEAgaW50IGk5MTVfZ2VtX3JlcXVlc3RfYWxsb2Mo c3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKIAogCXJlcS0+aTkxNSA9IGRldl9wcml2Owog CXJlcS0+cmluZyA9IHJpbmc7CisJcmVxLT51bmlxID0gZGV2X3ByaXYtPnJlcXVlc3RfdW5pcSsr OwogCXJlcS0+Y3R4ICA9IGN0eDsKIAlpOTE1X2dlbV9jb250ZXh0X3JlZmVyZW5jZShyZXEtPmN0 eCk7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfdHJhY2UuaCBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfdHJhY2UuaAppbmRleCBiM2FlODk0Li40YzAzNzU0IDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3RyYWNlLmgKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV90cmFjZS5oCkBAIC00NjksNiArNDY5LDcgQEAgVFJBQ0VfRVZF TlQoaTkxNV9nZW1fcmluZ19zeW5jX3RvLAogCQkJICAgICBfX2ZpZWxkKHUzMiwgZGV2KQogCQkJ ICAgICBfX2ZpZWxkKHUzMiwgc3luY19mcm9tKQogCQkJICAgICBfX2ZpZWxkKHUzMiwgc3luY190 bykKKwkJCSAgICAgX19maWVsZCh1MzIsIHVuaXFfdG8pCiAJCQkgICAgIF9fZmllbGQodTMyLCBz ZXFubykKIAkJCSAgICAgKSwKIApAQCAtNDc2LDEzICs0NzcsMTQgQEAgVFJBQ0VfRVZFTlQoaTkx NV9nZW1fcmluZ19zeW5jX3RvLAogCQkJICAgX19lbnRyeS0+ZGV2ID0gZnJvbS0+ZGV2LT5wcmlt YXJ5LT5pbmRleDsKIAkJCSAgIF9fZW50cnktPnN5bmNfZnJvbSA9IGZyb20tPmlkOwogCQkJICAg X19lbnRyeS0+c3luY190byA9IHRvX3JlcS0+cmluZy0+aWQ7CisJCQkgICBfX2VudHJ5LT51bmlx X3RvID0gdG9fcmVxLT51bmlxOwogCQkJICAgX19lbnRyeS0+c2Vxbm8gPSBpOTE1X2dlbV9yZXF1 ZXN0X2dldF9zZXFubyhyZXEpOwogCQkJICAgKSwKIAotCSAgICBUUF9wcmludGsoImRldj0ldSwg c3luYy1mcm9tPSV1LCBzeW5jLXRvPSV1LCBzZXFubz0ldSIsCisJICAgIFRQX3ByaW50aygiZGV2 PSV1LCBzeW5jLWZyb209JXUsIHN5bmMtdG89JXUsIHNlcW5vPSV1LCB0b191bmlxPSV1IiwKIAkJ ICAgICAgX19lbnRyeS0+ZGV2LAogCQkgICAgICBfX2VudHJ5LT5zeW5jX2Zyb20sIF9fZW50cnkt PnN5bmNfdG8sCi0JCSAgICAgIF9fZW50cnktPnNlcW5vKQorCQkgICAgICBfX2VudHJ5LT5zZXFu bywgX19lbnRyeS0+dW5pcV90bykKICk7CiAKIFRSQUNFX0VWRU5UKGk5MTVfZ2VtX3JpbmdfZGlz cGF0Y2gsCkBAIC01MTcsNiArNTE5LDcgQEAgVFJBQ0VfRVZFTlQoaTkxNV9nZW1fcmluZ19mbHVz aCwKIAkgICAgVFBfU1RSVUNUX19lbnRyeSgKIAkJCSAgICAgX19maWVsZCh1MzIsIGRldikKIAkJ CSAgICAgX19maWVsZCh1MzIsIHJpbmcpCisJCQkgICAgIF9fZmllbGQodTMyLCB1bmlxKQogCQkJ ICAgICBfX2ZpZWxkKHUzMiwgaW52YWxpZGF0ZSkKIAkJCSAgICAgX19maWVsZCh1MzIsIGZsdXNo KQogCQkJICAgICApLApAQCAtNTI0LDEyICs1MjcsMTMgQEAgVFJBQ0VfRVZFTlQoaTkxNV9nZW1f cmluZ19mbHVzaCwKIAkgICAgVFBfZmFzdF9hc3NpZ24oCiAJCQkgICBfX2VudHJ5LT5kZXYgPSBy ZXEtPnJpbmctPmRldi0+cHJpbWFyeS0+aW5kZXg7CiAJCQkgICBfX2VudHJ5LT5yaW5nID0gcmVx LT5yaW5nLT5pZDsKKwkJCSAgIF9fZW50cnktPnVuaXEgPSByZXEtPnVuaXE7CiAJCQkgICBfX2Vu dHJ5LT5pbnZhbGlkYXRlID0gaW52YWxpZGF0ZTsKIAkJCSAgIF9fZW50cnktPmZsdXNoID0gZmx1 c2g7CiAJCQkgICApLAogCi0JICAgIFRQX3ByaW50aygiZGV2PSV1LCByaW5nPSV4LCBpbnZhbGlk YXRlPSUwNHgsIGZsdXNoPSUwNHgiLAotCQkgICAgICBfX2VudHJ5LT5kZXYsIF9fZW50cnktPnJp bmcsCisJICAgIFRQX3ByaW50aygiZGV2PSV1LCByaW5nPSV4LCByZXF1ZXN0PSV1LCBpbnZhbGlk YXRlPSUwNHgsIGZsdXNoPSUwNHgiLAorCQkgICAgICBfX2VudHJ5LT5kZXYsIF9fZW50cnktPnJp bmcsIF9fZW50cnktPnVuaXEsCiAJCSAgICAgIF9fZW50cnktPmludmFsaWRhdGUsIF9fZW50cnkt PmZsdXNoKQogKTsKIApAQCAtNTQwLDYgKzU0NCw3IEBAIERFQ0xBUkVfRVZFTlRfQ0xBU1MoaTkx NV9nZW1fcmVxdWVzdCwKIAkgICAgVFBfU1RSVUNUX19lbnRyeSgKIAkJCSAgICAgX19maWVsZCh1 MzIsIGRldikKIAkJCSAgICAgX19maWVsZCh1MzIsIHJpbmcpCisJCQkgICAgIF9fZmllbGQodTMy LCB1bmlxKQogCQkJICAgICBfX2ZpZWxkKHUzMiwgc2Vxbm8pCiAJCQkgICAgICksCiAKQEAgLTU0 OCwxMSArNTUzLDEzIEBAIERFQ0xBUkVfRVZFTlRfQ0xBU1MoaTkxNV9nZW1fcmVxdWVzdCwKIAkJ CQkJCWk5MTVfZ2VtX3JlcXVlc3RfZ2V0X3JpbmcocmVxKTsKIAkJCSAgIF9fZW50cnktPmRldiA9 IHJpbmctPmRldi0+cHJpbWFyeS0+aW5kZXg7CiAJCQkgICBfX2VudHJ5LT5yaW5nID0gcmluZy0+ aWQ7CisJCQkgICBfX2VudHJ5LT51bmlxID0gcmVxID8gcmVxLT51bmlxIDogMDsKIAkJCSAgIF9f ZW50cnktPnNlcW5vID0gaTkxNV9nZW1fcmVxdWVzdF9nZXRfc2Vxbm8ocmVxKTsKIAkJCSAgICks CiAKLQkgICAgVFBfcHJpbnRrKCJkZXY9JXUsIHJpbmc9JXUsIHNlcW5vPSV1IiwKLQkJICAgICAg X19lbnRyeS0+ZGV2LCBfX2VudHJ5LT5yaW5nLCBfX2VudHJ5LT5zZXFubykKKwkgICAgVFBfcHJp bnRrKCJkZXY9JXUsIHJpbmc9JXUsIHVuaXE9JXUsIHNlcW5vPSV1IiwKKwkJICAgICAgX19lbnRy eS0+ZGV2LCBfX2VudHJ5LT5yaW5nLCBfX2VudHJ5LT51bmlxLAorCQkgICAgICBfX2VudHJ5LT5z ZXFubykKICk7CiAKIERFRklORV9FVkVOVChpOTE1X2dlbV9yZXF1ZXN0LCBpOTE1X2dlbV9yZXF1 ZXN0X2FkZCwKQEAgLTYwMSw2ICs2MDgsNyBAQCBUUkFDRV9FVkVOVChpOTE1X2dlbV9yZXF1ZXN0 X3dhaXRfYmVnaW4sCiAJICAgIFRQX1NUUlVDVF9fZW50cnkoCiAJCQkgICAgIF9fZmllbGQodTMy LCBkZXYpCiAJCQkgICAgIF9fZmllbGQodTMyLCByaW5nKQorCQkJICAgICBfX2ZpZWxkKHUzMiwg dW5pcSkKIAkJCSAgICAgX19maWVsZCh1MzIsIHNlcW5vKQogCQkJICAgICBfX2ZpZWxkKGJvb2ws IGJsb2NraW5nKQogCQkJICAgICApLApAQCAtNjE2LDEzICs2MjQsMTQgQEAgVFJBQ0VfRVZFTlQo aTkxNV9nZW1fcmVxdWVzdF93YWl0X2JlZ2luLAogCQkJCQkJaTkxNV9nZW1fcmVxdWVzdF9nZXRf cmluZyhyZXEpOwogCQkJICAgX19lbnRyeS0+ZGV2ID0gcmluZy0+ZGV2LT5wcmltYXJ5LT5pbmRl eDsKIAkJCSAgIF9fZW50cnktPnJpbmcgPSByaW5nLT5pZDsKKwkJCSAgIF9fZW50cnktPnVuaXEg PSByZXEgPyByZXEtPnVuaXEgOiAwOwogCQkJICAgX19lbnRyeS0+c2Vxbm8gPSBpOTE1X2dlbV9y ZXF1ZXN0X2dldF9zZXFubyhyZXEpOwogCQkJICAgX19lbnRyeS0+YmxvY2tpbmcgPQogCQkJCSAg ICAgbXV0ZXhfaXNfbG9ja2VkKCZyaW5nLT5kZXYtPnN0cnVjdF9tdXRleCk7CiAJCQkgICApLAog Ci0JICAgIFRQX3ByaW50aygiZGV2PSV1LCByaW5nPSV1LCBzZXFubz0ldSwgYmxvY2tpbmc9JXMi LAotCQkgICAgICBfX2VudHJ5LT5kZXYsIF9fZW50cnktPnJpbmcsCisJICAgIFRQX3ByaW50aygi ZGV2PSV1LCByaW5nPSV1LCB1bmlxPSV1LCBzZXFubz0ldSwgYmxvY2tpbmc9JXMiLAorCQkgICAg ICBfX2VudHJ5LT5kZXYsIF9fZW50cnktPnJpbmcsIF9fZW50cnktPnVuaXEsCiAJCSAgICAgIF9f ZW50cnktPnNlcW5vLCBfX2VudHJ5LT5ibG9ja2luZyA/ICAieWVzIChOQikiIDogIm5vIikKICk7 CiAKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdm eAo=