Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b5331d9 authored by Jerome Glisse's avatar Jerome Glisse Committed by Dave Airlie
Browse files

drm/radeon/kms: print GPU family and device id when loading 



This will help figuring out GPU when looking at bugs log.

Signed-off-by: default avatarJerome Glisse <jglisse@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent b73c5f8b

drivers/gpu/drm/radeon/radeon_device.c

+52 −1
Original line number Diff line number Diff line
@@ -35,6 +35,54 @@ 
#include "radeon.h"

#include "atom.h"



static const char radeon_family_name[][16] = {

	"R100",

	"RV100",

	"RS100",

	"RV200",

	"RS200",

	"R200",

	"RV250",

	"RS300",

	"RV280",

	"R300",

	"R350",

	"RV350",

	"RV380",

	"R420",

	"R423",

	"RV410",

	"RS400",

	"RS480",

	"RS600",

	"RS690",

	"RS740",

	"RV515",

	"R520",

	"RV530",

	"RV560",

	"RV570",

	"R580",

	"R600",

	"RV610",

	"RV630",

	"RV670",

	"RV620",

	"RV635",

	"RS780",

	"RS880",

	"RV770",

	"RV730",

	"RV710",

	"RV740",

	"CEDAR",

	"REDWOOD",

	"JUNIPER",

	"CYPRESS",

	"HEMLOCK",

	"LAST",

};



/*

 * Clear GPU surface registers.

 */
@@ -525,7 +573,6 @@ int radeon_device_init(struct radeon_device *rdev, 
	int r;

	int dma_bits;



	DRM_INFO("radeon: Initializing kernel modesetting.\n");

	rdev->shutdown = false;

	rdev->dev = &pdev->dev;

	rdev->ddev = ddev;
@@ -537,6 +584,10 @@ int radeon_device_init(struct radeon_device *rdev, 
	rdev->mc.gtt_size = radeon_gart_size * 1024 * 1024;

	rdev->gpu_lockup = false;

	rdev->accel_working = false;



	DRM_INFO("initializing kernel modesetting (%s 0x%04X:0x%04X).\n",

		radeon_family_name[rdev->family], pdev->vendor, pdev->device);



	/* mutex initialization are all done here so we

	 * can recall function without having locking issues */

	mutex_init(&rdev->cs_mutex);

drivers/gpu/drm/radeon/radeon_family.h

+2 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
 * Radeon chip families

 */

enum radeon_family {

	CHIP_R100,

	CHIP_R100 = 0,

	CHIP_RV100,

	CHIP_RS100,

	CHIP_RV200,
@@ -99,4 +99,5 @@ enum radeon_chip_flags { 
	RADEON_IS_PCI = 0x00800000UL,

	RADEON_IS_IGPGART = 0x01000000UL,

};



#endif