From: John.C.Harrison@Intel.com Subject: [PATCH v6 04/34] drm/i915: Cache request pointer in *_submission_final() Date: Wed, 20 Apr 2016 18:13:22 +0100 Message-ID: <1461172435-4256-5-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 EA2CC6EA85 for ; Wed, 20 Apr 2016 17:14:01 +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 RnJvbTogRGF2ZSBHb3Jkb24gPGRhdmlkLnMuZ29yZG9uQGludGVsLmNvbT4KCktlZXAgYSBsb2Nh bCBjb3B5IG9mIHRoZSByZXF1ZXN0IHBvaW50ZXIgaW4gdGhlIF9maW5hbCgpIGZ1bmN0aW9ucwpy YXRoZXIgdGhhbiBkZXJlZmVyZW5jaW5nIHRoZSBwYXJhbXMgYmxvY2sgcmVwZWF0ZWRseS4KCnYz OiBOZXcgcGF0Y2ggaW4gc2VyaWVzLgoKdjY6IFVwZGF0ZWQgdG8gbmV3ZXIgbmlnaHRseSAobG90 cyBvZiByaW5nIC0+IGVuZ2luZSByZW5hbWluZykuCgpGb3I6IFZJWi0xNTg3ClNpZ25lZC1vZmYt Ynk6IERhdmUgR29yZG9uIDxkYXZpZC5zLmdvcmRvbkBpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6 IEpvaG4gSGFycmlzb24gPEpvaG4uQy5IYXJyaXNvbkBJbnRlbC5jb20+ClJldmlld2VkLWJ5OiBK ZXNzZSBCYXJuZXMgPGpiYXJuZXNAdmlydHVvdXNnZWVrLm9yZz4KLS0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMgfCAxNyArKysrKysrKystLS0tLS0tLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgICAgICAgICAgIHwgMTEgKysrKysrLS0tLS0K IDIgZmlsZXMgY2hhbmdlZCwgMTUgaW5zZXJ0aW9ucygrKSwgMTMgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jCmluZGV4IDZlNTAwYmYuLjJi OTAyZTMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZm ZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMKQEAg LTEyOTIsNiArMTI5Miw3IEBAIGk5MTVfZ2VtX3JpbmdidWZmZXJfc3VibWlzc2lvbihzdHJ1Y3Qg aTkxNV9leGVjYnVmZmVyX3BhcmFtcyAqcGFyYW1zLAogaW50IGk5MTVfZ2VtX3JpbmdidWZmZXJf c3VibWlzc2lvbl9maW5hbChzdHJ1Y3QgaTkxNV9leGVjYnVmZmVyX3BhcmFtcyAqcGFyYW1zKQog ewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUocGFyYW1zLT5k ZXYpOworCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxID0gcGFyYW1zLT5yZXF1ZXN0 OwogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgICplbmdpbmUgPSBwYXJhbXMtPmVuZ2luZTsKIAl1 NjQgZXhlY19zdGFydCwgZXhlY19sZW47CiAJaW50IHJldDsKQEAgLTEzMDMsMTIgKzEzMDQsMTIg QEAgaW50IGk5MTVfZ2VtX3JpbmdidWZmZXJfc3VibWlzc2lvbl9maW5hbChzdHJ1Y3QgaTkxNV9l eGVjYnVmZmVyX3BhcmFtcyAqcGFyYW1zKQogCSAqIFVuY29uZGl0aW9uYWxseSBpbnZhbGlkYXRl IGdwdSBjYWNoZXMgYW5kIGVuc3VyZSB0aGF0IHdlIGRvIGZsdXNoCiAJICogYW55IHJlc2lkdWFs IHdyaXRlcyBmcm9tIHRoZSBwcmV2aW91cyBiYXRjaC4KIAkgKi8KLQlyZXQgPSBpbnRlbF9yaW5n X2ludmFsaWRhdGVfYWxsX2NhY2hlcyhwYXJhbXMtPnJlcXVlc3QpOworCXJldCA9IGludGVsX3Jp bmdfaW52YWxpZGF0ZV9hbGxfY2FjaGVzKHJlcSk7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsK IAogCS8qIFN3aXRjaCB0byB0aGUgY29ycmVjdCBjb250ZXh0IGZvciB0aGUgYmF0Y2ggKi8KLQly ZXQgPSBpOTE1X3N3aXRjaF9jb250ZXh0KHBhcmFtcy0+cmVxdWVzdCk7CisJcmV0ID0gaTkxNV9z d2l0Y2hfY29udGV4dChyZXEpOwogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKQEAgLTEzMTcs NyArMTMxOCw3IEBAIGludCBpOTE1X2dlbV9yaW5nYnVmZmVyX3N1Ym1pc3Npb25fZmluYWwoc3Ry dWN0IGk5MTVfZXhlY2J1ZmZlcl9wYXJhbXMgKnBhcmFtcykKIAogCWlmIChlbmdpbmUgPT0gJmRl dl9wcml2LT5lbmdpbmVbUkNTXSAmJgogCSAgICBwYXJhbXMtPmluc3RwX21vZGUgIT0gZGV2X3By aXYtPnJlbGF0aXZlX2NvbnN0YW50c19tb2RlKSB7Ci0JCXJldCA9IGludGVsX3JpbmdfYmVnaW4o cGFyYW1zLT5yZXF1ZXN0LCA0KTsKKwkJcmV0ID0gaW50ZWxfcmluZ19iZWdpbihyZXEsIDQpOwog CQlpZiAocmV0KQogCQkJcmV0dXJuIHJldDsKIApAQCAtMTMzMSw3ICsxMzMyLDcgQEAgaW50IGk5 MTVfZ2VtX3JpbmdidWZmZXJfc3VibWlzc2lvbl9maW5hbChzdHJ1Y3QgaTkxNV9leGVjYnVmZmVy X3BhcmFtcyAqcGFyYW1zKQogCX0KIAogCWlmIChwYXJhbXMtPmFyZ3NfZmxhZ3MgJiBJOTE1X0VY RUNfR0VON19TT0xfUkVTRVQpIHsKLQkJcmV0ID0gaTkxNV9yZXNldF9nZW43X3NvbF9vZmZzZXRz KHBhcmFtcy0+ZGV2LCBwYXJhbXMtPnJlcXVlc3QpOworCQlyZXQgPSBpOTE1X3Jlc2V0X2dlbjdf c29sX29mZnNldHMocGFyYW1zLT5kZXYsIHJlcSk7CiAJCWlmIChyZXQpCiAJCQlyZXR1cm4gcmV0 OwogCX0KQEAgLTEzNDMsMTMgKzEzNDQsMTMgQEAgaW50IGk5MTVfZ2VtX3JpbmdidWZmZXJfc3Vi bWlzc2lvbl9maW5hbChzdHJ1Y3QgaTkxNV9leGVjYnVmZmVyX3BhcmFtcyAqcGFyYW1zKQogCWlm IChleGVjX2xlbiA9PSAwKQogCQlleGVjX2xlbiA9IHBhcmFtcy0+YmF0Y2hfb2JqLT5iYXNlLnNp emU7CiAKLQlyZXQgPSBlbmdpbmUtPmRpc3BhdGNoX2V4ZWNidWZmZXIocGFyYW1zLT5yZXF1ZXN0 LAotCQkJCQlleGVjX3N0YXJ0LCBleGVjX2xlbiwKLQkJCQkJcGFyYW1zLT5kaXNwYXRjaF9mbGFn cyk7CisJcmV0ID0gZW5naW5lLT5kaXNwYXRjaF9leGVjYnVmZmVyKHJlcSwKKwkJCQkJICBleGVj X3N0YXJ0LCBleGVjX2xlbiwKKwkJCQkJICBwYXJhbXMtPmRpc3BhdGNoX2ZsYWdzKTsKIAlpZiAo cmV0KQogCQlyZXR1cm4gcmV0OwogCi0JdHJhY2VfaTkxNV9nZW1fcmluZ19kaXNwYXRjaChwYXJh bXMtPnJlcXVlc3QsIHBhcmFtcy0+ZGlzcGF0Y2hfZmxhZ3MpOworCXRyYWNlX2k5MTVfZ2VtX3Jp bmdfZGlzcGF0Y2gocmVxLCBwYXJhbXMtPmRpc3BhdGNoX2ZsYWdzKTsKIAogCWk5MTVfZ2VtX2V4 ZWNidWZmZXJfcmV0aXJlX2NvbW1hbmRzKHBhcmFtcyk7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJj LmMKaW5kZXggNmFjMDYzZC4uNjlkZjk0OCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfbHJjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKQEAg LTEwMDUsNyArMTAwNSw4IEBAIGludCBpbnRlbF9leGVjbGlzdHNfc3VibWlzc2lvbihzdHJ1Y3Qg aTkxNV9leGVjYnVmZmVyX3BhcmFtcyAqcGFyYW1zLAogaW50IGludGVsX2V4ZWNsaXN0c19zdWJt aXNzaW9uX2ZpbmFsKHN0cnVjdCBpOTE1X2V4ZWNidWZmZXJfcGFyYW1zICpwYXJhbXMpCiB7CiAJ c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShwYXJhbXMtPmRldik7 Ci0Jc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYgPSBwYXJhbXMtPnJlcXVlc3QtPnJp bmdidWY7CisJc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEgPSBwYXJhbXMtPnJlcXVl c3Q7CisJc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYgPSByZXEtPnJpbmdidWY7CiAJ c3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lID0gcGFyYW1zLT5lbmdpbmU7CiAJdTY0IGV4 ZWNfc3RhcnQ7CiAJaW50IHJldDsKQEAgLTEwMTcsMTMgKzEwMTgsMTMgQEAgaW50IGludGVsX2V4 ZWNsaXN0c19zdWJtaXNzaW9uX2ZpbmFsKHN0cnVjdCBpOTE1X2V4ZWNidWZmZXJfcGFyYW1zICpw YXJhbXMpCiAJICogVW5jb25kaXRpb25hbGx5IGludmFsaWRhdGUgZ3B1IGNhY2hlcyBhbmQgZW5z dXJlIHRoYXQgd2UgZG8gZmx1c2gKIAkgKiBhbnkgcmVzaWR1YWwgd3JpdGVzIGZyb20gdGhlIHBy ZXZpb3VzIGJhdGNoLgogCSAqLwotCXJldCA9IGxvZ2ljYWxfcmluZ19pbnZhbGlkYXRlX2FsbF9j YWNoZXMocGFyYW1zLT5yZXF1ZXN0KTsKKwlyZXQgPSBsb2dpY2FsX3JpbmdfaW52YWxpZGF0ZV9h bGxfY2FjaGVzKHJlcSk7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIAogCWlmIChlbmdpbmUg PT0gJmRldl9wcml2LT5lbmdpbmVbUkNTXSAmJgogCSAgICBwYXJhbXMtPmluc3RwX21vZGUgIT0g ZGV2X3ByaXYtPnJlbGF0aXZlX2NvbnN0YW50c19tb2RlKSB7Ci0JCXJldCA9IGludGVsX2xvZ2lj YWxfcmluZ19iZWdpbihwYXJhbXMtPnJlcXVlc3QsIDQpOworCQlyZXQgPSBpbnRlbF9sb2dpY2Fs X3JpbmdfYmVnaW4ocmVxLCA0KTsKIAkJaWYgKHJldCkKIAkJCXJldHVybiByZXQ7CiAKQEAgLTEw MzksMTEgKzEwNDAsMTEgQEAgaW50IGludGVsX2V4ZWNsaXN0c19zdWJtaXNzaW9uX2ZpbmFsKHN0 cnVjdCBpOTE1X2V4ZWNidWZmZXJfcGFyYW1zICpwYXJhbXMpCiAJZXhlY19zdGFydCA9IHBhcmFt cy0+YmF0Y2hfb2JqX3ZtX29mZnNldCArCiAJCSAgICAgcGFyYW1zLT5hcmdzX2JhdGNoX3N0YXJ0 X29mZnNldDsKIAotCXJldCA9IGVuZ2luZS0+ZW1pdF9iYl9zdGFydChwYXJhbXMtPnJlcXVlc3Qs IGV4ZWNfc3RhcnQsIHBhcmFtcy0+ZGlzcGF0Y2hfZmxhZ3MpOworCXJldCA9IGVuZ2luZS0+ZW1p dF9iYl9zdGFydChyZXEsIGV4ZWNfc3RhcnQsIHBhcmFtcy0+ZGlzcGF0Y2hfZmxhZ3MpOwogCWlm IChyZXQpCiAJCXJldHVybiByZXQ7CiAKLQl0cmFjZV9pOTE1X2dlbV9yaW5nX2Rpc3BhdGNoKHBh cmFtcy0+cmVxdWVzdCwgcGFyYW1zLT5kaXNwYXRjaF9mbGFncyk7CisJdHJhY2VfaTkxNV9nZW1f cmluZ19kaXNwYXRjaChyZXEsIHBhcmFtcy0+ZGlzcGF0Y2hfZmxhZ3MpOwogCiAJaTkxNV9nZW1f ZXhlY2J1ZmZlcl9yZXRpcmVfY29tbWFuZHMocGFyYW1zKTsKIAotLSAKMS45LjEKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5n IGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=