Merge "msm: mdss: expand vbif debug bus for msmcobalt" (4b80b64e) · Commits · e / devices / android_kernel_sony_msm8998

drivers/video/fbdev/msm/mdss_debug.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -57,6 +57,7 @@ struct vbif_debug_bus {
		u32 block_bus_addr;
		u32 bit_offset;
		u32 block_cnt;
		u32 test_pnt_start;
		u32 test_pnt_cnt;
		};

drivers/video/fbdev/msm/mdss_debug_xlog.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -312,7 +312,7 @@ static void __vbif_debug_bus(struct vbif_debug_bus *head,
		vbif_base + head->block_bus_addr);
		/* make sure that current bus blcok enable */
		wmb();
		for (j = 0; j < head->test_pnt_cnt; j++) {
		for (j = head->test_pnt_start; j < head->test_pnt_cnt; j++) {
		writel_relaxed(j, vbif_base + head->block_bus_addr + 4);
		/* make sure that test point is enabled */
		wmb();

drivers/video/fbdev/msm/mdss_mdp_debug.c

+18 −9

Original line number	Diff line number	Diff line
		@@ -1715,17 +1715,26 @@ static struct debug_bus dbg_bus_msmcobalt[] = {
		{ 0x418, 60, 0},
		};


		static struct vbif_debug_bus vbif_dbg_bus_8996[] = {
		{0x214, 0x21c, 16, 2, 0x10}, /* arb clients */
		{0x214, 0x21c, 0, 14, 0x13}, /* xin blocks - axi side */
		{0x21c, 0x214, 0, 14, 0xc}, /* xin blocks - clock side */
		{0x214, 0x21c, 16, 2, 0, 0x10}, /* arb clients */
		{0x214, 0x21c, 0, 14, 0, 0x13}, /* xin blocks - axi side */
		{0x21c, 0x214, 0, 14, 0, 0xc}, /* xin blocks - clock side */
		};

		static struct vbif_debug_bus nrt_vbif_dbg_bus_8996[] = {
		{0x214, 0x21c, 16, 1, 0x10}, /* arb clients */
		{0x214, 0x21c, 0, 12, 0x13}, /* xin blocks - axi side */
		{0x21c, 0x214, 0, 12, 0xc}, /* xin blocks - clock side */
		{0x214, 0x21c, 16, 1, 0, 0x10}, /* arb clients */
		{0x214, 0x21c, 0, 12, 0, 0x13}, /* xin blocks - axi side */
		{0x21c, 0x214, 0, 12, 0, 0xc}, /* xin blocks - clock side */
		};

		static struct vbif_debug_bus vbif_dbg_bus_msmcobalt[] = {
		{0x214, 0x21c, 16, 2, 0x0, 0xd}, /* arb clients */
		{0x214, 0x21c, 16, 2, 0x80, 0xc0}, /* arb clients */
		{0x214, 0x21c, 16, 2, 0x100, 0x140}, /* arb clients */
		{0x214, 0x21c, 0, 16, 0x0, 0xf}, /* xin blocks - axi side */
		{0x214, 0x21c, 0, 16, 0x80, 0xa4}, /* xin blocks - axi side */
		{0x214, 0x21c, 0, 15, 0x100, 0x124}, /* xin blocks - axi side */
		{0x21c, 0x214, 0, 14, 0, 0xc}, /* xin blocks - clock side */
		};

		void mdss_mdp_hw_rev_debug_caps_init(struct mdss_data_type *mdata)
		@@ -1750,8 +1759,8 @@ void mdss_mdp_hw_rev_debug_caps_init(struct mdss_data_type *mdata)
		case MDSS_MDP_HW_REV_301:
		mdata->dbg_bus = dbg_bus_msmcobalt;
		mdata->dbg_bus_size = ARRAY_SIZE(dbg_bus_msmcobalt);
		mdata->vbif_dbg_bus = vbif_dbg_bus_8996;
		mdata->vbif_dbg_bus_size = ARRAY_SIZE(vbif_dbg_bus_8996);
		mdata->vbif_dbg_bus = vbif_dbg_bus_msmcobalt;
		mdata->vbif_dbg_bus_size = ARRAY_SIZE(vbif_dbg_bus_msmcobalt);
		mdata->nrt_vbif_dbg_bus = nrt_vbif_dbg_bus_8996;
		mdata->nrt_vbif_dbg_bus_size =
		ARRAY_SIZE(nrt_vbif_dbg_bus_8996);