From mboxrd@z Thu Jan 1 00:00:00 1970 From: SF Markus Elfring Subject: [PATCH 07/14] GPU-DRM-OMAP: Rename a jump label in omap_dmm_probe() Date: Wed, 21 Sep 2016 18:48:40 +0200 Message-ID: References: <566ABCD9.1060404@users.sourceforge.net> <0ea38611-3d93-0ade-a1fb-f8cc2e0b8d61@users.sourceforge.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mout.web.de (mout.web.de [212.227.15.14]) by gabe.freedesktop.org (Postfix) with ESMTPS id B6D9F6E871 for ; Wed, 21 Sep 2016 16:48:47 +0000 (UTC) In-Reply-To: <0ea38611-3d93-0ade-a1fb-f8cc2e0b8d61@users.sourceforge.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, David Airlie , Laurent Pinchart , Tomi Valkeinen Cc: Julia Lawall , kernel-janitors@vger.kernel.org, LKML List-Id: dri-devel@lists.freedesktop.org RnJvbTogTWFya3VzIEVsZnJpbmcgPGVsZnJpbmdAdXNlcnMuc291cmNlZm9yZ2UubmV0PgpEYXRl OiBXZWQsIDIxIFNlcCAyMDE2IDE3OjMwOjI1ICswMjAwCgpBZGp1c3QganVtcCBsYWJlbHMgYWNj b3JkaW5nIHRvIHRoZSBjdXJyZW50IExpbnV4IGNvZGluZyBzdHlsZSBjb252ZW50aW9uLgoKU2ln bmVkLW9mZi1ieTogTWFya3VzIEVsZnJpbmcgPGVsZnJpbmdAdXNlcnMuc291cmNlZm9yZ2UubmV0 PgotLS0KIGRyaXZlcnMvZ3B1L2RybS9vbWFwZHJtL29tYXBfZG1tX3RpbGVyLmMgfCAyNSArKysr KysrKysrKystLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTIgaW5zZXJ0aW9ucygrKSwg MTMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL29tYXBkcm0vb21h cF9kbW1fdGlsZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9vbWFwZHJtL29tYXBfZG1tX3RpbGVyLmMK aW5kZXggYzZhNzE5Ny4uNWY2ZjIxYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL29tYXBk cm0vb21hcF9kbW1fdGlsZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vb21hcGRybS9vbWFwX2Rt bV90aWxlci5jCkBAIC02MjQsNyArNjI0LDcgQEAgc3RhdGljIGludCBvbWFwX2RtbV9wcm9iZShz dHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpkZXYpCiAKIAlvbWFwX2RtbSA9IGt6YWxsb2Moc2l6ZW9m KCpvbWFwX2RtbSksIEdGUF9LRVJORUwpOwogCWlmICghb21hcF9kbW0pCi0JCWdvdG8gZmFpbDsK KwkJZ290byBjaGVja19kbW1fcmVtb3ZhbDsKIAogCS8qIGluaXRpYWxpemUgbGlzdHMgKi8KIAlJ TklUX0xJU1RfSEVBRCgmb21hcF9kbW0tPmFsbG9jX2hlYWQpOwpAQCAtNjQ4LDIwICs2NDgsMjAg QEAgc3RhdGljIGludCBvbWFwX2RtbV9wcm9iZShzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpkZXYp CiAJbWVtID0gcGxhdGZvcm1fZ2V0X3Jlc291cmNlKGRldiwgSU9SRVNPVVJDRV9NRU0sIDApOwog CWlmICghbWVtKSB7CiAJCWRldl9lcnIoJmRldi0+ZGV2LCAiZmFpbGVkIHRvIGdldCBiYXNlIGFk ZHJlc3MgcmVzb3VyY2VcbiIpOwotCQlnb3RvIGZhaWw7CisJCWdvdG8gY2hlY2tfZG1tX3JlbW92 YWw7CiAJfQogCiAJb21hcF9kbW0tPmJhc2UgPSBpb3JlbWFwKG1lbS0+c3RhcnQsIFNaXzJLKTsK IAogCWlmICghb21hcF9kbW0tPmJhc2UpIHsKIAkJZGV2X2VycigmZGV2LT5kZXYsICJmYWlsZWQg dG8gZ2V0IGRtbSBiYXNlIGFkZHJlc3NcbiIpOwotCQlnb3RvIGZhaWw7CisJCWdvdG8gY2hlY2tf ZG1tX3JlbW92YWw7CiAJfQogCiAJb21hcF9kbW0tPmlycSA9IHBsYXRmb3JtX2dldF9pcnEoZGV2 LCAwKTsKIAlpZiAob21hcF9kbW0tPmlycSA8IDApIHsKIAkJZGV2X2VycigmZGV2LT5kZXYsICJm YWlsZWQgdG8gZ2V0IElSUSByZXNvdXJjZVxuIik7Ci0JCWdvdG8gZmFpbDsKKwkJZ290byBjaGVj a19kbW1fcmVtb3ZhbDsKIAl9CiAKIAlvbWFwX2RtbS0+ZGV2ID0gJmRldi0+ZGV2OwpAQCAtNjk5 LDcgKzY5OSw3IEBAIHN0YXRpYyBpbnQgb21hcF9kbW1fcHJvYmUoc3RydWN0IHBsYXRmb3JtX2Rl dmljZSAqZGV2KQogCQlkZXZfZXJyKCZkZXYtPmRldiwgImNvdWxkbid0IHJlZ2lzdGVyIElSUSAl ZCwgZXJyb3IgJWRcbiIsCiAJCQlvbWFwX2RtbS0+aXJxLCByZXQpOwogCQlvbWFwX2RtbS0+aXJx ID0gLTE7Ci0JCWdvdG8gZmFpbDsKKwkJZ290byBjaGVja19kbW1fcmVtb3ZhbDsKIAl9CiAKIAkv KiBFbmFibGUgYWxsIGludGVycnVwdHMgZm9yIGVhY2ggcmVmaWxsIGVuZ2luZSBleGNlcHQKQEAg LTcxNCwxMyArNzE0LDEzIEBAIHN0YXRpYyBpbnQgb21hcF9kbW1fcHJvYmUoc3RydWN0IHBsYXRm b3JtX2RldmljZSAqZGV2KQogCWlmICghb21hcF9kbW0tPmR1bW15X3BhZ2UpIHsKIAkJZGV2X2Vy cigmZGV2LT5kZXYsICJjb3VsZCBub3QgYWxsb2NhdGUgZHVtbXkgcGFnZVxuIik7CiAJCXJldCA9 IC1FTk9NRU07Ci0JCWdvdG8gZmFpbDsKKwkJZ290byBjaGVja19kbW1fcmVtb3ZhbDsKIAl9CiAK IAkvKiBzZXQgZG1hIG1hc2sgZm9yIGRldmljZSAqLwogCXJldCA9IGRtYV9zZXRfY29oZXJlbnRf bWFzaygmZGV2LT5kZXYsIERNQV9CSVRfTUFTSygzMikpOwogCWlmIChyZXQpCi0JCWdvdG8gZmFp bDsKKwkJZ290byBjaGVja19kbW1fcmVtb3ZhbDsKIAogCW9tYXBfZG1tLT5kdW1teV9wYSA9IHBh Z2VfdG9fcGh5cyhvbWFwX2RtbS0+ZHVtbXlfcGFnZSk7CiAKQEAgLTczMCw3ICs3MzAsNyBAQCBz dGF0aWMgaW50IG9tYXBfZG1tX3Byb2JlKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKmRldikKIAkJ CQkJICAgJm9tYXBfZG1tLT5yZWZpbGxfcGEsIEdGUF9LRVJORUwpOwogCWlmICghb21hcF9kbW0t PnJlZmlsbF92YSkgewogCQlkZXZfZXJyKCZkZXYtPmRldiwgImNvdWxkIG5vdCBhbGxvY2F0ZSBy ZWZpbGwgbWVtb3J5XG4iKTsKLQkJZ290byBmYWlsOworCQlnb3RvIGNoZWNrX2RtbV9yZW1vdmFs OwogCX0KIAogCS8qIGFsbG9jIGVuZ2luZXMgKi8KQEAgLTczOSw3ICs3MzksNyBAQCBzdGF0aWMg aW50IG9tYXBfZG1tX3Byb2JlKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKmRldikKIAkJCQkgICAg R0ZQX0tFUk5FTCk7CiAJaWYgKCFvbWFwX2RtbS0+ZW5naW5lcykgewogCQlyZXQgPSAtRU5PTUVN OwotCQlnb3RvIGZhaWw7CisJCWdvdG8gY2hlY2tfZG1tX3JlbW92YWw7CiAJfQogCiAJZm9yIChp ID0gMDsgaSA8IG9tYXBfZG1tLT5udW1fZW5naW5lczsgaSsrKSB7CkBAIC03NTgsNyArNzU4LDcg QEAgc3RhdGljIGludCBvbWFwX2RtbV9wcm9iZShzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpkZXYp CiAJCQkJR0ZQX0tFUk5FTCk7CiAJaWYgKCFvbWFwX2RtbS0+dGNtKSB7CiAJCXJldCA9IC1FTk9N RU07Ci0JCWdvdG8gZmFpbDsKKwkJZ290byBjaGVja19kbW1fcmVtb3ZhbDsKIAl9CiAKIAkvKiBp bml0IGNvbnRhaW5lcnMgKi8KQEAgLTc3Miw3ICs3NzIsNyBAQCBzdGF0aWMgaW50IG9tYXBfZG1t X3Byb2JlKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKmRldikKIAkJaWYgKCFvbWFwX2RtbS0+dGNt W2ldKSB7CiAJCQlkZXZfZXJyKCZkZXYtPmRldiwgImZhaWxlZCB0byBhbGxvY2F0ZSBjb250YWlu ZXJcbiIpOwogCQkJcmV0ID0gLUVOT01FTTsKLQkJCWdvdG8gZmFpbDsKKwkJCWdvdG8gY2hlY2tf ZG1tX3JlbW92YWw7CiAJCX0KIAogCQlvbWFwX2RtbS0+dGNtW2ldLT5sdXRfaWQgPSBpOwpAQCAt ODEyLDggKzgxMiw3IEBAIHN0YXRpYyBpbnQgb21hcF9kbW1fcHJvYmUoc3RydWN0IHBsYXRmb3Jt X2RldmljZSAqZGV2KQogCWRldl9pbmZvKG9tYXBfZG1tLT5kZXYsICJpbml0aWFsaXplZCBhbGwg UEFUIGVudHJpZXNcbiIpOwogCiAJcmV0dXJuIDA7Ci0KLWZhaWw6CisgY2hlY2tfZG1tX3JlbW92 YWw6CiAJaWYgKG9tYXBfZG1tX3JlbW92ZShkZXYpKQogCQlkZXZfZXJyKCZkZXYtPmRldiwgImNs ZWFudXAgZmFpbGVkXG4iKTsKIAlyZXR1cm4gcmV0OwotLSAKMi4xMC4wCgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0 CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK