Commit efea0c12 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-fixes-5.13-2021-06-21' of... 

Merge tag 'amd-drm-fixes-5.13-2021-06-21' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-fixes

amd-drm-fixes-5.13-2021-06-21:

amdgpu:
- Revert GFX9, 10 doorbell fixes, we just
  end up trading one bug for another
- Potential memory corruption fix in framebuffer handling

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210621214132.4004-1-alexander.deucher@amd.com
parents 13311e74 ee5468b9

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

+7 −5
Original line number Diff line number Diff line
@@ -1047,11 +1047,12 @@ int amdgpu_display_gem_fb_init(struct drm_device *dev, 


	rfb->base.obj[0] = obj;

	drm_helper_mode_fill_fb_struct(dev, &rfb->base, mode_cmd);

	ret = drm_framebuffer_init(dev, &rfb->base, &amdgpu_fb_funcs);



	ret = amdgpu_display_framebuffer_init(dev, rfb, mode_cmd, obj);

	if (ret)

		goto err;



	ret = amdgpu_display_framebuffer_init(dev, rfb, mode_cmd, obj);

	ret = drm_framebuffer_init(dev, &rfb->base, &amdgpu_fb_funcs);

	if (ret)

		goto err;
@@ -1071,9 +1072,6 @@ int amdgpu_display_gem_fb_verify_and_init( 


	rfb->base.obj[0] = obj;

	drm_helper_mode_fill_fb_struct(dev, &rfb->base, mode_cmd);

	ret = drm_framebuffer_init(dev, &rfb->base, &amdgpu_fb_funcs);

	if (ret)

		goto err;

	/* Verify that the modifier is supported. */

	if (!drm_any_plane_has_format(dev, mode_cmd->pixel_format,

				      mode_cmd->modifier[0])) {
@@ -1092,6 +1090,10 @@ int amdgpu_display_gem_fb_verify_and_init( 
	if (ret)

		goto err;



	ret = drm_framebuffer_init(dev, &rfb->base, &amdgpu_fb_funcs);

	if (ret)

		goto err;



	return 0;

err:

	drm_dbg_kms(dev, "Failed to verify and init gem fb: %d\n", ret);

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

+1 −5
Original line number Diff line number Diff line
@@ -6871,12 +6871,8 @@ static int gfx_v10_0_kiq_init_register(struct amdgpu_ring *ring) 
	if (ring->use_doorbell) {

		WREG32_SOC15(GC, 0, mmCP_MEC_DOORBELL_RANGE_LOWER,

			(adev->doorbell_index.kiq * 2) << 2);

		/* If GC has entered CGPG, ringing doorbell > first page doesn't

		 * wakeup GC. Enlarge CP_MEC_DOORBELL_RANGE_UPPER to workaround

		 * this issue.

		 */

		WREG32_SOC15(GC, 0, mmCP_MEC_DOORBELL_RANGE_UPPER,

			(adev->doorbell.size - 4));

			(adev->doorbell_index.userqueue_end * 2) << 2);

	}



	WREG32_SOC15(GC, 0, mmCP_HQD_PQ_DOORBELL_CONTROL,

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

+1 −5
Original line number Diff line number Diff line
@@ -3673,12 +3673,8 @@ static int gfx_v9_0_kiq_init_register(struct amdgpu_ring *ring) 
	if (ring->use_doorbell) {

		WREG32_SOC15(GC, 0, mmCP_MEC_DOORBELL_RANGE_LOWER,

					(adev->doorbell_index.kiq * 2) << 2);

		/* If GC has entered CGPG, ringing doorbell > first page doesn't

		 * wakeup GC. Enlarge CP_MEC_DOORBELL_RANGE_UPPER to workaround

		 * this issue.

		 */

		WREG32_SOC15(GC, 0, mmCP_MEC_DOORBELL_RANGE_UPPER,

					(adev->doorbell.size - 4));

					(adev->doorbell_index.userqueue_end * 2) << 2);

	}



	WREG32_SOC15_RLC(GC, 0, mmCP_HQD_PQ_DOORBELL_CONTROL,