xf86-video-intel: 2 commits - src/sna/kgem.c src/sna/sna_display.c

[Chris Wilson]

 src/sna/kgem.c        |    3 +++
 src/sna/sna_display.c |    3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 627ef68a8cd7a51627d5b6a98cb0a5bdb1d9b534
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sat Oct 31 09:27:35 2015 +0000

    sna: Don't extend the display mode cache for an unknown output
    
    When we enable the outputs initially, they only have the desired mode
    inherited from fbcon and have not do a full detect pass. For these we do
    not wish to extend the display mode cache on the output.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index 868d608..cb77b6f 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -1051,7 +1051,8 @@ sna_crtc_force_outputs_on(xf86CrtcPtr crtc)
 			continue;
 
 		__sna_output_dpms(output, DPMSModeOn, false);
-		to_sna_output(output)->last_detect = now;
+		if (to_sna_output(output)->last_detect)
+			to_sna_output(output)->last_detect = now;
 	}
 
 #if XF86_CRTC_VERSION >= 3
commit 0fa1c696b477d53326bab41d254ffcc8a6fa46f4
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sat Oct 31 09:26:40 2015 +0000

    sna: Add a couple more asserts to catch static requests being queued
    
    The static requests are never meant to be added to the request list, so
    assert that they are not on it.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index 156ebc9..181a49f 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -3097,6 +3097,8 @@ static bool __kgem_retire_rq(struct kgem *kgem, struct kgem_request *rq)
 	DBG(("%s: request %d complete\n",
 	     __FUNCTION__, rq->bo->handle));
 	assert(RQ(rq->bo->rq) == rq);
+	assert(rq != (struct kgem_request *)kgem);
+	assert(rq != &kgem->static_request);
 
 	if (rq == kgem->fence[rq->ring])
 		kgem->fence[rq->ring] = NULL;
@@ -3415,6 +3417,7 @@ static void kgem_commit(struct kgem *kgem)
 		gem_close(kgem->fd, rq->bo->handle);
 		kgem_cleanup_cache(kgem);
 	} else {
+		assert(rq != (struct kgem_request *)kgem);
 		assert(rq->ring < ARRAY_SIZE(kgem->requests));
 		list_add_tail(&rq->list, &kgem->requests[rq->ring]);
 		kgem->need_throttle = kgem->need_retire = 1;