From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH] drm/i915: Use FW_WM() macro for older gmch platforms too Date: Wed, 11 Mar 2015 11:05:58 +0100 Message-ID: <20150311100558.GF3800@phenom.ffwll.local> References: <1425996988-5747-1-git-send-email-ville.syrjala@linux.intel.com> <1425999741-10702-1-git-send-email-ville.syrjala@linux.intel.com> <54FF6718.7050200@virtuousgeek.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wg0-f52.google.com (mail-wg0-f52.google.com [74.125.82.52]) by gabe.freedesktop.org (Postfix) with ESMTP id BD5EB6E15B for ; Wed, 11 Mar 2015 03:04:18 -0700 (PDT) Received: by wghn12 with SMTP id n12so7976240wgh.6 for ; Wed, 11 Mar 2015 03:04:18 -0700 (PDT) Content-Disposition: inline In-Reply-To: <54FF6718.7050200@virtuousgeek.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Jesse Barnes Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gVHVlLCBNYXIgMTAsIDIwMTUgYXQgMDI6NTA6MTZQTSAtMDcwMCwgSmVzc2UgQmFybmVzIHdy b3RlOgo+IE9uIDAzLzEwLzIwMTUgMDg6MDIgQU0sIHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwu Y29tIHdyb3RlOgo+ID4gRnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4 LmludGVsLmNvbT4KPiA+IAo+ID4gVXNlIHRoZSBGV19XTSgpIG1hY3JvIGZyb20gdGhlIFZMViB3 bSBjb2RlIHRvIHBvbGlzaCB1cCB0aGUgd20KPiA+IGNvZGUgZm9yIG9sZGVyIGdtY2ggcGxhdGZv cm1zLgo+ID4gCj4gPiBDYzogRGFuaWVsIFZldHRlciA8ZGFuaWVsQGZmd2xsLmNoPgo+ID4gU2ln bmVkLW9mZi1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNv bT4KPiA+IC0tLQo+ID4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmggfCAgNCArKy0t Cj4gPiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyB8IDQyICsrKysrKysrKysrKysr KysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tCj4gPiAgMiBmaWxlcyBjaGFuZ2VkLCAyNCBpbnNl cnRpb25zKCspLCAyMiBkZWxldGlvbnMoLSkKPiA+IAo+ID4gZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfcmVnLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5o Cj4gPiBpbmRleCA4ZmYwMzlkLi43OTNlZDYzIDEwMDY0NAo+ID4gLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9yZWcuaAo+ID4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9y ZWcuaAo+ID4gQEAgLTQxMjEsOCArNDEyMSw4IEBAIGVudW0gc2tsX2Rpc3BfcG93ZXJfd2VsbHMg ewo+ID4gICNkZWZpbmUgICBEU1BGV19TUFJJVEVCX01BU0tfVkxWCSgweGZmPDwxNikgLyogdmx2 L2NodiAqLwo+ID4gICNkZWZpbmUgICBEU1BGV19DVVJTT1JBX1NISUZUCQk4Cj4gPiAgI2RlZmlu ZSAgIERTUEZXX0NVUlNPUkFfTUFTSwkJKDB4M2Y8PDgpCj4gPiAtI2RlZmluZSAgIERTUEZXX1BM QU5FQ19TSElGVF9PTEQJMAo+ID4gLSNkZWZpbmUgICBEU1BGV19QTEFORUNfTUFTS19PTEQJCSgw eDdmPDwwKSAvKiBwcmUtZ2VuNCBzcHJpdGUgQyAqLwo+ID4gKyNkZWZpbmUgICBEU1BGV19QTEFO RUNfT0xEX1NISUZUCTAKPiA+ICsjZGVmaW5lICAgRFNQRldfUExBTkVDX09MRF9NQVNLCQkoMHg3 Zjw8MCkgLyogcHJlLWdlbjQgc3ByaXRlIEMgKi8KPiA+ICAjZGVmaW5lICAgRFNQRldfU1BSSVRF QV9TSElGVAkJMAo+ID4gICNkZWZpbmUgICBEU1BGV19TUFJJVEVBX01BU0sJCSgweDdmPDwwKSAv KiBnNHggKi8KPiA+ICAjZGVmaW5lICAgRFNQRldfU1BSSVRFQV9NQVNLX1ZMVgkoMHhmZjw8MCkg Lyogdmx2L2NodiAqLwo+ID4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCj4gPiBpbmRleCA4YWMzNThk MC4uOWFjOWEyZiAxMDA2NDQKPiA+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bt LmMKPiA+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKPiA+IEBAIC0zMDEs NiArMzAxLDkgQEAgc3RhdGljIHZvaWQgY2h2X3NldF9tZW1vcnlfcG01KHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiwgYm9vbCBlbmFibGUpCj4gPiAgCW11dGV4X3VubG9jaygmZGV2 X3ByaXYtPnJwcy5od19sb2NrKTsKPiA+ICB9Cj4gPiAgCj4gPiArI2RlZmluZSBGV19XTSh2YWx1 ZSwgcGxhbmUpIFwKPiA+ICsJKCgodmFsdWUpIDw8IERTUEZXXyAjIyBwbGFuZSAjIyBfU0hJRlQp ICYgRFNQRldfICMjIHBsYW5lICMjIF9NQVNLKQo+ID4gKwo+ID4gIHZvaWQgaW50ZWxfc2V0X21l bW9yeV9jeHNyKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgYm9vbCBlbmFibGUp Cj4gPiAgewo+ID4gIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gZGV2X3ByaXYtPmRldjsKPiA+ IEBAIC02NjEsNyArNjY0LDcgQEAgc3RhdGljIHZvaWQgcGluZXZpZXdfdXBkYXRlX3dtKHN0cnVj dCBkcm1fY3J0YyAqdW51c2VkX2NydGMpCj4gPiAgCQkJCQlwaXhlbF9zaXplLCBsYXRlbmN5LT5k aXNwbGF5X3NyKTsKPiA+ICAJCXJlZyA9IEk5MTVfUkVBRChEU1BGVzEpOwo+ID4gIAkJcmVnICY9 IH5EU1BGV19TUl9NQVNLOwo+ID4gLQkJcmVnIHw9IHdtIDw8IERTUEZXX1NSX1NISUZUOwo+ID4g KwkJcmVnIHw9IEZXX1dNKHdtLCBTUik7Cj4gPiAgCQlJOTE1X1dSSVRFKERTUEZXMSwgcmVnKTsK PiA+ICAJCURSTV9ERUJVR19LTVMoIkRTUEZXMSByZWdpc3RlciBpcyAleFxuIiwgcmVnKTsKPiA+ ICAKPiA+IEBAIC02NzEsNyArNjc0LDcgQEAgc3RhdGljIHZvaWQgcGluZXZpZXdfdXBkYXRlX3dt KHN0cnVjdCBkcm1fY3J0YyAqdW51c2VkX2NydGMpCj4gPiAgCQkJCQlwaXhlbF9zaXplLCBsYXRl bmN5LT5jdXJzb3Jfc3IpOwo+ID4gIAkJcmVnID0gSTkxNV9SRUFEKERTUEZXMyk7Cj4gPiAgCQly ZWcgJj0gfkRTUEZXX0NVUlNPUl9TUl9NQVNLOwo+ID4gLQkJcmVnIHw9ICh3bSAmIDB4M2YpIDw8 IERTUEZXX0NVUlNPUl9TUl9TSElGVDsKPiA+ICsJCXJlZyB8PSBGV19XTSh3bSwgQ1VSU09SX1NS KTsKPiA+ICAJCUk5MTVfV1JJVEUoRFNQRlczLCByZWcpOwo+ID4gIAo+ID4gIAkJLyogRGlzcGxh eSBIUExMIG9mZiBTUiAqLwo+ID4gQEAgLTY4MCw3ICs2ODMsNyBAQCBzdGF0aWMgdm9pZCBwaW5l dmlld191cGRhdGVfd20oc3RydWN0IGRybV9jcnRjICp1bnVzZWRfY3J0YykKPiA+ICAJCQkJCXBp eGVsX3NpemUsIGxhdGVuY3ktPmRpc3BsYXlfaHBsbF9kaXNhYmxlKTsKPiA+ICAJCXJlZyA9IEk5 MTVfUkVBRChEU1BGVzMpOwo+ID4gIAkJcmVnICY9IH5EU1BGV19IUExMX1NSX01BU0s7Cj4gPiAt CQlyZWcgfD0gd20gJiBEU1BGV19IUExMX1NSX01BU0s7Cj4gPiArCQlyZWcgfD0gRldfV00od20s IEhQTExfU1IpOwo+ID4gIAkJSTkxNV9XUklURShEU1BGVzMsIHJlZyk7Cj4gPiAgCj4gPiAgCQkv KiBjdXJzb3IgSFBMTCBvZmYgU1IgKi8KPiA+IEBAIC02ODksNyArNjkyLDcgQEAgc3RhdGljIHZv aWQgcGluZXZpZXdfdXBkYXRlX3dtKHN0cnVjdCBkcm1fY3J0YyAqdW51c2VkX2NydGMpCj4gPiAg CQkJCQlwaXhlbF9zaXplLCBsYXRlbmN5LT5jdXJzb3JfaHBsbF9kaXNhYmxlKTsKPiA+ICAJCXJl ZyA9IEk5MTVfUkVBRChEU1BGVzMpOwo+ID4gIAkJcmVnICY9IH5EU1BGV19IUExMX0NVUlNPUl9N QVNLOwo+ID4gLQkJcmVnIHw9ICh3bSAmIDB4M2YpIDw8IERTUEZXX0hQTExfQ1VSU09SX1NISUZU Owo+ID4gKwkJcmVnIHw9IEZXX1dNKHdtLCBIUExMX0NVUlNPUik7Cj4gPiAgCQlJOTE1X1dSSVRF KERTUEZXMywgcmVnKTsKPiA+ICAJCURSTV9ERUJVR19LTVMoIkRTUEZXMyByZWdpc3RlciBpcyAl eFxuIiwgcmVnKTsKPiA+ICAKPiA+IEBAIC04MzUsOCArODM4LDYgQEAgc3RhdGljIGJvb2wgZzR4 X2NvbXB1dGVfc3J3bShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAo+ID4gIAkJCSAgICAgIGRpc3Bs YXksIGN1cnNvcik7Cj4gPiAgfQo+ID4gIAo+ID4gLSNkZWZpbmUgRldfV00odmFsdWUsIHBsYW5l KSBcCj4gPiAtCSgoKHZhbHVlKSA8PCBEU1BGV18gIyMgcGxhbmUgIyMgX1NISUZUKSAmIERTUEZX XyAjIyBwbGFuZSAjIyBfTUFTSykKPiA+ICAjZGVmaW5lIEZXX1dNX1ZMVih2YWx1ZSwgcGxhbmUp IFwKPiA+ICAJKCgodmFsdWUpIDw8IERTUEZXXyAjIyBwbGFuZSAjIyBfU0hJRlQpICYgRFNQRldf ICMjIHBsYW5lICMjIF9NQVNLX1ZMVikKPiA+ICAKPiA+IEBAIC05MDQsNyArOTA1LDYgQEAgc3Rh dGljIHZvaWQgdmx2X3dyaXRlX3dtX3ZhbHVlcyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKPiA+ ICAJZGV2X3ByaXYtPndtLnZsdiA9ICp3bTsKPiA+ICB9Cj4gPiAgCj4gPiAtI3VuZGVmIEZXX1dN Cj4gPiAgI3VuZGVmIEZXX1dNX1ZMVgo+ID4gIAo+ID4gIHN0YXRpYyB1aW50OF90IHZsdl9jb21w dXRlX2RyYWluX2xhdGVuY3koc3RydWN0IGRybV9jcnRjICpjcnRjLAo+ID4gQEAgLTExNjMsMTcg KzExNjMsMTcgQEAgc3RhdGljIHZvaWQgZzR4X3VwZGF0ZV93bShzdHJ1Y3QgZHJtX2NydGMgKmNy dGMpCj4gPiAgCQkgICAgICBwbGFuZV9zciwgY3Vyc29yX3NyKTsKPiA+ICAKPiA+ICAJSTkxNV9X UklURShEU1BGVzEsCj4gPiAtCQkgICAocGxhbmVfc3IgPDwgRFNQRldfU1JfU0hJRlQpIHwKPiA+ IC0JCSAgIChjdXJzb3JiX3dtIDw8IERTUEZXX0NVUlNPUkJfU0hJRlQpIHwKPiA+IC0JCSAgIChw bGFuZWJfd20gPDwgRFNQRldfUExBTkVCX1NISUZUKSB8Cj4gPiAtCQkgICAocGxhbmVhX3dtIDw8 IERTUEZXX1BMQU5FQV9TSElGVCkpOwo+ID4gKwkJICAgRldfV00ocGxhbmVfc3IsIFNSKSB8Cj4g PiArCQkgICBGV19XTShjdXJzb3JiX3dtLCBDVVJTT1JCKSB8Cj4gPiArCQkgICBGV19XTShwbGFu ZWJfd20sIFBMQU5FQikgfAo+ID4gKwkJICAgRldfV00ocGxhbmVhX3dtLCBQTEFORUEpKTsKPiA+ ICAJSTkxNV9XUklURShEU1BGVzIsCj4gPiAgCQkgICAoSTkxNV9SRUFEKERTUEZXMikgJiB+RFNQ RldfQ1VSU09SQV9NQVNLKSB8Cj4gPiAtCQkgICAoY3Vyc29yYV93bSA8PCBEU1BGV19DVVJTT1JB X1NISUZUKSk7Cj4gPiArCQkgICBGV19XTShjdXJzb3JhX3dtLCBDVVJTT1JBKSk7Cj4gPiAgCS8q IEhQTEwgb2ZmIGluIFNSIGhhcyBzb21lIGlzc3VlcyBvbiBHNHguLi4gZGlzYWJsZSBpdCAqLwo+ ID4gIAlJOTE1X1dSSVRFKERTUEZXMywKPiA+ICAJCSAgIChJOTE1X1JFQUQoRFNQRlczKSAmIH4o RFNQRldfSFBMTF9TUl9FTiB8IERTUEZXX0NVUlNPUl9TUl9NQVNLKSkgfAo+ID4gLQkJICAgKGN1 cnNvcl9zciA8PCBEU1BGV19DVVJTT1JfU1JfU0hJRlQpKTsKPiA+ICsJCSAgIEZXX1dNKGN1cnNv cl9zciwgQ1VSU09SX1NSKSk7Cj4gPiAgCj4gPiAgCWlmIChjeHNyX2VuYWJsZWQpCj4gPiAgCQlp bnRlbF9zZXRfbWVtb3J5X2N4c3IoZGV2X3ByaXYsIHRydWUpOwo+ID4gQEAgLTEyMzksMTkgKzEy MzksMjEgQEAgc3RhdGljIHZvaWQgaTk2NV91cGRhdGVfd20oc3RydWN0IGRybV9jcnRjICp1bnVz ZWRfY3J0YykKPiA+ICAJCSAgICAgIHNyd20pOwo+ID4gIAo+ID4gIAkvKiA5NjUgaGFzIGxpbWl0 YXRpb25zLi4uICovCj4gPiAtCUk5MTVfV1JJVEUoRFNQRlcxLCAoc3J3bSA8PCBEU1BGV19TUl9T SElGVCkgfAo+ID4gLQkJICAgKDggPDwgRFNQRldfQ1VSU09SQl9TSElGVCkgfAo+ID4gLQkJICAg KDggPDwgRFNQRldfUExBTkVCX1NISUZUKSB8Cj4gPiAtCQkgICAoOCA8PCBEU1BGV19QTEFORUFf U0hJRlQpKTsKPiA+IC0JSTkxNV9XUklURShEU1BGVzIsICg4IDw8IERTUEZXX0NVUlNPUkFfU0hJ RlQpIHwKPiA+IC0JCSAgICg4IDw8IERTUEZXX1BMQU5FQ19TSElGVF9PTEQpKTsKPiA+ICsJSTkx NV9XUklURShEU1BGVzEsIEZXX1dNKHNyd20sIFNSKSB8Cj4gPiArCQkgICBGV19XTSg4LCBDVVJT T1JCKSB8Cj4gPiArCQkgICBGV19XTSg4LCBQTEFORUIpIHwKPiA+ICsJCSAgIEZXX1dNKDgsIFBM QU5FQSkpOwo+ID4gKwlJOTE1X1dSSVRFKERTUEZXMiwgRldfV00oOCwgQ1VSU09SQSkgfAo+ID4g KwkJICAgRldfV00oOCwgUExBTkVDX09MRCkpOwo+ID4gIAkvKiB1cGRhdGUgY3Vyc29yIFNSIHdh dGVybWFyayAqLwo+ID4gLQlJOTE1X1dSSVRFKERTUEZXMywgKGN1cnNvcl9zciA8PCBEU1BGV19D VVJTT1JfU1JfU0hJRlQpKTsKPiA+ICsJSTkxNV9XUklURShEU1BGVzMsIEZXX1dNKGN1cnNvcl9z ciwgQ1VSU09SX1NSKSk7Cj4gPiAgCj4gPiAgCWlmIChjeHNyX2VuYWJsZWQpCj4gPiAgCQlpbnRl bF9zZXRfbWVtb3J5X2N4c3IoZGV2X3ByaXYsIHRydWUpOwo+ID4gIH0KPiA+ICAKPiA+ICsjdW5k ZWYgRldfV00KPiA+ICsKPiA+ICBzdGF0aWMgdm9pZCBpOXh4X3VwZGF0ZV93bShzdHJ1Y3QgZHJt X2NydGMgKnVudXNlZF9jcnRjKQo+ID4gIHsKPiA+ICAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9 IHVudXNlZF9jcnRjLT5kZXY7Cj4gPiAKPiAKPiBSZXZpZXdlZC1ieTogSmVzc2UgQmFybmVzIDxq YmFybmVzQHZpcnR1b3VzZ2Vlay5vcmc+CgpCb3RoIG1lcmdlZCwgdGhhbmtzIGZvciBwYXRjaGVz JnJldmlldy4KLURhbmllbAotLSAKRGFuaWVsIFZldHRlcgpTb2Z0d2FyZSBFbmdpbmVlciwgSW50 ZWwgQ29ycG9yYXRpb24KKzQxICgwKSA3OSAzNjUgNTcgNDggLSBodHRwOi8vYmxvZy5mZndsbC5j aApfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1n ZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=