From: Mika Kuoppala Subject: [PATCH 3/8] drm/i915: Wrap port cancellation into a function Date: Wed, 20 Sep 2017 17:37:00 +0300 Message-ID: <20170920143705.11277-4-mika.kuoppala@intel.com> References: <20170920143705.11277-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 1EC616E757 for ; Wed, 20 Sep 2017 14:39:30 +0000 (UTC) In-Reply-To: <20170920143705.11277-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 ZXQuCkludHJvZHVjZSBhIGZ1bmN0aW9uIGZvciB0aGlzLgoKdjI6IHJlYmFzZQoKQ2M6IENocmlz IFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpTaWduZWQtb2ZmLWJ5OiBNaWthIEt1 b3BwYWxhIDxtaWthLmt1b3BwYWxhQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9scmMuYyB8IDIxICsrKysrKysrKysrKy0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQs IDEyIGluc2VydGlvbnMoKyksIDkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMu YwppbmRleCBhNGVjZTRjNGYyOTEuLmZmYjljOTAwMzI4YiAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf bHJjLmMKQEAgLTU2OCw2ICs1NjgsMTYgQEAgc3RhdGljIHZvaWQgZXhlY2xpc3RzX2RlcXVldWUo c3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogCQlleGVjbGlzdHNfc3VibWl0X3BvcnRz KGVuZ2luZSk7CiB9CiAKK3N0YXRpYyB2b2lkIGV4ZWNsaXN0X2NhbmNlbF9wb3J0X3JlcXVlc3Rz KHN0cnVjdCBpbnRlbF9lbmdpbmVfZXhlY2xpc3QgKmVsKQoreworCXVuc2lnbmVkIGludCBpOwor CisJZm9yIChpID0gMDsgaSA8IEFSUkFZX1NJWkUoZWwtPnBvcnQpOyBpKyspCisJCWk5MTVfZ2Vt X3JlcXVlc3RfcHV0KHBvcnRfcmVxdWVzdCgmZWwtPnBvcnRbaV0pKTsKKworCW1lbXNldChlbC0+ cG9ydCwgMCwgc2l6ZW9mKGVsLT5wb3J0KSk7Cit9CisKIHN0YXRpYyB2b2lkIGV4ZWNsaXN0c19j YW5jZWxfcmVxdWVzdHMoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogewogCXN0cnVj dCBpbnRlbF9lbmdpbmVfZXhlY2xpc3QgKiBjb25zdCBlbCA9ICZlbmdpbmUtPmV4ZWNsaXN0OwpA QCAtNTc1LDE0ICs1ODUsMTEgQEAgc3RhdGljIHZvaWQgZXhlY2xpc3RzX2NhbmNlbF9yZXF1ZXN0 cyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAJc3RydWN0IGRybV9pOTE1X2dlbV9y ZXF1ZXN0ICpycSwgKnJuOwogCXN0cnVjdCByYl9ub2RlICpyYjsKIAl1bnNpZ25lZCBsb25nIGZs YWdzOwotCXVuc2lnbmVkIGxvbmcgbjsKIAogCXNwaW5fbG9ja19pcnFzYXZlKCZlbmdpbmUtPnRp bWVsaW5lLT5sb2NrLCBmbGFncyk7CiAKIAkvKiBDYW5jZWwgdGhlIHJlcXVlc3RzIG9uIHRoZSBI VyBhbmQgY2xlYXIgdGhlIEVMU1AgdHJhY2tlci4gKi8KLQlmb3IgKG4gPSAwOyBuIDwgQVJSQVlf U0laRShlbC0+cG9ydCk7IG4rKykKLQkJaTkxNV9nZW1fcmVxdWVzdF9wdXQocG9ydF9yZXF1ZXN0 KCZwb3J0W25dKSk7Ci0JbWVtc2V0KGVsLT5wb3J0LCAwLCBzaXplb2YoZWwtPnBvcnQpKTsKKwll eGVjbGlzdF9jYW5jZWxfcG9ydF9yZXF1ZXN0cyhlbCk7CiAKIAkvKiBNYXJrIGFsbCBleGVjdXRp bmcgcmVxdWVzdHMgYXMgc2tpcHBlZC4gKi8KIAlsaXN0X2Zvcl9lYWNoX2VudHJ5KHJxLCAmZW5n aW5lLT50aW1lbGluZS0+cmVxdWVzdHMsIGxpbmspIHsKQEAgLTEzNzIsMTEgKzEzNzksOSBAQCBz dGF0aWMgdm9pZCByZXNldF9jb21tb25fcmluZyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdp bmUsCiAJCQkgICAgICBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QpCiB7CiAJ c3RydWN0IGludGVsX2VuZ2luZV9leGVjbGlzdCAqIGNvbnN0IGVsID0gJmVuZ2luZS0+ZXhlY2xp c3Q7Ci0Jc3RydWN0IGV4ZWNsaXN0X3BvcnQgKnBvcnQgPSBlbC0+cG9ydDsKIAlzdHJ1Y3QgZHJt X2k5MTVfZ2VtX3JlcXVlc3QgKnJxLCAqcm47CiAJc3RydWN0IGludGVsX2NvbnRleHQgKmNlOwog CXVuc2lnbmVkIGxvbmcgZmxhZ3M7Ci0JdW5zaWduZWQgaW50IG47CiAKIAlzcGluX2xvY2tfaXJx c2F2ZSgmZW5naW5lLT50aW1lbGluZS0+bG9jaywgZmxhZ3MpOwogCkBAIC0xMzg5LDkgKzEzOTQs NyBAQCBzdGF0aWMgdm9pZCByZXNldF9jb21tb25fcmluZyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICplbmdpbmUsCiAJICogZ3Vlc3NpbmcgdGhlIG1pc3NlZCBjb250ZXh0LXN3aXRjaCBldmVudHMg YnkgbG9va2luZyBhdCB3aGF0CiAJICogcmVxdWVzdHMgd2VyZSBjb21wbGV0ZWQuCiAJICovCi0J Zm9yIChuID0gMDsgbiA8IEFSUkFZX1NJWkUoZWwtPnBvcnQpOyBuKyspCi0JCWk5MTVfZ2VtX3Jl cXVlc3RfcHV0KHBvcnRfcmVxdWVzdCgmcG9ydFtuXSkpOwotCW1lbXNldChlbC0+cG9ydCwgMCwg c2l6ZW9mKGVsLT5wb3J0KSk7CisJZXhlY2xpc3RfY2FuY2VsX3BvcnRfcmVxdWVzdHMoZWwpOwog CiAJLyogUHVzaCBiYWNrIGFueSBpbmNvbXBsZXRlIHJlcXVlc3RzIGZvciByZXBsYXkgYWZ0ZXIg dGhlIHJlc2V0LiAqLwogCWxpc3RfZm9yX2VhY2hfZW50cnlfc2FmZV9yZXZlcnNlKHJxLCBybiwK LS0gCjIuMTEuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3Jn Cmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4 Cg==