Commit 10a6e5fe authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-2023-10-13' of git://anongit.freedesktop.org/drm/drm 

Pull drm fixes from Dave Airlie:
 "Weekly fixes, the core is msm and amdgpu with some scattered fixes
  across vmwgfx, panel and the core stuff.

  atomic-helper:
   - Relax checks for unregistered connectors

  dma-buf:
   - Work around race condition when retrieving fence timestamp

  gem:
   - Avoid OOB access in BO memory range

  panel:
   - boe-tv101wun-ml6: Fix flickering

  simpledrm:
   - Fix error output

  vwmgfx:
   - Fix size calculation in texture-state code
   - Ref GEM BOs in surfaces

  msm:
   - PHY/link training reset fix
   - msm8998 - correct highest bank bit
   - skip video mode if timing engine disabled
   - check irq_of_parse_and_map return code
   - add new lines to some prints
   - fail atomic check for max mdp clk test

  amdgpu:
   - Seamless boot fix
   - Fix TTM BO resource check
   - SI fix for doorbell handling"

* tag 'drm-fixes-2023-10-13' of git://anongit.freedesktop.org/drm/drm:
  drm/tiny: correctly print `struct resource *` on error
  drm: Do not overrun array in drm_gem_get_pages()
  drm/atomic-helper: relax unregistered connector check
  drm/panel: boe-tv101wum-nl6: Completely pull GPW to VGL before TP term
  drm/amdgpu: fix SI failure due to doorbells allocation
  drm/amdgpu: add missing NULL check
  drm/amd/display: Don't set dpms_off for seamless boot
  drm/vmwgfx: Keep a gem reference to user bos in surfaces
  drm/vmwgfx: fix typo of sizeof argument
  drm/msm/dpu: fail dpu_plane_atomic_check() based on mdp clk limits
  dma-buf: add dma_fence_timestamp helper
  drm/msm/dp: Add newlines to debug printks
  drm/msm/dpu: change _dpu_plane_calc_bw() to use u64 to avoid overflow
  drm/msm/dsi: fix irq_of_parse_and_map() error checking
  drm/msm/dsi: skip the wait for video mode done if not applicable
  drm/msm/mdss: fix highest-bank-bit for msm8998
  drm/msm/dp: do not reinitialize phy unless retry during link training
parents ce583d5f 30873697

drivers/dma-buf/dma-fence-unwrap.c

+4 −9
Original line number Diff line number Diff line
@@ -76,16 +76,11 @@ struct dma_fence *__dma_fence_unwrap_merge(unsigned int num_fences, 
		dma_fence_unwrap_for_each(tmp, &iter[i], fences[i]) {

			if (!dma_fence_is_signaled(tmp)) {

				++count;

			} else if (test_bit(DMA_FENCE_FLAG_TIMESTAMP_BIT,

					    &tmp->flags)) {

				if (ktime_after(tmp->timestamp, timestamp))

					timestamp = tmp->timestamp;

			} else {

				/*

				 * Use the current time if the fence is

				 * currently signaling.

				 */

				timestamp = ktime_get();

				ktime_t t = dma_fence_timestamp(tmp);



				if (ktime_after(t, timestamp))

					timestamp = t;

			}

		}

	}

drivers/dma-buf/sync_file.c

+3 −6
Original line number Diff line number Diff line
@@ -268,12 +268,9 @@ static int sync_fill_fence_info(struct dma_fence *fence, 
		sizeof(info->driver_name));



	info->status = dma_fence_get_status(fence);

	while (test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &fence->flags) &&

	       !test_bit(DMA_FENCE_FLAG_TIMESTAMP_BIT, &fence->flags))

		cpu_relax();

	info->timestamp_ns =

		test_bit(DMA_FENCE_FLAG_TIMESTAMP_BIT, &fence->flags) ?

		ktime_to_ns(fence->timestamp) :

		dma_fence_is_signaled(fence) ?

			ktime_to_ns(dma_fence_timestamp(fence)) :

			ktime_set(0, 0);



	return info->status;

drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell_mgr.c

+4 −0
Original line number Diff line number Diff line
@@ -142,6 +142,10 @@ int amdgpu_doorbell_create_kernel_doorbells(struct amdgpu_device *adev) 
	int r;

	int size;



	/* SI HW does not have doorbells, skip allocation */

	if (adev->doorbell.num_kernel_doorbells == 0)

		return 0;



	/* Reserve first num_kernel_doorbells (page-aligned) for kernel ops */

	size = ALIGN(adev->doorbell.num_kernel_doorbells * sizeof(u32), PAGE_SIZE);

drivers/gpu/drm/amd/amdgpu/amdgpu_object.h

+1 −1
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ static inline bool amdgpu_bo_in_cpu_visible_vram(struct amdgpu_bo *bo) 
	struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev);

	struct amdgpu_res_cursor cursor;



	if (bo->tbo.resource->mem_type != TTM_PL_VRAM)

	if (!bo->tbo.resource || bo->tbo.resource->mem_type != TTM_PL_VRAM)

		return false;



	amdgpu_res_first(bo->tbo.resource, 0, amdgpu_bo_size(bo), &cursor);

drivers/gpu/drm/amd/display/dc/core/dc.c

+3 −0
Original line number Diff line number Diff line
@@ -1262,6 +1262,9 @@ static void disable_vbios_mode_if_required( 
		if (stream == NULL)

			continue;



		if (stream->apply_seamless_boot_optimization)

			continue;



		// only looking for first odm pipe

		if (pipe->prev_odm_pipe)

			continue;