From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michel Thierry Subject: [PATCH v3] drm/i915: Workaround to avoid lite restore with HEAD==TAIL Date: Wed, 15 Apr 2015 17:17:13 +0100 Message-ID: <1429114633-17185-1-git-send-email-michel.thierry@intel.com> References: <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 mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 0691E6E121 for ; Wed, 15 Apr 2015 09:17:14 -0700 (PDT) In-Reply-To: <1428658353-20692-1-git-send-email-michel.thierry@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 List-Id: intel-gfx@lists.freedesktop.org V2FJZGxlTGl0ZVJlc3RvcmUgaXMgYW4gZXhlY2xpc3RzLW9ubHkgd29ya2Fyb3VuZCwgYW5kIHJl cXVpcmVzIHRoZSBkcml2ZXIKdG8gZW5zdXJlIHRoYXQgYW55IGNvbnRleHQgYWx3YXlzIGhhcyBI RUFEIT1UQUlMIHdoZW4gYXR0ZW1wdGluZyBsaXRlCnJlc3RvcmUuCgpBZGQgdHdvIGV4dHJhIE1J X05PT1AgaW5zdHJ1Y3Rpb25zIGF0IHRoZSBlbmQgb2YgZWFjaCByZXF1ZXN0LCBidXQga2VlcAp0 aGUgcmVxdWVzdHMgdGFpbCBwb2ludGluZyBiZWZvcmUgdGhlIE1JX05PT1BzLiBXZSBtYXkgbm90 IG5lZWQgdG8KZXhlY3V0ZWQgdGhlbSwgYW5kIHRoaXMgaXMgd2h5IHJlcXVlc3QtPnRhaWwgbXVz dCBiZSBzYW1wbGVkIGJlZm9yZSBhZGRpbmcKdGhlc2UgZXh0cmEgaW5zdHJ1Y3Rpb25zLgoKSWYg d2Ugc3VibWl0IGEgY29udGV4dCB0byB0aGUgRUxTUCB3aGljaCBoYXMgcHJldmlvdXNseSBiZWVu IHN1Ym1pdHRlZCwKbW92ZSB0aGUgdGFpbCBwb2ludGVyIHBhc3QgdGhlIE1JX05PT1BzLiBUaGlz IGVuc3VyZXMgSEVBRCE9VEFJTC4KCnYyOiBNb3ZlIG92ZXJhbGxvY2F0aW9uIHRvIGdlbjhfZW1p dF9yZXF1ZXN0LCBhbmQgYWRkZWQgbm90ZSBhYm91dApzYW1wbGluZyByZXF1ZXN0LT50YWlsIGlu IGNvbW1pdCBtZXNzYWdlIChDaHJpcykuCgp2MzogUmVtb3ZlIHJlZHVuZGFudCByZXF1ZXN0LT50 YWlsIGFzc2lnbm1lbnQgaW4gX19pOTE1X2FkZF9yZXF1ZXN0LCBpbgpscmMgbW9kZSB0aGlzIGlz IGFscmVhZHkgc2V0IGluIGV4ZWNsaXN0c19jb250ZXh0X3F1ZXVlLgpEbyBub3QgYWRkIHdhIGlt cGxlbWVudGF0aW9uIGRldGFpbHMgaW5zaWRlIGdlbSAoQ2hyaXMpLgoKQ2M6IENocmlzIFdpbHNv biA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpTaWduZWQtb2ZmLWJ5OiBUaG9tYXMgRGFuaWVs IDx0aG9tYXMuZGFuaWVsQGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogTWljaGVsIFRoaWVycnkg PG1pY2hlbC50aGllcnJ5QGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbS5jICB8ICAzICsrLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgfCAzNSAr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLQogMiBmaWxlcyBjaGFuZ2VkLCAzNiBp bnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4 IDNkNWE1YTguLjk4MGUxN2MgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtMjQwMCwxMCAr MjQwMCwxMSBAQCBpbnQgX19pOTE1X2FkZF9yZXF1ZXN0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg KnJpbmcsCiAJCXJldCA9IHJpbmctPmFkZF9yZXF1ZXN0KHJpbmcpOwogCQlpZiAocmV0KQogCQkJ cmV0dXJuIHJldDsKKworCQlyZXF1ZXN0LT50YWlsID0gaW50ZWxfcmluZ19nZXRfdGFpbChyaW5n YnVmKTsKIAl9CiAKIAlyZXF1ZXN0LT5oZWFkID0gcmVxdWVzdF9zdGFydDsKLQlyZXF1ZXN0LT50 YWlsID0gaW50ZWxfcmluZ19nZXRfdGFpbChyaW5nYnVmKTsKIAogCS8qIFdoaWxzdCB0aGlzIHJl cXVlc3QgZXhpc3RzLCBiYXRjaF9vYmogd2lsbCBiZSBvbiB0aGUKIAkgKiBhY3RpdmVfbGlzdCwg YW5kIHNvIHdpbGwgaG9sZCB0aGUgYWN0aXZlIHJlZmVyZW5jZS4gT25seSB3aGVuIHRoaXMKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfbHJjLmMKaW5kZXggZjRhNWVmOS4uMDI5NjM1MCAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfbHJjLmMKQEAgLTQyNyw2ICs0MjcsMjYgQEAgc3RhdGljIHZvaWQgZXhlY2xpc3Rz X2NvbnRleHRfdW5xdWV1ZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQogCQl9CiAJfQog CisJaWYgKElTX0dFTjgocmluZy0+ZGV2KSB8fCBJU19HRU45KHJpbmctPmRldikpIHsKKwkJLyoK KwkJICogV2FJZGxlTGl0ZVJlc3RvcmU6IG1ha2Ugc3VyZSB3ZSBuZXZlciBjYXVzZSBhIGxpdGUK KwkJICogcmVzdG9yZSB3aXRoIEhFQUQ9PVRBSUwKKwkJICovCisJCWlmIChyZXEwICYmIHJlcTAt PmVsc3Bfc3VibWl0dGVkID09IDEpIHsKKwkJCS8qCisJCQkgKiBDb25zdW1lIHRoZSBidWZmZXIg Tk9PUHMgdG8gZW5zdXJlIEhFQUQgIT0gVEFJTCB3aGVuCisJCQkgKiBzdWJtaXR0aW5nLiBlbHNw X3N1Ym1pdHRlZCBjYW4gb25seSBiZSA+MSBhZnRlcgorCQkJICogcmVzZXQsIGluIHdoaWNoIGNh c2Ugd2UgZG9uJ3QgbmVlZCB0aGUgd29ya2Fyb3VuZCBhcworCQkJICogYSBsaXRlIHJlc3RvcmUg d2lsbCBub3Qgb2NjdXIuCisJCQkgKi8KKwkJCXN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5n YnVmOworCisJCQlyaW5nYnVmID0gcmVxMC0+Y3R4LT5lbmdpbmVbcmluZy0+aWRdLnJpbmdidWY7 CisJCQlyZXEwLT50YWlsICs9IDg7CisJCQlyZXEwLT50YWlsICY9IHJpbmdidWYtPnNpemUgLSAx OworCQl9CisJfQorCiAJV0FSTl9PTihyZXExICYmIHJlcTEtPmVsc3Bfc3VibWl0dGVkKTsKIAog CWV4ZWNsaXN0c19zdWJtaXRfY29udGV4dHMocmluZywgcmVxMC0+Y3R4LCByZXEwLT50YWlsLApA QCAtMTI4OSw3ICsxMzA5LDEyIEBAIHN0YXRpYyBpbnQgZ2VuOF9lbWl0X3JlcXVlc3Qoc3RydWN0 IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYsCiAJdTMyIGNtZDsKIAlpbnQgcmV0OwogCi0JcmV0 ID0gaW50ZWxfbG9naWNhbF9yaW5nX2JlZ2luKHJpbmdidWYsIHJlcXVlc3QtPmN0eCwgNik7CisJ LyoKKwkgKiBSZXNlcnZlIHNwYWNlIGZvciAyIE5PT1BzIGF0IHRoZSBlbmQgb2YgZWFjaCByZXF1 ZXN0IHRvIGJlCisJICogdXNlZCBhcyBhIHdvcmthcm91bmQgZm9yIG5vdCBiZWluZyBhbGxvd2Vk IHRvIGRvIGxpdGUKKwkgKiByZXN0b3JlIHdpdGggSEVBRD09VEFJTCAoV2FJZGxlTGl0ZVJlc3Rv cmUpLgorCSAqLworCXJldCA9IGludGVsX2xvZ2ljYWxfcmluZ19iZWdpbihyaW5nYnVmLCByZXF1 ZXN0LT5jdHgsIDgpOwogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKQEAgLTEzMDcsNiArMTMz MiwxNCBAQCBzdGF0aWMgaW50IGdlbjhfZW1pdF9yZXF1ZXN0KHN0cnVjdCBpbnRlbF9yaW5nYnVm ZmVyICpyaW5nYnVmLAogCWludGVsX2xvZ2ljYWxfcmluZ19lbWl0KHJpbmdidWYsIE1JX05PT1Ap OwogCWludGVsX2xvZ2ljYWxfcmluZ19hZHZhbmNlX2FuZF9zdWJtaXQocmluZ2J1ZiwgcmVxdWVz dC0+Y3R4LCByZXF1ZXN0KTsKIAorCS8qCisJICogSGVyZSB3ZSBhZGQgdHdvIGV4dHJhIE5PT1Bz IGFzIHBhZGRpbmcgdG8gYXZvaWQKKwkgKiBsaXRlIHJlc3RvcmUgb2YgYSBjb250ZXh0IHdpdGgg SEVBRD09VEFJTC4KKwkgKi8KKwlpbnRlbF9sb2dpY2FsX3JpbmdfZW1pdChyaW5nYnVmLCBNSV9O T09QKTsKKwlpbnRlbF9sb2dpY2FsX3JpbmdfZW1pdChyaW5nYnVmLCBNSV9OT09QKTsKKwlpbnRl bF9sb2dpY2FsX3JpbmdfYWR2YW5jZShyaW5nYnVmKTsKKwogCXJldHVybiAwOwogfQogCi0tIAoy LjEuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50 ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK