Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

A few small fixes for 4.11

* 'drm-fixes-4.11' of git://people.freedesktop.org/~agd5f/linux:
  drm/amd/amdgpu: add POLARIS12 PCI ID
  drm/amdgpu: fix the clearing wb size
  drm/amdgpu: reinstate oland workaround for sclk
  drm/radeon: reinstate oland workaround for sclk
parents f505a5c0 cf8c73af

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

+2 −2
Original line number Diff line number Diff line
@@ -475,7 +475,7 @@ static int amdgpu_wb_init(struct amdgpu_device *adev) 
	int r;



	if (adev->wb.wb_obj == NULL) {

		r = amdgpu_bo_create_kernel(adev, AMDGPU_MAX_WB * 4,

		r = amdgpu_bo_create_kernel(adev, AMDGPU_MAX_WB * sizeof(uint32_t),

					    PAGE_SIZE, AMDGPU_GEM_DOMAIN_GTT,

					    &adev->wb.wb_obj, &adev->wb.gpu_addr,

					    (void **)&adev->wb.wb);
@@ -488,7 +488,7 @@ static int amdgpu_wb_init(struct amdgpu_device *adev) 
		memset(&adev->wb.used, 0, sizeof(adev->wb.used));



		/* clear wb memory */

		memset((char *)adev->wb.wb, 0, AMDGPU_GPU_PAGE_SIZE);

		memset((char *)adev->wb.wb, 0, AMDGPU_MAX_WB * sizeof(uint32_t));

	}



	return 0;

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

+1 −0
Original line number Diff line number Diff line
@@ -421,6 +421,7 @@ static const struct pci_device_id pciidlist[] = { 
	{0x1002, 0x6985, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS12},

	{0x1002, 0x6986, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS12},

	{0x1002, 0x6987, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS12},

	{0x1002, 0x6995, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS12},

	{0x1002, 0x699F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS12},



	{0, 0, 0}

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

+7 −3
Original line number Diff line number Diff line
@@ -3465,9 +3465,13 @@ static void si_apply_state_adjust_rules(struct amdgpu_device *adev, 
			max_sclk = 75000;

		}

	} else if (adev->asic_type == CHIP_OLAND) {

		if ((adev->pdev->device == 0x6604) &&

		    (adev->pdev->subsystem_vendor == 0x1028) &&

		    (adev->pdev->subsystem_device == 0x066F)) {

		if ((adev->pdev->revision == 0xC7) ||

		    (adev->pdev->revision == 0x80) ||

		    (adev->pdev->revision == 0x81) ||

		    (adev->pdev->revision == 0x83) ||

		    (adev->pdev->revision == 0x87) ||

		    (adev->pdev->device == 0x6604) ||

		    (adev->pdev->device == 0x6605)) {

			max_sclk = 75000;

		}

	}

drivers/gpu/drm/radeon/si_dpm.c

+7 −3
Original line number Diff line number Diff line
@@ -2985,9 +2985,13 @@ static void si_apply_state_adjust_rules(struct radeon_device *rdev, 
			max_sclk = 75000;

		}

	} else if (rdev->family == CHIP_OLAND) {

		if ((rdev->pdev->device == 0x6604) &&

		    (rdev->pdev->subsystem_vendor == 0x1028) &&

		    (rdev->pdev->subsystem_device == 0x066F)) {

		if ((rdev->pdev->revision == 0xC7) ||

		    (rdev->pdev->revision == 0x80) ||

		    (rdev->pdev->revision == 0x81) ||

		    (rdev->pdev->revision == 0x83) ||

		    (rdev->pdev->revision == 0x87) ||

		    (rdev->pdev->device == 0x6604) ||

		    (rdev->pdev->device == 0x6605)) {

			max_sclk = 75000;

		}

	}