From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH] drm/i915: Fix botched merge that downgrades CSR versions. Date: Thu, 25 Aug 2016 14:29:00 +0300 Message-ID: <877fb5t7cz.fsf@intel.com> References: <1471939811-9817-1-git-send-email-maarten.lankhorst@linux.intel.com> <1471939811-9817-2-git-send-email-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1471939811-9817-2-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 T24gVHVlLCAyMyBBdWcgMjAxNiwgTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0 QGxpbnV4LmludGVsLmNvbT4gd3JvdGU6Cj4gTWVyZ2UgY29tbWl0IDVlNTgwNTIzZDkxMjhhNGQ4 IHJldmVydHMgdGhlIHZlcnNpb24gYnVtcGluZyBwYXJ0cyBvZgo+IGNvbW1pdCA0YWE3ZmI5YzNj NGZhMC4gQnVtcCB0aGUgdmVyc2lvbnMgYWdhaW4gYW5kIHJlcXVlc3QgdGhlIHNwZWNpZmljCj4g ZmlybXdhcmUgdmVyc2lvbi4KPgo+IFRoZSBjdXJyZW50bHkgcmVjb21tZW5kZWQgdmVyc2lvbnMg YXJlOiBTS0wgMS4yNiwgS0JMIDEuMDEgYW5kIEJYVCAxLjA3Lgo+Cj4gQ2M6IFBhdHJpayBKYWtv YnNzb24gPHBhdHJpay5qYWtvYnNzb25AbGludXguaW50ZWwuY29tPgo+IENjOiBJbXJlIERlYWsg PGltcmUuZGVha0BpbnRlbC5jb20+Cj4gQnVnemlsbGE6IGh0dHBzOi8vYnVncy5mcmVlZGVza3Rv cC5vcmcvc2hvd19idWcuY2dpP2lkPTk3MjQyCj4gQ2M6IGRybS1pbnRlbC1maXhlc0BsaXN0cy5m cmVlZGVza3RvcC5vcmcKPiBGaXhlczogNWU1ODA1MjNkOTEyICgiQmFja21lcmdlIHRhZyAndjQu NycgaW50byBkcm0tbmV4dCIpCj4gU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1h YXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KClRoaXMgaXMgYWxyZWFkeSBpbiBkaW5x IGFzIDUzNmFiM2NhMTllZiAoImRybS9pOTE1OiBGaXggYm90Y2hlZCBtZXJnZQp0aGF0IGRvd25n cmFkZXMgQ1NSIHZlcnNpb25zLiIpLCBhbmQgY2hlcnJ5LXBpY2tlZCB0byBmaXhlcyBhcwoxNzdk OTFhYWVhNGIgKCJkcm0vaTkxNTogRml4IGJvdGNoZWQgbWVyZ2UgdGhhdCBkb3duZ3JhZGVzIENT Ugp2ZXJzaW9ucy4iKS4gSXQncyBhbHNvIGluIG15IHRvZGF5J3MgcHVsbCByZXF1ZXN0IHRvIERh dmUuCgpCUiwKSmFuaS4KCgo+IC0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jc3Iu YyB8IDggKysrKy0tLS0KPiAgMSBmaWxlIGNoYW5nZWQsIDQgaW5zZXJ0aW9ucygrKSwgNCBkZWxl dGlvbnMoLSkKPgo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jc3Iu YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Nzci5jCj4gaW5kZXggZmIyN2QxODc4NzZj Li4xZWEwZTFmNDMzOTcgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf Y3NyLmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jc3IuYwo+IEBAIC0zNCwx NSArMzQsMTUgQEAKPiAgICogbG93LXBvd2VyIHN0YXRlIGFuZCBjb21lcyBiYWNrIHRvIG5vcm1h bC4KPiAgICovCj4gIAo+IC0jZGVmaW5lIEk5MTVfQ1NSX0tCTCAiaTkxNS9rYmxfZG1jX3ZlcjEu YmluIgo+ICsjZGVmaW5lIEk5MTVfQ1NSX0tCTCAiaTkxNS9rYmxfZG1jX3ZlcjFfMDEuYmluIgo+ ICBNT0RVTEVfRklSTVdBUkUoSTkxNV9DU1JfS0JMKTsKPiAgI2RlZmluZSBLQkxfQ1NSX1ZFUlNJ T05fUkVRVUlSRUQJQ1NSX1ZFUlNJT04oMSwgMSkKPiAgCj4gLSNkZWZpbmUgSTkxNV9DU1JfU0tM ICJpOTE1L3NrbF9kbWNfdmVyMS5iaW4iCj4gKyNkZWZpbmUgSTkxNV9DU1JfU0tMICJpOTE1L3Nr bF9kbWNfdmVyMV8yNi5iaW4iCj4gIE1PRFVMRV9GSVJNV0FSRShJOTE1X0NTUl9TS0wpOwo+IC0j ZGVmaW5lIFNLTF9DU1JfVkVSU0lPTl9SRVFVSVJFRAlDU1JfVkVSU0lPTigxLCAyMykKPiArI2Rl ZmluZSBTS0xfQ1NSX1ZFUlNJT05fUkVRVUlSRUQJQ1NSX1ZFUlNJT04oMSwgMjYpCj4gIAo+IC0j ZGVmaW5lIEk5MTVfQ1NSX0JYVCAiaTkxNS9ieHRfZG1jX3ZlcjEuYmluIgo+ICsjZGVmaW5lIEk5 MTVfQ1NSX0JYVCAiaTkxNS9ieHRfZG1jX3ZlcjFfMDcuYmluIgo+ICBNT0RVTEVfRklSTVdBUkUo STkxNV9DU1JfQlhUKTsKPiAgI2RlZmluZSBCWFRfQ1NSX1ZFUlNJT05fUkVRVUlSRUQJQ1NSX1ZF UlNJT04oMSwgNykKCi0tIApKYW5pIE5pa3VsYSwgSW50ZWwgT3BlbiBTb3VyY2UgVGVjaG5vbG9n eSBDZW50ZXIKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K SW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==