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

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

drivers/gpu/drm/drm_probe_helper.c

+5 −3
Original line number Diff line number Diff line
@@ -760,9 +760,11 @@ static void output_poll_execute(struct work_struct *work) 
	changed = dev->mode_config.delayed_event;

	dev->mode_config.delayed_event = false;



	if (!drm_kms_helper_poll && dev->mode_config.poll_running) {

	if (!drm_kms_helper_poll) {

		if (dev->mode_config.poll_running) {

			drm_kms_helper_disable_hpd(dev);

			dev->mode_config.poll_running = false;

		}

		goto out;

	}

drivers/gpu/drm/nouveau/nouveau_gem.c

+1 −1
Original line number Diff line number Diff line
@@ -764,7 +764,7 @@ nouveau_gem_ioctl_pushbuf(struct drm_device *dev, void *data, 
		return -ENOMEM;



	if (unlikely(nouveau_cli_uvmm(cli)))

		return -ENOSYS;

		return nouveau_abi16_put(abi16, -ENOSYS);



	list_for_each_entry(temp, &abi16->channels, head) {

		if (temp->chan->chid == req->channel) {

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

+4 −4
Original line number Diff line number Diff line
@@ -1768,11 +1768,11 @@ static const struct panel_desc starry_qfh032011_53g_desc = { 
};



static const struct drm_display_mode starry_himax83102_j02_default_mode = {

	.clock = 162850,

	.clock = 162680,

	.hdisplay = 1200,

	.hsync_start = 1200 + 50,

	.hsync_end = 1200 + 50 + 20,

	.htotal = 1200 + 50 + 20 + 50,

	.hsync_start = 1200 + 60,

	.hsync_end = 1200 + 60 + 20,

	.htotal = 1200 + 60 + 20 + 40,

	.vdisplay = 1920,

	.vsync_start = 1920 + 116,

	.vsync_end = 1920 + 116 + 8,

drivers/gpu/drm/tests/drm_buddy_test.c

+1 −1
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ static void drm_test_buddy_alloc_range_bias(struct kunit *test) 
							      &allocated,

							      DRM_BUDDY_RANGE_ALLOCATION),

				       "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;



		/*