From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ander Conselvan de Oliveira Subject: [PATCH v2 06/18] drm/i915: Unduplicate CHV encoders' post pll disable code Date: Wed, 20 Apr 2016 08:20:48 +0300 Message-ID: <1461129648-9981-1-git-send-email-ander.conselvan.de.oliveira@intel.com> References: <1460569673-13694-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 660D16E1E5 for ; Wed, 20 Apr 2016 05:21:44 +0000 (UTC) In-Reply-To: <1460569673-13694-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 VGhlIGV4YWN0IHNhbWUgY29kZSB3YXMgdXNlZCBieSBIRE1JIGFuZCBEUCBlbmNvZGVycywgc28g bW92ZSBpdCB0bwppbnRlbF9kcGlvX3BoeS5jLgoKdjI6IEZpeCB0eXBvIGluIHRoZSBjb21taXQg bWVzc2FnZS4gKEppbSBCcmlkZSkKQ2M6IEppbSBCcmlkZSA8amltLmJyaWRlQGxpbnV4LmludGVs LmNvbT4KU2lnbmVkLW9mZi1ieTogQW5kZXIgQ29uc2VsdmFuIGRlIE9saXZlaXJhIDxhbmRlci5j b25zZWx2YW4uZGUub2xpdmVpcmFAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZHJ2LmggICAgICAgfCAgMSArCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5j ICAgICAgIHwgMzAgKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kcGlvX3BoeS5jIHwgMzMgKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9oZG1pLmMgICAgIHwgMzAgKy0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiA0IGZpbGVzIGNoYW5nZWQsIDM2IGluc2VydGlvbnMo KyksIDU4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IDNhY2E2M2Yu Ljk2MjViMDYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMzU5Miw2ICszNTkyLDcgQEAg dm9pZCBjaHZfZGF0YV9sYW5lX3NvZnRfcmVzZXQoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29k ZXIsCiB2b2lkIGNodl9waHlfcHJlX3BsbF9lbmFibGUoc3RydWN0IGludGVsX2VuY29kZXIgKmVu Y29kZXIpOwogdm9pZCBjaHZfcGh5X3ByZV9lbmNvZGVyX2VuYWJsZShzdHJ1Y3QgaW50ZWxfZW5j b2RlciAqZW5jb2Rlcik7CiB2b2lkIGNodl9waHlfcmVsZWFzZV9jbDJfb3ZlcnJpZGUoc3RydWN0 IGludGVsX2VuY29kZXIgKmVuY29kZXIpOwordm9pZCBjaHZfcGh5X3Bvc3RfZGlzYWJsZShzdHJ1 Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2Rlcik7CiAKIGludCBpbnRlbF9ncHVfZnJlcShzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIGludCB2YWwpOwogaW50IGludGVsX2ZyZXFfb3Bj b2RlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgaW50IHZhbCk7CmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZHAuYwppbmRleCAxMTQ1NDhkLi45OTAyYWE3IDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2RwLmMKQEAgLTI4MzgsMzUgKzI4MzgsNyBAQCBzdGF0aWMgdm9pZCBjaHZfZHBfcHJlX3BsbF9l bmFibGUoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIpCiAKIHN0YXRpYyB2b2lkIGNodl9k cF9wb3N0X3BsbF9kaXNhYmxlKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyKQogewotCXN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZW5jb2Rlci0+YmFzZS5k ZXYpOwotCWVudW0gcGlwZSBwaXBlID0gdG9faW50ZWxfY3J0YyhlbmNvZGVyLT5iYXNlLmNydGMp LT5waXBlOwotCXUzMiB2YWw7Ci0KLQltdXRleF9sb2NrKCZkZXZfcHJpdi0+c2JfbG9jayk7Ci0K LQkvKiBkaXNhYmxlIGxlZnQvcmlnaHQgY2xvY2sgZGlzdHJpYnV0aW9uICovCi0JaWYgKHBpcGUg IT0gUElQRV9CKSB7Ci0JCXZhbCA9IHZsdl9kcGlvX3JlYWQoZGV2X3ByaXYsIHBpcGUsIF9DSFZf Q01OX0RXNV9DSDApOwotCQl2YWwgJj0gfihDSFZfQlVGTEVGVEVOQTFfTUFTSyB8IENIVl9CVUZS SUdIVEVOQTFfTUFTSyk7Ci0JCXZsdl9kcGlvX3dyaXRlKGRldl9wcml2LCBwaXBlLCBfQ0hWX0NN Tl9EVzVfQ0gwLCB2YWwpOwotCX0gZWxzZSB7Ci0JCXZhbCA9IHZsdl9kcGlvX3JlYWQoZGV2X3By aXYsIHBpcGUsIF9DSFZfQ01OX0RXMV9DSDEpOwotCQl2YWwgJj0gfihDSFZfQlVGTEVGVEVOQTJf TUFTSyB8IENIVl9CVUZSSUdIVEVOQTJfTUFTSyk7Ci0JCXZsdl9kcGlvX3dyaXRlKGRldl9wcml2 LCBwaXBlLCBfQ0hWX0NNTl9EVzFfQ0gxLCB2YWwpOwotCX0KLQotCW11dGV4X3VubG9jaygmZGV2 X3ByaXYtPnNiX2xvY2spOwotCi0JLyoKLQkgKiBMZWF2ZSB0aGUgcG93ZXIgZG93biBiaXQgY2xl YXJlZCBmb3IgYXQgbGVhc3Qgb25lCi0JICogbGFuZSBzbyB0aGF0IGNodl9wb3dlcmdhdGVfcGh5 X2NoKCkgd2lsbCBwb3dlcgotCSAqIG9uIHNvbWV0aGluZyB3aGVuIHRoZSBjaGFubmVsIGlzIG90 aGVyd2lzZSB1bnVzZWQuCi0JICogV2hlbiB0aGUgcG9ydCBpcyBvZmYgYW5kIHRoZSBvdmVycmlk ZSBpcyByZW1vdmVkCi0JICogdGhlIGxhbmVzIHBvd2VyIGRvd24gYW55d2F5LCBzbyBvdGhlcndp c2UgaXQgZG9lc24ndAotCSAqIHJlYWxseSBtYXR0ZXIgd2hhdCB0aGUgc3RhdGUgb2YgcG93ZXIg ZG93biBiaXRzIGlzCi0JICogYWZ0ZXIgdGhpcy4KLQkgKi8KLQljaHZfcGh5X3Bvd2VyZ2F0ZV9s YW5lcyhlbmNvZGVyLCBmYWxzZSwgMHgwKTsKKwljaHZfcGh5X3Bvc3RfZGlzYWJsZShlbmNvZGVy KTsKIH0KIAogLyoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwaW9f cGh5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcGlvX3BoeS5jCmluZGV4IGFkMGU3 YmUuLjI0MDA1NTQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwaW9f cGh5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHBpb19waHkuYwpAQCAtMzM2 LDMgKzMzNiwzNiBAQCB2b2lkIGNodl9waHlfcmVsZWFzZV9jbDJfb3ZlcnJpZGUoc3RydWN0IGlu dGVsX2VuY29kZXIgKmVuY29kZXIpCiAJCWRwb3J0LT5yZWxlYXNlX2NsMl9vdmVycmlkZSA9IGZh bHNlOwogCX0KIH0KKwordm9pZCBjaHZfcGh5X3Bvc3RfZGlzYWJsZShzdHJ1Y3QgaW50ZWxfZW5j b2RlciAqZW5jb2RlcikKK3sKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0 b19pOTE1KGVuY29kZXItPmJhc2UuZGV2KTsKKwllbnVtIHBpcGUgcGlwZSA9IHRvX2ludGVsX2Ny dGMoZW5jb2Rlci0+YmFzZS5jcnRjKS0+cGlwZTsKKwl1MzIgdmFsOworCisJbXV0ZXhfbG9jaygm ZGV2X3ByaXYtPnNiX2xvY2spOworCisJLyogZGlzYWJsZSBsZWZ0L3JpZ2h0IGNsb2NrIGRpc3Ry aWJ1dGlvbiAqLworCWlmIChwaXBlICE9IFBJUEVfQikgeworCQl2YWwgPSB2bHZfZHBpb19yZWFk KGRldl9wcml2LCBwaXBlLCBfQ0hWX0NNTl9EVzVfQ0gwKTsKKwkJdmFsICY9IH4oQ0hWX0JVRkxF RlRFTkExX01BU0sgfCBDSFZfQlVGUklHSFRFTkExX01BU0spOworCQl2bHZfZHBpb193cml0ZShk ZXZfcHJpdiwgcGlwZSwgX0NIVl9DTU5fRFc1X0NIMCwgdmFsKTsKKwl9IGVsc2UgeworCQl2YWwg PSB2bHZfZHBpb19yZWFkKGRldl9wcml2LCBwaXBlLCBfQ0hWX0NNTl9EVzFfQ0gxKTsKKwkJdmFs ICY9IH4oQ0hWX0JVRkxFRlRFTkEyX01BU0sgfCBDSFZfQlVGUklHSFRFTkEyX01BU0spOworCQl2 bHZfZHBpb193cml0ZShkZXZfcHJpdiwgcGlwZSwgX0NIVl9DTU5fRFcxX0NIMSwgdmFsKTsKKwl9 CisKKwltdXRleF91bmxvY2soJmRldl9wcml2LT5zYl9sb2NrKTsKKworCS8qCisJICogTGVhdmUg dGhlIHBvd2VyIGRvd24gYml0IGNsZWFyZWQgZm9yIGF0IGxlYXN0IG9uZQorCSAqIGxhbmUgc28g dGhhdCBjaHZfcG93ZXJnYXRlX3BoeV9jaCgpIHdpbGwgcG93ZXIKKwkgKiBvbiBzb21ldGhpbmcg d2hlbiB0aGUgY2hhbm5lbCBpcyBvdGhlcndpc2UgdW51c2VkLgorCSAqIFdoZW4gdGhlIHBvcnQg aXMgb2ZmIGFuZCB0aGUgb3ZlcnJpZGUgaXMgcmVtb3ZlZAorCSAqIHRoZSBsYW5lcyBwb3dlciBk b3duIGFueXdheSwgc28gb3RoZXJ3aXNlIGl0IGRvZXNuJ3QKKwkgKiByZWFsbHkgbWF0dGVyIHdo YXQgdGhlIHN0YXRlIG9mIHBvd2VyIGRvd24gYml0cyBpcworCSAqIGFmdGVyIHRoaXMuCisJICov CisJY2h2X3BoeV9wb3dlcmdhdGVfbGFuZXMoZW5jb2RlciwgZmFsc2UsIDB4MCk7Cit9CmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9oZG1pLmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9oZG1pLmMKaW5kZXggYjRkYTdlZS4uZjQyNGFmNSAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaGRtaS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2hkbWkuYwpAQCAtMTY2NywzNSArMTY2Nyw3IEBAIHN0YXRpYyB2b2lkIGNodl9o ZG1pX3ByZV9wbGxfZW5hYmxlKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyKQogCiBzdGF0 aWMgdm9pZCBjaHZfaGRtaV9wb3N0X3BsbF9kaXNhYmxlKHN0cnVjdCBpbnRlbF9lbmNvZGVyICpl bmNvZGVyKQogewotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUo ZW5jb2Rlci0+YmFzZS5kZXYpOwotCWVudW0gcGlwZSBwaXBlID0gdG9faW50ZWxfY3J0YyhlbmNv ZGVyLT5iYXNlLmNydGMpLT5waXBlOwotCXUzMiB2YWw7Ci0KLQltdXRleF9sb2NrKCZkZXZfcHJp di0+c2JfbG9jayk7Ci0KLQkvKiBkaXNhYmxlIGxlZnQvcmlnaHQgY2xvY2sgZGlzdHJpYnV0aW9u ICovCi0JaWYgKHBpcGUgIT0gUElQRV9CKSB7Ci0JCXZhbCA9IHZsdl9kcGlvX3JlYWQoZGV2X3By aXYsIHBpcGUsIF9DSFZfQ01OX0RXNV9DSDApOwotCQl2YWwgJj0gfihDSFZfQlVGTEVGVEVOQTFf TUFTSyB8IENIVl9CVUZSSUdIVEVOQTFfTUFTSyk7Ci0JCXZsdl9kcGlvX3dyaXRlKGRldl9wcml2 LCBwaXBlLCBfQ0hWX0NNTl9EVzVfQ0gwLCB2YWwpOwotCX0gZWxzZSB7Ci0JCXZhbCA9IHZsdl9k cGlvX3JlYWQoZGV2X3ByaXYsIHBpcGUsIF9DSFZfQ01OX0RXMV9DSDEpOwotCQl2YWwgJj0gfihD SFZfQlVGTEVGVEVOQTJfTUFTSyB8IENIVl9CVUZSSUdIVEVOQTJfTUFTSyk7Ci0JCXZsdl9kcGlv X3dyaXRlKGRldl9wcml2LCBwaXBlLCBfQ0hWX0NNTl9EVzFfQ0gxLCB2YWwpOwotCX0KLQotCW11 dGV4X3VubG9jaygmZGV2X3ByaXYtPnNiX2xvY2spOwotCi0JLyoKLQkgKiBMZWF2ZSB0aGUgcG93 ZXIgZG93biBiaXQgY2xlYXJlZCBmb3IgYXQgbGVhc3Qgb25lCi0JICogbGFuZSBzbyB0aGF0IGNo dl9wb3dlcmdhdGVfcGh5X2NoKCkgd2lsbCBwb3dlcgotCSAqIG9uIHNvbWV0aGluZyB3aGVuIHRo ZSBjaGFubmVsIGlzIG90aGVyd2lzZSB1bnVzZWQuCi0JICogV2hlbiB0aGUgcG9ydCBpcyBvZmYg YW5kIHRoZSBvdmVycmlkZSBpcyByZW1vdmVkCi0JICogdGhlIGxhbmVzIHBvd2VyIGRvd24gYW55 d2F5LCBzbyBvdGhlcndpc2UgaXQgZG9lc24ndAotCSAqIHJlYWxseSBtYXR0ZXIgd2hhdCB0aGUg c3RhdGUgb2YgcG93ZXIgZG93biBiaXRzIGlzCi0JICogYWZ0ZXIgdGhpcy4KLQkgKi8KLQljaHZf cGh5X3Bvd2VyZ2F0ZV9sYW5lcyhlbmNvZGVyLCBmYWxzZSwgMHgwKTsKKwljaHZfcGh5X3Bvc3Rf ZGlzYWJsZShlbmNvZGVyKTsKIH0KIAogc3RhdGljIHZvaWQgdmx2X2hkbWlfcG9zdF9kaXNhYmxl KHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyKQotLSAKMi40LjExCgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0 CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK