diff options
| author | Kyle McMartin <kyle@mcmartin.ca> | 2010-11-02 13:06:42 -0400 |
|---|---|---|
| committer | Kyle McMartin <kyle@mcmartin.ca> | 2010-11-02 13:06:42 -0400 |
| commit | 7b2f649ec2da6640878c15298f5d3f8451dd8125 (patch) | |
| tree | b26440ffa8853847fa0625f932673c7ff2554f2c /drm-intel-make-lvds-work.patch | |
| parent | 3daa57b3d93c5d0a795e3446850c83483df37f2e (diff) | |
| download | kernel-7b2f649ec2da6640878c15298f5d3f8451dd8125.tar.gz kernel-7b2f649ec2da6640878c15298f5d3f8451dd8125.tar.xz kernel-7b2f649ec2da6640878c15298f5d3f8451dd8125.zip | |
Linux 2.6.37-rc1
Diffstat (limited to 'drm-intel-make-lvds-work.patch')
| -rw-r--r-- | drm-intel-make-lvds-work.patch | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/drm-intel-make-lvds-work.patch b/drm-intel-make-lvds-work.patch index 5ca0152da..209deb295 100644 --- a/drm-intel-make-lvds-work.patch +++ b/drm-intel-make-lvds-work.patch @@ -1,19 +1,23 @@ -diff -up linux-2.6.33.noarch/drivers/gpu/drm/i915/intel_display.c.orig linux-2.6.33.noarch/drivers/gpu/drm/i915/intel_display.c ---- linux-2.6.33.noarch/drivers/gpu/drm/i915/intel_display.c.orig 2010-03-31 16:59:39.901995671 -0400 -+++ linux-2.6.33.noarch/drivers/gpu/drm/i915/intel_display.c 2010-03-31 17:01:05.416996744 -0400 -@@ -3757,7 +3757,6 @@ struct drm_crtc *intel_get_load_detect_p - void intel_release_load_detect_pipe(struct intel_encoder *intel_encoder, int dpms_mode) + drivers/gpu/drm/i915/intel_display.c | 2 -- + 1 files changed, 0 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c +index 990f065..171a797 100644 +--- a/drivers/gpu/drm/i915/intel_display.c ++++ b/drivers/gpu/drm/i915/intel_display.c +@@ -4568,7 +4568,6 @@ void intel_release_load_detect_pipe(struct intel_encoder *intel_encoder, + struct drm_connector *connector, int dpms_mode) { - struct drm_encoder *encoder = &intel_encoder->enc; + struct drm_encoder *encoder = &intel_encoder->base; - struct drm_device *dev = encoder->dev; struct drm_crtc *crtc = encoder->crtc; struct drm_encoder_helper_funcs *encoder_funcs = encoder->helper_private; struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private; -@@ -3767,7 +3766,6 @@ void intel_release_load_detect_pipe(stru - intel_encoder->base.encoder = NULL; +@@ -4578,7 +4577,6 @@ void intel_release_load_detect_pipe(struct intel_encoder *intel_encoder, + connector->encoder = NULL; intel_encoder->load_detect_temp = false; crtc->enabled = drm_helper_crtc_in_use(crtc); - drm_helper_disable_unused_functions(dev); } - /* Switch crtc and output back off if necessary */ + /* Switch crtc and encoder back off if necessary */ |