projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
19dfe57
)
drm/i915: Drop the eDP check from intel_dp_connector_destroy()
author
Ville Syrjälä
<
[email protected]
>
Mon, 8 Oct 2018 13:46:41 +0000
(16:46 +0300)
committer
Ville Syrjälä
<
[email protected]
>
Tue, 9 Oct 2018 13:35:22 +0000
(16:35 +0300)
As long as the connector was zeroed during allocation calling
intel_panel_fini() is safe even if we haven't initialized
the panel struct explicitly. So let's drop the useless eDP
check from dp connector destruction.
Signed-off-by: Ville Syrjälä <
[email protected]
>
Link:
https://patchwork.freedesktop.org/patch/msgid/
[email protected]
Reviewed-by: Chris Wilson <
[email protected]
>
drivers/gpu/drm/i915/intel_dp.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/i915/intel_dp.c
b/drivers/gpu/drm/i915/intel_dp.c
index 19f0c3f59cbe1b594a4187d5119c90cf62dd5e80..d12f987a6c43e2f53dd0a7fed001d2fbc3d5d42a 100644
(file)
--- a/
drivers/gpu/drm/i915/intel_dp.c
+++ b/
drivers/gpu/drm/i915/intel_dp.c
@@
-5261,12
+5261,7
@@
intel_dp_connector_destroy(struct drm_connector *connector)
if (!IS_ERR_OR_NULL(intel_connector->edid))
kfree(intel_connector->edid);
- /*
- * Can't call intel_dp_is_edp() since the encoder may have been
- * destroyed already.
- */
- if (connector->connector_type == DRM_MODE_CONNECTOR_eDP)
- intel_panel_fini(&intel_connector->panel);
+ intel_panel_fini(&intel_connector->panel);
drm_connector_cleanup(connector);
kfree(connector);