py: use ResourceManager

diff --git a/py/alpha-test.py b/py/alpha-test.py
index 113fab0ad73cdd597e55cc986280cd8a273b97d4..c6ec8ee0eae8f4e5476992bf62e44d650b97ac44 100755 (executable)
--- a/py/alpha-test.py
+++ b/py/alpha-test.py
@@ -9,10 +9,10 @@ card = pykms.Card()
 card = 0
 
 card = pykms.Card()
-
-conn = card.get_first_connected_connector()
+res = pykms.ResourceManager(card)
+conn = res.reserve_connector()
+crtc = res.reserve_crtc(conn)
 mode = conn.get_default_mode()
-crtc = get_crtc_for_connector(conn)
 
 planes = []
 for p in card.planes:

diff --git a/py/db.py b/py/db.py
index 60737650a95b9096f57fa3cf0e4711673dbf50ac..3ffb716b02792270fdfadef3d3138629afdc9d16 100755 (executable)
--- a/py/db.py
+++ b/py/db.py
@@ -41,9 +41,10 @@ class FlipHandler(pykms.PageFlipHandlerBase):
 
 
 card = pykms.Card()
-conn = card.get_first_connected_connector()
+res = pykms.ResourceManager(card)
+conn = res.reserve_connector()
+crtc = res.reserve_crtc(conn)
 mode = conn.get_default_mode()
-crtc = get_crtc_for_connector(conn)
 
 fliphandler = FlipHandler()
 

diff --git a/py/functest.py b/py/functest.py
index c2548fa044f45defbed698a81c586a20e93fe33d..44c29fb9a18ce778317bf55688ee2bb1371583e8 100755 (executable)
--- a/py/functest.py
+++ b/py/functest.py
@@ -4,16 +4,15 @@ import pykms
 from helpers import *
 
 card = pykms.Card()
-
-conn = card.get_first_connected_connector()
+res = pykms.ResourceManager(card)
+conn = res.reserve_connector()
+crtc = res.reserve_crtc(conn)
 
 mode = conn.get_default_mode()
 
 fb = pykms.DumbFramebuffer(card, mode.hdisplay, mode.vdisplay, "XR24");
 pykms.draw_test_pattern(fb);
 
-crtc = get_crtc_for_connector(conn)
-
 crtc.set_mode(conn, fb, mode)
 
 print("OK")

diff --git a/py/gamma.py b/py/gamma.py
index e1daa43929beef7c745c5a01491a0a1768adfa59..a6b68cccd2af82b45ad560407f1cb0b938a7706e 100755 (executable)
--- a/py/gamma.py
+++ b/py/gamma.py
@@ -8,10 +8,10 @@ card = pykms.Card()
 card = 0
 
 card = pykms.Card()
-
-conn = card.get_first_connected_connector()
+res = pykms.ResourceManager(card)
+conn = res.reserve_connector()
+crtc = res.reserve_crtc(conn)
 mode = conn.get_default_mode()
-crtc = get_crtc_for_connector(conn)
 
 fb = pykms.DumbFramebuffer(card, mode.hdisplay, mode.vdisplay, "XR24");
 pykms.draw_test_pattern(fb);

diff --git a/py/helpers.py b/py/helpers.py
index e92163ceaac9c92015a8300da0ef859a0542d0fe..fd67d4160cb9214d77c9a8e43db0a392b0f879d2 100644 (file)
--- a/py/helpers.py
+++ b/py/helpers.py
@@ -52,15 +52,3 @@ def disable_planes(card):
 
     if areq.commit_sync() != 0:
         print("disabling planes failed")
-
-def get_crtc_for_connector(conn):
-    crtc = conn.get_current_crtc()
-
-    if crtc != None:
-        return crtc
-
-    for crtc in conn.get_possible_crtcs():
-        if crtc.mode_valid == False:
-            return crtc
-
-    raise RuntimeError("No free crtc found")

diff --git a/py/iact.py b/py/iact.py
index 518dbfa18ca407dfd99d4513c6a827fd24ec5e3d..fecd899f056e58ac8b53dad5bc7c497c8b719efd 100755 (executable)
--- a/py/iact.py
+++ b/py/iact.py
@@ -9,16 +9,15 @@ from math import cos
 from helpers import *
 
 card = pykms.Card()
-
-conn = card.get_first_connected_connector()
+res = pykms.ResourceManager(card)
+conn = res.reserve_connector()
+crtc = res.reserve_crtc(conn)
 
 mode = conn.get_default_mode()
 
 fb = pykms.DumbFramebuffer(card, 200, 200, "XR24");
 pykms.draw_test_pattern(fb);
 
-crtc = get_crtc_for_connector(conn)
-
 #crtc.set_mode(conn, fb, mode)
 
 i = 0

diff --git a/py/test.py b/py/test.py
index 7625f101213e10aa3e07f9605464638eeaf239b1..9c23b5b4b92950667ba69456549ed199ca0231c2 100755 (executable)
--- a/py/test.py
+++ b/py/test.py
@@ -4,16 +4,15 @@ import pykms
 from helpers import *
 
 card = pykms.Card()
-
-conn = card.get_first_connected_connector()
+res = pykms.ResourceManager(card)
+conn = res.reserve_connector()
+crtc = res.reserve_crtc(conn)
 
 mode = conn.get_default_mode()
 
 fb = pykms.DumbFramebuffer(card, mode.hdisplay, mode.vdisplay, "XR24");
 pykms.draw_test_pattern(fb);
 
-crtc = get_crtc_for_connector(conn)
-
 crtc.set_mode(conn, fb, mode)
 
 input("press enter to exit\n")

diff --git a/py/trans-test.py b/py/trans-test.py
index e80802bbd80794f2d76b091b3f75bbd4e95b3ac8..8c1f9640ff7766ebf16b3016349d220bd5f7cbf6 100755 (executable)
--- a/py/trans-test.py
+++ b/py/trans-test.py
@@ -9,10 +9,10 @@ card = pykms.Card()
 card = 0
 
 card = pykms.Card()
-
-conn = card.get_first_connected_connector()
+res = pykms.ResourceManager(card)
+conn = res.reserve_connector()
+crtc = res.reserve_crtc(conn)
 mode = conn.get_default_mode()
-crtc = get_crtc_for_connector(conn)
 
 planes = []
 for p in card.planes: