drm/radeon: fix up dp aux tear down
Subsystems (2)
PATCH 1/2 drm/radeon: fix up dp aux tear down
Port the amdgpu fixes from Grazvydas to radeon.
bug:
https://bugs.freedesktop.org/show_bug.cgi?id=98200
Signed-off-by Alex Deucher <[email protected]>
--- drivers/gpu/drm/radeon/radeon_connectors.c | 18 ++++++++++++++++++ drivers/gpu/drm/radeon/radeon_i2c.c | 3 +-- 2 files changed, 19 insertions(+), 2 deletions(-)
drivers/gpu/drm/radeon/radeon_connectors.c +18 -0
@@ -927,6 +927,16 @@ radeon_lvds_detect(struct drm_connector *connector, bool force)return ret; } +static void radeon_connector_unregister (struct drm_connector *connector) +{ +struct radeon_connector *radeon_connector =to_radeon_connector (connector); + +if (radeon_connector->ddc_bus->has_aux) { +drm_dp_aux_unregister (&radeon_connector->ddc_bus->aux); + radeon_connector->ddc_bus->has_aux = false; + } +} +static void radeon_connector_destroy (struct drm_connector *connector) {struct radeon_connector *radeon_connector =to_radeon_connector (connector);
@@ -938,6 +948,7 @@ static void radeon_connector_destroy(struct drm_connector *connector)kfree (connector); } +static int radeon_lvds_set_property (struct drm_connector *connector,struct drm_property *property,uint64_t value)
@@ -984,6 +995,7 @@ static const struct drm_connector_funcs radeon_lvds_connector_funcs = { .dpms = drm_helper_connector_dpms, .detect = radeon_lvds_detect, .fill_modes = drm_helper_probe_single_connector_modes, + .early_unregister = radeon_connector_unregister, .destroy = radeon_connector_destroy, .set_property = radeon_lvds_set_property, };
@@ -1111,6 +1123,7 @@ static const struct drm_connector_funcs radeon_vga_connector_funcs = { .dpms = drm_helper_connector_dpms, .detect = radeon_vga_detect, .fill_modes = drm_helper_probe_single_connector_modes, + .early_unregister = radeon_connector_unregister, .destroy = radeon_connector_destroy, .set_property = radeon_connector_set_property, };
@@ -1188,6 +1201,7 @@ static const struct drm_connector_funcs radeon_tv_connector_funcs = { .dpms = drm_helper_connector_dpms, .detect = radeon_tv_detect, .fill_modes = drm_helper_probe_single_connector_modes, + .early_unregister = radeon_connector_unregister, .destroy = radeon_connector_destroy, .set_property = radeon_connector_set_property, };
@@ -1519,6 +1533,7 @@ static const struct drm_connector_funcs radeon_dvi_connector_funcs = { .detect = radeon_dvi_detect, .fill_modes = drm_helper_probe_single_connector_modes, .set_property = radeon_connector_set_property, + .early_unregister = radeon_connector_unregister, .destroy = radeon_connector_destroy, .force = radeon_dvi_force, };
@@ -1832,6 +1847,7 @@ static const struct drm_connector_funcs radeon_dp_connector_funcs = { .detect = radeon_dp_detect, .fill_modes = drm_helper_probe_single_connector_modes, .set_property = radeon_connector_set_property, + .early_unregister = radeon_connector_unregister, .destroy = radeon_connector_destroy, .force = radeon_dvi_force, };
@@ -1841,6 +1857,7 @@ static const struct drm_connector_funcs radeon_edp_connector_funcs = { .detect = radeon_dp_detect, .fill_modes = drm_helper_probe_single_connector_modes, .set_property = radeon_lvds_set_property, + .early_unregister = radeon_connector_unregister, .destroy = radeon_connector_destroy, .force = radeon_dvi_force, };
@@ -1850,6 +1867,7 @@ static const struct drm_connector_funcs radeon_lvds_bridge_connector_funcs = { .detect = radeon_dp_detect, .fill_modes = drm_helper_probe_single_connector_modes, .set_property = radeon_lvds_set_property, + .early_unregister = radeon_connector_unregister, .destroy = radeon_connector_destroy, .force = radeon_dvi_force, };
drivers/gpu/drm/radeon/radeon_i2c.c +1 -2
@@ -982,9 +982,8 @@ void radeon_i2c_destroy(struct radeon_i2c_chan *i2c) {if (!i2c)return ; +WARN_ON (i2c->has_aux);i2c_del_adapter (&i2c->adapter); -if (i2c->has_aux) -drm_dp_aux_unregister (&i2c->aux);kfree (i2c); }
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1476203216-11074-1-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org
PATCH 2/2 drm/radeon: fix modeset tear down code
The ordering caused problems.
bug:
https://bugs.freedesktop.org/show_bug.cgi?id=98200
Signed-off-by Alex Deucher <[email protected]>
--- drivers/gpu/drm/radeon/radeon_display.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/gpu/drm/radeon/radeon_display.c +7 -7
@@ -1675,20 +1675,20 @@ int radeon_modeset_init(struct radeon_device *rdev)void radeon_modeset_fini (struct radeon_device *rdev) { -radeon_fbdev_fini (rdev); -kfree (rdev->mode_info.bios_hardcoded_edid); - -/* free i2c buses */ -radeon_i2c_fini (rdev); -if (rdev->mode_info.mode_config_initialized) { -radeon_afmt_fini (rdev);drm_kms_helper_poll_fini (rdev->ddev);radeon_hpd_fini (rdev);drm_crtc_force_disable_all (rdev->ddev); +radeon_fbdev_fini (rdev); +radeon_afmt_fini (rdev);drm_mode_config_cleanup (rdev->ddev); rdev->mode_info.mode_config_initialized = false; } + +kfree (rdev->mode_info.bios_hardcoded_edid); + +/* free i2c buses */ +radeon_i2c_fini (rdev); }static bool is_hdtv_mode (const struct drm_display_mode *mode)
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 6 lines · Alex Deucher
Port the amdgpu fixes from Grazvydas to radeon.
bug:
https://bugs.freedesktop.org/show_bug.cgi?id=98200Signed-off-by Alex Deucher <[email protected]>
[...]
drivers/gpu/drm/radeon/radeon_connectors.c static void radeon_connector_destroy(struct drm_connector *connector) · line 954
Quoted 8 lines
drivers/gpu/drm/radeon/radeon_connectors.c +1
-0@@ -938,6 +948,7 @@ static void radeon_connector_destroy(struct drm_connector *connector)kfree (connector); } +static int radeon_lvds_set_property (struct drm_connector *connector,struct drm_property *property,uint64_t value)
I'd drop this hunk. Either way though, the series is
Reviewed-and-Tested-by Michel Dänzer <[email protected]>
Signature · 6 lines
Earthling Michel Dänzer | http://www.amd.com Libre software enthusiast | Mesa and X developer _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx