Commit a2272e48 authored by Rob Clark's avatar Rob Clark
Browse files

drm/msm: update generated headers 



Pull in additional regs needed for a430, etc.

Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent 61965d3d

drivers/gpu/drm/msm/adreno/a2xx.xml.h

+6 −5
Original line number Diff line number Diff line
@@ -9,16 +9,17 @@ git clone https://github.com/freedreno/envytools.git 


The rules-ng-ng source files this header was generated from are:

- /home/robclark/src/freedreno/envytools/rnndb/adreno.xml               (    398 bytes, from 2015-09-24 17:25:31)

- /home/robclark/src/freedreno/envytools/rnndb/freedreno_copyright.xml  (   1453 bytes, from 2015-05-20 20:03:07)

- /home/robclark/src/freedreno/envytools/rnndb/freedreno_copyright.xml  (   1572 bytes, from 2016-02-10 17:07:21)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/a2xx.xml          (  32901 bytes, from 2015-05-20 20:03:14)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_common.xml (  10755 bytes, from 2015-09-14 20:46:55)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_pm4.xml    (  14968 bytes, from 2015-05-20 20:12:27)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/a3xx.xml          (  67771 bytes, from 2015-09-14 20:46:55)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/a4xx.xml          (  63970 bytes, from 2015-09-14 20:50:12)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_common.xml (  11518 bytes, from 2016-02-10 21:03:25)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_pm4.xml    (  16166 bytes, from 2016-02-11 21:20:31)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/a3xx.xml          (  83967 bytes, from 2016-02-10 17:07:21)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/a4xx.xml          ( 109916 bytes, from 2016-02-20 18:44:48)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/ocmem.xml         (   1773 bytes, from 2015-09-24 17:30:00)



Copyright (C) 2013-2015 by the following authors:

- Rob Clark <robdclark@gmail.com> (robclark)

- Ilia Mirkin <imirkin@alum.mit.edu> (imirkin)



Permission is hereby granted, free of charge, to any person obtaining

