From: Mika Kuoppala Subject: [CI 3/5] drm/i915: Wrap port cancellation into a function Date: Fri, 22 Sep 2017 15:43:05 +0300 Message-ID: <20170922124307.10914-3-mika.kuoppala@intel.com> References: <20170922124307.10914-1-mika.kuoppala@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 ESMTPS id 539116E30E for ; Fri, 22 Sep 2017 13:04:06 +0000 (UTC) In-Reply-To: <20170922124307.10914-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 ZXQuCkludHJvZHVjZSBhIGZ1bmN0aW9uIGZvciB0aGlzLgoKdjI6IHJlYmFzZQp2MzogZHJvcCBs b2NhbCwga2VlcCBHRU1fQlVHX09OIChNaWNoYcWCLCBDaHJpcykKdjQ6IHJlYmFzZQoKQ2M6IENo cmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpTaWduZWQtb2ZmLWJ5OiBNaWth IEt1b3BwYWxhIDxtaWthLmt1b3BwYWxhQGludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IE1pY2hhxYIg V2luaWFyc2tpIDxtaWNoYWwud2luaWFyc2tpQGludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IENocmlz IFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2xyYy5jIHwgMjUgKysrKysrKysrKysrKystLS0tLS0tLS0tLQogMSBmaWxlIGNo YW5nZWQsIDE0IGluc2VydGlvbnMoKyksIDExIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfbHJjLmMKaW5kZXggMzE4NmJlNTRiYmQ4Li40ZjYyNTM3MWI1ZmUgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2xyYy5jCkBAIC01NjgsMjEgKzU2OCwyNyBAQCBzdGF0aWMgdm9pZCBleGVjbGlzdHNf ZGVxdWV1ZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAJCWV4ZWNsaXN0c19zdWJt aXRfcG9ydHMoZW5naW5lKTsKIH0KIAorc3RhdGljIHZvaWQgZXhlY2xpc3RfY2FuY2VsX3BvcnRf cmVxdWVzdHMoc3RydWN0IGludGVsX2VuZ2luZV9leGVjbGlzdHMgKmV4ZWNsaXN0cykKK3sKKwl1 bnNpZ25lZCBpbnQgaTsKKworCWZvciAoaSA9IDA7IGkgPCBBUlJBWV9TSVpFKGV4ZWNsaXN0cy0+ cG9ydCk7IGkrKykKKwkJaTkxNV9nZW1fcmVxdWVzdF9wdXQocG9ydF9yZXF1ZXN0KCZleGVjbGlz dHMtPnBvcnRbaV0pKTsKKworCW1lbXNldChleGVjbGlzdHMtPnBvcnQsIDAsIHNpemVvZihleGVj bGlzdHMtPnBvcnQpKTsKK30KKwogc3RhdGljIHZvaWQgZXhlY2xpc3RzX2NhbmNlbF9yZXF1ZXN0 cyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiB7CiAJc3RydWN0IGludGVsX2VuZ2lu ZV9leGVjbGlzdHMgKiBjb25zdCBleGVjbGlzdHMgPSAmZW5naW5lLT5leGVjbGlzdHM7Ci0Jc3Ry dWN0IGV4ZWNsaXN0X3BvcnQgKnBvcnQgPSBleGVjbGlzdHMtPnBvcnQ7CiAJc3RydWN0IGRybV9p OTE1X2dlbV9yZXF1ZXN0ICpycSwgKnJuOwogCXN0cnVjdCByYl9ub2RlICpyYjsKIAl1bnNpZ25l ZCBsb25nIGZsYWdzOwotCXVuc2lnbmVkIGxvbmcgbjsKIAogCXNwaW5fbG9ja19pcnFzYXZlKCZl bmdpbmUtPnRpbWVsaW5lLT5sb2NrLCBmbGFncyk7CiAKIAkvKiBDYW5jZWwgdGhlIHJlcXVlc3Rz IG9uIHRoZSBIVyBhbmQgY2xlYXIgdGhlIEVMU1AgdHJhY2tlci4gKi8KLQlmb3IgKG4gPSAwOyBu IDwgQVJSQVlfU0laRShleGVjbGlzdHMtPnBvcnQpOyBuKyspCi0JCWk5MTVfZ2VtX3JlcXVlc3Rf cHV0KHBvcnRfcmVxdWVzdCgmcG9ydFtuXSkpOwotCW1lbXNldChleGVjbGlzdHMtPnBvcnQsIDAs IHNpemVvZihleGVjbGlzdHMtPnBvcnQpKTsKKwlleGVjbGlzdF9jYW5jZWxfcG9ydF9yZXF1ZXN0 cyhleGVjbGlzdHMpOwogCiAJLyogTWFyayBhbGwgZXhlY3V0aW5nIHJlcXVlc3RzIGFzIHNraXBw ZWQuICovCiAJbGlzdF9mb3JfZWFjaF9lbnRyeShycSwgJmVuZ2luZS0+dGltZWxpbmUtPnJlcXVl c3RzLCBsaW5rKSB7CkBAIC02MTMsOSArNjE5LDEwIEBAIHN0YXRpYyB2b2lkIGV4ZWNsaXN0c19j YW5jZWxfcmVxdWVzdHMoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogCiAJLyogUmVt YWluaW5nIF91bnJlYWR5XyByZXF1ZXN0cyB3aWxsIGJlIG5vcCdlZCB3aGVuIHN1Ym1pdHRlZCAq LwogCisKIAlleGVjbGlzdHMtPnF1ZXVlID0gUkJfUk9PVDsKIAlleGVjbGlzdHMtPmZpcnN0ID0g TlVMTDsKLQlHRU1fQlVHX09OKHBvcnRfaXNzZXQoJnBvcnRbMF0pKTsKKwlHRU1fQlVHX09OKHBv cnRfaXNzZXQoJmV4ZWNsaXN0cy0+cG9ydFswXSkpOwogCiAJLyoKIAkgKiBUaGUgcG9ydCBpcyBj aGVja2VkIHByaW9yIHRvIHNjaGVkdWxpbmcgYSB0YXNrbGV0LCBidXQKQEAgLTEzNzIsMTEgKzEz NzksOSBAQCBzdGF0aWMgdm9pZCByZXNldF9jb21tb25fcmluZyhzdHJ1Y3QgaW50ZWxfZW5naW5l X2NzICplbmdpbmUsCiAJCQkgICAgICBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVl c3QpCiB7CiAJc3RydWN0IGludGVsX2VuZ2luZV9leGVjbGlzdHMgKiBjb25zdCBleGVjbGlzdHMg PSAmZW5naW5lLT5leGVjbGlzdHM7Ci0Jc3RydWN0IGV4ZWNsaXN0X3BvcnQgKnBvcnQgPSBleGVj bGlzdHMtPnBvcnQ7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpycSwgKnJuOwogCXN0 cnVjdCBpbnRlbF9jb250ZXh0ICpjZTsKIAl1bnNpZ25lZCBsb25nIGZsYWdzOwotCXVuc2lnbmVk IGludCBuOwogCiAJc3Bpbl9sb2NrX2lycXNhdmUoJmVuZ2luZS0+dGltZWxpbmUtPmxvY2ssIGZs YWdzKTsKIApAQCAtMTM4OSw5ICsxMzk0LDcgQEAgc3RhdGljIHZvaWQgcmVzZXRfY29tbW9uX3Jp bmcoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLAogCSAqIGd1ZXNzaW5nIHRoZSBtaXNz ZWQgY29udGV4dC1zd2l0Y2ggZXZlbnRzIGJ5IGxvb2tpbmcgYXQgd2hhdAogCSAqIHJlcXVlc3Rz IHdlcmUgY29tcGxldGVkLgogCSAqLwotCWZvciAobiA9IDA7IG4gPCBBUlJBWV9TSVpFKGV4ZWNs aXN0cy0+cG9ydCk7IG4rKykKLQkJaTkxNV9nZW1fcmVxdWVzdF9wdXQocG9ydF9yZXF1ZXN0KCZw b3J0W25dKSk7Ci0JbWVtc2V0KGV4ZWNsaXN0cy0+cG9ydCwgMCwgc2l6ZW9mKGV4ZWNsaXN0cy0+ cG9ydCkpOworCWV4ZWNsaXN0X2NhbmNlbF9wb3J0X3JlcXVlc3RzKGV4ZWNsaXN0cyk7CiAKIAkv KiBQdXNoIGJhY2sgYW55IGluY29tcGxldGUgcmVxdWVzdHMgZm9yIHJlcGxheSBhZnRlciB0aGUg cmVzZXQuICovCiAJbGlzdF9mb3JfZWFjaF9lbnRyeV9zYWZlX3JldmVyc2UocnEsIHJuLAotLSAK Mi4xMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJ bnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK