From mboxrd@z Thu Jan 1 00:00:00 1970 From: Robert Tarasov Subject: Re: [PATCH] drm/udl: Fixed problem with UDL adpater reconnection Date: Thu, 12 Oct 2017 18:07:45 -0700 Message-ID: References: <20171011204142.20381-1-tutankhamen@chromium.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1956599561==" Return-path: Received: from mail-qt0-x236.google.com (mail-qt0-x236.google.com [IPv6:2607:f8b0:400d:c0d::236]) by gabe.freedesktop.org (Postfix) with ESMTPS id BF1406E037 for ; Fri, 13 Oct 2017 01:07:46 +0000 (UTC) Received: by mail-qt0-x236.google.com with SMTP id z50so16928922qtj.4 for ; Thu, 12 Oct 2017 18:07:46 -0700 (PDT) In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Alex Deucher Cc: Dave Airlie , Maling list - DRI developers List-Id: dri-devel@lists.freedesktop.org --===============1956599561== Content-Type: multipart/alternative; boundary="001a113bf3c0dccea4055b63485c" --001a113bf3c0dccea4055b63485c Content-Type: text/plain; charset="UTF-8" Fixed. On Thu, Oct 12, 2017 at 12:56 PM, Alex Deucher wrote: > On Wed, Oct 11, 2017 at 4:41 PM, Robert Tarasov > wrote: > > Fixed problem with DisplayLink and DisplayLink certified adapters when > they > > didn't want to work if they were initialized with disconnected DVI > cable. Now > > udl driver checks and updates adapter's connection state every 10 > seconds, as > > well as retreives all the edid data blocks instead of only base one. > Previous > > approch could lead to improper initialization of video mode with certain > > monitors. > > > > Seems like this should be split into two patches: > > 1. rework the EDID handling in the driver > 2. enable drm connector polling. > > Alex > > > Signed-off-by: Robert Tarasov > > --- > > drivers/gpu/drm/udl/udl_connector.c | 153 > ++++++++++++++++++++++++------------ > > drivers/gpu/drm/udl/udl_connector.h | 13 +++ > > drivers/gpu/drm/udl/udl_drv.c | 4 + > > drivers/gpu/drm/udl/udl_main.c | 5 ++ > > 4 files changed, 125 insertions(+), 50 deletions(-) > > create mode 100644 drivers/gpu/drm/udl/udl_connector.h > > > > diff --git a/drivers/gpu/drm/udl/udl_connector.c > b/drivers/gpu/drm/udl/udl_connector.c > > index 9f9a49748d17..b2d9ffcc29aa 100644 > > --- a/drivers/gpu/drm/udl/udl_connector.c > > +++ b/drivers/gpu/drm/udl/udl_connector.c > > @@ -14,70 +14,95 @@ > > #include > > #include > > #include > > +#include "udl_connector.h" > > #include "udl_drv.h" > > > > -/* dummy connector to just get EDID, > > - all UDL appear to have a DVI-D */ > > - > > -static u8 *udl_get_edid(struct udl_device *udl) > > +static bool udl_get_edid_block(struct udl_device *udl, int block_idx, > > + u8 *buff) > > { > > - u8 *block; > > - char *rbuf; > > int ret, i; > > + u8 *read_buff; > > > > - block = kmalloc(EDID_LENGTH, GFP_KERNEL); > > - if (block == NULL) > > - return NULL; > > - > > - rbuf = kmalloc(2, GFP_KERNEL); > > - if (rbuf == NULL) > > - goto error; > > + read_buff = kmalloc(2, GFP_KERNEL); > > + if (!read_buff) > > + return false; > > > > for (i = 0; i < EDID_LENGTH; i++) { > > + int bval = (i + block_idx * EDID_LENGTH) << 8; > > ret = usb_control_msg(udl->udev, > > - usb_rcvctrlpipe(udl->udev, 0), > (0x02), > > - (0x80 | (0x02 << 5)), i << 8, > 0xA1, rbuf, 2, > > - HZ); > > + usb_rcvctrlpipe(udl->udev, 0), > > + (0x02), (0x80 | (0x02 << 5)), > bval, > > + 0xA1, read_buff, 2, HZ); > > if (ret < 1) { > > DRM_ERROR("Read EDID byte %d failed err %x\n", > i, ret); > > - goto error; > > + kfree(read_buff); > > + return false; > > } > > - block[i] = rbuf[1]; > > + buff[i] = read_buff[1]; > > } > > > > - kfree(rbuf); > > - return block; > > - > > -error: > > - kfree(block); > > - kfree(rbuf); > > - return NULL; > > + kfree(read_buff); > > + return true; > > } > > > > -static int udl_get_modes(struct drm_connector *connector) > > +static bool udl_get_edid(struct udl_device *udl, u8 **result_buff, > > + int *result_buff_size) > > { > > - struct udl_device *udl = connector->dev->dev_private; > > - struct edid *edid; > > - int ret; > > - > > - edid = (struct edid *)udl_get_edid(udl); > > - if (!edid) { > > - drm_mode_connector_update_edid_property(connector, > NULL); > > - return 0; > > + int i, extensions; > > + u8 *block_buff = NULL, *buff_ptr; > > + > > + block_buff = kmalloc(EDID_LENGTH, GFP_KERNEL); > > + if (block_buff == NULL) > > + return false; > > + > > + if (udl_get_edid_block(udl, 0, block_buff) && > > + memchr_inv(block_buff, 0, EDID_LENGTH)) { > > + extensions = ((struct edid *)block_buff)->extensions; > > + if (extensions > 0) { > > + /* we have to read all extensions one by one */ > > + *result_buff_size = EDID_LENGTH * (extensions + > 1); > > + *result_buff = kmalloc(*result_buff_size, > GFP_KERNEL); > > + buff_ptr = *result_buff; > > + if (buff_ptr == NULL) { > > + kfree(block_buff); > > + return false; > > + } > > + memcpy(buff_ptr, block_buff, EDID_LENGTH); > > + kfree(block_buff); > > + buff_ptr += EDID_LENGTH; > > + for (i = 1; i < extensions; ++i) { > > + if (udl_get_edid_block(udl, i, > buff_ptr)) { > > + buff_ptr += EDID_LENGTH; > > + } else { > > + kfree(*result_buff); > > + *result_buff = NULL; > > + return false; > > + } > > + } > > + return true; > > + } > > + /* we have only base edid block */ > > + *result_buff = block_buff; > > + *result_buff_size = EDID_LENGTH; > > + return true; > > } > > > > - /* > > - * We only read the main block, but if the monitor reports > extension > > - * blocks then the drm edid code expects them to be present, so > patch > > - * the extension count to 0. > > - */ > > - edid->checksum += edid->extensions; > > - edid->extensions = 0; > > - > > - drm_mode_connector_update_edid_property(connector, edid); > > - ret = drm_add_edid_modes(connector, edid); > > - kfree(edid); > > - return ret; > > + kfree(block_buff); > > + > > + return false; > > +} > > + > > +static int udl_get_modes(struct drm_connector *connector) > > +{ > > + struct udl_drm_connector *udl_connector = > > + container_of(connector, > > + struct udl_drm_connector, > > + connector); > > + > > + drm_mode_connector_update_edid_property(connector, > udl_connector->edid); > > + if (udl_connector->edid) > > + return drm_add_edid_modes(connector, > udl_connector->edid); > > + return 0; > > } > > > > static int udl_mode_valid(struct drm_connector *connector, > > @@ -96,8 +121,25 @@ static int udl_mode_valid(struct drm_connector > *connector, > > static enum drm_connector_status > > udl_detect(struct drm_connector *connector, bool force) > > { > > - if (drm_dev_is_unplugged(connector->dev)) > > + u8 *edid_buff = NULL; > > + int edid_buff_size = 0; > > + struct udl_device *udl = connector->dev->dev_private; > > + struct udl_drm_connector *udl_connector = > > + container_of(connector, > > + struct udl_drm_connector, > > + connector); > > + > > + /* cleanup previous edid */ > > + if (udl_connector->edid != NULL) { > > + kfree(udl_connector->edid); > > + udl_connector->edid = NULL; > > + } > > + > > + if (!udl_get_edid(udl, &edid_buff, &edid_buff_size)) > > return connector_status_disconnected; > > + > > + udl_connector->edid = (struct edid *)edid_buff; > > + > > return connector_status_connected; > > } > > > > @@ -117,8 +159,14 @@ static int udl_connector_set_property(struct > drm_connector *connector, > > > > static void udl_connector_destroy(struct drm_connector *connector) > > { > > + struct udl_drm_connector *udl_connector = > > + container_of(connector, > > + struct udl_drm_connector, > > + connector); > > + > > drm_connector_unregister(connector); > > drm_connector_cleanup(connector); > > + kfree(udl_connector->edid); > > kfree(connector); > > } > > > > @@ -138,17 +186,22 @@ static const struct drm_connector_funcs > udl_connector_funcs = { > > > > int udl_connector_init(struct drm_device *dev, struct drm_encoder > *encoder) > > { > > + struct udl_drm_connector *udl_connector; > > struct drm_connector *connector; > > > > - connector = kzalloc(sizeof(struct drm_connector), GFP_KERNEL); > > - if (!connector) > > + udl_connector = kzalloc(sizeof(struct udl_drm_connector), > GFP_KERNEL); > > + if (!udl_connector) > > return -ENOMEM; > > > > - drm_connector_init(dev, connector, &udl_connector_funcs, > DRM_MODE_CONNECTOR_DVII); > > + connector = &udl_connector->connector; > > + drm_connector_init(dev, connector, &udl_connector_funcs, > > + DRM_MODE_CONNECTOR_DVII); > > drm_connector_helper_add(connector, > &udl_connector_helper_funcs); > > > > drm_connector_register(connector); > > drm_mode_connector_attach_encoder(connector, encoder); > > + connector->polled = DRM_CONNECTOR_POLL_HPD | > > + DRM_CONNECTOR_POLL_CONNECT | > DRM_CONNECTOR_POLL_DISCONNECT; > > > > return 0; > > } > > diff --git a/drivers/gpu/drm/udl/udl_connector.h > b/drivers/gpu/drm/udl/udl_connector.h > > new file mode 100644 > > index 000000000000..0fb0db5c4612 > > --- /dev/null > > +++ b/drivers/gpu/drm/udl/udl_connector.h > > @@ -0,0 +1,13 @@ > > +#ifndef __UDL_CONNECTOR_H__ > > +#define __UDL_CONNECTOR_H__ > > + > > +#include > > + > > +struct udl_drm_connector { > > + struct drm_connector connector; > > + /* last udl_detect edid */ > > + struct edid *edid; > > +}; > > + > > + > > +#endif //__UDL_CONNECTOR_H__ > > diff --git a/drivers/gpu/drm/udl/udl_drv.c > b/drivers/gpu/drm/udl/udl_drv.c > > index 31421b6b586e..3c45a3064726 100644 > > --- a/drivers/gpu/drm/udl/udl_drv.c > > +++ b/drivers/gpu/drm/udl/udl_drv.c > > @@ -14,6 +14,9 @@ > > static int udl_usb_suspend(struct usb_interface *interface, > > pm_message_t message) > > { > > + struct drm_device *dev = usb_get_intfdata(interface); > > + > > + drm_kms_helper_poll_disable(dev); > > return 0; > > } > > > > @@ -21,6 +24,7 @@ static int udl_usb_resume(struct usb_interface > *interface) > > { > > struct drm_device *dev = usb_get_intfdata(interface); > > > > + drm_kms_helper_poll_enable(dev); > > udl_modeset_restore(dev); > > return 0; > > } > > diff --git a/drivers/gpu/drm/udl/udl_main.c b/drivers/gpu/drm/udl/udl_ > main.c > > index 0328b2c7b210..f1ec4528a73e 100644 > > --- a/drivers/gpu/drm/udl/udl_main.c > > +++ b/drivers/gpu/drm/udl/udl_main.c > > @@ -11,6 +11,7 @@ > > * more details. > > */ > > #include > > +#include > > #include "udl_drv.h" > > > > /* -BULK_SIZE as per usb-skeleton. Can we get full page and avoid > overhead? */ > > @@ -350,6 +351,8 @@ int udl_driver_load(struct drm_device *dev, unsigned > long flags) > > if (ret) > > goto err_fb; > > > > + drm_kms_helper_poll_init(dev); > > + > > return 0; > > err_fb: > > udl_fbdev_cleanup(dev); > > @@ -371,6 +374,8 @@ void udl_driver_unload(struct drm_device *dev) > > { > > struct udl_device *udl = dev->dev_private; > > > > + drm_kms_helper_poll_fini(dev); > > + > > if (udl->urbs.count) > > udl_free_urb_list(dev); > > > > -- > > 2.15.0.rc0.271.g36b669edcc-goog > > > > _______________________________________________ > > dri-devel mailing list > > dri-devel@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/dri-devel > --001a113bf3c0dccea4055b63485c Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Fixed.

