From: Michel Thierry Subject: [PATCH] drm/i915: Workaround to avoid lite restore with HEAD==TAIL Date: Fri, 10 Apr 2015 10:32:33 +0100 Message-ID: <1428658353-20692-1-git-send-email-michel.thierry@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 046C46E907 for ; Fri, 10 Apr 2015 02:32:29 -0700 (PDT) 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 List-Id: intel-gfx@lists.freedesktop.org V2FJZGxlTGl0ZVJlc3RvcmUgaXMgYW4gZXhlY2xpc3RzLW9ubHkgd29ya2Fyb3VuZCwgYW5kIHJl cXVpcmVzIHRoZSBkcml2ZXIKdG8gZW5zdXJlIHRoYXQgYW55IGNvbnRleHQgYWx3YXlzIGhhcyBI RUFEIT1UQUlMIHdoZW4gYXR0ZW1wdGluZyBsaXRlCnJlc3RvcmUuCgpBZGQgdHdvIGV4dHJhIE1J X05PT1AgaW5zdHJ1Y3Rpb25zIGF0IHRoZSBlbmQgb2YgZWFjaCByZXF1ZXN0LCBidXQga2VlcAp0 aGUgcmVxdWVzdHMgdGFpbCBwb2ludGluZyBiZWZvcmUgdGhlIE1JX05PT1BzLgoKSWYgd2Ugc3Vi bWl0IGEgY29udGV4dCB0byB0aGUgRUxTUCB3aGljaCBoYXMgcHJldmlvdXNseSBiZWVuIHN1Ym1p dHRlZCwKbW92ZSB0aGUgdGFpbCBwb2ludGVyIHBhc3QgdGhlIE1JX05PT1BzLiBUaGlzIGVuc3Vy ZXMgSEVBRCE9VEFJTC4KClNpZ25lZC1vZmYtYnk6IFRob21hcyBEYW5pZWwgPHRob21hcy5kYW5p ZWxAaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBNaWNoZWwgVGhpZXJyeSA8bWljaGVsLnRoaWVy cnlAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgIHwgMTEg KysrKysrKysrKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIHwgMjkgKysrKysr KysrKysrKysrKysrKysrKysrKysrKysKIDIgZmlsZXMgY2hhbmdlZCwgNDAgaW5zZXJ0aW9ucygr KQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IGNhNTIyYzkuLmE0NDA3MGEgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW0uYwpAQCAtMjM4Miw2ICsyMzgyLDE3IEBAIGludCBfX2k5MTVfYWRkX3Jl cXVlc3Qoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKIAlyZXF1ZXN0LT5oZWFkID0gcmVx dWVzdF9zdGFydDsKIAlyZXF1ZXN0LT50YWlsID0gaW50ZWxfcmluZ19nZXRfdGFpbChyaW5nYnVm KTsKIAorCWlmIChpOTE1LmVuYWJsZV9leGVjbGlzdHMgJiYKKwkgICAgKElTX0dFTjgocmluZy0+ ZGV2KSB8fCBJU19HRU45KHJpbmctPmRldikpKSB7CisJCS8qCisJCSAqIEhlcmUgd2UgYWRkIHR3 byBleHRyYSBOT09QcyBhcyBwYWRkaW5nIHRvIGF2b2lkCisJCSAqIGxpdGUgcmVzdG9yZSBvZiBh IGNvbnRleHQgd2l0aCBIRUFEPT1UQUlMLgorCQkgKi8KKwkJaW50ZWxfbG9naWNhbF9yaW5nX2Vt aXQocmluZ2J1ZiwgTUlfTk9PUCk7CisJCWludGVsX2xvZ2ljYWxfcmluZ19lbWl0KHJpbmdidWYs IE1JX05PT1ApOworCQlpbnRlbF9sb2dpY2FsX3JpbmdfYWR2YW5jZShyaW5nYnVmKTsKKwl9CisK IAkvKiBXaGlsc3QgdGhpcyByZXF1ZXN0IGV4aXN0cywgYmF0Y2hfb2JqIHdpbGwgYmUgb24gdGhl CiAJICogYWN0aXZlX2xpc3QsIGFuZCBzbyB3aWxsIGhvbGQgdGhlIGFjdGl2ZSByZWZlcmVuY2Uu IE9ubHkgd2hlbiB0aGlzCiAJICogcmVxdWVzdCBpcyByZXRpcmVkIHdpbGwgdGhlIHRoZSBiYXRj aF9vYmogYmUgbW92ZWQgb250byB0aGUKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKaW5kZXggZjE4 Zjk2Yy4uOGFjZWRjYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJj LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKQEAgLTQxMyw2ICs0MTMs MjYgQEAgc3RhdGljIHZvaWQgZXhlY2xpc3RzX2NvbnRleHRfdW5xdWV1ZShzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICpyaW5nKQogCQl9CiAJfQogCisJaWYgKElTX0dFTjgocmluZy0+ZGV2KSB8fCBJ U19HRU45KHJpbmctPmRldikpIHsKKwkJLyoKKwkJICogV2FJZGxlTGl0ZVJlc3RvcmU6IG1ha2Ug c3VyZSB3ZSBuZXZlciBjYXVzZSBhIGxpdGUKKwkJICogcmVzdG9yZSB3aXRoIEhFQUQ9PVRBSUwK KwkJICovCisJCWlmIChyZXEwICYmIHJlcTAtPmVsc3Bfc3VibWl0dGVkID09IDEpIHsKKwkJCS8q CisJCQkgKiBDb25zdW1lIHRoZSBidWZmZXIgTk9PUHMgdG8gZW5zdXJlIEhFQUQgIT0gVEFJTCB3 aGVuCisJCQkgKiBzdWJtaXR0aW5nLiBlbHNwX3N1Ym1pdHRlZCBjYW4gb25seSBiZSA+MSBhZnRl cgorCQkJICogcmVzZXQsIGluIHdoaWNoIGNhc2Ugd2UgZG9uJ3QgbmVlZCB0aGUgd29ya2Fyb3Vu ZCBhcworCQkJICogYSBsaXRlIHJlc3RvcmUgd2lsbCBub3Qgb2NjdXIuCisJCQkgKi8KKwkJCXN0 cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmOworCisJCQlyaW5nYnVmID0gcmVxMC0+Y3R4 LT5lbmdpbmVbcmluZy0+aWRdLnJpbmdidWY7CisJCQlyZXEwLT50YWlsICs9IDg7CisJCQlyZXEw LT50YWlsICY9IHJpbmdidWYtPnNpemUgLSAxOworCQl9CisJfQorCiAJV0FSTl9PTihyZXExICYm IHJlcTEtPmVsc3Bfc3VibWl0dGVkKTsKIAogCWV4ZWNsaXN0c19zdWJtaXRfY29udGV4dHMocmlu ZywgcmVxMC0+Y3R4LCByZXEwLT50YWlsLApAQCAtODI5LDYgKzg0OSwxNSBAQCBzdGF0aWMgaW50 IGludGVsX2xvZ2ljYWxfcmluZ19iZWdpbihzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1 ZiwKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRl OwogCWludCByZXQ7CiAKKwlpZiAoSVNfR0VOOChkZXYpIHx8IElTX0dFTjkoZGV2KSkgeworCQkv KgorCQkgKiBSZXNlcnZlIHNwYWNlIGZvciAyIE5PT1BzIGF0IHRoZSBlbmQgb2YgZWFjaCByZXF1 ZXN0IHRvIGJlCisJCSAqIHVzZWQgYXMgYSB3b3JrYXJvdW5kIGZvciBub3QgYmVpbmcgYWxsb3dl ZCB0byBkbyBsaXRlCisJCSAqIHJlc3RvcmUgd2l0aCBIRUFEPT1UQUlMLgorCQkgKi8KKwkJbnVt X2R3b3JkcyArPSAyOworCX0KKwogCXJldCA9IGk5MTVfZ2VtX2NoZWNrX3dlZGdlKCZkZXZfcHJp di0+Z3B1X2Vycm9yLAogCQkJCSAgIGRldl9wcml2LT5tbS5pbnRlcnJ1cHRpYmxlKTsKIAlpZiAo cmV0KQotLSAKMi4xLjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwt Z2Z4Cg==