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

Commit e6626254 authored by Marcin Slusarz's avatar Marcin Slusarz Committed by Ben Skeggs
Browse files

drm/nouveau: constify instances of nouveau_bitfield and nouveau_enum structs 



Signed-off-by: default avatarMarcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent c97f8c92

drivers/gpu/drm/nouveau/core/engine/copy/nva3.c

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ nva3_copy_cclass = { 
 * PCOPY engine/subdev functions

 ******************************************************************************/



static struct nouveau_enum nva3_copy_isr_error_name[] = {

static const struct nouveau_enum nva3_copy_isr_error_name[] = {

	{ 0x0001, "ILLEGAL_MTHD" },

	{ 0x0002, "INVALID_ENUM" },

	{ 0x0003, "INVALID_BITFIELD" },

drivers/gpu/drm/nouveau/core/engine/copy/nvc0.c

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ nvc0_copy1_cclass = { 
 * PCOPY engine/subdev functions

 ******************************************************************************/



static struct nouveau_enum nvc0_copy_isr_error_name[] = {

static const struct nouveau_enum nvc0_copy_isr_error_name[] = {

	{ 0x0001, "ILLEGAL_MTHD" },

	{ 0x0002, "INVALID_ENUM" },

	{ 0x0003, "INVALID_BITFIELD" },

drivers/gpu/drm/nouveau/core/engine/crypt/nv84.c

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ nv84_crypt_cclass = { 
 * PCRYPT engine/subdev functions

 ******************************************************************************/



static struct nouveau_bitfield nv84_crypt_intr_mask[] = {

static const struct nouveau_bitfield nv84_crypt_intr_mask[] = {

	{ 0x00000001, "INVALID_STATE" },

	{ 0x00000002, "ILLEGAL_MTHD" },

	{ 0x00000004, "ILLEGAL_CLASS" },

drivers/gpu/drm/nouveau/core/engine/crypt/nv98.c

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ nv98_crypt_cclass = { 
 * PCRYPT engine/subdev functions

 ******************************************************************************/



static struct nouveau_enum nv98_crypt_isr_error_name[] = {

static const struct nouveau_enum nv98_crypt_isr_error_name[] = {

	{ 0x0000, "ILLEGAL_MTHD" },

	{ 0x0001, "INVALID_BITFIELD" },

	{ 0x0002, "INVALID_ENUM" },

drivers/gpu/drm/nouveau/core/engine/fifo/nvc0.c

+5 −5
Original line number Diff line number Diff line
@@ -324,7 +324,7 @@ nvc0_fifo_cclass = { 
 * PFIFO engine

 ******************************************************************************/



struct nouveau_enum nvc0_fifo_fault_unit[] = {

static const struct nouveau_enum nvc0_fifo_fault_unit[] = {

	{ 0x00, "PGRAPH" },

	{ 0x03, "PEEPHOLE" },

	{ 0x04, "BAR1" },
@@ -340,7 +340,7 @@ struct nouveau_enum nvc0_fifo_fault_unit[] = { 
	{}

};



struct nouveau_enum nvc0_fifo_fault_reason[] = {

static const struct nouveau_enum nvc0_fifo_fault_reason[] = {

	{ 0x00, "PT_NOT_PRESENT" },

	{ 0x01, "PT_TOO_SHORT" },

	{ 0x02, "PAGE_NOT_PRESENT" },
@@ -353,7 +353,7 @@ struct nouveau_enum nvc0_fifo_fault_reason[] = { 
	{}

};



struct nouveau_enum nvc0_fifo_fault_hubclient[] = {

static const struct nouveau_enum nvc0_fifo_fault_hubclient[] = {

	{ 0x01, "PCOPY0" },

	{ 0x02, "PCOPY1" },

	{ 0x04, "DISPATCH" },
@@ -371,7 +371,7 @@ struct nouveau_enum nvc0_fifo_fault_hubclient[] = { 
	{}

};



struct nouveau_enum nvc0_fifo_fault_gpcclient[] = {

static const struct nouveau_enum nvc0_fifo_fault_gpcclient[] = {

	{ 0x01, "TEX" },

	{ 0x0c, "ESETUP" },

	{ 0x0e, "CTXCTL" },
@@ -379,7 +379,7 @@ struct nouveau_enum nvc0_fifo_fault_gpcclient[] = { 
	{}

};



struct nouveau_bitfield nvc0_fifo_subfifo_intr[] = {

static const struct nouveau_bitfield nvc0_fifo_subfifo_intr[] = {

/*	{ 0x00008000, "" }	seen with null ib push */

	{ 0x00200000, "ILLEGAL_MTHD" },

	{ 0x00800000, "EMPTY_SUBC" },