From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jesse Barnes Subject: Re: [PATCH] drm/i915: Use FW_WM() macro for older gmch platforms too Date: Tue, 10 Mar 2015 14:50:16 -0700 Message-ID: <54FF6718.7050200@virtuousgeek.org> References: <1425996988-5747-1-git-send-email-ville.syrjala@linux.intel.com> <1425999741-10702-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 gproxy5-pub.mail.unifiedlayer.com (gproxy5-pub.mail.unifiedlayer.com [67.222.38.55]) by gabe.freedesktop.org (Postfix) with SMTP id 923C889A35 for ; Tue, 10 Mar 2015 14:49:15 -0700 (PDT) In-Reply-To: <1425999741-10702-1-git-send-email-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: ville.syrjala@linux.intel.com, intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gMDMvMTAvMjAxNSAwODowMiBBTSwgdmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20gd3Jv dGU6Cj4gRnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNv bT4KPiAKPiBVc2UgdGhlIEZXX1dNKCkgbWFjcm8gZnJvbSB0aGUgVkxWIHdtIGNvZGUgdG8gcG9s aXNoIHVwIHRoZSB3bQo+IGNvZGUgZm9yIG9sZGVyIGdtY2ggcGxhdGZvcm1zLgo+IAo+IENjOiBE YW5pZWwgVmV0dGVyIDxkYW5pZWxAZmZ3bGwuY2g+Cj4gU2lnbmVkLW9mZi1ieTogVmlsbGUgU3ly asOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KPiAtLS0KPiAgZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9yZWcuaCB8ICA0ICsrLS0KPiAgZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfcG0uYyB8IDQyICsrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0t Cj4gIDIgZmlsZXMgY2hhbmdlZCwgMjQgaW5zZXJ0aW9ucygrKSwgMjIgZGVsZXRpb25zKC0pCj4g Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmggYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oCj4gaW5kZXggOGZmMDM5ZC4uNzkzZWQ2MyAxMDA2NDQK PiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oCj4gKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9yZWcuaAo+IEBAIC00MTIxLDggKzQxMjEsOCBAQCBlbnVtIHNrbF9k aXNwX3Bvd2VyX3dlbGxzIHsKPiAgI2RlZmluZSAgIERTUEZXX1NQUklURUJfTUFTS19WTFYJKDB4 ZmY8PDE2KSAvKiB2bHYvY2h2ICovCj4gICNkZWZpbmUgICBEU1BGV19DVVJTT1JBX1NISUZUCQk4 Cj4gICNkZWZpbmUgICBEU1BGV19DVVJTT1JBX01BU0sJCSgweDNmPDw4KQo+IC0jZGVmaW5lICAg RFNQRldfUExBTkVDX1NISUZUX09MRAkwCj4gLSNkZWZpbmUgICBEU1BGV19QTEFORUNfTUFTS19P TEQJCSgweDdmPDwwKSAvKiBwcmUtZ2VuNCBzcHJpdGUgQyAqLwo+ICsjZGVmaW5lICAgRFNQRldf UExBTkVDX09MRF9TSElGVAkwCj4gKyNkZWZpbmUgICBEU1BGV19QTEFORUNfT0xEX01BU0sJCSgw eDdmPDwwKSAvKiBwcmUtZ2VuNCBzcHJpdGUgQyAqLwo+ICAjZGVmaW5lICAgRFNQRldfU1BSSVRF QV9TSElGVAkJMAo+ICAjZGVmaW5lICAgRFNQRldfU1BSSVRFQV9NQVNLCQkoMHg3Zjw8MCkgLyog ZzR4ICovCj4gICNkZWZpbmUgICBEU1BGV19TUFJJVEVBX01BU0tfVkxWCSgweGZmPDwwKSAvKiB2 bHYvY2h2ICovCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCj4gaW5kZXggOGFjMzU4ZDAuLjlhYzlh MmYgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwo+ICsrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKPiBAQCAtMzAxLDYgKzMwMSw5IEBAIHN0 YXRpYyB2b2lkIGNodl9zZXRfbWVtb3J5X3BtNShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYsIGJvb2wgZW5hYmxlKQo+ICAJbXV0ZXhfdW5sb2NrKCZkZXZfcHJpdi0+cnBzLmh3X2xv Y2spOwo+ICB9Cj4gIAo+ICsjZGVmaW5lIEZXX1dNKHZhbHVlLCBwbGFuZSkgXAo+ICsJKCgodmFs dWUpIDw8IERTUEZXXyAjIyBwbGFuZSAjIyBfU0hJRlQpICYgRFNQRldfICMjIHBsYW5lICMjIF9N QVNLKQo+ICsKPiAgdm9pZCBpbnRlbF9zZXRfbWVtb3J5X2N4c3Ioc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2LCBib29sIGVuYWJsZSkKPiAgewo+ICAJc3RydWN0IGRybV9kZXZpY2Ug KmRldiA9IGRldl9wcml2LT5kZXY7Cj4gQEAgLTY2MSw3ICs2NjQsNyBAQCBzdGF0aWMgdm9pZCBw aW5ldmlld191cGRhdGVfd20oc3RydWN0IGRybV9jcnRjICp1bnVzZWRfY3J0YykKPiAgCQkJCQlw aXhlbF9zaXplLCBsYXRlbmN5LT5kaXNwbGF5X3NyKTsKPiAgCQlyZWcgPSBJOTE1X1JFQUQoRFNQ RlcxKTsKPiAgCQlyZWcgJj0gfkRTUEZXX1NSX01BU0s7Cj4gLQkJcmVnIHw9IHdtIDw8IERTUEZX X1NSX1NISUZUOwo+ICsJCXJlZyB8PSBGV19XTSh3bSwgU1IpOwo+ICAJCUk5MTVfV1JJVEUoRFNQ RlcxLCByZWcpOwo+ICAJCURSTV9ERUJVR19LTVMoIkRTUEZXMSByZWdpc3RlciBpcyAleFxuIiwg cmVnKTsKPiAgCj4gQEAgLTY3MSw3ICs2NzQsNyBAQCBzdGF0aWMgdm9pZCBwaW5ldmlld191cGRh dGVfd20oc3RydWN0IGRybV9jcnRjICp1bnVzZWRfY3J0YykKPiAgCQkJCQlwaXhlbF9zaXplLCBs YXRlbmN5LT5jdXJzb3Jfc3IpOwo+ICAJCXJlZyA9IEk5MTVfUkVBRChEU1BGVzMpOwo+ICAJCXJl ZyAmPSB+RFNQRldfQ1VSU09SX1NSX01BU0s7Cj4gLQkJcmVnIHw9ICh3bSAmIDB4M2YpIDw8IERT UEZXX0NVUlNPUl9TUl9TSElGVDsKPiArCQlyZWcgfD0gRldfV00od20sIENVUlNPUl9TUik7Cj4g IAkJSTkxNV9XUklURShEU1BGVzMsIHJlZyk7Cj4gIAo+ICAJCS8qIERpc3BsYXkgSFBMTCBvZmYg U1IgKi8KPiBAQCAtNjgwLDcgKzY4Myw3IEBAIHN0YXRpYyB2b2lkIHBpbmV2aWV3X3VwZGF0ZV93 bShzdHJ1Y3QgZHJtX2NydGMgKnVudXNlZF9jcnRjKQo+ICAJCQkJCXBpeGVsX3NpemUsIGxhdGVu Y3ktPmRpc3BsYXlfaHBsbF9kaXNhYmxlKTsKPiAgCQlyZWcgPSBJOTE1X1JFQUQoRFNQRlczKTsK PiAgCQlyZWcgJj0gfkRTUEZXX0hQTExfU1JfTUFTSzsKPiAtCQlyZWcgfD0gd20gJiBEU1BGV19I UExMX1NSX01BU0s7Cj4gKwkJcmVnIHw9IEZXX1dNKHdtLCBIUExMX1NSKTsKPiAgCQlJOTE1X1dS SVRFKERTUEZXMywgcmVnKTsKPiAgCj4gIAkJLyogY3Vyc29yIEhQTEwgb2ZmIFNSICovCj4gQEAg LTY4OSw3ICs2OTIsNyBAQCBzdGF0aWMgdm9pZCBwaW5ldmlld191cGRhdGVfd20oc3RydWN0IGRy bV9jcnRjICp1bnVzZWRfY3J0YykKPiAgCQkJCQlwaXhlbF9zaXplLCBsYXRlbmN5LT5jdXJzb3Jf aHBsbF9kaXNhYmxlKTsKPiAgCQlyZWcgPSBJOTE1X1JFQUQoRFNQRlczKTsKPiAgCQlyZWcgJj0g fkRTUEZXX0hQTExfQ1VSU09SX01BU0s7Cj4gLQkJcmVnIHw9ICh3bSAmIDB4M2YpIDw8IERTUEZX X0hQTExfQ1VSU09SX1NISUZUOwo+ICsJCXJlZyB8PSBGV19XTSh3bSwgSFBMTF9DVVJTT1IpOwo+ ICAJCUk5MTVfV1JJVEUoRFNQRlczLCByZWcpOwo+ICAJCURSTV9ERUJVR19LTVMoIkRTUEZXMyBy ZWdpc3RlciBpcyAleFxuIiwgcmVnKTsKPiAgCj4gQEAgLTgzNSw4ICs4MzgsNiBAQCBzdGF0aWMg Ym9vbCBnNHhfY29tcHV0ZV9zcndtKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCj4gIAkJCSAgICAg IGRpc3BsYXksIGN1cnNvcik7Cj4gIH0KPiAgCj4gLSNkZWZpbmUgRldfV00odmFsdWUsIHBsYW5l KSBcCj4gLQkoKCh2YWx1ZSkgPDwgRFNQRldfICMjIHBsYW5lICMjIF9TSElGVCkgJiBEU1BGV18g IyMgcGxhbmUgIyMgX01BU0spCj4gICNkZWZpbmUgRldfV01fVkxWKHZhbHVlLCBwbGFuZSkgXAo+ ICAJKCgodmFsdWUpIDw8IERTUEZXXyAjIyBwbGFuZSAjIyBfU0hJRlQpICYgRFNQRldfICMjIHBs YW5lICMjIF9NQVNLX1ZMVikKPiAgCj4gQEAgLTkwNCw3ICs5MDUsNiBAQCBzdGF0aWMgdm9pZCB2 bHZfd3JpdGVfd21fdmFsdWVzKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAo+ICAJZGV2X3ByaXYt PndtLnZsdiA9ICp3bTsKPiAgfQo+ICAKPiAtI3VuZGVmIEZXX1dNCj4gICN1bmRlZiBGV19XTV9W TFYKPiAgCj4gIHN0YXRpYyB1aW50OF90IHZsdl9jb21wdXRlX2RyYWluX2xhdGVuY3koc3RydWN0 IGRybV9jcnRjICpjcnRjLAo+IEBAIC0xMTYzLDE3ICsxMTYzLDE3IEBAIHN0YXRpYyB2b2lkIGc0 eF91cGRhdGVfd20oc3RydWN0IGRybV9jcnRjICpjcnRjKQo+ICAJCSAgICAgIHBsYW5lX3NyLCBj dXJzb3Jfc3IpOwo+ICAKPiAgCUk5MTVfV1JJVEUoRFNQRlcxLAo+IC0JCSAgIChwbGFuZV9zciA8 PCBEU1BGV19TUl9TSElGVCkgfAo+IC0JCSAgIChjdXJzb3JiX3dtIDw8IERTUEZXX0NVUlNPUkJf U0hJRlQpIHwKPiAtCQkgICAocGxhbmViX3dtIDw8IERTUEZXX1BMQU5FQl9TSElGVCkgfAo+IC0J CSAgIChwbGFuZWFfd20gPDwgRFNQRldfUExBTkVBX1NISUZUKSk7Cj4gKwkJICAgRldfV00ocGxh bmVfc3IsIFNSKSB8Cj4gKwkJICAgRldfV00oY3Vyc29yYl93bSwgQ1VSU09SQikgfAo+ICsJCSAg IEZXX1dNKHBsYW5lYl93bSwgUExBTkVCKSB8Cj4gKwkJICAgRldfV00ocGxhbmVhX3dtLCBQTEFO RUEpKTsKPiAgCUk5MTVfV1JJVEUoRFNQRlcyLAo+ICAJCSAgIChJOTE1X1JFQUQoRFNQRlcyKSAm IH5EU1BGV19DVVJTT1JBX01BU0spIHwKPiAtCQkgICAoY3Vyc29yYV93bSA8PCBEU1BGV19DVVJT T1JBX1NISUZUKSk7Cj4gKwkJICAgRldfV00oY3Vyc29yYV93bSwgQ1VSU09SQSkpOwo+ICAJLyog SFBMTCBvZmYgaW4gU1IgaGFzIHNvbWUgaXNzdWVzIG9uIEc0eC4uLiBkaXNhYmxlIGl0ICovCj4g IAlJOTE1X1dSSVRFKERTUEZXMywKPiAgCQkgICAoSTkxNV9SRUFEKERTUEZXMykgJiB+KERTUEZX X0hQTExfU1JfRU4gfCBEU1BGV19DVVJTT1JfU1JfTUFTSykpIHwKPiAtCQkgICAoY3Vyc29yX3Ny IDw8IERTUEZXX0NVUlNPUl9TUl9TSElGVCkpOwo+ICsJCSAgIEZXX1dNKGN1cnNvcl9zciwgQ1VS U09SX1NSKSk7Cj4gIAo+ICAJaWYgKGN4c3JfZW5hYmxlZCkKPiAgCQlpbnRlbF9zZXRfbWVtb3J5 X2N4c3IoZGV2X3ByaXYsIHRydWUpOwo+IEBAIC0xMjM5LDE5ICsxMjM5LDIxIEBAIHN0YXRpYyB2 b2lkIGk5NjVfdXBkYXRlX3dtKHN0cnVjdCBkcm1fY3J0YyAqdW51c2VkX2NydGMpCj4gIAkJICAg ICAgc3J3bSk7Cj4gIAo+ICAJLyogOTY1IGhhcyBsaW1pdGF0aW9ucy4uLiAqLwo+IC0JSTkxNV9X UklURShEU1BGVzEsIChzcndtIDw8IERTUEZXX1NSX1NISUZUKSB8Cj4gLQkJICAgKDggPDwgRFNQ RldfQ1VSU09SQl9TSElGVCkgfAo+IC0JCSAgICg4IDw8IERTUEZXX1BMQU5FQl9TSElGVCkgfAo+ IC0JCSAgICg4IDw8IERTUEZXX1BMQU5FQV9TSElGVCkpOwo+IC0JSTkxNV9XUklURShEU1BGVzIs ICg4IDw8IERTUEZXX0NVUlNPUkFfU0hJRlQpIHwKPiAtCQkgICAoOCA8PCBEU1BGV19QTEFORUNf U0hJRlRfT0xEKSk7Cj4gKwlJOTE1X1dSSVRFKERTUEZXMSwgRldfV00oc3J3bSwgU1IpIHwKPiAr CQkgICBGV19XTSg4LCBDVVJTT1JCKSB8Cj4gKwkJICAgRldfV00oOCwgUExBTkVCKSB8Cj4gKwkJ ICAgRldfV00oOCwgUExBTkVBKSk7Cj4gKwlJOTE1X1dSSVRFKERTUEZXMiwgRldfV00oOCwgQ1VS U09SQSkgfAo+ICsJCSAgIEZXX1dNKDgsIFBMQU5FQ19PTEQpKTsKPiAgCS8qIHVwZGF0ZSBjdXJz b3IgU1Igd2F0ZXJtYXJrICovCj4gLQlJOTE1X1dSSVRFKERTUEZXMywgKGN1cnNvcl9zciA8PCBE U1BGV19DVVJTT1JfU1JfU0hJRlQpKTsKPiArCUk5MTVfV1JJVEUoRFNQRlczLCBGV19XTShjdXJz b3Jfc3IsIENVUlNPUl9TUikpOwo+ICAKPiAgCWlmIChjeHNyX2VuYWJsZWQpCj4gIAkJaW50ZWxf c2V0X21lbW9yeV9jeHNyKGRldl9wcml2LCB0cnVlKTsKPiAgfQo+ICAKPiArI3VuZGVmIEZXX1dN Cj4gKwo+ICBzdGF0aWMgdm9pZCBpOXh4X3VwZGF0ZV93bShzdHJ1Y3QgZHJtX2NydGMgKnVudXNl ZF9jcnRjKQo+ICB7Cj4gIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gdW51c2VkX2NydGMtPmRl djsKPiAKClJldmlld2VkLWJ5OiBKZXNzZSBCYXJuZXMgPGpiYXJuZXNAdmlydHVvdXNnZWVrLm9y Zz4KX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwt Z2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK