From: Imre Deak Subject: [PATCH v2 2/3] drm/i915: vlv: fix mapping of pipestat enable to status bits Date: Mon, 10 Feb 2014 18:42:48 +0200 Message-ID: <1392050569-31600-2-git-send-email-imre.deak@intel.com> References: <1392050569-31600-1-git-send-email-imre.deak@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 3FD03FA821 for ; Mon, 10 Feb 2014 08:43:09 -0800 (PST) In-Reply-To: <1392050569-31600-1-git-send-email-imre.deak@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org QXQgbGVhc3Qgb24gVkxWIHdlIGNhbid0IGdldCBhdCB0aGUgcGlwZXN0YXQgc3RhdHVzIGJpdHMg Ynkgc2ltcGx5IHJpZ2h0CnNoaWZ0aW5nIHRoZSBjb3JyZXNwb25kaW5nIGVuYWJsZSBiaXRzLiBU aGUgbWFwcGluZyBiZXR3ZWVuIGVuYWJsZSBhbmQKc3RhdHVzIGJpdHMgZm9yIHRoZSBzcHJpdGUw LDEgZmxpcCBkb25lIGFuZCB0aGUgUFNSIGV2ZW50cyBkb24ndCBmb2xsb3cKdGhpcyBydWxlLCBz byB3ZSBuZWVkIHRvIG1hcCB0aGVtIHNlcGFyYXRlbHkuCgpUaGUgUFNSIGVuYWJsZSBmb3IgcGlw ZSBBIGlzIERQRkxJUFNUQVRbMjJdLCBidXQgSSBoYXZlbid0IGFkZGVkIHN1cHBvcnQKZm9yIHRo aXMsIHNpbmNlIHRoZXJlIGlzIG5vIHVzZXIgb2YgaXQgYXRtLiBVbnRpbCBzdXBwb3J0IGlzIGFk ZGVkIFdBUk4KaWYgc29tZW9uZSB0cmllcyB0byBlbmFibGUgUFNSIGludGVycnVwdHMsIG9yIHRy aWVzIHRvIGVuYWJsZSB0aGUgc2FtZQooMSA8PCA2KSBiaXQgb24gcGlwZSBCLCB3aGljaCBNQlou Cgp2MjoKLSBpbmxpbmUgdGhlIHN0YXR1cy0+ZW5hYmxlIG1hc2sgbWFwcGluZyAoVmlsbGUpCi0g Zml4IGJvZ3VzIHVzZSBvZiBzdGF0dXMgYml0cyBpbiBlbmFibGUgbWFzayAoVmlsbGUpCgpTaWdu ZWQtb2ZmLWJ5OiBJbXJlIERlYWsgPGltcmUuZGVha0BpbnRlbC5jb20+ClJldmlld2VkLWJ5OiBW aWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMgfCAzNCArKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oIHwgIDMgKysrCiAyIGZp bGVzIGNoYW5nZWQsIDM1IGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfaXJxLmMKaW5kZXggYTI1M2FjNy4uZmNiMjFkNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9pcnEuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2ly cS5jCkBAIC01MTUsMTMgKzUxNSwzOSBAQCBfX2k5MTVfZGlzYWJsZV9waXBlc3RhdChzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIGVudW0gcGlwZSBwaXBlLAogCVBPU1RJTkdfUkVB RChyZWcpOwogfQogCitzdGF0aWMgdTMyIHZsdl9nZXRfcGlwZXN0YXRfZW5hYmxlX21hc2soc3Ry dWN0IGRybV9kZXZpY2UgKmRldiwgdTMyIHN0YXR1c19tYXNrKQoreworCXUzMiBlbmFibGVfbWFz ayA9IHN0YXR1c19tYXNrIDw8IDE2OworCisJLyoKKwkgKiBPbiBwaXBlIEEgd2UgZG9uJ3Qgc3Vw cG9ydCB0aGUgUFNSIGludGVycnVwdCB5ZXQsIG9uIHBpcGUgQiB0aGUKKwkgKiBzYW1lIGJpdCBN QlouCisJICovCisJaWYgKFdBUk5fT05fT05DRShzdGF0dXNfbWFzayAmIFBJUEVfQV9QU1JfU1RB VFVTX1ZMVikpCisJCXJldHVybiAwOworCisJZW5hYmxlX21hc2sgJj0gfihQSVBFX0ZJRk9fVU5E RVJSVU5fU1RBVFVTIHwKKwkJCSBTUFJJVEUwX0ZMSVBfRE9ORV9JTlRfRU5fVkxWIHwKKwkJCSBT UFJJVEUxX0ZMSVBfRE9ORV9JTlRfRU5fVkxWKTsKKwlpZiAoc3RhdHVzX21hc2sgJiBTUFJJVEUw X0ZMSVBfRE9ORV9JTlRfU1RBVFVTX1ZMVikKKwkJZW5hYmxlX21hc2sgfD0gU1BSSVRFMF9GTElQ X0RPTkVfSU5UX0VOX1ZMVjsKKwlpZiAoc3RhdHVzX21hc2sgJiBTUFJJVEUxX0ZMSVBfRE9ORV9J TlRfU1RBVFVTX1ZMVikKKwkJZW5hYmxlX21hc2sgfD0gU1BSSVRFMV9GTElQX0RPTkVfSU5UX0VO X1ZMVjsKKworCXJldHVybiBlbmFibGVfbWFzazsKK30KKwogdm9pZAogaTkxNV9lbmFibGVfcGlw ZXN0YXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBlbnVtIHBpcGUgcGlwZSwK IAkJICAgICB1MzIgc3RhdHVzX21hc2spCiB7CiAJdTMyIGVuYWJsZV9tYXNrOwogCi0JZW5hYmxl X21hc2sgPSBzdGF0dXNfbWFzayA8PCAxNjsKKwlpZiAoSVNfVkFMTEVZVklFVyhkZXZfcHJpdi0+ ZGV2KSkKKwkJZW5hYmxlX21hc2sgPSB2bHZfZ2V0X3BpcGVzdGF0X2VuYWJsZV9tYXNrKGRldl9w cml2LT5kZXYsCisJCQkJCQkJICAgc3RhdHVzX21hc2spOworCWVsc2UKKwkJZW5hYmxlX21hc2sg PSBzdGF0dXNfbWFzayA8PCAxNjsKIAlfX2k5MTVfZW5hYmxlX3BpcGVzdGF0KGRldl9wcml2LCBw aXBlLCBlbmFibGVfbWFzaywgc3RhdHVzX21hc2spOwogfQogCkBAIC01MzEsNyArNTU3LDExIEBA IGk5MTVfZGlzYWJsZV9waXBlc3RhdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYs IGVudW0gcGlwZSBwaXBlLAogewogCXUzMiBlbmFibGVfbWFzazsKIAotCWVuYWJsZV9tYXNrID0g c3RhdHVzX21hc2sgPDwgMTY7CisJaWYgKElTX1ZBTExFWVZJRVcoZGV2X3ByaXYtPmRldikpCisJ CWVuYWJsZV9tYXNrID0gdmx2X2dldF9waXBlc3RhdF9lbmFibGVfbWFzayhkZXZfcHJpdi0+ZGV2 LAorCQkJCQkJCSAgIHN0YXR1c19tYXNrKTsKKwllbHNlCisJCWVuYWJsZV9tYXNrID0gc3RhdHVz X21hc2sgPDwgMTY7CiAJX19pOTE1X2Rpc2FibGVfcGlwZXN0YXQoZGV2X3ByaXYsIHBpcGUsIGVu YWJsZV9tYXNrLCBzdGF0dXNfbWFzayk7CiB9CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfcmVnLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oCmluZGV4 IDEyNDgyZDEuLmE3YWQ3YTAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf cmVnLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaApAQCAtMzI1NCw2ICsz MjU0LDcgQEAKICNkZWZpbmUgICBQSVBFX0xFR0FDWV9CTENfRVZFTlRfRU5BQkxFCQkoMVVMPDwy MikKICNkZWZpbmUgICBQSVBFX09ERF9GSUVMRF9JTlRFUlJVUFRfRU5BQkxFCSgxVUw8PDIxKQog I2RlZmluZSAgIFBJUEVfRVZFTl9GSUVMRF9JTlRFUlJVUFRfRU5BQkxFCSgxVUw8PDIwKQorI2Rl ZmluZSAgIFBJUEVfQl9QU1JfSU5URVJSVVBUX0VOQUJMRV9WTFYJKDFVTDw8MTkpCiAjZGVmaW5l ICAgUElQRV9IT1RQTFVHX1RWX0lOVEVSUlVQVF9FTkFCTEUJKDFVTDw8MTgpIC8qIHByZS05NjUg Ki8KICNkZWZpbmUgICBQSVBFX1NUQVJUX1ZCTEFOS19JTlRFUlJVUFRfRU5BQkxFCSgxVUw8PDE4 KSAvKiA5NjUgb3IgbGF0ZXIgKi8KICNkZWZpbmUgICBQSVBFX1ZCTEFOS19JTlRFUlJVUFRfRU5B QkxFCQkoMVVMPDwxNykKQEAgLTMyNzAsOCArMzI3MSwxMCBAQAogI2RlZmluZSAgIFBJUEVfRElT UExBWV9MSU5FX0NPTVBBUkVfU1RBVFVTCSgxVUw8PDgpCiAjZGVmaW5lICAgUElQRV9EUFNUX0VW RU5UX1NUQVRVUwkJKDFVTDw8NykKICNkZWZpbmUgICBQSVBFX0xFR0FDWV9CTENfRVZFTlRfU1RB VFVTCQkoMVVMPDw2KQorI2RlZmluZSAgIFBJUEVfQV9QU1JfU1RBVFVTX1ZMVgkJCSgxVUw8PDYp CiAjZGVmaW5lICAgUElQRV9PRERfRklFTERfSU5URVJSVVBUX1NUQVRVUwkoMVVMPDw1KQogI2Rl ZmluZSAgIFBJUEVfRVZFTl9GSUVMRF9JTlRFUlJVUFRfU1RBVFVTCSgxVUw8PDQpCisjZGVmaW5l ICAgUElQRV9CX1BTUl9TVEFUVVNfVkxWCQkJKDFVTDw8MykKICNkZWZpbmUgICBQSVBFX0hPVFBM VUdfVFZfSU5URVJSVVBUX1NUQVRVUwkoMVVMPDwyKSAvKiBwcmUtOTY1ICovCiAjZGVmaW5lICAg UElQRV9TVEFSVF9WQkxBTktfSU5URVJSVVBUX1NUQVRVUwkoMVVMPDwyKSAvKiA5NjUgb3IgbGF0 ZXIgKi8KICNkZWZpbmUgICBQSVBFX1ZCTEFOS19JTlRFUlJVUFRfU1RBVFVTCQkoMVVMPDwxKQot LSAKMS44LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==