Re: [PATCH] drm/udl: Fixed problem with UDL adpater reconnection

[Robert Tarasov]

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);
> > +

Re: [PATCH] drm/udl: Fixed problem with UDL adpater reconnection

[Alex Deucher]

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 {
> +  

[PATCH] drm/udl: Fixed problem with UDL adpater reconnection

[Robert Tarasov]

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.

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