[PATCH] drm/i915: Remove unnecessary null check in execlists_context_unqueue

[PATCH] drm/i915: Remove unnecessary null check in execlists_context_unqueue

[Michel Thierry]

commit 53292cdb066950611e5bc2e0eb109c7edb42af78 ("drm/i915: Workaround
to avoid lite restore with HEAD==TAIL") added a check for req0 != null
which is unnecessary.

The only way req0 could be null is if the list was empty, and this is
already addressed at the beginning of execlists_context_unqueue().

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Michel Thierry <michel.thierry@intel.com>
---
 drivers/gpu/drm/i915/intel_lrc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
index fa129b8..199a154 100644
--- a/drivers/gpu/drm/i915/intel_lrc.c
+++ b/drivers/gpu/drm/i915/intel_lrc.c
@@ -432,7 +432,7 @@ static void execlists_context_unqueue(struct intel_engine_cs *ring)
 		 * WaIdleLiteRestore: make sure we never cause a lite
 		 * restore with HEAD==TAIL
 		 */
-		if (req0 && req0->elsp_submitted) {
+		if (req0->elsp_submitted) {
 			/*
 			 * Apply the wa NOOPS to prevent ring:HEAD == req:TAIL
 			 * as we resubmit the request. See gen8_emit_request()
-- 
2.1.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: Remove unnecessary null check in execlists_context_unqueue

[shuang.he]

Tested-By: Intel Graphics QA PRTS (Patch Regression Test System Contact: shuang.he@intel.com)
Task id: 6268
-------------------------------------Summary-------------------------------------
Platform          Delta          drm-intel-nightly          Series Applied
PNV                                  276/276              276/276
ILK                                  302/302              302/302
SNB                                  316/316              316/316
IVB                                  264/264              264/264
BYT                 -3              227/227              224/227
BDW                                  318/318              318/318
-------------------------------------Detailed-------------------------------------
Platform  Test                                drm-intel-nightly          Series Applied
*BYT  igt@gem_dummy_reloc_loop@render      FAIL(1)PASS(3)      TIMEOUT(1)PASS(1)
 BYT  igt@gem_pipe_control_store_loop@fresh-buffer      FAIL(1)TIMEOUT(2)PASS(2)      TIMEOUT(2)
*BYT  igt@gem_threaded_access_tiled      FAIL(1)PASS(2)      DMESG_WARN(1)
(dmesg patch applied)drm:check_crtc_state[i915]]*ERROR*mismatch_in_has_infoframe(expected#,found#)@mismatch in has_infoframe .* found
WARNING:at_drivers/gpu/drm/i915/intel_display.c:#check_crtc_state[i915]()@WARNING:.* at .* check_crtc_state+0x
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: Remove unnecessary null check in execlists_context_unqueue

[Jani Nikula]

On Mon, 27 Apr 2015, Michel Thierry <michel.thierry@intel.com> wrote:
> commit 53292cdb066950611e5bc2e0eb109c7edb42af78 ("drm/i915: Workaround
> to avoid lite restore with HEAD==TAIL") added a check for req0 != null
> which is unnecessary.
>
> The only way req0 could be null is if the list was empty, and this is
> already addressed at the beginning of execlists_context_unqueue().
>
> Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
> Signed-off-by: Michel Thierry <michel.thierry@intel.com>

Reviewed-by: Jani Nikula <jani.nikula@intel.com>


> ---
>  drivers/gpu/drm/i915/intel_lrc.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
> index fa129b8..199a154 100644
> --- a/drivers/gpu/drm/i915/intel_lrc.c
> +++ b/drivers/gpu/drm/i915/intel_lrc.c
> @@ -432,7 +432,7 @@ static void execlists_context_unqueue(struct intel_engine_cs *ring)
>  		 * WaIdleLiteRestore: make sure we never cause a lite
>  		 * restore with HEAD==TAIL
>  		 */
> -		if (req0 && req0->elsp_submitted) {
> +		if (req0->elsp_submitted) {
>  			/*
>  			 * Apply the wa NOOPS to prevent ring:HEAD == req:TAIL
>  			 * as we resubmit the request. See gen8_emit_request()
> -- 
> 2.1.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: Remove unnecessary null check in execlists_context_unqueue

[Daniel Vetter]

On Wed, May 27, 2015 at 12:49:52PM +0300, Jani Nikula wrote:
> On Mon, 27 Apr 2015, Michel Thierry <michel.thierry@intel.com> wrote:
> > commit 53292cdb066950611e5bc2e0eb109c7edb42af78 ("drm/i915: Workaround
> > to avoid lite restore with HEAD==TAIL") added a check for req0 != null
> > which is unnecessary.
> >
> > The only way req0 could be null is if the list was empty, and this is
> > already addressed at the beginning of execlists_context_unqueue().
> >
> > Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
> > Signed-off-by: Michel Thierry <michel.thierry@intel.com>
> 
> Reviewed-by: Jani Nikula <jani.nikula@intel.com>

Queued for -next, thanks for the patch.
-Daniel

> 
> 
> > ---
> >  drivers/gpu/drm/i915/intel_lrc.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
> > index fa129b8..199a154 100644
> > --- a/drivers/gpu/drm/i915/intel_lrc.c
> > +++ b/drivers/gpu/drm/i915/intel_lrc.c
> > @@ -432,7 +432,7 @@ static void execlists_context_unqueue(struct intel_engine_cs *ring)
> >  		 * WaIdleLiteRestore: make sure we never cause a lite
> >  		 * restore with HEAD==TAIL
> >  		 */
> > -		if (req0 && req0->elsp_submitted) {
> > +		if (req0->elsp_submitted) {
> >  			/*
> >  			 * Apply the wa NOOPS to prevent ring:HEAD == req:TAIL
> >  			 * as we resubmit the request. See gen8_emit_request()
> > -- 
> > 2.1.1
> >
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
> 
> -- 
> Jani Nikula, Intel Open Source Technology Center
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx