Commit 3ca3a9ea authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-fixes-2019-11-06' of... 

Merge tag 'drm-misc-next-fixes-2019-11-06' of git://anongit.freedesktop.org/drm/drm-misc

 into drm-next

msm: Fix up a6xx debugbus register names (Sharat)
mst: Avoid u64 division (Sean)

Cc: Sharat Masetty <smasetty@codeaurora.org>
Cc: Sean Paul <seanpaul@chromium.org>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Sean Paul <sean@poorly.run>
Link: https://patchwork.freedesktop.org/patch/msgid/20191106202730.GA199896@art_vandelay
parents 23aae183 b149cbfe

drivers/gpu/drm/drm_dp_mst_topology.c

+2 −2
Original line number Diff line number Diff line
@@ -1507,12 +1507,12 @@ __dump_topology_ref_history(struct drm_dp_mst_topology_ref_history *history, 
		ulong *entries;

		uint nr_entries;

		u64 ts_nsec = entry->ts_nsec;

		u64 rem_nsec = do_div(ts_nsec, 1000000000);

		u32 rem_nsec = do_div(ts_nsec, 1000000000);



		nr_entries = stack_depot_fetch(entry->backtrace, &entries);

		stack_trace_snprint(buf, PAGE_SIZE, entries, nr_entries, 4);



		drm_printf(&p, "  %d %ss (last at %5llu.%06llu):\n%s",

		drm_printf(&p, "  %d %ss (last at %5llu.%06u):\n%s",

			   entry->count,

			   topology_ref_type_to_str(entry->type),

			   ts_nsec, rem_nsec / 1000, buf);

drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c

+12 −12
Original line number Diff line number Diff line
@@ -352,26 +352,26 @@ static void a6xx_get_debugbus(struct msm_gpu *gpu, 
		cxdbg = ioremap(res->start, resource_size(res));



	if (cxdbg) {

		cxdbg_write(cxdbg, REG_A6XX_DBGC_CFG_DBGBUS_CNTLT,

		cxdbg_write(cxdbg, REG_A6XX_CX_DBGC_CFG_DBGBUS_CNTLT,

			A6XX_DBGC_CFG_DBGBUS_CNTLT_SEGT(0xf));



		cxdbg_write(cxdbg, REG_A6XX_DBGC_CFG_DBGBUS_CNTLM,

		cxdbg_write(cxdbg, REG_A6XX_CX_DBGC_CFG_DBGBUS_CNTLM,

			A6XX_DBGC_CFG_DBGBUS_CNTLM_ENABLE(0xf));



		cxdbg_write(cxdbg, REG_A6XX_DBGC_CFG_DBGBUS_IVTL_0, 0);

		cxdbg_write(cxdbg, REG_A6XX_DBGC_CFG_DBGBUS_IVTL_1, 0);

		cxdbg_write(cxdbg, REG_A6XX_DBGC_CFG_DBGBUS_IVTL_2, 0);

		cxdbg_write(cxdbg, REG_A6XX_DBGC_CFG_DBGBUS_IVTL_3, 0);

		cxdbg_write(cxdbg, REG_A6XX_CX_DBGC_CFG_DBGBUS_IVTL_0, 0);

		cxdbg_write(cxdbg, REG_A6XX_CX_DBGC_CFG_DBGBUS_IVTL_1, 0);

		cxdbg_write(cxdbg, REG_A6XX_CX_DBGC_CFG_DBGBUS_IVTL_2, 0);

		cxdbg_write(cxdbg, REG_A6XX_CX_DBGC_CFG_DBGBUS_IVTL_3, 0);



		cxdbg_write(cxdbg, REG_A6XX_DBGC_CFG_DBGBUS_BYTEL_0,

		cxdbg_write(cxdbg, REG_A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0,

			0x76543210);

		cxdbg_write(cxdbg, REG_A6XX_DBGC_CFG_DBGBUS_BYTEL_1,

		cxdbg_write(cxdbg, REG_A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1,

			0xFEDCBA98);



		cxdbg_write(cxdbg, REG_A6XX_DBGC_CFG_DBGBUS_MASKL_0, 0);

		cxdbg_write(cxdbg, REG_A6XX_DBGC_CFG_DBGBUS_MASKL_1, 0);

		cxdbg_write(cxdbg, REG_A6XX_DBGC_CFG_DBGBUS_MASKL_2, 0);

		cxdbg_write(cxdbg, REG_A6XX_DBGC_CFG_DBGBUS_MASKL_3, 0);

		cxdbg_write(cxdbg, REG_A6XX_CX_DBGC_CFG_DBGBUS_MASKL_0, 0);

		cxdbg_write(cxdbg, REG_A6XX_CX_DBGC_CFG_DBGBUS_MASKL_1, 0);

		cxdbg_write(cxdbg, REG_A6XX_CX_DBGC_CFG_DBGBUS_MASKL_2, 0);

		cxdbg_write(cxdbg, REG_A6XX_CX_DBGC_CFG_DBGBUS_MASKL_3, 0);

	}



	a6xx_state->debugbus = state_kcalloc(a6xx_state,

CRA Git | Maintained and supported by SUSTech CRA and CCSE