From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ander Conselvan de Oliveira Subject: [PATCH v4 03/10] drm/i915: Unduplicate chv_data_lane_soft_reset() Date: Wed, 27 Apr 2016 15:44:18 +0300 Message-ID: <1461761065-21195-4-git-send-email-ander.conselvan.de.oliveira@intel.com> References: <1461761065-21195-1-git-send-email-ander.conselvan.de.oliveira@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 D39F06EAB3 for ; Wed, 27 Apr 2016 12:44:37 +0000 (UTC) In-Reply-To: <1461761065-21195-1-git-send-email-ander.conselvan.de.oliveira@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: Ander Conselvan de Oliveira List-Id: intel-gfx@lists.freedesktop.org VGhlIGZ1bmN0aW9uIGNodl9kYXRhX2xhbmVfc29mdF9yZXNldCgpIHdhcyBkdXBsaWNhdGVkIGlu IERQIGFuZCBIRE1JCmNvZGUuIE1vdmUgaXQgdG8gaW50ZWxfZHBpb19waHkuYy4KClNpZ25lZC1v ZmYtYnk6IEFuZGVyIENvbnNlbHZhbiBkZSBPbGl2ZWlyYSA8YW5kZXIuY29uc2VsdmFuLmRlLm9s aXZlaXJhQGludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IEppbSBCcmlkZSA8amltLmJyaWRlQGxpbnV4 LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAgIHwg IDIgKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMgICAgICAgfCA0NCAtLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZHBpb19waHkuYyB8IDQzICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2hkbWkuYyAgICAgfCA0NCAtLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLQogNCBmaWxlcyBjaGFuZ2VkLCA0NSBpbnNlcnRpb25zKCspLCA4OCBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5o IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCA5NzYwYjQyLi43MzA5ZDNm IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTM1ODEsNiArMzU4MSw4IEBAIHZvaWQgdmx2 X2ZsaXNkc2lfd3JpdGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCB1MzIgcmVn LCB1MzIgdmFsKTsKIHZvaWQgY2h2X3NldF9waHlfc2lnbmFsX2xldmVsKHN0cnVjdCBpbnRlbF9l bmNvZGVyICplbmNvZGVyLAogCQkJICAgICAgdTMyIGRlZW1waF9yZWdfdmFsdWUsIHUzMiBtYXJn aW5fcmVnX3ZhbHVlLAogCQkJICAgICAgYm9vbCB1bmlxX3RyYW5zX3NjYWxlKTsKK3ZvaWQgY2h2 X2RhdGFfbGFuZV9zb2Z0X3Jlc2V0KHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAorCQkJ ICAgICAgYm9vbCByZXNldCk7CiAKIGludCBpbnRlbF9ncHVfZnJlcShzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYsIGludCB2YWwpOwogaW50IGludGVsX2ZyZXFfb3Bjb2RlKHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgaW50IHZhbCk7CmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZHAuYwppbmRleCBiZGFmZDcyLi4zYTQxMWRlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kcC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKQEAg LTI0NjAsNTAgKzI0NjAsNiBAQCBzdGF0aWMgdm9pZCB2bHZfcG9zdF9kaXNhYmxlX2RwKHN0cnVj dCBpbnRlbF9lbmNvZGVyICplbmNvZGVyKQogCWludGVsX2RwX2xpbmtfZG93bihpbnRlbF9kcCk7 CiB9CiAKLXN0YXRpYyB2b2lkIGNodl9kYXRhX2xhbmVfc29mdF9yZXNldChzdHJ1Y3QgaW50ZWxf ZW5jb2RlciAqZW5jb2RlciwKLQkJCQkgICAgIGJvb2wgcmVzZXQpCi17Ci0Jc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShlbmNvZGVyLT5iYXNlLmRldik7Ci0JZW51 bSBkcGlvX2NoYW5uZWwgY2ggPSB2bHZfZHBvcnRfdG9fY2hhbm5lbChlbmNfdG9fZGlnX3BvcnQo JmVuY29kZXItPmJhc2UpKTsKLQlzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YyA9IHRvX2ludGVsX2Ny dGMoZW5jb2Rlci0+YmFzZS5jcnRjKTsKLQllbnVtIHBpcGUgcGlwZSA9IGNydGMtPnBpcGU7Ci0J dWludDMyX3QgdmFsOwotCi0JdmFsID0gdmx2X2RwaW9fcmVhZChkZXZfcHJpdiwgcGlwZSwgVkxW X1BDUzAxX0RXMChjaCkpOwotCWlmIChyZXNldCkKLQkJdmFsICY9IH4oRFBJT19QQ1NfVFhfTEFO RTJfUkVTRVQgfCBEUElPX1BDU19UWF9MQU5FMV9SRVNFVCk7Ci0JZWxzZQotCQl2YWwgfD0gRFBJ T19QQ1NfVFhfTEFORTJfUkVTRVQgfCBEUElPX1BDU19UWF9MQU5FMV9SRVNFVDsKLQl2bHZfZHBp b193cml0ZShkZXZfcHJpdiwgcGlwZSwgVkxWX1BDUzAxX0RXMChjaCksIHZhbCk7Ci0KLQlpZiAo Y3J0Yy0+Y29uZmlnLT5sYW5lX2NvdW50ID4gMikgewotCQl2YWwgPSB2bHZfZHBpb19yZWFkKGRl dl9wcml2LCBwaXBlLCBWTFZfUENTMjNfRFcwKGNoKSk7Ci0JCWlmIChyZXNldCkKLQkJCXZhbCAm PSB+KERQSU9fUENTX1RYX0xBTkUyX1JFU0VUIHwgRFBJT19QQ1NfVFhfTEFORTFfUkVTRVQpOwot CQllbHNlCi0JCQl2YWwgfD0gRFBJT19QQ1NfVFhfTEFORTJfUkVTRVQgfCBEUElPX1BDU19UWF9M QU5FMV9SRVNFVDsKLQkJdmx2X2RwaW9fd3JpdGUoZGV2X3ByaXYsIHBpcGUsIFZMVl9QQ1MyM19E VzAoY2gpLCB2YWwpOwotCX0KLQotCXZhbCA9IHZsdl9kcGlvX3JlYWQoZGV2X3ByaXYsIHBpcGUs IFZMVl9QQ1MwMV9EVzEoY2gpKTsKLQl2YWwgfD0gQ0hWX1BDU19SRVFfU09GVFJFU0VUX0VOOwot CWlmIChyZXNldCkKLQkJdmFsICY9IH5EUElPX1BDU19DTEtfU09GVF9SRVNFVDsKLQllbHNlCi0J CXZhbCB8PSBEUElPX1BDU19DTEtfU09GVF9SRVNFVDsKLQl2bHZfZHBpb193cml0ZShkZXZfcHJp diwgcGlwZSwgVkxWX1BDUzAxX0RXMShjaCksIHZhbCk7Ci0KLQlpZiAoY3J0Yy0+Y29uZmlnLT5s YW5lX2NvdW50ID4gMikgewotCQl2YWwgPSB2bHZfZHBpb19yZWFkKGRldl9wcml2LCBwaXBlLCBW TFZfUENTMjNfRFcxKGNoKSk7Ci0JCXZhbCB8PSBDSFZfUENTX1JFUV9TT0ZUUkVTRVRfRU47Ci0J CWlmIChyZXNldCkKLQkJCXZhbCAmPSB+RFBJT19QQ1NfQ0xLX1NPRlRfUkVTRVQ7Ci0JCWVsc2UK LQkJCXZhbCB8PSBEUElPX1BDU19DTEtfU09GVF9SRVNFVDsKLQkJdmx2X2RwaW9fd3JpdGUoZGV2 X3ByaXYsIHBpcGUsIFZMVl9QQ1MyM19EVzEoY2gpLCB2YWwpOwotCX0KLX0KLQogc3RhdGljIHZv aWQgY2h2X3Bvc3RfZGlzYWJsZV9kcChzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlcikKIHsK IAlzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwID0gZW5jX3RvX2ludGVsX2RwKCZlbmNvZGVyLT5i YXNlKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwaW9fcGh5LmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcGlvX3BoeS5jCmluZGV4IGNiZTE3MDNkLi45 ODU0YzkzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcGlvX3BoeS5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwaW9fcGh5LmMKQEAgLTEyMCwzICsx MjAsNDYgQEAgdm9pZCBjaHZfc2V0X3BoeV9zaWduYWxfbGV2ZWwoc3RydWN0IGludGVsX2VuY29k ZXIgKmVuY29kZXIsCiAKIH0KIAordm9pZCBjaHZfZGF0YV9sYW5lX3NvZnRfcmVzZXQoc3RydWN0 IGludGVsX2VuY29kZXIgKmVuY29kZXIsCisJCQkgICAgICBib29sIHJlc2V0KQoreworCXN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZW5jb2Rlci0+YmFzZS5kZXYp OworCWVudW0gZHBpb19jaGFubmVsIGNoID0gdmx2X2Rwb3J0X3RvX2NoYW5uZWwoZW5jX3RvX2Rp Z19wb3J0KCZlbmNvZGVyLT5iYXNlKSk7CisJc3RydWN0IGludGVsX2NydGMgKmNydGMgPSB0b19p bnRlbF9jcnRjKGVuY29kZXItPmJhc2UuY3J0Yyk7CisJZW51bSBwaXBlIHBpcGUgPSBjcnRjLT5w aXBlOworCXVpbnQzMl90IHZhbDsKKworCXZhbCA9IHZsdl9kcGlvX3JlYWQoZGV2X3ByaXYsIHBp cGUsIFZMVl9QQ1MwMV9EVzAoY2gpKTsKKwlpZiAocmVzZXQpCisJCXZhbCAmPSB+KERQSU9fUENT X1RYX0xBTkUyX1JFU0VUIHwgRFBJT19QQ1NfVFhfTEFORTFfUkVTRVQpOworCWVsc2UKKwkJdmFs IHw9IERQSU9fUENTX1RYX0xBTkUyX1JFU0VUIHwgRFBJT19QQ1NfVFhfTEFORTFfUkVTRVQ7CisJ dmx2X2RwaW9fd3JpdGUoZGV2X3ByaXYsIHBpcGUsIFZMVl9QQ1MwMV9EVzAoY2gpLCB2YWwpOwor CisJaWYgKGNydGMtPmNvbmZpZy0+bGFuZV9jb3VudCA+IDIpIHsKKwkJdmFsID0gdmx2X2RwaW9f cmVhZChkZXZfcHJpdiwgcGlwZSwgVkxWX1BDUzIzX0RXMChjaCkpOworCQlpZiAocmVzZXQpCisJ CQl2YWwgJj0gfihEUElPX1BDU19UWF9MQU5FMl9SRVNFVCB8IERQSU9fUENTX1RYX0xBTkUxX1JF U0VUKTsKKwkJZWxzZQorCQkJdmFsIHw9IERQSU9fUENTX1RYX0xBTkUyX1JFU0VUIHwgRFBJT19Q Q1NfVFhfTEFORTFfUkVTRVQ7CisJCXZsdl9kcGlvX3dyaXRlKGRldl9wcml2LCBwaXBlLCBWTFZf UENTMjNfRFcwKGNoKSwgdmFsKTsKKwl9CisKKwl2YWwgPSB2bHZfZHBpb19yZWFkKGRldl9wcml2 LCBwaXBlLCBWTFZfUENTMDFfRFcxKGNoKSk7CisJdmFsIHw9IENIVl9QQ1NfUkVRX1NPRlRSRVNF VF9FTjsKKwlpZiAocmVzZXQpCisJCXZhbCAmPSB+RFBJT19QQ1NfQ0xLX1NPRlRfUkVTRVQ7CisJ ZWxzZQorCQl2YWwgfD0gRFBJT19QQ1NfQ0xLX1NPRlRfUkVTRVQ7CisJdmx2X2RwaW9fd3JpdGUo ZGV2X3ByaXYsIHBpcGUsIFZMVl9QQ1MwMV9EVzEoY2gpLCB2YWwpOworCisJaWYgKGNydGMtPmNv bmZpZy0+bGFuZV9jb3VudCA+IDIpIHsKKwkJdmFsID0gdmx2X2RwaW9fcmVhZChkZXZfcHJpdiwg cGlwZSwgVkxWX1BDUzIzX0RXMShjaCkpOworCQl2YWwgfD0gQ0hWX1BDU19SRVFfU09GVFJFU0VU X0VOOworCQlpZiAocmVzZXQpCisJCQl2YWwgJj0gfkRQSU9fUENTX0NMS19TT0ZUX1JFU0VUOwor CQllbHNlCisJCQl2YWwgfD0gRFBJT19QQ1NfQ0xLX1NPRlRfUkVTRVQ7CisJCXZsdl9kcGlvX3dy aXRlKGRldl9wcml2LCBwaXBlLCBWTFZfUENTMjNfRFcxKGNoKSwgdmFsKTsKKwl9Cit9CmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9oZG1pLmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9oZG1pLmMKaW5kZXggNDk0ZTAyZS4uMmQ0MjlkMCAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaGRtaS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2hkbWkuYwpAQCAtMTY2Niw1MCArMTY2Niw2IEBAIHN0YXRpYyB2b2lkIHZsdl9o ZG1pX3ByZV9wbGxfZW5hYmxlKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyKQogCW11dGV4 X3VubG9jaygmZGV2X3ByaXYtPnNiX2xvY2spOwogfQogCi1zdGF0aWMgdm9pZCBjaHZfZGF0YV9s YW5lX3NvZnRfcmVzZXQoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCi0JCQkJICAgICBi b29sIHJlc2V0KQotewotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5 MTUoZW5jb2Rlci0+YmFzZS5kZXYpOwotCWVudW0gZHBpb19jaGFubmVsIGNoID0gdmx2X2Rwb3J0 X3RvX2NoYW5uZWwoZW5jX3RvX2RpZ19wb3J0KCZlbmNvZGVyLT5iYXNlKSk7Ci0Jc3RydWN0IGlu dGVsX2NydGMgKmNydGMgPSB0b19pbnRlbF9jcnRjKGVuY29kZXItPmJhc2UuY3J0Yyk7Ci0JZW51 bSBwaXBlIHBpcGUgPSBjcnRjLT5waXBlOwotCXVpbnQzMl90IHZhbDsKLQotCXZhbCA9IHZsdl9k cGlvX3JlYWQoZGV2X3ByaXYsIHBpcGUsIFZMVl9QQ1MwMV9EVzAoY2gpKTsKLQlpZiAocmVzZXQp Ci0JCXZhbCAmPSB+KERQSU9fUENTX1RYX0xBTkUyX1JFU0VUIHwgRFBJT19QQ1NfVFhfTEFORTFf UkVTRVQpOwotCWVsc2UKLQkJdmFsIHw9IERQSU9fUENTX1RYX0xBTkUyX1JFU0VUIHwgRFBJT19Q Q1NfVFhfTEFORTFfUkVTRVQ7Ci0Jdmx2X2RwaW9fd3JpdGUoZGV2X3ByaXYsIHBpcGUsIFZMVl9Q Q1MwMV9EVzAoY2gpLCB2YWwpOwotCi0JaWYgKGNydGMtPmNvbmZpZy0+bGFuZV9jb3VudCA+IDIp IHsKLQkJdmFsID0gdmx2X2RwaW9fcmVhZChkZXZfcHJpdiwgcGlwZSwgVkxWX1BDUzIzX0RXMChj aCkpOwotCQlpZiAocmVzZXQpCi0JCQl2YWwgJj0gfihEUElPX1BDU19UWF9MQU5FMl9SRVNFVCB8 IERQSU9fUENTX1RYX0xBTkUxX1JFU0VUKTsKLQkJZWxzZQotCQkJdmFsIHw9IERQSU9fUENTX1RY X0xBTkUyX1JFU0VUIHwgRFBJT19QQ1NfVFhfTEFORTFfUkVTRVQ7Ci0JCXZsdl9kcGlvX3dyaXRl KGRldl9wcml2LCBwaXBlLCBWTFZfUENTMjNfRFcwKGNoKSwgdmFsKTsKLQl9Ci0KLQl2YWwgPSB2 bHZfZHBpb19yZWFkKGRldl9wcml2LCBwaXBlLCBWTFZfUENTMDFfRFcxKGNoKSk7Ci0JdmFsIHw9 IENIVl9QQ1NfUkVRX1NPRlRSRVNFVF9FTjsKLQlpZiAocmVzZXQpCi0JCXZhbCAmPSB+RFBJT19Q Q1NfQ0xLX1NPRlRfUkVTRVQ7Ci0JZWxzZQotCQl2YWwgfD0gRFBJT19QQ1NfQ0xLX1NPRlRfUkVT RVQ7Ci0Jdmx2X2RwaW9fd3JpdGUoZGV2X3ByaXYsIHBpcGUsIFZMVl9QQ1MwMV9EVzEoY2gpLCB2 YWwpOwotCi0JaWYgKGNydGMtPmNvbmZpZy0+bGFuZV9jb3VudCA+IDIpIHsKLQkJdmFsID0gdmx2 X2RwaW9fcmVhZChkZXZfcHJpdiwgcGlwZSwgVkxWX1BDUzIzX0RXMShjaCkpOwotCQl2YWwgfD0g Q0hWX1BDU19SRVFfU09GVFJFU0VUX0VOOwotCQlpZiAocmVzZXQpCi0JCQl2YWwgJj0gfkRQSU9f UENTX0NMS19TT0ZUX1JFU0VUOwotCQllbHNlCi0JCQl2YWwgfD0gRFBJT19QQ1NfQ0xLX1NPRlRf UkVTRVQ7Ci0JCXZsdl9kcGlvX3dyaXRlKGRldl9wcml2LCBwaXBlLCBWTFZfUENTMjNfRFcxKGNo KSwgdmFsKTsKLQl9Ci19Ci0KIHN0YXRpYyB2b2lkIGNodl9oZG1pX3ByZV9wbGxfZW5hYmxlKHN0 cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyKQogewogCXN0cnVjdCBpbnRlbF9kaWdpdGFsX3Bv cnQgKmRwb3J0ID0gZW5jX3RvX2RpZ19wb3J0KCZlbmNvZGVyLT5iYXNlKTsKLS0gCjIuNC4xMQoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==