a copy of this software and associated documentation files (the

drivers/gpu/drm/msm/adreno/a3xx.xml.h

+428 −65

File changed.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/msm/adreno/a4xx.xml.h

+1205 −62

File changed.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/msm/adreno/adreno_common.xml.h

+24 −6
Original line number Diff line number Diff line
@@ -9,16 +9,17 @@ git clone https://github.com/freedreno/envytools.git 


The rules-ng-ng source files this header was generated from are:

- /home/robclark/src/freedreno/envytools/rnndb/adreno.xml               (    398 bytes, from 2015-09-24 17:25:31)

- /home/robclark/src/freedreno/envytools/rnndb/freedreno_copyright.xml  (   1453 bytes, from 2015-05-20 20:03:07)

- /home/robclark/src/freedreno/envytools/rnndb/freedreno_copyright.xml  (   1572 bytes, from 2016-02-10 17:07:21)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/a2xx.xml          (  32901 bytes, from 2015-05-20 20:03:14)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_common.xml (  10755 bytes, from 2015-09-14 20:46:55)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_pm4.xml    (  14968 bytes, from 2015-05-20 20:12:27)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/a3xx.xml          (  67771 bytes, from 2015-09-14 20:46:55)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/a4xx.xml          (  63970 bytes, from 2015-09-14 20:50:12)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_common.xml (  11518 bytes, from 2016-02-10 21:03:25)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_pm4.xml    (  16166 bytes, from 2016-02-11 21:20:31)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/a3xx.xml          (  83967 bytes, from 2016-02-10 17:07:21)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/a4xx.xml          ( 109916 bytes, from 2016-02-20 18:44:48)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/ocmem.xml         (   1773 bytes, from 2015-09-24 17:30:00)



Copyright (C) 2013-2015 by the following authors:

Copyright (C) 2013-2016 by the following authors:

- Rob Clark <robdclark@gmail.com> (robclark)

- Ilia Mirkin <imirkin@alum.mit.edu> (imirkin)



Permission is hereby granted, free of charge, to any person obtaining

a copy of this software and associated documentation files (the
@@ -119,6 +120,23 @@ enum adreno_rb_copy_control_mode { 
	RB_COPY_DEPTH_STENCIL = 5,

};



enum a3xx_rop_code {

	ROP_CLEAR = 0,

	ROP_NOR = 1,

	ROP_AND_INVERTED = 2,

	ROP_COPY_INVERTED = 3,

	ROP_AND_REVERSE = 4,

	ROP_INVERT = 5,

	ROP_NAND = 7,

	ROP_AND = 8,

	ROP_EQUIV = 9,

	ROP_NOOP = 10,

	ROP_OR_INVERTED = 11,

	ROP_OR_REVERSE = 13,

	ROP_OR = 14,

	ROP_SET = 15,

};



enum a3xx_render_mode {

	RB_RENDERING_PASS = 0,

	RB_TILING_PASS = 1,

drivers/gpu/drm/msm/adreno/adreno_pm4.xml.h

+41 −7
Original line number Diff line number Diff line
@@ -9,16 +9,17 @@ git clone https://github.com/freedreno/envytools.git 


The rules-ng-ng source files this header was generated from are:

- /home/robclark/src/freedreno/envytools/rnndb/adreno.xml               (    398 bytes, from 2015-09-24 17:25:31)

- /home/robclark/src/freedreno/envytools/rnndb/freedreno_copyright.xml  (   1453 bytes, from 2015-05-20 20:03:07)

- /home/robclark/src/freedreno/envytools/rnndb/freedreno_copyright.xml  (   1572 bytes, from 2016-02-10 17:07:21)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/a2xx.xml          (  32901 bytes, from 2015-05-20 20:03:14)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_common.xml (  10755 bytes, from 2015-09-14 20:46:55)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_pm4.xml    (  14968 bytes, from 2015-05-20 20:12:27)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/a3xx.xml          (  67771 bytes, from 2015-09-14 20:46:55)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/a4xx.xml          (  63970 bytes, from 2015-09-14 20:50:12)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_common.xml (  11518 bytes, from 2016-02-10 21:03:25)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_pm4.xml    (  16166 bytes, from 2016-02-11 21:20:31)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/a3xx.xml          (  83967 bytes, from 2016-02-10 17:07:21)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/a4xx.xml          ( 109916 bytes, from 2016-02-20 18:44:48)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/ocmem.xml         (   1773 bytes, from 2015-09-24 17:30:00)



Copyright (C) 2013-2015 by the following authors:

Copyright (C) 2013-2016 by the following authors:

- Rob Clark <robdclark@gmail.com> (robclark)

- Ilia Mirkin <imirkin@alum.mit.edu> (imirkin)



Permission is hereby granted, free of charge, to any person obtaining

a copy of this software and associated documentation files (the
@@ -172,6 +173,11 @@ enum adreno_pm4_type3_packets { 
	CP_UNKNOWN_1A = 26,

	CP_UNKNOWN_4E = 78,

	CP_WIDE_REG_WRITE = 116,

	CP_SCRATCH_TO_REG = 77,

	CP_REG_TO_SCRATCH = 74,

	CP_WAIT_MEM_WRITES = 18,

	CP_COND_REG_EXEC = 71,

	CP_MEM_TO_REG = 66,

	IN_IB_PREFETCH_END = 23,

	IN_SUBBLK_PREFETCH = 31,

	IN_INSTR_PREFETCH = 32,
@@ -199,7 +205,11 @@ enum adreno_state_type { 


enum adreno_state_src {

	SS_DIRECT = 0,

	SS_INVALID_ALL_IC = 2,

	SS_INVALID_PART_IC = 3,

	SS_INDIRECT = 4,

	SS_INDIRECT_TCM = 5,

	SS_INDIRECT_STM = 6,

};



enum a4xx_index_size {
@@ -227,7 +237,7 @@ static inline uint32_t CP_LOAD_STATE_0_STATE_BLOCK(enum adreno_state_block val) 
{

	return ((val) << CP_LOAD_STATE_0_STATE_BLOCK__SHIFT) & CP_LOAD_STATE_0_STATE_BLOCK__MASK;

}

#define CP_LOAD_STATE_0_NUM_UNIT__MASK				0x7fc00000

#define CP_LOAD_STATE_0_NUM_UNIT__MASK				0xffc00000

#define CP_LOAD_STATE_0_NUM_UNIT__SHIFT				22

static inline uint32_t CP_LOAD_STATE_0_NUM_UNIT(uint32_t val)

{
@@ -499,5 +509,29 @@ static inline uint32_t CP_SET_BIN_DATA_1_BIN_SIZE_ADDRESS(uint32_t val) 
	return ((val) << CP_SET_BIN_DATA_1_BIN_SIZE_ADDRESS__SHIFT) & CP_SET_BIN_DATA_1_BIN_SIZE_ADDRESS__MASK;

}



#define REG_CP_REG_TO_MEM_0					0x00000000

#define CP_REG_TO_MEM_0_REG__MASK				0x0000ffff

#define CP_REG_TO_MEM_0_REG__SHIFT				0

static inline uint32_t CP_REG_TO_MEM_0_REG(uint32_t val)

{

	return ((val) << CP_REG_TO_MEM_0_REG__SHIFT) & CP_REG_TO_MEM_0_REG__MASK;

}

#define CP_REG_TO_MEM_0_CNT__MASK				0x3ff80000

#define CP_REG_TO_MEM_0_CNT__SHIFT				19

static inline uint32_t CP_REG_TO_MEM_0_CNT(uint32_t val)

{

	return ((val) << CP_REG_TO_MEM_0_CNT__SHIFT) & CP_REG_TO_MEM_0_CNT__MASK;

}

#define CP_REG_TO_MEM_0_64B					0x40000000

#define CP_REG_TO_MEM_0_ACCUMULATE				0x80000000



#define REG_CP_REG_TO_MEM_1					0x00000001

#define CP_REG_TO_MEM_1_DEST__MASK				0xffffffff

#define CP_REG_TO_MEM_1_DEST__SHIFT				0

static inline uint32_t CP_REG_TO_MEM_1_DEST(uint32_t val)

{

	return ((val) << CP_REG_TO_MEM_1_DEST__SHIFT) & CP_REG_TO_MEM_1_DEST__MASK;

}





#endif /* ADRENO_PM4_XML */