From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH 2/2] drm/i915: clean up and simplify i9xx_crtc_mode_set wrt PLL handling Date: Fri, 13 Sep 2013 16:38:28 +0300 Message-ID: <87bo3wn8ob.fsf@intel.com> References: <20130913073017.GG20128@intel.com> <1379059389-2890-1-git-send-email-jani.nikula@intel.com> <1379059389-2890-2-git-send-email-jani.nikula@intel.com> <20130913130027.GL5459@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 374ACE6897 for ; Fri, 13 Sep 2013 06:36:22 -0700 (PDT) In-Reply-To: <20130913130027.GL5459@phenom.ffwll.local> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Daniel Vetter Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gRnJpLCAxMyBTZXAgMjAxMywgRGFuaWVsIFZldHRlciA8ZGFuaWVsQGZmd2xsLmNoPiB3cm90 ZToKPiBPbiBGcmksIFNlcCAxMywgMjAxMyBhdCAxMTowMzowOUFNICswMzAwLCBKYW5pIE5pa3Vs YSB3cm90ZToKPj4gRmxhdCBvdXQgc2tpcCBhbnl0aGluZyB0byBkbyB3aXRoIFBMTCBpZiB3ZSBo YXZlIGEgRFNJIGVuY29kZXIgKGFuZCB0aHVzCj4+IERTSSBQTEwpLiBBbHNvIHNraXAgUExMIGNv bXB1dGF0aW9uIGlmIHRoZSBlbmNvZGVyIGhhcyBhbHJlYWR5IHNldAo+PiBjbG9ja3MuIFRoaXMg YWxsb3dzIGZvciBzb21lIHRpZHlpbmcgdXAgb2YgdGhlIGNvZGUsIGluY2x1ZGluZyBhCj4+IHN1 cGVyZmx1b3VzIGNhbGwgdG8gaW50ZWxfbGltaXQoKSBmb3IgTFZEUyBkb3duY2xvY2sgcGF0aC4K Pj4gCj4+IFNpZ25lZC1vZmYtYnk6IEphbmkgTmlrdWxhIDxqYW5pLm5pa3VsYUBpbnRlbC5jb20+ Cj4+IFJldmlld2VkLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50 ZWwuY29tPgo+Cj4gVHJpZWQgdG8gbWVyZ2UgdGhpcyBidXQgdGhlIGJhc2VsaW5lIHNlZW1zIHRv IGJlIG9mZiwgYXQgbGVhc3Qgd3J0IGRpbnEuCj4gRG8gSSBtaXNzIHNvbWUgcGF0Y2hlcyB0aGF0 IEkgc2hvdWxkIGFwcGx5IGZpcnN0PwoKVGhpcyBvbmUgZGVwZW5kcyBvbiAiZHJtL2k5MTU6IGRv IG5vdCB1cGRhdGUgY3Vyc29yIGluIGNydGMgbW9kZSBzZXQiIGluCnRoaXMgdGhyZWFkIChteSBw YXRjaCBidXQgd2l0aCBWaWxsZSdzIGNvbW1pdCBtZXNzYWdlIGFtZW5kbWVuZCkuIERpZAp5b3Ug cHVzaCB0aGUgYXNzZXJ0IHBhdGNoIGJlZm9yZSB0aGF0PyBJdCdzIGEgZ29vZCBvcmRlci4KCkph bmkuCgoKCj4gLURhbmllbAo+Cj4+IC0tLQo+PiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGlzcGxheS5jIHwgICA0NCArKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tCj4+ICAx IGZpbGUgY2hhbmdlZCwgMjIgaW5zZXJ0aW9ucygrKSwgMjIgZGVsZXRpb25zKC0pCj4+IAo+PiBk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCj4+IGluZGV4IDA0NDZkYzcuLjZhNTFjYzIg MTAwNjQ0Cj4+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwo+PiAr KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKPj4gQEAgLTQ4OTIsOSAr NDg5MiwxMiBAQCBzdGF0aWMgaW50IGk5eHhfY3J0Y19tb2RlX3NldChzdHJ1Y3QgZHJtX2NydGMg KmNydGMsCj4+ICAJCW51bV9jb25uZWN0b3JzKys7Cj4+ICAJfQo+PiAgCj4+IC0JcmVmY2xrID0g aTl4eF9nZXRfcmVmY2xrKGNydGMsIG51bV9jb25uZWN0b3JzKTsKPj4gKwlpZiAoaXNfZHNpKQo+ PiArCQlnb3RvIHNraXBfZHBsbDsKPj4gKwo+PiArCWlmICghaW50ZWxfY3J0Yy0+Y29uZmlnLmNs b2NrX3NldCkgewo+PiArCQlyZWZjbGsgPSBpOXh4X2dldF9yZWZjbGsoY3J0YywgbnVtX2Nvbm5l Y3RvcnMpOwo+PiAgCj4+IC0JaWYgKCFpc19kc2kgJiYgIWludGVsX2NydGMtPmNvbmZpZy5jbG9j a19zZXQpIHsKPj4gIAkJLyoKPj4gIAkJICogUmV0dXJucyBhIHNldCBvZiBkaXZpc29ycyBmb3Ig dGhlIGRlc2lyZWQgdGFyZ2V0IGNsb2NrIHdpdGgKPj4gIAkJICogdGhlIGdpdmVuIHJlZmNsaywg b3IgRkFMU0UuICBUaGUgcmV0dXJuZWQgdmFsdWVzIHJlcHJlc2VudAo+PiBAQCAtNDkwNSwyOCAr NDkwOCwyNSBAQCBzdGF0aWMgaW50IGk5eHhfY3J0Y19tb2RlX3NldChzdHJ1Y3QgZHJtX2NydGMg KmNydGMsCj4+ICAJCW9rID0gZGV2X3ByaXYtPmRpc3BsYXkuZmluZF9kcGxsKGxpbWl0LCBjcnRj LAo+PiAgCQkJCQkJIGludGVsX2NydGMtPmNvbmZpZy5wb3J0X2Nsb2NrLAo+PiAgCQkJCQkJIHJl ZmNsaywgTlVMTCwgJmNsb2NrKTsKPj4gLQkJaWYgKCFvayAmJiAhaW50ZWxfY3J0Yy0+Y29uZmln LmNsb2NrX3NldCkgewo+PiArCQlpZiAoIW9rKSB7Cj4+ICAJCQlEUk1fRVJST1IoIkNvdWxkbid0 IGZpbmQgUExMIHNldHRpbmdzIGZvciBtb2RlIVxuIik7Cj4+ICAJCQlyZXR1cm4gLUVJTlZBTDsK Pj4gIAkJfQo+PiAtCX0KPj4gIAo+PiAtCWlmICghaXNfZHNpICYmIGlzX2x2ZHMgJiYgZGV2X3By aXYtPmx2ZHNfZG93bmNsb2NrX2F2YWlsKSB7Cj4+IC0JCS8qCj4+IC0JCSAqIEVuc3VyZSB3ZSBt YXRjaCB0aGUgcmVkdWNlZCBjbG9jaydzIFAgdG8gdGhlIHRhcmdldCBjbG9jay4KPj4gLQkJICog SWYgdGhlIGNsb2NrcyBkb24ndCBtYXRjaCwgd2UgY2FuJ3Qgc3dpdGNoIHRoZSBkaXNwbGF5IGNs b2NrCj4+IC0JCSAqIGJ5IHVzaW5nIHRoZSBGUDAvRlAxLiBJbiBzdWNoIGNhc2Ugd2Ugd2lsbCBk aXNhYmxlIHRoZSBMVkRTCj4+IC0JCSAqIGRvd25jbG9jayBmZWF0dXJlLgo+PiAtCQkqLwo+PiAt CQlsaW1pdCA9IGludGVsX2xpbWl0KGNydGMsIHJlZmNsayk7Cj4+IC0JCWhhc19yZWR1Y2VkX2Ns b2NrID0KPj4gLQkJCWRldl9wcml2LT5kaXNwbGF5LmZpbmRfZHBsbChsaW1pdCwgY3J0YywKPj4g LQkJCQkJCSAgICBkZXZfcHJpdi0+bHZkc19kb3duY2xvY2ssCj4+IC0JCQkJCQkgICAgcmVmY2xr LCAmY2xvY2ssCj4+IC0JCQkJCQkgICAgJnJlZHVjZWRfY2xvY2spOwo+PiAtCX0KPj4gLQkvKiBD b21wYXQtY29kZSBmb3IgdHJhbnNpdGlvbiwgd2lsbCBkaXNhcHBlYXIuICovCj4+IC0JaWYgKCFp bnRlbF9jcnRjLT5jb25maWcuY2xvY2tfc2V0KSB7Cj4+ICsJCWlmIChpc19sdmRzICYmIGRldl9w cml2LT5sdmRzX2Rvd25jbG9ja19hdmFpbCkgewo+PiArCQkJLyoKPj4gKwkJCSAqIEVuc3VyZSB3 ZSBtYXRjaCB0aGUgcmVkdWNlZCBjbG9jaydzIFAgdG8gdGhlIHRhcmdldAo+PiArCQkJICogY2xv Y2suICBJZiB0aGUgY2xvY2tzIGRvbid0IG1hdGNoLCB3ZSBjYW4ndCBzd2l0Y2gKPj4gKwkJCSAq IHRoZSBkaXNwbGF5IGNsb2NrIGJ5IHVzaW5nIHRoZSBGUDAvRlAxLiBJbiBzdWNoIGNhc2UKPj4g KwkJCSAqIHdlIHdpbGwgZGlzYWJsZSB0aGUgTFZEUyBkb3duY2xvY2sgZmVhdHVyZS4KPj4gKwkJ CSAqLwo+PiArCQkJaGFzX3JlZHVjZWRfY2xvY2sgPQo+PiArCQkJCWRldl9wcml2LT5kaXNwbGF5 LmZpbmRfZHBsbChsaW1pdCwgY3J0YywKPj4gKwkJCQkJCQkgICAgZGV2X3ByaXYtPmx2ZHNfZG93 bmNsb2NrLAo+PiArCQkJCQkJCSAgICByZWZjbGssICZjbG9jaywKPj4gKwkJCQkJCQkgICAgJnJl ZHVjZWRfY2xvY2spOwo+PiArCQl9Cj4+ICsJCS8qIENvbXBhdC1jb2RlIGZvciB0cmFuc2l0aW9u LCB3aWxsIGRpc2FwcGVhci4gKi8KPj4gIAkJaW50ZWxfY3J0Yy0+Y29uZmlnLmRwbGwubiA9IGNs b2NrLm47Cj4+ICAJCWludGVsX2NydGMtPmNvbmZpZy5kcGxsLm0xID0gY2xvY2subTE7Cj4+ICAJ CWludGVsX2NydGMtPmNvbmZpZy5kcGxsLm0yID0gY2xvY2subTI7Cj4+IEBAIC00OTM5LDE0ICs0 OTM5LDE0IEBAIHN0YXRpYyBpbnQgaTl4eF9jcnRjX21vZGVfc2V0KHN0cnVjdCBkcm1fY3J0YyAq Y3J0YywKPj4gIAkJCQloYXNfcmVkdWNlZF9jbG9jayA/ICZyZWR1Y2VkX2Nsb2NrIDogTlVMTCwK Pj4gIAkJCQludW1fY29ubmVjdG9ycyk7Cj4+ICAJfSBlbHNlIGlmIChJU19WQUxMRVlWSUVXKGRl dikpIHsKPj4gLQkJaWYgKCFpc19kc2kpCj4+IC0JCQl2bHZfdXBkYXRlX3BsbChpbnRlbF9jcnRj KTsKPj4gKwkJdmx2X3VwZGF0ZV9wbGwoaW50ZWxfY3J0Yyk7Cj4+ICAJfSBlbHNlIHsKPj4gIAkJ aTl4eF91cGRhdGVfcGxsKGludGVsX2NydGMsCj4+ICAJCQkJaGFzX3JlZHVjZWRfY2xvY2sgPyAm cmVkdWNlZF9jbG9jayA6IE5VTEwsCj4+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IG51bV9jb25uZWN0b3JzKTsKPj4gIAl9Cj4+ICAKPj4gK3NraXBfZHBsbDoKPj4gIAkvKiBTZXQg dXAgdGhlIGRpc3BsYXkgcGxhbmUgcmVnaXN0ZXIgKi8KPj4gIAlkc3BjbnRyID0gRElTUFBMQU5F X0dBTU1BX0VOQUJMRTsKPj4gIAo+PiAtLSAKPj4gMS43LjkuNQo+PiAKPj4gX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KPj4gSW50ZWwtZ2Z4IG1haWxpbmcg bGlzdAo+PiBJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCj4+IGh0dHA6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngKPgo+IC0tIAo+IERhbmll bCBWZXR0ZXIKPiBTb2Z0d2FyZSBFbmdpbmVlciwgSW50ZWwgQ29ycG9yYXRpb24KPiArNDEgKDAp IDc5IDM2NSA1NyA0OCAtIGh0dHA6Ly9ibG9nLmZmd2xsLmNoCj4gX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KPiBJbnRlbC1nZnggbWFpbGluZyBsaXN0Cj4g SW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwo+IGh0dHA6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngKCi0tIApKYW5pIE5pa3VsYSwgSW50ZWwg T3BlbiBTb3VyY2UgVGVjaG5vbG9neSBDZW50ZXIKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9pbnRlbC1nZngK