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

Commit feb5cde6 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'msm-next' of git://people.freedesktop.org/~robclark/linux into drm-next 

MSM tree from Rob.

* 'msm-next' of git://people.freedesktop.org/~robclark/linux:
  drm/msm: add a330/apq8x74
  drm/msm: add mdp5/apq8x74
  drm/msm: add hdmi support for apq8x74/mdp5
  drm/msm: move irq utils to mdp_kms
  drm/msm: split out msm_kms.h
  drm/msm: mdp4_format -> mdp_format
  drm/msm: resync generated headers
  drm/msm: move mdp4 -> mdp/mdp4
  drm/msm: add support for msm8060ab/bstem
  drm/msm: add support for non-IOMMU systems
  drm/msm: fix bus scaling
  drm/msm: add missing MODULE_FIRMWARE()s
  drm/msm: COMPILE_TEST support
parents 0a6659bd 55459968

drivers/gpu/drm/msm/Kconfig

+1 −2
Original line number Diff line number Diff line
@@ -2,8 +2,7 @@ 
config DRM_MSM

	tristate "MSM DRM"

	depends on DRM

	depends on ARCH_MSM

	depends on ARCH_MSM8960

	depends on (ARCH_MSM && ARCH_MSM8960) || (ARM && COMPILE_TEST)

	select DRM_KMS_HELPER

	select SHMEM

	select TMPFS

drivers/gpu/drm/msm/Makefile

+15 −6
Original line number Diff line number Diff line
@@ -12,18 +12,27 @@ msm-y := \ 
	hdmi/hdmi_i2c.o \

	hdmi/hdmi_phy_8960.o \

	hdmi/hdmi_phy_8x60.o \

	mdp4/mdp4_crtc.o \

	mdp4/mdp4_dtv_encoder.o \

	mdp4/mdp4_format.o \

	mdp4/mdp4_irq.o \

	mdp4/mdp4_kms.o \

	mdp4/mdp4_plane.o \

	hdmi/hdmi_phy_8x74.o \

	mdp/mdp_format.o \

	mdp/mdp_kms.o \

	mdp/mdp4/mdp4_crtc.o \

	mdp/mdp4/mdp4_dtv_encoder.o \

	mdp/mdp4/mdp4_irq.o \

	mdp/mdp4/mdp4_kms.o \

	mdp/mdp4/mdp4_plane.o \

	mdp/mdp5/mdp5_crtc.o \

	mdp/mdp5/mdp5_encoder.o \

	mdp/mdp5/mdp5_irq.o \

	mdp/mdp5/mdp5_kms.o \

	mdp/mdp5/mdp5_plane.o \

	mdp/mdp5/mdp5_smp.o \

	msm_drv.o \

	msm_fb.o \

	msm_gem.o \

	msm_gem_prime.o \

	msm_gem_submit.o \

	msm_gpu.o \

	msm_iommu.o \

	msm_ringbuffer.o



msm-$(CONFIG_DRM_MSM_FBDEV) += msm_fbdev.o

drivers/gpu/drm/msm/NOTES

+19 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ In the current snapdragon SoC's, we have (at least) 3 different 
display controller blocks at play:

 + MDP3 - ?? seems to be what is on geeksphone peak device

 + MDP4 - S3 (APQ8060, touchpad), S4-pro (APQ8064, nexus4 & ifc6410)

 + MDSS - snapdragon 800

 + MDP5 - snapdragon 800



