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

[karo-tx-linux.git] / drivers / gpu / drm / radeon / radeon_display.c

diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
index 358bd96c06c58907b7465b54191221a57ff72b45..b055bddaa94c3d85e4b497721b8d239082c035a4 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_display.c
+++ b/drivers/gpu/drm/radeon/radeon_display.c
@@ -1255,41 +1255,41 @@ static void radeon_afmt_init(struct radeon_device *rdev)
        for (i = 0; i < RADEON_MAX_AFMT_BLOCKS; i++)
                rdev->mode_info.afmt[i] = NULL;
 
-       if (ASIC_IS_DCE6(rdev)) {
-               /* todo */
+       if (ASIC_IS_NODCE(rdev)) {
+               /* nothing to do */
        } else if (ASIC_IS_DCE4(rdev)) {
+               static uint32_t eg_offsets[] = {
+                       EVERGREEN_CRTC0_REGISTER_OFFSET,
+                       EVERGREEN_CRTC1_REGISTER_OFFSET,
+                       EVERGREEN_CRTC2_REGISTER_OFFSET,
+                       EVERGREEN_CRTC3_REGISTER_OFFSET,
+                       EVERGREEN_CRTC4_REGISTER_OFFSET,
+                       EVERGREEN_CRTC5_REGISTER_OFFSET,
+                       0x13830 - 0x7030,
+               };
+               int num_afmt;
+
+               /* DCE8 has 7 audio blocks tied to DIG encoders */
+               /* DCE6 has 6 audio blocks tied to DIG encoders */
                /* DCE4/5 has 6 audio blocks tied to DIG encoders */
                /* DCE4.1 has 2 audio blocks tied to DIG encoders */
-               rdev->mode_info.afmt[0] = kzalloc(sizeof(struct radeon_afmt), GFP_KERNEL);
-               if (rdev->mode_info.afmt[0]) {
-                       rdev->mode_info.afmt[0]->offset = EVERGREEN_CRTC0_REGISTER_OFFSET;
-                       rdev->mode_info.afmt[0]->id = 0;
-               }
-               rdev->mode_info.afmt[1] = kzalloc(sizeof(struct radeon_afmt), GFP_KERNEL);
-               if (rdev->mode_info.afmt[1]) {
-                       rdev->mode_info.afmt[1]->offset = EVERGREEN_CRTC1_REGISTER_OFFSET;
-                       rdev->mode_info.afmt[1]->id = 1;
-               }
-               if (!ASIC_IS_DCE41(rdev)) {
-                       rdev->mode_info.afmt[2] = kzalloc(sizeof(struct radeon_afmt), GFP_KERNEL);
-                       if (rdev->mode_info.afmt[2]) {
-                               rdev->mode_info.afmt[2]->offset = EVERGREEN_CRTC2_REGISTER_OFFSET;
-                               rdev->mode_info.afmt[2]->id = 2;
-                       }
-                       rdev->mode_info.afmt[3] = kzalloc(sizeof(struct radeon_afmt), GFP_KERNEL);
-                       if (rdev->mode_info.afmt[3]) {
-                               rdev->mode_info.afmt[3]->offset = EVERGREEN_CRTC3_REGISTER_OFFSET;
-                               rdev->mode_info.afmt[3]->id = 3;
-                       }
-                       rdev->mode_info.afmt[4] = kzalloc(sizeof(struct radeon_afmt), GFP_KERNEL);
-                       if (rdev->mode_info.afmt[4]) {
-                               rdev->mode_info.afmt[4]->offset = EVERGREEN_CRTC4_REGISTER_OFFSET;
-                               rdev->mode_info.afmt[4]->id = 4;
-                       }
-                       rdev->mode_info.afmt[5] = kzalloc(sizeof(struct radeon_afmt), GFP_KERNEL);
-                       if (rdev->mode_info.afmt[5]) {
-                               rdev->mode_info.afmt[5]->offset = EVERGREEN_CRTC5_REGISTER_OFFSET;
-                               rdev->mode_info.afmt[5]->id = 5;
+               if (ASIC_IS_DCE8(rdev))
+                       num_afmt = 7;
+               else if (ASIC_IS_DCE6(rdev))
+                       num_afmt = 6;
+               else if (ASIC_IS_DCE5(rdev))
+                       num_afmt = 6;
+               else if (ASIC_IS_DCE41(rdev))
+                       num_afmt = 2;
+               else /* DCE4 */
+                       num_afmt = 6;
+
+               BUG_ON(num_afmt > ARRAY_SIZE(eg_offsets));
+               for (i = 0; i < num_afmt; i++) {
+                       rdev->mode_info.afmt[i] = kzalloc(sizeof(struct radeon_afmt), GFP_KERNEL);
+                       if (rdev->mode_info.afmt[i]) {
+                               rdev->mode_info.afmt[i]->offset = eg_offsets[i];
+                               rdev->mode_info.afmt[i]->id = i;
                        }
                }
        } else if (ASIC_IS_DCE3(rdev)) {