drm: Branch 'master' - 2 commits

 tests/util/kms.c |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 2ee1fd2470e96473f27080c01c5ecd710a6ab6c8
Author: Eric Anholt <[email protected]>
Date:   Tue Apr 25 11:31:27 2017 -0700

    Add the DPI encoder/connector types to KMS utils.
    
    Signed-off-by: Eric Anholt <[email protected]>
    Reviewed-by: Daniel Stone <[email protected]>

diff --git a/tests/util/kms.c b/tests/util/kms.c
index c008f78a..028cc8d9 100644
--- a/tests/util/kms.c
+++ b/tests/util/kms.c
@@ -79,6 +79,7 @@ static const struct type_name encoder_type_names[] = {
 	{ DRM_MODE_ENCODER_VIRTUAL, "Virtual" },
 	{ DRM_MODE_ENCODER_DSI, "DSI" },
 	{ DRM_MODE_ENCODER_DPMST, "DPMST" },
+	{ DRM_MODE_ENCODER_DPI, "DPI" },
 };
 
 const char *util_lookup_encoder_type_name(unsigned int type)
@@ -117,6 +118,7 @@ static const struct type_name connector_type_names[] = {
 	{ DRM_MODE_CONNECTOR_eDP, "eDP" },
 	{ DRM_MODE_CONNECTOR_VIRTUAL, "Virtual" },
 	{ DRM_MODE_CONNECTOR_DSI, "DSI" },
+	{ DRM_MODE_CONNECTOR_DPI, "DPI" },
 };
 
 const char *util_lookup_connector_type_name(unsigned int type)
commit d75a7ef1d7353cd122e5f8e975e69d2446eaad74
Author: Eric Anholt <[email protected]>
Date:   Tue Apr 25 11:29:33 2017 -0700

    Add pl111 as a KMS driver for utils.
    
    Signed-off-by: Eric Anholt <[email protected]>
    Reviewed-by: Daniel Stone <[email protected]>

diff --git a/tests/util/kms.c b/tests/util/kms.c
index 959b6881..c008f78a 100644
--- a/tests/util/kms.c
+++ b/tests/util/kms.c
@@ -145,6 +145,7 @@ static const char * const modules[] = {
 	"virtio_gpu",
 	"mediatek",
 	"meson",
+	"pl111",
 };
 
 int util_open(const char *device, const char *module)

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
--