(I don't have a completely clear picture on which display controller

maps to which part #)
@@ -46,6 +46,24 @@ and treat the MDP4 block's irq as "the" irq. Even though the connectors 
may have their own irqs which they install themselves.  For this reason

the display controller is the "master" device.



For MDP5, the mapping is:



  plane   -> PIPE{RGBn,VIGn}             \

  crtc    -> LM (layer mixer)            |-> MDP "device"

  encoder -> INTF                        /

  connector -> HDMI/DSI/eDP/etc          --> other device(s)



Unlike MDP4, it appears we can get by with a single encoder, rather

than needing a different implementation for DTV, DSI, etc.  (Ie. the

register interface is same, just different bases.)



Also unlike MDP4, with MDP5 all the IRQs for other blocks (HDMI, DSI,

etc) are routed through MDP.



And finally, MDP5 has this "Shared Memory Pool" (called "SMP"), from

which blocks need to be allocated to the active pipes based on fetch

stride.



Each connector probably ends up being a separate device, just for the

logistics of finding/mapping io region, irq, etc.  Idealy we would

have a better way than just stashing the platform device in a global

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

+105 −20
Original line number Diff line number Diff line
@@ -8,12 +8,13 @@ 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              (    327 bytes, from 2013-07-05 19:21:12)

- /home/robclark/src/freedreno/envytools/rnndb/adreno.xml               (    364 bytes, from 2013-11-30 14:47:15)

- /home/robclark/src/freedreno/envytools/rnndb/freedreno_copyright.xml  (   1453 bytes, from 2013-03-31 16:51:27)

- /home/robclark/src/freedreno/envytools/rnndb/a2xx/a2xx.xml           (  31003 bytes, from 2013-09-19 18:50:16)

- /home/robclark/src/freedreno/envytools/rnndb/adreno_common.xml       (   8983 bytes, from 2013-07-24 01:38:36)

- /home/robclark/src/freedreno/envytools/rnndb/adreno_pm4.xml          (   9759 bytes, from 2013-09-10 00:52:33)

- /home/robclark/src/freedreno/envytools/rnndb/a3xx/a3xx.xml           (  51983 bytes, from 2013-09-10 00:52:32)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/a2xx.xml          (  32814 bytes, from 2013-11-30 15:07:33)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_common.xml (   8900 bytes, from 2013-10-22 23:57:49)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_pm4.xml    (  10574 bytes, from 2013-11-13 05:44:45)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/a3xx.xml          (  53644 bytes, from 2013-11-30 15:07:33)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/a4xx.xml          (   8344 bytes, from 2013-11-30 14:49:47)



Copyright (C) 2013 by the following authors:

- Rob Clark <robdclark@gmail.com> (robclark)
@@ -202,6 +203,12 @@ enum a2xx_rb_copy_sample_select { 
	SAMPLE_0123 = 6,

};



enum adreno_mmu_clnt_beh {

	BEH_NEVR = 0,

	BEH_TRAN_RNG = 1,

	BEH_TRAN_FLT = 2,

};



enum sq_tex_clamp {

	SQ_TEX_WRAP = 0,

	SQ_TEX_MIRROR = 1,
@@ -238,6 +245,92 @@ enum sq_tex_filter { 


#define REG_A2XX_CP_PFP_UCODE_DATA				0x000000c1



#define REG_A2XX_MH_MMU_CONFIG					0x00000040

#define A2XX_MH_MMU_CONFIG_MMU_ENABLE				0x00000001

#define A2XX_MH_MMU_CONFIG_SPLIT_MODE_ENABLE			0x00000002

#define A2XX_MH_MMU_CONFIG_RB_W_CLNT_BEHAVIOR__MASK		0x00000030

#define A2XX_MH_MMU_CONFIG_RB_W_CLNT_BEHAVIOR__SHIFT		4

static inline uint32_t A2XX_MH_MMU_CONFIG_RB_W_CLNT_BEHAVIOR(enum adreno_mmu_clnt_beh val)

{

	return ((val) << A2XX_MH_MMU_CONFIG_RB_W_CLNT_BEHAVIOR__SHIFT) & A2XX_MH_MMU_CONFIG_RB_W_CLNT_BEHAVIOR__MASK;

}

#define A2XX_MH_MMU_CONFIG_CP_W_CLNT_BEHAVIOR__MASK		0x000000c0

#define A2XX_MH_MMU_CONFIG_CP_W_CLNT_BEHAVIOR__SHIFT		6

static inline uint32_t A2XX_MH_MMU_CONFIG_CP_W_CLNT_BEHAVIOR(enum adreno_mmu_clnt_beh val)

{

	return ((val) << A2XX_MH_MMU_CONFIG_CP_W_CLNT_BEHAVIOR__SHIFT) & A2XX_MH_MMU_CONFIG_CP_W_CLNT_BEHAVIOR__MASK;

}

#define A2XX_MH_MMU_CONFIG_CP_R0_CLNT_BEHAVIOR__MASK		0x00000300

#define A2XX_MH_MMU_CONFIG_CP_R0_CLNT_BEHAVIOR__SHIFT		8

static inline uint32_t A2XX_MH_MMU_CONFIG_CP_R0_CLNT_BEHAVIOR(enum adreno_mmu_clnt_beh val)

{

	return ((val) << A2XX_MH_MMU_CONFIG_CP_R0_CLNT_BEHAVIOR__SHIFT) & A2XX_MH_MMU_CONFIG_CP_R0_CLNT_BEHAVIOR__MASK;

}

#define A2XX_MH_MMU_CONFIG_CP_R1_CLNT_BEHAVIOR__MASK		0x00000c00

#define A2XX_MH_MMU_CONFIG_CP_R1_CLNT_BEHAVIOR__SHIFT		10

static inline uint32_t A2XX_MH_MMU_CONFIG_CP_R1_CLNT_BEHAVIOR(enum adreno_mmu_clnt_beh val)

{

	return ((val) << A2XX_MH_MMU_CONFIG_CP_R1_CLNT_BEHAVIOR__SHIFT) & A2XX_MH_MMU_CONFIG_CP_R1_CLNT_BEHAVIOR__MASK;

}

#define A2XX_MH_MMU_CONFIG_CP_R2_CLNT_BEHAVIOR__MASK		0x00003000

#define A2XX_MH_MMU_CONFIG_CP_R2_CLNT_BEHAVIOR__SHIFT		12

static inline uint32_t A2XX_MH_MMU_CONFIG_CP_R2_CLNT_BEHAVIOR(enum adreno_mmu_clnt_beh val)

{

	return ((val) << A2XX_MH_MMU_CONFIG_CP_R2_CLNT_BEHAVIOR__SHIFT) & A2XX_MH_MMU_CONFIG_CP_R2_CLNT_BEHAVIOR__MASK;

}

#define A2XX_MH_MMU_CONFIG_CP_R3_CLNT_BEHAVIOR__MASK		0x0000c000

#define A2XX_MH_MMU_CONFIG_CP_R3_CLNT_BEHAVIOR__SHIFT		14

static inline uint32_t A2XX_MH_MMU_CONFIG_CP_R3_CLNT_BEHAVIOR(enum adreno_mmu_clnt_beh val)

{

	return ((val) << A2XX_MH_MMU_CONFIG_CP_R3_CLNT_BEHAVIOR__SHIFT) & A2XX_MH_MMU_CONFIG_CP_R3_CLNT_BEHAVIOR__MASK;

}

#define A2XX_MH_MMU_CONFIG_CP_R4_CLNT_BEHAVIOR__MASK		0x00030000

#define A2XX_MH_MMU_CONFIG_CP_R4_CLNT_BEHAVIOR__SHIFT		16

static inline uint32_t A2XX_MH_MMU_CONFIG_CP_R4_CLNT_BEHAVIOR(enum adreno_mmu_clnt_beh val)

{

	return ((val) << A2XX_MH_MMU_CONFIG_CP_R4_CLNT_BEHAVIOR__SHIFT) & A2XX_MH_MMU_CONFIG_CP_R4_CLNT_BEHAVIOR__MASK;

}

#define A2XX_MH_MMU_CONFIG_VGT_R0_CLNT_BEHAVIOR__MASK		0x000c0000

#define A2XX_MH_MMU_CONFIG_VGT_R0_CLNT_BEHAVIOR__SHIFT		18

static inline uint32_t A2XX_MH_MMU_CONFIG_VGT_R0_CLNT_BEHAVIOR(enum adreno_mmu_clnt_beh val)

{

	return ((val) << A2XX_MH_MMU_CONFIG_VGT_R0_CLNT_BEHAVIOR__SHIFT) & A2XX_MH_MMU_CONFIG_VGT_R0_CLNT_BEHAVIOR__MASK;

}

#define A2XX_MH_MMU_CONFIG_VGT_R1_CLNT_BEHAVIOR__MASK		0x00300000

#define A2XX_MH_MMU_CONFIG_VGT_R1_CLNT_BEHAVIOR__SHIFT		20

static inline uint32_t A2XX_MH_MMU_CONFIG_VGT_R1_CLNT_BEHAVIOR(enum adreno_mmu_clnt_beh val)

{

	return ((val) << A2XX_MH_MMU_CONFIG_VGT_R1_CLNT_BEHAVIOR__SHIFT) & A2XX_MH_MMU_CONFIG_VGT_R1_CLNT_BEHAVIOR__MASK;

}

#define A2XX_MH_MMU_CONFIG_TC_R_CLNT_BEHAVIOR__MASK		0x00c00000

#define A2XX_MH_MMU_CONFIG_TC_R_CLNT_BEHAVIOR__SHIFT		22

static inline uint32_t A2XX_MH_MMU_CONFIG_TC_R_CLNT_BEHAVIOR(enum adreno_mmu_clnt_beh val)

{

	return ((val) << A2XX_MH_MMU_CONFIG_TC_R_CLNT_BEHAVIOR__SHIFT) & A2XX_MH_MMU_CONFIG_TC_R_CLNT_BEHAVIOR__MASK;

}

#define A2XX_MH_MMU_CONFIG_PA_W_CLNT_BEHAVIOR__MASK		0x03000000

#define A2XX_MH_MMU_CONFIG_PA_W_CLNT_BEHAVIOR__SHIFT		24

static inline uint32_t A2XX_MH_MMU_CONFIG_PA_W_CLNT_BEHAVIOR(enum adreno_mmu_clnt_beh val)

{

	return ((val) << A2XX_MH_MMU_CONFIG_PA_W_CLNT_BEHAVIOR__SHIFT) & A2XX_MH_MMU_CONFIG_PA_W_CLNT_BEHAVIOR__MASK;

}



#define REG_A2XX_MH_MMU_VA_RANGE				0x00000041



#define REG_A2XX_MH_MMU_PT_BASE					0x00000042



#define REG_A2XX_MH_MMU_PAGE_FAULT				0x00000043



#define REG_A2XX_MH_MMU_TRAN_ERROR				0x00000044



#define REG_A2XX_MH_MMU_INVALIDATE				0x00000045



#define REG_A2XX_MH_MMU_MPU_BASE				0x00000046



#define REG_A2XX_MH_MMU_MPU_END					0x00000047



#define REG_A2XX_NQWAIT_UNTIL					0x00000394



#define REG_A2XX_RBBM_PERFCOUNTER1_SELECT			0x00000395



#define REG_A2XX_RBBM_PERFCOUNTER1_LO				0x00000397
@@ -276,20 +369,6 @@ enum sq_tex_filter { 


#define REG_A2XX_CP_PERFCOUNTER_HI				0x00000447



#define REG_A2XX_CP_ST_BASE					0x0000044d



#define REG_A2XX_CP_ST_BUFSZ					0x0000044e



#define REG_A2XX_CP_IB1_BASE					0x00000458



#define REG_A2XX_CP_IB1_BUFSZ					0x00000459



#define REG_A2XX_CP_IB2_BASE					0x0000045a



#define REG_A2XX_CP_IB2_BUFSZ					0x0000045b



#define REG_A2XX_CP_STAT					0x0000047f



#define REG_A2XX_RBBM_STATUS					0x000005d0

#define A2XX_RBBM_STATUS_CMDFIFO_AVAIL__MASK			0x0000001f

#define A2XX_RBBM_STATUS_CMDFIFO_AVAIL__SHIFT			0
@@ -808,6 +887,12 @@ static inline uint32_t A2XX_SQ_CONTEXT_MISC_PARAM_GEN_POS(uint32_t val) 


#define REG_A2XX_SQ_VS_PROGRAM					0x000021f7



#define REG_A2XX_VGT_EVENT_INITIATOR				0x000021f9



#define REG_A2XX_VGT_DRAW_INITIATOR				0x000021fc



#define REG_A2XX_VGT_IMMED_DATA					0x000021fd



#define REG_A2XX_RB_DEPTHCONTROL				0x00002200

#define A2XX_RB_DEPTHCONTROL_STENCIL_ENABLE			0x00000001

#define A2XX_RB_DEPTHCONTROL_Z_ENABLE				0x00000002

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

+80 −36
Original line number Diff line number Diff line
@@ -8,12 +8,13 @@ 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              (    327 bytes, from 2013-07-05 19:21:12)

- /home/robclark/src/freedreno/envytools/rnndb/adreno.xml               (    364 bytes, from 2013-11-30 14:47:15)

- /home/robclark/src/freedreno/envytools/rnndb/freedreno_copyright.xml  (   1453 bytes, from 2013-03-31 16:51:27)

- /home/robclark/src/freedreno/envytools/rnndb/a2xx/a2xx.xml           (  31003 bytes, from 2013-09-19 18:50:16)

- /home/robclark/src/freedreno/envytools/rnndb/adreno_common.xml       (   8983 bytes, from 2013-07-24 01:38:36)

- /home/robclark/src/freedreno/envytools/rnndb/adreno_pm4.xml          (   9759 bytes, from 2013-09-10 00:52:33)

- /home/robclark/src/freedreno/envytools/rnndb/a3xx/a3xx.xml           (  51983 bytes, from 2013-09-10 00:52:32)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/a2xx.xml          (  32814 bytes, from 2013-11-30 15:07:33)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_common.xml (   8900 bytes, from 2013-10-22 23:57:49)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_pm4.xml    (  10574 bytes, from 2013-11-13 05:44:45)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/a3xx.xml          (  53644 bytes, from 2013-11-30 15:07:33)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/a4xx.xml          (   8344 bytes, from 2013-11-30 14:49:47)



Copyright (C) 2013 by the following authors:

- Rob Clark <robdclark@gmail.com> (robclark)
@@ -292,6 +293,8 @@ enum a3xx_tex_type { 
#define A3XX_RBBM_STATUS_GPU_BUSY_NOHC				0x40000000

#define A3XX_RBBM_STATUS_GPU_BUSY				0x80000000



#define REG_A3XX_RBBM_NQWAIT_UNTIL				0x00000040



#define REG_A3XX_RBBM_WAIT_IDLE_CLOCKS_CTL			0x00000033



#define REG_A3XX_RBBM_INTERFACE_HANG_INT_CTL			0x00000050
@@ -304,6 +307,8 @@ enum a3xx_tex_type { 


#define REG_A3XX_RBBM_INTERFACE_HANG_MASK_CTL3			0x0000005a



#define REG_A3XX_RBBM_INT_SET_CMD				0x00000060



#define REG_A3XX_RBBM_INT_CLEAR_CMD				0x00000061



#define REG_A3XX_RBBM_INT_0_MASK				0x00000063
@@ -937,13 +942,13 @@ static inline uint32_t A3XX_RB_BLEND_ALPHA_FLOAT(float val) 
	return ((util_float_to_half(val)) << A3XX_RB_BLEND_ALPHA_FLOAT__SHIFT) & A3XX_RB_BLEND_ALPHA_FLOAT__MASK;

}



#define REG_A3XX_UNKNOWN_20E8					0x000020e8

#define REG_A3XX_RB_CLEAR_COLOR_DW0				0x000020e8



#define REG_A3XX_UNKNOWN_20E9					0x000020e9

#define REG_A3XX_RB_CLEAR_COLOR_DW1				0x000020e9



#define REG_A3XX_UNKNOWN_20EA					0x000020ea

#define REG_A3XX_RB_CLEAR_COLOR_DW2				0x000020ea



#define REG_A3XX_UNKNOWN_20EB					0x000020eb

#define REG_A3XX_RB_CLEAR_COLOR_DW3				0x000020eb



#define REG_A3XX_RB_COPY_CONTROL				0x000020ec

#define A3XX_RB_COPY_CONTROL_MSAA_RESOLVE__MASK			0x00000003
@@ -1026,7 +1031,7 @@ static inline uint32_t A3XX_RB_DEPTH_CONTROL_ZFUNC(enum adreno_compare_func val) 
#define A3XX_RB_DEPTH_CONTROL_BF_ENABLE				0x00000080

#define A3XX_RB_DEPTH_CONTROL_Z_TEST_ENABLE			0x80000000



#define REG_A3XX_UNKNOWN_2101					0x00002101

#define REG_A3XX_RB_DEPTH_CLEAR					0x00002101



#define REG_A3XX_RB_DEPTH_INFO					0x00002102

#define A3XX_RB_DEPTH_INFO_DEPTH_FORMAT__MASK			0x00000001
@@ -1103,11 +1108,11 @@ static inline uint32_t A3XX_RB_STENCIL_CONTROL_ZFAIL_BF(enum adreno_stencil_op v 
	return ((val) << A3XX_RB_STENCIL_CONTROL_ZFAIL_BF__SHIFT) & A3XX_RB_STENCIL_CONTROL_ZFAIL_BF__MASK;

}



#define REG_A3XX_UNKNOWN_2105					0x00002105

#define REG_A3XX_RB_STENCIL_CLEAR				0x00002105



#define REG_A3XX_UNKNOWN_2106					0x00002106

#define REG_A3XX_RB_STENCIL_BUF_INFO				0x00002106



#define REG_A3XX_UNKNOWN_2107					0x00002107

#define REG_A3XX_RB_STENCIL_BUF_PITCH				0x00002107



#define REG_A3XX_RB_STENCILREFMASK				0x00002108

#define A3XX_RB_STENCILREFMASK_STENCILREF__MASK			0x000000ff
@@ -1149,20 +1154,31 @@ static inline uint32_t A3XX_RB_STENCILREFMASK_BF_STENCILWRITEMASK(uint32_t val) 
	return ((val) << A3XX_RB_STENCILREFMASK_BF_STENCILWRITEMASK__SHIFT) & A3XX_RB_STENCILREFMASK_BF_STENCILWRITEMASK__MASK;

}



#define REG_A3XX_PA_SC_WINDOW_OFFSET				0x0000210e

#define A3XX_PA_SC_WINDOW_OFFSET_X__MASK			0x0000ffff

#define A3XX_PA_SC_WINDOW_OFFSET_X__SHIFT			0

static inline uint32_t A3XX_PA_SC_WINDOW_OFFSET_X(uint32_t val)

#define REG_A3XX_RB_LRZ_VSC_CONTROL				0x0000210c

#define A3XX_RB_LRZ_VSC_CONTROL_BINNING_ENABLE			0x00000002



#define REG_A3XX_RB_WINDOW_OFFSET				0x0000210e

#define A3XX_RB_WINDOW_OFFSET_X__MASK				0x0000ffff

#define A3XX_RB_WINDOW_OFFSET_X__SHIFT				0

static inline uint32_t A3XX_RB_WINDOW_OFFSET_X(uint32_t val)

{

	return ((val) << A3XX_PA_SC_WINDOW_OFFSET_X__SHIFT) & A3XX_PA_SC_WINDOW_OFFSET_X__MASK;

	return ((val) << A3XX_RB_WINDOW_OFFSET_X__SHIFT) & A3XX_RB_WINDOW_OFFSET_X__MASK;

}

#define A3XX_PA_SC_WINDOW_OFFSET_Y__MASK			0xffff0000

#define A3XX_PA_SC_WINDOW_OFFSET_Y__SHIFT			16

static inline uint32_t A3XX_PA_SC_WINDOW_OFFSET_Y(uint32_t val)

#define A3XX_RB_WINDOW_OFFSET_Y__MASK				0xffff0000

#define A3XX_RB_WINDOW_OFFSET_Y__SHIFT				16

static inline uint32_t A3XX_RB_WINDOW_OFFSET_Y(uint32_t val)

{

	return ((val) << A3XX_PA_SC_WINDOW_OFFSET_Y__SHIFT) & A3XX_PA_SC_WINDOW_OFFSET_Y__MASK;

	return ((val) << A3XX_RB_WINDOW_OFFSET_Y__SHIFT) & A3XX_RB_WINDOW_OFFSET_Y__MASK;

}



#define REG_A3XX_RB_SAMPLE_COUNT_CONTROL			0x00002110



#define REG_A3XX_RB_SAMPLE_COUNT_ADDR				0x00002111



#define REG_A3XX_RB_Z_CLAMP_MIN					0x00002114



#define REG_A3XX_RB_Z_CLAMP_MAX					0x00002115



#define REG_A3XX_PC_VSTREAM_CONTROL				0x000021e4



#define REG_A3XX_PC_VERTEX_REUSE_BLOCK_CNTL			0x000021ea
@@ -1309,6 +1325,8 @@ static inline uint32_t A3XX_HLSQ_CONST_FSPRESV_RANGE_REG_ENDENTRY(uint32_t val) 


#define REG_A3XX_HLSQ_CL_KERNEL_GROUP_X_REG			0x00002215



#define REG_A3XX_HLSQ_CL_KERNEL_GROUP_Y_REG			0x00002216



#define REG_A3XX_HLSQ_CL_KERNEL_GROUP_Z_REG			0x00002217



#define REG_A3XX_HLSQ_CL_WG_OFFSET_REG				0x0000221a
@@ -1491,12 +1509,13 @@ static inline uint32_t REG_A3XX_VPC_VARYING_PS_REPL_MODE(uint32_t i0) { return 0 


#define REG_A3XX_SP_SP_CTRL_REG					0x000022c0

#define A3XX_SP_SP_CTRL_REG_RESOLVE				0x00010000

#define A3XX_SP_SP_CTRL_REG_CONSTMODE__MASK			0x000c0000

#define A3XX_SP_SP_CTRL_REG_CONSTMODE__MASK			0x00040000

#define A3XX_SP_SP_CTRL_REG_CONSTMODE__SHIFT			18

static inline uint32_t A3XX_SP_SP_CTRL_REG_CONSTMODE(uint32_t val)

{

	return ((val) << A3XX_SP_SP_CTRL_REG_CONSTMODE__SHIFT) & A3XX_SP_SP_CTRL_REG_CONSTMODE__MASK;

}

#define A3XX_SP_SP_CTRL_REG_BINNING				0x00080000

#define A3XX_SP_SP_CTRL_REG_SLEEPMODE__MASK			0x00300000

#define A3XX_SP_SP_CTRL_REG_SLEEPMODE__SHIFT			20

static inline uint32_t A3XX_SP_SP_CTRL_REG_SLEEPMODE(uint32_t val)
@@ -1669,7 +1688,7 @@ static inline uint32_t A3XX_SP_VS_OBJ_OFFSET_REG_SHADEROBJOFFSET(uint32_t val) 


#define REG_A3XX_SP_VS_OBJ_START_REG				0x000022d5



#define REG_A3XX_SP_VS_PVT_MEM_CTRL_REG				0x000022d6

#define REG_A3XX_SP_VS_PVT_MEM_PARAM_REG			0x000022d6



#define REG_A3XX_SP_VS_PVT_MEM_ADDR_REG				0x000022d7
@@ -1772,7 +1791,7 @@ static inline uint32_t A3XX_SP_FS_OBJ_OFFSET_REG_SHADEROBJOFFSET(uint32_t val) 


#define REG_A3XX_SP_FS_OBJ_START_REG				0x000022e3



#define REG_A3XX_SP_FS_PVT_MEM_CTRL_REG				0x000022e4

#define REG_A3XX_SP_FS_PVT_MEM_PARAM_REG			0x000022e4



#define REG_A3XX_SP_FS_PVT_MEM_ADDR_REG				0x000022e5
@@ -1943,6 +1962,9 @@ static inline uint32_t REG_A3XX_VSC_PIPE_DATA_ADDRESS(uint32_t i0) { return 0x00 


static inline uint32_t REG_A3XX_VSC_PIPE_DATA_LENGTH(uint32_t i0) { return 0x00000c08 + 0x3*i0; }



#define REG_A3XX_VSC_BIN_CONTROL				0x00000c3c

#define A3XX_VSC_BIN_CONTROL_BINNING_ENABLE			0x00000001



#define REG_A3XX_UNKNOWN_0C3D					0x00000c3d



#define REG_A3XX_PC_PERFCOUNTER0_SELECT				0x00000c48
@@ -1953,7 +1975,7 @@ static inline uint32_t REG_A3XX_VSC_PIPE_DATA_LENGTH(uint32_t i0) { return 0x000 


#define REG_A3XX_PC_PERFCOUNTER3_SELECT				0x00000c4b



#define REG_A3XX_UNKNOWN_0C81					0x00000c81

#define REG_A3XX_GRAS_TSE_DEBUG_ECO				0x00000c81



#define REG_A3XX_GRAS_PERFCOUNTER0_SELECT			0x00000c88
@@ -1975,22 +1997,24 @@ static inline uint32_t REG_A3XX_GRAS_CL_USER_PLANE_W(uint32_t i0) { return 0x000 


#define REG_A3XX_RB_GMEM_BASE_ADDR				0x00000cc0



#define REG_A3XX_RB_DEBUG_ECO_CONTROLS_ADDR			0x00000cc1



#define REG_A3XX_RB_PERFCOUNTER0_SELECT				0x00000cc6



#define REG_A3XX_RB_PERFCOUNTER1_SELECT				0x00000cc7



#define REG_A3XX_RB_WINDOW_SIZE					0x00000ce0

#define A3XX_RB_WINDOW_SIZE_WIDTH__MASK				0x00003fff

#define A3XX_RB_WINDOW_SIZE_WIDTH__SHIFT			0

static inline uint32_t A3XX_RB_WINDOW_SIZE_WIDTH(uint32_t val)

#define REG_A3XX_RB_FRAME_BUFFER_DIMENSION			0x00000ce0

#define A3XX_RB_FRAME_BUFFER_DIMENSION_WIDTH__MASK		0x00003fff

#define A3XX_RB_FRAME_BUFFER_DIMENSION_WIDTH__SHIFT		0

static inline uint32_t A3XX_RB_FRAME_BUFFER_DIMENSION_WIDTH(uint32_t val)

{

	return ((val) << A3XX_RB_WINDOW_SIZE_WIDTH__SHIFT) & A3XX_RB_WINDOW_SIZE_WIDTH__MASK;

	return ((val) << A3XX_RB_FRAME_BUFFER_DIMENSION_WIDTH__SHIFT) & A3XX_RB_FRAME_BUFFER_DIMENSION_WIDTH__MASK;

}

#define A3XX_RB_WINDOW_SIZE_HEIGHT__MASK			0x0fffc000

#define A3XX_RB_WINDOW_SIZE_HEIGHT__SHIFT			14

static inline uint32_t A3XX_RB_WINDOW_SIZE_HEIGHT(uint32_t val)

#define A3XX_RB_FRAME_BUFFER_DIMENSION_HEIGHT__MASK		0x0fffc000

#define A3XX_RB_FRAME_BUFFER_DIMENSION_HEIGHT__SHIFT		14

static inline uint32_t A3XX_RB_FRAME_BUFFER_DIMENSION_HEIGHT(uint32_t val)

{

	return ((val) << A3XX_RB_WINDOW_SIZE_HEIGHT__SHIFT) & A3XX_RB_WINDOW_SIZE_HEIGHT__MASK;

	return ((val) << A3XX_RB_FRAME_BUFFER_DIMENSION_HEIGHT__SHIFT) & A3XX_RB_FRAME_BUFFER_DIMENSION_HEIGHT__MASK;

}



#define REG_A3XX_HLSQ_PERFCOUNTER0_SELECT			0x00000e00
@@ -2088,6 +2112,14 @@ static inline uint32_t A3XX_UCHE_CACHE_INVALIDATE1_REG_OPCODE(enum a3xx_cache_op 


#define REG_A3XX_TP_PERFCOUNTER5_SELECT				0x00000f09



#define REG_A3XX_VGT_CL_INITIATOR				0x000021f0



#define REG_A3XX_VGT_EVENT_INITIATOR				0x000021f9



#define REG_A3XX_VGT_DRAW_INITIATOR				0x000021fc



#define REG_A3XX_VGT_IMMED_DATA					0x000021fd



#define REG_A3XX_TEX_SAMP_0					0x00000000

#define A3XX_TEX_SAMP_0_MIPFILTER_LINEAR			0x00000002

#define A3XX_TEX_SAMP_0_XY_MAG__MASK				0x0000000c
@@ -2123,6 +2155,18 @@ static inline uint32_t A3XX_TEX_SAMP_0_WRAP_R(enum a3xx_tex_clamp val) 
#define A3XX_TEX_SAMP_0_UNNORM_COORDS				0x80000000



#define REG_A3XX_TEX_SAMP_1					0x00000001

#define A3XX_TEX_SAMP_1_MAX_LOD__MASK				0x003ff000

#define A3XX_TEX_SAMP_1_MAX_LOD__SHIFT				12

static inline uint32_t A3XX_TEX_SAMP_1_MAX_LOD(float val)

{

	return ((((uint32_t)(val * 12.0))) << A3XX_TEX_SAMP_1_MAX_LOD__SHIFT) & A3XX_TEX_SAMP_1_MAX_LOD__MASK;

}

#define A3XX_TEX_SAMP_1_MIN_LOD__MASK				0xffc00000

#define A3XX_TEX_SAMP_1_MIN_LOD__SHIFT				22

static inline uint32_t A3XX_TEX_SAMP_1_MIN_LOD(float val)

{

	return ((((uint32_t)(val * 12.0))) << A3XX_TEX_SAMP_1_MIN_LOD__SHIFT) & A3XX_TEX_SAMP_1_MIN_LOD__MASK;

}



#define REG_A3XX_TEX_CONST_0					0x00000000

#define A3XX_TEX_CONST_0_TILED					0x00000001