From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH 1/6] drm/i915: Clean up VLV rps code a bit Date: Tue, 25 Jun 2013 19:21:01 +0300 Message-ID: <1372177266-2665-2-git-send-email-ville.syrjala@linux.intel.com> References: <1372177266-2665-1-git-send-email-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [143.182.124.21]) by gabe.freedesktop.org (Postfix) with ESMTP id 91599E5C4D for ; Tue, 25 Jun 2013 09:21:22 -0700 (PDT) In-Reply-To: <1372177266-2665-1-git-send-email-ville.syrjala@linux.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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkFs d2F5cyBwcmludCBib3RoIHRoZSBNSHogdmFsdWUgYW5kIHJhdyByZWdpc3RlciB2YWx1ZSBmb3Ig cnBzIHN0dWZmLgoKQWxzbyBraWxsIGEgc29tZXdoYXQgcG9pbnRsZXNzIGxvY2FsICdycGUnIHZh cmlhYmxlIGFuZCBqdXN0IHVzZQpkZXZfcHJpdi0+cnBzLnJwZV9kZWxheS4KCldoaWxlIGF0IGl0 IGNsZWFuIHVwIHRoZSBjYXBzIGluICJHUFUiIGFuZCAiUHVuaXQiIGRlYnVnIG1lc3NhZ2VzLgoK U2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVs LmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIHwgNTAgKysrKysrKysr KysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAzMCBpbnNl cnRpb25zKCspLCAyMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwppbmRleCAz NzA1MjAzLi40OGEzMTYyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9w bS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAgLTMwNzcsMTAgKzMw NzcsMTEgQEAgdm9pZCB2YWxsZXl2aWV3X3NldF9ycHMoc3RydWN0IGRybV9kZXZpY2UgKmRldiwg dTggdmFsKQogCVdBUk5fT04odmFsID4gZGV2X3ByaXYtPnJwcy5tYXhfZGVsYXkpOwogCVdBUk5f T04odmFsIDwgZGV2X3ByaXYtPnJwcy5taW5fZGVsYXkpOwogCi0JRFJNX0RFQlVHX0RSSVZFUigi Z3B1IGZyZXEgcmVxdWVzdCBmcm9tICVkIHRvICVkXG4iLAorCURSTV9ERUJVR19EUklWRVIoIkdQ VSBmcmVxIHJlcXVlc3QgZnJvbSAlZCBNSHogKCV1KSB0byAlZCBNSHogKCV1KVxuIiwKIAkJCSB2 bHZfZ3B1X2ZyZXEoZGV2X3ByaXYtPm1lbV9mcmVxLAogCQkJCSAgICAgIGRldl9wcml2LT5ycHMu Y3VyX2RlbGF5KSwKLQkJCSB2bHZfZ3B1X2ZyZXEoZGV2X3ByaXYtPm1lbV9mcmVxLCB2YWwpKTsK KwkJCSBkZXZfcHJpdi0+cnBzLmN1cl9kZWxheSwKKwkJCSB2bHZfZ3B1X2ZyZXEoZGV2X3ByaXYt Pm1lbV9mcmVxLCB2YWwpLCB2YWwpOwogCiAJaWYgKHZhbCA9PSBkZXZfcHJpdi0+cnBzLmN1cl9k ZWxheSkKIAkJcmV0dXJuOwpAQCAtMzA5OCw4ICszMDk5LDkgQEAgdm9pZCB2YWxsZXl2aWV3X3Nl dF9ycHMoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdTggdmFsKQogCiAJcHZhbCA9IHZsdl9wdW5p dF9yZWFkKGRldl9wcml2LCBQVU5JVF9SRUdfR1BVX0ZSRVFfU1RTKTsKIAlpZiAoKHB2YWwgPj4g OCkgIT0gdmFsKQotCQlEUk1fREVCVUdfRFJJVkVSKCJwdW5pdCBvdmVycm9kZSBmcmVxOiAlZCBy ZXF1ZXN0ZWQsIGJ1dCBnb3QgJWRcbiIsCi0JCQkgIHZhbCwgcHZhbCA+PiA4KTsKKwkJRFJNX0RF QlVHX0RSSVZFUigiUHVuaXQgb3ZlcnJvZGUgR1BVIGZyZXE6ICVkIE1IeiAoJXUpIHJlcXVlc3Rl ZCwgYnV0IGdvdCAlZCBNaHogKCV1KVxuIiwKKwkJCQkgdmx2X2dwdV9mcmVxKGRldl9wcml2LT5t ZW1fZnJlcSwgdmFsKSwgdmFsLAorCQkJCSB2bHZfZ3B1X2ZyZXEoZGV2X3ByaXYtPm1lbV9mcmVx LCBwdmFsID4+IDgpLCBwdmFsID4+IDgpOwogCiAJLyogTWFrZSBzdXJlIHdlIGNvbnRpbnVlIHRv IGdldCBpbnRlcnJ1cHRzCiAJICogdW50aWwgd2UgaGl0IHRoZSBtaW5pbXVtIG9yIG1heGltdW0g ZnJlcXVlbmNpZXMuCkBAIC0zNDkzLDcgKzM0OTUsNyBAQCBzdGF0aWMgdm9pZCB2YWxsZXl2aWV3 X2VuYWJsZV9ycHMoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBpbnRlbF9yaW5n X2J1ZmZlciAqcmluZzsKLQl1MzIgZ3RmaWZvZGJnLCB2YWwsIHJwZTsKKwl1MzIgZ3RmaWZvZGJn LCB2YWw7CiAJaW50IGk7CiAKIAlXQVJOX09OKCFtdXRleF9pc19sb2NrZWQoJmRldl9wcml2LT5y cHMuaHdfbG9jaykpOwpAQCAtMzU1NCwzMSArMzU1NiwzOSBAQCBzdGF0aWMgdm9pZCB2YWxsZXl2 aWV3X2VuYWJsZV9ycHMoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlEUk1fREVCVUdfRFJJVkVS KCJHUExMIGVuYWJsZWQ/ICVzXG4iLCB2YWwgJiAweDEwID8gInllcyIgOiAibm8iKTsKIAlEUk1f REVCVUdfRFJJVkVSKCJHUFUgc3RhdHVzOiAweCUwOHhcbiIsIHZhbCk7CiAKLQlEUk1fREVCVUdf RFJJVkVSKCJjdXJyZW50IEdQVSBmcmVxOiAlZFxuIiwKLQkJCSB2bHZfZ3B1X2ZyZXEoZGV2X3By aXYtPm1lbV9mcmVxLCAodmFsID4+IDgpICYgMHhmZikpOwogCWRldl9wcml2LT5ycHMuY3VyX2Rl bGF5ID0gKHZhbCA+PiA4KSAmIDB4ZmY7CisJRFJNX0RFQlVHX0RSSVZFUigiY3VycmVudCBHUFUg ZnJlcTogJWQgTUh6ICgldSlcbiIsCisJCQkgdmx2X2dwdV9mcmVxKGRldl9wcml2LT5tZW1fZnJl cSwKKwkJCQkgICAgICBkZXZfcHJpdi0+cnBzLmN1cl9kZWxheSksCisJCQkgZGV2X3ByaXYtPnJw cy5jdXJfZGVsYXkpOwogCiAJZGV2X3ByaXYtPnJwcy5tYXhfZGVsYXkgPSB2YWxsZXl2aWV3X3Jw c19tYXhfZnJlcShkZXZfcHJpdik7CiAJZGV2X3ByaXYtPnJwcy5od19tYXggPSBkZXZfcHJpdi0+ cnBzLm1heF9kZWxheTsKLQlEUk1fREVCVUdfRFJJVkVSKCJtYXggR1BVIGZyZXE6ICVkXG4iLCB2 bHZfZ3B1X2ZyZXEoZGV2X3ByaXYtPm1lbV9mcmVxLAotCQkJCQkJICAgICBkZXZfcHJpdi0+cnBz Lm1heF9kZWxheSkpOworCURSTV9ERUJVR19EUklWRVIoIm1heCBHUFUgZnJlcTogJWQgTUh6ICgl dSlcbiIsCisJCQkgdmx2X2dwdV9mcmVxKGRldl9wcml2LT5tZW1fZnJlcSwKKwkJCQkgICAgICBk ZXZfcHJpdi0+cnBzLm1heF9kZWxheSksCisJCQkgZGV2X3ByaXYtPnJwcy5tYXhfZGVsYXkpOwog Ci0JcnBlID0gdmFsbGV5dmlld19ycHNfcnBlX2ZyZXEoZGV2X3ByaXYpOwotCURSTV9ERUJVR19E UklWRVIoIlJQZSBHUFUgZnJlcTogJWRcbiIsCi0JCQkgdmx2X2dwdV9mcmVxKGRldl9wcml2LT5t ZW1fZnJlcSwgcnBlKSk7Ci0JZGV2X3ByaXYtPnJwcy5ycGVfZGVsYXkgPSBycGU7CisJZGV2X3By aXYtPnJwcy5ycGVfZGVsYXkgPSB2YWxsZXl2aWV3X3Jwc19ycGVfZnJlcShkZXZfcHJpdik7CisJ RFJNX0RFQlVHX0RSSVZFUigiUlBlIEdQVSBmcmVxOiAlZCBNSHogKCV1KVxuIiwKKwkJCSB2bHZf Z3B1X2ZyZXEoZGV2X3ByaXYtPm1lbV9mcmVxLAorCQkJCSAgICAgIGRldl9wcml2LT5ycHMucnBl X2RlbGF5KSwKKwkJCSBkZXZfcHJpdi0+cnBzLnJwZV9kZWxheSk7CiAKLQl2YWwgPSB2YWxsZXl2 aWV3X3Jwc19taW5fZnJlcShkZXZfcHJpdik7Ci0JRFJNX0RFQlVHX0RSSVZFUigibWluIEdQVSBm cmVxOiAlZFxuIiwgdmx2X2dwdV9mcmVxKGRldl9wcml2LT5tZW1fZnJlcSwKLQkJCQkJCQkgICAg dmFsKSk7Ci0JZGV2X3ByaXYtPnJwcy5taW5fZGVsYXkgPSB2YWw7CisJZGV2X3ByaXYtPnJwcy5t aW5fZGVsYXkgPSB2YWxsZXl2aWV3X3Jwc19taW5fZnJlcShkZXZfcHJpdik7CisJRFJNX0RFQlVH X0RSSVZFUigibWluIEdQVSBmcmVxOiAlZCBNSHogKCV1KVxuIiwKKwkJCSB2bHZfZ3B1X2ZyZXEo ZGV2X3ByaXYtPm1lbV9mcmVxLAorCQkJCSAgICAgIGRldl9wcml2LT5ycHMubWluX2RlbGF5KSwK KwkJCSBkZXZfcHJpdi0+cnBzLm1pbl9kZWxheSk7CiAKLQlEUk1fREVCVUdfRFJJVkVSKCJzZXR0 aW5nIEdQVSBmcmVxIHRvICVkXG4iLAotCQkJIHZsdl9ncHVfZnJlcShkZXZfcHJpdi0+bWVtX2Zy ZXEsIHJwZSkpOworCURSTV9ERUJVR19EUklWRVIoInNldHRpbmcgR1BVIGZyZXEgdG8gJWQgTUh6 ICgldSlcbiIsCisJCQkgdmx2X2dwdV9mcmVxKGRldl9wcml2LT5tZW1fZnJlcSwKKwkJCQkgICAg ICBkZXZfcHJpdi0+cnBzLnJwZV9kZWxheSksCisJCQkgZGV2X3ByaXYtPnJwcy5ycGVfZGVsYXkp OwogCiAJSU5JVF9ERUxBWUVEX1dPUksoJmRldl9wcml2LT5ycHMudmx2X3dvcmssIHZsdl9ycHNf dGltZXJfd29yayk7CiAKLQl2YWxsZXl2aWV3X3NldF9ycHMoZGV2X3ByaXYtPmRldiwgcnBlKTsK Kwl2YWxsZXl2aWV3X3NldF9ycHMoZGV2X3ByaXYtPmRldiwgZGV2X3ByaXYtPnJwcy5ycGVfZGVs YXkpOwogCiAJLyogcmVxdWlyZXMgTVNJIGVuYWJsZWQgKi8KIAlJOTE1X1dSSVRFKEdFTjZfUE1J RVIsIEdFTjZfUE1fUlBTX0VWRU5UUyk7Ci0tIAoxLjguMS41CgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVs LWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=