From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thierry Reding Subject: [PATCH 1/3] drm/tegra: Fix error handling cleanup Date: Thu, 6 Nov 2014 16:57:14 +0100 Message-ID: <1415289436-14797-1-git-send-email-thierry.reding@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-pd0-f181.google.com (mail-pd0-f181.google.com [209.85.192.181]) by gabe.freedesktop.org (Postfix) with ESMTP id AB9396E089 for ; Thu, 6 Nov 2014 07:57:22 -0800 (PST) Received: by mail-pd0-f181.google.com with SMTP id y10so1359468pdj.40 for ; Thu, 06 Nov 2014 07:57:22 -0800 (PST) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Thierry Reding Cc: =?UTF-8?q?St=C3=A9phane=20Marchesin?= , dri-devel@lists.freedesktop.org, Sean Paul List-Id: dri-devel@lists.freedesktop.org RnJvbTogVGhpZXJyeSBSZWRpbmcgPHRyZWRpbmdAbnZpZGlhLmNvbT4KClRoZSBEUk0gZHJpdmVy J3MgLT5sb2FkKCkgaW1wbGVtZW50YXRpb24gZGlkbid0IGRvIGEgZ29vZCBqb2IgKG5vIGpvYiBh dAphbGwgcmVhbGx5KSBjbGVhbmluZyB1cCBvbiBmYWlsdXJlLiBGaXggdGhhdCBieSB1bmRvaW5n IGFueSBwcmlvciBzZXR1cAp3aGVuIGFuIGVycm9yIG9jY3Vycy4gVGhpcyByZXF1aXJlcyBhIGJp dCBvZiByZXdvcmsgdG8gbWFrZSBpdCBwb3NzaWJsZQp0byBjbGVhbiB1cCBmYmRldiBtaWR3YXku CgpUaGlzIHdhcyB0ZXN0ZWQgYnkgaW5qZWN0aW5nIGVycm9ycyBhdCB2YXJpb3VzIHBvaW50cyBk dXJpbmcgdGhlCmluaXRpYWxpemF0aW9uIHNlcXVlbmNlIGFuZCB2ZXJpZnlpbmcgdGhhdCBlcnJv ciBjbGVhbnVwIGRpZG4ndCBjcmFzaAphbmQgbm8gbWVtb3J5IGxlYWtlZCAodXNpbmcga21lbWxl YWspLgoKUmVwb3J0ZWQtYnk6IFN0w6lwaGFuZSBNYXJjaGVzaW4gPG1hcmNoZXVAZ29vZ2xlLmNv bT4KUmVwb3J0ZWQtYnk6IFNlYW4gUGF1bCA8c2VhbnBhdWxAZ29vZ2xlLmNvbT4KU2lnbmVkLW9m Zi1ieTogVGhpZXJyeSBSZWRpbmcgPHRyZWRpbmdAbnZpZGlhLmNvbT4KLS0tCiBkcml2ZXJzL2dw dS9kcm0vdGVncmEvZHJtLmMgfCAyMCArKysrKysrKysrKysrKysrLS0tLQogZHJpdmVycy9ncHUv ZHJtL3RlZ3JhL2RybS5oIHwgIDEgKwogZHJpdmVycy9ncHUvZHJtL3RlZ3JhL2ZiLmMgIHwgMjAg KysrKysrKysrKysrKysrKystLS0KIDMgZmlsZXMgY2hhbmdlZCwgMzQgaW5zZXJ0aW9ucygrKSwg NyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdGVncmEvZHJtLmMg Yi9kcml2ZXJzL2dwdS9kcm0vdGVncmEvZHJtLmMKaW5kZXggNTk3MzZiYjgxMGNkLi5lMTYzMmZi MDNhODkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS90ZWdyYS9kcm0uYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vdGVncmEvZHJtLmMKQEAgLTQyLDEzICs0MiwxMyBAQCBzdGF0aWMgaW50IHRl Z3JhX2RybV9sb2FkKHN0cnVjdCBkcm1fZGV2aWNlICpkcm0sIHVuc2lnbmVkIGxvbmcgZmxhZ3Mp CiAKIAllcnIgPSB0ZWdyYV9kcm1fZmJfcHJlcGFyZShkcm0pOwogCWlmIChlcnIgPCAwKQotCQly ZXR1cm4gZXJyOworCQlnb3RvIGNvbmZpZzsKIAogCWRybV9rbXNfaGVscGVyX3BvbGxfaW5pdChk cm0pOwogCiAJZXJyID0gaG9zdDF4X2RldmljZV9pbml0KGRldmljZSk7CiAJaWYgKGVyciA8IDAp Ci0JCXJldHVybiBlcnI7CisJCWdvdG8gZmJkZXY7CiAKIAkvKgogCSAqIFdlIGRvbid0IHVzZSB0 aGUgZHJtX2lycV9pbnN0YWxsKCkgaGVscGVycyBwcm92aWRlZCBieSB0aGUgRFJNCkBAIC01OSwx MyArNTksMjUgQEAgc3RhdGljIGludCB0ZWdyYV9kcm1fbG9hZChzdHJ1Y3QgZHJtX2RldmljZSAq ZHJtLCB1bnNpZ25lZCBsb25nIGZsYWdzKQogCiAJZXJyID0gZHJtX3ZibGFua19pbml0KGRybSwg ZHJtLT5tb2RlX2NvbmZpZy5udW1fY3J0Yyk7CiAJaWYgKGVyciA8IDApCi0JCXJldHVybiBlcnI7 CisJCWdvdG8gZGV2aWNlOwogCiAJZXJyID0gdGVncmFfZHJtX2ZiX2luaXQoZHJtKTsKIAlpZiAo ZXJyIDwgMCkKLQkJcmV0dXJuIGVycjsKKwkJZ290byB2Ymxhbms7CiAKIAlyZXR1cm4gMDsKKwor dmJsYW5rOgorCWRybV92YmxhbmtfY2xlYW51cChkcm0pOworZGV2aWNlOgorCWhvc3QxeF9kZXZp Y2VfZXhpdChkZXZpY2UpOworZmJkZXY6CisJZHJtX2ttc19oZWxwZXJfcG9sbF9maW5pKGRybSk7 CisJdGVncmFfZHJtX2ZiX2ZyZWUoZHJtKTsKK2NvbmZpZzoKKwlkcm1fbW9kZV9jb25maWdfY2xl YW51cChkcm0pOworCWtmcmVlKHRlZ3JhKTsKKwlyZXR1cm4gZXJyOwogfQogCiBzdGF0aWMgaW50 IHRlZ3JhX2RybV91bmxvYWQoc3RydWN0IGRybV9kZXZpY2UgKmRybSkKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS90ZWdyYS9kcm0uaCBiL2RyaXZlcnMvZ3B1L2RybS90ZWdyYS9kcm0uaApp bmRleCBiOTk0YzAxNzk3MWQuLmVmMmZhYWVmNTkzNiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL3RlZ3JhL2RybS5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS90ZWdyYS9kcm0uaApAQCAtMjg4 LDYgKzI4OCw3IEBAIGJvb2wgdGVncmFfZmJfaXNfYm90dG9tX3VwKHN0cnVjdCBkcm1fZnJhbWVi dWZmZXIgKmZyYW1lYnVmZmVyKTsKIGludCB0ZWdyYV9mYl9nZXRfdGlsaW5nKHN0cnVjdCBkcm1f ZnJhbWVidWZmZXIgKmZyYW1lYnVmZmVyLAogCQkJc3RydWN0IHRlZ3JhX2JvX3RpbGluZyAqdGls aW5nKTsKIGludCB0ZWdyYV9kcm1fZmJfcHJlcGFyZShzdHJ1Y3QgZHJtX2RldmljZSAqZHJtKTsK K3ZvaWQgdGVncmFfZHJtX2ZiX2ZyZWUoc3RydWN0IGRybV9kZXZpY2UgKmRybSk7CiBpbnQgdGVn cmFfZHJtX2ZiX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRybSk7CiB2b2lkIHRlZ3JhX2RybV9m Yl9leGl0KHN0cnVjdCBkcm1fZGV2aWNlICpkcm0pOwogI2lmZGVmIENPTkZJR19EUk1fVEVHUkFf RkJERVYKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS90ZWdyYS9mYi5jIGIvZHJpdmVycy9n cHUvZHJtL3RlZ3JhL2ZiLmMKaW5kZXggMzUxM2QxMmQ1YWExLi4wNDc0MjQxYWMyYTQgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS90ZWdyYS9mYi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS90 ZWdyYS9mYi5jCkBAIC0yODksNiArMjg5LDExIEBAIHN0YXRpYyBzdHJ1Y3QgdGVncmFfZmJkZXYg KnRlZ3JhX2ZiZGV2X2NyZWF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZHJtKQogCXJldHVybiBmYmRl djsKIH0KIAorc3RhdGljIHZvaWQgdGVncmFfZmJkZXZfZnJlZShzdHJ1Y3QgdGVncmFfZmJkZXYg KmZiZGV2KQoreworCWtmcmVlKGZiZGV2KTsKK30KKwogc3RhdGljIGludCB0ZWdyYV9mYmRldl9p bml0KHN0cnVjdCB0ZWdyYV9mYmRldiAqZmJkZXYsCiAJCQkgICAgdW5zaWduZWQgaW50IHByZWZl cnJlZF9icHAsCiAJCQkgICAgdW5zaWduZWQgaW50IG51bV9jcnRjLApAQCAtMzIyLDcgKzMyNyw3 IEBAIGZpbmk6CiAJcmV0dXJuIGVycjsKIH0KIAotc3RhdGljIHZvaWQgdGVncmFfZmJkZXZfZnJl ZShzdHJ1Y3QgdGVncmFfZmJkZXYgKmZiZGV2KQorc3RhdGljIHZvaWQgdGVncmFfZmJkZXZfZXhp dChzdHJ1Y3QgdGVncmFfZmJkZXYgKmZiZGV2KQogewogCXN0cnVjdCBmYl9pbmZvICppbmZvID0g ZmJkZXYtPmJhc2UuZmJkZXY7CiAKQEAgLTM0NSw3ICszNTAsNyBAQCBzdGF0aWMgdm9pZCB0ZWdy YV9mYmRldl9mcmVlKHN0cnVjdCB0ZWdyYV9mYmRldiAqZmJkZXYpCiAJfQogCiAJZHJtX2ZiX2hl bHBlcl9maW5pKCZmYmRldi0+YmFzZSk7Ci0Ja2ZyZWUoZmJkZXYpOworCXRlZ3JhX2ZiZGV2X2Zy ZWUoZmJkZXYpOwogfQogCiB2b2lkIHRlZ3JhX2ZiZGV2X3Jlc3RvcmVfbW9kZShzdHJ1Y3QgdGVn cmFfZmJkZXYgKmZiZGV2KQpAQCAtMzkzLDYgKzM5OCwxNSBAQCBpbnQgdGVncmFfZHJtX2ZiX3By ZXBhcmUoc3RydWN0IGRybV9kZXZpY2UgKmRybSkKIAlyZXR1cm4gMDsKIH0KIAordm9pZCB0ZWdy YV9kcm1fZmJfZnJlZShzdHJ1Y3QgZHJtX2RldmljZSAqZHJtKQoreworI2lmZGVmIENPTkZJR19E Uk1fVEVHUkFfRkJERVYKKwlzdHJ1Y3QgdGVncmFfZHJtICp0ZWdyYSA9IGRybS0+ZGV2X3ByaXZh dGU7CisKKwl0ZWdyYV9mYmRldl9mcmVlKHRlZ3JhLT5mYmRldik7CisjZW5kaWYKK30KKwogaW50 IHRlZ3JhX2RybV9mYl9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkcm0pCiB7CiAjaWZkZWYgQ09O RklHX0RSTV9URUdSQV9GQkRFVgpAQCAtNDEzLDYgKzQyNyw2IEBAIHZvaWQgdGVncmFfZHJtX2Zi X2V4aXQoc3RydWN0IGRybV9kZXZpY2UgKmRybSkKICNpZmRlZiBDT05GSUdfRFJNX1RFR1JBX0ZC REVWCiAJc3RydWN0IHRlZ3JhX2RybSAqdGVncmEgPSBkcm0tPmRldl9wcml2YXRlOwogCi0JdGVn cmFfZmJkZXZfZnJlZSh0ZWdyYS0+ZmJkZXYpOworCXRlZ3JhX2ZiZGV2X2V4aXQodGVncmEtPmZi ZGV2KTsKICNlbmRpZgogfQotLSAKMi4xLjMKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vZHJpLWRldmVsCg==