summaryrefslogtreecommitdiff
path: root/meta/packages/xorg-driver/xf86-video-intel-dri2/006_disable_check_lvds_panelpower_status.patch
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2008-10-29 14:55:26 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2008-10-29 14:55:26 +0000
commite61ea24100067bdcd82be23607500d1acbcc91cb (patch)
tree55433c486ae43889b43179a076624097e029ffb9 /meta/packages/xorg-driver/xf86-video-intel-dri2/006_disable_check_lvds_panelpower_status.patch
parent3e7b691f60630bd224ab95374ddb5f3c108f645e (diff)
parentf21745fa921c1eacb9740ba4f08813a54be4ab8d (diff)
downloadopenembedded-core-e61ea24100067bdcd82be23607500d1acbcc91cb.tar.gz
openembedded-core-e61ea24100067bdcd82be23607500d1acbcc91cb.tar.bz2
openembedded-core-e61ea24100067bdcd82be23607500d1acbcc91cb.tar.xz
openembedded-core-e61ea24100067bdcd82be23607500d1acbcc91cb.zip
Merge branch 'pli1/X11-rework' of git@moblin-mdi.jf.intel.com:poky-staging into master-dev
Diffstat (limited to 'meta/packages/xorg-driver/xf86-video-intel-dri2/006_disable_check_lvds_panelpower_status.patch')
-rw-r--r--[-rwxr-xr-x]meta/packages/xorg-driver/xf86-video-intel-dri2/006_disable_check_lvds_panelpower_status.patch11
1 files changed, 6 insertions, 5 deletions
diff --git a/meta/packages/xorg-driver/xf86-video-intel-dri2/006_disable_check_lvds_panelpower_status.patch b/meta/packages/xorg-driver/xf86-video-intel-dri2/006_disable_check_lvds_panelpower_status.patch
index b35e43f6a..092544381 100755..100644
--- a/meta/packages/xorg-driver/xf86-video-intel-dri2/006_disable_check_lvds_panelpower_status.patch
+++ b/meta/packages/xorg-driver/xf86-video-intel-dri2/006_disable_check_lvds_panelpower_status.patch
@@ -1,7 +1,8 @@
-diff -urN xf86-video-intel-2.5.96.0/src/i830_lvds.c xf86-video-intel-2.5.96.0.new/src/i830_lvds.c
---- xf86-video-intel-2.5.96.0/src/i830_lvds.c 2008-09-01 05:27:39.000000000 +0800
-+++ xf86-video-intel-2.5.96.0.new/src/i830_lvds.c 2008-09-25 21:36:13.000000000 +0800
-@@ -404,10 +404,11 @@
+diff --git a/src/i830_lvds.c b/src/i830_lvds.c
+index 0d67d50..adb0dba 100644
+--- a/src/i830_lvds.c
++++ b/src/i830_lvds.c
+@@ -404,10 +404,11 @@ i830SetLVDSPanelPower(xf86OutputPtr output, Bool on)
dev_priv->backlight_duty_cycle = dev_priv->backlight_max;
OUTREG(PP_CONTROL, INREG(PP_CONTROL) | POWER_TARGET_ON);
@@ -14,7 +15,7 @@ diff -urN xf86-video-intel-2.5.96.0/src/i830_lvds.c xf86-video-intel-2.5.96.0.ne
dev_priv->set_backlight(output, dev_priv->backlight_duty_cycle);
dev_priv->dpmsoff = FALSE;
} else {
-@@ -420,10 +421,11 @@
+@@ -420,10 +421,11 @@ i830SetLVDSPanelPower(xf86OutputPtr output, Bool on)
dev_priv->set_backlight(output, 0);
OUTREG(PP_CONTROL, INREG(PP_CONTROL) & ~POWER_TARGET_ON);