diff mbox series

[1/2] drm/i915: Fix atomic state leak when resetting HDMI link

Message ID 20190227230408.31390-1-jose.souza@intel.com (mailing list archive)
State New, archived
Headers show
Series [1/2] drm/i915: Fix atomic state leak when resetting HDMI link | expand

Commit Message

Souza, Jose Feb. 27, 2019, 11:04 p.m. UTC
Atomic state needs to be put even if the commit was successful.

Fixes: dba14b27dd3c ("drm/i915: Reinitialize sink scrambling/TMDS clock ratio on HPD")
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Lyude Paul <lyude@redhat.com>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
---
 drivers/gpu/drm/i915/intel_ddi.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

Comments

Souza, Jose Feb. 28, 2019, 12:40 a.m. UTC | #1
On Thu, 2019-02-28 at 00:19 +0000, Patchwork wrote:
> == Series Details ==
> 
> Series: series starting with [1/2] drm/i915: Fix atomic state leak
> when resetting HDMI link
> URL   : https://patchwork.freedesktop.org/series/57318/
> State : failure
> 
> == Summary ==
> 
> CI Bug Log - changes from CI_DRM_5668 -> Patchwork_12322
> ====================================================
> 
> Summary
> -------
> 
>   **FAILURE**
> 
>   Serious unknown changes coming with Patchwork_12322 absolutely need
> to be
>   verified manually.
>   
>   If you think the reported changes have nothing to do with the
> changes
>   introduced in Patchwork_12322, please notify your bug team to allow
> them
>   to document this new failure mode, which will reduce false
> positives in CI.
> 
>   External URL: 
> https://patchwork.freedesktop.org/api/1.0/series/57318/revisions/1/
> 
> Possible new issues
> -------------------
> 
>   Here are the unknown changes that may have been introduced in
> Patchwork_12322:
> 
> ### IGT changes ###
> 
> #### Possible regressions ####
> 
>   * igt@i915_selftest@live_objects:
>     - fi-apl-guc:         NOTRUN -> DMESG-WARN

Not related at all.

> 
>   
> Known issues
> ------------
> 
>   Here are the changes found in Patchwork_12322 that come from known
> issues:
> 
> ### IGT changes ###
> 
> #### Issues hit ####
> 
>   * igt@amdgpu/amd_basic@userptr:
>     - fi-kbl-8809g:       PASS -> DMESG-WARN [fdo#108965]
> 
>   * igt@gem_exec_basic@basic-bsd2:
>     - fi-kbl-7500u:       NOTRUN -> SKIP [fdo#109271] +9
> 
>   * igt@i915_selftest@live_hangcheck:
>     - fi-icl-u3:          PASS -> INCOMPLETE [fdo#108569]
> 
>   * igt@i915_selftest@live_requests:
>     - fi-snb-2600:        PASS -> INCOMPLETE [fdo#105411]
> 
>   * igt@kms_chamelium@dp-crc-fast:
>     - fi-kbl-7500u:       NOTRUN -> DMESG-WARN [fdo#103841]
> 
>   * igt@kms_psr@primary_page_flip:
>     - fi-apl-guc:         NOTRUN -> SKIP [fdo#109271] +40
> 
>   * igt@runner@aborted:
>     - fi-kbl-7500u:       NOTRUN -> FAIL [fdo#103841]
> 
>   
> #### Possible fixes ####
> 
>   * igt@gem_exec_suspend@basic-s3:
>     - fi-apl-guc:         DMESG-WARN -> PASS
>     - {fi-icl-y}:         FAIL [fdo#103375] -> PASS
> 
>   * igt@gem_exec_suspend@basic-s4-devices:
>     - {fi-icl-y}:         FAIL -> PASS
> 
>   * igt@gem_mmap_gtt@basic-small-copy:
>     - {fi-icl-y}:         TIMEOUT -> PASS
> 
>   * igt@kms_busy@basic-flip-b:
>     - {fi-icl-y}:         FAIL [fdo#103182] -> PASS
> 
>   
>   {name}: This element is suppressed. This means it is ignored when
> computing
>           the status of the difference (SUCCESS, WARNING, or
> FAILURE).
> 
>   [fdo#103182]: https://bugs.freedesktop.org/show_bug.cgi?id=103182
>   [fdo#103375]: https://bugs.freedesktop.org/show_bug.cgi?id=103375
>   [fdo#103841]: https://bugs.freedesktop.org/show_bug.cgi?id=103841
>   [fdo#105411]: https://bugs.freedesktop.org/show_bug.cgi?id=105411
>   [fdo#108569]: https://bugs.freedesktop.org/show_bug.cgi?id=108569
>   [fdo#108965]: https://bugs.freedesktop.org/show_bug.cgi?id=108965
>   [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
> 
> 
> Participating hosts (42 -> 39)
> ------------------------------
> 
>   Additional (1): fi-kbl-7500u 
>   Missing    (4): fi-ilk-m540 fi-byt-squawks fi-bsw-cyan fi-hsw-
> 4200u 
> 
> 
> Build changes
> -------------
> 
>     * Linux: CI_DRM_5668 -> Patchwork_12322
> 
>   CI_DRM_5668: f31df5b814fb600861b577e2bc2cdb75c8c3e323 @
> git://anongit.freedesktop.org/gfx-ci/linux
>   IGT_4861: 017d8461ae509b2d8ef5f585de8ad908081d28a0 @
> git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
>   Patchwork_12322: 8c1a39496e922ad945fb891f7c5ecb36c2ff238f @
> git://anongit.freedesktop.org/gfx-ci/linux
> 
> 
> == Linux commits ==
> 
> 8c1a39496e92 drm/i915: Don't manually add connectors and planes state
> ae104db6497b drm/i915: Fix atomic state leak when resetting HDMI link
> 
> == Logs ==
> 
> For more details see: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12322/
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Ville Syrjälä Feb. 28, 2019, 11:35 a.m. UTC | #2
On Wed, Feb 27, 2019 at 03:04:07PM -0800, José Roberto de Souza wrote:
> Atomic state needs to be put even if the commit was successful.
> 
> Fixes: dba14b27dd3c ("drm/i915: Reinitialize sink scrambling/TMDS clock ratio on HPD")
> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Cc: Lyude Paul <lyude@redhat.com>
> Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
> ---
>  drivers/gpu/drm/i915/intel_ddi.c | 7 +------
>  1 file changed, 1 insertion(+), 6 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
> index d918be927fc2..34dd5823398a 100644
> --- a/drivers/gpu/drm/i915/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/intel_ddi.c
> @@ -3984,12 +3984,7 @@ static int modeset_pipe(struct drm_crtc *crtc,
>  		goto out;
>  
>  	ret = drm_atomic_commit(state);
> -	if (ret)
> -		goto out;
> -
> -	return 0;
> -
> - out:
> +out:

/me curses at that counterproductive codingstyle recommendation

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

>  	drm_atomic_state_put(state);
>  
>  	return ret;
> -- 
> 2.21.0
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index d918be927fc2..34dd5823398a 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -3984,12 +3984,7 @@  static int modeset_pipe(struct drm_crtc *crtc,
 		goto out;
 
 	ret = drm_atomic_commit(state);
-	if (ret)
-		goto out;
-
-	return 0;
-
- out:
+out:
 	drm_atomic_state_put(state);
 
 	return ret;