diff mbox

drm/i915: remove redundant fbc warnings

Message ID 1467710914-15146-1-git-send-email-matthew.auld@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Matthew Auld July 5, 2016, 9:28 a.m. UTC 
The fbc enabled/active sanity checks are already done in
__intel_fbc_disable so no need to do them again.

Signed-off-by: Matthew Auld <matthew.auld@intel.com>
---
 drivers/gpu/drm/i915/intel_fbc.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

Comments

Zanoni, Paulo R July 28, 2016, 6:29 p.m. UTC | #1 
Em Ter, 2016-07-05 às 10:28 +0100, Matthew Auld escreveu:
> The fbc enabled/active sanity checks are already done in

> __intel_fbc_disable so no need to do them again.

> 

> Signed-off-by: Matthew Auld <matthew.auld@intel.com>


Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>


> ---

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

>  1 file changed, 1 insertion(+), 4 deletions(-)

> 

> diff --git a/drivers/gpu/drm/i915/intel_fbc.c

> b/drivers/gpu/drm/i915/intel_fbc.c

> index 067b6f5..e77104d 100644

> --- a/drivers/gpu/drm/i915/intel_fbc.c

> +++ b/drivers/gpu/drm/i915/intel_fbc.c

> @@ -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);
Matthew Auld Aug. 2, 2016, 11:05 a.m. UTC | #2 
> Test gem_exec_flush:
>         Subgroup basic-batch-kernel-default-cmd:
>                 pass       -> FAIL       (ro-byt-n2820)
https://bugs.freedesktop.org/show_bug.cgi?id=95372
Joonas Lahtinen Aug. 2, 2016, 11:27 a.m. UTC | #3 
Merged, thanks for the patch and review.

On ti, 2016-08-02 at 12:05 +0100, Matthew Auld wrote:
> > 
> > Test gem_exec_flush:
> >         Subgroup basic-batch-kernel-default-cmd:
> >                 pass       -> FAIL       (ro-byt-n2820)
> https://bugs.freedesktop.org/show_bug.cgi?id=95372
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_fbc.c b/drivers/gpu/drm/i915/intel_fbc.c
index 067b6f5..e77104d 100644
--- a/drivers/gpu/drm/i915/intel_fbc.c
+++ b/drivers/gpu/drm/i915/intel_fbc.c
@@ -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);