Skip to content

Commit ac2c996

Browse files
Shixiong Outdz
authored andcommitted
drm/udl: Increase GET_URB_TIMEOUT
[WHY] A situation has occurred where udl_handle_damage() executed successfully and the kernel log appears normal, but the display fails to show any output. This is because the call to udl_get_urb() in udl_crtc_helper_atomic_enable() failed without generating any error message. [HOW] 1. Increase timeout of getting urb. 2. Add error messages when calling udl_get_urb() failed in udl_crtc_helper_atomic_enable(). Signed-off-by: Shixiong Ou <oushixiong@kylinos.cn> Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de> Fixes: 5320918 ("drm/udl: initial UDL driver (v4)") Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> Cc: <stable@vger.kernel.org> # v3.4+ Link: https://patch.msgid.link/20260424124427.657-1-oushixiong1025@163.com
1 parent 5dfd429 commit ac2c996

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

drivers/gpu/drm/udl/udl_main.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -285,13 +285,12 @@ static struct urb *udl_get_urb_locked(struct udl_device *udl, long timeout)
285285
return unode->urb;
286286
}
287287

288-
#define GET_URB_TIMEOUT HZ
289288
struct urb *udl_get_urb(struct udl_device *udl)
290289
{
291290
struct urb *urb;
292291

293292
spin_lock_irq(&udl->urbs.lock);
294-
urb = udl_get_urb_locked(udl, GET_URB_TIMEOUT);
293+
urb = udl_get_urb_locked(udl, HZ * 2);
295294
spin_unlock_irq(&udl->urbs.lock);
296295
return urb;
297296
}

drivers/gpu/drm/udl/udl_modeset.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include <drm/drm_gem_framebuffer_helper.h>
2222
#include <drm/drm_gem_shmem_helper.h>
2323
#include <drm/drm_modeset_helper_vtables.h>
24+
#include <drm/drm_print.h>
2425
#include <drm/drm_probe_helper.h>
2526
#include <drm/drm_vblank.h>
2627

@@ -342,8 +343,10 @@ static void udl_crtc_helper_atomic_enable(struct drm_crtc *crtc, struct drm_atom
342343
return;
343344

344345
urb = udl_get_urb(udl);
345-
if (!urb)
346+
if (!urb) {
347+
drm_err_ratelimited(dev, "get urb failed when enabling crtc\n");
346348
goto out;
349+
}
347350

348351
buf = (char *)urb->transfer_buffer;
349352
buf = udl_vidreg_lock(buf);

0 commit comments

Comments
 (0)