From: Michel Thierry Subject: [PATCH v4] drm/i915: Workaround to avoid lite restore with HEAD==TAIL Date: Wed, 15 Apr 2015 18:11:33 +0100 Message-ID: <1429117893-8902-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 C75966E0E1 for ; Wed, 15 Apr 2015 10:11:38 -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 IG5lZWQgdG8KZXhlY3V0ZWQgdGhlbSwgYW5kIHRoaXMgaXMgd2h5IHJlcXVlc3QtPnRhaWwgaXMg c2FtcGxlZCBiZWZvcmUgYWRkaW5nCnRoZXNlIGV4dHJhIGluc3RydWN0aW9ucy4KCklmIHdlIHN1 Ym1pdCBhIGNvbnRleHQgdG8gdGhlIEVMU1Agd2hpY2ggaGFzIHByZXZpb3VzbHkgYmVlbiBzdWJt aXR0ZWQsCm1vdmUgdGhlIHRhaWwgcG9pbnRlciBwYXN0IHRoZSBNSV9OT09Qcy4gVGhpcyBlbnN1 cmVzIEhFQUQhPVRBSUwuCgp2MjogTW92ZSBvdmVyYWxsb2NhdGlvbiB0byBnZW44X2VtaXRfcmVx dWVzdCwgYW5kIGFkZGVkIG5vdGUgYWJvdXQKc2FtcGxpbmcgcmVxdWVzdC0+dGFpbCBpbiBjb21t aXQgbWVzc2FnZSAoQ2hyaXMpLgoKdjM6IFJlbW92ZSByZWR1bmRhbnQgcmVxdWVzdC0+dGFpbCBh c3NpZ25tZW50IGluIF9faTkxNV9hZGRfcmVxdWVzdCwgaW4KbHJjIG1vZGUgdGhpcyBpcyBhbHJl YWR5IHNldCBpbiBleGVjbGlzdHNfY29udGV4dF9xdWV1ZS4KRG8gbm90IGFkZCB3YSBpbXBsZW1l bnRhdGlvbiBkZXRhaWxzIGluc2lkZSBnZW0gKENocmlzKS4KCnY0OiBBcHBseSB0aGUgd2Egd2hl bmV2ZXIgdGhlIHJlcSBoYXMgYmVlbiByZXN1Ym1pdHRlZCBhbmQgdXBkYXRlCmNvbW1lbnQgKENo cmlzKS4KCkNjOiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KU2lnbmVk LW9mZi1ieTogVGhvbWFzIERhbmllbCA8dGhvbWFzLmRhbmllbEBpbnRlbC5jb20+ClNpZ25lZC1v ZmYtYnk6IE1pY2hlbCBUaGllcnJ5IDxtaWNoZWwudGhpZXJyeUBpbnRlbC5jb20+Ci0tLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAgfCAgMyArKy0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2xyYy5jIHwgMzUgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0K IDIgZmlsZXMgY2hhbmdlZCwgMzYgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW0uYwppbmRleCAzZDVhNWE4Li45ODBlMTdjIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtLmMKQEAgLTI0MDAsMTAgKzI0MDAsMTEgQEAgaW50IF9faTkxNV9hZGRfcmVxdWVzdChz dHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogCQlyZXQgPSByaW5nLT5hZGRfcmVxdWVzdChy aW5nKTsKIAkJaWYgKHJldCkKIAkJCXJldHVybiByZXQ7CisKKwkJcmVxdWVzdC0+dGFpbCA9IGlu dGVsX3JpbmdfZ2V0X3RhaWwocmluZ2J1Zik7CiAJfQogCiAJcmVxdWVzdC0+aGVhZCA9IHJlcXVl c3Rfc3RhcnQ7Ci0JcmVxdWVzdC0+dGFpbCA9IGludGVsX3JpbmdfZ2V0X3RhaWwocmluZ2J1Zik7 CiAKIAkvKiBXaGlsc3QgdGhpcyByZXF1ZXN0IGV4aXN0cywgYmF0Y2hfb2JqIHdpbGwgYmUgb24g dGhlCiAJICogYWN0aXZlX2xpc3QsIGFuZCBzbyB3aWxsIGhvbGQgdGhlIGFjdGl2ZSByZWZlcmVu Y2UuIE9ubHkgd2hlbiB0aGlzCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9scmMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCmluZGV4IGY0YTVlZjku LjUwZWQ5NzcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCkBAIC00MjcsNiArNDI3LDI2IEBA IHN0YXRpYyB2b2lkIGV4ZWNsaXN0c19jb250ZXh0X3VucXVldWUoc3RydWN0IGludGVsX2VuZ2lu ZV9jcyAqcmluZykKIAkJfQogCX0KIAorCWlmIChJU19HRU44KHJpbmctPmRldikgfHwgSVNfR0VO OShyaW5nLT5kZXYpKSB7CisJCS8qCisJCSAqIFdhSWRsZUxpdGVSZXN0b3JlOiBtYWtlIHN1cmUg d2UgbmV2ZXIgY2F1c2UgYSBsaXRlCisJCSAqIHJlc3RvcmUgd2l0aCBIRUFEPT1UQUlMCisJCSAq LworCQlpZiAocmVxMCAmJiByZXEwLT5lbHNwX3N1Ym1pdHRlZCkgeworCQkJLyoKKwkJCSAqIEFw cGx5IHRoZSB3YSBOT09QUyB0byBwcmV2ZW50IHJpbmc6SEVBRCA9PSByZXE6VEFJTAorCQkJICog YXMgd2UgcmVzdWJtaXQgdGhlIHJlcXVlc3QuIFNlZSBnZW44X2VtaXRfcmVxdWVzdCgpCisJCQkg KiBmb3Igd2hlcmUgd2UgcHJlcGFyZSB0aGUgcGFkZGluZyBhZnRlciB0aGUgZW5kIG9mIHRoZQor CQkJICogcmVxdWVzdC4KKwkJCSAqLworCQkJc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdi dWY7CisKKwkJCXJpbmdidWYgPSByZXEwLT5jdHgtPmVuZ2luZVtyaW5nLT5pZF0ucmluZ2J1ZjsK KwkJCXJlcTAtPnRhaWwgKz0gODsKKwkJCXJlcTAtPnRhaWwgJj0gcmluZ2J1Zi0+c2l6ZSAtIDE7 CisJCX0KKwl9CisKIAlXQVJOX09OKHJlcTEgJiYgcmVxMS0+ZWxzcF9zdWJtaXR0ZWQpOwogCiAJ ZXhlY2xpc3RzX3N1Ym1pdF9jb250ZXh0cyhyaW5nLCByZXEwLT5jdHgsIHJlcTAtPnRhaWwsCkBA IC0xMjg5LDcgKzEzMDksMTIgQEAgc3RhdGljIGludCBnZW44X2VtaXRfcmVxdWVzdChzdHJ1Y3Qg aW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiwKIAl1MzIgY21kOwogCWludCByZXQ7CiAKLQlyZXQg PSBpbnRlbF9sb2dpY2FsX3JpbmdfYmVnaW4ocmluZ2J1ZiwgcmVxdWVzdC0+Y3R4LCA2KTsKKwkv KgorCSAqIFJlc2VydmUgc3BhY2UgZm9yIDIgTk9PUHMgYXQgdGhlIGVuZCBvZiBlYWNoIHJlcXVl c3QgdG8gYmUKKwkgKiB1c2VkIGFzIGEgd29ya2Fyb3VuZCBmb3Igbm90IGJlaW5nIGFsbG93ZWQg dG8gZG8gbGl0ZQorCSAqIHJlc3RvcmUgd2l0aCBIRUFEPT1UQUlMIChXYUlkbGVMaXRlUmVzdG9y ZSkuCisJICovCisJcmV0ID0gaW50ZWxfbG9naWNhbF9yaW5nX2JlZ2luKHJpbmdidWYsIHJlcXVl c3QtPmN0eCwgOCk7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIApAQCAtMTMwNyw2ICsxMzMy LDE0IEBAIHN0YXRpYyBpbnQgZ2VuOF9lbWl0X3JlcXVlc3Qoc3RydWN0IGludGVsX3JpbmdidWZm ZXIgKnJpbmdidWYsCiAJaW50ZWxfbG9naWNhbF9yaW5nX2VtaXQocmluZ2J1ZiwgTUlfTk9PUCk7 CiAJaW50ZWxfbG9naWNhbF9yaW5nX2FkdmFuY2VfYW5kX3N1Ym1pdChyaW5nYnVmLCByZXF1ZXN0 LT5jdHgsIHJlcXVlc3QpOwogCisJLyoKKwkgKiBIZXJlIHdlIGFkZCB0d28gZXh0cmEgTk9PUHMg YXMgcGFkZGluZyB0byBhdm9pZAorCSAqIGxpdGUgcmVzdG9yZSBvZiBhIGNvbnRleHQgd2l0aCBI RUFEPT1UQUlMLgorCSAqLworCWludGVsX2xvZ2ljYWxfcmluZ19lbWl0KHJpbmdidWYsIE1JX05P T1ApOworCWludGVsX2xvZ2ljYWxfcmluZ19lbWl0KHJpbmdidWYsIE1JX05PT1ApOworCWludGVs X2xvZ2ljYWxfcmluZ19hZHZhbmNlKHJpbmdidWYpOworCiAJcmV0dXJuIDA7CiB9CiAKLS0gCjIu MS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRl bC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDov L2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=