Commit 83c34dcb authored by Dave Airlie's avatar Dave Airlie

Merge tag 'drm-misc-fixes-2024-03-07' of...

Merge tag 'drm-misc-fixes-2024-03-07' of https://anongit.freedesktop.org/git/drm/drm-misc into drm-fixes

A connector status polling fix, a timings fix for the Himax83102-j02
panel, a deadlock fix for nouveau, A controversial format fix for udl
that got reverted to allow further discussion, and a build fix for the
drm/buddy kunit tests.
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Maxime Ripard <mripard@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240307-quizzical-auburn-starling-0ade8f@houat
parents b3cdb192 4ece8fc4
...@@ -760,9 +760,11 @@ static void output_poll_execute(struct work_struct *work) ...@@ -760,9 +760,11 @@ static void output_poll_execute(struct work_struct *work)
changed = dev->mode_config.delayed_event; changed = dev->mode_config.delayed_event;
dev->mode_config.delayed_event = false; dev->mode_config.delayed_event = false;
if (!drm_kms_helper_poll && dev->mode_config.poll_running) { if (!drm_kms_helper_poll) {
drm_kms_helper_disable_hpd(dev); if (dev->mode_config.poll_running) {
dev->mode_config.poll_running = false; drm_kms_helper_disable_hpd(dev);
dev->mode_config.poll_running = false;
}
goto out; goto out;
} }
......
...@@ -764,7 +764,7 @@ nouveau_gem_ioctl_pushbuf(struct drm_device *dev, void *data, ...@@ -764,7 +764,7 @@ nouveau_gem_ioctl_pushbuf(struct drm_device *dev, void *data,
return -ENOMEM; return -ENOMEM;
if (unlikely(nouveau_cli_uvmm(cli))) if (unlikely(nouveau_cli_uvmm(cli)))
return -ENOSYS; return nouveau_abi16_put(abi16, -ENOSYS);
list_for_each_entry(temp, &abi16->channels, head) { list_for_each_entry(temp, &abi16->channels, head) {
if (temp->chan->chid == req->channel) { if (temp->chan->chid == req->channel) {
......
...@@ -1768,11 +1768,11 @@ static const struct panel_desc starry_qfh032011_53g_desc = { ...@@ -1768,11 +1768,11 @@ static const struct panel_desc starry_qfh032011_53g_desc = {
}; };
static const struct drm_display_mode starry_himax83102_j02_default_mode = { static const struct drm_display_mode starry_himax83102_j02_default_mode = {
.clock = 162850, .clock = 162680,
.hdisplay = 1200, .hdisplay = 1200,
.hsync_start = 1200 + 50, .hsync_start = 1200 + 60,
.hsync_end = 1200 + 50 + 20, .hsync_end = 1200 + 60 + 20,
.htotal = 1200 + 50 + 20 + 50, .htotal = 1200 + 60 + 20 + 40,
.vdisplay = 1920, .vdisplay = 1920,
.vsync_start = 1920 + 116, .vsync_start = 1920 + 116,
.vsync_end = 1920 + 116 + 8, .vsync_end = 1920 + 116 + 8,
......
...@@ -189,7 +189,7 @@ static void drm_test_buddy_alloc_range_bias(struct kunit *test) ...@@ -189,7 +189,7 @@ static void drm_test_buddy_alloc_range_bias(struct kunit *test)
&allocated, &allocated,
DRM_BUDDY_RANGE_ALLOCATION), DRM_BUDDY_RANGE_ALLOCATION),
"buddy_alloc failed with bias(%x-%x), size=%u, ps=%u\n", "buddy_alloc failed with bias(%x-%x), size=%u, ps=%u\n",
bias_start, bias_end, size); bias_start, bias_end, size, ps);
bias_rem -= size; bias_rem -= size;
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment