diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-04-03 10:27:21 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-04-03 10:27:21 +1000 |
| commit | 5f3dbedf2770cf6aeb5547b3c56734dee4e5186b (patch) | |
| tree | e4930f7f4fe27b06079d2df8072a2bdf6457c666 /drivers/gpu/drm/i915/intel_modes.c | |
| parent | 7a1fb5d06d3936c0982e2cf8b53b046244a9aad6 (diff) | |
| parent | 1055f9ddad093f54dfd708a0f976582034d4ce1a (diff) | |
Merge branch 'drm-intel-next' of ../anholt-2.6 into drm-linus
Diffstat (limited to 'drivers/gpu/drm/i915/intel_modes.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_modes.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_modes.c b/drivers/gpu/drm/i915/intel_modes.c index e42019e5d66..07d7ec97616 100644 --- a/drivers/gpu/drm/i915/intel_modes.c +++ b/drivers/gpu/drm/i915/intel_modes.c @@ -76,6 +76,7 @@ int intel_ddc_get_modes(struct intel_output *intel_output) drm_mode_connector_update_edid_property(&intel_output->base, edid); ret = drm_add_edid_modes(&intel_output->base, edid); + intel_output->base.display_info.raw_edid = NULL; kfree(edid); } |