diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-10-10 20:05:21 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-10-10 20:05:21 +0100 |
| commit | 62addcb8c188eaa28968e27a02518404939851d7 (patch) | |
| tree | 265f431c92c2c677474e390ada03397c56850a5b /drivers/gpu/drm/i915/intel_modes.c | |
| parent | 5438ae88d098c086cfb94be5327c49a04fc6bfd7 (diff) | |
| parent | 64a742fac3a22f57303d8f1b7e347350a1c48254 (diff) | |
Merge branch 'drm-intel-next' of git://people.freedesktop.org/~keithp/linux into drm-core-next
* 'drm-intel-next' of git://people.freedesktop.org/~keithp/linux:
drm/i915: Dumb down the semaphore logic
drm/i915: pass ELD to HDMI/DP audio driver
drm: support routines for HDMI/DP ELD
drm/i915: Enable dither whenever display bpc < frame buffer bpc
drm/i915: Enable dither whenever display bpc < frame buffer bpc
Diffstat (limited to 'drivers/gpu/drm/i915/intel_modes.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_modes.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_modes.c b/drivers/gpu/drm/i915/intel_modes.c index 3b26a3ba02dd..be2c6fe07d12 100644 --- a/drivers/gpu/drm/i915/intel_modes.c +++ b/drivers/gpu/drm/i915/intel_modes.c @@ -26,6 +26,7 @@ #include <linux/slab.h> #include <linux/i2c.h> #include <linux/fb.h> +#include <drm/drm_edid.h> #include "drmP.h" #include "intel_drv.h" #include "i915_drv.h" @@ -74,6 +75,7 @@ int intel_ddc_get_modes(struct drm_connector *connector, if (edid) { drm_mode_connector_update_edid_property(connector, edid); ret = drm_add_edid_modes(connector, edid); + drm_edid_to_eld(connector, edid); connector->display_info.raw_edid = NULL; kfree(edid); } |