Commit 0d1409e4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-2022-12-09' of git://anongit.freedesktop.org/drm/drm 

Pull drm fixes from Dave Airlie:
 "Last set of fixes for final, scattered bunch of fixes, two amdgpu, one
  vmwgfx, and some misc others.

  amdgpu:
   - S0ix fix
   - DCN 3.2 array out of bounds fix

  shmem:
   - Fixes to shmem-helper error paths

  bridge:
   - Fix polarity bug in bridge/ti-sn65dsi86

  dw-hdmi:
   - Prefer 8-bit RGB fallback before any YUV mode in dw-hdmi, since
     some panels lie about YUV support

  vmwgfx:
   - Stop using screen objects when SEV is active"

* tag 'drm-fixes-2022-12-09' of git://anongit.freedesktop.org/drm/drm:
  drm/amd/display: fix array index out of bound error in DCN32 DML
  drm/amdgpu/sdma_v4_0: turn off SDMA ring buffer in the s2idle suspend
  drm/vmwgfx: Don't use screen objects when SEV is active
  drm/shmem-helper: Avoid vm_open error paths
  drm/shmem-helper: Remove errant put in error path
  drm: bridge: dw_hdmi: fix preference of RGB modes over YUV420
  drm/bridge: ti-sn65dsi86: Fix output polarity setting bug
  drm/vmwgfx: Fix race issue calling pin_user_pages
parents 859c73d4 c4252650

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

+15 −9
Original line number Diff line number Diff line
@@ -907,13 +907,13 @@ static void sdma_v4_0_ring_emit_fence(struct amdgpu_ring *ring, u64 addr, u64 se 




/**

 * sdma_v4_0_gfx_stop - stop the gfx async dma engines

 * sdma_v4_0_gfx_enable - enable the gfx async dma engines

 *

 * @adev: amdgpu_device pointer

 *

 * Stop the gfx async dma ring buffers (VEGA10).

 * @enable: enable SDMA RB/IB

 * control the gfx async dma ring buffers (VEGA10).

 */

static void sdma_v4_0_gfx_stop(struct amdgpu_device *adev)

static void sdma_v4_0_gfx_enable(struct amdgpu_device *adev, bool enable)

{

	u32 rb_cntl, ib_cntl;

	int i;
@@ -922,10 +922,10 @@ static void sdma_v4_0_gfx_stop(struct amdgpu_device *adev) 


	for (i = 0; i < adev->sdma.num_instances; i++) {

		rb_cntl = RREG32_SDMA(i, mmSDMA0_GFX_RB_CNTL);

		rb_cntl = REG_SET_FIELD(rb_cntl, SDMA0_GFX_RB_CNTL, RB_ENABLE, 0);

		rb_cntl = REG_SET_FIELD(rb_cntl, SDMA0_GFX_RB_CNTL, RB_ENABLE, enable ? 1 : 0);

		WREG32_SDMA(i, mmSDMA0_GFX_RB_CNTL, rb_cntl);

		ib_cntl = RREG32_SDMA(i, mmSDMA0_GFX_IB_CNTL);

		ib_cntl = REG_SET_FIELD(ib_cntl, SDMA0_GFX_IB_CNTL, IB_ENABLE, 0);

		ib_cntl = REG_SET_FIELD(ib_cntl, SDMA0_GFX_IB_CNTL, IB_ENABLE, enable ? 1 : 0);

		WREG32_SDMA(i, mmSDMA0_GFX_IB_CNTL, ib_cntl);

	}

}
@@ -1044,7 +1044,7 @@ static void sdma_v4_0_enable(struct amdgpu_device *adev, bool enable) 
	int i;



	if (!enable) {

		sdma_v4_0_gfx_stop(adev);

		sdma_v4_0_gfx_enable(adev, enable);

		sdma_v4_0_rlc_stop(adev);

		if (adev->sdma.has_page_queue)

			sdma_v4_0_page_stop(adev);
@@ -1960,8 +1960,10 @@ static int sdma_v4_0_suspend(void *handle) 
	struct amdgpu_device *adev = (struct amdgpu_device *)handle;



	/* SMU saves SDMA state for us */

	if (adev->in_s0ix)

	if (adev->in_s0ix) {

		sdma_v4_0_gfx_enable(adev, false);

		return 0;

	}



	return sdma_v4_0_hw_fini(adev);

}
@@ -1971,8 +1973,12 @@ static int sdma_v4_0_resume(void *handle) 
	struct amdgpu_device *adev = (struct amdgpu_device *)handle;



	/* SMU restores SDMA state for us */

	if (adev->in_s0ix)

	if (adev->in_s0ix) {

		sdma_v4_0_enable(adev, true);

		sdma_v4_0_gfx_enable(adev, true);

		amdgpu_ttm_set_buffer_funcs_status(adev, true);

		return 0;

	}



	return sdma_v4_0_hw_init(adev);

}

drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.h

+1 −1
Original line number Diff line number Diff line
@@ -1153,7 +1153,7 @@ struct vba_vars_st { 
	double UrgBurstFactorLumaPre[DC__NUM_DPP__MAX];

	double UrgBurstFactorChromaPre[DC__NUM_DPP__MAX];

	bool NotUrgentLatencyHidingPre[DC__NUM_DPP__MAX];

	bool LinkCapacitySupport[DC__NUM_DPP__MAX];

	bool LinkCapacitySupport[DC__VOLTAGE_STATES];

	bool VREADY_AT_OR_AFTER_VSYNC[DC__NUM_DPP__MAX];

	unsigned int MIN_DST_Y_NEXT_START[DC__NUM_DPP__MAX];

	unsigned int VFrontPorch[DC__NUM_DPP__MAX];

drivers/gpu/drm/bridge/synopsys/dw-hdmi.c

+3 −3
Original line number Diff line number Diff line
@@ -2720,6 +2720,9 @@ static u32 *dw_hdmi_bridge_atomic_get_output_bus_fmts(struct drm_bridge *bridge, 
	 * if supported. In any case the default RGB888 format is added

	 */



	/* Default 8bit RGB fallback */

	output_fmts[i++] = MEDIA_BUS_FMT_RGB888_1X24;



	if (max_bpc >= 16 && info->bpc == 16) {

		if (info->color_formats & DRM_COLOR_FORMAT_YCBCR444)

			output_fmts[i++] = MEDIA_BUS_FMT_YUV16_1X48;
@@ -2753,9 +2756,6 @@ static u32 *dw_hdmi_bridge_atomic_get_output_bus_fmts(struct drm_bridge *bridge, 
	if (info->color_formats & DRM_COLOR_FORMAT_YCBCR444)

		output_fmts[i++] = MEDIA_BUS_FMT_YUV8_1X24;



	/* Default 8bit RGB fallback */

	output_fmts[i++] = MEDIA_BUS_FMT_RGB888_1X24;



	*num_output_fmts = i;



	return output_fmts;

drivers/gpu/drm/bridge/ti-sn65dsi86.c

+2 −2
Original line number Diff line number Diff line
@@ -931,9 +931,9 @@ static void ti_sn_bridge_set_video_timings(struct ti_sn65dsi86 *pdata) 
		&pdata->bridge.encoder->crtc->state->adjusted_mode;

	u8 hsync_polarity = 0, vsync_polarity = 0;



	if (mode->flags & DRM_MODE_FLAG_PHSYNC)

	if (mode->flags & DRM_MODE_FLAG_NHSYNC)

		hsync_polarity = CHA_HSYNC_POLARITY;

	if (mode->flags & DRM_MODE_FLAG_PVSYNC)

	if (mode->flags & DRM_MODE_FLAG_NVSYNC)

		vsync_polarity = CHA_VSYNC_POLARITY;



	ti_sn65dsi86_write_u16(pdata, SN_CHA_ACTIVE_LINE_LENGTH_LOW_REG,

drivers/gpu/drm/drm_gem_shmem_helper.c

+12 −6
Original line number Diff line number Diff line
@@ -571,12 +571,20 @@ static void drm_gem_shmem_vm_open(struct vm_area_struct *vma) 
{

	struct drm_gem_object *obj = vma->vm_private_data;

	struct drm_gem_shmem_object *shmem = to_drm_gem_shmem_obj(obj);

	int ret;



	WARN_ON(shmem->base.import_attach);



	ret = drm_gem_shmem_get_pages(shmem);

	WARN_ON_ONCE(ret != 0);

	mutex_lock(&shmem->pages_lock);



	/*

	 * We should have already pinned the pages when the buffer was first

	 * mmap'd, vm_open() just grabs an additional reference for the new

	 * mm the vma is getting copied into (ie. on fork()).

	 */

	if (!WARN_ON_ONCE(!shmem->pages_use_count))

		shmem->pages_use_count++;



	mutex_unlock(&shmem->pages_lock);



	drm_gem_vm_open(vma);

}
@@ -622,10 +630,8 @@ int drm_gem_shmem_mmap(struct drm_gem_shmem_object *shmem, struct vm_area_struct 
	}



	ret = drm_gem_shmem_get_pages(shmem);

	if (ret) {

		drm_gem_vm_close(vma);

	if (ret)

		return ret;

	}



	vma->vm_flags |= VM_PFNMAP | VM_DONTEXPAND | VM_DONTDUMP;

	vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);