Skip to content

Commit 83c34dc

Browse files
committed
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: Dave Airlie <airlied@redhat.com> From: Maxime Ripard <mripard@redhat.com> Link: https://patchwork.freedesktop.org/patch/msgid/20240307-quizzical-auburn-starling-0ade8f@houat
2 parents b3cdb19 + 4ece8fc commit 83c34dc

File tree

4 files changed

+11
-9
lines changed

4 files changed

+11
-9
lines changed

drivers/gpu/drm/drm_probe_helper.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -760,9 +760,11 @@ static void output_poll_execute(struct work_struct *work)
760760
changed = dev->mode_config.delayed_event;
761761
dev->mode_config.delayed_event = false;
762762

763-
if (!drm_kms_helper_poll && dev->mode_config.poll_running) {
764-
drm_kms_helper_disable_hpd(dev);
765-
dev->mode_config.poll_running = false;
763+
if (!drm_kms_helper_poll) {
764+
if (dev->mode_config.poll_running) {
765+
drm_kms_helper_disable_hpd(dev);
766+
dev->mode_config.poll_running = false;
767+
}
766768
goto out;
767769
}
768770

drivers/gpu/drm/nouveau/nouveau_gem.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -764,7 +764,7 @@ nouveau_gem_ioctl_pushbuf(struct drm_device *dev, void *data,
764764
return -ENOMEM;
765765

766766
if (unlikely(nouveau_cli_uvmm(cli)))
767-
return -ENOSYS;
767+
return nouveau_abi16_put(abi16, -ENOSYS);
768768

769769
list_for_each_entry(temp, &abi16->channels, head) {
770770
if (temp->chan->chid == req->channel) {

drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1768,11 +1768,11 @@ static const struct panel_desc starry_qfh032011_53g_desc = {
17681768
};
17691769

17701770
static const struct drm_display_mode starry_himax83102_j02_default_mode = {
1771-
.clock = 162850,
1771+
.clock = 162680,
17721772
.hdisplay = 1200,
1773-
.hsync_start = 1200 + 50,
1774-
.hsync_end = 1200 + 50 + 20,
1775-
.htotal = 1200 + 50 + 20 + 50,
1773+
.hsync_start = 1200 + 60,
1774+
.hsync_end = 1200 + 60 + 20,
1775+
.htotal = 1200 + 60 + 20 + 40,
17761776
.vdisplay = 1920,
17771777
.vsync_start = 1920 + 116,
17781778
.vsync_end = 1920 + 116 + 8,

drivers/gpu/drm/tests/drm_buddy_test.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ static void drm_test_buddy_alloc_range_bias(struct kunit *test)
189189
&allocated,
190190
DRM_BUDDY_RANGE_ALLOCATION),
191191
"buddy_alloc failed with bias(%x-%x), size=%u, ps=%u\n",
192-
bias_start, bias_end, size);
192+
bias_start, bias_end, size, ps);
193193
bias_rem -= size;
194194

195195
/*

0 commit comments

Comments
 (0)