From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH 04/13] drm/i915: Release all atomic flips when GPU hangs Date: Fri, 16 Nov 2012 16:22:16 +0200 Message-ID: <1353075745-30115-5-git-send-email-ville.syrjala@linux.intel.com> References: <1353075745-30115-1-git-send-email-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1353075745-30115-1-git-send-email-ville.syrjala@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: dri-devel@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCklm IHRoZSBHUFUgaGFuZ3MsIHJlbGVhc2UgYWxsIHBlbmRpbmcgYXRvbWljIGZsaXBzIGZyb20gdGhl IHF1ZXVlLgoKU2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxp bnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jICAgICB8 ICAgIDEgKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljLmMgfCAgIDI5ICsrKysr KysrKysrKysrKysrKysrKysrKysrKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYu aCAgICB8ICAgIDEgKwogMyBmaWxlcyBjaGFuZ2VkLCAzMSBpbnNlcnRpb25zKCspLCAwIGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCmluZGV4IDQ0MTMwNmQuLmY3MGQyYjEgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9pcnEuYwpAQCAtMTQ1Miw2ICsxNDUyLDcgQEAgdm9pZCBpOTE1X2hh bmRsZV9lcnJvcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBib29sIHdlZGdlZCkKIAkJICovCiAJ CWZvcl9lYWNoX3JpbmcocmluZywgZGV2X3ByaXYsIGkpCiAJCQl3YWtlX3VwX2FsbCgmcmluZy0+ aXJxX3F1ZXVlKTsKKwkJaW50ZWxfYXRvbWljX3dlZGdlZChkZXYpOwogCX0KIAogCXF1ZXVlX3dv cmsoZGV2X3ByaXYtPndxLCAmZGV2X3ByaXYtPmVycm9yX3dvcmspOwpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9hdG9taWMuYwppbmRleCAwNGEyMGM1Li43YTBlMzE1IDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9hdG9taWMuYwpAQCAtMjI1MCw2ICsyMjUwLDMwIEBAIHZvaWQgaW50ZWxfYXRvbWljX25v dGlmeV9yaW5nKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJc3Bpbl91bmxvY2tfaXJxcmVzdG9y ZSgmZGV2X3ByaXYtPmZsaXAubG9jaywgZmxhZ3MpOwogfQogCit2b2lkIGludGVsX2F0b21pY193 ZWRnZWQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKK3sKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOworCXN0cnVjdCBpbnRlbF9mbGlwICppbnRl bF9mbGlwOworCXVuc2lnbmVkIGxvbmcgZmxhZ3M7CisKKwlzcGluX2xvY2tfaXJxc2F2ZSgmZGV2 X3ByaXYtPmZsaXAubG9jaywgZmxhZ3MpOworCisJbGlzdF9mb3JfZWFjaF9lbnRyeShpbnRlbF9m bGlwLCAmZGV2X3ByaXYtPmZsaXAubGlzdCwgYmFzZS5saXN0KSB7CisJCXN0cnVjdCBpbnRlbF9y aW5nX2J1ZmZlciAqcmluZyA9IGludGVsX2ZsaXAtPnJpbmc7CisKKwkJaWYgKHJpbmcpIHsKKwkJ CWludGVsX2ZsaXAtPnJpbmcgPSBOVUxMOworCQkJcmluZy0+aXJxX3B1dChyaW5nKTsKKwkJfQor CX0KKworCS8qIGFsbCBmbGlwcyBhcmUgInJlYWR5IiBzbyBubyBuZWVkIHRvIGNoZWNrIHdpdGgg aW50ZWxfYXRvbWljX2ZsaXBzX3JlYWR5KCkgKi8KKwlpZiAoIWxpc3RfZW1wdHkoJmRldl9wcml2 LT5mbGlwLmxpc3QpKQorCQlxdWV1ZV93b3JrKGRldl9wcml2LT5mbGlwLndxLCAmZGV2X3ByaXYt PmZsaXAud29yayk7CisKKwlzcGluX3VubG9ja19pcnFyZXN0b3JlKCZkZXZfcHJpdi0+ZmxpcC5s b2NrLCBmbGFncyk7Cit9CisKIHN0YXRpYyB2b2lkIGF0b21pY19waXBlX2NvbW1pdChzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2LAogCQkJICAgICAgIHN0cnVjdCBpbnRlbF9hdG9taWNfc3RhdGUgKnN0 YXRlLAogCQkJICAgICAgIGludCBwaXBlKQpAQCAtMjQyNyw2ICsyNDUxLDExIEBAIHN0YXRpYyB2 b2lkIGF0b21pY19waXBlX2NvbW1pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCWlmIChyaW5n c19tYXNrID09IDApCiAJCXJldHVybjsKIAorCWlmIChhdG9taWNfcmVhZCgmZGV2X3ByaXYtPm1t LndlZGdlZCkpIHsKKwkJaW50ZWxfYXRvbWljX3dlZGdlZChkZXYpOworCQlyZXR1cm47CisJfQor CiAJLyoKIAkgKiBEb3VibGUgY2hlY2sgdG8gY2F0Y2ggY2FzZXMgd2hlcmUgdGhlIGlycQogCSAq IGZpcmVkIGJlZm9yZSB0aGUgZmxpcCB3YXMgcGxhY2VkIG9udG8gZmxpcC5saXN0LgpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kcnYuaAppbmRleCAzMTlhYWM4Li42MTdiYTRkIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kcnYuaApAQCAtNzIzLDYgKzcyMyw3IEBAIGV4dGVybiB2b2lkIGludGVsX2F0b21pY19m cmVlX2V2ZW50cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJtX2ZpbGUgKmZpCiBl eHRlcm4gdm9pZCBpbnRlbF9hdG9taWNfaGFuZGxlX3ZibGFuayhzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2LCBpbnQgcGlwZSk7CiBleHRlcm4gdm9pZCBpbnRlbF9hdG9taWNfY2xlYXJfZmxpcHMoc3Ry dWN0IGRybV9jcnRjICpjcnRjKTsKIGV4dGVybiB2b2lkIGludGVsX2F0b21pY19ub3RpZnlfcmlu ZyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgaW50ZWxfcmluZ19idWZmZXIgKnJpbmcp OworZXh0ZXJuIHZvaWQgaW50ZWxfYXRvbWljX3dlZGdlZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 KTsKIAogZXh0ZXJuIHZvaWQgaW50ZWxfZW5hYmxlX3ByaW1hcnkoc3RydWN0IGRybV9jcnRjICpj cnRjKTsKIGV4dGVybiB2b2lkIGludGVsX2Rpc2FibGVfcHJpbWFyeShzdHJ1Y3QgZHJtX2NydGMg KmNydGMpOwotLSAKMS43LjguNgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRl c2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9p bnRlbC1nZngK