From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: Re: [PATCH] drm/i915: Fix botched merge that downgrades CSR versions. Date: Mon, 15 Aug 2016 16:27:16 +0300 Message-ID: <1471267636.15863.10.camel@intel.com> References: <1471266567-22443-1-git-send-email-maarten.lankhorst@linux.intel.com> Reply-To: imre.deak@intel.com Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1471266567-22443-1-git-send-email-maarten.lankhorst@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: Maarten Lankhorst , intel-gfx@lists.freedesktop.org Cc: drm-intel-fixes@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gbWEsIDIwMTYtMDgtMTUgYXQgMTU6MDkgKzAyMDAsIE1hYXJ0ZW4gTGFua2hvcnN0IHdyb3Rl Ogo+IE1lcmdlIGNvbW1pdCA1ZTU4MDUyM2Q5MTI4YTRkOCByZXZlcnRzIHRoZSB2ZXJzaW9uIGJ1 bXBpbmcgcGFydHMgb2YKPiBjb21taXQgNGFhN2ZiOWMzYzRmYTAuIEJ1bXAgdGhlIHZlcnNpb25z IGFnYWluIGFuZCByZXF1ZXN0IHRoZSBzcGVjaWZpYwo+IGZpcm13YXJlIHZlcnNpb24uCj4gCj4g VGhlIGN1cnJlbnRseSByZWNvbW1lbmRlZCB2ZXJzaW9ucyBhcmU6IFNLTCAxLjI2LCBLQkwgMS4w MSBhbmQgQlhUIDEuMDcuCj4gCj4gQ2M6IFBhdHJpayBKYWtvYnNzb24gPHBhdHJpay5qYWtvYnNz b25AbGludXguaW50ZWwuY29tPgo+IENjOiBJbXJlIERlYWsgPGltcmUuZGVha0BpbnRlbC5jb20+ Cj4gQnVnemlsbGE6IGh0dHBzOi8vYnVncy5mcmVlZGVza3RvcC5vcmcvc2hvd19idWcuY2dpP2lk PTk3MjQyCj4gQ2M6IGRybS1pbnRlbC1maXhlc0BsaXN0cy5mcmVlZGVza3RvcC5vcmcKPiBGaXhl czogNWU1ODA1MjNkOTEyICgiQmFja21lcmdlIHRhZyAndjQuNycgaW50byBkcm0tbmV4dCIpCgpJ IHRoaW5rIGl0IHdhcyA5NDU1OGUyNjViICgiTWVyZ2UgcmVtb3RlLXRyYWNraW5nIGJyYW5jaCAn YWlybGllZC9kcm0tCm5leHQnIGludG8gZHJtLWludGVsLW5leHQtcXVldWVkIikuCgo+IE1lcmdl IGNvbW1pdCA1ZTU4MDUyM2Q5MTI4YTRkOCByZXZlcnRzIHRoZSB2ZXJzaW9uIGJ1bXBpbmcgcGFy dHMgb2YKPiBjb21taXQgNGFhN2ZiOWMzYzRmYTAuIEJ1bXAgdGhlIHZlcnNpb25zIGFnYWluIGFu ZCByZXF1ZXN0IHRoZSBzcGVjaWZpYwo+IGZpcm13YXJlIHZlcnNpb24uCj4gCj4gVGhlIGN1cnJl bnRseSByZWNvbW1lbmRlZCB2ZXJzaW9ucyBhcmU6IFNLTCAxLjI2LCBLQkwgMS4wMSBhbmQgQlhU IDEuMDcuCj4gCj4gQ2M6IFBhdHJpayBKYWtvYnNzb24gPHBhdHJpay5qYWtvYnNzb25AbGludXgu aW50ZWwuY29tPgo+IENjOiBJbXJlIERlYWsgPGltcmUuZGVha0BpbnRlbC5jb20+Cj4gQnVnemls bGE6IGh0dHBzOi8vYnVncy5mcmVlZGVza3RvcC5vcmcvc2hvd19idWcuY2dpP2lkPTk3MjQyCj4g Q2M6IGRybS1pbnRlbC1maXhlc0BsaXN0cy5mcmVlZGVza3RvcC5vcmcKPiBGaXhlczogNWU1ODA1 MjNkOTEyICgiQmFja21lcmdlIHRhZyAndjQuNycgaW50byBkcm0tbmV4dCIpCj4gU2lnbmVkLW9m Zi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNv bT4KCldlIG1heSB3YW50IHRvIGJhY2twb3J0IHRoZSBTS0wgdmVyc2lvbiBidW1wIHBhcnQsIHNv IEknZCBoYXZlIGEKc2VwYXJhdGUgY29tbWl0IGZvciB0aGF0LiBFaXRoZXIgd2F5OgpSZXZpZXdl ZC1ieTogSW1yZSBEZWFrIDxpbXJlLmRlYWtAaW50ZWwuY29tPgoKPiAtLS0KPiDCoGRyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Nzci5jIHwgOCArKysrLS0tLQo+IMKgMSBmaWxlIGNoYW5nZWQs IDQgaW5zZXJ0aW9ucygrKSwgNCBkZWxldGlvbnMoLSkKPiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfY3NyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9j c3IuYwo+IGluZGV4IGZiMjdkMTg3ODc2Yy4uMWVhMGUxZjQzMzk3IDEwMDY0NAo+IC0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Nzci5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfY3NyLmMKPiBAQCAtMzQsMTUgKzM0LDE1IEBACj4gwqAgKiBsb3ctcG93ZXIgc3Rh dGUgYW5kIGNvbWVzIGJhY2sgdG8gbm9ybWFsLgo+IMKgICovCj4gwqAKPiAtI2RlZmluZSBJOTE1 X0NTUl9LQkwgImk5MTUva2JsX2RtY192ZXIxLmJpbiIKPiArI2RlZmluZSBJOTE1X0NTUl9LQkwg Imk5MTUva2JsX2RtY192ZXIxXzAxLmJpbiIKPiDCoE1PRFVMRV9GSVJNV0FSRShJOTE1X0NTUl9L QkwpOwo+IMKgI2RlZmluZSBLQkxfQ1NSX1ZFUlNJT05fUkVRVUlSRUQJQ1NSX1ZFUlNJT04oMSwg MSkKPiDCoAo+IC0jZGVmaW5lIEk5MTVfQ1NSX1NLTCAiaTkxNS9za2xfZG1jX3ZlcjEuYmluIgo+ ICsjZGVmaW5lIEk5MTVfQ1NSX1NLTCAiaTkxNS9za2xfZG1jX3ZlcjFfMjYuYmluIgo+IMKgTU9E VUxFX0ZJUk1XQVJFKEk5MTVfQ1NSX1NLTCk7Cj4gLSNkZWZpbmUgU0tMX0NTUl9WRVJTSU9OX1JF UVVJUkVECUNTUl9WRVJTSU9OKDEsIDIzKQo+ICsjZGVmaW5lIFNLTF9DU1JfVkVSU0lPTl9SRVFV SVJFRAlDU1JfVkVSU0lPTigxLCAyNikKPiDCoAo+IC0jZGVmaW5lIEk5MTVfQ1NSX0JYVCAiaTkx NS9ieHRfZG1jX3ZlcjEuYmluIgo+ICsjZGVmaW5lIEk5MTVfQ1NSX0JYVCAiaTkxNS9ieHRfZG1j X3ZlcjFfMDcuYmluIgo+IMKgTU9EVUxFX0ZJUk1XQVJFKEk5MTVfQ1NSX0JYVCk7Cj4gwqAjZGVm aW5lIEJYVF9DU1JfVkVSU0lPTl9SRVFVSVJFRAlDU1JfVkVSU0lPTigxLCA3KQo+IMKgCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWls aW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZy ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=