Skip to contentSkip to conversation

drm/i915: remove redundant fbc warnings

PATCH Applied Matthew Auld 5 participants 5 messages Jul 5, 2016 – Aug 2, 2016

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915: remove redundant fbc warnings

The fbc enabled/active sanity checks are already done in __intel_fbc_disable so no need to do them again.

---
 drivers/gpu/drm/i915/intel_fbc.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/gpu/drm/i915/intel_fbc.c +1 -4
index 067b6f5..e77104d 100644
@@ -1163,11 +1163,8 @@ void intel_fbc_disable(struct intel_crtc *crtc)
 		return;
 
 	mutex_lock(&fbc->lock);
-	if (fbc->crtc == crtc) {
-		WARN_ON(!fbc->enabled);
-		WARN_ON(fbc->active);
+	if (fbc->crtc == crtc)
 		__intel_fbc_disable(dev_priv);
-	}
 	mutex_unlock(&fbc->lock);
 
 	cancel_work_sync(&fbc->work.work);
Signature · 6 lines
2.7.4

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

✗ Ro.CI.BAT: failure for drm/i915: remove redundant fbc warnings

== Series Details ==

== Series Details ==

Series: drm/i915: remove redundant fbc warnings
URL : https://patchwork.freedesktop.org/series/9509/
State : failure

== Summary ==

Series 9509v1 drm/i915: remove redundant fbc warnings
http://patchwork.freedesktop.org/api/1.0/series/9509/revisions/1/mbox

Test gem_exec_flush:

        Subgroup basic-batch-kernel-default-cmd:
                pass       -> FAIL       (ro-byt-n2820)
Test gem_exec_suspend:
        Subgroup basic-s3:
                incomplete -> PASS       (fi-snb-i7-2600)
Test gem_mmap:
        Subgroup basic:
                incomplete -> PASS       (fi-skl-i7-6700k)
Test kms_cursor_legacy:
        Subgroup basic-cursor-vs-flip:
                dmesg-warn -> PASS       (fi-skl-i5-6260u)
Test kms_pipe_crc_basic:
        Subgroup nonblocking-crc-pipe-b-frame-sequence:
                pass       -> SKIP       (fi-skl-i5-6260u)
        Subgroup nonblocking-crc-pipe-c-frame-sequence:
                skip       -> PASS       (fi-skl-i5-6260u)
        Subgroup read-crc-pipe-b:
                skip       -> PASS       (fi-skl-i5-6260u)
        Subgroup suspend-read-crc-pipe-c:
                pass       -> SKIP       (fi-skl-i5-6260u)
fi-kbl-qkkr      total:234  pass:162  dwarn:30  dfail:0   fail:2   skip:40 
fi-skl-i5-6260u  total:234  pass:204  dwarn:0   dfail:0   fail:2   skip:28 
fi-skl-i7-6700k  total:234  pass:191  dwarn:0   dfail:1   fail:2   skip:40 
fi-snb-i7-2600   total:234  pass:178  dwarn:0   dfail:0   fail:2   skip:54 
ro-bdw-i5-5250u  total:229  pass:204  dwarn:2   dfail:1   fail:0   skip:22 
ro-bdw-i7-5557U  total:229  pass:203  dwarn:1   dfail:2   fail:0   skip:23 
ro-bdw-i7-5600u  total:229  pass:190  dwarn:0   dfail:1   fail:0   skip:38 
ro-bsw-n3050     total:229  pass:177  dwarn:0   dfail:1   fail:2   skip:49 
ro-byt-n2820     total:229  pass:180  dwarn:0   dfail:1   fail:3   skip:45 
ro-hsw-i3-4010u  total:229  pass:197  dwarn:0   dfail:1   fail:0   skip:31 
ro-hsw-i7-4770r  total:229  pass:197  dwarn:0   dfail:1   fail:0   skip:31 
ro-ilk-i7-620lm  total:229  pass:157  dwarn:0   dfail:1   fail:1   skip:70 
ro-ilk1-i5-650   total:224  pass:157  dwarn:0   dfail:1   fail:1   skip:65 
ro-ivb-i7-3770   total:229  pass:188  dwarn:0   dfail:1   fail:0   skip:40 
ro-skl3-i5-6260u total:229  pass:208  dwarn:1   dfail:1   fail:0   skip:19 
ro-snb-i7-2620M  total:229  pass:179  dwarn:0   dfail:1   fail:1   skip:48 

Results at /archive/results/CI_IGT_test/RO_Patchwork_1413/

0a1ed46 drm-intel-nightly: 2016y-07m-04d-15h-39m-24s UTC integration manifest b12be8d drm/i915: remove redundant fbc warnings

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

maintainer Applied
#3 lore raw

Re: ✗ Ro.CI.BAT: failure for drm/i915: remove redundant fbc warnings

Merged, thanks for the patch and review.

Quoted 5 lines · Matthew Auld
Quoted 4 lines

Test gem_exec_flush:
        Subgroup basic-batch-kernel-default-cmd:
                pass       -> FAIL       (ro-byt-n2820)

https://bugs.freedesktop.org/show_bug.cgi?id=95372

Signature · 7 lines
Joonas Lahtinen
Open Source Technology Center
Intel Corporation
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v1 1/1
#4 lore raw
In reply to Matthew Auld

Em Ter, 2016-07-05 às 10:28 +0100, Matthew Auld escreveu:

Quoted 4 lines

The fbc enabled/active sanity checks are already done in __intel_fbc_disable so no need to do them again.

Quoted 20 lines

---
 drivers/gpu/drm/i915/intel_fbc.c | 5 +----

 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/gpu/drm/i915/intel_fbc.c +0 -0
index 067b6f5..e77104d 100644
@@ -1163,11 +1163,8 @@ void intel_fbc_disable(struct intel_crtc
 *crtc)
  		return;


  mutex_lock(&fbc->lock);

drivers/gpu/drm/i915/intel_fbc.c +1 -3
-	if (fbc->crtc == crtc) {
-		WARN_ON(!fbc->enabled);
-		WARN_ON(fbc->active);
+	if (fbc->crtc == crtc)

  __intel_fbc_disable(dev_priv);

drivers/gpu/drm/i915/intel_fbc.c +0 -1
-	}
Quoted 3 lines

  mutex_unlock(&fbc->lock);

  cancel_work_sync(&fbc->work.work);

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx