Commit d430f7db authored by Alex Deucher's avatar Alex Deucher Committed by Dave Airlie
Browse files

drm/radeon/kms: add new Trinity PCI ids 



Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent bb409155

drivers/gpu/drm/radeon/ni.c

+17 −4
Original line number Diff line number Diff line
@@ -460,15 +460,28 @@ static void cayman_gpu_init(struct radeon_device *rdev) 
		rdev->config.cayman.max_pipes_per_simd = 4;

		rdev->config.cayman.max_tile_pipes = 2;

		if ((rdev->pdev->device == 0x9900) ||

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

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

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

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

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

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

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

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

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

			rdev->config.cayman.max_simds_per_se = 6;

			rdev->config.cayman.max_backends_per_se = 2;

		} else if ((rdev->pdev->device == 0x9903) ||

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

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

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

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

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

			rdev->config.cayman.max_simds_per_se = 4;

			rdev->config.cayman.max_backends_per_se = 2;

		} else if ((rdev->pdev->device == 0x9990) ||

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

		} else if ((rdev->pdev->device == 0x9919) ||

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

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

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

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

			rdev->config.cayman.max_simds_per_se = 3;

			rdev->config.cayman.max_backends_per_se = 1;

		} else {

include/drm/drm_pciids.h

+8 −0
Original line number Diff line number Diff line
@@ -561,11 +561,19 @@ 
	{0x1002, 0x9909, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \

	{0x1002, 0x990A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \

	{0x1002, 0x990F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \

	{0x1002, 0x9910, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \

	{0x1002, 0x9913, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \

	{0x1002, 0x9917, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \

	{0x1002, 0x9918, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \

	{0x1002, 0x9919, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \

	{0x1002, 0x9990, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \

	{0x1002, 0x9991, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \

	{0x1002, 0x9992, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \

	{0x1002, 0x9993, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \

	{0x1002, 0x9994, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \

	{0x1002, 0x99A0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \

	{0x1002, 0x99A2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \

	{0x1002, 0x99A4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \

	{0, 0, 0}



#define r128_PCI_IDS \