Browse Source

drm/radeon: add UVD support for OLAND

It seems this got dropped when we merged UVD support
last year.  Add this back now.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Alex Deucher 11 years ago
parent
commit
5d029339bb
2 changed files with 2 additions and 0 deletions
  1. 1 0
      drivers/gpu/drm/radeon/radeon_uvd.c
  2. 1 0
      drivers/gpu/drm/radeon/uvd_v2_2.c

+ 1 - 0
drivers/gpu/drm/radeon/radeon_uvd.c

@@ -91,6 +91,7 @@ int radeon_uvd_init(struct radeon_device *rdev)
 	case CHIP_VERDE:
 	case CHIP_VERDE:
 	case CHIP_PITCAIRN:
 	case CHIP_PITCAIRN:
 	case CHIP_ARUBA:
 	case CHIP_ARUBA:
+	case CHIP_OLAND:
 		fw_name = FIRMWARE_TAHITI;
 		fw_name = FIRMWARE_TAHITI;
 		break;
 		break;
 
 

+ 1 - 0
drivers/gpu/drm/radeon/uvd_v2_2.c

@@ -153,6 +153,7 @@ int uvd_v2_2_resume(struct radeon_device *rdev)
 		chip_id = 0x01000015;
 		chip_id = 0x01000015;
 		break;
 		break;
 	case CHIP_PITCAIRN:
 	case CHIP_PITCAIRN:
+	case CHIP_OLAND:
 		chip_id = 0x01000016;
 		chip_id = 0x01000016;
 		break;
 		break;
 	case CHIP_ARUBA:
 	case CHIP_ARUBA: