Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit cd792aa896f281a224870eb5f2ee5b24682910a5

Authored by Woody Suwalski
Committed by Linus Torvalds
1 parent 3a0991029b
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

[PATCH] cyber2010 framebuffer on ARM Netwinder fix 

The Netwinder machines with Cyber2010 crash badly when starting Xserver.
The workaround is to disable pci burst option for this revision of video
chip.

[akpm@osdl.org: cleanup]
Signed-off-by: Woody Suwalski <woodys@xandros.com>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Cc: James Simmons <jsimmons@infradead.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 12 additions and 7 deletions Side-by-side Diff

drivers/video/cyber2000fb.c
Diff comments   View file @ cd792aa
... ... @@ -1539,16 +1539,21 @@
1539 1539 /*
1540 1540 * Allow the CyberPro to accept PCI burst accesses
1541 1541 */
1542   - val = cyber2000_grphr(EXT_BUS_CTL, cfb);
1543   - if (!(val & EXT_BUS_CTL_PCIBURST_WRITE)) {
1544   - printk(KERN_INFO "%s: enabling PCI bursts\n", cfb->fb.fix.id);
  1542 + if (cfb->id == ID_CYBERPRO_2010) {
  1543 + printk(KERN_INFO "%s: NOT enabling PCI bursts\n", cfb->fb.fix.id);
  1544 + } else {
  1545 + val = cyber2000_grphr(EXT_BUS_CTL, cfb);
  1546 + if (!(val & EXT_BUS_CTL_PCIBURST_WRITE)) {
  1547 + printk(KERN_INFO "%s: enabling PCI bursts\n",
  1548 + cfb->fb.fix.id);
1545 1549  
1546   - val |= EXT_BUS_CTL_PCIBURST_WRITE;
  1550 + val |= EXT_BUS_CTL_PCIBURST_WRITE;
1547 1551  
1548   - if (cfb->id == ID_CYBERPRO_5000)
1549   - val |= EXT_BUS_CTL_PCIBURST_READ;
  1552 + if (cfb->id == ID_CYBERPRO_5000)
  1553 + val |= EXT_BUS_CTL_PCIBURST_READ;
1550 1554  
1551   - cyber2000_grphw(EXT_BUS_CTL, val, cfb);
  1555 + cyber2000_grphw(EXT_BUS_CTL, val, cfb);
  1556 + }
1552 1557 }
1553 1558  
1554 1559 return 0;