summaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2019-01-17 17:24:25 +0200
committerTomi Valkeinen <tomi.valkeinen@ti.com>2019-01-17 17:43:48 +0200
commitdb0da1f33c7d688e84e9cd7ff0551842bb68ca6f (patch)
tree58abaa24d29b2c592b9de03e1d4c1aaa23e22806 /utils
parentd49777b00e844ac77e0f3b0cfb9b9e07257b4c26 (diff)
card: another try with card constructors
Let's try again with the card constructors. Card::open_modesetting_card() is removed. The main constructor is Card(const std::string& dev_path = ""). If dev_path is set, the device node with that path is used. If dev_path is not set, the behavior is similar as previously, except a modeset capable card is used at the third step: - If KMSXX_DEVICE env variable is set, the card device with that path is opened. - If KMSXX_DRIVER env variable is set, the card with the given driver name and index is opened. The format is either "drvname" or "drvname:idx". - If neither env variable is given, the first modeset capable card is opened. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'utils')
-rw-r--r--utils/kmsblank.cpp2
-rw-r--r--utils/kmsprint.cpp2
-rw-r--r--utils/kmstest.cpp2
-rw-r--r--utils/kmsview.cpp2
4 files changed, 4 insertions, 4 deletions
diff --git a/utils/kmsblank.cpp b/utils/kmsblank.cpp
index 0b51810..286c7f7 100644
--- a/utils/kmsblank.cpp
+++ b/utils/kmsblank.cpp
@@ -27,7 +27,7 @@ static void usage()
int main(int argc, char **argv)
{
- string dev_path = "/dev/dri/card0";
+ string dev_path;
vector<string> conn_strs;
uint32_t time = 0;
diff --git a/utils/kmsprint.cpp b/utils/kmsprint.cpp
index 19cf8b7..9f550c7 100644
--- a/utils/kmsprint.cpp
+++ b/utils/kmsprint.cpp
@@ -497,7 +497,7 @@ static void usage()
int main(int argc, char **argv)
{
- string dev_path = "/dev/dri/card0";
+ string dev_path;
OptionSet optionset = {
Option("|device=", [&dev_path](string s)
diff --git a/utils/kmstest.cpp b/utils/kmstest.cpp
index 37f9e0f..8144117 100644
--- a/utils/kmstest.cpp
+++ b/utils/kmstest.cpp
@@ -444,7 +444,7 @@ struct Arg
string arg;
};
-static string s_device_path = "/dev/dri/card0";
+static string s_device_path;
static vector<Arg> parse_cmdline(int argc, char **argv)
{
diff --git a/utils/kmsview.cpp b/utils/kmsview.cpp
index 04d005d..eea9dde 100644
--- a/utils/kmsview.cpp
+++ b/utils/kmsview.cpp
@@ -38,7 +38,7 @@ static void usage()
int main(int argc, char** argv)
{
uint32_t time = 0;
- string dev_path = "/dev/dri/card0";
+ string dev_path;
string conn_name;
OptionSet optionset = {