Commit 5ee88057 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-2021-01-15' of git://anongit.freedesktop.org/drm/drm 

Pull drm fixes from Dave Airlie:
 "Regular fixes for rc4, a bunch of fixes across i915, amdgpu and
  nouveau here, along with a couple of TTM fixes, and dma-buf and one
  core pageflip/modifier interaction fix.

  One notable i915 fix is a HSW GT1 regression fix that has been
  outstanding for quite a while. (Thanks to Matt Turner for kicking
  Intel into getting it fixed).

  dma-buf:
   - Fix a memory leak in CMAV heap

  core:
   - Fix format check for legacy pageflips

  ttm:
   - Pass correct address to dma_mapping_error()
   - Use mutex in pool shrinker

  i915:
   - Allow the sysadmin to override security mitigations
   - Restore clear-residual mitigations for ivb/byt
   - Limit VFE threads based on GT
   - GVT: fix vfio edid and full display detection
   - Fix DSI DSC power refcounting
   - Fix LPT CPU mode backlight takeover
   - Disable RPM wakeref assertions during driver shutdown
   - Fix DSI sequence sleeps

  amdgpu:
   - Update repo location in MAINTAINERS
   - Add some new renoir PCI IDs
   - Revert CRC UAPI changes
   - Revert OLED display fix which cases clocking problems for some systems
   - Misc vangogh fixes
   - GFX fix for sienna cichlid
   - DCN1.0 fix for pipe split
   - Fix incorrect PSP command

  amdkfd:
   - Fix possible out of bounds read in vcrat creation

  nouveau:
   - irq handling fix
   - expansion ROM fix
   - hw init dpcd disable
   - aux semaphore owner field fix
   - vram heap sizing fix
   - notifier at 0 is valid fix"

* tag 'drm-fixes-2021-01-15' of git://anongit.freedesktop.org/drm/drm: (37 commits)
  drm/nouveau/kms/nv50-: fix case where notifier buffer is at offset 0
  drm/nouveau/mmu: fix vram heap sizing
  drm/nouveau/i2c/gm200: increase width of aux semaphore owner fields
  drm/nouveau/i2c/gk110-: disable hw-initiated dpcd reads
  drm/nouveau/i2c/gk110: split out from i2c/gk104
  drm/nouveau/privring: ack interrupts the same way as RM
  drm/nouveau/bios: fix issue shadowing expansion ROMs
  drm/amd/display: Fix to be able to stop crc calculation
  Revert "drm/amd/display: Expose new CRC window property"
  Revert "drm/amdgpu/disply: fix documentation warnings in display manager"
  Revert "drm/amd/display: Fix unused variable warning"
  drm/amdgpu: set power brake sequence
  drm/amdgpu: add new device id for Renior
  drm/amdgpu: add green_sardine device id (v2)
  drm/amdgpu: fix vram type and bandwidth error for DDR5 and DDR4
  drm/amdgpu/gfx10: add updated GOLDEN_TSC_COUNT_UPPER/LOWER register offsets for VGH
  drm/amdkfd: Fix out-of-bounds read in kdf_create_vcrat_image_cpu()
  Revert "drm/amd/display: Fixed Intermittent blue screen on OLED panel"
  drm/amd/display: disable dcn10 pipe split by default
  drm/amd/display: Add a missing DCN3.01 API mapping
  ...
parents cdaed110 c8f6364f

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -906,7 +906,7 @@ AMD KFD 
M:	Felix Kuehling <Felix.Kuehling@amd.com>

L:	amd-gfx@lists.freedesktop.org

S:	Supported

T:	git git://people.freedesktop.org/~agd5f/linux

T:	git https://gitlab.freedesktop.org/agd5f/linux.git

F:	drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd*.[ch]

F:	drivers/gpu/drm/amd/amdkfd/

F:	drivers/gpu/drm/amd/include/cik_structs.h
@@ -14812,7 +14812,7 @@ M: Alex Deucher <alexander.deucher@amd.com> 
M:	Christian König <christian.koenig@amd.com>

L:	amd-gfx@lists.freedesktop.org

S:	Supported

T:	git git://people.freedesktop.org/~agd5f/linux

T:	git https://gitlab.freedesktop.org/agd5f/linux.git

F:	drivers/gpu/drm/amd/

F:	drivers/gpu/drm/radeon/

F:	include/uapi/drm/amdgpu_drm.h

drivers/dma-buf/heaps/cma_heap.c

+3 −0
Original line number Diff line number Diff line
@@ -251,6 +251,9 @@ static void cma_heap_dma_buf_release(struct dma_buf *dmabuf) 
		buffer->vaddr = NULL;

	}



	/* free page list */

	kfree(buffer->pages);

	/* release memory */

	cma_release(cma_heap->cma, buffer->cma_pages, buffer->pagecount);

	kfree(buffer);

}

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

+36 −17
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ int amdgpu_atomfirmware_allocate_fb_scratch(struct amdgpu_device *adev) 
union igp_info {

	struct atom_integrated_system_info_v1_11 v11;

	struct atom_integrated_system_info_v1_12 v12;

	struct atom_integrated_system_info_v2_1 v21;

};



union umc_info {
@@ -209,9 +210,14 @@ amdgpu_atomfirmware_get_vram_info(struct amdgpu_device *adev, 
		if (adev->flags & AMD_IS_APU) {

			igp_info = (union igp_info *)

				(mode_info->atom_context->bios + data_offset);

			switch (frev) {

			case 1:

				switch (crev) {

				case 11:

				case 12:

					mem_channel_number = igp_info->v11.umachannelnumber;

					if (!mem_channel_number)

						mem_channel_number = 1;

					/* channel width is 64 */

					if (vram_width)

						*vram_width = mem_channel_number * 64;
@@ -219,18 +225,31 @@ amdgpu_atomfirmware_get_vram_info(struct amdgpu_device *adev, 
					if (vram_type)

						*vram_type = convert_atom_mem_type_to_vram_type(adev, mem_type);

					break;

			case 12:

				mem_channel_number = igp_info->v12.umachannelnumber;

				default:

					return -EINVAL;

				}

				break;

			case 2:

				switch (crev) {

				case 1:

				case 2:

					mem_channel_number = igp_info->v21.umachannelnumber;

					if (!mem_channel_number)

						mem_channel_number = 1;

					/* channel width is 64 */

					if (vram_width)

						*vram_width = mem_channel_number * 64;

				mem_type = igp_info->v12.memorytype;

					mem_type = igp_info->v21.memorytype;

					if (vram_type)

						*vram_type = convert_atom_mem_type_to_vram_type(adev, mem_type);

					break;

				default:

					return -EINVAL;

				}

				break;

			default:

				return -EINVAL;

			}

		} else {

			vram_info = (union vram_info *)

				(mode_info->atom_context->bios + data_offset);

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

+1 −1
Original line number Diff line number Diff line
@@ -3034,7 +3034,7 @@ bool amdgpu_device_asic_has_dc_support(enum amd_asic_type asic_type) 
#endif

	default:

		if (amdgpu_dc > 0)

			DRM_INFO("Display Core has been requested via kernel parameter "

			DRM_INFO_ONCE("Display Core has been requested via kernel parameter "

					 "but isn't supported by ASIC, ignoring\n");

		return false;

	}

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

+2 −0
Original line number Diff line number Diff line
@@ -1085,6 +1085,8 @@ static const struct pci_device_id pciidlist[] = { 


	/* Renoir */

	{0x1002, 0x1636, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RENOIR|AMD_IS_APU},

	{0x1002, 0x1638, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RENOIR|AMD_IS_APU},

	{0x1002, 0x164C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RENOIR|AMD_IS_APU},



	/* Navi12 */

	{0x1002, 0x7360, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_NAVI12},