From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ander Conselvan de Oliveira Subject: [PATCH v2 06/10] drm/i915: Undiplicate CHV encoders' post pll disable code Date: Wed, 13 Apr 2016 20:47:49 +0300 Message-ID: <1460569673-13694-7-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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id C77346E931 for ; Wed, 13 Apr 2016 17:48:11 +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 bW92ZSBpdCB0bwppbnRlbF9kcGlvX3BoeS5jLgoKU2lnbmVkLW9mZi1ieTogQW5kZXIgQ29uc2Vs dmFuIGRlIE9saXZlaXJhIDxhbmRlci5jb25zZWx2YW4uZGUub2xpdmVpcmFAaW50ZWwuY29tPgot LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgICAgfCAgMSArCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jICAgICAgIHwgMzAgKy0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcGlvX3BoeS5jIHwgMzMgKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9oZG1pLmMgICAgIHwgMzAgKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiA0IGZpbGVz IGNoYW5nZWQsIDM2IGluc2VydGlvbnMoKyksIDU4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2Rydi5oCmluZGV4IDZmOTZjNDQuLjg1YzA2MTAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu aApAQCAtMzU2Myw2ICszNTYzLDcgQEAgdm9pZCBjaHZfZGF0YV9sYW5lX3NvZnRfcmVzZXQoc3Ry dWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiB2b2lkIGNodl9waHlfcHJlX3BsbF9lbmFibGUo c3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIpOwogdm9pZCBjaHZfcGh5X3ByZV9lbmNvZGVy X2VuYWJsZShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2Rlcik7CiB2b2lkIGNodl9waHlfcmVs ZWFzZV9jbDJfb3ZlcnJpZGUoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIpOwordm9pZCBj aHZfcGh5X3Bvc3RfZGlzYWJsZShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2Rlcik7CiAKIGlu dCBpbnRlbF9ncHVfZnJlcShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIGludCB2 YWwpOwogaW50IGludGVsX2ZyZXFfb3Bjb2RlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiwgaW50IHZhbCk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k cC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYwppbmRleCA3NmE4MjVjLi5jZGFj ZDhiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKQEAgLTI4NjgsMzUgKzI4NjgsNyBAQCBzdGF0 aWMgdm9pZCBjaHZfZHBfcHJlX3BsbF9lbmFibGUoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29k ZXIpCiAKIHN0YXRpYyB2b2lkIGNodl9kcF9wb3N0X3BsbF9kaXNhYmxlKHN0cnVjdCBpbnRlbF9l bmNvZGVyICplbmNvZGVyKQogewotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9 IHRvX2k5MTUoZW5jb2Rlci0+YmFzZS5kZXYpOwotCWVudW0gcGlwZSBwaXBlID0gdG9faW50ZWxf Y3J0YyhlbmNvZGVyLT5iYXNlLmNydGMpLT5waXBlOwotCXUzMiB2YWw7Ci0KLQltdXRleF9sb2Nr KCZkZXZfcHJpdi0+c2JfbG9jayk7Ci0KLQkvKiBkaXNhYmxlIGxlZnQvcmlnaHQgY2xvY2sgZGlz dHJpYnV0aW9uICovCi0JaWYgKHBpcGUgIT0gUElQRV9CKSB7Ci0JCXZhbCA9IHZsdl9kcGlvX3Jl YWQoZGV2X3ByaXYsIHBpcGUsIF9DSFZfQ01OX0RXNV9DSDApOwotCQl2YWwgJj0gfihDSFZfQlVG TEVGVEVOQTFfTUFTSyB8IENIVl9CVUZSSUdIVEVOQTFfTUFTSyk7Ci0JCXZsdl9kcGlvX3dyaXRl KGRldl9wcml2LCBwaXBlLCBfQ0hWX0NNTl9EVzVfQ0gwLCB2YWwpOwotCX0gZWxzZSB7Ci0JCXZh bCA9IHZsdl9kcGlvX3JlYWQoZGV2X3ByaXYsIHBpcGUsIF9DSFZfQ01OX0RXMV9DSDEpOwotCQl2 YWwgJj0gfihDSFZfQlVGTEVGVEVOQTJfTUFTSyB8IENIVl9CVUZSSUdIVEVOQTJfTUFTSyk7Ci0J CXZsdl9kcGlvX3dyaXRlKGRldl9wcml2LCBwaXBlLCBfQ0hWX0NNTl9EVzFfQ0gxLCB2YWwpOwot CX0KLQotCW11dGV4X3VubG9jaygmZGV2X3ByaXYtPnNiX2xvY2spOwotCi0JLyoKLQkgKiBMZWF2 ZSB0aGUgcG93ZXIgZG93biBiaXQgY2xlYXJlZCBmb3IgYXQgbGVhc3Qgb25lCi0JICogbGFuZSBz byB0aGF0IGNodl9wb3dlcmdhdGVfcGh5X2NoKCkgd2lsbCBwb3dlcgotCSAqIG9uIHNvbWV0aGlu ZyB3aGVuIHRoZSBjaGFubmVsIGlzIG90aGVyd2lzZSB1bnVzZWQuCi0JICogV2hlbiB0aGUgcG9y dCBpcyBvZmYgYW5kIHRoZSBvdmVycmlkZSBpcyByZW1vdmVkCi0JICogdGhlIGxhbmVzIHBvd2Vy IGRvd24gYW55d2F5LCBzbyBvdGhlcndpc2UgaXQgZG9lc24ndAotCSAqIHJlYWxseSBtYXR0ZXIg d2hhdCB0aGUgc3RhdGUgb2YgcG93ZXIgZG93biBiaXRzIGlzCi0JICogYWZ0ZXIgdGhpcy4KLQkg Ki8KLQljaHZfcGh5X3Bvd2VyZ2F0ZV9sYW5lcyhlbmNvZGVyLCBmYWxzZSwgMHgwKTsKKwljaHZf cGh5X3Bvc3RfZGlzYWJsZShlbmNvZGVyKTsKIH0KIAogLyoKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2RwaW9fcGh5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kcGlvX3BoeS5jCmluZGV4IGFkMGU3YmUuLjI0MDA1NTQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2RwaW9fcGh5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZHBpb19waHkuYwpAQCAtMzM2LDMgKzMzNiwzNiBAQCB2b2lkIGNodl9waHlfcmVsZWFz ZV9jbDJfb3ZlcnJpZGUoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIpCiAJCWRwb3J0LT5y ZWxlYXNlX2NsMl9vdmVycmlkZSA9IGZhbHNlOwogCX0KIH0KKwordm9pZCBjaHZfcGh5X3Bvc3Rf ZGlzYWJsZShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlcikKK3sKKwlzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGVuY29kZXItPmJhc2UuZGV2KTsKKwllbnVt IHBpcGUgcGlwZSA9IHRvX2ludGVsX2NydGMoZW5jb2Rlci0+YmFzZS5jcnRjKS0+cGlwZTsKKwl1 MzIgdmFsOworCisJbXV0ZXhfbG9jaygmZGV2X3ByaXYtPnNiX2xvY2spOworCisJLyogZGlzYWJs ZSBsZWZ0L3JpZ2h0IGNsb2NrIGRpc3RyaWJ1dGlvbiAqLworCWlmIChwaXBlICE9IFBJUEVfQikg eworCQl2YWwgPSB2bHZfZHBpb19yZWFkKGRldl9wcml2LCBwaXBlLCBfQ0hWX0NNTl9EVzVfQ0gw KTsKKwkJdmFsICY9IH4oQ0hWX0JVRkxFRlRFTkExX01BU0sgfCBDSFZfQlVGUklHSFRFTkExX01B U0spOworCQl2bHZfZHBpb193cml0ZShkZXZfcHJpdiwgcGlwZSwgX0NIVl9DTU5fRFc1X0NIMCwg dmFsKTsKKwl9IGVsc2UgeworCQl2YWwgPSB2bHZfZHBpb19yZWFkKGRldl9wcml2LCBwaXBlLCBf Q0hWX0NNTl9EVzFfQ0gxKTsKKwkJdmFsICY9IH4oQ0hWX0JVRkxFRlRFTkEyX01BU0sgfCBDSFZf QlVGUklHSFRFTkEyX01BU0spOworCQl2bHZfZHBpb193cml0ZShkZXZfcHJpdiwgcGlwZSwgX0NI Vl9DTU5fRFcxX0NIMSwgdmFsKTsKKwl9CisKKwltdXRleF91bmxvY2soJmRldl9wcml2LT5zYl9s b2NrKTsKKworCS8qCisJICogTGVhdmUgdGhlIHBvd2VyIGRvd24gYml0IGNsZWFyZWQgZm9yIGF0 IGxlYXN0IG9uZQorCSAqIGxhbmUgc28gdGhhdCBjaHZfcG93ZXJnYXRlX3BoeV9jaCgpIHdpbGwg cG93ZXIKKwkgKiBvbiBzb21ldGhpbmcgd2hlbiB0aGUgY2hhbm5lbCBpcyBvdGhlcndpc2UgdW51 c2VkLgorCSAqIFdoZW4gdGhlIHBvcnQgaXMgb2ZmIGFuZCB0aGUgb3ZlcnJpZGUgaXMgcmVtb3Zl ZAorCSAqIHRoZSBsYW5lcyBwb3dlciBkb3duIGFueXdheSwgc28gb3RoZXJ3aXNlIGl0IGRvZXNu J3QKKwkgKiByZWFsbHkgbWF0dGVyIHdoYXQgdGhlIHN0YXRlIG9mIHBvd2VyIGRvd24gYml0cyBp cworCSAqIGFmdGVyIHRoaXMuCisJICovCisJY2h2X3BoeV9wb3dlcmdhdGVfbGFuZXMoZW5jb2Rl ciwgZmFsc2UsIDB4MCk7Cit9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9oZG1pLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9oZG1pLmMKaW5kZXggYjRkYTdl ZS4uZjQyNGFmNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaGRtaS5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2hkbWkuYwpAQCAtMTY2NywzNSArMTY2 Nyw3IEBAIHN0YXRpYyB2b2lkIGNodl9oZG1pX3ByZV9wbGxfZW5hYmxlKHN0cnVjdCBpbnRlbF9l bmNvZGVyICplbmNvZGVyKQogCiBzdGF0aWMgdm9pZCBjaHZfaGRtaV9wb3N0X3BsbF9kaXNhYmxl KHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyKQogewotCXN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZW5jb2Rlci0+YmFzZS5kZXYpOwotCWVudW0gcGlwZSBw aXBlID0gdG9faW50ZWxfY3J0YyhlbmNvZGVyLT5iYXNlLmNydGMpLT5waXBlOwotCXUzMiB2YWw7 Ci0KLQltdXRleF9sb2NrKCZkZXZfcHJpdi0+c2JfbG9jayk7Ci0KLQkvKiBkaXNhYmxlIGxlZnQv cmlnaHQgY2xvY2sgZGlzdHJpYnV0aW9uICovCi0JaWYgKHBpcGUgIT0gUElQRV9CKSB7Ci0JCXZh bCA9IHZsdl9kcGlvX3JlYWQoZGV2X3ByaXYsIHBpcGUsIF9DSFZfQ01OX0RXNV9DSDApOwotCQl2 YWwgJj0gfihDSFZfQlVGTEVGVEVOQTFfTUFTSyB8IENIVl9CVUZSSUdIVEVOQTFfTUFTSyk7Ci0J CXZsdl9kcGlvX3dyaXRlKGRldl9wcml2LCBwaXBlLCBfQ0hWX0NNTl9EVzVfQ0gwLCB2YWwpOwot CX0gZWxzZSB7Ci0JCXZhbCA9IHZsdl9kcGlvX3JlYWQoZGV2X3ByaXYsIHBpcGUsIF9DSFZfQ01O X0RXMV9DSDEpOwotCQl2YWwgJj0gfihDSFZfQlVGTEVGVEVOQTJfTUFTSyB8IENIVl9CVUZSSUdI VEVOQTJfTUFTSyk7Ci0JCXZsdl9kcGlvX3dyaXRlKGRldl9wcml2LCBwaXBlLCBfQ0hWX0NNTl9E VzFfQ0gxLCB2YWwpOwotCX0KLQotCW11dGV4X3VubG9jaygmZGV2X3ByaXYtPnNiX2xvY2spOwot Ci0JLyoKLQkgKiBMZWF2ZSB0aGUgcG93ZXIgZG93biBiaXQgY2xlYXJlZCBmb3IgYXQgbGVhc3Qg b25lCi0JICogbGFuZSBzbyB0aGF0IGNodl9wb3dlcmdhdGVfcGh5X2NoKCkgd2lsbCBwb3dlcgot CSAqIG9uIHNvbWV0aGluZyB3aGVuIHRoZSBjaGFubmVsIGlzIG90aGVyd2lzZSB1bnVzZWQuCi0J ICogV2hlbiB0aGUgcG9ydCBpcyBvZmYgYW5kIHRoZSBvdmVycmlkZSBpcyByZW1vdmVkCi0JICog dGhlIGxhbmVzIHBvd2VyIGRvd24gYW55d2F5LCBzbyBvdGhlcndpc2UgaXQgZG9lc24ndAotCSAq IHJlYWxseSBtYXR0ZXIgd2hhdCB0aGUgc3RhdGUgb2YgcG93ZXIgZG93biBiaXRzIGlzCi0JICog YWZ0ZXIgdGhpcy4KLQkgKi8KLQljaHZfcGh5X3Bvd2VyZ2F0ZV9sYW5lcyhlbmNvZGVyLCBmYWxz ZSwgMHgwKTsKKwljaHZfcGh5X3Bvc3RfZGlzYWJsZShlbmNvZGVyKTsKIH0KIAogc3RhdGljIHZv aWQgdmx2X2hkbWlfcG9zdF9kaXNhYmxlKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyKQot LSAKMi40LjExCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK