Skip to main content

[xwin-commits] [solaris-x11~x-s11-update-clone:1337] 16245956 M4: ROM Mapping Error for Matrox Device after First Run

  • From:
  • To:
  • Subject: [xwin-commits] [solaris-x11~x-s11-update-clone:1337] 16245956 M4: ROM Mapping Error for Matrox Device after First Run
  • Date: Wed, 20 Mar 2013 22:16:58 +0000

Project:    solaris-x11
Repository: x-s11-update-clone
Revision:   1337
Author:     x-hg
Date:       2013-03-20 22:14:14 UTC
Link:       

Log Message:
------------
16245956 M4: ROM Mapping Error for Matrox Device after First Run


Revisions:
----------
1337


Modified Paths:
---------------
open-src/driver/xf86-video-mga/Makefile


Added Paths:
------------
open-src/driver/xf86-video-mga/rom_map.patch


Diffs:
------
diff -r f0f608bcdc5f -r fb91cf54879e open-src/driver/xf86-video-mga/Makefile
--- a/open-src/driver/xf86-video-mga/Makefile   Wed Mar 20 12:39:28 2013 -0700
+++ b/open-src/driver/xf86-video-mga/Makefile   Wed Mar 20 15:14:14 2013 -0700
@@ -2,7 +2,7 @@
 #
 # xf86-video-mga Makefile
 #
-# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights 
reserved.
+# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights 
reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -41,7 +41,8 @@
                libraries.patch,-p1 \
                g200se_pilot3_offscreen.patch,-p1 \
                sparc.patch,-p1 \
-               sparc-bus-probe.patch,-p1
+               sparc-bus-probe.patch,-p1 \
+               rom_map.patch,-p1
 
 # Man pages to apply Sun footer to & attributes to list
 SUNTOUCHED_MANPAGES=man/*.man

diff -r f0f608bcdc5f -r fb91cf54879e 
open-src/driver/xf86-video-mga/rom_map.patch
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/driver/xf86-video-mga/rom_map.patch      Wed Mar 20 15:14:14 
2013 -0700
@@ -0,0 +1,22 @@
+--- a/src/mga_dacG.c   Mon Feb 11 14:59:08 2013
++++ b/src/mga_dacG.c   Mon Feb 11 15:00:39 2013
+@@ -1054,6 +1054,19 @@

+               if (pMga->HasSDRAM)
+                   pReg->Option = 0x40049120;
++              else {
++                  /* 
++                   * Do not reset biosen bit of option reg, as this will 
set 
++                   * ROM base register to 0
++                   */
++                  CARD32 option = 0;
++#ifdef XSERVER_LIBPCIACCESS
++                  pci_device_cfg_read_u32(pMga->PciInfo, & option, 
PCI_OPTION_REG);
++#else
++                  option = pciReadLong(pMga->PciTag, PCI_OPTION_REG);
++#endif
++                  pReg->Option = (pReg->Option & 0xFBFFFFFF) | (option & 
0x40000000);
++              }
+               pReg->Option2 = 0x00008000;
+               break;







[xwin-commits] [solaris-x11~x-s11-update-clone:1337] 16245956 M4: ROM Mapping Error for Matrox Device after First Run

x-hg 03/20/2013
 
 
Close
loading
Please Confirm
Close