| Message ID | 1453417821-2811-5-git-send-email-rafael.antognolli@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Jan 21, 2016 at 6:10 PM, Rafael Antognolli <rafael.antognolli@intel.com> wrote: > From: Lukas Wunner <lukas@wunner.de> > > Rafael Antognolli's new DRM_DP_AUX_CHARDEV feature causes a WARN_ON > if drm_dp_aux->dev == drm_connector->kdev and drm_dp_aux_unregister() > is called after drm_connector_unregister(). radeon is the only driver > affected by this besides i915. (amdgpu calls drm_dp_aux_unregister() > before drm_connector_unregister().) > > Cc: Rafael Antognolli <rafael.antognolli@intel.com> > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> > Cc: Alex Deucher <alexander.deucher@amd.com> > Signed-off-by: Lukas Wunner <lukas@wunner.de> Applied. thanks! Alex > --- > drivers/gpu/drm/radeon/radeon_display.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c > index b3bb923..a885dae 100644 > --- a/drivers/gpu/drm/radeon/radeon_display.c > +++ b/drivers/gpu/drm/radeon/radeon_display.c > @@ -1684,6 +1684,9 @@ 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); > @@ -1691,8 +1694,6 @@ void radeon_modeset_fini(struct radeon_device *rdev) > drm_mode_config_cleanup(rdev->ddev); > rdev->mode_info.mode_config_initialized = false; > } > - /* free i2c buses */ > - radeon_i2c_fini(rdev); > } > > static bool is_hdtv_mode(const struct drm_display_mode *mode) > -- > 2.4.3 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c index b3bb923..a885dae 100644 --- a/drivers/gpu/drm/radeon/radeon_display.c +++ b/drivers/gpu/drm/radeon/radeon_display.c @@ -1684,6 +1684,9 @@ 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); @@ -1691,8 +1694,6 @@ void radeon_modeset_fini(struct radeon_device *rdev) drm_mode_config_cleanup(rdev->ddev); rdev->mode_info.mode_config_initialized = false; } - /* free i2c buses */ - radeon_i2c_fini(rdev); } static bool is_hdtv_mode(const struct drm_display_mode *mode)