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

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

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

Fixes for 4.11. Highlights:
- fix >2 displays on asics with 3 or 5 crtcs
- fix SI headless asics
- powerplay fixes for new polaris variants
- misc fixes

* 'drm-next-4.11' of git://people.freedesktop.org/~agd5f/linux:
  drm/amdgpu: fix warning on older gcc releases
  drm/ttm: make TTM_MAX_BO_PRIORITY unsigned
  drm/amd/amdgpu: Fix flow control in uvd_v4_2_stop()
  drm/amd/powerplay: add didt config table for polaris kicker
  drm/amd/powerplay: modify VddcPhase value for polaris kicker
  drm/amd/powerplay: add kicker flag into smumgr
  drm/amdgpu: Initialize pipe priority order on graphic initialization
  drm/amdgpu: read hw register to check pg status.
  drm/amdgpu: Add to initialization of mmVCE_VCPU_CNTL register
  drm/amdgpu/pm: check for headless before calling compute_clocks
  drm/amdgpu: use amdgpu_gem_va_check() in amdgpu_gem_va_update_vm()
  drm/amdgpu: add more cases to DCE11 possible crtc mask setup
parents be3c9f5e e8411302

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+0 −2
Original line number Diff line number Diff line
@@ -1037,7 +1037,6 @@ struct amdgpu_uvd { 
	bool			use_ctx_buf;

	struct amd_sched_entity entity;

	uint32_t                srbm_soft_reset;

	bool			is_powergated;

};



/*
@@ -1066,7 +1065,6 @@ struct amdgpu_vce { 
	struct amd_sched_entity	entity;

	uint32_t                srbm_soft_reset;

	unsigned		num_rings;

	bool			is_powergated;

};



/*

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

+12 −8
Original line number Diff line number Diff line
@@ -834,16 +834,18 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device, 
			case CHIP_TOPAZ:

				if (((adev->pdev->device == 0x6900) && (adev->pdev->revision == 0x81)) ||

				    ((adev->pdev->device == 0x6900) && (adev->pdev->revision == 0x83)) ||

				    ((adev->pdev->device == 0x6907) && (adev->pdev->revision == 0x87)))

				    ((adev->pdev->device == 0x6907) && (adev->pdev->revision == 0x87))) {

					info->is_kicker = true;

					strcpy(fw_name, "amdgpu/topaz_k_smc.bin");

				else

				} else

					strcpy(fw_name, "amdgpu/topaz_smc.bin");

				break;

			case CHIP_TONGA:

				if (((adev->pdev->device == 0x6939) && (adev->pdev->revision == 0xf1)) ||

				    ((adev->pdev->device == 0x6938) && (adev->pdev->revision == 0xf1)))

				    ((adev->pdev->device == 0x6938) && (adev->pdev->revision == 0xf1))) {

					info->is_kicker = true;

					strcpy(fw_name, "amdgpu/tonga_k_smc.bin");

				else

				} else

					strcpy(fw_name, "amdgpu/tonga_smc.bin");

				break;

			case CHIP_FIJI:
@@ -858,9 +860,10 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device, 
					    ((adev->pdev->device == 0x67ff) &&

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

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

					      (adev->pdev->revision == 0xff))))

					      (adev->pdev->revision == 0xff)))) {

						info->is_kicker = true;

						strcpy(fw_name, "amdgpu/polaris11_k_smc.bin");

					else

					} else

						strcpy(fw_name, "amdgpu/polaris11_smc.bin");

				} else if (type == CGS_UCODE_ID_SMU_SK) {

					strcpy(fw_name, "amdgpu/polaris11_smc_sk.bin");
@@ -874,9 +877,10 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device, 
					     (adev->pdev->revision == 0xe4) ||

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

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

					     (adev->pdev->revision == 0xef)))

					     (adev->pdev->revision == 0xef))) {

						info->is_kicker = true;

						strcpy(fw_name, "amdgpu/polaris10_k_smc.bin");

					else

					} else

						strcpy(fw_name, "amdgpu/polaris10_smc.bin");

				} else if (type == CGS_UCODE_ID_SMU_SK) {

					strcpy(fw_name, "amdgpu/polaris10_smc_sk.bin");

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

+1 −7
Original line number Diff line number Diff line
@@ -504,13 +504,7 @@ static void amdgpu_gem_va_update_vm(struct amdgpu_device *adev, 
	list_for_each_entry(entry, list, head) {

		struct amdgpu_bo *bo =

			container_of(entry->bo, struct amdgpu_bo, tbo);



		/* if anything is swapped out don't swap it in here,

		   just abort and wait for the next CS */

		if (!amdgpu_bo_gpu_accessible(bo))

			goto error;



		if (bo->shadow && !amdgpu_bo_gpu_accessible(bo->shadow))

		if (amdgpu_gem_va_check(NULL, bo))

			goto error;

	}

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

+2 −1
Original line number Diff line number Diff line
@@ -1296,6 +1296,7 @@ void amdgpu_pm_compute_clocks(struct amdgpu_device *adev) 
	if (!adev->pm.dpm_enabled)

		return;



	if (adev->mode_info.num_crtc)

		amdgpu_display_bandwidth_update(adev);



	for (i = 0; i < AMDGPU_MAX_RINGS; i++) {

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

+6 −0
Original line number Diff line number Diff line
@@ -3737,9 +3737,15 @@ static void dce_v11_0_encoder_add(struct amdgpu_device *adev, 
	default:

		encoder->possible_crtcs = 0x3;

		break;

	case 3:

		encoder->possible_crtcs = 0x7;

		break;

	case 4:

		encoder->possible_crtcs = 0xf;

		break;

	case 5:

		encoder->possible_crtcs = 0x1f;

		break;

	case 6:

		encoder->possible_crtcs = 0x3f;

		break;