[PATCH 2/4] drm/i915: factor out intel_lvds_get_edid()
This code will be reused to support hybrid graphics on some Apple machines that can't get a mode for the LVDS panel at boot, so move it into a new function named intel_lvds_get_edid(). Cc: Andreas Heider Cc: Seth Forshee Original-patch-by: Seth Forshee Signed-off-by: Ramkumar Ramachandra --- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_lvds.c | 104 ++ 2 files changed, 61 insertions(+), 44 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 90fcccb..2c055f8 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -1496,6 +1496,7 @@ typedef struct drm_i915_private { } wm; struct i915_package_c8 pc8; + struct drm_connector *int_lvds_connector; /* Old dri1 support infrastructure, beware the dragons ya fools entering * here! */ diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c index c3b4da7..6c09617 100644 --- a/drivers/gpu/drm/i915/intel_lvds.c +++ b/drivers/gpu/drm/i915/intel_lvds.c @@ -42,6 +42,7 @@ /* Private structure for the integrated LVDS support */ struct intel_lvds_connector { struct intel_connector base; + u8 i2c_pin; struct notifier_block lid_notifier; }; @@ -921,6 +922,60 @@ static bool intel_lvds_supported(struct drm_device *dev) return false; } +static bool intel_lvds_get_edid(struct drm_device *dev) +{ + struct edid *edid; + struct drm_i915_private *dev_priv = dev->dev_private; + struct drm_connector *connector = dev_priv->int_lvds_connector; + struct intel_lvds_connector *lvds_connector = to_lvds_connector(connector); + struct drm_display_mode *scan; /* *modes, *bios_mode; */ + struct drm_display_mode *fixed_mode = NULL; + + /* +* Attempt to get the fixed panel mode from DDC. Assume that the +* preferred mode is the right one. +*/ + edid = drm_get_edid(connector, intel_gmbus_get_adapter(dev_priv, lvds_connector->i2c_pin)); + if (edid) { + if (drm_add_edid_modes(connector, edid)) { + drm_mode_connector_update_edid_property(connector, + edid); + } else { + kfree(edid); + edid = ERR_PTR(-EINVAL); + } + } else { + edid = ERR_PTR(-ENOENT); + } + lvds_connector->base.edid = edid; + + if (IS_ERR_OR_NULL(edid)) { + /* Didn't get an EDID, so +* Set wide sync ranges so we get all modes +* handed to valid_mode for checking +*/ + connector->display_info.min_vfreq = 0; + connector->display_info.max_vfreq = 200; + connector->display_info.min_hfreq = 0; + connector->display_info.max_hfreq = 200; + } + + list_for_each_entry(scan, >probed_modes, head) { + if (scan->type & DRM_MODE_TYPE_PREFERRED) { + DRM_DEBUG_KMS("using preferred mode from EDID: "); + drm_mode_debug_printmodeline(scan); + + fixed_mode = drm_mode_duplicate(dev, scan); + if (fixed_mode) { + intel_find_lvds_downclock(dev, fixed_mode, + connector); + return true; + } + } + } + return false; +} + /** * intel_lvds_init - setup LVDS connectors on this device * @dev: drm device @@ -937,9 +992,7 @@ void intel_lvds_init(struct drm_device *dev) struct intel_connector *intel_connector; struct drm_connector *connector; struct drm_encoder *encoder; - struct drm_display_mode *scan; /* *modes, *bios_mode; */ struct drm_display_mode *fixed_mode = NULL; - struct edid *edid; struct drm_crtc *crtc; u32 lvds; int pipe; @@ -978,11 +1031,13 @@ void intel_lvds_init(struct drm_device *dev) } lvds_encoder->attached_connector = lvds_connector; + lvds_connector->i2c_pin = pin; intel_encoder = _encoder->base; encoder = _encoder->base; intel_connector = _connector->base; connector = _connector->base; + dev_priv->int_lvds_connector = connector; drm_connector_init(dev, _connector->base, _lvds_connector_funcs, DRM_MODE_CONNECTOR_LVDS); @@ -1036,48 +1091,8 @@ void intel_lvds_init(struct drm_device *dev) *if closed, act like it's not there for now */ - /* -* Attempt to get the fixed panel mode from DDC. Assume that the -* preferred mode is the right one. -*/ - edid = drm_get_edid(connector,
[PATCH 2/4] drm/i915: factor out intel_lvds_get_edid()
This code will be reused to support hybrid graphics on some Apple machines that can't get a mode for the LVDS panel at boot, so move it into a new function named intel_lvds_get_edid(). Cc: Andreas Heider andr...@meetr.de Cc: Seth Forshee seth.fors...@canonical.com Original-patch-by: Seth Forshee seth.fors...@canonical.com Signed-off-by: Ramkumar Ramachandra artag...@gmail.com --- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_lvds.c | 104 ++ 2 files changed, 61 insertions(+), 44 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 90fcccb..2c055f8 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -1496,6 +1496,7 @@ typedef struct drm_i915_private { } wm; struct i915_package_c8 pc8; + struct drm_connector *int_lvds_connector; /* Old dri1 support infrastructure, beware the dragons ya fools entering * here! */ diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c index c3b4da7..6c09617 100644 --- a/drivers/gpu/drm/i915/intel_lvds.c +++ b/drivers/gpu/drm/i915/intel_lvds.c @@ -42,6 +42,7 @@ /* Private structure for the integrated LVDS support */ struct intel_lvds_connector { struct intel_connector base; + u8 i2c_pin; struct notifier_block lid_notifier; }; @@ -921,6 +922,60 @@ static bool intel_lvds_supported(struct drm_device *dev) return false; } +static bool intel_lvds_get_edid(struct drm_device *dev) +{ + struct edid *edid; + struct drm_i915_private *dev_priv = dev-dev_private; + struct drm_connector *connector = dev_priv-int_lvds_connector; + struct intel_lvds_connector *lvds_connector = to_lvds_connector(connector); + struct drm_display_mode *scan; /* *modes, *bios_mode; */ + struct drm_display_mode *fixed_mode = NULL; + + /* +* Attempt to get the fixed panel mode from DDC. Assume that the +* preferred mode is the right one. +*/ + edid = drm_get_edid(connector, intel_gmbus_get_adapter(dev_priv, lvds_connector-i2c_pin)); + if (edid) { + if (drm_add_edid_modes(connector, edid)) { + drm_mode_connector_update_edid_property(connector, + edid); + } else { + kfree(edid); + edid = ERR_PTR(-EINVAL); + } + } else { + edid = ERR_PTR(-ENOENT); + } + lvds_connector-base.edid = edid; + + if (IS_ERR_OR_NULL(edid)) { + /* Didn't get an EDID, so +* Set wide sync ranges so we get all modes +* handed to valid_mode for checking +*/ + connector-display_info.min_vfreq = 0; + connector-display_info.max_vfreq = 200; + connector-display_info.min_hfreq = 0; + connector-display_info.max_hfreq = 200; + } + + list_for_each_entry(scan, connector-probed_modes, head) { + if (scan-type DRM_MODE_TYPE_PREFERRED) { + DRM_DEBUG_KMS(using preferred mode from EDID: ); + drm_mode_debug_printmodeline(scan); + + fixed_mode = drm_mode_duplicate(dev, scan); + if (fixed_mode) { + intel_find_lvds_downclock(dev, fixed_mode, + connector); + return true; + } + } + } + return false; +} + /** * intel_lvds_init - setup LVDS connectors on this device * @dev: drm device @@ -937,9 +992,7 @@ void intel_lvds_init(struct drm_device *dev) struct intel_connector *intel_connector; struct drm_connector *connector; struct drm_encoder *encoder; - struct drm_display_mode *scan; /* *modes, *bios_mode; */ struct drm_display_mode *fixed_mode = NULL; - struct edid *edid; struct drm_crtc *crtc; u32 lvds; int pipe; @@ -978,11 +1031,13 @@ void intel_lvds_init(struct drm_device *dev) } lvds_encoder-attached_connector = lvds_connector; + lvds_connector-i2c_pin = pin; intel_encoder = lvds_encoder-base; encoder = intel_encoder-base; intel_connector = lvds_connector-base; connector = intel_connector-base; + dev_priv-int_lvds_connector = connector; drm_connector_init(dev, intel_connector-base, intel_lvds_connector_funcs, DRM_MODE_CONNECTOR_LVDS); @@ -1036,48 +1091,8 @@ void intel_lvds_init(struct drm_device *dev) *if closed, act like it's not there for now */ - /* -* Attempt to get the fixed panel mode from DDC. Assume that the -* preferred