Skip to content

Commit 4636f17

Browse files
committed
drm/vc4: hvs: Partial revert of Support BCM2712 HVS
This partially reverts 1473149 to avoid an upcoming merge conflict Signed-off-by: Dom Cobley <[email protected]>
1 parent c4b0b7e commit 4636f17

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

drivers/gpu/drm/vc4/vc4_hvs.c

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1809,9 +1809,14 @@ struct vc4_hvs *__vc4_hvs_alloc(struct vc4_dev *vc4,
18091809
return ERR_PTR(-ENODEV);
18101810
}
18111811

1812-
drm_mm_init(&hvs->dlist_mm, dlist_start, dlist_size);
1813-
1814-
hvs->dlist_mem_size = dlist_size;
1812+
/* Set up the HVS display list memory manager. We never
1813+
* overwrite the setup from the bootloader (just 128b out of
1814+
* our 16K), since we don't want to scramble the screen when
1815+
* transitioning from the firmware's boot setup to runtime.
1816+
*/
1817+
drm_mm_init(&hvs->dlist_mm,
1818+
HVS_BOOTLOADER_DLIST_END,
1819+
(SCALER_DLIST_SIZE >> 2) - HVS_BOOTLOADER_DLIST_END);
18151820

18161821
/* Set up the HVS LBM memory manager. We could have some more
18171822
* complicated data structure that allowed reuse of LBM areas

0 commit comments

Comments
 (0)