Commit 04da002d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-fixes-4.2' of git://people.freedesktop.org/~agd5f/linux 

Pull amd drm fixes from Alex Deucher:
 "Dave is on vacation at the moment, so please pull these radeon and
  amdgpu fixes directly.

  Just a few minor things for 4.2:

   - add a new radeon pci id
   - fix a power management regression in amdgpu
   - fix HEVC command buffer validation in amdgpu"

* 'drm-fixes-4.2' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon: add new OLAND pci id
  Revert "drm/amdgpu: Configure doorbell to maximum slots"
  drm/amdgpu: add context buffer size check for HEVC
parents cec45d90 e037239e

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

+14 −3
Original line number Diff line number Diff line
@@ -374,7 +374,7 @@ static int amdgpu_uvd_cs_msg_decode(uint32_t *msg, unsigned buf_sizes[]) 
	unsigned height_in_mb = ALIGN(height / 16, 2);

	unsigned fs_in_mb = width_in_mb * height_in_mb;



	unsigned image_size, tmp, min_dpb_size, num_dpb_buffer;

	unsigned image_size, tmp, min_dpb_size, num_dpb_buffer, min_ctx_size;



	image_size = width * height;

	image_size += image_size / 2;
@@ -466,6 +466,8 @@ static int amdgpu_uvd_cs_msg_decode(uint32_t *msg, unsigned buf_sizes[]) 


		num_dpb_buffer = (le32_to_cpu(msg[59]) & 0xff) + 2;

		min_dpb_size = image_size * num_dpb_buffer;

		min_ctx_size = ((width + 255) / 16) * ((height + 255) / 16)

					   * 16 * num_dpb_buffer + 52 * 1024;

		break;



	default:
@@ -486,6 +488,7 @@ static int amdgpu_uvd_cs_msg_decode(uint32_t *msg, unsigned buf_sizes[]) 


	buf_sizes[0x1] = dpb_size;

	buf_sizes[0x2] = image_size;

	buf_sizes[0x4] = min_ctx_size;

	return 0;

}
@@ -628,6 +631,13 @@ static int amdgpu_uvd_cs_pass2(struct amdgpu_uvd_cs_ctx *ctx) 
			return -EINVAL;

		}



	} else if (cmd == 0x206) {

		if ((end - start) < ctx->buf_sizes[4]) {

			DRM_ERROR("buffer (%d) to small (%d / %d)!\n", cmd,

					  (unsigned)(end - start),

					  ctx->buf_sizes[4]);

			return -EINVAL;

		}

	} else if ((cmd != 0x100) && (cmd != 0x204)) {

		DRM_ERROR("invalid UVD command %X!\n", cmd);

		return -EINVAL;
@@ -755,9 +765,10 @@ int amdgpu_uvd_ring_parse_cs(struct amdgpu_cs_parser *parser, uint32_t ib_idx) 
	struct amdgpu_uvd_cs_ctx ctx = {};

	unsigned buf_sizes[] = {

		[0x00000000]	=	2048,

		[0x00000001]	=	32 * 1024 * 1024,

		[0x00000002]	=	2048 * 1152 * 3,

		[0x00000001]	=	0xFFFFFFFF,

		[0x00000002]	=	0xFFFFFFFF,

		[0x00000003]	=	2048,

		[0x00000004]	=	0xFFFFFFFF,

	};

	struct amdgpu_ib *ib = &parser->ibs[ib_idx];

	int r;

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

+1 −1
Original line number Diff line number Diff line
@@ -3135,7 +3135,7 @@ static int gfx_v8_0_cp_compute_resume(struct amdgpu_device *adev) 
				WREG32(mmCP_MEC_DOORBELL_RANGE_LOWER,

				       AMDGPU_DOORBELL_KIQ << 2);

				WREG32(mmCP_MEC_DOORBELL_RANGE_UPPER,

						0x7FFFF << 2);

				       AMDGPU_DOORBELL_MEC_RING7 << 2);

			}

			tmp = RREG32(mmCP_HQD_PQ_DOORBELL_CONTROL);

			tmp = REG_SET_FIELD(tmp, CP_HQD_PQ_DOORBELL_CONTROL,

include/drm/drm_pciids.h

+1 −0
Original line number Diff line number Diff line
@@ -172,6 +172,7 @@ 
	{0x1002, 0x6610, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|RADEON_NEW_MEMMAP}, \

	{0x1002, 0x6611, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|RADEON_NEW_MEMMAP}, \

	{0x1002, 0x6613, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|RADEON_NEW_MEMMAP}, \

	{0x1002, 0x6617, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \

	{0x1002, 0x6620, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \

	{0x1002, 0x6621, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \

	{0x1002, 0x6623, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \

CRA Git | Maintained and supported by SUSTech CRA and CCSE