From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lucas Stach Subject: [PATCH RFC 062/111] staging: etnaviv: ensure GPU reset times out Date: Thu, 2 Apr 2015 17:30:04 +0200 Message-ID: <1427988653-754-63-git-send-email-l.stach@pengutronix.de> References: <1427988653-754-1-git-send-email-l.stach@pengutronix.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [92.198.50.35]) by gabe.freedesktop.org (Postfix) with ESMTP id 969316EA57 for ; Thu, 2 Apr 2015 08:30:59 -0700 (PDT) In-Reply-To: <1427988653-754-1-git-send-email-l.stach@pengutronix.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: Russell King , kernel@pengutronix.de List-Id: dri-devel@lists.freedesktop.org RnJvbTogUnVzc2VsbCBLaW5nIDxybWsra2VybmVsQGFybS5saW51eC5vcmcudWs+CgpSYXRoZXIg dGhhbiB3YWl0aW5nIGluZGVmaW5pdGVseSBmb3IgdGhlIEdQVSB0byByZXNldCwgYm91bmQgdGhp cyBhbmQKaWYgaXQgZG9lc24ndCBhcHBlYXIgdG8gYmUgc3VjY2Vzc2Z1bCwgYmFpbCBvdXQgYW5k IHJlcG9ydCB3aHkgd2UKZmFpbGVkLgoKU2lnbmVkLW9mZi1ieTogUnVzc2VsbCBLaW5nIDxybWsr a2VybmVsQGFybS5saW51eC5vcmcudWs+Ci0tLQogZHJpdmVycy9zdGFnaW5nL2V0bmF2aXYvZXRu YXZpdl9ncHUuYyB8IDMyICsrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tCiAxIGZpbGUg Y2hhbmdlZCwgMjcgaW5zZXJ0aW9ucygrKSwgNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL3N0YWdpbmcvZXRuYXZpdi9ldG5hdml2X2dwdS5jIGIvZHJpdmVycy9zdGFnaW5nL2V0 bmF2aXYvZXRuYXZpdl9ncHUuYwppbmRleCA0Y2Q4NDc0MGVhYzguLmYyY2UzYzcxZTU4MyAxMDA2 NDQKLS0tIGEvZHJpdmVycy9zdGFnaW5nL2V0bmF2aXYvZXRuYXZpdl9ncHUuYworKysgYi9kcml2 ZXJzL3N0YWdpbmcvZXRuYXZpdi9ldG5hdml2X2dwdS5jCkBAIC0yODcsOSArMjg3LDExIEBAIHN0 YXRpYyB2b2lkIGV0bmF2aXZfaHdfaWRlbnRpZnkoc3RydWN0IGV0bmF2aXZfZ3B1ICpncHUpCiAJ ZXRuYXZpdl9od19zcGVjcyhncHUpOwogfQogCi1zdGF0aWMgdm9pZCBldG5hdml2X2h3X3Jlc2V0 KHN0cnVjdCBldG5hdml2X2dwdSAqZ3B1KQorc3RhdGljIGludCBldG5hdml2X2h3X3Jlc2V0KHN0 cnVjdCBldG5hdml2X2dwdSAqZ3B1KQogewogCXUzMiBjb250cm9sLCBpZGxlOworCXVuc2lnbmVk IGxvbmcgdGltZW91dDsKKwlib29sIGZhaWxlZCA9IHRydWU7CiAKIAkvKiBUT0RPCiAJICoKQEAg LTI5OCw3ICszMDAsMTAgQEAgc3RhdGljIHZvaWQgZXRuYXZpdl9od19yZXNldChzdHJ1Y3QgZXRu YXZpdl9ncHUgKmdwdSkKIAkgKiAtIHdoYXQgYWJvdXQgVkc/CiAJICovCiAKLQl3aGlsZSAodHJ1 ZSkgeworCS8qIFdlIGhvcGUgdGhhdCB0aGUgR1BVIHJlc2V0cyBpbiB1bmRlciBvbmUgc2Vjb25k ICovCisJdGltZW91dCA9IGppZmZpZXMgKyBtc2Vjc190b19qaWZmaWVzKDEwMDApOworCisJd2hp bGUgKHRpbWVfaXNfYWZ0ZXJfamlmZmllcyh0aW1lb3V0KSkgewogCQljb250cm9sID0gVklWU19I SV9DTE9DS19DT05UUk9MX0RJU0FCTEVfREVCVUdfUkVHSVNURVJTIHwKIAkJCSAgVklWU19ISV9D TE9DS19DT05UUk9MX0ZTQ0FMRV9WQUwoMHg0MCk7CiAKQEAgLTM0MiwxNSArMzQ3LDI4IEBAIHN0 YXRpYyB2b2lkIGV0bmF2aXZfaHdfcmVzZXQoc3RydWN0IGV0bmF2aXZfZ3B1ICpncHUpCiAJCWNv bnRyb2wgPSBncHVfcmVhZChncHUsIFZJVlNfSElfQ0xPQ0tfQ09OVFJPTCk7CiAKIAkJLyogaXMg dGhlIEdQVSBpZGxlPyAqLwotCQlpZiAoKChjb250cm9sICYgVklWU19ISV9DTE9DS19DT05UUk9M X0lETEVfM0QpID09IDApCi0JCXx8ICgoY29udHJvbCAmIFZJVlNfSElfQ0xPQ0tfQ09OVFJPTF9J RExFXzJEKSA9PSAwKSkgeworCQlpZiAoKChjb250cm9sICYgVklWU19ISV9DTE9DS19DT05UUk9M X0lETEVfM0QpID09IDApIHx8CisJCSAgICAoKGNvbnRyb2wgJiBWSVZTX0hJX0NMT0NLX0NPTlRS T0xfSURMRV8yRCkgPT0gMCkpIHsKIAkJCWRldl9kYmcoZ3B1LT5kZXYsICJHUFUgaXMgbm90IGlk bGVcbiIpOwogCQkJY29udGludWU7CiAJCX0KIAorCQlmYWlsZWQgPSBmYWxzZTsKIAkJYnJlYWs7 CiAJfQogCisJaWYgKGZhaWxlZCkgeworCQlpZGxlID0gZ3B1X3JlYWQoZ3B1LCBWSVZTX0hJX0lE TEVfU1RBVEUpOworCQljb250cm9sID0gZ3B1X3JlYWQoZ3B1LCBWSVZTX0hJX0NMT0NLX0NPTlRS T0wpOworCisJCWRldl9lcnIoZ3B1LT5kZXYsICJHUFUgZmFpbGVkIHRvIHJlc2V0OiBGRSAlc2lk bGUsIDNEICVzaWRsZSwgMkQgJXNpZGxlXG4iLAorCQkJaWRsZSAmIFZJVlNfSElfSURMRV9TVEFU RV9GRSA/ICIiIDogIm5vdCAiLAorCQkJY29udHJvbCAmIFZJVlNfSElfQ0xPQ0tfQ09OVFJPTF9J RExFXzNEID8gIiIgOiAibm90ICIsCisJCQljb250cm9sICYgVklWU19ISV9DTE9DS19DT05UUk9M X0lETEVfMkQgPyAiIiA6ICJub3QgIik7CisKKwkJcmV0dXJuIC1FQlVTWTsKKwl9CisKIAkvKiBX ZSByZWx5IG9uIHRoZSBHUFUgcnVubmluZywgc28gcHJvZ3JhbSB0aGUgY2xvY2sgKi8KIAljb250 cm9sID0gVklWU19ISV9DTE9DS19DT05UUk9MX0RJU0FCTEVfREVCVUdfUkVHSVNURVJTIHwKIAkJ ICBWSVZTX0hJX0NMT0NLX0NPTlRST0xfRlNDQUxFX1ZBTCgweDQwKTsKQEAgLTM1OSw2ICszNzcs OCBAQCBzdGF0aWMgdm9pZCBldG5hdml2X2h3X3Jlc2V0KHN0cnVjdCBldG5hdml2X2dwdSAqZ3B1 KQogCWdwdV93cml0ZShncHUsIFZJVlNfSElfQ0xPQ0tfQ09OVFJPTCwgY29udHJvbCB8CiAJCSAg VklWU19ISV9DTE9DS19DT05UUk9MX0ZTQ0FMRV9DTURfTE9BRCk7CiAJZ3B1X3dyaXRlKGdwdSwg VklWU19ISV9DTE9DS19DT05UUk9MLCBjb250cm9sKTsKKworCXJldHVybiAwOwogfQogCiBpbnQg ZXRuYXZpdl9ncHVfaW5pdChzdHJ1Y3QgZXRuYXZpdl9ncHUgKmdwdSkKQEAgLTM2OSw3ICszODks OSBAQCBpbnQgZXRuYXZpdl9ncHVfaW5pdChzdHJ1Y3QgZXRuYXZpdl9ncHUgKmdwdSkKIAlib29s IG1tdXYyOwogCiAJZXRuYXZpdl9od19pZGVudGlmeShncHUpOwotCWV0bmF2aXZfaHdfcmVzZXQo Z3B1KTsKKwlyZXQgPSBldG5hdml2X2h3X3Jlc2V0KGdwdSk7CisJaWYgKHJldCkKKwkJcmV0dXJu IHJldDsKIAogCS8qIHNldCBiYXNlIGFkZHJlc3NlcyAqLwogCWdwdV93cml0ZShncHUsIFZJVlNf TUNfTUVNT1JZX0JBU0VfQUREUl9SQSwgMHgwKTsKLS0gCjIuMS40CgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRy aS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=