Commit a8f8b489 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nv50/disp: preparation for storing static class data 



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

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

+2 −2
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ nv04_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv04_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv04_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv04_graph_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] = &nv04_disp_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;

		break;

	case 0x05:

		device->cname = "NV05";
@@ -78,7 +78,7 @@ nv04_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv04_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv04_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv04_graph_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] = &nv04_disp_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;

		break;

	default:

		nv_fatal(device, "unknown RIVA chipset\n");

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

+8 −8
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_VM     ] = &nv04_vmmgr_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv04_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv10_graph_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] = &nv04_disp_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;

		break;

	case 0x15:

		device->cname = "NV15";
@@ -79,7 +79,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv10_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv10_graph_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] = &nv04_disp_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;

		break;

	case 0x16:

		device->cname = "NV16";
@@ -98,7 +98,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv10_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv10_graph_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] = &nv04_disp_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;

		break;

	case 0x1a:

		device->cname = "nForce";
@@ -117,7 +117,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv10_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv10_graph_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] = &nv04_disp_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;

		break;

	case 0x11:

		device->cname = "NV11";
@@ -136,7 +136,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv10_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv10_graph_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] = &nv04_disp_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;

		break;

	case 0x17:

		device->cname = "NV17";
@@ -155,7 +155,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv17_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv10_graph_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] = &nv04_disp_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;

		break;

	case 0x1f:

		device->cname = "nForce2";
@@ -174,7 +174,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv17_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv10_graph_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] = &nv04_disp_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;

		break;

	case 0x18:

		device->cname = "NV18";
@@ -193,7 +193,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv17_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv10_graph_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] = &nv04_disp_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;

		break;

	default:

		nv_fatal(device, "unknown Celsius chipset\n");

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

+4 −4
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ nv20_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv17_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv20_graph_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] = &nv04_disp_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;

		break;

	case 0x25:

		device->cname = "NV25";
@@ -82,7 +82,7 @@ nv20_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv17_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv25_graph_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] = &nv04_disp_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;

		break;

	case 0x28:

		device->cname = "NV28";
@@ -101,7 +101,7 @@ nv20_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv17_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv25_graph_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] = &nv04_disp_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;

		break;

	case 0x2a:

		device->cname = "NV2A";
@@ -120,7 +120,7 @@ nv20_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv17_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv2a_graph_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] = &nv04_disp_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;

		break;

	default:

		nv_fatal(device, "unknown Kelvin chipset\n");

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

+5 −5
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ nv30_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv17_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv30_graph_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] = &nv04_disp_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;

		break;

	case 0x35:

		device->cname = "NV35";
@@ -82,7 +82,7 @@ nv30_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv17_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv35_graph_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] = &nv04_disp_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;

		break;

	case 0x31:

		device->cname = "NV31";
@@ -102,7 +102,7 @@ nv30_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv30_graph_oclass;

		device->oclass[NVDEV_ENGINE_MPEG   ] = &nv31_mpeg_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] = &nv04_disp_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;

		break;

	case 0x36:

		device->cname = "NV36";
@@ -122,7 +122,7 @@ nv30_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv35_graph_oclass;

		device->oclass[NVDEV_ENGINE_MPEG   ] = &nv31_mpeg_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] = &nv04_disp_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;

		break;

	case 0x34:

		device->cname = "NV34";
@@ -142,7 +142,7 @@ nv30_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv34_graph_oclass;

		device->oclass[NVDEV_ENGINE_MPEG   ] = &nv31_mpeg_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] = &nv04_disp_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;

		break;

	default:

		nv_fatal(device, "unknown Rankine chipset\n");

drivers/gpu/drm/nouveau/core/engine/device/nv40.c

+16 −16
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv40_graph_oclass;

		device->oclass[NVDEV_ENGINE_MPEG   ] = &nv40_mpeg_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] = &nv04_disp_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;

		device->oclass[NVDEV_ENGINE_PERFMON] =  nv40_perfmon_oclass;

		break;

	case 0x41:
@@ -93,7 +93,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv40_graph_oclass;

		device->oclass[NVDEV_ENGINE_MPEG   ] = &nv40_mpeg_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] = &nv04_disp_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;

		device->oclass[NVDEV_ENGINE_PERFMON] =  nv40_perfmon_oclass;

		break;

	case 0x42:
@@ -116,7 +116,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv40_graph_oclass;

		device->oclass[NVDEV_ENGINE_MPEG   ] = &nv40_mpeg_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] = &nv04_disp_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;

		device->oclass[NVDEV_ENGINE_PERFMON] =  nv40_perfmon_oclass;

		break;

	case 0x43:
@@ -139,7 +139,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv40_graph_oclass;

		device->oclass[NVDEV_ENGINE_MPEG   ] = &nv40_mpeg_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] = &nv04_disp_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;

		device->oclass[NVDEV_ENGINE_PERFMON] =  nv40_perfmon_oclass;

		break;

	case 0x45:
@@ -162,7 +162,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv40_graph_oclass;

		device->oclass[NVDEV_ENGINE_MPEG   ] = &nv44_mpeg_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] = &nv04_disp_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;

		device->oclass[NVDEV_ENGINE_PERFMON] =  nv40_perfmon_oclass;

		break;

	case 0x47:
@@ -185,7 +185,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv40_graph_oclass;

		device->oclass[NVDEV_ENGINE_MPEG   ] = &nv44_mpeg_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] = &nv04_disp_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;

		device->oclass[NVDEV_ENGINE_PERFMON] =  nv40_perfmon_oclass;

		break;

	case 0x49:
@@ -208,7 +208,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv40_graph_oclass;

		device->oclass[NVDEV_ENGINE_MPEG   ] = &nv44_mpeg_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] = &nv04_disp_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;

		device->oclass[NVDEV_ENGINE_PERFMON] =  nv40_perfmon_oclass;

		break;

	case 0x4b:
@@ -231,7 +231,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv40_graph_oclass;

		device->oclass[NVDEV_ENGINE_MPEG   ] = &nv44_mpeg_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] = &nv04_disp_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;

		device->oclass[NVDEV_ENGINE_PERFMON] =  nv40_perfmon_oclass;

		break;

	case 0x44:
@@ -254,7 +254,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv40_graph_oclass;

		device->oclass[NVDEV_ENGINE_MPEG   ] = &nv44_mpeg_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] = &nv04_disp_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;

		device->oclass[NVDEV_ENGINE_PERFMON] =  nv40_perfmon_oclass;

		break;

	case 0x46:
@@ -277,7 +277,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv40_graph_oclass;

		device->oclass[NVDEV_ENGINE_MPEG   ] = &nv44_mpeg_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] = &nv04_disp_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;

		device->oclass[NVDEV_ENGINE_PERFMON] =  nv40_perfmon_oclass;

		break;

	case 0x4a:
@@ -300,7 +300,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv40_graph_oclass;

		device->oclass[NVDEV_ENGINE_MPEG   ] = &nv44_mpeg_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] = &nv04_disp_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;

		device->oclass[NVDEV_ENGINE_PERFMON] =  nv40_perfmon_oclass;

		break;

	case 0x4c:
@@ -323,7 +323,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv40_graph_oclass;

		device->oclass[NVDEV_ENGINE_MPEG   ] = &nv44_mpeg_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] = &nv04_disp_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;

		device->oclass[NVDEV_ENGINE_PERFMON] =  nv40_perfmon_oclass;

		break;

	case 0x4e:
@@ -346,7 +346,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv40_graph_oclass;

		device->oclass[NVDEV_ENGINE_MPEG   ] = &nv44_mpeg_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] = &nv04_disp_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;

		device->oclass[NVDEV_ENGINE_PERFMON] =  nv40_perfmon_oclass;

		break;

	case 0x63:
@@ -369,7 +369,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv40_graph_oclass;

		device->oclass[NVDEV_ENGINE_MPEG   ] = &nv44_mpeg_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] = &nv04_disp_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;

		device->oclass[NVDEV_ENGINE_PERFMON] =  nv40_perfmon_oclass;

		break;

	case 0x67:
@@ -392,7 +392,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv40_graph_oclass;

		device->oclass[NVDEV_ENGINE_MPEG   ] = &nv44_mpeg_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] = &nv04_disp_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;

		device->oclass[NVDEV_ENGINE_PERFMON] =  nv40_perfmon_oclass;

		break;

	case 0x68:
@@ -415,7 +415,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv40_graph_oclass;

		device->oclass[NVDEV_ENGINE_MPEG   ] = &nv44_mpeg_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] = &nv04_disp_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;

		device->oclass[NVDEV_ENGINE_PERFMON] =  nv40_perfmon_oclass;

		break;

	default: