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

Commit 36f4f69a authored by Eric Anholt's avatar Eric Anholt
Browse files

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: default avatarEric Anholt <eric@anholt.net>
parent 79513237

drivers/gpu/drm/vc4/vc4_crtc.c

+2 −1
Original line number Diff line number Diff line
@@ -401,7 +401,8 @@ static void vc4_crtc_atomic_flush(struct drm_crtc *crtc, 
		dlist_next++;



		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. */

		vc4_crtc->dlist_size -= (dlist_next - vc4_crtc->dlist);

drivers/gpu/drm/vc4/vc4_hvs.c

+4 −4
Original line number Diff line number Diff line
@@ -75,10 +75,10 @@ void vc4_hvs_dump_state(struct drm_device *dev) 
	for (i = 0; i < 64; i += 4) {

		DRM_INFO("0x%08x (%s): 0x%08x 0x%08x 0x%08x 0x%08x\n",

			 i * 4, i < HVS_BOOTLOADER_DLIST_END ? "B" : "D",

			 ((uint32_t *)vc4->hvs->dlist)[i + 0],

			 ((uint32_t *)vc4->hvs->dlist)[i + 1],

			 ((uint32_t *)vc4->hvs->dlist)[i + 2],

			 ((uint32_t *)vc4->hvs->dlist)[i + 3]);

			 readl((u32 __iomem *)vc4->hvs->dlist + i + 0),

			 readl((u32 __iomem *)vc4->hvs->dlist + i + 1),

			 readl((u32 __iomem *)vc4->hvs->dlist + i + 2),

			 readl((u32 __iomem *)vc4->hvs->dlist + i + 3));

	}

}