From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6618628196583604224 X-Received: by 2002:a02:1685:: with SMTP id a127-v6mr3656958jaa.9.1541019463346; Wed, 31 Oct 2018 13:57:43 -0700 (PDT) X-BeenThere: outreachy-kernel@googlegroups.com Received: by 2002:a24:5dc6:: with SMTP id w189-v6ls3366501ita.4.canary-gmail; Wed, 31 Oct 2018 13:57:42 -0700 (PDT) X-Google-Smtp-Source: AJdET5cP0Hg6bbTSrHFnGO5QlLliKRxBGA1ByFRRQGtl9e1o1Dte3+OAzMT5AE13191/lK6KCHpP X-Received: by 2002:a24:2795:: with SMTP id g143-v6mr3248821ita.38.1541019462574; Wed, 31 Oct 2018 13:57:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1541019462; cv=none; d=google.com; s=arc-20160816; b=h8X5nVBny9tA1QuxnsaSvlO1+YqNQqkZsPVGWBUaeo+gwSleuSqH1UtV/MCvP0iYtv XIP89uHLt7ecnVK6ZrKjks5EYSQHmP4M8lbtGTavUZqpsj0aSfGHYosYaWEOrAu5DFmh sGS2Gg/d7+3xgXpXYD9xn+l2uQv+nafzPZrf3Z6QCLh/sPPR7AEWHjgmIVlmDlSxZqcS Mw42FRb6l4lHooeSgRTnSxhUoLz7f3C6Z9fsRlfO5cGqrOjYzDBVnbk5djjsKtdLgYxO b3504y4FEqTbSiMUU3ThF1Hdu7qwHoXOwZFhY6Y74dBnzniuen7S31EGFSRyVYc9d3pf kjLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=user-agent:content-disposition:mime-version:message-id:subject:cc :to:from:date:dkim-signature; bh=P/+YaClhl463b55HNkEDJSmrYu6HJuE62UikqKKubfI=; b=okwMmEwn/tndA9SIQ9DOgy/txP46Agw013UB6lzP8a4wh/LV6dKulE6NMKPi6ct7pb kB7TI1oiJeMHETQwbQIyMNjVY8pQNNeRUuJEzhcjsLF/viCfufNdfyFo1mLxzmFb/4hF ak0hKL6IWzT1cw5MLz4Qtsaa6oe5i0x496xrIAj8i1tEe2SWetsB6/m3X3mvGmbuyaxg DfOWTB1y9kYj18Uefy1LJnxqbUUIbK8VQDrEPzrDmCv28Xuix6jHTxWXxzVm34tzV3DE mav645r2QO2Gt9mMl8WbqUl/EjKcrJpPyXQK1jU5NVMxFK82KUTjbzROHtLDw/AtA+Cs IDkQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=BRJ9FWO6; spf=pass (google.com: domain of shayenneluzmoura@gmail.com designates 2607:f8b0:4864:20::730 as permitted sender) smtp.mailfrom=shayenneluzmoura@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail-qk1-x730.google.com (mail-qk1-x730.google.com. [2607:f8b0:4864:20::730]) by gmr-mx.google.com with ESMTPS id a75-v6si365553itc.1.2018.10.31.13.57.42 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 31 Oct 2018 13:57:42 -0700 (PDT) Received-SPF: pass (google.com: domain of shayenneluzmoura@gmail.com designates 2607:f8b0:4864:20::730 as permitted sender) client-ip=2607:f8b0:4864:20::730; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=BRJ9FWO6; spf=pass (google.com: domain of shayenneluzmoura@gmail.com designates 2607:f8b0:4864:20::730 as permitted sender) smtp.mailfrom=shayenneluzmoura@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: by mail-qk1-x730.google.com with SMTP id v68-v6so11034766qka.2 for ; Wed, 31 Oct 2018 13:57:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :user-agent; bh=P/+YaClhl463b55HNkEDJSmrYu6HJuE62UikqKKubfI=; b=BRJ9FWO6fUu0YJQeL50LI6vGFyl/xRz/WGPUv9rzD8YWGbevwthS8v6eWkiNQYyWaH R+bxH2SxYzO69xv56kyjPVVZPEyI5PR/o8aw3zdXJAK+1KaXFc9+02gMSgECXe6HMren QEW6ERccqbbjooglY0PLtMhEZtI1yMRARcflSFpRyR1WjWAwWx673SFH/wMxg3a2TRrZ apimM2jbB7MFJr6+0XEJhdu0A8ZHwRn10XTf7z307G1LcY55QIW0zzwCR4rPkqQ2kvOd EP3jIi33UqKut4hDCbfJmGDF6hzEcvzIGicK5kbL8yZzzDD/KqjWaBPKesz/kjKUQYk/ kIsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=P/+YaClhl463b55HNkEDJSmrYu6HJuE62UikqKKubfI=; b=ZFQtpBgAXkiN375XFv3ctstA1hVgKFHggSlHh8m44hinBVBp4dWN09q9l71PtI6RLG FIWjtdMHdsT43pUcMngQ45uKrpDzHaBFFH9ZM/rjbfQ6iFe2NgqE6MOr269NiU5lA3t8 og60KB6vrDF9vgRqoMkDLFFWNp8a+hAXygW1tc6VAaCe3dncj/+NG4l58q1W8eGrMOwH Ny62HNy5ObvO9RDJAvVXwUWZwJeIfVj0dToF80/WU412rNQvEJ6e/FfPiwdGv5L/IEae l1Ah6gv8Zd7aHHk2aCK+8r7a4U9WZFrr8NG8aoaH6WicFz0i1vtzmP0pH5xQN2kJd9io K1Ng== X-Gm-Message-State: AGRZ1gKtQVlSTERh0NaP9XMiO86OVqyFSbjVMuNKdkW9xBD9LO9GNNA0 9AnyiIscdK/qasOHBoHHcXU= X-Received: by 2002:a37:9e44:: with SMTP id h65mr4129485qke.300.1541019462076; Wed, 31 Oct 2018 13:57:42 -0700 (PDT) Return-Path: Received: from smtp.gmail.com ([143.107.45.1]) by smtp.gmail.com with ESMTPSA id o63-v6sm9119499qka.16.2018.10.31.13.57.39 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 31 Oct 2018 13:57:41 -0700 (PDT) Date: Wed, 31 Oct 2018 17:57:37 -0300 From: Shayenne da Luz Moura To: Maarten Lankhorst , Maxime Ripard , Sean Paul , David Airlie Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, outreachy-kernel@googlegroups.com Subject: [PATCH] drm: Rename crtc_idr as object_idr to KMS cleanups Message-ID: <20181031205737.cingeaqget7hkbs6@smtp.gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: NeoMutt/20171215 Rename 'drm_mode_config.crtc_idr' as 'drm_mode_config.object_idr', as proposed in the task description in TODO list for KMS cleanups. Signed-off-by: Shayenne da Luz Moura --- drivers/gpu/drm/drm_lease.c | 6 +++--- drivers/gpu/drm/drm_mode_config.c | 4 ++-- drivers/gpu/drm/drm_mode_object.c | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/drm_lease.c b/drivers/gpu/drm/drm_lease.c index f4702f23c11d..4f8de2217049 100644 --- a/drivers/gpu/drm/drm_lease.c +++ b/drivers/gpu/drm/drm_lease.c @@ -222,7 +222,7 @@ static struct drm_master *drm_lease_create(struct drm_master *lessor, struct idr idr_for_each_entry(leases, entry, object) { error = 0; - if (!idr_find(&dev->mode_config.crtc_idr, object)) + if (!idr_find(&dev->mode_config.object_idr, object)) error = -ENOENT; else if (!_drm_lease_held_master(lessor, object)) error = -EACCES; @@ -438,7 +438,7 @@ static int fill_object_idr(struct drm_device *dev, /* * We're using an IDR to hold the set of leased * objects, but we don't need to point at the object's - * data structure from the lease as the main crtc_idr + * data structure from the lease as the main object_idr * will be used to actually find that. Instead, all we * really want is a 'leased/not-leased' result, for * which any non-NULL pointer will work fine. @@ -679,7 +679,7 @@ int drm_mode_get_lease_ioctl(struct drm_device *dev, if (lessee->lessor == NULL) /* owner can use all objects */ - object_idr = &lessee->dev->mode_config.crtc_idr; + object_idr = &lessee->dev->mode_config.object_idr; else /* lessee can only use allowed object */ object_idr = &lessee->leases; diff --git a/drivers/gpu/drm/drm_mode_config.c b/drivers/gpu/drm/drm_mode_config.c index ee80788f2c40..ab553b6465e2 100644 --- a/drivers/gpu/drm/drm_mode_config.c +++ b/drivers/gpu/drm/drm_mode_config.c @@ -381,7 +381,7 @@ void drm_mode_config_init(struct drm_device *dev) INIT_LIST_HEAD(&dev->mode_config.property_list); INIT_LIST_HEAD(&dev->mode_config.property_blob_list); INIT_LIST_HEAD(&dev->mode_config.plane_list); - idr_init(&dev->mode_config.crtc_idr); + idr_init(&dev->mode_config.object_idr); idr_init(&dev->mode_config.tile_idr); ida_init(&dev->mode_config.connector_ida); spin_lock_init(&dev->mode_config.connector_list_lock); @@ -484,7 +484,7 @@ void drm_mode_config_cleanup(struct drm_device *dev) ida_destroy(&dev->mode_config.connector_ida); idr_destroy(&dev->mode_config.tile_idr); - idr_destroy(&dev->mode_config.crtc_idr); + idr_destroy(&dev->mode_config.object_idr); drm_modeset_lock_fini(&dev->mode_config.connection_mutex); } EXPORT_SYMBOL(drm_mode_config_cleanup); diff --git a/drivers/gpu/drm/drm_mode_object.c b/drivers/gpu/drm/drm_mode_object.c index cd9bc0ce9be0..bb1dd46496cd 100644 --- a/drivers/gpu/drm/drm_mode_object.c +++ b/drivers/gpu/drm/drm_mode_object.c @@ -38,7 +38,7 @@ int __drm_mode_object_add(struct drm_device *dev, struct drm_mode_object *obj, int ret; mutex_lock(&dev->mode_config.idr_mutex); - ret = idr_alloc(&dev->mode_config.crtc_idr, register_obj ? obj : NULL, + ret = idr_alloc(&dev->mode_config.object_idr, register_obj ? obj : NULL, 1, 0, GFP_KERNEL); if (ret >= 0) { /* @@ -79,7 +79,7 @@ void drm_mode_object_register(struct drm_device *dev, struct drm_mode_object *obj) { mutex_lock(&dev->mode_config.idr_mutex); - idr_replace(&dev->mode_config.crtc_idr, obj, obj->id); + idr_replace(&dev->mode_config.object_idr, obj, obj->id); mutex_unlock(&dev->mode_config.idr_mutex); } @@ -99,7 +99,7 @@ void drm_mode_object_unregister(struct drm_device *dev, { mutex_lock(&dev->mode_config.idr_mutex); if (object->id) { - idr_remove(&dev->mode_config.crtc_idr, object->id); + idr_remove(&dev->mode_config.object_idr, object->id); object->id = 0; } mutex_unlock(&dev->mode_config.idr_mutex); @@ -131,7 +131,7 @@ struct drm_mode_object *__drm_mode_object_find(struct drm_device *dev, struct drm_mode_object *obj = NULL; mutex_lock(&dev->mode_config.idr_mutex); - obj = idr_find(&dev->mode_config.crtc_idr, id); + obj = idr_find(&dev->mode_config.object_idr, id); if (obj && type != DRM_MODE_OBJECT_ANY && obj->type != type) obj = NULL; if (obj && obj->id != id) -- 2.19.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Shayenne da Luz Moura Subject: [PATCH] drm: Rename crtc_idr as object_idr to KMS cleanups Date: Wed, 31 Oct 2018 17:57:37 -0300 Message-ID: <20181031205737.cingeaqget7hkbs6@smtp.gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-qk1-x743.google.com (mail-qk1-x743.google.com [IPv6:2607:f8b0:4864:20::743]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1AD1E6E3A9 for ; Wed, 31 Oct 2018 20:57:43 +0000 (UTC) Received: by mail-qk1-x743.google.com with SMTP id e4so11026540qkh.6 for ; Wed, 31 Oct 2018 13:57:43 -0700 (PDT) Content-Disposition: inline List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Maarten Lankhorst , Maxime Ripard , Sean Paul , David Airlie Cc: outreachy-kernel@googlegroups.com, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org UmVuYW1lICdkcm1fbW9kZV9jb25maWcuY3J0Y19pZHInIGFzICdkcm1fbW9kZV9jb25maWcub2Jq ZWN0X2lkcicsCmFzIHByb3Bvc2VkIGluIHRoZSB0YXNrIGRlc2NyaXB0aW9uIGluIFRPRE8gbGlz dCBmb3IgS01TIGNsZWFudXBzLgoKU2lnbmVkLW9mZi1ieTogU2hheWVubmUgZGEgTHV6IE1vdXJh IDxzaGF5ZW5uZWx1em1vdXJhQGdtYWlsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vZHJtX2xl YXNlLmMgICAgICAgfCA2ICsrKy0tLQogZHJpdmVycy9ncHUvZHJtL2RybV9tb2RlX2NvbmZpZy5j IHwgNCArKy0tCiBkcml2ZXJzL2dwdS9kcm0vZHJtX21vZGVfb2JqZWN0LmMgfCA4ICsrKystLS0t CiAzIGZpbGVzIGNoYW5nZWQsIDkgaW5zZXJ0aW9ucygrKSwgOSBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2xlYXNlLmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJt X2xlYXNlLmMKaW5kZXggZjQ3MDJmMjNjMTFkLi40ZjhkZTIyMTcwNDkgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9kcm1fbGVhc2UuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2xlYXNl LmMKQEAgLTIyMiw3ICsyMjIsNyBAQCBzdGF0aWMgc3RydWN0IGRybV9tYXN0ZXIgKmRybV9sZWFz ZV9jcmVhdGUoc3RydWN0IGRybV9tYXN0ZXIgKmxlc3Nvciwgc3RydWN0IGlkcgogCiAJaWRyX2Zv cl9lYWNoX2VudHJ5KGxlYXNlcywgZW50cnksIG9iamVjdCkgewogCQllcnJvciA9IDA7Ci0JCWlm ICghaWRyX2ZpbmQoJmRldi0+bW9kZV9jb25maWcuY3J0Y19pZHIsIG9iamVjdCkpCisJCWlmICgh aWRyX2ZpbmQoJmRldi0+bW9kZV9jb25maWcub2JqZWN0X2lkciwgb2JqZWN0KSkKIAkJCWVycm9y ID0gLUVOT0VOVDsKIAkJZWxzZSBpZiAoIV9kcm1fbGVhc2VfaGVsZF9tYXN0ZXIobGVzc29yLCBv YmplY3QpKQogCQkJZXJyb3IgPSAtRUFDQ0VTOwpAQCAtNDM4LDcgKzQzOCw3IEBAIHN0YXRpYyBp bnQgZmlsbF9vYmplY3RfaWRyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCS8qCiAJCSAqIFdl J3JlIHVzaW5nIGFuIElEUiB0byBob2xkIHRoZSBzZXQgb2YgbGVhc2VkCiAJCSAqIG9iamVjdHMs IGJ1dCB3ZSBkb24ndCBuZWVkIHRvIHBvaW50IGF0IHRoZSBvYmplY3QncwotCQkgKiBkYXRhIHN0 cnVjdHVyZSBmcm9tIHRoZSBsZWFzZSBhcyB0aGUgbWFpbiBjcnRjX2lkcgorCQkgKiBkYXRhIHN0 cnVjdHVyZSBmcm9tIHRoZSBsZWFzZSBhcyB0aGUgbWFpbiBvYmplY3RfaWRyCiAJCSAqIHdpbGwg YmUgdXNlZCB0byBhY3R1YWxseSBmaW5kIHRoYXQuIEluc3RlYWQsIGFsbCB3ZQogCQkgKiByZWFs bHkgd2FudCBpcyBhICdsZWFzZWQvbm90LWxlYXNlZCcgcmVzdWx0LCBmb3IKIAkJICogd2hpY2gg YW55IG5vbi1OVUxMIHBvaW50ZXIgd2lsbCB3b3JrIGZpbmUuCkBAIC02NzksNyArNjc5LDcgQEAg aW50IGRybV9tb2RlX2dldF9sZWFzZV9pb2N0bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCiAJ aWYgKGxlc3NlZS0+bGVzc29yID09IE5VTEwpCiAJCS8qIG93bmVyIGNhbiB1c2UgYWxsIG9iamVj dHMgKi8KLQkJb2JqZWN0X2lkciA9ICZsZXNzZWUtPmRldi0+bW9kZV9jb25maWcuY3J0Y19pZHI7 CisJCW9iamVjdF9pZHIgPSAmbGVzc2VlLT5kZXYtPm1vZGVfY29uZmlnLm9iamVjdF9pZHI7CiAJ ZWxzZQogCQkvKiBsZXNzZWUgY2FuIG9ubHkgdXNlIGFsbG93ZWQgb2JqZWN0ICovCiAJCW9iamVj dF9pZHIgPSAmbGVzc2VlLT5sZWFzZXM7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJt X21vZGVfY29uZmlnLmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX21vZGVfY29uZmlnLmMKaW5kZXgg ZWU4MDc4OGYyYzQwLi5hYjU1M2I2NDY1ZTIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9k cm1fbW9kZV9jb25maWcuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX21vZGVfY29uZmlnLmMK QEAgLTM4MSw3ICszODEsNyBAQCB2b2lkIGRybV9tb2RlX2NvbmZpZ19pbml0KHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYpCiAJSU5JVF9MSVNUX0hFQUQoJmRldi0+bW9kZV9jb25maWcucHJvcGVydHlf bGlzdCk7CiAJSU5JVF9MSVNUX0hFQUQoJmRldi0+bW9kZV9jb25maWcucHJvcGVydHlfYmxvYl9s aXN0KTsKIAlJTklUX0xJU1RfSEVBRCgmZGV2LT5tb2RlX2NvbmZpZy5wbGFuZV9saXN0KTsKLQlp ZHJfaW5pdCgmZGV2LT5tb2RlX2NvbmZpZy5jcnRjX2lkcik7CisJaWRyX2luaXQoJmRldi0+bW9k ZV9jb25maWcub2JqZWN0X2lkcik7CiAJaWRyX2luaXQoJmRldi0+bW9kZV9jb25maWcudGlsZV9p ZHIpOwogCWlkYV9pbml0KCZkZXYtPm1vZGVfY29uZmlnLmNvbm5lY3Rvcl9pZGEpOwogCXNwaW5f bG9ja19pbml0KCZkZXYtPm1vZGVfY29uZmlnLmNvbm5lY3Rvcl9saXN0X2xvY2spOwpAQCAtNDg0 LDcgKzQ4NCw3IEBAIHZvaWQgZHJtX21vZGVfY29uZmlnX2NsZWFudXAoc3RydWN0IGRybV9kZXZp Y2UgKmRldikKIAogCWlkYV9kZXN0cm95KCZkZXYtPm1vZGVfY29uZmlnLmNvbm5lY3Rvcl9pZGEp OwogCWlkcl9kZXN0cm95KCZkZXYtPm1vZGVfY29uZmlnLnRpbGVfaWRyKTsKLQlpZHJfZGVzdHJv eSgmZGV2LT5tb2RlX2NvbmZpZy5jcnRjX2lkcik7CisJaWRyX2Rlc3Ryb3koJmRldi0+bW9kZV9j b25maWcub2JqZWN0X2lkcik7CiAJZHJtX21vZGVzZXRfbG9ja19maW5pKCZkZXYtPm1vZGVfY29u ZmlnLmNvbm5lY3Rpb25fbXV0ZXgpOwogfQogRVhQT1JUX1NZTUJPTChkcm1fbW9kZV9jb25maWdf Y2xlYW51cCk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX21vZGVfb2JqZWN0LmMg Yi9kcml2ZXJzL2dwdS9kcm0vZHJtX21vZGVfb2JqZWN0LmMKaW5kZXggY2Q5YmMwY2U5YmUwLi5i YjFkZDQ2NDk2Y2QgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fbW9kZV9vYmplY3Qu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX21vZGVfb2JqZWN0LmMKQEAgLTM4LDcgKzM4LDcg QEAgaW50IF9fZHJtX21vZGVfb2JqZWN0X2FkZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1 Y3QgZHJtX21vZGVfb2JqZWN0ICpvYmosCiAJaW50IHJldDsKIAogCW11dGV4X2xvY2soJmRldi0+ bW9kZV9jb25maWcuaWRyX211dGV4KTsKLQlyZXQgPSBpZHJfYWxsb2MoJmRldi0+bW9kZV9jb25m aWcuY3J0Y19pZHIsIHJlZ2lzdGVyX29iaiA/IG9iaiA6IE5VTEwsCisJcmV0ID0gaWRyX2FsbG9j KCZkZXYtPm1vZGVfY29uZmlnLm9iamVjdF9pZHIsIHJlZ2lzdGVyX29iaiA/IG9iaiA6IE5VTEws CiAJCQkxLCAwLCBHRlBfS0VSTkVMKTsKIAlpZiAocmV0ID49IDApIHsKIAkJLyoKQEAgLTc5LDcg Kzc5LDcgQEAgdm9pZCBkcm1fbW9kZV9vYmplY3RfcmVnaXN0ZXIoc3RydWN0IGRybV9kZXZpY2Ug KmRldiwKIAkJCSAgICAgIHN0cnVjdCBkcm1fbW9kZV9vYmplY3QgKm9iaikKIHsKIAltdXRleF9s b2NrKCZkZXYtPm1vZGVfY29uZmlnLmlkcl9tdXRleCk7Ci0JaWRyX3JlcGxhY2UoJmRldi0+bW9k ZV9jb25maWcuY3J0Y19pZHIsIG9iaiwgb2JqLT5pZCk7CisJaWRyX3JlcGxhY2UoJmRldi0+bW9k ZV9jb25maWcub2JqZWN0X2lkciwgb2JqLCBvYmotPmlkKTsKIAltdXRleF91bmxvY2soJmRldi0+ bW9kZV9jb25maWcuaWRyX211dGV4KTsKIH0KIApAQCAtOTksNyArOTksNyBAQCB2b2lkIGRybV9t b2RlX29iamVjdF91bnJlZ2lzdGVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiB7CiAJbXV0ZXhf bG9jaygmZGV2LT5tb2RlX2NvbmZpZy5pZHJfbXV0ZXgpOwogCWlmIChvYmplY3QtPmlkKSB7Ci0J CWlkcl9yZW1vdmUoJmRldi0+bW9kZV9jb25maWcuY3J0Y19pZHIsIG9iamVjdC0+aWQpOworCQlp ZHJfcmVtb3ZlKCZkZXYtPm1vZGVfY29uZmlnLm9iamVjdF9pZHIsIG9iamVjdC0+aWQpOwogCQlv YmplY3QtPmlkID0gMDsKIAl9CiAJbXV0ZXhfdW5sb2NrKCZkZXYtPm1vZGVfY29uZmlnLmlkcl9t dXRleCk7CkBAIC0xMzEsNyArMTMxLDcgQEAgc3RydWN0IGRybV9tb2RlX29iamVjdCAqX19kcm1f bW9kZV9vYmplY3RfZmluZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCXN0cnVjdCBkcm1fbW9k ZV9vYmplY3QgKm9iaiA9IE5VTEw7CiAKIAltdXRleF9sb2NrKCZkZXYtPm1vZGVfY29uZmlnLmlk cl9tdXRleCk7Ci0Jb2JqID0gaWRyX2ZpbmQoJmRldi0+bW9kZV9jb25maWcuY3J0Y19pZHIsIGlk KTsKKwlvYmogPSBpZHJfZmluZCgmZGV2LT5tb2RlX2NvbmZpZy5vYmplY3RfaWRyLCBpZCk7CiAJ aWYgKG9iaiAmJiB0eXBlICE9IERSTV9NT0RFX09CSkVDVF9BTlkgJiYgb2JqLT50eXBlICE9IHR5 cGUpCiAJCW9iaiA9IE5VTEw7CiAJaWYgKG9iaiAmJiBvYmotPmlkICE9IGlkKQotLSAKMi4xOS4x CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2 ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK