From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arun Siluvery Subject: [PATCH v2 05/15] drm/i915/tdr: Prepare execlist submission to handle tdr resubmission after reset Date: Fri, 17 Jun 2016 08:09:05 +0100 Message-ID: <1466147355-4635-6-git-send-email-arun.siluvery@linux.intel.com> References: <1466147355-4635-1-git-send-email-arun.siluvery@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 2E2566EADD for ; Fri, 17 Jun 2016 07:09:29 +0000 (UTC) In-Reply-To: <1466147355-4635-1-git-send-email-arun.siluvery@linux.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 Cc: Tomas Elf List-Id: intel-gfx@lists.freedesktop.org VG8gcmVzdW1lIGV4ZWN1dGlvbiBhZnRlciBlbmdpbmUgcmVzZXQgd2UgcmVzdWJtaXQgdGhlIGNv bnRleHQgYW5kIHRoaXMKbmVlZHMgdG8gYmUgdHJlYXRlZCBkaWZmZXJlbnRseSBvdGhlcndpc2Ug d2Ugd291bGQgY291bnQgaXQgYXMgYSBjb21wbGV0ZWx5Cm5ldyBzdWJtaXNzaW9uLiBUaGlzIGNo YW5nZSBtb2RpZmllcyB0aGUgc3VibWlzc2lvbiBwYXRoIHRvIGFjY291bnQgZm9yCnRoaXMuCgpE dXJpbmcgcmVzdWJtaXNzaW9uIHdlIG9ubHkgc3VibWl0IHRoZSBoZWFkIHJlcXVlc3QgdGhhdCBj YXVzZWQgdGhlIGhhbmcsCm9uY2UgdGhpcyBpcyBkb25lIHRoZW4gd2UgY29udGludWUgd2l0aCB0 aGUgbm9ybWFsbHkgc3VibWlzc2lvbiBvZiB0d28KY29udGV4dHMgYXQgYSB0aW1lLiBUaGUgaW50 ZW50aW9uIGlzIHRvIHJlc3RvcmUgdGhlIHN1Ym1pc3Npb24gc3RhdGUgYXQgdGhlCnRpbWUgb2Yg aGFuZy4KClNpZ25lZC1vZmYtYnk6IFRvbWFzIEVsZiA8dG9tYXMuZWxmQGludGVsLmNvbT4KU2ln bmVkLW9mZi1ieTogQXJ1biBTaWx1dmVyeSA8YXJ1bi5zaWx1dmVyeUBsaW51eC5pbnRlbC5jb20+ Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgfCAzNiArKysrKysrKysrKysr KysrKysrKysrKysrKystLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyNyBpbnNlcnRpb25zKCsp LCA5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2xyYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKaW5kZXggNGZhZDgzMC4u MzUyNTVjZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKQEAgLTM0MCw3ICszNDAsOCBAQCB1 aW50NjRfdCBpbnRlbF9scl9jb250ZXh0X2Rlc2NyaXB0b3Ioc3RydWN0IGk5MTVfZ2VtX2NvbnRl eHQgKmN0eCwKIH0KIAogc3RhdGljIHZvaWQgZXhlY2xpc3RzX2Vsc3Bfd3JpdGUoc3RydWN0IGRy bV9pOTE1X2dlbV9yZXF1ZXN0ICpycTAsCi0JCQkJIHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVz dCAqcnExKQorCQkJCSBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJxMSwKKwkJCQkgYm9v bCB0ZHJfcmVzdWJtaXNzaW9uKQogewogCiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5l ID0gcnEwLT5lbmdpbmU7CkBAIC0zNDksMTMgKzM1MCwxNSBAQCBzdGF0aWMgdm9pZCBleGVjbGlz dHNfZWxzcF93cml0ZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJxMCwKIAogCWlmIChy cTEpIHsKIAkJZGVzY1sxXSA9IGludGVsX2xyX2NvbnRleHRfZGVzY3JpcHRvcihycTEtPmN0eCwg cnExLT5lbmdpbmUpOwotCQlycTEtPmVsc3Bfc3VibWl0dGVkKys7CisJCWlmICghdGRyX3Jlc3Vi bWlzc2lvbikKKwkJCXJxMS0+ZWxzcF9zdWJtaXR0ZWQrKzsKIAl9IGVsc2UgewogCQlkZXNjWzFd ID0gMDsKIAl9CiAKIAlkZXNjWzBdID0gaW50ZWxfbHJfY29udGV4dF9kZXNjcmlwdG9yKHJxMC0+ Y3R4LCBycTAtPmVuZ2luZSk7Ci0JcnEwLT5lbHNwX3N1Ym1pdHRlZCsrOworCWlmICghdGRyX3Jl c3VibWlzc2lvbikKKwkJcnEwLT5lbHNwX3N1Ym1pdHRlZCsrOwogCiAJLyogWW91IG11c3QgYWx3 YXlzIHdyaXRlIGJvdGggZGVzY3JpcHRvcnMgaW4gdGhlIG9yZGVyIGJlbG93LiAqLwogCUk5MTVf V1JJVEVfRlcoUklOR19FTFNQKGVuZ2luZSksIHVwcGVyXzMyX2JpdHMoZGVzY1sxXSkpOwpAQCAt Mzk2LDcgKzM5OSw4IEBAIHN0YXRpYyB2b2lkIGV4ZWNsaXN0c191cGRhdGVfY29udGV4dChzdHJ1 Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJxKQogfQogCiBzdGF0aWMgdm9pZCBleGVjbGlzdHNf c3VibWl0X3JlcXVlc3RzKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcnEwLAotCQkJCSAg ICAgIHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcnExKQorCQkJCSAgICAgIHN0cnVjdCBk cm1faTkxNV9nZW1fcmVxdWVzdCAqcnExLAorCQkJCSAgICAgIGJvb2wgdGRyX3Jlc3VibWlzc2lv bikKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBycTAtPmk5MTU7CiAJ dW5zaWduZWQgaW50IGZ3X2RvbWFpbnMgPSBycTAtPmVuZ2luZS0+ZndfZG9tYWluczsKQEAgLTQw OSwxMyArNDEzLDE0IEBAIHN0YXRpYyB2b2lkIGV4ZWNsaXN0c19zdWJtaXRfcmVxdWVzdHMoc3Ry dWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpycTAsCiAJc3Bpbl9sb2NrX2lycSgmZGV2X3ByaXYt PnVuY29yZS5sb2NrKTsKIAlpbnRlbF91bmNvcmVfZm9yY2V3YWtlX2dldF9fbG9ja2VkKGRldl9w cml2LCBmd19kb21haW5zKTsKIAotCWV4ZWNsaXN0c19lbHNwX3dyaXRlKHJxMCwgcnExKTsKKwll eGVjbGlzdHNfZWxzcF93cml0ZShycTAsIHJxMSwgdGRyX3Jlc3VibWlzc2lvbik7CiAKIAlpbnRl bF91bmNvcmVfZm9yY2V3YWtlX3B1dF9fbG9ja2VkKGRldl9wcml2LCBmd19kb21haW5zKTsKIAlz cGluX3VubG9ja19pcnEoJmRldl9wcml2LT51bmNvcmUubG9jayk7CiB9CiAKLXN0YXRpYyB2b2lk IGV4ZWNsaXN0c19jb250ZXh0X3VucXVldWUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5l KQorc3RhdGljIHZvaWQgZXhlY2xpc3RzX2NvbnRleHRfdW5xdWV1ZShzdHJ1Y3QgaW50ZWxfZW5n aW5lX2NzICplbmdpbmUsCisJCQkJICAgICAgYm9vbCB0ZHJfcmVzdWJtaXNzaW9uKQogewogCXN0 cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxMCA9IE5VTEwsICpyZXExID0gTlVMTDsKIAlz dHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKmN1cnNvciwgKnRtcDsKQEAgLTQzMyw2ICs0Mzgs MTkgQEAgc3RhdGljIHZvaWQgZXhlY2xpc3RzX2NvbnRleHRfdW5xdWV1ZShzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICplbmdpbmUpCiAJCQkJIGV4ZWNsaXN0X2xpbmspIHsKIAkJaWYgKCFyZXEwKSB7 CiAJCQlyZXEwID0gY3Vyc29yOworCisJCQkvKgorCQkJICogT25seSBzdWJtaXQgaGVhZCByZXF1 ZXN0IGlmIHRoaXMgaXMgYSByZXN1Ym1pc3Npb24KKwkJCSAqIGZvbGxvd2luZyBlbmdpbmUgcmVz ZXQuIFRoZSBpbnRlbnRpb24gaXMgdG8gcmVzdG9yZQorCQkJICogdGhlIG9yaWdpbmFsIHN1Ym1p c3Npb24gc3RhdGUgZnJvbSB0aGUgc2l0dWF0aW9uCisJCQkgKiB3aGVuIHRoZSBoYW5nIG9yaWdp bmFsbHkgaGFwcGVuZWQuIE9uY2UgdGhlIHJlcXVlc3QKKwkJCSAqIHRoYXQgY2F1c2VkIHRoZSBo YW5nIGlzIHJlc3VibWl0dGVkIHdlIGNhbiBjb250aW51ZQorCQkJICogbm9ybWFsbHkgYnkgc3Vi bWl0dGluZyB0d28gcmVxdWVzdCBhdCBhIHRpbWUuCisJCQkgKi8KKwkJCWlmICh0ZHJfcmVzdWJt aXNzaW9uKSB7CisJCQkJcmVxMSA9IE5VTEw7CisJCQkJYnJlYWs7CisJCQl9CiAJCX0gZWxzZSBp ZiAocmVxMC0+Y3R4ID09IGN1cnNvci0+Y3R4KSB7CiAJCQkvKiBTYW1lIGN0eDogaWdub3JlIGZp cnN0IHJlcXVlc3QsIGFzIHNlY29uZCByZXF1ZXN0CiAJCQkgKiB3aWxsIHVwZGF0ZSB0YWlsIHBh c3QgZmlyc3QgcmVxdWVzdCdzIHdvcmtsb2FkICovCkBAIC00NjYsNyArNDg0LDcgQEAgc3RhdGlj IHZvaWQgZXhlY2xpc3RzX2NvbnRleHRfdW5xdWV1ZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpl bmdpbmUpCiAJCXJlcTAtPnRhaWwgJj0gcmluZ2J1Zi0+c2l6ZSAtIDE7CiAJfQogCi0JZXhlY2xp c3RzX3N1Ym1pdF9yZXF1ZXN0cyhyZXEwLCByZXExKTsKKwlleGVjbGlzdHNfc3VibWl0X3JlcXVl c3RzKHJlcTAsIHJlcTEsIHRkcl9yZXN1Ym1pc3Npb24pOwogfQogCiBzdGF0aWMgdW5zaWduZWQg aW50CkBAIC01NzgsNyArNTk2LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfbHJjX2lycV9oYW5kbGVy KHVuc2lnbmVkIGxvbmcgZGF0YSkKIAlpZiAoc3VibWl0X2NvbnRleHRzKSB7CiAJCWlmICghZW5n aW5lLT5kaXNhYmxlX2xpdGVfcmVzdG9yZV93YSB8fAogCQkgICAgKGNzYltpXVswXSAmIEdFTjhf Q1RYX1NUQVRVU19BQ1RJVkVfSURMRSkpCi0JCQlleGVjbGlzdHNfY29udGV4dF91bnF1ZXVlKGVu Z2luZSk7CisJCQlleGVjbGlzdHNfY29udGV4dF91bnF1ZXVlKGVuZ2luZSwgZmFsc2UpOwogCX0K IAogCXNwaW5fdW5sb2NrKCZlbmdpbmUtPmV4ZWNsaXN0X2xvY2spOwpAQCAtNjE4LDcgKzYzNiw3 IEBAIHN0YXRpYyB2b2lkIGV4ZWNsaXN0c19jb250ZXh0X3F1ZXVlKHN0cnVjdCBkcm1faTkxNV9n ZW1fcmVxdWVzdCAqcmVxdWVzdCkKIAlsaXN0X2FkZF90YWlsKCZyZXF1ZXN0LT5leGVjbGlzdF9s aW5rLCAmZW5naW5lLT5leGVjbGlzdF9xdWV1ZSk7CiAJcmVxdWVzdC0+Y3R4X2h3X2lkID0gcmVx dWVzdC0+Y3R4LT5od19pZDsKIAlpZiAobnVtX2VsZW1lbnRzID09IDApCi0JCWV4ZWNsaXN0c19j b250ZXh0X3VucXVldWUoZW5naW5lKTsKKwkJZXhlY2xpc3RzX2NvbnRleHRfdW5xdWV1ZShlbmdp bmUsIGZhbHNlKTsKIAogCXNwaW5fdW5sb2NrX2JoKCZlbmdpbmUtPmV4ZWNsaXN0X2xvY2spOwog fQotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdm eAo=