On Thu, Oct 12, 2017 at 12:56 PM, Alex Deucher <alexdeuche= r@gmail.com> wrote:
On Wed, Oct 11, 2017 at 4:41 PM, Robert Tarasov
<tutankhamen@chromium.org> wrote:
> Fixed problem with DisplayLink and DisplayLink certified adapters when= they
> didn't want to work if they were initialized with disconnected DVI= cable. Now
> udl driver checks and updates adapter's connection state every 10 = seconds, as
> well as retreives all the edid data blocks instead of only base one. P= revious
> approch could lead to improper initialization of video mode with certa= in
> monitors.
>

Seems like this should be split into two patches:

1. rework the EDID handling in the driver
2. enable drm connector polling.

Alex

> Signed-off-by: Robert Tarasov <tutankhamen@chromium.org>
> ---
>=C2=A0 drivers/gpu/drm/udl/udl_connector.c | 153 +++++++++++++++++= +++++++------------
>=C2=A0 drivers/gpu/drm/udl/udl_connector.h |=C2=A0 13 +++
>=C2=A0 drivers/gpu/drm/udl/udl_drv.c=C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 = =C2=A04 +
>=C2=A0 drivers/gpu/drm/udl/udl_main.c=C2=A0 =C2=A0 =C2=A0 |=C2=A0 =C2= =A05 ++
>=C2=A0 4 files changed, 125 insertions(+), 50 deletions(-)
>=C2=A0 create mode 100644 drivers/gpu/drm/udl/udl_connector.h
>
> diff --git a/drivers/gpu/drm/udl/udl_connector.c b/drivers/gpu/dr= m/udl/udl_connector.c
> index 9f9a49748d17..b2d9ffcc29aa 100644
> --- a/drivers/gpu/drm/udl/udl_connector.c
> +++ b/drivers/gpu/drm/udl/udl_connector.c
> @@ -14,70 +14,95 @@
>=C2=A0 #include <drm/drm_crtc.h>
>=C2=A0 #include <drm/drm_edid.h>
>=C2=A0 #include <drm/drm_crtc_helper.h>
> +#include "udl_connector.h"
>=C2=A0 #include "udl_drv.h"
>
> -/* dummy connector to just get EDID,
> -=C2=A0 =C2=A0all UDL appear to have a DVI-D */
> -
> -static u8 *udl_get_edid(struct udl_device *udl)
> +static bool udl_get_edid_block(struct udl_device *udl, int block_idx,=
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 u8 *buff)
>=C2=A0 {
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0u8 *block;
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0char *rbuf;
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0int ret, i;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0u8 *read_buff;
>
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0block =3D kmalloc(EDID_LENGTH, GFP_KERNEL)= ;
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0if (block =3D=3D NULL)
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return NULL; > -
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0rbuf =3D kmalloc(2, GFP_KERNEL);
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0if (rbuf =3D=3D NULL)
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0goto error; > +=C2=A0 =C2=A0 =C2=A0 =C2=A0read_buff =3D kmalloc(2, GFP_KERNEL);
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0if (!read_buff)
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return false;<= br> >
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0for (i =3D 0; i < EDID_LENGTH; i++= ) {
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0int bval =3D (= i + block_idx * EDID_LENGTH) << 8;
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0ret =3D u= sb_control_msg(udl->udev,
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0usb_rcvctrlp= ipe(udl->udev, 0), (0x02),
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(0x80 | (0x0= 2 << 5)), i << 8, 0xA1, rbuf, 2,
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0HZ);
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0usb_rcvctrlp= ipe(udl->udev, 0),
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0(0x02), (0x80 | (0x02 << 5)), bval,
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A00xA1, read_buff, 2, HZ);
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (ret &= lt; 1) {
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0DRM_ERROR("Read EDID byte %d failed err %x\n"= , i, ret);
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0goto error;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0kfree(read_buff);
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0return false;
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0}
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0block[i] =3D r= buf[1];
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0buff[i] =3D re= ad_buff[1];
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0}
>
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0kfree(rbuf);
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0return block;
> -
> -error:
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0kfree(block);
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0kfree(rbuf);
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0return NULL;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0kfree(read_buff);
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0return true;
>=C2=A0 }
>
> -static int udl_get_modes(struct drm_connector *connector)
> +static bool udl_get_edid(struct udl_device *udl, u8 **result_buff, > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 int *result_buff_size)
>=C2=A0 {
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0struct udl_device *udl =3D connector->d= ev->dev_private;
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0struct edid *edid;
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0int ret;
> -
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0edid =3D (struct edid *)udl_get_edid(udl);=
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0if (!edid) {
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0drm_mode_conne= ctor_update_edid_property(connector, NULL);
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return 0;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0int i, extensions;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0u8 *block_buff =3D NULL, *buff_ptr;
> +
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0block_buff =3D kmalloc(EDID_LENGTH, GFP_KE= RNEL);
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0if (block_buff =3D=3D NULL)
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return false;<= br> > +
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0if (udl_get_edid_block(udl, 0, block_buff)= &&
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0memchr_inv(block_buff, 0, ED= ID_LENGTH)) {
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0extensions =3D= ((struct edid *)block_buff)->extensions;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (extensions= > 0) {
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0/* we have to read all extensions one by one */
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0*result_buff_size =3D EDID_LENGTH * (extensions + 1);
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0*result_buff =3D kmalloc(*result_buff_size, GFP_KERNEL);
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0buff_ptr =3D *result_buff;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0if (buff_ptr =3D=3D NULL) {
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0kfree(block_buff);
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return false;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0}
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0memcpy(buff_ptr, block_buff, EDID_LENGTH);
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0kfree(block_buff);
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0buff_ptr +=3D EDID_LENGTH;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0for (i =3D 1; i < extensions; ++i) {
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (udl_get_edid_block(udl, i, bu= ff_ptr)) {
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0buff_= ptr +=3D EDID_LENGTH;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0} else {
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0kfree= (*result_buff);
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*resu= lt_buff =3D NULL;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0retur= n false;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0}
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0}
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0return true;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0}
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0/* we have onl= y base edid block */
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*result_buff = =3D block_buff;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*result_buff_s= ize =3D EDID_LENGTH;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return true; >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0}
>
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0/*
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 * We only read the main block, but if the= monitor reports extension
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 * blocks then the drm edid code expects t= hem to be present, so patch
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 * the extension count to 0.
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 */
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0edid->checksum +=3D edid->extensions= ;
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0edid->extensions =3D 0;
> -
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0drm_mode_connector_update_edid_proper= ty(connector, edid);
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0ret =3D drm_add_edid_modes(connector, edid= );
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0kfree(edid);
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0return ret;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0kfree(block_buff);
> +
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0return false;
> +}
> +
> +static int udl_get_modes(struct drm_connector *connector)
> +{
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0struct udl_drm_connector *udl_connector = =3D
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0conta= iner_of(connector,
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0struc= t udl_drm_connector,
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0conne= ctor);
> +
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0drm_mode_connector_update_edid_proper= ty(connector, udl_connector->edid);
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0if (udl_connector->edid)
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return drm_add= _edid_modes(connector, udl_connector->edid);
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0return 0;
>=C2=A0 }
>
>=C2=A0 static int udl_mode_valid(struct drm_connector *connector,
> @@ -96,8 +121,25 @@ static int udl_mode_valid(struct drm_connector *co= nnector,
>=C2=A0 static enum drm_connector_status
>=C2=A0 udl_detect(struct drm_connector *connector, bool force)
>=C2=A0 {
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0if (drm_dev_is_unplugged(connector-&g= t;dev))
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0u8 *edid_buff =3D NULL;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0int edid_buff_size =3D 0;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0struct udl_device *udl =3D connector->d= ev->dev_private;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0struct udl_drm_connector *udl_connector = =3D
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0conta= iner_of(connector,
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0struc= t udl_drm_connector,
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0conne= ctor);
> +
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0/* cleanup previous edid */
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0if (udl_connector->edid !=3D NULL) { > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0kfree(udl_conn= ector->edid);
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0udl_connector-= >edid =3D NULL;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0}
> +
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0if (!udl_get_edid(udl, &edid_buff, &am= p;edid_buff_size))
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return co= nnector_status_disconnected;
> +
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0udl_connector->edid =3D (struct edid *)= edid_buff;
> +
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return connector_status_connected; >=C2=A0 }
>
> @@ -117,8 +159,14 @@ static int udl_connector_set_property(struct= drm_connector *connector,
>
>=C2=A0 static void udl_connector_destroy(struct drm_connector *connecto= r)
>=C2=A0 {
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0struct udl_drm_connector *udl_connector = =3D
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0conta= iner_of(connector,
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0struc= t udl_drm_connector,
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0conne= ctor);
> +
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0drm_connector_unregister(connect= or);
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0drm_connector_cleanup(connector)= ;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0kfree(udl_connector->edid);
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0kfree(connector);
>=C2=A0 }
>
> @@ -138,17 +186,22 @@ static const struct drm_connector_funcs udl_conn= ector_funcs =3D {
>
>=C2=A0 int udl_connector_init(struct drm_device *dev, struct drm_encode= r *encoder)
>=C2=A0 {
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0struct udl_drm_connector *udl_connector; >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0struct drm_connector *connector;
>
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0connector =3D kzalloc(sizeof(struct drm_co= nnector), GFP_KERNEL);
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0if (!connector)
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0udl_connector =3D kzalloc(sizeof(struct ud= l_drm_connector), GFP_KERNEL);
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0if (!udl_connector)
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return -E= NOMEM;
>
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0drm_connector_init(dev, connector, &ud= l_connector_funcs, DRM_MODE_CONNECTOR_DVII);
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0connector =3D &udl_connector->conne= ctor;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0drm_connector_init(dev, connector, &ud= l_connector_funcs,
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 DRM_MODE_CONNECTOR_DVII);
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0drm_connector_helper_add(connect= or, &udl_connector_helper_funcs);
>
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0drm_connector_register(connector= );
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0drm_mode_connector_attach_encode= r(connector, encoder);
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0connector->polled =3D DRM_CONNECTOR_POL= L_HPD |
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0DRM_CONNECTOR_= POLL_CONNECT | DRM_CONNECTOR_POLL_DISCONNECT;
>
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return 0;
>=C2=A0 }
> diff --git a/drivers/gpu/drm/udl/udl_connector.h b/drivers/gpu/dr= m/udl/udl_connector.h
> new file mode 100644
> index 000000000000..0fb0db5c4612
> --- /dev/null
> +++ b/drivers/gpu/drm/udl/udl_connector.h
> @@ -0,0 +1,13 @@
> +#ifndef __UDL_CONNECTOR_H__
> +#define __UDL_CONNECTOR_H__
> +
> +#include <drm/drm_crtc.h>
> +
> +struct udl_drm_connector {
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0struct drm_connector connector;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0/* last udl_detect edid */
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0struct edid *edid;
> +};
> +
> +
> +#endif //__UDL_CONNECTOR_H__
> diff --git a/drivers/gpu/drm/udl/udl_drv.c b/drivers/gpu/drm/udl/= udl_drv.c
> index 31421b6b586e..3c45a3064726 100644
> --- a/drivers/gpu/drm/udl/udl_drv.c
> +++ b/drivers/gpu/drm/udl/udl_drv.c
> @@ -14,6 +14,9 @@
>=C2=A0 static int udl_usb_suspend(struct usb_interface *interface,
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 pm_message_t message)
>=C2=A0 {
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0struct drm_device *dev =3D usb_get_intfdat= a(interface);
> +
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0drm_kms_helper_poll_disable(dev);
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return 0;
>=C2=A0 }
>
> @@ -21,6 +24,7 @@ static int udl_usb_resume(struct usb_interface *inte= rface)
>=C2=A0 {
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0struct drm_device *dev =3D usb_get_in= tfdata(interface);
>
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0drm_kms_helper_poll_enable(dev);
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0udl_modeset_restore(dev);
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return 0;
>=C2=A0 }
> diff --git a/drivers/gpu/drm/udl/udl_main.c b/drivers/gpu/drm/udl= /udl_main.c
> index 0328b2c7b210..f1ec4528a73e 100644
> --- a/drivers/gpu/drm/udl/udl_main.c
> +++ b/drivers/gpu/drm/udl/udl_main.c
> @@ -11,6 +11,7 @@
>=C2=A0 =C2=A0* more details.
>=C2=A0 =C2=A0*/
>=C2=A0 #include <drm/drmP.h>
> +#include <drm/drm_crtc_helper.h>
>=C2=A0 #include "udl_drv.h"
>
>=C2=A0 /* -BULK_SIZE as per usb-skeleton. Can we get full page and avoi= d overhead? */
> @@ -350,6 +351,8 @@ int udl_driver_load(struct drm_device *dev, unsign= ed long flags)
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (ret)
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0goto err_= fb;
>
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0drm_kms_helper_poll_init(dev);
> +
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return 0;
>=C2=A0 err_fb:
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0udl_fbdev_cleanup(dev);
> @@ -371,6 +374,8 @@ void udl_driver_unload(struct drm_device *dev)
>=C2=A0 {
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0struct udl_device *udl =3D dev->de= v_private;
>
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0drm_kms_helper_poll_fini(dev);
> +
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (udl->urbs.count)
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0udl_free_= urb_list(dev);
>
> --
> 2.15.0.rc0.271.g36b669edcc-goog
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.fre= edesktop.org
> https://lists.freedesktop.org/mail= man/listinfo/dri-devel

--001a113bf3c0dccea4055b63485c-- --===============1956599561== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVs IG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg== --===============1956599561==--