From: John.C.Harrison@Intel.com Subject: [PATCH v5 04/35] drm/i915: Cache request pointer in *_submission_final() Date: Thu, 18 Feb 2016 14:26:52 +0000 Message-ID: <1455805644-6450-5-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 9803E6E35C for ; Thu, 18 Feb 2016 14:27:32 +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 RnJvbTogRGF2ZSBHb3Jkb24gPGRhdmlkLnMuZ29yZG9uQGludGVsLmNvbT4KCktlZXAgYSBsb2Nh bCBjb3B5IG9mIHRoZSByZXF1ZXN0IHBvaW50ZXIgaW4gdGhlIF9maW5hbCgpIGZ1bmN0aW9ucwpy YXRoZXIgdGhhbiBkZXJlZmVyZW5jaW5nIHRoZSBwYXJhbXMgYmxvY2sgcmVwZWF0ZWRseS4KCnYz OiBOZXcgcGF0Y2ggaW4gc2VyaWVzLgoKRm9yOiBWSVotMTU4NwpTaWduZWQtb2ZmLWJ5OiBEYXZl IEdvcmRvbiA8ZGF2aWQucy5nb3Jkb25AaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBKb2huIEhh cnJpc29uIDxKb2huLkMuSGFycmlzb25ASW50ZWwuY29tPgpSZXZpZXdlZC1ieTogSmVzc2UgQmFy bmVzIDxqYmFybmVzQHZpcnR1b3VzZ2Vlay5vcmc+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9nZW1fZXhlY2J1ZmZlci5jIHwgMTMgKysrKysrKy0tLS0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfbHJjLmMgICAgICAgICAgIHwgMTEgKysrKysrLS0tLS0KIDIgZmlsZXMgY2hh bmdlZCwgMTMgaW5zZXJ0aW9ucygrKSwgMTEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jCmluZGV4IDMwNzFhMmIuLjc5NzhkYWUgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMKQEAgLTEyOTEsNiArMTI5 MSw3IEBAIGk5MTVfZ2VtX3JpbmdidWZmZXJfc3VibWlzc2lvbihzdHJ1Y3QgaTkxNV9leGVjYnVm ZmVyX3BhcmFtcyAqcGFyYW1zLAogaW50IGk5MTVfZ2VtX3JpbmdidWZmZXJfc3VibWlzc2lvbl9m aW5hbChzdHJ1Y3QgaTkxNV9leGVjYnVmZmVyX3BhcmFtcyAqcGFyYW1zKQogewogCXN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHBhcmFtcy0+ZGV2LT5kZXZfcHJpdmF0ZTsKKwlz dHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSA9IHBhcmFtcy0+cmVxdWVzdDsKIAlzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICAqcmluZyA9IHBhcmFtcy0+cmluZzsKIAl1NjQgZXhlY19zdGFy dCwgZXhlY19sZW47CiAJaW50IHJldDsKQEAgLTEzMDIsMTIgKzEzMDMsMTIgQEAgaW50IGk5MTVf Z2VtX3JpbmdidWZmZXJfc3VibWlzc2lvbl9maW5hbChzdHJ1Y3QgaTkxNV9leGVjYnVmZmVyX3Bh cmFtcyAqcGFyYW1zKQogCSAqIFVuY29uZGl0aW9uYWxseSBpbnZhbGlkYXRlIGdwdSBjYWNoZXMg YW5kIGVuc3VyZSB0aGF0IHdlIGRvIGZsdXNoCiAJICogYW55IHJlc2lkdWFsIHdyaXRlcyBmcm9t IHRoZSBwcmV2aW91cyBiYXRjaC4KIAkgKi8KLQlyZXQgPSBpbnRlbF9yaW5nX2ludmFsaWRhdGVf YWxsX2NhY2hlcyhwYXJhbXMtPnJlcXVlc3QpOworCXJldCA9IGludGVsX3JpbmdfaW52YWxpZGF0 ZV9hbGxfY2FjaGVzKHJlcSk7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIAogCS8qIFN3aXRj aCB0byB0aGUgY29ycmVjdCBjb250ZXh0IGZvciB0aGUgYmF0Y2ggKi8KLQlyZXQgPSBpOTE1X3N3 aXRjaF9jb250ZXh0KHBhcmFtcy0+cmVxdWVzdCk7CisJcmV0ID0gaTkxNV9zd2l0Y2hfY29udGV4 dChyZXEpOwogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKQEAgLTEzMTYsNyArMTMxNyw3IEBA IGludCBpOTE1X2dlbV9yaW5nYnVmZmVyX3N1Ym1pc3Npb25fZmluYWwoc3RydWN0IGk5MTVfZXhl Y2J1ZmZlcl9wYXJhbXMgKnBhcmFtcykKIAogCWlmIChyaW5nID09ICZkZXZfcHJpdi0+cmluZ1tS Q1NdICYmCiAJICAgIHBhcmFtcy0+aW5zdHBfbW9kZSAhPSBkZXZfcHJpdi0+cmVsYXRpdmVfY29u c3RhbnRzX21vZGUpIHsKLQkJcmV0ID0gaW50ZWxfcmluZ19iZWdpbihwYXJhbXMtPnJlcXVlc3Qs IDQpOworCQlyZXQgPSBpbnRlbF9yaW5nX2JlZ2luKHJlcSwgNCk7CiAJCWlmIChyZXQpCiAJCQly ZXR1cm4gcmV0OwogCkBAIC0xMzMwLDcgKzEzMzEsNyBAQCBpbnQgaTkxNV9nZW1fcmluZ2J1ZmZl cl9zdWJtaXNzaW9uX2ZpbmFsKHN0cnVjdCBpOTE1X2V4ZWNidWZmZXJfcGFyYW1zICpwYXJhbXMp CiAJfQogCiAJaWYgKHBhcmFtcy0+YXJnc19mbGFncyAmIEk5MTVfRVhFQ19HRU43X1NPTF9SRVNF VCkgewotCQlyZXQgPSBpOTE1X3Jlc2V0X2dlbjdfc29sX29mZnNldHMocGFyYW1zLT5kZXYsIHBh cmFtcy0+cmVxdWVzdCk7CisJCXJldCA9IGk5MTVfcmVzZXRfZ2VuN19zb2xfb2Zmc2V0cyhwYXJh bXMtPmRldiwgcmVxKTsKIAkJaWYgKHJldCkKIAkJCXJldHVybiByZXQ7CiAJfQpAQCAtMTM0Miwx MyArMTM0MywxMyBAQCBpbnQgaTkxNV9nZW1fcmluZ2J1ZmZlcl9zdWJtaXNzaW9uX2ZpbmFsKHN0 cnVjdCBpOTE1X2V4ZWNidWZmZXJfcGFyYW1zICpwYXJhbXMpCiAJaWYgKGV4ZWNfbGVuID09IDAp CiAJCWV4ZWNfbGVuID0gcGFyYW1zLT5iYXRjaF9vYmotPmJhc2Uuc2l6ZTsKIAotCXJldCA9IHJp bmctPmRpc3BhdGNoX2V4ZWNidWZmZXIocGFyYW1zLT5yZXF1ZXN0LAorCXJldCA9IHJpbmctPmRp c3BhdGNoX2V4ZWNidWZmZXIocmVxLAogCQkJCQlleGVjX3N0YXJ0LCBleGVjX2xlbiwKIAkJCQkJ cGFyYW1zLT5kaXNwYXRjaF9mbGFncyk7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIAotCXRy YWNlX2k5MTVfZ2VtX3JpbmdfZGlzcGF0Y2gocGFyYW1zLT5yZXF1ZXN0LCBwYXJhbXMtPmRpc3Bh dGNoX2ZsYWdzKTsKKwl0cmFjZV9pOTE1X2dlbV9yaW5nX2Rpc3BhdGNoKHJlcSwgcGFyYW1zLT5k aXNwYXRjaF9mbGFncyk7CiAKIAlpOTE1X2dlbV9leGVjYnVmZmVyX3JldGlyZV9jb21tYW5kcyhw YXJhbXMpOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCmluZGV4IDIyNDZhMTYuLjEyZTg5NDkg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCkBAIC05NzMsNyArOTczLDggQEAgaW50IGludGVs X2V4ZWNsaXN0c19zdWJtaXNzaW9uKHN0cnVjdCBpOTE1X2V4ZWNidWZmZXJfcGFyYW1zICpwYXJh bXMsCiBpbnQgaW50ZWxfZXhlY2xpc3RzX3N1Ym1pc3Npb25fZmluYWwoc3RydWN0IGk5MTVfZXhl Y2J1ZmZlcl9wYXJhbXMgKnBhcmFtcykKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYgPSBwYXJhbXMtPmRldi0+ZGV2X3ByaXZhdGU7Ci0Jc3RydWN0IGludGVsX3JpbmdidWZm ZXIgKnJpbmdidWYgPSBwYXJhbXMtPnJlcXVlc3QtPnJpbmdidWY7CisJc3RydWN0IGRybV9pOTE1 X2dlbV9yZXF1ZXN0ICpyZXEgPSBwYXJhbXMtPnJlcXVlc3Q7CisJc3RydWN0IGludGVsX3Jpbmdi dWZmZXIgKnJpbmdidWYgPSByZXEtPnJpbmdidWY7CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAq cmluZyA9IHBhcmFtcy0+cmluZzsKIAl1NjQgZXhlY19zdGFydDsKIAlpbnQgcmV0OwpAQCAtOTg1 LDEzICs5ODYsMTMgQEAgaW50IGludGVsX2V4ZWNsaXN0c19zdWJtaXNzaW9uX2ZpbmFsKHN0cnVj dCBpOTE1X2V4ZWNidWZmZXJfcGFyYW1zICpwYXJhbXMpCiAJICogVW5jb25kaXRpb25hbGx5IGlu dmFsaWRhdGUgZ3B1IGNhY2hlcyBhbmQgZW5zdXJlIHRoYXQgd2UgZG8gZmx1c2gKIAkgKiBhbnkg cmVzaWR1YWwgd3JpdGVzIGZyb20gdGhlIHByZXZpb3VzIGJhdGNoLgogCSAqLwotCXJldCA9IGxv Z2ljYWxfcmluZ19pbnZhbGlkYXRlX2FsbF9jYWNoZXMocGFyYW1zLT5yZXF1ZXN0KTsKKwlyZXQg PSBsb2dpY2FsX3JpbmdfaW52YWxpZGF0ZV9hbGxfY2FjaGVzKHJlcSk7CiAJaWYgKHJldCkKIAkJ cmV0dXJuIHJldDsKIAogCWlmIChyaW5nID09ICZkZXZfcHJpdi0+cmluZ1tSQ1NdICYmCiAJICAg IHBhcmFtcy0+aW5zdHBfbW9kZSAhPSBkZXZfcHJpdi0+cmVsYXRpdmVfY29uc3RhbnRzX21vZGUp IHsKLQkJcmV0ID0gaW50ZWxfbG9naWNhbF9yaW5nX2JlZ2luKHBhcmFtcy0+cmVxdWVzdCwgNCk7 CisJCXJldCA9IGludGVsX2xvZ2ljYWxfcmluZ19iZWdpbihyZXEsIDQpOwogCQlpZiAocmV0KQog CQkJcmV0dXJuIHJldDsKIApAQCAtMTAwNywxMSArMTAwOCwxMSBAQCBpbnQgaW50ZWxfZXhlY2xp c3RzX3N1Ym1pc3Npb25fZmluYWwoc3RydWN0IGk5MTVfZXhlY2J1ZmZlcl9wYXJhbXMgKnBhcmFt cykKIAlleGVjX3N0YXJ0ID0gcGFyYW1zLT5iYXRjaF9vYmpfdm1fb2Zmc2V0ICsKIAkJICAgICBw YXJhbXMtPmFyZ3NfYmF0Y2hfc3RhcnRfb2Zmc2V0OwogCi0JcmV0ID0gcmluZy0+ZW1pdF9iYl9z dGFydChwYXJhbXMtPnJlcXVlc3QsIGV4ZWNfc3RhcnQsIHBhcmFtcy0+ZGlzcGF0Y2hfZmxhZ3Mp OworCXJldCA9IHJpbmctPmVtaXRfYmJfc3RhcnQocmVxLCBleGVjX3N0YXJ0LCBwYXJhbXMtPmRp c3BhdGNoX2ZsYWdzKTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCi0JdHJhY2VfaTkxNV9n ZW1fcmluZ19kaXNwYXRjaChwYXJhbXMtPnJlcXVlc3QsIHBhcmFtcy0+ZGlzcGF0Y2hfZmxhZ3Mp OworCXRyYWNlX2k5MTVfZ2VtX3JpbmdfZGlzcGF0Y2gocmVxLCBwYXJhbXMtPmRpc3BhdGNoX2Zs YWdzKTsKIAogCWk5MTVfZ2VtX2V4ZWNidWZmZXJfcmV0aXJlX2NvbW1hbmRzKHBhcmFtcyk7CiAK LS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK