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

Commit 26eacb78 authored by Dave Airlie's avatar Dave Airlie
Browse files

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



Fixes for 4.20:
- Stability fixes for new polaris variants (e.g., RX590)
- New vega pci ids
- Vega20 smu fix
- Ctx locking fix

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181212203022.3054-1-alexander.deucher@amd.com
parents e59166b5 676fff1a

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

+30 −6
Original line number Diff line number Diff line
@@ -330,7 +330,9 @@ 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)) ||

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

				    ((adev->pdev->device == 0x6900) && (adev->pdev->revision == 0xD3))) {

					info->is_kicker = true;

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

				} else
@@ -351,7 +353,6 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device, 
				if (type == CGS_UCODE_ID_SMU) {

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

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

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

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

					    ((adev->pdev->device == 0x67ff) &&

					     ((adev->pdev->revision == 0xcf) ||
@@ -359,8 +360,13 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device, 
					      (adev->pdev->revision == 0xff)))) {

						info->is_kicker = true;

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

					} else

					} else if ((adev->pdev->device == 0x67ef) &&

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

						info->is_kicker = true;

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

					} else {

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

					}

				} else if (type == CGS_UCODE_ID_SMU_SK) {

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

				}
@@ -375,17 +381,35 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device, 
					      (adev->pdev->revision == 0xe7) ||

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

					    ((adev->pdev->device == 0x6fdf) &&

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

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

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

						info->is_kicker = true;

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

					} else

					} else if ((adev->pdev->device == 0x67df) &&

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

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

						info->is_kicker = true;

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

					} else {

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

					}

				} else if (type == CGS_UCODE_ID_SMU_SK) {

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

				}

				break;

			case CHIP_POLARIS12:

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

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

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

				    ((adev->pdev->device == 0x6981) &&

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

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

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

					info->is_kicker = true;

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

				} else {

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

				}

				break;

			case CHIP_VEGAM:

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

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

+2 −2
Original line number Diff line number Diff line
@@ -124,14 +124,14 @@ static int amdgpu_cs_parser_init(struct amdgpu_cs_parser *p, union drm_amdgpu_cs 
		goto free_chunk;

	}



	mutex_lock(&p->ctx->lock);



	/* skip guilty context job */

	if (atomic_read(&p->ctx->guilty) == 1) {

		ret = -ECANCELED;

		goto free_chunk;

	}



	mutex_lock(&p->ctx->lock);



	/* get chunks */

	chunk_array_user = u64_to_user_ptr(cs->in.chunks);

	if (copy_from_user(chunk_array, chunk_array_user,

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

+7 −0
Original line number Diff line number Diff line
@@ -872,7 +872,13 @@ static const struct pci_device_id pciidlist[] = { 
	{0x1002, 0x6864, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA10},

	{0x1002, 0x6867, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA10},

	{0x1002, 0x6868, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA10},

	{0x1002, 0x6869, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA10},

	{0x1002, 0x686a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA10},

	{0x1002, 0x686b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA10},

	{0x1002, 0x686c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA10},

	{0x1002, 0x686d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA10},

	{0x1002, 0x686e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA10},

	{0x1002, 0x686f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA10},

	{0x1002, 0x687f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA10},

	/* Vega 12 */

	{0x1002, 0x69A0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA12},
@@ -885,6 +891,7 @@ static const struct pci_device_id pciidlist[] = { 
	{0x1002, 0x66A1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA20},

	{0x1002, 0x66A2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA20},

	{0x1002, 0x66A3, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA20},

	{0x1002, 0x66A4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA20},

	{0x1002, 0x66A7, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA20},

	{0x1002, 0x66AF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA20},

	/* Raven */

drivers/gpu/drm/amd/amdkfd/kfd_device.c

+7 −0
Original line number Diff line number Diff line
@@ -337,12 +337,19 @@ static const struct kfd_deviceid supported_devices[] = { 
	{ 0x6864, &vega10_device_info },	/* Vega10 */

	{ 0x6867, &vega10_device_info },	/* Vega10 */

	{ 0x6868, &vega10_device_info },	/* Vega10 */

	{ 0x6869, &vega10_device_info },	/* Vega10 */

	{ 0x686A, &vega10_device_info },	/* Vega10 */

	{ 0x686B, &vega10_device_info },	/* Vega10 */

	{ 0x686C, &vega10_vf_device_info },	/* Vega10  vf*/

	{ 0x686D, &vega10_device_info },	/* Vega10 */

	{ 0x686E, &vega10_device_info },	/* Vega10 */

	{ 0x686F, &vega10_device_info },	/* Vega10 */

	{ 0x687F, &vega10_device_info },	/* Vega10 */

	{ 0x66a0, &vega20_device_info },	/* Vega20 */

	{ 0x66a1, &vega20_device_info },	/* Vega20 */

	{ 0x66a2, &vega20_device_info },	/* Vega20 */

	{ 0x66a3, &vega20_device_info },	/* Vega20 */

	{ 0x66a4, &vega20_device_info },	/* Vega20 */

	{ 0x66a7, &vega20_device_info },	/* Vega20 */

	{ 0x66af, &vega20_device_info }		/* Vega20 */

};

drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ static void vega20_set_default_registry_data(struct pp_hwmgr *hwmgr) 
	data->registry_data.disable_auto_wattman = 1;

	data->registry_data.auto_wattman_debug = 0;

	data->registry_data.auto_wattman_sample_period = 100;

	data->registry_data.fclk_gfxclk_ratio = 0x3F6CCCCD;

	data->registry_data.fclk_gfxclk_ratio = 0;

	data->registry_data.auto_wattman_threshold = 50;

	data->registry_data.gfxoff_controlled_by_driver = 1;

	data->gfxoff_allowed = false;