UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/vc4: Fix some failure to track __iomem decorations on pointers. 

Caught by the kbuild test robot.

v2: Fix the +i I dropped in the first version.

Signed-off-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Eric Anholt 2015-10-23 10:24:11 +01:00
parent 79513237da
commit 36f4f69a09
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/gpu/drm/vc4/vc4_crtc.c
View File

@ -401,7 +401,8 @@ static void vc4_crtc_atomic_flush(struct drm_crtc *crtc,
dlist_next++; dlist_next++;
HVS_WRITE(SCALER_DISPLISTX(vc4_crtc->channel), HVS_WRITE(SCALER_DISPLISTX(vc4_crtc->channel),
(u32 *)vc4_crtc->dlist - (u32 *)vc4->hvs->dlist); (u32 __iomem *)vc4_crtc->dlist -
(u32 __iomem *)vc4->hvs->dlist);
/* Make the next display list start after ours. */ /* Make the next display list start after ours. */
vc4_crtc->dlist_size -= (dlist_next - vc4_crtc->dlist); vc4_crtc->dlist_size -= (dlist_next - vc4_crtc->dlist);

8
drivers/gpu/drm/vc4/vc4_hvs.c
View File

@ -75,10 +75,10 @@ void vc4_hvs_dump_state(struct drm_device *dev)
for (i = 0; i < 64; i += 4) { for (i = 0; i < 64; i += 4) {
DRM_INFO("0x%08x (%s): 0x%08x 0x%08x 0x%08x 0x%08x\n", DRM_INFO("0x%08x (%s): 0x%08x 0x%08x 0x%08x 0x%08x\n",
i * 4, i < HVS_BOOTLOADER_DLIST_END ? "B" : "D", i * 4, i < HVS_BOOTLOADER_DLIST_END ? "B" : "D",
((uint32_t *)vc4->hvs->dlist)[i + 0], readl((u32 __iomem *)vc4->hvs->dlist + i + 0),
((uint32_t *)vc4->hvs->dlist)[i + 1], readl((u32 __iomem *)vc4->hvs->dlist + i + 1),
((uint32_t *)vc4->hvs->dlist)[i + 2], readl((u32 __iomem *)vc4->hvs->dlist + i + 2),
((uint32_t *)vc4->hvs->dlist)[i + 3]); readl((u32 __iomem *)vc4->hvs->dlist + i + 3));
} }
} }