drm/i915: dp: fix order of dp aux i2c device cleanup
Subsystems (2)
v2 cover drm/i915: dp: fix order of dp aux i2c device cleanup
The main point of this patchset is to fix a driver unload bug caused by incorrect order of dp aux i2c cleanup wrt. destroying the corresponding encoder/connector objects, see the second patch for details.
Tested on vlv/dp.
v2: move all sysfs removal bits to the new connector->unregister
callback (Daniel)
Imre Deak (4):
drm/i915: add unregister callback to connector drm/i915: dp: fix order of dp aux i2c device cleanup drm/i915: sdvo: fix error path in sdvo_connector_init drm/i915: sdvo: add i2c sysfs symlink to the connector's directory
drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_crt.c | 1 + drivers/gpu/drm/i915/intel_display.c | 14 ++++++-- drivers/gpu/drm/i915/intel_dp.c | 23 +++++++++++- drivers/gpu/drm/i915/intel_drv.h | 8 +++++ drivers/gpu/drm/i915/intel_dsi.c | 1 + drivers/gpu/drm/i915/intel_dvo.c | 1 + drivers/gpu/drm/i915/intel_hdmi.c | 1 + drivers/gpu/drm/i915/intel_lvds.c | 1 + drivers/gpu/drm/i915/intel_sdvo.c | 70 +++++++++++++++++++++++++++++++----- drivers/gpu/drm/i915/intel_tv.c | 1 + 11 files changed, 110 insertions(+), 12 deletions(-)
Signature · 1 line
1.8.4
PATCH v2 1/4 drm/i915: add unregister callback to connector
Since
commit d9255d57147e1dbcebdf6670409c2fa0ac3609e6
Author: Paulo Zanoni <[email protected]>
Date: Thu Sep 26 20:05:59 2013 -0300
it became clear that we need to separate the unload sequence into two parts:
1. remove all interfaces through which new operations on some object (crtc, encoder, connector) can be started and make sure all pending operations are completed
2. do the actual tear down of the internal representation of the above objects
The above commit achieved this separation for connectors by splitting out the sysfs removal part from the connector's destroy callback and doing this removal before calling drm_mode_config_cleanup() which does the actual tear-down of all the drm objects.
Since we'll have to customize the interface removal part for different types of connectors in the upcoming patches, add a new unregister callback and move the interface removal part to it.
No functional change.
--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_crt.c | 1 + drivers/gpu/drm/i915/intel_display.c | 14 ++++++++++++-- drivers/gpu/drm/i915/intel_dp.c | 1 + drivers/gpu/drm/i915/intel_drv.h | 8 ++++++++ drivers/gpu/drm/i915/intel_dsi.c | 1 + drivers/gpu/drm/i915/intel_dvo.c | 1 + drivers/gpu/drm/i915/intel_hdmi.c | 1 + drivers/gpu/drm/i915/intel_lvds.c | 1 + drivers/gpu/drm/i915/intel_sdvo.c | 1 + drivers/gpu/drm/i915/intel_tv.c | 1 + 11 files changed, 29 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -2550,6 +2550,7 @@ extern void intel_modeset_suspend_hw(struct drm_device *dev);extern void intel_modeset_init (struct drm_device *dev);extern void intel_modeset_gem_init (struct drm_device *dev);extern void intel_modeset_cleanup (struct drm_device *dev); +extern void intel_connector_unregister (struct intel_connector *);extern int intel_modeset_vga_set_state (struct drm_device *dev,bool state);extern void intel_modeset_setup_hw_state (struct drm_device *dev,bool force_restore);
drivers/gpu/drm/i915/intel_crt.c +1 -0
@@ -833,6 +833,7 @@ void intel_crt_init(struct drm_device *dev) crt->base.get_hw_state = intel_crt_get_hw_state; } intel_connector->get_hw_state = intel_connector_get_hw_state; + intel_connector->unregister = intel_connector_unregister;drm_connector_helper_add (connector, &intel_crt_connector_helper_funcs);
drivers/gpu/drm/i915/intel_display.c +12 -2
@@ -11435,6 +11435,14 @@ void intel_modeset_gem_init(struct drm_device *dev)mutex_unlock (&dev->mode_config.mutex); } +void intel_connector_unregister (struct intel_connector *intel_connector) +{ +struct drm_connector *connector = &intel_connector->base; + +intel_panel_destroy_backlight (connector); +drm_sysfs_connector_remove (connector); +} +void intel_modeset_cleanup (struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private;
@@ -11479,8 +11487,10 @@ void intel_modeset_cleanup(struct drm_device *dev)/* destroy the backlight and sysfs files before encoders/connectors */ list_for_each_entry (connector, &dev->mode_config.connector_list, head) { -intel_panel_destroy_backlight (connector); -drm_sysfs_connector_remove (connector); +struct intel_connector *intel_connector; + + intel_connector =to_intel_connector (connector); + intel_connector->unregister (intel_connector); }drm_mode_config_cleanup (dev);
drivers/gpu/drm/i915/intel_dp.c +1 -0
@@ -3803,6 +3803,7 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port, intel_connector->get_hw_state = intel_ddi_connector_get_hw_state; else intel_connector->get_hw_state = intel_connector_get_hw_state; + intel_connector->unregister = intel_connector_unregister; intel_dp->aux_ch_ctl_reg = intel_dp->output_reg +0x10 ;if (HAS_DDI (dev)) {
drivers/gpu/drm/i915/intel_drv.h +8 -0
@@ -187,6 +187,14 @@ struct intel_connector {* and active (i.e. dpms ON state). */ bool (*get_hw_state)(struct intel_connector *); +/* +* Removes all interfaces through which the connector is accessible +* - like sysfs, debugfs entries -, so that no new operations can be +* started on the connector. Also makes sure all currently pending +* operations finish before returing. +*/ +void (*unregister)(struct intel_connector *); +/* Panel info for eDP and LVDS */ struct intel_panel panel;
drivers/gpu/drm/i915/intel_dsi.c +1 -0
@@ -586,6 +586,7 @@ bool intel_dsi_init(struct drm_device *dev) intel_encoder->get_config = intel_dsi_get_config; intel_connector->get_hw_state = intel_connector_get_hw_state; + intel_connector->unregister = intel_connector_unregister;for (i =0 ; i <ARRAY_SIZE (intel_dsi_devices); i++) { dsi = &intel_dsi_devices[i];
drivers/gpu/drm/i915/intel_dvo.c +1 -0
@@ -477,6 +477,7 @@ void intel_dvo_init(struct drm_device *dev) intel_encoder->compute_config = intel_dvo_compute_config; intel_encoder->mode_set = intel_dvo_mode_set; intel_connector->get_hw_state = intel_dvo_connector_get_hw_state; + intel_connector->unregister = intel_connector_unregister;/* Now, try to find a controller */ for (i =0 ; i <ARRAY_SIZE (intel_dvo_devices); i++) {
drivers/gpu/drm/i915/intel_hdmi.c +1 -0
@@ -1263,6 +1263,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port, intel_connector->get_hw_state = intel_ddi_connector_get_hw_state; else intel_connector->get_hw_state = intel_connector_get_hw_state; + intel_connector->unregister = intel_connector_unregister;intel_hdmi_add_properties (intel_hdmi, connector);
drivers/gpu/drm/i915/intel_lvds.c +1 -0
@@ -957,6 +957,7 @@ void intel_lvds_init(struct drm_device *dev) intel_encoder->get_hw_state = intel_lvds_get_hw_state; intel_encoder->get_config = intel_lvds_get_config; intel_connector->get_hw_state = intel_connector_get_hw_state; + intel_connector->unregister = intel_connector_unregister;intel_connector_attach_encoder (intel_connector, intel_encoder); intel_encoder->type =INTEL_OUTPUT_LVDS ;
drivers/gpu/drm/i915/intel_sdvo.c +1 -0
@@ -2397,6 +2397,7 @@ intel_sdvo_connector_init(struct intel_sdvo_connector *connector, connector->base.base.doublescan_allowed =0 ; connector->base.base.display_info.subpixel_order = SubPixelHorizontalRGB; connector->base.get_hw_state = intel_sdvo_connector_get_hw_state; + connector->base.unregister = intel_connector_unregister;intel_connector_attach_encoder (&connector->base, &encoder->base);drm_sysfs_connector_add (&connector->base.base);
drivers/gpu/drm/i915/intel_tv.c +1 -0
@@ -1634,6 +1634,7 @@ intel_tv_init(struct drm_device *dev) intel_encoder->disable = intel_disable_tv; intel_encoder->get_hw_state = intel_tv_get_hw_state; intel_connector->get_hw_state = intel_connector_get_hw_state; + intel_connector->unregister = intel_connector_unregister;intel_connector_attach_encoder (intel_connector, intel_encoder); intel_encoder->type =INTEL_OUTPUT_TVOUT ;
Signature · 6 lines
1.8.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 2/4 drm/i915: dp: fix order of dp aux i2c device cleanup
In reply to Imre DeakAtm we set the parent of the dp i2c device to be the correspondig connector device. During driver cleanup we first remove the connector device through intel_modeset_cleanup()->drm_sysfs_connector_remove() and only after that the i2c device through the encoder's destroy callback. This order is not supported by the device core and we'll get a warning, see the below bugzilla ticket. The proper order is to remove first any child device and only then the parent device.
The first part of the fix changes the i2c device's parent to be the drm device. Its logical owner is not the connector anyway, but the encoder. Since the encoder doesn't have a device object, the next best choice is the drm device. This is the same what we do in the case of the sdvo i2c device and what the nouveau driver does.
The second part creates a symlink in the connector's sysfs directory pointing to the i2c device. This is so, that we keep the current ABI, which also makes sense in case someone wants to look up the i2c device belonging to a specific connector.
Reference: http://lists.freedesktop.org/archives/intel-gfx/2014-January/038782.html
Reference: http://lists.freedesktop.org/archives/intel-gfx/2014-February/039427.html
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=70523
--- drivers/gpu/drm/i915/intel_dp.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +22 -2
@@ -777,6 +777,16 @@ out:return ret; } +static void +intel_dp_connector_unregister (struct intel_connector *intel_connector) +{ +struct intel_dp *intel_dp =intel_attached_dp (&intel_connector->base); + +sysfs_remove_link (&intel_connector->base.kdev->kobj, + intel_dp->adapter.dev.kobj.name); +intel_connector_unregister (intel_connector); +} +static int intel_dp_i2c_init (struct intel_dp *intel_dp,struct intel_connector *intel_connector,const char *name)
@@ -794,9 +804,19 @@ intel_dp_i2c_init(struct intel_dp *intel_dp,strncpy (intel_dp->adapter.name, name,sizeof (intel_dp->adapter.name) -1 ); intel_dp->adapter.name[sizeof (intel_dp->adapter.name) -1 ] ='\0' ; intel_dp->adapter.algo_data = &intel_dp->algo; - intel_dp->adapter.dev.parent = intel_connector->base.kdev; + intel_dp->adapter.dev.parent = intel_connector->base.dev->dev; ret =i2c_dp_aux_add_bus (&intel_dp->adapter); +if (ret <0 ) +return ret; + + ret =sysfs_create_link (&intel_connector->base.kdev->kobj, + &intel_dp->adapter.dev.kobj, + intel_dp->adapter.dev.kobj.name); + +if (ret <0 ) +i2c_del_adapter (&intel_dp->adapter); +return ret; }
@@ -3803,7 +3823,7 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port, intel_connector->get_hw_state = intel_ddi_connector_get_hw_state; else intel_connector->get_hw_state = intel_connector_get_hw_state; - intel_connector->unregister = intel_connector_unregister; + intel_connector->unregister = intel_dp_connector_unregister; intel_dp->aux_ch_ctl_reg = intel_dp->output_reg +0x10 ;if (HAS_DDI (dev)) {
Signature · 1 line
1.8.4
PATCH v2 3/4 drm/i915: sdvo: fix error path in sdvo_connector_init
In reply to Imre Deak--- drivers/gpu/drm/i915/intel_sdvo.c | 49 +++++++++++++++++++++++++++++++-------- 1 file changed, 39 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/intel_sdvo.c +39 -10
@@ -2381,16 +2381,22 @@ intel_sdvo_get_slave_addr(struct drm_device *dev, struct intel_sdvo *sdvo)return 0x72 ; } -static void +static int intel_sdvo_connector_init (struct intel_sdvo_connector *connector,struct intel_sdvo *encoder) { -drm_connector_init (encoder->base.base.dev, - &connector->base.base, +struct drm_connector *drm_connector; +int ret; + + drm_connector = &connector->base.base; + ret =drm_connector_init (encoder->base.base.dev, + drm_connector, &intel_sdvo_connector_funcs, connector->base.base.connector_type); +if (ret <0 ) +return ret; -drm_connector_helper_add (&connector->base.base, +drm_connector_helper_add (drm_connector, &intel_sdvo_connector_helper_funcs); connector->base.base.interlace_allowed =1 ;
@@ -2400,7 +2406,16 @@ intel_sdvo_connector_init(struct intel_sdvo_connector *connector, connector->base.unregister = intel_connector_unregister;intel_connector_attach_encoder (&connector->base, &encoder->base); -drm_sysfs_connector_add (&connector->base.base); + ret =drm_sysfs_connector_add (drm_connector); +if (ret <0 ) + goto err1; + +return 0 ; + +err1: +drm_connector_cleanup (drm_connector); + +return ret; } static void
@@ -2460,7 +2475,11 @@ intel_sdvo_dvi_init(struct intel_sdvo *intel_sdvo, int device) intel_sdvo->is_hdmi = true; } -intel_sdvo_connector_init (intel_sdvo_connector, intel_sdvo); +if (intel_sdvo_connector_init (intel_sdvo_connector, intel_sdvo) <0 ) { +kfree (intel_sdvo_connector); +return false; + } +if (intel_sdvo->is_hdmi)intel_sdvo_add_hdmi_properties (intel_sdvo, intel_sdvo_connector);
@@ -2491,7 +2510,10 @@ intel_sdvo_tv_init(struct intel_sdvo *intel_sdvo, int type) intel_sdvo->is_tv = true; -intel_sdvo_connector_init (intel_sdvo_connector, intel_sdvo); +if (intel_sdvo_connector_init (intel_sdvo_connector, intel_sdvo) <0 ) { +kfree (intel_sdvo_connector); +return false; + }if (!intel_sdvo_tv_create_property (intel_sdvo, intel_sdvo_connector, type)) goto err;
@@ -2535,8 +2557,11 @@ intel_sdvo_analog_init(struct intel_sdvo *intel_sdvo, int device) intel_sdvo_connector->output_flag =SDVO_OUTPUT_RGB1 ; } -intel_sdvo_connector_init (intel_sdvo_connector, - intel_sdvo); +if (intel_sdvo_connector_init (intel_sdvo_connector, intel_sdvo) <0 ) { +kfree (intel_sdvo_connector); +return false; + } +return true; }
@@ -2567,7 +2592,11 @@ intel_sdvo_lvds_init(struct intel_sdvo *intel_sdvo, int device) intel_sdvo_connector->output_flag =SDVO_OUTPUT_LVDS1 ; } -intel_sdvo_connector_init (intel_sdvo_connector, intel_sdvo); +if (intel_sdvo_connector_init (intel_sdvo_connector, intel_sdvo) <0 ) { +kfree (intel_sdvo_connector); +return false; + } +if (!intel_sdvo_create_enhance_property (intel_sdvo, intel_sdvo_connector)) goto err;
Signature · 1 line
1.8.4
PATCH v2 4/4 drm/i915: sdvo: add i2c sysfs symlink to the connector's directory
In reply to Imre DeakThis is the same what we do for DP connectors, so make things more consistent.
--- drivers/gpu/drm/i915/intel_sdvo.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_sdvo.c +23 -1
@@ -2381,6 +2381,20 @@ intel_sdvo_get_slave_addr(struct drm_device *dev, struct intel_sdvo *sdvo)return 0x72 ; } +static void +intel_sdvo_connector_unregister (struct intel_connector *intel_connector) +{ +struct drm_connector *drm_connector; +struct intel_sdvo *sdvo_encoder; + + drm_connector = &intel_connector->base; + sdvo_encoder =intel_attached_sdvo (&intel_connector->base); + +sysfs_remove_link (&drm_connector->kdev->kobj, + sdvo_encoder->ddc.dev.kobj.name); +intel_connector_unregister (intel_connector); +} +static int intel_sdvo_connector_init (struct intel_sdvo_connector *connector,struct intel_sdvo *encoder)
@@ -2403,15 +2417,23 @@ intel_sdvo_connector_init(struct intel_sdvo_connector *connector, connector->base.base.doublescan_allowed =0 ; connector->base.base.display_info.subpixel_order = SubPixelHorizontalRGB; connector->base.get_hw_state = intel_sdvo_connector_get_hw_state; - connector->base.unregister = intel_connector_unregister; + connector->base.unregister = intel_sdvo_connector_unregister;intel_connector_attach_encoder (&connector->base, &encoder->base); ret =drm_sysfs_connector_add (drm_connector);if (ret <0 ) goto err1; + ret =sysfs_create_link (&encoder->ddc.dev.kobj, + &drm_connector->kdev->kobj, + encoder->ddc.dev.kobj.name); +if (ret <0 ) + goto err2; +return 0 ; +err2: +drm_sysfs_connector_remove (drm_connector); err1:drm_connector_cleanup (drm_connector);
Signature · 1 line
1.8.4
Quoted 28 lines · Imre Deak
The main point of this patchset is to fix a driver unload bug caused by incorrect order of dp aux i2c cleanup wrt. destroying the corresponding encoder/connector objects, see the second patch for details.
Tested on vlv/dp.
v2: move all sysfs removal bits to the new
connector->unregister
callback (Daniel)Imre Deak (4):
drm/i915: add unregister callback to connector drm/i915: dp: fix order of dp aux i2c device cleanup drm/i915: sdvo: fix error path insdvo_connector_initdrm/i915: sdvo: add i2c sysfs symlink to the connector's directorydrivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_crt.c | 1 + drivers/gpu/drm/i915/intel_display.c | 14 ++++++-- drivers/gpu/drm/i915/intel_dp.c | 23 +++++++++++- drivers/gpu/drm/i915/intel_drv.h | 8 +++++ drivers/gpu/drm/i915/intel_dsi.c | 1 + drivers/gpu/drm/i915/intel_dvo.c | 1 + drivers/gpu/drm/i915/intel_hdmi.c | 1 + drivers/gpu/drm/i915/intel_lvds.c | 1 + drivers/gpu/drm/i915/intel_sdvo.c | 70 +++++++++++++++++++++++++++++++----- drivers/gpu/drm/i915/intel_tv.c | 1 + 11 files changed, 110 insertions(+), 12 deletions(-)
Quoted 1 line
Signed-off-by Imre Deak <[email protected]>
Signature · 1 line
- Antti
Quoted 29 lines · Antti Koskipää
Quoted 28 lines · Imre Deak
The main point of this patchset is to fix a driver unload bug caused by incorrect order of dp aux i2c cleanup wrt. destroying the corresponding encoder/connector objects, see the second patch for details.
Tested on vlv/dp.
v2: move all sysfs removal bits to the new
connector->unregister
callback (Daniel)Imre Deak (4):
drm/i915: add unregister callback to connector drm/i915: dp: fix order of dp aux i2c device cleanup drm/i915: sdvo: fix error path insdvo_connector_initdrm/i915: sdvo: add i2c sysfs symlink to the connector's directorydrivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_crt.c | 1 + drivers/gpu/drm/i915/intel_display.c | 14 ++++++-- drivers/gpu/drm/i915/intel_dp.c | 23 +++++++++++- drivers/gpu/drm/i915/intel_drv.h | 8 +++++ drivers/gpu/drm/i915/intel_dsi.c | 1 + drivers/gpu/drm/i915/intel_dvo.c | 1 + drivers/gpu/drm/i915/intel_hdmi.c | 1 + drivers/gpu/drm/i915/intel_lvds.c | 1 + drivers/gpu/drm/i915/intel_sdvo.c | 70 +++++++++++++++++++++++++++++++----- drivers/gpu/drm/i915/intel_tv.c | 1 + 11 files changed, 110 insertions(+), 12 deletions(-)
Quoted 3 lines
Quoted 1 line
Signed-off-by Imre Deak <[email protected]>Reviewed-by Antti Koskipää <[email protected]>
All pulled in, thanks for patches and review.
-Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch