tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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: Dave Airlie <airlied@redhat.com>

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

Dave Airlie 3ca3a9ea 23aae183

+14 -14
+2 -2
drivers/gpu/drm/drm_dp_mst_topology.c
··· 1507 1507 ulong *entries; 1508 1508 uint nr_entries; 1509 1509 u64 ts_nsec = entry->ts_nsec; 1510 - u64 rem_nsec = do_div(ts_nsec, 1000000000); 1510 + u32 rem_nsec = do_div(ts_nsec, 1000000000); 1511 1511 1512 1512 nr_entries = stack_depot_fetch(entry->backtrace, &entries); 1513 1513 stack_trace_snprint(buf, PAGE_SIZE, entries, nr_entries, 4); 1514 1514 1515 - drm_printf(&p, " %d %ss (last at %5llu.%06llu):\n%s", 1515 + drm_printf(&p, " %d %ss (last at %5llu.%06u):\n%s", 1516 1516 entry->count, 1517 1517 topology_ref_type_to_str(entry->type), 1518 1518 ts_nsec, rem_nsec / 1000, buf);
+12 -12
drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c
··· 352 352 cxdbg = ioremap(res->start, resource_size(res)); 353 353 354 354 if (cxdbg) { 355 - cxdbg_write(cxdbg, REG_A6XX_DBGC_CFG_DBGBUS_CNTLT, 355 + cxdbg_write(cxdbg, REG_A6XX_CX_DBGC_CFG_DBGBUS_CNTLT, 356 356 A6XX_DBGC_CFG_DBGBUS_CNTLT_SEGT(0xf)); 357 357 358 - cxdbg_write(cxdbg, REG_A6XX_DBGC_CFG_DBGBUS_CNTLM, 358 + cxdbg_write(cxdbg, REG_A6XX_CX_DBGC_CFG_DBGBUS_CNTLM, 359 359 A6XX_DBGC_CFG_DBGBUS_CNTLM_ENABLE(0xf)); 360 360 361 - cxdbg_write(cxdbg, REG_A6XX_DBGC_CFG_DBGBUS_IVTL_0, 0); 362 - cxdbg_write(cxdbg, REG_A6XX_DBGC_CFG_DBGBUS_IVTL_1, 0); 363 - cxdbg_write(cxdbg, REG_A6XX_DBGC_CFG_DBGBUS_IVTL_2, 0); 364 - cxdbg_write(cxdbg, REG_A6XX_DBGC_CFG_DBGBUS_IVTL_3, 0); 361 + cxdbg_write(cxdbg, REG_A6XX_CX_DBGC_CFG_DBGBUS_IVTL_0, 0); 362 + cxdbg_write(cxdbg, REG_A6XX_CX_DBGC_CFG_DBGBUS_IVTL_1, 0); 363 + cxdbg_write(cxdbg, REG_A6XX_CX_DBGC_CFG_DBGBUS_IVTL_2, 0); 364 + cxdbg_write(cxdbg, REG_A6XX_CX_DBGC_CFG_DBGBUS_IVTL_3, 0); 365 365 366 - cxdbg_write(cxdbg, REG_A6XX_DBGC_CFG_DBGBUS_BYTEL_0, 366 + cxdbg_write(cxdbg, REG_A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0, 367 367 0x76543210); 368 - cxdbg_write(cxdbg, REG_A6XX_DBGC_CFG_DBGBUS_BYTEL_1, 368 + cxdbg_write(cxdbg, REG_A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1, 369 369 0xFEDCBA98); 370 370 371 - cxdbg_write(cxdbg, REG_A6XX_DBGC_CFG_DBGBUS_MASKL_0, 0); 372 - cxdbg_write(cxdbg, REG_A6XX_DBGC_CFG_DBGBUS_MASKL_1, 0); 373 - cxdbg_write(cxdbg, REG_A6XX_DBGC_CFG_DBGBUS_MASKL_2, 0); 374 - cxdbg_write(cxdbg, REG_A6XX_DBGC_CFG_DBGBUS_MASKL_3, 0); 371 + cxdbg_write(cxdbg, REG_A6XX_CX_DBGC_CFG_DBGBUS_MASKL_0, 0); 372 + cxdbg_write(cxdbg, REG_A6XX_CX_DBGC_CFG_DBGBUS_MASKL_1, 0); 373 + cxdbg_write(cxdbg, REG_A6XX_CX_DBGC_CFG_DBGBUS_MASKL_2, 0); 374 + cxdbg_write(cxdbg, REG_A6XX_CX_DBGC_CFG_DBGBUS_MASKL_3, 0); 375 375 } 376 376 377 377 a6xx_state->debugbus = state_kcalloc(a6xx_state,