From: Eric Anholt Subject: [PATCH 3/3] drm/vc4: Use runtime PM to power cycle the device when the GPU hangs. Date: Mon, 8 Feb 2016 16:19:39 -0800 Message-ID: <1454977179-16913-4-git-send-email-eric@anholt.net> References: <1454977179-16913-1-git-send-email-eric@anholt.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1454977179-16913-1-git-send-email-eric@anholt.net> 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: linux-kernel@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org VGhpcyBnZXRzIHVzIGZ1bmN0aW9uYWwgR1BVIHJlc2V0IGFnYWluLCBsaWtlIHdlIGhhZCB1bnRp bCBhIHJlZmFjdG9yCmF0IG1lcmdlIHRpbWUuICBUZXN0ZWQgd2l0aCBhIGxpdHRsZSBwYXRjaCB0 byBzdHVmZiBpbiBhIGJyb2tlbiBiaW5uZXIKam9iIGV2ZXJ5IDEwMCBmcmFtZXMuCgpTaWduZWQt b2ZmLWJ5OiBFcmljIEFuaG9sdCA8ZXJpY0BhbmhvbHQubmV0PgotLS0KIGRyaXZlcnMvZ3B1L2Ry bS92YzQvdmM0X2Rydi5oIHwgIDYgKysrKystCiBkcml2ZXJzL2dwdS9kcm0vdmM0L3ZjNF9nZW0u YyB8IDI2ICsrKysrKysrKysrKysrKysrKysrKy0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vdmM0L3Zj NF92M2QuYyB8IDEyIC0tLS0tLS0tLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCAyNiBpbnNlcnRpb25z KCspLCAxOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdmM0L3Zj NF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS92YzQvdmM0X2Rydi5oCmluZGV4IGI2NWU3ODUuLjgz ZGIwYjcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS92YzQvdmM0X2Rydi5oCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS92YzQvdmM0X2Rydi5oCkBAIC05MSw2ICs5MSwxMSBAQCBzdHJ1Y3QgdmM0 X2RldiB7CiAJc3RydWN0IHZjNF9ibyAqb3ZlcmZsb3dfbWVtOwogCXN0cnVjdCB3b3JrX3N0cnVj dCBvdmVyZmxvd19tZW1fd29yazsKIAorCWludCBwb3dlcl9yZWZjb3VudDsKKworCS8qIE11dGV4 IGNvbnRyb2xsaW5nIHRoZSBwb3dlciByZWZjb3VudC4gKi8KKwlzdHJ1Y3QgbXV0ZXggcG93ZXJf bG9jazsKKwogCXN0cnVjdCB7CiAJCXN0cnVjdCB0aW1lcl9saXN0IHRpbWVyOwogCQlzdHJ1Y3Qg d29ya19zdHJ1Y3QgcmVzZXRfd29yazsKQEAgLTQ0OSw3ICs0NTQsNiBAQCB2b2lkIHZjNF9wbGFu ZV9hc3luY19zZXRfZmIoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiBleHRlcm4gc3RydWN0IHBs YXRmb3JtX2RyaXZlciB2YzRfdjNkX2RyaXZlcjsKIGludCB2YzRfdjNkX2RlYnVnZnNfaWRlbnQo c3RydWN0IHNlcV9maWxlICptLCB2b2lkICp1bnVzZWQpOwogaW50IHZjNF92M2RfZGVidWdmc19y ZWdzKHN0cnVjdCBzZXFfZmlsZSAqbSwgdm9pZCAqdW51c2VkKTsKLWludCB2YzRfdjNkX3NldF9w b3dlcihzdHJ1Y3QgdmM0X2RldiAqdmM0LCBib29sIG9uKTsKIAogLyogdmM0X3ZhbGlkYXRlLmMg Ki8KIGludApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3ZjNC92YzRfZ2VtLmMgYi9kcml2 ZXJzL2dwdS9kcm0vdmM0L3ZjNF9nZW0uYwppbmRleCA0NDBhZDAzLi41ZGY0NmQ2IDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vdmM0L3ZjNF9nZW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0v dmM0L3ZjNF9nZW0uYwpAQCAtMjI5LDggKzIyOSwxNiBAQCB2YzRfcmVzZXQoc3RydWN0IGRybV9k ZXZpY2UgKmRldikKIAlzdHJ1Y3QgdmM0X2RldiAqdmM0ID0gdG9fdmM0X2RldihkZXYpOwogCiAJ RFJNX0lORk8oIlJlc2V0dGluZyBHUFUuXG4iKTsKLQl2YzRfdjNkX3NldF9wb3dlcih2YzQsIGZh bHNlKTsKLQl2YzRfdjNkX3NldF9wb3dlcih2YzQsIHRydWUpOworCisJbXV0ZXhfbG9jaygmdmM0 LT5wb3dlcl9sb2NrKTsKKwlpZiAodmM0LT5wb3dlcl9yZWZjb3VudCkgeworCQkvKiBQb3dlciB0 aGUgZGV2aWNlIG9mZiBhbmQgYmFjayBvbiB0aGUgYnkgZHJvcHBpbmcgdGhlCisJCSAqIHJlZmVy ZW5jZSBvbiBydW50aW1lIFBNLgorCQkgKi8KKwkJcG1fcnVudGltZV9wdXRfc3luY19zdXNwZW5k KCZ2YzQtPnYzZC0+cGRldi0+ZGV2KTsKKwkJcG1fcnVudGltZV9nZXRfc3luYygmdmM0LT52M2Qt PnBkZXYtPmRldik7CisJfQorCW11dGV4X3VubG9jaygmdmM0LT5wb3dlcl9sb2NrKTsKIAogCXZj NF9pcnFfcmVzZXQoZGV2KTsKIApAQCAtNjQ2LDcgKzY1NCwxMCBAQCB2YzRfY29tcGxldGVfZXhl YyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgdmM0X2V4ZWNfaW5mbyAqZXhlYykKIAl9 CiAJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CiAKLQlwbV9ydW50aW1lX3B1dCgm dmM0LT52M2QtPnBkZXYtPmRldik7CisJbXV0ZXhfbG9jaygmdmM0LT5wb3dlcl9sb2NrKTsKKwlp ZiAoLS12YzQtPnBvd2VyX3JlZmNvdW50ID09IDApCisJCXBtX3J1bnRpbWVfcHV0KCZ2YzQtPnYz ZC0+cGRldi0+ZGV2KTsKKwltdXRleF91bmxvY2soJnZjNC0+cG93ZXJfbG9jayk7CiAKIAlrZnJl ZShleGVjKTsKIH0KQEAgLTc4NSw3ICs3OTYsNyBAQCB2YzRfc3VibWl0X2NsX2lvY3RsKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAJc3RydWN0IHZjNF9kZXYgKnZjNCA9IHRv X3ZjNF9kZXYoZGV2KTsKIAlzdHJ1Y3QgZHJtX3ZjNF9zdWJtaXRfY2wgKmFyZ3MgPSBkYXRhOwog CXN0cnVjdCB2YzRfZXhlY19pbmZvICpleGVjOwotCWludCByZXQ7CisJaW50IHJldCA9IDA7CiAK IAlpZiAoKGFyZ3MtPmZsYWdzICYgflZDNF9TVUJNSVRfQ0xfVVNFX0NMRUFSX0NPTE9SKSAhPSAw KSB7CiAJCURSTV9FUlJPUigiVW5rbm93biBmbGFnczogMHglMDJ4XG4iLCBhcmdzLT5mbGFncyk7 CkBAIC03OTgsNyArODA5LDEwIEBAIHZjNF9zdWJtaXRfY2xfaW9jdGwoc3RydWN0IGRybV9kZXZp Y2UgKmRldiwgdm9pZCAqZGF0YSwKIAkJcmV0dXJuIC1FTk9NRU07CiAJfQogCi0JcmV0ID0gcG1f cnVudGltZV9nZXRfc3luYygmdmM0LT52M2QtPnBkZXYtPmRldik7CisJbXV0ZXhfbG9jaygmdmM0 LT5wb3dlcl9sb2NrKTsKKwlpZiAodmM0LT5wb3dlcl9yZWZjb3VudCsrID09IDApCisJCXJldCA9 IHBtX3J1bnRpbWVfZ2V0X3N5bmMoJnZjNC0+djNkLT5wZGV2LT5kZXYpOworCW11dGV4X3VubG9j aygmdmM0LT5wb3dlcl9sb2NrKTsKIAlpZiAocmV0IDwgMCkgewogCQlrZnJlZShleGVjKTsKIAkJ cmV0dXJuIHJldDsKQEAgLTg1OCw2ICs4NzIsOCBAQCB2YzRfZ2VtX2luaXQoc3RydWN0IGRybV9k ZXZpY2UgKmRldikKIAkJICAgICh1bnNpZ25lZCBsb25nKWRldik7CiAKIAlJTklUX1dPUksoJnZj NC0+am9iX2RvbmVfd29yaywgdmM0X2pvYl9kb25lX3dvcmspOworCisJbXV0ZXhfaW5pdCgmdmM0 LT5wb3dlcl9sb2NrKTsKIH0KIAogdm9pZApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3Zj NC92YzRfdjNkLmMgYi9kcml2ZXJzL2dwdS9kcm0vdmM0L3ZjNF92M2QuYwppbmRleCA5MzA4NTFm Li43YjExZTIxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vdmM0L3ZjNF92M2QuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vdmM0L3ZjNF92M2QuYwpAQCAtMTQ1LDE4ICsxNDUsNiBAQCBpbnQg dmM0X3YzZF9kZWJ1Z2ZzX2lkZW50KHN0cnVjdCBzZXFfZmlsZSAqbSwgdm9pZCAqdW51c2VkKQog fQogI2VuZGlmIC8qIENPTkZJR19ERUJVR19GUyAqLwogCi1pbnQKLXZjNF92M2Rfc2V0X3Bvd2Vy KHN0cnVjdCB2YzRfZGV2ICp2YzQsIGJvb2wgb24pCi17Ci0JLyogWFhYOiBUaGlzIGludGVyZmFj ZSBpcyBuZWVkZWQgZm9yIEdQVSByZXNldCwgYW5kIHRoZSB3YXkgdG8KLQkgKiBkbyBpdCBpcyB0 byB0dXJuIG91ciBwb3dlciBkb21haW4gb2ZmIGFuZCBiYWNrIG9uLiAgV2UKLQkgKiBjYW4ndCBq dXN0IHJlc2V0IGZyb20gd2l0aGluIHRoZSBkcml2ZXIsIGJlY2F1c2UgdGhlIHJlc2V0Ci0JICog Yml0cyBhcmUgaW4gdGhlIHBvd2VyIGRvbWFpbidzIHJlZ2lzdGVyIGFyZWEsIGFuZCBnZXQgc2V0 Ci0JICogZHVyaW5nIHRoZSBwb3dlcm9uIHByb2Nlc3MuCi0JICovCi0JcmV0dXJuIDA7Ci19Ci0K IHN0YXRpYyB2b2lkIHZjNF92M2RfaW5pdF9odyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogewog CXN0cnVjdCB2YzRfZGV2ICp2YzQgPSB0b192YzRfZGV2KGRldik7Ci0tIAoyLjcuMAoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxp bmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJl ZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==