Bug#660394: Screen goes blank @30 seconds into boot
On Sun, 2012-04-08 at 02:43 +0100, Ben Hutchings wrote: On Sat, 2012-04-07 at 18:04 -0400, jheaton5 wrote: On Sat, 2012-04-07 at 21:15 +0100, Ben Hutchings wrote: On Sat, 2012-04-07 at 13:53 -0500, Jonathan Nieder wrote: Ben Hutchings wrote: commit 7885d2052bd94395e337709cfba093a41f273ff1 Author: Jesse Barnes jbar...@virtuousgeek.org Date: Thu Jan 12 14:51:17 2012 -0800 drm/i915: mask transcoder select bits before setting them on LVDS which was included in Linux 3.3. I'll apply it and submit it for inclusion in 3.2.y. Thanks. Note that Joel tested that patch and it did not fix his problem (http://bugs.debian.org/660394#36). Oops, OK. Both Joel and Wearenotalone have Sandybridge integrated graphics processors, though they are D (desktop) and M (mobile) variants respectively and there may well be significant differences in the display connections as well. There seems to have been some refactoring of i915 display output setup in Linux 3.2 and subsequent fixes in 3.3. Joel, can you test the package of Linux 3.3 from experimental? Ben. I installed Linux 3.3 and xserver-xorg-video-intel 2.18.0-2 yesterday. The issue is not fixed. However, I can see the video flashing on and off with a bright light aimed at the screen. Eventually, usually after a few hours, the screen turns on and stays on. This condition is not stable because running xrandr or ctrlalt F1 turn the video off. As Jonathan said before: Please report this on http://bugs.freedesktop.org/ product DRI, component DRM/Intel following instructions from http://intellinuxgraphics.org/how_to_report_bug.html and let us know the bug number so we can track it. Ben. See Bug No. 48435 Joel -- To UNSUBSCRIBE, email to debian-kernel-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/1333894204.2204.0.ca...@debian.hsd1.ga.comcast.net.
Bug#660394: Screen goes blank @30 seconds into boot
tags 660394 = upstream forwarded 660394 https://bugs.freedesktop.org/48435 quit jheaton5 wrote: See Bug No. 48435 Thanks much. Hopefully someone upstream will have ideas for tracking this down further. -- To UNSUBSCRIBE, email to debian-kernel-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20120408145616.GC2631@burratino
Bug#660394: Screen goes blank @30 seconds into boot
Hello there, after updating my Debian Wheezy/Testing to linux kernel 3.2 my screen goes black at boot, too. My system is a Lenovo Thinkpad L420 with an Intel Core i3 (HD3000) inside. The fix posted above (http://lists.freedesktop.org/archives/intel-gfx/2012-January/014332.html) fixes this bug for me. If you dont want to compile a custom kernel, a temporary workaround is to add i915.modeset=0 to the grub command line. Thank You! WANA -- To UNSUBSCRIBE, email to debian-kernel-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/4f803999.2040...@freenet.de
Bug#660394: Screen goes blank @30 seconds into boot
Hi, Wearenotalone wrote: after updating my Debian Wheezy/Testing to linux kernel 3.2 my screen goes black at boot, too. My system is a Lenovo Thinkpad L420 with an Intel Core i3 (HD3000) inside. The fix posted above (http://lists.freedesktop.org/archives/intel-gfx/2012-January/014332.html) fixes this bug for me. Please file a separate bug. Thanks, Jonathan -- To UNSUBSCRIBE, email to debian-kernel-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20120407135238.GB2377@burratino
Bug#660394: Screen goes blank @30 seconds into boot
Hi Jonathan, my wording was a bit imprecise. My problem is already known upstream. So sooner or later the fix will make it into debian. I just wanted to let you know, that the patch and instructions you proposed are working for me. Thank you for that! First i booted into my system by using the i915.modeset=0 workaround. Then i patched my kernel as proposed at [1], rebooted and voilà the black/blank screen is gone. Kind regards [1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=660394#10 Am 07.04.2012 15:52, schrieb Jonathan Nieder: Hi, Wearenotalone wrote: after updating my Debian Wheezy/Testing to linux kernel 3.2 my screen goes black at boot, too. My system is a Lenovo Thinkpad L420 with an Intel Core i3 (HD3000) inside. The fix posted above (http://lists.freedesktop.org/archives/intel-gfx/2012-January/014332.html) fixes this bug for me. Please file a separate bug. Thanks, Jonathan -- To UNSUBSCRIBE, email to debian-kernel-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/4f805fea.6030...@freenet.de
Bug#660394: Screen goes blank @30 seconds into boot
Hi, Wearenotalone wrote: my wording was a bit imprecise. My problem is already known upstream. That's great, but please file a bug anyway so we can track it and make sure it gets fixed for wheezy (and in the upstream 3.2.y series). Thanks, Jonathan -- To UNSUBSCRIBE, email to debian-kernel-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20120407155305.GA3286@burratino
Bug#660394: Screen goes blank @30 seconds into boot
On Sat, 2012-04-07 at 14:56 +0200, Wearenotalone wrote: Hello there, after updating my Debian Wheezy/Testing to linux kernel 3.2 my screen goes black at boot, too. My system is a Lenovo Thinkpad L420 with an Intel Core i3 (HD3000) inside. The fix posted above (http://lists.freedesktop.org/archives/intel-gfx/2012-January/014332.html) fixes this bug for me. This was committed as: commit 7885d2052bd94395e337709cfba093a41f273ff1 Author: Jesse Barnes jbar...@virtuousgeek.org Date: Thu Jan 12 14:51:17 2012 -0800 drm/i915: mask transcoder select bits before setting them on LVDS which was included in Linux 3.3. I'll apply it and submit it for inclusion in 3.2.y. If you dont want to compile a custom kernel, a temporary workaround is to add i915.modeset=0 to the grub command line. Or use the package from experimental. Ben. -- Ben Hutchings Larkinson's Law: All laws are basically false. signature.asc Description: This is a digitally signed message part
Bug#660394: Screen goes blank @30 seconds into boot
Ben Hutchings wrote: commit 7885d2052bd94395e337709cfba093a41f273ff1 Author: Jesse Barnes jbar...@virtuousgeek.org Date: Thu Jan 12 14:51:17 2012 -0800 drm/i915: mask transcoder select bits before setting them on LVDS which was included in Linux 3.3. I'll apply it and submit it for inclusion in 3.2.y. Thanks. Note that Joel tested that patch and it did not fix his problem (http://bugs.debian.org/660394#36). -- To UNSUBSCRIBE, email to debian-kernel-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20120407185320.GA3993@burratino
Bug#660394: Screen goes blank @30 seconds into boot
On Sat, 2012-04-07 at 13:53 -0500, Jonathan Nieder wrote: Ben Hutchings wrote: commit 7885d2052bd94395e337709cfba093a41f273ff1 Author: Jesse Barnes jbar...@virtuousgeek.org Date: Thu Jan 12 14:51:17 2012 -0800 drm/i915: mask transcoder select bits before setting them on LVDS which was included in Linux 3.3. I'll apply it and submit it for inclusion in 3.2.y. Thanks. Note that Joel tested that patch and it did not fix his problem (http://bugs.debian.org/660394#36). Oops, OK. Both Joel and Wearenotalone have Sandybridge integrated graphics processors, though they are D (desktop) and M (mobile) variants respectively and there may well be significant differences in the display connections as well. There seems to have been some refactoring of i915 display output setup in Linux 3.2 and subsequent fixes in 3.3. Joel, can you test the package of Linux 3.3 from experimental? Ben. -- Ben Hutchings Larkinson's Law: All laws are basically false. signature.asc Description: This is a digitally signed message part
Bug#660394: Screen goes blank @30 seconds into boot
On Sat, 2012-02-25 at 10:55 -0500, Joel Heaton wrote: On Wed, 2012-02-22 at 05:10 -0600, Jonathan Nieder wrote: tags 660394 - patch moreinfo quit Joel Heaton wrote: I made the change by editing drivers/acpi/video.c but the bug is recreated. Thanks for the quick feedback. Let's take this upstream. Please report this on http://bugs.freedesktop.org/ product DRI, component DRM/Intel following instructions from [1]http://intellinuxgraphics.org/how_to_report_bug.html and let us know the bug number so we can track it. While gathering information to post in Bugzilla, I discovered that my chipset is H61. According to [1] above, the driver for this chipset is i965 whereas I am using i915. I 965 appears to be installed: [...] You're mixing up several different things. Modern graphics drivers are split into several parts: 1. Kernel driver (initialisation, display connector and mode setting (KMS, fb), memory management and command stream support (DRM)) 2. libdrm driver (userland command stream support) 3. X driver (accelerated X rendering) 4. Mesa driver (accelerated OpenGL rendering) In your case these parts are: 1. /lib/modules/release/kernel/drivers/gpu/drm/i915/i915.ko 2. /usr/lib/x86_64-linux-gnu/libdrm_intel.so.1.0.0 3. /usr/lib/xorg/modules/drivers/intel_drv.so 4. /usr/lib/x86_64-linux-gnu/dri/i965_dri.so Not all of these components support the same range of GPUs, hence the different names. Ben. -- Ben Hutchings Larkinson's Law: All laws are basically false. signature.asc Description: This is a digitally signed message part
Bug#660394: Screen goes blank @30 seconds into boot
On Sat, 2012-04-07 at 21:15 +0100, Ben Hutchings wrote: On Sat, 2012-04-07 at 13:53 -0500, Jonathan Nieder wrote: Ben Hutchings wrote: commit 7885d2052bd94395e337709cfba093a41f273ff1 Author: Jesse Barnes jbar...@virtuousgeek.org Date: Thu Jan 12 14:51:17 2012 -0800 drm/i915: mask transcoder select bits before setting them on LVDS which was included in Linux 3.3. I'll apply it and submit it for inclusion in 3.2.y. Thanks. Note that Joel tested that patch and it did not fix his problem (http://bugs.debian.org/660394#36). Oops, OK. Both Joel and Wearenotalone have Sandybridge integrated graphics processors, though they are D (desktop) and M (mobile) variants respectively and there may well be significant differences in the display connections as well. There seems to have been some refactoring of i915 display output setup in Linux 3.2 and subsequent fixes in 3.3. Joel, can you test the package of Linux 3.3 from experimental? Ben. I installed Linux 3.3 and xserver-xorg-video-intel 2.18.0-2 yesterday. The issue is not fixed. However, I can see the video flashing on and off with a bright light aimed at the screen. Eventually, usually after a few hours, the screen turns on and stays on. This condition is not stable because running xrandr or ctrlalt F1 turn the video off. Joel -- To UNSUBSCRIBE, email to debian-kernel-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/1333836242.6621.6.ca...@debian.hsd1.ga.comcast.net.
Bug#660394: Screen goes blank @30 seconds into boot
On Sat, 2012-04-07 at 21:39 +0100, Ben Hutchings wrote: On Sat, 2012-02-25 at 10:55 -0500, Joel Heaton wrote: On Wed, 2012-02-22 at 05:10 -0600, Jonathan Nieder wrote: tags 660394 - patch moreinfo quit Joel Heaton wrote: I made the change by editing drivers/acpi/video.c but the bug is recreated. Thanks for the quick feedback. Let's take this upstream. Please report this on http://bugs.freedesktop.org/ product DRI, component DRM/Intel following instructions from [1]http://intellinuxgraphics.org/how_to_report_bug.html and let us know the bug number so we can track it. While gathering information to post in Bugzilla, I discovered that my chipset is H61. According to [1] above, the driver for this chipset is i965 whereas I am using i915. I 965 appears to be installed: [...] You're mixing up several different things. Modern graphics drivers are split into several parts: 1. Kernel driver (initialisation, display connector and mode setting (KMS, fb), memory management and command stream support (DRM)) 2. libdrm driver (userland command stream support) 3. X driver (accelerated X rendering) 4. Mesa driver (accelerated OpenGL rendering) In your case these parts are: 1. /lib/modules/release/kernel/drivers/gpu/drm/i915/i915.ko 2. /usr/lib/x86_64-linux-gnu/libdrm_intel.so.1.0.0 3. /usr/lib/xorg/modules/drivers/intel_drv.so 4. /usr/lib/x86_64-linux-gnu/dri/i965_dri.so Not all of these components support the same range of GPUs, hence the different names. Ben. Thanks for that explanation. Joel -- To UNSUBSCRIBE, email to debian-kernel-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/1333836393.6621.7.ca...@debian.hsd1.ga.comcast.net.
Bug#660394: Screen goes blank @30 seconds into boot
On Sat, 2012-04-07 at 18:04 -0400, jheaton5 wrote: On Sat, 2012-04-07 at 21:15 +0100, Ben Hutchings wrote: On Sat, 2012-04-07 at 13:53 -0500, Jonathan Nieder wrote: Ben Hutchings wrote: commit 7885d2052bd94395e337709cfba093a41f273ff1 Author: Jesse Barnes jbar...@virtuousgeek.org Date: Thu Jan 12 14:51:17 2012 -0800 drm/i915: mask transcoder select bits before setting them on LVDS which was included in Linux 3.3. I'll apply it and submit it for inclusion in 3.2.y. Thanks. Note that Joel tested that patch and it did not fix his problem (http://bugs.debian.org/660394#36). Oops, OK. Both Joel and Wearenotalone have Sandybridge integrated graphics processors, though they are D (desktop) and M (mobile) variants respectively and there may well be significant differences in the display connections as well. There seems to have been some refactoring of i915 display output setup in Linux 3.2 and subsequent fixes in 3.3. Joel, can you test the package of Linux 3.3 from experimental? Ben. I installed Linux 3.3 and xserver-xorg-video-intel 2.18.0-2 yesterday. The issue is not fixed. However, I can see the video flashing on and off with a bright light aimed at the screen. Eventually, usually after a few hours, the screen turns on and stays on. This condition is not stable because running xrandr or ctrlalt F1 turn the video off. As Jonathan said before: Please report this on http://bugs.freedesktop.org/ product DRI, component DRM/Intel following instructions from http://intellinuxgraphics.org/how_to_report_bug.html and let us know the bug number so we can track it. Ben. -- Ben Hutchings If more than one person is responsible for a bug, no one is at fault. signature.asc Description: This is a digitally signed message part
Bug#660394: Screen goes blank @30 seconds into boot
On Wed, 2012-02-22 at 05:10 -0600, Jonathan Nieder wrote: tags 660394 - patch moreinfo quit Joel Heaton wrote: I made the change by editing drivers/acpi/video.c but the bug is recreated. Thanks for the quick feedback. Let's take this upstream. Please report this on http://bugs.freedesktop.org/ product DRI, component DRM/Intel following instructions from [1]http://intellinuxgraphics.org/how_to_report_bug.html and let us know the bug number so we can track it. While gathering information to post in Bugzilla, I discovered that my chipset is H61. According to [1] above, the driver for this chipset is i965 whereas I am using i915. I 965 appears to be installed: root@aragorn:/home/jheaton5# locate i965 /usr/lib/dri/i965_drv_video.so /usr/lib/x86_64-linux-gnu/dri/i965_dri.so /usr/lib32/dri/i965_dri.so But it is not in the active modules root@aragorn:/home/jheaton5# lsmod | grep i9 i915 351780 0 drm_kms_helper 27227 1 i915 drm 167670 2 i915,drm_kms_helper i2c_algo_bit 12841 1 i915 button 12937 1 i915 video 17628 1 i915 i2c_core 23876 6 i915,drm_kms_helper,drm,i2c_algo_bit,videodev,i2c_i801 I can remove i915 but I cannot modprobe i965. root@aragorn:/home/jheaton5# modprobe i965 FATAL: Module i965 not found. root@aragorn:/home/jheaton5# modprobe i965_drv_video.so FATAL: Module i965_drv_video.so not found. I am using the latest xserver-xorg-video-intel from experimental. root@aragorn:/home/jheaton5# apt-cache policy xserver-xorg-video-intel xserver-xorg-video-intel: Installed: 2:2.17.0+git20120204-1 Candidate: 2:2.18.0-1 Version table: 2:2.18.0-1+exp1 0 1 http://ftp.debian.org/debian/ experimental/main amd64 Packages 2:2.18.0-1 0 500 http://ftp.us.debian.org/debian/ sid/main amd64 Packages *** 2:2.17.0+git20120204-1 0 100 /var/lib/dpkg/status I need to use the i965 driver -- To UNSUBSCRIBE, email to debian-kernel-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/1330185314.2195.9.ca...@aragorn.hsd1.ga.comcast.net.
Bug#660394: Screen goes blank @30 seconds into boot
On Tue, 2012-02-21 at 05:14 -0600, Jonathan Nieder wrote: forwarded 660394 http://thread.gmane.org/gmane.comp.freedesktop.xorg.drivers.intel/8363/focus=8368 quit Joel Heaton wrote: This patched kernel also reproduced the bug. I have attached the acpidump and dmesg for this boot. Thanks. Alas. Could you try this[2] patch? I'd suggest just editing drivers/acpi/video.c by hand to make the change directly, then running make deb-pkg; # maybe with -j4 dpkg -i ../name of package reboot to test. (No need for another acpidump --- its output is always the same on a given machine, except when BIOS settings change or in some unusual cases of corruption which don't match your symptoms.) [2] http://thread.gmane.org/gmane.linux.kernel/1234103 I made the change by editing drivers/acpi/video.c but the bug is recreated. -- To UNSUBSCRIBE, email to debian-kernel-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/1329907614.7096.3.ca...@aragorn.hsd1.ga.comcast.net.
Bug#660394: Screen goes blank @30 seconds into boot
tags 660394 - patch moreinfo quit Joel Heaton wrote: I made the change by editing drivers/acpi/video.c but the bug is recreated. Thanks for the quick feedback. Let's take this upstream. Please report this on http://bugs.freedesktop.org/ product DRI, component DRM/Intel following instructions from http://intellinuxgraphics.org/how_to_report_bug.html and let us know the bug number so we can track it. -- To UNSUBSCRIBE, email to debian-kernel-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20120222111015.GB28745@burratino
Bug#660394: Screen goes blank @30 seconds into boot
forwarded 660394 http://thread.gmane.org/gmane.comp.freedesktop.xorg.drivers.intel/8363/focus=8368 quit Joel Heaton wrote: This patched kernel also reproduced the bug. I have attached the acpidump and dmesg for this boot. Thanks. Alas. Could you try this[2] patch? I'd suggest just editing drivers/acpi/video.c by hand to make the change directly, then running make deb-pkg; # maybe with -j4 dpkg -i ../name of package reboot to test. (No need for another acpidump --- its output is always the same on a given machine, except when BIOS settings change or in some unusual cases of corruption which don't match your symptoms.) [2] http://thread.gmane.org/gmane.linux.kernel/1234103 -- To UNSUBSCRIBE, email to debian-kernel-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/2012022118.GA28322@burratino
Bug#660394: Screen goes blank @30 seconds into boot
I am still trying to apply the patch. I'll report back when I have succeeded. Thanks Joel -- To UNSUBSCRIBE, email to debian-kernel-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/1329737767.8983.1.ca...@aragorn.hsd1.ga.comcast.net.
Bug#660394: Screen goes blank @30 seconds into boot
Joel Heaton wrote: I am still trying to apply the patch. Can you say more about this? Maybe we can help. As an alternative to the instructions at [1], I can also suggest 0. Prerequisites: apt-get install git build-essential 1. Get the source: git clone -o stable \ git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git \ linux cd linux Or, if you already have a git clone of the linux source, just get the point releases: cd linux git remote add -f stable \ git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git 2. Configure and build: git checkout stable/linux-3.2.y cp /boot/config-$(uname -r) .config; # current configuration make localmodconfig; # optional: minimize configuration make deb-pkg; # optionally with -jnum for parallel build dpkg -i ../name of package reboot Hopefully it reproduces the bug. 3. Try the patch: cd linux git apply --index thepatch make deb-pkg; # maybe with -j4 dpkg -i ../name of package reboot Hope that helps, Jonathan [1] http://kernel-handbook.alioth.debian.org/ch-common-tasks.html -- To UNSUBSCRIBE, email to debian-kernel-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20120220195331.GD18695@burratino
Bug#660394: Screen goes blank @30 seconds into boot
forwarded 660394
http://lists.freedesktop.org/archives/intel-gfx/2012-January/014334.html
tags 660394 + upstream patch
quit
Hi Joel,
Joel Heaton wrote:
Video: Intel HD/HD 2000/HD 3000
[...]
When booting the screen goes blank about 80% through the boot cycle.
The system is still running, I can log in blind and execute reboot
command.
I ssh into the system from another computer.
kern.log reports “Firmware Bug: ACPI: No _BQC method, cannot determine
initial brightness”
inxi -Fxx reports Drivers: (vesa, intel (unloaded: fbdev) Resolution
1280×1024@76.0hz
sporadically, I get a good boot, maybe once in 20 tries.
Is this a regression? What other kernel versions have you tried, and
how did they behave?
Is this the internal panel (LVDS) or some other output?
Please attach full acpidump and dmesg output from a bad boot.
Can you try the attached patch? Instructions for testing a patched
kernel are at [1].
Thanks,
Jonathan
[1] http://kernel-handbook.alioth.debian.org/ch-common-tasks.html
or the corresponding page in the debian-kernel-handbook package.
References:
http://forums.gentoo.org/viewtopic-t-874961.html
http://www.debianuserforums.org/viewtopic.php?f=56t=1586
https://bugs.freedesktop.org/show_bug.cgi?id=44652
http://techpatterns.com/forums/about1994-20.html
http://www.aptosid.com/index.php?name=PNphpBB2file=viewtopict=2075
From: Jesse Barnes jbar...@virtuousgeek.org
Date: Thu, 12 Jan 2012 14:51:17 -0800
Subject: drm/i915: mask transcoder select bits before setting them on LVDS
commit 7885d2052bd94395e337709cfba093a41f273ff1 upstream.
The transcoder port may changed from mode set to mode set, so make sure
to mask out the selection bits before setting the right ones or we'll
get black screens when going from transcoder B to A.
Tested-by: Vincent Vanackere vincent.vanack...@gmail.com
Signed-off-by: Jesse Barnes jbar...@virtuousgeek.org
Reviewed-by: Keith Packard kei...@keithp.com
Signed-off-by: Keith Packard kei...@keithp.com
Signed-off-by: Jonathan Nieder jrnie...@gmail.com
---
drivers/gpu/drm/i915/intel_display.c | 13 -
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c
b/drivers/gpu/drm/i915/intel_display.c
index daa5743..a52a9a2 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -5646,12 +5646,15 @@ static int ironlake_crtc_mode_set(struct drm_crtc *crtc,
if (is_lvds) {
temp = I915_READ(PCH_LVDS);
temp |= LVDS_PORT_EN | LVDS_A0A2_CLKA_POWER_UP;
- if (HAS_PCH_CPT(dev))
+ if (HAS_PCH_CPT(dev)) {
+ temp = ~PORT_TRANS_SEL_MASK;
temp |= PORT_TRANS_SEL_CPT(pipe);
- else if (pipe == 1)
- temp |= LVDS_PIPEB_SELECT;
- else
- temp = ~LVDS_PIPEB_SELECT;
+ } else {
+ if (pipe == 1)
+ temp |= LVDS_PIPEB_SELECT;
+ else
+ temp = ~LVDS_PIPEB_SELECT;
+ }
/* set the corresponsding LVDS_BORDER bit */
temp |= dev_priv-lvds_border_bits;
--
1.7.2.5
