summaryrefslogtreecommitdiff
path: root/meta-moblin/packages/linux/linux-moblin-2.6.33.2/linux-2.6.29-kms-edid-cache.patch
diff options
context:
space:
mode:
authorSaul Wold <Saul.Wold@intel.com>2010-09-24 15:36:24 -0700
committerSaul Wold <Saul.Wold@intel.com>2010-09-24 16:43:21 -0700
commit239a368d5715d8f5b7733f9400339c2350c49369 (patch)
tree2953f12b45e590d9e14b6f72f8e4ee7188e41508 /meta-moblin/packages/linux/linux-moblin-2.6.33.2/linux-2.6.29-kms-edid-cache.patch
parentc5b9525263dac6844d152e40acf8cee4d27b60bc (diff)
downloadopenembedded-core-239a368d5715d8f5b7733f9400339c2350c49369.tar.gz
openembedded-core-239a368d5715d8f5b7733f9400339c2350c49369.tar.bz2
openembedded-core-239a368d5715d8f5b7733f9400339c2350c49369.tar.xz
openembedded-core-239a368d5715d8f5b7733f9400339c2350c49369.zip
netbook: Correct netbook build by moving netbook configuration from moblin to meta
Signed-off-by: Saul Wold <Saul.Wold@intel.com>
Diffstat (limited to 'meta-moblin/packages/linux/linux-moblin-2.6.33.2/linux-2.6.29-kms-edid-cache.patch')
-rw-r--r--meta-moblin/packages/linux/linux-moblin-2.6.33.2/linux-2.6.29-kms-edid-cache.patch58
1 files changed, 0 insertions, 58 deletions
diff --git a/meta-moblin/packages/linux/linux-moblin-2.6.33.2/linux-2.6.29-kms-edid-cache.patch b/meta-moblin/packages/linux/linux-moblin-2.6.33.2/linux-2.6.29-kms-edid-cache.patch
deleted file mode 100644
index 1fda401e5..000000000
--- a/meta-moblin/packages/linux/linux-moblin-2.6.33.2/linux-2.6.29-kms-edid-cache.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
-index a51573d..3dcf5cc 100644
---- a/drivers/gpu/drm/i915/intel_drv.h
-+++ b/drivers/gpu/drm/i915/intel_drv.h
-@@ -102,6 +102,7 @@ struct intel_output {
- int type;
- struct i2c_adapter *i2c_bus;
- struct i2c_adapter *ddc_bus;
-+ struct edid *edid;
- bool load_detect_temp;
- bool needs_tv_clock;
- void *dev_priv;
-diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
-index 3118ce2..fa0299e 100644
---- a/drivers/gpu/drm/i915/intel_lvds.c
-+++ b/drivers/gpu/drm/i915/intel_lvds.c
-@@ -716,6 +716,7 @@ static void intel_lvds_destroy(struct drm_connector *connector)
- acpi_lid_notifier_unregister(&dev_priv->lid_notifier);
- drm_sysfs_connector_remove(connector);
- drm_connector_cleanup(connector);
-+ kfree(intel_output->edid);
- kfree(connector);
- }
-
-@@ -1189,5 +1190,6 @@ failed:
- intel_i2c_destroy(intel_output->ddc_bus);
- drm_connector_cleanup(connector);
- drm_encoder_cleanup(encoder);
-+ kfree(intel_output->edid);
- kfree(intel_output);
- }
-diff --git a/drivers/gpu/drm/i915/intel_modes.c b/drivers/gpu/drm/i915/intel_modes.c
-index 67e2f46..5ac537f 100644
---- a/drivers/gpu/drm/i915/intel_modes.c
-+++ b/drivers/gpu/drm/i915/intel_modes.c
-@@ -74,6 +74,10 @@ int intel_ddc_get_modes(struct intel_output *intel_output)
- int ret = 0;
-
- intel_i2c_quirk_set(intel_output->base.dev, true);
-+ if (intel_output->edid && intel_output->type == INTEL_OUTPUT_LVDS) {
-+ printk(KERN_INFO "Skipping EDID probe due to cached edid\n");
-+ return ret;
-+ }
- edid = drm_get_edid(&intel_output->base, intel_output->ddc_bus);
- intel_i2c_quirk_set(intel_output->base.dev, false);
- if (edid) {
-@@ -81,7 +85,10 @@ int intel_ddc_get_modes(struct intel_output *intel_output)
- edid);
- ret = drm_add_edid_modes(&intel_output->base, edid);
- intel_output->base.display_info.raw_edid = NULL;
-- kfree(edid);
-+ if (intel_output->type == INTEL_OUTPUT_LVDS)
-+ intel_output->edid = edid;
-+ else
-+ kfree(edid);
- }
-
- return ret;