From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ander Conselvan de Oliveira Subject: [PATCH v4 06/10] drm/i915: Unduplicate CHV encoders' post pll disable code Date: Wed, 27 Apr 2016 15:44:21 +0300 Message-ID: <1461761065-21195-7-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 12F3C6EAB9 for ; Wed, 27 Apr 2016 12:44:44 +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 VGhlIGV4YWN0IHNhbWUgY29kZSB3YXMgdXNlZCBieSBIRE1JIGFuZCBEUCBlbmNvZGVycywgc28g bW92ZSBpdCB0bwppbnRlbF9kcGlvX3BoeS5jLgoKdjI6IEZpeCB0eXBvIGluIHRoZSBjb21taXQg bWVzc2FnZS4gKEppbSBCcmlkZSkKdjM6IENhbGwgdGhlIG5ldyBmdW5jdGlvbiBjaHZfcGh5X3Bv c3RfcGxsX2Rpc2FibGUoKSBpbnN0ZWFkIG9mCiAgICBjaHZfcGh5X3Bvc3RfZGlzYWJsZSgpLCBh cyBpdCBzaG91bGQgYmUgY2FsbGVkIGFmdGVyIHRoZSBwbGwKICAgIGlzIGRpc2FibGVkLiAoVmls bGUpCgpDYzogSmltIEJyaWRlIDxqaW0uYnJpZGVAbGludXguaW50ZWwuY29tPgpDYzogVmlsbGUg U3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTog QW5kZXIgQ29uc2VsdmFuIGRlIE9saXZlaXJhIDxhbmRlci5jb25zZWx2YW4uZGUub2xpdmVpcmFA aW50ZWwuY29tPgpSZXZpZXdlZC1ieTogSmltIEJyaWRlIDxqaW0uYnJpZGVAbGludXguaW50ZWwu Y29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgICAgfCAgMSArCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jICAgICAgIHwgMzAgKy0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcGlvX3BoeS5jIHwg MzMgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9oZG1pLmMgICAgIHwgMzAgKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiA0 IGZpbGVzIGNoYW5nZWQsIDM2IGluc2VydGlvbnMoKyksIDU4IGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2Rydi5oCmluZGV4IGE0ODIyOTcuLjU3ZTYxZGIgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9kcnYuaApAQCAtMzU4Niw2ICszNTg2LDcgQEAgdm9pZCBjaHZfZGF0YV9sYW5lX3NvZnRfcmVz ZXQoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiB2b2lkIGNodl9waHlfcHJlX3BsbF9l bmFibGUoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIpOwogdm9pZCBjaHZfcGh5X3ByZV9l bmNvZGVyX2VuYWJsZShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2Rlcik7CiB2b2lkIGNodl9w aHlfcmVsZWFzZV9jbDJfb3ZlcnJpZGUoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIpOwor dm9pZCBjaHZfcGh5X3Bvc3RfcGxsX2Rpc2FibGUoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29k ZXIpOwogCiBpbnQgaW50ZWxfZ3B1X2ZyZXEoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2LCBpbnQgdmFsKTsKIGludCBpbnRlbF9mcmVxX29wY29kZShzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYsIGludCB2YWwpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZHAuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKaW5kZXggMmRh Zjg3NC4uMjZmYWExMiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jCkBAIC0yODM4LDM1ICsyODM4 LDcgQEAgc3RhdGljIHZvaWQgY2h2X2RwX3ByZV9wbGxfZW5hYmxlKHN0cnVjdCBpbnRlbF9lbmNv ZGVyICplbmNvZGVyKQogCiBzdGF0aWMgdm9pZCBjaHZfZHBfcG9zdF9wbGxfZGlzYWJsZShzdHJ1 Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlcikKIHsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYgPSB0b19pOTE1KGVuY29kZXItPmJhc2UuZGV2KTsKLQllbnVtIHBpcGUgcGlwZSA9 IHRvX2ludGVsX2NydGMoZW5jb2Rlci0+YmFzZS5jcnRjKS0+cGlwZTsKLQl1MzIgdmFsOwotCi0J bXV0ZXhfbG9jaygmZGV2X3ByaXYtPnNiX2xvY2spOwotCi0JLyogZGlzYWJsZSBsZWZ0L3JpZ2h0 IGNsb2NrIGRpc3RyaWJ1dGlvbiAqLwotCWlmIChwaXBlICE9IFBJUEVfQikgewotCQl2YWwgPSB2 bHZfZHBpb19yZWFkKGRldl9wcml2LCBwaXBlLCBfQ0hWX0NNTl9EVzVfQ0gwKTsKLQkJdmFsICY9 IH4oQ0hWX0JVRkxFRlRFTkExX01BU0sgfCBDSFZfQlVGUklHSFRFTkExX01BU0spOwotCQl2bHZf ZHBpb193cml0ZShkZXZfcHJpdiwgcGlwZSwgX0NIVl9DTU5fRFc1X0NIMCwgdmFsKTsKLQl9IGVs c2UgewotCQl2YWwgPSB2bHZfZHBpb19yZWFkKGRldl9wcml2LCBwaXBlLCBfQ0hWX0NNTl9EVzFf Q0gxKTsKLQkJdmFsICY9IH4oQ0hWX0JVRkxFRlRFTkEyX01BU0sgfCBDSFZfQlVGUklHSFRFTkEy X01BU0spOwotCQl2bHZfZHBpb193cml0ZShkZXZfcHJpdiwgcGlwZSwgX0NIVl9DTU5fRFcxX0NI MSwgdmFsKTsKLQl9Ci0KLQltdXRleF91bmxvY2soJmRldl9wcml2LT5zYl9sb2NrKTsKLQotCS8q Ci0JICogTGVhdmUgdGhlIHBvd2VyIGRvd24gYml0IGNsZWFyZWQgZm9yIGF0IGxlYXN0IG9uZQot CSAqIGxhbmUgc28gdGhhdCBjaHZfcG93ZXJnYXRlX3BoeV9jaCgpIHdpbGwgcG93ZXIKLQkgKiBv biBzb21ldGhpbmcgd2hlbiB0aGUgY2hhbm5lbCBpcyBvdGhlcndpc2UgdW51c2VkLgotCSAqIFdo ZW4gdGhlIHBvcnQgaXMgb2ZmIGFuZCB0aGUgb3ZlcnJpZGUgaXMgcmVtb3ZlZAotCSAqIHRoZSBs YW5lcyBwb3dlciBkb3duIGFueXdheSwgc28gb3RoZXJ3aXNlIGl0IGRvZXNuJ3QKLQkgKiByZWFs bHkgbWF0dGVyIHdoYXQgdGhlIHN0YXRlIG9mIHBvd2VyIGRvd24gYml0cyBpcwotCSAqIGFmdGVy IHRoaXMuCi0JICovCi0JY2h2X3BoeV9wb3dlcmdhdGVfbGFuZXMoZW5jb2RlciwgZmFsc2UsIDB4 MCk7CisJY2h2X3BoeV9wb3N0X3BsbF9kaXNhYmxlKGVuY29kZXIpOwogfQogCiAvKgpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHBpb19waHkuYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2RwaW9fcGh5LmMKaW5kZXggYWQwZTdiZS4uMzQ4ZDcwMCAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHBpb19waHkuYworKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcGlvX3BoeS5jCkBAIC0zMzYsMyArMzM2LDM2IEBAIHZvaWQg Y2h2X3BoeV9yZWxlYXNlX2NsMl9vdmVycmlkZShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2Rl cikKIAkJZHBvcnQtPnJlbGVhc2VfY2wyX292ZXJyaWRlID0gZmFsc2U7CiAJfQogfQorCit2b2lk IGNodl9waHlfcG9zdF9wbGxfZGlzYWJsZShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlcikK K3sKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGVuY29kZXIt PmJhc2UuZGV2KTsKKwllbnVtIHBpcGUgcGlwZSA9IHRvX2ludGVsX2NydGMoZW5jb2Rlci0+YmFz ZS5jcnRjKS0+cGlwZTsKKwl1MzIgdmFsOworCisJbXV0ZXhfbG9jaygmZGV2X3ByaXYtPnNiX2xv Y2spOworCisJLyogZGlzYWJsZSBsZWZ0L3JpZ2h0IGNsb2NrIGRpc3RyaWJ1dGlvbiAqLworCWlm IChwaXBlICE9IFBJUEVfQikgeworCQl2YWwgPSB2bHZfZHBpb19yZWFkKGRldl9wcml2LCBwaXBl LCBfQ0hWX0NNTl9EVzVfQ0gwKTsKKwkJdmFsICY9IH4oQ0hWX0JVRkxFRlRFTkExX01BU0sgfCBD SFZfQlVGUklHSFRFTkExX01BU0spOworCQl2bHZfZHBpb193cml0ZShkZXZfcHJpdiwgcGlwZSwg X0NIVl9DTU5fRFc1X0NIMCwgdmFsKTsKKwl9IGVsc2UgeworCQl2YWwgPSB2bHZfZHBpb19yZWFk KGRldl9wcml2LCBwaXBlLCBfQ0hWX0NNTl9EVzFfQ0gxKTsKKwkJdmFsICY9IH4oQ0hWX0JVRkxF RlRFTkEyX01BU0sgfCBDSFZfQlVGUklHSFRFTkEyX01BU0spOworCQl2bHZfZHBpb193cml0ZShk ZXZfcHJpdiwgcGlwZSwgX0NIVl9DTU5fRFcxX0NIMSwgdmFsKTsKKwl9CisKKwltdXRleF91bmxv Y2soJmRldl9wcml2LT5zYl9sb2NrKTsKKworCS8qCisJICogTGVhdmUgdGhlIHBvd2VyIGRvd24g Yml0IGNsZWFyZWQgZm9yIGF0IGxlYXN0IG9uZQorCSAqIGxhbmUgc28gdGhhdCBjaHZfcG93ZXJn YXRlX3BoeV9jaCgpIHdpbGwgcG93ZXIKKwkgKiBvbiBzb21ldGhpbmcgd2hlbiB0aGUgY2hhbm5l bCBpcyBvdGhlcndpc2UgdW51c2VkLgorCSAqIFdoZW4gdGhlIHBvcnQgaXMgb2ZmIGFuZCB0aGUg b3ZlcnJpZGUgaXMgcmVtb3ZlZAorCSAqIHRoZSBsYW5lcyBwb3dlciBkb3duIGFueXdheSwgc28g b3RoZXJ3aXNlIGl0IGRvZXNuJ3QKKwkgKiByZWFsbHkgbWF0dGVyIHdoYXQgdGhlIHN0YXRlIG9m IHBvd2VyIGRvd24gYml0cyBpcworCSAqIGFmdGVyIHRoaXMuCisJICovCisJY2h2X3BoeV9wb3dl cmdhdGVfbGFuZXMoZW5jb2RlciwgZmFsc2UsIDB4MCk7Cit9CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9oZG1pLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9o ZG1pLmMKaW5kZXggZGFhYTY4ZC4uZWQ3ODg5ZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfaGRtaS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2hkbWku YwpAQCAtMTY3NSwzNSArMTY3NSw3IEBAIHN0YXRpYyB2b2lkIGNodl9oZG1pX3ByZV9wbGxfZW5h YmxlKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyKQogCiBzdGF0aWMgdm9pZCBjaHZfaGRt aV9wb3N0X3BsbF9kaXNhYmxlKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyKQogewotCXN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZW5jb2Rlci0+YmFzZS5k ZXYpOwotCWVudW0gcGlwZSBwaXBlID0gdG9faW50ZWxfY3J0YyhlbmNvZGVyLT5iYXNlLmNydGMp LT5waXBlOwotCXUzMiB2YWw7Ci0KLQltdXRleF9sb2NrKCZkZXZfcHJpdi0+c2JfbG9jayk7Ci0K LQkvKiBkaXNhYmxlIGxlZnQvcmlnaHQgY2xvY2sgZGlzdHJpYnV0aW9uICovCi0JaWYgKHBpcGUg IT0gUElQRV9CKSB7Ci0JCXZhbCA9IHZsdl9kcGlvX3JlYWQoZGV2X3ByaXYsIHBpcGUsIF9DSFZf Q01OX0RXNV9DSDApOwotCQl2YWwgJj0gfihDSFZfQlVGTEVGVEVOQTFfTUFTSyB8IENIVl9CVUZS SUdIVEVOQTFfTUFTSyk7Ci0JCXZsdl9kcGlvX3dyaXRlKGRldl9wcml2LCBwaXBlLCBfQ0hWX0NN Tl9EVzVfQ0gwLCB2YWwpOwotCX0gZWxzZSB7Ci0JCXZhbCA9IHZsdl9kcGlvX3JlYWQoZGV2X3By aXYsIHBpcGUsIF9DSFZfQ01OX0RXMV9DSDEpOwotCQl2YWwgJj0gfihDSFZfQlVGTEVGVEVOQTJf TUFTSyB8IENIVl9CVUZSSUdIVEVOQTJfTUFTSyk7Ci0JCXZsdl9kcGlvX3dyaXRlKGRldl9wcml2 LCBwaXBlLCBfQ0hWX0NNTl9EVzFfQ0gxLCB2YWwpOwotCX0KLQotCW11dGV4X3VubG9jaygmZGV2 X3ByaXYtPnNiX2xvY2spOwotCi0JLyoKLQkgKiBMZWF2ZSB0aGUgcG93ZXIgZG93biBiaXQgY2xl YXJlZCBmb3IgYXQgbGVhc3Qgb25lCi0JICogbGFuZSBzbyB0aGF0IGNodl9wb3dlcmdhdGVfcGh5 X2NoKCkgd2lsbCBwb3dlcgotCSAqIG9uIHNvbWV0aGluZyB3aGVuIHRoZSBjaGFubmVsIGlzIG90 aGVyd2lzZSB1bnVzZWQuCi0JICogV2hlbiB0aGUgcG9ydCBpcyBvZmYgYW5kIHRoZSBvdmVycmlk ZSBpcyByZW1vdmVkCi0JICogdGhlIGxhbmVzIHBvd2VyIGRvd24gYW55d2F5LCBzbyBvdGhlcndp c2UgaXQgZG9lc24ndAotCSAqIHJlYWxseSBtYXR0ZXIgd2hhdCB0aGUgc3RhdGUgb2YgcG93ZXIg ZG93biBiaXRzIGlzCi0JICogYWZ0ZXIgdGhpcy4KLQkgKi8KLQljaHZfcGh5X3Bvd2VyZ2F0ZV9s YW5lcyhlbmNvZGVyLCBmYWxzZSwgMHgwKTsKKwljaHZfcGh5X3Bvc3RfcGxsX2Rpc2FibGUoZW5j b2Rlcik7CiB9CiAKIHN0YXRpYyB2b2lkIHZsdl9oZG1pX3Bvc3RfZGlzYWJsZShzdHJ1Y3QgaW50 ZWxfZW5jb2RlciAqZW5jb2RlcikKLS0gCjIuNC4xMQoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==