Skip to content
Draft
Changes from all commits
Commits
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
12 changes: 11 additions & 1 deletion picamera2/previews/drm_preview.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,21 +25,26 @@ def add(self, drm_preview):
if self.use_count == 0:
self.card = pykms.Card()
self.resman = pykms.ResourceManager(self.card)
conn = self.resman.reserve_connector()
conn = self.resman.reserve_connector('HDMI-A-2')
self.crtc = self.resman.reserve_crtc(conn)
conn2 = self.resman.reserve_connector('HDMI-A-1')
self.crtc2 = self.resman.reserve_crtc(conn2)
self.use_count += 1
drm_preview.card = self.card
drm_preview.resman = self.resman
drm_preview.crtc = self.crtc
drm_preview.crtc2 = self.crtc2

def remove(self, drm_preview):
drm_preview.card = None
drm_preview.resman = None
drm_preview.crtc = None
drm_preview.crtc2 = None
with self.lock:
self.use_count -= 1
if self.use_count == 0:
self.crtc = None
self.crtc2 = None
self.resman = None
self.card = None
gc.collect()
Expand Down Expand Up @@ -86,6 +91,7 @@ def init_drm(self, x, y, width, height, transform):
DrmPreview._manager.add(self)

self.plane = None
self.plane2 = None
self.drmfbs = {}
self.current = None
self.own_current = False
Expand Down Expand Up @@ -151,9 +157,11 @@ def render_drm(self, picam2, completed_request):
fmt = self.FMT_MAP[pixel_format]

self.plane = self.resman.reserve_overlay_plane(self.crtc, format=fmt)
self.plane2 = self.resman.reserve_overlay_plane(self.crtc2, format=fmt)
if self.plane is None:
# Some display devices may not support "alpha".
self.plane = self.resman.reserve_plane(self.crtc, type=pykms.PlaneType.Primary, format=fmt)
self.plane2 = self.resman.reserve_plane(self.crtc2, type=pykms.PlaneType.Primary, format=fmt)
if self.plane is None:
raise RuntimeError("Failed to reserve DRM plane")
drm_rotation = 1
Expand Down Expand Up @@ -211,6 +219,7 @@ def render_drm(self, picam2, completed_request):

drmfb = self.drmfbs[fb]
ctx.add_plane(self.plane, drmfb, self.crtc, (0, 0, width, height), (x, y, w, h))
ctx.add_plane(self.plane2, drmfb, self.crtc2, (0, 0, width, height), (x, y, w, h))

overlay_new_fb = self.overlay_new_fb
if overlay_new_fb != self.overlay_fb:
Expand Down Expand Up @@ -241,3 +250,4 @@ def stop(self):
self.mem = None
self.fb = None
DrmPreview._manager.remove(self)