diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2008-10-29 14:55:26 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2008-10-29 14:55:26 +0000 |
commit | e61ea24100067bdcd82be23607500d1acbcc91cb (patch) | |
tree | 55433c486ae43889b43179a076624097e029ffb9 /meta/packages/xorg-driver/xf86-video-intel-dri2/005_disable_sdvo_TV_port_restoreHW.patch | |
parent | 3e7b691f60630bd224ab95374ddb5f3c108f645e (diff) | |
parent | f21745fa921c1eacb9740ba4f08813a54be4ab8d (diff) | |
download | openembedded-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/005_disable_sdvo_TV_port_restoreHW.patch')
-rw-r--r--[-rwxr-xr-x] | meta/packages/xorg-driver/xf86-video-intel-dri2/005_disable_sdvo_TV_port_restoreHW.patch | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/meta/packages/xorg-driver/xf86-video-intel-dri2/005_disable_sdvo_TV_port_restoreHW.patch b/meta/packages/xorg-driver/xf86-video-intel-dri2/005_disable_sdvo_TV_port_restoreHW.patch index 6cdeb3e70..338acb2ba 100755..100644 --- a/meta/packages/xorg-driver/xf86-video-intel-dri2/005_disable_sdvo_TV_port_restoreHW.patch +++ b/meta/packages/xorg-driver/xf86-video-intel-dri2/005_disable_sdvo_TV_port_restoreHW.patch @@ -1,15 +1,16 @@ -diff -urN xf86-video-intel-2.5.96.0/src/i830_driver.c xf86-video-intel-2.5.96.0.new/src/i830_driver.c ---- xf86-video-intel-2.5.96.0/src/i830_driver.c 2008-09-25 21:32:45.000000000 +0800 -+++ xf86-video-intel-2.5.96.0.new/src/i830_driver.c 2008-09-25 21:34:19.000000000 +0800 -@@ -912,6 +912,7 @@ +diff --git a/src/i830_driver.c b/src/i830_driver.c +index 223967f..4f95db0 100644 +--- a/src/i830_driver.c ++++ b/src/i830_driver.c +@@ -912,6 +912,7 @@ I830SetupOutputs(ScrnInfoPtr pScrn) if (IS_MOBILE(pI830) && !IS_I830(pI830)) i830_lvds_init(pScrn); +#if 0 if (IS_I9XX(pI830)) { - if (INREG(SDVOB) & SDVO_DETECTED) { + if ((INREG(SDVOB) & SDVO_DETECTED) || pI830->force_sdvo_detect) { Bool found = i830_sdvo_init(pScrn, SDVOB); -@@ -931,7 +932,8 @@ +@@ -931,7 +932,8 @@ I830SetupOutputs(ScrnInfoPtr pScrn) } if (IS_I9XX(pI830) && IS_MOBILE(pI830)) i830_tv_init(pScrn); @@ -19,7 +20,7 @@ diff -urN xf86-video-intel-2.5.96.0/src/i830_driver.c xf86-video-intel-2.5.96.0. for (o = 0; o < config->num_output; o++) { xf86OutputPtr output = config->output[o]; -@@ -1612,7 +1614,9 @@ +@@ -1622,7 +1624,9 @@ I830AccelMethodInit(ScrnInfoPtr pScrn) PreInitCleanup(pScrn); return FALSE; } |