amdgpu: add SI support
authorRonie Salgado <roniesalg@gmail.com>
Wed, 13 Apr 2016 19:56:15 +0000 (21:56 +0200)
committerMarek Olšák <marek.olsak@amd.com>
Mon, 5 Sep 2016 13:46:29 +0000 (15:46 +0200)
v2: without the amdgpu_drm.h change

Signed-off-by: Marek Olšák <marek.olsak@amd.com>
amdgpu/amdgpu_gpu_info.c

index 3eecd79..0f23297 100644 (file)
@@ -187,10 +187,12 @@ drm_private int amdgpu_query_gpu_info_init(amdgpu_device_handle dev)
                if (r)
                        return r;
 
-               r = amdgpu_read_mm_registers(dev, 0xa0d5, 1, instance, 0,
+               if (dev->info.family_id >= AMDGPU_FAMILY_CI) {
+                       r = amdgpu_read_mm_registers(dev, 0xa0d5, 1, instance, 0,
                                             &dev->info.pa_sc_raster_cfg1[i]);
-               if (r)
-                       return r;
+                       if (r)
+                               return r;
+               }
        }
 
        r = amdgpu_read_mm_registers(dev, 0x2644, 32, 0xffffffff, 0,
@@ -198,10 +200,12 @@ drm_private int amdgpu_query_gpu_info_init(amdgpu_device_handle dev)
        if (r)
                return r;
 
-       r = amdgpu_read_mm_registers(dev, 0x2664, 16, 0xffffffff, 0,
-                                    dev->info.gb_macro_tile_mode);
-       if (r)
-               return r;
+       if (dev->info.family_id >= AMDGPU_FAMILY_CI) {
+               r = amdgpu_read_mm_registers(dev, 0x2664, 16, 0xffffffff, 0,
+                                            dev->info.gb_macro_tile_mode);
+               if (r)
+                       return r;
+       }
 
        r = amdgpu_read_mm_registers(dev, 0x263e, 1, 0xffffffff, 0,
                                     &dev->info.gb_addr_cfg);