From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville Syrjala Subject: [PATCH v2 6/6] drm/i915: Use _MMIO_PIPE3() for ilk+ WM0_PIPE registers Date: Wed, 12 Dec 2018 23:17:38 +0200 Message-ID: <20181212211738.27770-1-ville.syrjala@linux.intel.com> References: <20181212193824.3017-6-ville.syrjala@linux.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 ESMTPS id E160A6EBBE for ; Wed, 12 Dec 2018 21:17:40 +0000 (UTC) In-Reply-To: <20181212193824.3017-6-ville.syrjala@linux.intel.com> 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 List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClJl bW92ZSB0aGUgaGFuZCByb2xsZWQgYXJyYXkgb2YgV00wX1BJUEUgcmVnaXN0ZXIgb2Zmc2V0cwph bmQgdXNlIHRoZSBzdGFuZGFyZCBfTU1JT19QSVBFMygpIGluc3RlYWQuCgp2MjogVGFrZSBjYXJl IG9mIGd2dCB0b28KClNpZ25lZC1vZmYtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFs YUBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3Z0L2hhbmRsZXJz LmMgfCAgNiArKystLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmggICAgIHwgIDkg KysrKystLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jICAgICB8IDEzICsrKyst LS0tLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgMTIgaW5zZXJ0aW9ucygrKSwgMTYgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3Z0L2hhbmRsZXJzLmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9ndnQvaGFuZGxlcnMuYwppbmRleCBiNTQ3NWM5MWUyZWYuLjJl ZGFiMzg3MjIxZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3Z0L2hhbmRsZXJz LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3Z0L2hhbmRsZXJzLmMKQEAgLTIxMjAsOSAr MjEyMCw5IEBAIHN0YXRpYyBpbnQgaW5pdF9nZW5lcmljX21taW9faW5mbyhzdHJ1Y3QgaW50ZWxf Z3Z0ICpndnQpCiAJTU1JT19EKFBGX1ZTQ0FMRShQSVBFX0MpLCBEX0FMTCk7CiAJTU1JT19EKFBG X0hTQ0FMRShQSVBFX0MpLCBEX0FMTCk7CiAKLQlNTUlPX0QoV00wX1BJUEVBX0lMSywgRF9BTEwp OwotCU1NSU9fRChXTTBfUElQRUJfSUxLLCBEX0FMTCk7Ci0JTU1JT19EKFdNMF9QSVBFQ19JVkIs IERfQUxMKTsKKwlNTUlPX0QoV00wX1BJUEVfSUxLKFBJUEVfQSksIERfQUxMKTsKKwlNTUlPX0Qo V00wX1BJUEVfSUxLKFBJUEVfQiksIERfQUxMKTsKKwlNTUlPX0QoV00wX1BJUEVfSUxLKFBJUEVf QyksIERfQUxMKTsKIAlNTUlPX0QoV00xX0xQX0lMSywgRF9BTEwpOwogCU1NSU9fRChXTTJfTFBf SUxLLCBEX0FMTCk7CiAJTU1JT19EKFdNM19MUF9JTEssIERfQUxMKTsKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X3JlZy5oCmluZGV4IGVhOWE2NjQ5ODBhNi4uMjQ2ZTVlNzdlN2M1IDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfcmVnLmgKQEAgLTU5OTIsMTUgKzU5OTIsMTYgQEAgZW51bSB7CiAJX01NSU8oX1BMQU5FKHBs YW5lLCBfUExBTkVfV01fVFJBTlNfMShwaXBlKSwgX1BMQU5FX1dNX1RSQU5TXzIocGlwZSkpKQog CiAvKiBkZWZpbmUgdGhlIFdhdGVybWFyayByZWdpc3RlciBvbiBJcm9ubGFrZSAqLwotI2RlZmlu ZSBXTTBfUElQRUFfSUxLCQlfTU1JTygweDQ1MTAwKQorI2RlZmluZSBfV00wX1BJUEVBX0lMSwkJ MHg0NTEwMAorI2RlZmluZSBfV00wX1BJUEVCX0lMSwkJMHg0NTEwNAorI2RlZmluZSBfV00wX1BJ UEVDX0lWQgkJMHg0NTIwMAorI2RlZmluZSBXTTBfUElQRV9JTEsocGlwZSkJX01NSU9fUElQRTMo KHBpcGUpLCBfV00wX1BJUEVBX0lMSywgXAorCQkJCQkgICAgX1dNMF9QSVBFQl9JTEssIF9XTTBf UElQRUNfSVZCKQogI2RlZmluZSAgV00wX1BJUEVfUExBTkVfTUFTSwkoMHhmZmZmIDw8IDE2KQog I2RlZmluZSAgV00wX1BJUEVfUExBTkVfU0hJRlQJMTYKICNkZWZpbmUgIFdNMF9QSVBFX1NQUklU RV9NQVNLCSgweGZmIDw8IDgpCiAjZGVmaW5lICBXTTBfUElQRV9TUFJJVEVfU0hJRlQJOAogI2Rl ZmluZSAgV00wX1BJUEVfQ1VSU09SX01BU0sJKDB4ZmYpCi0KLSNkZWZpbmUgV00wX1BJUEVCX0lM SwkJX01NSU8oMHg0NTEwNCkKLSNkZWZpbmUgV00wX1BJUEVDX0lWQgkJX01NSU8oMHg0NTIwMCkK ICNkZWZpbmUgV00xX0xQX0lMSwkJX01NSU8oMHg0NTEwOCkKICNkZWZpbmUgIFdNMV9MUF9TUl9F TgkJKDEgPDwgMzEpCiAjZGVmaW5lICBXTTFfTFBfTEFURU5DWV9TSElGVAkyNApkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3BtLmMKaW5kZXggNmViZGU3YmJhYzRlLi40NmY4Yzg3Mjg4NDcgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfcG0uYwpAQCAtMzU1NSwxMSArMzU1NSwxMSBAQCBzdGF0aWMgdm9pZCBpbGtfd3Jp dGVfd21fdmFsdWVzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAlfaWxrX2Rp c2FibGVfbHBfd20oZGV2X3ByaXYsIGRpcnR5KTsKIAogCWlmIChkaXJ0eSAmIFdNX0RJUlRZX1BJ UEUoUElQRV9BKSkKLQkJSTkxNV9XUklURShXTTBfUElQRUFfSUxLLCByZXN1bHRzLT53bV9waXBl WzBdKTsKKwkJSTkxNV9XUklURShXTTBfUElQRV9JTEsoUElQRV9BKSwgcmVzdWx0cy0+d21fcGlw ZVswXSk7CiAJaWYgKGRpcnR5ICYgV01fRElSVFlfUElQRShQSVBFX0IpKQotCQlJOTE1X1dSSVRF KFdNMF9QSVBFQl9JTEssIHJlc3VsdHMtPndtX3BpcGVbMV0pOworCQlJOTE1X1dSSVRFKFdNMF9Q SVBFX0lMSyhQSVBFX0IpLCByZXN1bHRzLT53bV9waXBlWzFdKTsKIAlpZiAoZGlydHkgJiBXTV9E SVJUWV9QSVBFKFBJUEVfQykpCi0JCUk5MTVfV1JJVEUoV00wX1BJUEVDX0lWQiwgcmVzdWx0cy0+ d21fcGlwZVsyXSk7CisJCUk5MTVfV1JJVEUoV00wX1BJUEVfSUxLKFBJUEVfQyksIHJlc3VsdHMt PndtX3BpcGVbMl0pOwogCiAJaWYgKGRpcnR5ICYgV01fRElSVFlfTElORVRJTUUoUElQRV9BKSkK IAkJSTkxNV9XUklURShQSVBFX1dNX0xJTkVUSU1FKFBJUEVfQSksIHJlc3VsdHMtPndtX2xpbmV0 aW1lWzBdKTsKQEAgLTU2NDcsMTMgKzU2NDcsOCBAQCBzdGF0aWMgdm9pZCBpbGtfcGlwZV93bV9n ZXRfaHdfc3RhdGUoc3RydWN0IGludGVsX2NydGMgKmNydGMpCiAJc3RydWN0IGludGVsX2NydGNf c3RhdGUgKmNzdGF0ZSA9IHRvX2ludGVsX2NydGNfc3RhdGUoY3J0Yy0+YmFzZS5zdGF0ZSk7CiAJ c3RydWN0IGlsa19waXBlX3dtICphY3RpdmUgPSAmY3N0YXRlLT53bS5pbGsub3B0aW1hbDsKIAll bnVtIHBpcGUgcGlwZSA9IGNydGMtPnBpcGU7Ci0Jc3RhdGljIGNvbnN0IGk5MTVfcmVnX3Qgd20w X3BpcGVfcmVnW10gPSB7Ci0JCVtQSVBFX0FdID0gV00wX1BJUEVBX0lMSywKLQkJW1BJUEVfQl0g PSBXTTBfUElQRUJfSUxLLAotCQlbUElQRV9DXSA9IFdNMF9QSVBFQ19JVkIsCi0JfTsKIAotCWh3 LT53bV9waXBlW3BpcGVdID0gSTkxNV9SRUFEKHdtMF9waXBlX3JlZ1twaXBlXSk7CisJaHctPndt X3BpcGVbcGlwZV0gPSBJOTE1X1JFQUQoV00wX1BJUEVfSUxLKHBpcGUpKTsKIAlpZiAoSVNfSEFT V0VMTChkZXZfcHJpdikgfHwgSVNfQlJPQURXRUxMKGRldl9wcml2KSkKIAkJaHctPndtX2xpbmV0 aW1lW3BpcGVdID0gSTkxNV9SRUFEKFBJUEVfV01fTElORVRJTUUocGlwZSkpOwogCi0tIAoyLjE4 LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVs LWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczov L2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=