From: ville.syrjala@linux.intel.com Subject: [PATCH] drm/i915: Move the min_pixclk[] handling to the end of readout Date: Tue, 20 Dec 2016 17:39:02 +0200 Message-ID: <20161220153902.15621-1-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 399E56E203 for ; Tue, 20 Dec 2016 15:39:06 +0000 (UTC) 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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClRy eWluZyB0byBkZXRlcm1pbmUgdGhlIHBpeGVsIHJhdGUgb2YgdGhlIHBpcGUgY2FuJ3QgYmUgZG9u ZSB1bnRpbCB3ZQprbm93IHRoZSBjbG9jaywgd2hpY2ggbWVhbnMgaXQgY2FuJ3QgYmUgZG9uZSB1 bnRpbCB0aGUgZW5jb2RlcgouZ2V0X2NvbmZpZygpIGhvb2tzIGhhdmUgYmVlbiBjYWxsZWQuIFNv IGxldCdzIG1vdmUgdGhlIG1pbl9waXhjbGtbXQpzdHVmZiB0byB0aGUgZW5kIG9mIGludGVsX21v ZGVzZXRfcmVhZG91dF9od19zdGF0ZSgpIHdoZW4gd2UgYWN0dWFsbHkKaGF2ZSBnYXRoZXJlZCBh bGwgdGhlIHJlcXVpcmVkIGluZnJvbWF0aW9uLgoKQ2M6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFy dGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+CkNjOiBNaWthIEthaG9sYSA8bWlrYS5rYWhv bGFAaW50ZWwuY29tPgpDYzogQW5kZXIgQ29uc2VsdmFuIGRlIE9saXZlaXJhIDxhbmRlci5jb25z ZWx2YW4uZGUub2xpdmVpcmFAaW50ZWwuY29tPgpGaXhlczogNTY1NjAyZDc1MDFhICgiZHJtL2k5 MTU6IERvIG5vdCBhY3F1aXJlIGNydGMgc3RhdGUgdG8gY2hlY2sgY2xvY2sgZHVyaW5nIG1vZGVz ZXQsIHY0LiIpClNpZ25lZC1vZmYtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBs aW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5j IHwgMzIgKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAx NiBpbnNlcnRpb25zKCspLCAxNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMKaW5kZXggZWY1ZGRlNWFiMWNmLi5kOGVmZmQ0ZGEwMzQgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTE3MDMzLDcgKzE3MDMzLDYgQEAgc3RhdGljIHZvaWQg aW50ZWxfbW9kZXNldF9yZWFkb3V0X2h3X3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAK IAlmb3JfZWFjaF9pbnRlbF9jcnRjKGRldiwgY3J0YykgewogCQlzdHJ1Y3QgaW50ZWxfY3J0Y19z dGF0ZSAqY3J0Y19zdGF0ZSA9IGNydGMtPmNvbmZpZzsKLQkJaW50IHBpeGNsayA9IDA7CiAKIAkJ X19kcm1fYXRvbWljX2hlbHBlcl9jcnRjX2Rlc3Ryb3lfc3RhdGUoJmNydGNfc3RhdGUtPmJhc2Up OwogCQltZW1zZXQoY3J0Y19zdGF0ZSwgMCwgc2l6ZW9mKCpjcnRjX3N0YXRlKSk7CkBAIC0xNzA0 NSwyMyArMTcwNDQsOSBAQCBzdGF0aWMgdm9pZCBpbnRlbF9tb2Rlc2V0X3JlYWRvdXRfaHdfc3Rh dGUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJY3J0Yy0+YmFzZS5lbmFibGVkID0gY3J0Y19z dGF0ZS0+YmFzZS5lbmFibGU7CiAJCWNydGMtPmFjdGl2ZSA9IGNydGNfc3RhdGUtPmJhc2UuYWN0 aXZlOwogCi0JCWlmIChjcnRjX3N0YXRlLT5iYXNlLmFjdGl2ZSkgeworCQlpZiAoY3J0Y19zdGF0 ZS0+YmFzZS5hY3RpdmUpCiAJCQlkZXZfcHJpdi0+YWN0aXZlX2NydGNzIHw9IDEgPDwgY3J0Yy0+ cGlwZTsKIAotCQkJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gOSB8fCBJU19CUk9BRFdFTEwo ZGV2X3ByaXYpKQotCQkJCXBpeGNsayA9IGlsa19waXBlX3BpeGVsX3JhdGUoY3J0Y19zdGF0ZSk7 Ci0JCQllbHNlIGlmIChJU19WQUxMRVlWSUVXKGRldl9wcml2KSB8fCBJU19DSEVSUllWSUVXKGRl dl9wcml2KSkKLQkJCQlwaXhjbGsgPSBjcnRjX3N0YXRlLT5iYXNlLmFkanVzdGVkX21vZGUuY3J0 Y19jbG9jazsKLQkJCWVsc2UKLQkJCQlXQVJOX09OKGRldl9wcml2LT5kaXNwbGF5Lm1vZGVzZXRf Y2FsY19jZGNsayk7Ci0KLQkJCS8qIHBpeGVsIHJhdGUgbXVzdG4ndCBleGNlZWQgOTUlIG9mIGNk Y2xrIHdpdGggSVBTIG9uIEJEVyAqLwotCQkJaWYgKElTX0JST0FEV0VMTChkZXZfcHJpdikgJiYg Y3J0Y19zdGF0ZS0+aXBzX2VuYWJsZWQpCi0JCQkJcGl4Y2xrID0gRElWX1JPVU5EX1VQKHBpeGNs ayAqIDEwMCwgOTUpOwotCQl9Ci0KLQkJZGV2X3ByaXYtPm1pbl9waXhjbGtbY3J0Yy0+cGlwZV0g PSBwaXhjbGs7Ci0KIAkJcmVhZG91dF9wbGFuZV9zdGF0ZShjcnRjKTsKIAogCQlEUk1fREVCVUdf S01TKCJbQ1JUQzolZDolc10gaHcgc3RhdGUgcmVhZG91dDogJXNcbiIsCkBAIC0xNzEzNCw2ICsx NzExOSw4IEBAIHN0YXRpYyB2b2lkIGludGVsX21vZGVzZXRfcmVhZG91dF9od19zdGF0ZShzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2KQogCX0KIAogCWZvcl9lYWNoX2ludGVsX2NydGMoZGV2LCBjcnRj KSB7CisJCWludCBwaXhjbGsgPSAwOworCiAJCWNydGMtPmJhc2UuaHdtb2RlID0gY3J0Yy0+Y29u ZmlnLT5iYXNlLmFkanVzdGVkX21vZGU7CiAKIAkJbWVtc2V0KCZjcnRjLT5iYXNlLm1vZGUsIDAs IHNpemVvZihjcnRjLT5iYXNlLm1vZGUpKTsKQEAgLTE3MTYxLDEwICsxNzE0OCwyMyBAQCBzdGF0 aWMgdm9pZCBpbnRlbF9tb2Rlc2V0X3JlYWRvdXRfaHdfc3RhdGUoc3RydWN0IGRybV9kZXZpY2Ug KmRldikKIAkJCSAqLwogCQkJY3J0Yy0+YmFzZS5zdGF0ZS0+bW9kZS5wcml2YXRlX2ZsYWdzID0g STkxNV9NT0RFX0ZMQUdfSU5IRVJJVEVEOwogCisJCQlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+ PSA5IHx8IElTX0JST0FEV0VMTChkZXZfcHJpdikpCisJCQkJcGl4Y2xrID0gaWxrX3BpcGVfcGl4 ZWxfcmF0ZShjcnRjLT5jb25maWcpOworCQkJZWxzZSBpZiAoSVNfVkFMTEVZVklFVyhkZXZfcHJp dikgfHwgSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpCisJCQkJcGl4Y2xrID0gY3J0Yy0+Y29uZmln LT5iYXNlLmFkanVzdGVkX21vZGUuY3J0Y19jbG9jazsKKwkJCWVsc2UKKwkJCQlXQVJOX09OKGRl dl9wcml2LT5kaXNwbGF5Lm1vZGVzZXRfY2FsY19jZGNsayk7CisKKwkJCS8qIHBpeGVsIHJhdGUg bXVzdG4ndCBleGNlZWQgOTUlIG9mIGNkY2xrIHdpdGggSVBTIG9uIEJEVyAqLworCQkJaWYgKElT X0JST0FEV0VMTChkZXZfcHJpdikgJiYgY3J0Yy0+Y29uZmlnLT5pcHNfZW5hYmxlZCkKKwkJCQlw aXhjbGsgPSBESVZfUk9VTkRfVVAocGl4Y2xrICogMTAwLCA5NSk7CisKIAkJCWRybV9jYWxjX3Rp bWVzdGFtcGluZ19jb25zdGFudHMoJmNydGMtPmJhc2UsICZjcnRjLT5iYXNlLmh3bW9kZSk7CiAJ CQl1cGRhdGVfc2NhbmxpbmVfb2Zmc2V0KGNydGMpOwogCQl9CiAKKwkJZGV2X3ByaXYtPm1pbl9w aXhjbGtbY3J0Yy0+cGlwZV0gPSBwaXhjbGs7CisKIAkJaW50ZWxfcGlwZV9jb25maWdfc2FuaXR5 X2NoZWNrKGRldl9wcml2LCBjcnRjLT5jb25maWcpOwogCX0KIH0KLS0gCjIuMTAuMgoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxp bmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJl ZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==