From mboxrd@z Thu Jan 1 00:00:00 1970 From: maxime.ripard@bootlin.com (Maxime Ripard) Date: Wed, 11 Apr 2018 09:39:26 +0200 Subject: [PATCH v6 2/5] drm/atmel-hclcdc: Convert to the new generic alpha property In-Reply-To: References: Message-ID: To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Now that we have support for per-plane alpha in the core, let's use it. Acked-by: Boris Brezillon Reviewed-by: Laurent Pinchart Signed-off-by: Maxime Ripard --- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h | 13 +--- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 89 ++---------------- 2 files changed, 14 insertions(+), 88 deletions(-) diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h index ab32d5b268d2..60c937f42114 100644 --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h @@ -299,7 +299,6 @@ struct atmel_hlcdc_layer { struct atmel_hlcdc_plane { struct drm_plane base; struct atmel_hlcdc_layer layer; - struct atmel_hlcdc_plane_properties *properties; }; static inline struct atmel_hlcdc_plane * @@ -346,18 +345,6 @@ struct atmel_hlcdc_dc_desc { }; /** - * Atmel HLCDC Plane properties. - * - * This structure stores plane property definitions. - * - * @alpha: alpha blending (or transparency) property - * @rotation: rotation property - */ -struct atmel_hlcdc_plane_properties { - struct drm_property *alpha; -}; - -/** * Atmel HLCDC Display Controller. * * @desc: HLCDC Display Controller description diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c index e18800ed7cd1..73c875db45f4 100644 --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c @@ -31,7 +31,6 @@ * @src_y: y buffer position * @src_w: buffer width * @src_h: buffer height - * @alpha: alpha blending of the plane * @disc_x: x discard position * @disc_y: y discard position * @disc_w: discard width @@ -54,8 +53,6 @@ struct atmel_hlcdc_plane_state { uint32_t src_w; uint32_t src_h; - u8 alpha; - int disc_x; int disc_y; int disc_w; @@ -385,7 +382,7 @@ atmel_hlcdc_plane_update_general_settings(struct atmel_hlcdc_plane *plane, cfg |= ATMEL_HLCDC_LAYER_LAEN; else cfg |= ATMEL_HLCDC_LAYER_GAEN | - ATMEL_HLCDC_LAYER_GA(state->alpha); + ATMEL_HLCDC_LAYER_GA(state->base.alpha >> 8); } if (state->disc_h && state->disc_w) @@ -553,7 +550,7 @@ atmel_hlcdc_plane_prepare_disc_area(struct drm_crtc_state *c_state) if (!ovl_s->fb || ovl_s->fb->format->has_alpha || - ovl_state->alpha != 255) + ovl_s->alpha != DRM_BLEND_ALPHA_OPAQUE) continue; /* TODO: implement a smarter hidden area detection */ @@ -829,51 +826,18 @@ static void atmel_hlcdc_plane_destroy(struct drm_plane *p) drm_plane_cleanup(p); } -static int atmel_hlcdc_plane_atomic_set_property(struct drm_plane *p, - struct drm_plane_state *s, - struct drm_property *property, - uint64_t val) -{ - struct atmel_hlcdc_plane *plane = drm_plane_to_atmel_hlcdc_plane(p); - struct atmel_hlcdc_plane_properties *props = plane->properties; - struct atmel_hlcdc_plane_state *state = - drm_plane_state_to_atmel_hlcdc_plane_state(s); - - if (property == props->alpha) - state->alpha = val; - else - return -EINVAL; - - return 0; -} - -static int atmel_hlcdc_plane_atomic_get_property(struct drm_plane *p, - const struct drm_plane_state *s, - struct drm_property *property, - uint64_t *val) -{ - struct atmel_hlcdc_plane *plane = drm_plane_to_atmel_hlcdc_plane(p); - struct atmel_hlcdc_plane_properties *props = plane->properties; - const struct atmel_hlcdc_plane_state *state = - container_of(s, const struct atmel_hlcdc_plane_state, base); - - if (property == props->alpha) - *val = state->alpha; - else - return -EINVAL; - - return 0; -} - -static int atmel_hlcdc_plane_init_properties(struct atmel_hlcdc_plane *plane, - struct atmel_hlcdc_plane_properties *props) +static int atmel_hlcdc_plane_init_properties(struct atmel_hlcdc_plane *plane) { const struct atmel_hlcdc_layer_desc *desc = plane->layer.desc; if (desc->type == ATMEL_HLCDC_OVERLAY_LAYER || - desc->type == ATMEL_HLCDC_CURSOR_LAYER) - drm_object_attach_property(&plane->base.base, - props->alpha, 255); + desc->type == ATMEL_HLCDC_CURSOR_LAYER) { + int ret; + + ret = drm_plane_create_alpha_property(&plane->base); + if (ret) + return ret; + } if (desc->layout.xstride && desc->layout.pstride) { int ret; @@ -988,8 +952,8 @@ static void atmel_hlcdc_plane_reset(struct drm_plane *p) return; } - state->alpha = 255; p->state = &state->base; + p->state->alpha = DRM_BLEND_ALPHA_OPAQUE; p->state->plane = p; } } @@ -1042,13 +1006,10 @@ static const struct drm_plane_funcs layer_plane_funcs = { .reset = atmel_hlcdc_plane_reset, .atomic_duplicate_state = atmel_hlcdc_plane_atomic_duplicate_state, .atomic_destroy_state = atmel_hlcdc_plane_atomic_destroy_state, - .atomic_set_property = atmel_hlcdc_plane_atomic_set_property, - .atomic_get_property = atmel_hlcdc_plane_atomic_get_property, }; static int atmel_hlcdc_plane_create(struct drm_device *dev, - const struct atmel_hlcdc_layer_desc *desc, - struct atmel_hlcdc_plane_properties *props) + const struct atmel_hlcdc_layer_desc *desc) { struct atmel_hlcdc_dc *dc = dev->dev_private; struct atmel_hlcdc_plane *plane; @@ -1060,7 +1021,6 @@ static int atmel_hlcdc_plane_create(struct drm_device *dev, return -ENOMEM; atmel_hlcdc_layer_init(&plane->layer, desc, dc->hlcdc->regmap); - plane->properties = props; if (desc->type == ATMEL_HLCDC_BASE_LAYER) type = DRM_PLANE_TYPE_PRIMARY; @@ -1081,7 +1041,7 @@ static int atmel_hlcdc_plane_create(struct drm_device *dev, &atmel_hlcdc_layer_plane_helper_funcs); /* Set default property values*/ - ret = atmel_hlcdc_plane_init_properties(plane, props); + ret = atmel_hlcdc_plane_init_properties(plane); if (ret) return ret; @@ -1090,34 +1050,13 @@ static int atmel_hlcdc_plane_create(struct drm_device *dev, return 0; } -static struct atmel_hlcdc_plane_properties * -atmel_hlcdc_plane_create_properties(struct drm_device *dev) -{ - struct atmel_hlcdc_plane_properties *props; - - props = devm_kzalloc(dev->dev, sizeof(*props), GFP_KERNEL); - if (!props) - return ERR_PTR(-ENOMEM); - - props->alpha = drm_property_create_range(dev, 0, "alpha", 0, 255); - if (!props->alpha) - return ERR_PTR(-ENOMEM); - - return props; -} - int atmel_hlcdc_create_planes(struct drm_device *dev) { struct atmel_hlcdc_dc *dc = dev->dev_private; - struct atmel_hlcdc_plane_properties *props; const struct atmel_hlcdc_layer_desc *descs = dc->desc->layers; int nlayers = dc->desc->nlayers; int i, ret; - props = atmel_hlcdc_plane_create_properties(dev); - if (IS_ERR(props)) - return PTR_ERR(props); - dc->dscrpool = dmam_pool_create("atmel-hlcdc-dscr", dev->dev, sizeof(struct atmel_hlcdc_dma_channel_dscr), sizeof(u64), 0); @@ -1130,7 +1069,7 @@ int atmel_hlcdc_create_planes(struct drm_device *dev) descs[i].type != ATMEL_HLCDC_CURSOR_LAYER) continue; - ret = atmel_hlcdc_plane_create(dev, &descs[i], props); + ret = atmel_hlcdc_plane_create(dev, &descs[i]); if (ret) return ret; } -- git-series 0.9.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maxime Ripard Subject: [PATCH v6 2/5] drm/atmel-hclcdc: Convert to the new generic alpha property Date: Wed, 11 Apr 2018 09:39:26 +0200 Message-ID: References: Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail.bootlin.com (mail.bootlin.com [62.4.15.54]) by gabe.freedesktop.org (Postfix) with ESMTP id 06A4F6E54D for ; Wed, 11 Apr 2018 07:39:44 +0000 (UTC) In-Reply-To: In-Reply-To: References: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Gustavo Padovan , Daniel Vetter , Maarten Lankhorst , Sean Paul Cc: Maxime Ripard , dri-devel@lists.freedesktop.org, Stefan Schake , Boris Brezillon , Chen-Yu Tsai , Laurent Pinchart , linux-arm-kernel@lists.infradead.org List-Id: dri-devel@lists.freedesktop.org Tm93IHRoYXQgd2UgaGF2ZSBzdXBwb3J0IGZvciBwZXItcGxhbmUgYWxwaGEgaW4gdGhlIGNvcmUs IGxldCdzIHVzZSBpdC4KCkFja2VkLWJ5OiBCb3JpcyBCcmV6aWxsb24gPGJvcmlzLmJyZXppbGxv bkBib290bGluLmNvbT4KUmV2aWV3ZWQtYnk6IExhdXJlbnQgUGluY2hhcnQgPGxhdXJlbnQucGlu Y2hhcnRAaWRlYXNvbmJvYXJkLmNvbT4KU2lnbmVkLW9mZi1ieTogTWF4aW1lIFJpcGFyZCA8bWF4 aW1lLnJpcGFyZEBib290bGluLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vYXRtZWwtaGxjZGMv YXRtZWxfaGxjZGNfZGMuaCAgICB8IDEzICstLS0KIGRyaXZlcnMvZ3B1L2RybS9hdG1lbC1obGNk Yy9hdG1lbF9obGNkY19wbGFuZS5jIHwgODkgKystLS0tLS0tLS0tLS0tLS0tCiAyIGZpbGVzIGNo YW5nZWQsIDE0IGluc2VydGlvbnMoKyksIDg4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9hdG1lbC1obGNkYy9hdG1lbF9obGNkY19kYy5oIGIvZHJpdmVycy9ncHUv ZHJtL2F0bWVsLWhsY2RjL2F0bWVsX2hsY2RjX2RjLmgKaW5kZXggYWIzMmQ1YjI2OGQyLi42MGM5 MzdmNDIxMTQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hdG1lbC1obGNkYy9hdG1lbF9o bGNkY19kYy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hdG1lbC1obGNkYy9hdG1lbF9obGNkY19k Yy5oCkBAIC0yOTksNyArMjk5LDYgQEAgc3RydWN0IGF0bWVsX2hsY2RjX2xheWVyIHsKIHN0cnVj dCBhdG1lbF9obGNkY19wbGFuZSB7CiAJc3RydWN0IGRybV9wbGFuZSBiYXNlOwogCXN0cnVjdCBh dG1lbF9obGNkY19sYXllciBsYXllcjsKLQlzdHJ1Y3QgYXRtZWxfaGxjZGNfcGxhbmVfcHJvcGVy dGllcyAqcHJvcGVydGllczsKIH07CiAKIHN0YXRpYyBpbmxpbmUgc3RydWN0IGF0bWVsX2hsY2Rj X3BsYW5lICoKQEAgLTM0NiwxOCArMzQ1LDYgQEAgc3RydWN0IGF0bWVsX2hsY2RjX2RjX2Rlc2Mg ewogfTsKIAogLyoqCi0gKiBBdG1lbCBITENEQyBQbGFuZSBwcm9wZXJ0aWVzLgotICoKLSAqIFRo aXMgc3RydWN0dXJlIHN0b3JlcyBwbGFuZSBwcm9wZXJ0eSBkZWZpbml0aW9ucy4KLSAqCi0gKiBA YWxwaGE6IGFscGhhIGJsZW5kaW5nIChvciB0cmFuc3BhcmVuY3kpIHByb3BlcnR5Ci0gKiBAcm90 YXRpb246IHJvdGF0aW9uIHByb3BlcnR5Ci0gKi8KLXN0cnVjdCBhdG1lbF9obGNkY19wbGFuZV9w cm9wZXJ0aWVzIHsKLQlzdHJ1Y3QgZHJtX3Byb3BlcnR5ICphbHBoYTsKLX07Ci0KLS8qKgogICog QXRtZWwgSExDREMgRGlzcGxheSBDb250cm9sbGVyLgogICoKICAqIEBkZXNjOiBITENEQyBEaXNw bGF5IENvbnRyb2xsZXIgZGVzY3JpcHRpb24KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9h dG1lbC1obGNkYy9hdG1lbF9obGNkY19wbGFuZS5jIGIvZHJpdmVycy9ncHUvZHJtL2F0bWVsLWhs Y2RjL2F0bWVsX2hsY2RjX3BsYW5lLmMKaW5kZXggZTE4ODAwZWQ3Y2QxLi43M2M4NzVkYjQ1ZjQg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hdG1lbC1obGNkYy9hdG1lbF9obGNkY19wbGFu ZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hdG1lbC1obGNkYy9hdG1lbF9obGNkY19wbGFuZS5j CkBAIC0zMSw3ICszMSw2IEBACiAgKiBAc3JjX3k6IHkgYnVmZmVyIHBvc2l0aW9uCiAgKiBAc3Jj X3c6IGJ1ZmZlciB3aWR0aAogICogQHNyY19oOiBidWZmZXIgaGVpZ2h0Ci0gKiBAYWxwaGE6IGFs cGhhIGJsZW5kaW5nIG9mIHRoZSBwbGFuZQogICogQGRpc2NfeDogeCBkaXNjYXJkIHBvc2l0aW9u CiAgKiBAZGlzY195OiB5IGRpc2NhcmQgcG9zaXRpb24KICAqIEBkaXNjX3c6IGRpc2NhcmQgd2lk dGgKQEAgLTU0LDggKzUzLDYgQEAgc3RydWN0IGF0bWVsX2hsY2RjX3BsYW5lX3N0YXRlIHsKIAl1 aW50MzJfdCBzcmNfdzsKIAl1aW50MzJfdCBzcmNfaDsKIAotCXU4IGFscGhhOwotCiAJaW50IGRp c2NfeDsKIAlpbnQgZGlzY195OwogCWludCBkaXNjX3c7CkBAIC0zODUsNyArMzgyLDcgQEAgYXRt ZWxfaGxjZGNfcGxhbmVfdXBkYXRlX2dlbmVyYWxfc2V0dGluZ3Moc3RydWN0IGF0bWVsX2hsY2Rj X3BsYW5lICpwbGFuZSwKIAkJCWNmZyB8PSBBVE1FTF9ITENEQ19MQVlFUl9MQUVOOwogCQllbHNl CiAJCQljZmcgfD0gQVRNRUxfSExDRENfTEFZRVJfR0FFTiB8Ci0JCQkgICAgICAgQVRNRUxfSExD RENfTEFZRVJfR0Eoc3RhdGUtPmFscGhhKTsKKwkJCSAgICAgICBBVE1FTF9ITENEQ19MQVlFUl9H QShzdGF0ZS0+YmFzZS5hbHBoYSA+PiA4KTsKIAl9CiAKIAlpZiAoc3RhdGUtPmRpc2NfaCAmJiBz dGF0ZS0+ZGlzY193KQpAQCAtNTUzLDcgKzU1MCw3IEBAIGF0bWVsX2hsY2RjX3BsYW5lX3ByZXBh cmVfZGlzY19hcmVhKHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY19zdGF0ZSkKIAogCQlpZiAoIW92 bF9zLT5mYiB8fAogCQkgICAgb3ZsX3MtPmZiLT5mb3JtYXQtPmhhc19hbHBoYSB8fAotCQkgICAg b3ZsX3N0YXRlLT5hbHBoYSAhPSAyNTUpCisJCSAgICBvdmxfcy0+YWxwaGEgIT0gRFJNX0JMRU5E X0FMUEhBX09QQVFVRSkKIAkJCWNvbnRpbnVlOwogCiAJCS8qIFRPRE86IGltcGxlbWVudCBhIHNt YXJ0ZXIgaGlkZGVuIGFyZWEgZGV0ZWN0aW9uICovCkBAIC04MjksNTEgKzgyNiwxOCBAQCBzdGF0 aWMgdm9pZCBhdG1lbF9obGNkY19wbGFuZV9kZXN0cm95KHN0cnVjdCBkcm1fcGxhbmUgKnApCiAJ ZHJtX3BsYW5lX2NsZWFudXAocCk7CiB9CiAKLXN0YXRpYyBpbnQgYXRtZWxfaGxjZGNfcGxhbmVf YXRvbWljX3NldF9wcm9wZXJ0eShzdHJ1Y3QgZHJtX3BsYW5lICpwLAotCQkJCQkJIHN0cnVjdCBk cm1fcGxhbmVfc3RhdGUgKnMsCi0JCQkJCQkgc3RydWN0IGRybV9wcm9wZXJ0eSAqcHJvcGVydHks Ci0JCQkJCQkgdWludDY0X3QgdmFsKQotewotCXN0cnVjdCBhdG1lbF9obGNkY19wbGFuZSAqcGxh bmUgPSBkcm1fcGxhbmVfdG9fYXRtZWxfaGxjZGNfcGxhbmUocCk7Ci0Jc3RydWN0IGF0bWVsX2hs Y2RjX3BsYW5lX3Byb3BlcnRpZXMgKnByb3BzID0gcGxhbmUtPnByb3BlcnRpZXM7Ci0Jc3RydWN0 IGF0bWVsX2hsY2RjX3BsYW5lX3N0YXRlICpzdGF0ZSA9Ci0JCQlkcm1fcGxhbmVfc3RhdGVfdG9f YXRtZWxfaGxjZGNfcGxhbmVfc3RhdGUocyk7Ci0KLQlpZiAocHJvcGVydHkgPT0gcHJvcHMtPmFs cGhhKQotCQlzdGF0ZS0+YWxwaGEgPSB2YWw7Ci0JZWxzZQotCQlyZXR1cm4gLUVJTlZBTDsKLQot CXJldHVybiAwOwotfQotCi1zdGF0aWMgaW50IGF0bWVsX2hsY2RjX3BsYW5lX2F0b21pY19nZXRf cHJvcGVydHkoc3RydWN0IGRybV9wbGFuZSAqcCwKLQkJCQkJY29uc3Qgc3RydWN0IGRybV9wbGFu ZV9zdGF0ZSAqcywKLQkJCQkJc3RydWN0IGRybV9wcm9wZXJ0eSAqcHJvcGVydHksCi0JCQkJCXVp bnQ2NF90ICp2YWwpCi17Ci0Jc3RydWN0IGF0bWVsX2hsY2RjX3BsYW5lICpwbGFuZSA9IGRybV9w bGFuZV90b19hdG1lbF9obGNkY19wbGFuZShwKTsKLQlzdHJ1Y3QgYXRtZWxfaGxjZGNfcGxhbmVf cHJvcGVydGllcyAqcHJvcHMgPSBwbGFuZS0+cHJvcGVydGllczsKLQljb25zdCBzdHJ1Y3QgYXRt ZWxfaGxjZGNfcGxhbmVfc3RhdGUgKnN0YXRlID0KLQkJY29udGFpbmVyX29mKHMsIGNvbnN0IHN0 cnVjdCBhdG1lbF9obGNkY19wbGFuZV9zdGF0ZSwgYmFzZSk7Ci0KLQlpZiAocHJvcGVydHkgPT0g cHJvcHMtPmFscGhhKQotCQkqdmFsID0gc3RhdGUtPmFscGhhOwotCWVsc2UKLQkJcmV0dXJuIC1F SU5WQUw7Ci0KLQlyZXR1cm4gMDsKLX0KLQotc3RhdGljIGludCBhdG1lbF9obGNkY19wbGFuZV9p bml0X3Byb3BlcnRpZXMoc3RydWN0IGF0bWVsX2hsY2RjX3BsYW5lICpwbGFuZSwKLQkJCQlzdHJ1 Y3QgYXRtZWxfaGxjZGNfcGxhbmVfcHJvcGVydGllcyAqcHJvcHMpCitzdGF0aWMgaW50IGF0bWVs X2hsY2RjX3BsYW5lX2luaXRfcHJvcGVydGllcyhzdHJ1Y3QgYXRtZWxfaGxjZGNfcGxhbmUgKnBs YW5lKQogewogCWNvbnN0IHN0cnVjdCBhdG1lbF9obGNkY19sYXllcl9kZXNjICpkZXNjID0gcGxh bmUtPmxheWVyLmRlc2M7CiAKIAlpZiAoZGVzYy0+dHlwZSA9PSBBVE1FTF9ITENEQ19PVkVSTEFZ X0xBWUVSIHx8Ci0JICAgIGRlc2MtPnR5cGUgPT0gQVRNRUxfSExDRENfQ1VSU09SX0xBWUVSKQot CQlkcm1fb2JqZWN0X2F0dGFjaF9wcm9wZXJ0eSgmcGxhbmUtPmJhc2UuYmFzZSwKLQkJCQkJICAg cHJvcHMtPmFscGhhLCAyNTUpOworCSAgICBkZXNjLT50eXBlID09IEFUTUVMX0hMQ0RDX0NVUlNP Ul9MQVlFUikgeworCQlpbnQgcmV0OworCisJCXJldCA9IGRybV9wbGFuZV9jcmVhdGVfYWxwaGFf cHJvcGVydHkoJnBsYW5lLT5iYXNlKTsKKwkJaWYgKHJldCkKKwkJCXJldHVybiByZXQ7CisJfQog CiAJaWYgKGRlc2MtPmxheW91dC54c3RyaWRlICYmIGRlc2MtPmxheW91dC5wc3RyaWRlKSB7CiAJ CWludCByZXQ7CkBAIC05ODgsOCArOTUyLDggQEAgc3RhdGljIHZvaWQgYXRtZWxfaGxjZGNfcGxh bmVfcmVzZXQoc3RydWN0IGRybV9wbGFuZSAqcCkKIAkJCXJldHVybjsKIAkJfQogCi0JCXN0YXRl LT5hbHBoYSA9IDI1NTsKIAkJcC0+c3RhdGUgPSAmc3RhdGUtPmJhc2U7CisJCXAtPnN0YXRlLT5h bHBoYSA9IERSTV9CTEVORF9BTFBIQV9PUEFRVUU7CiAJCXAtPnN0YXRlLT5wbGFuZSA9IHA7CiAJ fQogfQpAQCAtMTA0MiwxMyArMTAwNiwxMCBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGRybV9wbGFu ZV9mdW5jcyBsYXllcl9wbGFuZV9mdW5jcyA9IHsKIAkucmVzZXQgPSBhdG1lbF9obGNkY19wbGFu ZV9yZXNldCwKIAkuYXRvbWljX2R1cGxpY2F0ZV9zdGF0ZSA9IGF0bWVsX2hsY2RjX3BsYW5lX2F0 b21pY19kdXBsaWNhdGVfc3RhdGUsCiAJLmF0b21pY19kZXN0cm95X3N0YXRlID0gYXRtZWxfaGxj ZGNfcGxhbmVfYXRvbWljX2Rlc3Ryb3lfc3RhdGUsCi0JLmF0b21pY19zZXRfcHJvcGVydHkgPSBh dG1lbF9obGNkY19wbGFuZV9hdG9taWNfc2V0X3Byb3BlcnR5LAotCS5hdG9taWNfZ2V0X3Byb3Bl cnR5ID0gYXRtZWxfaGxjZGNfcGxhbmVfYXRvbWljX2dldF9wcm9wZXJ0eSwKIH07CiAKIHN0YXRp YyBpbnQgYXRtZWxfaGxjZGNfcGxhbmVfY3JlYXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCi0J CQkJICAgIGNvbnN0IHN0cnVjdCBhdG1lbF9obGNkY19sYXllcl9kZXNjICpkZXNjLAotCQkJCSAg ICBzdHJ1Y3QgYXRtZWxfaGxjZGNfcGxhbmVfcHJvcGVydGllcyAqcHJvcHMpCisJCQkJICAgIGNv bnN0IHN0cnVjdCBhdG1lbF9obGNkY19sYXllcl9kZXNjICpkZXNjKQogewogCXN0cnVjdCBhdG1l bF9obGNkY19kYyAqZGMgPSBkZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBhdG1lbF9obGNkY19w bGFuZSAqcGxhbmU7CkBAIC0xMDYwLDcgKzEwMjEsNiBAQCBzdGF0aWMgaW50IGF0bWVsX2hsY2Rj X3BsYW5lX2NyZWF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQlyZXR1cm4gLUVOT01FTTsK IAogCWF0bWVsX2hsY2RjX2xheWVyX2luaXQoJnBsYW5lLT5sYXllciwgZGVzYywgZGMtPmhsY2Rj LT5yZWdtYXApOwotCXBsYW5lLT5wcm9wZXJ0aWVzID0gcHJvcHM7CiAKIAlpZiAoZGVzYy0+dHlw ZSA9PSBBVE1FTF9ITENEQ19CQVNFX0xBWUVSKQogCQl0eXBlID0gRFJNX1BMQU5FX1RZUEVfUFJJ TUFSWTsKQEAgLTEwODEsNyArMTA0MSw3IEBAIHN0YXRpYyBpbnQgYXRtZWxfaGxjZGNfcGxhbmVf Y3JlYXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQkgICAgICZhdG1lbF9obGNkY19sYXll cl9wbGFuZV9oZWxwZXJfZnVuY3MpOwogCiAJLyogU2V0IGRlZmF1bHQgcHJvcGVydHkgdmFsdWVz Ki8KLQlyZXQgPSBhdG1lbF9obGNkY19wbGFuZV9pbml0X3Byb3BlcnRpZXMocGxhbmUsIHByb3Bz KTsKKwlyZXQgPSBhdG1lbF9obGNkY19wbGFuZV9pbml0X3Byb3BlcnRpZXMocGxhbmUpOwogCWlm IChyZXQpCiAJCXJldHVybiByZXQ7CiAKQEAgLTEwOTAsMzQgKzEwNTAsMTMgQEAgc3RhdGljIGlu dCBhdG1lbF9obGNkY19wbGFuZV9jcmVhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAlyZXR1 cm4gMDsKIH0KIAotc3RhdGljIHN0cnVjdCBhdG1lbF9obGNkY19wbGFuZV9wcm9wZXJ0aWVzICoK LWF0bWVsX2hsY2RjX3BsYW5lX2NyZWF0ZV9wcm9wZXJ0aWVzKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYpCi17Ci0Jc3RydWN0IGF0bWVsX2hsY2RjX3BsYW5lX3Byb3BlcnRpZXMgKnByb3BzOwotCi0J cHJvcHMgPSBkZXZtX2t6YWxsb2MoZGV2LT5kZXYsIHNpemVvZigqcHJvcHMpLCBHRlBfS0VSTkVM KTsKLQlpZiAoIXByb3BzKQotCQlyZXR1cm4gRVJSX1BUUigtRU5PTUVNKTsKLQotCXByb3BzLT5h bHBoYSA9IGRybV9wcm9wZXJ0eV9jcmVhdGVfcmFuZ2UoZGV2LCAwLCAiYWxwaGEiLCAwLCAyNTUp OwotCWlmICghcHJvcHMtPmFscGhhKQotCQlyZXR1cm4gRVJSX1BUUigtRU5PTUVNKTsKLQotCXJl dHVybiBwcm9wczsKLX0KLQogaW50IGF0bWVsX2hsY2RjX2NyZWF0ZV9wbGFuZXMoc3RydWN0IGRy bV9kZXZpY2UgKmRldikKIHsKIAlzdHJ1Y3QgYXRtZWxfaGxjZGNfZGMgKmRjID0gZGV2LT5kZXZf cHJpdmF0ZTsKLQlzdHJ1Y3QgYXRtZWxfaGxjZGNfcGxhbmVfcHJvcGVydGllcyAqcHJvcHM7CiAJ Y29uc3Qgc3RydWN0IGF0bWVsX2hsY2RjX2xheWVyX2Rlc2MgKmRlc2NzID0gZGMtPmRlc2MtPmxh eWVyczsKIAlpbnQgbmxheWVycyA9IGRjLT5kZXNjLT5ubGF5ZXJzOwogCWludCBpLCByZXQ7CiAK LQlwcm9wcyA9IGF0bWVsX2hsY2RjX3BsYW5lX2NyZWF0ZV9wcm9wZXJ0aWVzKGRldik7Ci0JaWYg KElTX0VSUihwcm9wcykpCi0JCXJldHVybiBQVFJfRVJSKHByb3BzKTsKLQogCWRjLT5kc2NycG9v bCA9IGRtYW1fcG9vbF9jcmVhdGUoImF0bWVsLWhsY2RjLWRzY3IiLCBkZXYtPmRldiwKIAkJCQlz aXplb2Yoc3RydWN0IGF0bWVsX2hsY2RjX2RtYV9jaGFubmVsX2RzY3IpLAogCQkJCXNpemVvZih1 NjQpLCAwKTsKQEAgLTExMzAsNyArMTA2OSw3IEBAIGludCBhdG1lbF9obGNkY19jcmVhdGVfcGxh bmVzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCSAgICBkZXNjc1tpXS50eXBlICE9IEFUTUVM X0hMQ0RDX0NVUlNPUl9MQVlFUikKIAkJCWNvbnRpbnVlOwogCi0JCXJldCA9IGF0bWVsX2hsY2Rj X3BsYW5lX2NyZWF0ZShkZXYsICZkZXNjc1tpXSwgcHJvcHMpOworCQlyZXQgPSBhdG1lbF9obGNk Y19wbGFuZV9jcmVhdGUoZGV2LCAmZGVzY3NbaV0pOwogCQlpZiAocmV0KQogCQkJcmV0dXJuIHJl dDsKIAl9Ci0tIApnaXQtc2VyaWVzIDAuOS4xCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2RyaS1kZXZlbAo=