Commit 2094dd82 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/device: include the official chipset names 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 51a3d342

drivers/gpu/drm/nouveau/core/subdev/device/base.c

+2 −1
Original line number Diff line number Diff line
@@ -204,7 +204,8 @@ nouveau_devobj_ctor(struct nouveau_object *parent, 
		}



		nv_info(device, "BOOT0  : 0x%08x\n", boot0);

		nv_info(device, "Chipset: NV%02X\n", device->chipset);

		nv_info(device, "Chipset: %s (NV%02X)\n",

			device->cname, device->chipset);

		nv_info(device, "Family : NV%02X\n", device->card_type);



		/* determine frequency of timing crystal */

drivers/gpu/drm/nouveau/core/subdev/device/nv04.c

+2 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ nv04_identify(struct nouveau_device *device) 
{

	switch (device->chipset) {

	case 0x04:

		device->cname = "NV04";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nouveau_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;
@@ -60,6 +61,7 @@ nv04_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_DISP   ] = &nv04_disp_oclass;

		break;

	case 0x05:

		device->cname = "NV05";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nouveau_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

drivers/gpu/drm/nouveau/core/subdev/device/nv10.c

+8 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ nv10_identify(struct nouveau_device *device) 
{

	switch (device->chipset) {

	case 0x10:

		device->cname = "NV10";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nouveau_i2c_oclass;
@@ -60,6 +61,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_DISP   ] = &nv04_disp_oclass;

		break;

	case 0x15:

		device->cname = "NV15";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nouveau_i2c_oclass;
@@ -77,6 +79,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_DISP   ] = &nv04_disp_oclass;

		break;

	case 0x16:

		device->cname = "NV16";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nouveau_i2c_oclass;
@@ -94,6 +97,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_DISP   ] = &nv04_disp_oclass;

		break;

	case 0x1a:

		device->cname = "nForce";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nouveau_i2c_oclass;
@@ -111,6 +115,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_DISP   ] = &nv04_disp_oclass;

		break;

	case 0x11:

		device->cname = "NV11";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nouveau_i2c_oclass;
@@ -128,6 +133,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_DISP   ] = &nv04_disp_oclass;

		break;

	case 0x17:

		device->cname = "NV17";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nouveau_i2c_oclass;
@@ -145,6 +151,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_DISP   ] = &nv04_disp_oclass;

		break;

	case 0x1f:

		device->cname = "nForce2";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nouveau_i2c_oclass;
@@ -162,6 +169,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_DISP   ] = &nv04_disp_oclass;

		break;

	case 0x18:

		device->cname = "NV18";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nouveau_i2c_oclass;

drivers/gpu/drm/nouveau/core/subdev/device/nv20.c

+4 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ nv20_identify(struct nouveau_device *device) 
{

	switch (device->chipset) {

	case 0x20:

		device->cname = "NV20";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nouveau_i2c_oclass;
@@ -62,6 +63,7 @@ nv20_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_DISP   ] = &nv04_disp_oclass;

		break;

	case 0x25:

		device->cname = "NV25";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nouveau_i2c_oclass;
@@ -79,6 +81,7 @@ nv20_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_DISP   ] = &nv04_disp_oclass;

		break;

	case 0x28:

		device->cname = "NV28";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nouveau_i2c_oclass;
@@ -96,6 +99,7 @@ nv20_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_DISP   ] = &nv04_disp_oclass;

		break;

	case 0x2a:

		device->cname = "NV2A";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nouveau_i2c_oclass;

drivers/gpu/drm/nouveau/core/subdev/device/nv30.c

+5 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ nv30_identify(struct nouveau_device *device) 
{

	switch (device->chipset) {

	case 0x30:

		device->cname = "NV30";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nouveau_i2c_oclass;
@@ -63,6 +64,7 @@ nv30_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_DISP   ] = &nv04_disp_oclass;

		break;

	case 0x35:

		device->cname = "NV35";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nouveau_i2c_oclass;
@@ -80,6 +82,7 @@ nv30_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_DISP   ] = &nv04_disp_oclass;

		break;

	case 0x31:

		device->cname = "NV31";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nouveau_i2c_oclass;
@@ -98,6 +101,7 @@ nv30_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_DISP   ] = &nv04_disp_oclass;

		break;

	case 0x36:

		device->cname = "NV36";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nouveau_i2c_oclass;
@@ -116,6 +120,7 @@ nv30_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_DISP   ] = &nv04_disp_oclass;

		break;

	case 0x34:

		device->cname = "NV34";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nouveau_i2c_oclass;