From: Jani Nikula Subject: [PATCH 2/2] drm/i915: clean up and simplify i9xx_crtc_mode_set wrt PLL handling Date: Fri, 13 Sep 2013 11:03:09 +0300 Message-ID: <1379059389-2890-2-git-send-email-jani.nikula@intel.com> References: <20130913073017.GG20128@intel.com> <1379059389-2890-1-git-send-email-jani.nikula@intel.com> 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 523E9E7E39 for ; Fri, 13 Sep 2013 01:01:06 -0700 (PDT) In-Reply-To: <1379059389-2890-1-git-send-email-jani.nikula@intel.com> 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: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org RmxhdCBvdXQgc2tpcCBhbnl0aGluZyB0byBkbyB3aXRoIFBMTCBpZiB3ZSBoYXZlIGEgRFNJIGVu Y29kZXIgKGFuZCB0aHVzCkRTSSBQTEwpLiBBbHNvIHNraXAgUExMIGNvbXB1dGF0aW9uIGlmIHRo ZSBlbmNvZGVyIGhhcyBhbHJlYWR5IHNldApjbG9ja3MuIFRoaXMgYWxsb3dzIGZvciBzb21lIHRp ZHlpbmcgdXAgb2YgdGhlIGNvZGUsIGluY2x1ZGluZyBhCnN1cGVyZmx1b3VzIGNhbGwgdG8gaW50 ZWxfbGltaXQoKSBmb3IgTFZEUyBkb3duY2xvY2sgcGF0aC4KClNpZ25lZC1vZmYtYnk6IEphbmkg TmlrdWxhIDxqYW5pLm5pa3VsYUBpbnRlbC5jb20+ClJldmlld2VkLWJ5OiBWaWxsZSBTeXJqw6Rs w6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rpc3BsYXkuYyB8ICAgNDQgKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0t LS0tLQogMSBmaWxlIGNoYW5nZWQsIDIyIGluc2VydGlvbnMoKyksIDIyIGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCAwNDQ2ZGM3Li42YTUxY2MyIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC00ODkyLDkgKzQ4OTIsMTIgQEAg c3RhdGljIGludCBpOXh4X2NydGNfbW9kZV9zZXQoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCQlu dW1fY29ubmVjdG9ycysrOwogCX0KIAotCXJlZmNsayA9IGk5eHhfZ2V0X3JlZmNsayhjcnRjLCBu dW1fY29ubmVjdG9ycyk7CisJaWYgKGlzX2RzaSkKKwkJZ290byBza2lwX2RwbGw7CisKKwlpZiAo IWludGVsX2NydGMtPmNvbmZpZy5jbG9ja19zZXQpIHsKKwkJcmVmY2xrID0gaTl4eF9nZXRfcmVm Y2xrKGNydGMsIG51bV9jb25uZWN0b3JzKTsKIAotCWlmICghaXNfZHNpICYmICFpbnRlbF9jcnRj LT5jb25maWcuY2xvY2tfc2V0KSB7CiAJCS8qCiAJCSAqIFJldHVybnMgYSBzZXQgb2YgZGl2aXNv cnMgZm9yIHRoZSBkZXNpcmVkIHRhcmdldCBjbG9jayB3aXRoCiAJCSAqIHRoZSBnaXZlbiByZWZj bGssIG9yIEZBTFNFLiAgVGhlIHJldHVybmVkIHZhbHVlcyByZXByZXNlbnQKQEAgLTQ5MDUsMjgg KzQ5MDgsMjUgQEAgc3RhdGljIGludCBpOXh4X2NydGNfbW9kZV9zZXQoc3RydWN0IGRybV9jcnRj ICpjcnRjLAogCQlvayA9IGRldl9wcml2LT5kaXNwbGF5LmZpbmRfZHBsbChsaW1pdCwgY3J0YywK IAkJCQkJCSBpbnRlbF9jcnRjLT5jb25maWcucG9ydF9jbG9jaywKIAkJCQkJCSByZWZjbGssIE5V TEwsICZjbG9jayk7Ci0JCWlmICghb2sgJiYgIWludGVsX2NydGMtPmNvbmZpZy5jbG9ja19zZXQp IHsKKwkJaWYgKCFvaykgewogCQkJRFJNX0VSUk9SKCJDb3VsZG4ndCBmaW5kIFBMTCBzZXR0aW5n cyBmb3IgbW9kZSFcbiIpOwogCQkJcmV0dXJuIC1FSU5WQUw7CiAJCX0KLQl9CiAKLQlpZiAoIWlz X2RzaSAmJiBpc19sdmRzICYmIGRldl9wcml2LT5sdmRzX2Rvd25jbG9ja19hdmFpbCkgewotCQkv KgotCQkgKiBFbnN1cmUgd2UgbWF0Y2ggdGhlIHJlZHVjZWQgY2xvY2sncyBQIHRvIHRoZSB0YXJn ZXQgY2xvY2suCi0JCSAqIElmIHRoZSBjbG9ja3MgZG9uJ3QgbWF0Y2gsIHdlIGNhbid0IHN3aXRj aCB0aGUgZGlzcGxheSBjbG9jawotCQkgKiBieSB1c2luZyB0aGUgRlAwL0ZQMS4gSW4gc3VjaCBj YXNlIHdlIHdpbGwgZGlzYWJsZSB0aGUgTFZEUwotCQkgKiBkb3duY2xvY2sgZmVhdHVyZS4KLQkJ Ki8KLQkJbGltaXQgPSBpbnRlbF9saW1pdChjcnRjLCByZWZjbGspOwotCQloYXNfcmVkdWNlZF9j bG9jayA9Ci0JCQlkZXZfcHJpdi0+ZGlzcGxheS5maW5kX2RwbGwobGltaXQsIGNydGMsCi0JCQkJ CQkgICAgZGV2X3ByaXYtPmx2ZHNfZG93bmNsb2NrLAotCQkJCQkJICAgIHJlZmNsaywgJmNsb2Nr LAotCQkJCQkJICAgICZyZWR1Y2VkX2Nsb2NrKTsKLQl9Ci0JLyogQ29tcGF0LWNvZGUgZm9yIHRy YW5zaXRpb24sIHdpbGwgZGlzYXBwZWFyLiAqLwotCWlmICghaW50ZWxfY3J0Yy0+Y29uZmlnLmNs b2NrX3NldCkgeworCQlpZiAoaXNfbHZkcyAmJiBkZXZfcHJpdi0+bHZkc19kb3duY2xvY2tfYXZh aWwpIHsKKwkJCS8qCisJCQkgKiBFbnN1cmUgd2UgbWF0Y2ggdGhlIHJlZHVjZWQgY2xvY2sncyBQ IHRvIHRoZSB0YXJnZXQKKwkJCSAqIGNsb2NrLiAgSWYgdGhlIGNsb2NrcyBkb24ndCBtYXRjaCwg d2UgY2FuJ3Qgc3dpdGNoCisJCQkgKiB0aGUgZGlzcGxheSBjbG9jayBieSB1c2luZyB0aGUgRlAw L0ZQMS4gSW4gc3VjaCBjYXNlCisJCQkgKiB3ZSB3aWxsIGRpc2FibGUgdGhlIExWRFMgZG93bmNs b2NrIGZlYXR1cmUuCisJCQkgKi8KKwkJCWhhc19yZWR1Y2VkX2Nsb2NrID0KKwkJCQlkZXZfcHJp di0+ZGlzcGxheS5maW5kX2RwbGwobGltaXQsIGNydGMsCisJCQkJCQkJICAgIGRldl9wcml2LT5s dmRzX2Rvd25jbG9jaywKKwkJCQkJCQkgICAgcmVmY2xrLCAmY2xvY2ssCisJCQkJCQkJICAgICZy ZWR1Y2VkX2Nsb2NrKTsKKwkJfQorCQkvKiBDb21wYXQtY29kZSBmb3IgdHJhbnNpdGlvbiwgd2ls bCBkaXNhcHBlYXIuICovCiAJCWludGVsX2NydGMtPmNvbmZpZy5kcGxsLm4gPSBjbG9jay5uOwog CQlpbnRlbF9jcnRjLT5jb25maWcuZHBsbC5tMSA9IGNsb2NrLm0xOwogCQlpbnRlbF9jcnRjLT5j b25maWcuZHBsbC5tMiA9IGNsb2NrLm0yOwpAQCAtNDkzOSwxNCArNDkzOSwxNCBAQCBzdGF0aWMg aW50IGk5eHhfY3J0Y19tb2RlX3NldChzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJCQkJaGFzX3Jl ZHVjZWRfY2xvY2sgPyAmcmVkdWNlZF9jbG9jayA6IE5VTEwsCiAJCQkJbnVtX2Nvbm5lY3RvcnMp OwogCX0gZWxzZSBpZiAoSVNfVkFMTEVZVklFVyhkZXYpKSB7Ci0JCWlmICghaXNfZHNpKQotCQkJ dmx2X3VwZGF0ZV9wbGwoaW50ZWxfY3J0Yyk7CisJCXZsdl91cGRhdGVfcGxsKGludGVsX2NydGMp OwogCX0gZWxzZSB7CiAJCWk5eHhfdXBkYXRlX3BsbChpbnRlbF9jcnRjLAogCQkJCWhhc19yZWR1 Y2VkX2Nsb2NrID8gJnJlZHVjZWRfY2xvY2sgOiBOVUxMLAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBudW1fY29ubmVjdG9ycyk7CiAJfQogCitza2lwX2RwbGw6CiAJLyogU2V0IHVw IHRoZSBkaXNwbGF5IHBsYW5lIHJlZ2lzdGVyICovCiAJZHNwY250ciA9IERJU1BQTEFORV9HQU1N QV9FTkFCTEU7CiAKLS0gCjEuNy45LjUKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGlu Zm8vaW50ZWwtZ2Z4Cg==