Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

soc/integration: Ensure the video framebuffer fits in main RAM #1915

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

soc/integration: Ensure the video framebuffer fits in main RAM #1915

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9f6fef
soc/integration: Ensure the video framebuffer fits in main RAM
davidar Apr 3, 2024
ccbfce9
soc/integration: Improve error handling for framebuffer without sdram
davidar Apr 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions litex/soc/integration/soc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2363,14 +2363,31 @@ def add_video_framebuffer(self, name="video_framebuffer", phy=None, timings="800
timings = timings if isinstance(timings, str) else timings[0]
base = self.mem_map.get(name, None)
if base is None:
base = 0x40c00000
size = 0x800000
# If the intended region isn't contained in the main_ram region, adjust it to fit.
main_ram_region = self.bus.regions.get("main_ram", None)
if main_ram_region is None:
self.logger.error("Video framebuffer requires SDRAM")
raise SoCError()
contained_in_main_ram = (
main_ram_region.origin < base
and base + size < main_ram_region.origin + main_ram_region.size
)
if not contained_in_main_ram:
size = min(size, main_ram_region.size // 2)
base = main_ram_region.origin + main_ram_region.size - size
self.bus.add_region(name, SoCRegion(
origin = 0x40c00000,
size = 0x800000,
origin = base,
size = size,
linker = True)
)
base = self.bus.regions[name].origin
hres = int(timings.split("@")[0].split("x")[0])
vres = int(timings.split("@")[0].split("x")[1])
if not hasattr(self, "sdram"):
self.logger.error("Video framebuffer requires SDRAM")
raise SoCError()
vfb = VideoFrameBuffer(self.sdram.crossbar.get_port(),
hres = hres,
vres = vres,
Expand Down
Loading