diff options
| author | Daniel Vetter | 2010-08-20 18:08:28 +0200 |
|---|---|---|
| committer | Chris Wilson | 2010-09-08 11:13:23 +0200 |
| commit | 24d05927c37adf62fe8833eceba50585cb78f906 (patch) | |
| tree | 32ea38450f4d114dc74c11a0ba95c3ae3ee6fa61 /drivers/gpu/drm/i915/intel_dp.c | |
| parent | Merge remote branch 'airlied/drm-core-next' into HEAD (diff) | |
| download | kernel-qcow2-linux-24d05927c37adf62fe8833eceba50585cb78f906.tar.gz kernel-qcow2-linux-24d05927c37adf62fe8833eceba50585cb78f906.tar.xz kernel-qcow2-linux-24d05927c37adf62fe8833eceba50585cb78f906.zip | |
drm/i915: unload: fix intel dp encoder cleanup
struct intel_dp contains both struct intel_encoder at the beginning (as
it's base-class) and an i2c adapater. When initializing, the i2c adapter
gets assigned
intel_encoder->ddc_adaptor = &intel_dp->adapter
and the generic intel_encode_destroy happily calls kfree on this pointer.
Ouch. Fix this by using a dp specific cleanup function.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_dp.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_dp.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 51d142939a26..b1fc65b41275 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -1479,6 +1479,15 @@ intel_dp_destroy (struct drm_connector *connector) kfree(connector); } +static void intel_dp_encoder_destroy(struct drm_encoder *encoder) +{ + struct intel_dp *intel_dp = enc_to_intel_dp(encoder); + + i2c_del_adapter(&intel_dp->adapter); + drm_encoder_cleanup(encoder); + kfree(intel_dp); +} + static const struct drm_encoder_helper_funcs intel_dp_helper_funcs = { .dpms = intel_dp_dpms, .mode_fixup = intel_dp_mode_fixup, @@ -1501,7 +1510,7 @@ static const struct drm_connector_helper_funcs intel_dp_connector_helper_funcs = }; static const struct drm_encoder_funcs intel_dp_enc_funcs = { - .destroy = intel_encoder_destroy, + .destroy = intel_dp_encoder_destroy, }; void |