Skip to contentSkip to conversation

amdgpu: add SI support

PATCH In review Marek Olšák 1 participant 3 messages Aug 19, 2016 1 message not in the archive DRM drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 amdgpu: add SI support

From: Ronie Salgado <[email protected]>

---
 amdgpu/amdgpu_gpu_info.c | 18 +++++++++++-------
 include/drm/amdgpu_drm.h |  1 +
 2 files changed, 12 insertions(+), 7 deletions(-)
amdgpu/amdgpu_gpu_info.c +11 -7
index 0cc17f1..5c1644b 100644
@@ -180,35 +180,39 @@ drm_private int amdgpu_query_gpu_info_init(amdgpu_device_handle dev)
 			return r;
 		/* extract bitfield CC_RB_BACKEND_DISABLE.BACKEND_DISABLE */
 		dev->info.backend_disable[i] =
 			(dev->info.backend_disable[i] >> 16) & 0xff;
 
 		r = amdgpu_read_mm_registers(dev, 0xa0d4, 1, instance, 0,
 					     &dev->info.pa_sc_raster_cfg[i]);
 		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,
 				     dev->info.gb_tile_mode);
 	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);
 	if (r)
 		return r;
 
 	r = amdgpu_read_mm_registers(dev, 0x9d8, 1, 0xffffffff, 0,
 				     &dev->info.mc_arb_ramcfg);
 	if (r)
 		return r;
include/drm/amdgpu_drm.h +1 -0
index fbdd118..62e8682 100644
@@ -630,16 +630,17 @@ struct drm_amdgpu_info_hw_ip {
 	uint32_t  ib_size_alignment;
 	/** Bitmask of available rings. Bit 0 means ring 0, etc. */
 	uint32_t  available_rings;
 	uint32_t  _pad;
 };
 
 /*
  * Supported GPU families
  */
 #define AMDGPU_FAMILY_UNKNOWN			0
+#define AMDGPU_FAMILY_SI			100 /* Tahiti, Pitcairn, CapeVerde, Oland, Hainan */
 #define AMDGPU_FAMILY_CI			120 /* Bonaire, Hawaii */
 #define AMDGPU_FAMILY_KV			125 /* Kaveri, Kabini, Mullins */
 #define AMDGPU_FAMILY_VI			130 /* Iceland, Tonga */
 #define AMDGPU_FAMILY_CZ			135 /* Carrizo */
 
 #endif
Signature · 6 lines
2.7.4

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 1471597445-4868-1-git-send-email-maraeo-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org

#2 lore raw

PATCH 2/2 amdgpu: fix valgrind warnings caused by amdgpu_query_firmware_version

From: Marek Olšák <[email protected]>

---
 amdgpu/amdgpu_gpu_info.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
amdgpu/amdgpu_gpu_info.c +1 -1
index 5c1644b..0f23297 100644
@@ -112,21 +112,21 @@ int amdgpu_query_hw_ip_info(amdgpu_device_handle dev, unsigned type,
 
 	return drmCommandWrite(dev->fd, DRM_AMDGPU_INFO, &request,
 			       sizeof(struct drm_amdgpu_info));
 }
 
 int amdgpu_query_firmware_version(amdgpu_device_handle dev, unsigned fw_type,
 				  unsigned ip_instance, unsigned index,
 				  uint32_t *version, uint32_t *feature)
 {
 	struct drm_amdgpu_info request;
-	struct drm_amdgpu_info_firmware firmware;
+	struct drm_amdgpu_info_firmware firmware = {};
 	int r;
 
 	memset(&request, 0, sizeof(request));
 	request.return_pointer = (uintptr_t)&firmware;
 	request.return_size = sizeof(firmware);
 	request.query = AMDGPU_INFO_FW_VERSION;
 	request.query_fw.fw_type = fw_type;
 	request.query_fw.ip_instance = ip_instance;
 	request.query_fw.index = index;
 
Signature · 6 lines
2.7.4

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#3 lore raw
In reply to a message not in the archive
Quoted 64 lines · Marek Olšák

From: Ronie Salgado <[email protected]>

---
 amdgpu/amdgpu_gpu_info.c | 18 +++++++++++-------
 include/drm/amdgpu_drm.h |  1 +
 2 files changed, 12 insertions(+), 7 deletions(-)
amdgpu/amdgpu_gpu_info.c +11 -7
index 0cc17f1..5c1644b 100644
@@ -180,35 +180,39 @@ drm_private int amdgpu_query_gpu_info_init(amdgpu_device_handle dev)
                        return r;
                /* extract bitfield CC_RB_BACKEND_DISABLE.BACKEND_DISABLE */
                dev->info.backend_disable[i] =
                        (dev->info.backend_disable[i] >> 16) & 0xff;
 
                r = amdgpu_read_mm_registers(dev, 0xa0d4, 1, instance, 0,
                                             &dev->info.pa_sc_raster_cfg[i]);
                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,
                                     dev->info.gb_tile_mode);
        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);
        if (r)
                return r;
 
        r = amdgpu_read_mm_registers(dev, 0x9d8, 1, 0xffffffff, 0,
                                     &dev->info.mc_arb_ramcfg);
        if (r)
                return r;
include/drm/amdgpu_drm.h +0 -0
index fbdd118..62e8682 100644
@@ -630,16 +630,17 @@ struct drm_amdgpu_info_hw_ip {
        uint32_t  ib_size_alignment;

include/drm/amdgpu_drm.h struct drm_amdgpu_info_hw_ip { · line 640

Quoted 10 lines
include/drm/amdgpu_drm.h +1 -0
        /** Bitmask of available rings. Bit 0 means ring 0, etc. */
        uint32_t  available_rings;
        uint32_t  _pad;
 };
 
 /*
  * Supported GPU families
  */
 #define AMDGPU_FAMILY_UNKNOWN                  0
+#define AMDGPU_FAMILY_SI                       100 /* Tahiti, Pitcairn, CapeVerde, Oland, Hainan */

This should be 110 according to the kernel. Consider it fixed.

Marek
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx