From: Ander Conselvan de Oliveira Subject: [PATCH] drm/i915: Don't overwrite (e)DP PLL selection on SKL Date: Fri, 15 May 2015 13:34:29 +0300 Message-ID: <1431686069-6717-1-git-send-email-ander.conselvan.de.oliveira@intel.com> References: <1431685870.2600.18.camel@gmail.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 33E626E984 for ; Fri, 15 May 2015 03:34:30 -0700 (PDT) In-Reply-To: <1431685870.2600.18.camel@gmail.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 SW4gdGhlIGZvbGxvd2luZyBjb21taXQsIHRoZSBwbGFjZSB3aGVyZSB0aGUgY29udGVudHMgb2Yg ZHBsbF9od19zdGF0ZQppbiBjcnRjX3N0YXRlIHdoZXJlIHplcm9lZCB3YXMgY2hhbmdlZC4gUHJp b3IgdG8gdGhhdCBjb21taXQsIGl0CmhhcHBlbmVkIHdoZW4gdGhlIG5ldyBzdGF0ZSB3YXMgYWxs b2NhdGVkLCBidXQgbm93IHRoYXQgaGFwcGVucyBqdXN0CmJlZm9yZSB0aGUgY2FsbCB0aGUgLmNy dGNfY29tcHV0ZV9jbG9jaygpIGhvb2suIFRoZSBEUCBjb2RlIGZvciBTS0wsCmhvd2V2ZXIsIHNl dHMgdXAgdGhlIChwcml2YXRlKSBQTEwgaW4gdGhlIGVuY29kZXIgY29tcHV0ZSBjb25maWcKZnVu Y3Rpb24gdGhhdCBoYXMgYWxyZWFkeSBydW4gYnkgdGhlIHRpbWUgdGhhdCBtZW1zZXQoKSBpcyBy ZWFjaGVkLApjYXVzaW5nIHRoZSBwcmV2aW91cyB2YWx1ZSB0byBiZSBsb3N0LgoKVGhpcyBwYXRj aCBmaXhlcyB0aGUgaXNzdWUgYnkgbW92aW5nIHRoZSBtZW1zZXQoKSBkb3duIHRoZSBjYWxsIGNo YWluLApzbyB0aGF0IGl0IGlzIG9ubHkgY2FsbGVkIGlmIHRoZSB2YWx1ZXMgaW4gZHBsbF9od19z dGF0ZSBhcmUgZ29pbmcgdG8gYmUKdXBkYXRlZC4KCmNvbW1pdCA0OTc4Y2M5M2Q5YWMyNDBiNDM1 Y2U2MDQzMWFlZjI0MjM5YjRjMjcwCkF1dGhvcjogQW5kZXIgQ29uc2VsdmFuIGRlIE9saXZlaXJh IDxhbmRlci5jb25zZWx2YW4uZGUub2xpdmVpcmFAaW50ZWwuY29tPgpEYXRlOiAgIFR1ZSBBcHIg MjEgMTc6MTM6MjEgMjAxNSArMDMwMAoKICAgIGRybS9pOTE1OiBQcmVzZXJ2ZSBzaGFyZWQgRFBM TCBpbmZvcm1hdGlvbiBpbiBuZXcgcGlwZV9jb25maWcKCkJ1Z3ppbGxhOiBodHRwczovL2J1Z3Mu ZnJlZWRlc2t0b3Aub3JnL3Nob3dfYnVnLmNnaT9pZD05MDQ2MgotLS0KCk9uIEZyaSwgMjAxNS0w NS0xNSBhdCAxMzozMSArMDMwMCwgQW5kZXIgQ29uc2VsdmFuIERlIE9saXZlaXJhIHdyb3RlOgo+ IFRoZSBtZW1zZXQoKSB3YXMgYWRkZWQgdG8gZml4IGEgc2ltaWxhciB3YXJuaW5nIG9uIGEgZGlm ZmVyZW50IHBsYXRmb3JtLAo+IGJ1dCBJIGNhbid0IHJlbWVtYmVyIHdoaWNoIG9uZSBub3cuIFBl cmhhcHMgYSBtb3JlIGltbWVkaWF0ZSBmaXggd291bGQKPiBiZSB0byBtb3ZlIHRoZSBtZW1zZXQo KSBkb3duIHRoZSBjYWxsIGNoYWluLgoKTGlrZSB0aGlzIGNvbXBsZXRlbHkgdW50ZXN0ZWQgcGF0 Y2guCgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RkaS5jICAgICB8IDkgKysrKysr KysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCA4ICsrKysrKy0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jICAgICAgfCAzICsrKwogMyBmaWxlcyBjaGFu Z2VkLCAxOCBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2RkaS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGRpLmMKaW5kZXggZWM1ZDJlYS4uNDhkNDViMiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGRpLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMK QEAgLTEwODcsNiArMTA4Nyw5IEBAIGhzd19kZGlfcGxsX3NlbGVjdChzdHJ1Y3QgaW50ZWxfY3J0 YyAqaW50ZWxfY3J0YywKIAkJICAgICAgV1JQTExfRElWSURFUl9SRUZFUkVOQ0UocjIpIHwgV1JQ TExfRElWSURFUl9GRUVEQkFDSyhuMikgfAogCQkgICAgICBXUlBMTF9ESVZJREVSX1BPU1QocCk7 CiAKKwkJbWVtc2V0KCZjcnRjX3N0YXRlLT5kcGxsX2h3X3N0YXRlLCAwLAorCQkgICAgICAgc2l6 ZW9mKGNydGNfc3RhdGUtPmRwbGxfaHdfc3RhdGUpKTsKKwogCQljcnRjX3N0YXRlLT5kcGxsX2h3 X3N0YXRlLndycGxsID0gdmFsOwogCiAJCXBsbCA9IGludGVsX2dldF9zaGFyZWRfZHBsbChpbnRl bF9jcnRjLCBjcnRjX3N0YXRlKTsKQEAgLTEzMDksNiArMTMxMiw5IEBAIHNrbF9kZGlfcGxsX3Nl bGVjdChzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YywKIAl9IGVsc2UgLyogZURQICovCiAJ CXJldHVybiB0cnVlOwogCisJbWVtc2V0KCZjcnRjX3N0YXRlLT5kcGxsX2h3X3N0YXRlLCAwLAor CSAgICAgICBzaXplb2YoY3J0Y19zdGF0ZS0+ZHBsbF9od19zdGF0ZSkpOworCiAJY3J0Y19zdGF0 ZS0+ZHBsbF9od19zdGF0ZS5jdHJsMSA9IGN0cmwxOwogCWNydGNfc3RhdGUtPmRwbGxfaHdfc3Rh dGUuY2ZnY3IxID0gY2ZnY3IxOwogCWNydGNfc3RhdGUtPmRwbGxfaHdfc3RhdGUuY2ZnY3IyID0g Y2ZnY3IyOwpAQCAtMTQxOSw2ICsxNDI1LDkgQEAgYnh0X2RkaV9wbGxfc2VsZWN0KHN0cnVjdCBp bnRlbF9jcnRjICppbnRlbF9jcnRjLAogCQl9CiAJfQogCisJbWVtc2V0KCZjcnRjX3N0YXRlLT5k cGxsX2h3X3N0YXRlLCAwLAorCSAgICAgICBzaXplb2YoY3J0Y19zdGF0ZS0+ZHBsbF9od19zdGF0 ZSkpOworCiAJY3J0Y19zdGF0ZS0+ZHBsbF9od19zdGF0ZS5lYmIwID0KIAkJUE9SVF9QTExfUDEo Y2xrX2Rpdi5wMSkgfCBQT1JUX1BMTF9QMihjbGtfZGl2LnAyKTsKIAljcnRjX3N0YXRlLT5kcGxs X2h3X3N0YXRlLnBsbDAgPSBjbGtfZGl2Lm0yX2ludDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rp c3BsYXkuYwppbmRleCA4ZDQwZDdkLi5hNzczMmI0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGlzcGxheS5jCkBAIC03NDc1LDYgKzc0NzUsOSBAQCBzdGF0aWMgaW50IGk5eHhfY3J0Y19jb21w dXRlX2Nsb2NrKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCXN0cnVjdCBkcm1fY29ubmVjdG9y X3N0YXRlICpjb25uZWN0b3Jfc3RhdGU7CiAJaW50IGk7CiAKKwltZW1zZXQoJmNydGNfc3RhdGUt PmRwbGxfaHdfc3RhdGUsIDAsCisJICAgICAgIHNpemVvZihjcnRjX3N0YXRlLT5kcGxsX2h3X3N0 YXRlKSk7CisKIAlmb3JfZWFjaF9jb25uZWN0b3JfaW5fc3RhdGUoc3RhdGUsIGNvbm5lY3Rvciwg Y29ubmVjdG9yX3N0YXRlLCBpKSB7CiAJCWlmIChjb25uZWN0b3Jfc3RhdGUtPmNydGMgIT0gJmNy dGMtPmJhc2UpCiAJCQljb250aW51ZTsKQEAgLTg1MTYsNiArODUxOSw5IEBAIHN0YXRpYyBpbnQg aXJvbmxha2VfY3J0Y19jb21wdXRlX2Nsb2NrKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCWJv b2wgaXNfbHZkcyA9IGZhbHNlOwogCXN0cnVjdCBpbnRlbF9zaGFyZWRfZHBsbCAqcGxsOwogCisJ bWVtc2V0KCZjcnRjX3N0YXRlLT5kcGxsX2h3X3N0YXRlLCAwLAorCSAgICAgICBzaXplb2YoY3J0 Y19zdGF0ZS0+ZHBsbF9od19zdGF0ZSkpOworCiAJaXNfbHZkcyA9IGludGVsX3BpcGVfaGFzX3R5 cGUoY3J0YywgSU5URUxfT1VUUFVUX0xWRFMpOwogCiAJV0FSTighKEhBU19QQ0hfSUJYKGRldikg fHwgSEFTX1BDSF9DUFQoZGV2KSksCkBAIC0xMjI2NSw4ICsxMjI3MSw2IEBAIHN0YXRpYyBpbnQg X19pbnRlbF9zZXRfbW9kZV9zZXR1cF9wbGxzKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0 ZSkKIAkJaWYgKG5lZWRzX21vZGVzZXQoY3J0Y19zdGF0ZSkpIHsKIAkJCWNsZWFyX3BpcGVzIHw9 IDEgPDwgaW50ZWxfY3J0Yy0+cGlwZTsKIAkJCWludGVsX2NydGNfc3RhdGUtPnNoYXJlZF9kcGxs ID0gRFBMTF9JRF9QUklWQVRFOwotCQkJbWVtc2V0KCZpbnRlbF9jcnRjX3N0YXRlLT5kcGxsX2h3 X3N0YXRlLCAwLAotCQkJICAgICAgIHNpemVvZihpbnRlbF9jcnRjX3N0YXRlLT5kcGxsX2h3X3N0 YXRlKSk7CiAJCX0KIAl9CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2RwLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jCmluZGV4IDViZDczYWQuLjZm ZDljNjAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYwpAQCAtMTA5Nyw2ICsxMDk3LDkgQEAgc2ts X2VkcF9zZXRfcGxsX2NvbmZpZyhzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWcs IGludCBsaW5rX2Nsb2NrKQogewogCXUzMiBjdHJsMTsKIAorCW1lbXNldCgmcGlwZV9jb25maWct PmRwbGxfaHdfc3RhdGUsIDAsCisJICAgICAgIHNpemVvZihwaXBlX2NvbmZpZy0+ZHBsbF9od19z dGF0ZSkpOworCiAJcGlwZV9jb25maWctPmRkaV9wbGxfc2VsID0gU0tMX0RQTEwwOwogCXBpcGVf Y29uZmlnLT5kcGxsX2h3X3N0YXRlLmNmZ2NyMSA9IDA7CiAJcGlwZV9jb25maWctPmRwbGxfaHdf c3RhdGUuY2ZnY3IyID0gMDsKLS0gCjIuMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2ludGVsLWdmeAo=