From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH] drm/i915: Fix botched merge that downgrades CSR versions. Date: Tue, 23 Aug 2016 10:10:06 +0200 Message-ID: <1471939811-9817-2-git-send-email-maarten.lankhorst@linux.intel.com> References: <1471939811-9817-1-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-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: intel-gfx@lists.freedesktop.org Cc: drm-intel-fixes@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org TWVyZ2UgY29tbWl0IDVlNTgwNTIzZDkxMjhhNGQ4IHJldmVydHMgdGhlIHZlcnNpb24gYnVtcGlu ZyBwYXJ0cyBvZgpjb21taXQgNGFhN2ZiOWMzYzRmYTAuIEJ1bXAgdGhlIHZlcnNpb25zIGFnYWlu IGFuZCByZXF1ZXN0IHRoZSBzcGVjaWZpYwpmaXJtd2FyZSB2ZXJzaW9uLgoKVGhlIGN1cnJlbnRs eSByZWNvbW1lbmRlZCB2ZXJzaW9ucyBhcmU6IFNLTCAxLjI2LCBLQkwgMS4wMSBhbmQgQlhUIDEu MDcuCgpDYzogUGF0cmlrIEpha29ic3NvbiA8cGF0cmlrLmpha29ic3NvbkBsaW51eC5pbnRlbC5j b20+CkNjOiBJbXJlIERlYWsgPGltcmUuZGVha0BpbnRlbC5jb20+CkJ1Z3ppbGxhOiBodHRwczov L2J1Z3MuZnJlZWRlc2t0b3Aub3JnL3Nob3dfYnVnLmNnaT9pZD05NzI0MgpDYzogZHJtLWludGVs LWZpeGVzQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpGaXhlczogNWU1ODA1MjNkOTEyICgiQmFja21l cmdlIHRhZyAndjQuNycgaW50byBkcm0tbmV4dCIpClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFu a2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfY3NyLmMgfCA4ICsrKystLS0tCiAxIGZpbGUgY2hhbmdlZCwgNCBp bnNlcnRpb25zKCspLCA0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Nzci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY3NyLmMKaW5k ZXggZmIyN2QxODc4NzZjLi4xZWEwZTFmNDMzOTcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Nzci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Nzci5j CkBAIC0zNCwxNSArMzQsMTUgQEAKICAqIGxvdy1wb3dlciBzdGF0ZSBhbmQgY29tZXMgYmFjayB0 byBub3JtYWwuCiAgKi8KIAotI2RlZmluZSBJOTE1X0NTUl9LQkwgImk5MTUva2JsX2RtY192ZXIx LmJpbiIKKyNkZWZpbmUgSTkxNV9DU1JfS0JMICJpOTE1L2tibF9kbWNfdmVyMV8wMS5iaW4iCiBN T0RVTEVfRklSTVdBUkUoSTkxNV9DU1JfS0JMKTsKICNkZWZpbmUgS0JMX0NTUl9WRVJTSU9OX1JF UVVJUkVECUNTUl9WRVJTSU9OKDEsIDEpCiAKLSNkZWZpbmUgSTkxNV9DU1JfU0tMICJpOTE1L3Nr bF9kbWNfdmVyMS5iaW4iCisjZGVmaW5lIEk5MTVfQ1NSX1NLTCAiaTkxNS9za2xfZG1jX3ZlcjFf MjYuYmluIgogTU9EVUxFX0ZJUk1XQVJFKEk5MTVfQ1NSX1NLTCk7Ci0jZGVmaW5lIFNLTF9DU1Jf VkVSU0lPTl9SRVFVSVJFRAlDU1JfVkVSU0lPTigxLCAyMykKKyNkZWZpbmUgU0tMX0NTUl9WRVJT SU9OX1JFUVVJUkVECUNTUl9WRVJTSU9OKDEsIDI2KQogCi0jZGVmaW5lIEk5MTVfQ1NSX0JYVCAi aTkxNS9ieHRfZG1jX3ZlcjEuYmluIgorI2RlZmluZSBJOTE1X0NTUl9CWFQgImk5MTUvYnh0X2Rt Y192ZXIxXzA3LmJpbiIKIE1PRFVMRV9GSVJNV0FSRShJOTE1X0NTUl9CWFQpOwogI2RlZmluZSBC WFRfQ1NSX1ZFUlNJT05fUkVRVUlSRUQJQ1NSX1ZFUlNJT04oMSwgNykKIAotLSAKMi43LjQKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBt YWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=