From patchwork Mon Feb 18 19:50:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ville Syrjala X-Patchwork-Id: 10818729 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 720C8139A for ; Mon, 18 Feb 2019 19:50:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5DBDD2BAD5 for ; Mon, 18 Feb 2019 19:50:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4F69A2BAD7; Mon, 18 Feb 2019 19:50:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D843D2BAD5 for ; Mon, 18 Feb 2019 19:50:58 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4271A89203; Mon, 18 Feb 2019 19:50:57 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id F3D3B89203 for ; Mon, 18 Feb 2019 19:50:55 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Feb 2019 11:50:55 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,385,1544515200"; d="scan'208";a="117161887" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.174]) by orsmga006.jf.intel.com with SMTP; 18 Feb 2019 11:50:53 -0800 Received: by stinkbox (sSMTP sendmail emulation); Mon, 18 Feb 2019 21:50:52 +0200 From: Ville Syrjala To: intel-gfx@lists.freedesktop.org Date: Mon, 18 Feb 2019 21:50:51 +0200 Message-Id: <20190218195052.1729-1-ville.syrjala@linux.intel.com> X-Mailer: git-send-email 2.19.2 MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH xf86-video-intel 1/2] sna: Refactor property parsing X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP From: Ville Syrjälä Generalize the code that parses the plane properties to be useable for crtc (or any kms object) properties as well. Cc: Mario Kleiner Signed-off-by: Ville Syrjälä --- src/sna/sna_display.c | 67 +++++++++++++++++++++++++++++++------------ 1 file changed, 48 insertions(+), 19 deletions(-) diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c index fe67f85b62f1..916cc3c04e07 100644 --- a/src/sna/sna_display.c +++ b/src/sna/sna_display.c @@ -215,6 +215,7 @@ struct sna_crtc { uint32_t rotation; struct plane { uint32_t id; + uint32_t type; struct { uint32_t prop; uint32_t supported; @@ -3391,33 +3392,40 @@ void sna_crtc_set_sprite_colorspace(xf86CrtcPtr crtc, p->color_encoding.values[colorspace]); } -static int plane_details(struct sna *sna, struct plane *p) +typedef void (*parse_prop_func)(struct sna *sna, + struct drm_mode_get_property *prop, + uint64_t value, + void *data); +static void parse_props(struct sna *sna, + uint32_t obj_type, uint32_t obj_id, + parse_prop_func parse_prop, + void *data) { #define N_STACK_PROPS 32 /* must be a multiple of 2 */ struct local_mode_obj_get_properties arg; uint64_t stack[N_STACK_PROPS + N_STACK_PROPS/2]; uint64_t *values = stack; uint32_t *props = (uint32_t *)(values + N_STACK_PROPS); - int i, type = DRM_PLANE_TYPE_OVERLAY; + int i; memset(&arg, 0, sizeof(struct local_mode_obj_get_properties)); - arg.obj_id = p->id; - arg.obj_type = LOCAL_MODE_OBJECT_PLANE; + arg.obj_id = obj_id; + arg.obj_type = obj_type; arg.props_ptr = (uintptr_t)props; arg.prop_values_ptr = (uintptr_t)values; arg.count_props = N_STACK_PROPS; if (drmIoctl(sna->kgem.fd, LOCAL_IOCTL_MODE_OBJ_GETPROPERTIES, &arg)) - return -1; + return; DBG(("%s: object %d (type %x) has %d props\n", __FUNCTION__, - p->id, LOCAL_MODE_OBJECT_PLANE, arg.count_props)); + obj_id, obj_type, arg.count_props)); if (arg.count_props > N_STACK_PROPS) { values = malloc(2*sizeof(uint64_t)*arg.count_props); if (values == NULL) - return -1; + return; props = (uint32_t *)(values + arg.count_props); @@ -3444,25 +3452,46 @@ static int plane_details(struct sna *sna, struct plane *p) DBG(("%s: prop[%d] .id=%ld, .name=%s, .flags=%x, .value=%ld\n", __FUNCTION__, i, (long)props[i], prop.name, (unsigned)prop.flags, (long)values[i])); - if (strcmp(prop.name, "type") == 0) { - type = values[i]; - } else if (prop_is_rotation(&prop)) { - parse_rotation_prop(sna, p, &prop, values[i]); - } else if (prop_is_color_encoding(&prop)) { - parse_color_encoding_prop(sna, p, &prop, values[i]); - } + parse_prop(sna, &prop, values[i], data); } + if (values != stack) + free(values); + +#undef N_STACK_PROPS +} + +static bool prop_is_type(const struct drm_mode_get_property *prop) +{ + return prop_has_type_and_name(prop, 1, "type"); +} + +static void plane_parse_prop(struct sna *sna, + struct drm_mode_get_property *prop, + uint64_t value, void *data) +{ + struct plane *p = data; + + if (prop_is_type(prop)) + p->type = value; + else if (prop_is_rotation(prop)) + parse_rotation_prop(sna, p, prop, value); + else if (prop_is_color_encoding(prop)) + parse_color_encoding_prop(sna, p, prop, value); +} + +static int plane_details(struct sna *sna, struct plane *p) +{ + parse_props(sna, LOCAL_MODE_OBJECT_PLANE, p->id, + plane_parse_prop, p); + p->rotation.supported &= DBG_NATIVE_ROTATION; if (!xf86ReturnOptValBool(sna->Options, OPTION_ROTATION, TRUE)) p->rotation.supported = RR_Rotate_0; - if (values != stack) - free(values); + DBG(("%s: plane=%d type=%d\n", __FUNCTION__, p->id, p->type)); - DBG(("%s: plane=%d type=%d\n", __FUNCTION__, p->id, type)); - return type; -#undef N_STACK_PROPS + return p->type; } static void add_sprite_plane(struct sna_crtc *crtc, From patchwork Mon Feb 18 19:50:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ville Syrjala X-Patchwork-Id: 10818731 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 313EB139A for ; Mon, 18 Feb 2019 19:51:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1E56B2BAD5 for ; Mon, 18 Feb 2019 19:51:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 122E12BAD7; Mon, 18 Feb 2019 19:51:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6D7F62BAD5 for ; Mon, 18 Feb 2019 19:51:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C313689213; Mon, 18 Feb 2019 19:51:00 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4F29589213 for ; Mon, 18 Feb 2019 19:50:59 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Feb 2019 11:50:58 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,385,1544515200"; d="scan'208";a="118906640" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.174]) by orsmga008.jf.intel.com with SMTP; 18 Feb 2019 11:50:56 -0800 Received: by stinkbox (sSMTP sendmail emulation); Mon, 18 Feb 2019 21:50:55 +0200 From: Ville Syrjala To: intel-gfx@lists.freedesktop.org Date: Mon, 18 Feb 2019 21:50:52 +0200 Message-Id: <20190218195052.1729-2-ville.syrjala@linux.intel.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190218195052.1729-1-ville.syrjala@linux.intel.com> References: <20190218195052.1729-1-ville.syrjala@linux.intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH xf86-video-intel 2/2] sna: Support 10bpc gamma via the GAMMA_LUT crtc property X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP From: Ville Syrjälä Probe the GAMMA_LUT/GAMMA_LUT_SIZE props and utilize them when the running with > 8bpc. Cc: Mario Kleiner Signed-off-by: Ville Syrjälä --- src/sna/sna_display.c | 247 +++++++++++++++++++++++++++++++++++------- 1 file changed, 208 insertions(+), 39 deletions(-) diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c index 916cc3c04e07..2f82e1fa3d86 100644 --- a/src/sna/sna_display.c +++ b/src/sna/sna_display.c @@ -127,6 +127,7 @@ struct local_mode_obj_get_properties { uint32_t obj_type; uint32_t pad; }; +#define LOCAL_MODE_OBJECT_CRTC 0xcccccccc #define LOCAL_MODE_OBJECT_PLANE 0xeeeeeeee struct local_mode_set_plane { @@ -229,6 +230,11 @@ struct sna_crtc { } primary; struct list sprites; + struct drm_color_lut *gamma_lut; + uint64_t gamma_lut_prop; + uint64_t gamma_lut_blob; + uint32_t gamma_lut_size; + uint32_t mode_serial, flip_serial; uint32_t last_seq, wrap_seq; @@ -317,6 +323,9 @@ static void __sna_output_dpms(xf86OutputPtr output, int dpms, int fixup); static void sna_crtc_disable_cursor(struct sna *sna, struct sna_crtc *crtc); static bool sna_crtc_flip(struct sna *sna, struct sna_crtc *crtc, struct kgem_bo *bo, int x, int y); +static void sna_crtc_gamma_set(xf86CrtcPtr crtc, + CARD16 *red, CARD16 *green, + CARD16 *blue, int size); static bool is_zaphod(ScrnInfoPtr scrn) { @@ -3150,11 +3159,9 @@ sna_crtc_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode, mode->VDisplay <= sna->mode.max_crtc_height); #if HAS_GAMMA - drmModeCrtcSetGamma(sna->kgem.fd, __sna_crtc_id(sna_crtc), - crtc->gamma_size, - crtc->gamma_red, - crtc->gamma_green, - crtc->gamma_blue); + sna_crtc_gamma_set(crtc, + crtc->gamma_red, crtc->gamma_green, + crtc->gamma_blue, crtc->gamma_size); #endif saved_kmode = sna_crtc->kmode; @@ -3212,12 +3219,44 @@ void sna_mode_adjust_frame(struct sna *sna, int x, int y) static void sna_crtc_gamma_set(xf86CrtcPtr crtc, - CARD16 *red, CARD16 *green, CARD16 *blue, int size) + CARD16 *red, CARD16 *green, CARD16 *blue, int size) { - assert(to_sna_crtc(crtc)); - drmModeCrtcSetGamma(to_sna(crtc->scrn)->kgem.fd, - sna_crtc_id(crtc), - size, red, green, blue); + struct sna *sna = to_sna(crtc->scrn); + struct sna_crtc *sna_crtc = to_sna_crtc(crtc); + struct drm_color_lut *lut = sna_crtc->gamma_lut; + uint32_t blob_size = size * sizeof(lut[0]); + uint32_t blob_id; + int ret, i; + + DBG(("%s: gamma_size %d\n", __FUNCTION__, size)); + + if (!lut) { + assert(size == 256); + + drmModeCrtcSetGamma(to_sna(crtc->scrn)->kgem.fd, + sna_crtc_id(crtc), + size, red, green, blue); + return; + } + + assert(size == sna_crtc->gamma_lut_size); + + for (i = 0; i < size; i++) { + lut[i].red = red[i]; + lut[i].green = green[i]; + lut[i].blue = blue[i]; + } + + ret = drmModeCreatePropertyBlob(sna->kgem.fd, lut, blob_size, &blob_id); + if (ret) + return; + + ret = drmModeObjectSetProperty(sna->kgem.fd, + sna_crtc->id, DRM_MODE_OBJECT_CRTC, + sna_crtc->gamma_lut_prop, + blob_id); + + drmModeDestroyPropertyBlob(sna->kgem.fd, blob_id); } static void @@ -3229,6 +3268,8 @@ sna_crtc_destroy(xf86CrtcPtr crtc) if (sna_crtc == NULL) return; + free(sna_crtc->gamma_lut); + list_for_each_entry_safe(sprite, sn, &sna_crtc->sprites, link) free(sprite); @@ -3663,6 +3704,55 @@ bool sna_has_sprite_format(struct sna *sna, uint32_t format) return false; } +inline static bool prop_is_gamma_lut(const struct drm_mode_get_property *prop) +{ + return prop_has_type_and_name(prop, 4, "GAMMA_LUT"); +} + +inline static bool prop_is_gamma_lut_size(const struct drm_mode_get_property *prop) +{ + return prop_has_type_and_name(prop, 1, "GAMMA_LUT_SIZE"); +} + +static void sna_crtc_parse_prop(struct sna *sna, + struct drm_mode_get_property *prop, + uint64_t value, void *data) +{ + struct sna_crtc *crtc = data; + + if (prop_is_gamma_lut(prop)) { + crtc->gamma_lut_prop = prop->prop_id; + crtc->gamma_lut_blob = value; + } else if (prop_is_gamma_lut_size(prop)) { + crtc->gamma_lut_size = value; + } +} + +static void +sna_crtc_init__props(struct sna *sna, struct sna_crtc *crtc) +{ + ScrnInfoPtr scrn = sna->scrn; + + parse_props(sna, LOCAL_MODE_OBJECT_CRTC, crtc->id, + sna_crtc_parse_prop, crtc); + + /* use high precision gamma LUT for > 8bpc */ + /* X-Server < 1.20 mishandles > 256 slots / > 8 bpc color maps. */ + if (scrn->rgbBits <= 8 || + XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,20,0,0,0)) + crtc->gamma_lut_size = 0; + + if (crtc->gamma_lut_size) { + crtc->gamma_lut = calloc(max(crtc->gamma_lut_size, 256), + sizeof(crtc->gamma_lut[0])); + if (!crtc->gamma_lut) + crtc->gamma_lut_size = 0; + } + + DBG(("%s: CRTC:%d, gamma_lut_size=%d\n", __FUNCTION__, + sna_crtc_id(crtc), crtc->gamma_lut_size)); +} + static void sna_crtc_init__rotation(struct sna *sna, struct sna_crtc *crtc) { @@ -3723,6 +3813,9 @@ sna_crtc_add(ScrnInfoPtr scrn, unsigned id) list_init(&sna_crtc->sprites); sna_crtc_init__rotation(sna, sna_crtc); + + sna_crtc_init__props(sna, sna_crtc); + sna_crtc_find_planes(sna, sna_crtc); DBG(("%s: CRTC:%d [pipe=%d], primary id=%x: supported-rotations=%x, current-rotation=%x\n", @@ -7282,36 +7375,110 @@ static void output_set_gamma(xf86OutputPtr output, xf86CrtcPtr crtc) mon->mon_gamma_blue); } +static bool +crtc_get_gamma_lut(xf86CrtcPtr crtc, + CARD16 *red, CARD16 *green, CARD16 *blue, int size) +{ + + struct sna *sna = to_sna(crtc->scrn); + struct sna_crtc *sna_crtc = to_sna_crtc(crtc); + struct drm_color_lut *lut = sna_crtc->gamma_lut; + struct drm_mode_get_blob blob; + int lut_size, i; + + DBG(("%s: gamma_size %d\n", __FUNCTION__, size)); + + memset(&blob, 0, sizeof(blob)); + blob.blob_id = sna_crtc->gamma_lut_blob; + + if (drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_GETPROPBLOB, &blob)) + return false; + + lut_size = blob.length / sizeof(lut[0]); + + if (lut_size == 0 || + lut_size > max(sna_crtc->gamma_lut_size, 256)) + return false; + + blob.data = (uintptr_t)lut; + + if (drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_GETPROPBLOB, &blob)) + return false; + + for (i = 0; i < size; i++) { + struct drm_color_lut *entry = + &lut[i * (lut_size - 1) / (size - 1)]; + + red[i] = entry->red; + green[i] = entry->green; + blue[i] = entry->blue; + } + + return red[size - 1] && + green[size - 1] && + blue[size - 1]; +} + +static bool crtc_get_gamma_legacy(xf86CrtcPtr crtc, + CARD16 *red, + CARD16 *green, + CARD16 *blue, + int size) +{ + struct sna *sna = to_sna(crtc->scrn); + struct sna_crtc *sna_crtc = to_sna_crtc(crtc); + struct drm_mode_crtc_lut lut = { + .crtc_id = __sna_crtc_id(sna_crtc), + .gamma_size = size, + .red = (uintptr_t)red, + .green = (uintptr_t)green, + .blue = (uintptr_t)blue, + }; + + if (drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_GETGAMMA, &lut) != 0) + return false; + + VG(VALGRIND_MAKE_MEM_DEFINED(red, size*sizeof(red[0]))); + VG(VALGRIND_MAKE_MEM_DEFINED(green, size*sizeof(green[0]))); + VG(VALGRIND_MAKE_MEM_DEFINED(bluered, size*sizeof(blue[0]))); + + return red[size - 1] && + green[size - 1] && + blue[size - 1]; +} + static void crtc_init_gamma(xf86CrtcPtr crtc) { + struct sna *sna = to_sna(crtc->scrn); + struct sna_crtc *sna_crtc = to_sna_crtc(crtc); uint16_t *gamma; + int size; + + assert(sna_crtc); + + size = sna_crtc->gamma_lut_size; + if (!size) + size = 256; /* Initialize the gamma ramps */ gamma = NULL; - if (crtc->gamma_size == 256) + if (crtc->gamma_size == size) gamma = crtc->gamma_red; if (gamma == NULL) - gamma = malloc(3 * 256 * sizeof(uint16_t)); + gamma = malloc(3 * size * sizeof(uint16_t)); if (gamma) { - struct sna *sna = to_sna(crtc->scrn); - struct sna_crtc *sna_crtc = to_sna_crtc(crtc); struct drm_mode_crtc_lut lut; - bool gamma_set = false; - - assert(sna_crtc); - - lut.crtc_id = __sna_crtc_id(sna_crtc); - lut.gamma_size = 256; - lut.red = (uintptr_t)(gamma); - lut.green = (uintptr_t)(gamma + 256); - lut.blue = (uintptr_t)(gamma + 2 * 256); - if (drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_GETGAMMA, &lut) == 0) { - VG(VALGRIND_MAKE_MEM_DEFINED(gamma, 3*256*sizeof(gamma[0]))); - gamma_set = - gamma[256 - 1] && - gamma[2*256 - 1] && - gamma[3*256 - 1]; - } + bool gamma_set; + uint16_t *red = gamma; + uint16_t *green = gamma + size; + uint16_t *blue = gamma + 2 * size; + + if (sna_crtc->gamma_lut_size) + gamma_set = crtc_get_gamma_lut(crtc, red, + green, blue, size); + else + gamma_set = crtc_get_gamma_legacy(crtc, red, + green, blue, size); DBG(("%s: CRTC:%d, pipe=%d: gamma set?=%d\n", __FUNCTION__, __sna_crtc_id(sna_crtc), __sna_crtc_pipe(sna_crtc), @@ -7319,19 +7486,21 @@ static void crtc_init_gamma(xf86CrtcPtr crtc) if (!gamma_set) { int i; - for (i = 0; i < 256; i++) { - gamma[i] = i << 8; - gamma[256 + i] = i << 8; - gamma[2*256 + i] = i << 8; + for (i = 0; i < size; i++) { + uint16_t val = i * 0xffff / (size - 1); + + red[i] = val; + green[i] = val; + blue[i] = val; } } - if (gamma != crtc->gamma_red) { + if (red != crtc->gamma_red) { free(crtc->gamma_red); - crtc->gamma_red = gamma; - crtc->gamma_green = gamma + 256; - crtc->gamma_blue = gamma + 2*256; - crtc->gamma_size = 256; + crtc->gamma_red = red; + crtc->gamma_green = green; + crtc->gamma_blue = blue; + crtc->gamma_size = size; } } }