Commit 022ff62c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-next-2018-08-17-1' of git://anongit.freedesktop.org/drm/drm 

Pull drm msm support for adreno a6xx from Dave Airlie:
 "This is the support for new Qualcomm Snapdragon SoCs with the A6xx
  core. Userspace support is in mesa now"

* tag 'drm-next-2018-08-17-1' of git://anongit.freedesktop.org/drm/drm:
  drm/msm: a6xx: fix spelling mistake: "initalization" -> "initialization"
  drm/msm: Add A6XX device support
  drm/msm: update generated headers
  drm/msm/adreno: Load the firmware before bringing up the hardware
  drm/msm: Add a helper function to parse clock names
parents f80a71b0 3d63a3c1

drivers/gpu/drm/msm/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -11,6 +11,9 @@ msm-y := \ 
	adreno/a5xx_gpu.o \

	adreno/a5xx_power.o \

	adreno/a5xx_preempt.o \

	adreno/a6xx_gpu.o \

	adreno/a6xx_gmu.o \

	adreno/a6xx_hfi.o \

	hdmi/hdmi.o \

	hdmi/hdmi_audio.o \

	hdmi/hdmi_bridge.o \

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

+26 −31
Original line number Diff line number Diff line
@@ -8,17 +8,19 @@ http://github.com/freedreno/envytools/ 
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               (    431 bytes, from 2017-05-17 13:21:27)

- /home/robclark/src/freedreno/envytools/rnndb/freedreno_copyright.xml  (   1572 bytes, from 2017-05-17 13:21:27)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/a2xx.xml          (  37162 bytes, from 2017-05-17 13:21:27)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_common.xml (  13324 bytes, from 2017-05-17 13:21:27)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_pm4.xml    (  31866 bytes, from 2017-06-06 18:26:14)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/a3xx.xml          (  83840 bytes, from 2017-05-17 13:21:27)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/a4xx.xml          ( 111898 bytes, from 2017-06-06 18:23:59)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/a5xx.xml          ( 139480 bytes, from 2017-06-16 12:44:39)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/ocmem.xml         (   1773 bytes, from 2017-05-17 13:21:27)



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

- /home/robclark/src/envytools/rnndb/adreno.xml               (    501 bytes, from 2018-07-03 19:37:13)

- /home/robclark/src/envytools/rnndb/freedreno_copyright.xml  (   1572 bytes, from 2018-07-03 19:37:13)

- /home/robclark/src/envytools/rnndb/adreno/a2xx.xml          (  36805 bytes, from 2018-07-03 19:37:13)

- /home/robclark/src/envytools/rnndb/adreno/adreno_common.xml (  13634 bytes, from 2018-07-03 19:37:13)

- /home/robclark/src/envytools/rnndb/adreno/adreno_pm4.xml    (  42393 bytes, from 2018-08-06 18:45:45)

- /home/robclark/src/envytools/rnndb/adreno/a3xx.xml          (  83840 bytes, from 2018-07-03 19:37:13)

- /home/robclark/src/envytools/rnndb/adreno/a4xx.xml          ( 112086 bytes, from 2018-07-03 19:37:13)

- /home/robclark/src/envytools/rnndb/adreno/a5xx.xml          ( 147240 bytes, from 2018-08-06 18:45:45)

- /home/robclark/src/envytools/rnndb/adreno/a6xx.xml          ( 101627 bytes, from 2018-08-06 18:45:45)

- /home/robclark/src/envytools/rnndb/adreno/a6xx_gmu.xml      (  10431 bytes, from 2018-07-03 19:37:13)

- /home/robclark/src/envytools/rnndb/adreno/ocmem.xml         (   1773 bytes, from 2018-07-03 19:37:13)



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

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

- Ilia Mirkin <imirkin@alum.mit.edu> (imirkin)
@@ -84,13 +86,12 @@ enum a2xx_sq_surfaceformat { 
	FMT_5_5_5_1 = 13,

	FMT_8_8_8_8_A = 14,

	FMT_4_4_4_4 = 15,

	FMT_10_11_11 = 16,

	FMT_11_11_10 = 17,

	FMT_8_8_8 = 16,

	FMT_DXT1 = 18,

	FMT_DXT2_3 = 19,

	FMT_DXT4_5 = 20,

	FMT_10_10_10_2 = 21,

	FMT_24_8 = 22,

	FMT_24_8_FLOAT = 23,

	FMT_16 = 24,

	FMT_16_16 = 25,

	FMT_16_16_16_16 = 26,
@@ -106,29 +107,23 @@ enum a2xx_sq_surfaceformat { 
	FMT_32_FLOAT = 36,

	FMT_32_32_FLOAT = 37,

	FMT_32_32_32_32_FLOAT = 38,

	FMT_32_AS_8 = 39,

	FMT_32_AS_8_8 = 40,

	FMT_16_MPEG = 41,

	FMT_16_16_MPEG = 42,

	FMT_8_INTERLACED = 43,

	FMT_32_AS_8_INTERLACED = 44,

	FMT_32_AS_8_8_INTERLACED = 45,

	FMT_16_INTERLACED = 46,

	FMT_16_MPEG_INTERLACED = 47,

	FMT_16_16_MPEG_INTERLACED = 48,

	FMT_ATI_TC_RGB = 39,

	FMT_ATI_TC_RGBA = 40,

	FMT_ATI_TC_555_565_RGB = 41,

	FMT_ATI_TC_555_565_RGBA = 42,

	FMT_ATI_TC_RGBA_INTERP = 43,

	FMT_ATI_TC_555_565_RGBA_INTERP = 44,

	FMT_ETC1_RGBA_INTERP = 46,

	FMT_ETC1_RGB = 47,

	FMT_ETC1_RGBA = 48,

	FMT_DXN = 49,

	FMT_8_8_8_8_AS_16_16_16_16 = 50,

	FMT_DXT1_AS_16_16_16_16 = 51,

	FMT_DXT2_3_AS_16_16_16_16 = 52,

	FMT_DXT4_5_AS_16_16_16_16 = 53,

	FMT_2_3_3 = 51,

	FMT_2_10_10_10_AS_16_16_16_16 = 54,

	FMT_10_11_11_AS_16_16_16_16 = 55,

	FMT_11_11_10_AS_16_16_16_16 = 56,

	FMT_10_10_10_2_AS_16_16_16_16 = 55,

	FMT_32_32_32_FLOAT = 57,

	FMT_DXT3A = 58,

	FMT_DXT5A = 59,

	FMT_CTX1 = 60,

	FMT_DXT3A_AS_1_1_1_1 = 61,

};



enum a2xx_sq_ps_vtx_mode {

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

+13 −11
Original line number Diff line number Diff line
@@ -8,17 +8,19 @@ http://github.com/freedreno/envytools/ 
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               (    431 bytes, from 2017-05-17 13:21:27)

- /home/robclark/src/freedreno/envytools/rnndb/freedreno_copyright.xml  (   1572 bytes, from 2017-05-17 13:21:27)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/a2xx.xml          (  37162 bytes, from 2017-05-17 13:21:27)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_common.xml (  13324 bytes, from 2017-05-17 13:21:27)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_pm4.xml    (  31866 bytes, from 2017-06-06 18:26:14)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/a3xx.xml          (  83840 bytes, from 2017-05-17 13:21:27)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/a4xx.xml          ( 111898 bytes, from 2017-06-06 18:23:59)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/a5xx.xml          ( 139480 bytes, from 2017-06-16 12:44:39)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/ocmem.xml         (   1773 bytes, from 2017-05-17 13:21:27)



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

- /home/robclark/src/envytools/rnndb/adreno.xml               (    501 bytes, from 2018-07-03 19:37:13)

- /home/robclark/src/envytools/rnndb/freedreno_copyright.xml  (   1572 bytes, from 2018-07-03 19:37:13)

- /home/robclark/src/envytools/rnndb/adreno/a2xx.xml          (  36805 bytes, from 2018-07-03 19:37:13)

- /home/robclark/src/envytools/rnndb/adreno/adreno_common.xml (  13634 bytes, from 2018-07-03 19:37:13)

- /home/robclark/src/envytools/rnndb/adreno/adreno_pm4.xml    (  42393 bytes, from 2018-08-06 18:45:45)

- /home/robclark/src/envytools/rnndb/adreno/a3xx.xml          (  83840 bytes, from 2018-07-03 19:37:13)

- /home/robclark/src/envytools/rnndb/adreno/a4xx.xml          ( 112086 bytes, from 2018-07-03 19:37:13)

- /home/robclark/src/envytools/rnndb/adreno/a5xx.xml          ( 147240 bytes, from 2018-08-06 18:45:45)

- /home/robclark/src/envytools/rnndb/adreno/a6xx.xml          ( 101627 bytes, from 2018-08-06 18:45:45)

- /home/robclark/src/envytools/rnndb/adreno/a6xx_gmu.xml      (  10431 bytes, from 2018-07-03 19:37:13)

- /home/robclark/src/envytools/rnndb/adreno/ocmem.xml         (   1773 bytes, from 2018-07-03 19:37:13)



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

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

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

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

+170 −23
Original line number Diff line number Diff line
@@ -8,17 +8,19 @@ http://github.com/freedreno/envytools/ 
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               (    431 bytes, from 2017-05-17 13:21:27)

- /home/robclark/src/freedreno/envytools/rnndb/freedreno_copyright.xml  (   1572 bytes, from 2017-05-17 13:21:27)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/a2xx.xml          (  37162 bytes, from 2017-05-17 13:21:27)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_common.xml (  13324 bytes, from 2017-05-17 13:21:27)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_pm4.xml    (  31866 bytes, from 2017-06-06 18:26:14)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/a3xx.xml          (  83840 bytes, from 2017-05-17 13:21:27)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/a4xx.xml          ( 111898 bytes, from 2017-06-06 18:23:59)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/a5xx.xml          ( 139480 bytes, from 2017-06-16 12:44:39)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/ocmem.xml         (   1773 bytes, from 2017-05-17 13:21:27)



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

- /home/robclark/src/envytools/rnndb/adreno.xml               (    501 bytes, from 2018-07-03 19:37:13)

- /home/robclark/src/envytools/rnndb/freedreno_copyright.xml  (   1572 bytes, from 2018-07-03 19:37:13)

- /home/robclark/src/envytools/rnndb/adreno/a2xx.xml          (  36805 bytes, from 2018-07-03 19:37:13)

- /home/robclark/src/envytools/rnndb/adreno/adreno_common.xml (  13634 bytes, from 2018-07-03 19:37:13)

- /home/robclark/src/envytools/rnndb/adreno/adreno_pm4.xml    (  42393 bytes, from 2018-08-06 18:45:45)

- /home/robclark/src/envytools/rnndb/adreno/a3xx.xml          (  83840 bytes, from 2018-07-03 19:37:13)

- /home/robclark/src/envytools/rnndb/adreno/a4xx.xml          ( 112086 bytes, from 2018-07-03 19:37:13)

- /home/robclark/src/envytools/rnndb/adreno/a5xx.xml          ( 147240 bytes, from 2018-08-06 18:45:45)

- /home/robclark/src/envytools/rnndb/adreno/a6xx.xml          ( 101627 bytes, from 2018-08-06 18:45:45)

- /home/robclark/src/envytools/rnndb/adreno/a6xx_gmu.xml      (  10431 bytes, from 2018-07-03 19:37:13)

- /home/robclark/src/envytools/rnndb/adreno/ocmem.xml         (   1773 bytes, from 2018-07-03 19:37:13)



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

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

- Ilia Mirkin <imirkin@alum.mit.edu> (imirkin)
@@ -263,12 +265,6 @@ enum a4xx_depth_format { 
	DEPTH4_32 = 3,

};



enum a4xx_tess_spacing {

	EQUAL_SPACING = 0,

	ODD_SPACING = 2,

	EVEN_SPACING = 3,

};



enum a4xx_ccu_perfcounter_select {

	CCU_BUSY_CYCLES = 0,

	CCU_RB_DEPTH_RETURN_STALL = 2,
@@ -3544,12 +3540,13 @@ static inline uint32_t A4XX_HLSQ_VS_CONTROL_REG_CONSTLENGTH(uint32_t val) 
{

	return ((val) << A4XX_HLSQ_VS_CONTROL_REG_CONSTLENGTH__SHIFT) & A4XX_HLSQ_VS_CONTROL_REG_CONSTLENGTH__MASK;

}

#define A4XX_HLSQ_VS_CONTROL_REG_CONSTOBJECTOFFSET__MASK	0x0000ff00

#define A4XX_HLSQ_VS_CONTROL_REG_CONSTOBJECTOFFSET__MASK	0x00007f00

#define A4XX_HLSQ_VS_CONTROL_REG_CONSTOBJECTOFFSET__SHIFT	8

static inline uint32_t A4XX_HLSQ_VS_CONTROL_REG_CONSTOBJECTOFFSET(uint32_t val)

{

	return ((val) << A4XX_HLSQ_VS_CONTROL_REG_CONSTOBJECTOFFSET__SHIFT) & A4XX_HLSQ_VS_CONTROL_REG_CONSTOBJECTOFFSET__MASK;

}

#define A4XX_HLSQ_VS_CONTROL_REG_SSBO_ENABLE			0x00008000

#define A4XX_HLSQ_VS_CONTROL_REG_ENABLED			0x00010000

#define A4XX_HLSQ_VS_CONTROL_REG_SHADEROBJOFFSET__MASK		0x00fe0000

#define A4XX_HLSQ_VS_CONTROL_REG_SHADEROBJOFFSET__SHIFT		17
@@ -3571,12 +3568,13 @@ static inline uint32_t A4XX_HLSQ_FS_CONTROL_REG_CONSTLENGTH(uint32_t val) 
{

	return ((val) << A4XX_HLSQ_FS_CONTROL_REG_CONSTLENGTH__SHIFT) & A4XX_HLSQ_FS_CONTROL_REG_CONSTLENGTH__MASK;

}

#define A4XX_HLSQ_FS_CONTROL_REG_CONSTOBJECTOFFSET__MASK	0x0000ff00

#define A4XX_HLSQ_FS_CONTROL_REG_CONSTOBJECTOFFSET__MASK	0x00007f00

#define A4XX_HLSQ_FS_CONTROL_REG_CONSTOBJECTOFFSET__SHIFT	8

static inline uint32_t A4XX_HLSQ_FS_CONTROL_REG_CONSTOBJECTOFFSET(uint32_t val)

{

	return ((val) << A4XX_HLSQ_FS_CONTROL_REG_CONSTOBJECTOFFSET__SHIFT) & A4XX_HLSQ_FS_CONTROL_REG_CONSTOBJECTOFFSET__MASK;

}

#define A4XX_HLSQ_FS_CONTROL_REG_SSBO_ENABLE			0x00008000

#define A4XX_HLSQ_FS_CONTROL_REG_ENABLED			0x00010000

#define A4XX_HLSQ_FS_CONTROL_REG_SHADEROBJOFFSET__MASK		0x00fe0000

#define A4XX_HLSQ_FS_CONTROL_REG_SHADEROBJOFFSET__SHIFT		17
@@ -3598,12 +3596,13 @@ static inline uint32_t A4XX_HLSQ_HS_CONTROL_REG_CONSTLENGTH(uint32_t val) 
{

	return ((val) << A4XX_HLSQ_HS_CONTROL_REG_CONSTLENGTH__SHIFT) & A4XX_HLSQ_HS_CONTROL_REG_CONSTLENGTH__MASK;

}

#define A4XX_HLSQ_HS_CONTROL_REG_CONSTOBJECTOFFSET__MASK	0x0000ff00

#define A4XX_HLSQ_HS_CONTROL_REG_CONSTOBJECTOFFSET__MASK	0x00007f00

#define A4XX_HLSQ_HS_CONTROL_REG_CONSTOBJECTOFFSET__SHIFT	8

static inline uint32_t A4XX_HLSQ_HS_CONTROL_REG_CONSTOBJECTOFFSET(uint32_t val)

{

	return ((val) << A4XX_HLSQ_HS_CONTROL_REG_CONSTOBJECTOFFSET__SHIFT) & A4XX_HLSQ_HS_CONTROL_REG_CONSTOBJECTOFFSET__MASK;

}

#define A4XX_HLSQ_HS_CONTROL_REG_SSBO_ENABLE			0x00008000

#define A4XX_HLSQ_HS_CONTROL_REG_ENABLED			0x00010000

#define A4XX_HLSQ_HS_CONTROL_REG_SHADEROBJOFFSET__MASK		0x00fe0000

#define A4XX_HLSQ_HS_CONTROL_REG_SHADEROBJOFFSET__SHIFT		17
@@ -3625,12 +3624,13 @@ static inline uint32_t A4XX_HLSQ_DS_CONTROL_REG_CONSTLENGTH(uint32_t val) 
{

	return ((val) << A4XX_HLSQ_DS_CONTROL_REG_CONSTLENGTH__SHIFT) & A4XX_HLSQ_DS_CONTROL_REG_CONSTLENGTH__MASK;

}

#define A4XX_HLSQ_DS_CONTROL_REG_CONSTOBJECTOFFSET__MASK	0x0000ff00

#define A4XX_HLSQ_DS_CONTROL_REG_CONSTOBJECTOFFSET__MASK	0x00007f00

#define A4XX_HLSQ_DS_CONTROL_REG_CONSTOBJECTOFFSET__SHIFT	8

static inline uint32_t A4XX_HLSQ_DS_CONTROL_REG_CONSTOBJECTOFFSET(uint32_t val)

{

	return ((val) << A4XX_HLSQ_DS_CONTROL_REG_CONSTOBJECTOFFSET__SHIFT) & A4XX_HLSQ_DS_CONTROL_REG_CONSTOBJECTOFFSET__MASK;

}

#define A4XX_HLSQ_DS_CONTROL_REG_SSBO_ENABLE			0x00008000

#define A4XX_HLSQ_DS_CONTROL_REG_ENABLED			0x00010000

#define A4XX_HLSQ_DS_CONTROL_REG_SHADEROBJOFFSET__MASK		0x00fe0000

#define A4XX_HLSQ_DS_CONTROL_REG_SHADEROBJOFFSET__SHIFT		17
@@ -3652,12 +3652,13 @@ static inline uint32_t A4XX_HLSQ_GS_CONTROL_REG_CONSTLENGTH(uint32_t val) 
{

	return ((val) << A4XX_HLSQ_GS_CONTROL_REG_CONSTLENGTH__SHIFT) & A4XX_HLSQ_GS_CONTROL_REG_CONSTLENGTH__MASK;

}

#define A4XX_HLSQ_GS_CONTROL_REG_CONSTOBJECTOFFSET__MASK	0x0000ff00

#define A4XX_HLSQ_GS_CONTROL_REG_CONSTOBJECTOFFSET__MASK	0x00007f00

#define A4XX_HLSQ_GS_CONTROL_REG_CONSTOBJECTOFFSET__SHIFT	8

static inline uint32_t A4XX_HLSQ_GS_CONTROL_REG_CONSTOBJECTOFFSET(uint32_t val)

{

	return ((val) << A4XX_HLSQ_GS_CONTROL_REG_CONSTOBJECTOFFSET__SHIFT) & A4XX_HLSQ_GS_CONTROL_REG_CONSTOBJECTOFFSET__MASK;

}

#define A4XX_HLSQ_GS_CONTROL_REG_SSBO_ENABLE			0x00008000

#define A4XX_HLSQ_GS_CONTROL_REG_ENABLED			0x00010000

#define A4XX_HLSQ_GS_CONTROL_REG_SHADEROBJOFFSET__MASK		0x00fe0000

#define A4XX_HLSQ_GS_CONTROL_REG_SHADEROBJOFFSET__SHIFT		17
@@ -3672,23 +3673,103 @@ static inline uint32_t A4XX_HLSQ_GS_CONTROL_REG_INSTRLENGTH(uint32_t val) 
	return ((val) << A4XX_HLSQ_GS_CONTROL_REG_INSTRLENGTH__SHIFT) & A4XX_HLSQ_GS_CONTROL_REG_INSTRLENGTH__MASK;

}



#define REG_A4XX_HLSQ_CS_CONTROL				0x000023ca

#define REG_A4XX_HLSQ_CS_CONTROL_REG				0x000023ca

#define A4XX_HLSQ_CS_CONTROL_REG_CONSTLENGTH__MASK		0x000000ff

#define A4XX_HLSQ_CS_CONTROL_REG_CONSTLENGTH__SHIFT		0

static inline uint32_t A4XX_HLSQ_CS_CONTROL_REG_CONSTLENGTH(uint32_t val)

{

	return ((val) << A4XX_HLSQ_CS_CONTROL_REG_CONSTLENGTH__SHIFT) & A4XX_HLSQ_CS_CONTROL_REG_CONSTLENGTH__MASK;

}

#define A4XX_HLSQ_CS_CONTROL_REG_CONSTOBJECTOFFSET__MASK	0x00007f00

#define A4XX_HLSQ_CS_CONTROL_REG_CONSTOBJECTOFFSET__SHIFT	8

static inline uint32_t A4XX_HLSQ_CS_CONTROL_REG_CONSTOBJECTOFFSET(uint32_t val)

{

	return ((val) << A4XX_HLSQ_CS_CONTROL_REG_CONSTOBJECTOFFSET__SHIFT) & A4XX_HLSQ_CS_CONTROL_REG_CONSTOBJECTOFFSET__MASK;

}

#define A4XX_HLSQ_CS_CONTROL_REG_SSBO_ENABLE			0x00008000

#define A4XX_HLSQ_CS_CONTROL_REG_ENABLED			0x00010000

#define A4XX_HLSQ_CS_CONTROL_REG_SHADEROBJOFFSET__MASK		0x00fe0000

#define A4XX_HLSQ_CS_CONTROL_REG_SHADEROBJOFFSET__SHIFT		17

static inline uint32_t A4XX_HLSQ_CS_CONTROL_REG_SHADEROBJOFFSET(uint32_t val)

{

	return ((val) << A4XX_HLSQ_CS_CONTROL_REG_SHADEROBJOFFSET__SHIFT) & A4XX_HLSQ_CS_CONTROL_REG_SHADEROBJOFFSET__MASK;

}

#define A4XX_HLSQ_CS_CONTROL_REG_INSTRLENGTH__MASK		0xff000000

#define A4XX_HLSQ_CS_CONTROL_REG_INSTRLENGTH__SHIFT		24

static inline uint32_t A4XX_HLSQ_CS_CONTROL_REG_INSTRLENGTH(uint32_t val)

{

	return ((val) << A4XX_HLSQ_CS_CONTROL_REG_INSTRLENGTH__SHIFT) & A4XX_HLSQ_CS_CONTROL_REG_INSTRLENGTH__MASK;

}



#define REG_A4XX_HLSQ_CL_NDRANGE_0				0x000023cd

#define A4XX_HLSQ_CL_NDRANGE_0_KERNELDIM__MASK			0x00000003

#define A4XX_HLSQ_CL_NDRANGE_0_KERNELDIM__SHIFT			0

static inline uint32_t A4XX_HLSQ_CL_NDRANGE_0_KERNELDIM(uint32_t val)

{

	return ((val) << A4XX_HLSQ_CL_NDRANGE_0_KERNELDIM__SHIFT) & A4XX_HLSQ_CL_NDRANGE_0_KERNELDIM__MASK;

}

#define A4XX_HLSQ_CL_NDRANGE_0_LOCALSIZEX__MASK			0x00000ffc

#define A4XX_HLSQ_CL_NDRANGE_0_LOCALSIZEX__SHIFT		2

static inline uint32_t A4XX_HLSQ_CL_NDRANGE_0_LOCALSIZEX(uint32_t val)

{

	return ((val) << A4XX_HLSQ_CL_NDRANGE_0_LOCALSIZEX__SHIFT) & A4XX_HLSQ_CL_NDRANGE_0_LOCALSIZEX__MASK;

}

#define A4XX_HLSQ_CL_NDRANGE_0_LOCALSIZEY__MASK			0x003ff000

#define A4XX_HLSQ_CL_NDRANGE_0_LOCALSIZEY__SHIFT		12

static inline uint32_t A4XX_HLSQ_CL_NDRANGE_0_LOCALSIZEY(uint32_t val)

{

	return ((val) << A4XX_HLSQ_CL_NDRANGE_0_LOCALSIZEY__SHIFT) & A4XX_HLSQ_CL_NDRANGE_0_LOCALSIZEY__MASK;

}

#define A4XX_HLSQ_CL_NDRANGE_0_LOCALSIZEZ__MASK			0xffc00000

#define A4XX_HLSQ_CL_NDRANGE_0_LOCALSIZEZ__SHIFT		22

static inline uint32_t A4XX_HLSQ_CL_NDRANGE_0_LOCALSIZEZ(uint32_t val)

{

	return ((val) << A4XX_HLSQ_CL_NDRANGE_0_LOCALSIZEZ__SHIFT) & A4XX_HLSQ_CL_NDRANGE_0_LOCALSIZEZ__MASK;

}



#define REG_A4XX_HLSQ_CL_NDRANGE_1				0x000023ce

#define A4XX_HLSQ_CL_NDRANGE_1_SIZE_X__MASK			0xffffffff

#define A4XX_HLSQ_CL_NDRANGE_1_SIZE_X__SHIFT			0

static inline uint32_t A4XX_HLSQ_CL_NDRANGE_1_SIZE_X(uint32_t val)

{

	return ((val) << A4XX_HLSQ_CL_NDRANGE_1_SIZE_X__SHIFT) & A4XX_HLSQ_CL_NDRANGE_1_SIZE_X__MASK;

}



#define REG_A4XX_HLSQ_CL_NDRANGE_2				0x000023cf



#define REG_A4XX_HLSQ_CL_NDRANGE_3				0x000023d0

#define A4XX_HLSQ_CL_NDRANGE_3_SIZE_Y__MASK			0xffffffff

#define A4XX_HLSQ_CL_NDRANGE_3_SIZE_Y__SHIFT			0

static inline uint32_t A4XX_HLSQ_CL_NDRANGE_3_SIZE_Y(uint32_t val)

{

	return ((val) << A4XX_HLSQ_CL_NDRANGE_3_SIZE_Y__SHIFT) & A4XX_HLSQ_CL_NDRANGE_3_SIZE_Y__MASK;

}



#define REG_A4XX_HLSQ_CL_NDRANGE_4				0x000023d1



#define REG_A4XX_HLSQ_CL_NDRANGE_5				0x000023d2

#define A4XX_HLSQ_CL_NDRANGE_5_SIZE_Z__MASK			0xffffffff

#define A4XX_HLSQ_CL_NDRANGE_5_SIZE_Z__SHIFT			0

static inline uint32_t A4XX_HLSQ_CL_NDRANGE_5_SIZE_Z(uint32_t val)

{

	return ((val) << A4XX_HLSQ_CL_NDRANGE_5_SIZE_Z__SHIFT) & A4XX_HLSQ_CL_NDRANGE_5_SIZE_Z__MASK;

}



#define REG_A4XX_HLSQ_CL_NDRANGE_6				0x000023d3



#define REG_A4XX_HLSQ_CL_CONTROL_0				0x000023d4

#define A4XX_HLSQ_CL_CONTROL_0_WGIDCONSTID__MASK		0x000000ff

#define A4XX_HLSQ_CL_CONTROL_0_WGIDCONSTID__SHIFT		0

static inline uint32_t A4XX_HLSQ_CL_CONTROL_0_WGIDCONSTID(uint32_t val)

{

	return ((val) << A4XX_HLSQ_CL_CONTROL_0_WGIDCONSTID__SHIFT) & A4XX_HLSQ_CL_CONTROL_0_WGIDCONSTID__MASK;

}

#define A4XX_HLSQ_CL_CONTROL_0_LOCALIDREGID__MASK		0xff000000

#define A4XX_HLSQ_CL_CONTROL_0_LOCALIDREGID__SHIFT		24

static inline uint32_t A4XX_HLSQ_CL_CONTROL_0_LOCALIDREGID(uint32_t val)

{

	return ((val) << A4XX_HLSQ_CL_CONTROL_0_LOCALIDREGID__SHIFT) & A4XX_HLSQ_CL_CONTROL_0_LOCALIDREGID__MASK;

}



#define REG_A4XX_HLSQ_CL_CONTROL_1				0x000023d5
@@ -4087,5 +4168,71 @@ static inline uint32_t A4XX_TEX_CONST_4_BASE(uint32_t val) 


#define REG_A4XX_TEX_CONST_7					0x00000007



#define REG_A4XX_SSBO_0_0					0x00000000

#define A4XX_SSBO_0_0_BASE__MASK				0xffffffe0

#define A4XX_SSBO_0_0_BASE__SHIFT				5

static inline uint32_t A4XX_SSBO_0_0_BASE(uint32_t val)

{

	return ((val >> 5) << A4XX_SSBO_0_0_BASE__SHIFT) & A4XX_SSBO_0_0_BASE__MASK;

}



#define REG_A4XX_SSBO_0_1					0x00000001

#define A4XX_SSBO_0_1_PITCH__MASK				0x003fffff

#define A4XX_SSBO_0_1_PITCH__SHIFT				0

static inline uint32_t A4XX_SSBO_0_1_PITCH(uint32_t val)

{

	return ((val) << A4XX_SSBO_0_1_PITCH__SHIFT) & A4XX_SSBO_0_1_PITCH__MASK;

}



#define REG_A4XX_SSBO_0_2					0x00000002

#define A4XX_SSBO_0_2_ARRAY_PITCH__MASK				0x03fff000

#define A4XX_SSBO_0_2_ARRAY_PITCH__SHIFT			12

static inline uint32_t A4XX_SSBO_0_2_ARRAY_PITCH(uint32_t val)

{

	return ((val >> 12) << A4XX_SSBO_0_2_ARRAY_PITCH__SHIFT) & A4XX_SSBO_0_2_ARRAY_PITCH__MASK;

}



#define REG_A4XX_SSBO_0_3					0x00000003

#define A4XX_SSBO_0_3_CPP__MASK					0x0000003f

#define A4XX_SSBO_0_3_CPP__SHIFT				0

static inline uint32_t A4XX_SSBO_0_3_CPP(uint32_t val)

{

	return ((val) << A4XX_SSBO_0_3_CPP__SHIFT) & A4XX_SSBO_0_3_CPP__MASK;

}



#define REG_A4XX_SSBO_1_0					0x00000000

#define A4XX_SSBO_1_0_CPP__MASK					0x0000001f

#define A4XX_SSBO_1_0_CPP__SHIFT				0

static inline uint32_t A4XX_SSBO_1_0_CPP(uint32_t val)

{

	return ((val) << A4XX_SSBO_1_0_CPP__SHIFT) & A4XX_SSBO_1_0_CPP__MASK;

}

#define A4XX_SSBO_1_0_FMT__MASK					0x0000ff00

#define A4XX_SSBO_1_0_FMT__SHIFT				8

static inline uint32_t A4XX_SSBO_1_0_FMT(enum a4xx_color_fmt val)

{

	return ((val) << A4XX_SSBO_1_0_FMT__SHIFT) & A4XX_SSBO_1_0_FMT__MASK;

}

#define A4XX_SSBO_1_0_WIDTH__MASK				0xffff0000

#define A4XX_SSBO_1_0_WIDTH__SHIFT				16

static inline uint32_t A4XX_SSBO_1_0_WIDTH(uint32_t val)

{

	return ((val) << A4XX_SSBO_1_0_WIDTH__SHIFT) & A4XX_SSBO_1_0_WIDTH__MASK;

}



#define REG_A4XX_SSBO_1_1					0x00000001

#define A4XX_SSBO_1_1_HEIGHT__MASK				0x0000ffff

#define A4XX_SSBO_1_1_HEIGHT__SHIFT				0

static inline uint32_t A4XX_SSBO_1_1_HEIGHT(uint32_t val)

{

	return ((val) << A4XX_SSBO_1_1_HEIGHT__SHIFT) & A4XX_SSBO_1_1_HEIGHT__MASK;

}

#define A4XX_SSBO_1_1_DEPTH__MASK				0xffff0000

#define A4XX_SSBO_1_1_DEPTH__SHIFT				16

static inline uint32_t A4XX_SSBO_1_1_DEPTH(uint32_t val)

{

	return ((val) << A4XX_SSBO_1_1_DEPTH__SHIFT) & A4XX_SSBO_1_1_DEPTH__MASK;

}





#endif /* A4XX_XML */

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

+445 −38

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE