OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a89c096
)
drm/i915: Fix atomic state leak when resetting HDMI link
author
José Roberto de Souza
<jose.souza@intel.com>
Sat, 2 Mar 2019 00:33:47 +0000
(16:33 -0800)
committer
Rodrigo Vivi
<rodrigo.vivi@intel.com>
Fri, 8 Mar 2019 17:52:52 +0000
(09:52 -0800)
Atomic state needs to be put even if the commit was successful.
Fixes:
dba14b27dd3c
("drm/i915: Reinitialize sink scrambling/TMDS clock ratio on HPD")
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
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>
Link:
https://patchwork.freedesktop.org/patch/msgid/20190302003349.19189-1-jose.souza@intel.com
(cherry picked from commit
a551cd66bc0a15ba00433743094c2453e1ee7aa9
)
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
drivers/gpu/drm/i915/intel_ddi.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/i915/intel_ddi.c
b/drivers/gpu/drm/i915/intel_ddi.c
index
2323b7c
..
14d580c
100644
(file)
--- a/
drivers/gpu/drm/i915/intel_ddi.c
+++ b/
drivers/gpu/drm/i915/intel_ddi.c
@@
-3969,12
+3969,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;