drm: Branch 'master'

 tests/modetest/modetest.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit ba68d7bf600125f2755a5b3d6b1a17e8a130ba36
Author: Ville Syrjälä <[email protected]>
Date:   Wed Oct 11 17:58:11 2017 +0300

    modetest: Allow full testing of primary planes
    
    Allow the user to override the default configuration set by setcrtc
    for the primary plane. On some hardware primary planes can be freely
    positioned/sized, and it'd be nice if we can actually test that feature.
    
    Signed-off-by: Ville Syrjälä <[email protected]>

diff --git a/tests/modetest/modetest.c b/tests/modetest/modetest.c
index 8ad4766f..62d93327 100644
--- a/tests/modetest/modetest.c
+++ b/tests/modetest/modetest.c
@@ -1091,7 +1091,8 @@ static int set_plane(struct device *dev, struct plane_arg *p)
 		if (!format_support(ovr, p->fourcc))
 			continue;
 
-		if ((ovr->possible_crtcs & (1 << pipe)) && !ovr->crtc_id) {
+		if ((ovr->possible_crtcs & (1 << pipe)) &&
+		    (ovr->crtc_id == 0 || ovr->crtc_id == p->crtc_id)) {
 			plane_id = ovr->plane_id;
 			break;
 		}

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

--
_______________________________________________
Dri-patches mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/dri-patches