From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michel Thierry Subject: [PATCH 2/2] drm/i915/lrc: Prevent preemption when lite-restore is disabled Date: Fri, 4 Sep 2015 12:59:15 +0100 Message-ID: <1441367955-22006-2-git-send-email-michel.thierry@intel.com> References: <1441367955-22006-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 B4BD56E0F6 for ; Fri, 4 Sep 2015 04:59:19 -0700 (PDT) In-Reply-To: <1441367955-22006-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 V2hlbiBXYUVuYWJsZUZvcmNlUmVzdG9yZUluQ3R4dERlc2NGb3JWQ1MgaXMgcmVxdWlyZWQsIGl0 IGlzIG9ubHkKc2FmZSB0byBzZW5kIG5ldyBjb250ZXh0cyBpZiB0aGUgbGFzdCByZXBvcnRlZCBl dmVudCBpcyAiYWN0aXZlIHRvCmlkbGUiLiBPdGhlcndpc2UgdGhlIHNhbWUgY29udGV4dCBjYW4g ZnVsbHkgcHJlZW1wdCBpdHNlbGYgYmVjYXVzZQpsaXRlLXJlc3RvcmUgaXMgZGlzYWJsZWQuCgpU ZXN0Y2FzZTogaWd0L2dlbV9jb25jdXJyZW50X2JsaXQKUmVwb3J0ZWQtYnk6IERhbmllbGUgQ2Vy YW9sbyBTcHVyaW8gPGRhbmllbGUuY2VyYW9sb3NwdXJpb0BpbnRlbC5jb20+ClNpZ25lZC1vZmYt Ynk6IE1pY2hlbCBUaGllcnJ5IDxtaWNoZWwudGhpZXJyeUBpbnRlbC5jb20+Ci0tLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgfCAyNCArKysrKysrKysrKysrKysrKystLS0tLS0K IDEgZmlsZSBjaGFuZ2VkLCAxOCBpbnNlcnRpb25zKCspLCA2IGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfbHJjLmMKaW5kZXggZDhiNjA1Zi4uYzNmY2E0YiAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfbHJjLmMKQEAgLTI3NywxMCArMjc3LDE4IEBAIHUzMiBpbnRlbF9leGVjbGlzdHNfY3R4 X2lkKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpjdHhfb2JqKQogCXJldHVybiBscmNhID4+ IDEyOwogfQogCitzdGF0aWMgYm9vbCBkaXNhYmxlX2xpdGVfcmVzdG9yZV93YShzdHJ1Y3QgaW50 ZWxfZW5naW5lX2NzICpyaW5nKQoreworCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSByaW5nLT5k ZXY7CisKKwlyZXR1cm4gKChJU19TS1lMQUtFKGRldikgJiYgSU5URUxfUkVWSUQoZGV2KSA8PSBT S0xfUkVWSURfQjApIHx8CisJCShJU19CUk9YVE9OKGRldikgJiYgSU5URUxfUkVWSUQoZGV2KSA9 PSBCWFRfUkVWSURfQTApKSAmJgorCSAgICAgICAocmluZy0+aWQgPT0gVkNTIHx8IHJpbmctPmlk ID09IFZDUzIpOworfQorCiB1aW50NjRfdCBpbnRlbF9scl9jb250ZXh0X2Rlc2NyaXB0b3Ioc3Ry dWN0IGludGVsX2NvbnRleHQgKmN0eCwKIAkJCQkgICAgIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg KnJpbmcpCiB7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHJpbmctPmRldjsKIAlzdHJ1Y3Qg ZHJtX2k5MTVfZ2VtX29iamVjdCAqY3R4X29iaiA9IGN0eC0+ZW5naW5lW3JpbmctPmlkXS5zdGF0 ZTsKIAl1aW50NjRfdCBkZXNjOwogCXVpbnQ2NF90IGxyY2EgPSBpOTE1X2dlbV9vYmpfZ2d0dF9v ZmZzZXQoY3R4X29iaikgKwpAQCAtMzAyLDkgKzMxMCw3IEBAIHVpbnQ2NF90IGludGVsX2xyX2Nv bnRleHRfZGVzY3JpcHRvcihzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4LAogCiAJLyogV2FFbmFi bGVGb3JjZVJlc3RvcmVJbkN0eHREZXNjRm9yVkNTOnNrbCAqLwogCS8qIFdhRW5hYmxlRm9yY2VS ZXN0b3JlSW5DdHh0RGVzY0ZvclZDUzpieHQgKi8KLQlpZiAoKChJU19TS1lMQUtFKGRldikgJiYg SU5URUxfUkVWSUQoZGV2KSA8PSBTS0xfUkVWSURfQjApIHx8Ci0JICAgICAoSVNfQlJPWFRPTihk ZXYpICYmIElOVEVMX1JFVklEKGRldikgPT0gQlhUX1JFVklEX0EwKSkgJiYKLQkgICAgKHJpbmct PmlkID09IFZDUyB8fCByaW5nLT5pZCA9PSBWQ1MyKSkKKwlpZiAoZGlzYWJsZV9saXRlX3Jlc3Rv cmVfd2EocmluZykpCiAJCWRlc2MgfD0gR0VOOF9DVFhfRk9SQ0VfUkVTVE9SRTsKIAogCXJldHVy biBkZXNjOwpAQCAtNDk1LDcgKzUwMSw3IEBAIHZvaWQgaW50ZWxfbHJjX2lycV9oYW5kbGVyKHN0 cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCiAJdTMyIHN0YXR1c19wb2ludGVyOwogCXU4IHJl YWRfcG9pbnRlcjsKIAl1OCB3cml0ZV9wb2ludGVyOwotCXUzMiBzdGF0dXM7CisJdTMyIHN0YXR1 cyA9IDA7CiAJdTMyIHN0YXR1c19pZDsKIAl1MzIgc3VibWl0X2NvbnRleHRzID0gMDsKIApAQCAt NTMzLDggKzUzOSwxNCBAQCB2b2lkIGludGVsX2xyY19pcnFfaGFuZGxlcihzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICpyaW5nKQogCQl9CiAJfQogCi0JaWYgKHN1Ym1pdF9jb250ZXh0cyAhPSAwKQor CWlmIChkaXNhYmxlX2xpdGVfcmVzdG9yZV93YShyaW5nKSkgeworCQkvKiBQcmV2ZW50IGEgY3R4 IHRvIHByZWVtcHQgaXRzZWxmICovCisJCWlmICgoc3RhdHVzICYgR0VOOF9DVFhfU1RBVFVTX0FD VElWRV9JRExFKSAmJgorCQkgICAgKHN1Ym1pdF9jb250ZXh0cyAhPSAwKSkKKwkJCWV4ZWNsaXN0 c19jb250ZXh0X3VucXVldWUocmluZyk7CisJfSBlbHNlIGlmIChzdWJtaXRfY29udGV4dHMgIT0g MCkgewogCQlleGVjbGlzdHNfY29udGV4dF91bnF1ZXVlKHJpbmcpOworCX0KIAogCXNwaW5fdW5s b2NrKCZyaW5nLT5leGVjbGlzdF9sb2NrKTsKIAotLSAKMi41LjEKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50 ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==