From: Mika Kuoppala Subject: [PATCH 2/8] drm/i915: Wrap port cancellation into a function Date: Tue, 12 Sep 2017 11:36:12 +0300 Message-ID: <20170912083618.13009-3-mika.kuoppala@intel.com> References: <20170912083618.13009-1-mika.kuoppala@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 ESMTPS id 54B0B6E5A1 for ; Tue, 12 Sep 2017 08:40:50 +0000 (UTC) In-Reply-To: <20170912083618.13009-1-mika.kuoppala@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 T24gcmVzZXQgYW5kIHdlZGdlZCBwYXRoLCB3ZSB3YW50IHRvIHJlbGVhc2UgdGhlIHJlcXVlc3Rz CnRoYXQgYXJlIHRpZWQgdG8gcG9ydHMgYW5kIHRoZW4gbWFyayB0aGUgcG9ydHMgdG8gYmUgdW5z ZXQuCkludHJvZHVjZSBhIGZ1bmN0aW9uIGZvciB0aGlzLgoKQ2M6IENocmlzIFdpbHNvbiA8Y2hy aXNAY2hyaXMtd2lsc29uLmNvLnVrPgpTaWduZWQtb2ZmLWJ5OiBNaWthIEt1b3BwYWxhIDxtaWth Lmt1b3BwYWxhQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5j ICAgICAgICAgfCAxMSArKysrLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZW5n aW5lX2NzLmMgIHwgMTAgKysrKysrKysrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJj LmMgICAgICAgIHwgIDUgKy0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZm ZXIuaCB8ICAyICsrCiA0IGZpbGVzIGNoYW5nZWQsIDE3IGluc2VydGlvbnMoKyksIDExIGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IDdkMDI2M2U5YzIyMC4uZDY1ZjY1 NDgyMWNiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTMwNDcsMTcgKzMwNDcsMTQgQEAg c3RhdGljIHZvaWQgZW5naW5lX3NldF93ZWRnZWQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5n aW5lKQogCSAqLwogCiAJaWYgKGk5MTUuZW5hYmxlX2V4ZWNsaXN0cykgewotCQlzdHJ1Y3QgZXhl Y2xpc3RfcG9ydCAqcG9ydCA9IGVuZ2luZS0+ZXhlY2xpc3QucG9ydDsKKwkJc3RydWN0IGludGVs X2VuZ2luZV9leGVjbGlzdCAqIGNvbnN0IGVsID0gJmVuZ2luZS0+ZXhlY2xpc3Q7CiAJCXVuc2ln bmVkIGxvbmcgZmxhZ3M7Ci0JCXVuc2lnbmVkIGludCBuOwogCiAJCXNwaW5fbG9ja19pcnFzYXZl KCZlbmdpbmUtPnRpbWVsaW5lLT5sb2NrLCBmbGFncyk7CiAKLQkJZm9yIChuID0gMDsgbiA8IEFS UkFZX1NJWkUoZW5naW5lLT5leGVjbGlzdC5wb3J0KTsgbisrKQotCQkJaTkxNV9nZW1fcmVxdWVz dF9wdXQocG9ydF9yZXF1ZXN0KCZwb3J0W25dKSk7Ci0JCW1lbXNldChlbmdpbmUtPmV4ZWNsaXN0 LnBvcnQsIDAsIHNpemVvZihlbmdpbmUtPmV4ZWNsaXN0LnBvcnQpKTsKLQkJZW5naW5lLT5leGVj bGlzdC5xdWV1ZSA9IFJCX1JPT1Q7Ci0JCWVuZ2luZS0+ZXhlY2xpc3QuZmlyc3QgPSBOVUxMOwor CQlleGVjbGlzdF9jYW5jZWxfcG9ydF9yZXF1ZXN0cyhlbCk7CisJCWVsLT5xdWV1ZSA9IFJCX1JP T1Q7CisJCWVsLT5maXJzdCA9IE5VTEw7CiAKIAkJc3Bpbl91bmxvY2tfaXJxcmVzdG9yZSgmZW5n aW5lLT50aW1lbGluZS0+bG9jaywgZmxhZ3MpOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9lbmdpbmVfY3MuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Vu Z2luZV9jcy5jCmluZGV4IDYxOTdkZjBkZTNmZS4uMTkyZWNjMjZmNDMyIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9lbmdpbmVfY3MuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9lbmdpbmVfY3MuYwpAQCAtMTQwNyw2ICsxNDA3LDE2IEBAIGJvb2wgaW50 ZWxfZW5naW5lX2Nhbl9zdG9yZV9kd29yZChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUp CiAJfQogfQogCit2b2lkIGV4ZWNsaXN0X2NhbmNlbF9wb3J0X3JlcXVlc3RzKHN0cnVjdCBpbnRl bF9lbmdpbmVfZXhlY2xpc3QgKiBjb25zdCBlbCkKK3sKKwl1bnNpZ25lZCBpbnQgaTsKKworCWZv ciAoaSA9IDA7IGkgPCBBUlJBWV9TSVpFKGVsLT5wb3J0KTsgaSsrKQorCQlpOTE1X2dlbV9yZXF1 ZXN0X3B1dChwb3J0X3JlcXVlc3QoJmVsLT5wb3J0W2ldKSk7CisKKwltZW1zZXQoZWwtPnBvcnQs IDAsIHNpemVvZihlbC0+cG9ydCkpOworfQorCiAjaWYgSVNfRU5BQkxFRChDT05GSUdfRFJNX0k5 MTVfU0VMRlRFU1QpCiAjaW5jbHVkZSAic2VsZnRlc3RzL21vY2tfZW5naW5lLmMiCiAjZW5kaWYK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKaW5kZXggMjk2NGU3YzBhODczLi43ZGM4OTM4MDZiNDMg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCkBAIC0xMzMxLDcgKzEzMzEsNiBAQCBzdGF0aWMg dm9pZCByZXNldF9jb21tb25fcmluZyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsCiB7 CiAJc3RydWN0IGV4ZWNsaXN0X3BvcnQgKnBvcnQgPSBlbmdpbmUtPmV4ZWNsaXN0LnBvcnQ7CiAJ c3RydWN0IGludGVsX2NvbnRleHQgKmNlOwotCXVuc2lnbmVkIGludCBuOwogCiAJLyoKIAkgKiBD YXRjaCB1cCB3aXRoIGFueSBtaXNzZWQgY29udGV4dC1zd2l0Y2ggaW50ZXJydXB0cy4KQEAgLTEz NDMsOSArMTM0Miw3IEBAIHN0YXRpYyB2b2lkIHJlc2V0X2NvbW1vbl9yaW5nKHN0cnVjdCBpbnRl bF9lbmdpbmVfY3MgKmVuZ2luZSwKIAkgKiByZXF1ZXN0cyB3ZXJlIGNvbXBsZXRlZC4KIAkgKi8K IAlpZiAoIXJlcXVlc3QpIHsKLQkJZm9yIChuID0gMDsgbiA8IEFSUkFZX1NJWkUoZW5naW5lLT5l eGVjbGlzdC5wb3J0KTsgbisrKQotCQkJaTkxNV9nZW1fcmVxdWVzdF9wdXQocG9ydF9yZXF1ZXN0 KCZwb3J0W25dKSk7Ci0JCW1lbXNldChlbmdpbmUtPmV4ZWNsaXN0LnBvcnQsIDAsIHNpemVvZihl bmdpbmUtPmV4ZWNsaXN0LnBvcnQpKTsKKwkJZXhlY2xpc3RfY2FuY2VsX3BvcnRfcmVxdWVzdHMo JmVuZ2luZS0+ZXhlY2xpc3QpOwogCQlyZXR1cm47CiAJfQogCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9yaW5nYnVmZmVyLmgKaW5kZXggMzI2Y2ExNDUzZTkxLi5hZTkyMWY5MTZjODkgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAorKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKQEAgLTQ5Myw2ICs0OTMsOCBAQCBz dHJ1Y3QgaW50ZWxfZW5naW5lX2NzIHsKIAl1MzIgKCpnZXRfY21kX2xlbmd0aF9tYXNrKSh1MzIg Y21kX2hlYWRlcik7CiB9OwogCit2b2lkIGV4ZWNsaXN0X2NhbmNlbF9wb3J0X3JlcXVlc3RzKHN0 cnVjdCBpbnRlbF9lbmdpbmVfZXhlY2xpc3QgKiBjb25zdCBlbCk7CisKIHN0YXRpYyBpbmxpbmUg dW5zaWduZWQgaW50CiBpbnRlbF9lbmdpbmVfZmxhZyhjb25zdCBzdHJ1Y3QgaW50ZWxfZW5naW5l X2NzICplbmdpbmUpCiB7Ci0tIAoyLjExLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2ludGVsLWdmeAo=