]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Jun 2010 04:09:48 +0000 (21:09 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Jun 2010 04:09:48 +0000 (21:09 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
  module: fix bne2 "gave up waiting for init of module libcrc32c"
  module: verify_export_symbols under the lock
  module: move find_module check to end
  module: make locking more fine-grained.
  module: Make module sysfs functions private.
  module: move sysfs exposure to end of load_module
  module: fix kdb's illicit use of struct module_use.
  module: Make the 'usage' lists be two-way

425 files changed:
Documentation/DocBook/v4l/v4l2.xml
Documentation/DocBook/v4l/vidioc-query-dv-preset.xml
Documentation/edac.txt
Documentation/feature-removal-schedule.txt
Documentation/video4linux/CARDLIST.saa7134
Documentation/video4linux/gspca.txt
MAINTAINERS
arch/frv/mm/fault.c
arch/m32r/mm/fault.c
arch/mn10300/mm/fault.c
arch/sh/Kconfig
arch/sh/boards/Kconfig
arch/sh/boards/mach-ap325rxa/setup.c
arch/sh/boards/mach-ecovec24/setup.c
arch/sh/boards/mach-migor/setup.c
arch/sh/boards/mach-se/7724/setup.c
arch/sh/boot/romimage/Makefile
arch/sh/boot/romimage/head.S
arch/sh/boot/romimage/mmcif-sh7724.c [new file with mode: 0644]
arch/sh/boot/romimage/vmlinux.scr
arch/sh/include/asm/io.h
arch/sh/include/asm/machvec.h
arch/sh/include/cpu-sh4/cpu/sh7724.h
arch/sh/include/mach-common/mach/romimage.h
arch/sh/include/mach-ecovec24/mach/romimage.h
arch/sh/include/mach-kfr2r09/mach/romimage.h
arch/sh/kernel/Makefile
arch/sh/kernel/dwarf.c
arch/sh/kernel/io.c
arch/sh/kernel/io_generic.c
arch/sh/kernel/io_trapped.c
arch/sh/kernel/machvec.c
arch/sh/kernel/return_address.c
arch/um/kernel/skas/uaccess.c
arch/x86/include/asm/pci_x86.h
arch/x86/kernel/cpu/mcheck/mce.c
arch/x86/pci/legacy.c
arch/xtensa/mm/fault.c
block/blk-core.c
block/cfq-iosched.c
block/elevator.c
drivers/acpi/ec.c
drivers/acpi/internal.h
drivers/acpi/processor_idle.c
drivers/acpi/sleep.c
drivers/block/brd.c
drivers/block/cciss_scsi.c
drivers/block/drbd/drbd_int.h
drivers/block/drbd/drbd_main.c
drivers/block/drbd/drbd_receiver.c
drivers/block/drbd/drbd_req.c
drivers/block/drbd/drbd_req.h
drivers/block/drbd/drbd_worker.c
drivers/char/Kconfig
drivers/char/n_gsm.c
drivers/char/vt.c
drivers/char/vt_ioctl.c
drivers/clocksource/sh_cmt.c
drivers/clocksource/sh_tmu.c
drivers/edac/Kconfig
drivers/edac/Makefile
drivers/edac/edac_core.h
drivers/edac/edac_mc_sysfs.c
drivers/edac/edac_mce.c [new file with mode: 0644]
drivers/edac/i7core_edac.c [new file with mode: 0644]
drivers/input/serio/Kconfig
drivers/input/tablet/wacom_sys.c
drivers/input/tablet/wacom_wac.c
drivers/input/tablet/wacom_wac.h
drivers/input/touchscreen/Kconfig
drivers/input/touchscreen/ads7846.c
drivers/input/touchscreen/s3c2410_ts.c
drivers/input/touchscreen/tps6507x-ts.c
drivers/media/IR/Kconfig
drivers/media/IR/imon.c
drivers/media/IR/ir-keytable.c
drivers/media/IR/ir-sysfs.c
drivers/media/IR/keymaps/Makefile
drivers/media/IR/keymaps/rc-avermedia-m135a-rm-jx.c [deleted file]
drivers/media/IR/keymaps/rc-avermedia-m135a.c [new file with mode: 0644]
drivers/media/IR/keymaps/rc-avermedia-m733a-rm-k6.c [new file with mode: 0644]
drivers/media/dvb/dm1105/dm1105.c
drivers/media/dvb/dvb-core/dvb_net.c
drivers/media/dvb/dvb-usb/Kconfig
drivers/media/dvb/dvb-usb/cxusb.c
drivers/media/dvb/dvb-usb/dvb-usb-ids.h
drivers/media/dvb/dvb-usb/ttusb2.c
drivers/media/dvb/firewire/firedtv-1394.c
drivers/media/dvb/frontends/au8522_decoder.c
drivers/media/dvb/frontends/ds3000.c
drivers/media/dvb/frontends/stv6110x.c
drivers/media/dvb/ngene/ngene-cards.c
drivers/media/dvb/ngene/ngene-core.c
drivers/media/dvb/ngene/ngene-dvb.c
drivers/media/dvb/ngene/ngene-i2c.c
drivers/media/dvb/ngene/ngene.h
drivers/media/dvb/ttpci/Kconfig
drivers/media/dvb/ttpci/budget-ci.c
drivers/media/video/Kconfig
drivers/media/video/ak881x.c
drivers/media/video/bw-qcam.c
drivers/media/video/bw-qcam.h [deleted file]
drivers/media/video/c-qcam.c
drivers/media/video/cx18/cx18-alsa-main.c
drivers/media/video/cx18/cx18-alsa-mixer.c
drivers/media/video/cx18/cx18-alsa-mixer.h
drivers/media/video/cx18/cx18-alsa-pcm.c
drivers/media/video/cx18/cx18-alsa-pcm.h
drivers/media/video/cx18/cx18-alsa.h
drivers/media/video/cx18/cx18-av-audio.c
drivers/media/video/cx18/cx18-av-core.c
drivers/media/video/cx18/cx18-av-core.h
drivers/media/video/cx18/cx18-av-firmware.c
drivers/media/video/cx18/cx18-cards.c
drivers/media/video/cx18/cx18-cards.h
drivers/media/video/cx18/cx18-controls.c
drivers/media/video/cx18/cx18-driver.c
drivers/media/video/cx18/cx18-driver.h
drivers/media/video/cx18/cx18-dvb.c
drivers/media/video/cx18/cx18-fileops.c
drivers/media/video/cx18/cx18-firmware.c
drivers/media/video/cx18/cx18-gpio.c
drivers/media/video/cx18/cx18-gpio.h
drivers/media/video/cx18/cx18-i2c.c
drivers/media/video/cx18/cx18-io.c
drivers/media/video/cx18/cx18-io.h
drivers/media/video/cx18/cx18-ioctl.c
drivers/media/video/cx18/cx18-ioctl.h
drivers/media/video/cx18/cx18-irq.c
drivers/media/video/cx18/cx18-irq.h
drivers/media/video/cx18/cx18-mailbox.c
drivers/media/video/cx18/cx18-mailbox.h
drivers/media/video/cx18/cx18-queue.c
drivers/media/video/cx18/cx18-queue.h
drivers/media/video/cx18/cx18-scb.c
drivers/media/video/cx18/cx18-scb.h
drivers/media/video/cx18/cx18-streams.c
drivers/media/video/cx18/cx18-streams.h
drivers/media/video/cx231xx/cx231xx-video.c
drivers/media/video/cx2341x.c
drivers/media/video/cx23885/cx23885-dvb.c
drivers/media/video/cx23885/cx23885-i2c.c
drivers/media/video/cx23885/cx23885-input.c
drivers/media/video/cx23885/cx23885-input.h
drivers/media/video/cx23885/cx23885-ioctl.c
drivers/media/video/cx23885/cx23885-ioctl.h
drivers/media/video/cx23885/cx23885-ir.c
drivers/media/video/cx23885/cx23885-ir.h
drivers/media/video/cx23885/cx23885-video.c
drivers/media/video/cx23885/cx23888-ir.c
drivers/media/video/cx23885/cx23888-ir.h
drivers/media/video/cx25840/cx25840-core.c
drivers/media/video/cx88/cx88-i2c.c
drivers/media/video/em28xx/em28xx-core.c
drivers/media/video/gspca/sonixb.c
drivers/media/video/gspca/sonixj.c
drivers/media/video/hdpvr/hdpvr-video.c
drivers/media/video/ivtv/ivtv-controls.c
drivers/media/video/ivtv/ivtv-fileops.c
drivers/media/video/ivtv/ivtv-ioctl.c
drivers/media/video/ivtv/ivtv-streams.c
drivers/media/video/ivtv/ivtvfb.c
drivers/media/video/mt9m001.c
drivers/media/video/mt9m111.c
drivers/media/video/mt9t031.c
drivers/media/video/mt9t112.c
drivers/media/video/mt9v011.c
drivers/media/video/mt9v022.c
drivers/media/video/mx3_camera.c
drivers/media/video/omap/omap_vout.c
drivers/media/video/ov772x.c
drivers/media/video/ov9640.c
drivers/media/video/pvrusb2/pvrusb2-devattr.c
drivers/media/video/pvrusb2/pvrusb2-devattr.h
drivers/media/video/pvrusb2/pvrusb2-hdw.c
drivers/media/video/pvrusb2/pvrusb2-main.c
drivers/media/video/pvrusb2/pvrusb2-sysfs.c
drivers/media/video/pvrusb2/pvrusb2-v4l2.c
drivers/media/video/pxa_camera.c
drivers/media/video/rj54n1cb0c.c
drivers/media/video/saa7115.c
drivers/media/video/saa7127.c
drivers/media/video/saa7134/saa6752hs.c
drivers/media/video/saa7134/saa7134-cards.c
drivers/media/video/saa7134/saa7134-empress.c
drivers/media/video/saa7134/saa7134-input.c
drivers/media/video/saa7134/saa7134.h
drivers/media/video/saa717x.c
drivers/media/video/sh_mobile_ceu_camera.c
drivers/media/video/sn9c102/sn9c102_devtable.h
drivers/media/video/soc_camera.c
drivers/media/video/soc_camera_platform.c
drivers/media/video/tvp514x.c
drivers/media/video/tvp5150.c
drivers/media/video/tw9910.c
drivers/media/video/usbvision/usbvision-video.c
drivers/misc/vmware_balloon.c
drivers/mmc/host/omap.c
drivers/mmc/host/sh_mmcif.c
drivers/rtc/rtc-s3c.c
drivers/serial/8250_pci.c
drivers/serial/altera_uart.c
drivers/serial/bfin_5xx.c
drivers/serial/msm_serial.c
drivers/serial/msm_serial.h
drivers/serial/serial_cs.c
drivers/sfi/sfi_core.c
drivers/sh/intc.c
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/adis16255/Kconfig
drivers/staging/adis16255/adis16255.c
drivers/staging/batman-adv/device.c
drivers/staging/batman-adv/main.c
drivers/staging/batman-adv/send.c
drivers/staging/comedi/Kconfig
drivers/staging/comedi/comedi_fops.c
drivers/staging/comedi/drivers/Makefile
drivers/staging/comedi/drivers/addi-data/addi_common.c
drivers/staging/comedi/drivers/addi_apci_035.c
drivers/staging/comedi/drivers/addi_apci_1032.c
drivers/staging/comedi/drivers/addi_apci_1500.c
drivers/staging/comedi/drivers/addi_apci_1516.c
drivers/staging/comedi/drivers/addi_apci_1564.c
drivers/staging/comedi/drivers/addi_apci_16xx.c
drivers/staging/comedi/drivers/addi_apci_1710.c
drivers/staging/comedi/drivers/addi_apci_2016.c
drivers/staging/comedi/drivers/addi_apci_2032.c
drivers/staging/comedi/drivers/addi_apci_2200.c
drivers/staging/comedi/drivers/addi_apci_3001.c
drivers/staging/comedi/drivers/addi_apci_3120.c
drivers/staging/comedi/drivers/addi_apci_3200.c
drivers/staging/comedi/drivers/addi_apci_3300.c
drivers/staging/comedi/drivers/addi_apci_3501.c
drivers/staging/comedi/drivers/addi_apci_3xxx.c
drivers/staging/comedi/drivers/adv_pci_dio.c
drivers/staging/comedi/drivers/amplc_dio200.c
drivers/staging/comedi/drivers/ni_mio_cs.c
drivers/staging/comedi/drivers/usbdux.c
drivers/staging/dt3155/allocator.c
drivers/staging/iio/Documentation/iio_utils.h
drivers/staging/iio/ring_sw.c
drivers/staging/mrst-touchscreen/Kconfig [new file with mode: 0644]
drivers/staging/mrst-touchscreen/Makefile [new file with mode: 0644]
drivers/staging/mrst-touchscreen/TODO [new file with mode: 0644]
drivers/staging/mrst-touchscreen/intel-mid-touch.c [new file with mode: 0644]
drivers/staging/msm/Kconfig [new file with mode: 0644]
drivers/staging/msm/Makefile [new file with mode: 0644]
drivers/staging/msm/TODO [new file with mode: 0644]
drivers/staging/msm/ebi2_l2f.c [new file with mode: 0644]
drivers/staging/msm/ebi2_lcd.c [new file with mode: 0644]
drivers/staging/msm/ebi2_tmd20.c [new file with mode: 0644]
drivers/staging/msm/hdmi_sii9022.c [new file with mode: 0644]
drivers/staging/msm/lcdc.c [new file with mode: 0644]
drivers/staging/msm/lcdc_external.c [new file with mode: 0644]
drivers/staging/msm/lcdc_gordon.c [new file with mode: 0644]
drivers/staging/msm/lcdc_grapefruit.c [new file with mode: 0644]
drivers/staging/msm/lcdc_panel.c [new file with mode: 0644]
drivers/staging/msm/lcdc_prism.c [new file with mode: 0644]
drivers/staging/msm/lcdc_sharp_wvga_pt.c [new file with mode: 0644]
drivers/staging/msm/lcdc_st15.c [new file with mode: 0644]
drivers/staging/msm/lcdc_st1_wxga.c [new file with mode: 0644]
drivers/staging/msm/lcdc_toshiba_wvga_pt.c [new file with mode: 0644]
drivers/staging/msm/lcdc_wxga.c [new file with mode: 0644]
drivers/staging/msm/logo.c [new file with mode: 0644]
drivers/staging/msm/mddi.c [new file with mode: 0644]
drivers/staging/msm/mddi_ext.c [new file with mode: 0644]
drivers/staging/msm/mddi_ext_lcd.c [new file with mode: 0644]
drivers/staging/msm/mddi_prism.c [new file with mode: 0644]
drivers/staging/msm/mddi_sharp.c [new file with mode: 0644]
drivers/staging/msm/mddi_toshiba.c [new file with mode: 0644]
drivers/staging/msm/mddi_toshiba.h [new file with mode: 0644]
drivers/staging/msm/mddi_toshiba_vga.c [new file with mode: 0644]
drivers/staging/msm/mddi_toshiba_wvga.c [new file with mode: 0644]
drivers/staging/msm/mddi_toshiba_wvga_pt.c [new file with mode: 0644]
drivers/staging/msm/mddihost.c [new file with mode: 0644]
drivers/staging/msm/mddihost.h [new file with mode: 0644]
drivers/staging/msm/mddihost_e.c [new file with mode: 0644]
drivers/staging/msm/mddihosti.c [new file with mode: 0644]
drivers/staging/msm/mddihosti.h [new file with mode: 0644]
drivers/staging/msm/mdp.c [new file with mode: 0644]
drivers/staging/msm/mdp.h [new file with mode: 0644]
drivers/staging/msm/mdp4.h [new file with mode: 0644]
drivers/staging/msm/mdp4_debugfs.c [new file with mode: 0644]
drivers/staging/msm/mdp4_overlay.c [new file with mode: 0644]
drivers/staging/msm/mdp4_overlay_lcdc.c [new file with mode: 0644]
drivers/staging/msm/mdp4_overlay_mddi.c [new file with mode: 0644]
drivers/staging/msm/mdp4_util.c [new file with mode: 0644]
drivers/staging/msm/mdp_cursor.c [new file with mode: 0644]
drivers/staging/msm/mdp_dma.c [new file with mode: 0644]
drivers/staging/msm/mdp_dma_lcdc.c [new file with mode: 0644]
drivers/staging/msm/mdp_dma_s.c [new file with mode: 0644]
drivers/staging/msm/mdp_dma_tv.c [new file with mode: 0644]
drivers/staging/msm/mdp_hw_init.c [new file with mode: 0644]
drivers/staging/msm/mdp_ppp.c [new file with mode: 0644]
drivers/staging/msm/mdp_ppp_dq.c [new file with mode: 0644]
drivers/staging/msm/mdp_ppp_dq.h [new file with mode: 0644]
drivers/staging/msm/mdp_ppp_v20.c [new file with mode: 0644]
drivers/staging/msm/mdp_ppp_v31.c [new file with mode: 0644]
drivers/staging/msm/mdp_vsync.c [new file with mode: 0644]
drivers/staging/msm/memory.c [new file with mode: 0644]
drivers/staging/msm/memory_ll.h [new file with mode: 0644]
drivers/staging/msm/msm_fb.c [new file with mode: 0644]
drivers/staging/msm/msm_fb.h [new file with mode: 0644]
drivers/staging/msm/msm_fb_bl.c [new file with mode: 0644]
drivers/staging/msm/msm_fb_def.h [new file with mode: 0644]
drivers/staging/msm/msm_fb_panel.c [new file with mode: 0644]
drivers/staging/msm/msm_fb_panel.h [new file with mode: 0644]
drivers/staging/msm/msm_mdp.h [new file with mode: 0644]
drivers/staging/msm/staging-devices.c [new file with mode: 0644]
drivers/staging/msm/tv_ntsc.c [new file with mode: 0644]
drivers/staging/msm/tv_pal.c [new file with mode: 0644]
drivers/staging/msm/tvenc.c [new file with mode: 0644]
drivers/staging/msm/tvenc.h [new file with mode: 0644]
drivers/staging/phison/Kconfig
drivers/staging/rt2860/sta_ioctl.c
drivers/staging/sep/sep_driver.c
drivers/staging/tm6000/Kconfig
drivers/staging/tm6000/tm6000-alsa.c
drivers/staging/tm6000/tm6000-cards.c
drivers/staging/tm6000/tm6000-core.c
drivers/staging/tm6000/tm6000-dvb.c
drivers/staging/tm6000/tm6000-video.c
drivers/staging/tm6000/tm6000.h
drivers/staging/vme/bridges/vme_ca91cx42.c
drivers/staging/vme/bridges/vme_tsi148.c
drivers/staging/wlags49_h2/Kconfig
drivers/staging/wlags49_h25/Kconfig
drivers/staging/xgifb/Kconfig [new file with mode: 0644]
drivers/staging/xgifb/Makefile [new file with mode: 0644]
drivers/staging/xgifb/TODO [new file with mode: 0644]
drivers/staging/xgifb/XGI.h [new file with mode: 0644]
drivers/staging/xgifb/XGI_accel.c [new file with mode: 0644]
drivers/staging/xgifb/XGI_accel.h [new file with mode: 0644]
drivers/staging/xgifb/XGI_main.h [new file with mode: 0644]
drivers/staging/xgifb/XGI_main_26.c [new file with mode: 0644]
drivers/staging/xgifb/XGIfb.h [new file with mode: 0644]
drivers/staging/xgifb/osdef.h [new file with mode: 0644]
drivers/staging/xgifb/vb_def.h [new file with mode: 0644]
drivers/staging/xgifb/vb_ext.c [new file with mode: 0644]
drivers/staging/xgifb/vb_ext.h [new file with mode: 0644]
drivers/staging/xgifb/vb_init.c [new file with mode: 0644]
drivers/staging/xgifb/vb_init.h [new file with mode: 0644]
drivers/staging/xgifb/vb_setmode.c [new file with mode: 0644]
drivers/staging/xgifb/vb_setmode.h [new file with mode: 0644]
drivers/staging/xgifb/vb_struct.h [new file with mode: 0644]
drivers/staging/xgifb/vb_table.h [new file with mode: 0644]
drivers/staging/xgifb/vb_util.c [new file with mode: 0644]
drivers/staging/xgifb/vb_util.h [new file with mode: 0644]
drivers/staging/xgifb/vgatypes.h [new file with mode: 0644]
drivers/usb/class/cdc-acm.c
drivers/usb/core/driver.c
drivers/usb/gadget/Kconfig
drivers/usb/gadget/f_audio.c
drivers/usb/gadget/m66592-udc.h
drivers/usb/gadget/r8a66597-udc.c
drivers/usb/gadget/r8a66597-udc.h
drivers/usb/gadget/s3c-hsotg.c
drivers/usb/host/ehci-hcd.c
drivers/usb/host/isp1362.h
drivers/usb/host/r8a66597-hcd.c
drivers/usb/host/r8a66597.h
drivers/usb/host/xhci-pci.c
drivers/usb/host/xhci-ring.c
drivers/usb/host/xhci.c
drivers/usb/host/xhci.h
drivers/usb/serial/digi_acceleport.c
drivers/usb/serial/ftdi_sio.c
drivers/usb/serial/mos7840.c
drivers/video/Kconfig
drivers/video/fb_defio.c
drivers/video/sh_mobile_lcdcfb.c
fs/binfmt_flat.c
fs/compat.c
fs/configfs/inode.c
fs/fs-writeback.c
fs/pipe.c
fs/splice.c
fs/sync.c
fs/sysfs/inode.c
include/linux/backing-dev.h
include/linux/blkdev.h
include/linux/drbd.h
include/linux/edac_mce.h [new file with mode: 0644]
include/linux/iocontext.h
include/linux/mmc/sh_mmcif.h
include/linux/pci.h
include/linux/pci_ids.h
include/linux/personality.h
include/linux/pipe_fs_i.h
include/linux/serial_sci.h
include/linux/syscalls.h
include/linux/usb/audio-v2.h
include/linux/usb/audio.h
include/linux/writeback.h
include/media/rc-map.h
include/media/soc_camera.h
include/media/v4l2-mediabus.h
include/media/v4l2-subdev.h
kernel/cgroup.c
kernel/exec_domain.c
kernel/softirq.c
kernel/sysctl.c
kernel/timer.c
lib/atomic64_test.c
lib/kobject_uevent.c
mm/page-writeback.c
mm/vmscan.c
scripts/kconfig/Makefile
sound/pci/asihpi/asihpi.c
sound/pci/hda/hda_intel.c
sound/pci/hda/patch_realtek.c
sound/soc/imx/Kconfig
sound/usb/Makefile
sound/usb/card.c
sound/usb/card.h
sound/usb/clock.c [new file with mode: 0644]
sound/usb/clock.h [new file with mode: 0644]
sound/usb/endpoint.c
sound/usb/format.c
sound/usb/mixer.c
sound/usb/mixer.h
sound/usb/mixer_maps.c
sound/usb/pcm.c
sound/usb/usbaudio.h

index 9737243377a3b7ae235f9da9cce41094aed70807..7c3c098d5d08fe080241c82392fabe16814b1653 100644 (file)
@@ -58,7 +58,7 @@ MPEG stream embedded, sliced VBI data format in this specification.
 </contrib>
        <affiliation>
          <address>
-           <email>awalls@radix.net</email>
+           <email>awalls@md.metrocast.net</email>
          </address>
        </affiliation>
       </author>
index 87e4f0f6151cea2c6da8b434b2258300c9f8ce69..402229ee06f61d76bbf62238faec72901c18861b 100644 (file)
@@ -53,8 +53,10 @@ input</refpurpose>
 automatically, similar to sensing the video standard. To do so, applications
 call <constant> VIDIOC_QUERY_DV_PRESET</constant> with a pointer to a
 &v4l2-dv-preset; type. Once the hardware detects a preset, that preset is
-returned in the preset field of &v4l2-dv-preset;. When detection is not
-possible or fails, the value V4L2_DV_INVALID is returned.</para>
+returned in the preset field of &v4l2-dv-preset;. If the preset could not be
+detected because there was no signal, or the signal was unreliable, or the
+signal did not map to a supported preset, then the value V4L2_DV_INVALID is
+returned.</para>
   </refsect1>
 
   <refsect1>
index 79c533223762baa0df825995068b3c6475d90b8b..0b875e8da96965316d0bca49185d5a28b6d25649 100644 (file)
@@ -6,6 +6,8 @@ Written by Doug Thompson <dougthompson@xmission.com>
 7 Dec 2005
 17 Jul 2007    Updated
 
+(c) Mauro Carvalho Chehab <mchehab@redhat.com>
+05 Aug 2009    Nehalem interface
 
 EDAC is maintained and written by:
 
@@ -717,3 +719,153 @@ unique drivers for their hardware systems.
 The 'test_device_edac' sample driver is located at the
 bluesmoke.sourceforge.net project site for EDAC.
 
+=======================================================================
+NEHALEM USAGE OF EDAC APIs
+
+This chapter documents some EXPERIMENTAL mappings for EDAC API to handle
+Nehalem EDAC driver. They will likely be changed on future versions
+of the driver.
+
+Due to the way Nehalem exports Memory Controller data, some adjustments
+were done at i7core_edac driver. This chapter will cover those differences
+
+1) On Nehalem, there are one Memory Controller per Quick Patch Interconnect
+   (QPI). At the driver, the term "socket" means one QPI. This is
+   associated with a physical CPU socket.
+
+   Each MC have 3 physical read channels, 3 physical write channels and
+   3 logic channels. The driver currenty sees it as just 3 channels.
+   Each channel can have up to 3 DIMMs.
+
+   The minimum known unity is DIMMs. There are no information about csrows.
+   As EDAC API maps the minimum unity is csrows, the driver sequencially
+   maps channel/dimm into different csrows.
+
+   For example, suposing the following layout:
+       Ch0 phy rd0, wr0 (0x063f4031): 2 ranks, UDIMMs
+         dimm 0 1024 Mb offset: 0, bank: 8, rank: 1, row: 0x4000, col: 0x400
+         dimm 1 1024 Mb offset: 4, bank: 8, rank: 1, row: 0x4000, col: 0x400
+        Ch1 phy rd1, wr1 (0x063f4031): 2 ranks, UDIMMs
+         dimm 0 1024 Mb offset: 0, bank: 8, rank: 1, row: 0x4000, col: 0x400
+       Ch2 phy rd3, wr3 (0x063f4031): 2 ranks, UDIMMs
+         dimm 0 1024 Mb offset: 0, bank: 8, rank: 1, row: 0x4000, col: 0x400
+   The driver will map it as:
+       csrow0: channel 0, dimm0
+       csrow1: channel 0, dimm1
+       csrow2: channel 1, dimm0
+       csrow3: channel 2, dimm0
+
+exports one
+   DIMM per csrow.
+
+   Each QPI is exported as a different memory controller.
+
+2) Nehalem MC has the hability to generate errors. The driver implements this
+   functionality via some error injection nodes:
+
+   For injecting a memory error, there are some sysfs nodes, under
+   /sys/devices/system/edac/mc/mc?/:
+
+   inject_addrmatch/*:
+      Controls the error injection mask register. It is possible to specify
+      several characteristics of the address to match an error code:
+         dimm = the affected dimm. Numbers are relative to a channel;
+         rank = the memory rank;
+         channel = the channel that will generate an error;
+         bank = the affected bank;
+         page = the page address;
+         column (or col) = the address column.
+      each of the above values can be set to "any" to match any valid value.
+
+      At driver init, all values are set to any.
+
+      For example, to generate an error at rank 1 of dimm 2, for any channel,
+      any bank, any page, any column:
+               echo 2 >/sys/devices/system/edac/mc/mc0/inject_addrmatch/dimm
+               echo 1 >/sys/devices/system/edac/mc/mc0/inject_addrmatch/rank
+
+       To return to the default behaviour of matching any, you can do:
+               echo any >/sys/devices/system/edac/mc/mc0/inject_addrmatch/dimm
+               echo any >/sys/devices/system/edac/mc/mc0/inject_addrmatch/rank
+
+   inject_eccmask:
+       specifies what bits will have troubles,
+
+   inject_section:
+       specifies what ECC cache section will get the error:
+               3 for both
+               2 for the highest
+               1 for the lowest
+
+   inject_type:
+       specifies the type of error, being a combination of the following bits:
+               bit 0 - repeat
+               bit 1 - ecc
+               bit 2 - parity
+
+       inject_enable starts the error generation when something different
+       than 0 is written.
+
+   All inject vars can be read. root permission is needed for write.
+
+   Datasheet states that the error will only be generated after a write on an
+   address that matches inject_addrmatch. It seems, however, that reading will
+   also produce an error.
+
+   For example, the following code will generate an error for any write access
+   at socket 0, on any DIMM/address on channel 2:
+
+   echo 2 >/sys/devices/system/edac/mc/mc0/inject_addrmatch/channel
+   echo 2 >/sys/devices/system/edac/mc/mc0/inject_type
+   echo 64 >/sys/devices/system/edac/mc/mc0/inject_eccmask
+   echo 3 >/sys/devices/system/edac/mc/mc0/inject_section
+   echo 1 >/sys/devices/system/edac/mc/mc0/inject_enable
+   dd if=/dev/mem of=/dev/null seek=16k bs=4k count=1 >& /dev/null
+
+   For socket 1, it is needed to replace "mc0" by "mc1" at the above
+   commands.
+
+   The generated error message will look like:
+
+   EDAC MC0: UE row 0, channel-a= 0 channel-b= 0 labels "-": NON_FATAL (addr = 0x0075b980, socket=0, Dimm=0, Channel=2, syndrome=0x00000040, count=1, Err=8c0000400001009f:4000080482 (read error: read ECC error))
+
+3) Nehalem specific Corrected Error memory counters
+
+   Nehalem have some registers to count memory errors. The driver uses those
+   registers to report Corrected Errors on devices with Registered Dimms.
+
+   However, those counters don't work with Unregistered Dimms. As the chipset
+   offers some counters that also work with UDIMMS (but with a worse level of
+   granularity than the default ones), the driver exposes those registers for
+   UDIMM memories.
+
+   They can be read by looking at the contents of all_channel_counts/
+
+   $ for i in /sys/devices/system/edac/mc/mc0/all_channel_counts/*; do echo $i; cat $i; done
+       /sys/devices/system/edac/mc/mc0/all_channel_counts/udimm0
+       0
+       /sys/devices/system/edac/mc/mc0/all_channel_counts/udimm1
+       0
+       /sys/devices/system/edac/mc/mc0/all_channel_counts/udimm2
+       0
+
+   What happens here is that errors on different csrows, but at the same
+   dimm number will increment the same counter.
+   So, in this memory mapping:
+       csrow0: channel 0, dimm0
+       csrow1: channel 0, dimm1
+       csrow2: channel 1, dimm0
+       csrow3: channel 2, dimm0
+   The hardware will increment udimm0 for an error at the first dimm at either
+       csrow0, csrow2  or csrow3;
+   The hardware will increment udimm1 for an error at the second dimm at either
+       csrow0, csrow2  or csrow3;
+   The hardware will increment udimm2 for an error at the third dimm at either
+       csrow0, csrow2  or csrow3;
+
+4) Standard error counters
+
+   The standard error counters are generated when an mcelog error is received
+   by the driver. Since, with udimm, this is counted by software, it is
+   possible that some errors could be lost. With rdimm's, they displays the
+   contents of the registers
index 672be0109d02617dfa03536c9a4fae7ad4ae4831..c268783bc4e7c18c2e4db792c3fba83d6bc44c71 100644 (file)
@@ -578,15 +578,6 @@ Who:       Avi Kivity <avi@redhat.com>
 
 ----------------------------
 
-What:  "acpi=ht" boot option
-When:  2.6.35
-Why:   Useful in 2003, implementation is a hack.
-       Generally invoked by accident today.
-       Seen as doing more harm than good.
-Who:   Len Brown <len.brown@intel.com>
-
-----------------------------
-
 What:  iwlwifi 50XX module parameters
 When:  2.6.40
 Why:   The "..50" modules parameters were used to configure 5000 series and
index 070f2576707e16da0600c6a50e2d24d48865914f..1387a69ae3aa5f4842ea522bb5ec4b09a568e41a 100644 (file)
 175 -> Leadtek Winfast DTV1000S                 [107d:6655]
 176 -> Beholder BeholdTV 505 RDS                [0000:5051]
 177 -> Hawell HW-404M7
-179 -> Beholder BeholdTV H7                    [5ace:7190]
-180 -> Beholder BeholdTV A7                    [5ace:7090]
+178 -> Beholder BeholdTV H7                     [5ace:7190]
+179 -> Beholder BeholdTV A7                     [5ace:7090]
+180 -> Avermedia M733A                          [1461:4155,1461:4255]
index 8f3f5d33327ce0341b545ba68dd8d8991640f233..f13eb036c439a4af60310fff845a4e3b82552fa5 100644 (file)
@@ -290,6 +290,7 @@ sonixb              0c45:602e       Genius VideoCam Messenger
 sonixj         0c45:6040       Speed NVC 350K
 sonixj         0c45:607c       Sonix sn9c102p Hv7131R
 sonixj         0c45:60c0       Sangha Sn535
+sonixj         0c45:60ce       USB-PC-Camera-168 (TALK-5067)
 sonixj         0c45:60ec       SN9C105+MO4000
 sonixj         0c45:60fb       Surfer NoName
 sonixj         0c45:60fc       LG-LIC300
index a73dd8030afa5f823d9e210a04778b6b3498993c..67accd730ac91a22dd12cf7fa47cc8d02061f8d8 100644 (file)
@@ -1731,7 +1731,7 @@ S:        Maintained
 F:     sound/pci/cs5535audio/
 
 CX18 VIDEO4LINUX DRIVER
-M:     Andy Walls <awalls@radix.net>
+M:     Andy Walls <awalls@md.metrocast.net>
 L:     ivtv-devel@ivtvdriver.org (moderated for non-subscribers)
 L:     linux-media@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
@@ -3165,7 +3165,7 @@ F:        Documentation/hwmon/it87
 F:     drivers/hwmon/it87.c
 
 IVTV VIDEO4LINUX DRIVER
-M:     Andy Walls <awalls@radix.net>
+M:     Andy Walls <awalls@md.metrocast.net>
 L:     ivtv-devel@ivtvdriver.org (moderated for non-subscribers)
 L:     linux-media@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
index 30f5d100a81c15038f79f88672db560cf4f950a5..a325d57a83d5fdae12d8323480564d8204e86117 100644 (file)
@@ -257,10 +257,10 @@ asmlinkage void do_page_fault(int datammu, unsigned long esr0, unsigned long ear
  */
  out_of_memory:
        up_read(&mm->mmap_sem);
-       printk("VM: killing process %s\n", current->comm);
-       if (user_mode(__frame))
-               do_group_exit(SIGKILL);
-       goto no_context;
+       if (!user_mode(__frame))
+               goto no_context;
+       pagefault_out_of_memory();
+       return;
 
  do_sigbus:
        up_read(&mm->mmap_sem);
index 28ee389e5f5a3e43d39f8d5f1cdccf45923785d3..b8ec002aef8e321349f17b9255b70762b4b029ce 100644 (file)
@@ -188,7 +188,6 @@ good_area:
        if ((error_code & ACE_INSTRUCTION) && !(vma->vm_flags & VM_EXEC))
          goto bad_area;
 
-survive:
        /*
         * If for any reason at all we couldn't handle the fault,
         * make sure we exit gracefully rather than endlessly redo
@@ -271,15 +270,10 @@ no_context:
  */
 out_of_memory:
        up_read(&mm->mmap_sem);
-       if (is_global_init(tsk)) {
-               yield();
-               down_read(&mm->mmap_sem);
-               goto survive;
-       }
-       printk("VM: killing process %s\n", tsk->comm);
-       if (error_code & ACE_USERMODE)
-               do_group_exit(SIGKILL);
-       goto no_context;
+       if (!(error_code & ACE_USERMODE))
+               goto no_context;
+       pagefault_out_of_memory();
+       return;
 
 do_sigbus:
        up_read(&mm->mmap_sem);
index 53bb17d0f0687764ab1d8a4e05d6cdfc81c03e25..81f153fa51b4a6ecb07111f1d20383fbf0b6eaf2 100644 (file)
@@ -338,11 +338,10 @@ no_context:
  */
 out_of_memory:
        up_read(&mm->mmap_sem);
-       monitor_signal(regs);
-       printk(KERN_ALERT "VM: killing process %s\n", tsk->comm);
-       if ((fault_code & MMUFCR_xFC_ACCESS) == MMUFCR_xFC_ACCESS_USR)
-               do_exit(SIGKILL);
-       goto no_context;
+       if ((fault_code & MMUFCR_xFC_ACCESS) != MMUFCR_xFC_ACCESS_USR)
+               goto no_context;
+       pagefault_out_of_memory();
+       return;
 
 do_sigbus:
        up_read(&mm->mmap_sem);
index c5ee4ce60b576d0e5155e940f9230a29cc622639..573fca1fbd9b699d7beff90a4d162af8a01652cd 100644 (file)
@@ -9,7 +9,7 @@ config SUPERH
        def_bool y
        select EMBEDDED
        select HAVE_CLK
-       select HAVE_IDE
+       select HAVE_IDE if HAS_IOPORT
        select HAVE_LMB
        select HAVE_OPROFILE
        select HAVE_GENERIC_DMA_COHERENT
@@ -174,6 +174,9 @@ config ARCH_HAS_DEFAULT_IDLE
 config ARCH_HAS_CPU_IDLE_WAIT
        def_bool y
 
+config NO_IOPORT
+       bool
+
 config IO_TRAPPED
        bool
 
@@ -776,6 +779,17 @@ config ENTRY_OFFSET
        default "0x00010000" if PAGE_SIZE_64KB
        default "0x00000000"
 
+config ROMIMAGE_MMCIF
+       bool "Include MMCIF loader in romImage (EXPERIMENTAL)"
+       depends on CPU_SUBTYPE_SH7724 && EXPERIMENTAL
+       help
+         Say Y here to include experimental MMCIF loading code in
+         romImage. With this enabled it is possible to write the romImage
+         kernel image to an MMC card and boot the kernel straight from
+         the reset vector. At reset the processor Mask ROM will load the
+         first part of the romImage which in turn loads the rest the kernel
+         image to RAM using the MMCIF hardware block.
+
 choice
        prompt "Kernel command line"
        optional
index 938e87d51482e991bd3fab373e8b1df67de070ce..07b35ca2f64449fee151ad7176d8d58a2795f7a7 100644 (file)
@@ -154,6 +154,7 @@ config SH_SDK7786
        bool "SDK7786"
        depends on CPU_SUBTYPE_SH7786
        select SYS_SUPPORTS_PCI
+       select NO_IOPORT if !PCI
        help
          Select SDK7786 if configuring for a Renesas Technology Europe
          SH7786-65nm board.
@@ -190,6 +191,7 @@ config SH_URQUELL
        depends on CPU_SUBTYPE_SH7786
        select ARCH_REQUIRE_GPIOLIB
        select SYS_SUPPORTS_PCI
+       select NO_IOPORT if !PCI
 
 config SH_MIGOR
        bool "Migo-R"
@@ -286,6 +288,7 @@ config SH_LBOX_RE2
 config SH_X3PROTO
        bool "SH-X3 Prototype board"
        depends on CPU_SUBTYPE_SHX3
+       select NO_IOPORT if !PCI
 
 config SH_MAGIC_PANEL_R2
        bool "Magic Panel R2"
index 57e37e2842082e84588718007fdd45f599b6c8a5..3a170bd3f3d06c1453b32e4ff544958859818ef2 100644 (file)
@@ -328,7 +328,7 @@ static struct soc_camera_platform_info camera_info = {
        .set_capture = camera_set_capture,
 };
 
-struct soc_camera_link camera_link = {
+static struct soc_camera_link camera_link = {
        .bus_id         = 0,
        .add_device     = ap325rxa_camera_add,
        .del_device     = ap325rxa_camera_del,
index 49714258732e57ff0be5da2f458f37f356f19ca5..be1d114d3a435c10229bc3a3bbf0ceee8a0b3c3a 100644 (file)
@@ -12,6 +12,8 @@
 #include <linux/device.h>
 #include <linux/platform_device.h>
 #include <linux/mfd/sh_mobile_sdhi.h>
+#include <linux/mmc/host.h>
+#include <linux/mmc/sh_mmcif.h>
 #include <linux/mtd/physmap.h>
 #include <linux/gpio.h>
 #include <linux/interrupt.h>
@@ -26,7 +28,6 @@
 #include <linux/mmc/host.h>
 #include <linux/input.h>
 #include <linux/input/sh_keysc.h>
-#include <linux/mfd/sh_mobile_sdhi.h>
 #include <video/sh_mobile_lcdc.h>
 #include <sound/sh_fsi.h>
 #include <media/sh_mobile_ceu.h>
@@ -139,7 +140,7 @@ static struct resource sh_eth_resources[] = {
        },
 };
 
-struct sh_eth_plat_data sh_eth_plat = {
+static struct sh_eth_plat_data sh_eth_plat = {
        .phy = 0x1f, /* SMSC LAN8700 */
        .edmac_endian = EDMAC_LITTLE_ENDIAN,
        .ether_link_active_low = 1
@@ -159,7 +160,7 @@ static struct platform_device sh_eth_device = {
 };
 
 /* USB0 host */
-void usb0_port_power(int port, int power)
+static void usb0_port_power(int port, int power)
 {
        gpio_set_value(GPIO_PTB4, power);
 }
@@ -195,7 +196,7 @@ static struct platform_device usb0_host_device = {
 };
 
 /* USB1 host/function */
-void usb1_port_power(int port, int power)
+static void usb1_port_power(int port, int power)
 {
        gpio_set_value(GPIO_PTB5, power);
 }
@@ -421,7 +422,7 @@ static int ts_init(void)
        return 0;
 }
 
-struct tsc2007_platform_data tsc2007_info = {
+static struct tsc2007_platform_data tsc2007_info = {
        .model                  = 2007,
        .x_plate_ohms           = 180,
        .get_pendown_state      = ts_get_pendown_state,
@@ -436,7 +437,7 @@ static struct i2c_board_info ts_i2c_clients = {
 };
 
 #ifdef CONFIG_MFD_SH_MOBILE_SDHI
-/* SHDI0 */
+/* SDHI0 */
 static void sdhi0_set_pwr(struct platform_device *pdev, int state)
 {
        gpio_set_value(GPIO_PTB6, state);
@@ -474,7 +475,8 @@ static struct platform_device sdhi0_device = {
        },
 };
 
-/* SHDI1 */
+#if !defined(CONFIG_MMC_SH_MMCIF)
+/* SDHI1 */
 static void sdhi1_set_pwr(struct platform_device *pdev, int state)
 {
        gpio_set_value(GPIO_PTB7, state);
@@ -511,6 +513,7 @@ static struct platform_device sdhi1_device = {
                .hwblk_id = HWBLK_SDHI1,
        },
 };
+#endif /* CONFIG_MMC_SH_MMCIF */
 
 #else
 
@@ -720,7 +723,7 @@ static struct clk fsimckb_clk = {
        .rate           = 0, /* unknown */
 };
 
-struct sh_fsi_platform_info fsi_info = {
+static struct sh_fsi_platform_info fsi_info = {
        .portb_flags = SH_FSI_BRS_INV |
                       SH_FSI_OUT_SLAVE_MODE |
                       SH_FSI_IN_SLAVE_MODE |
@@ -777,7 +780,7 @@ static struct platform_device irda_device = {
 #include <media/ak881x.h>
 #include <media/sh_vou.h>
 
-struct ak881x_pdata ak881x_pdata = {
+static struct ak881x_pdata ak881x_pdata = {
        .flags = AK881X_IF_MODE_SLAVE,
 };
 
@@ -786,7 +789,7 @@ static struct i2c_board_info ak8813 = {
        .platform_data = &ak881x_pdata,
 };
 
-struct sh_vou_pdata sh_vou_pdata = {
+static struct sh_vou_pdata sh_vou_pdata = {
        .bus_fmt        = SH_VOU_BUS_8BIT,
        .flags          = SH_VOU_HSYNC_LOW | SH_VOU_VSYNC_LOW,
        .board_info     = &ak8813,
@@ -819,6 +822,58 @@ static struct platform_device vou_device = {
        },
 };
 
+#if defined(CONFIG_MMC_SH_MMCIF)
+/* SH_MMCIF */
+static void mmcif_set_pwr(struct platform_device *pdev, int state)
+{
+       gpio_set_value(GPIO_PTB7, state);
+}
+
+static void mmcif_down_pwr(struct platform_device *pdev)
+{
+       gpio_set_value(GPIO_PTB7, 0);
+}
+
+static struct resource sh_mmcif_resources[] = {
+       [0] = {
+               .name   = "SH_MMCIF",
+               .start  = 0xA4CA0000,
+               .end    = 0xA4CA00FF,
+               .flags  = IORESOURCE_MEM,
+       },
+       [1] = {
+               /* MMC2I */
+               .start  = 29,
+               .flags  = IORESOURCE_IRQ,
+       },
+       [2] = {
+               /* MMC3I */
+               .start  = 30,
+               .flags  = IORESOURCE_IRQ,
+       },
+};
+
+static struct sh_mmcif_plat_data sh_mmcif_plat = {
+       .set_pwr        = mmcif_set_pwr,
+       .down_pwr       = mmcif_down_pwr,
+       .sup_pclk       = 0, /* SH7724: Max Pclk/2 */
+       .caps           = MMC_CAP_4_BIT_DATA |
+                         MMC_CAP_8_BIT_DATA |
+                         MMC_CAP_NEEDS_POLL,
+       .ocr            = MMC_VDD_32_33 | MMC_VDD_33_34,
+};
+
+static struct platform_device sh_mmcif_device = {
+       .name           = "sh_mmcif",
+       .id             = 0,
+       .dev            = {
+               .platform_data          = &sh_mmcif_plat,
+       },
+       .num_resources  = ARRAY_SIZE(sh_mmcif_resources),
+       .resource       = sh_mmcif_resources,
+};
+#endif
+
 static struct platform_device *ecovec_devices[] __initdata = {
        &heartbeat_device,
        &nor_flash_device,
@@ -831,7 +886,9 @@ static struct platform_device *ecovec_devices[] __initdata = {
        &keysc_device,
 #ifdef CONFIG_MFD_SH_MOBILE_SDHI
        &sdhi0_device,
+#if !defined(CONFIG_MMC_SH_MMCIF)
        &sdhi1_device,
+#endif
 #else
        &msiof0_device,
 #endif
@@ -841,6 +898,9 @@ static struct platform_device *ecovec_devices[] __initdata = {
        &fsi_device,
        &irda_device,
        &vou_device,
+#if defined(CONFIG_MMC_SH_MMCIF)
+       &sh_mmcif_device,
+#endif
 };
 
 #ifdef CONFIG_I2C
@@ -1134,6 +1194,7 @@ static int __init arch_setup(void)
        gpio_request(GPIO_PTB6, NULL);
        gpio_direction_output(GPIO_PTB6, 0);
 
+#if !defined(CONFIG_MMC_SH_MMCIF)
        /* enable SDHI1 on CN12 (needs DS2.6,7 set to ON,OFF) */
        gpio_request(GPIO_FN_SDHI1CD,  NULL);
        gpio_request(GPIO_FN_SDHI1WP,  NULL);
@@ -1148,6 +1209,7 @@ static int __init arch_setup(void)
 
        /* I/O buffer drive ability is high for SDHI1 */
        __raw_writew((__raw_readw(IODRIVEA) & ~0x3000) | 0x2000 , IODRIVEA);
+#endif /* CONFIG_MMC_SH_MMCIF */
 #else
        /* enable MSIOF0 on CN11 (needs DS2.4 set to OFF) */
        gpio_request(GPIO_FN_MSIOF0_TXD, NULL);
@@ -1223,6 +1285,25 @@ static int __init arch_setup(void)
        gpio_request(GPIO_PTU5, NULL);
        gpio_direction_output(GPIO_PTU5, 0);
 
+#if defined(CONFIG_MMC_SH_MMCIF)
+       /* enable MMCIF (needs DS2.6,7 set to OFF,ON) */
+       gpio_request(GPIO_FN_MMC_D7, NULL);
+       gpio_request(GPIO_FN_MMC_D6, NULL);
+       gpio_request(GPIO_FN_MMC_D5, NULL);
+       gpio_request(GPIO_FN_MMC_D4, NULL);
+       gpio_request(GPIO_FN_MMC_D3, NULL);
+       gpio_request(GPIO_FN_MMC_D2, NULL);
+       gpio_request(GPIO_FN_MMC_D1, NULL);
+       gpio_request(GPIO_FN_MMC_D0, NULL);
+       gpio_request(GPIO_FN_MMC_CLK, NULL);
+       gpio_request(GPIO_FN_MMC_CMD, NULL);
+       gpio_request(GPIO_PTB7, NULL);
+       gpio_direction_output(GPIO_PTB7, 0);
+
+       /* I/O buffer drive ability is high for MMCIF */
+       __raw_writew((__raw_readw(IODRIVEA) & ~0x3000) | 0x2000 , IODRIVEA);
+#endif
+
        /* enable I2C device */
        i2c_register_board_info(0, i2c0_devices,
                                ARRAY_SIZE(i2c0_devices));
index 87185de2044698724cb50b66e3770eb1359b2bf6..662debe4ead2fdaab217e7fc40ce19d32dcaf140 100644 (file)
@@ -181,7 +181,7 @@ static int migor_nand_flash_ready(struct mtd_info *mtd)
        return gpio_get_value(GPIO_PTA1); /* NAND_RBn */
 }
 
-struct platform_nand_data migor_nand_flash_data = {
+static struct platform_nand_data migor_nand_flash_data = {
        .chip = {
                .nr_chips = 1,
                .partitions = migor_nand_flash_partitions,
index f9b82546c2df9c1fc2216011244ba6edf67da1ee..552ebd9ba82b17f693c00e22251857cb503462a7 100644 (file)
@@ -283,7 +283,7 @@ static struct clk fsimcka_clk = {
 };
 
 /* change J20, J21, J22 pin to 1-2 connection to use slave mode */
-struct sh_fsi_platform_info fsi_info = {
+static struct sh_fsi_platform_info fsi_info = {
        .porta_flags = SH_FSI_BRS_INV |
                       SH_FSI_OUT_SLAVE_MODE |
                       SH_FSI_IN_SLAVE_MODE |
@@ -371,7 +371,7 @@ static struct resource sh_eth_resources[] = {
        },
 };
 
-struct sh_eth_plat_data sh_eth_plat = {
+static struct sh_eth_plat_data sh_eth_plat = {
        .phy = 0x1f, /* SMSC LAN8187 */
        .edmac_endian = EDMAC_LITTLE_ENDIAN,
 };
@@ -535,7 +535,7 @@ static struct platform_device irda_device = {
 #include <media/ak881x.h>
 #include <media/sh_vou.h>
 
-struct ak881x_pdata ak881x_pdata = {
+static struct ak881x_pdata ak881x_pdata = {
        .flags = AK881X_IF_MODE_SLAVE,
 };
 
@@ -545,7 +545,7 @@ static struct i2c_board_info ak8813 = {
        .platform_data = &ak881x_pdata,
 };
 
-struct sh_vou_pdata sh_vou_pdata = {
+static struct sh_vou_pdata sh_vou_pdata = {
        .bus_fmt        = SH_VOU_BUS_8BIT,
        .flags          = SH_VOU_HSYNC_LOW | SH_VOU_VSYNC_LOW,
        .board_info     = &ak8813,
index f473a24a2d92e6e24b08ef26bdc1386f98c6335f..2216ee57f2516e14ff7c0017139dd01f1a83beb6 100644 (file)
@@ -1,16 +1,21 @@
 #
 # linux/arch/sh/boot/romimage/Makefile
 #
-# create an image suitable for burning to flash from zImage
+# create an romImage file suitable for burning to flash/mmc from zImage
 #
 
 targets                := vmlinux head.o zeropage.bin piggy.o
+load-y         := 0
 
-OBJECTS = $(obj)/head.o
-LDFLAGS_vmlinux := --oformat $(ld-bfd) -Ttext 0 -e romstart \
+mmcif-load-$(CONFIG_CPU_SUBTYPE_SH7724)        := 0xe5200000 # ILRAM
+mmcif-obj-$(CONFIG_CPU_SUBTYPE_SH7724) := $(obj)/mmcif-sh7724.o
+load-$(CONFIG_ROMIMAGE_MMCIF)          := $(mmcif-load-y)
+obj-$(CONFIG_ROMIMAGE_MMCIF)           := $(mmcif-obj-y)
+
+LDFLAGS_vmlinux := --oformat $(ld-bfd) -Ttext $(load-y) -e romstart \
                   -T $(obj)/../../kernel/vmlinux.lds
 
-$(obj)/vmlinux: $(OBJECTS) $(obj)/piggy.o FORCE
+$(obj)/vmlinux: $(obj)/head.o $(obj-y) $(obj)/piggy.o FORCE
        $(call if_changed,ld)
        @:
 
index 93e779a405eca3bf17fbc50e6e6cea41f8963d48..4671d1b82150f6aa077854ddd69b13b52738a8d7 100644 (file)
@@ -12,8 +12,40 @@ romstart:
        /* include board specific setup code */
 #include <mach/romimage.h>
 
+#ifdef CONFIG_ROMIMAGE_MMCIF
+       /* load the romImage to above the empty zero page */
+       mov.l   empty_zero_page_dst, r4
+       mov.l   empty_zero_page_dst_adj, r5
+       add     r5, r4
+       mov.l   bytes_to_load, r5
+       mov.l   loader_function, r7
+       jsr     @r7
+        mov    r4, r15
+
+       mov.l   empty_zero_page_dst, r4
+       mov.l   empty_zero_page_dst_adj, r5
+       add     r5, r4
+       mov.l   loaded_code_offs, r5
+       add     r5, r4
+       jmp     @r4
+        nop
+
+       .balign 4
+empty_zero_page_dst_adj:
+       .long   PAGE_SIZE
+bytes_to_load:
+       .long   end_data - romstart
+loader_function:
+       .long   mmcif_loader
+loaded_code_offs:
+       .long   loaded_code - romstart
+loaded_code:
+#endif /* CONFIG_ROMIMAGE_MMCIF */
+
        /* copy the empty_zero_page contents to where vmlinux expects it */
-       mova    empty_zero_page_src, r0
+       mova    extra_data_pos, r0
+       mov.l   extra_data_size, r1
+       add     r1, r0
        mov.l   empty_zero_page_dst, r1
        mov     #(PAGE_SHIFT - 4), r4
        mov     #1, r3
@@ -37,7 +69,9 @@ romstart:
        mov     #PAGE_SHIFT, r4
        mov     #1, r1
        shld    r4, r1
-       mova    empty_zero_page_src, r0
+       mova    extra_data_pos, r0
+       add     r1, r0
+       mov.l   extra_data_size, r1
        add     r1, r0
        jmp     @r0
         nop
@@ -45,4 +79,6 @@ romstart:
        .align 2
 empty_zero_page_dst:
        .long   _text
-empty_zero_page_src:
+extra_data_pos:
+extra_data_size:
+       .long   zero_page_pos - extra_data_pos
diff --git a/arch/sh/boot/romimage/mmcif-sh7724.c b/arch/sh/boot/romimage/mmcif-sh7724.c
new file mode 100644 (file)
index 0000000..14863d7
--- /dev/null
@@ -0,0 +1,72 @@
+/*
+ * sh7724 MMCIF loader
+ *
+ * Copyright (C) 2010 Magnus Damm
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+
+#include <linux/mmc/sh_mmcif.h>
+#include <mach/romimage.h>
+
+#define MMCIF_BASE      (void __iomem *)0xa4ca0000
+
+#define MSTPCR2                0xa4150038
+#define PTWCR          0xa4050146
+#define PTXCR          0xa4050148
+#define PSELA          0xa405014e
+#define PSELE          0xa4050156
+#define HIZCRC         0xa405015c
+#define DRVCRA         0xa405018a
+
+enum { MMCIF_PROGRESS_ENTER, MMCIF_PROGRESS_INIT,
+       MMCIF_PROGRESS_LOAD, MMCIF_PROGRESS_DONE };
+
+/* SH7724 specific MMCIF loader
+ *
+ * loads the romImage from an MMC card starting from block 512
+ * use the following line to write the romImage to an MMC card
+ * # dd if=arch/sh/boot/romImage of=/dev/sdx bs=512 seek=512
+ */
+asmlinkage void mmcif_loader(unsigned char *buf, unsigned long no_bytes)
+{
+       mmcif_update_progress(MMCIF_PROGRESS_ENTER);
+
+       /* enable clock to the MMCIF hardware block */
+       __raw_writel(__raw_readl(MSTPCR2) & ~0x20000000, MSTPCR2);
+
+       /* setup pins D7-D0 */
+       __raw_writew(0x0000, PTWCR);
+
+       /* setup pins MMC_CLK, MMC_CMD */
+       __raw_writew(__raw_readw(PTXCR) & ~0x000f, PTXCR);
+
+       /* select D3-D0 pin function */
+       __raw_writew(__raw_readw(PSELA) & ~0x2000, PSELA);
+
+       /* select D7-D4 pin function */
+       __raw_writew(__raw_readw(PSELE) & ~0x3000, PSELE);
+
+       /* disable Hi-Z for the MMC pins */
+       __raw_writew(__raw_readw(HIZCRC) & ~0x0620, HIZCRC);
+
+       /* high drive capability for MMC pins */
+       __raw_writew(__raw_readw(DRVCRA) | 0x3000, DRVCRA);
+
+       mmcif_update_progress(MMCIF_PROGRESS_INIT);
+
+       /* setup MMCIF hardware */
+       sh_mmcif_boot_init(MMCIF_BASE);
+
+       mmcif_update_progress(MMCIF_PROGRESS_LOAD);
+
+       /* load kernel via MMCIF interface */
+       sh_mmcif_boot_slurp(MMCIF_BASE, buf, no_bytes);
+
+       /* disable clock to the MMCIF hardware block */
+       __raw_writel(__raw_readl(MSTPCR2) | 0x20000000, MSTPCR2);
+
+       mmcif_update_progress(MMCIF_PROGRESS_DONE);
+}
index 287c08f8b4bb9348666f5766d00467ad2b72fcc5..590394e2f5f2e48db6e500bf3fb0e6bebeab703f 100644 (file)
@@ -1,6 +1,8 @@
 SECTIONS
 {
   .text : {
+       zero_page_pos = .;
        *(.data)
+       end_data = .;
        }
 }
index f689554e17c1ff81b40f3c0bf0b998357ef65319..b237d525d5926d0daeafc577ab04525447facac8 100644 (file)
@@ -39,6 +39,8 @@
 #include <asm/io_generic.h>
 #include <asm/io_trapped.h>
 
+#ifdef CONFIG_HAS_IOPORT
+
 #define inb(p)                 sh_mv.mv_inb((p))
 #define inw(p)                 sh_mv.mv_inw((p))
 #define inl(p)                 sh_mv.mv_inl((p))
@@ -60,6 +62,8 @@
 #define outsw(p,b,c)           sh_mv.mv_outsw((p), (b), (c))
 #define outsl(p,b,c)           sh_mv.mv_outsl((p), (b), (c))
 
+#endif
+
 #define __raw_writeb(v,a)      (__chk_io_ptr(a), *(volatile u8  __force *)(a) = (v))
 #define __raw_writew(v,a)      (__chk_io_ptr(a), *(volatile u16 __force *)(a) = (v))
 #define __raw_writel(v,a)      (__chk_io_ptr(a), *(volatile u32 __force *)(a) = (v))
@@ -240,6 +244,8 @@ __BUILD_MEMORY_STRING(q, u64)
 
 #define IO_SPACE_LIMIT 0xffffffff
 
+#ifdef CONFIG_HAS_IOPORT
+
 /*
  * This function provides a method for the generic case where a
  * board-specific ioport_map simply needs to return the port + some
@@ -255,6 +261,8 @@ static inline void __set_io_port_base(unsigned long pbase)
 
 #define __ioport_map(p, n) sh_mv.mv_ioport_map((p), (n))
 
+#endif
+
 /* We really want to try and get these to memcpy etc */
 void memcpy_fromio(void *, const volatile void __iomem *, unsigned long);
 void memcpy_toio(volatile void __iomem *, const void *, unsigned long);
index bc0218cb72e13992c97602bdc9e2679cdcdea323..a0b0cf79cf8a608b9c0fa351f7e1a7eb17e51b39 100644 (file)
@@ -19,6 +19,10 @@ struct sh_machine_vector {
        const char *mv_name;
        int mv_nr_irqs;
 
+       int (*mv_irq_demux)(int irq);
+       void (*mv_init_irq)(void);
+
+#ifdef CONFIG_HAS_IOPORT
        u8 (*mv_inb)(unsigned long);
        u16 (*mv_inw)(unsigned long);
        u32 (*mv_inl)(unsigned long);
@@ -40,12 +44,9 @@ struct sh_machine_vector {
        void (*mv_outsw)(unsigned long, const void *src, unsigned long count);
        void (*mv_outsl)(unsigned long, const void *src, unsigned long count);
 
-       int (*mv_irq_demux)(int irq);
-
-       void (*mv_init_irq)(void);
-
        void __iomem *(*mv_ioport_map)(unsigned long port, unsigned int size);
        void (*mv_ioport_unmap)(void __iomem *);
+#endif
 
        int (*mv_clk_init)(void);
        int (*mv_mode_pins)(void);
index fbbf550cc529c10d3ebbb8aa010de963d3a842fc..4c27b68789b3fd02a89fea5c6ae42fb0a347e0d5 100644 (file)
@@ -9,6 +9,7 @@
  * MD3: BSC - Area0 Bus Width (16/32-bit) [CS0BCR.9,10]
  * MD5: BSC - Endian Mode (L: Big, H: Little) [CMNCR.3]
  * MD8: Test Mode
+ * BOOT: FBR - Boot Mode (L: MMCIF, H: Area0)
  */
 
 /* Pin Function Controller:
index 267e24112d8233585f47e02aa1f7d655f33c89b4..08fb42269ecd1c836c29d7b85b993a4796764dcf 100644 (file)
@@ -1 +1,11 @@
+#ifdef __ASSEMBLY__
+
 /* do nothing here by default */
+
+#else /* __ASSEMBLY__ */
+
+extern inline void mmcif_update_progress(int nr)
+{
+}
+
+#endif /* __ASSEMBLY__ */
index 1c8787ecb1c117b014aeccc9296ca64bcd932fb4..1dcf5e6c8d83239966df26af919fa5fa2300bccb 100644 (file)
@@ -1,3 +1,5 @@
+#ifdef __ASSEMBLY__
+
 /* EcoVec board specific boot code:
  * converts the "partner-jet-script.txt" script into assembly
  * the assembly code is the first code to be executed in the romImage
        .align 2
 1 :    .long 0xa8000000
 2 :
+
+#else /* __ASSEMBLY__ */
+
+/* Ecovec board specific information:
+ *
+ * Set the following to enable MMCIF boot from the MMC card in CN12:
+ *
+ * DS1.5 = OFF (SH BOOT pin set to L)
+ * DS2.6 = OFF (Select MMCIF on CN12 instead of SDHI1)
+ * DS2.7 = ON  (Select MMCIF on CN12 instead of SDHI1)
+ *
+ */
+#define HIZCRA         0xa4050158
+#define PGDR           0xa405012c
+
+extern inline void mmcif_update_progress(int nr)
+{
+       /* disable Hi-Z for LED pins */
+       __raw_writew(__raw_readw(HIZCRA) & ~(1 << 1), HIZCRA);
+
+       /* update progress on LED4, LED5, LED6 and LED7 */
+       __raw_writeb(1 << (nr - 1), PGDR);
+}
+
+#endif /* __ASSEMBLY__ */
index a110823f2bde78d8966d5aefd77ea688bfb7b447..976256a323f2c4a85e1bdd9dbd18b1209f5e5ba0 100644 (file)
@@ -1,3 +1,5 @@
+#ifdef __ASSEMBLY__
+
 /* kfr2r09 board specific boot code:
  * converts the "partner-jet-script.txt" script into assembly
  * the assembly code is the first code to be executed in the romImage
        .align 2
 1:     .long 0xa8000000
 2:
+
+#else /* __ASSEMBLY__ */
+
+extern inline void mmcif_update_progress(int nr)
+{
+}
+
+#endif /* __ASSEMBLY__ */
index 650b92f00ee56411fbaabe648db36c5d91c66e17..e25f3c69525d4eeb4aaed3fc9a5d724efb797124 100644 (file)
@@ -12,7 +12,7 @@ endif
 CFLAGS_REMOVE_return_address.o = -pg
 
 obj-y  := clkdev.o debugtraps.o dma-nommu.o dumpstack.o                \
-          idle.o io.o io_generic.o irq.o                               \
+          idle.o io.o irq.o                                            \
           irq_$(BITS).o machvec.o nmi_debug.o process.o                \
           process_$(BITS).o ptrace_$(BITS).o                           \
           reboot.o return_address.o                                    \
@@ -39,6 +39,7 @@ obj-$(CONFIG_DUMP_CODE)               += disassemble.o
 obj-$(CONFIG_HIBERNATION)      += swsusp.o
 obj-$(CONFIG_DWARF_UNWINDER)   += dwarf.o
 obj-$(CONFIG_PERF_EVENTS)      += perf_event.o perf_callchain.o
+obj-$(CONFIG_HAS_IOPORT)       += io_generic.o
 
 obj-$(CONFIG_HAVE_HW_BREAKPOINT)               += hw_breakpoint.o
 obj-$(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST)    += localtimer.o
index 886d7d83ace38912aa4966da50159d43686b0fde..49c09c7d5b77ce76b3351bf2174251756c7b9b41 100644 (file)
@@ -49,6 +49,8 @@ static DEFINE_SPINLOCK(dwarf_fde_lock);
 
 static struct dwarf_cie *cached_cie;
 
+static unsigned int dwarf_unwinder_ready;
+
 /**
  *     dwarf_frame_alloc_reg - allocate memory for a DWARF register
  *     @frame: the DWARF frame whose list of registers we insert on
@@ -581,6 +583,13 @@ struct dwarf_frame *dwarf_unwind_stack(unsigned long pc,
        struct dwarf_reg *reg;
        unsigned long addr;
 
+       /*
+        * If we've been called in to before initialization has
+        * completed, bail out immediately.
+        */
+       if (!dwarf_unwinder_ready)
+               return NULL;
+
        /*
         * If we're starting at the top of the stack we need get the
         * contents of a physical register to get the CFA in order to
@@ -1167,7 +1176,7 @@ void module_dwarf_cleanup(struct module *mod)
  */
 static int __init dwarf_unwinder_init(void)
 {
-       int err;
+       int err = -ENOMEM;
 
        dwarf_frame_cachep = kmem_cache_create("dwarf_frames",
                        sizeof(struct dwarf_frame), 0,
@@ -1181,11 +1190,15 @@ static int __init dwarf_unwinder_init(void)
                                          mempool_alloc_slab,
                                          mempool_free_slab,
                                          dwarf_frame_cachep);
+       if (!dwarf_frame_pool)
+               goto out;
 
        dwarf_reg_pool = mempool_create(DWARF_REG_MIN_REQ,
                                         mempool_alloc_slab,
                                         mempool_free_slab,
                                         dwarf_reg_cachep);
+       if (!dwarf_reg_pool)
+               goto out;
 
        err = dwarf_parse_section(__start_eh_frame, __stop_eh_frame, NULL);
        if (err)
@@ -1195,11 +1208,13 @@ static int __init dwarf_unwinder_init(void)
        if (err)
                goto out;
 
+       dwarf_unwinder_ready = 1;
+
        return 0;
 
 out:
        printk(KERN_ERR "Failed to initialise DWARF unwinder: %d\n", err);
        dwarf_unwinder_cleanup();
-       return -EINVAL;
+       return err;
 }
 early_initcall(dwarf_unwinder_init);
index 4770c241c6790192a4954d2274de144b8da5938a..5c51b794ba2a8a7591546f79a18271d73e33e771 100644 (file)
@@ -112,25 +112,3 @@ void memset_io(volatile void __iomem *dst, int c, unsigned long count)
         }
 }
 EXPORT_SYMBOL(memset_io);
-
-#ifndef CONFIG_GENERIC_IOMAP
-
-void __iomem *ioport_map(unsigned long port, unsigned int nr)
-{
-       void __iomem *ret;
-
-       ret = __ioport_map_trapped(port, nr);
-       if (ret)
-               return ret;
-
-       return __ioport_map(port, nr);
-}
-EXPORT_SYMBOL(ioport_map);
-
-void ioport_unmap(void __iomem *addr)
-{
-       sh_mv.mv_ioport_unmap(addr);
-}
-EXPORT_SYMBOL(ioport_unmap);
-
-#endif /* CONFIG_GENERIC_IOMAP */
index e1e1dbd195579e5cacc7a5437020a75bcc695757..447d78f666f90ef2f34430185a1d10ae8ef9ddb4 100644 (file)
@@ -158,3 +158,23 @@ void __iomem *generic_ioport_map(unsigned long addr, unsigned int size)
 void generic_ioport_unmap(void __iomem *addr)
 {
 }
+
+#ifndef CONFIG_GENERIC_IOMAP
+void __iomem *ioport_map(unsigned long port, unsigned int nr)
+{
+       void __iomem *ret;
+
+       ret = __ioport_map_trapped(port, nr);
+       if (ret)
+               return ret;
+
+       return __ioport_map(port, nr);
+}
+EXPORT_SYMBOL(ioport_map);
+
+void ioport_unmap(void __iomem *addr)
+{
+       sh_mv.mv_ioport_unmap(addr);
+}
+EXPORT_SYMBOL(ioport_unmap);
+#endif /* CONFIG_GENERIC_IOMAP */
index 4a8bb4eeb8ad7ffc5dee5a312712fafda419028c..2947d2bd12919e5d19117839a9d180ff918a93f3 100644 (file)
@@ -91,10 +91,14 @@ int register_trapped_io(struct trapped_io *tiop)
        tiop->magic = IO_TRAPPED_MAGIC;
        INIT_LIST_HEAD(&tiop->list);
        spin_lock_irq(&trapped_lock);
+#ifdef CONFIG_HAS_IOPORT
        if (flags & IORESOURCE_IO)
                list_add(&tiop->list, &trapped_io);
+#endif
+#ifdef CONFIG_HAS_IOMEM
        if (flags & IORESOURCE_MEM)
                list_add(&tiop->list, &trapped_mem);
+#endif
        spin_unlock_irq(&trapped_lock);
 
        return 0;
index 85cfaf916fdc027d4206f1fc3976cc40fc889c9c..9f9bb63616adf6067151b1d85241044469cc2627 100644 (file)
@@ -118,6 +118,14 @@ void __init sh_mv_setup(void)
                sh_mv.mv_##elem = generic_##elem; \
 } while (0)
 
+#ifdef CONFIG_HAS_IOPORT
+
+#ifdef P2SEG
+       __set_io_port_base(P2SEG);
+#else
+       __set_io_port_base(0);
+#endif
+
        mv_set(inb);    mv_set(inw);    mv_set(inl);
        mv_set(outb);   mv_set(outw);   mv_set(outl);
 
@@ -129,16 +137,13 @@ void __init sh_mv_setup(void)
 
        mv_set(ioport_map);
        mv_set(ioport_unmap);
+
+#endif
+
        mv_set(irq_demux);
        mv_set(mode_pins);
        mv_set(mem_init);
 
        if (!sh_mv.mv_nr_irqs)
                sh_mv.mv_nr_irqs = NR_IRQS;
-
-#ifdef P2SEG
-       __set_io_port_base(P2SEG);
-#else
-       __set_io_port_base(0);
-#endif
 }
index cbf1dd5372b2d223f399ab884fd46bfbd83246d1..5124aeb28c3f333d9b7ff7755d8f01e738a044d1 100644 (file)
@@ -24,6 +24,8 @@ void *return_address(unsigned int depth)
                struct dwarf_frame *tmp;
 
                tmp = dwarf_unwind_stack(ra, frame);
+               if (!tmp)
+                       return NULL;
 
                if (frame)
                        dwarf_free_frame(frame);
index e22c96993db3b07545e107adb57f2ef1d8ddb608..696634214dc65551557ab88535b40557fed4eb7c 100644 (file)
@@ -81,7 +81,7 @@ static int do_op_one_page(unsigned long addr, int len, int is_write,
 
        current->thread.fault_catcher = NULL;
 
-       kunmap_atomic(page, KM_UML_USERCOPY);
+       kunmap_atomic((void *)addr, KM_UML_USERCOPY);
 
        return n;
 }
index 8d8797eae5d704e238d764b4b4d1e7254c2ecc62..cd2a31dc5fb8e4a956c8c34125534540d51b08f4 100644 (file)
@@ -53,6 +53,8 @@ extern int pcibios_last_bus;
 extern struct pci_bus *pci_root_bus;
 extern struct pci_ops pci_root_ops;
 
+void pcibios_scan_specific_bus(int busn);
+
 /* pci-irq.c */
 
 struct irq_info {
index 707165dbc20343310147dcd483605b7bfde456f0..18cc4256225081077161c027a9bb1bae1013ab44 100644 (file)
@@ -36,6 +36,7 @@
 #include <linux/fs.h>
 #include <linux/mm.h>
 #include <linux/debugfs.h>
+#include <linux/edac_mce.h>
 
 #include <asm/processor.h>
 #include <asm/hw_irq.h>
@@ -168,6 +169,15 @@ void mce_log(struct mce *mce)
        for (;;) {
                entry = rcu_dereference_check_mce(mcelog.next);
                for (;;) {
+                       /*
+                        * If edac_mce is enabled, it will check the error type
+                        * and will process it, if it is a known error.
+                        * Otherwise, the error will be sent through mcelog
+                        * interface
+                        */
+                       if (edac_mce_parse(mce))
+                               return;
+
                        /*
                         * When the buffer fills up discard new entries.
                         * Assume that the earlier errors are the more
index 0db5eaf54560b3ec1d8083ee8e69d8a1057a045c..8d460eaf524f1d6f1a54b3853de221e7b38d9e6d 100644 (file)
  */
 static void __devinit pcibios_fixup_peer_bridges(void)
 {
-       int n, devfn;
-       long node;
+       int n;
 
        if (pcibios_last_bus <= 0 || pcibios_last_bus > 0xff)
                return;
        DBG("PCI: Peer bridge fixup\n");
 
-       for (n=0; n <= pcibios_last_bus; n++) {
-               u32 l;
-               if (pci_find_bus(0, n))
-                       continue;
-               node = get_mp_bus_to_node(n);
-               for (devfn = 0; devfn < 256; devfn += 8) {
-                       if (!raw_pci_read(0, n, devfn, PCI_VENDOR_ID, 2, &l) &&
-                           l != 0x0000 && l != 0xffff) {
-                               DBG("Found device at %02x:%02x [%04x]\n", n, devfn, l);
-                               printk(KERN_INFO "PCI: Discovered peer bus %02x\n", n);
-                               pci_scan_bus_on_node(n, &pci_root_ops, node);
-                               break;
-                       }
-               }
-       }
+       for (n=0; n <= pcibios_last_bus; n++)
+               pcibios_scan_specific_bus(n);
 }
 
 int __init pci_legacy_init(void)
@@ -50,6 +36,28 @@ int __init pci_legacy_init(void)
        return 0;
 }
 
+void pcibios_scan_specific_bus(int busn)
+{
+       int devfn;
+       long node;
+       u32 l;
+
+       if (pci_find_bus(0, busn))
+               return;
+
+       node = get_mp_bus_to_node(busn);
+       for (devfn = 0; devfn < 256; devfn += 8) {
+               if (!raw_pci_read(0, busn, devfn, PCI_VENDOR_ID, 2, &l) &&
+                   l != 0x0000 && l != 0xffff) {
+                       DBG("Found device at %02x:%02x [%04x]\n", busn, devfn, l);
+                       printk(KERN_INFO "PCI: Discovered peer bus %02x\n", busn);
+                       pci_scan_bus_on_node(busn, &pci_root_ops, node);
+                       return;
+               }
+       }
+}
+EXPORT_SYMBOL_GPL(pcibios_scan_specific_bus);
+
 int __init pci_subsys_init(void)
 {
        /*
index bc0733359a8852a12288f083c2420f4c9734948e..e367e30264366d82c17dc66d157a2aa2534388bc 100644 (file)
@@ -105,7 +105,6 @@ good_area:
         * make sure we exit gracefully rather than endlessly redo
         * the fault.
         */
-survive:
        fault = handle_mm_fault(mm, vma, address, is_write ? FAULT_FLAG_WRITE : 0);
        if (unlikely(fault & VM_FAULT_ERROR)) {
                if (fault & VM_FAULT_OOM)
@@ -146,15 +145,10 @@ bad_area:
         */
 out_of_memory:
        up_read(&mm->mmap_sem);
-       if (is_global_init(current)) {
-               yield();
-               down_read(&mm->mmap_sem);
-               goto survive;
-       }
-       printk("VM: killing process %s\n", current->comm);
-       if (user_mode(regs))
-               do_group_exit(SIGKILL);
-       bad_page_fault(regs, address, SIGKILL);
+       if (!user_mode(regs))
+               bad_page_fault(regs, address, SIGKILL);
+       else
+               pagefault_out_of_memory();
        return;
 
 do_sigbus:
index 3bc5579d6f543fa57783e09268707178de26c4b7..f84cce42fc58da2dc0bc48186cbd9f6bd1d7dfc3 100644 (file)
@@ -467,6 +467,9 @@ static int blk_init_free_list(struct request_queue *q)
 {
        struct request_list *rl = &q->rq;
 
+       if (unlikely(rl->rq_pool))
+               return 0;
+
        rl->count[BLK_RW_SYNC] = rl->count[BLK_RW_ASYNC] = 0;
        rl->starved[BLK_RW_SYNC] = rl->starved[BLK_RW_ASYNC] = 0;
        rl->elvpriv = 0;
@@ -570,9 +573,17 @@ EXPORT_SYMBOL(blk_init_queue);
 struct request_queue *
 blk_init_queue_node(request_fn_proc *rfn, spinlock_t *lock, int node_id)
 {
-       struct request_queue *q = blk_alloc_queue_node(GFP_KERNEL, node_id);
+       struct request_queue *uninit_q, *q;
+
+       uninit_q = blk_alloc_queue_node(GFP_KERNEL, node_id);
+       if (!uninit_q)
+               return NULL;
+
+       q = blk_init_allocated_queue_node(uninit_q, rfn, lock, node_id);
+       if (!q)
+               blk_cleanup_queue(uninit_q);
 
-       return blk_init_allocated_queue_node(q, rfn, lock, node_id);
+       return q;
 }
 EXPORT_SYMBOL(blk_init_queue_node);
 
@@ -592,10 +603,8 @@ blk_init_allocated_queue_node(struct request_queue *q, request_fn_proc *rfn,
                return NULL;
 
        q->node = node_id;
-       if (blk_init_free_list(q)) {
-               kmem_cache_free(blk_requestq_cachep, q);
+       if (blk_init_free_list(q))
                return NULL;
-       }
 
        q->request_fn           = rfn;
        q->prep_rq_fn           = NULL;
@@ -618,7 +627,6 @@ blk_init_allocated_queue_node(struct request_queue *q, request_fn_proc *rfn,
                return q;
        }
 
-       blk_put_queue(q);
        return NULL;
 }
 EXPORT_SYMBOL(blk_init_allocated_queue_node);
index ed897b5ef315dedfe01d0fe8817ef2259b770252..5ff4f4850e717ddb319423e9678e0e44cd7f265c 100644 (file)
@@ -64,6 +64,9 @@ static DEFINE_PER_CPU(unsigned long, cfq_ioc_count);
 static struct completion *ioc_gone;
 static DEFINE_SPINLOCK(ioc_gone_lock);
 
+static DEFINE_SPINLOCK(cic_index_lock);
+static DEFINE_IDA(cic_index_ida);
+
 #define CFQ_PRIO_LISTS         IOPRIO_BE_NR
 #define cfq_class_idle(cfqq)   ((cfqq)->ioprio_class == IOPRIO_CLASS_IDLE)
 #define cfq_class_rt(cfqq)     ((cfqq)->ioprio_class == IOPRIO_CLASS_RT)
@@ -271,6 +274,7 @@ struct cfq_data {
        unsigned int cfq_latency;
        unsigned int cfq_group_isolation;
 
+       unsigned int cic_index;
        struct list_head cic_list;
 
        /*
@@ -430,6 +434,24 @@ static inline void cic_set_cfqq(struct cfq_io_context *cic,
        cic->cfqq[is_sync] = cfqq;
 }
 
+#define CIC_DEAD_KEY   1ul
+#define CIC_DEAD_INDEX_SHIFT   1
+
+static inline void *cfqd_dead_key(struct cfq_data *cfqd)
+{
+       return (void *)(cfqd->cic_index << CIC_DEAD_INDEX_SHIFT | CIC_DEAD_KEY);
+}
+
+static inline struct cfq_data *cic_to_cfqd(struct cfq_io_context *cic)
+{
+       struct cfq_data *cfqd = cic->key;
+
+       if (unlikely((unsigned long) cfqd & CIC_DEAD_KEY))
+               return NULL;
+
+       return cfqd;
+}
+
 /*
  * We regard a request as SYNC, if it's either a read or has the SYNC bit
  * set (in which case it could also be direct WRITE).
@@ -2510,11 +2532,12 @@ static void cfq_cic_free(struct cfq_io_context *cic)
 static void cic_free_func(struct io_context *ioc, struct cfq_io_context *cic)
 {
        unsigned long flags;
+       unsigned long dead_key = (unsigned long) cic->key;
 
-       BUG_ON(!cic->dead_key);
+       BUG_ON(!(dead_key & CIC_DEAD_KEY));
 
        spin_lock_irqsave(&ioc->lock, flags);
-       radix_tree_delete(&ioc->radix_root, cic->dead_key);
+       radix_tree_delete(&ioc->radix_root, dead_key >> CIC_DEAD_INDEX_SHIFT);
        hlist_del_rcu(&cic->cic_list);
        spin_unlock_irqrestore(&ioc->lock, flags);
 
@@ -2537,15 +2560,10 @@ static void cfq_free_io_context(struct io_context *ioc)
        __call_for_each_cic(ioc, cic_free_func);
 }
 
-static void cfq_exit_cfqq(struct cfq_data *cfqd, struct cfq_queue *cfqq)
+static void cfq_put_cooperator(struct cfq_queue *cfqq)
 {
        struct cfq_queue *__cfqq, *next;
 
-       if (unlikely(cfqq == cfqd->active_queue)) {
-               __cfq_slice_expired(cfqd, cfqq, 0);
-               cfq_schedule_dispatch(cfqd);
-       }
-
        /*
         * If this queue was scheduled to merge with another queue, be
         * sure to drop the reference taken on that queue (and others in
@@ -2561,6 +2579,16 @@ static void cfq_exit_cfqq(struct cfq_data *cfqd, struct cfq_queue *cfqq)
                cfq_put_queue(__cfqq);
                __cfqq = next;
        }
+}
+
+static void cfq_exit_cfqq(struct cfq_data *cfqd, struct cfq_queue *cfqq)
+{
+       if (unlikely(cfqq == cfqd->active_queue)) {
+               __cfq_slice_expired(cfqd, cfqq, 0);
+               cfq_schedule_dispatch(cfqd);
+       }
+
+       cfq_put_cooperator(cfqq);
 
        cfq_put_queue(cfqq);
 }
@@ -2573,11 +2601,10 @@ static void __cfq_exit_single_io_context(struct cfq_data *cfqd,
        list_del_init(&cic->queue_list);
 
        /*
-        * Make sure key == NULL is seen for dead queues
+        * Make sure dead mark is seen for dead queues
         */
        smp_wmb();
-       cic->dead_key = (unsigned long) cic->key;
-       cic->key = NULL;
+       cic->key = cfqd_dead_key(cfqd);
 
        if (ioc->ioc_data == cic)
                rcu_assign_pointer(ioc->ioc_data, NULL);
@@ -2596,7 +2623,7 @@ static void __cfq_exit_single_io_context(struct cfq_data *cfqd,
 static void cfq_exit_single_io_context(struct io_context *ioc,
                                       struct cfq_io_context *cic)
 {
-       struct cfq_data *cfqd = cic->key;
+       struct cfq_data *cfqd = cic_to_cfqd(cic);
 
        if (cfqd) {
                struct request_queue *q = cfqd->queue;
@@ -2609,7 +2636,7 @@ static void cfq_exit_single_io_context(struct io_context *ioc,
                 * race between exiting task and queue
                 */
                smp_read_barrier_depends();
-               if (cic->key)
+               if (cic->key == cfqd)
                        __cfq_exit_single_io_context(cfqd, cic);
 
                spin_unlock_irqrestore(q->queue_lock, flags);
@@ -2689,7 +2716,7 @@ static void cfq_init_prio_data(struct cfq_queue *cfqq, struct io_context *ioc)
 
 static void changed_ioprio(struct io_context *ioc, struct cfq_io_context *cic)
 {
-       struct cfq_data *cfqd = cic->key;
+       struct cfq_data *cfqd = cic_to_cfqd(cic);
        struct cfq_queue *cfqq;
        unsigned long flags;
 
@@ -2746,7 +2773,7 @@ static void cfq_init_cfqq(struct cfq_data *cfqd, struct cfq_queue *cfqq,
 static void changed_cgroup(struct io_context *ioc, struct cfq_io_context *cic)
 {
        struct cfq_queue *sync_cfqq = cic_to_cfqq(cic, 1);
-       struct cfq_data *cfqd = cic->key;
+       struct cfq_data *cfqd = cic_to_cfqd(cic);
        unsigned long flags;
        struct request_queue *q;
 
@@ -2883,12 +2910,13 @@ cfq_drop_dead_cic(struct cfq_data *cfqd, struct io_context *ioc,
        unsigned long flags;
 
        WARN_ON(!list_empty(&cic->queue_list));
+       BUG_ON(cic->key != cfqd_dead_key(cfqd));
 
        spin_lock_irqsave(&ioc->lock, flags);
 
        BUG_ON(ioc->ioc_data == cic);
 
-       radix_tree_delete(&ioc->radix_root, (unsigned long) cfqd);
+       radix_tree_delete(&ioc->radix_root, cfqd->cic_index);
        hlist_del_rcu(&cic->cic_list);
        spin_unlock_irqrestore(&ioc->lock, flags);
 
@@ -2900,7 +2928,6 @@ cfq_cic_lookup(struct cfq_data *cfqd, struct io_context *ioc)
 {
        struct cfq_io_context *cic;
        unsigned long flags;
-       void *k;
 
        if (unlikely(!ioc))
                return NULL;
@@ -2917,13 +2944,11 @@ cfq_cic_lookup(struct cfq_data *cfqd, struct io_context *ioc)
        }
 
        do {
-               cic = radix_tree_lookup(&ioc->radix_root, (unsigned long) cfqd);
+               cic = radix_tree_lookup(&ioc->radix_root, cfqd->cic_index);
                rcu_read_unlock();
                if (!cic)
                        break;
-               /* ->key must be copied to avoid race with cfq_exit_queue() */
-               k = cic->key;
-               if (unlikely(!k)) {
+               if (unlikely(cic->key != cfqd)) {
                        cfq_drop_dead_cic(cfqd, ioc, cic);
                        rcu_read_lock();
                        continue;
@@ -2956,7 +2981,7 @@ static int cfq_cic_link(struct cfq_data *cfqd, struct io_context *ioc,
 
                spin_lock_irqsave(&ioc->lock, flags);
                ret = radix_tree_insert(&ioc->radix_root,
-                                               (unsigned long) cfqd, cic);
+                                               cfqd->cic_index, cic);
                if (!ret)
                        hlist_add_head_rcu(&cic->cic_list, &ioc->cic_list);
                spin_unlock_irqrestore(&ioc->lock, flags);
@@ -3516,6 +3541,9 @@ split_cfqq(struct cfq_io_context *cic, struct cfq_queue *cfqq)
        }
 
        cic_set_cfqq(cic, NULL, 1);
+
+       cfq_put_cooperator(cfqq);
+
        cfq_put_queue(cfqq);
        return NULL;
 }
@@ -3708,10 +3736,32 @@ static void cfq_exit_queue(struct elevator_queue *e)
 
        cfq_shutdown_timer_wq(cfqd);
 
+       spin_lock(&cic_index_lock);
+       ida_remove(&cic_index_ida, cfqd->cic_index);
+       spin_unlock(&cic_index_lock);
+
        /* Wait for cfqg->blkg->key accessors to exit their grace periods. */
        call_rcu(&cfqd->rcu, cfq_cfqd_free);
 }
 
+static int cfq_alloc_cic_index(void)
+{
+       int index, error;
+
+       do {
+               if (!ida_pre_get(&cic_index_ida, GFP_KERNEL))
+                       return -ENOMEM;
+
+               spin_lock(&cic_index_lock);
+               error = ida_get_new(&cic_index_ida, &index);
+               spin_unlock(&cic_index_lock);
+               if (error && error != -EAGAIN)
+                       return error;
+       } while (error);
+
+       return index;
+}
+
 static void *cfq_init_queue(struct request_queue *q)
 {
        struct cfq_data *cfqd;
@@ -3719,10 +3769,16 @@ static void *cfq_init_queue(struct request_queue *q)
        struct cfq_group *cfqg;
        struct cfq_rb_root *st;
 
+       i = cfq_alloc_cic_index();
+       if (i < 0)
+               return NULL;
+
        cfqd = kmalloc_node(sizeof(*cfqd), GFP_KERNEL | __GFP_ZERO, q->node);
        if (!cfqd)
                return NULL;
 
+       cfqd->cic_index = i;
+
        /* Init root service tree */
        cfqd->grp_service_tree = CFQ_RB_ROOT;
 
@@ -3984,6 +4040,7 @@ static void __exit cfq_exit(void)
         */
        if (elv_ioc_count_read(cfq_ioc_count))
                wait_for_completion(&all_gone);
+       ida_destroy(&cic_index_ida);
        cfq_slab_kill();
 }
 
index 6df2b5056b51e1347c10cb7c5f3c50d09aa21650..923a9139106c51cbdb63dca5d1c97ce81a30d316 100644 (file)
@@ -242,9 +242,11 @@ int elevator_init(struct request_queue *q, char *name)
 {
        struct elevator_type *e = NULL;
        struct elevator_queue *eq;
-       int ret = 0;
        void *data;
 
+       if (unlikely(q->elevator))
+               return 0;
+
        INIT_LIST_HEAD(&q->queue_head);
        q->last_merge = NULL;
        q->end_sector = 0;
@@ -284,7 +286,7 @@ int elevator_init(struct request_queue *q, char *name)
        }
 
        elevator_attach(q, eq, data);
-       return ret;
+       return 0;
 }
 EXPORT_SYMBOL(elevator_init);
 
@@ -1097,7 +1099,7 @@ ssize_t elv_iosched_show(struct request_queue *q, char *name)
        struct elevator_type *__e;
        int len = 0;
 
-       if (!q->elevator)
+       if (!q->elevator || !blk_queue_stackable(q))
                return sprintf(name, "none\n");
 
        elv = e->elevator_type;
index e61d4f8e62a54a42dd8f39b5c9647b2a08449e07..5f2027d782e8134642d777225f4c37f6120b214f 100644 (file)
@@ -79,7 +79,7 @@ enum {
        EC_FLAGS_GPE_STORM,             /* GPE storm detected */
        EC_FLAGS_HANDLERS_INSTALLED,    /* Handlers for GPE and
                                         * OpReg are installed */
-       EC_FLAGS_FROZEN,                /* Transactions are suspended */
+       EC_FLAGS_BLOCKED,               /* Transactions are blocked */
 };
 
 /* If we find an EC via the ECDT, we need to keep a ptr to its context */
@@ -293,7 +293,7 @@ static int acpi_ec_transaction(struct acpi_ec *ec, struct transaction *t)
        if (t->rdata)
                memset(t->rdata, 0, t->rlen);
        mutex_lock(&ec->lock);
-       if (test_bit(EC_FLAGS_FROZEN, &ec->flags)) {
+       if (test_bit(EC_FLAGS_BLOCKED, &ec->flags)) {
                status = -EINVAL;
                goto unlock;
        }
@@ -459,7 +459,7 @@ int ec_transaction(u8 command,
 
 EXPORT_SYMBOL(ec_transaction);
 
-void acpi_ec_suspend_transactions(void)
+void acpi_ec_block_transactions(void)
 {
        struct acpi_ec *ec = first_ec;
 
@@ -468,11 +468,11 @@ void acpi_ec_suspend_transactions(void)
 
        mutex_lock(&ec->lock);
        /* Prevent transactions from being carried out */
-       set_bit(EC_FLAGS_FROZEN, &ec->flags);
+       set_bit(EC_FLAGS_BLOCKED, &ec->flags);
        mutex_unlock(&ec->lock);
 }
 
-void acpi_ec_resume_transactions(void)
+void acpi_ec_unblock_transactions(void)
 {
        struct acpi_ec *ec = first_ec;
 
@@ -481,10 +481,20 @@ void acpi_ec_resume_transactions(void)
 
        mutex_lock(&ec->lock);
        /* Allow transactions to be carried out again */
-       clear_bit(EC_FLAGS_FROZEN, &ec->flags);
+       clear_bit(EC_FLAGS_BLOCKED, &ec->flags);
        mutex_unlock(&ec->lock);
 }
 
+void acpi_ec_unblock_transactions_early(void)
+{
+       /*
+        * Allow transactions to happen again (this function is called from
+        * atomic context during wakeup, so we don't need to acquire the mutex).
+        */
+       if (first_ec)
+               clear_bit(EC_FLAGS_BLOCKED, &first_ec->flags);
+}
+
 static int acpi_ec_query_unlocked(struct acpi_ec *ec, u8 * data)
 {
        int result;
index e28411367239a117f48f2773f489aa41919bcf1f..f8f190ec066e7a266101b0783a97e8f274f5a639 100644 (file)
@@ -49,8 +49,9 @@ void acpi_early_processor_set_pdc(void);
 int acpi_ec_init(void);
 int acpi_ec_ecdt_probe(void);
 int acpi_boot_ec_enable(void);
-void acpi_ec_suspend_transactions(void);
-void acpi_ec_resume_transactions(void);
+void acpi_ec_block_transactions(void);
+void acpi_ec_unblock_transactions(void);
+void acpi_ec_unblock_transactions_early(void);
 
 /*--------------------------------------------------------------------------
                                   Suspend/Resume
index 2e8c27d48f2b75f59f0e76436ae94db5f61466a7..b1b385692f46e09f05dd55882ed3ea9c73039b74 100644 (file)
@@ -80,7 +80,7 @@ module_param(nocst, uint, 0000);
 static unsigned int latency_factor __read_mostly = 2;
 module_param(latency_factor, uint, 0644);
 
-static s64 us_to_pm_timer_ticks(s64 t)
+static u64 us_to_pm_timer_ticks(s64 t)
 {
        return div64_u64(t * PM_TIMER_FREQUENCY, 1000000);
 }
@@ -731,10 +731,10 @@ static int acpi_processor_power_seq_show(struct seq_file *seq, void *offset)
 
                seq_puts(seq, "demotion[--] ");
 
-               seq_printf(seq, "latency[%03d] usage[%08d] duration[%020llu]\n",
+               seq_printf(seq, "latency[%03d] usage[%08d] duration[%020Lu]\n",
                           pr->power.states[i].latency,
                           pr->power.states[i].usage,
-                          (unsigned long long)pr->power.states[i].time);
+                          us_to_pm_timer_ticks(pr->power.states[i].time));
        }
 
       end:
@@ -861,7 +861,6 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev,
        ktime_t  kt1, kt2;
        s64 idle_time_ns;
        s64 idle_time;
-       s64 sleep_ticks = 0;
 
        pr = __get_cpu_var(processors);
 
@@ -906,8 +905,6 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev,
        idle_time = idle_time_ns;
        do_div(idle_time, NSEC_PER_USEC);
 
-       sleep_ticks = us_to_pm_timer_ticks(idle_time);
-
        /* Tell the scheduler how much we idled: */
        sched_clock_idle_wakeup_event(idle_time_ns);
 
@@ -918,7 +915,7 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev,
        cx->usage++;
 
        lapic_timer_state_broadcast(pr, cx, 0);
-       cx->time += sleep_ticks;
+       cx->time += idle_time;
        return idle_time;
 }
 
@@ -940,7 +937,6 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
        ktime_t  kt1, kt2;
        s64 idle_time_ns;
        s64 idle_time;
-       s64 sleep_ticks = 0;
 
 
        pr = __get_cpu_var(processors);
@@ -1022,11 +1018,10 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
                spin_unlock(&c3_lock);
        }
        kt2 = ktime_get_real();
-       idle_time_ns = ktime_to_us(ktime_sub(kt2, kt1));
+       idle_time_ns = ktime_to_ns(ktime_sub(kt2, kt1));
        idle_time = idle_time_ns;
        do_div(idle_time, NSEC_PER_USEC);
 
-       sleep_ticks = us_to_pm_timer_ticks(idle_time);
        /* Tell the scheduler how much we idled: */
        sched_clock_idle_wakeup_event(idle_time_ns);
 
@@ -1037,7 +1032,7 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
        cx->usage++;
 
        lapic_timer_state_broadcast(pr, cx, 0);
-       cx->time += sleep_ticks;
+       cx->time += idle_time;
        return idle_time;
 }
 
index 4ab2275b4461e797bf374880c97c24db72dba386..3fb4bdea7e06e59edcd5591897179895ce12807c 100644 (file)
@@ -94,11 +94,13 @@ void __init acpi_old_suspend_ordering(void)
 }
 
 /**
- *     acpi_pm_disable_gpes - Disable the GPEs.
+ * acpi_pm_freeze - Disable the GPEs and suspend EC transactions.
  */
-static int acpi_pm_disable_gpes(void)
+static int acpi_pm_freeze(void)
 {
        acpi_disable_all_gpes();
+       acpi_os_wait_events_complete(NULL);
+       acpi_ec_block_transactions();
        return 0;
 }
 
@@ -126,7 +128,8 @@ static int acpi_pm_prepare(void)
        int error = __acpi_pm_prepare();
 
        if (!error)
-               acpi_disable_all_gpes();
+               acpi_pm_freeze();
+
        return error;
 }
 
@@ -256,6 +259,8 @@ static int acpi_suspend_enter(suspend_state_t pm_state)
         * acpi_leave_sleep_state will reenable specific GPEs later
         */
        acpi_disable_all_gpes();
+       /* Allow EC transactions to happen. */
+       acpi_ec_unblock_transactions_early();
 
        local_irq_restore(flags);
        printk(KERN_DEBUG "Back to C!\n");
@@ -267,6 +272,12 @@ static int acpi_suspend_enter(suspend_state_t pm_state)
        return ACPI_SUCCESS(status) ? 0 : -EFAULT;
 }
 
+static void acpi_suspend_finish(void)
+{
+       acpi_ec_unblock_transactions();
+       acpi_pm_finish();
+}
+
 static int acpi_suspend_state_valid(suspend_state_t pm_state)
 {
        u32 acpi_state;
@@ -288,7 +299,7 @@ static struct platform_suspend_ops acpi_suspend_ops = {
        .begin = acpi_suspend_begin,
        .prepare_late = acpi_pm_prepare,
        .enter = acpi_suspend_enter,
-       .wake = acpi_pm_finish,
+       .wake = acpi_suspend_finish,
        .end = acpi_pm_end,
 };
 
@@ -314,9 +325,9 @@ static int acpi_suspend_begin_old(suspend_state_t pm_state)
 static struct platform_suspend_ops acpi_suspend_ops_old = {
        .valid = acpi_suspend_state_valid,
        .begin = acpi_suspend_begin_old,
-       .prepare_late = acpi_pm_disable_gpes,
+       .prepare_late = acpi_pm_freeze,
        .enter = acpi_suspend_enter,
-       .wake = acpi_pm_finish,
+       .wake = acpi_suspend_finish,
        .end = acpi_pm_end,
        .recover = acpi_pm_finish,
 };
@@ -433,6 +444,7 @@ static int acpi_hibernation_enter(void)
 static void acpi_hibernation_finish(void)
 {
        hibernate_nvs_free();
+       acpi_ec_unblock_transactions();
        acpi_pm_finish();
 }
 
@@ -453,19 +465,13 @@ static void acpi_hibernation_leave(void)
        }
        /* Restore the NVS memory area */
        hibernate_nvs_restore();
+       /* Allow EC transactions to happen. */
+       acpi_ec_unblock_transactions_early();
 }
 
-static int acpi_pm_pre_restore(void)
-{
-       acpi_disable_all_gpes();
-       acpi_os_wait_events_complete(NULL);
-       acpi_ec_suspend_transactions();
-       return 0;
-}
-
-static void acpi_pm_restore_cleanup(void)
+static void acpi_pm_thaw(void)
 {
-       acpi_ec_resume_transactions();
+       acpi_ec_unblock_transactions();
        acpi_enable_all_runtime_gpes();
 }
 
@@ -477,8 +483,8 @@ static struct platform_hibernation_ops acpi_hibernation_ops = {
        .prepare = acpi_pm_prepare,
        .enter = acpi_hibernation_enter,
        .leave = acpi_hibernation_leave,
-       .pre_restore = acpi_pm_pre_restore,
-       .restore_cleanup = acpi_pm_restore_cleanup,
+       .pre_restore = acpi_pm_freeze,
+       .restore_cleanup = acpi_pm_thaw,
 };
 
 /**
@@ -510,12 +516,9 @@ static int acpi_hibernation_begin_old(void)
 
 static int acpi_hibernation_pre_snapshot_old(void)
 {
-       int error = acpi_pm_disable_gpes();
-
-       if (!error)
-               hibernate_nvs_save();
-
-       return error;
+       acpi_pm_freeze();
+       hibernate_nvs_save();
+       return 0;
 }
 
 /*
@@ -527,11 +530,11 @@ static struct platform_hibernation_ops acpi_hibernation_ops_old = {
        .end = acpi_pm_end,
        .pre_snapshot = acpi_hibernation_pre_snapshot_old,
        .finish = acpi_hibernation_finish,
-       .prepare = acpi_pm_disable_gpes,
+       .prepare = acpi_pm_freeze,
        .enter = acpi_hibernation_enter,
        .leave = acpi_hibernation_leave,
-       .pre_restore = acpi_pm_pre_restore,
-       .restore_cleanup = acpi_pm_restore_cleanup,
+       .pre_restore = acpi_pm_freeze,
+       .restore_cleanup = acpi_pm_thaw,
        .recover = acpi_pm_finish,
 };
 #endif /* CONFIG_HIBERNATION */
index 6081e81d5738b3fecb90da4350d7325b6b78d28a..f1bf79d9bc0a1c65df988ef4ec0b3c1eab907d93 100644 (file)
@@ -133,6 +133,28 @@ static struct page *brd_insert_page(struct brd_device *brd, sector_t sector)
        return page;
 }
 
+static void brd_free_page(struct brd_device *brd, sector_t sector)
+{
+       struct page *page;
+       pgoff_t idx;
+
+       spin_lock(&brd->brd_lock);
+       idx = sector >> PAGE_SECTORS_SHIFT;
+       page = radix_tree_delete(&brd->brd_pages, idx);
+       spin_unlock(&brd->brd_lock);
+       if (page)
+               __free_page(page);
+}
+
+static void brd_zero_page(struct brd_device *brd, sector_t sector)
+{
+       struct page *page;
+
+       page = brd_lookup_page(brd, sector);
+       if (page)
+               clear_highpage(page);
+}
+
 /*
  * Free all backing store pages and radix tree. This must only be called when
  * there are no other users of the device.
@@ -189,6 +211,24 @@ static int copy_to_brd_setup(struct brd_device *brd, sector_t sector, size_t n)
        return 0;
 }
 
+static void discard_from_brd(struct brd_device *brd,
+                       sector_t sector, size_t n)
+{
+       while (n >= PAGE_SIZE) {
+               /*
+                * Don't want to actually discard pages here because
+                * re-allocating the pages can result in writeback
+                * deadlocks under heavy load.
+                */
+               if (0)
+                       brd_free_page(brd, sector);
+               else
+                       brd_zero_page(brd, sector);
+               sector += PAGE_SIZE >> SECTOR_SHIFT;
+               n -= PAGE_SIZE;
+       }
+}
+
 /*
  * Copy n bytes from src to the brd starting at sector. Does not sleep.
  */
@@ -300,6 +340,12 @@ static int brd_make_request(struct request_queue *q, struct bio *bio)
                                                get_capacity(bdev->bd_disk))
                goto out;
 
+       if (unlikely(bio_rw_flagged(bio, BIO_RW_DISCARD))) {
+               err = 0;
+               discard_from_brd(brd, sector, bio->bi_size);
+               goto out;
+       }
+
        rw = bio_rw(bio);
        if (rw == READA)
                rw = READ;
@@ -320,7 +366,7 @@ out:
 }
 
 #ifdef CONFIG_BLK_DEV_XIP
-static int brd_direct_access (struct block_device *bdev, sector_t sector,
+static int brd_direct_access(struct block_device *bdev, sector_t sector,
                        void **kaddr, unsigned long *pfn)
 {
        struct brd_device *brd = bdev->bd_disk->private_data;
@@ -437,6 +483,11 @@ static struct brd_device *brd_alloc(int i)
        blk_queue_max_hw_sectors(brd->brd_queue, 1024);
        blk_queue_bounce_limit(brd->brd_queue, BLK_BOUNCE_ANY);
 
+       brd->brd_queue->limits.discard_granularity = PAGE_SIZE;
+       brd->brd_queue->limits.max_discard_sectors = UINT_MAX;
+       brd->brd_queue->limits.discard_zeroes_data = 1;
+       queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, brd->brd_queue);
+
        disk = brd->brd_disk = alloc_disk(1 << part_shift);
        if (!disk)
                goto out_free_queue;
index e1d0e2cfec72aaae4d332e693005d5d30833e8ab..3381505c8a6c309c7838cb7d0a4daff7e3e162e7 100644 (file)
@@ -188,11 +188,11 @@ scsi_cmd_free(ctlr_info_t *h, CommandList_struct *cmd)
 
        sa = h->scsi_ctlr;
        stk = &sa->cmd_stack; 
+       stk->top++;
        if (stk->top >= CMD_STACK_SIZE) {
                printk("cciss: scsi_cmd_free called too many times.\n");
                BUG();
        }
-       stk->top++;
        stk->elem[stk->top] = (struct cciss_scsi_cmd_stack_elem_t *) cmd;
 }
 
index e9654c8d5b6265f5f125c80185bd54b8034b697a..485ed8c7d623986b1aabbcd19ee50768f6c60c4c 100644 (file)
@@ -943,8 +943,7 @@ struct drbd_conf {
        struct drbd_work  resync_work,
                          unplug_work,
                          md_sync_work,
-                         delay_probe_work,
-                         uuid_work;
+                         delay_probe_work;
        struct timer_list resync_timer;
        struct timer_list md_sync_timer;
        struct timer_list delay_probe_timer;
@@ -1069,7 +1068,6 @@ struct drbd_conf {
        struct timeval dps_time; /* delay-probes-start-time */
        unsigned int dp_volume_last;  /* send_cnt of last delay probe */
        int c_sync_rate; /* current resync rate after delay_probe magic */
-       atomic_t new_c_uuid;
 };
 
 static inline struct drbd_conf *minor_to_mdev(unsigned int minor)
@@ -1476,7 +1474,6 @@ extern int w_e_end_ov_req(struct drbd_conf *, struct drbd_work *, int);
 extern int w_ov_finished(struct drbd_conf *, struct drbd_work *, int);
 extern int w_resync_inactive(struct drbd_conf *, struct drbd_work *, int);
 extern int w_resume_next_sg(struct drbd_conf *, struct drbd_work *, int);
-extern int w_io_error(struct drbd_conf *, struct drbd_work *, int);
 extern int w_send_write_hint(struct drbd_conf *, struct drbd_work *, int);
 extern int w_make_resync_request(struct drbd_conf *, struct drbd_work *, int);
 extern int w_send_dblock(struct drbd_conf *, struct drbd_work *, int);
@@ -1542,7 +1539,7 @@ static inline void drbd_tcp_nodelay(struct socket *sock)
 
 static inline void drbd_tcp_quickack(struct socket *sock)
 {
-       int __user val = 1;
+       int __user val = 2;
        (void) drbd_setsockopt(sock, SOL_TCP, TCP_QUICKACK,
                        (char __user *)&val, sizeof(val));
 }
@@ -1728,7 +1725,7 @@ static inline void __drbd_chk_io_error_(struct drbd_conf *mdev, int forcedetach,
        switch (mdev->ldev->dc.on_io_error) {
        case EP_PASS_ON:
                if (!forcedetach) {
-                       if (printk_ratelimit())
+                       if (__ratelimit(&drbd_ratelimit_state))
                                dev_err(DEV, "Local IO failed in %s."
                                             "Passing error on...\n", where);
                        break;
@@ -2219,8 +2216,6 @@ static inline int __inc_ap_bio_cond(struct drbd_conf *mdev)
                return 0;
        if (test_bit(BITMAP_IO, &mdev->flags))
                return 0;
-       if (atomic_read(&mdev->new_c_uuid))
-               return 0;
        return 1;
 }
 
@@ -2241,9 +2236,6 @@ static inline void inc_ap_bio(struct drbd_conf *mdev, int count)
         * to avoid races with the reconnect code,
         * we need to atomic_inc within the spinlock. */
 
-       if (atomic_read(&mdev->new_c_uuid) && atomic_add_unless(&mdev->new_c_uuid, -1, 1))
-               drbd_queue_work_front(&mdev->data.work, &mdev->uuid_work);
-
        spin_lock_irq(&mdev->req_lock);
        while (!__inc_ap_bio_cond(mdev)) {
                prepare_to_wait(&mdev->misc_wait, &wait, TASK_UNINTERRUPTIBLE);
index be2d2da9cdba41db2c09f8bea3b1d8df0474f24e..6b077f93acc620eaf40fa85599dbe83745779c28 100644 (file)
@@ -1215,18 +1215,17 @@ static void after_state_ch(struct drbd_conf *mdev, union drbd_state os,
             ns.pdsk == D_OUTDATED)) {
                if (get_ldev(mdev)) {
                        if ((ns.role == R_PRIMARY || ns.peer == R_PRIMARY) &&
-                           mdev->ldev->md.uuid[UI_BITMAP] == 0 && ns.disk >= D_UP_TO_DATE &&
-                           !atomic_read(&mdev->new_c_uuid))
-                               atomic_set(&mdev->new_c_uuid, 2);
+                           mdev->ldev->md.uuid[UI_BITMAP] == 0 && ns.disk >= D_UP_TO_DATE) {
+                               drbd_uuid_new_current(mdev);
+                               drbd_send_uuids(mdev);
+                       }
                        put_ldev(mdev);
                }
        }
 
        if (ns.pdsk < D_INCONSISTENT && get_ldev(mdev)) {
-               /* Diskless peer becomes primary or got connected do diskless, primary peer. */
-               if (ns.peer == R_PRIMARY && mdev->ldev->md.uuid[UI_BITMAP] == 0 &&
-                   !atomic_read(&mdev->new_c_uuid))
-                       atomic_set(&mdev->new_c_uuid, 2);
+               if (ns.peer == R_PRIMARY && mdev->ldev->md.uuid[UI_BITMAP] == 0)
+                       drbd_uuid_new_current(mdev);
 
                /* D_DISKLESS Peer becomes secondary */
                if (os.peer == R_PRIMARY && ns.peer == R_SECONDARY)
@@ -1350,24 +1349,6 @@ static void after_state_ch(struct drbd_conf *mdev, union drbd_state os,
        drbd_md_sync(mdev);
 }
 
-static int w_new_current_uuid(struct drbd_conf *mdev, struct drbd_work *w, int cancel)
-{
-       if (get_ldev(mdev)) {
-               if (mdev->ldev->md.uuid[UI_BITMAP] == 0) {
-                       drbd_uuid_new_current(mdev);
-                       if (get_net_conf(mdev)) {
-                               drbd_send_uuids(mdev);
-                               put_net_conf(mdev);
-                       }
-                       drbd_md_sync(mdev);
-               }
-               put_ldev(mdev);
-       }
-       atomic_dec(&mdev->new_c_uuid);
-       wake_up(&mdev->misc_wait);
-
-       return 1;
-}
 
 static int drbd_thread_setup(void *arg)
 {
@@ -2291,9 +2272,9 @@ static int we_should_drop_the_connection(struct drbd_conf *mdev, struct socket *
  * with page_count == 0 or PageSlab.
  */
 static int _drbd_no_send_page(struct drbd_conf *mdev, struct page *page,
-                  int offset, size_t size)
+                  int offset, size_t size, unsigned msg_flags)
 {
-       int sent = drbd_send(mdev, mdev->data.socket, kmap(page) + offset, size, 0);
+       int sent = drbd_send(mdev, mdev->data.socket, kmap(page) + offset, size, msg_flags);
        kunmap(page);
        if (sent == size)
                mdev->send_cnt += size>>9;
@@ -2301,7 +2282,7 @@ static int _drbd_no_send_page(struct drbd_conf *mdev, struct page *page,
 }
 
 static int _drbd_send_page(struct drbd_conf *mdev, struct page *page,
-                   int offset, size_t size)
+                   int offset, size_t size, unsigned msg_flags)
 {
        mm_segment_t oldfs = get_fs();
        int sent, ok;
@@ -2314,14 +2295,15 @@ static int _drbd_send_page(struct drbd_conf *mdev, struct page *page,
         * __page_cache_release a page that would actually still be referenced
         * by someone, leading to some obscure delayed Oops somewhere else. */
        if (disable_sendpage || (page_count(page) < 1) || PageSlab(page))
-               return _drbd_no_send_page(mdev, page, offset, size);
+               return _drbd_no_send_page(mdev, page, offset, size, msg_flags);
 
+       msg_flags |= MSG_NOSIGNAL;
        drbd_update_congested(mdev);
        set_fs(KERNEL_DS);
        do {
                sent = mdev->data.socket->ops->sendpage(mdev->data.socket, page,
                                                        offset, len,
-                                                       MSG_NOSIGNAL);
+                                                       msg_flags);
                if (sent == -EAGAIN) {
                        if (we_should_drop_the_connection(mdev,
                                                          mdev->data.socket))
@@ -2350,9 +2332,11 @@ static int _drbd_send_bio(struct drbd_conf *mdev, struct bio *bio)
 {
        struct bio_vec *bvec;
        int i;
+       /* hint all but last page with MSG_MORE */
        __bio_for_each_segment(bvec, bio, i, 0) {
                if (!_drbd_no_send_page(mdev, bvec->bv_page,
-                                    bvec->bv_offset, bvec->bv_len))
+                                    bvec->bv_offset, bvec->bv_len,
+                                    i == bio->bi_vcnt -1 ? 0 : MSG_MORE))
                        return 0;
        }
        return 1;
@@ -2362,12 +2346,13 @@ static int _drbd_send_zc_bio(struct drbd_conf *mdev, struct bio *bio)
 {
        struct bio_vec *bvec;
        int i;
+       /* hint all but last page with MSG_MORE */
        __bio_for_each_segment(bvec, bio, i, 0) {
                if (!_drbd_send_page(mdev, bvec->bv_page,
-                                    bvec->bv_offset, bvec->bv_len))
+                                    bvec->bv_offset, bvec->bv_len,
+                                    i == bio->bi_vcnt -1 ? 0 : MSG_MORE))
                        return 0;
        }
-
        return 1;
 }
 
@@ -2375,9 +2360,11 @@ static int _drbd_send_zc_ee(struct drbd_conf *mdev, struct drbd_epoch_entry *e)
 {
        struct page *page = e->pages;
        unsigned len = e->size;
+       /* hint all but last page with MSG_MORE */
        page_chain_for_each(page) {
                unsigned l = min_t(unsigned, len, PAGE_SIZE);
-               if (!_drbd_send_page(mdev, page, 0, l))
+               if (!_drbd_send_page(mdev, page, 0, l,
+                               page_chain_next(page) ? MSG_MORE : 0))
                        return 0;
                len -= l;
        }
@@ -2457,11 +2444,11 @@ int drbd_send_dblock(struct drbd_conf *mdev, struct drbd_request *req)
        p.dp_flags = cpu_to_be32(dp_flags);
        set_bit(UNPLUG_REMOTE, &mdev->flags);
        ok = (sizeof(p) ==
-               drbd_send(mdev, mdev->data.socket, &p, sizeof(p), MSG_MORE));
+               drbd_send(mdev, mdev->data.socket, &p, sizeof(p), dgs ? MSG_MORE : 0));
        if (ok && dgs) {
                dgb = mdev->int_dig_out;
                drbd_csum_bio(mdev, mdev->integrity_w_tfm, req->master_bio, dgb);
-               ok = drbd_send(mdev, mdev->data.socket, dgb, dgs, MSG_MORE);
+               ok = drbd_send(mdev, mdev->data.socket, dgb, dgs, 0);
        }
        if (ok) {
                if (mdev->net_conf->wire_protocol == DRBD_PROT_A)
@@ -2510,11 +2497,11 @@ int drbd_send_block(struct drbd_conf *mdev, enum drbd_packets cmd,
                return 0;
 
        ok = sizeof(p) == drbd_send(mdev, mdev->data.socket, &p,
-                                       sizeof(p), MSG_MORE);
+                                       sizeof(p), dgs ? MSG_MORE : 0);
        if (ok && dgs) {
                dgb = mdev->int_dig_out;
                drbd_csum_ee(mdev, mdev->integrity_w_tfm, e, dgb);
-               ok = drbd_send(mdev, mdev->data.socket, dgb, dgs, MSG_MORE);
+               ok = drbd_send(mdev, mdev->data.socket, dgb, dgs, 0);
        }
        if (ok)
                ok = _drbd_send_zc_ee(mdev, e);
@@ -2708,7 +2695,6 @@ void drbd_init_set_defaults(struct drbd_conf *mdev)
        atomic_set(&mdev->net_cnt, 0);
        atomic_set(&mdev->packet_seq, 0);
        atomic_set(&mdev->pp_in_use, 0);
-       atomic_set(&mdev->new_c_uuid, 0);
 
        mutex_init(&mdev->md_io_mutex);
        mutex_init(&mdev->data.mutex);
@@ -2739,14 +2725,12 @@ void drbd_init_set_defaults(struct drbd_conf *mdev)
        INIT_LIST_HEAD(&mdev->bm_io_work.w.list);
        INIT_LIST_HEAD(&mdev->delay_probes);
        INIT_LIST_HEAD(&mdev->delay_probe_work.list);
-       INIT_LIST_HEAD(&mdev->uuid_work.list);
 
        mdev->resync_work.cb  = w_resync_inactive;
        mdev->unplug_work.cb  = w_send_write_hint;
        mdev->md_sync_work.cb = w_md_sync;
        mdev->bm_io_work.w.cb = w_bitmap_io;
        mdev->delay_probe_work.cb = w_delay_probes;
-       mdev->uuid_work.cb = w_new_current_uuid;
        init_timer(&mdev->resync_timer);
        init_timer(&mdev->md_sync_timer);
        init_timer(&mdev->delay_probe_timer);
@@ -3799,7 +3783,7 @@ _drbd_insert_fault(struct drbd_conf *mdev, unsigned int type)
        if (ret) {
                fault_count++;
 
-               if (printk_ratelimit())
+               if (__ratelimit(&drbd_ratelimit_state))
                        dev_warn(DEV, "***Simulating %s failure\n",
                                _drbd_fault_str(type));
        }
index bc9ab7fb2cc7d6eaeda21fcfa07706cfe5a4c922..dff48701b84d8784f0f85a9202abbaaf16c522fc 100644 (file)
@@ -42,7 +42,6 @@
 #include <linux/unistd.h>
 #include <linux/vmalloc.h>
 #include <linux/random.h>
-#include <linux/mm.h>
 #include <linux/string.h>
 #include <linux/scatterlist.h>
 #include "drbd_int.h"
@@ -571,6 +570,25 @@ static int drbd_recv(struct drbd_conf *mdev, void *buf, size_t size)
        return rv;
 }
 
+/* quoting tcp(7):
+ *   On individual connections, the socket buffer size must be set prior to the
+ *   listen(2) or connect(2) calls in order to have it take effect.
+ * This is our wrapper to do so.
+ */
+static void drbd_setbufsize(struct socket *sock, unsigned int snd,
+               unsigned int rcv)
+{
+       /* open coded SO_SNDBUF, SO_RCVBUF */
+       if (snd) {
+               sock->sk->sk_sndbuf = snd;
+               sock->sk->sk_userlocks |= SOCK_SNDBUF_LOCK;
+       }
+       if (rcv) {
+               sock->sk->sk_rcvbuf = rcv;
+               sock->sk->sk_userlocks |= SOCK_RCVBUF_LOCK;
+       }
+}
+
 static struct socket *drbd_try_connect(struct drbd_conf *mdev)
 {
        const char *what;
@@ -592,6 +610,8 @@ static struct socket *drbd_try_connect(struct drbd_conf *mdev)
 
        sock->sk->sk_rcvtimeo =
        sock->sk->sk_sndtimeo =  mdev->net_conf->try_connect_int*HZ;
+       drbd_setbufsize(sock, mdev->net_conf->sndbuf_size,
+                       mdev->net_conf->rcvbuf_size);
 
        /* explicitly bind to the configured IP as source IP
        *  for the outgoing connections.
@@ -670,6 +690,8 @@ static struct socket *drbd_wait_for_connect(struct drbd_conf *mdev)
        s_listen->sk->sk_reuse    = 1; /* SO_REUSEADDR */
        s_listen->sk->sk_rcvtimeo = timeo;
        s_listen->sk->sk_sndtimeo = timeo;
+       drbd_setbufsize(s_listen, mdev->net_conf->sndbuf_size,
+                       mdev->net_conf->rcvbuf_size);
 
        what = "bind before listen";
        err = s_listen->ops->bind(s_listen,
@@ -856,16 +878,6 @@ retry:
        sock->sk->sk_priority = TC_PRIO_INTERACTIVE_BULK;
        msock->sk->sk_priority = TC_PRIO_INTERACTIVE;
 
-       if (mdev->net_conf->sndbuf_size) {
-               sock->sk->sk_sndbuf = mdev->net_conf->sndbuf_size;
-               sock->sk->sk_userlocks |= SOCK_SNDBUF_LOCK;
-       }
-
-       if (mdev->net_conf->rcvbuf_size) {
-               sock->sk->sk_rcvbuf = mdev->net_conf->rcvbuf_size;
-               sock->sk->sk_userlocks |= SOCK_RCVBUF_LOCK;
-       }
-
        /* NOT YET ...
         * sock->sk->sk_sndtimeo = mdev->net_conf->timeout*HZ/10;
         * sock->sk->sk_rcvtimeo = MAX_SCHEDULE_TIMEOUT;
@@ -1154,17 +1166,6 @@ int drbd_submit_ee(struct drbd_conf *mdev, struct drbd_epoch_entry *e,
        unsigned n_bios = 0;
        unsigned nr_pages = (ds + PAGE_SIZE -1) >> PAGE_SHIFT;
 
-       if (atomic_read(&mdev->new_c_uuid)) {
-               if (atomic_add_unless(&mdev->new_c_uuid, -1, 1)) {
-                       drbd_uuid_new_current(mdev);
-                       drbd_md_sync(mdev);
-
-                       atomic_dec(&mdev->new_c_uuid);
-                       wake_up(&mdev->misc_wait);
-               }
-               wait_event(mdev->misc_wait, !atomic_read(&mdev->new_c_uuid));
-       }
-
        /* In most cases, we will only need one bio.  But in case the lower
         * level restrictions happen to be different at this offset on this
         * side than those of the sending peer, we may need to submit the
index 3397f11d0ba915fd29ca9cd6f65717d2f6a83f10..654f1ef5cbb0fb6e21c25430e8e2cace1a84630f 100644 (file)
@@ -102,32 +102,7 @@ static void _req_is_done(struct drbd_conf *mdev, struct drbd_request *req, const
                }
        }
 
-       /* if it was a local io error, we want to notify our
-        * peer about that, and see if we need to
-        * detach the disk and stuff.
-        * to avoid allocating some special work
-        * struct, reuse the request. */
-
-       /* THINK
-        * why do we do this not when we detect the error,
-        * but delay it until it is "done", i.e. possibly
-        * until the next barrier ack? */
-
-       if (rw == WRITE &&
-           ((s & RQ_LOCAL_MASK) && !(s & RQ_LOCAL_OK))) {
-               if (!(req->w.list.next == LIST_POISON1 ||
-                     list_empty(&req->w.list))) {
-                       /* DEBUG ASSERT only; if this triggers, we
-                        * probably corrupt the worker list here */
-                       dev_err(DEV, "req->w.list.next = %p\n", req->w.list.next);
-                       dev_err(DEV, "req->w.list.prev = %p\n", req->w.list.prev);
-               }
-               req->w.cb = w_io_error;
-               drbd_queue_work(&mdev->data.work, &req->w);
-               /* drbd_req_free() is done in w_io_error */
-       } else {
-               drbd_req_free(req);
-       }
+       drbd_req_free(req);
 }
 
 static void queue_barrier(struct drbd_conf *mdev)
@@ -453,9 +428,6 @@ void __req_mod(struct drbd_request *req, enum drbd_req_event what,
                req->rq_state |= RQ_LOCAL_COMPLETED;
                req->rq_state &= ~RQ_LOCAL_PENDING;
 
-               dev_alert(DEV, "Local WRITE failed sec=%llus size=%u\n",
-                     (unsigned long long)req->sector, req->size);
-               /* and now: check how to handle local io error. */
                __drbd_chk_io_error(mdev, FALSE);
                _req_may_be_done(req, m);
                put_ldev(mdev);
@@ -475,22 +447,21 @@ void __req_mod(struct drbd_request *req, enum drbd_req_event what,
                req->rq_state |= RQ_LOCAL_COMPLETED;
                req->rq_state &= ~RQ_LOCAL_PENDING;
 
-               dev_alert(DEV, "Local READ failed sec=%llus size=%u\n",
-                     (unsigned long long)req->sector, req->size);
-               /* _req_mod(req,to_be_send); oops, recursion... */
                D_ASSERT(!(req->rq_state & RQ_NET_MASK));
-               req->rq_state |= RQ_NET_PENDING;
-               inc_ap_pending(mdev);
 
                __drbd_chk_io_error(mdev, FALSE);
                put_ldev(mdev);
-               /* NOTE: if we have no connection,
-                * or know the peer has no good data either,
-                * then we don't actually need to "queue_for_net_read",
-                * but we do so anyways, since the drbd_io_error()
-                * and the potential state change to "Diskless"
-                * needs to be done from process context */
 
+               /* no point in retrying if there is no good remote data,
+                * or we have no connection. */
+               if (mdev->state.pdsk != D_UP_TO_DATE) {
+                       _req_may_be_done(req, m);
+                       break;
+               }
+
+               /* _req_mod(req,to_be_send); oops, recursion... */
+               req->rq_state |= RQ_NET_PENDING;
+               inc_ap_pending(mdev);
                /* fall through: _req_mod(req,queue_for_net_read); */
 
        case queue_for_net_read:
@@ -600,6 +571,9 @@ void __req_mod(struct drbd_request *req, enum drbd_req_event what,
                _req_may_be_done(req, m);
                break;
 
+       case read_retry_remote_canceled:
+               req->rq_state &= ~RQ_NET_QUEUED;
+               /* fall through, in case we raced with drbd_disconnect */
        case connection_lost_while_pending:
                /* transfer log cleanup after connection loss */
                /* assert something? */
index 16119d7056cc65e1eae0e97245eaf7d28f78e884..02d575d245187b301e223cfc8ef5859990a637f6 100644 (file)
@@ -91,6 +91,7 @@ enum drbd_req_event {
        send_failed,
        handed_over_to_network,
        connection_lost_while_pending,
+       read_retry_remote_canceled,
        recv_acked_by_peer,
        write_acked_by_peer,
        write_acked_by_peer_and_sis, /* and set_in_sync */
index 727ff6339754776c389f717ca98276bbdd72714e..b623ceee2a4a6b06a42b9beef06d24f18b28bf71 100644 (file)
@@ -224,9 +224,6 @@ void drbd_endio_pri(struct bio *bio, int error)
        enum drbd_req_event what;
        int uptodate = bio_flagged(bio, BIO_UPTODATE);
 
-       if (error)
-               dev_warn(DEV, "p %s: error=%d\n",
-                        bio_data_dir(bio) == WRITE ? "write" : "read", error);
        if (!error && !uptodate) {
                dev_warn(DEV, "p %s: setting error to -EIO\n",
                         bio_data_dir(bio) == WRITE ? "write" : "read");
@@ -257,20 +254,6 @@ void drbd_endio_pri(struct bio *bio, int error)
                complete_master_bio(mdev, &m);
 }
 
-int w_io_error(struct drbd_conf *mdev, struct drbd_work *w, int cancel)
-{
-       struct drbd_request *req = container_of(w, struct drbd_request, w);
-
-       /* NOTE: mdev->ldev can be NULL by the time we get here! */
-       /* D_ASSERT(mdev->ldev->dc.on_io_error != EP_PASS_ON); */
-
-       /* the only way this callback is scheduled is from _req_may_be_done,
-        * when it is done and had a local write error, see comments there */
-       drbd_req_free(req);
-
-       return TRUE;
-}
-
 int w_read_retry_remote(struct drbd_conf *mdev, struct drbd_work *w, int cancel)
 {
        struct drbd_request *req = container_of(w, struct drbd_request, w);
@@ -280,12 +263,9 @@ int w_read_retry_remote(struct drbd_conf *mdev, struct drbd_work *w, int cancel)
         * to give the disk the chance to relocate that block */
 
        spin_lock_irq(&mdev->req_lock);
-       if (cancel ||
-           mdev->state.conn < C_CONNECTED ||
-           mdev->state.pdsk <= D_INCONSISTENT) {
-               _req_mod(req, send_canceled);
+       if (cancel || mdev->state.pdsk != D_UP_TO_DATE) {
+               _req_mod(req, read_retry_remote_canceled);
                spin_unlock_irq(&mdev->req_lock);
-               dev_alert(DEV, "WE ARE LOST. Local IO failure, no peer.\n");
                return 1;
        }
        spin_unlock_irq(&mdev->req_lock);
index f09fc0e2062dfdf9b0d2c4d816cd4fada77c4628..7cfcc629a7fd0f89bf56995652aff7d888379549 100644 (file)
@@ -1123,6 +1123,7 @@ source "drivers/s390/char/Kconfig"
 
 config RAMOOPS
        tristate "Log panic/oops to a RAM buffer"
+       depends on HAS_IOMEM
        default n
        help
          This enables panic and oops messages to be logged to a circular
index c4161d5e053d383c74d79905dfdb8d3fef27868e..e4089c432f15fea5964418cdf8d765e47f39bb50 100644 (file)
@@ -904,9 +904,7 @@ static void gsm_dlci_data_sweep(struct gsm_mux *gsm)
        int len;
        /* Priority ordering: We should do priority with RR of the groups */
        int i = 1;
-       unsigned long flags;
 
-       spin_lock_irqsave(&gsm->tx_lock, flags);
        while (i < NUM_DLCI) {
                struct gsm_dlci *dlci;
 
@@ -927,7 +925,6 @@ static void gsm_dlci_data_sweep(struct gsm_mux *gsm)
                if (len == 0)
                        i++;
        }
-       spin_unlock_irqrestore(&gsm->tx_lock, flags);
 }
 
 /**
@@ -2230,12 +2227,16 @@ static int gsmld_open(struct tty_struct *tty)
 static void gsmld_write_wakeup(struct tty_struct *tty)
 {
        struct gsm_mux *gsm = tty->disc_data;
+       unsigned long flags;
 
        /* Queue poll */
        clear_bit(TTY_DO_WRITE_WAKEUP, &tty->flags);
        gsm_data_kick(gsm);
-       if (gsm->tx_bytes < TX_THRESH_LO)
+       if (gsm->tx_bytes < TX_THRESH_LO) {
+               spin_lock_irqsave(&gsm->tx_lock, flags);
                gsm_dlci_data_sweep(gsm);
+               spin_unlock_irqrestore(&gsm->tx_lock, flags);
+       }
 }
 
 /**
index 7cdb6ee569cd7ca592bedfea458f0b676ec937af..1296c42ed5c627d876adf3bc75e4e1a665cc8a1d 100644 (file)
@@ -304,7 +304,7 @@ static void scrup(struct vc_data *vc, unsigned int t, unsigned int b, int nr)
        d = (unsigned short *)(vc->vc_origin + vc->vc_size_row * t);
        s = (unsigned short *)(vc->vc_origin + vc->vc_size_row * (t + nr));
        scr_memmovew(d, s, (b - t - nr) * vc->vc_size_row);
-       scr_memsetw(d + (b - t - nr) * vc->vc_cols, vc->vc_video_erase_char,
+       scr_memsetw(d + (b - t - nr) * vc->vc_size_row, vc->vc_video_erase_char,
                    vc->vc_size_row * nr);
 }
 
index 6aa10284104aeb6e4bc3a22833ea347e67c5d976..cb19dbc52136426d3b869c089a7153de2c719c7f 100644 (file)
@@ -1303,7 +1303,9 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
                if (!perm)
                        goto eperm;
                ret = copy_from_user(&ui, up, sizeof(struct unimapinit));
-               if (!ret)
+               if (ret)
+                       ret = -EFAULT;
+               else
                        con_clear_unimap(vc, &ui);
                break;
              }
index f6677cb197895e51bd1c2ddb1a1cdc886980aec5..f3d3898898ed9675786c76ff3d837d968517fa68 100644 (file)
@@ -412,18 +412,10 @@ static cycle_t sh_cmt_clocksource_read(struct clocksource *cs)
 static int sh_cmt_clocksource_enable(struct clocksource *cs)
 {
        struct sh_cmt_priv *p = cs_to_sh_cmt(cs);
-       int ret;
 
        p->total_cycles = 0;
 
-       ret = sh_cmt_start(p, FLAG_CLOCKSOURCE);
-       if (ret)
-               return ret;
-
-       /* TODO: calculate good shift from rate and counter bit width */
-       cs->shift = 0;
-       cs->mult = clocksource_hz2mult(p->rate, cs->shift);
-       return 0;
+       return sh_cmt_start(p, FLAG_CLOCKSOURCE);
 }
 
 static void sh_cmt_clocksource_disable(struct clocksource *cs)
@@ -450,8 +442,20 @@ static int sh_cmt_register_clocksource(struct sh_cmt_priv *p,
        cs->resume = sh_cmt_clocksource_resume;
        cs->mask = CLOCKSOURCE_MASK(sizeof(unsigned long) * 8);
        cs->flags = CLOCK_SOURCE_IS_CONTINUOUS;
+
+       /* clk_get_rate() needs an enabled clock */
+       clk_enable(p->clk);
+       p->rate = clk_get_rate(p->clk) / (p->width == 16) ? 512 : 8;
+       clk_disable(p->clk);
+
+       /* TODO: calculate good shift from rate and counter bit width */
+       cs->shift = 10;
+       cs->mult = clocksource_hz2mult(p->rate, cs->shift);
+
        dev_info(&p->pdev->dev, "used as clock source\n");
+
        clocksource_register(cs);
+
        return 0;
 }
 
index 8e44e14ec4c2dffdb214261edbcf4f2ea9fd60a3..de715901b82a28a09f8160dd1b62f17a25247a51 100644 (file)
@@ -199,16 +199,8 @@ static cycle_t sh_tmu_clocksource_read(struct clocksource *cs)
 static int sh_tmu_clocksource_enable(struct clocksource *cs)
 {
        struct sh_tmu_priv *p = cs_to_sh_tmu(cs);
-       int ret;
-
-       ret = sh_tmu_enable(p);
-       if (ret)
-               return ret;
 
-       /* TODO: calculate good shift from rate and counter bit width */
-       cs->shift = 10;
-       cs->mult = clocksource_hz2mult(p->rate, cs->shift);
-       return 0;
+       return sh_tmu_enable(p);
 }
 
 static void sh_tmu_clocksource_disable(struct clocksource *cs)
@@ -228,6 +220,16 @@ static int sh_tmu_register_clocksource(struct sh_tmu_priv *p,
        cs->disable = sh_tmu_clocksource_disable;
        cs->mask = CLOCKSOURCE_MASK(32);
        cs->flags = CLOCK_SOURCE_IS_CONTINUOUS;
+
+       /* clk_get_rate() needs an enabled clock */
+       clk_enable(p->clk);
+       /* channel will be configured at parent clock / 4 */
+       p->rate = clk_get_rate(p->clk) / 4;
+       clk_disable(p->clk);
+       /* TODO: calculate good shift from rate and counter bit width */
+       cs->shift = 10;
+       cs->mult = clocksource_hz2mult(p->rate, cs->shift);
+
        dev_info(&p->pdev->dev, "used as clock source\n");
        clocksource_register(cs);
        return 0;
index 55c9c59b3f713c0f29b211f89806f321fcffc879..aedef7941b22855f17c892f73d370ae10f17632c 100644 (file)
@@ -69,6 +69,9 @@ config EDAC_MM_EDAC
          occurred so that a particular failing memory module can be
          replaced.  If unsure, select 'Y'.
 
+config EDAC_MCE
+       bool
+
 config EDAC_AMD64
        tristate "AMD64 (Opteron, Athlon64) K8, F10h, F11h"
        depends on EDAC_MM_EDAC && K8_NB && X86_64 && PCI && EDAC_DECODE_MCE
@@ -166,6 +169,16 @@ config EDAC_I5400
          Support for error detection and correction the Intel
          i5400 MCH chipset (Seaburg).
 
+config EDAC_I7CORE
+       tristate "Intel i7 Core (Nehalem) processors"
+       depends on EDAC_MM_EDAC && PCI && X86
+       select EDAC_MCE
+       help
+         Support for error detection and correction the Intel
+         i7 Core (Nehalem) Integrated Memory Controller that exists on
+         newer processors like i7 Core, i7 Core Extreme, Xeon 35xx
+         and Xeon 55xx processors.
+
 config EDAC_I82860
        tristate "Intel 82860"
        depends on EDAC_MM_EDAC && PCI && X86_32
index bc5dc232a0fbf046b15a28ce069d232aa11fb2b2..ca6b1bb24ccc8e76109b13f38e1237eec98ec09e 100644 (file)
@@ -8,6 +8,7 @@
 
 obj-$(CONFIG_EDAC)                     := edac_stub.o
 obj-$(CONFIG_EDAC_MM_EDAC)             += edac_core.o
+obj-$(CONFIG_EDAC_MCE)                 += edac_mce.o
 
 edac_core-objs := edac_mc.o edac_device.o edac_mc_sysfs.o edac_pci_sysfs.o
 edac_core-objs += edac_module.o edac_device_sysfs.o
@@ -23,6 +24,7 @@ obj-$(CONFIG_EDAC_CPC925)             += cpc925_edac.o
 obj-$(CONFIG_EDAC_I5000)               += i5000_edac.o
 obj-$(CONFIG_EDAC_I5100)               += i5100_edac.o
 obj-$(CONFIG_EDAC_I5400)               += i5400_edac.o
+obj-$(CONFIG_EDAC_I7CORE)              += i7core_edac.o
 obj-$(CONFIG_EDAC_E7XXX)               += e7xxx_edac.o
 obj-$(CONFIG_EDAC_E752X)               += e752x_edac.o
 obj-$(CONFIG_EDAC_I82443BXGX)          += i82443bxgx_edac.o
index 001b2e797fb383a3c4f43f805a160d2bffc3b9d6..efca9343d26a7537df0c2a9a4a6eb546cc58cab3 100644 (file)
@@ -341,12 +341,30 @@ struct csrow_info {
        struct channel_info *channels;
 };
 
+struct mcidev_sysfs_group {
+       const char *name;                               /* group name */
+       struct mcidev_sysfs_attribute *mcidev_attr;     /* group attributes */
+};
+
+struct mcidev_sysfs_group_kobj {
+       struct list_head list;          /* list for all instances within a mc */
+
+       struct kobject kobj;            /* kobj for the group */
+
+       struct mcidev_sysfs_group *grp; /* group description table */
+       struct mem_ctl_info *mci;       /* the parent */
+};
+
 /* mcidev_sysfs_attribute structure
  *     used for driver sysfs attributes and in mem_ctl_info
  *     sysfs top level entries
  */
 struct mcidev_sysfs_attribute {
-        struct attribute attr;
+       /* It should use either attr or grp */
+       struct attribute attr;
+       struct mcidev_sysfs_group *grp; /* Points to a group of attributes */
+
+       /* Ops for show/store values at the attribute - not used on group */
         ssize_t (*show)(struct mem_ctl_info *,char *);
         ssize_t (*store)(struct mem_ctl_info *, const char *,size_t);
 };
@@ -424,6 +442,9 @@ struct mem_ctl_info {
        /* edac sysfs device control */
        struct kobject edac_mci_kobj;
 
+       /* list for all grp instances within a mc */
+       struct list_head grp_kobj_list;
+
        /* Additional top controller level attributes, but specified
         * by the low level driver.
         *
index 418b65f1a1da858c5b127c863ced032f773424e1..c200c2fd43ea48d7d6e1e466a0150fe9e443885e 100644 (file)
@@ -557,6 +557,8 @@ static ssize_t mcidev_show(struct kobject *kobj, struct attribute *attr,
        struct mem_ctl_info *mem_ctl_info = to_mci(kobj);
        struct mcidev_sysfs_attribute *mcidev_attr = to_mcidev_attr(attr);
 
+       debugf1("%s() mem_ctl_info %p\n", __func__, mem_ctl_info);
+
        if (mcidev_attr->show)
                return mcidev_attr->show(mem_ctl_info, buffer);
 
@@ -569,6 +571,8 @@ static ssize_t mcidev_store(struct kobject *kobj, struct attribute *attr,
        struct mem_ctl_info *mem_ctl_info = to_mci(kobj);
        struct mcidev_sysfs_attribute *mcidev_attr = to_mcidev_attr(attr);
 
+       debugf1("%s() mem_ctl_info %p\n", __func__, mem_ctl_info);
+
        if (mcidev_attr->store)
                return mcidev_attr->store(mem_ctl_info, buffer, count);
 
@@ -726,28 +730,118 @@ void edac_mc_unregister_sysfs_main_kobj(struct mem_ctl_info *mci)
 
 #define EDAC_DEVICE_SYMLINK    "device"
 
+#define grp_to_mci(k) (container_of(k, struct mcidev_sysfs_group_kobj, kobj)->mci)
+
+/* MCI show/store functions for top most object */
+static ssize_t inst_grp_show(struct kobject *kobj, struct attribute *attr,
+                       char *buffer)
+{
+       struct mem_ctl_info *mem_ctl_info = grp_to_mci(kobj);
+       struct mcidev_sysfs_attribute *mcidev_attr = to_mcidev_attr(attr);
+
+       debugf1("%s() mem_ctl_info %p\n", __func__, mem_ctl_info);
+
+       if (mcidev_attr->show)
+               return mcidev_attr->show(mem_ctl_info, buffer);
+
+       return -EIO;
+}
+
+static ssize_t inst_grp_store(struct kobject *kobj, struct attribute *attr,
+                       const char *buffer, size_t count)
+{
+       struct mem_ctl_info *mem_ctl_info = grp_to_mci(kobj);
+       struct mcidev_sysfs_attribute *mcidev_attr = to_mcidev_attr(attr);
+
+       debugf1("%s() mem_ctl_info %p\n", __func__, mem_ctl_info);
+
+       if (mcidev_attr->store)
+               return mcidev_attr->store(mem_ctl_info, buffer, count);
+
+       return -EIO;
+}
+
+/* No memory to release for this kobj */
+static void edac_inst_grp_release(struct kobject *kobj)
+{
+       struct mcidev_sysfs_group_kobj *grp;
+       struct mem_ctl_info *mci;
+
+       debugf1("%s()\n", __func__);
+
+       grp = container_of(kobj, struct mcidev_sysfs_group_kobj, kobj);
+       mci = grp->mci;
+
+       kobject_put(&mci->edac_mci_kobj);
+}
+
+/* Intermediate show/store table */
+static struct sysfs_ops inst_grp_ops = {
+       .show = inst_grp_show,
+       .store = inst_grp_store
+};
+
+/* the kobj_type instance for a instance group */
+static struct kobj_type ktype_inst_grp = {
+       .release = edac_inst_grp_release,
+       .sysfs_ops = &inst_grp_ops,
+};
+
+
 /*
  * edac_create_mci_instance_attributes
- *     create MC driver specific attributes at the topmost level
- *     directory of this mci instance.
+ *     create MC driver specific attributes bellow an specified kobj
+ * This routine calls itself recursively, in order to create an entire
+ * object tree.
  */
-static int edac_create_mci_instance_attributes(struct mem_ctl_info *mci)
+static int edac_create_mci_instance_attributes(struct mem_ctl_info *mci,
+                               struct mcidev_sysfs_attribute *sysfs_attrib,
+                               struct kobject *kobj)
 {
        int err;
-       struct mcidev_sysfs_attribute *sysfs_attrib;
 
-       /* point to the start of the array and iterate over it
-        * adding each attribute listed to this mci instance's kobject
-        */
-       sysfs_attrib = mci->mc_driver_sysfs_attributes;
+       debugf1("%s()\n", __func__);
+
+       while (sysfs_attrib) {
+               if (sysfs_attrib->grp) {
+                       struct mcidev_sysfs_group_kobj *grp_kobj;
+
+                       grp_kobj = kzalloc(sizeof(*grp_kobj), GFP_KERNEL);
+                       if (!grp_kobj)
+                               return -ENOMEM;
+
+                       list_add_tail(&grp_kobj->list, &mci->grp_kobj_list);
+
+                       grp_kobj->grp = sysfs_attrib->grp;
+                       grp_kobj->mci = mci;
+
+                       debugf0("%s() grp %s, mci %p\n", __func__,
+                               sysfs_attrib->grp->name, mci);
+
+                       err = kobject_init_and_add(&grp_kobj->kobj,
+                                               &ktype_inst_grp,
+                                               &mci->edac_mci_kobj,
+                                               sysfs_attrib->grp->name);
+                       if (err)
+                               return err;
+
+                       err = edac_create_mci_instance_attributes(mci,
+                                       grp_kobj->grp->mcidev_attr,
+                                       &grp_kobj->kobj);
+
+                       if (err)
+                               return err;
+               } else if (sysfs_attrib->attr.name) {
+                       debugf0("%s() file %s\n", __func__,
+                               sysfs_attrib->attr.name);
+
+                       err = sysfs_create_file(kobj, &sysfs_attrib->attr);
+               } else
+                       break;
 
-       while (sysfs_attrib && sysfs_attrib->attr.name) {
-               err = sysfs_create_file(&mci->edac_mci_kobj,
-                                       (struct attribute*) sysfs_attrib);
                if (err) {
                        return err;
                }
-
                sysfs_attrib++;
        }
 
@@ -759,21 +853,44 @@ static int edac_create_mci_instance_attributes(struct mem_ctl_info *mci)
  *     remove MC driver specific attributes at the topmost level
  *     directory of this mci instance.
  */
-static void edac_remove_mci_instance_attributes(struct mem_ctl_info *mci)
+static void edac_remove_mci_instance_attributes(struct mem_ctl_info *mci,
+                               struct mcidev_sysfs_attribute *sysfs_attrib,
+                               struct kobject *kobj, int count)
 {
-       struct mcidev_sysfs_attribute *sysfs_attrib;
+       struct mcidev_sysfs_group_kobj *grp_kobj, *tmp;
 
-       /* point to the start of the array and iterate over it
-        * adding each attribute listed to this mci instance's kobject
-        */
-       sysfs_attrib = mci->mc_driver_sysfs_attributes;
+       debugf1("%s()\n", __func__);
 
-       /* loop if there are attributes and until we hit a NULL entry */
-       while (sysfs_attrib && sysfs_attrib->attr.name) {
-               sysfs_remove_file(&mci->edac_mci_kobj,
-                                       (struct attribute *) sysfs_attrib);
+       /*
+        * loop if there are attributes and until we hit a NULL entry
+        * Remove first all the atributes
+        */
+       while (sysfs_attrib) {
+               if (sysfs_attrib->grp) {
+                       list_for_each_entry(grp_kobj, &mci->grp_kobj_list,
+                                           list)
+                               if (grp_kobj->grp == sysfs_attrib->grp)
+                                       edac_remove_mci_instance_attributes(mci,
+                                                   grp_kobj->grp->mcidev_attr,
+                                                   &grp_kobj->kobj, count + 1);
+               } else if (sysfs_attrib->attr.name) {
+                       debugf0("%s() file %s\n", __func__,
+                               sysfs_attrib->attr.name);
+                       sysfs_remove_file(kobj, &sysfs_attrib->attr);
+               } else
+                       break;
                sysfs_attrib++;
        }
+
+       /*
+        * Now that all attributes got removed, it is save to remove all groups
+        */
+       if (!count)
+               list_for_each_entry_safe(grp_kobj, tmp, &mci->grp_kobj_list,
+                                        list) {
+                       debugf0("%s() grp %s\n", __func__, grp_kobj->grp->name);
+                       kobject_put(&grp_kobj->kobj);
+               }
 }
 
 
@@ -794,6 +911,8 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
 
        debugf0("%s() idx=%d\n", __func__, mci->mc_idx);
 
+       INIT_LIST_HEAD(&mci->grp_kobj_list);
+
        /* create a symlink for the device */
        err = sysfs_create_link(kobj_mci, &mci->dev->kobj,
                                EDAC_DEVICE_SYMLINK);
@@ -806,7 +925,9 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
         * then create them now for the driver.
         */
        if (mci->mc_driver_sysfs_attributes) {
-               err = edac_create_mci_instance_attributes(mci);
+               err = edac_create_mci_instance_attributes(mci,
+                                       mci->mc_driver_sysfs_attributes,
+                                       &mci->edac_mci_kobj);
                if (err) {
                        debugf1("%s() failure to create mci attributes\n",
                                __func__);
@@ -841,7 +962,8 @@ fail1:
        }
 
        /* remove the mci instance's attributes, if any */
-       edac_remove_mci_instance_attributes(mci);
+       edac_remove_mci_instance_attributes(mci,
+               mci->mc_driver_sysfs_attributes, &mci->edac_mci_kobj, 0);
 
        /* remove the symlink */
        sysfs_remove_link(kobj_mci, EDAC_DEVICE_SYMLINK);
@@ -875,8 +997,9 @@ void edac_remove_sysfs_mci_device(struct mem_ctl_info *mci)
        debugf0("%s()  remove_mci_instance\n", __func__);
 
        /* remove this mci instance's attribtes */
-       edac_remove_mci_instance_attributes(mci);
-
+       edac_remove_mci_instance_attributes(mci,
+                                           mci->mc_driver_sysfs_attributes,
+                                           &mci->edac_mci_kobj, 0);
        debugf0("%s()  unregister this mci kobj\n", __func__);
 
        /* unregister this instance's kobject */
diff --git a/drivers/edac/edac_mce.c b/drivers/edac/edac_mce.c
new file mode 100644 (file)
index 0000000..9ccdc5b
--- /dev/null
@@ -0,0 +1,61 @@
+/* Provides edac interface to mcelog events
+ *
+ * This file may be distributed under the terms of the
+ * GNU General Public License version 2.
+ *
+ * Copyright (c) 2009 by:
+ *      Mauro Carvalho Chehab <mchehab@redhat.com>
+ *
+ * Red Hat Inc. http://www.redhat.com
+ */
+
+#include <linux/module.h>
+#include <linux/edac_mce.h>
+#include <asm/mce.h>
+
+int edac_mce_enabled;
+EXPORT_SYMBOL_GPL(edac_mce_enabled);
+
+
+/*
+ * Extension interface
+ */
+
+static LIST_HEAD(edac_mce_list);
+static DEFINE_MUTEX(edac_mce_lock);
+
+int edac_mce_register(struct edac_mce *edac_mce)
+{
+       mutex_lock(&edac_mce_lock);
+       list_add_tail(&edac_mce->list, &edac_mce_list);
+       mutex_unlock(&edac_mce_lock);
+       return 0;
+}
+EXPORT_SYMBOL(edac_mce_register);
+
+void edac_mce_unregister(struct edac_mce *edac_mce)
+{
+       mutex_lock(&edac_mce_lock);
+       list_del(&edac_mce->list);
+       mutex_unlock(&edac_mce_lock);
+}
+EXPORT_SYMBOL(edac_mce_unregister);
+
+int edac_mce_parse(struct mce *mce)
+{
+       struct edac_mce *edac_mce;
+
+       list_for_each_entry(edac_mce, &edac_mce_list, list) {
+               if (edac_mce->check_error(edac_mce->priv, mce))
+                       return 1;
+       }
+
+       /* Nobody queued the error */
+       return 0;
+}
+EXPORT_SYMBOL_GPL(edac_mce_parse);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Mauro Carvalho Chehab <mchehab@redhat.com>");
+MODULE_AUTHOR("Red Hat Inc. (http://www.redhat.com)");
+MODULE_DESCRIPTION("EDAC Driver for mcelog captured errors");
diff --git a/drivers/edac/i7core_edac.c b/drivers/edac/i7core_edac.c
new file mode 100644 (file)
index 0000000..6b8b7b4
--- /dev/null
@@ -0,0 +1,2078 @@
+/* Intel i7 core/Nehalem Memory Controller kernel module
+ *
+ * This driver supports yhe memory controllers found on the Intel
+ * processor families i7core, i7core 7xx/8xx, i5core, Xeon 35xx,
+ * Xeon 55xx and Xeon 56xx also known as Nehalem, Nehalem-EP, Lynnfield
+ * and Westmere-EP.
+ *
+ * This file may be distributed under the terms of the
+ * GNU General Public License version 2 only.
+ *
+ * Copyright (c) 2009-2010 by:
+ *      Mauro Carvalho Chehab <mchehab@redhat.com>
+ *
+ * Red Hat Inc. http://www.redhat.com
+ *
+ * Forked and adapted from the i5400_edac driver
+ *
+ * Based on the following public Intel datasheets:
+ * Intel Core i7 Processor Extreme Edition and Intel Core i7 Processor
+ * Datasheet, Volume 2:
+ *     http://download.intel.com/design/processor/datashts/320835.pdf
+ * Intel Xeon Processor 5500 Series Datasheet Volume 2
+ *     http://www.intel.com/Assets/PDF/datasheet/321322.pdf
+ * also available at:
+ *     http://www.arrownac.com/manufacturers/intel/s/nehalem/5500-datasheet-v2.pdf
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/pci.h>
+#include <linux/pci_ids.h>
+#include <linux/slab.h>
+#include <linux/delay.h>
+#include <linux/edac.h>
+#include <linux/mmzone.h>
+#include <linux/edac_mce.h>
+#include <linux/smp.h>
+#include <asm/processor.h>
+
+#include "edac_core.h"
+
+/*
+ * This is used for Nehalem-EP and Nehalem-EX devices, where the non-core
+ * registers start at bus 255, and are not reported by BIOS.
+ * We currently find devices with only 2 sockets. In order to support more QPI
+ * Quick Path Interconnect, just increment this number.
+ */
+#define MAX_SOCKET_BUSES       2
+
+
+/*
+ * Alter this version for the module when modifications are made
+ */
+#define I7CORE_REVISION    " Ver: 1.0.0 " __DATE__
+#define EDAC_MOD_STR      "i7core_edac"
+
+/*
+ * Debug macros
+ */
+#define i7core_printk(level, fmt, arg...)                      \
+       edac_printk(level, "i7core", fmt, ##arg)
+
+#define i7core_mc_printk(mci, level, fmt, arg...)              \
+       edac_mc_chipset_printk(mci, level, "i7core", fmt, ##arg)
+
+/*
+ * i7core Memory Controller Registers
+ */
+
+       /* OFFSETS for Device 0 Function 0 */
+
+#define MC_CFG_CONTROL 0x90
+
+       /* OFFSETS for Device 3 Function 0 */
+
+#define MC_CONTROL     0x48
+#define MC_STATUS      0x4c
+#define MC_MAX_DOD     0x64
+
+/*
+ * OFFSETS for Device 3 Function 4, as inicated on Xeon 5500 datasheet:
+ * http://www.arrownac.com/manufacturers/intel/s/nehalem/5500-datasheet-v2.pdf
+ */
+
+#define MC_TEST_ERR_RCV1       0x60
+  #define DIMM2_COR_ERR(r)                     ((r) & 0x7fff)
+
+#define MC_TEST_ERR_RCV0       0x64
+  #define DIMM1_COR_ERR(r)                     (((r) >> 16) & 0x7fff)
+  #define DIMM0_COR_ERR(r)                     ((r) & 0x7fff)
+
+/* OFFSETS for Device 3 Function 2, as inicated on Xeon 5500 datasheet */
+#define MC_COR_ECC_CNT_0       0x80
+#define MC_COR_ECC_CNT_1       0x84
+#define MC_COR_ECC_CNT_2       0x88
+#define MC_COR_ECC_CNT_3       0x8c
+#define MC_COR_ECC_CNT_4       0x90
+#define MC_COR_ECC_CNT_5       0x94
+
+#define DIMM_TOP_COR_ERR(r)                    (((r) >> 16) & 0x7fff)
+#define DIMM_BOT_COR_ERR(r)                    ((r) & 0x7fff)
+
+
+       /* OFFSETS for Devices 4,5 and 6 Function 0 */
+
+#define MC_CHANNEL_DIMM_INIT_PARAMS 0x58
+  #define THREE_DIMMS_PRESENT          (1 << 24)
+  #define SINGLE_QUAD_RANK_PRESENT     (1 << 23)
+  #define QUAD_RANK_PRESENT            (1 << 22)
+  #define REGISTERED_DIMM              (1 << 15)
+
+#define MC_CHANNEL_MAPPER      0x60
+  #define RDLCH(r, ch)         ((((r) >> (3 + (ch * 6))) & 0x07) - 1)
+  #define WRLCH(r, ch)         ((((r) >> (ch * 6)) & 0x07) - 1)
+
+#define MC_CHANNEL_RANK_PRESENT 0x7c
+  #define RANK_PRESENT_MASK            0xffff
+
+#define MC_CHANNEL_ADDR_MATCH  0xf0
+#define MC_CHANNEL_ERROR_MASK  0xf8
+#define MC_CHANNEL_ERROR_INJECT        0xfc
+  #define INJECT_ADDR_PARITY   0x10
+  #define INJECT_ECC           0x08
+  #define MASK_CACHELINE       0x06
+  #define MASK_FULL_CACHELINE  0x06
+  #define MASK_MSB32_CACHELINE 0x04
+  #define MASK_LSB32_CACHELINE 0x02
+  #define NO_MASK_CACHELINE    0x00
+  #define REPEAT_EN            0x01
+
+       /* OFFSETS for Devices 4,5 and 6 Function 1 */
+
+#define MC_DOD_CH_DIMM0                0x48
+#define MC_DOD_CH_DIMM1                0x4c
+#define MC_DOD_CH_DIMM2                0x50
+  #define RANKOFFSET_MASK      ((1 << 12) | (1 << 11) | (1 << 10))
+  #define RANKOFFSET(x)                ((x & RANKOFFSET_MASK) >> 10)
+  #define DIMM_PRESENT_MASK    (1 << 9)
+  #define DIMM_PRESENT(x)      (((x) & DIMM_PRESENT_MASK) >> 9)
+  #define MC_DOD_NUMBANK_MASK          ((1 << 8) | (1 << 7))
+  #define MC_DOD_NUMBANK(x)            (((x) & MC_DOD_NUMBANK_MASK) >> 7)
+  #define MC_DOD_NUMRANK_MASK          ((1 << 6) | (1 << 5))
+  #define MC_DOD_NUMRANK(x)            (((x) & MC_DOD_NUMRANK_MASK) >> 5)
+  #define MC_DOD_NUMROW_MASK           ((1 << 4) | (1 << 3) | (1 << 2))
+  #define MC_DOD_NUMROW(x)             (((x) & MC_DOD_NUMROW_MASK) >> 2)
+  #define MC_DOD_NUMCOL_MASK           3
+  #define MC_DOD_NUMCOL(x)             ((x) & MC_DOD_NUMCOL_MASK)
+
+#define MC_RANK_PRESENT                0x7c
+
+#define MC_SAG_CH_0    0x80
+#define MC_SAG_CH_1    0x84
+#define MC_SAG_CH_2    0x88
+#define MC_SAG_CH_3    0x8c
+#define MC_SAG_CH_4    0x90
+#define MC_SAG_CH_5    0x94
+#define MC_SAG_CH_6    0x98
+#define MC_SAG_CH_7    0x9c
+
+#define MC_RIR_LIMIT_CH_0      0x40
+#define MC_RIR_LIMIT_CH_1      0x44
+#define MC_RIR_LIMIT_CH_2      0x48
+#define MC_RIR_LIMIT_CH_3      0x4C
+#define MC_RIR_LIMIT_CH_4      0x50
+#define MC_RIR_LIMIT_CH_5      0x54
+#define MC_RIR_LIMIT_CH_6      0x58
+#define MC_RIR_LIMIT_CH_7      0x5C
+#define MC_RIR_LIMIT_MASK      ((1 << 10) - 1)
+
+#define MC_RIR_WAY_CH          0x80
+  #define MC_RIR_WAY_OFFSET_MASK       (((1 << 14) - 1) & ~0x7)
+  #define MC_RIR_WAY_RANK_MASK         0x7
+
+/*
+ * i7core structs
+ */
+
+#define NUM_CHANS 3
+#define MAX_DIMMS 3            /* Max DIMMS per channel */
+#define MAX_MCR_FUNC  4
+#define MAX_CHAN_FUNC 3
+
+struct i7core_info {
+       u32     mc_control;
+       u32     mc_status;
+       u32     max_dod;
+       u32     ch_map;
+};
+
+
+struct i7core_inject {
+       int     enable;
+
+       u32     section;
+       u32     type;
+       u32     eccmask;
+
+       /* Error address mask */
+       int channel, dimm, rank, bank, page, col;
+};
+
+struct i7core_channel {
+       u32             ranks;
+       u32             dimms;
+};
+
+struct pci_id_descr {
+       int                     dev;
+       int                     func;
+       int                     dev_id;
+       int                     optional;
+};
+
+struct pci_id_table {
+       struct pci_id_descr     *descr;
+       int                     n_devs;
+};
+
+struct i7core_dev {
+       struct list_head        list;
+       u8                      socket;
+       struct pci_dev          **pdev;
+       int                     n_devs;
+       struct mem_ctl_info     *mci;
+};
+
+struct i7core_pvt {
+       struct pci_dev  *pci_noncore;
+       struct pci_dev  *pci_mcr[MAX_MCR_FUNC + 1];
+       struct pci_dev  *pci_ch[NUM_CHANS][MAX_CHAN_FUNC + 1];
+
+       struct i7core_dev *i7core_dev;
+
+       struct i7core_info      info;
+       struct i7core_inject    inject;
+       struct i7core_channel   channel[NUM_CHANS];
+
+       int             channels; /* Number of active channels */
+
+       int             ce_count_available;
+       int             csrow_map[NUM_CHANS][MAX_DIMMS];
+
+                       /* ECC corrected errors counts per udimm */
+       unsigned long   udimm_ce_count[MAX_DIMMS];
+       int             udimm_last_ce_count[MAX_DIMMS];
+                       /* ECC corrected errors counts per rdimm */
+       unsigned long   rdimm_ce_count[NUM_CHANS][MAX_DIMMS];
+       int             rdimm_last_ce_count[NUM_CHANS][MAX_DIMMS];
+
+       unsigned int    is_registered;
+
+       /* mcelog glue */
+       struct edac_mce         edac_mce;
+
+       /* Fifo double buffers */
+       struct mce              mce_entry[MCE_LOG_LEN];
+       struct mce              mce_outentry[MCE_LOG_LEN];
+
+       /* Fifo in/out counters */
+       unsigned                mce_in, mce_out;
+
+       /* Count indicator to show errors not got */
+       unsigned                mce_overrun;
+};
+
+/* Static vars */
+static LIST_HEAD(i7core_edac_list);
+static DEFINE_MUTEX(i7core_edac_lock);
+
+#define PCI_DESCR(device, function, device_id) \
+       .dev = (device),                        \
+       .func = (function),                     \
+       .dev_id = (device_id)
+
+struct pci_id_descr pci_dev_descr_i7core_nehalem[] = {
+               /* Memory controller */
+       { PCI_DESCR(3, 0, PCI_DEVICE_ID_INTEL_I7_MCR)     },
+       { PCI_DESCR(3, 1, PCI_DEVICE_ID_INTEL_I7_MC_TAD)  },
+                       /* Exists only for RDIMM */
+       { PCI_DESCR(3, 2, PCI_DEVICE_ID_INTEL_I7_MC_RAS), .optional = 1  },
+       { PCI_DESCR(3, 4, PCI_DEVICE_ID_INTEL_I7_MC_TEST) },
+
+               /* Channel 0 */
+       { PCI_DESCR(4, 0, PCI_DEVICE_ID_INTEL_I7_MC_CH0_CTRL) },
+       { PCI_DESCR(4, 1, PCI_DEVICE_ID_INTEL_I7_MC_CH0_ADDR) },
+       { PCI_DESCR(4, 2, PCI_DEVICE_ID_INTEL_I7_MC_CH0_RANK) },
+       { PCI_DESCR(4, 3, PCI_DEVICE_ID_INTEL_I7_MC_CH0_TC)   },
+
+               /* Channel 1 */
+       { PCI_DESCR(5, 0, PCI_DEVICE_ID_INTEL_I7_MC_CH1_CTRL) },
+       { PCI_DESCR(5, 1, PCI_DEVICE_ID_INTEL_I7_MC_CH1_ADDR) },
+       { PCI_DESCR(5, 2, PCI_DEVICE_ID_INTEL_I7_MC_CH1_RANK) },
+       { PCI_DESCR(5, 3, PCI_DEVICE_ID_INTEL_I7_MC_CH1_TC)   },
+
+               /* Channel 2 */
+       { PCI_DESCR(6, 0, PCI_DEVICE_ID_INTEL_I7_MC_CH2_CTRL) },
+       { PCI_DESCR(6, 1, PCI_DEVICE_ID_INTEL_I7_MC_CH2_ADDR) },
+       { PCI_DESCR(6, 2, PCI_DEVICE_ID_INTEL_I7_MC_CH2_RANK) },
+       { PCI_DESCR(6, 3, PCI_DEVICE_ID_INTEL_I7_MC_CH2_TC)   },
+
+               /* Generic Non-core registers */
+       /*
+        * This is the PCI device on i7core and on Xeon 35xx (8086:2c41)
+        * On Xeon 55xx, however, it has a different id (8086:2c40). So,
+        * the probing code needs to test for the other address in case of
+        * failure of this one
+        */
+       { PCI_DESCR(0, 0, PCI_DEVICE_ID_INTEL_I7_NONCORE)  },
+
+};
+
+struct pci_id_descr pci_dev_descr_lynnfield[] = {
+       { PCI_DESCR( 3, 0, PCI_DEVICE_ID_INTEL_LYNNFIELD_MCR)         },
+       { PCI_DESCR( 3, 1, PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_TAD)      },
+       { PCI_DESCR( 3, 4, PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_TEST)     },
+
+       { PCI_DESCR( 4, 0, PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_CH0_CTRL) },
+       { PCI_DESCR( 4, 1, PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_CH0_ADDR) },
+       { PCI_DESCR( 4, 2, PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_CH0_RANK) },
+       { PCI_DESCR( 4, 3, PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_CH0_TC)   },
+
+       { PCI_DESCR( 5, 0, PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_CH1_CTRL) },
+       { PCI_DESCR( 5, 1, PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_CH1_ADDR) },
+       { PCI_DESCR( 5, 2, PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_CH1_RANK) },
+       { PCI_DESCR( 5, 3, PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_CH1_TC)   },
+
+       /*
+        * This is the PCI device has an alternate address on some
+        * processors like Core i7 860
+        */
+       { PCI_DESCR( 0, 0, PCI_DEVICE_ID_INTEL_LYNNFIELD_NONCORE)     },
+};
+
+struct pci_id_descr pci_dev_descr_i7core_westmere[] = {
+               /* Memory controller */
+       { PCI_DESCR(3, 0, PCI_DEVICE_ID_INTEL_LYNNFIELD_MCR_REV2)     },
+       { PCI_DESCR(3, 1, PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_TAD_REV2)  },
+                       /* Exists only for RDIMM */
+       { PCI_DESCR(3, 2, PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_RAS_REV2), .optional = 1  },
+       { PCI_DESCR(3, 4, PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_TEST_REV2) },
+
+               /* Channel 0 */
+       { PCI_DESCR(4, 0, PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_CH0_CTRL_REV2) },
+       { PCI_DESCR(4, 1, PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_CH0_ADDR_REV2) },
+       { PCI_DESCR(4, 2, PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_CH0_RANK_REV2) },
+       { PCI_DESCR(4, 3, PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_CH0_TC_REV2)   },
+
+               /* Channel 1 */
+       { PCI_DESCR(5, 0, PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_CH1_CTRL_REV2) },
+       { PCI_DESCR(5, 1, PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_CH1_ADDR_REV2) },
+       { PCI_DESCR(5, 2, PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_CH1_RANK_REV2) },
+       { PCI_DESCR(5, 3, PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_CH1_TC_REV2)   },
+
+               /* Channel 2 */
+       { PCI_DESCR(6, 0, PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_CH2_CTRL_REV2) },
+       { PCI_DESCR(6, 1, PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_CH2_ADDR_REV2) },
+       { PCI_DESCR(6, 2, PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_CH2_RANK_REV2) },
+       { PCI_DESCR(6, 3, PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_CH2_TC_REV2)   },
+
+               /* Generic Non-core registers */
+       { PCI_DESCR(0, 0, PCI_DEVICE_ID_INTEL_LYNNFIELD_NONCORE_REV2)  },
+
+};
+
+#define PCI_ID_TABLE_ENTRY(A) { A, ARRAY_SIZE(A) }
+struct pci_id_table pci_dev_table[] = {
+       PCI_ID_TABLE_ENTRY(pci_dev_descr_i7core_nehalem),
+       PCI_ID_TABLE_ENTRY(pci_dev_descr_lynnfield),
+       PCI_ID_TABLE_ENTRY(pci_dev_descr_i7core_westmere),
+};
+
+/*
+ *     pci_device_id   table for which devices we are looking for
+ */
+static const struct pci_device_id i7core_pci_tbl[] __devinitdata = {
+       {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_X58_HUB_MGMT)},
+       {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_LYNNFIELD_QPI_LINK0)},
+       {0,}                    /* 0 terminated list. */
+};
+
+static struct edac_pci_ctl_info *i7core_pci;
+
+/****************************************************************************
+                       Anciliary status routines
+ ****************************************************************************/
+
+       /* MC_CONTROL bits */
+#define CH_ACTIVE(pvt, ch)     ((pvt)->info.mc_control & (1 << (8 + ch)))
+#define ECCx8(pvt)             ((pvt)->info.mc_control & (1 << 1))
+
+       /* MC_STATUS bits */
+#define ECC_ENABLED(pvt)       ((pvt)->info.mc_status & (1 << 4))
+#define CH_DISABLED(pvt, ch)   ((pvt)->info.mc_status & (1 << ch))
+
+       /* MC_MAX_DOD read functions */
+static inline int numdimms(u32 dimms)
+{
+       return (dimms & 0x3) + 1;
+}
+
+static inline int numrank(u32 rank)
+{
+       static int ranks[4] = { 1, 2, 4, -EINVAL };
+
+       return ranks[rank & 0x3];
+}
+
+static inline int numbank(u32 bank)
+{
+       static int banks[4] = { 4, 8, 16, -EINVAL };
+
+       return banks[bank & 0x3];
+}
+
+static inline int numrow(u32 row)
+{
+       static int rows[8] = {
+               1 << 12, 1 << 13, 1 << 14, 1 << 15,
+               1 << 16, -EINVAL, -EINVAL, -EINVAL,
+       };
+
+       return rows[row & 0x7];
+}
+
+static inline int numcol(u32 col)
+{
+       static int cols[8] = {
+               1 << 10, 1 << 11, 1 << 12, -EINVAL,
+       };
+       return cols[col & 0x3];
+}
+
+static struct i7core_dev *get_i7core_dev(u8 socket)
+{
+       struct i7core_dev *i7core_dev;
+
+       list_for_each_entry(i7core_dev, &i7core_edac_list, list) {
+               if (i7core_dev->socket == socket)
+                       return i7core_dev;
+       }
+
+       return NULL;
+}
+
+/****************************************************************************
+                       Memory check routines
+ ****************************************************************************/
+static struct pci_dev *get_pdev_slot_func(u8 socket, unsigned slot,
+                                         unsigned func)
+{
+       struct i7core_dev *i7core_dev = get_i7core_dev(socket);
+       int i;
+
+       if (!i7core_dev)
+               return NULL;
+
+       for (i = 0; i < i7core_dev->n_devs; i++) {
+               if (!i7core_dev->pdev[i])
+                       continue;
+
+               if (PCI_SLOT(i7core_dev->pdev[i]->devfn) == slot &&
+                   PCI_FUNC(i7core_dev->pdev[i]->devfn) == func) {
+                       return i7core_dev->pdev[i];
+               }
+       }
+
+       return NULL;
+}
+
+/**
+ * i7core_get_active_channels() - gets the number of channels and csrows
+ * @socket:    Quick Path Interconnect socket
+ * @channels:  Number of channels that will be returned
+ * @csrows:    Number of csrows found
+ *
+ * Since EDAC core needs to know in advance the number of available channels
+ * and csrows, in order to allocate memory for csrows/channels, it is needed
+ * to run two similar steps. At the first step, implemented on this function,
+ * it checks the number of csrows/channels present at one socket.
+ * this is used in order to properly allocate the size of mci components.
+ *
+ * It should be noticed that none of the current available datasheets explain
+ * or even mention how csrows are seen by the memory controller. So, we need
+ * to add a fake description for csrows.
+ * So, this driver is attributing one DIMM memory for one csrow.
+ */
+static int i7core_get_active_channels(u8 socket, unsigned *channels,
+                                     unsigned *csrows)
+{
+       struct pci_dev *pdev = NULL;
+       int i, j;
+       u32 status, control;
+
+       *channels = 0;
+       *csrows = 0;
+
+       pdev = get_pdev_slot_func(socket, 3, 0);
+       if (!pdev) {
+               i7core_printk(KERN_ERR, "Couldn't find socket %d fn 3.0!!!\n",
+                             socket);
+               return -ENODEV;
+       }
+
+       /* Device 3 function 0 reads */
+       pci_read_config_dword(pdev, MC_STATUS, &status);
+       pci_read_config_dword(pdev, MC_CONTROL, &control);
+
+       for (i = 0; i < NUM_CHANS; i++) {
+               u32 dimm_dod[3];
+               /* Check if the channel is active */
+               if (!(control & (1 << (8 + i))))
+                       continue;
+
+               /* Check if the channel is disabled */
+               if (status & (1 << i))
+                       continue;
+
+               pdev = get_pdev_slot_func(socket, i + 4, 1);
+               if (!pdev) {
+                       i7core_printk(KERN_ERR, "Couldn't find socket %d "
+                                               "fn %d.%d!!!\n",
+                                               socket, i + 4, 1);
+                       return -ENODEV;
+               }
+               /* Devices 4-6 function 1 */
+               pci_read_config_dword(pdev,
+                               MC_DOD_CH_DIMM0, &dimm_dod[0]);
+               pci_read_config_dword(pdev,
+                               MC_DOD_CH_DIMM1, &dimm_dod[1]);
+               pci_read_config_dword(pdev,
+                               MC_DOD_CH_DIMM2, &dimm_dod[2]);
+
+               (*channels)++;
+
+               for (j = 0; j < 3; j++) {
+                       if (!DIMM_PRESENT(dimm_dod[j]))
+                               continue;
+                       (*csrows)++;
+               }
+       }
+
+       debugf0("Number of active channels on socket %d: %d\n",
+               socket, *channels);
+
+       return 0;
+}
+
+static int get_dimm_config(struct mem_ctl_info *mci, int *csrow)
+{
+       struct i7core_pvt *pvt = mci->pvt_info;
+       struct csrow_info *csr;
+       struct pci_dev *pdev;
+       int i, j;
+       unsigned long last_page = 0;
+       enum edac_type mode;
+       enum mem_type mtype;
+
+       /* Get data from the MC register, function 0 */
+       pdev = pvt->pci_mcr[0];
+       if (!pdev)
+               return -ENODEV;
+
+       /* Device 3 function 0 reads */
+       pci_read_config_dword(pdev, MC_CONTROL, &pvt->info.mc_control);
+       pci_read_config_dword(pdev, MC_STATUS, &pvt->info.mc_status);
+       pci_read_config_dword(pdev, MC_MAX_DOD, &pvt->info.max_dod);
+       pci_read_config_dword(pdev, MC_CHANNEL_MAPPER, &pvt->info.ch_map);
+
+       debugf0("QPI %d control=0x%08x status=0x%08x dod=0x%08x map=0x%08x\n",
+               pvt->i7core_dev->socket, pvt->info.mc_control, pvt->info.mc_status,
+               pvt->info.max_dod, pvt->info.ch_map);
+
+       if (ECC_ENABLED(pvt)) {
+               debugf0("ECC enabled with x%d SDCC\n", ECCx8(pvt) ? 8 : 4);
+               if (ECCx8(pvt))
+                       mode = EDAC_S8ECD8ED;
+               else
+                       mode = EDAC_S4ECD4ED;
+       } else {
+               debugf0("ECC disabled\n");
+               mode = EDAC_NONE;
+       }
+
+       /* FIXME: need to handle the error codes */
+       debugf0("DOD Max limits: DIMMS: %d, %d-ranked, %d-banked "
+               "x%x x 0x%x\n",
+               numdimms(pvt->info.max_dod),
+               numrank(pvt->info.max_dod >> 2),
+               numbank(pvt->info.max_dod >> 4),
+               numrow(pvt->info.max_dod >> 6),
+               numcol(pvt->info.max_dod >> 9));
+
+       for (i = 0; i < NUM_CHANS; i++) {
+               u32 data, dimm_dod[3], value[8];
+
+               if (!pvt->pci_ch[i][0])
+                       continue;
+
+               if (!CH_ACTIVE(pvt, i)) {
+                       debugf0("Channel %i is not active\n", i);
+                       continue;
+               }
+               if (CH_DISABLED(pvt, i)) {
+                       debugf0("Channel %i is disabled\n", i);
+                       continue;
+               }
+
+               /* Devices 4-6 function 0 */
+               pci_read_config_dword(pvt->pci_ch[i][0],
+                               MC_CHANNEL_DIMM_INIT_PARAMS, &data);
+
+               pvt->channel[i].ranks = (data & QUAD_RANK_PRESENT) ?
+                                               4 : 2;
+
+               if (data & REGISTERED_DIMM)
+                       mtype = MEM_RDDR3;
+               else
+                       mtype = MEM_DDR3;
+#if 0
+               if (data & THREE_DIMMS_PRESENT)
+                       pvt->channel[i].dimms = 3;
+               else if (data & SINGLE_QUAD_RANK_PRESENT)
+                       pvt->channel[i].dimms = 1;
+               else
+                       pvt->channel[i].dimms = 2;
+#endif
+
+               /* Devices 4-6 function 1 */
+               pci_read_config_dword(pvt->pci_ch[i][1],
+                               MC_DOD_CH_DIMM0, &dimm_dod[0]);
+               pci_read_config_dword(pvt->pci_ch[i][1],
+                               MC_DOD_CH_DIMM1, &dimm_dod[1]);
+               pci_read_config_dword(pvt->pci_ch[i][1],
+                               MC_DOD_CH_DIMM2, &dimm_dod[2]);
+
+               debugf0("Ch%d phy rd%d, wr%d (0x%08x): "
+                       "%d ranks, %cDIMMs\n",
+                       i,
+                       RDLCH(pvt->info.ch_map, i), WRLCH(pvt->info.ch_map, i),
+                       data,
+                       pvt->channel[i].ranks,
+                       (data & REGISTERED_DIMM) ? 'R' : 'U');
+
+               for (j = 0; j < 3; j++) {
+                       u32 banks, ranks, rows, cols;
+                       u32 size, npages;
+
+                       if (!DIMM_PRESENT(dimm_dod[j]))
+                               continue;
+
+                       banks = numbank(MC_DOD_NUMBANK(dimm_dod[j]));
+                       ranks = numrank(MC_DOD_NUMRANK(dimm_dod[j]));
+                       rows = numrow(MC_DOD_NUMROW(dimm_dod[j]));
+                       cols = numcol(MC_DOD_NUMCOL(dimm_dod[j]));
+
+                       /* DDR3 has 8 I/O banks */
+                       size = (rows * cols * banks * ranks) >> (20 - 3);
+
+                       pvt->channel[i].dimms++;
+
+                       debugf0("\tdimm %d %d Mb offset: %x, "
+                               "bank: %d, rank: %d, row: %#x, col: %#x\n",
+                               j, size,
+                               RANKOFFSET(dimm_dod[j]),
+                               banks, ranks, rows, cols);
+
+#if PAGE_SHIFT > 20
+                       npages = size >> (PAGE_SHIFT - 20);
+#else
+                       npages = size << (20 - PAGE_SHIFT);
+#endif
+
+                       csr = &mci->csrows[*csrow];
+                       csr->first_page = last_page + 1;
+                       last_page += npages;
+                       csr->last_page = last_page;
+                       csr->nr_pages = npages;
+
+                       csr->page_mask = 0;
+                       csr->grain = 8;
+                       csr->csrow_idx = *csrow;
+                       csr->nr_channels = 1;
+
+                       csr->channels[0].chan_idx = i;
+                       csr->channels[0].ce_count = 0;
+
+                       pvt->csrow_map[i][j] = *csrow;
+
+                       switch (banks) {
+                       case 4:
+                               csr->dtype = DEV_X4;
+                               break;
+                       case 8:
+                               csr->dtype = DEV_X8;
+                               break;
+                       case 16:
+                               csr->dtype = DEV_X16;
+                               break;
+                       default:
+                               csr->dtype = DEV_UNKNOWN;
+                       }
+
+                       csr->edac_mode = mode;
+                       csr->mtype = mtype;
+
+                       (*csrow)++;
+               }
+
+               pci_read_config_dword(pdev, MC_SAG_CH_0, &value[0]);
+               pci_read_config_dword(pdev, MC_SAG_CH_1, &value[1]);
+               pci_read_config_dword(pdev, MC_SAG_CH_2, &value[2]);
+               pci_read_config_dword(pdev, MC_SAG_CH_3, &value[3]);
+               pci_read_config_dword(pdev, MC_SAG_CH_4, &value[4]);
+               pci_read_config_dword(pdev, MC_SAG_CH_5, &value[5]);
+               pci_read_config_dword(pdev, MC_SAG_CH_6, &value[6]);
+               pci_read_config_dword(pdev, MC_SAG_CH_7, &value[7]);
+               debugf1("\t[%i] DIVBY3\tREMOVED\tOFFSET\n", i);
+               for (j = 0; j < 8; j++)
+                       debugf1("\t\t%#x\t%#x\t%#x\n",
+                               (value[j] >> 27) & 0x1,
+                               (value[j] >> 24) & 0x7,
+                               (value[j] && ((1 << 24) - 1)));
+       }
+
+       return 0;
+}
+
+/****************************************************************************
+                       Error insertion routines
+ ****************************************************************************/
+
+/* The i7core has independent error injection features per channel.
+   However, to have a simpler code, we don't allow enabling error injection
+   on more than one channel.
+   Also, since a change at an inject parameter will be applied only at enable,
+   we're disabling error injection on all write calls to the sysfs nodes that
+   controls the error code injection.
+ */
+static int disable_inject(struct mem_ctl_info *mci)
+{
+       struct i7core_pvt *pvt = mci->pvt_info;
+
+       pvt->inject.enable = 0;
+
+       if (!pvt->pci_ch[pvt->inject.channel][0])
+               return -ENODEV;
+
+       pci_write_config_dword(pvt->pci_ch[pvt->inject.channel][0],
+                               MC_CHANNEL_ERROR_INJECT, 0);
+
+       return 0;
+}
+
+/*
+ * i7core inject inject.section
+ *
+ *     accept and store error injection inject.section value
+ *     bit 0 - refers to the lower 32-byte half cacheline
+ *     bit 1 - refers to the upper 32-byte half cacheline
+ */
+static ssize_t i7core_inject_section_store(struct mem_ctl_info *mci,
+                                          const char *data, size_t count)
+{
+       struct i7core_pvt *pvt = mci->pvt_info;
+       unsigned long value;
+       int rc;
+
+       if (pvt->inject.enable)
+               disable_inject(mci);
+
+       rc = strict_strtoul(data, 10, &value);
+       if ((rc < 0) || (value > 3))
+               return -EIO;
+
+       pvt->inject.section = (u32) value;
+       return count;
+}
+
+static ssize_t i7core_inject_section_show(struct mem_ctl_info *mci,
+                                             char *data)
+{
+       struct i7core_pvt *pvt = mci->pvt_info;
+       return sprintf(data, "0x%08x\n", pvt->inject.section);
+}
+
+/*
+ * i7core inject.type
+ *
+ *     accept and store error injection inject.section value
+ *     bit 0 - repeat enable - Enable error repetition
+ *     bit 1 - inject ECC error
+ *     bit 2 - inject parity error
+ */
+static ssize_t i7core_inject_type_store(struct mem_ctl_info *mci,
+                                       const char *data, size_t count)
+{
+       struct i7core_pvt *pvt = mci->pvt_info;
+       unsigned long value;
+       int rc;
+
+       if (pvt->inject.enable)
+               disable_inject(mci);
+
+       rc = strict_strtoul(data, 10, &value);
+       if ((rc < 0) || (value > 7))
+               return -EIO;
+
+       pvt->inject.type = (u32) value;
+       return count;
+}
+
+static ssize_t i7core_inject_type_show(struct mem_ctl_info *mci,
+                                             char *data)
+{
+       struct i7core_pvt *pvt = mci->pvt_info;
+       return sprintf(data, "0x%08x\n", pvt->inject.type);
+}
+
+/*
+ * i7core_inject_inject.eccmask_store
+ *
+ * The type of error (UE/CE) will depend on the inject.eccmask value:
+ *   Any bits set to a 1 will flip the corresponding ECC bit
+ *   Correctable errors can be injected by flipping 1 bit or the bits within
+ *   a symbol pair (2 consecutive aligned 8-bit pairs - i.e. 7:0 and 15:8 or
+ *   23:16 and 31:24). Flipping bits in two symbol pairs will cause an
+ *   uncorrectable error to be injected.
+ */
+static ssize_t i7core_inject_eccmask_store(struct mem_ctl_info *mci,
+                                       const char *data, size_t count)
+{
+       struct i7core_pvt *pvt = mci->pvt_info;
+       unsigned long value;
+       int rc;
+
+       if (pvt->inject.enable)
+               disable_inject(mci);
+
+       rc = strict_strtoul(data, 10, &value);
+       if (rc < 0)
+               return -EIO;
+
+       pvt->inject.eccmask = (u32) value;
+       return count;
+}
+
+static ssize_t i7core_inject_eccmask_show(struct mem_ctl_info *mci,
+                                             char *data)
+{
+       struct i7core_pvt *pvt = mci->pvt_info;
+       return sprintf(data, "0x%08x\n", pvt->inject.eccmask);
+}
+
+/*
+ * i7core_addrmatch
+ *
+ * The type of error (UE/CE) will depend on the inject.eccmask value:
+ *   Any bits set to a 1 will flip the corresponding ECC bit
+ *   Correctable errors can be injected by flipping 1 bit or the bits within
+ *   a symbol pair (2 consecutive aligned 8-bit pairs - i.e. 7:0 and 15:8 or
+ *   23:16 and 31:24). Flipping bits in two symbol pairs will cause an
+ *   uncorrectable error to be injected.
+ */
+
+#define DECLARE_ADDR_MATCH(param, limit)                       \
+static ssize_t i7core_inject_store_##param(                    \
+               struct mem_ctl_info *mci,                       \
+               const char *data, size_t count)                 \
+{                                                              \
+       struct i7core_pvt *pvt;                                 \
+       long value;                                             \
+       int rc;                                                 \
+                                                               \
+       debugf1("%s()\n", __func__);                            \
+       pvt = mci->pvt_info;                                    \
+                                                               \
+       if (pvt->inject.enable)                                 \
+               disable_inject(mci);                            \
+                                                               \
+       if (!strcasecmp(data, "any") || !strcasecmp(data, "any\n"))\
+               value = -1;                                     \
+       else {                                                  \
+               rc = strict_strtoul(data, 10, &value);          \
+               if ((rc < 0) || (value >= limit))               \
+                       return -EIO;                            \
+       }                                                       \
+                                                               \
+       pvt->inject.param = value;                              \
+                                                               \
+       return count;                                           \
+}                                                              \
+                                                               \
+static ssize_t i7core_inject_show_##param(                     \
+               struct mem_ctl_info *mci,                       \
+               char *data)                                     \
+{                                                              \
+       struct i7core_pvt *pvt;                                 \
+                                                               \
+       pvt = mci->pvt_info;                                    \
+       debugf1("%s() pvt=%p\n", __func__, pvt);                \
+       if (pvt->inject.param < 0)                              \
+               return sprintf(data, "any\n");                  \
+       else                                                    \
+               return sprintf(data, "%d\n", pvt->inject.param);\
+}
+
+#define ATTR_ADDR_MATCH(param)                                 \
+       {                                                       \
+               .attr = {                                       \
+                       .name = #param,                         \
+                       .mode = (S_IRUGO | S_IWUSR)             \
+               },                                              \
+               .show  = i7core_inject_show_##param,            \
+               .store = i7core_inject_store_##param,           \
+       }
+
+DECLARE_ADDR_MATCH(channel, 3);
+DECLARE_ADDR_MATCH(dimm, 3);
+DECLARE_ADDR_MATCH(rank, 4);
+DECLARE_ADDR_MATCH(bank, 32);
+DECLARE_ADDR_MATCH(page, 0x10000);
+DECLARE_ADDR_MATCH(col, 0x4000);
+
+static int write_and_test(struct pci_dev *dev, int where, u32 val)
+{
+       u32 read;
+       int count;
+
+       debugf0("setting pci %02x:%02x.%x reg=%02x value=%08x\n",
+               dev->bus->number, PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn),
+               where, val);
+
+       for (count = 0; count < 10; count++) {
+               if (count)
+                       msleep(100);
+               pci_write_config_dword(dev, where, val);
+               pci_read_config_dword(dev, where, &read);
+
+               if (read == val)
+                       return 0;
+       }
+
+       i7core_printk(KERN_ERR, "Error during set pci %02x:%02x.%x reg=%02x "
+               "write=%08x. Read=%08x\n",
+               dev->bus->number, PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn),
+               where, val, read);
+
+       return -EINVAL;
+}
+
+/*
+ * This routine prepares the Memory Controller for error injection.
+ * The error will be injected when some process tries to write to the
+ * memory that matches the given criteria.
+ * The criteria can be set in terms of a mask where dimm, rank, bank, page
+ * and col can be specified.
+ * A -1 value for any of the mask items will make the MCU to ignore
+ * that matching criteria for error injection.
+ *
+ * It should be noticed that the error will only happen after a write operation
+ * on a memory that matches the condition. if REPEAT_EN is not enabled at
+ * inject mask, then it will produce just one error. Otherwise, it will repeat
+ * until the injectmask would be cleaned.
+ *
+ * FIXME: This routine assumes that MAXNUMDIMMS value of MC_MAX_DOD
+ *    is reliable enough to check if the MC is using the
+ *    three channels. However, this is not clear at the datasheet.
+ */
+static ssize_t i7core_inject_enable_store(struct mem_ctl_info *mci,
+                                      const char *data, size_t count)
+{
+       struct i7core_pvt *pvt = mci->pvt_info;
+       u32 injectmask;
+       u64 mask = 0;
+       int  rc;
+       long enable;
+
+       if (!pvt->pci_ch[pvt->inject.channel][0])
+               return 0;
+
+       rc = strict_strtoul(data, 10, &enable);
+       if ((rc < 0))
+               return 0;
+
+       if (enable) {
+               pvt->inject.enable = 1;
+       } else {
+               disable_inject(mci);
+               return count;
+       }
+
+       /* Sets pvt->inject.dimm mask */
+       if (pvt->inject.dimm < 0)
+               mask |= 1LL << 41;
+       else {
+               if (pvt->channel[pvt->inject.channel].dimms > 2)
+                       mask |= (pvt->inject.dimm & 0x3LL) << 35;
+               else
+                       mask |= (pvt->inject.dimm & 0x1LL) << 36;
+       }
+
+       /* Sets pvt->inject.rank mask */
+       if (pvt->inject.rank < 0)
+               mask |= 1LL << 40;
+       else {
+               if (pvt->channel[pvt->inject.channel].dimms > 2)
+                       mask |= (pvt->inject.rank & 0x1LL) << 34;
+               else
+                       mask |= (pvt->inject.rank & 0x3LL) << 34;
+       }
+
+       /* Sets pvt->inject.bank mask */
+       if (pvt->inject.bank < 0)
+               mask |= 1LL << 39;
+       else
+               mask |= (pvt->inject.bank & 0x15LL) << 30;
+
+       /* Sets pvt->inject.page mask */
+       if (pvt->inject.page < 0)
+               mask |= 1LL << 38;
+       else
+               mask |= (pvt->inject.page & 0xffff) << 14;
+
+       /* Sets pvt->inject.column mask */
+       if (pvt->inject.col < 0)
+               mask |= 1LL << 37;
+       else
+               mask |= (pvt->inject.col & 0x3fff);
+
+       /*
+        * bit    0: REPEAT_EN
+        * bits 1-2: MASK_HALF_CACHELINE
+        * bit    3: INJECT_ECC
+        * bit    4: INJECT_ADDR_PARITY
+        */
+
+       injectmask = (pvt->inject.type & 1) |
+                    (pvt->inject.section & 0x3) << 1 |
+                    (pvt->inject.type & 0x6) << (3 - 1);
+
+       /* Unlock writes to registers - this register is write only */
+       pci_write_config_dword(pvt->pci_noncore,
+                              MC_CFG_CONTROL, 0x2);
+
+       write_and_test(pvt->pci_ch[pvt->inject.channel][0],
+                              MC_CHANNEL_ADDR_MATCH, mask);
+       write_and_test(pvt->pci_ch[pvt->inject.channel][0],
+                              MC_CHANNEL_ADDR_MATCH + 4, mask >> 32L);
+
+       write_and_test(pvt->pci_ch[pvt->inject.channel][0],
+                              MC_CHANNEL_ERROR_MASK, pvt->inject.eccmask);
+
+       write_and_test(pvt->pci_ch[pvt->inject.channel][0],
+                              MC_CHANNEL_ERROR_INJECT, injectmask);
+
+       /*
+        * This is something undocumented, based on my tests
+        * Without writing 8 to this register, errors aren't injected. Not sure
+        * why.
+        */
+       pci_write_config_dword(pvt->pci_noncore,
+                              MC_CFG_CONTROL, 8);
+
+       debugf0("Error inject addr match 0x%016llx, ecc 0x%08x,"
+               " inject 0x%08x\n",
+               mask, pvt->inject.eccmask, injectmask);
+
+
+       return count;
+}
+
+static ssize_t i7core_inject_enable_show(struct mem_ctl_info *mci,
+                                       char *data)
+{
+       struct i7core_pvt *pvt = mci->pvt_info;
+       u32 injectmask;
+
+       if (!pvt->pci_ch[pvt->inject.channel][0])
+               return 0;
+
+       pci_read_config_dword(pvt->pci_ch[pvt->inject.channel][0],
+                              MC_CHANNEL_ERROR_INJECT, &injectmask);
+
+       debugf0("Inject error read: 0x%018x\n", injectmask);
+
+       if (injectmask & 0x0c)
+               pvt->inject.enable = 1;
+
+       return sprintf(data, "%d\n", pvt->inject.enable);
+}
+
+#define DECLARE_COUNTER(param)                                 \
+static ssize_t i7core_show_counter_##param(                    \
+               struct mem_ctl_info *mci,                       \
+               char *data)                                     \
+{                                                              \
+       struct i7core_pvt *pvt = mci->pvt_info;                 \
+                                                               \
+       debugf1("%s() \n", __func__);                           \
+       if (!pvt->ce_count_available || (pvt->is_registered))   \
+               return sprintf(data, "data unavailable\n");     \
+       return sprintf(data, "%lu\n",                           \
+                       pvt->udimm_ce_count[param]);            \
+}
+
+#define ATTR_COUNTER(param)                                    \
+       {                                                       \
+               .attr = {                                       \
+                       .name = __stringify(udimm##param),      \
+                       .mode = (S_IRUGO | S_IWUSR)             \
+               },                                              \
+               .show  = i7core_show_counter_##param            \
+       }
+
+DECLARE_COUNTER(0);
+DECLARE_COUNTER(1);
+DECLARE_COUNTER(2);
+
+/*
+ * Sysfs struct
+ */
+
+
+static struct mcidev_sysfs_attribute i7core_addrmatch_attrs[] = {
+       ATTR_ADDR_MATCH(channel),
+       ATTR_ADDR_MATCH(dimm),
+       ATTR_ADDR_MATCH(rank),
+       ATTR_ADDR_MATCH(bank),
+       ATTR_ADDR_MATCH(page),
+       ATTR_ADDR_MATCH(col),
+       { .attr = { .name = NULL } }
+};
+
+static struct mcidev_sysfs_group i7core_inject_addrmatch = {
+       .name  = "inject_addrmatch",
+       .mcidev_attr = i7core_addrmatch_attrs,
+};
+
+static struct mcidev_sysfs_attribute i7core_udimm_counters_attrs[] = {
+       ATTR_COUNTER(0),
+       ATTR_COUNTER(1),
+       ATTR_COUNTER(2),
+};
+
+static struct mcidev_sysfs_group i7core_udimm_counters = {
+       .name  = "all_channel_counts",
+       .mcidev_attr = i7core_udimm_counters_attrs,
+};
+
+static struct mcidev_sysfs_attribute i7core_sysfs_attrs[] = {
+       {
+               .attr = {
+                       .name = "inject_section",
+                       .mode = (S_IRUGO | S_IWUSR)
+               },
+               .show  = i7core_inject_section_show,
+               .store = i7core_inject_section_store,
+       }, {
+               .attr = {
+                       .name = "inject_type",
+                       .mode = (S_IRUGO | S_IWUSR)
+               },
+               .show  = i7core_inject_type_show,
+               .store = i7core_inject_type_store,
+       }, {
+               .attr = {
+                       .name = "inject_eccmask",
+                       .mode = (S_IRUGO | S_IWUSR)
+               },
+               .show  = i7core_inject_eccmask_show,
+               .store = i7core_inject_eccmask_store,
+       }, {
+               .grp = &i7core_inject_addrmatch,
+       }, {
+               .attr = {
+                       .name = "inject_enable",
+                       .mode = (S_IRUGO | S_IWUSR)
+               },
+               .show  = i7core_inject_enable_show,
+               .store = i7core_inject_enable_store,
+       },
+       { .attr = { .name = NULL } },   /* Reserved for udimm counters */
+       { .attr = { .name = NULL } }
+};
+
+/****************************************************************************
+       Device initialization routines: put/get, init/exit
+ ****************************************************************************/
+
+/*
+ *     i7core_put_devices      'put' all the devices that we have
+ *                             reserved via 'get'
+ */
+static void i7core_put_devices(struct i7core_dev *i7core_dev)
+{
+       int i;
+
+       debugf0(__FILE__ ": %s()\n", __func__);
+       for (i = 0; i < i7core_dev->n_devs; i++) {
+               struct pci_dev *pdev = i7core_dev->pdev[i];
+               if (!pdev)
+                       continue;
+               debugf0("Removing dev %02x:%02x.%d\n",
+                       pdev->bus->number,
+                       PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn));
+               pci_dev_put(pdev);
+       }
+       kfree(i7core_dev->pdev);
+       list_del(&i7core_dev->list);
+       kfree(i7core_dev);
+}
+
+static void i7core_put_all_devices(void)
+{
+       struct i7core_dev *i7core_dev, *tmp;
+
+       list_for_each_entry_safe(i7core_dev, tmp, &i7core_edac_list, list)
+               i7core_put_devices(i7core_dev);
+}
+
+static void __init i7core_xeon_pci_fixup(struct pci_id_table *table)
+{
+       struct pci_dev *pdev = NULL;
+       int i;
+       /*
+        * On Xeon 55xx, the Intel Quckpath Arch Generic Non-core pci buses
+        * aren't announced by acpi. So, we need to use a legacy scan probing
+        * to detect them
+        */
+       while (table && table->descr) {
+               pdev = pci_get_device(PCI_VENDOR_ID_INTEL, table->descr[0].dev_id, NULL);
+               if (unlikely(!pdev)) {
+                       for (i = 0; i < MAX_SOCKET_BUSES; i++)
+                               pcibios_scan_specific_bus(255-i);
+               }
+               table++;
+       }
+}
+
+/*
+ *     i7core_get_devices      Find and perform 'get' operation on the MCH's
+ *                     device/functions we want to reference for this driver
+ *
+ *                     Need to 'get' device 16 func 1 and func 2
+ */
+int i7core_get_onedevice(struct pci_dev **prev, int devno,
+                        struct pci_id_descr *dev_descr, unsigned n_devs)
+{
+       struct i7core_dev *i7core_dev;
+
+       struct pci_dev *pdev = NULL;
+       u8 bus = 0;
+       u8 socket = 0;
+
+       pdev = pci_get_device(PCI_VENDOR_ID_INTEL,
+                             dev_descr->dev_id, *prev);
+
+       /*
+        * On Xeon 55xx, the Intel Quckpath Arch Generic Non-core regs
+        * is at addr 8086:2c40, instead of 8086:2c41. So, we need
+        * to probe for the alternate address in case of failure
+        */
+       if (dev_descr->dev_id == PCI_DEVICE_ID_INTEL_I7_NONCORE && !pdev)
+               pdev = pci_get_device(PCI_VENDOR_ID_INTEL,
+                                     PCI_DEVICE_ID_INTEL_I7_NONCORE_ALT, *prev);
+
+       if (dev_descr->dev_id == PCI_DEVICE_ID_INTEL_LYNNFIELD_NONCORE && !pdev)
+               pdev = pci_get_device(PCI_VENDOR_ID_INTEL,
+                                     PCI_DEVICE_ID_INTEL_LYNNFIELD_NONCORE_ALT,
+                                     *prev);
+
+       if (!pdev) {
+               if (*prev) {
+                       *prev = pdev;
+                       return 0;
+               }
+
+               if (dev_descr->optional)
+                       return 0;
+
+               if (devno == 0)
+                       return -ENODEV;
+
+               i7core_printk(KERN_ERR,
+                       "Device not found: dev %02x.%d PCI ID %04x:%04x\n",
+                       dev_descr->dev, dev_descr->func,
+                       PCI_VENDOR_ID_INTEL, dev_descr->dev_id);
+
+               /* End of list, leave */
+               return -ENODEV;
+       }
+       bus = pdev->bus->number;
+
+       if (bus == 0x3f)
+               socket = 0;
+       else
+               socket = 255 - bus;
+
+       i7core_dev = get_i7core_dev(socket);
+       if (!i7core_dev) {
+               i7core_dev = kzalloc(sizeof(*i7core_dev), GFP_KERNEL);
+               if (!i7core_dev)
+                       return -ENOMEM;
+               i7core_dev->pdev = kzalloc(sizeof(*i7core_dev->pdev) * n_devs,
+                                          GFP_KERNEL);
+               if (!i7core_dev->pdev) {
+                       kfree(i7core_dev);
+                       return -ENOMEM;
+               }
+               i7core_dev->socket = socket;
+               i7core_dev->n_devs = n_devs;
+               list_add_tail(&i7core_dev->list, &i7core_edac_list);
+       }
+
+       if (i7core_dev->pdev[devno]) {
+               i7core_printk(KERN_ERR,
+                       "Duplicated device for "
+                       "dev %02x:%02x.%d PCI ID %04x:%04x\n",
+                       bus, dev_descr->dev, dev_descr->func,
+                       PCI_VENDOR_ID_INTEL, dev_descr->dev_id);
+               pci_dev_put(pdev);
+               return -ENODEV;
+       }
+
+       i7core_dev->pdev[devno] = pdev;
+
+       /* Sanity check */
+       if (unlikely(PCI_SLOT(pdev->devfn) != dev_descr->dev ||
+                       PCI_FUNC(pdev->devfn) != dev_descr->func)) {
+               i7core_printk(KERN_ERR,
+                       "Device PCI ID %04x:%04x "
+                       "has dev %02x:%02x.%d instead of dev %02x:%02x.%d\n",
+                       PCI_VENDOR_ID_INTEL, dev_descr->dev_id,
+                       bus, PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn),
+                       bus, dev_descr->dev, dev_descr->func);
+               return -ENODEV;
+       }
+
+       /* Be sure that the device is enabled */
+       if (unlikely(pci_enable_device(pdev) < 0)) {
+               i7core_printk(KERN_ERR,
+                       "Couldn't enable "
+                       "dev %02x:%02x.%d PCI ID %04x:%04x\n",
+                       bus, dev_descr->dev, dev_descr->func,
+                       PCI_VENDOR_ID_INTEL, dev_descr->dev_id);
+               return -ENODEV;
+       }
+
+       debugf0("Detected socket %d dev %02x:%02x.%d PCI ID %04x:%04x\n",
+               socket, bus, dev_descr->dev,
+               dev_descr->func,
+               PCI_VENDOR_ID_INTEL, dev_descr->dev_id);
+
+       *prev = pdev;
+
+       return 0;
+}
+
+static int i7core_get_devices(struct pci_id_table *table)
+{
+       int i, rc;
+       struct pci_dev *pdev = NULL;
+       struct pci_id_descr *dev_descr;
+
+       while (table && table->descr) {
+               dev_descr = table->descr;
+               for (i = 0; i < table->n_devs; i++) {
+                       pdev = NULL;
+                       do {
+                               rc = i7core_get_onedevice(&pdev, i, &dev_descr[i],
+                                                         table->n_devs);
+                               if (rc < 0) {
+                                       if (i == 0) {
+                                               i = table->n_devs;
+                                               break;
+                                       }
+                                       i7core_put_all_devices();
+                                       return -ENODEV;
+                               }
+                       } while (pdev);
+               }
+               table++;
+       }
+
+       return 0;
+       return 0;
+}
+
+static int mci_bind_devs(struct mem_ctl_info *mci,
+                        struct i7core_dev *i7core_dev)
+{
+       struct i7core_pvt *pvt = mci->pvt_info;
+       struct pci_dev *pdev;
+       int i, func, slot;
+
+       /* Associates i7core_dev and mci for future usage */
+       pvt->i7core_dev = i7core_dev;
+       i7core_dev->mci = mci;
+
+       pvt->is_registered = 0;
+       for (i = 0; i < i7core_dev->n_devs; i++) {
+               pdev = i7core_dev->pdev[i];
+               if (!pdev)
+                       continue;
+
+               func = PCI_FUNC(pdev->devfn);
+               slot = PCI_SLOT(pdev->devfn);
+               if (slot == 3) {
+                       if (unlikely(func > MAX_MCR_FUNC))
+                               goto error;
+                       pvt->pci_mcr[func] = pdev;
+               } else if (likely(slot >= 4 && slot < 4 + NUM_CHANS)) {
+                       if (unlikely(func > MAX_CHAN_FUNC))
+                               goto error;
+                       pvt->pci_ch[slot - 4][func] = pdev;
+               } else if (!slot && !func)
+                       pvt->pci_noncore = pdev;
+               else
+                       goto error;
+
+               debugf0("Associated fn %d.%d, dev = %p, socket %d\n",
+                       PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn),
+                       pdev, i7core_dev->socket);
+
+               if (PCI_SLOT(pdev->devfn) == 3 &&
+                       PCI_FUNC(pdev->devfn) == 2)
+                       pvt->is_registered = 1;
+       }
+
+       /*
+        * Add extra nodes to count errors on udimm
+        * For registered memory, this is not needed, since the counters
+        * are already displayed at the standard locations
+        */
+       if (!pvt->is_registered)
+               i7core_sysfs_attrs[ARRAY_SIZE(i7core_sysfs_attrs)-2].grp =
+                       &i7core_udimm_counters;
+
+       return 0;
+
+error:
+       i7core_printk(KERN_ERR, "Device %d, function %d "
+                     "is out of the expected range\n",
+                     slot, func);
+       return -EINVAL;
+}
+
+/****************************************************************************
+                       Error check routines
+ ****************************************************************************/
+static void i7core_rdimm_update_csrow(struct mem_ctl_info *mci,
+                                        int chan, int dimm, int add)
+{
+       char *msg;
+       struct i7core_pvt *pvt = mci->pvt_info;
+       int row = pvt->csrow_map[chan][dimm], i;
+
+       for (i = 0; i < add; i++) {
+               msg = kasprintf(GFP_KERNEL, "Corrected error "
+                               "(Socket=%d channel=%d dimm=%d)",
+                               pvt->i7core_dev->socket, chan, dimm);
+
+               edac_mc_handle_fbd_ce(mci, row, 0, msg);
+               kfree (msg);
+       }
+}
+
+static void i7core_rdimm_update_ce_count(struct mem_ctl_info *mci,
+                       int chan, int new0, int new1, int new2)
+{
+       struct i7core_pvt *pvt = mci->pvt_info;
+       int add0 = 0, add1 = 0, add2 = 0;
+       /* Updates CE counters if it is not the first time here */
+       if (pvt->ce_count_available) {
+               /* Updates CE counters */
+
+               add2 = new2 - pvt->rdimm_last_ce_count[chan][2];
+               add1 = new1 - pvt->rdimm_last_ce_count[chan][1];
+               add0 = new0 - pvt->rdimm_last_ce_count[chan][0];
+
+               if (add2 < 0)
+                       add2 += 0x7fff;
+               pvt->rdimm_ce_count[chan][2] += add2;
+
+               if (add1 < 0)
+                       add1 += 0x7fff;
+               pvt->rdimm_ce_count[chan][1] += add1;
+
+               if (add0 < 0)
+                       add0 += 0x7fff;
+               pvt->rdimm_ce_count[chan][0] += add0;
+       } else
+               pvt->ce_count_available = 1;
+
+       /* Store the new values */
+       pvt->rdimm_last_ce_count[chan][2] = new2;
+       pvt->rdimm_last_ce_count[chan][1] = new1;
+       pvt->rdimm_last_ce_count[chan][0] = new0;
+
+       /*updated the edac core */
+       if (add0 != 0)
+               i7core_rdimm_update_csrow(mci, chan, 0, add0);
+       if (add1 != 0)
+               i7core_rdimm_update_csrow(mci, chan, 1, add1);
+       if (add2 != 0)
+               i7core_rdimm_update_csrow(mci, chan, 2, add2);
+
+}
+
+static void i7core_rdimm_check_mc_ecc_err(struct mem_ctl_info *mci)
+{
+       struct i7core_pvt *pvt = mci->pvt_info;
+       u32 rcv[3][2];
+       int i, new0, new1, new2;
+
+       /*Read DEV 3: FUN 2:  MC_COR_ECC_CNT regs directly*/
+       pci_read_config_dword(pvt->pci_mcr[2], MC_COR_ECC_CNT_0,
+                                                               &rcv[0][0]);
+       pci_read_config_dword(pvt->pci_mcr[2], MC_COR_ECC_CNT_1,
+                                                               &rcv[0][1]);
+       pci_read_config_dword(pvt->pci_mcr[2], MC_COR_ECC_CNT_2,
+                                                               &rcv[1][0]);
+       pci_read_config_dword(pvt->pci_mcr[2], MC_COR_ECC_CNT_3,
+                                                               &rcv[1][1]);
+       pci_read_config_dword(pvt->pci_mcr[2], MC_COR_ECC_CNT_4,
+                                                               &rcv[2][0]);
+       pci_read_config_dword(pvt->pci_mcr[2], MC_COR_ECC_CNT_5,
+                                                               &rcv[2][1]);
+       for (i = 0 ; i < 3; i++) {
+               debugf3("MC_COR_ECC_CNT%d = 0x%x; MC_COR_ECC_CNT%d = 0x%x\n",
+                       (i * 2), rcv[i][0], (i * 2) + 1, rcv[i][1]);
+               /*if the channel has 3 dimms*/
+               if (pvt->channel[i].dimms > 2) {
+                       new0 = DIMM_BOT_COR_ERR(rcv[i][0]);
+                       new1 = DIMM_TOP_COR_ERR(rcv[i][0]);
+                       new2 = DIMM_BOT_COR_ERR(rcv[i][1]);
+               } else {
+                       new0 = DIMM_TOP_COR_ERR(rcv[i][0]) +
+                                       DIMM_BOT_COR_ERR(rcv[i][0]);
+                       new1 = DIMM_TOP_COR_ERR(rcv[i][1]) +
+                                       DIMM_BOT_COR_ERR(rcv[i][1]);
+                       new2 = 0;
+               }
+
+               i7core_rdimm_update_ce_count(mci, i, new0, new1, new2);
+       }
+}
+
+/* This function is based on the device 3 function 4 registers as described on:
+ * Intel Xeon Processor 5500 Series Datasheet Volume 2
+ *     http://www.intel.com/Assets/PDF/datasheet/321322.pdf
+ * also available at:
+ *     http://www.arrownac.com/manufacturers/intel/s/nehalem/5500-datasheet-v2.pdf
+ */
+static void i7core_udimm_check_mc_ecc_err(struct mem_ctl_info *mci)
+{
+       struct i7core_pvt *pvt = mci->pvt_info;
+       u32 rcv1, rcv0;
+       int new0, new1, new2;
+
+       if (!pvt->pci_mcr[4]) {
+               debugf0("%s MCR registers not found\n", __func__);
+               return;
+       }
+
+       /* Corrected test errors */
+       pci_read_config_dword(pvt->pci_mcr[4], MC_TEST_ERR_RCV1, &rcv1);
+       pci_read_config_dword(pvt->pci_mcr[4], MC_TEST_ERR_RCV0, &rcv0);
+
+       /* Store the new values */
+       new2 = DIMM2_COR_ERR(rcv1);
+       new1 = DIMM1_COR_ERR(rcv0);
+       new0 = DIMM0_COR_ERR(rcv0);
+
+       /* Updates CE counters if it is not the first time here */
+       if (pvt->ce_count_available) {
+               /* Updates CE counters */
+               int add0, add1, add2;
+
+               add2 = new2 - pvt->udimm_last_ce_count[2];
+               add1 = new1 - pvt->udimm_last_ce_count[1];
+               add0 = new0 - pvt->udimm_last_ce_count[0];
+
+               if (add2 < 0)
+                       add2 += 0x7fff;
+               pvt->udimm_ce_count[2] += add2;
+
+               if (add1 < 0)
+                       add1 += 0x7fff;
+               pvt->udimm_ce_count[1] += add1;
+
+               if (add0 < 0)
+                       add0 += 0x7fff;
+               pvt->udimm_ce_count[0] += add0;
+
+               if (add0 | add1 | add2)
+                       i7core_printk(KERN_ERR, "New Corrected error(s): "
+                                     "dimm0: +%d, dimm1: +%d, dimm2 +%d\n",
+                                     add0, add1, add2);
+       } else
+               pvt->ce_count_available = 1;
+
+       /* Store the new values */
+       pvt->udimm_last_ce_count[2] = new2;
+       pvt->udimm_last_ce_count[1] = new1;
+       pvt->udimm_last_ce_count[0] = new0;
+}
+
+/*
+ * According with tables E-11 and E-12 of chapter E.3.3 of Intel 64 and IA-32
+ * Architectures Software Developer’s Manual Volume 3B.
+ * Nehalem are defined as family 0x06, model 0x1a
+ *
+ * The MCA registers used here are the following ones:
+ *     struct mce field        MCA Register
+ *     m->status       MSR_IA32_MC8_STATUS
+ *     m->addr         MSR_IA32_MC8_ADDR
+ *     m->misc         MSR_IA32_MC8_MISC
+ * In the case of Nehalem, the error information is masked at .status and .misc
+ * fields
+ */
+static void i7core_mce_output_error(struct mem_ctl_info *mci,
+                                   struct mce *m)
+{
+       struct i7core_pvt *pvt = mci->pvt_info;
+       char *type, *optype, *err, *msg;
+       unsigned long error = m->status & 0x1ff0000l;
+       u32 optypenum = (m->status >> 4) & 0x07;
+       u32 core_err_cnt = (m->status >> 38) && 0x7fff;
+       u32 dimm = (m->misc >> 16) & 0x3;
+       u32 channel = (m->misc >> 18) & 0x3;
+       u32 syndrome = m->misc >> 32;
+       u32 errnum = find_first_bit(&error, 32);
+       int csrow;
+
+       if (m->mcgstatus & 1)
+               type = "FATAL";
+       else
+               type = "NON_FATAL";
+
+       switch (optypenum) {
+       case 0:
+               optype = "generic undef request";
+               break;
+       case 1:
+               optype = "read error";
+               break;
+       case 2:
+               optype = "write error";
+               break;
+       case 3:
+               optype = "addr/cmd error";
+               break;
+       case 4:
+               optype = "scrubbing error";
+               break;
+       default:
+               optype = "reserved";
+               break;
+       }
+
+       switch (errnum) {
+       case 16:
+               err = "read ECC error";
+               break;
+       case 17:
+               err = "RAS ECC error";
+               break;
+       case 18:
+               err = "write parity error";
+               break;
+       case 19:
+               err = "redundacy loss";
+               break;
+       case 20:
+               err = "reserved";
+               break;
+       case 21:
+               err = "memory range error";
+               break;
+       case 22:
+               err = "RTID out of range";
+               break;
+       case 23:
+               err = "address parity error";
+               break;
+       case 24:
+               err = "byte enable parity error";
+               break;
+       default:
+               err = "unknown";
+       }
+
+       /* FIXME: should convert addr into bank and rank information */
+       msg = kasprintf(GFP_ATOMIC,
+               "%s (addr = 0x%08llx, cpu=%d, Dimm=%d, Channel=%d, "
+               "syndrome=0x%08x, count=%d, Err=%08llx:%08llx (%s: %s))\n",
+               type, (long long) m->addr, m->cpu, dimm, channel,
+               syndrome, core_err_cnt, (long long)m->status,
+               (long long)m->misc, optype, err);
+
+       debugf0("%s", msg);
+
+       csrow = pvt->csrow_map[channel][dimm];
+
+       /* Call the helper to output message */
+       if (m->mcgstatus & 1)
+               edac_mc_handle_fbd_ue(mci, csrow, 0,
+                               0 /* FIXME: should be channel here */, msg);
+       else if (!pvt->is_registered)
+               edac_mc_handle_fbd_ce(mci, csrow,
+                               0 /* FIXME: should be channel here */, msg);
+
+       kfree(msg);
+}
+
+/*
+ *     i7core_check_error      Retrieve and process errors reported by the
+ *                             hardware. Called by the Core module.
+ */
+static void i7core_check_error(struct mem_ctl_info *mci)
+{
+       struct i7core_pvt *pvt = mci->pvt_info;
+       int i;
+       unsigned count = 0;
+       struct mce *m;
+
+       /*
+        * MCE first step: Copy all mce errors into a temporary buffer
+        * We use a double buffering here, to reduce the risk of
+        * loosing an error.
+        */
+       smp_rmb();
+       count = (pvt->mce_out + MCE_LOG_LEN - pvt->mce_in)
+               % MCE_LOG_LEN;
+       if (!count)
+               goto check_ce_error;
+
+       m = pvt->mce_outentry;
+       if (pvt->mce_in + count > MCE_LOG_LEN) {
+               unsigned l = MCE_LOG_LEN - pvt->mce_in;
+
+               memcpy(m, &pvt->mce_entry[pvt->mce_in], sizeof(*m) * l);
+               smp_wmb();
+               pvt->mce_in = 0;
+               count -= l;
+               m += l;
+       }
+       memcpy(m, &pvt->mce_entry[pvt->mce_in], sizeof(*m) * count);
+       smp_wmb();
+       pvt->mce_in += count;
+
+       smp_rmb();
+       if (pvt->mce_overrun) {
+               i7core_printk(KERN_ERR, "Lost %d memory errors\n",
+                             pvt->mce_overrun);
+               smp_wmb();
+               pvt->mce_overrun = 0;
+       }
+
+       /*
+        * MCE second step: parse errors and display
+        */
+       for (i = 0; i < count; i++)
+               i7core_mce_output_error(mci, &pvt->mce_outentry[i]);
+
+       /*
+        * Now, let's increment CE error counts
+        */
+check_ce_error:
+       if (!pvt->is_registered)
+               i7core_udimm_check_mc_ecc_err(mci);
+       else
+               i7core_rdimm_check_mc_ecc_err(mci);
+}
+
+/*
+ * i7core_mce_check_error      Replicates mcelog routine to get errors
+ *                             This routine simply queues mcelog errors, and
+ *                             return. The error itself should be handled later
+ *                             by i7core_check_error.
+ * WARNING: As this routine should be called at NMI time, extra care should
+ * be taken to avoid deadlocks, and to be as fast as possible.
+ */
+static int i7core_mce_check_error(void *priv, struct mce *mce)
+{
+       struct mem_ctl_info *mci = priv;
+       struct i7core_pvt *pvt = mci->pvt_info;
+
+       /*
+        * Just let mcelog handle it if the error is
+        * outside the memory controller
+        */
+       if (((mce->status & 0xffff) >> 7) != 1)
+               return 0;
+
+       /* Bank 8 registers are the only ones that we know how to handle */
+       if (mce->bank != 8)
+               return 0;
+
+#ifdef CONFIG_SMP
+       /* Only handle if it is the right mc controller */
+       if (cpu_data(mce->cpu).phys_proc_id != pvt->i7core_dev->socket)
+               return 0;
+#endif
+
+       smp_rmb();
+       if ((pvt->mce_out + 1) % MCE_LOG_LEN == pvt->mce_in) {
+               smp_wmb();
+               pvt->mce_overrun++;
+               return 0;
+       }
+
+       /* Copy memory error at the ringbuffer */
+       memcpy(&pvt->mce_entry[pvt->mce_out], mce, sizeof(*mce));
+       smp_wmb();
+       pvt->mce_out = (pvt->mce_out + 1) % MCE_LOG_LEN;
+
+       /* Handle fatal errors immediately */
+       if (mce->mcgstatus & 1)
+               i7core_check_error(mci);
+
+       /* Advice mcelog that the error were handled */
+       return 1;
+}
+
+static int i7core_register_mci(struct i7core_dev *i7core_dev,
+                              int num_channels, int num_csrows)
+{
+       struct mem_ctl_info *mci;
+       struct i7core_pvt *pvt;
+       int csrow = 0;
+       int rc;
+
+       /* allocate a new MC control structure */
+       mci = edac_mc_alloc(sizeof(*pvt), num_csrows, num_channels,
+                           i7core_dev->socket);
+       if (unlikely(!mci))
+               return -ENOMEM;
+
+       debugf0("MC: " __FILE__ ": %s(): mci = %p\n", __func__, mci);
+
+       /* record ptr to the generic device */
+       mci->dev = &i7core_dev->pdev[0]->dev;
+
+       pvt = mci->pvt_info;
+       memset(pvt, 0, sizeof(*pvt));
+
+       /*
+        * FIXME: how to handle RDDR3 at MCI level? It is possible to have
+        * Mixed RDDR3/UDDR3 with Nehalem, provided that they are on different
+        * memory channels
+        */
+       mci->mtype_cap = MEM_FLAG_DDR3;
+       mci->edac_ctl_cap = EDAC_FLAG_NONE;
+       mci->edac_cap = EDAC_FLAG_NONE;
+       mci->mod_name = "i7core_edac.c";
+       mci->mod_ver = I7CORE_REVISION;
+       mci->ctl_name = kasprintf(GFP_KERNEL, "i7 core #%d",
+                                 i7core_dev->socket);
+       mci->dev_name = pci_name(i7core_dev->pdev[0]);
+       mci->ctl_page_to_phys = NULL;
+       mci->mc_driver_sysfs_attributes = i7core_sysfs_attrs;
+       /* Set the function pointer to an actual operation function */
+       mci->edac_check = i7core_check_error;
+
+       /* Store pci devices at mci for faster access */
+       rc = mci_bind_devs(mci, i7core_dev);
+       if (unlikely(rc < 0))
+               goto fail;
+
+       /* Get dimm basic config */
+       get_dimm_config(mci, &csrow);
+
+       /* add this new MC control structure to EDAC's list of MCs */
+       if (unlikely(edac_mc_add_mc(mci))) {
+               debugf0("MC: " __FILE__
+                       ": %s(): failed edac_mc_add_mc()\n", __func__);
+               /* FIXME: perhaps some code should go here that disables error
+                * reporting if we just enabled it
+                */
+
+               rc = -EINVAL;
+               goto fail;
+       }
+
+       /* allocating generic PCI control info */
+       i7core_pci = edac_pci_create_generic_ctl(&i7core_dev->pdev[0]->dev,
+                                                EDAC_MOD_STR);
+       if (unlikely(!i7core_pci)) {
+               printk(KERN_WARNING
+                       "%s(): Unable to create PCI control\n",
+                       __func__);
+               printk(KERN_WARNING
+                       "%s(): PCI error report via EDAC not setup\n",
+                       __func__);
+       }
+
+       /* Default error mask is any memory */
+       pvt->inject.channel = 0;
+       pvt->inject.dimm = -1;
+       pvt->inject.rank = -1;
+       pvt->inject.bank = -1;
+       pvt->inject.page = -1;
+       pvt->inject.col = -1;
+
+       /* Registers on edac_mce in order to receive memory errors */
+       pvt->edac_mce.priv = mci;
+       pvt->edac_mce.check_error = i7core_mce_check_error;
+
+       rc = edac_mce_register(&pvt->edac_mce);
+       if (unlikely(rc < 0)) {
+               debugf0("MC: " __FILE__
+                       ": %s(): failed edac_mce_register()\n", __func__);
+       }
+
+fail:
+       if (rc < 0)
+               edac_mc_free(mci);
+       return rc;
+}
+
+/*
+ *     i7core_probe    Probe for ONE instance of device to see if it is
+ *                     present.
+ *     return:
+ *             0 for FOUND a device
+ *             < 0 for error code
+ */
+static int __devinit i7core_probe(struct pci_dev *pdev,
+                                 const struct pci_device_id *id)
+{
+       int dev_idx = id->driver_data;
+       int rc;
+       struct i7core_dev *i7core_dev;
+
+       /*
+        * All memory controllers are allocated at the first pass.
+        */
+       if (unlikely(dev_idx >= 1))
+               return -EINVAL;
+
+       /* get the pci devices we want to reserve for our use */
+       mutex_lock(&i7core_edac_lock);
+
+       rc = i7core_get_devices(pci_dev_table);
+       if (unlikely(rc < 0))
+               goto fail0;
+
+       list_for_each_entry(i7core_dev, &i7core_edac_list, list) {
+               int channels;
+               int csrows;
+
+               /* Check the number of active and not disabled channels */
+               rc = i7core_get_active_channels(i7core_dev->socket,
+                                               &channels, &csrows);
+               if (unlikely(rc < 0))
+                       goto fail1;
+
+               rc = i7core_register_mci(i7core_dev, channels, csrows);
+               if (unlikely(rc < 0))
+                       goto fail1;
+       }
+
+       i7core_printk(KERN_INFO, "Driver loaded.\n");
+
+       mutex_unlock(&i7core_edac_lock);
+       return 0;
+
+fail1:
+       i7core_put_all_devices();
+fail0:
+       mutex_unlock(&i7core_edac_lock);
+       return rc;
+}
+
+/*
+ *     i7core_remove   destructor for one instance of device
+ *
+ */
+static void __devexit i7core_remove(struct pci_dev *pdev)
+{
+       struct mem_ctl_info *mci;
+       struct i7core_dev *i7core_dev, *tmp;
+
+       debugf0(__FILE__ ": %s()\n", __func__);
+
+       if (i7core_pci)
+               edac_pci_release_generic_ctl(i7core_pci);
+
+       /*
+        * we have a trouble here: pdev value for removal will be wrong, since
+        * it will point to the X58 register used to detect that the machine
+        * is a Nehalem or upper design. However, due to the way several PCI
+        * devices are grouped together to provide MC functionality, we need
+        * to use a different method for releasing the devices
+        */
+
+       mutex_lock(&i7core_edac_lock);
+       list_for_each_entry_safe(i7core_dev, tmp, &i7core_edac_list, list) {
+               mci = edac_mc_del_mc(&i7core_dev->pdev[0]->dev);
+               if (mci) {
+                       struct i7core_pvt *pvt = mci->pvt_info;
+
+                       i7core_dev = pvt->i7core_dev;
+                       edac_mce_unregister(&pvt->edac_mce);
+                       kfree(mci->ctl_name);
+                       edac_mc_free(mci);
+                       i7core_put_devices(i7core_dev);
+               } else {
+                       i7core_printk(KERN_ERR,
+                                     "Couldn't find mci for socket %d\n",
+                                     i7core_dev->socket);
+               }
+       }
+       mutex_unlock(&i7core_edac_lock);
+}
+
+MODULE_DEVICE_TABLE(pci, i7core_pci_tbl);
+
+/*
+ *     i7core_driver   pci_driver structure for this module
+ *
+ */
+static struct pci_driver i7core_driver = {
+       .name     = "i7core_edac",
+       .probe    = i7core_probe,
+       .remove   = __devexit_p(i7core_remove),
+       .id_table = i7core_pci_tbl,
+};
+
+/*
+ *     i7core_init             Module entry function
+ *                     Try to initialize this module for its devices
+ */
+static int __init i7core_init(void)
+{
+       int pci_rc;
+
+       debugf2("MC: " __FILE__ ": %s()\n", __func__);
+
+       /* Ensure that the OPSTATE is set correctly for POLL or NMI */
+       opstate_init();
+
+       i7core_xeon_pci_fixup(pci_dev_table);
+
+       pci_rc = pci_register_driver(&i7core_driver);
+
+       if (pci_rc >= 0)
+               return 0;
+
+       i7core_printk(KERN_ERR, "Failed to register device with error %d.\n",
+                     pci_rc);
+
+       return pci_rc;
+}
+
+/*
+ *     i7core_exit()   Module exit function
+ *                     Unregister the driver
+ */
+static void __exit i7core_exit(void)
+{
+       debugf2("MC: " __FILE__ ": %s()\n", __func__);
+       pci_unregister_driver(&i7core_driver);
+}
+
+module_init(i7core_init);
+module_exit(i7core_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Mauro Carvalho Chehab <mchehab@redhat.com>");
+MODULE_AUTHOR("Red Hat Inc. (http://www.redhat.com)");
+MODULE_DESCRIPTION("MC Driver for Intel i7 Core memory controllers - "
+                  I7CORE_REVISION);
+
+module_param(edac_op_state, int, 0444);
+MODULE_PARM_DESC(edac_op_state, "EDAC Error Reporting state: 0=Poll,1=NMI");
index f34f1dbeb5773aa1810509e45d05b2e2a543c4fb..3bfe8fafc6adac421577bc17c4da964537a4145f 100644 (file)
@@ -21,7 +21,8 @@ if SERIO
 config SERIO_I8042
        tristate "i8042 PC Keyboard controller" if EMBEDDED || !X86
        default y
-       depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && !M68K && !BLACKFIN
+       depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && \
+                  (!SUPERH || SH_CAYMAN) && !M68K && !BLACKFIN
        help
          i8042 is the chip over which the standard AT keyboard and PS/2
          mouse are connected to the computer. If you use these devices,
index 2dc0c07c04699de92a3a101b1a6f78cf45d7cc48..42ba3691d908bc1fc8c370da5ada4287ceb21115 100644 (file)
@@ -507,7 +507,6 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i
                        goto fail3;
        }
 
-       input_dev->name = wacom_wac->name;
        input_dev->name = wacom_wac->name;
        input_dev->dev.parent = &intf->dev;
        input_dev->open = wacom_open;
index 847fd0135bcf92b547a5303ad528c563bf5fe903..d564af58175cbf9136040745205b5716714b5604 100644 (file)
@@ -300,7 +300,7 @@ static int wacom_intuos_inout(struct wacom_wac *wacom)
                case 0x823: /* Intuos3 Grip Pen */
                case 0x813: /* Intuos3 Classic Pen */
                case 0x885: /* Intuos3 Marker Pen */
-               case 0x802: /* Intuos4 Grip Pen Eraser */
+               case 0x802: /* Intuos4 General Pen */
                case 0x804: /* Intuos4 Marker Pen */
                case 0x40802: /* Intuos4 Classic Pen */
                case 0x022:
@@ -335,7 +335,7 @@ static int wacom_intuos_inout(struct wacom_wac *wacom)
                case 0x81b: /* Intuos3 Classic Pen Eraser */
                case 0x91b: /* Intuos3 Airbrush Eraser */
                case 0x80c: /* Intuos4 Marker Pen Eraser */
-               case 0x80a: /* Intuos4 Grip Pen Eraser */
+               case 0x80a: /* Intuos4 General Pen Eraser */
                case 0x4080a: /* Intuos4 Classic Pen Eraser */
                case 0x90a: /* Intuos4 Airbrush Eraser */
                        wacom->tool[idx] = BTN_TOOL_RUBBER;
@@ -356,6 +356,11 @@ static int wacom_intuos_inout(struct wacom_wac *wacom)
                return 1;
        }
 
+       /* older I4 styli don't work with new Cintiqs */
+       if (!((wacom->id[idx] >> 20) & 0x01) &&
+                       (features->type == WACOM_21UX2))
+               return 1;
+
        /* Exit report */
        if ((data[1] & 0xfe) == 0x80) {
                /*
@@ -474,21 +479,43 @@ static int wacom_intuos_irq(struct wacom_wac *wacom)
                                input_report_abs(input, ABS_MISC, 0);
                        }
                } else {
-                       input_report_key(input, BTN_0, (data[5] & 0x01));
-                       input_report_key(input, BTN_1, (data[5] & 0x02));
-                       input_report_key(input, BTN_2, (data[5] & 0x04));
-                       input_report_key(input, BTN_3, (data[5] & 0x08));
-                       input_report_key(input, BTN_4, (data[6] & 0x01));
-                       input_report_key(input, BTN_5, (data[6] & 0x02));
-                       input_report_key(input, BTN_6, (data[6] & 0x04));
-                       input_report_key(input, BTN_7, (data[6] & 0x08));
-                       input_report_key(input, BTN_8, (data[5] & 0x10));
-                       input_report_key(input, BTN_9, (data[6] & 0x10));
+                       if (features->type == WACOM_21UX2) {
+                               input_report_key(input, BTN_0, (data[5] & 0x01));
+                               input_report_key(input, BTN_1, (data[6] & 0x01));
+                               input_report_key(input, BTN_2, (data[6] & 0x02));
+                               input_report_key(input, BTN_3, (data[6] & 0x04));
+                               input_report_key(input, BTN_4, (data[6] & 0x08));
+                               input_report_key(input, BTN_5, (data[6] & 0x10));
+                               input_report_key(input, BTN_6, (data[6] & 0x20));
+                               input_report_key(input, BTN_7, (data[6] & 0x40));
+                               input_report_key(input, BTN_8, (data[6] & 0x80));
+                               input_report_key(input, BTN_9, (data[7] & 0x01));
+                               input_report_key(input, BTN_A, (data[8] & 0x01));
+                               input_report_key(input, BTN_B, (data[8] & 0x02));
+                               input_report_key(input, BTN_C, (data[8] & 0x04));
+                               input_report_key(input, BTN_X, (data[8] & 0x08));
+                               input_report_key(input, BTN_Y, (data[8] & 0x10));
+                               input_report_key(input, BTN_Z, (data[8] & 0x20));
+                               input_report_key(input, BTN_BASE, (data[8] & 0x40));
+                               input_report_key(input, BTN_BASE2, (data[8] & 0x80));
+                       } else {
+                               input_report_key(input, BTN_0, (data[5] & 0x01));
+                               input_report_key(input, BTN_1, (data[5] & 0x02));
+                               input_report_key(input, BTN_2, (data[5] & 0x04));
+                               input_report_key(input, BTN_3, (data[5] & 0x08));
+                               input_report_key(input, BTN_4, (data[6] & 0x01));
+                               input_report_key(input, BTN_5, (data[6] & 0x02));
+                               input_report_key(input, BTN_6, (data[6] & 0x04));
+                               input_report_key(input, BTN_7, (data[6] & 0x08));
+                               input_report_key(input, BTN_8, (data[5] & 0x10));
+                               input_report_key(input, BTN_9, (data[6] & 0x10));
+                       }
                        input_report_abs(input, ABS_RX, ((data[1] & 0x1f) << 8) | data[2]);
                        input_report_abs(input, ABS_RY, ((data[3] & 0x1f) << 8) | data[4]);
 
                        if ((data[5] & 0x1f) | (data[6] & 0x1f) | (data[1] & 0x1f) |
-                               data[2] | (data[3] & 0x1f) | data[4]) {
+                               data[2] | (data[3] & 0x1f) | data[4] | data[8] |
+                               (data[7] & 0x01)) {
                                input_report_key(input, wacom->tool[1], 1);
                                input_report_abs(input, ABS_MISC, PAD_DEVICE_ID);
                        } else {
@@ -640,7 +667,7 @@ static void wacom_tpc_finger_in(struct wacom_wac *wacom, char *data, int idx)
        if (!idx)
                input_report_key(input, BTN_TOUCH, 1);
        input_event(input, EV_MSC, MSC_SERIAL, finger);
-       input_sync(wacom->input);
+       input_sync(input);
 
        wacom->last_finger = finger;
 }
@@ -826,6 +853,7 @@ void wacom_wac_irq(struct wacom_wac *wacom_wac, size_t len)
        case INTUOS4L:
        case CINTIQ:
        case WACOM_BEE:
+       case WACOM_21UX2:
                sync = wacom_intuos_irq(wacom_wac);
                break;
 
@@ -921,6 +949,17 @@ void wacom_setup_input_capabilities(struct input_dev *input_dev,
                __set_bit(BTN_STYLUS2, input_dev->keybit);
                break;
 
+       case WACOM_21UX2:
+               __set_bit(BTN_A, input_dev->keybit);
+               __set_bit(BTN_B, input_dev->keybit);
+               __set_bit(BTN_C, input_dev->keybit);
+               __set_bit(BTN_X, input_dev->keybit);
+               __set_bit(BTN_Y, input_dev->keybit);
+               __set_bit(BTN_Z, input_dev->keybit);
+               __set_bit(BTN_BASE, input_dev->keybit);
+               __set_bit(BTN_BASE2, input_dev->keybit);
+               /* fall through */
+
        case WACOM_BEE:
                __set_bit(BTN_8, input_dev->keybit);
                __set_bit(BTN_9, input_dev->keybit);
@@ -1105,6 +1144,8 @@ static const struct wacom_features wacom_features_0xBA =
        { "Wacom Intuos4 8x13",   WACOM_PKGLEN_INTUOS,    65024, 40640, 2047, 63, INTUOS4L };
 static const struct wacom_features wacom_features_0xBB =
        { "Wacom Intuos4 12x19",  WACOM_PKGLEN_INTUOS,    97536, 60960, 2047, 63, INTUOS4L };
+static const struct wacom_features wacom_features_0xBC =
+       { "Wacom Intuos4 WL",     WACOM_PKGLEN_INTUOS,    40840, 25400, 2047, 63, INTUOS4 };
 static const struct wacom_features wacom_features_0x3F =
        { "Wacom Cintiq 21UX",    WACOM_PKGLEN_INTUOS,    87200, 65600, 1023, 63, CINTIQ };
 static const struct wacom_features wacom_features_0xC5 =
@@ -1113,6 +1154,8 @@ static const struct wacom_features wacom_features_0xC6 =
        { "Wacom Cintiq 12WX",    WACOM_PKGLEN_INTUOS,    53020, 33440, 1023, 63, WACOM_BEE };
 static const struct wacom_features wacom_features_0xC7 =
        { "Wacom DTU1931",        WACOM_PKGLEN_GRAPHIRE,  37832, 30305,  511,  0, PL };
+static const struct wacom_features wacom_features_0xCC =
+       { "Wacom Cintiq 21UX2",   WACOM_PKGLEN_INTUOS,    87200, 65600, 2047, 63, WACOM_21UX2 };
 static const struct wacom_features wacom_features_0x90 =
        { "Wacom ISDv4 90",       WACOM_PKGLEN_GRAPHIRE,  26202, 16325,  255,  0, TABLETPC };
 static const struct wacom_features wacom_features_0x93 =
@@ -1185,10 +1228,12 @@ const struct usb_device_id wacom_ids[] = {
        { USB_DEVICE_WACOM(0xB9) },
        { USB_DEVICE_WACOM(0xBA) },
        { USB_DEVICE_WACOM(0xBB) },
+       { USB_DEVICE_WACOM(0xBC) },
        { USB_DEVICE_WACOM(0x3F) },
        { USB_DEVICE_WACOM(0xC5) },
        { USB_DEVICE_WACOM(0xC6) },
        { USB_DEVICE_WACOM(0xC7) },
+       { USB_DEVICE_WACOM(0xCC) },
        { USB_DEVICE_WACOM(0x90) },
        { USB_DEVICE_WACOM(0x93) },
        { USB_DEVICE_WACOM(0x9A) },
index 063f1af3204fb5dab3b2c8d85e47a56a54395727..854b92092dfcb8663f29bf601adc62d40ce71d1d 100644 (file)
@@ -50,6 +50,7 @@ enum {
        INTUOS4S,
        INTUOS4,
        INTUOS4L,
+       WACOM_21UX2,
        CINTIQ,
        WACOM_BEE,
        WACOM_MO,
index 6703c6b9800a4c290fde19dc5f1ab10c4ed2dc1f..3b9d5e2105d76d9fbfdd1a8d4cab9bf80f411b25 100644 (file)
@@ -156,7 +156,7 @@ config TOUCHSCREEN_FUJITSU
 config TOUCHSCREEN_S3C2410
        tristate "Samsung S3C2410/generic touchscreen input driver"
        depends on ARCH_S3C2410 || SAMSUNG_DEV_TS
-       select S3C24XX_ADC
+       select S3C_ADC
        help
          Say Y here if you have the s3c2410 touchscreen.
 
index 634f6f6b9b1349a27bcca9a056ca27a1b5151abc..a9fdf55c0238b14b4c6fa54fa257002f925d3daa 100644 (file)
@@ -1164,7 +1164,7 @@ static int __devinit ads7846_probe(struct spi_device *spi)
        ts->reg = regulator_get(&spi->dev, "vcc");
        if (IS_ERR(ts->reg)) {
                err = PTR_ERR(ts->reg);
-               dev_err(&spi->dev, "unable to get regulator: %ld\n", err);
+               dev_err(&spi->dev, "unable to get regulator: %d\n", err);
                goto err_free_gpio;
        }
 
index ac5d0f9b0cb14bac59636f3ae01315a517070567..6085d12fd56196e0e47873bade9b4880ab5ca356 100644 (file)
@@ -173,7 +173,7 @@ static irqreturn_t stylus_irq(int irq, void *dev_id)
        if (down)
                s3c_adc_start(ts.client, 0, 1 << ts.shift);
        else
-               dev_info(ts.dev, "%s: count=%d\n", __func__, ts.count);
+               dev_dbg(ts.dev, "%s: count=%d\n", __func__, ts.count);
 
        if (ts.features & FEAT_PEN_IRQ) {
                /* Clear pen down/up interrupt */
index 5de80a1a730b79ef129bf3f6980878719c04417a..5b70a1419b4d6da36fe5486b5b732d647691bdff 100644 (file)
@@ -221,7 +221,7 @@ done:
 
        if (poll) {
                schd = queue_delayed_work(tsc->wq, &tsc->work,
-                                         tsc->poll_period * HZ / 1000);
+                                         msecs_to_jiffies(tsc->poll_period));
                if (schd)
                        tsc->polling = 1;
                else {
@@ -326,7 +326,7 @@ static int tps6507x_ts_probe(struct platform_device *pdev)
                goto err2;
 
        schd = queue_delayed_work(tsc->wq, &tsc->work,
-                                 tsc->poll_period * HZ / 1000);
+                                 msecs_to_jiffies(tsc->poll_period));
 
        if (schd)
                tsc->polling = 1;
@@ -339,10 +339,8 @@ static int tps6507x_ts_probe(struct platform_device *pdev)
        return 0;
 
 err2:
-       cancel_delayed_work(&tsc->work);
-       flush_workqueue(tsc->wq);
+       cancel_delayed_work_sync(&tsc->work);
        destroy_workqueue(tsc->wq);
-       tsc->wq = 0;
        input_free_device(input_dev);
 err1:
        kfree(tsc);
@@ -360,10 +358,8 @@ static int __devexit tps6507x_ts_remove(struct platform_device *pdev)
        if (!tsc)
                return 0;
 
-       cancel_delayed_work(&tsc->work);
-       flush_workqueue(tsc->wq);
+       cancel_delayed_work_sync(&tsc->work);
        destroy_workqueue(tsc->wq);
-       tsc->wq = 0;
 
        input_free_device(input_dev);
 
index 195c6cf359f67fbb166f270ba5643e6b3c9be7d5..d22a8ec523fc1df4f1b7bc57c7e10c378e0f9956 100644 (file)
@@ -13,6 +13,7 @@ source "drivers/media/IR/keymaps/Kconfig"
 config IR_NEC_DECODER
        tristate "Enable IR raw decoder for the NEC protocol"
        depends on IR_CORE
+       select BITREVERSE
        default y
 
        ---help---
@@ -22,6 +23,7 @@ config IR_NEC_DECODER
 config IR_RC5_DECODER
        tristate "Enable IR raw decoder for the RC-5 protocol"
        depends on IR_CORE
+       select BITREVERSE
        default y
 
        ---help---
index 5e2045670004bbc0fd31f7182740fbf8b3997054..4bbd45f4284c37b53c1169b95f250a1eaf44d01b 100644 (file)
@@ -94,6 +94,7 @@ struct imon_context {
 
        bool display_supported;         /* not all controllers do */
        bool display_isopen;            /* display port has been opened */
+       bool rf_device;                 /* true if iMON 2.4G LT/DT RF device */
        bool rf_isassociating;          /* RF remote associating */
        bool dev_present_intf0;         /* USB device presence, interface 0 */
        bool dev_present_intf1;         /* USB device presence, interface 1 */
@@ -385,7 +386,7 @@ static int display_open(struct inode *inode, struct file *file)
                err("%s: display port is already open", __func__);
                retval = -EBUSY;
        } else {
-               ictx->display_isopen = 1;
+               ictx->display_isopen = true;
                file->private_data = ictx;
                dev_dbg(ictx->dev, "display port opened\n");
        }
@@ -422,7 +423,7 @@ static int display_close(struct inode *inode, struct file *file)
                err("%s: display is not open", __func__);
                retval = -EIO;
        } else {
-               ictx->display_isopen = 0;
+               ictx->display_isopen = false;
                dev_dbg(ictx->dev, "display port closed\n");
                if (!ictx->dev_present_intf0) {
                        /*
@@ -491,12 +492,12 @@ static int send_packet(struct imon_context *ictx)
        }
 
        init_completion(&ictx->tx.finished);
-       ictx->tx.busy = 1;
+       ictx->tx.busy = true;
        smp_rmb(); /* ensure later readers know we're busy */
 
        retval = usb_submit_urb(ictx->tx_urb, GFP_KERNEL);
        if (retval) {
-               ictx->tx.busy = 0;
+               ictx->tx.busy = false;
                smp_rmb(); /* ensure later readers know we're not busy */
                err("%s: error submitting urb(%d)", __func__, retval);
        } else {
@@ -682,7 +683,7 @@ static ssize_t store_associate_remote(struct device *d,
                return -ENODEV;
 
        mutex_lock(&ictx->lock);
-       ictx->rf_isassociating = 1;
+       ictx->rf_isassociating = true;
        send_associate_24g(ictx);
        mutex_unlock(&ictx->lock);
 
@@ -950,7 +951,7 @@ static void usb_tx_callback(struct urb *urb)
        ictx->tx.status = urb->status;
 
        /* notify waiters that write has finished */
-       ictx->tx.busy = 0;
+       ictx->tx.busy = false;
        smp_rmb(); /* ensure later readers know we're not busy */
        complete(&ictx->tx.finished);
 }
@@ -1215,7 +1216,7 @@ static bool imon_mouse_event(struct imon_context *ictx,
 {
        char rel_x = 0x00, rel_y = 0x00;
        u8 right_shift = 1;
-       bool mouse_input = 1;
+       bool mouse_input = true;
        int dir = 0;
 
        /* newer iMON device PAD or mouse button */
@@ -1246,7 +1247,7 @@ static bool imon_mouse_event(struct imon_context *ictx,
        } else if (ictx->kc == KEY_CHANNELDOWN && (buf[2] & 0x40) != 0x40) {
                dir = -1;
        } else
-               mouse_input = 0;
+               mouse_input = false;
 
        if (mouse_input) {
                dev_dbg(ictx->dev, "sending mouse data via input subsystem\n");
@@ -1450,7 +1451,7 @@ static void imon_incoming_packet(struct imon_context *ictx,
        unsigned char *buf = urb->transfer_buffer;
        struct device *dev = ictx->dev;
        u32 kc;
-       bool norelease = 0;
+       bool norelease = false;
        int i;
        u64 temp_key;
        u64 panel_key = 0;
@@ -1465,7 +1466,7 @@ static void imon_incoming_packet(struct imon_context *ictx,
        idev = ictx->idev;
 
        /* filter out junk data on the older 0xffdc imon devices */
-       if ((buf[0] == 0xff) && (buf[7] == 0xff))
+       if ((buf[0] == 0xff) && (buf[1] == 0xff) && (buf[2] == 0xff))
                return;
 
        /* Figure out what key was pressed */
@@ -1517,7 +1518,7 @@ static void imon_incoming_packet(struct imon_context *ictx,
             !(buf[1] & 0x1 || buf[1] >> 2 & 0x1))) {
                len = 8;
                imon_pad_to_keys(ictx, buf);
-               norelease = 1;
+               norelease = true;
        }
 
        if (debug) {
@@ -1580,7 +1581,7 @@ not_input_data:
            (buf[6] == 0x5E && buf[7] == 0xDF))) {      /* DT */
                dev_warn(dev, "%s: remote associated refid=%02X\n",
                         __func__, buf[1]);
-               ictx->rf_isassociating = 0;
+               ictx->rf_isassociating = false;
        }
 }
 
@@ -1790,9 +1791,9 @@ static bool imon_find_endpoints(struct imon_context *ictx,
        int ifnum = iface_desc->desc.bInterfaceNumber;
        int num_endpts = iface_desc->desc.bNumEndpoints;
        int i, ep_dir, ep_type;
-       bool ir_ep_found = 0;
-       bool display_ep_found = 0;
-       bool tx_control = 0;
+       bool ir_ep_found = false;
+       bool display_ep_found = false;
+       bool tx_control = false;
 
        /*
         * Scan the endpoint list and set:
@@ -1808,13 +1809,13 @@ static bool imon_find_endpoints(struct imon_context *ictx,
                    ep_type == USB_ENDPOINT_XFER_INT) {
 
                        rx_endpoint = ep;
-                       ir_ep_found = 1;
+                       ir_ep_found = true;
                        dev_dbg(ictx->dev, "%s: found IR endpoint\n", __func__);
 
                } else if (!display_ep_found && ep_dir == USB_DIR_OUT &&
                           ep_type == USB_ENDPOINT_XFER_INT) {
                        tx_endpoint = ep;
-                       display_ep_found = 1;
+                       display_ep_found = true;
                        dev_dbg(ictx->dev, "%s: found display endpoint\n", __func__);
                }
        }
@@ -1835,8 +1836,8 @@ static bool imon_find_endpoints(struct imon_context *ictx,
         * newer iMON devices that use control urb instead of interrupt
         */
        if (!display_ep_found) {
-               tx_control = 1;
-               display_ep_found = 1;
+               tx_control = true;
+               display_ep_found = true;
                dev_dbg(ictx->dev, "%s: device uses control endpoint, not "
                        "interface OUT endpoint\n", __func__);
        }
@@ -1847,7 +1848,7 @@ static bool imon_find_endpoints(struct imon_context *ictx,
         * and without... :\
         */
        if (ictx->display_type == IMON_DISPLAY_TYPE_NONE) {
-               display_ep_found = 0;
+               display_ep_found = false;
                dev_dbg(ictx->dev, "%s: device has no display\n", __func__);
        }
 
@@ -1856,7 +1857,7 @@ static bool imon_find_endpoints(struct imon_context *ictx,
         * that refers to e.g. /dev/lcd0 (a character device LCD or VFD).
         */
        if (ictx->display_type == IMON_DISPLAY_TYPE_VGA) {
-               display_ep_found = 0;
+               display_ep_found = false;
                dev_dbg(ictx->dev, "%s: iMON Touch device found\n", __func__);
        }
 
@@ -1905,9 +1906,10 @@ static struct imon_context *imon_init_intf0(struct usb_interface *intf)
 
        ictx->dev = dev;
        ictx->usbdev_intf0 = usb_get_dev(interface_to_usbdev(intf));
-       ictx->dev_present_intf0 = 1;
+       ictx->dev_present_intf0 = true;
        ictx->rx_urb_intf0 = rx_urb;
        ictx->tx_urb = tx_urb;
+       ictx->rf_device = false;
 
        ictx->vendor  = le16_to_cpu(ictx->usbdev_intf0->descriptor.idVendor);
        ictx->product = le16_to_cpu(ictx->usbdev_intf0->descriptor.idProduct);
@@ -1979,7 +1981,7 @@ static struct imon_context *imon_init_intf1(struct usb_interface *intf,
        }
 
        ictx->usbdev_intf1 = usb_get_dev(interface_to_usbdev(intf));
-       ictx->dev_present_intf1 = 1;
+       ictx->dev_present_intf1 = true;
        ictx->rx_urb_intf1 = rx_urb;
 
        ret = -ENODEV;
@@ -2047,6 +2049,12 @@ static void imon_get_ffdc_type(struct imon_context *ictx)
                dev_info(ictx->dev, "0xffdc iMON Knob, iMON IR");
                ictx->display_supported = false;
                break;
+       /* iMON 2.4G LT (usb stick), no display, iMON RF */
+       case 0x4e:
+               dev_info(ictx->dev, "0xffdc iMON 2.4G LT, iMON RF");
+               ictx->display_supported = false;
+               ictx->rf_device = true;
+               break;
        /* iMON VFD, no IR (does have vol knob tho) */
        case 0x35:
                dev_info(ictx->dev, "0xffdc iMON VFD + knob, no IR");
@@ -2197,15 +2205,6 @@ static int __devinit imon_probe(struct usb_interface *interface,
                        goto fail;
                }
 
-               if (product == 0xffdc) {
-                       /* RF products *also* use 0xffdc... sigh... */
-                       sysfs_err = sysfs_create_group(&interface->dev.kobj,
-                                                      &imon_rf_attribute_group);
-                       if (sysfs_err)
-                               err("%s: Could not create RF sysfs entries(%d)",
-                                   __func__, sysfs_err);
-               }
-
        } else {
        /* this is the secondary interface on the device */
                ictx = imon_init_intf1(interface, first_if_ctx);
@@ -2233,6 +2232,14 @@ static int __devinit imon_probe(struct usb_interface *interface,
 
                imon_set_display_type(ictx, interface);
 
+               if (product == 0xffdc && ictx->rf_device) {
+                       sysfs_err = sysfs_create_group(&interface->dev.kobj,
+                                                      &imon_rf_attribute_group);
+                       if (sysfs_err)
+                               err("%s: Could not create RF sysfs entries(%d)",
+                                   __func__, sysfs_err);
+               }
+
                if (ictx->display_supported)
                        imon_init_display(ictx, interface);
        }
@@ -2297,7 +2304,7 @@ static void __devexit imon_disconnect(struct usb_interface *interface)
        }
 
        if (ifnum == 0) {
-               ictx->dev_present_intf0 = 0;
+               ictx->dev_present_intf0 = false;
                usb_kill_urb(ictx->rx_urb_intf0);
                input_unregister_device(ictx->idev);
                if (ictx->display_supported) {
@@ -2307,7 +2314,7 @@ static void __devexit imon_disconnect(struct usb_interface *interface)
                                usb_deregister_dev(interface, &imon_vfd_class);
                }
        } else {
-               ictx->dev_present_intf1 = 0;
+               ictx->dev_present_intf1 = false;
                usb_kill_urb(ictx->rx_urb_intf1);
                if (ictx->display_type == IMON_DISPLAY_TYPE_VGA)
                        input_unregister_device(ictx->touch);
index 9374a006f43d6c82ba276e3d35f8261aa16a4108..94a8577e72ebd3ba09e264d2abd2213a0ead42c8 100644 (file)
@@ -490,11 +490,12 @@ int __ir_input_register(struct input_dev *input_dev,
        if (rc < 0)
                goto out_table;
 
-       if (ir_dev->props->driver_type == RC_DRIVER_IR_RAW) {
-               rc = ir_raw_event_register(input_dev);
-               if (rc < 0)
-                       goto out_event;
-       }
+       if (ir_dev->props)
+               if (ir_dev->props->driver_type == RC_DRIVER_IR_RAW) {
+                       rc = ir_raw_event_register(input_dev);
+                       if (rc < 0)
+                               goto out_event;
+               }
 
        IR_dprintk(1, "Registered input device on %s for %s remote.\n",
                   driver_name, rc_tab->name);
@@ -530,8 +531,10 @@ void ir_input_unregister(struct input_dev *input_dev)
        IR_dprintk(1, "Freed keycode table\n");
 
        del_timer_sync(&ir_dev->timer_keyup);
-       if (ir_dev->props->driver_type == RC_DRIVER_IR_RAW)
-               ir_raw_event_unregister(input_dev);
+       if (ir_dev->props)
+               if (ir_dev->props->driver_type == RC_DRIVER_IR_RAW)
+                       ir_raw_event_unregister(input_dev);
+
        rc_tab = &ir_dev->rc_tab;
        rc_tab->size = 0;
        kfree(rc_tab->scan);
index d7da63e16c92eff8fa4d37db0af99b544fa24eb1..2098dd1488e00647245057653ef6c1decb514026 100644 (file)
@@ -221,9 +221,10 @@ int ir_register_class(struct input_dev *input_dev)
        if (unlikely(devno < 0))
                return devno;
 
-       if (ir_dev->props->driver_type == RC_DRIVER_SCANCODE)
-               ir_dev->dev.type = &rc_dev_type;
-       else
+       if (ir_dev->props) {
+               if (ir_dev->props->driver_type == RC_DRIVER_SCANCODE)
+                       ir_dev->dev.type = &rc_dev_type;
+       } else
                ir_dev->dev.type = &ir_raw_dev_type;
 
        ir_dev->dev.class = &ir_input_class;
index ec25258a955f73b7f5fdbdd1709b435c31405c1f..aea649fbcf5a6a929a88dc7979f7840817b155c8 100644 (file)
@@ -6,7 +6,8 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \
                        rc-avermedia.o \
                        rc-avermedia-cardbus.o \
                        rc-avermedia-dvbt.o \
-                       rc-avermedia-m135a-rm-jx.o \
+                       rc-avermedia-m135a.o \
+                       rc-avermedia-m733a-rm-k6.o \
                        rc-avertv-303.o \
                        rc-behold.o \
                        rc-behold-columbus.o \
diff --git a/drivers/media/IR/keymaps/rc-avermedia-m135a-rm-jx.c b/drivers/media/IR/keymaps/rc-avermedia-m135a-rm-jx.c
deleted file mode 100644 (file)
index 101e7ea..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-/* avermedia-m135a-rm-jx.h - Keytable for avermedia_m135a_rm_jx Remote Controller
- *
- * keymap imported from ir-keymaps.c
- *
- * Copyright (c) 2010 by Mauro Carvalho Chehab <mchehab@redhat.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-#include <media/rc-map.h>
-
-/*
- * Avermedia M135A with IR model RM-JX
- * The same codes exist on both Positivo (BR) and original IR
- * Mauro Carvalho Chehab <mchehab@infradead.org>
- */
-
-static struct ir_scancode avermedia_m135a_rm_jx[] = {
-       { 0x0200, KEY_POWER2 },
-       { 0x022e, KEY_DOT },            /* '.' */
-       { 0x0201, KEY_MODE },           /* TV/FM or SOURCE */
-
-       { 0x0205, KEY_1 },
-       { 0x0206, KEY_2 },
-       { 0x0207, KEY_3 },
-       { 0x0209, KEY_4 },
-       { 0x020a, KEY_5 },
-       { 0x020b, KEY_6 },
-       { 0x020d, KEY_7 },
-       { 0x020e, KEY_8 },
-       { 0x020f, KEY_9 },
-       { 0x0211, KEY_0 },
-
-       { 0x0213, KEY_RIGHT },          /* -> or L */
-       { 0x0212, KEY_LEFT },           /* <- or R */
-
-       { 0x0217, KEY_SLEEP },          /* Capturar Imagem or Snapshot */
-       { 0x0210, KEY_SHUFFLE },        /* Amostra or 16 chan prev */
-
-       { 0x0303, KEY_CHANNELUP },
-       { 0x0302, KEY_CHANNELDOWN },
-       { 0x021f, KEY_VOLUMEUP },
-       { 0x021e, KEY_VOLUMEDOWN },
-       { 0x020c, KEY_ENTER },          /* Full Screen */
-
-       { 0x0214, KEY_MUTE },
-       { 0x0208, KEY_AUDIO },
-
-       { 0x0203, KEY_TEXT },           /* Teletext */
-       { 0x0204, KEY_EPG },
-       { 0x022b, KEY_TV2 },            /* TV2 or PIP */
-
-       { 0x021d, KEY_RED },
-       { 0x021c, KEY_YELLOW },
-       { 0x0301, KEY_GREEN },
-       { 0x0300, KEY_BLUE },
-
-       { 0x021a, KEY_PLAYPAUSE },
-       { 0x0219, KEY_RECORD },
-       { 0x0218, KEY_PLAY },
-       { 0x021b, KEY_STOP },
-};
-
-static struct rc_keymap avermedia_m135a_rm_jx_map = {
-       .map = {
-               .scan    = avermedia_m135a_rm_jx,
-               .size    = ARRAY_SIZE(avermedia_m135a_rm_jx),
-               .ir_type = IR_TYPE_NEC,
-               .name    = RC_MAP_AVERMEDIA_M135A_RM_JX,
-       }
-};
-
-static int __init init_rc_map_avermedia_m135a_rm_jx(void)
-{
-       return ir_register_map(&avermedia_m135a_rm_jx_map);
-}
-
-static void __exit exit_rc_map_avermedia_m135a_rm_jx(void)
-{
-       ir_unregister_map(&avermedia_m135a_rm_jx_map);
-}
-
-module_init(init_rc_map_avermedia_m135a_rm_jx)
-module_exit(exit_rc_map_avermedia_m135a_rm_jx)
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Mauro Carvalho Chehab <mchehab@redhat.com>");
diff --git a/drivers/media/IR/keymaps/rc-avermedia-m135a.c b/drivers/media/IR/keymaps/rc-avermedia-m135a.c
new file mode 100644 (file)
index 0000000..e4471fb
--- /dev/null
@@ -0,0 +1,147 @@
+/* avermedia-m135a.c - Keytable for Avermedia M135A Remote Controllers
+ *
+ * Copyright (c) 2010 by Mauro Carvalho Chehab <mchehab@redhat.com>
+ * Copyright (c) 2010 by Herton Ronaldo Krzesinski <herton@mandriva.com.br>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#include <media/rc-map.h>
+
+/*
+ * Avermedia M135A with RM-JX and RM-K6 remote controls
+ *
+ * On Avermedia M135A with IR model RM-JX, the same codes exist on both
+ * Positivo (BR) and original IR, initial version and remote control codes
+ * added by Mauro Carvalho Chehab <mchehab@infradead.org>
+ *
+ * Positivo also ships Avermedia M135A with model RM-K6, extra control
+ * codes added by Herton Ronaldo Krzesinski <herton@mandriva.com.br>
+ */
+
+static struct ir_scancode avermedia_m135a[] = {
+       /* RM-JX */
+       { 0x0200, KEY_POWER2 },
+       { 0x022e, KEY_DOT },            /* '.' */
+       { 0x0201, KEY_MODE },           /* TV/FM or SOURCE */
+
+       { 0x0205, KEY_1 },
+       { 0x0206, KEY_2 },
+       { 0x0207, KEY_3 },
+       { 0x0209, KEY_4 },
+       { 0x020a, KEY_5 },
+       { 0x020b, KEY_6 },
+       { 0x020d, KEY_7 },
+       { 0x020e, KEY_8 },
+       { 0x020f, KEY_9 },
+       { 0x0211, KEY_0 },
+
+       { 0x0213, KEY_RIGHT },          /* -> or L */
+       { 0x0212, KEY_LEFT },           /* <- or R */
+
+       { 0x0217, KEY_SLEEP },          /* Capturar Imagem or Snapshot */
+       { 0x0210, KEY_SHUFFLE },        /* Amostra or 16 chan prev */
+
+       { 0x0303, KEY_CHANNELUP },
+       { 0x0302, KEY_CHANNELDOWN },
+       { 0x021f, KEY_VOLUMEUP },
+       { 0x021e, KEY_VOLUMEDOWN },
+       { 0x020c, KEY_ENTER },          /* Full Screen */
+
+       { 0x0214, KEY_MUTE },
+       { 0x0208, KEY_AUDIO },
+
+       { 0x0203, KEY_TEXT },           /* Teletext */
+       { 0x0204, KEY_EPG },
+       { 0x022b, KEY_TV2 },            /* TV2 or PIP */
+
+       { 0x021d, KEY_RED },
+       { 0x021c, KEY_YELLOW },
+       { 0x0301, KEY_GREEN },
+       { 0x0300, KEY_BLUE },
+
+       { 0x021a, KEY_PLAYPAUSE },
+       { 0x0219, KEY_RECORD },
+       { 0x0218, KEY_PLAY },
+       { 0x021b, KEY_STOP },
+
+       /* RM-K6 */
+       { 0x0401, KEY_POWER2 },
+       { 0x0406, KEY_MUTE },
+       { 0x0408, KEY_MODE },     /* TV/FM */
+
+       { 0x0409, KEY_1 },
+       { 0x040a, KEY_2 },
+       { 0x040b, KEY_3 },
+       { 0x040c, KEY_4 },
+       { 0x040d, KEY_5 },
+       { 0x040e, KEY_6 },
+       { 0x040f, KEY_7 },
+       { 0x0410, KEY_8 },
+       { 0x0411, KEY_9 },
+       { 0x044c, KEY_DOT },      /* '.' */
+       { 0x0412, KEY_0 },
+       { 0x0407, KEY_REFRESH },  /* Refresh/Reload */
+
+       { 0x0413, KEY_AUDIO },
+       { 0x0440, KEY_SCREEN },   /* Full Screen toggle */
+       { 0x0441, KEY_HOME },
+       { 0x0442, KEY_BACK },
+       { 0x0447, KEY_UP },
+       { 0x0448, KEY_DOWN },
+       { 0x0449, KEY_LEFT },
+       { 0x044a, KEY_RIGHT },
+       { 0x044b, KEY_OK },
+       { 0x0404, KEY_VOLUMEUP },
+       { 0x0405, KEY_VOLUMEDOWN },
+       { 0x0402, KEY_CHANNELUP },
+       { 0x0403, KEY_CHANNELDOWN },
+
+       { 0x0443, KEY_RED },
+       { 0x0444, KEY_GREEN },
+       { 0x0445, KEY_YELLOW },
+       { 0x0446, KEY_BLUE },
+
+       { 0x0414, KEY_TEXT },
+       { 0x0415, KEY_EPG },
+       { 0x041a, KEY_TV2 },      /* PIP */
+       { 0x041b, KEY_MHP },      /* Snapshot */
+
+       { 0x0417, KEY_RECORD },
+       { 0x0416, KEY_PLAYPAUSE },
+       { 0x0418, KEY_STOP },
+       { 0x0419, KEY_PAUSE },
+
+       { 0x041f, KEY_PREVIOUS },
+       { 0x041c, KEY_REWIND },
+       { 0x041d, KEY_FORWARD },
+       { 0x041e, KEY_NEXT },
+};
+
+static struct rc_keymap avermedia_m135a_map = {
+       .map = {
+               .scan    = avermedia_m135a,
+               .size    = ARRAY_SIZE(avermedia_m135a),
+               .ir_type = IR_TYPE_NEC,
+               .name    = RC_MAP_AVERMEDIA_M135A,
+       }
+};
+
+static int __init init_rc_map_avermedia_m135a(void)
+{
+       return ir_register_map(&avermedia_m135a_map);
+}
+
+static void __exit exit_rc_map_avermedia_m135a(void)
+{
+       ir_unregister_map(&avermedia_m135a_map);
+}
+
+module_init(init_rc_map_avermedia_m135a)
+module_exit(exit_rc_map_avermedia_m135a)
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Mauro Carvalho Chehab <mchehab@redhat.com>");
diff --git a/drivers/media/IR/keymaps/rc-avermedia-m733a-rm-k6.c b/drivers/media/IR/keymaps/rc-avermedia-m733a-rm-k6.c
new file mode 100644 (file)
index 0000000..cf8d457
--- /dev/null
@@ -0,0 +1,95 @@
+/* avermedia-m733a-rm-k6.h - Keytable for avermedia_m733a_rm_k6 Remote Controller
+ *
+ * Copyright (c) 2010 by Herton Ronaldo Krzesinski <herton@mandriva.com.br>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#include <media/rc-map.h>
+
+/*
+ * Avermedia M733A with IR model RM-K6
+ * This is the stock remote controller used with Positivo machines with M733A
+ * Herton Ronaldo Krzesinski <herton@mandriva.com.br>
+ */
+
+static struct ir_scancode avermedia_m733a_rm_k6[] = {
+       { 0x0401, KEY_POWER2 },
+       { 0x0406, KEY_MUTE },
+       { 0x0408, KEY_MODE },     /* TV/FM */
+
+       { 0x0409, KEY_1 },
+       { 0x040a, KEY_2 },
+       { 0x040b, KEY_3 },
+       { 0x040c, KEY_4 },
+       { 0x040d, KEY_5 },
+       { 0x040e, KEY_6 },
+       { 0x040f, KEY_7 },
+       { 0x0410, KEY_8 },
+       { 0x0411, KEY_9 },
+       { 0x044c, KEY_DOT },      /* '.' */
+       { 0x0412, KEY_0 },
+       { 0x0407, KEY_REFRESH },  /* Refresh/Reload */
+
+       { 0x0413, KEY_AUDIO },
+       { 0x0440, KEY_SCREEN },   /* Full Screen toggle */
+       { 0x0441, KEY_HOME },
+       { 0x0442, KEY_BACK },
+       { 0x0447, KEY_UP },
+       { 0x0448, KEY_DOWN },
+       { 0x0449, KEY_LEFT },
+       { 0x044a, KEY_RIGHT },
+       { 0x044b, KEY_OK },
+       { 0x0404, KEY_VOLUMEUP },
+       { 0x0405, KEY_VOLUMEDOWN },
+       { 0x0402, KEY_CHANNELUP },
+       { 0x0403, KEY_CHANNELDOWN },
+
+       { 0x0443, KEY_RED },
+       { 0x0444, KEY_GREEN },
+       { 0x0445, KEY_YELLOW },
+       { 0x0446, KEY_BLUE },
+
+       { 0x0414, KEY_TEXT },
+       { 0x0415, KEY_EPG },
+       { 0x041a, KEY_TV2 },      /* PIP */
+       { 0x041b, KEY_MHP },      /* Snapshot */
+
+       { 0x0417, KEY_RECORD },
+       { 0x0416, KEY_PLAYPAUSE },
+       { 0x0418, KEY_STOP },
+       { 0x0419, KEY_PAUSE },
+
+       { 0x041f, KEY_PREVIOUS },
+       { 0x041c, KEY_REWIND },
+       { 0x041d, KEY_FORWARD },
+       { 0x041e, KEY_NEXT },
+};
+
+static struct rc_keymap avermedia_m733a_rm_k6_map = {
+       .map = {
+               .scan    = avermedia_m733a_rm_k6,
+               .size    = ARRAY_SIZE(avermedia_m733a_rm_k6),
+               .ir_type = IR_TYPE_NEC,
+               .name    = RC_MAP_AVERMEDIA_M733A_RM_K6,
+       }
+};
+
+static int __init init_rc_map_avermedia_m733a_rm_k6(void)
+{
+       return ir_register_map(&avermedia_m733a_rm_k6_map);
+}
+
+static void __exit exit_rc_map_avermedia_m733a_rm_k6(void)
+{
+       ir_unregister_map(&avermedia_m733a_rm_k6_map);
+}
+
+module_init(init_rc_map_avermedia_m733a_rm_k6)
+module_exit(exit_rc_map_avermedia_m733a_rm_k6)
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Mauro Carvalho Chehab <mchehab@redhat.com>");
index b762e561a6d58a4de3509fca73989cbdb9bacb4e..bca07c0bcd01e4b872bd02a364bc760fd38735d5 100644 (file)
@@ -594,7 +594,7 @@ static irqreturn_t dm1105_irq(int irq, void *dev_id)
 int __devinit dm1105_ir_init(struct dm1105_dev *dm1105)
 {
        struct input_dev *input_dev;
-       char *ir_codes = NULL;
+       char *ir_codes = RC_MAP_DM1105_NEC;
        int err = -ENOMEM;
 
        input_dev = input_allocate_device();
index f6dac2bb0ac658c2f14fa39d65644ecb117d3547..6c3a8a06ccab03ed30fcf4481958a1d532f7fbcf 100644 (file)
@@ -351,6 +351,7 @@ static void dvb_net_ule( struct net_device *dev, const u8 *buf, size_t buf_len )
        const u8 *ts, *ts_end, *from_where = NULL;
        u8 ts_remain = 0, how_much = 0, new_ts = 1;
        struct ethhdr *ethh = NULL;
+       bool error = false;
 
 #ifdef ULE_DEBUG
        /* The code inside ULE_DEBUG keeps a history of the last 100 TS cells processed. */
@@ -460,10 +461,16 @@ static void dvb_net_ule( struct net_device *dev, const u8 *buf, size_t buf_len )
 
                                                /* Drop partly decoded SNDU, reset state, resync on PUSI. */
                                                if (priv->ule_skb) {
-                                                       dev_kfree_skb( priv->ule_skb );
+                                                       error = true;
+                                                       dev_kfree_skb(priv->ule_skb);
+                                               }
+
+                                               if (error || priv->ule_sndu_remain) {
                                                        dev->stats.rx_errors++;
                                                        dev->stats.rx_frame_errors++;
+                                                       error = false;
                                                }
+
                                                reset_ule(priv);
                                                priv->need_pusi = 1;
                                                continue;
@@ -535,6 +542,7 @@ static void dvb_net_ule( struct net_device *dev, const u8 *buf, size_t buf_len )
                                from_where += 2;
                        }
 
+                       priv->ule_sndu_remain = priv->ule_sndu_len + 2;
                        /*
                         * State of current TS:
                         *   ts_remain (remaining bytes in the current TS cell)
@@ -544,6 +552,7 @@ static void dvb_net_ule( struct net_device *dev, const u8 *buf, size_t buf_len )
                         */
                        switch (ts_remain) {
                                case 1:
+                                       priv->ule_sndu_remain--;
                                        priv->ule_sndu_type = from_where[0] << 8;
                                        priv->ule_sndu_type_1 = 1; /* first byte of ule_type is set. */
                                        ts_remain -= 1; from_where += 1;
@@ -557,6 +566,7 @@ static void dvb_net_ule( struct net_device *dev, const u8 *buf, size_t buf_len )
                                default: /* complete ULE header is present in current TS. */
                                        /* Extract ULE type field. */
                                        if (priv->ule_sndu_type_1) {
+                                               priv->ule_sndu_type_1 = 0;
                                                priv->ule_sndu_type |= from_where[0];
                                                from_where += 1; /* points to payload start. */
                                                ts_remain -= 1;
index e5f91f16ffa4ea51ae3f74cf06477eed56186a24..553b48ac1919068cddaa461e7302e3d004b54c4f 100644 (file)
@@ -76,6 +76,7 @@ config DVB_USB_DIB0700
        select DVB_S5H1411 if !DVB_FE_CUSTOMISE
        select DVB_LGDT3305 if !DVB_FE_CUSTOMISE
        select DVB_TUNER_DIB0070 if !DVB_FE_CUSTOMISE
+       select DVB_TUNER_DIB0090 if !DVB_FE_CUSTOMISE
        select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMISE
        select MEDIA_TUNER_MT2266 if !MEDIA_TUNER_CUSTOMISE
        select MEDIA_TUNER_XC2028 if !MEDIA_TUNER_CUSTOMISE
@@ -134,6 +135,7 @@ config DVB_USB_M920X
        select DVB_TDA1004X if !DVB_FE_CUSTOMISE
        select MEDIA_TUNER_QT1010 if !MEDIA_TUNER_CUSTOMISE
        select MEDIA_TUNER_TDA827X if !MEDIA_TUNER_CUSTOMISE
+       select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMISE
        help
          Say Y here to support the MSI Mega Sky 580 USB2.0 DVB-T receiver.
          Currently, only devices with a product id of
@@ -264,7 +266,7 @@ config DVB_USB_DW2102
        select DVB_STB6000 if !DVB_FE_CUSTOMISE
        select DVB_CX24116 if !DVB_FE_CUSTOMISE
        select DVB_SI21XX if !DVB_FE_CUSTOMISE
-       select DVB_TDA10021 if !DVB_FE_CUSTOMISE
+       select DVB_TDA10023 if !DVB_FE_CUSTOMISE
        select DVB_MT312 if !DVB_FE_CUSTOMISE
        select DVB_ZL10039 if !DVB_FE_CUSTOMISE
        select DVB_DS3000 if !DVB_FE_CUSTOMISE
index 0eb49088916225c735f902ef3567b4c0b5d30b3b..11e9e85dac86b1f527ef43995e226ff1d14854fb 100644 (file)
@@ -1026,8 +1026,10 @@ static int cxusb_dualdig4_rev2_frontend_attach(struct dvb_usb_adapter *adap)
        cxusb_bluebird_gpio_pulse(adap->dev, 0x02, 1);
 
        if (dib7000p_i2c_enumeration(&adap->dev->i2c_adap, 1, 18,
-                                &cxusb_dualdig4_rev2_config) < 0)
+                                    &cxusb_dualdig4_rev2_config) < 0) {
+               printk(KERN_WARNING "Unable to enumerate dib7000p\n");
                return -ENODEV;
+       }
 
        adap->fe = dvb_attach(dib7000p_attach, &adap->dev->i2c_adap, 0x80,
                              &cxusb_dualdig4_rev2_config);
index 085c4e457e0e22c611f6e087d9fc4b6d98f7d8ad..b4afe6f8ed1900f22bc26bd00c1f53aef2f73b34 100644 (file)
 #define USB_PID_AVERMEDIA_A850                         0x850a
 #define USB_PID_AVERMEDIA_A805                         0xa805
 #define USB_PID_TECHNOTREND_CONNECT_S2400               0x3006
+#define USB_PID_TECHNOTREND_CONNECT_CT3650             0x300d
 #define USB_PID_TERRATEC_CINERGY_DT_XS_DIVERSITY       0x005a
 #define USB_PID_TERRATEC_CINERGY_DT_XS_DIVERSITY_2     0x0081
 #define USB_PID_TERRATEC_CINERGY_HT_USB_XE             0x0058
index 20ca9d9ee99b23aedb60d3ecf3e892c5d9ae71a5..a6de489a6a39e0c3ba63c897963317081ceeb416 100644 (file)
@@ -29,6 +29,8 @@
 
 #include "tda826x.h"
 #include "tda10086.h"
+#include "tda1002x.h"
+#include "tda827x.h"
 #include "lnbp21.h"
 
 /* debug */
@@ -150,7 +152,17 @@ static struct tda10086_config tda10086_config = {
        .xtal_freq = TDA10086_XTAL_16M,
 };
 
-static int ttusb2_frontend_attach(struct dvb_usb_adapter *adap)
+static struct tda10023_config tda10023_config = {
+       .demod_address = 0x0c,
+       .invert = 0,
+       .xtal = 16000000,
+       .pll_m = 11,
+       .pll_p = 3,
+       .pll_n = 1,
+       .deltaf = 0xa511,
+};
+
+static int ttusb2_frontend_tda10086_attach(struct dvb_usb_adapter *adap)
 {
        if (usb_set_interface(adap->dev->udev,0,3) < 0)
                err("set interface to alts=3 failed");
@@ -163,7 +175,27 @@ static int ttusb2_frontend_attach(struct dvb_usb_adapter *adap)
        return 0;
 }
 
-static int ttusb2_tuner_attach(struct dvb_usb_adapter *adap)
+static int ttusb2_frontend_tda10023_attach(struct dvb_usb_adapter *adap)
+{
+       if (usb_set_interface(adap->dev->udev, 0, 3) < 0)
+               err("set interface to alts=3 failed");
+       if ((adap->fe = dvb_attach(tda10023_attach, &tda10023_config, &adap->dev->i2c_adap, 0x48)) == NULL) {
+               deb_info("TDA10023 attach failed\n");
+               return -ENODEV;
+       }
+       return 0;
+}
+
+static int ttusb2_tuner_tda827x_attach(struct dvb_usb_adapter *adap)
+{
+       if (dvb_attach(tda827x_attach, adap->fe, 0x61, &adap->dev->i2c_adap, NULL) == NULL) {
+               printk(KERN_ERR "%s: No tda827x found!\n", __func__);
+               return -ENODEV;
+       }
+       return 0;
+}
+
+static int ttusb2_tuner_tda826x_attach(struct dvb_usb_adapter *adap)
 {
        if (dvb_attach(tda826x_attach, adap->fe, 0x60, &adap->dev->i2c_adap, 0) == NULL) {
                deb_info("TDA8263 attach failed\n");
@@ -180,6 +212,7 @@ static int ttusb2_tuner_attach(struct dvb_usb_adapter *adap)
 /* DVB USB Driver stuff */
 static struct dvb_usb_device_properties ttusb2_properties;
 static struct dvb_usb_device_properties ttusb2_properties_s2400;
+static struct dvb_usb_device_properties ttusb2_properties_ct3650;
 
 static int ttusb2_probe(struct usb_interface *intf,
                const struct usb_device_id *id)
@@ -187,6 +220,8 @@ static int ttusb2_probe(struct usb_interface *intf,
        if (0 == dvb_usb_device_init(intf, &ttusb2_properties,
                                     THIS_MODULE, NULL, adapter_nr) ||
            0 == dvb_usb_device_init(intf, &ttusb2_properties_s2400,
+                                    THIS_MODULE, NULL, adapter_nr) ||
+           0 == dvb_usb_device_init(intf, &ttusb2_properties_ct3650,
                                     THIS_MODULE, NULL, adapter_nr))
                return 0;
        return -ENODEV;
@@ -197,6 +232,8 @@ static struct usb_device_id ttusb2_table [] = {
        { USB_DEVICE(USB_VID_PINNACLE, USB_PID_PCTV_450E) },
        { USB_DEVICE(USB_VID_TECHNOTREND,
                USB_PID_TECHNOTREND_CONNECT_S2400) },
+       { USB_DEVICE(USB_VID_TECHNOTREND,
+               USB_PID_TECHNOTREND_CONNECT_CT3650) },
        {}              /* Terminating entry */
 };
 MODULE_DEVICE_TABLE (usb, ttusb2_table);
@@ -214,8 +251,8 @@ static struct dvb_usb_device_properties ttusb2_properties = {
                {
                        .streaming_ctrl   = NULL, // ttusb2_streaming_ctrl,
 
-                       .frontend_attach  = ttusb2_frontend_attach,
-                       .tuner_attach     = ttusb2_tuner_attach,
+                       .frontend_attach  = ttusb2_frontend_tda10086_attach,
+                       .tuner_attach     = ttusb2_tuner_tda826x_attach,
 
                        /* parameter for the MPEG2-data transfer */
                        .stream = {
@@ -266,8 +303,8 @@ static struct dvb_usb_device_properties ttusb2_properties_s2400 = {
                {
                        .streaming_ctrl   = NULL,
 
-                       .frontend_attach  = ttusb2_frontend_attach,
-                       .tuner_attach     = ttusb2_tuner_attach,
+                       .frontend_attach  = ttusb2_frontend_tda10086_attach,
+                       .tuner_attach     = ttusb2_tuner_tda826x_attach,
 
                        /* parameter for the MPEG2-data transfer */
                        .stream = {
@@ -301,6 +338,52 @@ static struct dvb_usb_device_properties ttusb2_properties_s2400 = {
        }
 };
 
+static struct dvb_usb_device_properties ttusb2_properties_ct3650 = {
+       .caps = DVB_USB_IS_AN_I2C_ADAPTER,
+
+       .usb_ctrl = CYPRESS_FX2,
+
+       .size_of_priv = sizeof(struct ttusb2_state),
+
+       .num_adapters = 1,
+       .adapter = {
+               {
+                       .streaming_ctrl   = NULL,
+
+                       .frontend_attach  = ttusb2_frontend_tda10023_attach,
+                       .tuner_attach = ttusb2_tuner_tda827x_attach,
+
+                       /* parameter for the MPEG2-data transfer */
+                       .stream = {
+                               .type = USB_ISOC,
+                               .count = 5,
+                               .endpoint = 0x02,
+                               .u = {
+                                       .isoc = {
+                                               .framesperurb = 4,
+                                               .framesize = 940,
+                                               .interval = 1,
+                                       }
+                               }
+                       }
+               },
+       },
+
+       .power_ctrl       = ttusb2_power_ctrl,
+       .identify_state   = ttusb2_identify_state,
+
+       .i2c_algo         = &ttusb2_i2c_algo,
+
+       .generic_bulk_ctrl_endpoint = 0x01,
+
+       .num_device_descs = 1,
+       .devices = {
+               {   "Technotrend TT-connect CT-3650",
+                       .warm_ids = { &ttusb2_table[3], NULL },
+               },
+       }
+};
+
 static struct usb_driver ttusb2_driver = {
        .name           = "dvb_usb_ttusb2",
        .probe          = ttusb2_probe,
index 26333b4f4d3e9b039460513189383fcf45199745..b34ca7afb0e6bf7697fe188b5fd098a266ad5272 100644 (file)
@@ -58,7 +58,7 @@ static void rawiso_activity_cb(struct hpsb_iso *iso)
        num = hpsb_iso_n_ready(iso);
 
        if (!fdtv) {
-               dev_err(fdtv->device, "received at unknown iso channel\n");
+               pr_err("received at unknown iso channel\n");
                goto out;
        }
 
index 68dba3a4b4dab43fe61584cc7dec323db2765679..29cdbfe36852b865933ddd3b2f80f0dc0e5d57e6 100644 (file)
@@ -567,30 +567,6 @@ static int au8522_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
 
 /* ----------------------------------------------------------------------- */
 
-static int au8522_g_fmt(struct v4l2_subdev *sd, struct v4l2_format *fmt)
-{
-       switch (fmt->type) {
-       default:
-               return -EINVAL;
-       }
-       return 0;
-}
-
-static int au8522_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *fmt)
-{
-       switch (fmt->type) {
-       case V4L2_BUF_TYPE_VIDEO_CAPTURE:
-               /* Not yet implemented */
-               break;
-       default:
-               return -EINVAL;
-       }
-
-       return 0;
-}
-
-/* ----------------------------------------------------------------------- */
-
 #ifdef CONFIG_VIDEO_ADV_DEBUG
 static int au8522_g_register(struct v4l2_subdev *sd,
                             struct v4l2_dbg_register *reg)
@@ -772,8 +748,6 @@ static const struct v4l2_subdev_audio_ops au8522_audio_ops = {
 
 static const struct v4l2_subdev_video_ops au8522_video_ops = {
        .s_routing = au8522_s_video_routing,
-       .g_fmt = au8522_g_fmt,
-       .s_fmt = au8522_s_fmt,
        .s_stream = au8522_s_stream,
 };
 
index 78001e8bcdb74004c7930df01bcb1efa708ef922..fc61d9230db8bd1d0eb9541e8698da647f0a5367 100644 (file)
@@ -969,15 +969,12 @@ struct dvb_frontend *ds3000_attach(const struct ds3000_config *config,
        dprintk("%s\n", __func__);
 
        /* allocate memory for the internal state */
-       state = kmalloc(sizeof(struct ds3000_state), GFP_KERNEL);
+       state = kzalloc(sizeof(struct ds3000_state), GFP_KERNEL);
        if (state == NULL) {
                printk(KERN_ERR "Unable to kmalloc\n");
                goto error2;
        }
 
-       /* setup the state */
-       memset(state, 0, sizeof(struct ds3000_state));
-
        state->config = config;
        state->i2c = i2c;
        state->prevUCBS2 = 0;
index 42591ce1aaaddbd62c104a9ab47d807a3239e882..f36cab12bdc71964a463a79e4553738f00126dca 100644 (file)
@@ -303,7 +303,10 @@ static int stv6110x_set_mode(struct dvb_frontend *fe, enum tuner_mode mode)
 
 static int stv6110x_sleep(struct dvb_frontend *fe)
 {
-       return stv6110x_set_mode(fe, TUNER_SLEEP);
+       if (fe->tuner_priv)
+               return stv6110x_set_mode(fe, TUNER_SLEEP);
+
+       return 0;
 }
 
 static int stv6110x_get_status(struct dvb_frontend *fe, u32 *status)
index 692c3e226e83ff25efb04313a1aaafe0285de21a..4692a41ad95b8b598ab2b16c9a92a776db522898 100644 (file)
@@ -217,6 +217,19 @@ static struct ngene_info ngene_info_cineS2v5 = {
        .fw_version     = 15,
 };
 
+static struct ngene_info ngene_info_duoFlexS2 = {
+       .type           = NGENE_SIDEWINDER,
+       .name           = "Digital Devices DuoFlex S2 miniPCIe",
+       .io_type        = {NGENE_IO_TSIN, NGENE_IO_TSIN},
+       .demod_attach   = {demod_attach_stv0900, demod_attach_stv0900},
+       .tuner_attach   = {tuner_attach_stv6110, tuner_attach_stv6110},
+       .fe_config      = {&fe_cineS2, &fe_cineS2},
+       .tuner_config   = {&tuner_cineS2_0, &tuner_cineS2_1},
+       .lnb            = {0x0a, 0x08},
+       .tsf            = {3, 3},
+       .fw_version     = 15,
+};
+
 static struct ngene_info ngene_info_m780 = {
        .type           = NGENE_APP,
        .name           = "Aver M780 ATSC/QAM-B",
@@ -256,6 +269,8 @@ static const struct pci_device_id ngene_id_tbl[] __devinitdata = {
        NGENE_ID(0x18c3, 0xdb01, ngene_info_satixS2),
        NGENE_ID(0x18c3, 0xdb02, ngene_info_satixS2v2),
        NGENE_ID(0x18c3, 0xdd00, ngene_info_cineS2v5),
+       NGENE_ID(0x18c3, 0xdd10, ngene_info_duoFlexS2),
+       NGENE_ID(0x18c3, 0xdd20, ngene_info_duoFlexS2),
        NGENE_ID(0x1461, 0x062e, ngene_info_m780),
        {0}
 };
index c8b4dfa0ab5f07f5df9ad6906730b618c2344426..4caeb163a66668da958cdae28058c2e0bb67a3af 100644 (file)
@@ -53,8 +53,6 @@ MODULE_PARM_DESC(debug, "Print debugging information.");
 
 DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
 
-#define COMMAND_TIMEOUT_WORKAROUND
-
 #define dprintk        if (debug) printk
 
 #define ngwriteb(dat, adr)         writeb((dat), (char *)(dev->iomem + (adr)))
@@ -147,24 +145,24 @@ static void demux_tasklet(unsigned long data)
                } else {
                        if (chan->HWState == HWSTATE_RUN) {
                                u32 Flags = 0;
+                               IBufferExchange *exch1 = chan->pBufferExchange;
+                               IBufferExchange *exch2 = chan->pBufferExchange2;
                                if (Cur->ngeneBuffer.SR.Flags & 0x01)
                                        Flags |= BEF_EVEN_FIELD;
                                if (Cur->ngeneBuffer.SR.Flags & 0x20)
                                        Flags |= BEF_OVERFLOW;
-                               if (chan->pBufferExchange)
-                                       chan->pBufferExchange(chan,
-                                                             Cur->Buffer1,
-                                                             chan->
-                                                             Capture1Length,
-                                                             Cur->ngeneBuffer.
-                                                             SR.Clock, Flags);
-                               if (chan->pBufferExchange2)
-                                       chan->pBufferExchange2(chan,
-                                                              Cur->Buffer2,
-                                                              chan->
-                                                              Capture2Length,
-                                                              Cur->ngeneBuffer.
-                                                              SR.Clock, Flags);
+                               spin_unlock_irq(&chan->state_lock);
+                               if (exch1)
+                                       exch1(chan, Cur->Buffer1,
+                                               chan->Capture1Length,
+                                               Cur->ngeneBuffer.SR.Clock,
+                                               Flags);
+                               if (exch2)
+                                       exch2(chan, Cur->Buffer2,
+                                               chan->Capture2Length,
+                                               Cur->ngeneBuffer.SR.Clock,
+                                               Flags);
+                               spin_lock_irq(&chan->state_lock);
                        } else if (chan->HWState != HWSTATE_STOP)
                                chan->HWState = HWSTATE_RUN;
                }
@@ -572,11 +570,7 @@ static int ngene_command_stream_control(struct ngene *dev, u8 stream,
        u16 BsSPI = ((stream & 1) ? 0x9800 : 0x9700);
        u16 BsSDO = 0x9B00;
 
-       /* down(&dev->stream_mutex); */
-       while (down_trylock(&dev->stream_mutex)) {
-               printk(KERN_INFO DEVICE_NAME ": SC locked\n");
-               msleep(1);
-       }
+       down(&dev->stream_mutex);
        memset(&com, 0, sizeof(com));
        com.cmd.hdr.Opcode = CMD_CONTROL;
        com.cmd.hdr.Length = sizeof(struct FW_STREAM_CONTROL) - 2;
@@ -1252,14 +1246,17 @@ static int ngene_load_firm(struct ngene *dev)
                version = 15;
                size = 23466;
                fw_name = "ngene_15.fw";
+               dev->cmd_timeout_workaround = true;
                break;
        case 16:
                size = 23498;
                fw_name = "ngene_16.fw";
+               dev->cmd_timeout_workaround = true;
                break;
        case 17:
                size = 24446;
                fw_name = "ngene_17.fw";
+               dev->cmd_timeout_workaround = true;
                break;
        }
 
@@ -1299,11 +1296,16 @@ static void ngene_stop(struct ngene *dev)
        ngwritel(0, NGENE_EVENT);
        ngwritel(0, NGENE_EVENT_HI);
        free_irq(dev->pci_dev->irq, dev);
+#ifdef CONFIG_PCI_MSI
+       if (dev->msi_enabled)
+               pci_disable_msi(dev->pci_dev);
+#endif
 }
 
 static int ngene_start(struct ngene *dev)
 {
        int stat;
+       unsigned long flags;
        int i;
 
        pci_set_master(dev->pci_dev);
@@ -1333,6 +1335,28 @@ static int ngene_start(struct ngene *dev)
        if (stat < 0)
                goto fail;
 
+#ifdef CONFIG_PCI_MSI
+       /* enable MSI if kernel and card support it */
+       if (pci_msi_enabled() && dev->card_info->msi_supported) {
+               ngwritel(0, NGENE_INT_ENABLE);
+               free_irq(dev->pci_dev->irq, dev);
+               stat = pci_enable_msi(dev->pci_dev);
+               if (stat) {
+                       printk(KERN_INFO DEVICE_NAME
+                               ": MSI not available\n");
+                       flags = IRQF_SHARED;
+               } else {
+                       flags = 0;
+                       dev->msi_enabled = true;
+               }
+               stat = request_irq(dev->pci_dev->irq, irq_handler,
+                                       flags, "nGene", dev);
+               if (stat < 0)
+                       goto fail2;
+               ngwritel(1, NGENE_INT_ENABLE);
+       }
+#endif
+
        stat = ngene_i2c_init(dev, 0);
        if (stat < 0)
                goto fail;
@@ -1358,10 +1382,18 @@ static int ngene_start(struct ngene *dev)
                        bconf = BUFFER_CONFIG_3333;
                stat = ngene_command_config_buf(dev, bconf);
        }
-       return stat;
+       if (!stat)
+               return stat;
+
+       /* otherwise error: fall through */
 fail:
        ngwritel(0, NGENE_INT_ENABLE);
        free_irq(dev->pci_dev->irq, dev);
+#ifdef CONFIG_PCI_MSI
+fail2:
+       if (dev->msi_enabled)
+               pci_disable_msi(dev->pci_dev);
+#endif
        return stat;
 }
 
@@ -1379,10 +1411,8 @@ static void release_channel(struct ngene_channel *chan)
        struct ngene_info *ni = dev->card_info;
        int io = ni->io_type[chan->number];
 
-#ifdef COMMAND_TIMEOUT_WORKAROUND
-       if (chan->running)
+       if (chan->dev->cmd_timeout_workaround && chan->running)
                set_transfer(chan, 0);
-#endif
 
        tasklet_kill(&chan->demux_tasklet);
 
index 96013eb353cda0db1e46724d3e0542e91888a61a..48f980b21d663ad94b89b17689d62737104b6ac4 100644 (file)
 #include <linux/pci.h>
 #include <linux/smp_lock.h>
 #include <linux/timer.h>
-#include <linux/version.h>
 #include <linux/byteorder/generic.h>
 #include <linux/firmware.h>
 #include <linux/vmalloc.h>
 
 #include "ngene.h"
 
-#define COMMAND_TIMEOUT_WORKAROUND
-
 
 /****************************************************************************/
 /* COMMAND API interface ****************************************************/
@@ -69,9 +66,7 @@ void *tsin_exchange(void *priv, void *buf, u32 len, u32 clock, u32 flags)
        struct ngene_channel *chan = priv;
 
 
-#ifdef COMMAND_TIMEOUT_WORKAROUND
        if (chan->users > 0)
-#endif
                dvb_dmx_swfilter(&chan->demux, buf, len);
        return NULL;
 }
@@ -106,11 +101,8 @@ int ngene_start_feed(struct dvb_demux_feed *dvbdmxfeed)
        struct ngene_channel *chan = dvbdmx->priv;
 
        if (chan->users == 0) {
-#ifdef COMMAND_TIMEOUT_WORKAROUND
-               if (!chan->running)
-#endif
+               if (!chan->dev->cmd_timeout_workaround || !chan->running)
                        set_transfer(chan, 1);
-               /* msleep(10); */
        }
 
        return ++chan->users;
@@ -124,9 +116,8 @@ int ngene_stop_feed(struct dvb_demux_feed *dvbdmxfeed)
        if (--chan->users)
                return chan->users;
 
-#ifndef COMMAND_TIMEOUT_WORKAROUND
-       set_transfer(chan, 0);
-#endif
+       if (!chan->dev->cmd_timeout_workaround)
+               set_transfer(chan, 0);
 
        return 0;
 }
index 2ef54ca6baddc2399c7043b516ba3502afcb1424..477fe0aade866bea99040fc8ca8b134883fc2919 100644 (file)
@@ -39,7 +39,6 @@
 #include <linux/pci_ids.h>
 #include <linux/smp_lock.h>
 #include <linux/timer.h>
-#include <linux/version.h>
 #include <linux/byteorder/generic.h>
 #include <linux/firmware.h>
 #include <linux/vmalloc.h>
index 676fcbb79026847cfb8694c5d22d25d711195ddd..8fb4200f83f847e73d0f17b6e70e0a33dd107df1 100644 (file)
@@ -725,6 +725,8 @@ struct ngene {
        u32                   device_version;
        u32                   fw_interface_version;
        u32                   icounts;
+       bool                  msi_enabled;
+       bool                  cmd_timeout_workaround;
 
        u8                   *CmdDoneByte;
        int                   BootFirmware;
@@ -797,6 +799,7 @@ struct ngene_info {
 #define NGENE_VBOX_V2   7
 
        int   fw_version;
+       bool  msi_supported;
        char *name;
 
        int   io_type[MAX_STREAM];
index d8d4214fd65f2c7af9d3af1a263a30f9dc24e3a9..32a7ec65ec42f1c40fbb4e4576b56cded5045902 100644 (file)
@@ -68,13 +68,14 @@ config DVB_BUDGET
        select DVB_VES1820 if !DVB_FE_CUSTOMISE
        select DVB_L64781 if !DVB_FE_CUSTOMISE
        select DVB_TDA8083 if !DVB_FE_CUSTOMISE
-       select DVB_TDA10021 if !DVB_FE_CUSTOMISE
-       select DVB_TDA10023 if !DVB_FE_CUSTOMISE
        select DVB_S5H1420 if !DVB_FE_CUSTOMISE
        select DVB_TDA10086 if !DVB_FE_CUSTOMISE
        select DVB_TDA826X if !DVB_FE_CUSTOMISE
        select DVB_LNBP21 if !DVB_FE_CUSTOMISE
        select DVB_TDA1004X if !DVB_FE_CUSTOMISE
+       select DVB_ISL6423 if !DVB_FE_CUSTOMISE
+       select DVB_STV090x if !DVB_FE_CUSTOMISE
+       select DVB_STV6110x if !DVB_FE_CUSTOMISE
        help
          Support for simple SAA7146 based DVB cards (so called Budget-
          or Nova-PCI cards) without onboard MPEG2 decoder, and without
index 46171439633136fc23b6b8e869abba15b1a9a8e9..13ac9e3ab1210dab3cbe4d9ae469af49a98c434b 100644 (file)
@@ -215,6 +215,7 @@ static int msp430_ir_init(struct budget_ci *budget_ci)
                break;
        case 0x1010:
        case 0x1017:
+       case 0x1019:
        case 0x101a:
                /* for the Technotrend 1500 bundled remote */
                ir_codes = RC_MAP_TT_1500;
index ad9e6f9c22e9a04473565a245c254ec7f21a3089..bdbc9d305419d8778d7bfceded703e1fb55d4c9b 100644 (file)
@@ -646,7 +646,7 @@ config VIDEO_PMS
 
 config VIDEO_BWQCAM
        tristate "Quickcam BW Video For Linux"
-       depends on PARPORT && VIDEO_V4L1
+       depends on PARPORT && VIDEO_V4L2
        help
          Say Y have if you the black and white version of the QuickCam
          camera. See the next option for the color version.
@@ -656,7 +656,7 @@ config VIDEO_BWQCAM
 
 config VIDEO_CQCAM
        tristate "QuickCam Colour Video For Linux (EXPERIMENTAL)"
-       depends on EXPERIMENTAL && PARPORT && VIDEO_V4L1
+       depends on EXPERIMENTAL && PARPORT && VIDEO_V4L2
        help
          This is the video4linux driver for the colour version of the
          Connectix QuickCam.  If you have one of these cameras, say Y here,
index 35390d4717b97a4f5824a69a4c2545b236485323..1573392f74bd36a2fb3d010d49238222c1f2344b 100644 (file)
@@ -11,6 +11,7 @@
 #include <linux/i2c.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
+#include <linux/slab.h>
 #include <linux/videodev2.h>
 
 #include <media/ak881x.h>
@@ -141,7 +142,7 @@ static int ak881x_s_mbus_fmt(struct v4l2_subdev *sd,
        return ak881x_try_g_mbus_fmt(sd, mf);
 }
 
-static int ak881x_enum_mbus_fmt(struct v4l2_subdev *sd, int index,
+static int ak881x_enum_mbus_fmt(struct v4l2_subdev *sd, unsigned int index,
                                enum v4l2_mbus_pixelcode *code)
 {
        if (index)
index 3c9e754d73a053199376098170ee5e80b9a86f37..935e0c9a96744aa1e4f0cd3d443c8ee4c8b407d2 100644 (file)
@@ -66,19 +66,58 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/fs.h>
-#include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/mm.h>
 #include <linux/parport.h>
 #include <linux/sched.h>
-#include <linux/videodev.h>
-#include <media/v4l2-common.h>
-#include <media/v4l2-ioctl.h>
+#include <linux/version.h>
+#include <linux/videodev2.h>
 #include <linux/mutex.h>
 #include <asm/uaccess.h>
-
-#include "bw-qcam.h"
+#include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
+#include <media/v4l2-device.h>
+
+/* One from column A... */
+#define QC_NOTSET 0
+#define QC_UNIDIR 1
+#define QC_BIDIR  2
+#define QC_SERIAL 3
+
+/* ... and one from column B */
+#define QC_ANY          0x00
+#define QC_FORCE_UNIDIR 0x10
+#define QC_FORCE_BIDIR  0x20
+#define QC_FORCE_SERIAL 0x30
+/* in the port_mode member */
+
+#define QC_MODE_MASK    0x07
+#define QC_FORCE_MASK   0x70
+
+#define MAX_HEIGHT 243
+#define MAX_WIDTH 336
+
+/* Bit fields for status flags */
+#define QC_PARAM_CHANGE        0x01 /* Camera status change has occurred */
+
+struct qcam {
+       struct v4l2_device v4l2_dev;
+       struct video_device vdev;
+       struct pardevice *pdev;
+       struct parport *pport;
+       struct mutex lock;
+       int width, height;
+       int bpp;
+       int mode;
+       int contrast, brightness, whitebal;
+       int port_mode;
+       int transfer_scale;
+       int top, left;
+       int status;
+       unsigned int saved_bits;
+       unsigned long in_use;
+};
 
 static unsigned int maxpoll = 250;   /* Maximum busy-loop count for qcam I/O */
 static unsigned int yieldlines = 4;  /* Yield after this many during capture */
@@ -93,22 +132,26 @@ module_param(video_nr, int, 0);
  * immediately attempt to initialize qcam */
 module_param(force_init, int, 0);
 
-static inline int read_lpstatus(struct qcam_device *q)
+#define MAX_CAMS 4
+static struct qcam *qcams[MAX_CAMS];
+static unsigned int num_cams;
+
+static inline int read_lpstatus(struct qcam *q)
 {
        return parport_read_status(q->pport);
 }
 
-static inline int read_lpdata(struct qcam_device *q)
+static inline int read_lpdata(struct qcam *q)
 {
        return parport_read_data(q->pport);
 }
 
-static inline void write_lpdata(struct qcam_device *q, int d)
+static inline void write_lpdata(struct qcam *q, int d)
 {
        parport_write_data(q->pport, d);
 }
 
-static inline void write_lpcontrol(struct qcam_device *q, int d)
+static void write_lpcontrol(struct qcam *q, int d)
 {
        if (d & 0x20) {
                /* Set bidirectional mode to reverse (data in) */
@@ -124,126 +167,11 @@ static inline void write_lpcontrol(struct qcam_device *q, int d)
        parport_write_control(q->pport, d);
 }
 
-static int qc_waithand(struct qcam_device *q, int val);
-static int qc_command(struct qcam_device *q, int command);
-static int qc_readparam(struct qcam_device *q);
-static int qc_setscanmode(struct qcam_device *q);
-static int qc_readbytes(struct qcam_device *q, char buffer[]);
-
-static struct video_device qcam_template;
-
-static int qc_calibrate(struct qcam_device *q)
-{
-       /*
-        *      Bugfix by Hanno Mueller hmueller@kabel.de, Mai 21 96
-        *      The white balance is an individiual value for each
-        *      quickcam.
-        */
-
-       int value;
-       int count = 0;
-
-       qc_command(q, 27);      /* AutoAdjustOffset */
-       qc_command(q, 0);       /* Dummy Parameter, ignored by the camera */
-
-       /* GetOffset (33) will read 255 until autocalibration */
-       /* is finished. After that, a value of 1-254 will be */
-       /* returned. */
-
-       do {
-               qc_command(q, 33);
-               value = qc_readparam(q);
-               mdelay(1);
-               schedule();
-               count++;
-       } while (value == 0xff && count < 2048);
-
-       q->whitebal = value;
-       return value;
-}
-
-/* Initialize the QuickCam driver control structure.  This is where
- * defaults are set for people who don't have a config file.*/
-
-static struct qcam_device *qcam_init(struct parport *port)
-{
-       struct qcam_device *q;
-
-       q = kmalloc(sizeof(struct qcam_device), GFP_KERNEL);
-       if (q == NULL)
-               return NULL;
-
-       q->pport = port;
-       q->pdev = parport_register_device(port, "bw-qcam", NULL, NULL,
-                       NULL, 0, NULL);
-       if (q->pdev == NULL) {
-               printk(KERN_ERR "bw-qcam: couldn't register for %s.\n",
-                               port->name);
-               kfree(q);
-               return NULL;
-       }
-
-       memcpy(&q->vdev, &qcam_template, sizeof(qcam_template));
-
-       mutex_init(&q->lock);
-
-       q->port_mode = (QC_ANY | QC_NOTSET);
-       q->width = 320;
-       q->height = 240;
-       q->bpp = 4;
-       q->transfer_scale = 2;
-       q->contrast = 192;
-       q->brightness = 180;
-       q->whitebal = 105;
-       q->top = 1;
-       q->left = 14;
-       q->mode = -1;
-       q->status = QC_PARAM_CHANGE;
-       return q;
-}
-
-
-/* qc_command is probably a bit of a misnomer -- it's used to send
- * bytes *to* the camera.  Generally, these bytes are either commands
- * or arguments to commands, so the name fits, but it still bugs me a
- * bit.  See the documentation for a list of commands. */
-
-static int qc_command(struct qcam_device *q, int command)
-{
-       int n1, n2;
-       int cmd;
-
-       write_lpdata(q, command);
-       write_lpcontrol(q, 6);
-
-       n1 = qc_waithand(q, 1);
-
-       write_lpcontrol(q, 0xe);
-       n2 = qc_waithand(q, 0);
-
-       cmd = (n1 & 0xf0) | ((n2 & 0xf0) >> 4);
-       return cmd;
-}
-
-static int qc_readparam(struct qcam_device *q)
-{
-       int n1, n2;
-       int cmd;
-
-       write_lpcontrol(q, 6);
-       n1 = qc_waithand(q, 1);
-
-       write_lpcontrol(q, 0xe);
-       n2 = qc_waithand(q, 0);
-
-       cmd = (n1 & 0xf0) | ((n2 & 0xf0) >> 4);
-       return cmd;
-}
 
 /* qc_waithand busy-waits for a handshake signal from the QuickCam.
  * Almost all communication with the camera requires handshaking. */
 
-static int qc_waithand(struct qcam_device *q, int val)
+static int qc_waithand(struct qcam *q, int val)
 {
        int status;
        int runs = 0;
@@ -286,7 +214,7 @@ static int qc_waithand(struct qcam_device *q, int val)
  * (bit 3 of status register).  It also returns the last value read,
  * since this data is useful. */
 
-static unsigned int qc_waithand2(struct qcam_device *q, int val)
+static unsigned int qc_waithand2(struct qcam *q, int val)
 {
        unsigned int status;
        int runs = 0;
@@ -309,6 +237,43 @@ static unsigned int qc_waithand2(struct qcam_device *q, int val)
        return status;
 }
 
+/* qc_command is probably a bit of a misnomer -- it's used to send
+ * bytes *to* the camera.  Generally, these bytes are either commands
+ * or arguments to commands, so the name fits, but it still bugs me a
+ * bit.  See the documentation for a list of commands. */
+
+static int qc_command(struct qcam *q, int command)
+{
+       int n1, n2;
+       int cmd;
+
+       write_lpdata(q, command);
+       write_lpcontrol(q, 6);
+
+       n1 = qc_waithand(q, 1);
+
+       write_lpcontrol(q, 0xe);
+       n2 = qc_waithand(q, 0);
+
+       cmd = (n1 & 0xf0) | ((n2 & 0xf0) >> 4);
+       return cmd;
+}
+
+static int qc_readparam(struct qcam *q)
+{
+       int n1, n2;
+       int cmd;
+
+       write_lpcontrol(q, 6);
+       n1 = qc_waithand(q, 1);
+
+       write_lpcontrol(q, 0xe);
+       n2 = qc_waithand(q, 0);
+
+       cmd = (n1 & 0xf0) | ((n2 & 0xf0) >> 4);
+       return cmd;
+}
+
 
 /* Try to detect a QuickCam.  It appears to flash the upper 4 bits of
    the status register at 5-10 Hz.  This is only used in the autoprobe
@@ -317,7 +282,7 @@ static unsigned int qc_waithand2(struct qcam_device *q, int val)
    almost completely safe, while their method screws up my printer if
    I plug it in before the camera. */
 
-static int qc_detect(struct qcam_device *q)
+static int qc_detect(struct qcam *q)
 {
        int reg, lastreg;
        int count = 0;
@@ -358,41 +323,6 @@ static int qc_detect(struct qcam_device *q)
        }
 }
 
-
-/* Reset the QuickCam.  This uses the same sequence the Windows
- * QuickPic program uses.  Someone with a bi-directional port should
- * check that bi-directional mode is detected right, and then
- * implement bi-directional mode in qc_readbyte(). */
-
-static void qc_reset(struct qcam_device *q)
-{
-       switch (q->port_mode & QC_FORCE_MASK) {
-       case QC_FORCE_UNIDIR:
-               q->port_mode = (q->port_mode & ~QC_MODE_MASK) | QC_UNIDIR;
-               break;
-
-       case QC_FORCE_BIDIR:
-               q->port_mode = (q->port_mode & ~QC_MODE_MASK) | QC_BIDIR;
-               break;
-
-       case QC_ANY:
-               write_lpcontrol(q, 0x20);
-               write_lpdata(q, 0x75);
-
-               if (read_lpdata(q) != 0x75)
-                       q->port_mode = (q->port_mode & ~QC_MODE_MASK) | QC_BIDIR;
-               else
-                       q->port_mode = (q->port_mode & ~QC_MODE_MASK) | QC_UNIDIR;
-               break;
-       }
-
-       write_lpcontrol(q, 0xb);
-       udelay(250);
-       write_lpcontrol(q, 0xe);
-       qc_setscanmode(q);              /* in case port_mode changed */
-}
-
-
 /* Decide which scan mode to use.  There's no real requirement that
  * the scanmode match the resolution in q->height and q-> width -- the
  * camera takes the picture at the resolution specified in the
@@ -402,7 +332,7 @@ static void qc_reset(struct qcam_device *q)
  * returned.  If the scan is smaller, then the rest of the image
  * returned contains garbage. */
 
-static int qc_setscanmode(struct qcam_device *q)
+static int qc_setscanmode(struct qcam *q)
 {
        int old_mode = q->mode;
 
@@ -442,10 +372,45 @@ static int qc_setscanmode(struct qcam_device *q)
 }
 
 
+/* Reset the QuickCam.  This uses the same sequence the Windows
+ * QuickPic program uses.  Someone with a bi-directional port should
+ * check that bi-directional mode is detected right, and then
+ * implement bi-directional mode in qc_readbyte(). */
+
+static void qc_reset(struct qcam *q)
+{
+       switch (q->port_mode & QC_FORCE_MASK) {
+       case QC_FORCE_UNIDIR:
+               q->port_mode = (q->port_mode & ~QC_MODE_MASK) | QC_UNIDIR;
+               break;
+
+       case QC_FORCE_BIDIR:
+               q->port_mode = (q->port_mode & ~QC_MODE_MASK) | QC_BIDIR;
+               break;
+
+       case QC_ANY:
+               write_lpcontrol(q, 0x20);
+               write_lpdata(q, 0x75);
+
+               if (read_lpdata(q) != 0x75)
+                       q->port_mode = (q->port_mode & ~QC_MODE_MASK) | QC_BIDIR;
+               else
+                       q->port_mode = (q->port_mode & ~QC_MODE_MASK) | QC_UNIDIR;
+               break;
+       }
+
+       write_lpcontrol(q, 0xb);
+       udelay(250);
+       write_lpcontrol(q, 0xe);
+       qc_setscanmode(q);              /* in case port_mode changed */
+}
+
+
+
 /* Reset the QuickCam and program for brightness, contrast,
  * white-balance, and resolution. */
 
-static void qc_set(struct qcam_device *q)
+static void qc_set(struct qcam *q)
 {
        int val;
        int val2;
@@ -499,7 +464,7 @@ static void qc_set(struct qcam_device *q)
    the supplied buffer.  It returns the number of bytes read,
    or -1 on error. */
 
-static inline int qc_readbytes(struct qcam_device *q, char buffer[])
+static inline int qc_readbytes(struct qcam *q, char buffer[])
 {
        int ret = 1;
        unsigned int hi, lo;
@@ -590,7 +555,7 @@ static inline int qc_readbytes(struct qcam_device *q, char buffer[])
  * n=2^(bit depth)-1.  Ask me for more details if you don't understand
  * this. */
 
-static long qc_capture(struct qcam_device *q, char __user *buf, unsigned long len)
+static long qc_capture(struct qcam *q, char __user *buf, unsigned long len)
 {
        int i, j, k, yield;
        int bytes;
@@ -674,171 +639,206 @@ static long qc_capture(struct qcam_device *q, char __user *buf, unsigned long le
  *     Video4linux interfacing
  */
 
-static long qcam_do_ioctl(struct file *file, unsigned int cmd, void *arg)
+static int qcam_querycap(struct file *file, void  *priv,
+                                       struct v4l2_capability *vcap)
 {
-       struct video_device *dev = video_devdata(file);
-       struct qcam_device *qcam = (struct qcam_device *)dev;
-
-       switch (cmd) {
-       case VIDIOCGCAP:
-               {
-                       struct video_capability *b = arg;
-                       strcpy(b->name, "Quickcam");
-                       b->type = VID_TYPE_CAPTURE|VID_TYPE_SCALES|VID_TYPE_MONOCHROME;
-                       b->channels = 1;
-                       b->audios = 0;
-                       b->maxwidth = 320;
-                       b->maxheight = 240;
-                       b->minwidth = 80;
-                       b->minheight = 60;
-                       return 0;
-               }
-       case VIDIOCGCHAN:
-               {
-                       struct video_channel *v = arg;
-                       if (v->channel != 0)
-                               return -EINVAL;
-                       v->flags = 0;
-                       v->tuners = 0;
-                       /* Good question.. its composite or SVHS so.. */
-                       v->type = VIDEO_TYPE_CAMERA;
-                       strcpy(v->name, "Camera");
-                       return 0;
-               }
-       case VIDIOCSCHAN:
-               {
-                       struct video_channel *v = arg;
-                       if (v->channel != 0)
-                               return -EINVAL;
-                       return 0;
-               }
-       case VIDIOCGTUNER:
-               {
-                       struct video_tuner *v = arg;
-                       if (v->tuner)
-                               return -EINVAL;
-                       strcpy(v->name, "Format");
-                       v->rangelow = 0;
-                       v->rangehigh = 0;
-                       v->flags = 0;
-                       v->mode = VIDEO_MODE_AUTO;
-                       return 0;
-               }
-       case VIDIOCSTUNER:
-               {
-                       struct video_tuner *v = arg;
-                       if (v->tuner)
-                               return -EINVAL;
-                       if (v->mode != VIDEO_MODE_AUTO)
-                               return -EINVAL;
-                       return 0;
-               }
-       case VIDIOCGPICT:
-               {
-                       struct video_picture *p = arg;
-                       p->colour = 0x8000;
-                       p->hue = 0x8000;
-                       p->brightness = qcam->brightness << 8;
-                       p->contrast = qcam->contrast << 8;
-                       p->whiteness = qcam->whitebal << 8;
-                       p->depth = qcam->bpp;
-                       p->palette = VIDEO_PALETTE_GREY;
-                       return 0;
-               }
-       case VIDIOCSPICT:
-               {
-                       struct video_picture *p = arg;
-                       if (p->palette != VIDEO_PALETTE_GREY)
-                               return -EINVAL;
-                       if (p->depth != 4 && p->depth != 6)
-                               return -EINVAL;
-
-                       /*
-                        *      Now load the camera.
-                        */
-
-                       qcam->brightness = p->brightness >> 8;
-                       qcam->contrast = p->contrast >> 8;
-                       qcam->whitebal = p->whiteness >> 8;
-                       qcam->bpp = p->depth;
-
-                       mutex_lock(&qcam->lock);
-                       qc_setscanmode(qcam);
-                       mutex_unlock(&qcam->lock);
-                       qcam->status |= QC_PARAM_CHANGE;
+       struct qcam *qcam = video_drvdata(file);
 
-                       return 0;
-               }
-       case VIDIOCSWIN:
-               {
-                       struct video_window *vw = arg;
-                       if (vw->flags)
-                               return -EINVAL;
-                       if (vw->clipcount)
-                               return -EINVAL;
-                       if (vw->height < 60 || vw->height > 240)
-                               return -EINVAL;
-                       if (vw->width < 80 || vw->width > 320)
-                               return -EINVAL;
-
-                       qcam->width = 320;
-                       qcam->height = 240;
-                       qcam->transfer_scale = 4;
-
-                       if (vw->width >= 160 && vw->height >= 120)
-                               qcam->transfer_scale = 2;
-                       if (vw->width >= 320 && vw->height >= 240) {
-                               qcam->width = 320;
-                               qcam->height = 240;
-                               qcam->transfer_scale = 1;
-                       }
-                       mutex_lock(&qcam->lock);
-                       qc_setscanmode(qcam);
-                       mutex_unlock(&qcam->lock);
+       strlcpy(vcap->driver, qcam->v4l2_dev.name, sizeof(vcap->driver));
+       strlcpy(vcap->card, "B&W Quickcam", sizeof(vcap->card));
+       strlcpy(vcap->bus_info, "parport", sizeof(vcap->bus_info));
+       vcap->version = KERNEL_VERSION(0, 0, 2);
+       vcap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE;
+       return 0;
+}
 
-                       /* We must update the camera before we grab. We could
-                          just have changed the grab size */
-                       qcam->status |= QC_PARAM_CHANGE;
+static int qcam_enum_input(struct file *file, void *fh, struct v4l2_input *vin)
+{
+       if (vin->index > 0)
+               return -EINVAL;
+       strlcpy(vin->name, "Camera", sizeof(vin->name));
+       vin->type = V4L2_INPUT_TYPE_CAMERA;
+       vin->audioset = 0;
+       vin->tuner = 0;
+       vin->std = 0;
+       vin->status = 0;
+       return 0;
+}
 
-                       /* Ok we figured out what to use from our wide choice */
-                       return 0;
-               }
-       case VIDIOCGWIN:
-               {
-                       struct video_window *vw = arg;
+static int qcam_g_input(struct file *file, void *fh, unsigned int *inp)
+{
+       *inp = 0;
+       return 0;
+}
 
-                       memset(vw, 0, sizeof(*vw));
-                       vw->width = qcam->width / qcam->transfer_scale;
-                       vw->height = qcam->height / qcam->transfer_scale;
-                       return 0;
-               }
-       case VIDIOCKEY:
-               return 0;
-       case VIDIOCCAPTURE:
-       case VIDIOCGFBUF:
-       case VIDIOCSFBUF:
-       case VIDIOCGFREQ:
-       case VIDIOCSFREQ:
-       case VIDIOCGAUDIO:
-       case VIDIOCSAUDIO:
-               return -EINVAL;
+static int qcam_s_input(struct file *file, void *fh, unsigned int inp)
+{
+       return (inp > 0) ? -EINVAL : 0;
+}
+
+static int qcam_queryctrl(struct file *file, void *priv,
+                                       struct v4l2_queryctrl *qc)
+{
+       switch (qc->id) {
+       case V4L2_CID_BRIGHTNESS:
+               return v4l2_ctrl_query_fill(qc, 0, 255, 1, 180);
+       case V4L2_CID_CONTRAST:
+               return v4l2_ctrl_query_fill(qc, 0, 255, 1, 192);
+       case V4L2_CID_GAMMA:
+               return v4l2_ctrl_query_fill(qc, 0, 255, 1, 105);
+       }
+       return -EINVAL;
+}
+
+static int qcam_g_ctrl(struct file *file, void *priv,
+                                       struct v4l2_control *ctrl)
+{
+       struct qcam *qcam = video_drvdata(file);
+       int ret = 0;
+
+       switch (ctrl->id) {
+       case V4L2_CID_BRIGHTNESS:
+               ctrl->value = qcam->brightness;
+               break;
+       case V4L2_CID_CONTRAST:
+               ctrl->value = qcam->contrast;
+               break;
+       case V4L2_CID_GAMMA:
+               ctrl->value = qcam->whitebal;
+               break;
        default:
-               return -ENOIOCTLCMD;
+               ret = -EINVAL;
+               break;
        }
+       return ret;
+}
+
+static int qcam_s_ctrl(struct file *file, void *priv,
+                                       struct v4l2_control *ctrl)
+{
+       struct qcam *qcam = video_drvdata(file);
+       int ret = 0;
+
+       mutex_lock(&qcam->lock);
+       switch (ctrl->id) {
+       case V4L2_CID_BRIGHTNESS:
+               qcam->brightness = ctrl->value;
+               break;
+       case V4L2_CID_CONTRAST:
+               qcam->contrast = ctrl->value;
+               break;
+       case V4L2_CID_GAMMA:
+               qcam->whitebal = ctrl->value;
+               break;
+       default:
+               ret = -EINVAL;
+               break;
+       }
+       if (ret == 0) {
+               qc_setscanmode(qcam);
+               qcam->status |= QC_PARAM_CHANGE;
+       }
+       mutex_unlock(&qcam->lock);
+       return ret;
+}
+
+static int qcam_g_fmt_vid_cap(struct file *file, void *fh, struct v4l2_format *fmt)
+{
+       struct qcam *qcam = video_drvdata(file);
+       struct v4l2_pix_format *pix = &fmt->fmt.pix;
+
+       pix->width = qcam->width / qcam->transfer_scale;
+       pix->height = qcam->height / qcam->transfer_scale;
+       pix->pixelformat = (qcam->bpp == 4) ? V4L2_PIX_FMT_Y4 : V4L2_PIX_FMT_Y6;
+       pix->field = V4L2_FIELD_NONE;
+       pix->bytesperline = qcam->width;
+       pix->sizeimage = qcam->width * qcam->height;
+       /* Just a guess */
+       pix->colorspace = V4L2_COLORSPACE_SRGB;
+       return 0;
+}
+
+static int qcam_try_fmt_vid_cap(struct file *file, void *fh, struct v4l2_format *fmt)
+{
+       struct v4l2_pix_format *pix = &fmt->fmt.pix;
+
+       if (pix->height <= 60 || pix->width <= 80) {
+               pix->height = 60;
+               pix->width = 80;
+       } else if (pix->height <= 120 || pix->width <= 160) {
+               pix->height = 120;
+               pix->width = 160;
+       } else {
+               pix->height = 240;
+               pix->width = 320;
+       }
+       if (pix->pixelformat != V4L2_PIX_FMT_Y4 &&
+           pix->pixelformat != V4L2_PIX_FMT_Y6)
+               pix->pixelformat = V4L2_PIX_FMT_Y4;
+       pix->field = V4L2_FIELD_NONE;
+       pix->bytesperline = pix->width;
+       pix->sizeimage = pix->width * pix->height;
+       /* Just a guess */
+       pix->colorspace = V4L2_COLORSPACE_SRGB;
+       return 0;
+}
+
+static int qcam_s_fmt_vid_cap(struct file *file, void *fh, struct v4l2_format *fmt)
+{
+       struct qcam *qcam = video_drvdata(file);
+       struct v4l2_pix_format *pix = &fmt->fmt.pix;
+       int ret = qcam_try_fmt_vid_cap(file, fh, fmt);
+
+       if (ret)
+               return ret;
+       qcam->width = 320;
+       qcam->height = 240;
+       if (pix->height == 60)
+               qcam->transfer_scale = 4;
+       else if (pix->height == 120)
+               qcam->transfer_scale = 2;
+       else
+               qcam->transfer_scale = 1;
+       if (pix->pixelformat == V4L2_PIX_FMT_Y6)
+               qcam->bpp = 6;
+       else
+               qcam->bpp = 4;
+
+       mutex_lock(&qcam->lock);
+       qc_setscanmode(qcam);
+       /* We must update the camera before we grab. We could
+          just have changed the grab size */
+       qcam->status |= QC_PARAM_CHANGE;
+       mutex_unlock(&qcam->lock);
        return 0;
 }
 
-static long qcam_ioctl(struct file *file,
-               unsigned int cmd, unsigned long arg)
+static int qcam_enum_fmt_vid_cap(struct file *file, void *fh, struct v4l2_fmtdesc *fmt)
 {
-       return video_usercopy(file, cmd, arg, qcam_do_ioctl);
+       static struct v4l2_fmtdesc formats[] = {
+               { 0, 0, 0,
+                 "4-Bit Monochrome", V4L2_PIX_FMT_Y4,
+                 { 0, 0, 0, 0 }
+               },
+               { 0, 0, 0,
+                 "6-Bit Monochrome", V4L2_PIX_FMT_Y6,
+                 { 0, 0, 0, 0 }
+               },
+       };
+       enum v4l2_buf_type type = fmt->type;
+
+       if (fmt->index > 1)
+               return -EINVAL;
+
+       *fmt = formats[fmt->index];
+       fmt->type = type;
+       return 0;
 }
 
 static ssize_t qcam_read(struct file *file, char __user *buf,
                size_t count, loff_t *ppos)
 {
-       struct video_device *v = video_devdata(file);
-       struct qcam_device *qcam = (struct qcam_device *)v;
+       struct qcam *qcam = video_drvdata(file);
        int len;
        parport_claim_or_block(qcam->pdev);
 
@@ -858,43 +858,112 @@ static ssize_t qcam_read(struct file *file, char __user *buf,
        return len;
 }
 
-static int qcam_exclusive_open(struct file *file)
+static const struct v4l2_file_operations qcam_fops = {
+       .owner          = THIS_MODULE,
+       .ioctl          = video_ioctl2,
+       .read           = qcam_read,
+};
+
+static const struct v4l2_ioctl_ops qcam_ioctl_ops = {
+       .vidioc_querycap                    = qcam_querycap,
+       .vidioc_g_input                     = qcam_g_input,
+       .vidioc_s_input                     = qcam_s_input,
+       .vidioc_enum_input                  = qcam_enum_input,
+       .vidioc_queryctrl                   = qcam_queryctrl,
+       .vidioc_g_ctrl                      = qcam_g_ctrl,
+       .vidioc_s_ctrl                      = qcam_s_ctrl,
+       .vidioc_enum_fmt_vid_cap            = qcam_enum_fmt_vid_cap,
+       .vidioc_g_fmt_vid_cap               = qcam_g_fmt_vid_cap,
+       .vidioc_s_fmt_vid_cap               = qcam_s_fmt_vid_cap,
+       .vidioc_try_fmt_vid_cap             = qcam_try_fmt_vid_cap,
+};
+
+/* Initialize the QuickCam driver control structure.  This is where
+ * defaults are set for people who don't have a config file.*/
+
+static struct qcam *qcam_init(struct parport *port)
 {
-       struct video_device *dev = video_devdata(file);
-       struct qcam_device *qcam = (struct qcam_device *)dev;
+       struct qcam *qcam;
+       struct v4l2_device *v4l2_dev;
+
+       qcam = kzalloc(sizeof(struct qcam), GFP_KERNEL);
+       if (qcam == NULL)
+               return NULL;
+
+       v4l2_dev = &qcam->v4l2_dev;
+       strlcpy(v4l2_dev->name, "bw-qcam", sizeof(v4l2_dev->name));
 
-       return test_and_set_bit(0, &qcam->in_use) ? -EBUSY : 0;
+       if (v4l2_device_register(NULL, v4l2_dev) < 0) {
+               v4l2_err(v4l2_dev, "Could not register v4l2_device\n");
+               return NULL;
+       }
+
+       qcam->pport = port;
+       qcam->pdev = parport_register_device(port, "bw-qcam", NULL, NULL,
+                       NULL, 0, NULL);
+       if (qcam->pdev == NULL) {
+               v4l2_err(v4l2_dev, "couldn't register for %s.\n", port->name);
+               kfree(qcam);
+               return NULL;
+       }
+
+       strlcpy(qcam->vdev.name, "Connectix QuickCam", sizeof(qcam->vdev.name));
+       qcam->vdev.v4l2_dev = v4l2_dev;
+       qcam->vdev.fops = &qcam_fops;
+       qcam->vdev.ioctl_ops = &qcam_ioctl_ops;
+       qcam->vdev.release = video_device_release_empty;
+       video_set_drvdata(&qcam->vdev, qcam);
+
+       mutex_init(&qcam->lock);
+
+       qcam->port_mode = (QC_ANY | QC_NOTSET);
+       qcam->width = 320;
+       qcam->height = 240;
+       qcam->bpp = 4;
+       qcam->transfer_scale = 2;
+       qcam->contrast = 192;
+       qcam->brightness = 180;
+       qcam->whitebal = 105;
+       qcam->top = 1;
+       qcam->left = 14;
+       qcam->mode = -1;
+       qcam->status = QC_PARAM_CHANGE;
+       return qcam;
 }
 
-static int qcam_exclusive_release(struct file *file)
+static int qc_calibrate(struct qcam *q)
 {
-       struct video_device *dev = video_devdata(file);
-       struct qcam_device *qcam = (struct qcam_device *)dev;
+       /*
+        *      Bugfix by Hanno Mueller hmueller@kabel.de, Mai 21 96
+        *      The white balance is an individual value for each
+        *      quickcam.
+        */
 
-       clear_bit(0, &qcam->in_use);
-       return 0;
-}
+       int value;
+       int count = 0;
 
-static const struct v4l2_file_operations qcam_fops = {
-       .owner          = THIS_MODULE,
-       .open           = qcam_exclusive_open,
-       .release        = qcam_exclusive_release,
-       .ioctl          = qcam_ioctl,
-       .read           = qcam_read,
-};
-static struct video_device qcam_template = {
-       .name           = "Connectix Quickcam",
-       .fops           = &qcam_fops,
-       .release        = video_device_release_empty,
-};
+       qc_command(q, 27);      /* AutoAdjustOffset */
+       qc_command(q, 0);       /* Dummy Parameter, ignored by the camera */
 
-#define MAX_CAMS 4
-static struct qcam_device *qcams[MAX_CAMS];
-static unsigned int num_cams;
+       /* GetOffset (33) will read 255 until autocalibration */
+       /* is finished. After that, a value of 1-254 will be */
+       /* returned. */
+
+       do {
+               qc_command(q, 33);
+               value = qc_readparam(q);
+               mdelay(1);
+               schedule();
+               count++;
+       } while (value == 0xff && count < 2048);
+
+       q->whitebal = value;
+       return value;
+}
 
 static int init_bwqcam(struct parport *port)
 {
-       struct qcam_device *qcam;
+       struct qcam *qcam;
 
        if (num_cams == MAX_CAMS) {
                printk(KERN_ERR "Too many Quickcams (max %d)\n", MAX_CAMS);
@@ -919,7 +988,7 @@ static int init_bwqcam(struct parport *port)
 
        parport_release(qcam->pdev);
 
-       printk(KERN_INFO "Connectix Quickcam on %s\n", qcam->pport->name);
+       v4l2_info(&qcam->v4l2_dev, "Connectix Quickcam on %s\n", qcam->pport->name);
 
        if (video_register_device(&qcam->vdev, VFL_TYPE_GRABBER, video_nr) < 0) {
                parport_unregister_device(qcam->pdev);
@@ -932,7 +1001,7 @@ static int init_bwqcam(struct parport *port)
        return 0;
 }
 
-static void close_bwqcam(struct qcam_device *qcam)
+static void close_bwqcam(struct qcam *qcam)
 {
        video_unregister_device(&qcam->vdev);
        parport_unregister_device(qcam->pdev);
@@ -983,7 +1052,7 @@ static void bwqcam_detach(struct parport *port)
 {
        int i;
        for (i = 0; i < num_cams; i++) {
-               struct qcam_device *qcam = qcams[i];
+               struct qcam *qcam = qcams[i];
                if (qcam && qcam->pdev->port == port) {
                        qcams[i] = NULL;
                        close_bwqcam(qcam);
diff --git a/drivers/media/video/bw-qcam.h b/drivers/media/video/bw-qcam.h
deleted file mode 100644 (file)
index 8a60c5d..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- *     Video4Linux bw-qcam driver
- *
- *     Derived from code..
- */
-
-/******************************************************************
-
-Copyright (C) 1996 by Scott Laird
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL SCOTT LAIRD BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-******************************************************************/
-
-/* One from column A... */
-#define QC_NOTSET 0
-#define QC_UNIDIR 1
-#define QC_BIDIR  2
-#define QC_SERIAL 3
-
-/* ... and one from column B */
-#define QC_ANY          0x00
-#define QC_FORCE_UNIDIR 0x10
-#define QC_FORCE_BIDIR  0x20
-#define QC_FORCE_SERIAL 0x30
-/* in the port_mode member */
-
-#define QC_MODE_MASK    0x07
-#define QC_FORCE_MASK   0x70
-
-#define MAX_HEIGHT 243
-#define MAX_WIDTH 336
-
-/* Bit fields for status flags */
-#define QC_PARAM_CHANGE        0x01 /* Camera status change has occurred */
-
-struct qcam_device {
-       struct video_device vdev;
-       struct pardevice *pdev;
-       struct parport *pport;
-       struct mutex lock;
-       int width, height;
-       int bpp;
-       int mode;
-       int contrast, brightness, whitebal;
-       int port_mode;
-       int transfer_scale;
-       int top, left;
-       int status;
-       unsigned int saved_bits;
-       unsigned long in_use;
-};
index 8f1dd88b32a6c5210269e4d11e8688d4bb9e8fb7..6e4b19698c13fe6212ee08cfd0d9bee7be3cf964 100644 (file)
 #include <linux/mm.h>
 #include <linux/parport.h>
 #include <linux/sched.h>
-#include <linux/videodev.h>
-#include <media/v4l2-common.h>
-#include <media/v4l2-ioctl.h>
 #include <linux/mutex.h>
 #include <linux/jiffies.h>
-
+#include <linux/version.h>
+#include <linux/videodev2.h>
 #include <asm/uaccess.h>
+#include <media/v4l2-device.h>
+#include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 
-struct qcam_device {
+struct qcam {
+       struct v4l2_device v4l2_dev;
        struct video_device vdev;
        struct pardevice *pdev;
        struct parport *pport;
@@ -51,7 +53,6 @@ struct qcam_device {
        int contrast, brightness, whitebal;
        int top, left;
        unsigned int bidirectional;
-       unsigned long in_use;
        struct mutex lock;
 };
 
@@ -68,33 +69,45 @@ struct qcam_device {
 #define QC_DECIMATION_2                2
 #define QC_DECIMATION_4                4
 
-#define BANNER "Colour QuickCam for Video4Linux v0.05"
+#define BANNER "Colour QuickCam for Video4Linux v0.06"
 
 static int parport[MAX_CAMS] = { [1 ... MAX_CAMS-1] = -1 };
 static int probe = 2;
 static int force_rgb;
 static int video_nr = -1;
 
-static inline void qcam_set_ack(struct qcam_device *qcam, unsigned int i)
+/* FIXME: parport=auto would never have worked, surely? --RR */
+MODULE_PARM_DESC(parport, "parport=<auto|n[,n]...> for port detection method\n"
+                         "probe=<0|1|2> for camera detection method\n"
+                         "force_rgb=<0|1> for RGB data format (default BGR)");
+module_param_array(parport, int, NULL, 0);
+module_param(probe, int, 0);
+module_param(force_rgb, bool, 0);
+module_param(video_nr, int, 0);
+
+static struct qcam *qcams[MAX_CAMS];
+static unsigned int num_cams;
+
+static inline void qcam_set_ack(struct qcam *qcam, unsigned int i)
 {
        /* note: the QC specs refer to the PCAck pin by voltage, not
           software level.  PC ports have builtin inverters. */
        parport_frob_control(qcam->pport, 8, i ? 8 : 0);
 }
 
-static inline unsigned int qcam_ready1(struct qcam_device *qcam)
+static inline unsigned int qcam_ready1(struct qcam *qcam)
 {
        return (parport_read_status(qcam->pport) & 0x8) ? 1 : 0;
 }
 
-static inline unsigned int qcam_ready2(struct qcam_device *qcam)
+static inline unsigned int qcam_ready2(struct qcam *qcam)
 {
        return (parport_read_data(qcam->pport) & 0x1) ? 1 : 0;
 }
 
-static unsigned int qcam_await_ready1(struct qcam_device *qcam,
-                                            int value)
+static unsigned int qcam_await_ready1(struct qcam *qcam, int value)
 {
+       struct v4l2_device *v4l2_dev = &qcam->v4l2_dev;
        unsigned long oldjiffies = jiffies;
        unsigned int i;
 
@@ -112,14 +125,15 @@ static unsigned int qcam_await_ready1(struct qcam_device *qcam,
        }
 
        /* Probably somebody pulled the plug out.  Not much we can do. */
-       printk(KERN_ERR "c-qcam: ready1 timeout (%d) %x %x\n", value,
+       v4l2_err(v4l2_dev, "ready1 timeout (%d) %x %x\n", value,
               parport_read_status(qcam->pport),
               parport_read_control(qcam->pport));
        return 1;
 }
 
-static unsigned int qcam_await_ready2(struct qcam_device *qcam, int value)
+static unsigned int qcam_await_ready2(struct qcam *qcam, int value)
 {
+       struct v4l2_device *v4l2_dev = &qcam->v4l2_dev;
        unsigned long oldjiffies = jiffies;
        unsigned int i;
 
@@ -137,14 +151,14 @@ static unsigned int qcam_await_ready2(struct qcam_device *qcam, int value)
        }
 
        /* Probably somebody pulled the plug out.  Not much we can do. */
-       printk(KERN_ERR "c-qcam: ready2 timeout (%d) %x %x %x\n", value,
+       v4l2_err(v4l2_dev, "ready2 timeout (%d) %x %x %x\n", value,
               parport_read_status(qcam->pport),
               parport_read_control(qcam->pport),
               parport_read_data(qcam->pport));
        return 1;
 }
 
-static int qcam_read_data(struct qcam_device *qcam)
+static int qcam_read_data(struct qcam *qcam)
 {
        unsigned int idata;
 
@@ -159,21 +173,22 @@ static int qcam_read_data(struct qcam_device *qcam)
        return idata;
 }
 
-static int qcam_write_data(struct qcam_device *qcam, unsigned int data)
+static int qcam_write_data(struct qcam *qcam, unsigned int data)
 {
+       struct v4l2_device *v4l2_dev = &qcam->v4l2_dev;
        unsigned int idata;
 
        parport_write_data(qcam->pport, data);
        idata = qcam_read_data(qcam);
        if (data != idata) {
-               printk(KERN_WARNING "cqcam: sent %x but received %x\n", data,
+               v4l2_warn(v4l2_dev, "sent %x but received %x\n", data,
                       idata);
                return 1;
        }
        return 0;
 }
 
-static inline int qcam_set(struct qcam_device *qcam, unsigned int cmd, unsigned int data)
+static inline int qcam_set(struct qcam *qcam, unsigned int cmd, unsigned int data)
 {
        if (qcam_write_data(qcam, cmd))
                return -1;
@@ -182,14 +197,14 @@ static inline int qcam_set(struct qcam_device *qcam, unsigned int cmd, unsigned
        return 0;
 }
 
-static inline int qcam_get(struct qcam_device *qcam, unsigned int cmd)
+static inline int qcam_get(struct qcam *qcam, unsigned int cmd)
 {
        if (qcam_write_data(qcam, cmd))
                return -1;
        return qcam_read_data(qcam);
 }
 
-static int qc_detect(struct qcam_device *qcam)
+static int qc_detect(struct qcam *qcam)
 {
        unsigned int stat, ostat, i, count = 0;
 
@@ -246,7 +261,7 @@ static int qc_detect(struct qcam_device *qcam)
        return 0;
 }
 
-static void qc_reset(struct qcam_device *qcam)
+static void qc_reset(struct qcam *qcam)
 {
        parport_write_control(qcam->pport, 0xc);
        parport_write_control(qcam->pport, 0x8);
@@ -258,55 +273,55 @@ static void qc_reset(struct qcam_device *qcam)
 /* Reset the QuickCam and program for brightness, contrast,
  * white-balance, and resolution. */
 
-static void qc_setup(struct qcam_device *q)
+static void qc_setup(struct qcam *qcam)
 {
-       qc_reset(q);
+       qc_reset(qcam);
 
        /* Set the brightness. */
-       qcam_set(q, 11, q->brightness);
+       qcam_set(qcam, 11, qcam->brightness);
 
        /* Set the height and width.  These refer to the actual
           CCD area *before* applying the selected decimation.  */
-       qcam_set(q, 17, q->ccd_height);
-       qcam_set(q, 19, q->ccd_width / 2);
+       qcam_set(qcam, 17, qcam->ccd_height);
+       qcam_set(qcam, 19, qcam->ccd_width / 2);
 
        /* Set top and left.  */
-       qcam_set(q, 0xd, q->top);
-       qcam_set(q, 0xf, q->left);
+       qcam_set(qcam, 0xd, qcam->top);
+       qcam_set(qcam, 0xf, qcam->left);
 
        /* Set contrast and white balance.  */
-       qcam_set(q, 0x19, q->contrast);
-       qcam_set(q, 0x1f, q->whitebal);
+       qcam_set(qcam, 0x19, qcam->contrast);
+       qcam_set(qcam, 0x1f, qcam->whitebal);
 
        /* Set the speed.  */
-       qcam_set(q, 45, 2);
+       qcam_set(qcam, 45, 2);
 }
 
 /* Read some bytes from the camera and put them in the buffer.
    nbytes should be a multiple of 3, because bidirectional mode gives
    us three bytes at a time.  */
 
-static unsigned int qcam_read_bytes(struct qcam_device *q, unsigned char *buf, unsigned int nbytes)
+static unsigned int qcam_read_bytes(struct qcam *qcam, unsigned char *buf, unsigned int nbytes)
 {
        unsigned int bytes = 0;
 
-       qcam_set_ack(q, 0);
-       if (q->bidirectional) {
+       qcam_set_ack(qcam, 0);
+       if (qcam->bidirectional) {
                /* It's a bidirectional port */
                while (bytes < nbytes) {
                        unsigned int lo1, hi1, lo2, hi2;
                        unsigned char r, g, b;
 
-                       if (qcam_await_ready2(q, 1))
+                       if (qcam_await_ready2(qcam, 1))
                                return bytes;
-                       lo1 = parport_read_data(q->pport) >> 1;
-                       hi1 = ((parport_read_status(q->pport) >> 3) & 0x1f) ^ 0x10;
-                       qcam_set_ack(q, 1);
-                       if (qcam_await_ready2(q, 0))
+                       lo1 = parport_read_data(qcam->pport) >> 1;
+                       hi1 = ((parport_read_status(qcam->pport) >> 3) & 0x1f) ^ 0x10;
+                       qcam_set_ack(qcam, 1);
+                       if (qcam_await_ready2(qcam, 0))
                                return bytes;
-                       lo2 = parport_read_data(q->pport) >> 1;
-                       hi2 = ((parport_read_status(q->pport) >> 3) & 0x1f) ^ 0x10;
-                       qcam_set_ack(q, 0);
+                       lo2 = parport_read_data(qcam->pport) >> 1;
+                       hi2 = ((parport_read_status(qcam->pport) >> 3) & 0x1f) ^ 0x10;
+                       qcam_set_ack(qcam, 0);
                        r = lo1 | ((hi1 & 1) << 7);
                        g = ((hi1 & 0x1e) << 3) | ((hi2 & 0x1e) >> 1);
                        b = lo2 | ((hi2 & 1) << 7);
@@ -328,14 +343,14 @@ static unsigned int qcam_read_bytes(struct qcam_device *q, unsigned char *buf, u
                while (bytes < nbytes) {
                        unsigned int hi, lo;
 
-                       if (qcam_await_ready1(q, 1))
+                       if (qcam_await_ready1(qcam, 1))
                                return bytes;
-                       hi = (parport_read_status(q->pport) & 0xf0);
-                       qcam_set_ack(q, 1);
-                       if (qcam_await_ready1(q, 0))
+                       hi = (parport_read_status(qcam->pport) & 0xf0);
+                       qcam_set_ack(qcam, 1);
+                       if (qcam_await_ready1(qcam, 0))
                                return bytes;
-                       lo = (parport_read_status(q->pport) & 0xf0);
-                       qcam_set_ack(q, 0);
+                       lo = (parport_read_status(qcam->pport) & 0xf0);
+                       qcam_set_ack(qcam, 0);
                        /* flip some bits */
                        rgb[(i = bytes++ % 3)] = (hi | (lo >> 4)) ^ 0x88;
                        if (i >= 2) {
@@ -361,10 +376,11 @@ get_fragment:
 
 #define BUFSZ  150
 
-static long qc_capture(struct qcam_device *q, char __user *buf, unsigned long len)
+static long qc_capture(struct qcam *qcam, char __user *buf, unsigned long len)
 {
+       struct v4l2_device *v4l2_dev = &qcam->v4l2_dev;
        unsigned lines, pixelsperline, bitsperxfer;
-       unsigned int is_bi_dir = q->bidirectional;
+       unsigned int is_bi_dir = qcam->bidirectional;
        size_t wantlen, outptr = 0;
        char tmpbuf[BUFSZ];
 
@@ -373,10 +389,10 @@ static long qc_capture(struct qcam_device *q, char __user *buf, unsigned long le
 
        /* Wait for camera to become ready */
        for (;;) {
-               int i = qcam_get(q, 41);
+               int i = qcam_get(qcam, 41);
 
                if (i == -1) {
-                       qc_setup(q);
+                       qc_setup(qcam);
                        return -EIO;
                }
                if ((i & 0x80) == 0)
@@ -384,25 +400,25 @@ static long qc_capture(struct qcam_device *q, char __user *buf, unsigned long le
                schedule();
        }
 
-       if (qcam_set(q, 7, (q->mode | (is_bi_dir ? 1 : 0)) + 1))
+       if (qcam_set(qcam, 7, (qcam->mode | (is_bi_dir ? 1 : 0)) + 1))
                return -EIO;
 
-       lines = q->height;
-       pixelsperline = q->width;
+       lines = qcam->height;
+       pixelsperline = qcam->width;
        bitsperxfer = (is_bi_dir) ? 24 : 8;
 
        if (is_bi_dir) {
                /* Turn the port around */
-               parport_data_reverse(q->pport);
+               parport_data_reverse(qcam->pport);
                mdelay(3);
-               qcam_set_ack(q, 0);
-               if (qcam_await_ready1(q, 1)) {
-                       qc_setup(q);
+               qcam_set_ack(qcam, 0);
+               if (qcam_await_ready1(qcam, 1)) {
+                       qc_setup(qcam);
                        return -EIO;
                }
-               qcam_set_ack(q, 1);
-               if (qcam_await_ready1(q, 0)) {
-                       qc_setup(q);
+               qcam_set_ack(qcam, 1);
+               if (qcam_await_ready1(qcam, 0)) {
+                       qc_setup(qcam);
                        return -EIO;
                }
        }
@@ -413,7 +429,7 @@ static long qc_capture(struct qcam_device *q, char __user *buf, unsigned long le
                size_t t, s;
 
                s = (wantlen > BUFSZ) ? BUFSZ : wantlen;
-               t = qcam_read_bytes(q, tmpbuf, s);
+               t = qcam_read_bytes(qcam, tmpbuf, s);
                if (outptr < len) {
                        size_t sz = len - outptr;
 
@@ -432,10 +448,10 @@ static long qc_capture(struct qcam_device *q, char __user *buf, unsigned long le
        len = outptr;
 
        if (wantlen) {
-               printk(KERN_ERR "qcam: short read.\n");
+               v4l2_err(v4l2_dev, "short read.\n");
                if (is_bi_dir)
-                       parport_data_forward(q->pport);
-               qc_setup(q);
+                       parport_data_forward(qcam->pport);
+               qc_setup(qcam);
                return len;
        }
 
@@ -443,49 +459,49 @@ static long qc_capture(struct qcam_device *q, char __user *buf, unsigned long le
                int l;
 
                do {
-                       l = qcam_read_bytes(q, tmpbuf, 3);
+                       l = qcam_read_bytes(qcam, tmpbuf, 3);
                        cond_resched();
                } while (l && (tmpbuf[0] == 0x7e || tmpbuf[1] == 0x7e || tmpbuf[2] == 0x7e));
                if (force_rgb) {
                        if (tmpbuf[0] != 0xe || tmpbuf[1] != 0x0 || tmpbuf[2] != 0xf)
-                               printk(KERN_ERR "qcam: bad EOF\n");
+                               v4l2_err(v4l2_dev, "bad EOF\n");
                } else {
                        if (tmpbuf[0] != 0xf || tmpbuf[1] != 0x0 || tmpbuf[2] != 0xe)
-                               printk(KERN_ERR "qcam: bad EOF\n");
+                               v4l2_err(v4l2_dev, "bad EOF\n");
                }
-               qcam_set_ack(q, 0);
-               if (qcam_await_ready1(q, 1)) {
-                       printk(KERN_ERR "qcam: no ack after EOF\n");
-                       parport_data_forward(q->pport);
-                       qc_setup(q);
+               qcam_set_ack(qcam, 0);
+               if (qcam_await_ready1(qcam, 1)) {
+                       v4l2_err(v4l2_dev, "no ack after EOF\n");
+                       parport_data_forward(qcam->pport);
+                       qc_setup(qcam);
                        return len;
                }
-               parport_data_forward(q->pport);
+               parport_data_forward(qcam->pport);
                mdelay(3);
-               qcam_set_ack(q, 1);
-               if (qcam_await_ready1(q, 0)) {
-                       printk(KERN_ERR "qcam: no ack to port turnaround\n");
-                       qc_setup(q);
+               qcam_set_ack(qcam, 1);
+               if (qcam_await_ready1(qcam, 0)) {
+                       v4l2_err(v4l2_dev, "no ack to port turnaround\n");
+                       qc_setup(qcam);
                        return len;
                }
        } else {
                int l;
 
                do {
-                       l = qcam_read_bytes(q, tmpbuf, 1);
+                       l = qcam_read_bytes(qcam, tmpbuf, 1);
                        cond_resched();
                } while (l && tmpbuf[0] == 0x7e);
-               l = qcam_read_bytes(q, tmpbuf + 1, 2);
+               l = qcam_read_bytes(qcam, tmpbuf + 1, 2);
                if (force_rgb) {
                        if (tmpbuf[0] != 0xe || tmpbuf[1] != 0x0 || tmpbuf[2] != 0xf)
-                               printk(KERN_ERR "qcam: bad EOF\n");
+                               v4l2_err(v4l2_dev, "bad EOF\n");
                } else {
                        if (tmpbuf[0] != 0xf || tmpbuf[1] != 0x0 || tmpbuf[2] != 0xe)
-                               printk(KERN_ERR "qcam: bad EOF\n");
+                               v4l2_err(v4l2_dev, "bad EOF\n");
                }
        }
 
-       qcam_write_data(q, 0);
+       qcam_write_data(qcam, 0);
        return len;
 }
 
@@ -493,184 +509,202 @@ static long qc_capture(struct qcam_device *q, char __user *buf, unsigned long le
  *     Video4linux interfacing
  */
 
-static long qcam_do_ioctl(struct file *file, unsigned int cmd, void *arg)
+static int qcam_querycap(struct file *file, void  *priv,
+                                       struct v4l2_capability *vcap)
 {
-       struct video_device *dev = video_devdata(file);
-       struct qcam_device *qcam = (struct qcam_device *)dev;
+       struct qcam *qcam = video_drvdata(file);
 
-       switch (cmd) {
-       case VIDIOCGCAP:
-       {
-               struct video_capability *b = arg;
+       strlcpy(vcap->driver, qcam->v4l2_dev.name, sizeof(vcap->driver));
+       strlcpy(vcap->card, "Color Quickcam", sizeof(vcap->card));
+       strlcpy(vcap->bus_info, "parport", sizeof(vcap->bus_info));
+       vcap->version = KERNEL_VERSION(0, 0, 3);
+       vcap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE;
+       return 0;
+}
 
-               strcpy(b->name, "Quickcam");
-               b->type = VID_TYPE_CAPTURE | VID_TYPE_SCALES;
-               b->channels = 1;
-               b->audios = 0;
-               b->maxwidth = 320;
-               b->maxheight = 240;
-               b->minwidth = 80;
-               b->minheight = 60;
-               return 0;
-       }
-       case VIDIOCGCHAN:
-       {
-               struct video_channel *v = arg;
-
-               if (v->channel != 0)
-                       return -EINVAL;
-               v->flags = 0;
-               v->tuners = 0;
-               /* Good question.. its composite or SVHS so.. */
-               v->type = VIDEO_TYPE_CAMERA;
-               strcpy(v->name, "Camera");
-               return 0;
-       }
-       case VIDIOCSCHAN:
-       {
-               struct video_channel *v = arg;
+static int qcam_enum_input(struct file *file, void *fh, struct v4l2_input *vin)
+{
+       if (vin->index > 0)
+               return -EINVAL;
+       strlcpy(vin->name, "Camera", sizeof(vin->name));
+       vin->type = V4L2_INPUT_TYPE_CAMERA;
+       vin->audioset = 0;
+       vin->tuner = 0;
+       vin->std = 0;
+       vin->status = 0;
+       return 0;
+}
 
-               if (v->channel != 0)
-                       return -EINVAL;
-               return 0;
-       }
-       case VIDIOCGTUNER:
-       {
-               struct video_tuner *v = arg;
-
-               if (v->tuner)
-                       return -EINVAL;
-               memset(v, 0, sizeof(*v));
-               strcpy(v->name, "Format");
-               v->mode = VIDEO_MODE_AUTO;
-               return 0;
+static int qcam_g_input(struct file *file, void *fh, unsigned int *inp)
+{
+       *inp = 0;
+       return 0;
+}
+
+static int qcam_s_input(struct file *file, void *fh, unsigned int inp)
+{
+       return (inp > 0) ? -EINVAL : 0;
+}
+
+static int qcam_queryctrl(struct file *file, void *priv,
+                                       struct v4l2_queryctrl *qc)
+{
+       switch (qc->id) {
+       case V4L2_CID_BRIGHTNESS:
+               return v4l2_ctrl_query_fill(qc, 0, 255, 1, 240);
+       case V4L2_CID_CONTRAST:
+               return v4l2_ctrl_query_fill(qc, 0, 255, 1, 192);
+       case V4L2_CID_GAMMA:
+               return v4l2_ctrl_query_fill(qc, 0, 255, 1, 128);
        }
-       case VIDIOCSTUNER:
-       {
-               struct video_tuner *v = arg;
-
-               if (v->tuner)
-                       return -EINVAL;
-               if (v->mode != VIDEO_MODE_AUTO)
-                       return -EINVAL;
-               return 0;
+       return -EINVAL;
+}
+
+static int qcam_g_ctrl(struct file *file, void *priv,
+                                       struct v4l2_control *ctrl)
+{
+       struct qcam *qcam = video_drvdata(file);
+       int ret = 0;
+
+       switch (ctrl->id) {
+       case V4L2_CID_BRIGHTNESS:
+               ctrl->value = qcam->brightness;
+               break;
+       case V4L2_CID_CONTRAST:
+               ctrl->value = qcam->contrast;
+               break;
+       case V4L2_CID_GAMMA:
+               ctrl->value = qcam->whitebal;
+               break;
+       default:
+               ret = -EINVAL;
+               break;
        }
-       case VIDIOCGPICT:
-       {
-               struct video_picture *p = arg;
-
-               p->colour = 0x8000;
-               p->hue = 0x8000;
-               p->brightness = qcam->brightness << 8;
-               p->contrast = qcam->contrast << 8;
-               p->whiteness = qcam->whitebal << 8;
-               p->depth = 24;
-               p->palette = VIDEO_PALETTE_RGB24;
-               return 0;
+       return ret;
+}
+
+static int qcam_s_ctrl(struct file *file, void *priv,
+                                       struct v4l2_control *ctrl)
+{
+       struct qcam *qcam = video_drvdata(file);
+       int ret = 0;
+
+       mutex_lock(&qcam->lock);
+       switch (ctrl->id) {
+       case V4L2_CID_BRIGHTNESS:
+               qcam->brightness = ctrl->value;
+               break;
+       case V4L2_CID_CONTRAST:
+               qcam->contrast = ctrl->value;
+               break;
+       case V4L2_CID_GAMMA:
+               qcam->whitebal = ctrl->value;
+               break;
+       default:
+               ret = -EINVAL;
+               break;
        }
-       case VIDIOCSPICT:
-       {
-               struct video_picture *p = arg;
-
-               /*
-                *      Sanity check args
-                */
-               if (p->depth != 24 || p->palette != VIDEO_PALETTE_RGB24)
-                       return -EINVAL;
-
-               /*
-                *      Now load the camera.
-                */
-               qcam->brightness = p->brightness >> 8;
-               qcam->contrast = p->contrast >> 8;
-               qcam->whitebal = p->whiteness >> 8;
-
-               mutex_lock(&qcam->lock);
+       if (ret == 0) {
                parport_claim_or_block(qcam->pdev);
                qc_setup(qcam);
                parport_release(qcam->pdev);
-               mutex_unlock(&qcam->lock);
-               return 0;
        }
-       case VIDIOCSWIN:
-       {
-               struct video_window *vw = arg;
-
-               if (vw->flags)
-                       return -EINVAL;
-               if (vw->clipcount)
-                       return -EINVAL;
-               if (vw->height < 60 || vw->height > 240)
-                       return -EINVAL;
-               if (vw->width < 80 || vw->width > 320)
-                       return -EINVAL;
-
-               qcam->width = 80;
-               qcam->height = 60;
-               qcam->mode = QC_DECIMATION_4;
+       mutex_unlock(&qcam->lock);
+       return ret;
+}
 
-               if (vw->width >= 160 && vw->height >= 120) {
-                       qcam->width = 160;
-                       qcam->height = 120;
-                       qcam->mode = QC_DECIMATION_2;
-               }
-               if (vw->width >= 320 && vw->height >= 240) {
-                       qcam->width = 320;
-                       qcam->height = 240;
-                       qcam->mode = QC_DECIMATION_1;
-               }
-               qcam->mode |= QC_MILLIONS;
-#if 0
-               if (vw->width >= 640 && vw->height >= 480) {
-                       qcam->width = 640;
-                       qcam->height = 480;
-                       qcam->mode = QC_BILLIONS | QC_DECIMATION_1;
-               }
-#endif
-               /* Ok we figured out what to use from our
-                  wide choice */
-               mutex_lock(&qcam->lock);
-               parport_claim_or_block(qcam->pdev);
-               qc_setup(qcam);
-               parport_release(qcam->pdev);
-               mutex_unlock(&qcam->lock);
-               return 0;
-       }
-       case VIDIOCGWIN:
-       {
-               struct video_window *vw = arg;
-               memset(vw, 0, sizeof(*vw));
-               vw->width = qcam->width;
-               vw->height = qcam->height;
-               return 0;
+static int qcam_g_fmt_vid_cap(struct file *file, void *fh, struct v4l2_format *fmt)
+{
+       struct qcam *qcam = video_drvdata(file);
+       struct v4l2_pix_format *pix = &fmt->fmt.pix;
+
+       pix->width = qcam->width;
+       pix->height = qcam->height;
+       pix->pixelformat = V4L2_PIX_FMT_RGB24;
+       pix->field = V4L2_FIELD_NONE;
+       pix->bytesperline = 3 * qcam->width;
+       pix->sizeimage = 3 * qcam->width * qcam->height;
+       /* Just a guess */
+       pix->colorspace = V4L2_COLORSPACE_SRGB;
+       return 0;
+}
+
+static int qcam_try_fmt_vid_cap(struct file *file, void *fh, struct v4l2_format *fmt)
+{
+       struct v4l2_pix_format *pix = &fmt->fmt.pix;
+
+       if (pix->height < 60 || pix->width < 80) {
+               pix->height = 60;
+               pix->width = 80;
+       } else if (pix->height < 120 || pix->width < 160) {
+               pix->height = 120;
+               pix->width = 160;
+       } else {
+               pix->height = 240;
+               pix->width = 320;
        }
-       case VIDIOCKEY:
-               return 0;
-       case VIDIOCCAPTURE:
-       case VIDIOCGFBUF:
-       case VIDIOCSFBUF:
-       case VIDIOCGFREQ:
-       case VIDIOCSFREQ:
-       case VIDIOCGAUDIO:
-       case VIDIOCSAUDIO:
-               return -EINVAL;
+       pix->pixelformat = V4L2_PIX_FMT_RGB24;
+       pix->field = V4L2_FIELD_NONE;
+       pix->bytesperline = 3 * pix->width;
+       pix->sizeimage = 3 * pix->width * pix->height;
+       /* Just a guess */
+       pix->colorspace = V4L2_COLORSPACE_SRGB;
+       return 0;
+}
+
+static int qcam_s_fmt_vid_cap(struct file *file, void *fh, struct v4l2_format *fmt)
+{
+       struct qcam *qcam = video_drvdata(file);
+       struct v4l2_pix_format *pix = &fmt->fmt.pix;
+       int ret = qcam_try_fmt_vid_cap(file, fh, fmt);
+
+       if (ret)
+               return ret;
+       switch (pix->height) {
+       case 60:
+               qcam->mode = QC_DECIMATION_4;
+               break;
+       case 120:
+               qcam->mode = QC_DECIMATION_2;
+               break;
        default:
-               return -ENOIOCTLCMD;
+               qcam->mode = QC_DECIMATION_1;
+               break;
        }
+
+       mutex_lock(&qcam->lock);
+       qcam->mode |= QC_MILLIONS;
+       qcam->height = pix->height;
+       qcam->width = pix->width;
+       parport_claim_or_block(qcam->pdev);
+       qc_setup(qcam);
+       parport_release(qcam->pdev);
+       mutex_unlock(&qcam->lock);
        return 0;
 }
 
-static long qcam_ioctl(struct file *file,
-                     unsigned int cmd, unsigned long arg)
+static int qcam_enum_fmt_vid_cap(struct file *file, void *fh, struct v4l2_fmtdesc *fmt)
 {
-       return video_usercopy(file, cmd, arg, qcam_do_ioctl);
+       static struct v4l2_fmtdesc formats[] = {
+               { 0, 0, 0,
+                 "RGB 8:8:8", V4L2_PIX_FMT_RGB24,
+                 { 0, 0, 0, 0 }
+               },
+       };
+       enum v4l2_buf_type type = fmt->type;
+
+       if (fmt->index > 0)
+               return -EINVAL;
+
+       *fmt = formats[fmt->index];
+       fmt->type = type;
+       return 0;
 }
 
 static ssize_t qcam_read(struct file *file, char __user *buf,
                         size_t count, loff_t *ppos)
 {
-       struct video_device *v = video_devdata(file);
-       struct qcam_device *qcam = (struct qcam_device *)v;
+       struct qcam *qcam = video_drvdata(file);
        int len;
 
        mutex_lock(&qcam->lock);
@@ -682,81 +716,80 @@ static ssize_t qcam_read(struct file *file, char __user *buf,
        return len;
 }
 
-static int qcam_exclusive_open(struct file *file)
-{
-       struct video_device *dev = video_devdata(file);
-       struct qcam_device *qcam = (struct qcam_device *)dev;
-
-       return test_and_set_bit(0, &qcam->in_use) ? -EBUSY : 0;
-}
-
-static int qcam_exclusive_release(struct file *file)
-{
-       struct video_device *dev = video_devdata(file);
-       struct qcam_device *qcam = (struct qcam_device *)dev;
-
-       clear_bit(0, &qcam->in_use);
-       return 0;
-}
-
-/* video device template */
 static const struct v4l2_file_operations qcam_fops = {
        .owner          = THIS_MODULE,
-       .open           = qcam_exclusive_open,
-       .release        = qcam_exclusive_release,
-       .ioctl          = qcam_ioctl,
+       .ioctl          = video_ioctl2,
        .read           = qcam_read,
 };
 
-static struct video_device qcam_template = {
-       .name           = "Colour QuickCam",
-       .fops           = &qcam_fops,
-       .release        = video_device_release_empty,
+static const struct v4l2_ioctl_ops qcam_ioctl_ops = {
+       .vidioc_querycap                    = qcam_querycap,
+       .vidioc_g_input                     = qcam_g_input,
+       .vidioc_s_input                     = qcam_s_input,
+       .vidioc_enum_input                  = qcam_enum_input,
+       .vidioc_queryctrl                   = qcam_queryctrl,
+       .vidioc_g_ctrl                      = qcam_g_ctrl,
+       .vidioc_s_ctrl                      = qcam_s_ctrl,
+       .vidioc_enum_fmt_vid_cap            = qcam_enum_fmt_vid_cap,
+       .vidioc_g_fmt_vid_cap               = qcam_g_fmt_vid_cap,
+       .vidioc_s_fmt_vid_cap               = qcam_s_fmt_vid_cap,
+       .vidioc_try_fmt_vid_cap             = qcam_try_fmt_vid_cap,
 };
 
 /* Initialize the QuickCam driver control structure. */
 
-static struct qcam_device *qcam_init(struct parport *port)
+static struct qcam *qcam_init(struct parport *port)
 {
-       struct qcam_device *q;
+       struct qcam *qcam;
+       struct v4l2_device *v4l2_dev;
 
-       q = kmalloc(sizeof(struct qcam_device), GFP_KERNEL);
-       if (q == NULL)
+       qcam = kzalloc(sizeof(*qcam), GFP_KERNEL);
+       if (qcam == NULL)
                return NULL;
 
-       q->pport = port;
-       q->pdev = parport_register_device(port, "c-qcam", NULL, NULL,
+       v4l2_dev = &qcam->v4l2_dev;
+       strlcpy(v4l2_dev->name, "c-qcam", sizeof(v4l2_dev->name));
+
+       if (v4l2_device_register(NULL, v4l2_dev) < 0) {
+               v4l2_err(v4l2_dev, "Could not register v4l2_device\n");
+               return NULL;
+       }
+
+       qcam->pport = port;
+       qcam->pdev = parport_register_device(port, "c-qcam", NULL, NULL,
                                          NULL, 0, NULL);
 
-       q->bidirectional = (q->pport->modes & PARPORT_MODE_TRISTATE) ? 1 : 0;
+       qcam->bidirectional = (qcam->pport->modes & PARPORT_MODE_TRISTATE) ? 1 : 0;
 
-       if (q->pdev == NULL) {
-               printk(KERN_ERR "c-qcam: couldn't register for %s.\n",
-                      port->name);
-               kfree(q);
+       if (qcam->pdev == NULL) {
+               v4l2_err(v4l2_dev, "couldn't register for %s.\n", port->name);
+               kfree(qcam);
                return NULL;
        }
 
-       memcpy(&q->vdev, &qcam_template, sizeof(qcam_template));
-
-       mutex_init(&q->lock);
-       q->width = q->ccd_width = 320;
-       q->height = q->ccd_height = 240;
-       q->mode = QC_MILLIONS | QC_DECIMATION_1;
-       q->contrast = 192;
-       q->brightness = 240;
-       q->whitebal = 128;
-       q->top = 1;
-       q->left = 14;
-       return q;
+       strlcpy(qcam->vdev.name, "Colour QuickCam", sizeof(qcam->vdev.name));
+       qcam->vdev.v4l2_dev = v4l2_dev;
+       qcam->vdev.fops = &qcam_fops;
+       qcam->vdev.ioctl_ops = &qcam_ioctl_ops;
+       qcam->vdev.release = video_device_release_empty;
+       video_set_drvdata(&qcam->vdev, qcam);
+
+       mutex_init(&qcam->lock);
+       qcam->width = qcam->ccd_width = 320;
+       qcam->height = qcam->ccd_height = 240;
+       qcam->mode = QC_MILLIONS | QC_DECIMATION_1;
+       qcam->contrast = 192;
+       qcam->brightness = 240;
+       qcam->whitebal = 128;
+       qcam->top = 1;
+       qcam->left = 14;
+       return qcam;
 }
 
-static struct qcam_device *qcams[MAX_CAMS];
-static unsigned int num_cams;
-
 static int init_cqcam(struct parport *port)
 {
-       struct qcam_device *qcam;
+       struct qcam *qcam;
+       struct v4l2_device *v4l2_dev;
 
        if (parport[0] != -1) {
                /* The user gave specific instructions */
@@ -777,6 +810,8 @@ static int init_cqcam(struct parport *port)
        if (qcam == NULL)
                return -ENODEV;
 
+       v4l2_dev = &qcam->v4l2_dev;
+
        parport_claim_or_block(qcam->pdev);
 
        qc_reset(qcam);
@@ -793,14 +828,14 @@ static int init_cqcam(struct parport *port)
        parport_release(qcam->pdev);
 
        if (video_register_device(&qcam->vdev, VFL_TYPE_GRABBER, video_nr) < 0) {
-               printk(KERN_ERR "Unable to register Colour QuickCam on %s\n",
+               v4l2_err(v4l2_dev, "Unable to register Colour QuickCam on %s\n",
                       qcam->pport->name);
                parport_unregister_device(qcam->pdev);
                kfree(qcam);
                return -ENODEV;
        }
 
-       printk(KERN_INFO "%s: Colour QuickCam found on %s\n",
+       v4l2_info(v4l2_dev, "%s: Colour QuickCam found on %s\n",
               video_device_node_name(&qcam->vdev), qcam->pport->name);
 
        qcams[num_cams++] = qcam;
@@ -808,7 +843,7 @@ static int init_cqcam(struct parport *port)
        return 0;
 }
 
-static void close_cqcam(struct qcam_device *qcam)
+static void close_cqcam(struct qcam *qcam)
 {
        video_unregister_device(&qcam->vdev);
        parport_unregister_device(qcam->pdev);
@@ -833,7 +868,7 @@ static struct parport_driver cqcam_driver = {
 
 static int __init cqcam_init(void)
 {
-       printk(BANNER "\n");
+       printk(KERN_INFO BANNER "\n");
 
        return parport_register_driver(&cqcam_driver);
 }
@@ -852,14 +887,5 @@ MODULE_AUTHOR("Philip Blundell <philb@gnu.org>");
 MODULE_DESCRIPTION(BANNER);
 MODULE_LICENSE("GPL");
 
-/* FIXME: parport=auto would never have worked, surely? --RR */
-MODULE_PARM_DESC(parport, "parport=<auto|n[,n]...> for port detection method\n"
-                         "probe=<0|1|2> for camera detection method\n"
-                         "force_rgb=<0|1> for RGB data format (default BGR)");
-module_param_array(parport, int, NULL, 0);
-module_param(probe, int, 0);
-module_param(force_rgb, bool, 0);
-module_param(video_nr, int, 0);
-
 module_init(cqcam_init);
 module_exit(cqcam_cleanup);
index b5d7cbf4528ab9d0d455e76ab6ff278493f56ec1..d50d69da387b5d0ea30fb6be335c7fb23523e55b 100644 (file)
@@ -1,7 +1,7 @@
 /*
  *  ALSA interface to cx18 PCM capture streams
  *
- *  Copyright (C) 2009  Andy Walls <awalls@radix.net>
+ *  Copyright (C) 2009  Andy Walls <awalls@md.metrocast.net>
  *  Copyright (C) 2009  Devin Heitmueller <dheitmueller@kernellabs.com>
  *
  *  Portions of this work were sponsored by ONELAN Limited.
index ef21114309fe61cf4836e96c7c28f0c9fd335f5f..341bddc00b774f5eb5338e224c55d6b8d973416a 100644 (file)
@@ -2,7 +2,7 @@
  *  ALSA mixer controls for the
  *  ALSA interface to cx18 PCM capture streams
  *
- *  Copyright (C) 2009  Andy Walls <awalls@radix.net>
+ *  Copyright (C) 2009  Andy Walls <awalls@md.metrocast.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
index 2d418db000fe6170ffa3a249e4fd18625d84b7dd..ec9238793f6f415fbf660d4b592af1e4431942e7 100644 (file)
@@ -2,7 +2,7 @@
  *  ALSA mixer controls for the
  *  ALSA interface to cx18 PCM capture streams
  *
- *  Copyright (C) 2009  Andy Walls <awalls@radix.net>
+ *  Copyright (C) 2009  Andy Walls <awalls@md.metrocast.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
index 2bd312daeb1e5d6a25521a45e6b289ba256f117e..8f55692db36d278e01191bd3fd2ea9e380c90965 100644 (file)
@@ -2,7 +2,7 @@
  *  ALSA PCM device for the
  *  ALSA interface to cx18 PCM capture streams
  *
- *  Copyright (C) 2009  Andy Walls <awalls@radix.net>
+ *  Copyright (C) 2009  Andy Walls <awalls@md.metrocast.net>
  *  Copyright (C) 2009  Devin Heitmueller <dheitmueller@kernellabs.com>
  *
  *  Portions of this work were sponsored by ONELAN Limited.
index 325662c647a000b8d840d8a26001d5f4f0c72da4..d26e51f94577fac526f8416ce3af303ca87f3048 100644 (file)
@@ -2,7 +2,7 @@
  *  ALSA PCM device for the
  *  ALSA interface to cx18 PCM capture streams
  *
- *  Copyright (C) 2009  Andy Walls <awalls@radix.net>
+ *  Copyright (C) 2009  Andy Walls <awalls@md.metrocast.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
index 88a1cde7540b21957dddf42d97fae1c99ce69642..447da374c9e8312fffc4b7e34bcecb1d068ac96e 100644 (file)
@@ -1,7 +1,7 @@
 /*
  *  ALSA interface to cx18 PCM capture streams
  *
- *  Copyright (C) 2009  Andy Walls <awalls@radix.net>
+ *  Copyright (C) 2009  Andy Walls <awalls@md.metrocast.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
index 9e30983f2ff632496e2bcf731185956a79542ab6..43d09a24b2624ee936373388e6b195521922c8ff 100644 (file)
@@ -4,7 +4,7 @@
  *  Derived from cx25840-audio.c
  *
  *  Copyright (C) 2007  Hans Verkuil <hverkuil@xs4all.nl>
- *  Copyright (C) 2008  Andy Walls <awalls@radix.net>
+ *  Copyright (C) 2008  Andy Walls <awalls@md.metrocast.net>
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License
index 0e5006b14279994d07d14ca2ae4747548c0641f9..a41951cab276a1b6ff68f8fe26c550b6ec9f0869 100644 (file)
@@ -4,7 +4,7 @@
  *  Derived from cx25840-core.c
  *
  *  Copyright (C) 2007  Hans Verkuil <hverkuil@xs4all.nl>
- *  Copyright (C) 2008  Andy Walls <awalls@radix.net>
+ *  Copyright (C) 2008  Andy Walls <awalls@md.metrocast.net>
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License
@@ -1021,86 +1021,74 @@ static int cx18_av_queryctrl(struct v4l2_subdev *sd, struct v4l2_queryctrl *qc)
        return -EINVAL;
 }
 
-static int cx18_av_g_fmt(struct v4l2_subdev *sd, struct v4l2_format *fmt)
-{
-       if (fmt->type != V4L2_BUF_TYPE_SLICED_VBI_CAPTURE)
-               return -EINVAL;
-       return cx18_av_g_sliced_fmt(sd, &fmt->fmt.sliced);
-}
-
-static int cx18_av_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *fmt)
+static int cx18_av_s_mbus_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *fmt)
 {
        struct cx18_av_state *state = to_cx18_av_state(sd);
        struct cx18 *cx = v4l2_get_subdevdata(sd);
-
-       struct v4l2_pix_format *pix;
        int HSC, VSC, Vsrc, Hsrc, filter, Vlines;
        int is_50Hz = !(state->std & V4L2_STD_525_60);
 
-       switch (fmt->type) {
-       case V4L2_BUF_TYPE_VIDEO_CAPTURE:
-               pix = &(fmt->fmt.pix);
+       if (fmt->code != V4L2_MBUS_FMT_FIXED)
+               return -EINVAL;
 
-               Vsrc = (cx18_av_read(cx, 0x476) & 0x3f) << 4;
-               Vsrc |= (cx18_av_read(cx, 0x475) & 0xf0) >> 4;
+       fmt->field = V4L2_FIELD_INTERLACED;
+       fmt->colorspace = V4L2_COLORSPACE_SMPTE170M;
 
-               Hsrc = (cx18_av_read(cx, 0x472) & 0x3f) << 4;
-               Hsrc |= (cx18_av_read(cx, 0x471) & 0xf0) >> 4;
+       Vsrc = (cx18_av_read(cx, 0x476) & 0x3f) << 4;
+       Vsrc |= (cx18_av_read(cx, 0x475) & 0xf0) >> 4;
 
-               /*
-                * This adjustment reflects the excess of vactive, set in
-                * cx18_av_std_setup(), above standard values:
-                *
-                * 480 + 1 for 60 Hz systems
-                * 576 + 3 for 50 Hz systems
-                */
-               Vlines = pix->height + (is_50Hz ? 3 : 1);
-
-               /*
-                * Invalid height and width scaling requests are:
-                * 1. width less than 1/16 of the source width
-                * 2. width greater than the source width
-                * 3. height less than 1/8 of the source height
-                * 4. height greater than the source height
-                */
-               if ((pix->width * 16 < Hsrc) || (Hsrc < pix->width) ||
-                   (Vlines * 8 < Vsrc) || (Vsrc < Vlines)) {
-                       CX18_ERR_DEV(sd, "%dx%d is not a valid size!\n",
-                                    pix->width, pix->height);
-                       return -ERANGE;
-               }
+       Hsrc = (cx18_av_read(cx, 0x472) & 0x3f) << 4;
+       Hsrc |= (cx18_av_read(cx, 0x471) & 0xf0) >> 4;
 
-               HSC = (Hsrc * (1 << 20)) / pix->width - (1 << 20);
-               VSC = (1 << 16) - (Vsrc * (1 << 9) / Vlines - (1 << 9));
-               VSC &= 0x1fff;
+       /*
+        * This adjustment reflects the excess of vactive, set in
+        * cx18_av_std_setup(), above standard values:
+        *
+        * 480 + 1 for 60 Hz systems
+        * 576 + 3 for 50 Hz systems
+        */
+       Vlines = fmt->height + (is_50Hz ? 3 : 1);
 
-               if (pix->width >= 385)
-                       filter = 0;
-               else if (pix->width > 192)
-                       filter = 1;
-               else if (pix->width > 96)
-                       filter = 2;
-               else
-                       filter = 3;
+       /*
+        * Invalid height and width scaling requests are:
+        * 1. width less than 1/16 of the source width
+        * 2. width greater than the source width
+        * 3. height less than 1/8 of the source height
+        * 4. height greater than the source height
+        */
+       if ((fmt->width * 16 < Hsrc) || (Hsrc < fmt->width) ||
+           (Vlines * 8 < Vsrc) || (Vsrc < Vlines)) {
+               CX18_ERR_DEV(sd, "%dx%d is not a valid size!\n",
+                            fmt->width, fmt->height);
+               return -ERANGE;
+       }
 
-               CX18_DEBUG_INFO_DEV(sd,
-                                   "decoder set size %dx%d -> scale  %ux%u\n",
-                                   pix->width, pix->height, HSC, VSC);
-
-               /* HSCALE=HSC */
-               cx18_av_write(cx, 0x418, HSC & 0xff);
-               cx18_av_write(cx, 0x419, (HSC >> 8) & 0xff);
-               cx18_av_write(cx, 0x41a, HSC >> 16);
-               /* VSCALE=VSC */
-               cx18_av_write(cx, 0x41c, VSC & 0xff);
-               cx18_av_write(cx, 0x41d, VSC >> 8);
-               /* VS_INTRLACE=1 VFILT=filter */
-               cx18_av_write(cx, 0x41e, 0x8 | filter);
-               break;
+       HSC = (Hsrc * (1 << 20)) / fmt->width - (1 << 20);
+       VSC = (1 << 16) - (Vsrc * (1 << 9) / Vlines - (1 << 9));
+       VSC &= 0x1fff;
 
-       default:
-               return -EINVAL;
-       }
+       if (fmt->width >= 385)
+               filter = 0;
+       else if (fmt->width > 192)
+               filter = 1;
+       else if (fmt->width > 96)
+               filter = 2;
+       else
+               filter = 3;
+
+       CX18_DEBUG_INFO_DEV(sd,
+                           "decoder set size %dx%d -> scale  %ux%u\n",
+                           fmt->width, fmt->height, HSC, VSC);
+
+       /* HSCALE=HSC */
+       cx18_av_write(cx, 0x418, HSC & 0xff);
+       cx18_av_write(cx, 0x419, (HSC >> 8) & 0xff);
+       cx18_av_write(cx, 0x41a, HSC >> 16);
+       /* VSCALE=VSC */
+       cx18_av_write(cx, 0x41c, VSC & 0xff);
+       cx18_av_write(cx, 0x41d, VSC >> 8);
+       /* VS_INTRLACE=1 VFILT=filter */
+       cx18_av_write(cx, 0x41e, 0x8 | filter);
        return 0;
 }
 
@@ -1398,8 +1386,7 @@ static const struct v4l2_subdev_audio_ops cx18_av_audio_ops = {
 static const struct v4l2_subdev_video_ops cx18_av_video_ops = {
        .s_routing = cx18_av_s_video_routing,
        .s_stream = cx18_av_s_stream,
-       .g_fmt = cx18_av_g_fmt,
-       .s_fmt = cx18_av_s_fmt,
+       .s_mbus_fmt = cx18_av_s_mbus_fmt,
 };
 
 static const struct v4l2_subdev_vbi_ops cx18_av_vbi_ops = {
index c106967bdcc3347e5ef1123d7317a44bf16cff59..1956991795e3ab6b20d4a6b7b05ce3ddda5aecc2 100644 (file)
@@ -4,7 +4,7 @@
  *  Derived from cx25840-core.h
  *
  *  Copyright (C) 2007  Hans Verkuil <hverkuil@xs4all.nl>
- *  Copyright (C) 2008  Andy Walls <awalls@radix.net>
+ *  Copyright (C) 2008  Andy Walls <awalls@md.metrocast.net>
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License
index b9e8cc5d264a4ec12a45ab9bd0fd29bb6b386380..280aa4d22488c658a712e8907823ef0e800358ed 100644 (file)
@@ -2,7 +2,7 @@
  *  cx18 ADEC firmware functions
  *
  *  Copyright (C) 2007  Hans Verkuil <hverkuil@xs4all.nl>
- *  Copyright (C) 2008  Andy Walls <awalls@radix.net>
+ *  Copyright (C) 2008  Andy Walls <awalls@md.metrocast.net>
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License
index 74e122b5fc49285ef426b1c63c6bb8f98562f3fa..6b805afe5d20a464aa51a60b2ae74e73a6a498c9 100644 (file)
@@ -4,7 +4,7 @@
  *  Derived from ivtv-cards.c
  *
  *  Copyright (C) 2007  Hans Verkuil <hverkuil@xs4all.nl>
- *  Copyright (C) 2008  Andy Walls <awalls@radix.net>
+ *  Copyright (C) 2008  Andy Walls <awalls@md.metrocast.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
index 796e517300ac0f64c950ac86cb9304064ae4c5a0..3e750068f275ed7edb46277370c584d177e83917 100644 (file)
@@ -4,7 +4,7 @@
  *  Derived from ivtv-cards.c
  *
  *  Copyright (C) 2007  Hans Verkuil <hverkuil@xs4all.nl>
- *  Copyright (C) 2008  Andy Walls <awalls@radix.net>
+ *  Copyright (C) 2008  Andy Walls <awalls@md.metrocast.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
index 4b4b46544d5a2443c754c0cd9ca4e9966710e5f2..67043c7b452b6f1f0c7a5ec74ebdcc6fa4c55da6 100644 (file)
@@ -297,14 +297,13 @@ int cx18_s_ext_ctrls(struct file *file, void *fh, struct v4l2_ext_controls *c)
                if (p.video_encoding != cx->params.video_encoding) {
                        int is_mpeg1 = p.video_encoding ==
                                                V4L2_MPEG_VIDEO_ENCODING_MPEG_1;
-                       struct v4l2_format fmt;
+                       struct v4l2_mbus_framefmt fmt;
 
                        /* fix videodecoder resolution */
-                       fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-                       fmt.fmt.pix.width = cx->params.width
-                                               / (is_mpeg1 ? 2 : 1);
-                       fmt.fmt.pix.height = cx->params.height;
-                       v4l2_subdev_call(cx->sd_av, video, s_fmt, &fmt);
+                       fmt.width = cx->params.width / (is_mpeg1 ? 2 : 1);
+                       fmt.height = cx->params.height;
+                       fmt.code = V4L2_MBUS_FMT_FIXED;
+                       v4l2_subdev_call(cx->sd_av, video, s_mbus_fmt, &fmt);
                }
                priv.cx = cx;
                priv.s = &cx->streams[id->type];
index c95a86ba33b01b5201799ffb18e1f866c32bf28b..df60f27337cf6d1691db52c9d5000d7b2c35b77a 100644 (file)
@@ -4,7 +4,7 @@
  *  Derived from ivtv-driver.c
  *
  *  Copyright (C) 2007  Hans Verkuil <hverkuil@xs4all.nl>
- *  Copyright (C) 2008  Andy Walls <awalls@radix.net>
+ *  Copyright (C) 2008  Andy Walls <awalls@md.metrocast.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
index b9728e8eee40b7e00cf4dc6d4c0811307045cf01..9bc51a99376bc22231e7c97977d26261de4974b4 100644 (file)
@@ -4,7 +4,7 @@
  *  Derived from ivtv-driver.h
  *
  *  Copyright (C) 2007  Hans Verkuil <hverkuil@xs4all.nl>
- *  Copyright (C) 2008  Andy Walls <awalls@radix.net>
+ *  Copyright (C) 2008  Andy Walls <awalls@md.metrocast.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
index 0ae2c2e1eab540127317b404979a30217e0cc483..6d19f040d70f7da143741cc231fd56a6b7a4a1ce 100644 (file)
@@ -2,7 +2,7 @@
  *  cx18 functions for DVB support
  *
  *  Copyright (c) 2008 Steven Toth <stoth@linuxtv.org>
- *  Copyright (C) 2008  Andy Walls <awalls@radix.net>
+ *  Copyright (C) 2008  Andy Walls <awalls@md.metrocast.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
index e12a15020cdab5f62ce8af1b9d9afb5f15702bc5..9f23b90732f2d38ffdfe3e56edb9939501f26654 100644 (file)
@@ -4,7 +4,7 @@
  *  Derived from ivtv-fileops.c
  *
  *  Copyright (C) 2007  Hans Verkuil <hverkuil@xs4all.nl>
- *  Copyright (C) 2008  Andy Walls <awalls@radix.net>
+ *  Copyright (C) 2008  Andy Walls <awalls@md.metrocast.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
index 83cd559cc6099ebb7e63886e86bb56e0d6b106ea..1b3fb502e6be5fdb31164407a72f8de96fa9712a 100644 (file)
@@ -2,7 +2,7 @@
  *  cx18 firmware functions
  *
  *  Copyright (C) 2007  Hans Verkuil <hverkuil@xs4all.nl>
- *  Copyright (C) 2008  Andy Walls <awalls@radix.net>
+ *  Copyright (C) 2008  Andy Walls <awalls@md.metrocast.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
index 86a204b5448e7edd2f1088ee5e3d1b6596b42980..5374aeb0cd2298f263b3216ec76196b528f4b456 100644 (file)
@@ -4,7 +4,7 @@
  *  Derived from ivtv-gpio.c
  *
  *  Copyright (C) 2007  Hans Verkuil <hverkuil@xs4all.nl>
- *  Copyright (C) 2008  Andy Walls <awalls@radix.net>
+ *  Copyright (C) 2008  Andy Walls <awalls@md.metrocast.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
index f9a5ca3566af2fee27cf3b2186674164abc59f0d..4aea2ef88e8d05794e6a07e3a7ba734dc9be1048 100644 (file)
@@ -4,7 +4,7 @@
  *  Derived from ivtv-gpio.h
  *
  *  Copyright (C) 2007  Hans Verkuil <hverkuil@xs4all.nl>
- *  Copyright (C) 2008  Andy Walls <awalls@radix.net>
+ *  Copyright (C) 2008  Andy Walls <awalls@md.metrocast.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
index cfa1f289b0f52050e1f2a127bd65248e7ca68a77..809f7d37129c9b475d9cc15c46e7b1fb12e24750 100644 (file)
@@ -4,7 +4,7 @@
  *  Derived from ivtv-i2c.c
  *
  *  Copyright (C) 2007  Hans Verkuil <hverkuil@xs4all.nl>
- *  Copyright (C) 2008  Andy Walls <awalls@radix.net>
+ *  Copyright (C) 2008  Andy Walls <awalls@md.metrocast.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
index ec5b3d7bcc6b0802cca9d7f4366f08d9643758d0..49b9dbd06248c53e0e0388e23e1ceb0104a45ec1 100644 (file)
@@ -2,7 +2,7 @@
  *  cx18 driver PCI memory mapped IO access routines
  *
  *  Copyright (C) 2007  Hans Verkuil <hverkuil@xs4all.nl>
- *  Copyright (C) 2008  Andy Walls <awalls@radix.net>
+ *  Copyright (C) 2008  Andy Walls <awalls@md.metrocast.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
index 2635b3a8cc96cafea7db8068ae1ab77066f16e01..18974d886cf729e01d777f10a3f2226a936b397d 100644 (file)
@@ -2,7 +2,7 @@
  *  cx18 driver PCI memory mapped IO access routines
  *
  *  Copyright (C) 2007  Hans Verkuil <hverkuil@xs4all.nl>
- *  Copyright (C) 2008  Andy Walls <awalls@radix.net>
+ *  Copyright (C) 2008  Andy Walls <awalls@md.metrocast.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@
 /*
  * Readback and retry of MMIO access for reliability:
  * The concept was suggested by Steve Toth <stoth@linuxtv.org>.
- * The implmentation is the fault of Andy Walls <awalls@radix.net>.
+ * The implmentation is the fault of Andy Walls <awalls@md.metrocast.net>.
  *
  * *write* functions are implied to retry the mmio unless suffixed with _noretry
  * *read* functions never retry the mmio (it never helps to do so)
index 2530fc54daaf6bd711b387a86f850ecf6ef47a99..20eaf38ba95976b4a46ae7c785d4e3b63c658071 100644 (file)
@@ -4,7 +4,7 @@
  *  Derived from ivtv-ioctl.c
  *
  *  Copyright (C) 2007  Hans Verkuil <hverkuil@xs4all.nl>
- *  Copyright (C) 2008  Andy Walls <awalls@radix.net>
+ *  Copyright (C) 2008  Andy Walls <awalls@md.metrocast.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -274,6 +274,7 @@ static int cx18_s_fmt_vid_cap(struct file *file, void *fh,
 {
        struct cx18_open_id *id = fh;
        struct cx18 *cx = id->cx;
+       struct v4l2_mbus_framefmt mbus_fmt;
        int ret;
        int w, h;
 
@@ -293,9 +294,10 @@ static int cx18_s_fmt_vid_cap(struct file *file, void *fh,
        if (atomic_read(&cx->ana_capturing) > 0)
                return -EBUSY;
 
-       cx->params.width = w;
-       cx->params.height = h;
-       v4l2_subdev_call(cx->sd_av, video, s_fmt, fmt);
+       mbus_fmt.width = cx->params.width = w;
+       mbus_fmt.height = cx->params.height = h;
+       mbus_fmt.code = V4L2_MBUS_FMT_FIXED;
+       v4l2_subdev_call(cx->sd_av, video, s_mbus_fmt, &mbus_fmt);
        return cx18_g_fmt_vid_cap(file, fh, fmt);
 }
 
index e2ca0d1521165fd210a14e8f535724e0a38d249f..dcb2559ad52050dbaeb0420bff74ed8ebae660f4 100644 (file)
@@ -4,7 +4,7 @@
  *  Derived from ivtv-ioctl.h
  *
  *  Copyright (C) 2007  Hans Verkuil <hverkuil@xs4all.nl>
- *  Copyright (C) 2008  Andy Walls <awalls@radix.net>
+ *  Copyright (C) 2008  Andy Walls <awalls@md.metrocast.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
index af2f504eda2b3020efab592ffb834c08087b4d49..80edfe93a3d8948ee13857d439e5574776cfdb99 100644 (file)
@@ -2,7 +2,7 @@
  *  cx18 interrupt handling
  *
  *  Copyright (C) 2007  Hans Verkuil <hverkuil@xs4all.nl>
- *  Copyright (C) 2008  Andy Walls <awalls@radix.net>
+ *  Copyright (C) 2008  Andy Walls <awalls@md.metrocast.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
index 91f0b5278ef9fb0d5368a350a5e2698f9a5a6dd8..30e7eaf8cb5540007446cb79f0c923caf1d21867 100644 (file)
@@ -2,7 +2,7 @@
  *  cx18 interrupt handling
  *
  *  Copyright (C) 2007  Hans Verkuil <hverkuil@xs4all.nl>
- *  Copyright (C) 2008  Andy Walls <awalls@radix.net>
+ *  Copyright (C) 2008  Andy Walls <awalls@md.metrocast.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
index 6dcce297752f57f0f1aae616ee5fb7c1debc4da4..956aa190ecca155c8a6c3db78744b94062af30af 100644 (file)
@@ -2,7 +2,7 @@
  *  cx18 mailbox functions
  *
  *  Copyright (C) 2007  Hans Verkuil <hverkuil@xs4all.nl>
- *  Copyright (C) 2008  Andy Walls <awalls@radix.net>
+ *  Copyright (C) 2008  Andy Walls <awalls@md.metrocast.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
index 33a3491c45374a1128eb8ec8e09e1e91450bc769..077952fcbcca9bf688a61d356dcd9718f3134477 100644 (file)
@@ -2,7 +2,7 @@
  *  cx18 mailbox functions
  *
  *  Copyright (C) 2007  Hans Verkuil <hverkuil@xs4all.nl>
- *  Copyright (C) 2008  Andy Walls <awalls@radix.net>
+ *  Copyright (C) 2008  Andy Walls <awalls@md.metrocast.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
index aefc8c8cf3c16f513a897faacf6e4022e1c40ff5..8884537bd62f9bf4685ea1a48c89f970cbb6f8b7 100644 (file)
@@ -4,7 +4,7 @@
  *  Derived from ivtv-queue.c
  *
  *  Copyright (C) 2007  Hans Verkuil <hverkuil@xs4all.nl>
- *  Copyright (C) 2008  Andy Walls <awalls@radix.net>
+ *  Copyright (C) 2008  Andy Walls <awalls@md.metrocast.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
index 88a6d34ad3bb8fbf38b35a8bbf1cfe09c13724de..4201ddc16091518b553b0ce0e94282a5e025fb4d 100644 (file)
@@ -4,7 +4,7 @@
  *  Derived from ivtv-queue.h
  *
  *  Copyright (C) 2007  Hans Verkuil <hverkuil@xs4all.nl>
- *  Copyright (C) 2008  Andy Walls <awalls@radix.net>
+ *  Copyright (C) 2008  Andy Walls <awalls@md.metrocast.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
index 34b4d03c55cda9692668ce05a0a12aa818aa22f7..85cc59637e54f67fa5ef0ad975adbeef4a958b76 100644 (file)
@@ -2,7 +2,7 @@
  *  cx18 System Control Block initialization
  *
  *  Copyright (C) 2007  Hans Verkuil <hverkuil@xs4all.nl>
- *  Copyright (C) 2008  Andy Walls <awalls@radix.net>
+ *  Copyright (C) 2008  Andy Walls <awalls@md.metrocast.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
index 368f23d08709a6347167c6bf05bc2120057e93bb..08877652e321f8579d350effa6b0531be12f2be1 100644 (file)
@@ -2,7 +2,7 @@
  *  cx18 System Control Block initialization
  *
  *  Copyright (C) 2007  Hans Verkuil <hverkuil@xs4all.nl>
- *  Copyright (C) 2008  Andy Walls <awalls@radix.net>
+ *  Copyright (C) 2008  Andy Walls <awalls@md.metrocast.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
index f5c91261b2db08b565f7a94c2e0e38a2930c8315..9045f1ece0ebb35cdb1b85eec68b96cc2344fcfc 100644 (file)
@@ -4,7 +4,7 @@
  *  Derived from ivtv-streams.c
  *
  *  Copyright (C) 2007  Hans Verkuil <hverkuil@xs4all.nl>
- *  Copyright (C) 2008  Andy Walls <awalls@radix.net>
+ *  Copyright (C) 2008  Andy Walls <awalls@md.metrocast.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
index 0bff0fa2976370f77dc677673bb93529bcbba647..77412bee59631ae5f80096e1302b83b82243aa2a 100644 (file)
@@ -4,7 +4,7 @@
  *  Derived from ivtv-streams.h
  *
  *  Copyright (C) 2007  Hans Verkuil <hverkuil@xs4all.nl>
- *  Copyright (C) 2008  Andy Walls <awalls@radix.net>
+ *  Copyright (C) 2008  Andy Walls <awalls@md.metrocast.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
index 2782709b263fa49a7ed72f7a0f5eef9887111b60..e76014561aa782d0a22b725f079dadb2ef03bf58 100644 (file)
@@ -993,6 +993,7 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
        struct cx231xx *dev = fh->dev;
        int rc;
        struct cx231xx_fmt *fmt;
+       struct v4l2_mbus_framefmt mbus_fmt;
 
        rc = check_dev(dev);
        if (rc < 0)
@@ -1026,7 +1027,9 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
        dev->format = fmt;
        get_scale(dev, dev->width, dev->height, &dev->hscale, &dev->vscale);
 
-       call_all(dev, video, s_fmt, f);
+       v4l2_fill_mbus_format(&mbus_fmt, &f->fmt.pix, V4L2_MBUS_FMT_FIXED);
+       call_all(dev, video, s_mbus_fmt, &mbus_fmt);
+       v4l2_fill_pix_format(&f->fmt.pix, &mbus_fmt);
 
        /* Set the correct alternate setting for this resolution */
        cx231xx_resolution_set(dev);
index 022b480918cd0da8bfa4d2ccb9d4bb23c6001fb7..2bf44ef10fec2dfb870971535b6f21454ce609b9 100644 (file)
@@ -1113,7 +1113,6 @@ invalid:
 void cx2341x_log_status(const struct cx2341x_mpeg_params *p, const char *prefix)
 {
        int is_mpeg1 = p->video_encoding == V4L2_MPEG_VIDEO_ENCODING_MPEG_1;
-       int temporal = p->video_temporal_filter;
 
        /* Stream */
        printk(KERN_INFO "%s: Stream: %s",
@@ -1179,14 +1178,11 @@ void cx2341x_log_status(const struct cx2341x_mpeg_params *p, const char *prefix)
                    V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE),
                p->video_spatial_filter);
 
-       if (p->width != 720 || p->height != (p->is_50hz ? 576 : 480))
-               temporal = 0;
-
        printk(KERN_INFO "%s: Temporal Filter: %s, %d\n",
                prefix,
                cx2341x_menu_item(p,
                        V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE),
-               temporal);
+               p->video_temporal_filter);
        printk(KERN_INFO
                "%s: Median Filter:   %s, Luma [%d, %d], Chroma [%d, %d]\n",
                prefix,
index 9e1460828b2fb0410de226b7075d526402e13f8a..0a199d774d9b7473c37342f43d3629029d71c83b 100644 (file)
@@ -991,6 +991,8 @@ static int dvb_register(struct cx23885_tsport *port)
        ret = videobuf_dvb_register_bus(&port->frontends, THIS_MODULE, port,
                                        &dev->pci->dev, adapter_nr, 0,
                                        cx23885_dvb_fe_ioctl_override);
+       if (!ret)
+               return ret;
 
        /* init CI & MAC */
        switch (dev->board) {
index 4172cb3874207428556d5d75e99d46e1d5f6a38f..d4746e06451692f8c853bf8c73924c87f6ad70b3 100644 (file)
@@ -365,7 +365,17 @@ int cx23885_i2c_register(struct cx23885_i2c *bus)
 
                memset(&info, 0, sizeof(struct i2c_board_info));
                strlcpy(info.type, "ir_video", I2C_NAME_SIZE);
-               i2c_new_probed_device(&bus->i2c_adap, &info, addr_list);
+               /*
+                * We can't call i2c_new_probed_device() because it uses
+                * quick writes for probing and the IR receiver device only
+                * replies to reads.
+                */
+               if (i2c_smbus_xfer(&bus->i2c_adap, addr_list[0], 0,
+                                  I2C_SMBUS_READ, 0, I2C_SMBUS_QUICK,
+                                  NULL) >= 0) {
+                       info.addr = addr_list[0];
+                       i2c_new_device(&bus->i2c_adap, &info);
+               }
        }
 
        return bus->i2c_rc;
index 8d306d8bb61cd60260eb6b4906efa851b3328e4e..5de6ba98f7a8383cd3cb3dd7ac83ce690d1f3f29 100644 (file)
@@ -5,7 +5,7 @@
  *
  *  Most of this file is
  *
- *  Copyright (C) 2009  Andy Walls <awalls@radix.net>
+ *  Copyright (C) 2009  Andy Walls <awalls@md.metrocast.net>
  *
  *  However, the cx23885_input_{init,fini} functions contained herein are
  *  derived from Linux kernel files linux/media/video/.../...-input.c marked as:
index 3572cb1ecfc2f4557f30502803044a8b16873a89..75ef15d3f5235209365ae49d02fc68b2c24323e1 100644 (file)
@@ -3,7 +3,7 @@
  *
  *  Infrared remote control input device
  *
- *  Copyright (C) 2009  Andy Walls <awalls@radix.net>
+ *  Copyright (C) 2009  Andy Walls <awalls@md.metrocast.net>
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License
index dfb4627fb3402580ff2b13f474e61779b353a3d9..44812ca788992d6a511e12354464df0d85eb64e1 100644 (file)
@@ -3,7 +3,7 @@
  *
  *  Various common ioctl() support functions
  *
- *  Copyright (c) 2009 Andy Walls <awalls@radix.net>
+ *  Copyright (c) 2009 Andy Walls <awalls@md.metrocast.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
index 80b0f4923c6a76c9291638532c5cec32c23e546c..315be0ca5a0405045e48053b3784de973a0ddfca 100644 (file)
@@ -3,7 +3,7 @@
  *
  *  Various common ioctl() support functions
  *
- *  Copyright (c) 2009 Andy Walls <awalls@radix.net>
+ *  Copyright (c) 2009 Andy Walls <awalls@md.metrocast.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
index 6ae982cc985626fd9edac215117bfbeafe433e2c..9a677eb080af4efb3d58d1dccd63a166a1ef2cdc 100644 (file)
@@ -3,7 +3,7 @@
  *
  *  Infrared device support routines - non-input, non-vl42_subdev routines
  *
- *  Copyright (C) 2009  Andy Walls <awalls@radix.net>
+ *  Copyright (C) 2009  Andy Walls <awalls@md.metrocast.net>
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License
index 9b8a6d5d1ef63ef9198114436ac7a6d07482ed51..0c9d8bda9e2895d1640c96c6b89e16cb95f499ec 100644 (file)
@@ -3,7 +3,7 @@
  *
  *  Infrared device support routines - non-input, non-vl42_subdev routines
  *
- *  Copyright (C) 2009  Andy Walls <awalls@radix.net>
+ *  Copyright (C) 2009  Andy Walls <awalls@md.metrocast.net>
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License
index 543b854f6a620498e37e1d9dbf3b081cfddf309b..4e44dcda38756e298aa2da930907cde71ae5a113 100644 (file)
@@ -976,6 +976,7 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
 {
        struct cx23885_fh *fh = priv;
        struct cx23885_dev *dev  = ((struct cx23885_fh *)priv)->dev;
+       struct v4l2_mbus_framefmt mbus_fmt;
        int err;
 
        dprintk(2, "%s()\n", __func__);
@@ -989,7 +990,9 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
        fh->vidq.field = f->fmt.pix.field;
        dprintk(2, "%s() width=%d height=%d field=%d\n", __func__,
                fh->width, fh->height, fh->vidq.field);
-       call_all(dev, video, s_fmt, f);
+       v4l2_fill_mbus_format(&mbus_fmt, &f->fmt.pix, V4L2_MBUS_FMT_FIXED);
+       call_all(dev, video, s_mbus_fmt, &mbus_fmt);
+       v4l2_fill_pix_format(&f->fmt.pix, &mbus_fmt);
        return 0;
 }
 
index ad728d767d699eba750ebbe5b65915d857a42b50..f63d378257a76ccc733fe953b513e0e6e84e8b62 100644 (file)
@@ -3,7 +3,7 @@
  *
  *  CX23888 Integrated Consumer Infrared Controller
  *
- *  Copyright (C) 2009  Andy Walls <awalls@radix.net>
+ *  Copyright (C) 2009  Andy Walls <awalls@md.metrocast.net>
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License
index 3d446f9eb94bd2bfce686e488b8b6cb37c91428a..d2de41caaf1d6e902354adfacb6e8611cc7948d3 100644 (file)
@@ -3,7 +3,7 @@
  *
  *  CX23888 Integrated Consumer Infrared Controller
  *
- *  Copyright (C) 2009  Andy Walls <awalls@radix.net>
+ *  Copyright (C) 2009  Andy Walls <awalls@md.metrocast.net>
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License
index 8b6fb35443769140ac04de0d241765f47f9974be..bb4872b2ceb0d0a6455d792f84ddfa9217c0014c 100644 (file)
@@ -1014,75 +1014,59 @@ static int cx25840_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
 
 /* ----------------------------------------------------------------------- */
 
-static int cx25840_g_fmt(struct v4l2_subdev *sd, struct v4l2_format *fmt)
-{
-       switch (fmt->type) {
-       case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE:
-               return cx25840_g_sliced_fmt(sd, &fmt->fmt.sliced);
-       default:
-               return -EINVAL;
-       }
-       return 0;
-}
-
-static int cx25840_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *fmt)
+static int cx25840_s_mbus_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *fmt)
 {
        struct cx25840_state *state = to_state(sd);
        struct i2c_client *client = v4l2_get_subdevdata(sd);
-       struct v4l2_pix_format *pix;
        int HSC, VSC, Vsrc, Hsrc, filter, Vlines;
        int is_50Hz = !(state->std & V4L2_STD_525_60);
 
-       switch (fmt->type) {
-       case V4L2_BUF_TYPE_VIDEO_CAPTURE:
-               pix = &(fmt->fmt.pix);
-
-               Vsrc = (cx25840_read(client, 0x476) & 0x3f) << 4;
-               Vsrc |= (cx25840_read(client, 0x475) & 0xf0) >> 4;
-
-               Hsrc = (cx25840_read(client, 0x472) & 0x3f) << 4;
-               Hsrc |= (cx25840_read(client, 0x471) & 0xf0) >> 4;
+       if (fmt->code != V4L2_MBUS_FMT_FIXED)
+               return -EINVAL;
 
-               Vlines = pix->height + (is_50Hz ? 4 : 7);
+       fmt->field = V4L2_FIELD_INTERLACED;
+       fmt->colorspace = V4L2_COLORSPACE_SMPTE170M;
 
-               if ((pix->width * 16 < Hsrc) || (Hsrc < pix->width) ||
-                   (Vlines * 8 < Vsrc) || (Vsrc < Vlines)) {
-                       v4l_err(client, "%dx%d is not a valid size!\n",
-                                   pix->width, pix->height);
-                       return -ERANGE;
-               }
+       Vsrc = (cx25840_read(client, 0x476) & 0x3f) << 4;
+       Vsrc |= (cx25840_read(client, 0x475) & 0xf0) >> 4;
 
-               HSC = (Hsrc * (1 << 20)) / pix->width - (1 << 20);
-               VSC = (1 << 16) - (Vsrc * (1 << 9) / Vlines - (1 << 9));
-               VSC &= 0x1fff;
+       Hsrc = (cx25840_read(client, 0x472) & 0x3f) << 4;
+       Hsrc |= (cx25840_read(client, 0x471) & 0xf0) >> 4;
 
-               if (pix->width >= 385)
-                       filter = 0;
-               else if (pix->width > 192)
-                       filter = 1;
-               else if (pix->width > 96)
-                       filter = 2;
-               else
-                       filter = 3;
-
-               v4l_dbg(1, cx25840_debug, client, "decoder set size %dx%d -> scale  %ux%u\n",
-                           pix->width, pix->height, HSC, VSC);
-
-               /* HSCALE=HSC */
-               cx25840_write(client, 0x418, HSC & 0xff);
-               cx25840_write(client, 0x419, (HSC >> 8) & 0xff);
-               cx25840_write(client, 0x41a, HSC >> 16);
-               /* VSCALE=VSC */
-               cx25840_write(client, 0x41c, VSC & 0xff);
-               cx25840_write(client, 0x41d, VSC >> 8);
-               /* VS_INTRLACE=1 VFILT=filter */
-               cx25840_write(client, 0x41e, 0x8 | filter);
-               break;
+       Vlines = fmt->height + (is_50Hz ? 4 : 7);
 
-       default:
-               return -EINVAL;
+       if ((fmt->width * 16 < Hsrc) || (Hsrc < fmt->width) ||
+                       (Vlines * 8 < Vsrc) || (Vsrc < Vlines)) {
+               v4l_err(client, "%dx%d is not a valid size!\n",
+                               fmt->width, fmt->height);
+               return -ERANGE;
        }
 
+       HSC = (Hsrc * (1 << 20)) / fmt->width - (1 << 20);
+       VSC = (1 << 16) - (Vsrc * (1 << 9) / Vlines - (1 << 9));
+       VSC &= 0x1fff;
+
+       if (fmt->width >= 385)
+               filter = 0;
+       else if (fmt->width > 192)
+               filter = 1;
+       else if (fmt->width > 96)
+               filter = 2;
+       else
+               filter = 3;
+
+       v4l_dbg(1, cx25840_debug, client, "decoder set size %dx%d -> scale  %ux%u\n",
+                       fmt->width, fmt->height, HSC, VSC);
+
+       /* HSCALE=HSC */
+       cx25840_write(client, 0x418, HSC & 0xff);
+       cx25840_write(client, 0x419, (HSC >> 8) & 0xff);
+       cx25840_write(client, 0x41a, HSC >> 16);
+       /* VSCALE=VSC */
+       cx25840_write(client, 0x41c, VSC & 0xff);
+       cx25840_write(client, 0x41d, VSC >> 8);
+       /* VS_INTRLACE=1 VFILT=filter */
+       cx25840_write(client, 0x41e, 0x8 | filter);
        return 0;
 }
 
@@ -1627,8 +1611,7 @@ static const struct v4l2_subdev_audio_ops cx25840_audio_ops = {
 
 static const struct v4l2_subdev_video_ops cx25840_video_ops = {
        .s_routing = cx25840_s_video_routing,
-       .g_fmt = cx25840_g_fmt,
-       .s_fmt = cx25840_s_fmt,
+       .s_mbus_fmt = cx25840_s_mbus_fmt,
        .s_stream = cx25840_s_stream,
 };
 
index ee1ca39db06ad684758dc4da0bfa8b35aa8e1f56..fb39f11845583a86dcb463745d66d498bc873efe 100644 (file)
@@ -188,10 +188,24 @@ int cx88_i2c_init(struct cx88_core *core, struct pci_dev *pci)
                        0x18, 0x6b, 0x71,
                        I2C_CLIENT_END
                };
+               const unsigned short *addrp;
 
                memset(&info, 0, sizeof(struct i2c_board_info));
                strlcpy(info.type, "ir_video", I2C_NAME_SIZE);
-               i2c_new_probed_device(&core->i2c_adap, &info, addr_list);
+               /*
+                * We can't call i2c_new_probed_device() because it uses
+                * quick writes for probing and at least some R receiver
+                * devices only reply to reads.
+                */
+               for (addrp = addr_list; *addrp != I2C_CLIENT_END; addrp++) {
+                       if (i2c_smbus_xfer(&core->i2c_adap, *addrp, 0,
+                                          I2C_SMBUS_READ, 0,
+                                          I2C_SMBUS_QUICK, NULL) >= 0) {
+                               info.addr = *addrp;
+                               i2c_new_device(&core->i2c_adap, &info);
+                               break;
+                       }
+               }
        }
        return core->i2c_rc;
 }
index 331e1cac427221ba39f1002fa625a913da35363e..44c63cbd6dda8da1dcdc1375c94db856e934b4d4 100644 (file)
@@ -1186,8 +1186,7 @@ int em28xx_register_extension(struct em28xx_ops *ops)
        mutex_lock(&em28xx_devlist_mutex);
        list_add_tail(&ops->next, &em28xx_extension_devlist);
        list_for_each_entry(dev, &em28xx_devlist, devlist) {
-               if (dev)
-                       ops->init(dev);
+               ops->init(dev);
        }
        printk(KERN_INFO "Em28xx: Initialized (%s) extension\n", ops->name);
        mutex_unlock(&em28xx_devlist_mutex);
@@ -1201,10 +1200,8 @@ void em28xx_unregister_extension(struct em28xx_ops *ops)
 
        mutex_lock(&em28xx_devlist_mutex);
        list_for_each_entry(dev, &em28xx_devlist, devlist) {
-               if (dev)
-                       ops->fini(dev);
+               ops->fini(dev);
        }
-
        printk(KERN_INFO "Em28xx: Removed (%s) extension\n", ops->name);
        list_del(&ops->next);
        mutex_unlock(&em28xx_devlist_mutex);
index 785eeb4c20144573416c44f8b970198e74730ba6..95354a339e3d3aabd100fd11d26dc893c7e9bee4 100644 (file)
@@ -1453,9 +1453,7 @@ static const struct usb_device_id device_table[] __devinitconst = {
        {USB_DEVICE(0x0c45, 0x6029), SB(PAS106, 102)},
        {USB_DEVICE(0x0c45, 0x602c), SB(OV7630, 102)},
        {USB_DEVICE(0x0c45, 0x602d), SB(HV7131R, 102)},
-#if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE
        {USB_DEVICE(0x0c45, 0x602e), SB(OV7630, 102)},
-#endif
        {USB_DEVICE(0x0c45, 0x608f), SB(OV7630, 103)},
 #if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE
        {USB_DEVICE(0x0c45, 0x60af), SB(PAS202, 103)},
index bb923efb75bd5c0ddd6cec17633a256f32973557..176c5b3d5e6f9096df04276a56995d3ce08684e7 100644 (file)
@@ -3022,16 +3022,18 @@ static const __devinitdata struct usb_device_id device_table[] = {
 /*     {USB_DEVICE(0x0c45, 0x60c2), BS(SN9C105, P1030xC)}, */
 /*     {USB_DEVICE(0x0c45, 0x60c8), BS(SN9C105, OM6802)}, */
 /*     {USB_DEVICE(0x0c45, 0x60cc), BS(SN9C105, HV7131GP)}, */
+       {USB_DEVICE(0x0c45, 0x60ce), BS(SN9C105, SP80708)},
        {USB_DEVICE(0x0c45, 0x60ec), BS(SN9C105, MO4000)},
 /*     {USB_DEVICE(0x0c45, 0x60ef), BS(SN9C105, ICM105C)}, */
 /*     {USB_DEVICE(0x0c45, 0x60fa), BS(SN9C105, OV7648)}, */
+/*     {USB_DEVICE(0x0c45, 0x60f2), BS(SN9C105, OV7660)}, */
        {USB_DEVICE(0x0c45, 0x60fb), BS(SN9C105, OV7660)},
 #if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE
        {USB_DEVICE(0x0c45, 0x60fc), BS(SN9C105, HV7131R)},
        {USB_DEVICE(0x0c45, 0x60fe), BS(SN9C105, OV7630)},
 #endif
        {USB_DEVICE(0x0c45, 0x6100), BS(SN9C120, MI0360)},      /*sn9c128*/
-/*     {USB_DEVICE(0x0c45, 0x6102), BS(SN9C120, P1030xC)}, */
+/*     {USB_DEVICE(0x0c45, 0x6102), BS(SN9C120, PO2030N)}, * / GC0305*/
 /*     {USB_DEVICE(0x0c45, 0x6108), BS(SN9C120, OM6802)}, */
        {USB_DEVICE(0x0c45, 0x610a), BS(SN9C120, OV7648)},      /*sn9c128*/
        {USB_DEVICE(0x0c45, 0x610b), BS(SN9C120, OV7660)},      /*sn9c128*/
@@ -3058,6 +3060,7 @@ static const __devinitdata struct usb_device_id device_table[] = {
        {USB_DEVICE(0x0c45, 0x613c), BS(SN9C120, HV7131R)},
        {USB_DEVICE(0x0c45, 0x613e), BS(SN9C120, OV7630)},
        {USB_DEVICE(0x0c45, 0x6142), BS(SN9C120, PO2030N)},     /*sn9c120b*/
+                                               /* or GC0305 / GC0307 */
        {USB_DEVICE(0x0c45, 0x6143), BS(SN9C120, SP80708)},     /*sn9c120b*/
        {USB_DEVICE(0x0c45, 0x6148), BS(SN9C120, OM6802)},      /*sn9c120b*/
        {USB_DEVICE(0x0c45, 0x614a), BS(SN9C120, ADCM1700)},    /*sn9c120b*/
index 7cfccfd1b870fc6f202c9b6cbf6f843ab5bec7b0..c338f3f62e777abd0950d123c11338159a6788f0 100644 (file)
@@ -366,7 +366,7 @@ static int hdpvr_open(struct file *file)
 
        dev = (struct hdpvr_device *)video_get_drvdata(video_devdata(file));
        if (!dev) {
-               v4l2_err(&dev->v4l2_dev, "open failing with with ENODEV\n");
+               pr_err("open failing with with ENODEV\n");
                retval = -ENODEV;
                goto err;
        }
index b59475bfc243990a7397281ca90ac2c2b9170402..b588e30cbcf02bfa79fef54c09e3134a536bb730 100644 (file)
@@ -267,13 +267,13 @@ int ivtv_s_ext_ctrls(struct file *file, void *fh, struct v4l2_ext_controls *c)
                if (p.video_encoding != itv->params.video_encoding) {
                        int is_mpeg1 = p.video_encoding ==
                                V4L2_MPEG_VIDEO_ENCODING_MPEG_1;
-                       struct v4l2_format fmt;
+                       struct v4l2_mbus_framefmt fmt;
 
                        /* fix videodecoder resolution */
-                       fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-                       fmt.fmt.pix.width = itv->params.width / (is_mpeg1 ? 2 : 1);
-                       fmt.fmt.pix.height = itv->params.height;
-                       v4l2_subdev_call(itv->sd_video, video, s_fmt, &fmt);
+                       fmt.width = itv->params.width / (is_mpeg1 ? 2 : 1);
+                       fmt.height = itv->params.height;
+                       fmt.code = V4L2_MBUS_FMT_FIXED;
+                       v4l2_subdev_call(itv->sd_video, video, s_mbus_fmt, &fmt);
                }
                err = cx2341x_update(itv, ivtv_api_func, &itv->params, &p);
                if (!err && itv->params.stream_vbi_fmt != p.stream_vbi_fmt)
index abf410943cc9f54cdf2047597c07117f1408f102..3c2cc270ccd548bd455b69073f3f584f6944650a 100644 (file)
@@ -823,6 +823,12 @@ static void ivtv_stop_decoding(struct ivtv_open_id *id, int flags, u64 pts)
 
        IVTV_DEBUG_FILE("close() of %s\n", s->name);
 
+       if (id->type == IVTV_DEC_STREAM_TYPE_YUV &&
+               test_bit(IVTV_F_I_DECODING_YUV, &itv->i_flags)) {
+               /* Restore registers we've changed & clean up any mess */
+               ivtv_yuv_close(itv);
+       }
+
        /* Stop decoding */
        if (test_bit(IVTV_F_S_STREAMING, &s->s_flags)) {
                IVTV_DEBUG_INFO("close stopping decode\n");
@@ -832,10 +838,7 @@ static void ivtv_stop_decoding(struct ivtv_open_id *id, int flags, u64 pts)
        }
        clear_bit(IVTV_F_S_APPL_IO, &s->s_flags);
        clear_bit(IVTV_F_S_STREAMOFF, &s->s_flags);
-       if (id->type == IVTV_DEC_STREAM_TYPE_YUV && test_bit(IVTV_F_I_DECODING_YUV, &itv->i_flags)) {
-               /* Restore registers we've changed & clean up any mess we've made */
-               ivtv_yuv_close(itv);
-       }
+
        if (itv->output_mode == OUT_UDMA_YUV && id->yuv_frames)
                itv->output_mode = OUT_NONE;
 
index fa9f0d958f96c25fd682d2a2fd65e07ac9c724b9..11ac2fa33ef7153855ff7f17f0a2a35a11e661df 100644 (file)
@@ -569,6 +569,7 @@ static int ivtv_s_fmt_vid_cap(struct file *file, void *fh, struct v4l2_format *f
        struct ivtv_open_id *id = fh;
        struct ivtv *itv = id->itv;
        struct cx2341x_mpeg_params *p = &itv->params;
+       struct v4l2_mbus_framefmt mbus_fmt;
        int ret = ivtv_try_fmt_vid_cap(file, fh, fmt);
        int w = fmt->fmt.pix.width;
        int h = fmt->fmt.pix.height;
@@ -586,7 +587,10 @@ static int ivtv_s_fmt_vid_cap(struct file *file, void *fh, struct v4l2_format *f
        p->height = h;
        if (p->video_encoding == V4L2_MPEG_VIDEO_ENCODING_MPEG_1)
                fmt->fmt.pix.width /= 2;
-       v4l2_subdev_call(itv->sd_video, video, s_fmt, fmt);
+       mbus_fmt.width = fmt->fmt.pix.width;
+       mbus_fmt.height = h;
+       mbus_fmt.code = V4L2_MBUS_FMT_FIXED;
+       v4l2_subdev_call(itv->sd_video, video, s_mbus_fmt, &mbus_fmt);
        return ivtv_g_fmt_vid_cap(file, fh, fmt);
 }
 
index de4288cc188933d6e4100fb162dcab9099a14238..9ecacab4b89b3a63c601d12c3ea6ba1862f115e3 100644 (file)
@@ -618,12 +618,17 @@ static int ivtv_setup_v4l2_decode_stream(struct ivtv_stream *s)
        struct ivtv *itv = s->itv;
        struct cx2341x_mpeg_params *p = &itv->params;
        int datatype;
+       u16 width;
+       u16 height;
 
        if (s->vdev == NULL)
                return -EINVAL;
 
        IVTV_DEBUG_INFO("Setting some initial decoder settings\n");
 
+       width = p->width;
+       height = p->height;
+
        /* set audio mode to left/stereo  for dual/stereo mode. */
        ivtv_vapi(itv, CX2341X_DEC_SET_AUDIO_MODE, 2, itv->audio_bilingual_mode, itv->audio_stereo_mode);
 
@@ -646,7 +651,14 @@ static int ivtv_setup_v4l2_decode_stream(struct ivtv_stream *s)
           2 = yuv_from_host */
        switch (s->type) {
        case IVTV_DEC_STREAM_TYPE_YUV:
-               datatype = itv->output_mode == OUT_PASSTHROUGH ? 1 : 2;
+               if (itv->output_mode == OUT_PASSTHROUGH) {
+                       datatype = 1;
+               } else {
+                       /* Fake size to avoid switching video standard */
+                       datatype = 2;
+                       width = 720;
+                       height = itv->is_out_50hz ? 576 : 480;
+               }
                IVTV_DEBUG_INFO("Setup DEC YUV Stream data[0] = %d\n", datatype);
                break;
        case IVTV_DEC_STREAM_TYPE_MPG:
@@ -655,9 +667,13 @@ static int ivtv_setup_v4l2_decode_stream(struct ivtv_stream *s)
                break;
        }
        if (ivtv_vapi(itv, CX2341X_DEC_SET_DECODER_SOURCE, 4, datatype,
-                       p->width, p->height, p->audio_properties)) {
+                       width, height, p->audio_properties)) {
                IVTV_DEBUG_WARN("Couldn't initialize decoder source\n");
        }
+
+       /* Decoder sometimes dies here, so wait a moment */
+       ivtv_msleep_timeout(10, 0);
+
        return 0;
 }
 
@@ -697,6 +713,9 @@ int ivtv_start_v4l2_decode_stream(struct ivtv_stream *s, int gop_offset)
        /* start playback */
        ivtv_vapi(itv, CX2341X_DEC_START_PLAYBACK, 2, gop_offset, 0);
 
+       /* Let things settle before we actually start */
+       ivtv_msleep_timeout(10, 0);
+
        /* Clear the following Interrupt mask bits for decoding */
        ivtv_clear_irq_mask(itv, IVTV_IRQ_MASK_DECODE);
        IVTV_DEBUG_IRQ("IRQ Mask is now: 0x%08x\n", itv->irqmask);
index 49e1a283ed3649ec8cf55e19663e24628652d89c..9ff3425891edc7f678452317d33351ab80a4034c 100644 (file)
@@ -1066,7 +1066,11 @@ static int ivtvfb_init_io(struct ivtv *itv)
        }
        mutex_unlock(&itv->serialize_lock);
 
-       ivtvfb_get_framebuffer(itv, &oi->video_rbase, &oi->video_buffer_size);
+       if (ivtvfb_get_framebuffer(itv, &oi->video_rbase,
+                                       &oi->video_buffer_size) < 0) {
+               IVTVFB_ERR("Firmware failed to respond\n");
+               return -EIO;
+       }
 
        /* The osd buffer size depends on the number of video buffers allocated
           on the PVR350 itself. For now we'll hardcode the smallest osd buffer
@@ -1158,8 +1162,11 @@ static int ivtvfb_init_card(struct ivtv *itv)
        }
 
        /* Find & setup the OSD buffer */
-       if ((rc = ivtvfb_init_io(itv)))
+       rc = ivtvfb_init_io(itv);
+       if (rc) {
+               ivtvfb_release_buffers(itv);
                return rc;
+       }
 
        /* Set the startup video mode information */
        if ((rc = ivtvfb_init_vidmode(itv))) {
@@ -1210,6 +1217,7 @@ static int ivtvfb_callback_cleanup(struct device *dev, void *p)
 {
        struct v4l2_device *v4l2_dev = dev_get_drvdata(dev);
        struct ivtv *itv = container_of(v4l2_dev, struct ivtv, v4l2_dev);
+       struct osd_info *oi = itv->osd_info;
 
        if (itv && (itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT)) {
                if (unregister_framebuffer(&itv->osd_info->ivtvfb_info)) {
@@ -1218,7 +1226,7 @@ static int ivtvfb_callback_cleanup(struct device *dev, void *p)
                        return 0;
                }
                IVTVFB_INFO("Unregister framebuffer %d\n", itv->instance);
-               ivtvfb_blank(FB_BLANK_POWERDOWN, &itv->osd_info->ivtvfb_info);
+               ivtvfb_blank(FB_BLANK_VSYNC_SUSPEND, &oi->ivtvfb_info);
                ivtvfb_release_buffers(itv);
                itv->osd_video_pbase = 0;
        }
index e3b9a8ab37f4e5c53f11c14d82a8855883f50036..79f096ddcf5def01671ef05af5fe8abcad4c8878 100644 (file)
@@ -701,13 +701,13 @@ static struct v4l2_subdev_core_ops mt9m001_subdev_core_ops = {
 #endif
 };
 
-static int mt9m001_enum_fmt(struct v4l2_subdev *sd, int index,
+static int mt9m001_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
                            enum v4l2_mbus_pixelcode *code)
 {
        struct i2c_client *client = sd->priv;
        struct mt9m001 *mt9m001 = to_mt9m001(client);
 
-       if ((unsigned int)index >= mt9m001->num_fmts)
+       if (index >= mt9m001->num_fmts)
                return -EINVAL;
 
        *code = mt9m001->fmts[index].code;
index e42162c50f0a3436ae74ee2249221b6ff75a1120..fbd0fc794720cb21ef56345315a382d0f3263e27 100644 (file)
@@ -999,10 +999,10 @@ static struct v4l2_subdev_core_ops mt9m111_subdev_core_ops = {
 #endif
 };
 
-static int mt9m111_enum_fmt(struct v4l2_subdev *sd, int index,
+static int mt9m111_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
                            enum v4l2_mbus_pixelcode *code)
 {
-       if ((unsigned int)index >= ARRAY_SIZE(mt9m111_colour_fmts))
+       if (index >= ARRAY_SIZE(mt9m111_colour_fmts))
                return -EINVAL;
 
        *code = mt9m111_colour_fmts[index].code;
index 9f5ff2547f1993bde3f594aa95bf4bb11d23c50d..a9a28b2142359adcce64d15ed0cc4a64a8ab71e1 100644 (file)
@@ -798,7 +798,7 @@ static struct v4l2_subdev_core_ops mt9t031_subdev_core_ops = {
 #endif
 };
 
-static int mt9t031_enum_fmt(struct v4l2_subdev *sd, int index,
+static int mt9t031_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
                            enum v4l2_mbus_pixelcode *code)
 {
        if (index)
index aa4fce95098f06a5e8dcb832cd56d7d15de972ba..e4bf1db9a87b4d978eaad6646c1fed2b1076cf70 100644 (file)
@@ -1017,10 +1017,10 @@ static int mt9t112_try_fmt(struct v4l2_subdev *sd,
        return 0;
 }
 
-static int mt9t112_enum_fmt(struct v4l2_subdev *sd, int index,
+static int mt9t112_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
                           enum v4l2_mbus_pixelcode *code)
 {
-       if ((unsigned int)index >= ARRAY_SIZE(mt9t112_cfmts))
+       if (index >= ARRAY_SIZE(mt9t112_cfmts))
                return -EINVAL;
 
        *code = mt9t112_cfmts[index].code;
index 72e55be0b4abae5fdc59651117613e84c6f4e348..f5e778d5ca9fdb859754b8d3f99601833029d973 100644 (file)
@@ -392,27 +392,25 @@ static int mt9v011_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
        return 0;
 }
 
-static int mt9v011_enum_fmt(struct v4l2_subdev *sd, struct v4l2_fmtdesc *fmt)
+static int mt9v011_enum_mbus_fmt(struct v4l2_subdev *sd, unsigned index,
+                                       enum v4l2_mbus_pixelcode *code)
 {
-       if (fmt->index > 0)
+       if (index > 0)
                return -EINVAL;
 
-       fmt->flags = 0;
-       strcpy(fmt->description, "8 bpp Bayer GRGR..BGBG");
-       fmt->pixelformat = V4L2_PIX_FMT_SGRBG8;
-
+       *code = V4L2_MBUS_FMT_SGRBG8_1X8;
        return 0;
 }
 
-static int mt9v011_try_fmt(struct v4l2_subdev *sd, struct v4l2_format *fmt)
+static int mt9v011_try_mbus_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *fmt)
 {
-       struct v4l2_pix_format *pix = &fmt->fmt.pix;
-
-       if (pix->pixelformat != V4L2_PIX_FMT_SGRBG8)
+       if (fmt->code != V4L2_MBUS_FMT_SGRBG8_1X8)
                return -EINVAL;
 
-       v4l_bound_align_image(&pix->width, 48, 639, 1,
-                             &pix->height, 32, 480, 1, 0);
+       v4l_bound_align_image(&fmt->width, 48, 639, 1,
+                             &fmt->height, 32, 480, 1, 0);
+       fmt->field = V4L2_FIELD_NONE;
+       fmt->colorspace = V4L2_COLORSPACE_SRGB;
 
        return 0;
 }
@@ -455,18 +453,17 @@ static int mt9v011_s_parm(struct v4l2_subdev *sd, struct v4l2_streamparm *parms)
        return 0;
 }
 
-static int mt9v011_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *fmt)
+static int mt9v011_s_mbus_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *fmt)
 {
-       struct v4l2_pix_format *pix = &fmt->fmt.pix;
        struct mt9v011 *core = to_mt9v011(sd);
        int rc;
 
-       rc = mt9v011_try_fmt(sd, fmt);
+       rc = mt9v011_try_mbus_fmt(sd, fmt);
        if (rc < 0)
                return -EINVAL;
 
-       core->width = pix->width;
-       core->height = pix->height;
+       core->width = fmt->width;
+       core->height = fmt->height;
 
        set_res(sd);
 
@@ -549,9 +546,9 @@ static const struct v4l2_subdev_core_ops mt9v011_core_ops = {
 };
 
 static const struct v4l2_subdev_video_ops mt9v011_video_ops = {
-       .enum_fmt = mt9v011_enum_fmt,
-       .try_fmt = mt9v011_try_fmt,
-       .s_fmt = mt9v011_s_fmt,
+       .enum_mbus_fmt = mt9v011_enum_mbus_fmt,
+       .try_mbus_fmt = mt9v011_try_mbus_fmt,
+       .s_mbus_fmt = mt9v011_s_mbus_fmt,
        .g_parm = mt9v011_g_parm,
        .s_parm = mt9v011_s_parm,
 };
index fb44ff006628834fb45b5d728589edfad34b99a8..e7cd23cd63941ecb3380243f623960cf91c8ea31 100644 (file)
@@ -838,13 +838,13 @@ static struct v4l2_subdev_core_ops mt9v022_subdev_core_ops = {
 #endif
 };
 
-static int mt9v022_enum_fmt(struct v4l2_subdev *sd, int index,
+static int mt9v022_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
                            enum v4l2_mbus_pixelcode *code)
 {
        struct i2c_client *client = sd->priv;
        struct mt9v022 *mt9v022 = to_mt9v022(client);
 
-       if ((unsigned int)index >= mt9v022->num_fmts)
+       if (index >= mt9v022->num_fmts)
                return -EINVAL;
 
        *code = mt9v022->fmts[index].code;
index d477e3058002c27f996c445b1980e2a4e1ae24ea..a9be14c239124a06185c3ff6c43af44bb47d4f83 100644 (file)
@@ -672,7 +672,7 @@ static bool mx3_camera_packing_supported(const struct soc_mbus_pixelfmt *fmt)
                 fmt->packing == SOC_MBUS_PACKING_EXTEND16);
 }
 
-static int mx3_camera_get_formats(struct soc_camera_device *icd, int idx,
+static int mx3_camera_get_formats(struct soc_camera_device *icd, unsigned int idx,
                                  struct soc_camera_format_xlate *xlate)
 {
        struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
@@ -689,7 +689,7 @@ static int mx3_camera_get_formats(struct soc_camera_device *icd, int idx,
        fmt = soc_mbus_get_fmtdesc(code);
        if (!fmt) {
                dev_err(icd->dev.parent,
-                       "Invalid format code #%d: %d\n", idx, code);
+                       "Invalid format code #%u: %d\n", idx, code);
                return 0;
        }
 
index 4c0ab499228bd5d6a559932b5ef63e6e9646c5a1..e7db0554949a943fff6d3f6e1221064916b7acb1 100644 (file)
@@ -2371,12 +2371,11 @@ static int __init omap_vout_create_video_devices(struct platform_device *pdev)
 
        for (k = 0; k < pdev->num_resources; k++) {
 
-               vout = kmalloc(sizeof(struct omap_vout_device), GFP_KERNEL);
+               vout = kzalloc(sizeof(struct omap_vout_device), GFP_KERNEL);
                if (!vout) {
                        dev_err(&pdev->dev, ": could not allocate memory\n");
                        return -ENOMEM;
                }
-               memset(vout, 0, sizeof(struct omap_vout_device));
 
                vout->vid = k;
                vid_dev->vouts[k] = vout;
index c33acc94b7472c5c6fdaec46b26d1690fed541d7..34034a710214e39b30f6f194f5cde31383aa9636 100644 (file)
@@ -1092,10 +1092,10 @@ static struct v4l2_subdev_core_ops ov772x_subdev_core_ops = {
 #endif
 };
 
-static int ov772x_enum_fmt(struct v4l2_subdev *sd, int index,
+static int ov772x_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
                           enum v4l2_mbus_pixelcode *code)
 {
-       if ((unsigned int)index >= ARRAY_SIZE(ov772x_cfmts))
+       if (index >= ARRAY_SIZE(ov772x_cfmts))
                return -EINVAL;
 
        *code = ov772x_cfmts[index].code;
index 035e9ecb0c7569ce0e65bde6607d1b6b529c10ff..7ce9e05b47815c764baa56d087dab3d47b4b228d 100644 (file)
@@ -614,10 +614,10 @@ static int ov9640_try_fmt(struct v4l2_subdev *sd,
        return 0;
 }
 
-static int ov9640_enum_fmt(struct v4l2_subdev *sd, int index,
+static int ov9640_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
                           enum v4l2_mbus_pixelcode *code)
 {
-       if ((unsigned int)index >= ARRAY_SIZE(ov9640_codes))
+       if (index >= ARRAY_SIZE(ov9640_codes))
                return -EINVAL;
 
        *code = ov9640_codes[index];
index 6bc16c13ccef7423558e48bb58d8ad85273c0241..3092abfd66a21e69113728127ad9aaf9e64d79c1 100644 (file)
@@ -117,6 +117,7 @@ static const struct pvr2_device_desc pvr2_device_24xxx = {
 static const struct pvr2_device_client_desc pvr2_cli_gotview_2[] = {
        { .module_id = PVR2_CLIENT_ID_CX25840 },
        { .module_id = PVR2_CLIENT_ID_TUNER },
+       { .module_id = PVR2_CLIENT_ID_DEMOD },
 };
 
 static const struct pvr2_device_desc pvr2_device_gotview_2 = {
index e5b9594eb5f6266acbdbe757740c5be47b5e7d4b..273c8d4b3853b1c7b34cc7db301506d666280a07 100644 (file)
@@ -177,6 +177,11 @@ struct pvr2_device_desc {
        unsigned int flag_has_composite:1;     /* Has composite input */
        unsigned int flag_has_svideo:1;        /* Has s-video input */
        unsigned int flag_fx2_16kb:1;          /* 16KB FX2 firmware OK here */
+
+       /* If this driver is considered experimental, i.e. not all aspects
+          are working correctly and/or it is untested, mark that fact
+          with this flag. */
+       unsigned int flag_is_experimental:1;
 };
 
 extern struct usb_device_id pvr2_device_table[];
index 301ef197d038140008b4b5c59290ef467fe4f76d..70ea578d6266cfba9540417aa63ced74ab45d2a4 100644 (file)
@@ -2459,6 +2459,19 @@ struct pvr2_hdw *pvr2_hdw_create(struct usb_interface *intf,
                   hdw,hdw_desc->description);
        pvr2_trace(PVR2_TRACE_INFO, "Hardware description: %s",
                hdw_desc->description);
+       if (hdw_desc->flag_is_experimental) {
+               pvr2_trace(PVR2_TRACE_INFO, "**********");
+               pvr2_trace(PVR2_TRACE_INFO,
+                          "WARNING: Support for this device (%s) is"
+                          " experimental.", hdw_desc->description);
+               pvr2_trace(PVR2_TRACE_INFO,
+                          "Important functionality might not be"
+                          " entirely working.");
+               pvr2_trace(PVR2_TRACE_INFO,
+                          "Please consider contacting the driver author to"
+                          " help with further stabilization of the driver.");
+               pvr2_trace(PVR2_TRACE_INFO, "**********");
+       }
        if (!hdw) goto fail;
 
        init_timer(&hdw->quiescent_timer);
@@ -3056,14 +3069,14 @@ static void pvr2_subdev_update(struct pvr2_hdw *hdw)
        }
 
        if (hdw->res_hor_dirty || hdw->res_ver_dirty || hdw->force_dirty) {
-               struct v4l2_format fmt;
+               struct v4l2_mbus_framefmt fmt;
                memset(&fmt, 0, sizeof(fmt));
-               fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-               fmt.fmt.pix.width = hdw->res_hor_val;
-               fmt.fmt.pix.height = hdw->res_ver_val;
+               fmt.width = hdw->res_hor_val;
+               fmt.height = hdw->res_ver_val;
+               fmt.code = V4L2_MBUS_FMT_FIXED;
                pvr2_trace(PVR2_TRACE_CHIPS, "subdev v4l2 set_size(%dx%d)",
-                          fmt.fmt.pix.width, fmt.fmt.pix.height);
-               v4l2_device_call_all(&hdw->v4l2_dev, 0, video, s_fmt, &fmt);
+                          fmt.width, fmt.height);
+               v4l2_device_call_all(&hdw->v4l2_dev, 0, video, s_mbus_fmt, &fmt);
        }
 
        if (hdw->srate_dirty || hdw->force_dirty) {
@@ -4084,12 +4097,20 @@ void pvr2_hdw_device_reset(struct pvr2_hdw *hdw)
 
 void pvr2_hdw_cpureset_assert(struct pvr2_hdw *hdw,int val)
 {
-       char da[1];
+       char *da;
        unsigned int pipe;
        int ret;
 
        if (!hdw->usb_dev) return;
 
+       da = kmalloc(16, GFP_KERNEL);
+
+       if (da == NULL) {
+               pvr2_trace(PVR2_TRACE_ERROR_LEGS,
+                          "Unable to allocate memory to control CPU reset");
+               return;
+       }
+
        pvr2_trace(PVR2_TRACE_INIT,"cpureset_assert(%d)",val);
 
        da[0] = val ? 0x01 : 0x00;
@@ -4103,6 +4124,8 @@ void pvr2_hdw_cpureset_assert(struct pvr2_hdw *hdw,int val)
                           "cpureset_assert(%d) error=%d",val,ret);
                pvr2_hdw_render_useless(hdw);
        }
+
+       kfree(da);
 }
 
 
index eeacd0f67855d118b49aa8ad5cd4a11bfe9d3ce6..2254194aad579c201475784f7c27a51e7be6791d 100644 (file)
@@ -153,12 +153,12 @@ static void __exit pvr_exit(void)
 
        usb_deregister(&pvr_driver);
 
+       pvr2_context_global_done();
+
 #ifdef CONFIG_VIDEO_PVRUSB2_SYSFS
        pvr2_sysfs_class_destroy(class_ptr);
 #endif /* CONFIG_VIDEO_PVRUSB2_SYSFS */
 
-       pvr2_context_global_done();
-
        pvr2_trace(PVR2_TRACE_INIT,"pvr_exit complete");
 }
 
index 71f50565f637c804f19fac089cf62af55134bf55..3d7e5aab547fdf0c15e680c5e26aa8d98e46eaa5 100644 (file)
@@ -74,7 +74,7 @@ struct pvr2_sysfs_ctl_item {
        int ctl_id;
        struct pvr2_sysfs *chptr;
        struct pvr2_sysfs_ctl_item *item_next;
-       struct attribute *attr_gen[7];
+       struct attribute *attr_gen[8];
        struct attribute_group grp;
        int created_ok;
        char name[80];
@@ -511,6 +511,7 @@ static void pvr2_sysfs_release(struct device *class_dev)
 
 static void class_dev_destroy(struct pvr2_sysfs *sfp)
 {
+       struct device *dev;
        if (!sfp->class_dev) return;
 #ifdef CONFIG_VIDEO_PVRUSB2_DEBUGIFC
        pvr2_sysfs_tear_down_debugifc(sfp);
@@ -542,6 +543,9 @@ static void class_dev_destroy(struct pvr2_sysfs *sfp)
        }
        pvr2_sysfs_trace("Destroying class_dev id=%p",sfp->class_dev);
        dev_set_drvdata(sfp->class_dev, NULL);
+       dev = sfp->class_dev->parent;
+       sfp->class_dev->parent = NULL;
+       put_device(dev);
        device_unregister(sfp->class_dev);
        sfp->class_dev = NULL;
 }
@@ -631,10 +635,11 @@ static void class_dev_create(struct pvr2_sysfs *sfp,
        pvr2_sysfs_trace("Creating class_dev id=%p",class_dev);
 
        class_dev->class = &class_ptr->class;
+
        dev_set_name(class_dev, "%s",
                     pvr2_hdw_get_device_identifier(sfp->channel.hdw));
 
-       class_dev->parent = &usb_dev->dev;
+       class_dev->parent = get_device(&usb_dev->dev);
 
        sfp->class_dev = class_dev;
        dev_set_drvdata(class_dev, sfp);
@@ -775,7 +780,8 @@ struct pvr2_sysfs_class *pvr2_sysfs_class_create(void)
        struct pvr2_sysfs_class *clp;
        clp = kzalloc(sizeof(*clp),GFP_KERNEL);
        if (!clp) return clp;
-       pvr2_sysfs_trace("Creating pvr2_sysfs_class id=%p",clp);
+       pvr2_sysfs_trace("Creating and registering pvr2_sysfs_class id=%p",
+                        clp);
        clp->class.name = "pvrusb2";
        clp->class.class_release = pvr2_sysfs_class_release;
        clp->class.dev_release = pvr2_sysfs_release;
@@ -791,6 +797,7 @@ struct pvr2_sysfs_class *pvr2_sysfs_class_create(void)
 
 void pvr2_sysfs_class_destroy(struct pvr2_sysfs_class *clp)
 {
+       pvr2_sysfs_trace("Unregistering pvr2_sysfs_class id=%p", clp);
        class_unregister(&clp->class);
 }
 
index 5ffa0d2b0b0d957c9b94d118110078f4daf9eb22..aaafa0398fd5e7c24fafc9aab37a419bc6f92c9f 100644 (file)
@@ -883,6 +883,17 @@ static void pvr2_v4l2_dev_destroy(struct pvr2_v4l2_dev *dip)
 {
        struct pvr2_hdw *hdw = dip->v4lp->channel.mc_head->hdw;
        enum pvr2_config cfg = dip->config;
+       char msg[80];
+       unsigned int mcnt;
+
+       /* Construct the unregistration message *before* we actually
+          perform the unregistration step.  By doing it this way we don't
+          have to worry about potentially touching deleted resources. */
+       mcnt = scnprintf(msg, sizeof(msg) - 1,
+                        "pvrusb2: unregistered device %s [%s]",
+                        video_device_node_name(&dip->devbase),
+                        pvr2_config_get_name(cfg));
+       msg[mcnt] = 0;
 
        pvr2_hdw_v4l_store_minor_number(hdw,dip->minor_type,-1);
 
@@ -894,9 +905,7 @@ static void pvr2_v4l2_dev_destroy(struct pvr2_v4l2_dev *dip)
           are gone. */
        video_unregister_device(&dip->devbase);
 
-       printk(KERN_INFO "pvrusb2: unregistered device %s [%s]\n",
-              video_device_node_name(&dip->devbase),
-              pvr2_config_get_name(cfg));
+       printk(KERN_INFO "%s\n", msg);
 
 }
 
index 7fe70e7186565deb9155f592d30eae7284603771..fb242f6cfb1f23b313df0ae80510ef8ec6042539 100644 (file)
@@ -1247,7 +1247,7 @@ static bool pxa_camera_packing_supported(const struct soc_mbus_pixelfmt *fmt)
                 fmt->packing == SOC_MBUS_PACKING_EXTEND16);
 }
 
-static int pxa_camera_get_formats(struct soc_camera_device *icd, int idx,
+static int pxa_camera_get_formats(struct soc_camera_device *icd, unsigned int idx,
                                  struct soc_camera_format_xlate *xlate)
 {
        struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
@@ -1264,7 +1264,7 @@ static int pxa_camera_get_formats(struct soc_camera_device *icd, int idx,
 
        fmt = soc_mbus_get_fmtdesc(code);
        if (!fmt) {
-               dev_err(dev, "Invalid format code #%d: %d\n", idx, code);
+               dev_err(dev, "Invalid format code #%u: %d\n", idx, code);
                return 0;
        }
 
index 2c3b58c99e1884fb8db7bc7546eb758b5aaea094..47fd207ba3b1f63dd3edf9458ff0a7b98fa5f3b7 100644 (file)
@@ -481,10 +481,10 @@ static int reg_write_multiple(struct i2c_client *client,
        return 0;
 }
 
-static int rj54n1_enum_fmt(struct v4l2_subdev *sd, int index,
+static int rj54n1_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
                           enum v4l2_mbus_pixelcode *code)
 {
-       if ((unsigned int)index >= ARRAY_SIZE(rj54n1_colour_fmts))
+       if (index >= ARRAY_SIZE(rj54n1_colour_fmts))
                return -EINVAL;
 
        *code = rj54n1_colour_fmts[index].code;
index 53b6fcde3800076cd416ebc0eca82eb984834c88..76da74368680f9a10f747fc0c8322a56f2c630bd 100644 (file)
@@ -1117,13 +1117,6 @@ static int saa711x_g_sliced_fmt(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_f
        return 0;
 }
 
-static int saa711x_g_fmt(struct v4l2_subdev *sd, struct v4l2_format *fmt)
-{
-       if (fmt->type != V4L2_BUF_TYPE_SLICED_VBI_CAPTURE)
-               return -EINVAL;
-       return saa711x_g_sliced_fmt(sd, &fmt->fmt.sliced);
-}
-
 static int saa711x_s_raw_fmt(struct v4l2_subdev *sd, struct v4l2_vbi_format *fmt)
 {
        saa711x_set_lcr(sd, NULL);
@@ -1136,12 +1129,13 @@ static int saa711x_s_sliced_fmt(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_f
        return 0;
 }
 
-static int saa711x_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *fmt)
+static int saa711x_s_mbus_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *fmt)
 {
-       if (fmt->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+       if (fmt->code != V4L2_MBUS_FMT_FIXED)
                return -EINVAL;
-
-       return saa711x_set_size(sd, fmt->fmt.pix.width, fmt->fmt.pix.height);
+       fmt->field = V4L2_FIELD_INTERLACED;
+       fmt->colorspace = V4L2_COLORSPACE_SMPTE170M;
+       return saa711x_set_size(sd, fmt->width, fmt->height);
 }
 
 /* Decode the sliced VBI data stream as created by the saa7115.
@@ -1556,8 +1550,7 @@ static const struct v4l2_subdev_audio_ops saa711x_audio_ops = {
 static const struct v4l2_subdev_video_ops saa711x_video_ops = {
        .s_routing = saa711x_s_routing,
        .s_crystal_freq = saa711x_s_crystal_freq,
-       .g_fmt = saa711x_g_fmt,
-       .s_fmt = saa711x_s_fmt,
+       .s_mbus_fmt = saa711x_s_mbus_fmt,
        .s_stream = saa711x_s_stream,
        .querystd = saa711x_querystd,
        .g_input_status = saa711x_g_input_status,
index 87986ad62f8698b5bee3a49094458ace5aff09f3..79fffcf39ba8562e25db013dbbb715f5cd4bd046 100644 (file)
@@ -645,13 +645,6 @@ static int saa7127_g_sliced_fmt(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_f
        return 0;
 }
 
-static int saa7127_g_fmt(struct v4l2_subdev *sd, struct v4l2_format *fmt)
-{
-       if (fmt->type != V4L2_BUF_TYPE_SLICED_VBI_CAPTURE)
-               return -EINVAL;
-       return saa7127_g_sliced_fmt(sd, &fmt->fmt.sliced);
-}
-
 static int saa7127_s_vbi_data(struct v4l2_subdev *sd, const struct v4l2_sliced_vbi_data *data)
 {
        switch (data->id) {
@@ -731,7 +724,6 @@ static const struct v4l2_subdev_core_ops saa7127_core_ops = {
 };
 
 static const struct v4l2_subdev_video_ops saa7127_video_ops = {
-       .g_fmt = saa7127_g_fmt,
        .s_std_output = saa7127_s_std_output,
        .s_routing = saa7127_s_routing,
        .s_stream = saa7127_s_stream,
index 1eabff6b2456a5744fcaf6b7fe0e42d344fab576..40fd31ca7716da6ae74ee2b76697fa4d615f54b0 100644 (file)
@@ -846,24 +846,28 @@ static int saa6752hs_g_ext_ctrls(struct v4l2_subdev *sd, struct v4l2_ext_control
        return 0;
 }
 
-static int saa6752hs_g_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
+static int saa6752hs_g_mbus_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *f)
 {
        struct saa6752hs_state *h = to_state(sd);
 
        if (h->video_format == SAA6752HS_VF_UNKNOWN)
                h->video_format = SAA6752HS_VF_D1;
-       f->fmt.pix.width =
-               v4l2_format_table[h->video_format].fmt.pix.width;
-       f->fmt.pix.height =
-               v4l2_format_table[h->video_format].fmt.pix.height;
+       f->width = v4l2_format_table[h->video_format].fmt.pix.width;
+       f->height = v4l2_format_table[h->video_format].fmt.pix.height;
+       f->code = V4L2_MBUS_FMT_FIXED;
+       f->field = V4L2_FIELD_INTERLACED;
+       f->colorspace = V4L2_COLORSPACE_SMPTE170M;
        return 0;
 }
 
-static int saa6752hs_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
+static int saa6752hs_s_mbus_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *f)
 {
        struct saa6752hs_state *h = to_state(sd);
        int dist_352, dist_480, dist_720;
 
+       if (f->code != V4L2_MBUS_FMT_FIXED)
+               return -EINVAL;
+
        /*
          FIXME: translate and round width/height into EMPRESS
          subsample type:
@@ -876,28 +880,30 @@ static int saa6752hs_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
          D1     | 720x576 | 720x480
        */
 
-       dist_352 = abs(f->fmt.pix.width - 352);
-       dist_480 = abs(f->fmt.pix.width - 480);
-       dist_720 = abs(f->fmt.pix.width - 720);
+       dist_352 = abs(f->width - 352);
+       dist_480 = abs(f->width - 480);
+       dist_720 = abs(f->width - 720);
        if (dist_720 < dist_480) {
-               f->fmt.pix.width = 720;
-               f->fmt.pix.height = 576;
+               f->width = 720;
+               f->height = 576;
                h->video_format = SAA6752HS_VF_D1;
        } else if (dist_480 < dist_352) {
-               f->fmt.pix.width = 480;
-               f->fmt.pix.height = 576;
+               f->width = 480;
+               f->height = 576;
                h->video_format = SAA6752HS_VF_2_3_D1;
        } else {
-               f->fmt.pix.width = 352;
-               if (abs(f->fmt.pix.height - 576) <
-                   abs(f->fmt.pix.height - 288)) {
-                       f->fmt.pix.height = 576;
+               f->width = 352;
+               if (abs(f->height - 576) <
+                   abs(f->height - 288)) {
+                       f->height = 576;
                        h->video_format = SAA6752HS_VF_1_2_D1;
                } else {
-                       f->fmt.pix.height = 288;
+                       f->height = 288;
                        h->video_format = SAA6752HS_VF_SIF;
                }
        }
+       f->field = V4L2_FIELD_INTERLACED;
+       f->colorspace = V4L2_COLORSPACE_SMPTE170M;
        return 0;
 }
 
@@ -932,8 +938,8 @@ static const struct v4l2_subdev_core_ops saa6752hs_core_ops = {
 };
 
 static const struct v4l2_subdev_video_ops saa6752hs_video_ops = {
-       .s_fmt = saa6752hs_s_fmt,
-       .g_fmt = saa6752hs_g_fmt,
+       .s_mbus_fmt = saa6752hs_s_mbus_fmt,
+       .g_mbus_fmt = saa6752hs_g_mbus_fmt,
 };
 
 static const struct v4l2_subdev_ops saa6752hs_ops = {
index 72700d4e394121fe6305588bbdff947ed4d1f695..07f6bb8ef9d949b36e52530d17a8350cf86648b9 100644 (file)
@@ -3897,6 +3897,40 @@ struct saa7134_board saa7134_boards[] = {
                        .gpio = 0x01,
                },
        },
+       [SAA7134_BOARD_AVERMEDIA_M733A] = {
+               .name           = "Avermedia PCI M733A",
+               .audio_clock    = 0x00187de7,
+               .tuner_type     = TUNER_PHILIPS_TDA8290,
+               .radio_type     = UNSET,
+               .tuner_addr     = ADDR_UNSET,
+               .radio_addr     = ADDR_UNSET,
+               .tuner_config   = 0,
+               .gpiomask       = 0x020200000,
+               .inputs         = {{
+                       .name = name_tv,
+                       .vmux = 1,
+                       .amux = TV,
+                       .tv   = 1,
+               }, {
+                       .name = name_comp1,
+                       .vmux = 3,
+                       .amux = LINE1,
+               }, {
+                       .name = name_svideo,
+                       .vmux = 8,
+                       .amux = LINE1,
+               } },
+               .radio = {
+                       .name = name_radio,
+                       .amux = TV,
+                       .gpio = 0x00200000,
+               },
+               .mute = {
+                       .name = name_mute,
+                       .amux = TV,
+                       .gpio = 0x01,
+               },
+       },
        [SAA7134_BOARD_BEHOLD_401] = {
                /*       Beholder Intl. Ltd. 2008      */
                /*Dmitry Belimov <d.belimov@gmail.com> */
@@ -5820,6 +5854,18 @@ struct pci_device_id saa7134_pci_tbl[] = {
                .subvendor    = 0x1461, /* Avermedia Technologies Inc */
                .subdevice    = 0xf11d,
                .driver_data  = SAA7134_BOARD_AVERMEDIA_M135A,
+       }, {
+               .vendor       = PCI_VENDOR_ID_PHILIPS,
+               .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
+               .subvendor    = 0x1461, /* Avermedia Technologies Inc */
+               .subdevice    = 0x4155,
+               .driver_data  = SAA7134_BOARD_AVERMEDIA_M733A,
+       }, {
+               .vendor       = PCI_VENDOR_ID_PHILIPS,
+               .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
+               .subvendor    = 0x1461, /* Avermedia Technologies Inc */
+               .subdevice    = 0x4255,
+               .driver_data  = SAA7134_BOARD_AVERMEDIA_M733A,
        }, {
                .vendor       = PCI_VENDOR_ID_PHILIPS,
                .device       = PCI_DEVICE_ID_PHILIPS_SAA7130,
@@ -6786,6 +6832,7 @@ static int saa7134_tda8290_callback(struct saa7134_dev *dev,
        switch (dev->board) {
        case SAA7134_BOARD_HAUPPAUGE_HVR1150:
        case SAA7134_BOARD_HAUPPAUGE_HVR1120:
+       case SAA7134_BOARD_AVERMEDIA_M733A:
                /* tda8290 + tda18271 */
                ret = saa7134_tda8290_18271_callback(dev, command, arg);
                break;
@@ -7087,6 +7134,14 @@ int saa7134_board_init1(struct saa7134_dev *dev)
                saa_andorl(SAA7134_GPIO_GPMODE0 >> 2,   0x0000C000, 0x0000C000);
                saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, 0x0000C000, 0x0000C000);
                break;
+       case SAA7134_BOARD_AVERMEDIA_M733A:
+               saa7134_set_gpio(dev, 1, 1);
+               msleep(10);
+               saa7134_set_gpio(dev, 1, 0);
+               msleep(10);
+               saa7134_set_gpio(dev, 1, 1);
+               dev->has_remote = SAA7134_REMOTE_GPIO;
+               break;
        }
        return 0;
 }
index ea877a50f52d9b65963e1edfcf81b81f356b807e..e763f9fd0133f06c1ebed3f4add1ac82dc30f166 100644 (file)
@@ -223,9 +223,11 @@ static int empress_g_fmt_vid_cap(struct file *file, void *priv,
                                struct v4l2_format *f)
 {
        struct saa7134_dev *dev = file->private_data;
+       struct v4l2_mbus_framefmt mbus_fmt;
 
-       saa_call_all(dev, video, g_fmt, f);
+       saa_call_all(dev, video, g_mbus_fmt, &mbus_fmt);
 
+       v4l2_fill_pix_format(&f->fmt.pix, &mbus_fmt);
        f->fmt.pix.pixelformat  = V4L2_PIX_FMT_MPEG;
        f->fmt.pix.sizeimage    = TS_PACKET_SIZE * dev->ts.nr_packets;
 
@@ -236,8 +238,11 @@ static int empress_s_fmt_vid_cap(struct file *file, void *priv,
                                struct v4l2_format *f)
 {
        struct saa7134_dev *dev = file->private_data;
+       struct v4l2_mbus_framefmt mbus_fmt;
 
-       saa_call_all(dev, video, s_fmt, f);
+       v4l2_fill_mbus_format(&mbus_fmt, &f->fmt.pix, V4L2_MBUS_FMT_FIXED);
+       saa_call_all(dev, video, s_mbus_fmt, &mbus_fmt);
+       v4l2_fill_pix_format(&f->fmt.pix, &mbus_fmt);
 
        f->fmt.pix.pixelformat  = V4L2_PIX_FMT_MPEG;
        f->fmt.pix.sizeimage    = TS_PACKET_SIZE * dev->ts.nr_packets;
index e5565e2fd4262e4f92d7916f1d4eb4d9a1e6945e..0b336ca6d55b9a281c3e346193389587a2534852 100644 (file)
@@ -141,8 +141,8 @@ static int get_key_flydvb_trio(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
        struct saa7134_dev *dev = ir->c->adapter->algo_data;
 
        if (dev == NULL) {
-               dprintk("get_key_flydvb_trio: "
-                        "gir->c->adapter->algo_data is NULL!\n");
+               i2cdprintk("get_key_flydvb_trio: "
+                          "ir->c->adapter->algo_data is NULL!\n");
                return -EIO;
        }
 
@@ -195,8 +195,8 @@ static int get_key_msi_tvanywhere_plus(struct IR_i2c *ir, u32 *ir_key,
        /* <dev> is needed to access GPIO. Used by the saa_readl macro. */
        struct saa7134_dev *dev = ir->c->adapter->algo_data;
        if (dev == NULL) {
-               dprintk("get_key_msi_tvanywhere_plus: "
-                       "gir->c->adapter->algo_data is NULL!\n");
+               i2cdprintk("get_key_msi_tvanywhere_plus: "
+                          "ir->c->adapter->algo_data is NULL!\n");
                return -EIO;
        }
 
@@ -657,12 +657,19 @@ int saa7134_input_init1(struct saa7134_dev *dev)
                saa_setb(SAA7134_GPIO_GPSTATUS0, 0x4);
                break;
        case SAA7134_BOARD_AVERMEDIA_M135A:
-               ir_codes     = RC_MAP_AVERMEDIA_M135A_RM_JX;
+               ir_codes     = RC_MAP_AVERMEDIA_M135A;
                mask_keydown = 0x0040000;       /* Enable GPIO18 line on both edges */
                mask_keyup   = 0x0040000;
                mask_keycode = 0xffff;
                raw_decode   = 1;
                break;
+       case SAA7134_BOARD_AVERMEDIA_M733A:
+               ir_codes     = RC_MAP_AVERMEDIA_M733A_RM_K6;
+               mask_keydown = 0x0040000;
+               mask_keyup   = 0x0040000;
+               mask_keycode = 0xffff;
+               raw_decode   = 1;
+               break;
        case SAA7134_BOARD_AVERMEDIA_777:
        case SAA7134_BOARD_AVERMEDIA_A16AR:
                ir_codes     = RC_MAP_AVERMEDIA;
@@ -815,7 +822,6 @@ int saa7134_input_init1(struct saa7134_dev *dev)
                mask_keyup   = 0x020000;
                polling      = 50; /* ms */
                break;
-       break;
        }
        if (NULL == ir_codes) {
                printk("%s: Oops: IR config error [card=%d]\n",
index 3962534267be2b5af3259d9b983fe279710c436d..756a1ca8833d89a50153a910064d8ec8e0272fd9 100644 (file)
@@ -303,6 +303,7 @@ struct saa7134_format {
 #define SAA7134_BOARD_HAWELL_HW_404M7          177
 #define SAA7134_BOARD_BEHOLD_H7             178
 #define SAA7134_BOARD_BEHOLD_A7             179
+#define SAA7134_BOARD_AVERMEDIA_M733A       180
 
 #define SAA7134_MAXBOARDS 32
 #define SAA7134_INPUT_MAX 8
index d521c648e15706fa29e2d26dd012330519aaedff..78d69950c00abe1bc4ee70bd000e1ed2c3e051a3 100644 (file)
@@ -1199,28 +1199,32 @@ static int saa717x_s_register(struct v4l2_subdev *sd, struct v4l2_dbg_register *
 }
 #endif
 
-static int saa717x_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *fmt)
+static int saa717x_s_mbus_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *fmt)
 {
-       struct v4l2_pix_format *pix;
        int prescale, h_scale, v_scale;
 
-       pix = &fmt->fmt.pix;
        v4l2_dbg(1, debug, sd, "decoder set size\n");
 
+       if (fmt->code != V4L2_MBUS_FMT_FIXED)
+               return -EINVAL;
+
        /* FIXME need better bounds checking here */
-       if (pix->width < 1 || pix->width > 1440)
+       if (fmt->width < 1 || fmt->width > 1440)
                return -EINVAL;
-       if (pix->height < 1 || pix->height > 960)
+       if (fmt->height < 1 || fmt->height > 960)
                return -EINVAL;
 
+       fmt->field = V4L2_FIELD_INTERLACED;
+       fmt->colorspace = V4L2_COLORSPACE_SMPTE170M;
+
        /* scaling setting */
        /* NTSC and interlace only */
-       prescale = SAA717X_NTSC_WIDTH / pix->width;
+       prescale = SAA717X_NTSC_WIDTH / fmt->width;
        if (prescale == 0)
                prescale = 1;
-       h_scale = 1024 * SAA717X_NTSC_WIDTH / prescale / pix->width;
+       h_scale = 1024 * SAA717X_NTSC_WIDTH / prescale / fmt->width;
        /* interlace */
-       v_scale = 512 * 2 * SAA717X_NTSC_HEIGHT / pix->height;
+       v_scale = 512 * 2 * SAA717X_NTSC_HEIGHT / fmt->height;
 
        /* Horizontal prescaling etc */
        set_h_prescale(sd, 0, prescale);
@@ -1241,19 +1245,19 @@ static int saa717x_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *fmt)
        /* set video output size */
        /* video number of pixels at output */
        /* TASK A */
-       saa717x_write(sd, 0x5C, (u8)(pix->width & 0xFF));
-       saa717x_write(sd, 0x5D, (u8)((pix->width >> 8) & 0xFF));
+       saa717x_write(sd, 0x5C, (u8)(fmt->width & 0xFF));
+       saa717x_write(sd, 0x5D, (u8)((fmt->width >> 8) & 0xFF));
        /* TASK B */
-       saa717x_write(sd, 0x9C, (u8)(pix->width & 0xFF));
-       saa717x_write(sd, 0x9D, (u8)((pix->width >> 8) & 0xFF));
+       saa717x_write(sd, 0x9C, (u8)(fmt->width & 0xFF));
+       saa717x_write(sd, 0x9D, (u8)((fmt->width >> 8) & 0xFF));
 
        /* video number of lines at output */
        /* TASK A */
-       saa717x_write(sd, 0x5E, (u8)(pix->height & 0xFF));
-       saa717x_write(sd, 0x5F, (u8)((pix->height >> 8) & 0xFF));
+       saa717x_write(sd, 0x5E, (u8)(fmt->height & 0xFF));
+       saa717x_write(sd, 0x5F, (u8)((fmt->height >> 8) & 0xFF));
        /* TASK B */
-       saa717x_write(sd, 0x9E, (u8)(pix->height & 0xFF));
-       saa717x_write(sd, 0x9F, (u8)((pix->height >> 8) & 0xFF));
+       saa717x_write(sd, 0x9E, (u8)(fmt->height & 0xFF));
+       saa717x_write(sd, 0x9F, (u8)((fmt->height >> 8) & 0xFF));
        return 0;
 }
 
@@ -1403,7 +1407,7 @@ static const struct v4l2_subdev_tuner_ops saa717x_tuner_ops = {
 
 static const struct v4l2_subdev_video_ops saa717x_video_ops = {
        .s_routing = saa717x_s_video_routing,
-       .s_fmt = saa717x_s_fmt,
+       .s_mbus_fmt = saa717x_s_mbus_fmt,
        .s_stream = saa717x_s_stream,
 };
 
index 4ac3b482fbb49cd206b8ec4c2db3017535525411..961bfa2fea97eb9f65a5900d36fcc0d181e2ffa2 100644 (file)
@@ -878,7 +878,7 @@ static bool sh_mobile_ceu_packing_supported(const struct soc_mbus_pixelfmt *fmt)
 
 static int client_g_rect(struct v4l2_subdev *sd, struct v4l2_rect *rect);
 
-static int sh_mobile_ceu_get_formats(struct soc_camera_device *icd, int idx,
+static int sh_mobile_ceu_get_formats(struct soc_camera_device *icd, unsigned int idx,
                                     struct soc_camera_format_xlate *xlate)
 {
        struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
@@ -897,7 +897,7 @@ static int sh_mobile_ceu_get_formats(struct soc_camera_device *icd, int idx,
        fmt = soc_mbus_get_fmtdesc(code);
        if (!fmt) {
                dev_err(icd->dev.parent,
-                       "Invalid format code #%d: %d\n", idx, code);
+                       "Invalid format code #%u: %d\n", idx, code);
                return -EINVAL;
        }
 
index 522ba3f4c285d8fbf8cc05b04d624a25fc61774e..b6643ca7656ae026b3d7d2fd62cbfc2970fdd8ee 100644 (file)
@@ -62,8 +62,8 @@ static const struct usb_device_id sn9c102_id_table[] = {
 #if !defined CONFIG_USB_GSPCA_SONIXB && !defined CONFIG_USB_GSPCA_SONIXB_MODULE
        { SN9C102_USB_DEVICE(0x0c45, 0x602c, BRIDGE_SN9C102), },
 /*     { SN9C102_USB_DEVICE(0x0c45, 0x602d, BRIDGE_SN9C102), }, HV7131R */
-#endif
        { SN9C102_USB_DEVICE(0x0c45, 0x602e, BRIDGE_SN9C102), },
+#endif
        { SN9C102_USB_DEVICE(0x0c45, 0x6030, BRIDGE_SN9C102), },
        /* SN9C103 */
        { SN9C102_USB_DEVICE(0x0c45, 0x6080, BRIDGE_SN9C103), },
index db1ca0e90d7611e80905339d7730c2dc00668b86..475757bfd7ba5bbd0cff11ecf8ab4f963d5174f9 100644 (file)
@@ -200,7 +200,8 @@ static int soc_camera_init_user_formats(struct soc_camera_device *icd)
 {
        struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
        struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
-       int i, fmts = 0, raw_fmts = 0, ret;
+       unsigned int i, fmts = 0, raw_fmts = 0;
+       int ret;
        enum v4l2_mbus_pixelcode code;
 
        while (!v4l2_subdev_call(sd, video, enum_mbus_fmt, raw_fmts, &code))
index 10b003a8be83c21fbf7b7964c6dc142c8c0e93f3..248c986f0989744bce6497d699fe4d43d038b850 100644 (file)
@@ -71,7 +71,7 @@ static int soc_camera_platform_try_fmt(struct v4l2_subdev *sd,
 
 static struct v4l2_subdev_core_ops platform_subdev_core_ops;
 
-static int soc_camera_platform_enum_fmt(struct v4l2_subdev *sd, int index,
+static int soc_camera_platform_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
                                        enum v4l2_mbus_pixelcode *code)
 {
        struct soc_camera_platform_info *p = v4l2_get_subdevdata(sd);
index e826114b7fb887d7408c8f61202dc1ff6b928c69..71c73fa0d68c7d2b26a345c96bc1e299ea112a15 100644 (file)
@@ -88,9 +88,6 @@ static int tvp514x_s_stream(struct v4l2_subdev *sd, int enable);
  * @pdata: Board specific
  * @ver: Chip version
  * @streaming: TVP5146/47 decoder streaming - enabled or disabled.
- * @pix: Current pixel format
- * @num_fmts: Number of formats
- * @fmt_list: Format list
  * @current_std: Current standard
  * @num_stds: Number of standards
  * @std_list: Standards list
@@ -105,13 +102,9 @@ struct tvp514x_decoder {
        int ver;
        int streaming;
 
-       struct v4l2_pix_format pix;
-       int num_fmts;
-       const struct v4l2_fmtdesc *fmt_list;
-
        enum tvp514x_std current_std;
        int num_stds;
-       struct tvp514x_std_info *std_list;
+       const struct tvp514x_std_info *std_list;
        /* Input and Output Routing parameters */
        u32 input;
        u32 output;
@@ -202,28 +195,13 @@ static struct tvp514x_reg tvp514x_reg_list_default[] = {
        {TOK_TERM, 0, 0},
 };
 
-/**
- * List of image formats supported by TVP5146/47 decoder
- * Currently we are using 8 bit mode only, but can be
- * extended to 10/20 bit mode.
- */
-static const struct v4l2_fmtdesc tvp514x_fmt_list[] = {
-       {
-        .index = 0,
-        .type = V4L2_BUF_TYPE_VIDEO_CAPTURE,
-        .flags = 0,
-        .description = "8-bit UYVY 4:2:2 Format",
-        .pixelformat = V4L2_PIX_FMT_UYVY,
-       },
-};
-
 /**
  * Supported standards -
  *
  * Currently supports two standards only, need to add support for rest of the
  * modes, like SECAM, etc...
  */
-static struct tvp514x_std_info tvp514x_std_list[] = {
+static const struct tvp514x_std_info tvp514x_std_list[] = {
        /* Standard: STD_NTSC_MJ */
        [STD_NTSC_MJ] = {
         .width = NTSC_NUM_ACTIVE_PIXELS,
@@ -366,13 +344,13 @@ static int tvp514x_write_regs(struct v4l2_subdev *sd,
 }
 
 /**
- * tvp514x_get_current_std() : Get the current standard detected by TVP5146/47
+ * tvp514x_query_current_std() : Query the current standard detected by TVP5146/47
  * @sd: ptr to v4l2_subdev struct
  *
- * Get current standard detected by TVP5146/47, STD_INVALID if there is no
+ * Returns the current standard detected by TVP5146/47, STD_INVALID if there is no
  * standard detected.
  */
-static enum tvp514x_std tvp514x_get_current_std(struct v4l2_subdev *sd)
+static enum tvp514x_std tvp514x_query_current_std(struct v4l2_subdev *sd)
 {
        u8 std, std_status;
 
@@ -518,7 +496,7 @@ static int tvp514x_detect(struct v4l2_subdev *sd,
  * @std_id: standard V4L2 std_id ioctl enum
  *
  * Returns the current standard detected by TVP5146/47. If no active input is
- * detected, returns -EINVAL
+ * detected then *std_id is set to 0 and the function returns 0.
  */
 static int tvp514x_querystd(struct v4l2_subdev *sd, v4l2_std_id *std_id)
 {
@@ -530,10 +508,12 @@ static int tvp514x_querystd(struct v4l2_subdev *sd, v4l2_std_id *std_id)
        if (std_id == NULL)
                return -EINVAL;
 
-       /* get the current standard */
-       current_std = tvp514x_get_current_std(sd);
+       *std_id = V4L2_STD_UNKNOWN;
+
+       /* query the current standard */
+       current_std = tvp514x_query_current_std(sd);
        if (current_std == STD_INVALID)
-               return -EINVAL;
+               return 0;
 
        input_sel = decoder->input;
 
@@ -575,12 +555,11 @@ static int tvp514x_querystd(struct v4l2_subdev *sd, v4l2_std_id *std_id)
        /* check whether signal is locked */
        sync_lock_status = tvp514x_read_reg(sd, REG_STATUS1);
        if (lock_mask != (sync_lock_status & lock_mask))
-               return -EINVAL; /* No input detected */
+               return 0;       /* No input detected */
 
-       decoder->current_std = current_std;
        *std_id = decoder->std_list[current_std].standard.id;
 
-       v4l2_dbg(1, debug, sd, "Current STD: %s",
+       v4l2_dbg(1, debug, sd, "Current STD: %s\n",
                        decoder->std_list[current_std].standard.name);
        return 0;
 }
@@ -614,7 +593,7 @@ static int tvp514x_s_std(struct v4l2_subdev *sd, v4l2_std_id std_id)
        decoder->tvp514x_regs[REG_VIDEO_STD].val =
                decoder->std_list[i].video_std;
 
-       v4l2_dbg(1, debug, sd, "Standard set to: %s",
+       v4l2_dbg(1, debug, sd, "Standard set to: %s\n",
                        decoder->std_list[i].standard.name);
        return 0;
 }
@@ -637,7 +616,6 @@ static int tvp514x_s_routing(struct v4l2_subdev *sd,
        int err;
        enum tvp514x_input input_sel;
        enum tvp514x_output output_sel;
-       enum tvp514x_std current_std = STD_INVALID;
        u8 sync_lock_status, lock_mask;
        int try_count = LOCK_RETRY_COUNT;
 
@@ -721,11 +699,6 @@ static int tvp514x_s_routing(struct v4l2_subdev *sd,
                /* Allow decoder to sync up with new input */
                msleep(LOCK_RETRY_DELAY);
 
-               /* get the current standard for future reference */
-               current_std = tvp514x_get_current_std(sd);
-               if (current_std == STD_INVALID)
-                       continue;
-
                sync_lock_status = tvp514x_read_reg(sd,
                                REG_STATUS1);
                if (lock_mask == (sync_lock_status & lock_mask))
@@ -733,15 +706,13 @@ static int tvp514x_s_routing(struct v4l2_subdev *sd,
                        break;
        }
 
-       if ((current_std == STD_INVALID) || (try_count < 0))
+       if (try_count < 0)
                return -EINVAL;
 
-       decoder->current_std = current_std;
        decoder->input = input;
        decoder->output = output;
 
-       v4l2_dbg(1, debug, sd, "Input set to: %d, std : %d",
-                       input_sel, current_std);
+       v4l2_dbg(1, debug, sd, "Input set to: %d\n", input_sel);
 
        return 0;
 }
@@ -794,7 +765,7 @@ tvp514x_queryctrl(struct v4l2_subdev *sd, struct v4l2_queryctrl *qctrl)
                return err;
        }
 
-       v4l2_dbg(1, debug, sd, "Query Control:%s: Min - %d, Max - %d, Def - %d",
+       v4l2_dbg(1, debug, sd, "Query Control:%s: Min - %d, Max - %d, Def - %d\n",
                        qctrl->name, qctrl->minimum, qctrl->maximum,
                        qctrl->default_value);
 
@@ -851,7 +822,7 @@ tvp514x_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
                return -EINVAL;
        }
 
-       v4l2_dbg(1, debug, sd, "Get Control: ID - %d - %d",
+       v4l2_dbg(1, debug, sd, "Get Control: ID - %d - %d\n",
                        ctrl->id, ctrl->value);
        return 0;
 }
@@ -951,7 +922,7 @@ tvp514x_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
                return err;
        }
 
-       v4l2_dbg(1, debug, sd, "Set Control: ID - %d - %d",
+       v4l2_dbg(1, debug, sd, "Set Control: ID - %d - %d\n",
                        ctrl->id, ctrl->value);
 
        return err;
@@ -967,44 +938,33 @@ tvp514x_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
 static int
 tvp514x_enum_fmt_cap(struct v4l2_subdev *sd, struct v4l2_fmtdesc *fmt)
 {
-       struct tvp514x_decoder *decoder = to_decoder(sd);
-       int index;
-
-       if (fmt == NULL)
-               return -EINVAL;
-
-       index = fmt->index;
-       if ((index >= decoder->num_fmts) || (index < 0))
-               /* Index out of bound */
+       if (fmt == NULL || fmt->index)
                return -EINVAL;
 
        if (fmt->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
                /* only capture is supported */
                return -EINVAL;
 
-       memcpy(fmt, &decoder->fmt_list[index],
-               sizeof(struct v4l2_fmtdesc));
-
-       v4l2_dbg(1, debug, sd, "Current FMT: index - %d (%s)",
-                       decoder->fmt_list[index].index,
-                       decoder->fmt_list[index].description);
+       /* only one format */
+       fmt->flags = 0;
+       strlcpy(fmt->description, "8-bit UYVY 4:2:2 Format",
+                                       sizeof(fmt->description));
+       fmt->pixelformat = V4L2_PIX_FMT_UYVY;
        return 0;
 }
 
 /**
- * tvp514x_try_fmt_cap() - V4L2 decoder interface handler for try_fmt
+ * tvp514x_fmt_cap() - V4L2 decoder interface handler for try/s/g_fmt
  * @sd: pointer to standard V4L2 sub-device structure
  * @f: pointer to standard V4L2 VIDIOC_TRY_FMT ioctl structure
  *
- * Implement the VIDIOC_TRY_FMT ioctl for the CAPTURE buffer type. This
- * ioctl is used to negotiate the image capture size and pixel format
- * without actually making it take effect.
+ * Implement the VIDIOC_TRY/S/G_FMT ioctl for the CAPTURE buffer type. This
+ * ioctl is used to negotiate the image capture size and pixel format.
  */
 static int
-tvp514x_try_fmt_cap(struct v4l2_subdev *sd, struct v4l2_format *f)
+tvp514x_fmt_cap(struct v4l2_subdev *sd, struct v4l2_format *f)
 {
        struct tvp514x_decoder *decoder = to_decoder(sd);
-       int ifmt;
        struct v4l2_pix_format *pix;
        enum tvp514x_std current_std;
 
@@ -1012,105 +972,29 @@ tvp514x_try_fmt_cap(struct v4l2_subdev *sd, struct v4l2_format *f)
                return -EINVAL;
 
        if (f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
-               /* only capture is supported */
-               f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+               return -EINVAL;
 
        pix = &f->fmt.pix;
 
        /* Calculate height and width based on current standard */
-       current_std = tvp514x_get_current_std(sd);
-       if (current_std == STD_INVALID)
-               return -EINVAL;
+       current_std = decoder->current_std;
 
-       decoder->current_std = current_std;
+       pix->pixelformat = V4L2_PIX_FMT_UYVY;
        pix->width = decoder->std_list[current_std].width;
        pix->height = decoder->std_list[current_std].height;
-
-       for (ifmt = 0; ifmt < decoder->num_fmts; ifmt++) {
-               if (pix->pixelformat ==
-                       decoder->fmt_list[ifmt].pixelformat)
-                       break;
-       }
-       if (ifmt == decoder->num_fmts)
-               /* None of the format matched, select default */
-               ifmt = 0;
-       pix->pixelformat = decoder->fmt_list[ifmt].pixelformat;
-
        pix->field = V4L2_FIELD_INTERLACED;
        pix->bytesperline = pix->width * 2;
        pix->sizeimage = pix->bytesperline * pix->height;
        pix->colorspace = V4L2_COLORSPACE_SMPTE170M;
        pix->priv = 0;
 
-       v4l2_dbg(1, debug, sd, "Try FMT: pixelformat - %s, bytesperline - %d"
-                       "Width - %d, Height - %d",
-                       decoder->fmt_list[ifmt].description, pix->bytesperline,
+       v4l2_dbg(1, debug, sd, "FMT: bytesperline - %d"
+                       "Width - %d, Height - %d\n",
+                       pix->bytesperline,
                        pix->width, pix->height);
        return 0;
 }
 
-/**
- * tvp514x_s_fmt_cap() - V4L2 decoder interface handler for s_fmt
- * @sd: pointer to standard V4L2 sub-device structure
- * @f: pointer to standard V4L2 VIDIOC_S_FMT ioctl structure
- *
- * If the requested format is supported, configures the HW to use that
- * format, returns error code if format not supported or HW can't be
- * correctly configured.
- */
-static int
-tvp514x_s_fmt_cap(struct v4l2_subdev *sd, struct v4l2_format *f)
-{
-       struct tvp514x_decoder *decoder = to_decoder(sd);
-       struct v4l2_pix_format *pix;
-       int rval;
-
-       if (f == NULL)
-               return -EINVAL;
-
-       if (f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
-               /* only capture is supported */
-               return -EINVAL;
-
-       pix = &f->fmt.pix;
-       rval = tvp514x_try_fmt_cap(sd, f);
-       if (rval)
-               return rval;
-
-               decoder->pix = *pix;
-
-       return rval;
-}
-
-/**
- * tvp514x_g_fmt_cap() - V4L2 decoder interface handler for tvp514x_g_fmt_cap
- * @sd: pointer to standard V4L2 sub-device structure
- * @f: pointer to standard V4L2 v4l2_format structure
- *
- * Returns the decoder's current pixel format in the v4l2_format
- * parameter.
- */
-static int
-tvp514x_g_fmt_cap(struct v4l2_subdev *sd, struct v4l2_format *f)
-{
-       struct tvp514x_decoder *decoder = to_decoder(sd);
-
-       if (f == NULL)
-               return -EINVAL;
-
-       if (f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
-               /* only capture is supported */
-               return -EINVAL;
-
-       f->fmt.pix = decoder->pix;
-
-       v4l2_dbg(1, debug, sd, "Current FMT: bytesperline - %d"
-                       "Width - %d, Height - %d",
-                       decoder->pix.bytesperline,
-                       decoder->pix.width, decoder->pix.height);
-       return 0;
-}
-
 /**
  * tvp514x_g_parm() - V4L2 decoder interface handler for g_parm
  * @sd: pointer to standard V4L2 sub-device structure
@@ -1132,15 +1016,8 @@ tvp514x_g_parm(struct v4l2_subdev *sd, struct v4l2_streamparm *a)
                /* only capture is supported */
                return -EINVAL;
 
-       memset(a, 0, sizeof(*a));
-       a->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-
        /* get the current standard */
-       current_std = tvp514x_get_current_std(sd);
-       if (current_std == STD_INVALID)
-               return -EINVAL;
-
-       decoder->current_std = current_std;
+       current_std = decoder->current_std;
 
        cparm = &a->parm.capture;
        cparm->capability = V4L2_CAP_TIMEPERFRAME;
@@ -1175,11 +1052,7 @@ tvp514x_s_parm(struct v4l2_subdev *sd, struct v4l2_streamparm *a)
        timeperframe = &a->parm.capture.timeperframe;
 
        /* get the current standard */
-       current_std = tvp514x_get_current_std(sd);
-       if (current_std == STD_INVALID)
-               return -EINVAL;
-
-       decoder->current_std = current_std;
+       current_std = decoder->current_std;
 
        *timeperframe =
            decoder->std_list[current_std].standard.frameperiod;
@@ -1259,9 +1132,9 @@ static const struct v4l2_subdev_video_ops tvp514x_video_ops = {
        .s_routing = tvp514x_s_routing,
        .querystd = tvp514x_querystd,
        .enum_fmt = tvp514x_enum_fmt_cap,
-       .g_fmt = tvp514x_g_fmt_cap,
-       .try_fmt = tvp514x_try_fmt_cap,
-       .s_fmt = tvp514x_s_fmt_cap,
+       .g_fmt = tvp514x_fmt_cap,
+       .try_fmt = tvp514x_fmt_cap,
+       .s_fmt = tvp514x_fmt_cap,
        .g_parm = tvp514x_g_parm,
        .s_parm = tvp514x_s_parm,
        .s_stream = tvp514x_s_stream,
@@ -1274,22 +1147,6 @@ static const struct v4l2_subdev_ops tvp514x_ops = {
 
 static struct tvp514x_decoder tvp514x_dev = {
        .streaming = 0,
-
-       .fmt_list = tvp514x_fmt_list,
-       .num_fmts = ARRAY_SIZE(tvp514x_fmt_list),
-
-       .pix = {
-               /* Default to NTSC 8-bit YUV 422 */
-               .width = NTSC_NUM_ACTIVE_PIXELS,
-               .height = NTSC_NUM_ACTIVE_LINES,
-               .pixelformat = V4L2_PIX_FMT_UYVY,
-               .field = V4L2_FIELD_INTERLACED,
-               .bytesperline = NTSC_NUM_ACTIVE_PIXELS * 2,
-               .sizeimage =
-               NTSC_NUM_ACTIVE_PIXELS * 2 * NTSC_NUM_ACTIVE_LINES,
-               .colorspace = V4L2_COLORSPACE_SMPTE170M,
-               },
-
        .current_std = STD_NTSC_MJ,
        .std_list = tvp514x_std_list,
        .num_stds = ARRAY_SIZE(tvp514x_std_list),
index 47f0582d50a58e36ffb51d394f4b366fe92c776a..1654f65cca7c0dfe7c487b12fe32c37711a0b6e3 100644 (file)
@@ -934,17 +934,6 @@ static int tvp5150_s_sliced_fmt(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_f
        return 0;
 }
 
-static int tvp5150_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *fmt)
-{
-       switch (fmt->type) {
-       case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE:
-               return tvp5150_s_sliced_fmt(sd, &fmt->fmt.sliced);
-
-       default:
-               return -EINVAL;
-       }
-}
-
 static int tvp5150_g_sliced_fmt(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_format *svbi)
 {
        int i, mask = 0;
@@ -960,13 +949,6 @@ static int tvp5150_g_sliced_fmt(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_f
        return 0;
 }
 
-static int tvp5150_g_fmt(struct v4l2_subdev *sd, struct v4l2_format *fmt)
-{
-       if (fmt->type != V4L2_BUF_TYPE_SLICED_VBI_CAPTURE)
-               return -EINVAL;
-       return tvp5150_g_sliced_fmt(sd, &fmt->fmt.sliced);
-}
-
 static int tvp5150_g_chip_ident(struct v4l2_subdev *sd,
                                struct v4l2_dbg_chip_ident *chip)
 {
@@ -1054,8 +1036,6 @@ static const struct v4l2_subdev_tuner_ops tvp5150_tuner_ops = {
 
 static const struct v4l2_subdev_video_ops tvp5150_video_ops = {
        .s_routing = tvp5150_s_routing,
-       .g_fmt = tvp5150_g_fmt,
-       .s_fmt = tvp5150_s_fmt,
 };
 
 static const struct v4l2_subdev_vbi_ops tvp5150_vbi_ops = {
index 6eb3395def077754f30e7be7cdb5c1a60ea57b4c..445dc93413e3ae32ffd7ab3654b3687b3ba600ce 100644 (file)
@@ -903,7 +903,7 @@ static struct v4l2_subdev_core_ops tw9910_subdev_core_ops = {
 #endif
 };
 
-static int tw9910_enum_fmt(struct v4l2_subdev *sd, int index,
+static int tw9910_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
                           enum v4l2_mbus_pixelcode *code)
 {
        if (index)
index 6248a639ba2d2ab6e097f5770a5f2b69fec643b1..c2690df33438bd65190157dc88c20e4164ad2caa 100644 (file)
@@ -1671,8 +1671,7 @@ static void __devexit usbvision_disconnect(struct usb_interface *intf)
        PDEBUG(DBG_PROBE, "");
 
        if (usbvision == NULL) {
-               dev_err(&usbvision->dev->dev,
-                       "%s: usb_get_intfdata() failed\n", __func__);
+               pr_err("%s: usb_get_intfdata() failed\n", __func__);
                return;
        }
 
index db9cd0240c6f3f84bc89c65b1e5b8750ce4db116..2a1e804a71aa2466199119f2206133fdb409d932 100644 (file)
@@ -45,7 +45,7 @@
 
 MODULE_AUTHOR("VMware, Inc.");
 MODULE_DESCRIPTION("VMware Memory Control (Balloon) Driver");
-MODULE_VERSION("1.2.1.0-K");
+MODULE_VERSION("1.2.1.1-k");
 MODULE_ALIAS("dmi:*:svnVMware*:*");
 MODULE_ALIAS("vmware_vmmemctl");
 MODULE_LICENSE("GPL");
@@ -101,6 +101,8 @@ MODULE_LICENSE("GPL");
 /* Maximum number of page allocations without yielding processor */
 #define VMW_BALLOON_YIELD_THRESHOLD    1024
 
+/* Maximum number of refused pages we accumulate during inflation cycle */
+#define VMW_BALLOON_MAX_REFUSED                16
 
 /*
  * Hypervisor communication port definitions.
@@ -183,6 +185,7 @@ struct vmballoon {
 
        /* transient list of non-balloonable pages */
        struct list_head refused_pages;
+       unsigned int n_refused_pages;
 
        /* balloon size in pages */
        unsigned int size;
@@ -428,14 +431,21 @@ static int vmballoon_reserve_page(struct vmballoon *b, bool can_sleep)
                /* inform monitor */
                locked = vmballoon_send_lock_page(b, page_to_pfn(page));
                if (!locked) {
+                       STATS_INC(b->stats.refused_alloc);
+
                        if (b->reset_required) {
                                __free_page(page);
                                return -EIO;
                        }
 
-                       /* place on list of non-balloonable pages, retry allocation */
+                       /*
+                        * Place page on the list of non-balloonable pages
+                        * and retry allocation, unless we already accumulated
+                        * too many of them, in which case take a breather.
+                        */
                        list_add(&page->lru, &b->refused_pages);
-                       STATS_INC(b->stats.refused_alloc);
+                       if (++b->n_refused_pages >= VMW_BALLOON_MAX_REFUSED)
+                               return -EIO;
                }
        } while (!locked);
 
@@ -483,6 +493,8 @@ static void vmballoon_release_refused_pages(struct vmballoon *b)
                __free_page(page);
                STATS_INC(b->stats.refused_free);
        }
+
+       b->n_refused_pages = 0;
 }
 
 /*
index 2b281680e3206da99f9e991d69f12c5edef92754..d98ddcfac5e5cb2e0ddf1fd32fac9318cc09b29b 100644 (file)
@@ -1157,7 +1157,6 @@ static void mmc_omap_start_request(struct mmc_omap_host *host,
        mmc_omap_start_command(host, req->cmd);
        if (host->dma_in_use)
                omap_start_dma(host->dma_ch);
-       BUG_ON(irqs_disabled());
 }
 
 static void mmc_omap_request(struct mmc_host *mmc, struct mmc_request *req)
index eb97830c0344a57a7d458fc3430ab35165f6be76..5d3f824bb5a31078257ecbb0c10941fc874d3ad7 100644 (file)
 #define DRIVER_NAME    "sh_mmcif"
 #define DRIVER_VERSION "2010-04-28"
 
-#define MMCIF_CE_CMD_SET       0x00000000
-#define MMCIF_CE_ARG           0x00000008
-#define MMCIF_CE_ARG_CMD12     0x0000000C
-#define MMCIF_CE_CMD_CTRL      0x00000010
-#define MMCIF_CE_BLOCK_SET     0x00000014
-#define MMCIF_CE_CLK_CTRL      0x00000018
-#define MMCIF_CE_BUF_ACC       0x0000001C
-#define MMCIF_CE_RESP3         0x00000020
-#define MMCIF_CE_RESP2         0x00000024
-#define MMCIF_CE_RESP1         0x00000028
-#define MMCIF_CE_RESP0         0x0000002C
-#define MMCIF_CE_RESP_CMD12    0x00000030
-#define MMCIF_CE_DATA          0x00000034
-#define MMCIF_CE_INT           0x00000040
-#define MMCIF_CE_INT_MASK      0x00000044
-#define MMCIF_CE_HOST_STS1     0x00000048
-#define MMCIF_CE_HOST_STS2     0x0000004C
-#define MMCIF_CE_VERSION       0x0000007C
-
 /* CE_CMD_SET */
 #define CMD_MASK               0x3f000000
 #define CMD_SET_RTYP_NO                ((0 << 23) | (0 << 22))
@@ -207,27 +188,17 @@ struct sh_mmcif_host {
        wait_queue_head_t intr_wait;
 };
 
-static inline u32 sh_mmcif_readl(struct sh_mmcif_host *host, unsigned int reg)
-{
-       return readl(host->addr + reg);
-}
-
-static inline void sh_mmcif_writel(struct sh_mmcif_host *host,
-                                       unsigned int reg, u32 val)
-{
-       writel(val, host->addr + reg);
-}
 
 static inline void sh_mmcif_bitset(struct sh_mmcif_host *host,
                                        unsigned int reg, u32 val)
 {
-       writel(val | sh_mmcif_readl(host, reg), host->addr + reg);
+       writel(val | readl(host->addr + reg), host->addr + reg);
 }
 
 static inline void sh_mmcif_bitclr(struct sh_mmcif_host *host,
                                        unsigned int reg, u32 val)
 {
-       writel(~val & sh_mmcif_readl(host, reg), host->addr + reg);
+       writel(~val & readl(host->addr + reg), host->addr + reg);
 }
 
 
@@ -253,10 +224,10 @@ static void sh_mmcif_sync_reset(struct sh_mmcif_host *host)
 {
        u32 tmp;
 
-       tmp = 0x010f0000 & sh_mmcif_readl(host, MMCIF_CE_CLK_CTRL);
+       tmp = 0x010f0000 & sh_mmcif_readl(host->addr, MMCIF_CE_CLK_CTRL);
 
-       sh_mmcif_writel(host, MMCIF_CE_VERSION, SOFT_RST_ON);
-       sh_mmcif_writel(host, MMCIF_CE_VERSION, SOFT_RST_OFF);
+       sh_mmcif_writel(host->addr, MMCIF_CE_VERSION, SOFT_RST_ON);
+       sh_mmcif_writel(host->addr, MMCIF_CE_VERSION, SOFT_RST_OFF);
        sh_mmcif_bitset(host, MMCIF_CE_CLK_CTRL, tmp |
                SRSPTO_256 | SRBSYTO_29 | SRWDTO_29 | SCCSTO_29);
        /* byte swap on */
@@ -271,12 +242,10 @@ static int sh_mmcif_error_manage(struct sh_mmcif_host *host)
        host->sd_error = 0;
        host->wait_int = 0;
 
-       state1 = sh_mmcif_readl(host, MMCIF_CE_HOST_STS1);
-       state2 = sh_mmcif_readl(host, MMCIF_CE_HOST_STS2);
-       pr_debug("%s: ERR HOST_STS1 = %08x\n", \
-                       DRIVER_NAME, sh_mmcif_readl(host, MMCIF_CE_HOST_STS1));
-       pr_debug("%s: ERR HOST_STS2 = %08x\n", \
-                       DRIVER_NAME, sh_mmcif_readl(host, MMCIF_CE_HOST_STS2));
+       state1 = sh_mmcif_readl(host->addr, MMCIF_CE_HOST_STS1);
+       state2 = sh_mmcif_readl(host->addr, MMCIF_CE_HOST_STS2);
+       pr_debug("%s: ERR HOST_STS1 = %08x\n", DRIVER_NAME, state1);
+       pr_debug("%s: ERR HOST_STS2 = %08x\n", DRIVER_NAME, state2);
 
        if (state1 & STS1_CMDSEQ) {
                sh_mmcif_bitset(host, MMCIF_CE_CMD_CTRL, CMD_CTRL_BREAK);
@@ -288,7 +257,7 @@ static int sh_mmcif_error_manage(struct sh_mmcif_host *host)
                                        "command sequence timeout err\n");
                                return -EIO;
                        }
-                       if (!(sh_mmcif_readl(host, MMCIF_CE_HOST_STS1)
+                       if (!(sh_mmcif_readl(host->addr, MMCIF_CE_HOST_STS1)
                                                                & STS1_CMDSEQ))
                                break;
                        mdelay(1);
@@ -330,9 +299,9 @@ static int sh_mmcif_single_read(struct sh_mmcif_host *host,
 
        host->wait_int = 0;
        blocksize = (BLOCK_SIZE_MASK &
-                       sh_mmcif_readl(host, MMCIF_CE_BLOCK_SET)) + 3;
+                       sh_mmcif_readl(host->addr, MMCIF_CE_BLOCK_SET)) + 3;
        for (i = 0; i < blocksize / 4; i++)
-               *p++ = sh_mmcif_readl(host, MMCIF_CE_DATA);
+               *p++ = sh_mmcif_readl(host->addr, MMCIF_CE_DATA);
 
        /* buffer read end */
        sh_mmcif_bitset(host, MMCIF_CE_INT_MASK, MASK_MBUFRE);
@@ -353,7 +322,8 @@ static int sh_mmcif_multi_read(struct sh_mmcif_host *host,
        long time;
        u32 blocksize, i, j, sec, *p;
 
-       blocksize = BLOCK_SIZE_MASK & sh_mmcif_readl(host, MMCIF_CE_BLOCK_SET);
+       blocksize = BLOCK_SIZE_MASK & sh_mmcif_readl(host->addr,
+                                                    MMCIF_CE_BLOCK_SET);
        for (j = 0; j < data->sg_len; j++) {
                p = sg_virt(data->sg);
                host->wait_int = 0;
@@ -370,7 +340,8 @@ static int sh_mmcif_multi_read(struct sh_mmcif_host *host,
 
                        host->wait_int = 0;
                        for (i = 0; i < blocksize / 4; i++)
-                               *p++ = sh_mmcif_readl(host, MMCIF_CE_DATA);
+                               *p++ = sh_mmcif_readl(host->addr,
+                                                     MMCIF_CE_DATA);
                }
                if (j < data->sg_len - 1)
                        data->sg++;
@@ -397,9 +368,9 @@ static int sh_mmcif_single_write(struct sh_mmcif_host *host,
 
        host->wait_int = 0;
        blocksize = (BLOCK_SIZE_MASK &
-                       sh_mmcif_readl(host, MMCIF_CE_BLOCK_SET)) + 3;
+                       sh_mmcif_readl(host->addr, MMCIF_CE_BLOCK_SET)) + 3;
        for (i = 0; i < blocksize / 4; i++)
-               sh_mmcif_writel(host, MMCIF_CE_DATA, *p++);
+               sh_mmcif_writel(host->addr, MMCIF_CE_DATA, *p++);
 
        /* buffer write end */
        sh_mmcif_bitset(host, MMCIF_CE_INT_MASK, MASK_MDTRANE);
@@ -421,7 +392,8 @@ static int sh_mmcif_multi_write(struct sh_mmcif_host *host,
        long time;
        u32 i, sec, j, blocksize, *p;
 
-       blocksize = BLOCK_SIZE_MASK & sh_mmcif_readl(host, MMCIF_CE_BLOCK_SET);
+       blocksize = BLOCK_SIZE_MASK & sh_mmcif_readl(host->addr,
+                                                    MMCIF_CE_BLOCK_SET);
 
        for (j = 0; j < data->sg_len; j++) {
                p = sg_virt(data->sg);
@@ -439,7 +411,8 @@ static int sh_mmcif_multi_write(struct sh_mmcif_host *host,
 
                        host->wait_int = 0;
                        for (i = 0; i < blocksize / 4; i++)
-                               sh_mmcif_writel(host, MMCIF_CE_DATA, *p++);
+                               sh_mmcif_writel(host->addr,
+                                               MMCIF_CE_DATA, *p++);
                }
                if (j < data->sg_len - 1)
                        data->sg++;
@@ -451,18 +424,18 @@ static void sh_mmcif_get_response(struct sh_mmcif_host *host,
                                                struct mmc_command *cmd)
 {
        if (cmd->flags & MMC_RSP_136) {
-               cmd->resp[0] = sh_mmcif_readl(host, MMCIF_CE_RESP3);
-               cmd->resp[1] = sh_mmcif_readl(host, MMCIF_CE_RESP2);
-               cmd->resp[2] = sh_mmcif_readl(host, MMCIF_CE_RESP1);
-               cmd->resp[3] = sh_mmcif_readl(host, MMCIF_CE_RESP0);
+               cmd->resp[0] = sh_mmcif_readl(host->addr, MMCIF_CE_RESP3);
+               cmd->resp[1] = sh_mmcif_readl(host->addr, MMCIF_CE_RESP2);
+               cmd->resp[2] = sh_mmcif_readl(host->addr, MMCIF_CE_RESP1);
+               cmd->resp[3] = sh_mmcif_readl(host->addr, MMCIF_CE_RESP0);
        } else
-               cmd->resp[0] = sh_mmcif_readl(host, MMCIF_CE_RESP0);
+               cmd->resp[0] = sh_mmcif_readl(host->addr, MMCIF_CE_RESP0);
 }
 
 static void sh_mmcif_get_cmd12response(struct sh_mmcif_host *host,
                                                struct mmc_command *cmd)
 {
-       cmd->resp[0] = sh_mmcif_readl(host, MMCIF_CE_RESP_CMD12);
+       cmd->resp[0] = sh_mmcif_readl(host->addr, MMCIF_CE_RESP_CMD12);
 }
 
 static u32 sh_mmcif_set_cmd(struct sh_mmcif_host *host,
@@ -596,18 +569,19 @@ static void sh_mmcif_start_cmd(struct sh_mmcif_host *host,
                MASK_MRDATTO | MASK_MRBSYTO | MASK_MRSPTO;
 
        if (host->data) {
-               sh_mmcif_writel(host, MMCIF_CE_BLOCK_SET, 0);
-               sh_mmcif_writel(host, MMCIF_CE_BLOCK_SET, mrq->data->blksz);
+               sh_mmcif_writel(host->addr, MMCIF_CE_BLOCK_SET, 0);
+               sh_mmcif_writel(host->addr, MMCIF_CE_BLOCK_SET,
+                               mrq->data->blksz);
        }
        opc = sh_mmcif_set_cmd(host, mrq, cmd, opc);
 
-       sh_mmcif_writel(host, MMCIF_CE_INT, 0xD80430C0);
-       sh_mmcif_writel(host, MMCIF_CE_INT_MASK, mask);
+       sh_mmcif_writel(host->addr, MMCIF_CE_INT, 0xD80430C0);
+       sh_mmcif_writel(host->addr, MMCIF_CE_INT_MASK, mask);
        /* set arg */
-       sh_mmcif_writel(host, MMCIF_CE_ARG, cmd->arg);
+       sh_mmcif_writel(host->addr, MMCIF_CE_ARG, cmd->arg);
        host->wait_int = 0;
        /* set cmd */
-       sh_mmcif_writel(host, MMCIF_CE_CMD_SET, opc);
+       sh_mmcif_writel(host->addr, MMCIF_CE_CMD_SET, opc);
 
        time = wait_event_interruptible_timeout(host->intr_wait,
                host->wait_int == 1 || host->sd_error == 1, host->timeout);
@@ -752,43 +726,44 @@ static irqreturn_t sh_mmcif_intr(int irq, void *dev_id)
        u32 state = 0;
        int err = 0;
 
-       state = sh_mmcif_readl(host, MMCIF_CE_INT);
+       state = sh_mmcif_readl(host->addr, MMCIF_CE_INT);
 
        if (state & INT_RBSYE) {
-               sh_mmcif_writel(host, MMCIF_CE_INT, ~(INT_RBSYE | INT_CRSPE));
+               sh_mmcif_writel(host->addr, MMCIF_CE_INT,
+                               ~(INT_RBSYE | INT_CRSPE));
                sh_mmcif_bitclr(host, MMCIF_CE_INT_MASK, MASK_MRBSYE);
        } else if (state & INT_CRSPE) {
-               sh_mmcif_writel(host, MMCIF_CE_INT, ~INT_CRSPE);
+               sh_mmcif_writel(host->addr, MMCIF_CE_INT, ~INT_CRSPE);
                sh_mmcif_bitclr(host, MMCIF_CE_INT_MASK, MASK_MCRSPE);
        } else if (state & INT_BUFREN) {
-               sh_mmcif_writel(host, MMCIF_CE_INT, ~INT_BUFREN);
+               sh_mmcif_writel(host->addr, MMCIF_CE_INT, ~INT_BUFREN);
                sh_mmcif_bitclr(host, MMCIF_CE_INT_MASK, MASK_MBUFREN);
        } else if (state & INT_BUFWEN) {
-               sh_mmcif_writel(host, MMCIF_CE_INT, ~INT_BUFWEN);
+               sh_mmcif_writel(host->addr, MMCIF_CE_INT, ~INT_BUFWEN);
                sh_mmcif_bitclr(host, MMCIF_CE_INT_MASK, MASK_MBUFWEN);
        } else if (state & INT_CMD12DRE) {
-               sh_mmcif_writel(host, MMCIF_CE_INT,
+               sh_mmcif_writel(host->addr, MMCIF_CE_INT,
                        ~(INT_CMD12DRE | INT_CMD12RBE |
                          INT_CMD12CRE | INT_BUFRE));
                sh_mmcif_bitclr(host, MMCIF_CE_INT_MASK, MASK_MCMD12DRE);
        } else if (state & INT_BUFRE) {
-               sh_mmcif_writel(host, MMCIF_CE_INT, ~INT_BUFRE);
+               sh_mmcif_writel(host->addr, MMCIF_CE_INT, ~INT_BUFRE);
                sh_mmcif_bitclr(host, MMCIF_CE_INT_MASK, MASK_MBUFRE);
        } else if (state & INT_DTRANE) {
-               sh_mmcif_writel(host, MMCIF_CE_INT, ~INT_DTRANE);
+               sh_mmcif_writel(host->addr, MMCIF_CE_INT, ~INT_DTRANE);
                sh_mmcif_bitclr(host, MMCIF_CE_INT_MASK, MASK_MDTRANE);
        } else if (state & INT_CMD12RBE) {
-               sh_mmcif_writel(host, MMCIF_CE_INT,
+               sh_mmcif_writel(host->addr, MMCIF_CE_INT,
                                ~(INT_CMD12RBE | INT_CMD12CRE));
                sh_mmcif_bitclr(host, MMCIF_CE_INT_MASK, MASK_MCMD12RBE);
        } else if (state & INT_ERR_STS) {
                /* err interrupts */
-               sh_mmcif_writel(host, MMCIF_CE_INT, ~state);
+               sh_mmcif_writel(host->addr, MMCIF_CE_INT, ~state);
                sh_mmcif_bitclr(host, MMCIF_CE_INT_MASK, state);
                err = 1;
        } else {
                pr_debug("%s: Not support int\n", DRIVER_NAME);
-               sh_mmcif_writel(host, MMCIF_CE_INT, ~state);
+               sh_mmcif_writel(host->addr, MMCIF_CE_INT, ~state);
                sh_mmcif_bitclr(host, MMCIF_CE_INT_MASK, state);
                err = 1;
        }
@@ -894,12 +869,12 @@ static int __devinit sh_mmcif_probe(struct platform_device *pdev)
                goto clean_up2;
        }
 
-       sh_mmcif_writel(host, MMCIF_CE_INT_MASK, MASK_ALL);
+       sh_mmcif_writel(host->addr, MMCIF_CE_INT_MASK, MASK_ALL);
        sh_mmcif_detect(host->mmc);
 
        pr_info("%s: driver version %s\n", DRIVER_NAME, DRIVER_VERSION);
        pr_debug("%s: chip ver H'%04x\n", DRIVER_NAME,
-                       sh_mmcif_readl(host, MMCIF_CE_VERSION) & 0x0000ffff);
+               sh_mmcif_readl(host->addr, MMCIF_CE_VERSION) & 0x0000ffff);
        return ret;
 
 clean_up2:
@@ -917,7 +892,7 @@ static int __devexit sh_mmcif_remove(struct platform_device *pdev)
        struct sh_mmcif_host *host = platform_get_drvdata(pdev);
        int irq[2];
 
-       sh_mmcif_writel(host, MMCIF_CE_INT_MASK, MASK_ALL);
+       sh_mmcif_writel(host->addr, MMCIF_CE_INT_MASK, MASK_ALL);
 
        irq[0] = platform_get_irq(pdev, 0);
        irq[1] = platform_get_irq(pdev, 1);
index e5972b2c17b7be04be983a4460ca5aec5c7063d2..70b68d35f9694c804272c1bca502253f15a563c9 100644 (file)
@@ -495,8 +495,6 @@ static int __devinit s3c_rtc_probe(struct platform_device *pdev)
        pr_debug("s3c2410_rtc: RTCCON=%02x\n",
                 readb(s3c_rtc_base + S3C2410_RTCCON));
 
-       s3c_rtc_setfreq(&pdev->dev, 1);
-
        device_init_wakeup(&pdev->dev, 1);
 
        /* register RTC and exit */
@@ -510,14 +508,17 @@ static int __devinit s3c_rtc_probe(struct platform_device *pdev)
                goto err_nortc;
        }
 
+       s3c_rtc_cpu_type = platform_get_device_id(pdev)->driver_data;
+
        if (s3c_rtc_cpu_type == TYPE_S3C64XX)
                rtc->max_user_freq = 32768;
        else
                rtc->max_user_freq = 128;
 
-       s3c_rtc_cpu_type = platform_get_device_id(pdev)->driver_data;
-
        platform_set_drvdata(pdev, rtc);
+
+       s3c_rtc_setfreq(&pdev->dev, 1);
+
        return 0;
 
  err_nortc:
index 01c012da4e26d01eef7c9cfeb87b71a26e1f1bd6..746a44621d9157e3a50448ce60e577d66dfc1246 100644 (file)
@@ -982,6 +982,18 @@ static int skip_tx_en_setup(struct serial_private *priv,
 #define PCI_SUBDEVICE_ID_POCTAL422     0x0408
 #define PCI_VENDOR_ID_ADVANTECH                0x13fe
 #define PCI_DEVICE_ID_ADVANTECH_PCI3620        0x3620
+#define PCI_DEVICE_ID_TITAN_200I       0x8028
+#define PCI_DEVICE_ID_TITAN_400I       0x8048
+#define PCI_DEVICE_ID_TITAN_800I       0x8088
+#define PCI_DEVICE_ID_TITAN_800EH      0xA007
+#define PCI_DEVICE_ID_TITAN_800EHB     0xA008
+#define PCI_DEVICE_ID_TITAN_400EH      0xA009
+#define PCI_DEVICE_ID_TITAN_100E       0xA010
+#define PCI_DEVICE_ID_TITAN_200E       0xA012
+#define PCI_DEVICE_ID_TITAN_400E       0xA013
+#define PCI_DEVICE_ID_TITAN_800E       0xA014
+#define PCI_DEVICE_ID_TITAN_200EI      0xA016
+#define PCI_DEVICE_ID_TITAN_200EISI    0xA017
 
 /* Unknown vendors/cards - this should not be in linux/pci_ids.h */
 #define PCI_SUBDEVICE_ID_UNKNOWN_0x1584        0x1584
@@ -1541,6 +1553,10 @@ enum pci_board_num_t {
        pbn_b3_4_115200,
        pbn_b3_8_115200,
 
+       pbn_b4_bt_2_921600,
+       pbn_b4_bt_4_921600,
+       pbn_b4_bt_8_921600,
+
        /*
         * Board-specific versions.
         */
@@ -1995,6 +2011,25 @@ static struct pciserial_board pci_boards[] __devinitdata = {
                .uart_offset    = 8,
        },
 
+       [pbn_b4_bt_2_921600] = {
+               .flags          = FL_BASE4,
+               .num_ports      = 2,
+               .base_baud      = 921600,
+               .uart_offset    = 8,
+       },
+       [pbn_b4_bt_4_921600] = {
+               .flags          = FL_BASE4,
+               .num_ports      = 4,
+               .base_baud      = 921600,
+               .uart_offset    = 8,
+       },
+       [pbn_b4_bt_8_921600] = {
+               .flags          = FL_BASE4,
+               .num_ports      = 8,
+               .base_baud      = 921600,
+               .uart_offset    = 8,
+       },
+
        /*
         * Entries following this are board-specific.
         */
@@ -3043,6 +3078,42 @@ static struct pci_device_id serial_pci_tbl[] = {
        {       PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_800L,
                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
                pbn_b0_bt_8_921600 },
+       {       PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_200I,
+               PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+               pbn_b4_bt_2_921600 },
+       {       PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_400I,
+               PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+               pbn_b4_bt_4_921600 },
+       {       PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_800I,
+               PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+               pbn_b4_bt_8_921600 },
+       {       PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_400EH,
+               PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+               pbn_b0_4_921600 },
+       {       PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_800EH,
+               PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+               pbn_b0_4_921600 },
+       {       PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_800EHB,
+               PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+               pbn_b0_4_921600 },
+       {       PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_100E,
+               PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+               pbn_oxsemi_1_4000000 },
+       {       PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_200E,
+               PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+               pbn_oxsemi_2_4000000 },
+       {       PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_400E,
+               PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+               pbn_oxsemi_4_4000000 },
+       {       PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_800E,
+               PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+               pbn_oxsemi_8_4000000 },
+       {       PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_200EI,
+               PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+               pbn_oxsemi_2_4000000 },
+       {       PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_200EISI,
+               PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+               pbn_oxsemi_2_4000000 },
 
        {       PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S_10x_550,
                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
index bcee156d2f2eb32edc3f9f1d60a55e545875663a..0f1189605d2141b2516b48c6ecd6ed6ee7c287ec 100644 (file)
@@ -89,15 +89,12 @@ static unsigned int altera_uart_tx_empty(struct uart_port *port)
 static unsigned int altera_uart_get_mctrl(struct uart_port *port)
 {
        struct altera_uart *pp = container_of(port, struct altera_uart, port);
-       unsigned long flags;
        unsigned int sigs;
 
-       spin_lock_irqsave(&port->lock, flags);
        sigs =
            (readl(port->membase + ALTERA_UART_STATUS_REG) &
             ALTERA_UART_STATUS_CTS_MSK) ? TIOCM_CTS : 0;
        sigs |= (pp->sigs & TIOCM_RTS);
-       spin_unlock_irqrestore(&port->lock, flags);
 
        return sigs;
 }
@@ -105,49 +102,37 @@ static unsigned int altera_uart_get_mctrl(struct uart_port *port)
 static void altera_uart_set_mctrl(struct uart_port *port, unsigned int sigs)
 {
        struct altera_uart *pp = container_of(port, struct altera_uart, port);
-       unsigned long flags;
 
-       spin_lock_irqsave(&port->lock, flags);
        pp->sigs = sigs;
        if (sigs & TIOCM_RTS)
                pp->imr |= ALTERA_UART_CONTROL_RTS_MSK;
        else
                pp->imr &= ~ALTERA_UART_CONTROL_RTS_MSK;
        writel(pp->imr, port->membase + ALTERA_UART_CONTROL_REG);
-       spin_unlock_irqrestore(&port->lock, flags);
 }
 
 static void altera_uart_start_tx(struct uart_port *port)
 {
        struct altera_uart *pp = container_of(port, struct altera_uart, port);
-       unsigned long flags;
 
-       spin_lock_irqsave(&port->lock, flags);
        pp->imr |= ALTERA_UART_CONTROL_TRDY_MSK;
        writel(pp->imr, port->membase + ALTERA_UART_CONTROL_REG);
-       spin_unlock_irqrestore(&port->lock, flags);
 }
 
 static void altera_uart_stop_tx(struct uart_port *port)
 {
        struct altera_uart *pp = container_of(port, struct altera_uart, port);
-       unsigned long flags;
 
-       spin_lock_irqsave(&port->lock, flags);
        pp->imr &= ~ALTERA_UART_CONTROL_TRDY_MSK;
        writel(pp->imr, port->membase + ALTERA_UART_CONTROL_REG);
-       spin_unlock_irqrestore(&port->lock, flags);
 }
 
 static void altera_uart_stop_rx(struct uart_port *port)
 {
        struct altera_uart *pp = container_of(port, struct altera_uart, port);
-       unsigned long flags;
 
-       spin_lock_irqsave(&port->lock, flags);
        pp->imr &= ~ALTERA_UART_CONTROL_RRDY_MSK;
        writel(pp->imr, port->membase + ALTERA_UART_CONTROL_REG);
-       spin_unlock_irqrestore(&port->lock, flags);
 }
 
 static void altera_uart_break_ctl(struct uart_port *port, int break_state)
@@ -272,10 +257,14 @@ static irqreturn_t altera_uart_interrupt(int irq, void *data)
        unsigned int isr;
 
        isr = readl(port->membase + ALTERA_UART_STATUS_REG) & pp->imr;
+
+       spin_lock(&port->lock);
        if (isr & ALTERA_UART_STATUS_RRDY_MSK)
                altera_uart_rx_chars(pp);
        if (isr & ALTERA_UART_STATUS_TRDY_MSK)
                altera_uart_tx_chars(pp);
+       spin_unlock(&port->lock);
+
        return IRQ_RETVAL(isr);
 }
 
@@ -402,31 +391,24 @@ int __init early_altera_uart_setup(struct altera_uart_platform_uart *platp)
        return 0;
 }
 
-static void altera_uart_console_putc(struct console *co, const char c)
+static void altera_uart_console_putc(struct uart_port *port, const char c)
 {
-       struct uart_port *port = &(altera_uart_ports + co->index)->port;
-       int i;
+       while (!(readl(port->membase + ALTERA_UART_STATUS_REG) &
+                ALTERA_UART_STATUS_TRDY_MSK))
+               cpu_relax();
 
-       for (i = 0; i < 0x10000; i++) {
-               if (readl(port->membase + ALTERA_UART_STATUS_REG) &
-                   ALTERA_UART_STATUS_TRDY_MSK)
-                       break;
-       }
        writel(c, port->membase + ALTERA_UART_TXDATA_REG);
-       for (i = 0; i < 0x10000; i++) {
-               if (readl(port->membase + ALTERA_UART_STATUS_REG) &
-                   ALTERA_UART_STATUS_TRDY_MSK)
-                       break;
-       }
 }
 
 static void altera_uart_console_write(struct console *co, const char *s,
                                      unsigned int count)
 {
+       struct uart_port *port = &(altera_uart_ports + co->index)->port;
+
        for (; count; count--, s++) {
-               altera_uart_console_putc(co, *s);
+               altera_uart_console_putc(port, *s);
                if (*s == '\n')
-                       altera_uart_console_putc(co, '\r');
+                       altera_uart_console_putc(port, '\r');
        }
 }
 
@@ -516,7 +498,7 @@ static int __devinit altera_uart_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int altera_uart_remove(struct platform_device *pdev)
+static int __devexit altera_uart_remove(struct platform_device *pdev)
 {
        struct uart_port *port;
        int i;
index 96f7e7484feebf4269c631862f9a01b227eac0f6..511cbf68787782ce9b782f85ae51a0b5a80df5a6 100644 (file)
@@ -797,7 +797,7 @@ static void bfin_serial_shutdown(struct uart_port *port)
                gpio_free(uart->rts_pin);
 #endif
 #ifdef CONFIG_SERIAL_BFIN_HARD_CTSRTS
-       if (UART_GET_IER(uart) && EDSSI)
+       if (UART_GET_IER(uart) & EDSSI)
                free_irq(uart->status_irq, uart);
 #endif
 }
@@ -869,7 +869,12 @@ bfin_serial_set_termios(struct uart_port *port, struct ktermios *termios,
        }
 
        baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16);
-       quot = uart_get_divisor(port, baud) - ANOMALY_05000230;
+       quot = uart_get_divisor(port, baud);
+
+       /* If discipline is not IRDA, apply ANOMALY_05000230 */
+       if (termios->c_line != N_IRDA)
+               quot -= ANOMALY_05000230;
+
        spin_lock_irqsave(&uart->port.lock, flags);
 
        UART_SET_ANOMALY_THRESHOLD(uart, USEC_PER_SEC / baud * 15);
index ecdc0facf7ee9928fd4354a0e2a52e5d611b6acb..f8c816e7725de2152f9f80b50a0962c6f88c82e4 100644 (file)
@@ -41,19 +41,6 @@ struct msm_port {
        unsigned int            imr;
 };
 
-#define UART_TO_MSM(uart_port) ((struct msm_port *) uart_port)
-
-static inline void msm_write(struct uart_port *port, unsigned int val,
-                            unsigned int off)
-{
-       __raw_writel(val, port->membase + off);
-}
-
-static inline unsigned int msm_read(struct uart_port *port, unsigned int off)
-{
-       return __raw_readl(port->membase + off);
-}
-
 static void msm_stop_tx(struct uart_port *port)
 {
        struct msm_port *msm_port = UART_TO_MSM(port);
@@ -320,11 +307,7 @@ static void msm_init_clock(struct uart_port *port)
        struct msm_port *msm_port = UART_TO_MSM(port);
 
        clk_enable(msm_port->clk);
-
-       msm_write(port, 0xC0, UART_MREG);
-       msm_write(port, 0xB2, UART_NREG);
-       msm_write(port, 0x7D, UART_DREG);
-       msm_write(port, 0x1C, UART_MNDREG);
+       msm_serial_set_mnd_regs(port);
 }
 
 static int msm_startup(struct uart_port *port)
@@ -706,6 +689,8 @@ static int __init msm_serial_probe(struct platform_device *pdev)
        if (unlikely(IS_ERR(msm_port->clk)))
                return PTR_ERR(msm_port->clk);
        port->uartclk = clk_get_rate(msm_port->clk);
+       printk(KERN_INFO "uartclk = %d\n", port->uartclk);
+
 
        resource = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        if (unlikely(!resource))
index 689f1fa0e84e2370254bc0570e7a841e98184b23..f6ca9ca79e98f34be24525596f1b38fe5c5f31a3 100644 (file)
 #define UART_MISR      0x0010
 #define UART_ISR       0x0014
 
+#define UART_TO_MSM(uart_port) ((struct msm_port *) uart_port)
+
+static inline
+void msm_write(struct uart_port *port, unsigned int val, unsigned int off)
+{
+       __raw_writel(val, port->membase + off);
+}
+
+static inline
+unsigned int msm_read(struct uart_port *port, unsigned int off)
+{
+       return __raw_readl(port->membase + off);
+}
+
+/*
+ * Setup the MND registers to use the TCXO clock.
+ */
+static inline void msm_serial_set_mnd_regs_tcxo(struct uart_port *port)
+{
+       msm_write(port, 0x06, UART_MREG);
+       msm_write(port, 0xF1, UART_NREG);
+       msm_write(port, 0x0F, UART_DREG);
+       msm_write(port, 0x1A, UART_MNDREG);
+}
+
+/*
+ * Setup the MND registers to use the TCXO clock divided by 4.
+ */
+static inline void msm_serial_set_mnd_regs_tcxoby4(struct uart_port *port)
+{
+       msm_write(port, 0x18, UART_MREG);
+       msm_write(port, 0xF6, UART_NREG);
+       msm_write(port, 0x0F, UART_DREG);
+       msm_write(port, 0x0A, UART_MNDREG);
+}
+
+static inline
+void msm_serial_set_mnd_regs_from_uartclk(struct uart_port *port)
+{
+       if (port->uartclk == 19200000)
+               msm_serial_set_mnd_regs_tcxo(port);
+       else
+               msm_serial_set_mnd_regs_tcxoby4(port);
+}
+
+/*
+ * TROUT has a specific defect that makes it report it's uartclk
+ * as 19.2Mhz (TCXO) when it's actually 4.8Mhz (TCXO/4). This special
+ * cases TROUT to use the right clock.
+ */
+#ifdef CONFIG_MACH_TROUT
+#define msm_serial_set_mnd_regs msm_serial_set_mnd_regs_tcxoby4
+#else
+#define msm_serial_set_mnd_regs msm_serial_set_mnd_regs_from_uartclk
+#endif
+
 #endif /* __DRIVERS_SERIAL_MSM_SERIAL_H */
index dadd686c98012e545bf90d07a61447853630818d..526307368f8be5f8c1a1a553b01ac83799db2ffa 100644 (file)
@@ -715,6 +715,8 @@ static struct pcmcia_device_id serial_ids[] = {
        PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0057, 0x0021),
        PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0089, 0x110a),
        PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0104, 0x000a),
+       PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0105, 0x0d0a),
+       PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0105, 0x0e0a),
        PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0105, 0xea15),
        PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0109, 0x0501),
        PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0138, 0x110a),
@@ -724,8 +726,6 @@ static struct pcmcia_device_id serial_ids[] = {
        PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x016c, 0x0081),
        PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x021b, 0x0101),
        PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x08a1, 0xc0ab),
-       PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0105, 0x0d0a),
-       PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0105, 0x0e0a),
        PCMCIA_PFC_DEVICE_PROD_ID123(1, "MEGAHERTZ", "CC/XJEM3288", "DATA/FAX/CELL ETHERNET MODEM", 0xf510db04, 0x04cd2988, 0x46a52d63),
        PCMCIA_PFC_DEVICE_PROD_ID123(1, "MEGAHERTZ", "CC/XJEM3336", "DATA/FAX/CELL ETHERNET MODEM", 0xf510db04, 0x0143b773, 0x46a52d63),
        PCMCIA_PFC_DEVICE_PROD_ID123(1, "MEGAHERTZ", "EM1144T", "PCMCIA MODEM", 0xf510db04, 0x856d66c8, 0xbd6c43ef),
@@ -768,17 +768,26 @@ static struct pcmcia_device_id serial_ids[] = {
        PCMCIA_DEVICE_MANF_CARD(0x00a4, 0x0276),
        PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0039),
        PCMCIA_DEVICE_MANF_CARD(0x0104, 0x0006),
+       PCMCIA_DEVICE_MANF_CARD(0x0105, 0x0101), /* TDK DF2814 */
+       PCMCIA_DEVICE_MANF_CARD(0x0105, 0x100a), /* Xircom CM-56G */
+       PCMCIA_DEVICE_MANF_CARD(0x0105, 0x3e0a), /* TDK DF5660 */
        PCMCIA_DEVICE_MANF_CARD(0x0105, 0x410a),
+       PCMCIA_DEVICE_MANF_CARD(0x0107, 0x0002), /* USRobotics 14,400 */
        PCMCIA_DEVICE_MANF_CARD(0x010b, 0x0d50),
        PCMCIA_DEVICE_MANF_CARD(0x010b, 0x0d51),
        PCMCIA_DEVICE_MANF_CARD(0x010b, 0x0d52),
        PCMCIA_DEVICE_MANF_CARD(0x010b, 0x0d53),
        PCMCIA_DEVICE_MANF_CARD(0x010b, 0xd180),
+       PCMCIA_DEVICE_MANF_CARD(0x0115, 0x3330), /* USRobotics/SUN 14,400 */
+       PCMCIA_DEVICE_MANF_CARD(0x0124, 0x0100), /* Nokia DTP-2 ver II */
+       PCMCIA_DEVICE_MANF_CARD(0x0134, 0x5600), /* LASAT COMMUNICATIONS A/S */
        PCMCIA_DEVICE_MANF_CARD(0x0137, 0x000e),
        PCMCIA_DEVICE_MANF_CARD(0x0137, 0x001b),
        PCMCIA_DEVICE_MANF_CARD(0x0137, 0x0025),
        PCMCIA_DEVICE_MANF_CARD(0x0137, 0x0045),
        PCMCIA_DEVICE_MANF_CARD(0x0137, 0x0052),
+       PCMCIA_DEVICE_MANF_CARD(0x016c, 0x0006), /* Psion 56K+Fax */
+       PCMCIA_DEVICE_MANF_CARD(0x0200, 0x0001), /* MultiMobile */
        PCMCIA_DEVICE_PROD_ID134("ADV", "TECH", "COMpad-32/85", 0x67459937, 0x916d02ba, 0x8fbe92ae),
        PCMCIA_DEVICE_PROD_ID124("GATEWAY2000", "CC3144", "PCMCIA MODEM", 0x506bccae, 0xcb3685f1, 0xbd6c43ef),
        PCMCIA_DEVICE_PROD_ID14("MEGAHERTZ", "PCMCIA MODEM", 0xf510db04, 0xbd6c43ef),
@@ -792,16 +801,21 @@ static struct pcmcia_device_id serial_ids[] = {
        PCMCIA_DEVICE_PROD_ID12("COMPAQ", "PCMCIA 33600 FAX/DATA MODEM", 0xa3a3062c, 0x5a00ce95),
        PCMCIA_DEVICE_PROD_ID12("Computerboards, Inc.", "PCM-COM422", 0xd0b78f51, 0x7e2d49ed),
        PCMCIA_DEVICE_PROD_ID12("Dr. Neuhaus", "FURY CARD 14K4", 0x76942813, 0x8b96ce65),
+       PCMCIA_DEVICE_PROD_ID12("IBM", "ISDN/56K/GSM", 0xb569a6e5, 0xfee5297b),
        PCMCIA_DEVICE_PROD_ID12("Intelligent", "ANGIA FAX/MODEM", 0xb496e65e, 0xf31602a6),
        PCMCIA_DEVICE_PROD_ID12("Intel", "MODEM 2400+", 0x816cc815, 0x412729fb),
+       PCMCIA_DEVICE_PROD_ID12("Intertex", "IX34-PCMCIA", 0xf8a097e3, 0x97880447),
        PCMCIA_DEVICE_PROD_ID12("IOTech Inc ", "PCMCIA Dual RS-232 Serial Port Card", 0x3bd2d898, 0x92abc92f),
        PCMCIA_DEVICE_PROD_ID12("MACRONIX", "FAX/MODEM", 0x668388b3, 0x3f9bdf2f),
        PCMCIA_DEVICE_PROD_ID12("Multi-Tech", "MT1432LT", 0x5f73be51, 0x0b3e2383),
        PCMCIA_DEVICE_PROD_ID12("Multi-Tech", "MT2834LT", 0x5f73be51, 0x4cd7c09e),
        PCMCIA_DEVICE_PROD_ID12("OEM      ", "C288MX     ", 0xb572d360, 0xd2385b7a),
+       PCMCIA_DEVICE_PROD_ID12("Option International", "V34bis GSM/PSTN Data/Fax Modem", 0x9d7cd6f5, 0x5cb8bf41),
        PCMCIA_DEVICE_PROD_ID12("PCMCIA   ", "C336MX     ", 0x99bcafe9, 0xaa25bcab),
        PCMCIA_DEVICE_PROD_ID12("Quatech Inc", "PCMCIA Dual RS-232 Serial Port Card", 0xc4420b35, 0x92abc92f),
        PCMCIA_DEVICE_PROD_ID12("Quatech Inc", "Dual RS-232 Serial Port PC Card", 0xc4420b35, 0x031a380d),
+       PCMCIA_DEVICE_PROD_ID12("Telia", "SurfinBird 560P/A+", 0xe2cdd5e, 0xc9314b38),
+       PCMCIA_DEVICE_PROD_ID1("Smart Serial Port", 0x2d8ce292),
        PCMCIA_PFC_DEVICE_CIS_PROD_ID12(1, "PCMCIA", "EN2218-LAN/MODEM", 0x281f1c5d, 0x570f348e, "cis/PCMLM28.cis"),
        PCMCIA_PFC_DEVICE_CIS_PROD_ID12(1, "PCMCIA", "UE2218-LAN/MODEM", 0x281f1c5d, 0x6fdcacee, "cis/PCMLM28.cis"),
        PCMCIA_PFC_DEVICE_CIS_PROD_ID12(1, "Psion Dacom", "Gold Card V34 Ethernet", 0xf5f025c2, 0x338e8155, "cis/PCMLM28.cis"),
index 005195958647b03acded28a822bfd7374744d210..ceba593dc84fbcb994f1fb4968cab3b4adf05b83 100644 (file)
@@ -441,8 +441,10 @@ struct sfi_table_attr __init *sfi_sysfs_install_table(u64 pa)
 
        ret = sysfs_create_bin_file(tables_kobj,
                                  &tbl_attr->attr);
-       if (ret)
+       if (ret) {
                kfree(tbl_attr);
+               tbl_attr = NULL;
+       }
 
        sfi_unmap_table(th);
        return tbl_attr;
index c585574b9aedcc6b5c25fc6db620959a61a9ad08..e91a23e5ffd8ad874a8f2e8c6615b5e181a54f8c 100644 (file)
@@ -16,6 +16,8 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  */
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/init.h>
 #include <linux/irq.h>
 #include <linux/module.h>
@@ -855,8 +857,8 @@ static void __init intc_register_irq(struct intc_desc *desc,
                primary = 1;
 
        if (!data[0] && !data[1])
-               pr_warning("intc: missing unique irq mask for "
-                          "irq %d (vect 0x%04x)\n", irq, irq2evt(irq));
+               pr_warning("missing unique irq mask for irq %d (vect 0x%04x)\n",
+                          irq, irq2evt(irq));
 
        data[0] = data[0] ? data[0] : intc_mask_data(desc, d, enum_id, 1);
        data[1] = data[1] ? data[1] : intc_prio_data(desc, d, enum_id, 1);
@@ -952,7 +954,7 @@ int __init register_intc_controller(struct intc_desc *desc)
        struct intc_desc_int *d;
        struct resource *res;
 
-       pr_info("intc: Registered controller '%s' with %u IRQs\n",
+       pr_info("Registered controller '%s' with %u IRQs\n",
                desc->name, hw->nr_vectors);
 
        d = kzalloc(sizeof(*d), GFP_NOWAIT);
@@ -1148,7 +1150,7 @@ int register_intc_userimask(unsigned long addr)
        if (unlikely(!uimask))
                return -ENOMEM;
 
-       pr_info("intc: userimask support registered for levels 0 -> %d\n",
+       pr_info("userimask support registered for levels 0 -> %d\n",
                default_prio_level - 1);
 
        return 0;
@@ -1286,7 +1288,7 @@ static int __init register_intc_sysdevs(void)
        }
 
        if (error)
-               pr_err("intc: sysdev registration error\n");
+               pr_err("sysdev registration error\n");
 
        return error;
 }
index b5c3b3013037c0eccb099c9ccff17e4ac557d1eb..984a75440710673efe2c50ea5967c460a7ef3d12 100644 (file)
@@ -141,5 +141,11 @@ source "drivers/staging/ti-st/Kconfig"
 
 source "drivers/staging/adis16255/Kconfig"
 
+source "drivers/staging/xgifb/Kconfig"
+
+source "drivers/staging/mrst-touchscreen/Kconfig"
+
+source "drivers/staging/msm/Kconfig"
+
 endif # !STAGING_EXCLUDE_BUILD
 endif # STAGING
index e330dd5e843d510178895bca75aed1741e0372a3..9fa25133874afc9b0c2a4c4b31a87f0aa98468d3 100644 (file)
@@ -51,3 +51,6 @@ obj-$(CONFIG_CRYSTALHD)               += crystalhd/
 obj-$(CONFIG_CXT1E1)           += cxt1e1/
 obj-$(CONFIG_TI_ST)            += ti-st/
 obj-$(CONFIG_ADIS16255)                += adis16255/
+obj-$(CONFIG_FB_XGI)           += xgifb/
+obj-$(CONFIG_TOUCHSCREEN_MRSTOUCH)     += mrst-touchscreen/
+obj-$(CONFIG_MSM_STAGING)      += msm/
index a642be66adeac6f85089470bb8d7697c115de16b..a883c1f4478bd089524824d0a5346daacfe83c6f 100644 (file)
@@ -1,5 +1,5 @@
 config ADIS16255
-       tristate "Ananlog Devices ADIS16250/16255"
+       tristate "Analog Devices ADIS16250/16255"
        depends on SPI && SYSFS
        ---help---
        If you say yes here you get support for the Analog Devices
index 1ba11f00b2e726fa8d4d070eb9a1e0fdc535b88f..55d66e290f7d1d80eb0e1603c12b4b7224031c0e 100644 (file)
@@ -361,7 +361,7 @@ err:
 
 /*-------------------------------------------------------------------------*/
 
-static int spi_adis16255_probe(struct spi_device *spi)
+static int __devinit spi_adis16255_probe(struct spi_device *spi)
 {
 
        struct adis16255_init_data *init_data = spi->dev.platform_data;
@@ -421,7 +421,7 @@ err:
        return status;
 }
 
-static int spi_adis16255_remove(struct spi_device *spi)
+static int __devexit spi_adis16255_remove(struct spi_device *spi)
 {
        struct spi_adis16255_data  *spiadis    = dev_get_drvdata(&spi->dev);
 
index ad82ec4a48562d9f44fcba08cd767931764af220..7eb6559e03158d07eada6eccddf882ddaa2ec537 100644 (file)
@@ -309,7 +309,7 @@ void bat_device_add_packet(struct device_client *device_client,
        struct device_packet *device_packet;
        unsigned long flags;
 
-       device_packet = kmalloc(sizeof(struct device_packet), GFP_KERNEL);
+       device_packet = kmalloc(sizeof(struct device_packet), GFP_ATOMIC);
 
        if (!device_packet)
                return;
index 9d13979c2d8ee071d8f29442d03ccc05bc8b64a5..74c70d589a932d1d42ed249d3b9b04c0558d276b 100644 (file)
@@ -127,7 +127,10 @@ int init_module(void)
        return 0;
 
 unreg_soft_device:
-       unregister_netdevice(soft_device);
+       unregister_netdev(soft_device);
+       soft_device = NULL;
+       return -ENOMEM;
+
 free_soft_device:
        free_netdev(soft_device);
        soft_device = NULL;
index d8536e277a26163c27e44f47f185154e58f249aa..ac69ed871a7614c36b8bfc1d2bda10cb1792b14b 100644 (file)
@@ -440,6 +440,9 @@ void send_outstanding_bcast_packet(struct work_struct *work)
        hlist_del(&forw_packet->list);
        spin_unlock_irqrestore(&forw_bcast_list_lock, flags);
 
+       if (atomic_read(&module_state) == MODULE_DEACTIVATING)
+               goto out;
+
        /* rebroadcast packet */
        rcu_read_lock();
        list_for_each_entry_rcu(batman_if, &if_list, list) {
@@ -453,15 +456,15 @@ void send_outstanding_bcast_packet(struct work_struct *work)
 
        forw_packet->num_packets++;
 
-       /* if we still have some more bcasts to send and we are not shutting
-        * down */
-       if ((forw_packet->num_packets < 3) &&
-           (atomic_read(&module_state) != MODULE_DEACTIVATING))
+       /* if we still have some more bcasts to send */
+       if (forw_packet->num_packets < 3) {
                _add_bcast_packet_to_list(forw_packet, ((5 * HZ) / 1000));
-       else {
-               forw_packet_free(forw_packet);
-               atomic_inc(&bcast_queue_left);
+               return;
        }
+
+out:
+       forw_packet_free(forw_packet);
+       atomic_inc(&bcast_queue_left);
 }
 
 void send_outstanding_bat_packet(struct work_struct *work)
@@ -476,6 +479,9 @@ void send_outstanding_bat_packet(struct work_struct *work)
        hlist_del(&forw_packet->list);
        spin_unlock_irqrestore(&forw_bat_list_lock, flags);
 
+       if (atomic_read(&module_state) == MODULE_DEACTIVATING)
+               goto out;
+
        send_packet(forw_packet);
 
        /**
@@ -483,10 +489,10 @@ void send_outstanding_bat_packet(struct work_struct *work)
         * to determine the queues wake up time unless we are
         * shutting down
         */
-       if ((forw_packet->own) &&
-           (atomic_read(&module_state) != MODULE_DEACTIVATING))
+       if (forw_packet->own)
                schedule_own_packet(forw_packet->if_incoming);
 
+out:
        /* don't count own packet */
        if (!forw_packet->own)
                atomic_inc(&batman_queue_left);
index 8ce307e64b58512d1a1f7fecb13caec8f82c684d..aad47326d6dc4b9422a97f385c58900387a8e9cc 100644 (file)
@@ -100,15 +100,6 @@ menuconfig COMEDI_ISA_DRIVERS
 
 if COMEDI_ISA_DRIVERS && ISA
 
-config COMEDI_8255
-       tristate "Generic 8255 support"
-       default N
-       ---help---
-         Enable generic 8255 support.
-
-         To compile this driver as a module, choose M here: the module will be
-         called 8255.
-
 config COMEDI_ACL7225B
        tristate "ADlink NuDAQ ACL-7225b and compatibles support"
        default N
@@ -130,6 +121,7 @@ config COMEDI_PCL711
 
 config COMEDI_PCL724
        tristate "Advantech PCL-722/724/731 and ADlink ACL-7122/7124/PET-48DIO"
+       select COMEDI_8255
        default N
        ---help---
          Enable support for Advantech PCL-724, PCL-722, PCL-731 and
@@ -198,6 +190,7 @@ config COMEDI_PCL818
 
 config COMEDI_PCM3724
        tristate "Advantech PCM-3724 PC/104 card support"
+       select COMEDI_8255
        default N
        ---help---
          Enable support for Advantech PCM-3724 PC/104 cards.
@@ -232,18 +225,9 @@ config COMEDI_RTI802
          To compile this driver as a module, choose M here: the module will be
          called rti802.
 
-config COMEDI_DAS08
-       tristate "DAS-08 compatible ISA, PC/104 and PCMCIA card support"
-       default N
-       ---help---
-         Enable support for Keithley Metrabyte/ComputerBoards DAS08
-         and compatible ISA and PC/104 cards
-
-         To compile this driver as a module, choose M here: the module will be
-         called das08.
-
 config COMEDI_DAS16M1
        tristate "MeasurementComputing CIO-DAS16/M1DAS-16 ISA card support"
+       select COMEDI_8255
        select COMEDI_FC
        default N
        ---help---
@@ -254,6 +238,7 @@ config COMEDI_DAS16M1
 
 config COMEDI_DAS16
        tristate "DAS-16 compatible ISA and PC/104 card support"
+       select COMEDI_8255
        select COMEDI_FC
        default N
        ---help---
@@ -385,6 +370,7 @@ config COMEDI_FL512
 
 config COMEDI_AIO_AIO12_8
        tristate "I/O Products PC/104 AIO12-8 Analog I/O Board support"
+       select COMEDI_8255
        default N
        ---help---
          Enable support for I/O Products PC/104 AIO12-8 Analog I/O Board
@@ -466,6 +452,7 @@ config COMEDI_NI_ATMIO
 config COMEDI_NI_ATMIO16D
        tristate "NI AT-MIO16/AT-MIO16D series ISA-PNP card support"
        depends on ISAPNP && COMEDI_NI_COMMON
+       select COMEDI_8255
        default N
        ---help---
          Enable support for National Instruments AT-MIO16/AT-MIO16D cards.
@@ -667,6 +654,7 @@ config COMEDI_ADDI_APCI_3XXX
 
 config COMEDI_ADL_PCI6208
        tristate "ADLink PCI-6208A support"
+       select COMEDI_8255
        default N
        ---help---
          Enable support for ADLink PCI-6208A cards
@@ -751,6 +739,7 @@ config COMEDI_ADV_PCI1723
 
 config COMEDI_ADV_PCI_DIO
        tristate "Advantech PCI DIO card support"
+       select COMEDI_8255
        default N
        ---help---
          Enable support for Advantech PCI DIO cards
@@ -762,6 +751,7 @@ config COMEDI_ADV_PCI_DIO
 
 config COMEDI_AMPLC_DIO200
        tristate "Amplicon PC272E and PCI272 DIO board support"
+       select COMEDI_8255
        default N
        ---help---
          Enable support for Amplicon PC272E and PCI272 DIO boards
@@ -771,6 +761,7 @@ config COMEDI_AMPLC_DIO200
 
 config COMEDI_AMPLC_PC236
        tristate "Amplicon PC36AT and PCI236 DIO board support"
+       select COMEDI_8255
        default N
        ---help---
          Enable support for Amplicon PC36AT and PCI236 DIO boards
@@ -799,6 +790,7 @@ config COMEDI_AMPLC_PCI224
 
 config COMEDI_AMPLC_PCI230
        tristate "Amplicon PCI230 and PCI260 support"
+       select COMEDI_8255
        default N
        ---help---
          Enable support for Amplicon PCI230 and PCI260 Multifunction I/O
@@ -869,6 +861,7 @@ config COMEDI_II_PCI20KC
 
 config COMEDI_DAQBOARD2000
        tristate "IOtech DAQboard/2000 support"
+       select COMEDI_8255
        default N
        ---help---
          Enable support for the IOtech DAQboard/2000
@@ -896,6 +889,7 @@ config COMEDI_KE_COUNTER
 
 config COMEDI_CB_PCIDAS64
        tristate "MeasurementComputing PCI-DAS 64xx, 60xx, and 4020 support"
+       select COMEDI_8255
        select COMEDI_FC
        default N
        ---help---
@@ -907,6 +901,7 @@ config COMEDI_CB_PCIDAS64
 
 config COMEDI_CB_PCIDAS
        tristate "MeasurementComputing PCI-DAS support"
+       select COMEDI_8255
        select COMEDI_FC
        default N
        ---help---
@@ -920,6 +915,7 @@ config COMEDI_CB_PCIDAS
 
 config COMEDI_CB_PCIDDA
        tristate "MeasurementComputing PCI-DDA series support"
+       select COMEDI_8255
        default N
        ---help---
          Enable support for ComputerBoards/MeasurementComputing PCI-DDA
@@ -931,6 +927,7 @@ config COMEDI_CB_PCIDDA
 
 config COMEDI_CB_PCIDIO
        tristate "MeasurementComputing PCI-DIO series support"
+       select COMEDI_8255
        default N
        ---help---
          Enable support for ComputerBoards/MeasurementComputing PCI-DIO series
@@ -941,6 +938,7 @@ config COMEDI_CB_PCIDIO
 
 config COMEDI_CB_PCIMDAS
        tristate "MeasurementComputing PCIM-DAS1602/16 support"
+       select COMEDI_8255
        default N
        ---help---
          Enable support for ComputerBoards/MeasurementComputing PCI Migration
@@ -951,6 +949,7 @@ config COMEDI_CB_PCIMDAS
 
 config COMEDI_CB_PCIMDDA
        tristate "MeasurementComputing PCIM-DDA06-16 support"
+       select COMEDI_8255
        default N
        ---help---
          Enable support for ComputerBoards/MeasurementComputing PCIM-DDA06-16
@@ -1026,6 +1025,7 @@ config COMEDI_NI_670X
 config COMEDI_NI_PCIDIO
        tristate "NI PCI-DIO32HS, PCI-DIO96, PCI-6533, PCI-6503 support"
        depends on COMEDI_MITE
+       select COMEDI_8255
        default N
        ---help---
          Enable support for National Instruments PCI-DIO-32HS, PXI-6533,
@@ -1058,6 +1058,7 @@ config COMEDI_NI_PCIMIO
 
 config COMEDI_RTD520
        tristate "Real Time Devices PCI4520/DM7520 support"
+       select COMEDI_8255
        default N
        ---help---
          Enable support for Real Time Devices PCI4520/DM7520
@@ -1097,7 +1098,7 @@ endif # COMEDI_PCI_DRIVERS
 
 menuconfig COMEDI_PCMCIA_DRIVERS
        tristate "Comedi PCMCIA drivers"
-       depends on COMEDI && PCMCIA && PCCARD
+       depends on COMEDI && (PCMCIA || PCCARD)
        default N
        ---help---
          Enable comedi PCMCIA and PCCARD drivers to be built
@@ -1142,6 +1143,7 @@ config COMEDI_NI_DAQ_700_CS
 config COMEDI_NI_DAQ_DIO24_CS
        tristate "NI DAQ-Card DIO-24 PCMCIA support"
        depends on COMEDI_NI_COMMON
+       select COMEDI_8255
        default N
        ---help---
          Enable support for the National Instruments PCMCIA DAQ-Card DIO-24
@@ -1162,8 +1164,8 @@ config COMEDI_NI_LABPC_CS
 config COMEDI_NI_MIO_CS
        tristate "NI DAQCard E series PCMCIA support"
        depends on COMEDI_NI_TIO && COMEDI_NI_COMMON
-       default N
        select COMEDI_FC
+       default N
        ---help---
          Enable support for the National Instruments PCMCIA DAQCard E series
          DAQCard-ai-16xe-50, DAQCard-ai-16e-4, DAQCard-6062E, DAQCard-6024E
@@ -1265,7 +1267,8 @@ config COMEDI_MITE
 
 config COMEDI_NI_TIO
        tristate "NI general purpose counter support"
-       select COMEDI_MITE
+       depends on COMEDI_MITE
+       select COMEDI_8255
        default N
        ---help---
          Enable support for National Instruments general purpose counters.
@@ -1278,6 +1281,8 @@ config COMEDI_NI_TIO
 
 config COMEDI_NI_LABPC
        tristate "NI Lab-PC and compatibles ISA and PCI support"
+       depends on COMEDI_MITE
+       select COMEDI_8255
        select COMEDI_FC
        default N
        ---help---
@@ -1291,8 +1296,40 @@ config COMEDI_NI_LABPC
 
 endif # COMEDI_NI_COMMON
 
+config COMEDI_8255
+       tristate "Generic 8255 support"
+       depends on COMEDI
+       default N
+       ---help---
+         Enable generic 8255 support.
+
+         You should enable compilation this driver if you plan to use a board
+         that has an 8255 chip. For multifunction boards, the main driver will
+         configure the 8255 subdevice automatically.
+
+         Note that most PCI 8255 boards do NOT work with this driver, and
+         need a separate driver as a wrapper.
+
+         To compile this driver as a module, choose M here: the module will be
+         called 8255.
+
+config COMEDI_DAS08
+       tristate "DAS-08 compatible support"
+       depends on COMEDI
+       select COMEDI_8255
+       default N
+       ---help---
+         Enable support for DAS08 and compatible ISA, PC/104 and PCI cards.
+
+         Note that PCMCIA DAS08 cards are not directly supported by this
+         driver, and need a separate driver as a wrapper.
+
+         To compile this driver as a module, choose M here: the module will be
+         called das08.
+
 config COMEDI_FC
        tristate "Comedi shared functions for low-level driver support"
+       depends on COMEDI
        default N
        ---help---
          Enable support for shared functions for low-level drivers.
index aced00e5cd107ae03b7c5e4edc81f1135aa711cc..aeb2c00875cd2110117afae796edb95748134e39 100644 (file)
@@ -83,7 +83,7 @@ static int do_subdinfo_ioctl(struct comedi_device *dev,
 static int do_chaninfo_ioctl(struct comedi_device *dev,
                             struct comedi_chaninfo __user *arg);
 static int do_bufinfo_ioctl(struct comedi_device *dev,
-                           struct comedi_bufinfo __user *arg);
+                           struct comedi_bufinfo __user *arg, void *file);
 static int do_cmd_ioctl(struct comedi_device *dev,
                        struct comedi_cmd __user *arg, void *file);
 static int do_lock_ioctl(struct comedi_device *dev, unsigned int arg,
@@ -169,7 +169,8 @@ static long comedi_unlocked_ioctl(struct file *file, unsigned int cmd,
                break;
        case COMEDI_BUFINFO:
                rc = do_bufinfo_ioctl(dev,
-                                     (struct comedi_bufinfo __user *)arg);
+                                     (struct comedi_bufinfo __user *)arg,
+                                     file);
                break;
        case COMEDI_LOCK:
                rc = do_lock_ioctl(dev, arg, file);
@@ -563,7 +564,7 @@ static int do_chaninfo_ioctl(struct comedi_device *dev,
 
   */
 static int do_bufinfo_ioctl(struct comedi_device *dev,
-                           struct comedi_bufinfo __user *arg)
+                           struct comedi_bufinfo __user *arg, void *file)
 {
        struct comedi_bufinfo bi;
        struct comedi_subdevice *s;
@@ -576,6 +577,10 @@ static int do_bufinfo_ioctl(struct comedi_device *dev,
                return -EINVAL;
 
        s = dev->subdevices + bi.subdevice;
+
+       if (s->lock && s->lock != file)
+               return -EACCES;
+
        async = s->async;
 
        if (!async) {
@@ -584,8 +589,17 @@ static int do_bufinfo_ioctl(struct comedi_device *dev,
                bi.buf_read_ptr = 0;
                bi.buf_write_count = 0;
                bi.buf_read_count = 0;
+               bi.bytes_read = 0;
+               bi.bytes_written = 0;
                goto copyback;
        }
+       if (!s->busy) {
+               bi.bytes_read = 0;
+               bi.bytes_written = 0;
+               goto copyback_position;
+       }
+       if (s->busy != file)
+               return -EACCES;
 
        if (bi.bytes_read && (s->subdev_flags & SDF_CMD_READ)) {
                bi.bytes_read = comedi_buf_read_alloc(async, bi.bytes_read);
@@ -604,6 +618,7 @@ static int do_bufinfo_ioctl(struct comedi_device *dev,
                comedi_buf_write_free(async, bi.bytes_written);
        }
 
+copyback_position:
        bi.buf_write_count = async->buf_write_count;
        bi.buf_write_ptr = async->buf_write_ptr;
        bi.buf_read_count = async->buf_read_count;
@@ -1576,6 +1591,19 @@ static ssize_t comedi_write(struct file *file, const char __user *buf,
        while (nbytes > 0 && !retval) {
                set_current_state(TASK_INTERRUPTIBLE);
 
+               if (!(comedi_get_subdevice_runflags(s) & SRF_RUNNING)) {
+                       if (count == 0) {
+                               if (comedi_get_subdevice_runflags(s) &
+                                       SRF_ERROR) {
+                                       retval = -EPIPE;
+                               } else {
+                                       retval = 0;
+                               }
+                               do_become_nonbusy(dev, s);
+                       }
+                       break;
+               }
+
                n = nbytes;
 
                m = n;
@@ -1588,16 +1616,6 @@ static ssize_t comedi_write(struct file *file, const char __user *buf,
                        n = m;
 
                if (n == 0) {
-                       if (!(comedi_get_subdevice_runflags(s) & SRF_RUNNING)) {
-                               if (comedi_get_subdevice_runflags(s) &
-                                   SRF_ERROR) {
-                                       retval = -EPIPE;
-                               } else {
-                                       retval = 0;
-                               }
-                               do_become_nonbusy(dev, s);
-                               break;
-                       }
                        if (file->f_flags & O_NONBLOCK) {
                                retval = -EAGAIN;
                                break;
index 5ccf246e2526c93fd2fe0dcab89f01c81faf7e40..354fb7d29841f400b7eaca46d7e4feaa41c3d8a8 100644 (file)
@@ -12,7 +12,6 @@ obj-$(CONFIG_COMEDI_SERIAL2002)               += serial2002.o
 obj-$(CONFIG_COMEDI_SKEL)              += skel.o
 
 # Comedi ISA drivers
-obj-$(CONFIG_COMEDI_8255)              += 8255.o
 obj-$(CONFIG_COMEDI_ACL7225B)          += acl7225b.o
 obj-$(CONFIG_COMEDI_PCL711)            += pcl711.o
 obj-$(CONFIG_COMEDI_PCL724)            += pcl724.o
@@ -26,7 +25,6 @@ obj-$(CONFIG_COMEDI_PCM3724)          += pcm3724.o
 obj-$(CONFIG_COMEDI_PCM3730)           += pcm3730.o
 obj-$(CONFIG_COMEDI_RTI800)            += rti800.o
 obj-$(CONFIG_COMEDI_RTI802)            += rti802.o
-obj-$(CONFIG_COMEDI_DAS08)             += das08.o
 obj-$(CONFIG_COMEDI_DAS16M1)           += das16m1.o
 obj-$(CONFIG_COMEDI_DAS16)             += das16.o
 obj-$(CONFIG_COMEDI_DAS800)            += das800.o
@@ -135,4 +133,6 @@ obj-$(CONFIG_COMEDI_NI_TIO)         += ni_tio.o
 obj-$(CONFIG_COMEDI_NI_TIO)            += ni_tiocmd.o
 obj-$(CONFIG_COMEDI_NI_LABPC)          += ni_labpc.o
 
+obj-$(CONFIG_COMEDI_8255)              += 8255.o
+obj-$(CONFIG_COMEDI_DAS08)             += das08.o
 obj-$(CONFIG_COMEDI_FC)                        += comedi_fc.o
index 2c986413a81a442db349d018fa4bf300991ace01..b18e81d8cf8a5187fc4bc41afc974b5eb91ccbae 100644 (file)
@@ -68,6 +68,10 @@ You should also find the complete GPL in the COPYING file accompanying this sour
 #include "addi_common.h"
 #include "addi_amcc_s5933.h"
 
+#ifndef ADDIDATA_DRIVER_NAME
+#define ADDIDATA_DRIVER_NAME   "addi_common"
+#endif
+
 /* Update-0.7.57->0.7.68MODULE_AUTHOR("ADDI-DATA GmbH <info@addi-data.com>"); */
 /* Update-0.7.57->0.7.68MODULE_DESCRIPTION("Comedi ADDI-DATA module"); */
 /* Update-0.7.57->0.7.68MODULE_LICENSE("GPL"); */
@@ -2528,7 +2532,7 @@ static const struct addi_board boardtypes[] = {
 #define n_boardtypes (sizeof(boardtypes)/sizeof(struct addi_board))
 
 static struct comedi_driver driver_addi = {
-       .driver_name = "addi_common",
+       .driver_name = ADDIDATA_DRIVER_NAME,
        .module = THIS_MODULE,
        .attach = i_ADDI_Attach,
        .detach = i_ADDI_Detach,
@@ -2570,10 +2574,6 @@ static int i_ADDI_Attach(struct comedi_device *dev, struct comedi_devconfig *it)
        struct pcilst_struct *card = NULL;
        unsigned char pci_bus, pci_slot, pci_func;
        int i_Dma = 0;
-       static char c_Identifier[150];
-
-       sprintf(c_Identifier, "Addi-Data GmbH Comedi %s",
-               this_board->pc_DriverName);
 
        ret = alloc_private(dev, sizeof(struct addi_private));
        if (ret < 0)
@@ -2583,7 +2583,7 @@ static int i_ADDI_Attach(struct comedi_device *dev, struct comedi_devconfig *it)
                v_pci_card_list_init(this_board->i_VendorId, 1);        /* 1 for displaying the list.. */
                pci_list_builded = 1;
        }
-       /* printk("comedi%d: addi_common: board=%s",dev->minor,this_board->pc_DriverName); */
+       /* printk("comedi%d: "ADDIDATA_DRIVER_NAME": board=%s",dev->minor,this_board->pc_DriverName); */
 
        if ((this_board->i_Dma) && (it->options[2] == 0)) {
                i_Dma = 1;
@@ -2648,7 +2648,7 @@ static int i_ADDI_Attach(struct comedi_device *dev, struct comedi_devconfig *it)
 
        if (irq > 0) {
                if (request_irq(irq, v_ADDI_Interrupt, IRQF_SHARED,
-                               c_Identifier, dev) < 0) {
+                               this_board->pc_DriverName, dev) < 0) {
                        printk(", unable to allocate IRQ %u, DISABLING IT",
                                irq);
                        irq = 0;        /* Can't use IRQ */
index da454e854c4cd16e7c02c98271399300e52263dc..6dfcbe803f2dcd18aeec42f93e7ea13861eb7fcd 100644 (file)
@@ -2,4 +2,6 @@
 
 #define ADDIDATA_WATCHDOG 2    /*  Or shold it be something else */
 
+#define ADDIDATA_DRIVER_NAME   "addi_apci_035"
+
 #include "addi-data/addi_common.c"
index fa2056e8aa0ece225245701122c1b3bc73423106..4722ec834f7bfd796b42da0c1a2883c4dc4b5993 100644 (file)
@@ -1,3 +1,5 @@
 #define CONFIG_APCI_1032 1
 
+#define ADDIDATA_DRIVER_NAME   "addi_apci_1032"
+
 #include "addi-data/addi_common.c"
index 7a5cae599ef80650fc5b8050f63a6dc520641e8d..db3dafdcf691728bb46bb4a653ea51eb54be6d4d 100644 (file)
@@ -1,3 +1,5 @@
 #define CONFIG_APCI_1500 1
 
+#define ADDIDATA_DRIVER_NAME   "addi_apci_1500"
+
 #include "addi-data/addi_common.c"
index 8d414844009f6455e23d8af82ccabc2588a0d3db..f591baff6a0b192606dfc810d5574bb401162618 100644 (file)
@@ -1,3 +1,5 @@
 #define CONFIG_APCI_1516 1
 
+#define ADDIDATA_DRIVER_NAME   "addi_apci_1516"
+
 #include "addi-data/addi_common.c"
index 0351cdde102623b628cc2a6111014884d51a80e5..6f5c923ac22604750486fb291f64f8cfffb493a1 100644 (file)
@@ -1,3 +1,5 @@
 #define CONFIG_APCI_1564 1
 
+#define ADDIDATA_DRIVER_NAME   "addi_apci_1564"
+
 #include "addi-data/addi_common.c"
index 5067990412948e676193b221e0fefc8d7faafa92..1d926add9e6d9606e57e70befcfa0188b1d6ccd6 100644 (file)
@@ -1,3 +1,5 @@
 #define CONFIG_APCI_16XX 1
 
+#define ADDIDATA_DRIVER_NAME   "addi_apci_16xx"
+
 #include "addi-data/addi_common.c"
index c433445913dd828bf63eb4499c1e5111c4d6495c..df6ba8ccf56f050b2062f87eca4ff8b27efa6a4f 100644 (file)
@@ -1,3 +1,5 @@
 #define CONFIG_APCI_1710 1
 
+#define ADDIDATA_DRIVER_NAME   "addi_apci_1710"
+
 #include "addi-data/addi_common.c"
index 271c47c8cad3c5bb997ae42e03adf6ec20a5047f..7266e412f0a6373109db9b1835be9276d5d4aff8 100644 (file)
@@ -1,3 +1,5 @@
 #define CONFIG_APCI_2016 1
 
+#define ADDIDATA_DRIVER_NAME   "addi_apci_2016"
+
 #include "addi-data/addi_common.c"
index 5108ea2a392435835b6a9181d7b9d8f136ac6f19..f67da94119e8c5ff1c027d801b07f05eb834b43d 100644 (file)
@@ -1,3 +1,5 @@
 #define CONFIG_APCI_2032 1
 
+#define ADDIDATA_DRIVER_NAME   "addi_apci_2032"
+
 #include "addi-data/addi_common.c"
index e439f835cf4f77a1bae8d8d765c032af72bd5cf2..bc7f7d6535034902dd37d198b6828968c93e833d 100644 (file)
@@ -1,3 +1,5 @@
 #define CONFIG_APCI_2200 1
 
+#define ADDIDATA_DRIVER_NAME   "addi_apci_2200"
+
 #include "addi-data/addi_common.c"
index df97c305828b562cf582fbe62b6df6eefca58a62..d86c4209cb90afd168f36e496b5aad875bcba445 100644 (file)
@@ -1,3 +1,5 @@
 #define CONFIG_APCI_3001 1
 
+#define ADDIDATA_DRIVER_NAME   "addi_apci_3001"
+
 #include "addi-data/addi_common.c"
index 9183125ddde413cbc6d21307caa33a285a5db830..0b22cf10415d3c9a8cc5d8291deb81fbee2902d1 100644 (file)
@@ -1,3 +1,5 @@
 #define CONFIG_APCI_3120 1
 
+#define ADDIDATA_DRIVER_NAME   "addi_apci_3120"
+
 #include "addi-data/addi_common.c"
index f25a70b3290b4784de5c842f14dbd1b055ab55fd..159313997dcf64fb97c2233cb661ea58cf8b2304 100644 (file)
@@ -1,3 +1,5 @@
 #define CONFIG_APCI_3200 1
 
+#define ADDIDATA_DRIVER_NAME   "addi_apci_3200"
+
 #include "addi-data/addi_common.c"
index 1ee4778ad45b38a58de4787e3b003d5ce2452602..733c69abc43a57901d27479105a8d0dfde396eba 100644 (file)
@@ -1,3 +1,5 @@
 #define CONFIG_APCI_3300 1
 
+#define ADDIDATA_DRIVER_NAME   "addi_apci_3300"
+
 #include "addi-data/addi_common.c"
index 1049e20237e8284357048c22befc1a4200b4f9a3..d8a01b154e3585372fdd3fc103cccb25ea32030a 100644 (file)
@@ -1,3 +1,5 @@
 #define CONFIG_APCI_3501 1
 
+#define ADDIDATA_DRIVER_NAME   "addi_apci_3501"
+
 #include "addi-data/addi_common.c"
index fb9deb7083bdf5998dedd160c3ff033c99860909..942bc9e259a8bdf3f8df7546350618455eaa66eb 100644 (file)
@@ -1,3 +1,5 @@
 #define CONFIG_APCI_3XXX 1
 
+#define ADDIDATA_DRIVER_NAME   "addi_apci_3xxx"
+
 #include "addi-data/addi_common.c"
index 40eeecf5347fc73fbe24c12bdd38cf41698bfe14..e424a0c7d34fdfbb4ca8a26fa42f1cc4e5f2b600 100644 (file)
@@ -7,17 +7,17 @@
 */
 /*
 Driver: adv_pci_dio
-Description: Advantech PCI-1730, PCI-1733, PCI-1734, PCI-1736UP,
-             PCI-1750, PCI-1751, PCI-1752, PCI-1753/E, PCI-1754,
-             PCI-1756, PCI-1762
+Description: Advantech PCI-1730, PCI-1733, PCI-1734, PCI-1735U,
+             PCI-1736UP, PCI-1750, PCI-1751, PCI-1752, PCI-1753/E,
+             PCI-1754, PCI-1756, PCI-1762
 Author: Michal Dobes <dobes@tesnet.cz>
 Devices: [Advantech] PCI-1730 (adv_pci_dio), PCI-1733,
-  PCI-1734, PCI-1736UP, PCI-1750,
+  PCI-1734, PCI-1735U, PCI-1736UP, PCI-1750,
   PCI-1751, PCI-1752, PCI-1753,
   PCI-1753+PCI-1753E, PCI-1754, PCI-1756,
   PCI-1760, PCI-1762
 Status: untested
-Updated: Mon, 14 Apr 2008 10:43:08 +0100
+Updated: Tue, 04 May 2010 13:00:00 +0000
 
 This driver supports now only insn interface for DI/DO/DIO.
 
@@ -35,6 +35,7 @@ Configuration options:
 
 #include "comedi_pci.h"
 #include "8255.h"
+#include "8253.h"
 
 #undef PCI_DIO_EXTDEBUG                /* if defined, enable extensive debug logging */
 
@@ -49,7 +50,7 @@ Configuration options:
 
 /* hardware types of the cards */
 enum hw_cards_id {
-       TYPE_PCI1730, TYPE_PCI1733, TYPE_PCI1734, TYPE_PCI1736,
+       TYPE_PCI1730, TYPE_PCI1733, TYPE_PCI1734, TYPE_PCI1735, TYPE_PCI1736,
        TYPE_PCI1750,
        TYPE_PCI1751,
        TYPE_PCI1752,
@@ -67,7 +68,10 @@ enum hw_io_access {
 #define MAX_DI_SUBDEVS 2       /* max number of DI subdevices per card */
 #define MAX_DO_SUBDEVS 2       /* max number of DO subdevices per card */
 #define MAX_DIO_SUBDEVG        2       /* max number of DIO subdevices group per card */
+#define MAX_8254_SUBDEVS   1   /* max number of 8254 counter subdevs per card */
+                               /* (could be more than one 8254 per subdevice) */
 
+#define SIZE_8254         4    /* 8254 IO space length */
 #define SIZE_8255         4    /* 8255 IO space length */
 
 #define PCIDIO_MAINREG    2    /* main I/O region for all Advantech cards? */
@@ -85,6 +89,12 @@ enum hw_io_access {
 #define PCI1734_IDO       0    /* W:   Isolated digital output 0-31 */
 #define PCI173x_BOARDID           4    /* R:   Board I/D switch for 1730/3/4 */
 
+/* Advantech PCI-1735U */
+#define PCI1735_DI        0    /* R:   Digital input  0-31 */
+#define PCI1735_DO        0    /* W:   Digital output 0-31 */
+#define PCI1735_C8254     4    /* R/W: 8254 counter */
+#define PCI1735_BOARDID           8    /* R:   Board I/D switch for 1735U */
+
 /*  Advantech PCI-1736UP */
 #define PCI1736_IDI        0   /* R:   Isolated digital input  0-15 */
 #define PCI1736_IDO        0   /* W:   Isolated digital output 0-15 */
@@ -192,7 +202,8 @@ static int pci_dio_detach(struct comedi_device *dev);
 struct diosubd_data {
        int chans;              /*  num of chans */
        int addr;               /*  PCI address ofset */
-       int regs;               /*  number of registers to read or 8255 subdevices */
+       int regs;               /*  number of registers to read or 8255
+                                   subdevices or 8254 chips */
        unsigned int specflags; /*  addon subdevice flags */
 };
 
@@ -206,6 +217,7 @@ struct dio_boardtype {
        struct diosubd_data sdo[MAX_DO_SUBDEVS];        /*  DO chans */
        struct diosubd_data sdio[MAX_DIO_SUBDEVG];      /*  DIO 8255 chans */
        struct diosubd_data boardid;    /*  card supports board ID switch */
+       struct diosubd_data s8254[MAX_8254_SUBDEVS];    /* 8254 subdevices */
        enum hw_io_access io_access;
 };
 
@@ -214,6 +226,7 @@ static DEFINE_PCI_DEVICE_TABLE(pci_dio_pci_table) = {
        PCI_VENDOR_ID_ADVANTECH, 0x1730, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
        PCI_VENDOR_ID_ADVANTECH, 0x1733, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
        PCI_VENDOR_ID_ADVANTECH, 0x1734, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
+       PCI_VENDOR_ID_ADVANTECH, 0x1735, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
        PCI_VENDOR_ID_ADVANTECH, 0x1736, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
        PCI_VENDOR_ID_ADVANTECH, 0x1750, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
        PCI_VENDOR_ID_ADVANTECH, 0x1751, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
@@ -235,14 +248,15 @@ static const struct dio_boardtype boardtypes[] = {
         {{16, PCI1730_DO, 2, 0}, {16, PCI1730_IDO, 2, 0}},
         {{0, 0, 0, 0}, {0, 0, 0, 0}},
         {4, PCI173x_BOARDID, 1, SDF_INTERNAL},
-        IO_8b,
-        },
+        {{0, 0, 0, 0}},
+        IO_8b},
        {"pci1733", PCI_VENDOR_ID_ADVANTECH, 0x1733, PCIDIO_MAINREG,
         TYPE_PCI1733,
         {{0, 0, 0, 0}, {32, PCI1733_IDI, 4, 0}},
         {{0, 0, 0, 0}, {0, 0, 0, 0}},
         {{0, 0, 0, 0}, {0, 0, 0, 0}},
         {4, PCI173x_BOARDID, 1, SDF_INTERNAL},
+        {{0, 0, 0, 0}},
         IO_8b},
        {"pci1734", PCI_VENDOR_ID_ADVANTECH, 0x1734, PCIDIO_MAINREG,
         TYPE_PCI1734,
@@ -250,6 +264,15 @@ static const struct dio_boardtype boardtypes[] = {
         {{0, 0, 0, 0}, {32, PCI1734_IDO, 4, 0}},
         {{0, 0, 0, 0}, {0, 0, 0, 0}},
         {4, PCI173x_BOARDID, 1, SDF_INTERNAL},
+        {{0, 0, 0, 0}},
+        IO_8b},
+       {"pci1735", PCI_VENDOR_ID_ADVANTECH, 0x1735, PCIDIO_MAINREG,
+        TYPE_PCI1735,
+        {{32, PCI1735_DI, 4, 0}, {0, 0, 0, 0}},
+        {{32, PCI1735_DO, 4, 0}, {0, 0, 0, 0}},
+        {{0, 0, 0, 0}, {0, 0, 0, 0}},
+        { 4, PCI1735_BOARDID, 1, SDF_INTERNAL},
+        {{3, PCI1735_C8254, 1, 0}},
         IO_8b},
        {"pci1736", PCI_VENDOR_ID_ADVANTECH, 0x1736, PCI1736_MAINREG,
         TYPE_PCI1736,
@@ -257,14 +280,15 @@ static const struct dio_boardtype boardtypes[] = {
         {{0, 0, 0, 0}, {16, PCI1736_IDO, 2, 0}},
         {{0, 0, 0, 0}, {0, 0, 0, 0}},
         {4, PCI1736_BOARDID, 1, SDF_INTERNAL},
-        IO_8b,
-        },
+        {{0, 0, 0, 0}},
+        IO_8b},
        {"pci1750", PCI_VENDOR_ID_ADVANTECH, 0x1750, PCIDIO_MAINREG,
         TYPE_PCI1750,
         {{0, 0, 0, 0}, {16, PCI1750_IDI, 2, 0}},
         {{0, 0, 0, 0}, {16, PCI1750_IDO, 2, 0}},
         {{0, 0, 0, 0}, {0, 0, 0, 0}},
         {0, 0, 0, 0},
+        {{0, 0, 0, 0}},
         IO_8b},
        {"pci1751", PCI_VENDOR_ID_ADVANTECH, 0x1751, PCIDIO_MAINREG,
         TYPE_PCI1751,
@@ -272,6 +296,7 @@ static const struct dio_boardtype boardtypes[] = {
         {{0, 0, 0, 0}, {0, 0, 0, 0}},
         {{48, PCI1751_DIO, 2, 0}, {0, 0, 0, 0}},
         {0, 0, 0, 0},
+        {{0, 0, 0, 0}},
         IO_8b},
        {"pci1752", PCI_VENDOR_ID_ADVANTECH, 0x1752, PCIDIO_MAINREG,
         TYPE_PCI1752,
@@ -279,6 +304,7 @@ static const struct dio_boardtype boardtypes[] = {
         {{32, PCI1752_IDO, 2, 0}, {32, PCI1752_IDO2, 2, 0}},
         {{0, 0, 0, 0}, {0, 0, 0, 0}},
         {4, PCI175x_BOARDID, 1, SDF_INTERNAL},
+        {{0, 0, 0, 0}},
         IO_16b},
        {"pci1753", PCI_VENDOR_ID_ADVANTECH, 0x1753, PCIDIO_MAINREG,
         TYPE_PCI1753,
@@ -286,6 +312,7 @@ static const struct dio_boardtype boardtypes[] = {
         {{0, 0, 0, 0}, {0, 0, 0, 0}},
         {{96, PCI1753_DIO, 4, 0}, {0, 0, 0, 0}},
         {0, 0, 0, 0},
+        {{0, 0, 0, 0}},
         IO_8b},
        {"pci1753e", PCI_VENDOR_ID_ADVANTECH, 0x1753, PCIDIO_MAINREG,
         TYPE_PCI1753E,
@@ -293,6 +320,7 @@ static const struct dio_boardtype boardtypes[] = {
         {{0, 0, 0, 0}, {0, 0, 0, 0}},
         {{96, PCI1753_DIO, 4, 0}, {96, PCI1753E_DIO, 4, 0}},
         {0, 0, 0, 0},
+        {{0, 0, 0, 0}},
         IO_8b},
        {"pci1754", PCI_VENDOR_ID_ADVANTECH, 0x1754, PCIDIO_MAINREG,
         TYPE_PCI1754,
@@ -300,6 +328,7 @@ static const struct dio_boardtype boardtypes[] = {
         {{0, 0, 0, 0}, {0, 0, 0, 0}},
         {{0, 0, 0, 0}, {0, 0, 0, 0}},
         {4, PCI175x_BOARDID, 1, SDF_INTERNAL},
+        {{0, 0, 0, 0}},
         IO_16b},
        {"pci1756", PCI_VENDOR_ID_ADVANTECH, 0x1756, PCIDIO_MAINREG,
         TYPE_PCI1756,
@@ -307,6 +336,7 @@ static const struct dio_boardtype boardtypes[] = {
         {{0, 0, 0, 0}, {32, PCI1756_IDO, 2, 0}},
         {{0, 0, 0, 0}, {0, 0, 0, 0}},
         {4, PCI175x_BOARDID, 1, SDF_INTERNAL},
+        {{0, 0, 0, 0}},
         IO_16b},
        {"pci1760", PCI_VENDOR_ID_ADVANTECH, 0x1760, 0,
         TYPE_PCI1760,
@@ -314,6 +344,7 @@ static const struct dio_boardtype boardtypes[] = {
         {{0, 0, 0, 0}, {0, 0, 0, 0}},
         {{0, 0, 0, 0}, {0, 0, 0, 0}},
         {0, 0, 0, 0},
+        {{0, 0, 0, 0}},
         IO_8b},
        {"pci1762", PCI_VENDOR_ID_ADVANTECH, 0x1762, PCIDIO_MAINREG,
         TYPE_PCI1762,
@@ -321,6 +352,7 @@ static const struct dio_boardtype boardtypes[] = {
         {{0, 0, 0, 0}, {16, PCI1762_RO, 1, 0}},
         {{0, 0, 0, 0}, {0, 0, 0, 0}},
         {4, PCI1762_BOARDID, 1, SDF_INTERNAL},
+        {{0, 0, 0, 0}},
         IO_16b}
 };
 
@@ -437,6 +469,83 @@ static int pci_dio_insn_bits_do_w(struct comedi_device *dev,
        return 2;
 }
 
+/*
+==============================================================================
+*/
+static int pci_8254_insn_read(struct comedi_device *dev,
+                             struct comedi_subdevice *s,
+                             struct comedi_insn *insn, unsigned int *data)
+{
+       const struct diosubd_data *d = (const struct diosubd_data *)s->private;
+       unsigned int chan, chip, chipchan;
+       unsigned long flags;
+
+       chan = CR_CHAN(insn->chanspec); /* channel on subdevice */
+       chip = chan / 3;                /* chip on subdevice */
+       chipchan = chan - (3 * chip);   /* channel on chip on subdevice */
+       spin_lock_irqsave(&s->spin_lock, flags);
+       data[0] = i8254_read(dev->iobase + d->addr + (SIZE_8254 * chip),
+                       0, chipchan);
+       spin_unlock_irqrestore(&s->spin_lock, flags);
+       return 1;
+}
+
+/*
+==============================================================================
+*/
+static int pci_8254_insn_write(struct comedi_device *dev,
+                              struct comedi_subdevice *s,
+                              struct comedi_insn *insn, unsigned int *data)
+{
+       const struct diosubd_data *d = (const struct diosubd_data *)s->private;
+       unsigned int chan, chip, chipchan;
+       unsigned long flags;
+
+       chan = CR_CHAN(insn->chanspec); /* channel on subdevice */
+       chip = chan / 3;                /* chip on subdevice */
+       chipchan = chan - (3 * chip);   /* channel on chip on subdevice */
+       spin_lock_irqsave(&s->spin_lock, flags);
+       i8254_write(dev->iobase + d->addr + (SIZE_8254 * chip),
+                       0, chipchan, data[0]);
+       spin_unlock_irqrestore(&s->spin_lock, flags);
+       return 1;
+}
+
+/*
+==============================================================================
+*/
+static int pci_8254_insn_config(struct comedi_device *dev,
+                               struct comedi_subdevice *s,
+                               struct comedi_insn *insn, unsigned int *data)
+{
+       const struct diosubd_data *d = (const struct diosubd_data *)s->private;
+       unsigned int chan, chip, chipchan;
+       unsigned long iobase;
+       int ret = 0;
+       unsigned long flags;
+
+       chan = CR_CHAN(insn->chanspec); /* channel on subdevice */
+       chip = chan / 3;                /* chip on subdevice */
+       chipchan = chan - (3 * chip);   /* channel on chip on subdevice */
+       iobase = dev->iobase + d->addr + (SIZE_8254 * chip);
+       spin_lock_irqsave(&s->spin_lock, flags);
+       switch (data[0]) {
+       case INSN_CONFIG_SET_COUNTER_MODE:
+               ret = i8254_set_mode(iobase, 0, chipchan, data[1]);
+               if (ret < 0)
+                       ret = -EINVAL;
+               break;
+       case INSN_CONFIG_8254_READ_STATUS:
+               data[1] = i8254_status(iobase, 0, chipchan);
+               break;
+       default:
+               ret = -EINVAL;
+               break;
+       }
+       spin_unlock_irqrestore(&s->spin_lock, flags);
+       return ret < 0 ? ret : insn->n;
+}
+
 /*
 ==============================================================================
 */
@@ -708,6 +817,15 @@ static int pci_dio_reset(struct comedi_device *dev)
                outb(0, dev->iobase + PCI1734_IDO + 2);
                outb(0, dev->iobase + PCI1734_IDO + 3);
                break;
+       case TYPE_PCI1735:
+               outb(0, dev->iobase + PCI1735_DO);      /*  clear outputs */
+               outb(0, dev->iobase + PCI1735_DO + 1);
+               outb(0, dev->iobase + PCI1735_DO + 2);
+               outb(0, dev->iobase + PCI1735_DO + 3);
+               i8254_set_mode(dev->iobase + PCI1735_C8254, 0, 0, I8254_MODE0);
+               i8254_set_mode(dev->iobase + PCI1735_C8254, 0, 1, I8254_MODE0);
+               i8254_set_mode(dev->iobase + PCI1735_C8254, 0, 2, I8254_MODE0);
+               break;
 
        case TYPE_PCI1736:
                outb(0, dev->iobase + PCI1736_IDO);
@@ -874,6 +992,26 @@ static int pci_dio_add_do(struct comedi_device *dev, struct comedi_subdevice *s,
        return 0;
 }
 
+/*
+==============================================================================
+*/
+static int pci_dio_add_8254(struct comedi_device *dev,
+                           struct comedi_subdevice * s,
+                           const struct diosubd_data *d, int subdev)
+{
+       s->type = COMEDI_SUBD_COUNTER;
+       s->subdev_flags = SDF_WRITABLE | SDF_READABLE;
+       s->n_chan = d->chans;
+       s->maxdata = 65535;
+       s->len_chanlist = d->chans;
+       s->insn_read = pci_8254_insn_read;
+       s->insn_write = pci_8254_insn_write;
+       s->insn_config = pci_8254_insn_config;
+       s->private = (void *)d;
+
+       return 0;
+}
+
 /*
 ==============================================================================
 */
@@ -979,6 +1117,9 @@ static int pci_dio_attach(struct comedi_device *dev,
                        n_subdevices += this_board->sdio[i].regs;
                if (this_board->boardid.chans)
                        n_subdevices++;
+               for (i = 0; i < MAX_8254_SUBDEVS; i++)
+                       if (this_board->s8254[i].chans)
+                               n_subdevices++;
        }
 
        ret = alloc_subdevices(dev, n_subdevices);
@@ -1022,6 +1163,13 @@ static int pci_dio_attach(struct comedi_device *dev,
                subdev++;
        }
 
+       for (i = 0; i < MAX_8254_SUBDEVS; i++)
+               if (this_board->s8254[i].chans) {
+                       s = dev->subdevices + subdev;
+                       pci_dio_add_8254(dev, s, &this_board->s8254[i], subdev);
+                       subdev++;
+               }
+
        if (this_board->cardtype == TYPE_PCI1760)
                pci1760_attach(dev, it);
 
@@ -1067,6 +1215,16 @@ static int pci_dio_detach(struct comedi_device *dev)
                        }
                }
 
+               if (this_board->boardid.chans) {
+                       subdev++;
+               }
+
+               for (i = 0; i < MAX_8254_SUBDEVS; i++) {
+                       if (this_board->s8254[i].chans) {
+                               subdev++;
+                       }
+               }
+
                for (i = 0; i < dev->n_subdevices; i++) {
                        s = dev->subdevices + i;
                        s->private = NULL;
index 8eb67651486aadec3839caa960e14b027dbc55c2..bf27617aa62d426e15cdb93b7436613633ff138e 100644 (file)
@@ -460,6 +460,7 @@ struct dio200_subdev_8254 {
        int has_clk_gat_sce;
        unsigned clock_src[3];  /* Current clock sources */
        unsigned gate_src[3];   /* Current gate sources */
+       spinlock_t spinlock;
 };
 
 struct dio200_subdev_intr {
@@ -1042,8 +1043,11 @@ dio200_subdev_8254_read(struct comedi_device *dev, struct comedi_subdevice *s,
 {
        struct dio200_subdev_8254 *subpriv = s->private;
        int chan = CR_CHAN(insn->chanspec);
+       unsigned long flags;
 
+       spin_lock_irqsave(&subpriv->spinlock, flags);
        data[0] = i8254_read(subpriv->iobase, 0, chan);
+       spin_unlock_irqrestore(&subpriv->spinlock, flags);
 
        return 1;
 }
@@ -1057,8 +1061,11 @@ dio200_subdev_8254_write(struct comedi_device *dev, struct comedi_subdevice *s,
 {
        struct dio200_subdev_8254 *subpriv = s->private;
        int chan = CR_CHAN(insn->chanspec);
+       unsigned long flags;
 
+       spin_lock_irqsave(&subpriv->spinlock, flags);
        i8254_write(subpriv->iobase, 0, chan, data[0]);
+       spin_unlock_irqrestore(&subpriv->spinlock, flags);
 
        return 1;
 }
@@ -1151,14 +1158,16 @@ dio200_subdev_8254_config(struct comedi_device *dev, struct comedi_subdevice *s,
                          struct comedi_insn *insn, unsigned int *data)
 {
        struct dio200_subdev_8254 *subpriv = s->private;
-       int ret;
+       int ret = 0;
        int chan = CR_CHAN(insn->chanspec);
+       unsigned long flags;
 
+       spin_lock_irqsave(&subpriv->spinlock, flags);
        switch (data[0]) {
        case INSN_CONFIG_SET_COUNTER_MODE:
                ret = i8254_set_mode(subpriv->iobase, 0, chan, data[1]);
                if (ret < 0)
-                       return -EINVAL;
+                       ret = -EINVAL;
                break;
        case INSN_CONFIG_8254_READ_STATUS:
                data[1] = i8254_status(subpriv->iobase, 0, chan);
@@ -1166,30 +1175,35 @@ dio200_subdev_8254_config(struct comedi_device *dev, struct comedi_subdevice *s,
        case INSN_CONFIG_SET_GATE_SRC:
                ret = dio200_set_gate_src(subpriv, chan, data[2]);
                if (ret < 0)
-                       return -EINVAL;
+                       ret = -EINVAL;
                break;
        case INSN_CONFIG_GET_GATE_SRC:
                ret = dio200_get_gate_src(subpriv, chan);
-               if (ret < 0)
-                       return -EINVAL;
+               if (ret < 0) {
+                       ret = -EINVAL;
+                       break;
+               }
                data[2] = ret;
                break;
        case INSN_CONFIG_SET_CLOCK_SRC:
                ret = dio200_set_clock_src(subpriv, chan, data[1]);
                if (ret < 0)
-                       return -EINVAL;
+                       ret = -EINVAL;
                break;
        case INSN_CONFIG_GET_CLOCK_SRC:
                ret = dio200_get_clock_src(subpriv, chan, &data[2]);
-               if (ret < 0)
-                       return -EINVAL;
+               if (ret < 0) {
+                       ret = -EINVAL;
+                       break;
+               }
                data[1] = ret;
                break;
        default:
-               return -EINVAL;
+               ret = -EINVAL;
                break;
        }
-       return insn->n;
+       spin_unlock_irqrestore(&subpriv->spinlock, flags);
+       return ret < 0 ? ret : insn->n;
 }
 
 /*
@@ -1222,6 +1236,7 @@ dio200_subdev_8254_init(struct comedi_device *dev, struct comedi_subdevice *s,
        s->insn_write = dio200_subdev_8254_write;
        s->insn_config = dio200_subdev_8254_config;
 
+       spin_lock_init(&subpriv->spinlock);
        subpriv->iobase = offset + iobase;
        subpriv->has_clk_gat_sce = has_clk_gat_sce;
        if (has_clk_gat_sce) {
index cedb02d40f9515683e852adebaebd26660134e45..3a46f0c0bff905e7df83c80e8a794d67a7a24f53 100644 (file)
@@ -123,7 +123,7 @@ static const struct ni_board_struct ni_boards[] = {
         .adbits = 12,
         .ai_fifo_depth = 1024,
         .alwaysdither = 0,
-        .gainlkup = ai_gain_16,
+        .gainlkup = ai_gain_4,
         .ai_speed = 5000,
         .n_aochan = 2,
         .aobits = 12,
index 86f035d00675067b8d020cbc90ad4b2ca97eaaf5..27b4cb2e2ec2924928b44089c92dc61ee9bab87a 100644 (file)
@@ -351,8 +351,7 @@ static int usbdux_ai_stop(struct usbduxsub *this_usbduxsub, int do_unlink)
        int ret = 0;
 
        if (!this_usbduxsub) {
-               dev_err(&this_usbduxsub->interface->dev,
-                       "comedi?: usbdux_ai_stop: this_usbduxsub=NULL!\n");
+               pr_err("comedi?: usbdux_ai_stop: this_usbduxsub=NULL!\n");
                return -EFAULT;
        }
        dev_dbg(&this_usbduxsub->interface->dev, "comedi: usbdux_ai_stop\n");
index bd5adbc2a238fbeb2f1b4fa56e9709f651fbcf02..d33947b0378f0a809533f3133d125213c588e43e 100644 (file)
@@ -176,9 +176,7 @@ int allocator_free_dma(unsigned long address)
        prev = ptr; ptr = ptr->next;
 
        if (!ptr) {
-               printk(KERN_ERR ALL_MSG
-                       "free_dma(0x%08lx) but add. not allocated\n",
-                       ptr->address);
+               pr_err(ALL_MSG "free_dma but add. not allocated\n");
                return -EINVAL;
        }
        PDEBUGG("freeing: %08lx (%li) next %08lx\n", ptr->address, ptr->size,
index a4555e6f133f0f4cca98924a6085aa8b7f0b6ad0..014f6684faba94f8ba6c28fcd606a131050bfdde 100644 (file)
@@ -62,9 +62,8 @@ inline int find_type_by_name(const char *name, const char *type)
                                        1) != 0) {
                                filename = malloc(strlen(iio_dir)
                                                + strlen(type)
-                                               + 1
                                                + numstrlen
-                                               + 1);
+                                               + 6);
                                if (filename == NULL)
                                        return -ENOMEM;
                                sprintf(filename, "%s%s%d/name",
index 1f14cd4770e7103515d157e3029f44b516e66276..294272d0619fd0567143392d41bb6dae1babfe30 100644 (file)
@@ -20,7 +20,7 @@ static inline int __iio_allocate_sw_ring_buffer(struct iio_sw_ring_buffer *ring,
        if ((length == 0) || (bytes_per_datum == 0))
                return -EINVAL;
        __iio_update_ring_buffer(&ring->buf, bytes_per_datum, length);
-       ring->data = kmalloc(length*ring->buf.bpd, GFP_KERNEL);
+       ring->data = kmalloc(length*ring->buf.bpd, GFP_ATOMIC);
        ring->read_p = NULL;
        ring->write_p = NULL;
        ring->last_written_p = NULL;
diff --git a/drivers/staging/mrst-touchscreen/Kconfig b/drivers/staging/mrst-touchscreen/Kconfig
new file mode 100644 (file)
index 0000000..c2af492
--- /dev/null
@@ -0,0 +1,7 @@
+config TOUCHSCREEN_INTEL_MID
+       tristate "Intel MID platform resistive touchscreen"
+       depends on INTEL_SCU_IPC
+       default y
+       help
+         Say Y here if you have a Intel MID based touchscreen
+         If unsure, say N.
diff --git a/drivers/staging/mrst-touchscreen/Makefile b/drivers/staging/mrst-touchscreen/Makefile
new file mode 100644 (file)
index 0000000..2d638b0
--- /dev/null
@@ -0,0 +1,3 @@
+obj-$(CONFIG_TOUCHSCREEN_INTEL_MID) := intel_mid_touch.o
+
+
diff --git a/drivers/staging/mrst-touchscreen/TODO b/drivers/staging/mrst-touchscreen/TODO
new file mode 100644 (file)
index 0000000..7157028
--- /dev/null
@@ -0,0 +1,2 @@
+- Move the driver to not think it is SPI (requires fixing some of the SFI
+  and firmware side)
diff --git a/drivers/staging/mrst-touchscreen/intel-mid-touch.c b/drivers/staging/mrst-touchscreen/intel-mid-touch.c
new file mode 100644 (file)
index 0000000..1db0097
--- /dev/null
@@ -0,0 +1,864 @@
+/*
+ * intel_mid_touch.c - Intel MID Resistive Touch Screen Driver
+ *
+ * Copyright (C) 2008 Intel Corp
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.        See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; ifnot, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ *
+ * Questions/Comments/Bug fixes to Sreedhara (sreedhara.ds@intel.com)
+ *                         Ramesh Agarwal (ramesh.agarwal@intel.com)
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ *
+ * TODO:
+ *     kill off mrstouch_debug eventually
+ *     review conversion of r/m/w sequences
+ *     Replace interrupt mutex abuse
+ *     Kill of mrstouchdevp pointer
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/input.h>
+#include <linux/interrupt.h>
+#include <linux/err.h>
+#include <linux/param.h>
+#include <linux/spi/spi.h>
+#include <linux/irq.h>
+#include <linux/delay.h>
+#include <linux/kthread.h>
+#include <asm/intel_scu_ipc.h>
+
+
+#if defined(MRSTOUCH_DEBUG)
+#define mrstouch_debug(fmt, args...)\
+       do { \
+               printk(KERN_DEBUG "\n[MRSTOUCH(%d)] - ", __LINE__); \
+               printk(KERN_DEBUG fmt, ##args); \
+       } while (0);
+#else
+#define mrstouch_debug(fmt, args...)
+#endif
+
+/* PMIC Interrupt registers */
+#define PMIC_REG_ID1   0x00 /*PMIC ID1 register */
+
+/* PMIC Interrupt registers */
+#define PMIC_REG_INT   0x04 /*PMIC interrupt register */
+#define PMIC_REG_MINT  0x05 /*PMIC interrupt mask register */
+
+/* ADC Interrupt registers */
+#define PMIC_REG_ADCINT   0x5F /*ADC interrupt register */
+#define PMIC_REG_MADCINT  0x60 /*ADC interrupt mask register */
+
+/* ADC Control registers */
+#define PMIC_REG_ADCCNTL1    0x61 /*ADC control register */
+
+/* ADC Channel Selection registers */
+#define PMICADDR0     0xA4
+#define END_OF_CHANNEL 0x1F
+
+/* ADC Result register */
+#define PMIC_REG_ADCSNS0H   0x64
+
+/* ADC channels for touch screen */
+#define MRST_TS_CHAN10   0xA /* Touch screen X+ connection */
+#define MRST_TS_CHAN11   0xB /* Touch screen X- connection */
+#define MRST_TS_CHAN12   0xC /* Touch screen Y+ connection */
+#define MRST_TS_CHAN13   0xD /* Touch screen Y- connection */
+
+/* Touch screen coordinate constants */
+#define TOUCH_PRESSURE         50
+#define TOUCH_PRESSURE_FS      100
+
+#define XMOVE_LIMIT    5
+#define YMOVE_LIMIT    5
+#define XYMOVE_CNT     3
+
+#define MAX_10BIT      ((1<<10)-1)
+
+/* Touch screen channel BIAS constants */
+#define XBIAS          0x20
+#define YBIAS          0x40
+#define ZBIAS          0x80
+
+/* Touch screen coordinates */
+#define MIN_X          10
+#define MAX_X          1024
+#define MIN_Y          10
+#define MAX_Y          1024
+#define WAIT_ADC_COMPLETION 10
+
+/* PMIC ADC round robin delays */
+#define ADC_LOOP_DELAY0 0x0 /* Continuous loop */
+#define ADC_LOOP_DELAY1 0x1 /* 4.5  ms approximate */
+
+/* PMIC Vendor Identifiers */
+#define PMIC_VENDOR_FS  0 /* PMIC vendor FreeScale */
+#define PMIC_VENDOR_MAXIM 1 /* PMIC vendor MAXIM */
+#define PMIC_VENDOR_NEC 2 /* PMIC vendor NEC */
+#define MRSTOUCH_MAX_CHANNELS 32 /* Maximum ADC channels */
+
+/* Touch screen device structure */
+struct mrstouch_dev {
+       struct spi_device *spi; /* SPI device associated with touch screen */
+       struct input_dev *input; /* input device for touchscreen*/
+       char            phys[32]; /* Device name */
+       struct task_struct *pendet_thrd; /* PENDET interrupt handler */
+       struct mutex lock; /* Sync between interrupt and PENDET handler */
+       bool            busy; /* Busy flag */
+       u16             asr; /* Address selection register */
+       int             irq;    /* Touch screen IRQ # */
+       uint            vendor;  /* PMIC vendor */
+       uint            rev;  /* PMIC revision */
+       bool            suspended; /* Device suspended status */
+       bool            disabled;  /* Device disabled status */
+       u16             x;  /* X coordinate */
+       u16             y;  /* Y coordinate */
+       bool            pendown;  /* PEN position */
+} ;
+
+
+/* Global Pointer to Touch screen device */
+static struct mrstouch_dev *mrstouchdevp;
+
+/* Utility to read PMIC ID */
+static int mrstouch_pmic_id(uint *vendor, uint *rev)
+{
+       int err;
+       u8 r;
+
+       err = intel_scu_ipc_ioread8(PMIC_REG_ID1, &r);
+       if (err)
+               return err;
+
+       *vendor = r & 0x7;
+       *rev = (r >> 3) & 0x7;
+
+       return 0;
+}
+
+/*
+ * Parse ADC channels to find end of the channel configured by other ADC user
+ * NEC and MAXIM requires 4 channels and FreeScale needs 18 channels
+ */
+static int mrstouch_chan_parse(struct mrstouch_dev *tsdev)
+{
+       int err, i, j, found;
+       u32 r32;
+
+       found = -1;
+
+       for (i = 0; i < MRSTOUCH_MAX_CHANNELS; i++) {
+               if (found >= 0)
+                       break;
+
+               err = intel_scu_ipc_ioread32(PMICADDR0, &r32);
+               if (err)
+                       return err;
+
+               for (j = 0; j < 32; j+= 8) {
+                       if (((r32 >> j) & 0xFF) == END_OF_CHANNEL) {
+                               found = i;
+                               break;
+                       }
+               }
+       }
+       if (found < 0)
+               return 0;
+
+       if (tsdev->vendor == PMIC_VENDOR_FS) {
+               if (found && found > (MRSTOUCH_MAX_CHANNELS - 18))
+                       return -ENOSPC;
+       } else {
+               if (found && found > (MRSTOUCH_MAX_CHANNELS - 4))
+                       return -ENOSPC;
+       }
+       return found;
+}
+
+/* Utility to enable/disable pendet.
+ * pendet set to true enables PENDET interrupt
+ * pendet set to false disables PENDET interrupt
+ * Also clears RND mask bit
+*/
+static int pendet_enable(struct mrstouch_dev *tsdev, bool pendet)
+{
+       u16 reg;
+       u8 r;
+       u8 pendet_enabled = 0;
+       int retry = 0;
+       int err;
+
+       err = intel_scu_ipc_ioread16(PMIC_REG_MADCINT, &reg);
+       if (err)
+               return err;
+
+       if (pendet) {
+               reg &= ~0x0005;
+               reg |= 0x2000; /* Enable pendet */
+       } else
+               reg &= 0xDFFF; /* Disable pendet */
+
+       /* Set MADCINT and update ADCCNTL1 (next reg byte) */
+       err = intel_scu_ipc_iowrite16(PMIC_REG_MADCINT, reg);
+       if (!pendet || err)
+               return err;
+
+       /*
+        * Sometimes even after the register write succeeds
+        * the PMIC register value is not updated. Retry few iterations
+        * to enable pendet.
+        */
+
+       err = intel_scu_ipc_ioread8(PMIC_REG_ADCCNTL1, &r);
+       pendet_enabled = (r >> 5) & 0x01;
+
+       retry = 0;
+       while (!err && !pendet_enabled) {
+               retry++;
+               msleep(10);
+               err = intel_scu_ipc_iowrite8(PMIC_REG_ADCCNTL1, reg >> 8);
+               if (err)
+                       break;
+               err = intel_scu_ipc_ioread8(PMIC_REG_ADCCNTL1, &r);
+               if (err == 0)
+                       pendet_enabled = (r >> 5) & 0x01;
+               if (retry >= 10) {
+                       dev_err(&tsdev->spi->dev, "Touch screen disabled.\n");
+                       return -EIO;
+               }
+       }
+       return 0;
+}
+
+/* To read PMIC ADC touch screen result
+ * Reads ADC storage registers for higher 7 and lower 3 bits
+ * converts the two readings to single value and turns off gain bit
+ */
+static int mrstouch_ts_chan_read(u16 offset, u16 chan, u16 *vp, u16 *vm)
+{
+       int err;
+       u16 result;
+       u32 res;
+
+       result = PMIC_REG_ADCSNS0H + offset;
+
+       if (chan == MRST_TS_CHAN12)
+               result += 4;
+
+       err = intel_scu_ipc_ioread32(result, &res);
+       if (err)
+               return err;
+
+       /* Mash the bits up */
+
+       *vp = (res & 0xFF) << 3;        /* Highest 7 bits */
+       *vp |= (res >> 8) & 0x07;       /* Lower 3 bits */
+       *vp &= 0x3FF;
+
+       res >>= 16;
+
+       *vm = (res & 0xFF) << 3;        /* Highest 7 bits */
+       *vm |= (res >> 8) & 0x07;       /* Lower 3 bits */
+       *vm &= 0x3FF;
+
+       return 0;
+}
+
+/* To configure touch screen channels
+ * Writes touch screen channels to ADC address selection registers
+ */
+static int mrstouch_ts_chan_set(uint offset)
+{
+       int count;
+       u16 chan;
+       u16 reg[5];
+       u8 data[5];
+
+       chan = PMICADDR0 + offset;
+       for (count = 0; count <= 3; count++) {
+               reg[count] = chan++;
+               data[count] = MRST_TS_CHAN10 + count;
+       }
+       reg[count] = chan;
+       data[count] = END_OF_CHANNEL;
+
+       return intel_scu_ipc_writev(reg, data, 5);
+}
+
+/* Initialize ADC */
+static int mrstouch_adc_init(struct mrstouch_dev *tsdev)
+{
+       int err, start;
+       u8 ra, rm;
+
+       err = mrstouch_pmic_id(&tsdev->vendor, &tsdev->rev);
+       if (err) {
+               dev_err(&tsdev->spi->dev, "Unable to read PMIC id\n");
+               return err;
+       }
+
+       start = mrstouch_chan_parse(tsdev);
+       if (start < 0) {
+               dev_err(&tsdev->spi->dev, "Unable to parse channels\n");
+               return start;
+       }
+
+       tsdev->asr = start;
+
+       mrstouch_debug("Channel offset(%d): 0x%X\n", tsdev->asr, tsdev->vendor);
+
+       /* ADC power on, start, enable PENDET and set loop delay
+        * ADC loop delay is set to 4.5 ms approximately
+        * Loop delay more than this results in jitter in adc readings
+        * Setting loop delay to 0 (continous loop) in MAXIM stops PENDET
+        * interrupt generation sometimes.
+        */
+
+       if (tsdev->vendor == PMIC_VENDOR_FS) {
+               ra = 0xE0 | ADC_LOOP_DELAY0;
+               rm = 0x5;
+       } else {
+               /* NEC and MAXIm not consistent with loop delay 0 */
+               ra = 0xE0 | ADC_LOOP_DELAY1;
+               rm = 0x0;
+
+               /* configure touch screen channels */
+               err = mrstouch_ts_chan_set(tsdev->asr);
+               if (err)
+                       return err;
+       }
+       err = intel_scu_ipc_update_register(PMIC_REG_ADCCNTL1, ra, 0xE7);
+       if (err == 0)
+               err = intel_scu_ipc_update_register(PMIC_REG_MADCINT, rm, 0x03);
+       return err;
+}
+
+/* Reports x,y coordinates to event subsystem */
+static void mrstouch_report_xy(struct mrstouch_dev *tsdev, u16 x, u16 y, u16 z)
+{
+       int xdiff, ydiff;
+
+       if (tsdev->pendown && z <= TOUCH_PRESSURE) {
+               /* Pen removed, report button release */
+               mrstouch_debug("BTN REL(%d)", z);
+               input_report_key(tsdev->input, BTN_TOUCH, 0);
+               tsdev->pendown = false;
+       }
+
+       xdiff = abs(x - tsdev->x);
+       ydiff = abs(y - tsdev->y);
+
+       /*
+       if x and y values changes for XYMOVE_CNT readings it is considered
+       as stylus is moving. This is required to differentiate between stylus
+       movement and jitter
+       */
+       if (x < MIN_X || x > MAX_X || y < MIN_Y || y > MAX_Y) {
+               /* Spurious values, release button if touched and return */
+               if (tsdev->pendown) {
+                       mrstouch_debug("BTN REL(%d)", z);
+                       input_report_key(tsdev->input, BTN_TOUCH, 0);
+                       tsdev->pendown = false;
+               }
+               return;
+       } else if (xdiff >= XMOVE_LIMIT || ydiff >= YMOVE_LIMIT) {
+               tsdev->x = x;
+               tsdev->y = y;
+
+               input_report_abs(tsdev->input, ABS_X, x);
+               input_report_abs(tsdev->input, ABS_Y, y);
+               input_sync(tsdev->input);
+       }
+
+
+       if (!tsdev->pendown && z > TOUCH_PRESSURE) {
+               /* Pen touched, report button touch */
+               mrstouch_debug("BTN TCH(%d, %d, %d)", x, y, z);
+               input_report_key(tsdev->input, BTN_TOUCH, 1);
+               tsdev->pendown = true;
+       }
+}
+
+
+/* Utility to start ADC, used by freescale handler */
+static int pendet_mask(void)
+{
+       return  intel_scu_ipc_update_register(PMIC_REG_MADCINT, 0x02, 0x02);
+}
+
+/* Utility to stop ADC, used by freescale handler */
+static int pendet_umask(void)
+{
+       return  intel_scu_ipc_update_register(PMIC_REG_MADCINT, 0x00, 0x02);
+}
+
+/* Utility to read ADC, used by freescale handler */
+static int mrstouch_pmic_fs_adc_read(struct mrstouch_dev *tsdev)
+{
+       int err;
+       u16 x, y, z, result;
+       u16 reg[4];
+       u8 data[4];
+
+       result = PMIC_REG_ADCSNS0H + tsdev->asr;
+
+       reg[0] = result + 4;
+       reg[1] = result + 5;
+       reg[2] = result + 16;
+       reg[3] = result + 17;
+
+       err = intel_scu_ipc_readv(reg, data, 4);
+       if (err)
+               goto ipc_error;
+
+       x = data[0] << 3; /* Higher 7 bits */
+       x |= data[1] & 0x7; /* Lower 3 bits */
+       x &= 0x3FF;
+
+       y = data[2] << 3; /* Higher 7 bits */
+       y |= data[3] & 0x7; /* Lower 3 bits */
+       y &= 0x3FF;
+
+       /* Read Z value */
+       reg[0] = result + 28;
+       reg[1] = result + 29;
+
+       err = intel_scu_ipc_readv(reg, data, 4);
+       if (err)
+               goto ipc_error;
+
+       z = data[0] << 3; /* Higher 7 bits */
+       z |= data[1] & 0x7; /* Lower 3 bits */
+       z &= 0x3FF;
+
+#if defined(MRSTOUCH_PRINT_XYZP)
+       mrstouch_debug("X: %d, Y: %d, Z: %d", x, y, z);
+#endif
+
+       if (z >= TOUCH_PRESSURE_FS) {
+               mrstouch_report_xy(tsdev, x, y, TOUCH_PRESSURE - 1); /* Pen Removed */
+               return TOUCH_PRESSURE - 1;
+       } else {
+               mrstouch_report_xy(tsdev, x, y, TOUCH_PRESSURE + 1); /* Pen Touched */
+               return TOUCH_PRESSURE + 1;
+       }
+
+       return 0;
+
+ipc_error:
+       dev_err(&tsdev->spi->dev, "ipc error during fs_adc read\n");
+       return err;
+}
+
+/* To handle free scale pmic pendet interrupt */
+static int pmic0_pendet(void *dev_id)
+{
+       int err, count;
+       u16 chan;
+       unsigned int touched;
+       struct mrstouch_dev *tsdev = (struct mrstouch_dev *)dev_id;
+       u16 reg[5];
+       u8 data[5];
+
+       chan = PMICADDR0 + tsdev->asr;
+
+       /* Set X BIAS */
+       for (count = 0; count <= 3; count++) {
+               reg[count] = chan++;
+               data[count] = 0x2A;
+       }
+       reg[count] =  chan++; /* Dummy */
+       data[count] = 0;
+
+       err = intel_scu_ipc_writev(reg, data, 5);
+       if (err)
+               goto ipc_error;
+
+       msleep(WAIT_ADC_COMPLETION);
+
+       /* Set Y BIAS */
+       for (count = 0; count <= 3; count++) {
+               reg[count] = chan++;
+               data[count] = 0x4A;
+       }
+       reg[count] = chan++; /* Dummy */
+       data[count] = 0;
+
+       err = intel_scu_ipc_writev(reg, data, 5);
+       if (err)
+               goto ipc_error;
+
+       msleep(WAIT_ADC_COMPLETION);
+
+       /* Set Z BIAS */
+       err = intel_scu_ipc_iowrite32(chan + 2, 0x8A8A8A8A);
+       if (err)
+               goto ipc_error;
+
+       msleep(WAIT_ADC_COMPLETION);
+
+       /*Read touch screen channels till pen removed
+        * Freescale reports constant value of z for all points
+        * z is high when screen is not touched and low when touched
+        * Map high z value to not touched and low z value to pen touched
+        */
+       touched = mrstouch_pmic_fs_adc_read(tsdev);
+       while (touched > TOUCH_PRESSURE) {
+               touched = mrstouch_pmic_fs_adc_read(tsdev);
+               msleep(WAIT_ADC_COMPLETION);
+       }
+
+       /* Clear all TS channels */
+       chan = PMICADDR0 + tsdev->asr;
+       for (count = 0; count <= 4; count++) {
+               reg[count] = chan++;
+               data[count] = 0;
+       }
+       err = intel_scu_ipc_writev(reg, data, 5);
+       if (err)
+               goto ipc_error;
+
+       for (count = 0; count <= 4; count++) {
+               reg[count] = chan++;
+               data[count] = 0;
+       }
+       err = intel_scu_ipc_writev(reg, data, 5);
+       if (err)
+               goto ipc_error;
+
+       err = intel_scu_ipc_iowrite32(chan + 2, 0x00000000);
+       if (err)
+               goto ipc_error;
+
+       return 0;
+
+ipc_error:
+       dev_err(&tsdev->spi->dev, "ipc error during pendet\n");
+       return err;
+}
+
+
+/* To enable X, Y and Z bias values
+ * Enables YPYM for X channels and XPXM for Y channels
+ */
+static int mrstouch_ts_bias_set(uint offset, uint bias)
+{
+       int count;
+       u16 chan, start;
+       u16 reg[4];
+       u8 data[4];
+
+       chan = PMICADDR0 + offset;
+       start = MRST_TS_CHAN10;
+
+       for (count = 0; count <= 3; count++) {
+               reg[count] = chan++;
+               data[count] = bias | (start + count);
+       }
+       return intel_scu_ipc_writev(reg, data, 4);
+}
+
+/* To read touch screen channel values */
+static int mrstouch_adc_read(struct mrstouch_dev *tsdev)
+{
+       int err;
+       u16 xp, xm, yp, ym, zp, zm;
+
+       /* configure Y bias for X channels */
+       err = mrstouch_ts_bias_set(tsdev->asr, YBIAS);
+       if (err)
+               goto ipc_error;
+
+       msleep(WAIT_ADC_COMPLETION);
+
+       /* read x+ and x- channels */
+       err = mrstouch_ts_chan_read(tsdev->asr, MRST_TS_CHAN10, &xp, &xm);
+       if (err)
+               goto ipc_error;
+
+       /* configure x bias for y channels */
+       err = mrstouch_ts_bias_set(tsdev->asr, XBIAS);
+       if (err)
+               goto ipc_error;
+
+       msleep(WAIT_ADC_COMPLETION);
+
+       /* read y+ and y- channels */
+       err = mrstouch_ts_chan_read(tsdev->asr, MRST_TS_CHAN12, &yp, &ym);
+       if (err)
+               goto ipc_error;
+
+       /* configure z bias for x and y channels */
+       err = mrstouch_ts_bias_set(tsdev->asr, ZBIAS);
+       if (err)
+               goto ipc_error;
+
+       msleep(WAIT_ADC_COMPLETION);
+
+       /* read z+ and z- channels */
+       err = mrstouch_ts_chan_read(tsdev->asr, MRST_TS_CHAN10, &zp, &zm);
+       if (err)
+               goto ipc_error;
+
+#if defined(MRSTOUCH_PRINT_XYZP)
+       printk(KERN_INFO "X+: %d, Y+: %d, Z+: %d\n", xp, yp, zp);
+#endif
+
+#if defined(MRSTOUCH_PRINT_XYZM)
+       printk(KERN_INFO "X-: %d, Y-: %d, Z-: %d\n", xm, ym, zm);
+#endif
+
+       mrstouch_report_xy(tsdev, xp, yp, zp); /* report x and y to eventX */
+
+       return zp;
+
+ipc_error:
+       dev_err(&tsdev->spi->dev, "ipc error during adc read\n");
+       return err;
+}
+
+/* PENDET interrupt handler function for NEC and MAXIM */
+static void pmic12_pendet(void *data)
+{
+       unsigned int touched;
+       struct mrstouch_dev *tsdev = (struct mrstouch_dev *)data;
+
+       /* read touch screen channels till pen removed */
+       do {
+               touched = mrstouch_adc_read(tsdev);
+       } while (touched > TOUCH_PRESSURE);
+}
+
+/* Handler to process PENDET interrupt */
+int mrstouch_pendet(void *data)
+{
+       struct mrstouch_dev *tsdev = (struct mrstouch_dev *)data;
+       while (1) {
+               /* Wait for PENDET interrupt */
+               if (mutex_lock_interruptible(&tsdev->lock)) {
+                       msleep(WAIT_ADC_COMPLETION);
+                       continue;
+               }
+
+               if (tsdev->busy)
+                       return 0;
+
+               tsdev->busy = true;
+
+               if (tsdev->vendor == PMIC_VENDOR_NEC ||
+                       tsdev->vendor == PMIC_VENDOR_MAXIM) {
+                       /* PENDET must be disabled in NEC before reading ADC */
+                       pendet_enable(tsdev,false); /* Disbale PENDET */
+                       pmic12_pendet(tsdev);
+                       pendet_enable(tsdev, true); /*Enable PENDET */
+               } else if (tsdev->vendor == PMIC_VENDOR_FS) {
+                       pendet_umask(); /* Stop ADC */
+                       pmic0_pendet(tsdev);
+                       pendet_mask(); /* Stop ADC */
+               } else
+               dev_err(&tsdev->spi->dev, "Unsupported touchscreen: %d\n",
+                               tsdev->vendor);
+
+               tsdev->busy = false;
+
+       }
+       return 0;
+}
+
+/* PENDET interrupt handler */
+static irqreturn_t pendet_intr_handler(int irq, void *handle)
+{
+       struct mrstouch_dev *tsdev = (struct mrstouch_dev *)handle;
+
+       mutex_unlock(&tsdev->lock);
+       return IRQ_HANDLED;
+}
+
+/* Intializes input device and registers with input subsystem */
+static int ts_input_dev_init(struct mrstouch_dev *tsdev, struct spi_device *spi)
+{
+       int err = 0;
+
+       mrstouch_debug("%s", __func__);
+
+       tsdev->input = input_allocate_device();
+       if (!tsdev->input) {
+               dev_err(&tsdev->spi->dev, "Unable to allocate input device.\n");
+               return -EINVAL;
+       }
+
+       tsdev->input->name = "mrst_touchscreen";
+       snprintf(tsdev->phys, sizeof(tsdev->phys),
+                       "%s/input0", dev_name(&spi->dev));
+       tsdev->input->phys = tsdev->phys;
+       tsdev->input->dev.parent = &spi->dev;
+
+       tsdev->input->id.vendor = tsdev->vendor;
+       tsdev->input->id.version = tsdev->rev;
+
+       tsdev->input->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
+       tsdev->input->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
+
+       input_set_abs_params(tsdev->input, ABS_X, MIN_X, MIN_Y, 0, 0);
+       input_set_abs_params(tsdev->input, ABS_Y, MIN_X, MIN_Y, 0, 0);
+
+       err = input_register_device(tsdev->input);
+       if (err) {
+               dev_err(&tsdev->spi->dev, "unable to register input device\n");
+               input_free_device(tsdev->input);
+               return err;
+       }
+
+       mrstouch_debug("%s", "mrstouch initialized");
+
+       return 0;
+
+}
+
+/* Probe function for touch screen driver */
+static int __devinit mrstouch_probe(struct spi_device *mrstouch_spi)
+{
+       int err;
+       unsigned int myirq;
+       struct mrstouch_dev *tsdev;
+
+       mrstouch_debug("%s(%p)", __func__, mrstouch_spi);
+
+       mrstouchdevp = NULL;
+       myirq = mrstouch_spi->irq;
+
+       if (!mrstouch_spi->irq) {
+               dev_err(&mrstouch_spi->dev, "no interrupt assigned\n");
+               return -EINVAL;
+       }
+
+       tsdev = kzalloc(sizeof(struct mrstouch_dev), GFP_KERNEL);
+       if (!tsdev) {
+               dev_err(&mrstouch_spi->dev, "unable to allocate memory\n");
+               return -ENOMEM;
+       }
+
+       tsdev->irq = myirq;
+       mrstouchdevp = tsdev;
+
+       err = mrstouch_adc_init(tsdev);
+       if (err) {
+               dev_err(&mrstouch_spi->dev, "ADC init failed\n");
+               goto mrstouch_err_free_mem;
+       }
+
+       dev_set_drvdata(&mrstouch_spi->dev, tsdev);
+       tsdev->spi = mrstouch_spi;
+
+       err = ts_input_dev_init(tsdev, mrstouch_spi);
+       if (err) {
+               dev_err(&tsdev->spi->dev, "ts_input_dev_init failed");
+               goto mrstouch_err_free_mem;
+       }
+
+       mutex_init(&tsdev->lock);
+       mutex_lock(&tsdev->lock)
+
+       mrstouch_debug("Requesting IRQ-%d", myirq);
+       err = request_irq(myirq, pendet_intr_handler,
+                               0, "mrstouch", tsdev);
+       if (err) {
+               dev_err(&tsdev->spi->dev, "unable to allocate irq\n");
+               goto mrstouch_err_free_mem;
+       }
+
+       tsdev->pendet_thrd = kthread_run(mrstouch_pendet,
+                               (void *)tsdev, "pendet handler");
+       if (IS_ERR(tsdev->pendet_thrd)) {
+               dev_err(&tsdev->spi->dev, "kthread_run failed\n");
+               err = PTR_ERR(tsdev->pendet_thrd);
+               goto mrstouch_err_free_mem;
+       }
+       mrstouch_debug("%s", "Driver initialized");
+       return 0;
+
+mrstouch_err_free_mem:
+       kfree(tsdev);
+       return err;
+}
+
+static int mrstouch_suspend(struct spi_device *spi, pm_message_t msg)
+{
+       mrstouch_debug("%s", __func__);
+       mrstouchdevp->suspended = 1;
+       return 0;
+}
+
+static int mrstouch_resume(struct spi_device *spi)
+{
+       mrstouch_debug("%s", __func__);
+       mrstouchdevp->suspended = 0;
+       return 0;
+}
+
+static int mrstouch_remove(struct spi_device *spi)
+{
+       mrstouch_debug("%s", __func__);
+       free_irq(mrstouchdevp->irq, mrstouchdevp);
+       input_unregister_device(mrstouchdevp->input);
+       input_free_device(mrstouchdevp->input);
+       kfree(mrstouchdevp);
+       if (mrstouchdevp->pendet_thrd)
+               kthread_stop(mrstouchdevp->pendet_thrd);
+       return 0;
+}
+
+static struct spi_driver mrstouch_driver = {
+       .driver = {
+               .name   = "pmic_touch",
+               .bus    = &spi_bus_type,
+               .owner  = THIS_MODULE,
+       },
+       .probe          = mrstouch_probe,
+       .suspend        = mrstouch_suspend,
+       .resume         = mrstouch_resume,
+       .remove         = mrstouch_remove,
+};
+
+static int __init mrstouch_module_init(void)
+{
+       int err;
+
+       mrstouch_debug("%s", __func__);
+       err = spi_register_driver(&mrstouch_driver);
+       if (err) {
+               mrstouch_debug("%s(%d)", "SPI PENDET failed", err);
+               return -1;
+       }
+
+       return 0;
+}
+
+static void __exit mrstouch_module_exit(void)
+{
+       mrstouch_debug("%s", __func__);
+       spi_unregister_driver(&mrstouch_driver);
+       return;
+}
+
+module_init(mrstouch_module_init);
+module_exit(mrstouch_module_exit);
+
+MODULE_AUTHOR("Sreedhara Murthy. D.S, sreedhara.ds@intel.com");
+MODULE_DESCRIPTION("Intel Moorestown Resistive Touch Screen Driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/staging/msm/Kconfig b/drivers/staging/msm/Kconfig
new file mode 100644 (file)
index 0000000..c57039f
--- /dev/null
@@ -0,0 +1,134 @@
+config MSM_STAGING
+       tristate "MSM Frame Buffer Support"
+       depends on FB && ARCH_MSM && !FB_MSM
+       select FB_BACKLIGHT if FB_MSM_BACKLIGHT
+       select NEW_LEDS
+       select LEDS_CLASS
+       select FB_CFB_FILLRECT
+       select FB_CFB_COPYAREA
+       select FB_CFB_IMAGEBLIT
+       ---help---
+         Support for MSM Framebuffer.
+
+if MSM_STAGING
+
+config FB_MSM_LCDC_HW
+       bool
+       default n
+
+choice
+       prompt "MDP HW version"
+       default FB_MSM_MDP31
+
+config FB_MSM_MDP31
+       select FB_MSM_LCDC_HW
+       bool "MDP HW ver3.1"
+       ---help---
+         Support for MSM MDP HW revision 3.1
+         Say Y here if this is msm8x50 variant platform.
+endchoice
+
+config FB_MSM_LCDC
+       bool
+       default n
+
+config FB_MSM_TVOUT
+       bool
+       default n
+
+config FB_MSM_LCDC_PANEL
+       bool
+       select FB_MSM_LCDC
+       default n
+
+config FB_MSM_LCDC_PRISM_WVGA
+        bool
+       select FB_MSM_LCDC_PANEL
+       default n
+
+config FB_MSM_LCDC_ST1_WXGA
+       bool
+       select FB_MSM_LCDC_PANEL
+       default n
+
+config FB_MSM_LCDC_ST15_WXGA
+        bool
+        select FB_MSM_LCDC_PANEL
+        default n
+
+config FB_MSM_LCDC_WXGA
+       bool
+       select FB_MSM_LCDC_PANEL
+       default n
+
+choice
+       prompt "LCD Panel"
+       default FB_MSM_LCDC_ST15_PANEL
+
+config FB_MSM_LCDC_PRISM_WVGA_PANEL
+       depends on FB_MSM_LCDC_HW
+       bool "LCDC Prism WVGA Panel"
+       select FB_MSM_LCDC_PRISM_WVGA
+       ---help---
+         Support for LCDC Prism WVGA (800x480) panel
+
+
+config FB_MSM_LCDC_ST15_PANEL
+        depends on FB_MSM_LCDC_HW
+        bool "LCDC ST1.5 Panel"
+        select FB_MSM_LCDC_ST15_WXGA
+        ---help---
+          Support for ST1.5 WXGA (1366x768) panel
+
+config FB_MSM_PANEL_NONE
+       bool "NONE"
+       ---help---
+         This will disable LCD panel
+endchoice
+
+choice
+       prompt "Secondary LCD Panel"
+       depends on  FB_MSM_MDP31
+       default FB_MSM_SECONDARY_PANEL_NONE
+
+config FB_MSM_SECONDARY_PANEL_NONE
+       bool "NONE"
+       ---help---
+         No secondary panel
+endchoice
+
+config FB_MSM_TVOUT_NTSC
+       bool
+       select FB_MSM_TVOUT
+       default n
+
+config FB_MSM_TVOUT_PAL
+       bool
+       select FB_MSM_TVOUT
+       default n
+
+choice
+       depends on  (FB_MSM_MDP22 || FB_MSM_MDP31)
+       prompt "TVOut Region"
+       default FB_MSM_TVOUT_NTSC_M
+
+config FB_MSM_TVOUT_NTSC_M
+       bool "NTSC M"
+       select FB_MSM_TVOUT_NTSC
+       ---help---
+         Support for NTSC M region (North American and Korea)
+
+config FB_MSM_TVOUT_NONE
+       bool "NONE"
+       ---help---
+         This will disable TV Out functionality.
+endchoice
+
+config PMEM_KERNEL_SIZE
+        int "PMEM for kernel components (in MB)"
+        default 2
+        depends on ARCH_QSD8X50
+        help
+          Configures the amount of PMEM for use by kernel components
+          (in MB; minimum 2MB)
+endif
diff --git a/drivers/staging/msm/Makefile b/drivers/staging/msm/Makefile
new file mode 100644 (file)
index 0000000..98a0ce1
--- /dev/null
@@ -0,0 +1,93 @@
+obj-y := msm_fb.o staging-devices.o memory.o
+
+obj-$(CONFIG_FB_MSM_LOGO) += logo.o
+obj-$(CONFIG_FB_BACKLIGHT) += msm_fb_bl.o
+
+# MDP
+obj-y += mdp.o
+
+ifeq ($(CONFIG_FB_MSM_MDP40),y)
+obj-y += mdp4_util.o
+obj-$(CONFIG_DEBUG_FS) += mdp4_debugfs.o
+else
+obj-y += mdp_hw_init.o
+obj-y += mdp_ppp.o
+ifeq ($(CONFIG_FB_MSM_MDP31),y)
+obj-y += mdp_ppp_v31.o
+obj-$(CONFIG_MDP_PPP_ASYNC_OP) += mdp_ppp_dq.o
+else
+obj-y += mdp_ppp_v20.o
+endif
+endif
+
+ifeq ($(CONFIG_FB_MSM_OVERLAY),y)
+obj-y += mdp4_overlay.o
+obj-y += mdp4_overlay_lcdc.o
+obj-y += mdp4_overlay_mddi.o
+else
+obj-y += mdp_dma_lcdc.o
+endif
+
+obj-y += mdp_dma.o
+obj-y += mdp_dma_s.o
+obj-y += mdp_vsync.o
+obj-y += mdp_cursor.o
+obj-y += mdp_dma_tv.o
+
+# EBI2
+obj-$(CONFIG_FB_MSM_EBI2) += ebi2_lcd.o
+
+# LCDC
+obj-$(CONFIG_FB_MSM_LCDC) += lcdc.o
+
+# MDDI
+msm_mddi-objs := mddi.o mddihost.o mddihosti.o
+obj-$(CONFIG_FB_MSM_MDDI) += msm_mddi.o
+
+# External MDDI
+msm_mddi_ext-objs := mddihost_e.o mddi_ext.o
+obj-$(CONFIG_FB_MSM_EXTMDDI) += msm_mddi_ext.o
+
+# TVEnc
+obj-$(CONFIG_FB_MSM_TVOUT) += tvenc.o
+
+# MSM FB Panel
+obj-y += msm_fb_panel.o
+obj-$(CONFIG_FB_MSM_EBI2_TMD_QVGA_EPSON_QCIF) += ebi2_tmd20.o
+obj-$(CONFIG_FB_MSM_EBI2_TMD_QVGA_EPSON_QCIF) += ebi2_l2f.o
+
+ifeq ($(CONFIG_FB_MSM_MDDI_AUTO_DETECT),y)
+obj-y += mddi_prism.o
+obj-y += mddi_toshiba.o
+obj-y += mddi_toshiba_vga.o
+obj-y += mddi_toshiba_wvga_pt.o
+obj-y += mddi_toshiba_wvga.o
+obj-y += mddi_sharp.o
+else
+obj-$(CONFIG_FB_MSM_MDDI_PRISM_WVGA) += mddi_prism.o
+obj-$(CONFIG_FB_MSM_MDDI_TOSHIBA_COMMON) += mddi_toshiba.o
+obj-$(CONFIG_FB_MSM_MDDI_TOSHIBA_COMMON_VGA) += mddi_toshiba_vga.o
+obj-$(CONFIG_FB_MSM_MDDI_TOSHIBA_WVGA_PORTRAIT) += mddi_toshiba_wvga_pt.o
+obj-$(CONFIG_FB_MSM_MDDI_TOSHIBA_WVGA) += mddi_toshiba_wvga.o
+obj-$(CONFIG_FB_MSM_MDDI_SHARP_QVGA_128x128) += mddi_sharp.o
+endif
+
+obj-$(CONFIG_FB_MSM_LCDC_PANEL) += lcdc_panel.o
+obj-$(CONFIG_FB_MSM_LCDC_PRISM_WVGA) += lcdc_prism.o
+obj-$(CONFIG_FB_MSM_LCDC_EXTERNAL_WXGA) += lcdc_external.o
+obj-$(CONFIG_FB_MSM_LCDC_GORDON_VGA) += lcdc_gordon.o
+obj-$(CONFIG_FB_MSM_LCDC_WXGA) += lcdc_wxga.o
+obj-$(CONFIG_FB_MSM_LCDC_TOSHIBA_WVGA_PT) += lcdc_toshiba_wvga_pt.o
+obj-$(CONFIG_FB_MSM_LCDC_SHARP_WVGA_PT) += lcdc_sharp_wvga_pt.o
+obj-$(CONFIG_FB_MSM_LCDC_GRAPEFRUIT_VGA) += lcdc_grapefruit.o
+obj-$(CONFIG_FB_MSM_LCDC_ST1_WXGA) += lcdc_st1_wxga.o
+obj-$(CONFIG_FB_MSM_LCDC_ST15_WXGA) += lcdc_st15.o
+obj-$(CONFIG_FB_MSM_HDMI_SII_EXTERNAL_720P) += hdmi_sii9022.o
+
+obj-$(CONFIG_FB_MSM_TVOUT_NTSC) += tv_ntsc.o
+obj-$(CONFIG_FB_MSM_TVOUT_PAL) += tv_pal.o
+
+obj-$(CONFIG_FB_MSM_EXTMDDI_SVGA) += mddi_ext_lcd.o
+
+clean:
+       rm *.o .*cmd
diff --git a/drivers/staging/msm/TODO b/drivers/staging/msm/TODO
new file mode 100644 (file)
index 0000000..05107a7
--- /dev/null
@@ -0,0 +1,3 @@
+- Merge this code with the existing MSM framebuffer
+- General style clean ups.
+
diff --git a/drivers/staging/msm/ebi2_l2f.c b/drivers/staging/msm/ebi2_l2f.c
new file mode 100644 (file)
index 0000000..eea891d
--- /dev/null
@@ -0,0 +1,569 @@
+/* Copyright (c) 2008-2009, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include "msm_fb.h"
+
+#include <linux/memory.h>
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/time.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include "linux/proc_fs.h"
+
+#include <linux/delay.h>
+
+#include <mach/hardware.h>
+#include <linux/io.h>
+
+#include <asm/system.h>
+#include <asm/mach-types.h>
+
+/* The following are for MSM5100 on Gator
+*/
+#ifdef FEATURE_PM1000
+#include "pm1000.h"
+#endif /* FEATURE_PM1000 */
+/* The following are for MSM6050 on Bambi
+*/
+#ifdef FEATURE_PMIC_LCDKBD_LED_DRIVER
+#include "pm.h"
+#endif /* FEATURE_PMIC_LCDKBD_LED_DRIVER */
+
+#ifdef DISP_DEVICE_18BPP
+#undef DISP_DEVICE_18BPP
+#define DISP_DEVICE_16BPP
+#endif
+
+#define QCIF_WIDTH        176
+#define QCIF_HEIGHT       220
+
+static void *DISP_CMD_PORT;
+static void *DISP_DATA_PORT;
+
+#define DISP_CMD_DISON    0xaf
+#define DISP_CMD_DISOFF   0xae
+#define DISP_CMD_DISNOR   0xa6
+#define DISP_CMD_DISINV   0xa7
+#define DISP_CMD_DISCTL   0xca
+#define DISP_CMD_GCP64    0xcb
+#define DISP_CMD_GCP16    0xcc
+#define DISP_CMD_GSSET    0xcd
+#define DISP_GS_2       0x02
+#define DISP_GS_16      0x01
+#define DISP_GS_64      0x00
+#define DISP_CMD_SLPIN    0x95
+#define DISP_CMD_SLPOUT   0x94
+#define DISP_CMD_SD_PSET  0x75
+#define DISP_CMD_MD_PSET  0x76
+#define DISP_CMD_SD_CSET  0x15
+#define DISP_CMD_MD_CSET  0x16
+#define DISP_CMD_DATCTL   0xbc
+#define DISP_DATCTL_666 0x08
+#define DISP_DATCTL_565 0x28
+#define DISP_DATCTL_444 0x38
+#define DISP_CMD_RAMWR    0x5c
+#define DISP_CMD_RAMRD    0x5d
+#define DISP_CMD_PTLIN    0xa8
+#define DISP_CMD_PTLOUT   0xa9
+#define DISP_CMD_ASCSET   0xaa
+#define DISP_CMD_SCSTART  0xab
+#define DISP_CMD_VOLCTL   0xc6
+#define DISP_VOLCTL_TONE 0x80
+#define DISP_CMD_NOp      0x25
+#define DISP_CMD_OSSEL    0xd0
+#define DISP_CMD_3500KSET 0xd1
+#define DISP_CMD_3500KEND 0xd2
+#define DISP_CMD_14MSET   0xd3
+#define DISP_CMD_14MEND   0xd4
+
+#define DISP_CMD_OUT(cmd) outpw(DISP_CMD_PORT, cmd);
+
+#define DISP_DATA_OUT(data) outpw(DISP_DATA_PORT, data);
+
+#define DISP_DATA_IN() inpw(DISP_DATA_PORT);
+
+/* Epson device column number starts at 2
+*/
+#define DISP_SET_RECT(ulhc_row, lrhc_row, ulhc_col, lrhc_col) \
+         DISP_CMD_OUT(DISP_CMD_SD_PSET) \
+         DISP_DATA_OUT((ulhc_row) & 0xFF) \
+         DISP_DATA_OUT((ulhc_row) >> 8) \
+         DISP_DATA_OUT((lrhc_row) & 0xFF) \
+         DISP_DATA_OUT((lrhc_row) >> 8) \
+         DISP_CMD_OUT(DISP_CMD_SD_CSET) \
+         DISP_DATA_OUT(((ulhc_col)+2) & 0xFF) \
+         DISP_DATA_OUT(((ulhc_col)+2) >> 8) \
+         DISP_DATA_OUT(((lrhc_col)+2) & 0xFF) \
+         DISP_DATA_OUT(((lrhc_col)+2) >> 8)
+
+#define DISP_MIN_CONTRAST      0
+#define DISP_MAX_CONTRAST      127
+#define DISP_DEFAULT_CONTRAST  80
+
+#define DISP_MIN_BACKLIGHT     0
+#define DISP_MAX_BACKLIGHT     15
+#define DISP_DEFAULT_BACKLIGHT 2
+
+#define WAIT_SEC(sec) mdelay((sec)/1000)
+
+static word disp_area_start_row;
+static word disp_area_end_row;
+static byte disp_contrast = DISP_DEFAULT_CONTRAST;
+static boolean disp_powered_up;
+static boolean disp_initialized = FALSE;
+/* For some reason the contrast set at init time is not good. Need to do
+ * it again
+ */
+static boolean display_on = FALSE;
+static void epsonQcif_disp_init(struct platform_device *pdev);
+static void epsonQcif_disp_set_contrast(word contrast);
+static void epsonQcif_disp_set_display_area(word start_row, word end_row);
+static int epsonQcif_disp_off(struct platform_device *pdev);
+static int epsonQcif_disp_on(struct platform_device *pdev);
+static void epsonQcif_disp_set_rect(int x, int y, int xres, int yres);
+
+volatile word databack;
+static void epsonQcif_disp_init(struct platform_device *pdev)
+{
+       struct msm_fb_data_type *mfd;
+
+       int i;
+
+       if (disp_initialized)
+               return;
+
+       mfd = platform_get_drvdata(pdev);
+
+       DISP_CMD_PORT = mfd->cmd_port;
+       DISP_DATA_PORT = mfd->data_port;
+
+       /* Sleep in */
+       DISP_CMD_OUT(DISP_CMD_SLPIN);
+
+       /* Display off */
+       DISP_CMD_OUT(DISP_CMD_DISOFF);
+
+       /* Display normal */
+       DISP_CMD_OUT(DISP_CMD_DISNOR);
+
+       /* Set data mode */
+       DISP_CMD_OUT(DISP_CMD_DATCTL);
+       DISP_DATA_OUT(DISP_DATCTL_565);
+
+       /* Set display timing */
+       DISP_CMD_OUT(DISP_CMD_DISCTL);
+       DISP_DATA_OUT(0x1c);    /* p1 */
+       DISP_DATA_OUT(0x02);    /* p1 */
+       DISP_DATA_OUT(0x82);    /* p2 */
+       DISP_DATA_OUT(0x00);    /* p3 */
+       DISP_DATA_OUT(0x00);    /* p4 */
+       DISP_DATA_OUT(0xe0);    /* p5 */
+       DISP_DATA_OUT(0x00);    /* p5 */
+       DISP_DATA_OUT(0xdc);    /* p6 */
+       DISP_DATA_OUT(0x00);    /* p6 */
+       DISP_DATA_OUT(0x02);    /* p7 */
+       DISP_DATA_OUT(0x00);    /* p8 */
+
+       /* Set 64 gray scale level */
+       DISP_CMD_OUT(DISP_CMD_GCP64);
+       DISP_DATA_OUT(0x08);    /* p01 */
+       DISP_DATA_OUT(0x00);
+       DISP_DATA_OUT(0x2a);    /* p02 */
+       DISP_DATA_OUT(0x00);
+       DISP_DATA_OUT(0x4e);    /* p03 */
+       DISP_DATA_OUT(0x00);
+       DISP_DATA_OUT(0x6b);    /* p04 */
+       DISP_DATA_OUT(0x00);
+       DISP_DATA_OUT(0x88);    /* p05 */
+       DISP_DATA_OUT(0x00);
+       DISP_DATA_OUT(0xa3);    /* p06 */
+       DISP_DATA_OUT(0x00);
+       DISP_DATA_OUT(0xba);    /* p07 */
+       DISP_DATA_OUT(0x00);
+       DISP_DATA_OUT(0xd1);    /* p08 */
+       DISP_DATA_OUT(0x00);
+       DISP_DATA_OUT(0xe5);    /* p09 */
+       DISP_DATA_OUT(0x00);
+       DISP_DATA_OUT(0xf3);    /* p10 */
+       DISP_DATA_OUT(0x00);
+       DISP_DATA_OUT(0x03);    /* p11 */
+       DISP_DATA_OUT(0x01);
+       DISP_DATA_OUT(0x13);    /* p12 */
+       DISP_DATA_OUT(0x01);
+       DISP_DATA_OUT(0x22);    /* p13 */
+       DISP_DATA_OUT(0x01);
+       DISP_DATA_OUT(0x2f);    /* p14 */
+       DISP_DATA_OUT(0x01);
+       DISP_DATA_OUT(0x3b);    /* p15 */
+       DISP_DATA_OUT(0x01);
+       DISP_DATA_OUT(0x46);    /* p16 */
+       DISP_DATA_OUT(0x01);
+       DISP_DATA_OUT(0x51);    /* p17 */
+       DISP_DATA_OUT(0x01);
+       DISP_DATA_OUT(0x5b);    /* p18 */
+       DISP_DATA_OUT(0x01);
+       DISP_DATA_OUT(0x64);    /* p19 */
+       DISP_DATA_OUT(0x01);
+       DISP_DATA_OUT(0x6c);    /* p20 */
+       DISP_DATA_OUT(0x01);
+       DISP_DATA_OUT(0x74);    /* p21 */
+       DISP_DATA_OUT(0x01);
+       DISP_DATA_OUT(0x7c);    /* p22 */
+       DISP_DATA_OUT(0x01);
+       DISP_DATA_OUT(0x83);    /* p23 */
+       DISP_DATA_OUT(0x01);
+       DISP_DATA_OUT(0x8a);    /* p24 */
+       DISP_DATA_OUT(0x01);
+       DISP_DATA_OUT(0x91);    /* p25 */
+       DISP_DATA_OUT(0x01);
+       DISP_DATA_OUT(0x98);    /* p26 */
+       DISP_DATA_OUT(0x01);
+       DISP_DATA_OUT(0x9f);    /* p27 */
+       DISP_DATA_OUT(0x01);
+       DISP_DATA_OUT(0xa6);    /* p28 */
+       DISP_DATA_OUT(0x01);
+       DISP_DATA_OUT(0xac);    /* p29 */
+       DISP_DATA_OUT(0x01);
+       DISP_DATA_OUT(0xb2);    /* p30 */
+       DISP_DATA_OUT(0x01);
+       DISP_DATA_OUT(0xb7);    /* p31 */
+       DISP_DATA_OUT(0x01);
+       DISP_DATA_OUT(0xbc);    /* p32 */
+       DISP_DATA_OUT(0x01);
+       DISP_DATA_OUT(0xc1);    /* p33 */
+       DISP_DATA_OUT(0x01);
+       DISP_DATA_OUT(0xc6);    /* p34 */
+       DISP_DATA_OUT(0x01);
+       DISP_DATA_OUT(0xcb);    /* p35 */
+       DISP_DATA_OUT(0x01);
+       DISP_DATA_OUT(0xd0);    /* p36 */
+       DISP_DATA_OUT(0x01);
+       DISP_DATA_OUT(0xd4);    /* p37 */
+       DISP_DATA_OUT(0x01);
+       DISP_DATA_OUT(0xd8);    /* p38 */
+       DISP_DATA_OUT(0x01);
+       DISP_DATA_OUT(0xdc);    /* p39 */
+       DISP_DATA_OUT(0x01);
+       DISP_DATA_OUT(0xe0);    /* p40 */
+       DISP_DATA_OUT(0x01);
+       DISP_DATA_OUT(0xe4);    /* p41 */
+       DISP_DATA_OUT(0x01);
+       DISP_DATA_OUT(0xe8);    /* p42 */
+       DISP_DATA_OUT(0x01);
+       DISP_DATA_OUT(0xec);    /* p43 */
+       DISP_DATA_OUT(0x01);
+       DISP_DATA_OUT(0xf0);    /* p44 */
+       DISP_DATA_OUT(0x01);
+       DISP_DATA_OUT(0xf4);    /* p45 */
+       DISP_DATA_OUT(0x01);
+       DISP_DATA_OUT(0xf8);    /* p46 */
+       DISP_DATA_OUT(0x01);
+       DISP_DATA_OUT(0xfb);    /* p47 */
+       DISP_DATA_OUT(0x01);
+       DISP_DATA_OUT(0xfe);    /* p48 */
+       DISP_DATA_OUT(0x01);
+       DISP_DATA_OUT(0x01);    /* p49 */
+       DISP_DATA_OUT(0x02);
+       DISP_DATA_OUT(0x03);    /* p50 */
+       DISP_DATA_OUT(0x02);
+       DISP_DATA_OUT(0x05);    /* p51 */
+       DISP_DATA_OUT(0x02);
+       DISP_DATA_OUT(0x07);    /* p52 */
+       DISP_DATA_OUT(0x02);
+       DISP_DATA_OUT(0x09);    /* p53 */
+       DISP_DATA_OUT(0x02);
+       DISP_DATA_OUT(0x0b);    /* p54 */
+       DISP_DATA_OUT(0x02);
+       DISP_DATA_OUT(0x0d);    /* p55 */
+       DISP_DATA_OUT(0x02);
+       DISP_DATA_OUT(0x0f);    /* p56 */
+       DISP_DATA_OUT(0x02);
+       DISP_DATA_OUT(0x11);    /* p57 */
+       DISP_DATA_OUT(0x02);
+       DISP_DATA_OUT(0x13);    /* p58 */
+       DISP_DATA_OUT(0x02);
+       DISP_DATA_OUT(0x15);    /* p59 */
+       DISP_DATA_OUT(0x02);
+       DISP_DATA_OUT(0x17);    /* p60 */
+       DISP_DATA_OUT(0x02);
+       DISP_DATA_OUT(0x19);    /* p61 */
+       DISP_DATA_OUT(0x02);
+       DISP_DATA_OUT(0x1b);    /* p62 */
+       DISP_DATA_OUT(0x02);
+       DISP_DATA_OUT(0x1c);    /* p63 */
+       DISP_DATA_OUT(0x02);
+
+       /* Set 16 gray scale level */
+       DISP_CMD_OUT(DISP_CMD_GCP16);
+       DISP_DATA_OUT(0x1a);    /* p01 */
+       DISP_DATA_OUT(0x32);    /* p02 */
+       DISP_DATA_OUT(0x42);    /* p03 */
+       DISP_DATA_OUT(0x4c);    /* p04 */
+       DISP_DATA_OUT(0x58);    /* p05 */
+       DISP_DATA_OUT(0x5f);    /* p06 */
+       DISP_DATA_OUT(0x66);    /* p07 */
+       DISP_DATA_OUT(0x6b);    /* p08 */
+       DISP_DATA_OUT(0x70);    /* p09 */
+       DISP_DATA_OUT(0x74);    /* p10 */
+       DISP_DATA_OUT(0x78);    /* p11 */
+       DISP_DATA_OUT(0x7b);    /* p12 */
+       DISP_DATA_OUT(0x7e);    /* p13 */
+       DISP_DATA_OUT(0x80);    /* p14 */
+       DISP_DATA_OUT(0x82);    /* p15 */
+
+       /* Set DSP column */
+       DISP_CMD_OUT(DISP_CMD_MD_CSET);
+       DISP_DATA_OUT(0xff);
+       DISP_DATA_OUT(0x03);
+       DISP_DATA_OUT(0xff);
+       DISP_DATA_OUT(0x03);
+
+       /* Set DSP page */
+       DISP_CMD_OUT(DISP_CMD_MD_PSET);
+       DISP_DATA_OUT(0xff);
+       DISP_DATA_OUT(0x01);
+       DISP_DATA_OUT(0xff);
+       DISP_DATA_OUT(0x01);
+
+       /* Set ARM column */
+       DISP_CMD_OUT(DISP_CMD_SD_CSET);
+       DISP_DATA_OUT(0x02);
+       DISP_DATA_OUT(0x00);
+       DISP_DATA_OUT((QCIF_WIDTH + 1) & 0xFF);
+       DISP_DATA_OUT((QCIF_WIDTH + 1) >> 8);
+
+       /* Set ARM page */
+       DISP_CMD_OUT(DISP_CMD_SD_PSET);
+       DISP_DATA_OUT(0x00);
+       DISP_DATA_OUT(0x00);
+       DISP_DATA_OUT((QCIF_HEIGHT - 1) & 0xFF);
+       DISP_DATA_OUT((QCIF_HEIGHT - 1) >> 8);
+
+       /* Set 64 gray scales */
+       DISP_CMD_OUT(DISP_CMD_GSSET);
+       DISP_DATA_OUT(DISP_GS_64);
+
+       DISP_CMD_OUT(DISP_CMD_OSSEL);
+       DISP_DATA_OUT(0);
+
+       /* Sleep out */
+       DISP_CMD_OUT(DISP_CMD_SLPOUT);
+
+       WAIT_SEC(40000);
+
+       /* Initialize power IC */
+       DISP_CMD_OUT(DISP_CMD_VOLCTL);
+       DISP_DATA_OUT(DISP_VOLCTL_TONE);
+
+       WAIT_SEC(40000);
+
+       /* Set electronic volume, d'xx */
+       DISP_CMD_OUT(DISP_CMD_VOLCTL);
+       DISP_DATA_OUT(DISP_DEFAULT_CONTRAST);   /* value from 0 to 127 */
+
+       /* Initialize display data */
+       DISP_SET_RECT(0, (QCIF_HEIGHT - 1), 0, (QCIF_WIDTH - 1));
+       DISP_CMD_OUT(DISP_CMD_RAMWR);
+       for (i = 0; i < QCIF_HEIGHT * QCIF_WIDTH; i++)
+               DISP_DATA_OUT(0xffff);
+
+       DISP_CMD_OUT(DISP_CMD_RAMRD);
+       databack = DISP_DATA_IN();
+       databack = DISP_DATA_IN();
+       databack = DISP_DATA_IN();
+       databack = DISP_DATA_IN();
+
+       WAIT_SEC(80000);
+
+       DISP_CMD_OUT(DISP_CMD_DISON);
+
+       disp_area_start_row = 0;
+       disp_area_end_row = QCIF_HEIGHT - 1;
+       disp_powered_up = TRUE;
+       disp_initialized = TRUE;
+       epsonQcif_disp_set_display_area(0, QCIF_HEIGHT - 1);
+       display_on = TRUE;
+}
+
+static void epsonQcif_disp_set_rect(int x, int y, int xres, int yres)
+{
+       if (!disp_initialized)
+               return;
+
+       DISP_SET_RECT(y, y + yres - 1, x, x + xres - 1);
+       DISP_CMD_OUT(DISP_CMD_RAMWR);
+}
+
+static void epsonQcif_disp_set_display_area(word start_row, word end_row)
+{
+       if (!disp_initialized)
+               return;
+
+       if ((start_row == disp_area_start_row)
+           && (end_row == disp_area_end_row))
+               return;
+       disp_area_start_row = start_row;
+       disp_area_end_row = end_row;
+
+       /* Range checking
+        */
+       if (end_row >= QCIF_HEIGHT)
+               end_row = QCIF_HEIGHT - 1;
+       if (start_row > end_row)
+               start_row = end_row;
+
+       /* When display is not the full screen, gray scale is set to
+        ** 2; otherwise it is set to 64.
+        */
+       if ((start_row == 0) && (end_row == (QCIF_HEIGHT - 1))) {
+               /* The whole screen */
+               DISP_CMD_OUT(DISP_CMD_PTLOUT);
+               WAIT_SEC(10000);
+               DISP_CMD_OUT(DISP_CMD_DISOFF);
+               WAIT_SEC(100000);
+               DISP_CMD_OUT(DISP_CMD_GSSET);
+               DISP_DATA_OUT(DISP_GS_64);
+               WAIT_SEC(100000);
+               DISP_CMD_OUT(DISP_CMD_DISON);
+       } else {
+               /* partial screen */
+               DISP_CMD_OUT(DISP_CMD_PTLIN);
+               DISP_DATA_OUT(start_row);
+               DISP_DATA_OUT(start_row >> 8);
+               DISP_DATA_OUT(end_row);
+               DISP_DATA_OUT(end_row >> 8);
+               DISP_CMD_OUT(DISP_CMD_GSSET);
+               DISP_DATA_OUT(DISP_GS_2);
+       }
+}
+
+static int epsonQcif_disp_off(struct platform_device *pdev)
+{
+       if (!disp_initialized)
+               epsonQcif_disp_init(pdev);
+
+       if (display_on) {
+               DISP_CMD_OUT(DISP_CMD_DISOFF);
+               DISP_CMD_OUT(DISP_CMD_SLPIN);
+               display_on = FALSE;
+       }
+
+       return 0;
+}
+
+static int epsonQcif_disp_on(struct platform_device *pdev)
+{
+       if (!disp_initialized)
+               epsonQcif_disp_init(pdev);
+
+       if (!display_on) {
+               DISP_CMD_OUT(DISP_CMD_SLPOUT);
+               WAIT_SEC(40000);
+               DISP_CMD_OUT(DISP_CMD_DISON);
+               epsonQcif_disp_set_contrast(disp_contrast);
+               display_on = TRUE;
+       }
+
+       return 0;
+}
+
+static void epsonQcif_disp_set_contrast(word contrast)
+{
+       if (!disp_initialized)
+               return;
+
+       /* Initialize power IC, d'24 */
+       DISP_CMD_OUT(DISP_CMD_VOLCTL);
+       DISP_DATA_OUT(DISP_VOLCTL_TONE);
+
+       WAIT_SEC(40000);
+
+       /* Set electronic volume, d'xx */
+       DISP_CMD_OUT(DISP_CMD_VOLCTL);
+       if (contrast > 127)
+               contrast = 127;
+       DISP_DATA_OUT(contrast);        /* value from 0 to 127 */
+       disp_contrast = (byte) contrast;
+}                              /* End disp_set_contrast */
+
+static void epsonQcif_disp_clear_screen_area(
+       word start_row, word end_row, word start_column, word end_column) {
+       int32 i;
+
+       /* Clear the display screen */
+       DISP_SET_RECT(start_row, end_row, start_column, end_column);
+       DISP_CMD_OUT(DISP_CMD_RAMWR);
+       i = (end_row - start_row + 1) * (end_column - start_column + 1);
+       for (; i > 0; i--)
+               DISP_DATA_OUT(0xffff);
+}
+
+static int __init epsonQcif_probe(struct platform_device *pdev)
+{
+       msm_fb_add_device(pdev);
+
+       return 0;
+}
+
+static struct platform_driver this_driver = {
+       .probe  = epsonQcif_probe,
+       .driver = {
+               .name   = "ebi2_epson_qcif",
+       },
+};
+
+static struct msm_fb_panel_data epsonQcif_panel_data = {
+       .on = epsonQcif_disp_on,
+       .off = epsonQcif_disp_off,
+       .set_rect = epsonQcif_disp_set_rect,
+};
+
+static struct platform_device this_device = {
+       .name   = "ebi2_epson_qcif",
+       .id     = 0,
+       .dev    = {
+               .platform_data = &epsonQcif_panel_data,
+       }
+};
+
+static int __init epsonQcif_init(void)
+{
+       int ret;
+       struct msm_panel_info *pinfo;
+
+       ret = platform_driver_register(&this_driver);
+       if (!ret) {
+               pinfo = &epsonQcif_panel_data.panel_info;
+               pinfo->xres = QCIF_WIDTH;
+               pinfo->yres = QCIF_HEIGHT;
+               pinfo->type = EBI2_PANEL;
+               pinfo->pdest = DISPLAY_2;
+               pinfo->wait_cycle = 0x808000;
+               pinfo->bpp = 16;
+               pinfo->fb_num = 2;
+               pinfo->lcd.vsync_enable = FALSE;
+
+               ret = platform_device_register(&this_device);
+               if (ret)
+                       platform_driver_unregister(&this_driver);
+       }
+
+       return ret;
+}
+
+module_init(epsonQcif_init);
diff --git a/drivers/staging/msm/ebi2_lcd.c b/drivers/staging/msm/ebi2_lcd.c
new file mode 100644 (file)
index 0000000..b41e123
--- /dev/null
@@ -0,0 +1,250 @@
+/* Copyright (c) 2008-2009, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/delay.h>
+#include <linux/mm.h>
+#include <linux/fb.h>
+#include <linux/init.h>
+#include <linux/ioport.h>
+#include <linux/device.h>
+#include <linux/dma-mapping.h>
+#include <linux/uaccess.h>
+#include <linux/workqueue.h>
+#include <linux/string.h>
+#include <linux/version.h>
+#include <linux/proc_fs.h>
+#include <linux/vmalloc.h>
+#include <linux/debugfs.h>
+
+#include "msm_fb.h"
+
+static int ebi2_lcd_probe(struct platform_device *pdev);
+static int ebi2_lcd_remove(struct platform_device *pdev);
+
+static struct platform_driver ebi2_lcd_driver = {
+       .probe = ebi2_lcd_probe,
+       .remove = ebi2_lcd_remove,
+       .suspend = NULL,
+       .suspend_late = NULL,
+       .resume_early = NULL,
+       .resume = NULL,
+       .shutdown = NULL,
+       .driver = {
+                  .name = "ebi2_lcd",
+                  },
+};
+
+static void *ebi2_base;
+static void *ebi2_lcd_cfg0;
+static void *ebi2_lcd_cfg1;
+static void __iomem *lcd01_base;
+static void __iomem *lcd02_base;
+static int ebi2_lcd_resource_initialized;
+
+static struct platform_device *pdev_list[MSM_FB_MAX_DEV_LIST];
+static int pdev_list_cnt;
+
+static int ebi2_lcd_probe(struct platform_device *pdev)
+{
+       struct msm_fb_data_type *mfd;
+       struct platform_device *mdp_dev = NULL;
+       struct msm_fb_panel_data *pdata = NULL;
+       int rc, i;
+
+       if (pdev->id == 0) {
+               for (i = 0; i < pdev->num_resources; i++) {
+                       if (!strncmp(pdev->resource[i].name, "base", 4)) {
+                               ebi2_base = ioremap(pdev->resource[i].start,
+                                               pdev->resource[i].end -
+                                               pdev->resource[i].start + 1);
+                               if (!ebi2_base) {
+                                       printk(KERN_ERR
+                                               "ebi2_base ioremap failed!\n");
+                                       return -ENOMEM;
+                               }
+                               ebi2_lcd_cfg0 = (void *)(ebi2_base + 0x20);
+                               ebi2_lcd_cfg1 = (void *)(ebi2_base + 0x24);
+                       } else if (!strncmp(pdev->resource[i].name,
+                                               "lcd01", 5)) {
+                               lcd01_base = ioremap(pdev->resource[i].start,
+                                               pdev->resource[i].end -
+                                               pdev->resource[i].start + 1);
+                               if (!lcd01_base) {
+                                       printk(KERN_ERR
+                                               "lcd01_base ioremap failed!\n");
+                                       return -ENOMEM;
+                               }
+                       } else if (!strncmp(pdev->resource[i].name,
+                                               "lcd02", 5)) {
+                               lcd02_base = ioremap(pdev->resource[i].start,
+                                               pdev->resource[i].end -
+                                               pdev->resource[i].start + 1);
+                               if (!lcd02_base) {
+                                       printk(KERN_ERR
+                                               "lcd02_base ioremap failed!\n");
+                                       return -ENOMEM;
+                               }
+                       }
+               }
+               ebi2_lcd_resource_initialized = 1;
+               return 0;
+       }
+
+       if (!ebi2_lcd_resource_initialized)
+               return -EPERM;
+
+       mfd = platform_get_drvdata(pdev);
+
+       if (!mfd)
+               return -ENODEV;
+
+       if (mfd->key != MFD_KEY)
+               return -EINVAL;
+
+       if (pdev_list_cnt >= MSM_FB_MAX_DEV_LIST)
+               return -ENOMEM;
+
+       if (ebi2_base == NULL)
+               return -ENOMEM;
+
+       mdp_dev = platform_device_alloc("mdp", pdev->id);
+       if (!mdp_dev)
+               return -ENOMEM;
+
+       /* link to the latest pdev */
+       mfd->pdev = mdp_dev;
+       mfd->dest = DISPLAY_LCD;
+
+       /* add panel data */
+       if (platform_device_add_data
+           (mdp_dev, pdev->dev.platform_data,
+            sizeof(struct msm_fb_panel_data))) {
+               printk(KERN_ERR "ebi2_lcd_probe: platform_device_add_data failed!\n");
+               platform_device_put(mdp_dev);
+               return -ENOMEM;
+       }
+
+       /* data chain */
+       pdata = mdp_dev->dev.platform_data;
+       pdata->on = panel_next_on;
+       pdata->off = panel_next_off;
+       pdata->next = pdev;
+
+       /* get/set panel specific fb info */
+       mfd->panel_info = pdata->panel_info;
+
+       if (mfd->panel_info.bpp == 24)
+               mfd->fb_imgType = MDP_RGB_888;
+       else
+               mfd->fb_imgType = MDP_RGB_565;
+
+       /* config msm ebi2 lcd register */
+       if (mfd->panel_info.pdest == DISPLAY_1) {
+               outp32(ebi2_base,
+                      (inp32(ebi2_base) & (~(EBI2_PRIM_LCD_CLR))) |
+                      EBI2_PRIM_LCD_SEL);
+               /*
+                * current design has one set of cfg0/1 register to control
+                * both EBI2 channels. so, we're using the PRIM channel to
+                * configure both.
+                */
+               outp32(ebi2_lcd_cfg0, mfd->panel_info.wait_cycle);
+               if (mfd->panel_info.bpp == 18)
+                       outp32(ebi2_lcd_cfg1, 0x01000000);
+               else
+                       outp32(ebi2_lcd_cfg1, 0x0);
+       } else {
+#ifdef DEBUG_EBI2_LCD
+               /*
+                * confliting with QCOM SURF FPGA CS.
+                * OEM should enable below for their CS mapping
+                */
+                outp32(ebi2_base, (inp32(ebi2_base)&(~(EBI2_SECD_LCD_CLR)))
+                                       |EBI2_SECD_LCD_SEL);
+#endif
+       }
+
+       /*
+        * map cs (chip select) address
+        */
+       if (mfd->panel_info.pdest == DISPLAY_1) {
+               mfd->cmd_port = lcd01_base;
+               mfd->data_port =
+                   (void *)((uint32) mfd->cmd_port + EBI2_PRIM_LCD_RS_PIN);
+               mfd->data_port_phys =
+                   (void *)(LCD_PRIM_BASE_PHYS + EBI2_PRIM_LCD_RS_PIN);
+       } else {
+               mfd->cmd_port = lcd01_base;
+               mfd->data_port =
+                   (void *)((uint32) mfd->cmd_port + EBI2_SECD_LCD_RS_PIN);
+               mfd->data_port_phys =
+                   (void *)(LCD_SECD_BASE_PHYS + EBI2_SECD_LCD_RS_PIN);
+       }
+
+       /*
+        * set driver data
+        */
+       platform_set_drvdata(mdp_dev, mfd);
+
+       /*
+        * register in mdp driver
+        */
+       rc = platform_device_add(mdp_dev);
+       if (rc) {
+               goto ebi2_lcd_probe_err;
+       }
+
+       pdev_list[pdev_list_cnt++] = pdev;
+       return 0;
+
+      ebi2_lcd_probe_err:
+       platform_device_put(mdp_dev);
+       return rc;
+}
+
+static int ebi2_lcd_remove(struct platform_device *pdev)
+{
+       struct msm_fb_data_type *mfd;
+
+       mfd = (struct msm_fb_data_type *)platform_get_drvdata(pdev);
+
+       if (!mfd)
+               return 0;
+
+       if (mfd->key != MFD_KEY)
+               return 0;
+
+       iounmap(mfd->cmd_port);
+
+       return 0;
+}
+
+static int ebi2_lcd_register_driver(void)
+{
+       return platform_driver_register(&ebi2_lcd_driver);
+}
+
+static int __init ebi2_lcd_driver_init(void)
+{
+       return ebi2_lcd_register_driver();
+}
+
+module_init(ebi2_lcd_driver_init);
\ No newline at end of file
diff --git a/drivers/staging/msm/ebi2_tmd20.c b/drivers/staging/msm/ebi2_tmd20.c
new file mode 100644 (file)
index 0000000..d66d039
--- /dev/null
@@ -0,0 +1,1122 @@
+/* Copyright (c) 2008-2009, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include "msm_fb.h"
+
+#include <linux/memory.h>
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/time.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include "linux/proc_fs.h"
+
+#include <linux/delay.h>
+
+#include <mach/hardware.h>
+#include <linux/io.h>
+
+#include <asm/system.h>
+#include <asm/mach-types.h>
+
+/* #define TMD20QVGA_LCD_18BPP */
+#define QVGA_WIDTH        240
+#define QVGA_HEIGHT       320
+
+#ifdef TMD20QVGA_LCD_18BPP
+#define DISP_QVGA_18BPP(x)  ((((x)<<2) & 0x3FC00)|(( (x)<<1)& 0x1FE))
+#define DISP_REG(name)  uint32 register_##name;
+#define OUTPORT(x, y)  outpdw(x, y)
+#define INPORT(x)   inpdw(x)
+#else
+#define DISP_QVGA_18BPP(x)  (x)
+#define DISP_REG(name)  uint16 register_##name;
+#define OUTPORT(x, y)  outpw(x, y)
+#define INPORT(x)   intpw(x)
+#endif
+
+static void *DISP_CMD_PORT;
+static void *DISP_DATA_PORT;
+
+#define DISP_RNTI         0x10
+
+#define DISP_CMD_OUT(cmd) OUTPORT(DISP_CMD_PORT, DISP_QVGA_18BPP(cmd))
+#define DISP_DATA_OUT(data) OUTPORT(DISP_DATA_PORT, data)
+#define DISP_DATA_IN() INPORT(DISP_DATA_PORT)
+
+#if (defined(TMD20QVGA_LCD_18BPP))
+#define DISP_DATA_OUT_16TO18BPP(x) \
+       DISP_DATA_OUT((((x)&0xf800)<<2|((x)&0x80000)>>3) \
+                    | (((x)&0x7e0)<<1) \
+                    | (((x)&0x1F)<<1|((x)&0x10)>>4))
+#else
+#define DISP_DATA_OUT_16TO18BPP(x) \
+       DISP_DATA_OUT(x)
+#endif
+
+#define DISP_WRITE_OUT(addr, data) \
+   register_##addr = DISP_QVGA_18BPP(data); \
+   DISP_CMD_OUT(addr); \
+   DISP_DATA_OUT(register_##addr);
+
+#define DISP_UPDATE_VALUE(addr, bitmask, data) \
+   DISP_WRITE_OUT(##addr, (register_##addr & ~(bitmask)) | (data));
+
+#define DISP_VAL_IF(bitvalue, bitmask) \
+   ((bitvalue) ? (bitmask) : 0)
+
+/* QVGA = 256 x 320 */
+/* actual display is 240 x 320...offset by 0x10 */
+#define DISP_ROW_COL_TO_ADDR(row, col) ((row) * 0x100 + col)
+#define DISP_SET_RECT(ulhc_row, lrhc_row, ulhc_col, lrhc_col) \
+   { \
+   DISP_WRITE_OUT(DISP_HORZ_RAM_ADDR_POS_1_ADDR, (ulhc_col) + tmd20qvga_panel_offset); \
+   DISP_WRITE_OUT(DISP_HORZ_RAM_ADDR_POS_2_ADDR, (lrhc_col) + tmd20qvga_panel_offset); \
+   DISP_WRITE_OUT(DISP_VERT_RAM_ADDR_POS_1_ADDR, (ulhc_row)); \
+   DISP_WRITE_OUT(DISP_VERT_RAM_ADDR_POS_2_ADDR, (lrhc_row)); \
+   DISP_WRITE_OUT(DISP_RAM_ADDR_SET_1_ADDR, (ulhc_col) + tmd20qvga_panel_offset); \
+   DISP_WRITE_OUT(DISP_RAM_ADDR_SET_2_ADDR, (ulhc_row)); \
+   }
+
+#define WAIT_MSEC(msec) mdelay(msec)
+
+/*
+ * TMD QVGA Address
+ */
+/* Display Control */
+#define DISP_START_OSCILLATION_ADDR     0x000
+DISP_REG(DISP_START_OSCILLATION_ADDR)
+#define DISP_DRIVER_OUTPUT_CTL_ADDR     0x001
+    DISP_REG(DISP_DRIVER_OUTPUT_CTL_ADDR)
+#define DISP_LCD_DRIVING_SIG_ADDR     0x002
+    DISP_REG(DISP_LCD_DRIVING_SIG_ADDR)
+#define DISP_ENTRY_MODE_ADDR            0x003
+    DISP_REG(DISP_ENTRY_MODE_ADDR)
+#define DISP_DISPLAY_CTL_1_ADDR         0x007
+    DISP_REG(DISP_DISPLAY_CTL_1_ADDR)
+#define DISP_DISPLAY_CTL_2_ADDR         0x008
+    DISP_REG(DISP_DISPLAY_CTL_2_ADDR)
+
+/* DISPLAY MODE 0x009 partial display not supported */
+#define DISP_POWER_SUPPLY_INTF_ADDR     0x00A
+    DISP_REG(DISP_POWER_SUPPLY_INTF_ADDR)
+
+/* DISPLAY MODE 0x00B xZoom feature is not supported */
+#define DISP_EXT_DISPLAY_CTL_1_ADDR     0x00C
+    DISP_REG(DISP_EXT_DISPLAY_CTL_1_ADDR)
+
+#define DISP_FRAME_CYCLE_CTL_ADDR       0x00D
+    DISP_REG(DISP_FRAME_CYCLE_CTL_ADDR)
+
+#define DISP_EXT_DISPLAY_CTL_2_ADDR     0x00E
+    DISP_REG(DISP_EXT_DISPLAY_CTL_2_ADDR)
+
+#define DISP_EXT_DISPLAY_CTL_3_ADDR     0x00F
+    DISP_REG(DISP_EXT_DISPLAY_CTL_3_ADDR)
+
+#define DISP_LTPS_CTL_1_ADDR            0x012
+    DISP_REG(DISP_LTPS_CTL_1_ADDR)
+#define DISP_LTPS_CTL_2_ADDR            0x013
+    DISP_REG(DISP_LTPS_CTL_2_ADDR)
+#define DISP_LTPS_CTL_3_ADDR            0x014
+    DISP_REG(DISP_LTPS_CTL_3_ADDR)
+#define DISP_LTPS_CTL_4_ADDR            0x018
+    DISP_REG(DISP_LTPS_CTL_4_ADDR)
+#define DISP_LTPS_CTL_5_ADDR            0x019
+    DISP_REG(DISP_LTPS_CTL_5_ADDR)
+#define DISP_LTPS_CTL_6_ADDR            0x01A
+    DISP_REG(DISP_LTPS_CTL_6_ADDR)
+#define DISP_AMP_SETTING_ADDR           0x01C
+    DISP_REG(DISP_AMP_SETTING_ADDR)
+#define DISP_MODE_SETTING_ADDR          0x01D
+    DISP_REG(DISP_MODE_SETTING_ADDR)
+#define DISP_POFF_LN_SETTING_ADDR       0x01E
+    DISP_REG(DISP_POFF_LN_SETTING_ADDR)
+/* Power Contol */
+#define DISP_POWER_CTL_1_ADDR           0x100
+    DISP_REG(DISP_POWER_CTL_1_ADDR)
+#define DISP_POWER_CTL_2_ADDR           0x101
+    DISP_REG(DISP_POWER_CTL_2_ADDR)
+#define DISP_POWER_CTL_3_ADDR           0x102
+    DISP_REG(DISP_POWER_CTL_3_ADDR)
+#define DISP_POWER_CTL_4_ADDR           0x103
+    DISP_REG(DISP_POWER_CTL_4_ADDR)
+#define DISP_POWER_CTL_5_ADDR           0x104
+    DISP_REG(DISP_POWER_CTL_5_ADDR)
+#define DISP_POWER_CTL_6_ADDR           0x105
+    DISP_REG(DISP_POWER_CTL_6_ADDR)
+#define DISP_POWER_CTL_7_ADDR           0x106
+    DISP_REG(DISP_POWER_CTL_7_ADDR)
+/* RAM Access */
+#define DISP_RAM_ADDR_SET_1_ADDR        0x200
+    DISP_REG(DISP_RAM_ADDR_SET_1_ADDR)
+#define DISP_RAM_ADDR_SET_2_ADDR        0x201
+    DISP_REG(DISP_RAM_ADDR_SET_2_ADDR)
+#define DISP_CMD_RAMRD                  DISP_CMD_RAMWR
+#define DISP_CMD_RAMWR                  0x202
+    DISP_REG(DISP_CMD_RAMWR)
+#define DISP_RAM_DATA_MASK_1_ADDR       0x203
+    DISP_REG(DISP_RAM_DATA_MASK_1_ADDR)
+#define DISP_RAM_DATA_MASK_2_ADDR       0x204
+    DISP_REG(DISP_RAM_DATA_MASK_2_ADDR)
+/* Gamma Control, Contrast, Gray Scale Setting */
+#define DISP_GAMMA_CONTROL_1_ADDR       0x300
+    DISP_REG(DISP_GAMMA_CONTROL_1_ADDR)
+#define DISP_GAMMA_CONTROL_2_ADDR       0x301
+    DISP_REG(DISP_GAMMA_CONTROL_2_ADDR)
+#define DISP_GAMMA_CONTROL_3_ADDR       0x302
+    DISP_REG(DISP_GAMMA_CONTROL_3_ADDR)
+#define DISP_GAMMA_CONTROL_4_ADDR       0x303
+    DISP_REG(DISP_GAMMA_CONTROL_4_ADDR)
+#define DISP_GAMMA_CONTROL_5_ADDR       0x304
+    DISP_REG(DISP_GAMMA_CONTROL_5_ADDR)
+/* Coordinate Control */
+#define DISP_VERT_SCROLL_CTL_1_ADDR     0x400
+    DISP_REG(DISP_VERT_SCROLL_CTL_1_ADDR)
+#define DISP_VERT_SCROLL_CTL_2_ADDR     0x401
+    DISP_REG(DISP_VERT_SCROLL_CTL_2_ADDR)
+#define DISP_SCREEN_1_DRV_POS_1_ADDR    0x402
+    DISP_REG(DISP_SCREEN_1_DRV_POS_1_ADDR)
+#define DISP_SCREEN_1_DRV_POS_2_ADDR    0x403
+    DISP_REG(DISP_SCREEN_1_DRV_POS_2_ADDR)
+#define DISP_SCREEN_2_DRV_POS_1_ADDR    0x404
+    DISP_REG(DISP_SCREEN_2_DRV_POS_1_ADDR)
+#define DISP_SCREEN_2_DRV_POS_2_ADDR    0x405
+    DISP_REG(DISP_SCREEN_2_DRV_POS_2_ADDR)
+#define DISP_HORZ_RAM_ADDR_POS_1_ADDR   0x406
+    DISP_REG(DISP_HORZ_RAM_ADDR_POS_1_ADDR)
+#define DISP_HORZ_RAM_ADDR_POS_2_ADDR   0x407
+    DISP_REG(DISP_HORZ_RAM_ADDR_POS_2_ADDR)
+#define DISP_VERT_RAM_ADDR_POS_1_ADDR   0x408
+    DISP_REG(DISP_VERT_RAM_ADDR_POS_1_ADDR)
+#define DISP_VERT_RAM_ADDR_POS_2_ADDR   0x409
+    DISP_REG(DISP_VERT_RAM_ADDR_POS_2_ADDR)
+#define DISP_TMD_700_ADDR               0x700  /*  0x700 */
+    DISP_REG(DISP_TMD_700_ADDR)
+#define DISP_TMD_015_ADDR               0x015  /*  0x700 */
+    DISP_REG(DISP_TMD_015_ADDR)
+#define DISP_TMD_305_ADDR               0x305  /*  0x700 */
+    DISP_REG(DISP_TMD_305_ADDR)
+
+/*
+ * TMD QVGA Bit Definations
+ */
+
+#define DISP_BIT_IB15              0x8000
+#define DISP_BIT_IB14              0x4000
+#define DISP_BIT_IB13              0x2000
+#define DISP_BIT_IB12              0x1000
+#define DISP_BIT_IB11              0x0800
+#define DISP_BIT_IB10              0x0400
+#define DISP_BIT_IB09              0x0200
+#define DISP_BIT_IB08              0x0100
+#define DISP_BIT_IB07              0x0080
+#define DISP_BIT_IB06              0x0040
+#define DISP_BIT_IB05              0x0020
+#define DISP_BIT_IB04              0x0010
+#define DISP_BIT_IB03              0x0008
+#define DISP_BIT_IB02              0x0004
+#define DISP_BIT_IB01              0x0002
+#define DISP_BIT_IB00              0x0001
+/*
+ * Display Control
+ * DISP_START_OSCILLATION_ADDR     Start Oscillation
+ * DISP_DRIVER_OUTPUT_CTL_ADDR     Driver Output Control
+ */
+#define DISP_BITMASK_SS            DISP_BIT_IB08
+#define DISP_BITMASK_NL5           DISP_BIT_IB05
+#define DISP_BITMASK_NL4           DISP_BIT_IB04
+#define DISP_BITMASK_NL3           DISP_BIT_IB03
+#define DISP_BITMASK_NL2           DISP_BIT_IB02
+#define DISP_BITMASK_NL1           DISP_BIT_IB01
+#define DISP_BITMASK_NL0           DISP_BIT_IB00
+/* DISP_LCD_DRIVING_SIG_ADDR       LCD Driving Signal Setting */
+#define DISP_BITMASK_BC            DISP_BIT_IB09
+/* DISP_ENTRY_MODE_ADDR            Entry Mode */
+#define DISP_BITMASK_TRI           DISP_BIT_IB15
+#define DISP_BITMASK_DFM1          DISP_BIT_IB14
+#define DISP_BITMASK_DFM0          DISP_BIT_IB13
+#define DISP_BITMASK_BGR           DISP_BIT_IB12
+#define DISP_BITMASK_HWM0          DISP_BIT_IB08
+#define DISP_BITMASK_ID1           DISP_BIT_IB05
+#define DISP_BITMASK_ID0           DISP_BIT_IB04
+#define DISP_BITMASK_AM            DISP_BIT_IB03
+/* DISP_DISPLAY_CTL_1_ADDR         Display Control (1) */
+#define DISP_BITMASK_COL1          DISP_BIT_IB15
+#define DISP_BITMASK_COL0          DISP_BIT_IB14
+#define DISP_BITMASK_VLE2          DISP_BIT_IB10
+#define DISP_BITMASK_VLE1          DISP_BIT_IB09
+#define DISP_BITMASK_SPT           DISP_BIT_IB08
+#define DISP_BITMASK_PT1           DISP_BIT_IB07
+#define DISP_BITMASK_PT0           DISP_BIT_IB06
+#define DISP_BITMASK_REV           DISP_BIT_IB02
+/* DISP_DISPLAY_CTL_2_ADDR         Display Control (2) */
+#define DISP_BITMASK_FP3           DISP_BIT_IB11
+#define DISP_BITMASK_FP2           DISP_BIT_IB10
+#define DISP_BITMASK_FP1           DISP_BIT_IB09
+#define DISP_BITMASK_FP0           DISP_BIT_IB08
+#define DISP_BITMASK_BP3           DISP_BIT_IB03
+#define DISP_BITMASK_BP2           DISP_BIT_IB02
+#define DISP_BITMASK_BP1           DISP_BIT_IB01
+#define DISP_BITMASK_BP0           DISP_BIT_IB00
+/* DISP_POWER_SUPPLY_INTF_ADDR     Power Supply IC Interface Control */
+#define DISP_BITMASK_CSE           DISP_BIT_IB12
+#define DISP_BITMASK_TE            DISP_BIT_IB08
+#define DISP_BITMASK_IX3           DISP_BIT_IB03
+#define DISP_BITMASK_IX2           DISP_BIT_IB02
+#define DISP_BITMASK_IX1           DISP_BIT_IB01
+#define DISP_BITMASK_IX0           DISP_BIT_IB00
+/* DISP_EXT_DISPLAY_CTL_1_ADDR     External Display Interface Control (1) */
+#define DISP_BITMASK_RM            DISP_BIT_IB08
+#define DISP_BITMASK_DM1           DISP_BIT_IB05
+#define DISP_BITMASK_DM0           DISP_BIT_IB04
+#define DISP_BITMASK_RIM1          DISP_BIT_IB01
+#define DISP_BITMASK_RIM0          DISP_BIT_IB00
+/* DISP_FRAME_CYCLE_CTL_ADDR       Frame Frequency Adjustment Control */
+#define DISP_BITMASK_DIVI1         DISP_BIT_IB09
+#define DISP_BITMASK_DIVI0         DISP_BIT_IB08
+#define DISP_BITMASK_RTNI4         DISP_BIT_IB04
+#define DISP_BITMASK_RTNI3         DISP_BIT_IB03
+#define DISP_BITMASK_RTNI2         DISP_BIT_IB02
+#define DISP_BITMASK_RTNI1         DISP_BIT_IB01
+#define DISP_BITMASK_RTNI0         DISP_BIT_IB00
+/* DISP_EXT_DISPLAY_CTL_2_ADDR     External Display Interface Control (2) */
+#define DISP_BITMASK_DIVE1         DISP_BIT_IB09
+#define DISP_BITMASK_DIVE0         DISP_BIT_IB08
+#define DISP_BITMASK_RTNE7         DISP_BIT_IB07
+#define DISP_BITMASK_RTNE6         DISP_BIT_IB06
+#define DISP_BITMASK_RTNE5         DISP_BIT_IB05
+#define DISP_BITMASK_RTNE4         DISP_BIT_IB04
+#define DISP_BITMASK_RTNE3         DISP_BIT_IB03
+#define DISP_BITMASK_RTNE2         DISP_BIT_IB02
+#define DISP_BITMASK_RTNE1         DISP_BIT_IB01
+#define DISP_BITMASK_RTNE0         DISP_BIT_IB00
+/* DISP_EXT_DISPLAY_CTL_3_ADDR     External Display Interface Control (3) */
+#define DISP_BITMASK_VSPL          DISP_BIT_IB04
+#define DISP_BITMASK_HSPL          DISP_BIT_IB03
+#define DISP_BITMASK_VPL           DISP_BIT_IB02
+#define DISP_BITMASK_EPL           DISP_BIT_IB01
+#define DISP_BITMASK_DPL           DISP_BIT_IB00
+/* DISP_LTPS_CTL_1_ADDR            LTPS Interface Control (1) */
+#define DISP_BITMASK_CLWI3         DISP_BIT_IB11
+#define DISP_BITMASK_CLWI2         DISP_BIT_IB10
+#define DISP_BITMASK_CLWI1         DISP_BIT_IB09
+#define DISP_BITMASK_CLWI0         DISP_BIT_IB08
+#define DISP_BITMASK_CLTI1         DISP_BIT_IB01
+#define DISP_BITMASK_CLTI0         DISP_BIT_IB00
+/* DISP_LTPS_CTL_2_ADDR            LTPS Interface Control (2) */
+#define DISP_BITMASK_OEVBI1        DISP_BIT_IB09
+#define DISP_BITMASK_OEVBI0        DISP_BIT_IB08
+#define DISP_BITMASK_OEVFI1        DISP_BIT_IB01
+#define DISP_BITMASK_OEVFI0        DISP_BIT_IB00
+/* DISP_LTPS_CTL_3_ADDR            LTPS Interface Control (3) */
+#define DISP_BITMASK_SHI1          DISP_BIT_IB01
+#define DISP_BITMASK_SHI0          DISP_BIT_IB00
+/* DISP_LTPS_CTL_4_ADDR            LTPS Interface Control (4) */
+#define DISP_BITMASK_CLWE5         DISP_BIT_IB13
+#define DISP_BITMASK_CLWE4         DISP_BIT_IB12
+#define DISP_BITMASK_CLWE3         DISP_BIT_IB11
+#define DISP_BITMASK_CLWE2         DISP_BIT_IB10
+#define DISP_BITMASK_CLWE1         DISP_BIT_IB09
+#define DISP_BITMASK_CLWE0         DISP_BIT_IB08
+#define DISP_BITMASK_CLTE3         DISP_BIT_IB03
+#define DISP_BITMASK_CLTE2         DISP_BIT_IB02
+#define DISP_BITMASK_CLTE1         DISP_BIT_IB01
+#define DISP_BITMASK_CLTE0         DISP_BIT_IB00
+/* DISP_LTPS_CTL_5_ADDR            LTPS Interface Control (5) */
+#define DISP_BITMASK_OEVBE3        DISP_BIT_IB11
+#define DISP_BITMASK_OEVBE2        DISP_BIT_IB10
+#define DISP_BITMASK_OEVBE1        DISP_BIT_IB09
+#define DISP_BITMASK_OEVBE0        DISP_BIT_IB08
+#define DISP_BITMASK_OEVFE3        DISP_BIT_IB03
+#define DISP_BITMASK_OEVFE2        DISP_BIT_IB02
+#define DISP_BITMASK_OEVFE1        DISP_BIT_IB01
+#define DISP_BITMASK_OEVFE0        DISP_BIT_IB00
+/* DISP_LTPS_CTL_6_ADDR            LTPS Interface Control (6) */
+#define DISP_BITMASK_SHE3          DISP_BIT_IB03
+#define DISP_BITMASK_SHE2          DISP_BIT_IB02
+#define DISP_BITMASK_SHE1          DISP_BIT_IB01
+#define DISP_BITMASK_SHE0          DISP_BIT_IB00
+/* DISP_AMP_SETTING_ADDR           Amplify Setting */
+#define DISP_BITMASK_ABSW1         DISP_BIT_IB01
+#define DISP_BITMASK_ABSW0         DISP_BIT_IB00
+/* DISP_MODE_SETTING_ADDR          Mode Setting */
+#define DISP_BITMASK_DSTB          DISP_BIT_IB02
+#define DISP_BITMASK_STB           DISP_BIT_IB00
+/* DISP_POFF_LN_SETTING_ADDR       Power Off Line Setting */
+#define DISP_BITMASK_POFH3         DISP_BIT_IB03
+#define DISP_BITMASK_POFH2         DISP_BIT_IB02
+#define DISP_BITMASK_POFH1         DISP_BIT_IB01
+#define DISP_BITMASK_POFH0         DISP_BIT_IB00
+
+/* Power Contol */
+/* DISP_POWER_CTL_1_ADDR           Power Control (1) */
+#define DISP_BITMASK_PO            DISP_BIT_IB11
+#define DISP_BITMASK_VCD           DISP_BIT_IB09
+#define DISP_BITMASK_VSC           DISP_BIT_IB08
+#define DISP_BITMASK_CON           DISP_BIT_IB07
+#define DISP_BITMASK_ASW1          DISP_BIT_IB06
+#define DISP_BITMASK_ASW0          DISP_BIT_IB05
+#define DISP_BITMASK_OEV           DISP_BIT_IB04
+#define DISP_BITMASK_OEVE          DISP_BIT_IB03
+#define DISP_BITMASK_FR            DISP_BIT_IB02
+#define DISP_BITMASK_D1            DISP_BIT_IB01
+#define DISP_BITMASK_D0            DISP_BIT_IB00
+/* DISP_POWER_CTL_2_ADDR           Power Control (2) */
+#define DISP_BITMASK_DC4           DISP_BIT_IB15
+#define DISP_BITMASK_DC3           DISP_BIT_IB14
+#define DISP_BITMASK_SAP2          DISP_BIT_IB13
+#define DISP_BITMASK_SAP1          DISP_BIT_IB12
+#define DISP_BITMASK_SAP0          DISP_BIT_IB11
+#define DISP_BITMASK_BT2           DISP_BIT_IB10
+#define DISP_BITMASK_BT1           DISP_BIT_IB09
+#define DISP_BITMASK_BT0           DISP_BIT_IB08
+#define DISP_BITMASK_DC2           DISP_BIT_IB07
+#define DISP_BITMASK_DC1           DISP_BIT_IB06
+#define DISP_BITMASK_DC0           DISP_BIT_IB05
+#define DISP_BITMASK_AP2           DISP_BIT_IB04
+#define DISP_BITMASK_AP1           DISP_BIT_IB03
+#define DISP_BITMASK_AP0           DISP_BIT_IB02
+/* DISP_POWER_CTL_3_ADDR           Power Control (3) */
+#define DISP_BITMASK_VGL4          DISP_BIT_IB10
+#define DISP_BITMASK_VGL3          DISP_BIT_IB09
+#define DISP_BITMASK_VGL2          DISP_BIT_IB08
+#define DISP_BITMASK_VGL1          DISP_BIT_IB07
+#define DISP_BITMASK_VGL0          DISP_BIT_IB06
+#define DISP_BITMASK_VGH4          DISP_BIT_IB04
+#define DISP_BITMASK_VGH3          DISP_BIT_IB03
+#define DISP_BITMASK_VGH2          DISP_BIT_IB02
+#define DISP_BITMASK_VGH1          DISP_BIT_IB01
+#define DISP_BITMASK_VGH0          DISP_BIT_IB00
+/* DISP_POWER_CTL_4_ADDR           Power Control (4) */
+#define DISP_BITMASK_VC2           DISP_BIT_IB02
+#define DISP_BITMASK_VC1           DISP_BIT_IB01
+#define DISP_BITMASK_VC0           DISP_BIT_IB00
+/* DISP_POWER_CTL_5_ADDR           Power Control (5) */
+#define DISP_BITMASK_VRL3          DISP_BIT_IB11
+#define DISP_BITMASK_VRL2          DISP_BIT_IB10
+#define DISP_BITMASK_VRL1          DISP_BIT_IB09
+#define DISP_BITMASK_VRL0          DISP_BIT_IB08
+#define DISP_BITMASK_PON           DISP_BIT_IB04
+#define DISP_BITMASK_VRH3          DISP_BIT_IB03
+#define DISP_BITMASK_VRH2          DISP_BIT_IB02
+#define DISP_BITMASK_VRH1          DISP_BIT_IB01
+#define DISP_BITMASK_VRH0          DISP_BIT_IB00
+/* DISP_POWER_CTL_6_ADDR           Power Control (6) */
+#define DISP_BITMASK_VCOMG         DISP_BIT_IB13
+#define DISP_BITMASK_VDV4          DISP_BIT_IB12
+#define DISP_BITMASK_VDV3          DISP_BIT_IB11
+#define DISP_BITMASK_VDV2          DISP_BIT_IB10
+#define DISP_BITMASK_VDV1          DISP_BIT_IB09
+#define DISP_BITMASK_VDV0          DISP_BIT_IB08
+#define DISP_BITMASK_VCM4          DISP_BIT_IB04
+#define DISP_BITMASK_VCM3          DISP_BIT_IB03
+#define DISP_BITMASK_VCM2          DISP_BIT_IB02
+#define DISP_BITMASK_VCM1          DISP_BIT_IB01
+#define DISP_BITMASK_VCM0          DISP_BIT_IB00
+/* RAM Access */
+/* DISP_RAM_ADDR_SET_1_ADDR        RAM Address Set (1) */
+#define DISP_BITMASK_AD7           DISP_BIT_IB07
+#define DISP_BITMASK_AD6           DISP_BIT_IB06
+#define DISP_BITMASK_AD5           DISP_BIT_IB05
+#define DISP_BITMASK_AD4           DISP_BIT_IB04
+#define DISP_BITMASK_AD3           DISP_BIT_IB03
+#define DISP_BITMASK_AD2           DISP_BIT_IB02
+#define DISP_BITMASK_AD1           DISP_BIT_IB01
+#define DISP_BITMASK_AD0           DISP_BIT_IB00
+/* DISP_RAM_ADDR_SET_2_ADDR        RAM Address Set (2) */
+#define DISP_BITMASK_AD16          DISP_BIT_IB08
+#define DISP_BITMASK_AD15          DISP_BIT_IB07
+#define DISP_BITMASK_AD14          DISP_BIT_IB06
+#define DISP_BITMASK_AD13          DISP_BIT_IB05
+#define DISP_BITMASK_AD12          DISP_BIT_IB04
+#define DISP_BITMASK_AD11          DISP_BIT_IB03
+#define DISP_BITMASK_AD10          DISP_BIT_IB02
+#define DISP_BITMASK_AD9           DISP_BIT_IB01
+#define DISP_BITMASK_AD8           DISP_BIT_IB00
+/*
+ * DISP_CMD_RAMWR       RAM Data Read/Write
+ * Use Data Bit Configuration
+ */
+/* DISP_RAM_DATA_MASK_1_ADDR       RAM Write Data Mask (1) */
+#define DISP_BITMASK_WM11          DISP_BIT_IB13
+#define DISP_BITMASK_WM10          DISP_BIT_IB12
+#define DISP_BITMASK_WM9           DISP_BIT_IB11
+#define DISP_BITMASK_WM8           DISP_BIT_IB10
+#define DISP_BITMASK_WM7           DISP_BIT_IB09
+#define DISP_BITMASK_WM6           DISP_BIT_IB08
+#define DISP_BITMASK_WM5           DISP_BIT_IB05
+#define DISP_BITMASK_WM4           DISP_BIT_IB04
+#define DISP_BITMASK_WM3           DISP_BIT_IB03
+#define DISP_BITMASK_WM2           DISP_BIT_IB02
+#define DISP_BITMASK_WM1           DISP_BIT_IB01
+#define DISP_BITMASK_WM0           DISP_BIT_IB00
+/* DISP_RAM_DATA_MASK_2_ADDR       RAM Write Data Mask (2) */
+#define DISP_BITMASK_WM17          DISP_BIT_IB05
+#define DISP_BITMASK_WM16          DISP_BIT_IB04
+#define DISP_BITMASK_WM15          DISP_BIT_IB03
+#define DISP_BITMASK_WM14          DISP_BIT_IB02
+#define DISP_BITMASK_WM13          DISP_BIT_IB01
+#define DISP_BITMASK_WM12          DISP_BIT_IB00
+/*Gamma Control */
+/* DISP_GAMMA_CONTROL_1_ADDR       Gamma Control (1) */
+#define DISP_BITMASK_PKP12         DISP_BIT_IB10
+#define DISP_BITMASK_PKP11         DISP_BIT_IB08
+#define DISP_BITMASK_PKP10         DISP_BIT_IB09
+#define DISP_BITMASK_PKP02         DISP_BIT_IB02
+#define DISP_BITMASK_PKP01         DISP_BIT_IB01
+#define DISP_BITMASK_PKP00         DISP_BIT_IB00
+/* DISP_GAMMA_CONTROL_2_ADDR       Gamma Control (2) */
+#define DISP_BITMASK_PKP32         DISP_BIT_IB10
+#define DISP_BITMASK_PKP31         DISP_BIT_IB09
+#define DISP_BITMASK_PKP30         DISP_BIT_IB08
+#define DISP_BITMASK_PKP22         DISP_BIT_IB02
+#define DISP_BITMASK_PKP21         DISP_BIT_IB01
+#define DISP_BITMASK_PKP20         DISP_BIT_IB00
+/* DISP_GAMMA_CONTROL_3_ADDR       Gamma Control (3) */
+#define DISP_BITMASK_PKP52         DISP_BIT_IB10
+#define DISP_BITMASK_PKP51         DISP_BIT_IB09
+#define DISP_BITMASK_PKP50         DISP_BIT_IB08
+#define DISP_BITMASK_PKP42         DISP_BIT_IB02
+#define DISP_BITMASK_PKP41         DISP_BIT_IB01
+#define DISP_BITMASK_PKP40         DISP_BIT_IB00
+/* DISP_GAMMA_CONTROL_4_ADDR       Gamma Control (4) */
+#define DISP_BITMASK_PRP12         DISP_BIT_IB10
+#define DISP_BITMASK_PRP11         DISP_BIT_IB08
+#define DISP_BITMASK_PRP10         DISP_BIT_IB09
+#define DISP_BITMASK_PRP02         DISP_BIT_IB02
+#define DISP_BITMASK_PRP01         DISP_BIT_IB01
+#define DISP_BITMASK_PRP00         DISP_BIT_IB00
+/* DISP_GAMMA_CONTROL_5_ADDR       Gamma Control (5) */
+#define DISP_BITMASK_VRP14         DISP_BIT_IB12
+#define DISP_BITMASK_VRP13         DISP_BIT_IB11
+#define DISP_BITMASK_VRP12         DISP_BIT_IB10
+#define DISP_BITMASK_VRP11         DISP_BIT_IB08
+#define DISP_BITMASK_VRP10         DISP_BIT_IB09
+#define DISP_BITMASK_VRP03         DISP_BIT_IB03
+#define DISP_BITMASK_VRP02         DISP_BIT_IB02
+#define DISP_BITMASK_VRP01         DISP_BIT_IB01
+#define DISP_BITMASK_VRP00         DISP_BIT_IB00
+/* DISP_GAMMA_CONTROL_6_ADDR       Gamma Control (6) */
+#define DISP_BITMASK_PKN12         DISP_BIT_IB10
+#define DISP_BITMASK_PKN11         DISP_BIT_IB08
+#define DISP_BITMASK_PKN10         DISP_BIT_IB09
+#define DISP_BITMASK_PKN02         DISP_BIT_IB02
+#define DISP_BITMASK_PKN01         DISP_BIT_IB01
+#define DISP_BITMASK_PKN00         DISP_BIT_IB00
+/* DISP_GAMMA_CONTROL_7_ADDR       Gamma Control (7) */
+#define DISP_BITMASK_PKN32         DISP_BIT_IB10
+#define DISP_BITMASK_PKN31         DISP_BIT_IB08
+#define DISP_BITMASK_PKN30         DISP_BIT_IB09
+#define DISP_BITMASK_PKN22         DISP_BIT_IB02
+#define DISP_BITMASK_PKN21         DISP_BIT_IB01
+#define DISP_BITMASK_PKN20         DISP_BIT_IB00
+/* DISP_GAMMA_CONTROL_8_ADDR       Gamma Control (8) */
+#define DISP_BITMASK_PKN52         DISP_BIT_IB10
+#define DISP_BITMASK_PKN51         DISP_BIT_IB08
+#define DISP_BITMASK_PKN50         DISP_BIT_IB09
+#define DISP_BITMASK_PKN42         DISP_BIT_IB02
+#define DISP_BITMASK_PKN41         DISP_BIT_IB01
+#define DISP_BITMASK_PKN40         DISP_BIT_IB00
+/* DISP_GAMMA_CONTROL_9_ADDR       Gamma Control (9) */
+#define DISP_BITMASK_PRN12         DISP_BIT_IB10
+#define DISP_BITMASK_PRN11         DISP_BIT_IB08
+#define DISP_BITMASK_PRN10         DISP_BIT_IB09
+#define DISP_BITMASK_PRN02         DISP_BIT_IB02
+#define DISP_BITMASK_PRN01         DISP_BIT_IB01
+#define DISP_BITMASK_PRN00         DISP_BIT_IB00
+/* DISP_GAMMA_CONTROL_10_ADDR      Gamma Control (10) */
+#define DISP_BITMASK_VRN14         DISP_BIT_IB12
+#define DISP_BITMASK_VRN13         DISP_BIT_IB11
+#define DISP_BITMASK_VRN12         DISP_BIT_IB10
+#define DISP_BITMASK_VRN11         DISP_BIT_IB08
+#define DISP_BITMASK_VRN10         DISP_BIT_IB09
+#define DISP_BITMASK_VRN03         DISP_BIT_IB03
+#define DISP_BITMASK_VRN02         DISP_BIT_IB02
+#define DISP_BITMASK_VRN01         DISP_BIT_IB01
+#define DISP_BITMASK_VRN00         DISP_BIT_IB00
+/* Coordinate Control */
+/* DISP_VERT_SCROLL_CTL_1_ADDR     Vertical Scroll Control (1) */
+#define DISP_BITMASK_VL18          DISP_BIT_IB08
+#define DISP_BITMASK_VL17          DISP_BIT_IB07
+#define DISP_BITMASK_VL16          DISP_BIT_IB06
+#define DISP_BITMASK_VL15          DISP_BIT_IB05
+#define DISP_BITMASK_VL14          DISP_BIT_IB04
+#define DISP_BITMASK_VL13          DISP_BIT_IB03
+#define DISP_BITMASK_VL12          DISP_BIT_IB02
+#define DISP_BITMASK_VL11          DISP_BIT_IB01
+#define DISP_BITMASK_VL10          DISP_BIT_IB00
+/* DISP_VERT_SCROLL_CTL_2_ADDR     Vertical Scroll Control (2) */
+#define DISP_BITMASK_VL28          DISP_BIT_IB08
+#define DISP_BITMASK_VL27          DISP_BIT_IB07
+#define DISP_BITMASK_VL26          DISP_BIT_IB06
+#define DISP_BITMASK_VL25          DISP_BIT_IB05
+#define DISP_BITMASK_VL24          DISP_BIT_IB04
+#define DISP_BITMASK_VL23          DISP_BIT_IB03
+#define DISP_BITMASK_VL22          DISP_BIT_IB02
+#define DISP_BITMASK_VL21          DISP_BIT_IB01
+#define DISP_BITMASK_VL20          DISP_BIT_IB00
+/* DISP_SCREEN_1_DRV_POS_1_ADDR    First Screen Driving Position (1) */
+#define DISP_BITMASK_SS18          DISP_BIT_IB08
+#define DISP_BITMASK_SS17          DISP_BIT_IB07
+#define DISP_BITMASK_SS16          DISP_BIT_IB06
+#define DISP_BITMASK_SS15          DISP_BIT_IB05
+#define DISP_BITMASK_SS14          DISP_BIT_IB04
+#define DISP_BITMASK_SS13          DISP_BIT_IB03
+#define DISP_BITMASK_SS12          DISP_BIT_IB02
+#define DISP_BITMASK_SS11          DISP_BIT_IB01
+#define DISP_BITMASK_SS10          DISP_BIT_IB00
+/* DISP_SCREEN_1_DRV_POS_2_ADDR    First Screen Driving Position (2) */
+#define DISP_BITMASK_SE18          DISP_BIT_IB08
+#define DISP_BITMASK_SE17          DISP_BIT_IB07
+#define DISP_BITMASK_SE16          DISP_BIT_IB06
+#define DISP_BITMASK_SE15          DISP_BIT_IB05
+#define DISP_BITMASK_SE14          DISP_BIT_IB04
+#define DISP_BITMASK_SE13          DISP_BIT_IB03
+#define DISP_BITMASK_SE12          DISP_BIT_IB02
+#define DISP_BITMASK_SE11          DISP_BIT_IB01
+#define DISP_BITMASK_SE10          DISP_BIT_IB00
+/* DISP_SCREEN_2_DRV_POS_1_ADDR    Second Screen Driving Position (1) */
+#define DISP_BITMASK_SS28          DISP_BIT_IB08
+#define DISP_BITMASK_SS27          DISP_BIT_IB07
+#define DISP_BITMASK_SS26          DISP_BIT_IB06
+#define DISP_BITMASK_SS25          DISP_BIT_IB05
+#define DISP_BITMASK_SS24          DISP_BIT_IB04
+#define DISP_BITMASK_SS23          DISP_BIT_IB03
+#define DISP_BITMASK_SS22          DISP_BIT_IB02
+#define DISP_BITMASK_SS21          DISP_BIT_IB01
+#define DISP_BITMASK_SS20          DISP_BIT_IB00
+/* DISP_SCREEN_3_DRV_POS_2_ADDR    Second Screen Driving Position (2) */
+#define DISP_BITMASK_SE28          DISP_BIT_IB08
+#define DISP_BITMASK_SE27          DISP_BIT_IB07
+#define DISP_BITMASK_SE26          DISP_BIT_IB06
+#define DISP_BITMASK_SE25          DISP_BIT_IB05
+#define DISP_BITMASK_SE24          DISP_BIT_IB04
+#define DISP_BITMASK_SE23          DISP_BIT_IB03
+#define DISP_BITMASK_SE22          DISP_BIT_IB02
+#define DISP_BITMASK_SE21          DISP_BIT_IB01
+#define DISP_BITMASK_SE20          DISP_BIT_IB00
+/* DISP_HORZ_RAM_ADDR_POS_1_ADDR   Horizontal RAM Address Position (1) */
+#define DISP_BITMASK_HSA7          DISP_BIT_IB07
+#define DISP_BITMASK_HSA6          DISP_BIT_IB06
+#define DISP_BITMASK_HSA5          DISP_BIT_IB05
+#define DISP_BITMASK_HSA4          DISP_BIT_IB04
+#define DISP_BITMASK_HSA3          DISP_BIT_IB03
+#define DISP_BITMASK_HSA2          DISP_BIT_IB02
+#define DISP_BITMASK_HSA1          DISP_BIT_IB01
+#define DISP_BITMASK_HSA0          DISP_BIT_IB00
+/* DISP_HORZ_RAM_ADDR_POS_2_ADDR   Horizontal RAM Address Position (2) */
+#define DISP_BITMASK_HEA7          DISP_BIT_IB07
+#define DISP_BITMASK_HEA6          DISP_BIT_IB06
+#define DISP_BITMASK_HEA5          DISP_BIT_IB05
+#define DISP_BITMASK_HEA4          DISP_BIT_IB04
+#define DISP_BITMASK_HEA3          DISP_BIT_IB03
+#define DISP_BITMASK_HEA2          DISP_BIT_IB02
+#define DISP_BITMASK_HEA1          DISP_BIT_IB01
+#define DISP_BITMASK_HEA0          DISP_BIT_IB00
+/* DISP_VERT_RAM_ADDR_POS_1_ADDR   Vertical RAM Address Position (1) */
+#define DISP_BITMASK_VSA8          DISP_BIT_IB08
+#define DISP_BITMASK_VSA7          DISP_BIT_IB07
+#define DISP_BITMASK_VSA6          DISP_BIT_IB06
+#define DISP_BITMASK_VSA5          DISP_BIT_IB05
+#define DISP_BITMASK_VSA4          DISP_BIT_IB04
+#define DISP_BITMASK_VSA3          DISP_BIT_IB03
+#define DISP_BITMASK_VSA2          DISP_BIT_IB02
+#define DISP_BITMASK_VSA1          DISP_BIT_IB01
+#define DISP_BITMASK_VSA0          DISP_BIT_IB00
+/* DISP_VERT_RAM_ADDR_POS_2_ADDR   Vertical RAM Address Position (2) */
+#define DISP_BITMASK_VEA8          DISP_BIT_IB08
+#define DISP_BITMASK_VEA7          DISP_BIT_IB07
+#define DISP_BITMASK_VEA6          DISP_BIT_IB06
+#define DISP_BITMASK_VEA5          DISP_BIT_IB05
+#define DISP_BITMASK_VEA4          DISP_BIT_IB04
+#define DISP_BITMASK_VEA3          DISP_BIT_IB03
+#define DISP_BITMASK_VEA2          DISP_BIT_IB02
+#define DISP_BITMASK_VEA1          DISP_BIT_IB01
+#define DISP_BITMASK_VEA0          DISP_BIT_IB00
+static word disp_area_start_row;
+static word disp_area_end_row;
+static boolean disp_initialized = FALSE;
+/* For some reason the contrast set at init time is not good. Need to do
+* it again
+*/
+static boolean display_on = FALSE;
+
+static uint32 tmd20qvga_lcd_rev;
+uint16 tmd20qvga_panel_offset;
+
+#ifdef DISP_DEVICE_8BPP
+static word convert_8_to_16_tbl[256] = {
+       0x0000, 0x2000, 0x4000, 0x6000, 0x8000, 0xA000, 0xC000, 0xE000,
+       0x0100, 0x2100, 0x4100, 0x6100, 0x8100, 0xA100, 0xC100, 0xE100,
+       0x0200, 0x2200, 0x4200, 0x6200, 0x8200, 0xA200, 0xC200, 0xE200,
+       0x0300, 0x2300, 0x4300, 0x6300, 0x8300, 0xA300, 0xC300, 0xE300,
+       0x0400, 0x2400, 0x4400, 0x6400, 0x8400, 0xA400, 0xC400, 0xE400,
+       0x0500, 0x2500, 0x4500, 0x6500, 0x8500, 0xA500, 0xC500, 0xE500,
+       0x0600, 0x2600, 0x4600, 0x6600, 0x8600, 0xA600, 0xC600, 0xE600,
+       0x0700, 0x2700, 0x4700, 0x6700, 0x8700, 0xA700, 0xC700, 0xE700,
+       0x0008, 0x2008, 0x4008, 0x6008, 0x8008, 0xA008, 0xC008, 0xE008,
+       0x0108, 0x2108, 0x4108, 0x6108, 0x8108, 0xA108, 0xC108, 0xE108,
+       0x0208, 0x2208, 0x4208, 0x6208, 0x8208, 0xA208, 0xC208, 0xE208,
+       0x0308, 0x2308, 0x4308, 0x6308, 0x8308, 0xA308, 0xC308, 0xE308,
+       0x0408, 0x2408, 0x4408, 0x6408, 0x8408, 0xA408, 0xC408, 0xE408,
+       0x0508, 0x2508, 0x4508, 0x6508, 0x8508, 0xA508, 0xC508, 0xE508,
+       0x0608, 0x2608, 0x4608, 0x6608, 0x8608, 0xA608, 0xC608, 0xE608,
+       0x0708, 0x2708, 0x4708, 0x6708, 0x8708, 0xA708, 0xC708, 0xE708,
+       0x0010, 0x2010, 0x4010, 0x6010, 0x8010, 0xA010, 0xC010, 0xE010,
+       0x0110, 0x2110, 0x4110, 0x6110, 0x8110, 0xA110, 0xC110, 0xE110,
+       0x0210, 0x2210, 0x4210, 0x6210, 0x8210, 0xA210, 0xC210, 0xE210,
+       0x0310, 0x2310, 0x4310, 0x6310, 0x8310, 0xA310, 0xC310, 0xE310,
+       0x0410, 0x2410, 0x4410, 0x6410, 0x8410, 0xA410, 0xC410, 0xE410,
+       0x0510, 0x2510, 0x4510, 0x6510, 0x8510, 0xA510, 0xC510, 0xE510,
+       0x0610, 0x2610, 0x4610, 0x6610, 0x8610, 0xA610, 0xC610, 0xE610,
+       0x0710, 0x2710, 0x4710, 0x6710, 0x8710, 0xA710, 0xC710, 0xE710,
+       0x0018, 0x2018, 0x4018, 0x6018, 0x8018, 0xA018, 0xC018, 0xE018,
+       0x0118, 0x2118, 0x4118, 0x6118, 0x8118, 0xA118, 0xC118, 0xE118,
+       0x0218, 0x2218, 0x4218, 0x6218, 0x8218, 0xA218, 0xC218, 0xE218,
+       0x0318, 0x2318, 0x4318, 0x6318, 0x8318, 0xA318, 0xC318, 0xE318,
+       0x0418, 0x2418, 0x4418, 0x6418, 0x8418, 0xA418, 0xC418, 0xE418,
+       0x0518, 0x2518, 0x4518, 0x6518, 0x8518, 0xA518, 0xC518, 0xE518,
+       0x0618, 0x2618, 0x4618, 0x6618, 0x8618, 0xA618, 0xC618, 0xE618,
+       0x0718, 0x2718, 0x4718, 0x6718, 0x8718, 0xA718, 0xC718, 0xE718
+};
+#endif /* DISP_DEVICE_8BPP */
+
+static void tmd20qvga_disp_set_rect(int x, int y, int xres, int yres);
+static void tmd20qvga_disp_init(struct platform_device *pdev);
+static void tmd20qvga_disp_set_contrast(void);
+static void tmd20qvga_disp_set_display_area(word start_row, word end_row);
+static int tmd20qvga_disp_off(struct platform_device *pdev);
+static int tmd20qvga_disp_on(struct platform_device *pdev);
+static void tmd20qvga_set_revId(int);
+
+/* future use */
+void tmd20qvga_disp_clear_screen_area(word start_row, word end_row,
+                                     word start_column, word end_column);
+
+static void tmd20qvga_set_revId(int id)
+{
+
+       tmd20qvga_lcd_rev = id;
+
+       if (tmd20qvga_lcd_rev == 1)
+               tmd20qvga_panel_offset = 0x10;
+       else
+               tmd20qvga_panel_offset = 0;
+}
+
+static void tmd20qvga_disp_init(struct platform_device *pdev)
+{
+       struct msm_fb_data_type *mfd;
+
+       if (disp_initialized)
+               return;
+
+       mfd = platform_get_drvdata(pdev);
+
+       DISP_CMD_PORT = mfd->cmd_port;
+       DISP_DATA_PORT = mfd->data_port;
+
+#ifdef TMD20QVGA_LCD_18BPP
+       tmd20qvga_set_revId(2);
+#else
+       tmd20qvga_set_revId(1);
+#endif
+
+       disp_initialized = TRUE;
+       tmd20qvga_disp_set_contrast();
+       tmd20qvga_disp_set_display_area(0, QVGA_HEIGHT - 1);
+}
+
+static void tmd20qvga_disp_set_rect(int x, int y, int xres, int yres)
+{
+       if (!disp_initialized)
+               return;
+
+       DISP_SET_RECT(y, y + yres - 1, x, x + xres - 1);
+
+       DISP_CMD_OUT(DISP_CMD_RAMWR);
+}
+
+static void tmd20qvga_disp_set_display_area(word start_row, word end_row)
+{
+       word start_driving = start_row;
+       word end_driving = end_row;
+
+       if (!disp_initialized)
+               return;
+
+       /* Range checking
+        */
+       if (end_driving >= QVGA_HEIGHT)
+               end_driving = QVGA_HEIGHT - 1;
+       if (start_driving > end_driving) {
+               /* Probably Backwards Switch */
+               start_driving = end_driving;
+               end_driving = start_row;        /* Has not changed */
+               if (end_driving >= QVGA_HEIGHT)
+                       end_driving = QVGA_HEIGHT - 1;
+       }
+
+       if ((start_driving == disp_area_start_row)
+           && (end_driving == disp_area_end_row))
+               return;
+
+       disp_area_start_row = start_driving;
+       disp_area_end_row = end_driving;
+
+       DISP_WRITE_OUT(DISP_SCREEN_1_DRV_POS_1_ADDR,
+                      DISP_VAL_IF(start_driving & 0x100,
+                                  DISP_BITMASK_SS18) |
+                      DISP_VAL_IF(start_driving & 0x080,
+                                  DISP_BITMASK_SS17) |
+                      DISP_VAL_IF(start_driving & 0x040,
+                                  DISP_BITMASK_SS16) |
+                      DISP_VAL_IF(start_driving & 0x020,
+                                  DISP_BITMASK_SS15) |
+                      DISP_VAL_IF(start_driving & 0x010,
+                                  DISP_BITMASK_SS14) |
+                      DISP_VAL_IF(start_driving & 0x008,
+                                  DISP_BITMASK_SS13) |
+                      DISP_VAL_IF(start_driving & 0x004,
+                                  DISP_BITMASK_SS12) |
+                      DISP_VAL_IF(start_driving & 0x002,
+                                  DISP_BITMASK_SS11) |
+                      DISP_VAL_IF(start_driving & 0x001, DISP_BITMASK_SS10));
+
+       DISP_WRITE_OUT(DISP_SCREEN_1_DRV_POS_2_ADDR,
+                       DISP_VAL_IF(end_driving & 0x100, DISP_BITMASK_SE18) |
+                       DISP_VAL_IF(end_driving & 0x080, DISP_BITMASK_SE17) |
+                       DISP_VAL_IF(end_driving & 0x040, DISP_BITMASK_SE16) |
+                       DISP_VAL_IF(end_driving & 0x020, DISP_BITMASK_SE15) |
+                       DISP_VAL_IF(end_driving & 0x010, DISP_BITMASK_SE14) |
+                       DISP_VAL_IF(end_driving & 0x008, DISP_BITMASK_SE13) |
+                       DISP_VAL_IF(end_driving & 0x004, DISP_BITMASK_SE12) |
+                       DISP_VAL_IF(end_driving & 0x002, DISP_BITMASK_SE11) |
+                       DISP_VAL_IF(end_driving & 0x001, DISP_BITMASK_SE10));
+}
+
+static int tmd20qvga_disp_off(struct platform_device *pdev)
+{
+       if (!disp_initialized)
+               tmd20qvga_disp_init(pdev);
+
+       if (display_on) {
+               if (tmd20qvga_lcd_rev == 2) {
+                       DISP_WRITE_OUT(DISP_POFF_LN_SETTING_ADDR, 0x000A);
+                       DISP_WRITE_OUT(DISP_POWER_CTL_1_ADDR, 0xFFEE);
+                       WAIT_MSEC(40);
+                       DISP_WRITE_OUT(DISP_POWER_CTL_1_ADDR, 0xF812);
+                       WAIT_MSEC(40);
+                       DISP_WRITE_OUT(DISP_POWER_CTL_1_ADDR, 0xE811);
+                       WAIT_MSEC(40);
+                       DISP_WRITE_OUT(DISP_POWER_CTL_1_ADDR, 0xC011);
+                       WAIT_MSEC(40);
+                       DISP_WRITE_OUT(DISP_POWER_CTL_1_ADDR, 0x4011);
+                       WAIT_MSEC(20);
+                       DISP_WRITE_OUT(DISP_POWER_CTL_1_ADDR, 0x0010);
+
+               } else {
+                       DISP_WRITE_OUT(DISP_POFF_LN_SETTING_ADDR, 0x000F);
+                       DISP_WRITE_OUT(DISP_POWER_CTL_1_ADDR, 0x0BFE);
+                       DISP_WRITE_OUT(DISP_POWER_SUPPLY_INTF_ADDR, 0x0100);
+                       WAIT_MSEC(40);
+                       DISP_WRITE_OUT(DISP_POWER_CTL_1_ADDR, 0x0BED);
+                       DISP_WRITE_OUT(DISP_POWER_SUPPLY_INTF_ADDR, 0x0100);
+                       WAIT_MSEC(40);
+                       DISP_WRITE_OUT(DISP_POWER_CTL_1_ADDR, 0x00CD);
+                       DISP_WRITE_OUT(DISP_POWER_SUPPLY_INTF_ADDR, 0x0100);
+                       WAIT_MSEC(20);
+                       DISP_WRITE_OUT(DISP_START_OSCILLATION_ADDR, 0x0);
+               }
+
+               DISP_WRITE_OUT(DISP_MODE_SETTING_ADDR, 0x0004);
+               DISP_WRITE_OUT(DISP_MODE_SETTING_ADDR, 0x0000);
+
+               display_on = FALSE;
+       }
+
+       return 0;
+}
+
+static int tmd20qvga_disp_on(struct platform_device *pdev)
+{
+       if (!disp_initialized)
+               tmd20qvga_disp_init(pdev);
+
+       if (!display_on) {
+               /* Deep Stand-by -> Stand-by */
+               DISP_CMD_OUT(DISP_START_OSCILLATION_ADDR);
+               WAIT_MSEC(1);
+               DISP_CMD_OUT(DISP_START_OSCILLATION_ADDR);
+               WAIT_MSEC(1);
+               DISP_CMD_OUT(DISP_START_OSCILLATION_ADDR);
+               WAIT_MSEC(1);
+
+               /* OFF -> Deep Stan-By -> Stand-by */
+               /* let's change the state from "Stand-by" to "Sleep" */
+               DISP_WRITE_OUT(DISP_MODE_SETTING_ADDR, 0x0005);
+               WAIT_MSEC(1);
+
+               /* Sleep -> Displaying */
+               DISP_WRITE_OUT(DISP_START_OSCILLATION_ADDR, 0x0001);
+               DISP_WRITE_OUT(DISP_DRIVER_OUTPUT_CTL_ADDR, 0x0127);
+               DISP_WRITE_OUT(DISP_LCD_DRIVING_SIG_ADDR, 0x200);
+               /* fast write mode */
+               DISP_WRITE_OUT(DISP_ENTRY_MODE_ADDR, 0x0130);
+               if (tmd20qvga_lcd_rev == 2)
+                       DISP_WRITE_OUT(DISP_TMD_700_ADDR, 0x0003);
+               /* back porch = 14 + front porch = 2 --> 16 lines */
+               if (tmd20qvga_lcd_rev == 2) {
+#ifdef TMD20QVGA_LCD_18BPP
+                       /* 256k color */
+                       DISP_WRITE_OUT(DISP_DISPLAY_CTL_1_ADDR, 0x0000);
+#else
+                       /* 65k color */
+                       DISP_WRITE_OUT(DISP_DISPLAY_CTL_1_ADDR, 0x4000);
+#endif
+                       DISP_WRITE_OUT(DISP_DISPLAY_CTL_2_ADDR, 0x0302);
+               } else {
+#ifdef TMD20QVGA_LCD_18BPP
+                       /* 256k color */
+                       DISP_WRITE_OUT(DISP_DISPLAY_CTL_1_ADDR, 0x0004);
+#else
+                       /* 65k color */
+                       DISP_WRITE_OUT(DISP_DISPLAY_CTL_1_ADDR, 0x4004);
+#endif
+                       DISP_WRITE_OUT(DISP_DISPLAY_CTL_2_ADDR, 0x020E);
+               }
+               /* 16 bit one transfer */
+               if (tmd20qvga_lcd_rev == 2) {
+                       DISP_WRITE_OUT(DISP_EXT_DISPLAY_CTL_1_ADDR, 0x0000);
+                       DISP_WRITE_OUT(DISP_FRAME_CYCLE_CTL_ADDR, 0x0010);
+                       DISP_WRITE_OUT(DISP_LTPS_CTL_1_ADDR, 0x0302);
+                       DISP_WRITE_OUT(DISP_LTPS_CTL_2_ADDR, 0x0102);
+                       DISP_WRITE_OUT(DISP_LTPS_CTL_3_ADDR, 0x0000);
+                       DISP_WRITE_OUT(DISP_TMD_015_ADDR, 0x2000);
+
+                       DISP_WRITE_OUT(DISP_AMP_SETTING_ADDR, 0x0000);
+                       DISP_WRITE_OUT(DISP_GAMMA_CONTROL_1_ADDR, 0x0403);
+                       DISP_WRITE_OUT(DISP_GAMMA_CONTROL_2_ADDR, 0x0304);
+                       DISP_WRITE_OUT(DISP_GAMMA_CONTROL_3_ADDR, 0x0403);
+                       DISP_WRITE_OUT(DISP_GAMMA_CONTROL_4_ADDR, 0x0303);
+                       DISP_WRITE_OUT(DISP_GAMMA_CONTROL_5_ADDR, 0x0101);
+                       DISP_WRITE_OUT(DISP_TMD_305_ADDR, 0);
+
+                       DISP_WRITE_OUT(DISP_SCREEN_1_DRV_POS_1_ADDR, 0x0000);
+                       DISP_WRITE_OUT(DISP_SCREEN_1_DRV_POS_2_ADDR, 0x013F);
+
+                       DISP_WRITE_OUT(DISP_POWER_CTL_3_ADDR, 0x077D);
+
+                       DISP_WRITE_OUT(DISP_POWER_CTL_4_ADDR, 0x0005);
+                       DISP_WRITE_OUT(DISP_POWER_CTL_5_ADDR, 0x0000);
+                       DISP_WRITE_OUT(DISP_POWER_CTL_6_ADDR, 0x0015);
+                       DISP_WRITE_OUT(DISP_POWER_CTL_1_ADDR, 0xC010);
+                       WAIT_MSEC(1);
+
+                       DISP_WRITE_OUT(DISP_POWER_CTL_2_ADDR, 0x0001);
+                       DISP_WRITE_OUT(DISP_POWER_CTL_1_ADDR, 0xFFFE);
+                       WAIT_MSEC(60);
+               } else {
+                       DISP_WRITE_OUT(DISP_EXT_DISPLAY_CTL_1_ADDR, 0x0001);
+                       DISP_WRITE_OUT(DISP_FRAME_CYCLE_CTL_ADDR, 0x0010);
+                       DISP_WRITE_OUT(DISP_LTPS_CTL_1_ADDR, 0x0301);
+                       DISP_WRITE_OUT(DISP_LTPS_CTL_2_ADDR, 0x0001);
+                       DISP_WRITE_OUT(DISP_LTPS_CTL_3_ADDR, 0x0000);
+                       DISP_WRITE_OUT(DISP_AMP_SETTING_ADDR, 0x0000);
+                       DISP_WRITE_OUT(DISP_GAMMA_CONTROL_1_ADDR, 0x0507);
+                       DISP_WRITE_OUT(DISP_GAMMA_CONTROL_2_ADDR, 0x0405);
+                       DISP_WRITE_OUT(DISP_GAMMA_CONTROL_3_ADDR, 0x0607);
+                       DISP_WRITE_OUT(DISP_GAMMA_CONTROL_4_ADDR, 0x0502);
+                       DISP_WRITE_OUT(DISP_GAMMA_CONTROL_5_ADDR, 0x0301);
+                       DISP_WRITE_OUT(DISP_SCREEN_1_DRV_POS_1_ADDR, 0x0000);
+                       DISP_WRITE_OUT(DISP_SCREEN_1_DRV_POS_2_ADDR, 0x013F);
+                       DISP_WRITE_OUT(DISP_POWER_CTL_3_ADDR, 0x0795);
+
+                       DISP_WRITE_OUT(DISP_POWER_SUPPLY_INTF_ADDR, 0x0102);
+                       WAIT_MSEC(1);
+
+                       DISP_WRITE_OUT(DISP_POWER_CTL_4_ADDR, 0x0450);
+                       DISP_WRITE_OUT(DISP_POWER_SUPPLY_INTF_ADDR, 0x0103);
+                       WAIT_MSEC(1);
+
+                       DISP_WRITE_OUT(DISP_POWER_CTL_5_ADDR, 0x0008);
+                       DISP_WRITE_OUT(DISP_POWER_SUPPLY_INTF_ADDR, 0x0104);
+                       WAIT_MSEC(1);
+
+                       DISP_WRITE_OUT(DISP_POWER_CTL_6_ADDR, 0x0C00);
+                       DISP_WRITE_OUT(DISP_POWER_SUPPLY_INTF_ADDR, 0x0105);
+                       WAIT_MSEC(1);
+
+                       DISP_WRITE_OUT(DISP_POWER_CTL_7_ADDR, 0x0000);
+                       DISP_WRITE_OUT(DISP_POWER_SUPPLY_INTF_ADDR, 0x0106);
+                       WAIT_MSEC(1);
+
+                       DISP_WRITE_OUT(DISP_POWER_CTL_1_ADDR, 0x0801);
+                       DISP_WRITE_OUT(DISP_POWER_SUPPLY_INTF_ADDR, 0x0100);
+                       WAIT_MSEC(1);
+
+                       DISP_WRITE_OUT(DISP_POWER_CTL_2_ADDR, 0x001F);
+                       DISP_WRITE_OUT(DISP_POWER_SUPPLY_INTF_ADDR, 0x0101);
+                       WAIT_MSEC(60);
+
+                       DISP_WRITE_OUT(DISP_POWER_CTL_2_ADDR, 0x009F);
+                       DISP_WRITE_OUT(DISP_POWER_SUPPLY_INTF_ADDR, 0x0101);
+                       WAIT_MSEC(10);
+
+                       DISP_WRITE_OUT(DISP_HORZ_RAM_ADDR_POS_1_ADDR, 0x0010);
+                       DISP_WRITE_OUT(DISP_HORZ_RAM_ADDR_POS_2_ADDR, 0x00FF);
+                       DISP_WRITE_OUT(DISP_VERT_RAM_ADDR_POS_1_ADDR, 0x0000);
+                       DISP_WRITE_OUT(DISP_VERT_RAM_ADDR_POS_2_ADDR, 0x013F);
+                       /* RAM starts at address 0x10 */
+                       DISP_WRITE_OUT(DISP_RAM_ADDR_SET_1_ADDR, 0x0010);
+                       DISP_WRITE_OUT(DISP_RAM_ADDR_SET_2_ADDR, 0x0000);
+
+                       /* lcd controller uses internal clock, not ext. vsync */
+                       DISP_CMD_OUT(DISP_CMD_RAMWR);
+
+                       DISP_WRITE_OUT(DISP_POWER_CTL_1_ADDR, 0x0881);
+                       DISP_WRITE_OUT(DISP_POWER_SUPPLY_INTF_ADDR, 0x0100);
+                       WAIT_MSEC(40);
+
+                       DISP_WRITE_OUT(DISP_POWER_CTL_1_ADDR, 0x0BE1);
+                       DISP_WRITE_OUT(DISP_POWER_SUPPLY_INTF_ADDR, 0x0100);
+                       WAIT_MSEC(40);
+
+                       DISP_WRITE_OUT(DISP_POWER_CTL_1_ADDR, 0x0BFF);
+                       DISP_WRITE_OUT(DISP_POWER_SUPPLY_INTF_ADDR, 0x0100);
+               }
+               display_on = TRUE;
+       }
+
+       return 0;
+}
+
+static void tmd20qvga_disp_set_contrast(void)
+{
+#if (defined(TMD20QVGA_LCD_18BPP))
+
+       DISP_WRITE_OUT(DISP_GAMMA_CONTROL_1_ADDR, 0x0403);
+       DISP_WRITE_OUT(DISP_GAMMA_CONTROL_2_ADDR, 0x0302);
+       DISP_WRITE_OUT(DISP_GAMMA_CONTROL_3_ADDR, 0x0403);
+       DISP_WRITE_OUT(DISP_GAMMA_CONTROL_4_ADDR, 0x0303);
+       DISP_WRITE_OUT(DISP_GAMMA_CONTROL_5_ADDR, 0x0F07);
+
+#else
+       int newcontrast = 0x46;
+
+       DISP_WRITE_OUT(DISP_GAMMA_CONTROL_1_ADDR, 0x0403);
+
+       DISP_WRITE_OUT(DISP_GAMMA_CONTROL_2_ADDR,
+                       DISP_VAL_IF(newcontrast & 0x0001, DISP_BITMASK_PKP20) |
+                       DISP_VAL_IF(newcontrast & 0x0002, DISP_BITMASK_PKP21) |
+                       DISP_VAL_IF(newcontrast & 0x0004, DISP_BITMASK_PKP22) |
+                       DISP_VAL_IF(newcontrast & 0x0010, DISP_BITMASK_PKP30) |
+                       DISP_VAL_IF(newcontrast & 0x0020, DISP_BITMASK_PKP31) |
+                       DISP_VAL_IF(newcontrast & 0x0040, DISP_BITMASK_PKP32));
+
+       DISP_WRITE_OUT(DISP_GAMMA_CONTROL_3_ADDR,
+                       DISP_VAL_IF(newcontrast & 0x0010, DISP_BITMASK_PKP40) |
+                       DISP_VAL_IF(newcontrast & 0x0020, DISP_BITMASK_PKP41) |
+                       DISP_VAL_IF(newcontrast & 0x0040, DISP_BITMASK_PKP42) |
+                       DISP_VAL_IF(newcontrast & 0x0001, DISP_BITMASK_PKP50) |
+                       DISP_VAL_IF(newcontrast & 0x0002, DISP_BITMASK_PKP51) |
+                       DISP_VAL_IF(newcontrast & 0x0004, DISP_BITMASK_PKP52));
+
+       DISP_WRITE_OUT(DISP_GAMMA_CONTROL_4_ADDR, 0x0303);
+       DISP_WRITE_OUT(DISP_GAMMA_CONTROL_5_ADDR, 0x0F07);
+
+#endif /* defined(TMD20QVGA_LCD_18BPP) */
+
+}      /* End disp_set_contrast */
+
+void tmd20qvga_disp_clear_screen_area
+    (word start_row, word end_row, word start_column, word end_column) {
+       int32 i;
+
+       /* Clear the display screen */
+       DISP_SET_RECT(start_row, end_row, start_column, end_column);
+       DISP_CMD_OUT(DISP_CMD_RAMWR);
+       i = (end_row - start_row + 1) * (end_column - start_column + 1);
+       for (; i > 0; i--)
+               DISP_DATA_OUT_16TO18BPP(0x0);
+}
+
+static int __init tmd20qvga_probe(struct platform_device *pdev)
+{
+       msm_fb_add_device(pdev);
+
+       return 0;
+}
+
+static struct platform_driver this_driver = {
+       .probe  = tmd20qvga_probe,
+       .driver = {
+               .name   = "ebi2_tmd_qvga",
+       },
+};
+
+static struct msm_fb_panel_data tmd20qvga_panel_data = {
+       .on = tmd20qvga_disp_on,
+       .off = tmd20qvga_disp_off,
+       .set_rect = tmd20qvga_disp_set_rect,
+};
+
+static struct platform_device this_device = {
+       .name   = "ebi2_tmd_qvga",
+       .id     = 0,
+       .dev    = {
+               .platform_data = &tmd20qvga_panel_data,
+       }
+};
+
+static int __init tmd20qvga_init(void)
+{
+       int ret;
+       struct msm_panel_info *pinfo;
+
+       ret = platform_driver_register(&this_driver);
+       if (!ret) {
+               pinfo = &tmd20qvga_panel_data.panel_info;
+               pinfo->xres = 240;
+               pinfo->yres = 320;
+               pinfo->type = EBI2_PANEL;
+               pinfo->pdest = DISPLAY_1;
+               pinfo->wait_cycle = 0x808000;
+#ifdef TMD20QVGA_LCD_18BPP
+               pinfo->bpp = 18;
+#else
+               pinfo->bpp = 16;
+#endif
+               pinfo->fb_num = 2;
+               pinfo->lcd.vsync_enable = TRUE;
+               pinfo->lcd.refx100 = 6000;
+               pinfo->lcd.v_back_porch = 16;
+               pinfo->lcd.v_front_porch = 4;
+               pinfo->lcd.v_pulse_width = 0;
+               pinfo->lcd.hw_vsync_mode = FALSE;
+               pinfo->lcd.vsync_notifier_period = 0;
+
+               ret = platform_device_register(&this_device);
+               if (ret)
+                       platform_driver_unregister(&this_driver);
+       }
+
+       return ret;
+}
+
+module_init(tmd20qvga_init);
diff --git a/drivers/staging/msm/hdmi_sii9022.c b/drivers/staging/msm/hdmi_sii9022.c
new file mode 100644 (file)
index 0000000..6b82b56
--- /dev/null
@@ -0,0 +1,248 @@
+/* Copyright (c) 2009, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <linux/i2c.h>
+#include <linux/delay.h>
+#include "msm_fb.h"
+
+#define DEVICE_NAME "sii9022"
+#define SII9022_DEVICE_ID   0xB0
+
+struct sii9022_i2c_addr_data{
+       u8 addr;
+       u8 data;
+};
+
+/* video mode data */
+static u8 video_mode_data[] = {
+       0x00,
+       0xF9, 0x1C, 0x70, 0x17, 0x72, 0x06, 0xEE, 0x02,
+};
+
+static u8 avi_io_format[] = {
+       0x09,
+       0x00, 0x00,
+};
+
+/* power state */
+static struct sii9022_i2c_addr_data regset0[] = {
+       { 0x60, 0x04 },
+       { 0x63, 0x00 },
+       { 0x1E, 0x00 },
+};
+
+static u8 video_infoframe[] = {
+       0x0C,
+       0xF0, 0x00, 0x68, 0x00, 0x04, 0x00, 0x19, 0x00,
+       0xE9, 0x02, 0x04, 0x01, 0x04, 0x06,
+};
+
+/* configure audio */
+static struct sii9022_i2c_addr_data regset1[] = {
+       { 0x26, 0x90 },
+       { 0x20, 0x90 },
+       { 0x1F, 0x80 },
+       { 0x26, 0x80 },
+       { 0x24, 0x02 },
+       { 0x25, 0x0B },
+       { 0xBC, 0x02 },
+       { 0xBD, 0x24 },
+       { 0xBE, 0x02 },
+};
+
+/* enable audio */
+static u8 misc_infoframe[] = {
+       0xBF,
+       0xC2, 0x84, 0x01, 0x0A, 0x6F, 0x02, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+
+/* set HDMI, active */
+static struct sii9022_i2c_addr_data regset2[] = {
+       { 0x1A, 0x01 },
+       { 0x3D, 0x00 },
+};
+
+static int send_i2c_data(struct i2c_client *client,
+                        struct sii9022_i2c_addr_data *regset,
+                        int size)
+{
+       int i;
+       int rc = 0;
+
+       for (i = 0; i < size; i++) {
+               rc = i2c_smbus_write_byte_data(
+                       client,
+                       regset[i].addr, regset[i].data);
+               if (rc)
+                       break;
+       }
+       return rc;
+}
+
+static int hdmi_sii_enable(struct i2c_client *client)
+{
+       int rc;
+       int retries = 10;
+       int count;
+
+       rc = i2c_smbus_write_byte_data(client, 0xC7, 0x00);
+       if (rc)
+               goto enable_exit;
+
+       do {
+               msleep(1);
+               rc = i2c_smbus_read_byte_data(client, 0x1B);
+       } while ((rc != SII9022_DEVICE_ID) && retries--);
+
+       if (rc != SII9022_DEVICE_ID)
+               return -ENODEV;
+
+       rc = i2c_smbus_write_byte_data(client, 0x1A, 0x11);
+       if (rc)
+               goto enable_exit;
+
+       count = ARRAY_SIZE(video_mode_data);
+       rc = i2c_master_send(client, video_mode_data, count);
+       if (rc != count) {
+               rc = -EIO;
+               goto enable_exit;
+       }
+
+       rc = i2c_smbus_write_byte_data(client, 0x08, 0x20);
+       if (rc)
+               goto enable_exit;
+       count = ARRAY_SIZE(avi_io_format);
+       rc = i2c_master_send(client, avi_io_format, count);
+       if (rc != count) {
+               rc = -EIO;
+               goto enable_exit;
+       }
+
+       rc = send_i2c_data(client, regset0, ARRAY_SIZE(regset0));
+       if (rc)
+               goto enable_exit;
+
+       count = ARRAY_SIZE(video_infoframe);
+       rc = i2c_master_send(client, video_infoframe, count);
+       if (rc != count) {
+               rc = -EIO;
+               goto enable_exit;
+       }
+
+       rc = send_i2c_data(client, regset1, ARRAY_SIZE(regset1));
+       if (rc)
+               goto enable_exit;
+
+       count = ARRAY_SIZE(misc_infoframe);
+       rc = i2c_master_send(client, misc_infoframe, count);
+       if (rc != count) {
+               rc = -EIO;
+               goto enable_exit;
+       }
+
+       rc = send_i2c_data(client, regset2, ARRAY_SIZE(regset2));
+       if (rc)
+               goto enable_exit;
+
+       return 0;
+enable_exit:
+       printk(KERN_ERR "%s: exited rc=%d\n", __func__, rc);
+       return rc;
+}
+
+static const struct i2c_device_id hmdi_sii_id[] = {
+       { DEVICE_NAME, 0 },
+       { }
+};
+
+static int hdmi_sii_probe(struct i2c_client *client,
+                       const struct i2c_device_id *id)
+{
+       int rc;
+
+       if (!i2c_check_functionality(client->adapter,
+                                    I2C_FUNC_SMBUS_BYTE | I2C_FUNC_I2C))
+               return -ENODEV;
+       rc = hdmi_sii_enable(client);
+       return rc;
+}
+
+
+static struct i2c_driver hdmi_sii_i2c_driver = {
+       .driver = {
+               .name = DEVICE_NAME,
+               .owner = THIS_MODULE,
+       },
+       .probe = hdmi_sii_probe,
+       .remove =  __exit_p(hdmi_sii_remove),
+       .id_table = hmdi_sii_id,
+};
+
+static int __init hdmi_sii_init(void)
+{
+       int ret;
+       struct msm_panel_info pinfo;
+
+       if (msm_fb_detect_client("hdmi_sii9022"))
+               return 0;
+
+       pinfo.xres = 1280;
+       pinfo.yres = 720;
+       pinfo.type = HDMI_PANEL;
+       pinfo.pdest = DISPLAY_1;
+       pinfo.wait_cycle = 0;
+       pinfo.bpp = 24;
+       pinfo.fb_num = 2;
+       pinfo.clk_rate = 74250000;
+
+       pinfo.lcdc.h_back_porch = 124;
+       pinfo.lcdc.h_front_porch = 110;
+       pinfo.lcdc.h_pulse_width = 136;
+       pinfo.lcdc.v_back_porch = 19;
+       pinfo.lcdc.v_front_porch = 5;
+       pinfo.lcdc.v_pulse_width = 6;
+       pinfo.lcdc.border_clr = 0;
+       pinfo.lcdc.underflow_clr = 0xff;
+       pinfo.lcdc.hsync_skew = 0;
+
+       ret = lcdc_device_register(&pinfo);
+       if (ret) {
+               printk(KERN_ERR "%s: failed to register device\n", __func__);
+               goto init_exit;
+       }
+
+       ret = i2c_add_driver(&hdmi_sii_i2c_driver);
+       if (ret)
+               printk(KERN_ERR "%s: failed to add i2c driver\n", __func__);
+
+init_exit:
+       return ret;
+}
+
+static void __exit hdmi_sii_exit(void)
+{
+       i2c_del_driver(&hdmi_sii_i2c_driver);
+}
+
+module_init(hdmi_sii_init);
+module_exit(hdmi_sii_exit);
+MODULE_LICENSE("GPL v2");
+MODULE_VERSION("0.1");
+MODULE_AUTHOR("Qualcomm Innovation Center, Inc.");
+MODULE_DESCRIPTION("SiI9022 HDMI driver");
+MODULE_ALIAS("platform:hdmi-sii9022");
diff --git a/drivers/staging/msm/lcdc.c b/drivers/staging/msm/lcdc.c
new file mode 100644 (file)
index 0000000..735280a
--- /dev/null
@@ -0,0 +1,239 @@
+/* Copyright (c) 2008-2009, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/time.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/spinlock.h>
+#include <linux/delay.h>
+#include <mach/hardware.h>
+#include <linux/io.h>
+
+#include <asm/system.h>
+#include <asm/mach-types.h>
+#include <linux/semaphore.h>
+#include <linux/uaccess.h>
+#include <linux/clk.h>
+#include <linux/platform_device.h>
+#include <linux/pm_qos_params.h>
+
+#include "msm_fb.h"
+
+static int lcdc_probe(struct platform_device *pdev);
+static int lcdc_remove(struct platform_device *pdev);
+
+static int lcdc_off(struct platform_device *pdev);
+static int lcdc_on(struct platform_device *pdev);
+
+static struct platform_device *pdev_list[MSM_FB_MAX_DEV_LIST];
+static int pdev_list_cnt;
+
+static struct clk *mdp_lcdc_pclk_clk;
+static struct clk *mdp_lcdc_pad_pclk_clk;
+
+int mdp_lcdc_pclk_clk_rate;
+int mdp_lcdc_pad_pclk_clk_rate;
+
+static struct platform_driver lcdc_driver = {
+       .probe = lcdc_probe,
+       .remove = lcdc_remove,
+       .suspend = NULL,
+       .resume = NULL,
+       .shutdown = NULL,
+       .driver = {
+                  .name = "lcdc",
+                  },
+};
+
+static struct lcdc_platform_data *lcdc_pdata;
+
+static int lcdc_off(struct platform_device *pdev)
+{
+       int ret = 0;
+
+       ret = panel_next_off(pdev);
+
+       clk_disable(mdp_lcdc_pclk_clk);
+       clk_disable(mdp_lcdc_pad_pclk_clk);
+
+       if (lcdc_pdata && lcdc_pdata->lcdc_power_save)
+               lcdc_pdata->lcdc_power_save(0);
+
+       if (lcdc_pdata && lcdc_pdata->lcdc_gpio_config)
+               ret = lcdc_pdata->lcdc_gpio_config(0);
+
+//     pm_qos_update_requirement(PM_QOS_SYSTEM_BUS_FREQ , "lcdc",
+//                                     PM_QOS_DEFAULT_VALUE);
+
+       return ret;
+}
+
+static int lcdc_on(struct platform_device *pdev)
+{
+       int ret = 0;
+       struct msm_fb_data_type *mfd;
+       unsigned long panel_pixclock_freq , pm_qos_freq;
+
+       mfd = platform_get_drvdata(pdev);
+       panel_pixclock_freq = mfd->fbi->var.pixclock;
+
+       if (panel_pixclock_freq > 58000000)
+               /* pm_qos_freq should be in Khz */
+               pm_qos_freq = panel_pixclock_freq / 1000 ;
+       else
+               pm_qos_freq = 58000;
+
+//     pm_qos_update_requirement(PM_QOS_SYSTEM_BUS_FREQ , "lcdc",
+//                                             pm_qos_freq);
+       mfd = platform_get_drvdata(pdev);
+
+       clk_enable(mdp_lcdc_pclk_clk);
+       clk_enable(mdp_lcdc_pad_pclk_clk);
+
+       if (lcdc_pdata && lcdc_pdata->lcdc_power_save)
+               lcdc_pdata->lcdc_power_save(1);
+       if (lcdc_pdata && lcdc_pdata->lcdc_gpio_config)
+               ret = lcdc_pdata->lcdc_gpio_config(1);
+
+       clk_set_rate(mdp_lcdc_pclk_clk, mfd->fbi->var.pixclock);
+       clk_set_rate(mdp_lcdc_pad_pclk_clk, mfd->fbi->var.pixclock);
+       mdp_lcdc_pclk_clk_rate = clk_get_rate(mdp_lcdc_pclk_clk);
+       mdp_lcdc_pad_pclk_clk_rate = clk_get_rate(mdp_lcdc_pad_pclk_clk);
+
+       ret = panel_next_on(pdev);
+       return ret;
+}
+
+static int lcdc_probe(struct platform_device *pdev)
+{
+       struct msm_fb_data_type *mfd;
+       struct fb_info *fbi;
+       struct platform_device *mdp_dev = NULL;
+       struct msm_fb_panel_data *pdata = NULL;
+       int rc;
+
+       if (pdev->id == 0) {
+               lcdc_pdata = pdev->dev.platform_data;
+               return 0;
+       }
+
+       mfd = platform_get_drvdata(pdev);
+
+       if (!mfd)
+               return -ENODEV;
+
+       if (mfd->key != MFD_KEY)
+               return -EINVAL;
+
+       if (pdev_list_cnt >= MSM_FB_MAX_DEV_LIST)
+               return -ENOMEM;
+
+       mdp_dev = platform_device_alloc("mdp", pdev->id);
+       if (!mdp_dev)
+               return -ENOMEM;
+
+       /*
+        * link to the latest pdev
+        */
+       mfd->pdev = mdp_dev;
+       mfd->dest = DISPLAY_LCDC;
+
+       /*
+        * alloc panel device data
+        */
+       if (platform_device_add_data
+           (mdp_dev, pdev->dev.platform_data,
+            sizeof(struct msm_fb_panel_data))) {
+               printk(KERN_ERR "lcdc_probe: platform_device_add_data failed!\n");
+               platform_device_put(mdp_dev);
+               return -ENOMEM;
+       }
+       /*
+        * data chain
+        */
+       pdata = (struct msm_fb_panel_data *)mdp_dev->dev.platform_data;
+       pdata->on = lcdc_on;
+       pdata->off = lcdc_off;
+       pdata->next = pdev;
+
+       /*
+        * get/set panel specific fb info
+        */
+       mfd->panel_info = pdata->panel_info;
+       mfd->fb_imgType = MDP_RGB_565;
+
+       fbi = mfd->fbi;
+       fbi->var.pixclock = mfd->panel_info.clk_rate;
+       fbi->var.left_margin = mfd->panel_info.lcdc.h_back_porch;
+       fbi->var.right_margin = mfd->panel_info.lcdc.h_front_porch;
+       fbi->var.upper_margin = mfd->panel_info.lcdc.v_back_porch;
+       fbi->var.lower_margin = mfd->panel_info.lcdc.v_front_porch;
+       fbi->var.hsync_len = mfd->panel_info.lcdc.h_pulse_width;
+       fbi->var.vsync_len = mfd->panel_info.lcdc.v_pulse_width;
+
+       /*
+        * set driver data
+        */
+       platform_set_drvdata(mdp_dev, mfd);
+
+       /*
+        * register in mdp driver
+        */
+       rc = platform_device_add(mdp_dev);
+       if (rc)
+               goto lcdc_probe_err;
+
+       pdev_list[pdev_list_cnt++] = pdev;
+               return 0;
+
+lcdc_probe_err:
+       platform_device_put(mdp_dev);
+       return rc;
+}
+
+static int lcdc_remove(struct platform_device *pdev)
+{
+//     pm_qos_remove_requirement(PM_QOS_SYSTEM_BUS_FREQ , "lcdc");
+       return 0;
+}
+
+static int lcdc_register_driver(void)
+{
+       return platform_driver_register(&lcdc_driver);
+}
+
+static int __init lcdc_driver_init(void)
+{
+       mdp_lcdc_pclk_clk = clk_get(NULL, "mdp_lcdc_pclk_clk");
+       if (IS_ERR(mdp_lcdc_pclk_clk)) {
+               printk(KERN_ERR "error: can't get mdp_lcdc_pclk_clk!\n");
+               return IS_ERR(mdp_lcdc_pclk_clk);
+       }
+       mdp_lcdc_pad_pclk_clk = clk_get(NULL, "mdp_lcdc_pad_pclk_clk");
+       if (IS_ERR(mdp_lcdc_pad_pclk_clk)) {
+               printk(KERN_ERR "error: can't get mdp_lcdc_pad_pclk_clk!\n");
+               return IS_ERR(mdp_lcdc_pad_pclk_clk);
+       }
+//     pm_qos_add_requirement(PM_QOS_SYSTEM_BUS_FREQ , "lcdc",
+//                             PM_QOS_DEFAULT_VALUE);
+       return lcdc_register_driver();
+}
+
+module_init(lcdc_driver_init);
diff --git a/drivers/staging/msm/lcdc_external.c b/drivers/staging/msm/lcdc_external.c
new file mode 100644 (file)
index 0000000..45ff785
--- /dev/null
@@ -0,0 +1,54 @@
+/* Copyright (c) 2009, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include "msm_fb.h"
+
+static int __init lcdc_external_init(void)
+{
+       int ret;
+       struct msm_panel_info pinfo;
+
+       if (msm_fb_detect_client("lcdc_external"))
+               return 0;
+
+       pinfo.xres = 1280;
+       pinfo.yres = 720;
+       pinfo.type = LCDC_PANEL;
+       pinfo.pdest = DISPLAY_1;
+       pinfo.wait_cycle = 0;
+       pinfo.bpp = 24;
+       pinfo.fb_num = 2;
+       pinfo.clk_rate = 74250000;
+
+       pinfo.lcdc.h_back_porch = 124;
+       pinfo.lcdc.h_front_porch = 110;
+       pinfo.lcdc.h_pulse_width = 136;
+       pinfo.lcdc.v_back_porch = 19;
+       pinfo.lcdc.v_front_porch = 5;
+       pinfo.lcdc.v_pulse_width = 6;
+       pinfo.lcdc.border_clr = 0;      /* blk */
+       pinfo.lcdc.underflow_clr = 0xff;        /* blue */
+       pinfo.lcdc.hsync_skew = 0;
+
+       ret = lcdc_device_register(&pinfo);
+       if (ret)
+               printk(KERN_ERR "%s: failed to register device!\n", __func__);
+
+       return ret;
+}
+
+module_init(lcdc_external_init);
diff --git a/drivers/staging/msm/lcdc_gordon.c b/drivers/staging/msm/lcdc_gordon.c
new file mode 100644 (file)
index 0000000..399ec8c
--- /dev/null
@@ -0,0 +1,446 @@
+/* Copyright (c) 2009, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <linux/delay.h>
+#include <mach/gpio.h>
+#include "msm_fb.h"
+
+/* registers */
+#define GORDON_REG_NOP          0x00
+#define GORDON_REG_IMGCTL1      0x10
+#define GORDON_REG_IMGCTL2      0x11
+#define GORDON_REG_IMGSET1      0x12
+#define GORDON_REG_IMGSET2      0x13
+#define GORDON_REG_IVBP1        0x14
+#define GORDON_REG_IHBP1        0x15
+#define GORDON_REG_IVNUM1       0x16
+#define GORDON_REG_IHNUM1       0x17
+#define GORDON_REG_IVBP2        0x18
+#define GORDON_REG_IHBP2        0x19
+#define GORDON_REG_IVNUM2       0x1A
+#define GORDON_REG_IHNUM2       0x1B
+#define GORDON_REG_LCDIFCTL1    0x30
+#define GORDON_REG_VALTRAN      0x31
+#define GORDON_REG_AVCTL        0x33
+#define GORDON_REG_LCDIFCTL2    0x34
+#define GORDON_REG_LCDIFCTL3    0x35
+#define GORDON_REG_LCDIFSET1    0x36
+#define GORDON_REG_PCCTL        0x3C
+#define GORDON_REG_TPARAM1      0x40
+#define GORDON_REG_TLCDIF1      0x41
+#define GORDON_REG_TSSPB_ST1    0x42
+#define GORDON_REG_TSSPB_ED1    0x43
+#define GORDON_REG_TSCK_ST1     0x44
+#define GORDON_REG_TSCK_WD1     0x45
+#define GORDON_REG_TGSPB_VST1   0x46
+#define GORDON_REG_TGSPB_VED1   0x47
+#define GORDON_REG_TGSPB_CH1    0x48
+#define GORDON_REG_TGCK_ST1     0x49
+#define GORDON_REG_TGCK_ED1     0x4A
+#define GORDON_REG_TPCTL_ST1    0x4B
+#define GORDON_REG_TPCTL_ED1    0x4C
+#define GORDON_REG_TPCHG_ED1    0x4D
+#define GORDON_REG_TCOM_CH1     0x4E
+#define GORDON_REG_THBP1        0x4F
+#define GORDON_REG_TPHCTL1      0x50
+#define GORDON_REG_EVPH1        0x51
+#define GORDON_REG_EVPL1        0x52
+#define GORDON_REG_EVNH1        0x53
+#define GORDON_REG_EVNL1        0x54
+#define GORDON_REG_TBIAS1       0x55
+#define GORDON_REG_TPARAM2      0x56
+#define GORDON_REG_TLCDIF2      0x57
+#define GORDON_REG_TSSPB_ST2    0x58
+#define GORDON_REG_TSSPB_ED2    0x59
+#define GORDON_REG_TSCK_ST2     0x5A
+#define GORDON_REG_TSCK_WD2     0x5B
+#define GORDON_REG_TGSPB_VST2   0x5C
+#define GORDON_REG_TGSPB_VED2   0x5D
+#define GORDON_REG_TGSPB_CH2    0x5E
+#define GORDON_REG_TGCK_ST2     0x5F
+#define GORDON_REG_TGCK_ED2     0x60
+#define GORDON_REG_TPCTL_ST2    0x61
+#define GORDON_REG_TPCTL_ED2    0x62
+#define GORDON_REG_TPCHG_ED2    0x63
+#define GORDON_REG_TCOM_CH2     0x64
+#define GORDON_REG_THBP2        0x65
+#define GORDON_REG_TPHCTL2      0x66
+#define GORDON_REG_POWCTL       0x80
+
+static int lcdc_gordon_panel_off(struct platform_device *pdev);
+
+static int spi_cs;
+static int spi_sclk;
+static int spi_sdo;
+static int spi_sdi;
+static int spi_dac;
+static unsigned char bit_shift[8] = { (1 << 7),        /* MSB */
+       (1 << 6),
+       (1 << 5),
+       (1 << 4),
+       (1 << 3),
+       (1 << 2),
+       (1 << 1),
+       (1 << 0)                               /* LSB */
+};
+
+struct gordon_state_type{
+       boolean disp_initialized;
+       boolean display_on;
+       boolean disp_powered_up;
+};
+
+static struct gordon_state_type gordon_state = { 0 };
+static struct msm_panel_common_pdata *lcdc_gordon_pdata;
+
+static void serigo(uint16 reg, uint8 data)
+{
+       unsigned int tx_val = ((0x00FF & reg) << 8) | data;
+       unsigned char i, val = 0;
+
+       /* Enable the Chip Select */
+       gpio_set_value(spi_cs, 1);
+       udelay(33);
+
+       /* Transmit it in two parts, Higher Byte first, then Lower Byte */
+       val = (unsigned char)((tx_val & 0xFF00) >> 8);
+
+       /* Clock should be Low before entering ! */
+       for (i = 0; i < 8; i++) {
+               /* #1: Drive the Data (High or Low) */
+               if (val & bit_shift[i])
+                       gpio_set_value(spi_sdi, 1);
+               else
+                       gpio_set_value(spi_sdi, 0);
+
+               /* #2: Drive the Clk High and then Low */
+               udelay(33);
+               gpio_set_value(spi_sclk, 1);
+               udelay(33);
+               gpio_set_value(spi_sclk, 0);
+       }
+
+       /* Idle state of SDO (MOSI) is Low */
+       gpio_set_value(spi_sdi, 0);
+       /* ..then Lower Byte */
+       val = (uint8) (tx_val & 0x00FF);
+       /* Before we enter here the Clock should be Low ! */
+
+       for (i = 0; i < 8; i++) {
+               /* #1: Drive the Data (High or Low) */
+               if (val & bit_shift[i])
+                       gpio_set_value(spi_sdi, 1);
+               else
+                       gpio_set_value(spi_sdi, 0);
+
+               /* #2: Drive the Clk High and then Low */
+               udelay(33);
+
+               gpio_set_value(spi_sclk, 1);
+               udelay(33);
+               gpio_set_value(spi_sclk, 0);
+       }
+
+       /* Idle state of SDO (MOSI) is Low */
+       gpio_set_value(spi_sdi, 0);
+
+       /* Now Disable the Chip Select */
+       udelay(33);
+       gpio_set_value(spi_cs, 0);
+}
+
+static void spi_init(void)
+{
+       /* Setting the Default GPIO's */
+       spi_sclk = *(lcdc_gordon_pdata->gpio_num);
+       spi_cs   = *(lcdc_gordon_pdata->gpio_num + 1);
+       spi_sdi  = *(lcdc_gordon_pdata->gpio_num + 2);
+       spi_sdo  = *(lcdc_gordon_pdata->gpio_num + 3);
+
+       /* Set the output so that we dont disturb the slave device */
+       gpio_set_value(spi_sclk, 0);
+       gpio_set_value(spi_sdi, 0);
+
+       /* Set the Chip Select De-asserted */
+       gpio_set_value(spi_cs, 0);
+
+}
+
+static void gordon_disp_powerup(void)
+{
+       if (!gordon_state.disp_powered_up && !gordon_state.display_on) {
+               /* Reset the hardware first */
+               /* Include DAC power up implementation here */
+             gordon_state.disp_powered_up = TRUE;
+       }
+}
+
+static void gordon_init(void)
+{
+       /* Image interface settings */
+       serigo(GORDON_REG_IMGCTL2, 0x00);
+       serigo(GORDON_REG_IMGSET1, 0x00);
+
+       /* Exchange the RGB signal for J510(Softbank mobile) */
+       serigo(GORDON_REG_IMGSET2, 0x12);
+       serigo(GORDON_REG_LCDIFSET1, 0x00);
+
+       /* Pre-charge settings */
+       serigo(GORDON_REG_PCCTL, 0x09);
+       serigo(GORDON_REG_LCDIFCTL2, 0x7B);
+
+       mdelay(1);
+}
+
+static void gordon_disp_on(void)
+{
+       if (gordon_state.disp_powered_up && !gordon_state.display_on) {
+               gordon_init();
+               mdelay(20);
+               /* gordon_dispmode setting */
+               serigo(GORDON_REG_TPARAM1, 0x30);
+               serigo(GORDON_REG_TLCDIF1, 0x00);
+               serigo(GORDON_REG_TSSPB_ST1, 0x8B);
+               serigo(GORDON_REG_TSSPB_ED1, 0x93);
+               serigo(GORDON_REG_TSCK_ST1, 0x88);
+               serigo(GORDON_REG_TSCK_WD1, 0x00);
+               serigo(GORDON_REG_TGSPB_VST1, 0x01);
+               serigo(GORDON_REG_TGSPB_VED1, 0x02);
+               serigo(GORDON_REG_TGSPB_CH1, 0x5E);
+               serigo(GORDON_REG_TGCK_ST1, 0x80);
+               serigo(GORDON_REG_TGCK_ED1, 0x3C);
+               serigo(GORDON_REG_TPCTL_ST1, 0x50);
+               serigo(GORDON_REG_TPCTL_ED1, 0x74);
+               serigo(GORDON_REG_TPCHG_ED1, 0x78);
+               serigo(GORDON_REG_TCOM_CH1, 0x50);
+               serigo(GORDON_REG_THBP1, 0x84);
+               serigo(GORDON_REG_TPHCTL1, 0x00);
+               serigo(GORDON_REG_EVPH1, 0x70);
+               serigo(GORDON_REG_EVPL1, 0x64);
+               serigo(GORDON_REG_EVNH1, 0x56);
+               serigo(GORDON_REG_EVNL1, 0x48);
+               serigo(GORDON_REG_TBIAS1, 0x88);
+
+               /* QVGA settings */
+               serigo(GORDON_REG_TPARAM2, 0x28);
+               serigo(GORDON_REG_TLCDIF2, 0x14);
+               serigo(GORDON_REG_TSSPB_ST2, 0x49);
+               serigo(GORDON_REG_TSSPB_ED2, 0x4B);
+               serigo(GORDON_REG_TSCK_ST2, 0x4A);
+               serigo(GORDON_REG_TSCK_WD2, 0x02);
+               serigo(GORDON_REG_TGSPB_VST2, 0x02);
+               serigo(GORDON_REG_TGSPB_VED2, 0x03);
+               serigo(GORDON_REG_TGSPB_CH2, 0x2F);
+               serigo(GORDON_REG_TGCK_ST2, 0x40);
+               serigo(GORDON_REG_TGCK_ED2, 0x1E);
+               serigo(GORDON_REG_TPCTL_ST2, 0x2C);
+               serigo(GORDON_REG_TPCTL_ED2, 0x3A);
+               serigo(GORDON_REG_TPCHG_ED2, 0x3C);
+               serigo(GORDON_REG_TCOM_CH2, 0x28);
+               serigo(GORDON_REG_THBP2, 0x4D);
+               serigo(GORDON_REG_TPHCTL2, 0x1A);
+
+               /* VGA settings */
+               serigo(GORDON_REG_IVBP1, 0x02);
+               serigo(GORDON_REG_IHBP1, 0x90);
+               serigo(GORDON_REG_IVNUM1, 0xA0);
+               serigo(GORDON_REG_IHNUM1, 0x78);
+
+               /* QVGA settings */
+               serigo(GORDON_REG_IVBP2, 0x02);
+               serigo(GORDON_REG_IHBP2, 0x48);
+               serigo(GORDON_REG_IVNUM2, 0x50);
+               serigo(GORDON_REG_IHNUM2, 0x3C);
+
+               /* Gordon Charge pump settings and ON */
+               serigo(GORDON_REG_POWCTL, 0x03);
+               mdelay(15);
+               serigo(GORDON_REG_POWCTL, 0x07);
+               mdelay(15);
+
+               serigo(GORDON_REG_POWCTL, 0x0F);
+               mdelay(15);
+
+               serigo(GORDON_REG_AVCTL, 0x03);
+               mdelay(15);
+
+               serigo(GORDON_REG_POWCTL, 0x1F);
+               mdelay(15);
+
+               serigo(GORDON_REG_POWCTL, 0x5F);
+               mdelay(15);
+
+               serigo(GORDON_REG_POWCTL, 0x7F);
+               mdelay(15);
+
+               serigo(GORDON_REG_LCDIFCTL1, 0x02);
+               mdelay(15);
+
+               serigo(GORDON_REG_IMGCTL1, 0x00);
+               mdelay(15);
+
+               serigo(GORDON_REG_LCDIFCTL3, 0x00);
+               mdelay(15);
+
+               serigo(GORDON_REG_VALTRAN, 0x01);
+               mdelay(15);
+
+               serigo(GORDON_REG_LCDIFCTL1, 0x03);
+               mdelay(1);
+               gordon_state.display_on = TRUE;
+       }
+}
+
+static int lcdc_gordon_panel_on(struct platform_device *pdev)
+{
+       if (!gordon_state.disp_initialized) {
+               /* Configure reset GPIO that drives DAC */
+               lcdc_gordon_pdata->panel_config_gpio(1);
+               spi_dac = *(lcdc_gordon_pdata->gpio_num + 4);
+               gpio_set_value(spi_dac, 0);
+               udelay(15);
+               gpio_set_value(spi_dac, 1);
+               spi_init();     /* LCD needs SPI */
+               gordon_disp_powerup();
+               gordon_disp_on();
+               gordon_state.disp_initialized = TRUE;
+       }
+       return 0;
+}
+
+static int lcdc_gordon_panel_off(struct platform_device *pdev)
+{
+       if (gordon_state.disp_powered_up && gordon_state.display_on) {
+               serigo(GORDON_REG_LCDIFCTL2, 0x7B);
+               serigo(GORDON_REG_VALTRAN, 0x01);
+               serigo(GORDON_REG_LCDIFCTL1, 0x02);
+               serigo(GORDON_REG_LCDIFCTL3, 0x01);
+               mdelay(20);
+               serigo(GORDON_REG_VALTRAN, 0x01);
+               serigo(GORDON_REG_IMGCTL1, 0x01);
+               serigo(GORDON_REG_LCDIFCTL1, 0x00);
+               mdelay(20);
+
+               serigo(GORDON_REG_POWCTL, 0x1F);
+               mdelay(40);
+
+               serigo(GORDON_REG_POWCTL, 0x07);
+               mdelay(40);
+
+               serigo(GORDON_REG_POWCTL, 0x03);
+               mdelay(40);
+
+               serigo(GORDON_REG_POWCTL, 0x00);
+               mdelay(40);
+               lcdc_gordon_pdata->panel_config_gpio(0);
+               gordon_state.display_on = FALSE;
+               gordon_state.disp_initialized = FALSE;
+       }
+       return 0;
+}
+
+static void lcdc_gordon_set_backlight(struct msm_fb_data_type *mfd)
+{
+               int bl_level = mfd->bl_level;
+
+               if (bl_level <= 1) {
+                       /* keep back light OFF */
+                       serigo(GORDON_REG_LCDIFCTL2, 0x0B);
+                       udelay(15);
+                       serigo(GORDON_REG_VALTRAN, 0x01);
+               } else {
+                       /* keep back light ON */
+                       serigo(GORDON_REG_LCDIFCTL2, 0x7B);
+                       udelay(15);
+                       serigo(GORDON_REG_VALTRAN, 0x01);
+               }
+}
+
+static int __init gordon_probe(struct platform_device *pdev)
+{
+       if (pdev->id == 0) {
+               lcdc_gordon_pdata = pdev->dev.platform_data;
+               return 0;
+       }
+       msm_fb_add_device(pdev);
+       return 0;
+}
+
+static struct platform_driver this_driver = {
+       .probe  = gordon_probe,
+       .driver = {
+               .name   = "lcdc_gordon_vga",
+       },
+};
+
+static struct msm_fb_panel_data gordon_panel_data = {
+       .on = lcdc_gordon_panel_on,
+       .off = lcdc_gordon_panel_off,
+       .set_backlight = lcdc_gordon_set_backlight,
+};
+
+static struct platform_device this_device = {
+       .name   = "lcdc_gordon_vga",
+       .id     = 1,
+       .dev    = {
+               .platform_data = &gordon_panel_data,
+       }
+};
+
+static int __init lcdc_gordon_panel_init(void)
+{
+       int ret;
+       struct msm_panel_info *pinfo;
+
+#ifdef CONFIG_FB_MSM_TRY_MDDI_CATCH_LCDC_PRISM
+       if (msm_fb_detect_client("lcdc_gordon_vga"))
+               return 0;
+#endif
+       ret = platform_driver_register(&this_driver);
+       if (ret)
+               return ret;
+
+       pinfo = &gordon_panel_data.panel_info;
+       pinfo->xres = 480;
+       pinfo->yres = 640;
+       pinfo->type = LCDC_PANEL;
+       pinfo->pdest = DISPLAY_1;
+       pinfo->wait_cycle = 0;
+       pinfo->bpp = 24;
+       pinfo->fb_num = 2;
+       pinfo->clk_rate = 24500000;
+       pinfo->bl_max = 4;
+       pinfo->bl_min = 1;
+
+       pinfo->lcdc.h_back_porch = 84;
+       pinfo->lcdc.h_front_porch = 33;
+       pinfo->lcdc.h_pulse_width = 60;
+       pinfo->lcdc.v_back_porch = 0;
+       pinfo->lcdc.v_front_porch = 2;
+       pinfo->lcdc.v_pulse_width = 2;
+       pinfo->lcdc.border_clr = 0;     /* blk */
+       pinfo->lcdc.underflow_clr = 0xff;       /* blue */
+       pinfo->lcdc.hsync_skew = 0;
+
+       ret = platform_device_register(&this_device);
+       if (ret)
+               platform_driver_unregister(&this_driver);
+
+       return ret;
+}
+
+module_init(lcdc_gordon_panel_init);
diff --git a/drivers/staging/msm/lcdc_grapefruit.c b/drivers/staging/msm/lcdc_grapefruit.c
new file mode 100644 (file)
index 0000000..7284649
--- /dev/null
@@ -0,0 +1,60 @@
+/* Copyright (c) 2009, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include "msm_fb.h"
+
+#ifdef CONFIG_FB_MSM_TRY_MDDI_CATCH_LCDC_PRISM
+#include "mddihosti.h"
+#endif
+
+static int __init lcdc_grapefruit_init(void)
+{
+       int ret;
+       struct msm_panel_info pinfo;
+
+#ifdef CONFIG_FB_MSM_TRY_MDDI_CATCH_LCDC_PRISM
+       if (msm_fb_detect_client("lcdc_grapefruit_vga"))
+               return 0;
+#endif
+
+       pinfo.xres = 1024;
+       pinfo.yres = 600;
+       pinfo.type = LCDC_PANEL;
+       pinfo.pdest = DISPLAY_1;
+       pinfo.wait_cycle = 0;
+       pinfo.bpp = 18;
+       pinfo.fb_num = 2;
+       pinfo.clk_rate = 40000000;
+
+       pinfo.lcdc.h_back_porch = 88;
+       pinfo.lcdc.h_front_porch = 40;
+       pinfo.lcdc.h_pulse_width = 128;
+       pinfo.lcdc.v_back_porch = 23;
+       pinfo.lcdc.v_front_porch = 1;
+       pinfo.lcdc.v_pulse_width = 4;
+       pinfo.lcdc.border_clr = 0;      /* blk */
+       pinfo.lcdc.underflow_clr = 0xff;        /* blue */
+       pinfo.lcdc.hsync_skew = 0;
+
+       ret = lcdc_device_register(&pinfo);
+       if (ret)
+               printk(KERN_ERR "%s: failed to register device!\n", __func__);
+
+       return ret;
+}
+
+module_init(lcdc_grapefruit_init);
diff --git a/drivers/staging/msm/lcdc_panel.c b/drivers/staging/msm/lcdc_panel.c
new file mode 100644 (file)
index 0000000..b40974e
--- /dev/null
@@ -0,0 +1,88 @@
+/* Copyright (c) 2008-2009, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include "msm_fb.h"
+
+static int lcdc_panel_on(struct platform_device *pdev)
+{
+       return 0;
+}
+
+static int lcdc_panel_off(struct platform_device *pdev)
+{
+       return 0;
+}
+
+static int __init lcdc_panel_probe(struct platform_device *pdev)
+{
+       msm_fb_add_device(pdev);
+
+       return 0;
+}
+
+static struct platform_driver this_driver = {
+       .probe  = lcdc_panel_probe,
+       .driver = {
+               .name   = "lcdc_panel",
+       },
+};
+
+static struct msm_fb_panel_data lcdc_panel_data = {
+       .on = lcdc_panel_on,
+       .off = lcdc_panel_off,
+};
+
+static int lcdc_dev_id;
+
+int lcdc_device_register(struct msm_panel_info *pinfo)
+{
+       struct platform_device *pdev = NULL;
+       int ret;
+
+       pdev = platform_device_alloc("lcdc_panel", ++lcdc_dev_id);
+       if (!pdev)
+               return -ENOMEM;
+
+       lcdc_panel_data.panel_info = *pinfo;
+       ret = platform_device_add_data(pdev, &lcdc_panel_data,
+               sizeof(lcdc_panel_data));
+       if (ret) {
+               printk(KERN_ERR
+                 "%s: platform_device_add_data failed!\n", __func__);
+               goto err_device_put;
+       }
+
+       ret = platform_device_add(pdev);
+       if (ret) {
+               printk(KERN_ERR
+                 "%s: platform_device_register failed!\n", __func__);
+               goto err_device_put;
+       }
+
+       return 0;
+
+err_device_put:
+       platform_device_put(pdev);
+       return ret;
+}
+
+static int __init lcdc_panel_init(void)
+{
+       return platform_driver_register(&this_driver);
+}
+
+module_init(lcdc_panel_init);
diff --git a/drivers/staging/msm/lcdc_prism.c b/drivers/staging/msm/lcdc_prism.c
new file mode 100644 (file)
index 0000000..d102c98
--- /dev/null
@@ -0,0 +1,64 @@
+/* Copyright (c) 2009, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include "msm_fb.h"
+
+#ifdef CONFIG_FB_MSM_TRY_MDDI_CATCH_LCDC_PRISM
+#include "mddihosti.h"
+#endif
+
+static int __init lcdc_prism_init(void)
+{
+       int ret;
+       struct msm_panel_info pinfo;
+
+#ifdef CONFIG_FB_MSM_TRY_MDDI_CATCH_LCDC_PRISM
+       ret = msm_fb_detect_client("lcdc_prism_wvga");
+       if (ret == -ENODEV)
+               return 0;
+
+       if (ret && (mddi_get_client_id() != 0))
+               return 0;
+#endif
+
+       pinfo.xres = 800;
+       pinfo.yres = 480;
+       pinfo.type = LCDC_PANEL;
+       pinfo.pdest = DISPLAY_1;
+       pinfo.wait_cycle = 0;
+       pinfo.bpp = 24;
+       pinfo.fb_num = 2;
+       pinfo.clk_rate = 38460000;
+
+       pinfo.lcdc.h_back_porch = 21;
+       pinfo.lcdc.h_front_porch = 81;
+       pinfo.lcdc.h_pulse_width = 60;
+       pinfo.lcdc.v_back_porch = 18;
+       pinfo.lcdc.v_front_porch = 27;
+       pinfo.lcdc.v_pulse_width = 2;
+       pinfo.lcdc.border_clr = 0;      /* blk */
+       pinfo.lcdc.underflow_clr = 0xff;        /* blue */
+       pinfo.lcdc.hsync_skew = 0;
+
+       ret = lcdc_device_register(&pinfo);
+       if (ret)
+               printk(KERN_ERR "%s: failed to register device!\n", __func__);
+
+       return ret;
+}
+
+module_init(lcdc_prism_init);
diff --git a/drivers/staging/msm/lcdc_sharp_wvga_pt.c b/drivers/staging/msm/lcdc_sharp_wvga_pt.c
new file mode 100644 (file)
index 0000000..1f08cf9
--- /dev/null
@@ -0,0 +1,290 @@
+/* Copyright (c) 2009, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <linux/delay.h>
+#ifdef CONFIG_ARCH_MSM7X30
+#include <linux/mfd/pmic8058.h>
+#endif
+#include <mach/gpio.h>
+#include "msm_fb.h"
+
+static int lcdc_sharp_panel_off(struct platform_device *pdev);
+
+static int spi_cs;
+static int spi_sclk;
+static int spi_mosi;
+static int spi_miso;
+static unsigned char bit_shift[8] = { (1 << 7),        /* MSB */
+       (1 << 6),
+       (1 << 5),
+       (1 << 4),
+       (1 << 3),
+       (1 << 2),
+       (1 << 1),
+       (1 << 0)                               /* LSB */
+};
+
+struct sharp_state_type {
+       boolean disp_initialized;
+       boolean display_on;
+       boolean disp_powered_up;
+};
+
+struct sharp_spi_data {
+       u8 addr;
+       u8 data;
+};
+
+static struct sharp_spi_data init_sequence[] = {
+       {  15, 0x01 },
+       {   5, 0x01 },
+       {   7, 0x10 },
+       {   9, 0x1E },
+       {  10, 0x04 },
+       {  17, 0xFF },
+       {  21, 0x8A },
+       {  22, 0x00 },
+       {  23, 0x82 },
+       {  24, 0x24 },
+       {  25, 0x22 },
+       {  26, 0x6D },
+       {  27, 0xEB },
+       {  28, 0xB9 },
+       {  29, 0x3A },
+       {  49, 0x1A },
+       {  50, 0x16 },
+       {  51, 0x05 },
+       {  55, 0x7F },
+       {  56, 0x15 },
+       {  57, 0x7B },
+       {  60, 0x05 },
+       {  61, 0x0C },
+       {  62, 0x80 },
+       {  63, 0x00 },
+       {  92, 0x90 },
+       {  97, 0x01 },
+       {  98, 0xFF },
+       { 113, 0x11 },
+       { 114, 0x02 },
+       { 115, 0x08 },
+       { 123, 0xAB },
+       { 124, 0x04 },
+       {   6, 0x02 },
+       { 133, 0x00 },
+       { 134, 0xFE },
+       { 135, 0x22 },
+       { 136, 0x0B },
+       { 137, 0xFF },
+       { 138, 0x0F },
+       { 139, 0x00 },
+       { 140, 0xFE },
+       { 141, 0x22 },
+       { 142, 0x0B },
+       { 143, 0xFF },
+       { 144, 0x0F },
+       { 145, 0x00 },
+       { 146, 0xFE },
+       { 147, 0x22 },
+       { 148, 0x0B },
+       { 149, 0xFF },
+       { 150, 0x0F },
+       { 202, 0x30 },
+       {  30, 0x01 },
+       {   4, 0x01 },
+       {  31, 0x41 },
+};
+
+static struct sharp_state_type sharp_state = { 0 };
+static struct msm_panel_common_pdata *lcdc_sharp_pdata;
+
+static void sharp_spi_write_byte(u8 val)
+{
+       int i;
+
+       /* Clock should be Low before entering */
+       for (i = 0; i < 8; i++) {
+               /* #1: Drive the Data (High or Low) */
+               if (val & bit_shift[i])
+                       gpio_set_value(spi_mosi, 1);
+               else
+                       gpio_set_value(spi_mosi, 0);
+
+               /* #2: Drive the Clk High and then Low */
+               gpio_set_value(spi_sclk, 1);
+               gpio_set_value(spi_sclk, 0);
+       }
+}
+
+static void serigo(u8 reg, u8 data)
+{
+       /* Enable the Chip Select - low */
+       gpio_set_value(spi_cs, 0);
+       udelay(1);
+
+       /* Transmit register address first, then data */
+       sharp_spi_write_byte(reg);
+
+       /* Idle state of MOSI is Low */
+       gpio_set_value(spi_mosi, 0);
+       udelay(1);
+       sharp_spi_write_byte(data);
+
+       gpio_set_value(spi_mosi, 0);
+       gpio_set_value(spi_cs, 1);
+}
+
+static void sharp_spi_init(void)
+{
+       spi_sclk = *(lcdc_sharp_pdata->gpio_num);
+       spi_cs   = *(lcdc_sharp_pdata->gpio_num + 1);
+       spi_mosi = *(lcdc_sharp_pdata->gpio_num + 2);
+       spi_miso = *(lcdc_sharp_pdata->gpio_num + 3);
+
+       /* Set the output so that we don't disturb the slave device */
+       gpio_set_value(spi_sclk, 0);
+       gpio_set_value(spi_mosi, 0);
+
+       /* Set the Chip Select deasserted (active low) */
+       gpio_set_value(spi_cs, 1);
+}
+
+static void sharp_disp_powerup(void)
+{
+       if (!sharp_state.disp_powered_up && !sharp_state.display_on)
+               sharp_state.disp_powered_up = TRUE;
+}
+
+static void sharp_disp_on(void)
+{
+       int i;
+
+       if (sharp_state.disp_powered_up && !sharp_state.display_on) {
+               for (i = 0; i < ARRAY_SIZE(init_sequence); i++) {
+                       serigo(init_sequence[i].addr,
+                              init_sequence[i].data);
+               }
+               mdelay(10);
+               serigo(31, 0xC1);
+               mdelay(10);
+               serigo(31, 0xD9);
+               serigo(31, 0xDF);
+
+               sharp_state.display_on = TRUE;
+       }
+}
+
+static int lcdc_sharp_panel_on(struct platform_device *pdev)
+{
+       if (!sharp_state.disp_initialized) {
+               lcdc_sharp_pdata->panel_config_gpio(1);
+               sharp_spi_init();
+               sharp_disp_powerup();
+               sharp_disp_on();
+               sharp_state.disp_initialized = TRUE;
+       }
+       return 0;
+}
+
+static int lcdc_sharp_panel_off(struct platform_device *pdev)
+{
+       if (sharp_state.disp_powered_up && sharp_state.display_on) {
+               serigo(4, 0x00);
+               mdelay(40);
+               serigo(31, 0xC1);
+               mdelay(40);
+               serigo(31, 0x00);
+               mdelay(100);
+               sharp_state.display_on = FALSE;
+               sharp_state.disp_initialized = FALSE;
+       }
+       return 0;
+}
+
+static int __init sharp_probe(struct platform_device *pdev)
+{
+       if (pdev->id == 0) {
+               lcdc_sharp_pdata = pdev->dev.platform_data;
+               return 0;
+       }
+       msm_fb_add_device(pdev);
+       return 0;
+}
+
+static struct platform_driver this_driver = {
+       .probe  = sharp_probe,
+       .driver = {
+               .name   = "lcdc_sharp_wvga",
+       },
+};
+
+static struct msm_fb_panel_data sharp_panel_data = {
+       .on = lcdc_sharp_panel_on,
+       .off = lcdc_sharp_panel_off,
+};
+
+static struct platform_device this_device = {
+       .name   = "lcdc_sharp_wvga",
+       .id     = 1,
+       .dev    = {
+               .platform_data = &sharp_panel_data,
+       }
+};
+
+static int __init lcdc_sharp_panel_init(void)
+{
+       int ret;
+       struct msm_panel_info *pinfo;
+
+#ifdef CONFIG_FB_MSM_MDDI_AUTO_DETECT
+       if (msm_fb_detect_client("lcdc_sharp_wvga_pt"))
+               return 0;
+#endif
+
+       ret = platform_driver_register(&this_driver);
+       if (ret)
+               return ret;
+
+       pinfo = &sharp_panel_data.panel_info;
+       pinfo->xres = 480;
+       pinfo->yres = 800;
+       pinfo->type = LCDC_PANEL;
+       pinfo->pdest = DISPLAY_1;
+       pinfo->wait_cycle = 0;
+       pinfo->bpp = 18;
+       pinfo->fb_num = 2;
+       pinfo->clk_rate = 24500000;
+       pinfo->bl_max = 4;
+       pinfo->bl_min = 1;
+
+       pinfo->lcdc.h_back_porch = 20;
+       pinfo->lcdc.h_front_porch = 10;
+       pinfo->lcdc.h_pulse_width = 10;
+       pinfo->lcdc.v_back_porch = 2;
+       pinfo->lcdc.v_front_porch = 2;
+       pinfo->lcdc.v_pulse_width = 2;
+       pinfo->lcdc.border_clr = 0;
+       pinfo->lcdc.underflow_clr = 0xff;
+       pinfo->lcdc.hsync_skew = 0;
+
+       ret = platform_device_register(&this_device);
+       if (ret)
+               platform_driver_unregister(&this_driver);
+
+       return ret;
+}
+
+module_init(lcdc_sharp_panel_init);
diff --git a/drivers/staging/msm/lcdc_st15.c b/drivers/staging/msm/lcdc_st15.c
new file mode 100644 (file)
index 0000000..fed8278
--- /dev/null
@@ -0,0 +1,237 @@
+/* Copyright (c) 2010, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <linux/i2c.h>
+#include <linux/delay.h>
+#include "msm_fb.h"
+
+#define DEVICE_NAME "sii9022"
+#define SII9022_DEVICE_ID   0xB0
+
+struct sii9022_i2c_addr_data{
+       u8 addr;
+       u8 data;
+};
+
+/* video mode data */
+static u8 video_mode_data[] = {
+       0x00,
+       0xF9, 0x1C, 0x70, 0x17, 0x72, 0x06, 0xEE, 0x02,
+};
+
+static u8 avi_io_format[] = {
+       0x09,
+       0x00, 0x00,
+};
+
+/* power state */
+static struct sii9022_i2c_addr_data regset0[] = {
+       { 0x60, 0x04 },
+       { 0x63, 0x00 },
+       { 0x1E, 0x00 },
+};
+
+static u8 video_infoframe[] = {
+       0x0C,
+       0xF0, 0x00, 0x68, 0x00, 0x04, 0x00, 0x19, 0x00,
+       0xE9, 0x02, 0x04, 0x01, 0x04, 0x06,
+};
+
+/* configure audio */
+static struct sii9022_i2c_addr_data regset1[] = {
+       { 0x26, 0x90 },
+       { 0x20, 0x90 },
+       { 0x1F, 0x80 },
+       { 0x26, 0x80 },
+       { 0x24, 0x02 },
+       { 0x25, 0x0B },
+       { 0xBC, 0x02 },
+       { 0xBD, 0x24 },
+       { 0xBE, 0x02 },
+};
+
+/* enable audio */
+static u8 misc_infoframe[] = {
+       0xBF,
+       0xC2, 0x84, 0x01, 0x0A, 0x6F, 0x02, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+
+/* set HDMI, active */
+static struct sii9022_i2c_addr_data regset2[] = {
+       { 0x1A, 0x01 },
+       { 0x3D, 0x00 },
+};
+
+static int send_i2c_data(struct i2c_client *client,
+                        struct sii9022_i2c_addr_data *regset,
+                        int size)
+{
+       int i;
+       int rc = 0;
+
+       for (i = 0; i < size; i++) {
+               rc = i2c_smbus_write_byte_data(
+                       client,
+                       regset[i].addr, regset[i].data);
+               if (rc)
+                       break;
+       }
+       return rc;
+}
+
+static int hdmi_sii_enable(struct i2c_client *client)
+{
+       int rc;
+       int retries = 10;
+       int count;
+
+       rc = i2c_smbus_write_byte_data(client, 0xC7, 0x00);
+       if (rc)
+               goto enable_exit;
+
+       do {
+               msleep(1);
+               rc = i2c_smbus_read_byte_data(client, 0x1B);
+       } while ((rc != SII9022_DEVICE_ID) && retries--);
+
+       if (rc != SII9022_DEVICE_ID)
+               return -ENODEV;
+
+       rc = i2c_smbus_write_byte_data(client, 0x1A, 0x11);
+       if (rc)
+               goto enable_exit;
+
+       count = ARRAY_SIZE(video_mode_data);
+       rc = i2c_master_send(client, video_mode_data, count);
+       if (rc != count) {
+               rc = -EIO;
+               goto enable_exit;
+       }
+
+       rc = i2c_smbus_write_byte_data(client, 0x08, 0x20);
+       if (rc)
+               goto enable_exit;
+       count = ARRAY_SIZE(avi_io_format);
+       rc = i2c_master_send(client, avi_io_format, count);
+       if (rc != count) {
+               rc = -EIO;
+               goto enable_exit;
+       }
+
+       rc = send_i2c_data(client, regset0, ARRAY_SIZE(regset0));
+       if (rc)
+               goto enable_exit;
+
+       count = ARRAY_SIZE(video_infoframe);
+       rc = i2c_master_send(client, video_infoframe, count);
+       if (rc != count) {
+               rc = -EIO;
+               goto enable_exit;
+       }
+
+       rc = send_i2c_data(client, regset1, ARRAY_SIZE(regset1));
+       if (rc)
+               goto enable_exit;
+
+       count = ARRAY_SIZE(misc_infoframe);
+       rc = i2c_master_send(client, misc_infoframe, count);
+       if (rc != count) {
+               rc = -EIO;
+               goto enable_exit;
+       }
+
+       rc = send_i2c_data(client, regset2, ARRAY_SIZE(regset2));
+       if (rc)
+               goto enable_exit;
+
+       return 0;
+enable_exit:
+       printk(KERN_ERR "%s: exited rc=%d\n", __func__, rc);
+       return rc;
+}
+
+static const struct i2c_device_id hmdi_sii_id[] = {
+       { DEVICE_NAME, 0 },
+       { }
+};
+
+static int hdmi_sii_probe(struct i2c_client *client,
+                       const struct i2c_device_id *id)
+{
+       int rc;
+
+       if (!i2c_check_functionality(client->adapter,
+                                    I2C_FUNC_SMBUS_BYTE | I2C_FUNC_I2C))
+               return -ENODEV;
+       rc = hdmi_sii_enable(client);
+       return rc;
+}
+
+
+static struct i2c_driver hdmi_sii_i2c_driver = {
+       .driver = {
+               .name = DEVICE_NAME,
+               .owner = THIS_MODULE,
+       },
+       .probe = hdmi_sii_probe,
+       .remove =  __exit_p(hdmi_sii_remove),
+       .id_table = hmdi_sii_id,
+};
+
+static int __init lcdc_st15_init(void)
+{
+       int ret;
+       struct msm_panel_info pinfo;
+
+       if (msm_fb_detect_client("lcdc_st15"))
+               return 0;
+
+       pinfo.xres = 1366;
+       pinfo.yres = 768;
+       pinfo.type = LCDC_PANEL;
+       pinfo.pdest = DISPLAY_1;
+       pinfo.wait_cycle = 0;
+       pinfo.bpp = 24;
+       pinfo.fb_num = 2;
+       pinfo.clk_rate = 74250000;
+
+       pinfo.lcdc.h_back_porch = 120;
+       pinfo.lcdc.h_front_porch = 20;
+       pinfo.lcdc.h_pulse_width = 40;
+       pinfo.lcdc.v_back_porch = 25;
+       pinfo.lcdc.v_front_porch = 1;
+       pinfo.lcdc.v_pulse_width = 7;
+       pinfo.lcdc.border_clr = 0;      /* blk */
+       pinfo.lcdc.underflow_clr = 0xff;        /* blue */
+       pinfo.lcdc.hsync_skew = 0;
+
+       ret = lcdc_device_register(&pinfo);
+       if (ret) {
+               printk(KERN_ERR "%s: failed to register device!\n", __func__);
+               goto init_exit;
+       }
+
+       ret = i2c_add_driver(&hdmi_sii_i2c_driver);
+       if (ret)
+               printk(KERN_ERR "%s: failed to add i2c driver\n", __func__);
+
+init_exit:
+       return ret;
+}
+
+module_init(lcdc_st15_init);
diff --git a/drivers/staging/msm/lcdc_st1_wxga.c b/drivers/staging/msm/lcdc_st1_wxga.c
new file mode 100644 (file)
index 0000000..7376001
--- /dev/null
@@ -0,0 +1,54 @@
+/* Copyright (c) 2009, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include "msm_fb.h"
+
+static int __init lcdc_st1_wxga_init(void)
+{
+       int ret;
+       struct msm_panel_info pinfo;
+
+       if (msm_fb_detect_client("lcdc_st1_wxga"))
+               return 0;
+
+       pinfo.xres = 1280;
+       pinfo.yres = 720;
+       pinfo.type = LCDC_PANEL;
+       pinfo.pdest = DISPLAY_1;
+       pinfo.wait_cycle = 0;
+       pinfo.bpp = 18;
+       pinfo.fb_num = 2;
+       pinfo.clk_rate = 74250000;
+
+       pinfo.lcdc.h_back_porch = 124;
+       pinfo.lcdc.h_front_porch = 110;
+       pinfo.lcdc.h_pulse_width = 136;
+       pinfo.lcdc.v_back_porch = 19;
+       pinfo.lcdc.v_front_porch = 5;
+       pinfo.lcdc.v_pulse_width = 6;
+       pinfo.lcdc.border_clr = 0;      /* blk */
+       pinfo.lcdc.underflow_clr = 0xff;        /* blue */
+       pinfo.lcdc.hsync_skew = 0;
+
+       ret = lcdc_device_register(&pinfo);
+       if (ret)
+               printk(KERN_ERR "%s: failed to register device!\n", __func__);
+
+       return ret;
+}
+
+module_init(lcdc_st1_wxga_init);
diff --git a/drivers/staging/msm/lcdc_toshiba_wvga_pt.c b/drivers/staging/msm/lcdc_toshiba_wvga_pt.c
new file mode 100644 (file)
index 0000000..864d7c1
--- /dev/null
@@ -0,0 +1,374 @@
+/* Copyright (c) 2009, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <linux/delay.h>
+#include <linux/module.h>
+#include <mach/gpio.h>
+#include <mach/pmic.h>
+#include "msm_fb.h"
+
+#ifdef CONFIG_FB_MSM_TRY_MDDI_CATCH_LCDC_PRISM
+#include "mddihosti.h"
+#endif
+
+static int spi_cs;
+static int spi_sclk;
+static int spi_mosi;
+static int spi_miso;
+
+struct toshiba_state_type{
+       boolean disp_initialized;
+       boolean display_on;
+       boolean disp_powered_up;
+};
+
+static struct toshiba_state_type toshiba_state = { 0 };
+static struct msm_panel_common_pdata *lcdc_toshiba_pdata;
+
+static void toshiba_spi_write_byte(char dc, uint8 data)
+{
+       uint32 bit;
+       int bnum;
+
+       gpio_set_value(spi_sclk, 0); /* clk low */
+       /* dc: 0 for command, 1 for parameter */
+       gpio_set_value(spi_mosi, dc);
+       udelay(1);      /* at least 20 ns */
+       gpio_set_value(spi_sclk, 1); /* clk high */
+       udelay(1);      /* at least 20 ns */
+       bnum = 8;       /* 8 data bits */
+       bit = 0x80;
+       while (bnum) {
+               gpio_set_value(spi_sclk, 0); /* clk low */
+               if (data & bit)
+                       gpio_set_value(spi_mosi, 1);
+               else
+                       gpio_set_value(spi_mosi, 0);
+               udelay(1);
+               gpio_set_value(spi_sclk, 1); /* clk high */
+               udelay(1);
+               bit >>= 1;
+               bnum--;
+       }
+}
+
+static void toshiba_spi_write(char cmd, uint32 data, int num)
+{
+       char *bp;
+
+       gpio_set_value(spi_cs, 1);      /* cs high */
+
+       /* command byte first */
+       toshiba_spi_write_byte(0, cmd);
+
+       /* followed by parameter bytes */
+       if (num) {
+               bp = (char *)&data;;
+               bp += (num - 1);
+               while (num) {
+                       toshiba_spi_write_byte(1, *bp);
+                       num--;
+                       bp--;
+               }
+       }
+
+       gpio_set_value(spi_cs, 0);      /* cs low */
+       udelay(1);
+}
+
+void toshiba_spi_read_bytes(char cmd, uint32 *data, int num)
+{
+       uint32 dbit, bits;
+       int bnum;
+
+       gpio_set_value(spi_cs, 1);      /* cs high */
+
+       /* command byte first */
+       toshiba_spi_write_byte(0, cmd);
+
+       if (num > 1) {
+               /* extra dc bit */
+               gpio_set_value(spi_sclk, 0); /* clk low */
+               udelay(1);
+               dbit = gpio_get_value(spi_miso);/* dc bit */
+               udelay(1);
+               gpio_set_value(spi_sclk, 1); /* clk high */
+       }
+
+       /* followed by data bytes */
+       bnum = num * 8; /* number of bits */
+       bits = 0;
+       while (bnum) {
+               bits <<= 1;
+               gpio_set_value(spi_sclk, 0); /* clk low */
+               udelay(1);
+               dbit = gpio_get_value(spi_miso);
+               udelay(1);
+               gpio_set_value(spi_sclk, 1); /* clk high */
+               bits |= dbit;
+               bnum--;
+       }
+
+       *data = bits;
+
+       udelay(1);
+       gpio_set_value(spi_cs, 0);      /* cs low */
+       udelay(1);
+}
+
+static void spi_pin_assign(void)
+{
+       /* Setting the Default GPIO's */
+       spi_sclk = *(lcdc_toshiba_pdata->gpio_num);
+       spi_cs   = *(lcdc_toshiba_pdata->gpio_num + 1);
+       spi_mosi  = *(lcdc_toshiba_pdata->gpio_num + 2);
+       spi_miso  = *(lcdc_toshiba_pdata->gpio_num + 3);
+}
+
+static void toshiba_disp_powerup(void)
+{
+       if (!toshiba_state.disp_powered_up && !toshiba_state.display_on) {
+               /* Reset the hardware first */
+               /* Include DAC power up implementation here */
+             toshiba_state.disp_powered_up = TRUE;
+       }
+}
+
+static void toshiba_disp_on(void)
+{
+       uint32  data;
+
+       gpio_set_value(spi_cs, 0);      /* low */
+       gpio_set_value(spi_sclk, 1);    /* high */
+       gpio_set_value(spi_mosi, 0);
+       gpio_set_value(spi_miso, 0);
+
+       if (toshiba_state.disp_powered_up && !toshiba_state.display_on) {
+               toshiba_spi_write(0, 0, 0);
+               mdelay(7);
+               toshiba_spi_write(0, 0, 0);
+               mdelay(7);
+               toshiba_spi_write(0, 0, 0);
+               mdelay(7);
+               toshiba_spi_write(0xba, 0x11, 1);
+               toshiba_spi_write(0x36, 0x00, 1);
+               mdelay(1);
+               toshiba_spi_write(0x3a, 0x60, 1);
+               toshiba_spi_write(0xb1, 0x5d, 1);
+               mdelay(1);
+               toshiba_spi_write(0xb2, 0x33, 1);
+               toshiba_spi_write(0xb3, 0x22, 1);
+               mdelay(1);
+               toshiba_spi_write(0xb4, 0x02, 1);
+               toshiba_spi_write(0xb5, 0x1e, 1); /* vcs -- adjust brightness */
+               mdelay(1);
+               toshiba_spi_write(0xb6, 0x27, 1);
+               toshiba_spi_write(0xb7, 0x03, 1);
+               mdelay(1);
+               toshiba_spi_write(0xb9, 0x24, 1);
+               toshiba_spi_write(0xbd, 0xa1, 1);
+               mdelay(1);
+               toshiba_spi_write(0xbb, 0x00, 1);
+               toshiba_spi_write(0xbf, 0x01, 1);
+               mdelay(1);
+               toshiba_spi_write(0xbe, 0x00, 1);
+               toshiba_spi_write(0xc0, 0x11, 1);
+               mdelay(1);
+               toshiba_spi_write(0xc1, 0x11, 1);
+               toshiba_spi_write(0xc2, 0x11, 1);
+               mdelay(1);
+               toshiba_spi_write(0xc3, 0x3232, 2);
+               mdelay(1);
+               toshiba_spi_write(0xc4, 0x3232, 2);
+               mdelay(1);
+               toshiba_spi_write(0xc5, 0x3232, 2);
+               mdelay(1);
+               toshiba_spi_write(0xc6, 0x3232, 2);
+               mdelay(1);
+               toshiba_spi_write(0xc7, 0x6445, 2);
+               mdelay(1);
+               toshiba_spi_write(0xc8, 0x44, 1);
+               toshiba_spi_write(0xc9, 0x52, 1);
+               mdelay(1);
+               toshiba_spi_write(0xca, 0x00, 1);
+               mdelay(1);
+               toshiba_spi_write(0xec, 0x02a4, 2);     /* 0x02a4 */
+               mdelay(1);
+               toshiba_spi_write(0xcf, 0x01, 1);
+               mdelay(1);
+               toshiba_spi_write(0xd0, 0xc003, 2);     /* c003 */
+               mdelay(1);
+               toshiba_spi_write(0xd1, 0x01, 1);
+               mdelay(1);
+               toshiba_spi_write(0xd2, 0x0028, 2);
+               mdelay(1);
+               toshiba_spi_write(0xd3, 0x0028, 2);
+               mdelay(1);
+               toshiba_spi_write(0xd4, 0x26a4, 2);
+               mdelay(1);
+               toshiba_spi_write(0xd5, 0x20, 1);
+               mdelay(1);
+               toshiba_spi_write(0xef, 0x3200, 2);
+               mdelay(32);
+               toshiba_spi_write(0xbc, 0x80, 1);       /* wvga pass through */
+               toshiba_spi_write(0x3b, 0x00, 1);
+               mdelay(1);
+               toshiba_spi_write(0xb0, 0x16, 1);
+               mdelay(1);
+               toshiba_spi_write(0xb8, 0xfff5, 2);
+               mdelay(1);
+               toshiba_spi_write(0x11, 0, 0);
+               mdelay(5);
+               toshiba_spi_write(0x29, 0, 0);
+               mdelay(5);
+               toshiba_state.display_on = TRUE;
+       }
+
+       data = 0;
+       toshiba_spi_read_bytes(0x04, &data, 3);
+       printk(KERN_INFO "toshiba_disp_on: id=%x\n", data);
+
+}
+
+static int lcdc_toshiba_panel_on(struct platform_device *pdev)
+{
+       if (!toshiba_state.disp_initialized) {
+               /* Configure reset GPIO that drives DAC */
+               if (lcdc_toshiba_pdata->panel_config_gpio)
+                       lcdc_toshiba_pdata->panel_config_gpio(1);
+               toshiba_disp_powerup();
+               toshiba_disp_on();
+               toshiba_state.disp_initialized = TRUE;
+       }
+       return 0;
+}
+
+static int lcdc_toshiba_panel_off(struct platform_device *pdev)
+{
+       if (toshiba_state.disp_powered_up && toshiba_state.display_on) {
+               /* Main panel power off (Deep standby in) */
+
+               toshiba_spi_write(0x28, 0, 0);  /* display off */
+               mdelay(1);
+               toshiba_spi_write(0xb8, 0x8002, 2);     /* output control */
+               mdelay(1);
+               toshiba_spi_write(0x10, 0x00, 1);       /* sleep mode in */
+               mdelay(85);             /* wait 85 msec */
+               toshiba_spi_write(0xb0, 0x00, 1);       /* deep standby in */
+               mdelay(1);
+               if (lcdc_toshiba_pdata->panel_config_gpio)
+                       lcdc_toshiba_pdata->panel_config_gpio(0);
+               toshiba_state.display_on = FALSE;
+               toshiba_state.disp_initialized = FALSE;
+       }
+       return 0;
+}
+
+static void lcdc_toshiba_set_backlight(struct msm_fb_data_type *mfd)
+{
+       int bl_level;
+       int ret = -EPERM;
+
+       bl_level = mfd->bl_level;
+       ret = pmic_set_led_intensity(LED_LCD, bl_level);
+
+       if (ret)
+               printk(KERN_WARNING "%s: can't set lcd backlight!\n",
+                               __func__);
+}
+
+static int __init toshiba_probe(struct platform_device *pdev)
+{
+       if (pdev->id == 0) {
+               lcdc_toshiba_pdata = pdev->dev.platform_data;
+               spi_pin_assign();
+               return 0;
+       }
+       msm_fb_add_device(pdev);
+       return 0;
+}
+
+static struct platform_driver this_driver = {
+       .probe  = toshiba_probe,
+       .driver = {
+               .name   = "lcdc_toshiba_wvga",
+       },
+};
+
+static struct msm_fb_panel_data toshiba_panel_data = {
+       .on = lcdc_toshiba_panel_on,
+       .off = lcdc_toshiba_panel_off,
+       .set_backlight = lcdc_toshiba_set_backlight,
+};
+
+static struct platform_device this_device = {
+       .name   = "lcdc_toshiba_wvga",
+       .id     = 1,
+       .dev    = {
+               .platform_data = &toshiba_panel_data,
+       }
+};
+
+static int __init lcdc_toshiba_panel_init(void)
+{
+       int ret;
+       struct msm_panel_info *pinfo;
+#ifdef CONFIG_FB_MSM_TRY_MDDI_CATCH_LCDC_PRISM
+       if (mddi_get_client_id() != 0)
+               return 0;
+
+       ret = msm_fb_detect_client("lcdc_toshiba_wvga_pt");
+       if (ret)
+               return 0;
+
+#endif
+
+       ret = platform_driver_register(&this_driver);
+       if (ret)
+               return ret;
+
+       pinfo = &toshiba_panel_data.panel_info;
+       pinfo->xres = 480;
+       pinfo->yres = 800;
+       pinfo->type = LCDC_PANEL;
+       pinfo->pdest = DISPLAY_1;
+       pinfo->wait_cycle = 0;
+       pinfo->bpp = 18;
+       pinfo->fb_num = 2;
+       /* 30Mhz mdp_lcdc_pclk and mdp_lcdc_pad_pcl */
+       pinfo->clk_rate = 27648000;
+       pinfo->bl_max = 15;
+       pinfo->bl_min = 1;
+
+       pinfo->lcdc.h_back_porch = 184; /* hsw = 8 + hbp=184 */
+       pinfo->lcdc.h_front_porch = 4;
+       pinfo->lcdc.h_pulse_width = 8;
+       pinfo->lcdc.v_back_porch = 2;   /* vsw=1 + vbp = 2 */
+       pinfo->lcdc.v_front_porch = 3;
+       pinfo->lcdc.v_pulse_width = 1;
+       pinfo->lcdc.border_clr = 0;     /* blk */
+       pinfo->lcdc.underflow_clr = 0xff;       /* blue */
+       pinfo->lcdc.hsync_skew = 0;
+
+       ret = platform_device_register(&this_device);
+       if (ret)
+               platform_driver_unregister(&this_driver);
+
+       return ret;
+}
+
+device_initcall(lcdc_toshiba_panel_init);
diff --git a/drivers/staging/msm/lcdc_wxga.c b/drivers/staging/msm/lcdc_wxga.c
new file mode 100644 (file)
index 0000000..202c92c
--- /dev/null
@@ -0,0 +1,56 @@
+/* Copyright (c) 2009, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include "msm_fb.h"
+
+static int __init lcdc_wxga_init(void)
+{
+       int ret;
+       struct msm_panel_info pinfo;
+
+#ifdef CONFIG_FB_MSM_MDDI_AUTO_DETECT
+       if (msm_fb_detect_client("lcdc_wxga"))
+               return 0;
+#endif
+
+       pinfo.xres = 1280;
+       pinfo.yres = 720;
+       pinfo.type = LCDC_PANEL;
+       pinfo.pdest = DISPLAY_1;
+       pinfo.wait_cycle = 0;
+       pinfo.bpp = 24;
+       pinfo.fb_num = 2;
+       pinfo.clk_rate = 74250000;
+
+       pinfo.lcdc.h_back_porch = 124;
+       pinfo.lcdc.h_front_porch = 110;
+       pinfo.lcdc.h_pulse_width = 136;
+       pinfo.lcdc.v_back_porch = 19;
+       pinfo.lcdc.v_front_porch = 5;
+       pinfo.lcdc.v_pulse_width = 6;
+       pinfo.lcdc.border_clr = 0;      /* blk */
+       pinfo.lcdc.underflow_clr = 0xff;        /* blue */
+       pinfo.lcdc.hsync_skew = 0;
+
+       ret = lcdc_device_register(&pinfo);
+       if (ret)
+               printk(KERN_ERR "%s: failed to register device!\n", __func__);
+
+       return ret;
+}
+
+module_init(lcdc_wxga_init);
diff --git a/drivers/staging/msm/logo.c b/drivers/staging/msm/logo.c
new file mode 100644 (file)
index 0000000..7272765
--- /dev/null
@@ -0,0 +1,98 @@
+/* drivers/video/msm/logo.c
+ *
+ * Show Logo in RLE 565 format
+ *
+ * Copyright (C) 2008 Google Incorporated
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/fb.h>
+#include <linux/vt_kern.h>
+#include <linux/unistd.h>
+#include <linux/syscalls.h>
+
+#include <linux/irq.h>
+#include <asm/system.h>
+
+#define fb_width(fb)   ((fb)->var.xres)
+#define fb_height(fb)  ((fb)->var.yres)
+#define fb_size(fb)    ((fb)->var.xres * (fb)->var.yres * 2)
+
+static void memset16(void *_ptr, unsigned short val, unsigned count)
+{
+       unsigned short *ptr = _ptr;
+       count >>= 1;
+       while (count--)
+               *ptr++ = val;
+}
+
+/* 565RLE image format: [count(2 bytes), rle(2 bytes)] */
+int load_565rle_image(char *filename)
+{
+       struct fb_info *info;
+       int fd, err = 0;
+       unsigned count, max;
+       unsigned short *data, *bits, *ptr;
+
+       info = registered_fb[0];
+       if (!info) {
+               printk(KERN_WARNING "%s: Can not access framebuffer\n",
+                       __func__);
+               return -ENODEV;
+       }
+
+       fd = sys_open(filename, O_RDONLY, 0);
+       if (fd < 0) {
+               printk(KERN_WARNING "%s: Can not open %s\n",
+                       __func__, filename);
+               return -ENOENT;
+       }
+       count = (unsigned)sys_lseek(fd, (off_t)0, 2);
+       if (count == 0) {
+               sys_close(fd);
+               err = -EIO;
+               goto err_logo_close_file;
+       }
+       sys_lseek(fd, (off_t)0, 0);
+       data = kmalloc(count, GFP_KERNEL);
+       if (!data) {
+               printk(KERN_WARNING "%s: Can not alloc data\n", __func__);
+               err = -ENOMEM;
+               goto err_logo_close_file;
+       }
+       if ((unsigned)sys_read(fd, (char *)data, count) != count) {
+               err = -EIO;
+               goto err_logo_free_data;
+       }
+
+       max = fb_width(info) * fb_height(info);
+       ptr = data;
+       bits = (unsigned short *)(info->screen_base);
+       while (count > 3) {
+               unsigned n = ptr[0];
+               if (n > max)
+                       break;
+               memset16(bits, ptr[1], n << 1);
+               bits += n;
+               max -= n;
+               ptr += 2;
+               count -= 4;
+       }
+
+err_logo_free_data:
+       kfree(data);
+err_logo_close_file:
+       sys_close(fd);
+       return err;
+}
+EXPORT_SYMBOL(load_565rle_image);
diff --git a/drivers/staging/msm/mddi.c b/drivers/staging/msm/mddi.c
new file mode 100644 (file)
index 0000000..132eb1a
--- /dev/null
@@ -0,0 +1,375 @@
+/* Copyright (c) 2008-2009, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/time.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/spinlock.h>
+#include <linux/delay.h>
+#include <mach/hardware.h>
+#include <asm/io.h>
+
+#include <asm/system.h>
+#include <asm/mach-types.h>
+#include <linux/semaphore.h>
+#include <linux/uaccess.h>
+#include <linux/clk.h>
+#include <linux/platform_device.h>
+
+#include "msm_fb.h"
+#include "mddihosti.h"
+#include "mddihost.h"
+#include <mach/gpio.h>
+#include <mach/clk.h>
+
+static int mddi_probe(struct platform_device *pdev);
+static int mddi_remove(struct platform_device *pdev);
+
+static int mddi_off(struct platform_device *pdev);
+static int mddi_on(struct platform_device *pdev);
+
+static int mddi_suspend(struct platform_device *pdev, pm_message_t state);
+static int mddi_resume(struct platform_device *pdev);
+
+#ifdef CONFIG_HAS_EARLYSUSPEND
+static void mddi_early_suspend(struct early_suspend *h);
+static void mddi_early_resume(struct early_suspend *h);
+#endif
+
+static struct platform_device *pdev_list[MSM_FB_MAX_DEV_LIST];
+static int pdev_list_cnt;
+static struct clk *mddi_clk;
+static struct clk *mddi_pclk;
+static struct mddi_platform_data *mddi_pdata;
+
+static struct platform_driver mddi_driver = {
+       .probe = mddi_probe,
+       .remove = mddi_remove,
+#ifndef CONFIG_HAS_EARLYSUSPEND
+#ifdef CONFIG_PM
+       .suspend = mddi_suspend,
+       .resume = mddi_resume,
+#endif
+#endif
+       .suspend_late = NULL,
+       .resume_early = NULL,
+       .shutdown = NULL,
+       .driver = {
+                  .name = "mddi",
+                  },
+};
+
+extern int int_mddi_pri_flag;
+
+static int mddi_off(struct platform_device *pdev)
+{
+       int ret = 0;
+
+       ret = panel_next_off(pdev);
+
+       if (mddi_pdata && mddi_pdata->mddi_power_save)
+               mddi_pdata->mddi_power_save(0);
+
+       return ret;
+}
+
+static int mddi_on(struct platform_device *pdev)
+{
+       int ret = 0;
+       u32 clk_rate;
+       struct msm_fb_data_type *mfd;
+
+       mfd = platform_get_drvdata(pdev);
+
+       if (mddi_pdata && mddi_pdata->mddi_power_save)
+               mddi_pdata->mddi_power_save(1);
+
+       clk_rate = mfd->fbi->var.pixclock;
+       clk_rate = min(clk_rate, mfd->panel_info.clk_max);
+
+       if (mddi_pdata &&
+           mddi_pdata->mddi_sel_clk &&
+           mddi_pdata->mddi_sel_clk(&clk_rate))
+                       printk(KERN_ERR
+                         "%s: can't select mddi io clk targate rate = %d\n",
+                         __func__, clk_rate);
+
+       if (clk_set_min_rate(mddi_clk, clk_rate) < 0)
+               printk(KERN_ERR "%s: clk_set_min_rate failed\n",
+                       __func__);
+
+       ret = panel_next_on(pdev);
+
+       return ret;
+}
+
+static int mddi_resource_initialized;
+
+static int mddi_probe(struct platform_device *pdev)
+{
+       struct msm_fb_data_type *mfd;
+       struct platform_device *mdp_dev = NULL;
+       struct msm_fb_panel_data *pdata = NULL;
+       int rc;
+       resource_size_t size ;
+       u32 clk_rate;
+
+       if ((pdev->id == 0) && (pdev->num_resources >= 0)) {
+               mddi_pdata = pdev->dev.platform_data;
+
+               size =  resource_size(&pdev->resource[0]);
+               msm_pmdh_base =  ioremap(pdev->resource[0].start, size);
+
+               MSM_FB_INFO("primary mddi base phy_addr = 0x%x virt = 0x%x\n",
+                               pdev->resource[0].start, (int) msm_pmdh_base);
+
+               if (unlikely(!msm_pmdh_base))
+                       return -ENOMEM;
+
+               if (mddi_pdata && mddi_pdata->mddi_power_save)
+                       mddi_pdata->mddi_power_save(1);
+
+               mddi_resource_initialized = 1;
+               return 0;
+       }
+
+       if (!mddi_resource_initialized)
+               return -EPERM;
+
+       mfd = platform_get_drvdata(pdev);
+
+       if (!mfd)
+               return -ENODEV;
+
+       if (mfd->key != MFD_KEY)
+               return -EINVAL;
+
+       if (pdev_list_cnt >= MSM_FB_MAX_DEV_LIST)
+               return -ENOMEM;
+
+       mdp_dev = platform_device_alloc("mdp", pdev->id);
+       if (!mdp_dev)
+               return -ENOMEM;
+
+       /*
+        * link to the latest pdev
+        */
+       mfd->pdev = mdp_dev;
+       mfd->dest = DISPLAY_LCD;
+
+       /*
+        * alloc panel device data
+        */
+       if (platform_device_add_data
+           (mdp_dev, pdev->dev.platform_data,
+            sizeof(struct msm_fb_panel_data))) {
+               printk(KERN_ERR "mddi_probe: platform_device_add_data failed!\n");
+               platform_device_put(mdp_dev);
+               return -ENOMEM;
+       }
+       /*
+        * data chain
+        */
+       pdata = mdp_dev->dev.platform_data;
+       pdata->on = mddi_on;
+       pdata->off = mddi_off;
+       pdata->next = pdev;
+
+       /*
+        * get/set panel specific fb info
+        */
+       mfd->panel_info = pdata->panel_info;
+       mfd->fb_imgType = MDP_RGB_565;
+
+       clk_rate = mfd->panel_info.clk_max;
+       if (mddi_pdata &&
+           mddi_pdata->mddi_sel_clk &&
+           mddi_pdata->mddi_sel_clk(&clk_rate))
+                       printk(KERN_ERR
+                         "%s: can't select mddi io clk targate rate = %d\n",
+                         __func__, clk_rate);
+
+       if (clk_set_max_rate(mddi_clk, clk_rate) < 0)
+               printk(KERN_ERR "%s: clk_set_max_rate failed\n", __func__);
+       mfd->panel_info.clk_rate = mfd->panel_info.clk_min;
+
+       /*
+        * set driver data
+        */
+       platform_set_drvdata(mdp_dev, mfd);
+
+       /*
+        * register in mdp driver
+        */
+       rc = platform_device_add(mdp_dev);
+       if (rc)
+               goto mddi_probe_err;
+
+       pdev_list[pdev_list_cnt++] = pdev;
+
+#ifdef CONFIG_HAS_EARLYSUSPEND
+       mfd->mddi_early_suspend.level = EARLY_SUSPEND_LEVEL_DISABLE_FB;
+       mfd->mddi_early_suspend.suspend = mddi_early_suspend;
+       mfd->mddi_early_suspend.resume = mddi_early_resume;
+       register_early_suspend(&mfd->mddi_early_suspend);
+#endif
+
+       return 0;
+
+mddi_probe_err:
+       platform_device_put(mdp_dev);
+       return rc;
+}
+
+static int mddi_pad_ctrl;
+static int mddi_power_locked;
+static int mddi_is_in_suspend;
+
+void mddi_disable(int lock)
+{
+       mddi_host_type host_idx = MDDI_HOST_PRIM;
+
+       if (mddi_power_locked)
+               return;
+
+       if (lock)
+               mddi_power_locked = 1;
+
+       if (mddi_host_timer.function)
+               del_timer_sync(&mddi_host_timer);
+
+       mddi_pad_ctrl = mddi_host_reg_in(PAD_CTL);
+       mddi_host_reg_out(PAD_CTL, 0x0);
+
+       if (clk_set_min_rate(mddi_clk, 0) < 0)
+               printk(KERN_ERR "%s: clk_set_min_rate failed\n", __func__);
+
+       clk_disable(mddi_clk);
+       if (mddi_pclk)
+               clk_disable(mddi_pclk);
+       disable_irq(INT_MDDI_PRI);
+
+       if (mddi_pdata && mddi_pdata->mddi_power_save)
+               mddi_pdata->mddi_power_save(0);
+}
+
+static int mddi_suspend(struct platform_device *pdev, pm_message_t state)
+{
+       if (mddi_is_in_suspend)
+               return 0;
+
+       mddi_is_in_suspend = 1;
+       mddi_disable(0);
+       return 0;
+}
+
+static int mddi_resume(struct platform_device *pdev)
+{
+       mddi_host_type host_idx = MDDI_HOST_PRIM;
+
+       if (!mddi_is_in_suspend)
+               return 0;
+
+       mddi_is_in_suspend = 0;
+
+       if (mddi_power_locked)
+               return 0;
+
+       enable_irq(INT_MDDI_PRI);
+       clk_enable(mddi_clk);
+       if (mddi_pclk)
+               clk_enable(mddi_pclk);
+       mddi_host_reg_out(PAD_CTL, mddi_pad_ctrl);
+
+       if (mddi_host_timer.function)
+               mddi_host_timer_service(0);
+
+       return 0;
+}
+
+#ifdef CONFIG_HAS_EARLYSUSPEND
+static void mddi_early_suspend(struct early_suspend *h)
+{
+       pm_message_t state;
+       struct msm_fb_data_type *mfd = container_of(h, struct msm_fb_data_type,
+                                                       mddi_early_suspend);
+
+       state.event = PM_EVENT_SUSPEND;
+       mddi_suspend(mfd->pdev, state);
+}
+
+static void mddi_early_resume(struct early_suspend *h)
+{
+       struct msm_fb_data_type *mfd = container_of(h, struct msm_fb_data_type,
+                                                       mddi_early_suspend);
+       mddi_resume(mfd->pdev);
+}
+#endif
+
+static int mddi_remove(struct platform_device *pdev)
+{
+       if (mddi_host_timer.function)
+               del_timer_sync(&mddi_host_timer);
+
+       iounmap(msm_pmdh_base);
+
+       return 0;
+}
+
+static int mddi_register_driver(void)
+{
+       return platform_driver_register(&mddi_driver);
+}
+
+static int __init mddi_driver_init(void)
+{
+       int ret;
+
+       mddi_clk = clk_get(NULL, "mddi_clk");
+       if (IS_ERR(mddi_clk)) {
+               printk(KERN_ERR "can't find mddi_clk \n");
+               return PTR_ERR(mddi_clk);
+       }
+       clk_enable(mddi_clk);
+
+       mddi_pclk = clk_get(NULL, "mddi_pclk");
+       if (IS_ERR(mddi_pclk))
+               mddi_pclk = NULL;
+       else
+               clk_enable(mddi_pclk);
+
+       ret = mddi_register_driver();
+       if (ret) {
+               clk_disable(mddi_clk);
+               clk_put(mddi_clk);
+               if (mddi_pclk) {
+                       clk_disable(mddi_pclk);
+                       clk_put(mddi_pclk);
+               }
+               printk(KERN_ERR "mddi_register_driver() failed!\n");
+               return ret;
+       }
+
+       mddi_init();
+
+       return ret;
+}
+
+module_init(mddi_driver_init);
diff --git a/drivers/staging/msm/mddi_ext.c b/drivers/staging/msm/mddi_ext.c
new file mode 100644 (file)
index 0000000..c0c168c
--- /dev/null
@@ -0,0 +1,320 @@
+/* Copyright (c) 2008-2009, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/time.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/spinlock.h>
+#include <linux/delay.h>
+#include <mach/hardware.h>
+#include <asm/io.h>
+
+#include <asm/system.h>
+#include <asm/mach-types.h>
+#include <linux/semaphore.h>
+#include <linux/uaccess.h>
+#include <linux/clk.h>
+#include <mach/clk.h>
+#include <linux/platform_device.h>
+
+#include "msm_fb.h"
+#include "mddihosti.h"
+
+static int mddi_ext_probe(struct platform_device *pdev);
+static int mddi_ext_remove(struct platform_device *pdev);
+
+static int mddi_ext_off(struct platform_device *pdev);
+static int mddi_ext_on(struct platform_device *pdev);
+
+static struct platform_device *pdev_list[MSM_FB_MAX_DEV_LIST];
+static int pdev_list_cnt;
+
+static int mddi_ext_suspend(struct platform_device *pdev, pm_message_t state);
+static int mddi_ext_resume(struct platform_device *pdev);
+
+#ifdef CONFIG_HAS_EARLYSUSPEND
+static void mddi_ext_early_suspend(struct early_suspend *h);
+static void mddi_ext_early_resume(struct early_suspend *h);
+#endif
+
+static struct platform_driver mddi_ext_driver = {
+       .probe = mddi_ext_probe,
+       .remove = mddi_ext_remove,
+#ifndef CONFIG_HAS_EARLYSUSPEND
+#ifdef CONFIG_PM
+       .suspend = mddi_ext_suspend,
+       .resume = mddi_ext_resume,
+#endif
+#endif
+       .resume_early = NULL,
+       .resume = NULL,
+       .shutdown = NULL,
+       .driver = {
+                  .name = "mddi_ext",
+                  },
+};
+
+static struct clk *mddi_ext_clk;
+static struct mddi_platform_data *mddi_ext_pdata;
+
+extern int int_mddi_ext_flag;
+
+static int mddi_ext_off(struct platform_device *pdev)
+{
+       int ret = 0;
+
+       ret = panel_next_off(pdev);
+       mddi_host_stop_ext_display();
+
+       return ret;
+}
+
+static int mddi_ext_on(struct platform_device *pdev)
+{
+       int ret = 0;
+       u32 clk_rate;
+       struct msm_fb_data_type *mfd;
+
+       mfd = platform_get_drvdata(pdev);
+
+       clk_rate = mfd->fbi->var.pixclock;
+       clk_rate = min(clk_rate, mfd->panel_info.clk_max);
+
+       if (mddi_ext_pdata &&
+           mddi_ext_pdata->mddi_sel_clk &&
+           mddi_ext_pdata->mddi_sel_clk(&clk_rate))
+               printk(KERN_ERR
+                         "%s: can't select mddi io clk targate rate = %d\n",
+                         __func__, clk_rate);
+
+       if (clk_set_min_rate(mddi_ext_clk, clk_rate) < 0)
+               printk(KERN_ERR "%s: clk_set_min_rate failed\n",
+                       __func__);
+
+       mddi_host_start_ext_display();
+       ret = panel_next_on(pdev);
+
+       return ret;
+}
+
+static int mddi_ext_resource_initialized;
+
+static int mddi_ext_probe(struct platform_device *pdev)
+{
+       struct msm_fb_data_type *mfd;
+       struct platform_device *mdp_dev = NULL;
+       struct msm_fb_panel_data *pdata = NULL;
+       int rc;
+       resource_size_t size ;
+       u32 clk_rate;
+
+       if ((pdev->id == 0) && (pdev->num_resources >= 0)) {
+               mddi_ext_pdata = pdev->dev.platform_data;
+
+               size =  resource_size(&pdev->resource[0]);
+               msm_emdh_base = ioremap(pdev->resource[0].start, size);
+
+               MSM_FB_INFO("external mddi base address = 0x%x\n",
+                               pdev->resource[0].start);
+
+               if (unlikely(!msm_emdh_base))
+                       return -ENOMEM;
+
+               mddi_ext_resource_initialized = 1;
+               return 0;
+       }
+
+       if (!mddi_ext_resource_initialized)
+               return -EPERM;
+
+       mfd = platform_get_drvdata(pdev);
+
+       if (!mfd)
+               return -ENODEV;
+
+       if (mfd->key != MFD_KEY)
+               return -EINVAL;
+
+       if (pdev_list_cnt >= MSM_FB_MAX_DEV_LIST)
+               return -ENOMEM;
+
+       mdp_dev = platform_device_alloc("mdp", pdev->id);
+       if (!mdp_dev)
+               return -ENOMEM;
+
+       /*
+        * link to the latest pdev
+        */
+       mfd->pdev = mdp_dev;
+       mfd->dest = DISPLAY_EXT_MDDI;
+
+       /*
+        * alloc panel device data
+        */
+       if (platform_device_add_data
+           (mdp_dev, pdev->dev.platform_data,
+            sizeof(struct msm_fb_panel_data))) {
+               printk(KERN_ERR "mddi_ext_probe: platform_device_add_data failed!\n");
+               platform_device_put(mdp_dev);
+               return -ENOMEM;
+       }
+       /*
+        * data chain
+        */
+       pdata = mdp_dev->dev.platform_data;
+       pdata->on = mddi_ext_on;
+       pdata->off = mddi_ext_off;
+       pdata->next = pdev;
+
+       /*
+        * get/set panel specific fb info
+        */
+       mfd->panel_info = pdata->panel_info;
+       mfd->fb_imgType = MDP_RGB_565;
+
+       clk_rate = mfd->panel_info.clk_max;
+       if (mddi_ext_pdata &&
+           mddi_ext_pdata->mddi_sel_clk &&
+           mddi_ext_pdata->mddi_sel_clk(&clk_rate))
+                       printk(KERN_ERR
+                         "%s: can't select mddi io clk targate rate = %d\n",
+                         __func__, clk_rate);
+
+       if (clk_set_max_rate(mddi_ext_clk, clk_rate) < 0)
+               printk(KERN_ERR "%s: clk_set_max_rate failed\n", __func__);
+       mfd->panel_info.clk_rate = mfd->panel_info.clk_min;
+
+       /*
+        * set driver data
+        */
+       platform_set_drvdata(mdp_dev, mfd);
+
+       /*
+        * register in mdp driver
+        */
+       rc = platform_device_add(mdp_dev);
+       if (rc)
+               goto mddi_ext_probe_err;
+
+       pdev_list[pdev_list_cnt++] = pdev;
+
+#ifdef CONFIG_HAS_EARLYSUSPEND
+       mfd->mddi_ext_early_suspend.level = EARLY_SUSPEND_LEVEL_DISABLE_FB;
+       mfd->mddi_ext_early_suspend.suspend = mddi_ext_early_suspend;
+       mfd->mddi_ext_early_suspend.resume = mddi_ext_early_resume;
+       register_early_suspend(&mfd->mddi_ext_early_suspend);
+#endif
+
+       return 0;
+
+mddi_ext_probe_err:
+       platform_device_put(mdp_dev);
+       return rc;
+}
+
+static int mddi_ext_is_in_suspend;
+
+static int mddi_ext_suspend(struct platform_device *pdev, pm_message_t state)
+{
+       if (mddi_ext_is_in_suspend)
+               return 0;
+
+       mddi_ext_is_in_suspend = 1;
+
+       if (clk_set_min_rate(mddi_ext_clk, 0) < 0)
+               printk(KERN_ERR "%s: clk_set_min_rate failed\n", __func__);
+
+       clk_disable(mddi_ext_clk);
+       disable_irq(INT_MDDI_EXT);
+
+       return 0;
+}
+
+static int mddi_ext_resume(struct platform_device *pdev)
+{
+       struct msm_fb_data_type *mfd;
+
+       mfd = platform_get_drvdata(pdev);
+
+       if (!mddi_ext_is_in_suspend)
+               return 0;
+
+       mddi_ext_is_in_suspend = 0;
+       enable_irq(INT_MDDI_EXT);
+
+       clk_enable(mddi_ext_clk);
+
+       return 0;
+}
+
+#ifdef CONFIG_HAS_EARLYSUSPEND
+static void mddi_ext_early_suspend(struct early_suspend *h)
+{
+       pm_message_t state;
+       struct msm_fb_data_type *mfd = container_of(h, struct msm_fb_data_type,
+                                                       mddi_ext_early_suspend);
+
+       state.event = PM_EVENT_SUSPEND;
+       mddi_ext_suspend(mfd->pdev, state);
+}
+
+static void mddi_ext_early_resume(struct early_suspend *h)
+{
+       struct msm_fb_data_type *mfd = container_of(h, struct msm_fb_data_type,
+                                                       mddi_ext_early_suspend);
+       mddi_ext_resume(mfd->pdev);
+}
+#endif
+
+static int mddi_ext_remove(struct platform_device *pdev)
+{
+       iounmap(msm_emdh_base);
+       return 0;
+}
+
+static int mddi_ext_register_driver(void)
+{
+       return platform_driver_register(&mddi_ext_driver);
+}
+
+static int __init mddi_ext_driver_init(void)
+{
+       int ret;
+
+       mddi_ext_clk = clk_get(NULL, "emdh_clk");
+       if (IS_ERR(mddi_ext_clk)) {
+               printk(KERN_ERR "can't find emdh_clk\n");
+               return PTR_ERR(mddi_ext_clk);
+       }
+       clk_enable(mddi_ext_clk);
+
+       ret = mddi_ext_register_driver();
+       if (ret) {
+               clk_disable(mddi_ext_clk);
+               clk_put(mddi_ext_clk);
+               printk(KERN_ERR "mddi_ext_register_driver() failed!\n");
+               return ret;
+       }
+       mddi_init();
+
+       return ret;
+}
+
+module_init(mddi_ext_driver_init);
diff --git a/drivers/staging/msm/mddi_ext_lcd.c b/drivers/staging/msm/mddi_ext_lcd.c
new file mode 100644 (file)
index 0000000..502e80d
--- /dev/null
@@ -0,0 +1,91 @@
+/* Copyright (c) 2008-2009, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include "msm_fb.h"
+#include "mddihost.h"
+#include "mddihosti.h"
+
+static int mddi_ext_lcd_on(struct platform_device *pdev);
+static int mddi_ext_lcd_off(struct platform_device *pdev);
+
+static int mddi_ext_lcd_on(struct platform_device *pdev)
+{
+       return 0;
+}
+
+static int mddi_ext_lcd_off(struct platform_device *pdev)
+{
+       return 0;
+}
+
+static int __init mddi_ext_lcd_probe(struct platform_device *pdev)
+{
+       msm_fb_add_device(pdev);
+
+       return 0;
+}
+
+static struct platform_driver this_driver = {
+       .probe  = mddi_ext_lcd_probe,
+       .driver = {
+               .name   = "extmddi_svga",
+       },
+};
+
+static struct msm_fb_panel_data mddi_ext_lcd_panel_data = {
+       .panel_info.xres = 800,
+       .panel_info.yres = 600,
+       .panel_info.type = EXT_MDDI_PANEL,
+       .panel_info.pdest = DISPLAY_1,
+       .panel_info.wait_cycle = 0,
+       .panel_info.bpp = 18,
+       .panel_info.fb_num = 2,
+       .panel_info.clk_rate = 122880000,
+       .panel_info.clk_min  = 120000000,
+       .panel_info.clk_max  = 125000000,
+       .on = mddi_ext_lcd_on,
+       .off = mddi_ext_lcd_off,
+};
+
+static struct platform_device this_device = {
+       .name   = "extmddi_svga",
+       .id     = 0,
+       .dev    = {
+               .platform_data = &mddi_ext_lcd_panel_data,
+       }
+};
+
+static int __init mddi_ext_lcd_init(void)
+{
+       int ret;
+       struct msm_panel_info *pinfo;
+
+       ret = platform_driver_register(&this_driver);
+       if (!ret) {
+               pinfo = &mddi_ext_lcd_panel_data.panel_info;
+               pinfo->lcd.vsync_enable = FALSE;
+               pinfo->mddi.vdopkt = MDDI_DEFAULT_PRIM_PIX_ATTR;
+
+               ret = platform_device_register(&this_device);
+               if (ret)
+                       platform_driver_unregister(&this_driver);
+       }
+
+       return ret;
+}
+
+module_init(mddi_ext_lcd_init);
diff --git a/drivers/staging/msm/mddi_prism.c b/drivers/staging/msm/mddi_prism.c
new file mode 100644 (file)
index 0000000..489d404
--- /dev/null
@@ -0,0 +1,114 @@
+/* Copyright (c) 2008-2009, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include "msm_fb.h"
+#include "mddihost.h"
+#include "mddihosti.h"
+
+static int prism_lcd_on(struct platform_device *pdev);
+static int prism_lcd_off(struct platform_device *pdev);
+
+static int prism_lcd_on(struct platform_device *pdev)
+{
+       /* Set the MDP pixel data attributes for Primary Display */
+       mddi_host_write_pix_attr_reg(0x00C3);
+
+       return 0;
+}
+
+static int prism_lcd_off(struct platform_device *pdev)
+{
+       return 0;
+}
+
+static int __init prism_probe(struct platform_device *pdev)
+{
+       msm_fb_add_device(pdev);
+
+       return 0;
+}
+
+static struct platform_driver this_driver = {
+       .probe  = prism_probe,
+       .driver = {
+               .name   = "mddi_prism_wvga",
+       },
+};
+
+static struct msm_fb_panel_data prism_panel_data = {
+       .on = prism_lcd_on,
+       .off = prism_lcd_off,
+};
+
+static struct platform_device this_device = {
+       .name   = "mddi_prism_wvga",
+       .id     = 0,
+       .dev    = {
+               .platform_data = &prism_panel_data,
+       }
+};
+
+static int __init prism_init(void)
+{
+       int ret;
+       struct msm_panel_info *pinfo;
+
+#ifdef CONFIG_FB_MSM_MDDI_AUTO_DETECT
+       u32 id;
+
+       ret = msm_fb_detect_client("mddi_prism_wvga");
+       if (ret == -ENODEV)
+               return 0;
+
+       if (ret) {
+               id = mddi_get_client_id();
+
+               if (((id >> 16) != 0x4474) || ((id & 0xffff) == 0x8960))
+                       return 0;
+       }
+#endif
+       ret = platform_driver_register(&this_driver);
+       if (!ret) {
+               pinfo = &prism_panel_data.panel_info;
+               pinfo->xres = 800;
+               pinfo->yres = 480;
+               pinfo->type = MDDI_PANEL;
+               pinfo->pdest = DISPLAY_1;
+               pinfo->mddi.vdopkt = MDDI_DEFAULT_PRIM_PIX_ATTR;
+               pinfo->wait_cycle = 0;
+               pinfo->bpp = 18;
+               pinfo->fb_num = 2;
+               pinfo->clk_rate = 153600000;
+               pinfo->clk_min = 150000000;
+               pinfo->clk_max = 160000000;
+               pinfo->lcd.vsync_enable = TRUE;
+               pinfo->lcd.refx100 = 6050;
+               pinfo->lcd.v_back_porch = 23;
+               pinfo->lcd.v_front_porch = 20;
+               pinfo->lcd.v_pulse_width = 105;
+               pinfo->lcd.hw_vsync_mode = TRUE;
+               pinfo->lcd.vsync_notifier_period = 0;
+
+               ret = platform_device_register(&this_device);
+               if (ret)
+                       platform_driver_unregister(&this_driver);
+       }
+
+       return ret;
+}
+
+module_init(prism_init);
diff --git a/drivers/staging/msm/mddi_sharp.c b/drivers/staging/msm/mddi_sharp.c
new file mode 100644 (file)
index 0000000..1da1be4
--- /dev/null
@@ -0,0 +1,892 @@
+/* Copyright (c) 2008-2009, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include "msm_fb.h"
+#include "mddihost.h"
+#include "mddihosti.h"
+
+#define SHARP_QVGA_PRIM 1
+#define SHARP_128X128_SECD 2
+
+extern uint32 mddi_host_core_version;
+static boolean mddi_debug_prim_wait = FALSE;
+static boolean mddi_sharp_vsync_wake = TRUE;
+static boolean mddi_sharp_monitor_refresh_value = TRUE;
+static boolean mddi_sharp_report_refresh_measurements = FALSE;
+static uint32 mddi_sharp_rows_per_second = 13830;      /* 5200000/376 */
+static uint32 mddi_sharp_rows_per_refresh = 338;
+static uint32 mddi_sharp_usecs_per_refresh = 24440;    /* (376+338)/5200000 */
+static boolean mddi_sharp_debug_60hz_refresh = FALSE;
+
+extern mddi_gpio_info_type mddi_gpio;
+extern boolean mddi_vsync_detect_enabled;
+static msm_fb_vsync_handler_type mddi_sharp_vsync_handler;
+static void *mddi_sharp_vsync_handler_arg;
+static uint16 mddi_sharp_vsync_attempts;
+
+static void mddi_sharp_prim_lcd_init(void);
+static void mddi_sharp_sub_lcd_init(void);
+static void mddi_sharp_lcd_set_backlight(struct msm_fb_data_type *mfd);
+static void mddi_sharp_vsync_set_handler(msm_fb_vsync_handler_type handler,
+                                        void *);
+static void mddi_sharp_lcd_vsync_detected(boolean detected);
+static struct msm_panel_common_pdata *mddi_sharp_pdata;
+
+#define REG_SYSCTL    0x0000
+#define REG_INTR    0x0006
+#define REG_CLKCNF    0x000C
+#define REG_CLKDIV1    0x000E
+#define REG_CLKDIV2    0x0010
+
+#define REG_GIOD    0x0040
+#define REG_GIOA    0x0042
+
+#define REG_AGM      0x010A
+#define REG_FLFT    0x0110
+#define REG_FRGT    0x0112
+#define REG_FTOP    0x0114
+#define REG_FBTM    0x0116
+#define REG_FSTRX    0x0118
+#define REG_FSTRY    0x011A
+#define REG_VRAM    0x0202
+#define REG_SSDCTL    0x0330
+#define REG_SSD0    0x0332
+#define REG_PSTCTL1    0x0400
+#define REG_PSTCTL2    0x0402
+#define REG_PTGCTL    0x042A
+#define REG_PTHP    0x042C
+#define REG_PTHB    0x042E
+#define REG_PTHW    0x0430
+#define REG_PTHF    0x0432
+#define REG_PTVP    0x0434
+#define REG_PTVB    0x0436
+#define REG_PTVW    0x0438
+#define REG_PTVF    0x043A
+#define REG_VBLKS    0x0458
+#define REG_VBLKE    0x045A
+#define REG_SUBCTL    0x0700
+#define REG_SUBTCMD    0x0702
+#define REG_SUBTCMDD  0x0704
+#define REG_REVBYTE    0x0A02
+#define REG_REVCNT    0x0A04
+#define REG_REVATTR    0x0A06
+#define REG_REVFMT    0x0A08
+
+#define SHARP_SUB_UNKNOWN 0xffffffff
+#define SHARP_SUB_HYNIX 1
+#define SHARP_SUB_ROHM  2
+
+static uint32 sharp_subpanel_type = SHARP_SUB_UNKNOWN;
+
+static void sub_through_write(int sub_rs, uint32 sub_data)
+{
+       mddi_queue_register_write(REG_SUBTCMDD, sub_data, FALSE, 0);
+
+       /* CS=1,RD=1,WE=1,RS=sub_rs */
+       mddi_queue_register_write(REG_SUBTCMD, 0x000e | sub_rs, FALSE, 0);
+
+       /* CS=0,RD=1,WE=1,RS=sub_rs */
+       mddi_queue_register_write(REG_SUBTCMD, 0x0006 | sub_rs, FALSE, 0);
+
+       /* CS=0,RD=1,WE=0,RS=sub_rs */
+       mddi_queue_register_write(REG_SUBTCMD, 0x0004 | sub_rs, FALSE, 0);
+
+       /* CS=0,RD=1,WE=1,RS=sub_rs */
+       mddi_queue_register_write(REG_SUBTCMD, 0x0006 | sub_rs, FALSE, 0);
+
+       /* CS=1,RD=1,WE=1,RS=sub_rs */
+       mddi_queue_register_write(REG_SUBTCMD, 0x000e | sub_rs, TRUE, 0);
+}
+
+static uint32 sub_through_read(int sub_rs)
+{
+       uint32 sub_data;
+
+       /* CS=1,RD=1,WE=1,RS=sub_rs */
+       mddi_queue_register_write(REG_SUBTCMD, 0x000e | sub_rs, FALSE, 0);
+
+       /* CS=0,RD=1,WE=1,RS=sub_rs */
+       mddi_queue_register_write(REG_SUBTCMD, 0x0006 | sub_rs, FALSE, 0);
+
+       /* CS=0,RD=1,WE=0,RS=sub_rs */
+       mddi_queue_register_write(REG_SUBTCMD, 0x0002 | sub_rs, TRUE, 0);
+
+       mddi_queue_register_read(REG_SUBTCMDD, &sub_data, TRUE, 0);
+
+       /* CS=0,RD=1,WE=1,RS=sub_rs */
+       mddi_queue_register_write(REG_SUBTCMD, 0x0006 | sub_rs, FALSE, 0);
+
+       /* CS=1,RD=1,WE=1,RS=sub_rs */
+       mddi_queue_register_write(REG_SUBTCMD, 0x000e | sub_rs, TRUE, 0);
+
+       return sub_data;
+}
+
+static void serigo(uint32 ssd)
+{
+       uint32 ssdctl;
+
+       mddi_queue_register_read(REG_SSDCTL, &ssdctl, TRUE, 0);
+       ssdctl = ((ssdctl & 0xE7) | 0x02);
+
+       mddi_queue_register_write(REG_SSD0, ssd, FALSE, 0);
+       mddi_queue_register_write(REG_SSDCTL, ssdctl, TRUE, 0);
+
+       do {
+               mddi_queue_register_read(REG_SSDCTL, &ssdctl, TRUE, 0);
+       } while ((ssdctl & 0x0002) != 0);
+
+       if (mddi_debug_prim_wait)
+               mddi_wait(2);
+}
+
+static void mddi_sharp_lcd_powerdown(void)
+{
+       serigo(0x0131);
+       serigo(0x0300);
+       mddi_wait(40);
+       serigo(0x0135);
+       mddi_wait(20);
+       serigo(0x2122);
+       mddi_wait(20);
+       serigo(0x0201);
+       mddi_wait(20);
+       serigo(0x2100);
+       mddi_wait(20);
+       serigo(0x2000);
+       mddi_wait(20);
+
+       mddi_queue_register_write(REG_PSTCTL1, 0x1, TRUE, 0);
+       mddi_wait(100);
+       mddi_queue_register_write(REG_PSTCTL1, 0x0, TRUE, 0);
+       mddi_wait(2);
+       mddi_queue_register_write(REG_SYSCTL, 0x1, TRUE, 0);
+       mddi_wait(2);
+       mddi_queue_register_write(REG_CLKDIV1, 0x3, TRUE, 0);
+       mddi_wait(2);
+       mddi_queue_register_write(REG_SSDCTL, 0x0000, TRUE, 0); /* SSDRESET */
+       mddi_queue_register_write(REG_SYSCTL, 0x0, TRUE, 0);
+       mddi_wait(2);
+}
+
+static void mddi_sharp_lcd_set_backlight(struct msm_fb_data_type *mfd)
+{
+       uint32 regdata;
+       int32 level;
+       int max = mfd->panel_info.bl_max;
+       int min = mfd->panel_info.bl_min;
+
+       if (mddi_sharp_pdata && mddi_sharp_pdata->backlight_level) {
+               level = mddi_sharp_pdata->backlight_level(mfd->bl_level,
+                                                         max,
+                                                         min);
+
+               if (level < 0)
+                       return;
+
+               /* use Rodem GPIO(2:0) to give 8 levels of backlight (7-0) */
+               /* Set lower 3 GPIOs as Outputs (set to 0) */
+               mddi_queue_register_read(REG_GIOA, &regdata, TRUE, 0);
+               mddi_queue_register_write(REG_GIOA, regdata & 0xfff8, TRUE, 0);
+
+               /* Set lower 3 GPIOs as level */
+               mddi_queue_register_read(REG_GIOD, &regdata, TRUE, 0);
+               mddi_queue_register_write(REG_GIOD,
+                         (regdata & 0xfff8) | (0x07 & level), TRUE, 0);
+       }
+}
+
+static void mddi_sharp_prim_lcd_init(void)
+{
+       mddi_queue_register_write(REG_SYSCTL, 0x4000, TRUE, 0);
+       mddi_wait(1);
+       mddi_queue_register_write(REG_SYSCTL, 0x0000, TRUE, 0);
+       mddi_wait(5);
+       mddi_queue_register_write(REG_SYSCTL, 0x0001, FALSE, 0);
+       mddi_queue_register_write(REG_CLKDIV1, 0x000b, FALSE, 0);
+
+       /* new reg write below */
+       if (mddi_sharp_debug_60hz_refresh)
+               mddi_queue_register_write(REG_CLKCNF, 0x070d, FALSE, 0);
+       else
+               mddi_queue_register_write(REG_CLKCNF, 0x0708, FALSE, 0);
+
+       mddi_queue_register_write(REG_SYSCTL, 0x0201, FALSE, 0);
+       mddi_queue_register_write(REG_PTGCTL, 0x0010, FALSE, 0);
+       mddi_queue_register_write(REG_PTHP, 4, FALSE, 0);
+       mddi_queue_register_write(REG_PTHB, 40, FALSE, 0);
+       mddi_queue_register_write(REG_PTHW, 240, FALSE, 0);
+       if (mddi_sharp_debug_60hz_refresh)
+               mddi_queue_register_write(REG_PTHF, 12, FALSE, 0);
+       else
+               mddi_queue_register_write(REG_PTHF, 92, FALSE, 0);
+
+       mddi_wait(1);
+
+       mddi_queue_register_write(REG_PTVP, 1, FALSE, 0);
+       mddi_queue_register_write(REG_PTVB, 2, FALSE, 0);
+       mddi_queue_register_write(REG_PTVW, 320, FALSE, 0);
+       mddi_queue_register_write(REG_PTVF, 15, FALSE, 0);
+
+       mddi_wait(1);
+
+       /* vram_color set REG_AGM???? */
+       mddi_queue_register_write(REG_AGM, 0x0000, TRUE, 0);
+
+       mddi_queue_register_write(REG_SSDCTL, 0x0000, FALSE, 0);
+       mddi_queue_register_write(REG_SSDCTL, 0x0001, TRUE, 0);
+       mddi_wait(1);
+       mddi_queue_register_write(REG_PSTCTL1, 0x0001, TRUE, 0);
+       mddi_wait(10);
+
+       serigo(0x0701);
+       /* software reset */
+       mddi_wait(1);
+       /* Wait over 50us */
+
+       serigo(0x0400);
+       /* DCLK~ACHSYNC~ACVSYNC polarity setting */
+       serigo(0x2900);
+       /* EEPROM start read address setting */
+       serigo(0x2606);
+       /* EEPROM start read register setting */
+       mddi_wait(20);
+       /* Wait over 20ms */
+
+       serigo(0x0503);
+       /* Horizontal timing setting */
+       serigo(0x062C);
+       /* Veritical timing setting */
+       serigo(0x2001);
+       /* power initialize setting(VDC2) */
+       mddi_wait(20);
+       /* Wait over 20ms */
+
+       serigo(0x2120);
+       /* Initialize power setting(CPS) */
+       mddi_wait(20);
+       /* Wait over 20ms */
+
+       serigo(0x2130);
+       /* Initialize power setting(CPS) */
+       mddi_wait(20);
+       /* Wait over 20ms */
+
+       serigo(0x2132);
+       /* Initialize power setting(CPS) */
+       mddi_wait(10);
+       /* Wait over 10ms */
+
+       serigo(0x2133);
+       /* Initialize power setting(CPS) */
+       mddi_wait(20);
+       /* Wait over 20ms */
+
+       serigo(0x0200);
+       /* Panel initialize release(INIT) */
+       mddi_wait(1);
+       /* Wait over 1ms */
+
+       serigo(0x0131);
+       /* Panel setting(CPS) */
+       mddi_wait(1);
+       /* Wait over 1ms */
+
+       mddi_queue_register_write(REG_PSTCTL1, 0x0003, TRUE, 0);
+
+       /* if (FFA LCD is upside down) -> serigo(0x0100); */
+       serigo(0x0130);
+
+       /* Black mask release(display ON) */
+       mddi_wait(1);
+       /* Wait over 1ms */
+
+       if (mddi_sharp_vsync_wake) {
+               mddi_queue_register_write(REG_VBLKS, 0x1001, TRUE, 0);
+               mddi_queue_register_write(REG_VBLKE, 0x1002, TRUE, 0);
+       }
+
+       /* Set the MDP pixel data attributes for Primary Display */
+       mddi_host_write_pix_attr_reg(0x00C3);
+       return;
+
+}
+
+void mddi_sharp_sub_lcd_init(void)
+{
+
+       mddi_queue_register_write(REG_SYSCTL, 0x4000, FALSE, 0);
+       mddi_queue_register_write(REG_SYSCTL, 0x0000, TRUE, 0);
+       mddi_wait(100);
+
+       mddi_queue_register_write(REG_SYSCTL, 0x0001, FALSE, 0);
+       mddi_queue_register_write(REG_CLKDIV1, 0x000b, FALSE, 0);
+       mddi_queue_register_write(REG_CLKCNF, 0x0708, FALSE, 0);
+       mddi_queue_register_write(REG_SYSCTL, 0x0201, FALSE, 0);
+       mddi_queue_register_write(REG_PTGCTL, 0x0010, FALSE, 0);
+       mddi_queue_register_write(REG_PTHP, 4, FALSE, 0);
+       mddi_queue_register_write(REG_PTHB, 40, FALSE, 0);
+       mddi_queue_register_write(REG_PTHW, 128, FALSE, 0);
+       mddi_queue_register_write(REG_PTHF, 92, FALSE, 0);
+       mddi_queue_register_write(REG_PTVP, 1, FALSE, 0);
+       mddi_queue_register_write(REG_PTVB, 2, FALSE, 0);
+       mddi_queue_register_write(REG_PTVW, 128, FALSE, 0);
+       mddi_queue_register_write(REG_PTVF, 15, FALSE, 0);
+
+       /* Now the sub display..... */
+       /* Reset High */
+       mddi_queue_register_write(REG_SUBCTL, 0x0200, FALSE, 0);
+       /* CS=1,RD=1,WE=1,RS=1 */
+       mddi_queue_register_write(REG_SUBTCMD, 0x000f, TRUE, 0);
+       mddi_wait(1);
+       /* Wait 5us */
+
+       if (sharp_subpanel_type == SHARP_SUB_UNKNOWN) {
+               uint32 data;
+
+               sub_through_write(1, 0x05);
+               sub_through_write(1, 0x6A);
+               sub_through_write(1, 0x1D);
+               sub_through_write(1, 0x05);
+               data = sub_through_read(1);
+               if (data == 0x6A) {
+                       sharp_subpanel_type = SHARP_SUB_HYNIX;
+               } else {
+                       sub_through_write(0, 0x36);
+                       sub_through_write(1, 0xA8);
+                       sub_through_write(0, 0x09);
+                       data = sub_through_read(1);
+                       data = sub_through_read(1);
+                       if (data == 0x54) {
+                               sub_through_write(0, 0x36);
+                               sub_through_write(1, 0x00);
+                               sharp_subpanel_type = SHARP_SUB_ROHM;
+                       }
+               }
+       }
+
+       if (sharp_subpanel_type == SHARP_SUB_HYNIX) {
+               sub_through_write(1, 0x00);     /* Display setting 1 */
+               sub_through_write(1, 0x04);
+               sub_through_write(1, 0x01);
+               sub_through_write(1, 0x05);
+               sub_through_write(1, 0x0280);
+               sub_through_write(1, 0x0301);
+               sub_through_write(1, 0x0402);
+               sub_through_write(1, 0x0500);
+               sub_through_write(1, 0x0681);
+               sub_through_write(1, 0x077F);
+               sub_through_write(1, 0x08C0);
+               sub_through_write(1, 0x0905);
+               sub_through_write(1, 0x0A02);
+               sub_through_write(1, 0x0B00);
+               sub_through_write(1, 0x0C00);
+               sub_through_write(1, 0x0D00);
+               sub_through_write(1, 0x0E00);
+               sub_through_write(1, 0x0F00);
+
+               sub_through_write(1, 0x100B);   /* Display setting 2 */
+               sub_through_write(1, 0x1103);
+               sub_through_write(1, 0x1237);
+               sub_through_write(1, 0x1300);
+               sub_through_write(1, 0x1400);
+               sub_through_write(1, 0x1500);
+               sub_through_write(1, 0x1605);
+               sub_through_write(1, 0x1700);
+               sub_through_write(1, 0x1800);
+               sub_through_write(1, 0x192E);
+               sub_through_write(1, 0x1A00);
+               sub_through_write(1, 0x1B00);
+               sub_through_write(1, 0x1C00);
+
+               sub_through_write(1, 0x151A);   /* Power setting */
+
+               sub_through_write(1, 0x2002);   /* Gradation Palette setting */
+               sub_through_write(1, 0x2107);
+               sub_through_write(1, 0x220C);
+               sub_through_write(1, 0x2310);
+               sub_through_write(1, 0x2414);
+               sub_through_write(1, 0x2518);
+               sub_through_write(1, 0x261C);
+               sub_through_write(1, 0x2720);
+               sub_through_write(1, 0x2824);
+               sub_through_write(1, 0x2928);
+               sub_through_write(1, 0x2A2B);
+               sub_through_write(1, 0x2B2E);
+               sub_through_write(1, 0x2C31);
+               sub_through_write(1, 0x2D34);
+               sub_through_write(1, 0x2E37);
+               sub_through_write(1, 0x2F3A);
+               sub_through_write(1, 0x303C);
+               sub_through_write(1, 0x313E);
+               sub_through_write(1, 0x323F);
+               sub_through_write(1, 0x3340);
+               sub_through_write(1, 0x3441);
+               sub_through_write(1, 0x3543);
+               sub_through_write(1, 0x3646);
+               sub_through_write(1, 0x3749);
+               sub_through_write(1, 0x384C);
+               sub_through_write(1, 0x394F);
+               sub_through_write(1, 0x3A52);
+               sub_through_write(1, 0x3B59);
+               sub_through_write(1, 0x3C60);
+               sub_through_write(1, 0x3D67);
+               sub_through_write(1, 0x3E6E);
+               sub_through_write(1, 0x3F7F);
+               sub_through_write(1, 0x4001);
+               sub_through_write(1, 0x4107);
+               sub_through_write(1, 0x420C);
+               sub_through_write(1, 0x4310);
+               sub_through_write(1, 0x4414);
+               sub_through_write(1, 0x4518);
+               sub_through_write(1, 0x461C);
+               sub_through_write(1, 0x4720);
+               sub_through_write(1, 0x4824);
+               sub_through_write(1, 0x4928);
+               sub_through_write(1, 0x4A2B);
+               sub_through_write(1, 0x4B2E);
+               sub_through_write(1, 0x4C31);
+               sub_through_write(1, 0x4D34);
+               sub_through_write(1, 0x4E37);
+               sub_through_write(1, 0x4F3A);
+               sub_through_write(1, 0x503C);
+               sub_through_write(1, 0x513E);
+               sub_through_write(1, 0x523F);
+               sub_through_write(1, 0x5340);
+               sub_through_write(1, 0x5441);
+               sub_through_write(1, 0x5543);
+               sub_through_write(1, 0x5646);
+               sub_through_write(1, 0x5749);
+               sub_through_write(1, 0x584C);
+               sub_through_write(1, 0x594F);
+               sub_through_write(1, 0x5A52);
+               sub_through_write(1, 0x5B59);
+               sub_through_write(1, 0x5C60);
+               sub_through_write(1, 0x5D67);
+               sub_through_write(1, 0x5E6E);
+               sub_through_write(1, 0x5F7E);
+               sub_through_write(1, 0x6000);
+               sub_through_write(1, 0x6107);
+               sub_through_write(1, 0x620C);
+               sub_through_write(1, 0x6310);
+               sub_through_write(1, 0x6414);
+               sub_through_write(1, 0x6518);
+               sub_through_write(1, 0x661C);
+               sub_through_write(1, 0x6720);
+               sub_through_write(1, 0x6824);
+               sub_through_write(1, 0x6928);
+               sub_through_write(1, 0x6A2B);
+               sub_through_write(1, 0x6B2E);
+               sub_through_write(1, 0x6C31);
+               sub_through_write(1, 0x6D34);
+               sub_through_write(1, 0x6E37);
+               sub_through_write(1, 0x6F3A);
+               sub_through_write(1, 0x703C);
+               sub_through_write(1, 0x713E);
+               sub_through_write(1, 0x723F);
+               sub_through_write(1, 0x7340);
+               sub_through_write(1, 0x7441);
+               sub_through_write(1, 0x7543);
+               sub_through_write(1, 0x7646);
+               sub_through_write(1, 0x7749);
+               sub_through_write(1, 0x784C);
+               sub_through_write(1, 0x794F);
+               sub_through_write(1, 0x7A52);
+               sub_through_write(1, 0x7B59);
+               sub_through_write(1, 0x7C60);
+               sub_through_write(1, 0x7D67);
+               sub_through_write(1, 0x7E6E);
+               sub_through_write(1, 0x7F7D);
+
+               sub_through_write(1, 0x1851);   /* Display on */
+
+               mddi_queue_register_write(REG_AGM, 0x0000, TRUE, 0);
+
+               /* 1 pixel / 1 post clock */
+               mddi_queue_register_write(REG_CLKDIV2, 0x3b00, FALSE, 0);
+
+               /* SUB LCD select */
+               mddi_queue_register_write(REG_PSTCTL2, 0x0080, FALSE, 0);
+
+               /* RS=0,command initiate number=0,select master mode */
+               mddi_queue_register_write(REG_SUBCTL, 0x0202, FALSE, 0);
+
+               /* Sub LCD Data transform start */
+               mddi_queue_register_write(REG_PSTCTL1, 0x0003, FALSE, 0);
+
+       } else if (sharp_subpanel_type == SHARP_SUB_ROHM) {
+
+               sub_through_write(0, 0x01);     /* Display setting */
+               sub_through_write(1, 0x00);
+
+               mddi_wait(1);
+               /* Wait 100us  <----- ******* Update 2005/01/24 */
+
+               sub_through_write(0, 0xB6);
+               sub_through_write(1, 0x0C);
+               sub_through_write(1, 0x4A);
+               sub_through_write(1, 0x20);
+               sub_through_write(0, 0x3A);
+               sub_through_write(1, 0x05);
+               sub_through_write(0, 0xB7);
+               sub_through_write(1, 0x01);
+               sub_through_write(0, 0xBA);
+               sub_through_write(1, 0x20);
+               sub_through_write(1, 0x02);
+               sub_through_write(0, 0x25);
+               sub_through_write(1, 0x4F);
+               sub_through_write(0, 0xBB);
+               sub_through_write(1, 0x00);
+               sub_through_write(0, 0x36);
+               sub_through_write(1, 0x00);
+               sub_through_write(0, 0xB1);
+               sub_through_write(1, 0x05);
+               sub_through_write(0, 0xBE);
+               sub_through_write(1, 0x80);
+               sub_through_write(0, 0x26);
+               sub_through_write(1, 0x01);
+               sub_through_write(0, 0x2A);
+               sub_through_write(1, 0x02);
+               sub_through_write(1, 0x81);
+               sub_through_write(0, 0x2B);
+               sub_through_write(1, 0x00);
+               sub_through_write(1, 0x7F);
+
+               sub_through_write(0, 0x2C);
+               sub_through_write(0, 0x11);     /* Sleep mode off */
+
+               mddi_wait(1);
+               /* Wait 100 ms <----- ******* Update 2005/01/24 */
+
+               sub_through_write(0, 0x29);     /* Display on */
+               sub_through_write(0, 0xB3);
+               sub_through_write(1, 0x20);
+               sub_through_write(1, 0xAA);
+               sub_through_write(1, 0xA0);
+               sub_through_write(1, 0x20);
+               sub_through_write(1, 0x30);
+               sub_through_write(1, 0xA6);
+               sub_through_write(1, 0xFF);
+               sub_through_write(1, 0x9A);
+               sub_through_write(1, 0x9F);
+               sub_through_write(1, 0xAF);
+               sub_through_write(1, 0xBC);
+               sub_through_write(1, 0xCF);
+               sub_through_write(1, 0xDF);
+               sub_through_write(1, 0x20);
+               sub_through_write(1, 0x9C);
+               sub_through_write(1, 0x8A);
+
+               sub_through_write(0, 0x002C);   /* Display on */
+
+               /* 1 pixel / 2 post clock */
+               mddi_queue_register_write(REG_CLKDIV2, 0x7b00, FALSE, 0);
+
+               /* SUB LCD select */
+               mddi_queue_register_write(REG_PSTCTL2, 0x0080, FALSE, 0);
+
+               /* RS=1,command initiate number=0,select master mode */
+               mddi_queue_register_write(REG_SUBCTL, 0x0242, FALSE, 0);
+
+               /* Sub LCD Data transform start */
+               mddi_queue_register_write(REG_PSTCTL1, 0x0003, FALSE, 0);
+
+       }
+
+       /* Set the MDP pixel data attributes for Sub Display */
+       mddi_host_write_pix_attr_reg(0x00C0);
+}
+
+void mddi_sharp_lcd_vsync_detected(boolean detected)
+{
+       /* static timetick_type start_time = 0; */
+       static struct timeval start_time;
+       static boolean first_time = TRUE;
+       /* uint32 mdp_cnt_val = 0; */
+       /* timetick_type elapsed_us; */
+       struct timeval now;
+       uint32 elapsed_us;
+       uint32 num_vsyncs;
+
+       if ((detected) || (mddi_sharp_vsync_attempts > 5)) {
+               if ((detected) && (mddi_sharp_monitor_refresh_value)) {
+                       /* if (start_time != 0) */
+                       if (!first_time) {
+                               jiffies_to_timeval(jiffies, &now);
+                               elapsed_us =
+                                   (now.tv_sec - start_time.tv_sec) * 1000000 +
+                                   now.tv_usec - start_time.tv_usec;
+                               /*
+                               * LCD is configured for a refresh every usecs,
+                               * so to determine the number of vsyncs that
+                               * have occurred since the last measurement add
+                               * half that to the time difference and divide
+                               * by the refresh rate.
+                               */
+                               num_vsyncs = (elapsed_us +
+                                             (mddi_sharp_usecs_per_refresh >>
+                                              1)) /
+                                   mddi_sharp_usecs_per_refresh;
+                               /*
+                                * LCD is configured for * hsyncs (rows) per
+                                * refresh cycle. Calculate new rows_per_second
+                                * value based upon these new measurements.
+                                * MDP can update with this new value.
+                                */
+                               mddi_sharp_rows_per_second =
+                                   (mddi_sharp_rows_per_refresh * 1000 *
+                                    num_vsyncs) / (elapsed_us / 1000);
+                       }
+                       /* start_time = timetick_get(); */
+                       first_time = FALSE;
+                       jiffies_to_timeval(jiffies, &start_time);
+                       if (mddi_sharp_report_refresh_measurements) {
+                               /* mdp_cnt_val = MDP_LINE_COUNT; */
+                       }
+               }
+               /* if detected = TRUE, client initiated wakeup was detected */
+               if (mddi_sharp_vsync_handler != NULL) {
+                       (*mddi_sharp_vsync_handler)
+                           (mddi_sharp_vsync_handler_arg);
+                       mddi_sharp_vsync_handler = NULL;
+               }
+               mddi_vsync_detect_enabled = FALSE;
+               mddi_sharp_vsync_attempts = 0;
+               /* need to clear this vsync wakeup */
+               if (!mddi_queue_register_write_int(REG_INTR, 0x0000)) {
+                       MDDI_MSG_ERR("Vsync interrupt clear failed!\n");
+               }
+               if (!detected) {
+                       /* give up after 5 failed attempts but show error */
+                       MDDI_MSG_NOTICE("Vsync detection failed!\n");
+               } else if ((mddi_sharp_monitor_refresh_value) &&
+                       (mddi_sharp_report_refresh_measurements)) {
+                       MDDI_MSG_NOTICE("  Lines Per Second=%d!\n",
+                               mddi_sharp_rows_per_second);
+               }
+       } else
+               /* if detected = FALSE, we woke up from hibernation, but did not
+                * detect client initiated wakeup.
+                */
+               mddi_sharp_vsync_attempts++;
+}
+
+/* ISR to be executed */
+void mddi_sharp_vsync_set_handler(msm_fb_vsync_handler_type handler, void *arg)
+{
+       boolean error = FALSE;
+       unsigned long flags;
+
+       /* Disable interrupts */
+       spin_lock_irqsave(&mddi_host_spin_lock, flags);
+       /* INTLOCK(); */
+
+       if (mddi_sharp_vsync_handler != NULL)
+               error = TRUE;
+
+       /* Register the handler for this particular GROUP interrupt source */
+       mddi_sharp_vsync_handler = handler;
+       mddi_sharp_vsync_handler_arg = arg;
+
+       /* Restore interrupts */
+       spin_unlock_irqrestore(&mddi_host_spin_lock, flags);
+       /* INTFREE(); */
+
+       if (error)
+               MDDI_MSG_ERR("MDDI: Previous Vsync handler never called\n");
+
+       /* Enable the vsync wakeup */
+       mddi_queue_register_write(REG_INTR, 0x8100, FALSE, 0);
+
+       mddi_sharp_vsync_attempts = 1;
+       mddi_vsync_detect_enabled = TRUE;
+}                              /* mddi_sharp_vsync_set_handler */
+
+static int mddi_sharp_lcd_on(struct platform_device *pdev)
+{
+       struct msm_fb_data_type *mfd;
+
+       mfd = platform_get_drvdata(pdev);
+
+       if (!mfd)
+               return -ENODEV;
+
+       if (mfd->key != MFD_KEY)
+               return -EINVAL;
+
+       if (mfd->panel.id == SHARP_QVGA_PRIM)
+               mddi_sharp_prim_lcd_init();
+       else
+               mddi_sharp_sub_lcd_init();
+
+       return 0;
+}
+
+static int mddi_sharp_lcd_off(struct platform_device *pdev)
+{
+       mddi_sharp_lcd_powerdown();
+       return 0;
+}
+
+static int __init mddi_sharp_probe(struct platform_device *pdev)
+{
+       if (pdev->id == 0) {
+               mddi_sharp_pdata = pdev->dev.platform_data;
+               return 0;
+       }
+
+       msm_fb_add_device(pdev);
+
+       return 0;
+}
+
+static struct platform_driver this_driver = {
+       .probe  = mddi_sharp_probe,
+       .driver = {
+               .name   = "mddi_sharp_qvga",
+       },
+};
+
+static struct msm_fb_panel_data mddi_sharp_panel_data0 = {
+       .on = mddi_sharp_lcd_on,
+       .off = mddi_sharp_lcd_off,
+       .set_backlight = mddi_sharp_lcd_set_backlight,
+       .set_vsync_notifier = mddi_sharp_vsync_set_handler,
+};
+
+static struct platform_device this_device_0 = {
+       .name   = "mddi_sharp_qvga",
+       .id     = SHARP_QVGA_PRIM,
+       .dev    = {
+               .platform_data = &mddi_sharp_panel_data0,
+       }
+};
+
+static struct msm_fb_panel_data mddi_sharp_panel_data1 = {
+       .on = mddi_sharp_lcd_on,
+       .off = mddi_sharp_lcd_off,
+};
+
+static struct platform_device this_device_1 = {
+       .name   = "mddi_sharp_qvga",
+       .id     = SHARP_128X128_SECD,
+       .dev    = {
+               .platform_data = &mddi_sharp_panel_data1,
+       }
+};
+
+static int __init mddi_sharp_init(void)
+{
+       int ret;
+       struct msm_panel_info *pinfo;
+
+#ifdef CONFIG_FB_MSM_MDDI_AUTO_DETECT
+       u32 id;
+
+       ret = msm_fb_detect_client("mddi_sharp_qvga");
+       if (ret == -ENODEV)
+               return 0;
+
+       if (ret) {
+               id = mddi_get_client_id();
+
+               if (((id >> 16) != 0x0) || ((id & 0xffff) != 0x8835))
+                       return 0;
+       }
+#endif
+       if (mddi_host_core_version > 8) {
+               /* can use faster refresh with newer hw revisions */
+               mddi_sharp_debug_60hz_refresh = TRUE;
+
+               /* Timing variables for tracking vsync */
+               /* dot_clock = 6.00MHz
+                * horizontal count = 296
+                * vertical count = 338
+                * refresh rate = 6000000/(296+338) = 60Hz
+                */
+               mddi_sharp_rows_per_second = 20270;     /* 6000000/296 */
+               mddi_sharp_rows_per_refresh = 338;
+               mddi_sharp_usecs_per_refresh = 16674;   /* (296+338)/6000000 */
+       } else {
+               /* Timing variables for tracking vsync */
+               /* dot_clock = 5.20MHz
+                * horizontal count = 376
+                * vertical count = 338
+                * refresh rate = 5200000/(376+338) = 41Hz
+                */
+               mddi_sharp_rows_per_second = 13830;     /* 5200000/376 */
+               mddi_sharp_rows_per_refresh = 338;
+               mddi_sharp_usecs_per_refresh = 24440;   /* (376+338)/5200000 */
+       }
+
+       ret = platform_driver_register(&this_driver);
+       if (!ret) {
+               pinfo = &mddi_sharp_panel_data0.panel_info;
+               pinfo->xres = 240;
+               pinfo->yres = 320;
+               pinfo->type = MDDI_PANEL;
+               pinfo->pdest = DISPLAY_1;
+               pinfo->mddi.vdopkt = MDDI_DEFAULT_PRIM_PIX_ATTR;
+               pinfo->wait_cycle = 0;
+               pinfo->bpp = 18;
+               pinfo->fb_num = 2;
+               pinfo->clk_rate = 122880000;
+               pinfo->clk_min = 120000000;
+               pinfo->clk_max = 125000000;
+               pinfo->lcd.vsync_enable = TRUE;
+               pinfo->lcd.refx100 =
+                       (mddi_sharp_rows_per_second * 100) /
+                       mddi_sharp_rows_per_refresh;
+               pinfo->lcd.v_back_porch = 12;
+               pinfo->lcd.v_front_porch = 6;
+               pinfo->lcd.v_pulse_width = 0;
+               pinfo->lcd.hw_vsync_mode = FALSE;
+               pinfo->lcd.vsync_notifier_period = (1 * HZ);
+               pinfo->bl_max = 7;
+               pinfo->bl_min = 1;
+
+               ret = platform_device_register(&this_device_0);
+               if (ret)
+                       platform_driver_unregister(&this_driver);
+
+               pinfo = &mddi_sharp_panel_data1.panel_info;
+               pinfo->xres = 128;
+               pinfo->yres = 128;
+               pinfo->type = MDDI_PANEL;
+               pinfo->pdest = DISPLAY_2;
+               pinfo->mddi.vdopkt = 0x400;
+               pinfo->wait_cycle = 0;
+               pinfo->bpp = 18;
+               pinfo->clk_rate = 122880000;
+               pinfo->clk_min = 120000000;
+               pinfo->clk_max = 125000000;
+               pinfo->fb_num = 2;
+
+               ret = platform_device_register(&this_device_1);
+               if (ret) {
+                       platform_device_unregister(&this_device_0);
+                       platform_driver_unregister(&this_driver);
+               }
+       }
+
+       if (!ret)
+               mddi_lcd.vsync_detected = mddi_sharp_lcd_vsync_detected;
+
+       return ret;
+}
+
+module_init(mddi_sharp_init);
diff --git a/drivers/staging/msm/mddi_toshiba.c b/drivers/staging/msm/mddi_toshiba.c
new file mode 100644 (file)
index 0000000..e96342d
--- /dev/null
@@ -0,0 +1,1741 @@
+/* Copyright (c) 2008-2009, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include "msm_fb.h"
+#include "mddihost.h"
+#include "mddihosti.h"
+#include "mddi_toshiba.h"
+
+#define TM_GET_DID(id) ((id) & 0xff)
+#define TM_GET_PID(id) (((id) & 0xff00)>>8)
+
+#define MDDI_CLIENT_CORE_BASE  0x108000
+#define LCD_CONTROL_BLOCK_BASE 0x110000
+#define SPI_BLOCK_BASE         0x120000
+#define PWM_BLOCK_BASE         0x140000
+#define SYSTEM_BLOCK1_BASE     0x160000
+
+#define TTBUSSEL    (MDDI_CLIENT_CORE_BASE|0x18)
+#define DPSET0      (MDDI_CLIENT_CORE_BASE|0x1C)
+#define DPSET1      (MDDI_CLIENT_CORE_BASE|0x20)
+#define DPSUS       (MDDI_CLIENT_CORE_BASE|0x24)
+#define DPRUN       (MDDI_CLIENT_CORE_BASE|0x28)
+#define SYSCKENA    (MDDI_CLIENT_CORE_BASE|0x2C)
+
+#define BITMAP0     (MDDI_CLIENT_CORE_BASE|0x44)
+#define BITMAP1     (MDDI_CLIENT_CORE_BASE|0x48)
+#define BITMAP2     (MDDI_CLIENT_CORE_BASE|0x4C)
+#define BITMAP3     (MDDI_CLIENT_CORE_BASE|0x50)
+#define BITMAP4     (MDDI_CLIENT_CORE_BASE|0x54)
+
+#define SRST        (LCD_CONTROL_BLOCK_BASE|0x00)
+#define PORT_ENB    (LCD_CONTROL_BLOCK_BASE|0x04)
+#define START       (LCD_CONTROL_BLOCK_BASE|0x08)
+#define PORT        (LCD_CONTROL_BLOCK_BASE|0x0C)
+
+#define INTFLG      (LCD_CONTROL_BLOCK_BASE|0x18)
+#define INTMSK      (LCD_CONTROL_BLOCK_BASE|0x1C)
+#define MPLFBUF     (LCD_CONTROL_BLOCK_BASE|0x20)
+
+#define PXL         (LCD_CONTROL_BLOCK_BASE|0x30)
+#define HCYCLE      (LCD_CONTROL_BLOCK_BASE|0x34)
+#define HSW         (LCD_CONTROL_BLOCK_BASE|0x38)
+#define HDE_START   (LCD_CONTROL_BLOCK_BASE|0x3C)
+#define HDE_SIZE    (LCD_CONTROL_BLOCK_BASE|0x40)
+#define VCYCLE      (LCD_CONTROL_BLOCK_BASE|0x44)
+#define VSW         (LCD_CONTROL_BLOCK_BASE|0x48)
+#define VDE_START   (LCD_CONTROL_BLOCK_BASE|0x4C)
+#define VDE_SIZE    (LCD_CONTROL_BLOCK_BASE|0x50)
+#define WAKEUP      (LCD_CONTROL_BLOCK_BASE|0x54)
+#define REGENB      (LCD_CONTROL_BLOCK_BASE|0x5C)
+#define VSYNIF      (LCD_CONTROL_BLOCK_BASE|0x60)
+#define WRSTB       (LCD_CONTROL_BLOCK_BASE|0x64)
+#define RDSTB       (LCD_CONTROL_BLOCK_BASE|0x68)
+#define ASY_DATA    (LCD_CONTROL_BLOCK_BASE|0x6C)
+#define ASY_DATB    (LCD_CONTROL_BLOCK_BASE|0x70)
+#define ASY_DATC    (LCD_CONTROL_BLOCK_BASE|0x74)
+#define ASY_DATD    (LCD_CONTROL_BLOCK_BASE|0x78)
+#define ASY_DATE    (LCD_CONTROL_BLOCK_BASE|0x7C)
+#define ASY_DATF    (LCD_CONTROL_BLOCK_BASE|0x80)
+#define ASY_DATG    (LCD_CONTROL_BLOCK_BASE|0x84)
+#define ASY_DATH    (LCD_CONTROL_BLOCK_BASE|0x88)
+#define ASY_CMDSET  (LCD_CONTROL_BLOCK_BASE|0x8C)
+#define MONI        (LCD_CONTROL_BLOCK_BASE|0xB0)
+#define VPOS        (LCD_CONTROL_BLOCK_BASE|0xC0)
+
+#define SSICTL      (SPI_BLOCK_BASE|0x00)
+#define SSITIME     (SPI_BLOCK_BASE|0x04)
+#define SSITX       (SPI_BLOCK_BASE|0x08)
+#define SSIINTS     (SPI_BLOCK_BASE|0x14)
+
+#define TIMER0LOAD    (PWM_BLOCK_BASE|0x00)
+#define TIMER0CTRL    (PWM_BLOCK_BASE|0x08)
+#define PWM0OFF       (PWM_BLOCK_BASE|0x1C)
+#define TIMER1LOAD    (PWM_BLOCK_BASE|0x20)
+#define TIMER1CTRL    (PWM_BLOCK_BASE|0x28)
+#define PWM1OFF       (PWM_BLOCK_BASE|0x3C)
+#define TIMER2LOAD    (PWM_BLOCK_BASE|0x40)
+#define TIMER2CTRL    (PWM_BLOCK_BASE|0x48)
+#define PWM2OFF       (PWM_BLOCK_BASE|0x5C)
+#define PWMCR         (PWM_BLOCK_BASE|0x68)
+
+#define GPIOIS      (GPIO_BLOCK_BASE|0x08)
+#define GPIOIEV     (GPIO_BLOCK_BASE|0x10)
+#define GPIOIC      (GPIO_BLOCK_BASE|0x20)
+
+#define WKREQ       (SYSTEM_BLOCK1_BASE|0x00)
+#define CLKENB      (SYSTEM_BLOCK1_BASE|0x04)
+#define DRAMPWR     (SYSTEM_BLOCK1_BASE|0x08)
+#define INTMASK     (SYSTEM_BLOCK1_BASE|0x0C)
+#define CNT_DIS     (SYSTEM_BLOCK1_BASE|0x10)
+
+typedef enum {
+       TOSHIBA_STATE_OFF,
+       TOSHIBA_STATE_PRIM_SEC_STANDBY,
+       TOSHIBA_STATE_PRIM_SEC_READY,
+       TOSHIBA_STATE_PRIM_NORMAL_MODE,
+       TOSHIBA_STATE_SEC_NORMAL_MODE
+} mddi_toshiba_state_t;
+
+static uint32 mddi_toshiba_curr_vpos;
+static boolean mddi_toshiba_monitor_refresh_value = FALSE;
+static boolean mddi_toshiba_report_refresh_measurements = FALSE;
+
+boolean mddi_toshiba_61Hz_refresh = TRUE;
+
+/* Modifications to timing to increase refresh rate to > 60Hz.
+ *   20MHz dot clock.
+ *   646 total rows.
+ *   506 total columns.
+ *   refresh rate = 61.19Hz
+ */
+static uint32 mddi_toshiba_rows_per_second = 39526;
+static uint32 mddi_toshiba_usecs_per_refresh = 16344;
+static uint32 mddi_toshiba_rows_per_refresh = 646;
+extern boolean mddi_vsync_detect_enabled;
+
+static msm_fb_vsync_handler_type mddi_toshiba_vsync_handler;
+static void *mddi_toshiba_vsync_handler_arg;
+static uint16 mddi_toshiba_vsync_attempts;
+
+static mddi_toshiba_state_t toshiba_state = TOSHIBA_STATE_OFF;
+
+static struct msm_panel_common_pdata *mddi_toshiba_pdata;
+
+static int mddi_toshiba_lcd_on(struct platform_device *pdev);
+static int mddi_toshiba_lcd_off(struct platform_device *pdev);
+
+static void mddi_toshiba_state_transition(mddi_toshiba_state_t a,
+                                         mddi_toshiba_state_t b)
+{
+       if (toshiba_state != a) {
+               MDDI_MSG_ERR("toshiba state trans. (%d->%d) found %d\n", a, b,
+                            toshiba_state);
+       }
+       toshiba_state = b;
+}
+
+#define GORDON_REG_IMGCTL1      0x10   /* Image interface control 1   */
+#define GORDON_REG_IMGCTL2      0x11   /* Image interface control 2   */
+#define GORDON_REG_IMGSET1      0x12   /* Image interface settings 1  */
+#define GORDON_REG_IMGSET2      0x13   /* Image interface settings 2  */
+#define GORDON_REG_IVBP1        0x14   /* DM0: Vert back porch        */
+#define GORDON_REG_IHBP1        0x15   /* DM0: Horiz back porch       */
+#define GORDON_REG_IVNUM1       0x16   /* DM0: Num of vert lines      */
+#define GORDON_REG_IHNUM1       0x17   /* DM0: Num of pixels per line */
+#define GORDON_REG_IVBP2        0x18   /* DM1: Vert back porch        */
+#define GORDON_REG_IHBP2        0x19   /* DM1: Horiz back porch       */
+#define GORDON_REG_IVNUM2       0x1A   /* DM1: Num of vert lines      */
+#define GORDON_REG_IHNUM2       0x1B   /* DM1: Num of pixels per line */
+#define GORDON_REG_LCDIFCTL1    0x30   /* LCD interface control 1     */
+#define GORDON_REG_VALTRAN      0x31   /* LCD IF ctl: VALTRAN sync flag */
+#define GORDON_REG_AVCTL        0x33
+#define GORDON_REG_LCDIFCTL2    0x34   /* LCD interface control 2     */
+#define GORDON_REG_LCDIFCTL3    0x35   /* LCD interface control 3     */
+#define GORDON_REG_LCDIFSET1    0x36   /* LCD interface settings 1    */
+#define GORDON_REG_PCCTL        0x3C
+#define GORDON_REG_TPARAM1      0x40
+#define GORDON_REG_TLCDIF1      0x41
+#define GORDON_REG_TSSPB_ST1    0x42
+#define GORDON_REG_TSSPB_ED1    0x43
+#define GORDON_REG_TSCK_ST1     0x44
+#define GORDON_REG_TSCK_WD1     0x45
+#define GORDON_REG_TGSPB_VST1   0x46
+#define GORDON_REG_TGSPB_VED1   0x47
+#define GORDON_REG_TGSPB_CH1    0x48
+#define GORDON_REG_TGCK_ST1     0x49
+#define GORDON_REG_TGCK_ED1     0x4A
+#define GORDON_REG_TPCTL_ST1    0x4B
+#define GORDON_REG_TPCTL_ED1    0x4C
+#define GORDON_REG_TPCHG_ED1    0x4D
+#define GORDON_REG_TCOM_CH1     0x4E
+#define GORDON_REG_THBP1        0x4F
+#define GORDON_REG_TPHCTL1      0x50
+#define GORDON_REG_EVPH1        0x51
+#define GORDON_REG_EVPL1        0x52
+#define GORDON_REG_EVNH1        0x53
+#define GORDON_REG_EVNL1        0x54
+#define GORDON_REG_TBIAS1       0x55
+#define GORDON_REG_TPARAM2      0x56
+#define GORDON_REG_TLCDIF2      0x57
+#define GORDON_REG_TSSPB_ST2    0x58
+#define GORDON_REG_TSSPB_ED2    0x59
+#define GORDON_REG_TSCK_ST2     0x5A
+#define GORDON_REG_TSCK_WD2     0x5B
+#define GORDON_REG_TGSPB_VST2   0x5C
+#define GORDON_REG_TGSPB_VED2   0x5D
+#define GORDON_REG_TGSPB_CH2    0x5E
+#define GORDON_REG_TGCK_ST2     0x5F
+#define GORDON_REG_TGCK_ED2     0x60
+#define GORDON_REG_TPCTL_ST2    0x61
+#define GORDON_REG_TPCTL_ED2    0x62
+#define GORDON_REG_TPCHG_ED2    0x63
+#define GORDON_REG_TCOM_CH2     0x64
+#define GORDON_REG_THBP2        0x65
+#define GORDON_REG_TPHCTL2      0x66
+#define GORDON_REG_EVPH2        0x67
+#define GORDON_REG_EVPL2        0x68
+#define GORDON_REG_EVNH2        0x69
+#define GORDON_REG_EVNL2        0x6A
+#define GORDON_REG_TBIAS2       0x6B
+#define GORDON_REG_POWCTL       0x80
+#define GORDON_REG_POWOSC1      0x81
+#define GORDON_REG_POWOSC2      0x82
+#define GORDON_REG_POWSET       0x83
+#define GORDON_REG_POWTRM1      0x85
+#define GORDON_REG_POWTRM2      0x86
+#define GORDON_REG_POWTRM3      0x87
+#define GORDON_REG_POWTRMSEL    0x88
+#define GORDON_REG_POWHIZ       0x89
+
+void serigo(uint16 reg, uint8 data)
+{
+       uint32 mddi_val = 0;
+       mddi_queue_register_read(SSIINTS, &mddi_val, TRUE, 0);
+       if (mddi_val & (1 << 8))
+               mddi_wait(1);
+       /* No De-assert of CS and send 2 bytes */
+       mddi_val = 0x90000 | ((0x00FF & reg) << 8) | data;
+       mddi_queue_register_write(SSITX, mddi_val, TRUE, 0);
+}
+
+void gordon_init(void)
+{
+       /* Image interface settings ***/
+       serigo(GORDON_REG_IMGCTL2, 0x00);
+       serigo(GORDON_REG_IMGSET1, 0x01);
+
+       /* Exchange the RGB signal for J510(Softbank mobile) */
+       serigo(GORDON_REG_IMGSET2, 0x12);
+       serigo(GORDON_REG_LCDIFSET1, 0x00);
+       mddi_wait(2);
+
+       /* Pre-charge settings */
+       serigo(GORDON_REG_PCCTL, 0x09);
+       serigo(GORDON_REG_LCDIFCTL2, 0x1B);
+       mddi_wait(1);
+}
+
+void gordon_disp_on(void)
+{
+       /*gordon_dispmode setting */
+       /*VGA settings */
+       serigo(GORDON_REG_TPARAM1, 0x30);
+       serigo(GORDON_REG_TLCDIF1, 0x00);
+       serigo(GORDON_REG_TSSPB_ST1, 0x8B);
+       serigo(GORDON_REG_TSSPB_ED1, 0x93);
+       mddi_wait(2);
+       serigo(GORDON_REG_TSCK_ST1, 0x88);
+       serigo(GORDON_REG_TSCK_WD1, 0x00);
+       serigo(GORDON_REG_TGSPB_VST1, 0x01);
+       serigo(GORDON_REG_TGSPB_VED1, 0x02);
+       mddi_wait(2);
+       serigo(GORDON_REG_TGSPB_CH1, 0x5E);
+       serigo(GORDON_REG_TGCK_ST1, 0x80);
+       serigo(GORDON_REG_TGCK_ED1, 0x3C);
+       serigo(GORDON_REG_TPCTL_ST1, 0x50);
+       mddi_wait(2);
+       serigo(GORDON_REG_TPCTL_ED1, 0x74);
+       serigo(GORDON_REG_TPCHG_ED1, 0x78);
+       serigo(GORDON_REG_TCOM_CH1, 0x50);
+       serigo(GORDON_REG_THBP1, 0x84);
+       mddi_wait(2);
+       serigo(GORDON_REG_TPHCTL1, 0x00);
+       serigo(GORDON_REG_EVPH1, 0x70);
+       serigo(GORDON_REG_EVPL1, 0x64);
+       serigo(GORDON_REG_EVNH1, 0x56);
+       mddi_wait(2);
+       serigo(GORDON_REG_EVNL1, 0x48);
+       serigo(GORDON_REG_TBIAS1, 0x88);
+       mddi_wait(2);
+       serigo(GORDON_REG_TPARAM2, 0x28);
+       serigo(GORDON_REG_TLCDIF2, 0x14);
+       serigo(GORDON_REG_TSSPB_ST2, 0x49);
+       serigo(GORDON_REG_TSSPB_ED2, 0x4B);
+       mddi_wait(2);
+       serigo(GORDON_REG_TSCK_ST2, 0x4A);
+       serigo(GORDON_REG_TSCK_WD2, 0x02);
+       serigo(GORDON_REG_TGSPB_VST2, 0x02);
+       serigo(GORDON_REG_TGSPB_VED2, 0x03);
+       mddi_wait(2);
+       serigo(GORDON_REG_TGSPB_CH2, 0x2F);
+       serigo(GORDON_REG_TGCK_ST2, 0x40);
+       serigo(GORDON_REG_TGCK_ED2, 0x1E);
+       serigo(GORDON_REG_TPCTL_ST2, 0x2C);
+       mddi_wait(2);
+       serigo(GORDON_REG_TPCTL_ED2, 0x3A);
+       serigo(GORDON_REG_TPCHG_ED2, 0x3C);
+       serigo(GORDON_REG_TCOM_CH2, 0x28);
+       serigo(GORDON_REG_THBP2, 0x4D);
+       mddi_wait(2);
+       serigo(GORDON_REG_TPHCTL2, 0x1A);
+       mddi_wait(2);
+       serigo(GORDON_REG_IVBP1, 0x02);
+       serigo(GORDON_REG_IHBP1, 0x90);
+       serigo(GORDON_REG_IVNUM1, 0xA0);
+       serigo(GORDON_REG_IHNUM1, 0x78);
+       mddi_wait(2);
+       serigo(GORDON_REG_IVBP2, 0x02);
+       serigo(GORDON_REG_IHBP2, 0x48);
+       serigo(GORDON_REG_IVNUM2, 0x50);
+       serigo(GORDON_REG_IHNUM2, 0x3C);
+       mddi_wait(2);
+       serigo(GORDON_REG_POWCTL, 0x03);
+       mddi_wait(15);
+       serigo(GORDON_REG_POWCTL, 0x07);
+       mddi_wait(15);
+       serigo(GORDON_REG_POWCTL, 0x0F);
+       mddi_wait(15);
+       serigo(GORDON_REG_AVCTL, 0x03);
+       mddi_wait(15);
+       serigo(GORDON_REG_POWCTL, 0x1F);
+       mddi_wait(15);
+       serigo(GORDON_REG_POWCTL, 0x5F);
+       mddi_wait(15);
+       serigo(GORDON_REG_POWCTL, 0x7F);
+       mddi_wait(15);
+       serigo(GORDON_REG_LCDIFCTL1, 0x02);
+       mddi_wait(15);
+       serigo(GORDON_REG_IMGCTL1, 0x00);
+       mddi_wait(15);
+       serigo(GORDON_REG_LCDIFCTL3, 0x00);
+       mddi_wait(15);
+       serigo(GORDON_REG_VALTRAN, 0x01);
+       mddi_wait(15);
+       serigo(GORDON_REG_LCDIFCTL1, 0x03);
+       serigo(GORDON_REG_LCDIFCTL1, 0x03);
+       mddi_wait(1);
+}
+
+void gordon_disp_off(void)
+{
+       serigo(GORDON_REG_LCDIFCTL2, 0x7B);
+       serigo(GORDON_REG_VALTRAN, 0x01);
+       serigo(GORDON_REG_LCDIFCTL1, 0x02);
+       serigo(GORDON_REG_LCDIFCTL3, 0x01);
+       mddi_wait(20);
+       serigo(GORDON_REG_VALTRAN, 0x01);
+       serigo(GORDON_REG_IMGCTL1, 0x01);
+       serigo(GORDON_REG_LCDIFCTL1, 0x00);
+       mddi_wait(20);
+       serigo(GORDON_REG_POWCTL, 0x1F);
+       mddi_wait(40);
+       serigo(GORDON_REG_POWCTL, 0x07);
+       mddi_wait(40);
+       serigo(GORDON_REG_POWCTL, 0x03);
+       mddi_wait(40);
+       serigo(GORDON_REG_POWCTL, 0x00);
+       mddi_wait(40);
+}
+
+void gordon_disp_init(void)
+{
+       gordon_init();
+       mddi_wait(20);
+       gordon_disp_on();
+}
+
+static void toshiba_common_initial_setup(struct msm_fb_data_type *mfd)
+{
+       if (TM_GET_PID(mfd->panel.id) == LCD_TOSHIBA_2P4_WVGA_PT) {
+               write_client_reg(DPSET0    , 0x4bec0066, TRUE);
+               write_client_reg(DPSET1    , 0x00000113, TRUE);
+               write_client_reg(DPSUS     , 0x00000000, TRUE);
+               write_client_reg(DPRUN     , 0x00000001, TRUE);
+               mddi_wait(5);
+               write_client_reg(SYSCKENA  , 0x00000001, TRUE);
+               write_client_reg(CLKENB    , 0x0000a0e9, TRUE);
+
+               write_client_reg(GPIODATA  , 0x03FF0000, TRUE);
+               write_client_reg(GPIODIR   , 0x0000024D, TRUE);
+               write_client_reg(GPIOSEL   , 0x00000173, TRUE);
+               write_client_reg(GPIOPC    , 0x03C300C0, TRUE);
+               write_client_reg(WKREQ     , 0x00000000, TRUE);
+               write_client_reg(GPIOIS    , 0x00000000, TRUE);
+               write_client_reg(GPIOIEV   , 0x00000001, TRUE);
+               write_client_reg(GPIOIC    , 0x000003FF, TRUE);
+               write_client_reg(GPIODATA  , 0x00040004, TRUE);
+
+               write_client_reg(GPIODATA  , 0x00080008, TRUE);
+               write_client_reg(DRAMPWR   , 0x00000001, TRUE);
+               write_client_reg(CLKENB    , 0x0000a0eb, TRUE);
+               write_client_reg(PWMCR     , 0x00000000, TRUE);
+               mddi_wait(1);
+
+               write_client_reg(SSICTL    , 0x00060399, TRUE);
+               write_client_reg(SSITIME   , 0x00000100, TRUE);
+               write_client_reg(CNT_DIS   , 0x00000002, TRUE);
+               write_client_reg(SSICTL    , 0x0006039b, TRUE);
+
+               write_client_reg(SSITX     , 0x00000000, TRUE);
+               mddi_wait(7);
+               write_client_reg(SSITX     , 0x00000000, TRUE);
+               mddi_wait(7);
+               write_client_reg(SSITX     , 0x00000000, TRUE);
+               mddi_wait(7);
+
+               write_client_reg(SSITX     , 0x000800BA, TRUE);
+               write_client_reg(SSITX     , 0x00000111, TRUE);
+               write_client_reg(SSITX     , 0x00080036, TRUE);
+               write_client_reg(SSITX     , 0x00000100, TRUE);
+               mddi_wait(1);
+               write_client_reg(SSITX     , 0x0008003A, TRUE);
+               write_client_reg(SSITX     , 0x00000160, TRUE);
+               write_client_reg(SSITX     , 0x000800B1, TRUE);
+               write_client_reg(SSITX     , 0x0000015D, TRUE);
+               mddi_wait(1);
+               write_client_reg(SSITX     , 0x000800B2, TRUE);
+               write_client_reg(SSITX     , 0x00000133, TRUE);
+               write_client_reg(SSITX     , 0x000800B3, TRUE);
+               write_client_reg(SSITX     , 0x00000122, TRUE);
+               mddi_wait(1);
+               write_client_reg(SSITX     , 0x000800B4, TRUE);
+               write_client_reg(SSITX     , 0x00000102, TRUE);
+               write_client_reg(SSITX     , 0x000800B5, TRUE);
+               write_client_reg(SSITX     , 0x0000011E, TRUE);
+               mddi_wait(1);
+               write_client_reg(SSITX     , 0x000800B6, TRUE);
+               write_client_reg(SSITX     , 0x00000127, TRUE);
+               write_client_reg(SSITX     , 0x000800B7, TRUE);
+               write_client_reg(SSITX     , 0x00000103, TRUE);
+               mddi_wait(1);
+               write_client_reg(SSITX     , 0x000800B9, TRUE);
+               write_client_reg(SSITX     , 0x00000124, TRUE);
+               write_client_reg(SSITX     , 0x000800BD, TRUE);
+               write_client_reg(SSITX     , 0x000001A1, TRUE);
+               mddi_wait(1);
+               write_client_reg(SSITX     , 0x000800BB, TRUE);
+               write_client_reg(SSITX     , 0x00000100, TRUE);
+               write_client_reg(SSITX     , 0x000800BF, TRUE);
+               write_client_reg(SSITX     , 0x00000101, TRUE);
+               mddi_wait(1);
+               write_client_reg(SSITX     , 0x000800BE, TRUE);
+               write_client_reg(SSITX     , 0x00000100, TRUE);
+               write_client_reg(SSITX     , 0x000800C0, TRUE);
+               write_client_reg(SSITX     , 0x00000111, TRUE);
+               mddi_wait(1);
+               write_client_reg(SSITX     , 0x000800C1, TRUE);
+               write_client_reg(SSITX     , 0x00000111, TRUE);
+               write_client_reg(SSITX     , 0x000800C2, TRUE);
+               write_client_reg(SSITX     , 0x00000111, TRUE);
+               mddi_wait(1);
+               write_client_reg(SSITX     , 0x000800C3, TRUE);
+               write_client_reg(SSITX     , 0x00080132, TRUE);
+               write_client_reg(SSITX     , 0x00000132, TRUE);
+               mddi_wait(1);
+               write_client_reg(SSITX     , 0x000800C4, TRUE);
+               write_client_reg(SSITX     , 0x00080132, TRUE);
+               write_client_reg(SSITX     , 0x00000132, TRUE);
+               mddi_wait(1);
+               write_client_reg(SSITX     , 0x000800C5, TRUE);
+               write_client_reg(SSITX     , 0x00080132, TRUE);
+               write_client_reg(SSITX     , 0x00000132, TRUE);
+               mddi_wait(1);
+               write_client_reg(SSITX     , 0x000800C6, TRUE);
+               write_client_reg(SSITX     , 0x00080132, TRUE);
+               write_client_reg(SSITX     , 0x00000132, TRUE);
+               mddi_wait(1);
+               write_client_reg(SSITX     , 0x000800C7, TRUE);
+               write_client_reg(SSITX     , 0x00080164, TRUE);
+               write_client_reg(SSITX     , 0x00000145, TRUE);
+               mddi_wait(1);
+               write_client_reg(SSITX     , 0x000800C8, TRUE);
+               write_client_reg(SSITX     , 0x00000144, TRUE);
+               write_client_reg(SSITX     , 0x000800C9, TRUE);
+               write_client_reg(SSITX     , 0x00000152, TRUE);
+               mddi_wait(1);
+               write_client_reg(SSITX     , 0x000800CA, TRUE);
+               write_client_reg(SSITX     , 0x00000100, TRUE);
+               mddi_wait(1);
+               write_client_reg(SSITX     , 0x000800EC, TRUE);
+               write_client_reg(SSITX     , 0x00080101, TRUE);
+               write_client_reg(SSITX     , 0x000001FC, TRUE);
+               mddi_wait(1);
+               write_client_reg(SSITX     , 0x000800CF, TRUE);
+               write_client_reg(SSITX     , 0x00000101, TRUE);
+               mddi_wait(1);
+               write_client_reg(SSITX     , 0x000800D0, TRUE);
+               write_client_reg(SSITX     , 0x00080110, TRUE);
+               write_client_reg(SSITX     , 0x00000104, TRUE);
+               mddi_wait(1);
+               write_client_reg(SSITX     , 0x000800D1, TRUE);
+               write_client_reg(SSITX     , 0x00000101, TRUE);
+               mddi_wait(1);
+               write_client_reg(SSITX     , 0x000800D2, TRUE);
+               write_client_reg(SSITX     , 0x00080100, TRUE);
+               write_client_reg(SSITX     , 0x00000128, TRUE);
+               mddi_wait(1);
+               write_client_reg(SSITX     , 0x000800D3, TRUE);
+               write_client_reg(SSITX     , 0x00080100, TRUE);
+               write_client_reg(SSITX     , 0x00000128, TRUE);
+               mddi_wait(1);
+               write_client_reg(SSITX     , 0x000800D4, TRUE);
+               write_client_reg(SSITX     , 0x00080126, TRUE);
+               write_client_reg(SSITX     , 0x000001A4, TRUE);
+               mddi_wait(1);
+               write_client_reg(SSITX     , 0x000800D5, TRUE);
+               write_client_reg(SSITX     , 0x00000120, TRUE);
+               mddi_wait(1);
+               write_client_reg(SSITX     , 0x000800EF, TRUE);
+               write_client_reg(SSITX     , 0x00080132, TRUE);
+               write_client_reg(SSITX     , 0x00000100, TRUE);
+               mddi_wait(1);
+
+               write_client_reg(BITMAP0   , 0x032001E0, TRUE);
+               write_client_reg(BITMAP1   , 0x032001E0, TRUE);
+               write_client_reg(BITMAP2   , 0x014000F0, TRUE);
+               write_client_reg(BITMAP3   , 0x014000F0, TRUE);
+               write_client_reg(BITMAP4   , 0x014000F0, TRUE);
+               write_client_reg(CLKENB    , 0x0000A1EB, TRUE);
+               write_client_reg(PORT_ENB  , 0x00000001, TRUE);
+               write_client_reg(PORT      , 0x00000004, TRUE);
+               write_client_reg(PXL       , 0x00000002, TRUE);
+               write_client_reg(MPLFBUF   , 0x00000000, TRUE);
+               write_client_reg(HCYCLE    , 0x000000FD, TRUE);
+               write_client_reg(HSW       , 0x00000003, TRUE);
+               write_client_reg(HDE_START , 0x00000007, TRUE);
+               write_client_reg(HDE_SIZE  , 0x000000EF, TRUE);
+               write_client_reg(VCYCLE    , 0x00000325, TRUE);
+               write_client_reg(VSW       , 0x00000001, TRUE);
+               write_client_reg(VDE_START , 0x00000003, TRUE);
+               write_client_reg(VDE_SIZE  , 0x0000031F, TRUE);
+               write_client_reg(START     , 0x00000001, TRUE);
+               mddi_wait(32);
+               write_client_reg(SSITX     , 0x000800BC, TRUE);
+               write_client_reg(SSITX     , 0x00000180, TRUE);
+               write_client_reg(SSITX     , 0x0008003B, TRUE);
+               write_client_reg(SSITX     , 0x00000100, TRUE);
+               mddi_wait(1);
+               write_client_reg(SSITX     , 0x000800B0, TRUE);
+               write_client_reg(SSITX     , 0x00000116, TRUE);
+               mddi_wait(1);
+               write_client_reg(SSITX     , 0x000800B8, TRUE);
+               write_client_reg(SSITX     , 0x000801FF, TRUE);
+               write_client_reg(SSITX     , 0x000001F5, TRUE);
+               mddi_wait(1);
+               write_client_reg(SSITX     , 0x00000011, TRUE);
+               mddi_wait(5);
+               write_client_reg(SSITX     , 0x00000029, TRUE);
+               return;
+       }
+
+       if (TM_GET_PID(mfd->panel.id) == LCD_SHARP_2P4_VGA) {
+               write_client_reg(DPSET0, 0x4BEC0066, TRUE);
+               write_client_reg(DPSET1, 0x00000113, TRUE);
+               write_client_reg(DPSUS, 0x00000000, TRUE);
+               write_client_reg(DPRUN, 0x00000001, TRUE);
+               mddi_wait(14);
+               write_client_reg(SYSCKENA, 0x00000001, TRUE);
+               write_client_reg(CLKENB, 0x000000EF, TRUE);
+               write_client_reg(GPIO_BLOCK_BASE, 0x03FF0000, TRUE);
+               write_client_reg(GPIODIR, 0x0000024D, TRUE);
+               write_client_reg(SYSTEM_BLOCK2_BASE, 0x00000173, TRUE);
+               write_client_reg(GPIOPC, 0x03C300C0, TRUE);
+               write_client_reg(SYSTEM_BLOCK1_BASE, 0x00000000, TRUE);
+               write_client_reg(GPIOIS, 0x00000000, TRUE);
+               write_client_reg(GPIOIEV, 0x00000001, TRUE);
+               write_client_reg(GPIOIC, 0x000003FF, TRUE);
+               write_client_reg(GPIO_BLOCK_BASE, 0x00060006, TRUE);
+               write_client_reg(GPIO_BLOCK_BASE, 0x00080008, TRUE);
+               write_client_reg(GPIO_BLOCK_BASE, 0x02000200, TRUE);
+               write_client_reg(DRAMPWR, 0x00000001, TRUE);
+               write_client_reg(TIMER0CTRL, 0x00000060, TRUE);
+               write_client_reg(PWM_BLOCK_BASE, 0x00001388, TRUE);
+               write_client_reg(PWM0OFF, 0x00001387, TRUE);
+               write_client_reg(TIMER1CTRL, 0x00000060, TRUE);
+               write_client_reg(TIMER1LOAD, 0x00001388, TRUE);
+               write_client_reg(PWM1OFF, 0x00001387, TRUE);
+               write_client_reg(TIMER0CTRL, 0x000000E0, TRUE);
+               write_client_reg(TIMER1CTRL, 0x000000E0, TRUE);
+               write_client_reg(PWMCR, 0x00000003, TRUE);
+               mddi_wait(1);
+               write_client_reg(SPI_BLOCK_BASE, 0x00063111, TRUE);
+               write_client_reg(SSITIME, 0x00000100, TRUE);
+               write_client_reg(SPI_BLOCK_BASE, 0x00063113, TRUE);
+               mddi_wait(1);
+               write_client_reg(SSITX, 0x00000000, TRUE);
+               mddi_wait(1);
+               write_client_reg(SSITX, 0x00000000, TRUE);
+               mddi_wait(1);
+               write_client_reg(SSITX, 0x00000000, TRUE);
+               mddi_wait(1);
+               write_client_reg(CLKENB, 0x0000A1EF, TRUE);
+               write_client_reg(START, 0x00000000, TRUE);
+               write_client_reg(WRSTB, 0x0000003F, TRUE);
+               write_client_reg(RDSTB, 0x00000432, TRUE);
+               write_client_reg(PORT_ENB, 0x00000002, TRUE);
+               write_client_reg(VSYNIF, 0x00000000, TRUE);
+               write_client_reg(ASY_DATA, 0x80000000, TRUE);
+               write_client_reg(ASY_DATB, 0x00000001, TRUE);
+               write_client_reg(ASY_CMDSET, 0x00000005, TRUE);
+               write_client_reg(ASY_CMDSET, 0x00000004, TRUE);
+               mddi_wait(10);
+               write_client_reg(ASY_DATA, 0x80000000, TRUE);
+               write_client_reg(ASY_DATB, 0x80000000, TRUE);
+               write_client_reg(ASY_DATC, 0x80000000, TRUE);
+               write_client_reg(ASY_DATD, 0x80000000, TRUE);
+               write_client_reg(ASY_CMDSET, 0x00000009, TRUE);
+               write_client_reg(ASY_CMDSET, 0x00000008, TRUE);
+               write_client_reg(ASY_DATA, 0x80000007, TRUE);
+               write_client_reg(ASY_DATB, 0x00004005, TRUE);
+               write_client_reg(ASY_CMDSET, 0x00000005, TRUE);
+               write_client_reg(ASY_CMDSET, 0x00000004, TRUE);
+               mddi_wait(20);
+               write_client_reg(ASY_DATA, 0x80000059, TRUE);
+               write_client_reg(ASY_DATB, 0x00000000, TRUE);
+               write_client_reg(ASY_CMDSET, 0x00000005, TRUE);
+               write_client_reg(ASY_CMDSET, 0x00000004, TRUE);
+
+               write_client_reg(VSYNIF, 0x00000001, TRUE);
+               write_client_reg(PORT_ENB, 0x00000001, TRUE);
+       } else {
+               write_client_reg(DPSET0, 0x4BEC0066, TRUE);
+               write_client_reg(DPSET1, 0x00000113, TRUE);
+               write_client_reg(DPSUS, 0x00000000, TRUE);
+               write_client_reg(DPRUN, 0x00000001, TRUE);
+               mddi_wait(14);
+               write_client_reg(SYSCKENA, 0x00000001, TRUE);
+               write_client_reg(CLKENB, 0x000000EF, TRUE);
+               write_client_reg(GPIODATA, 0x03FF0000, TRUE);
+               write_client_reg(GPIODIR, 0x0000024D, TRUE);
+               write_client_reg(GPIOSEL, 0x00000173, TRUE);
+               write_client_reg(GPIOPC, 0x03C300C0, TRUE);
+               write_client_reg(WKREQ, 0x00000000, TRUE);
+               write_client_reg(GPIOIS, 0x00000000, TRUE);
+               write_client_reg(GPIOIEV, 0x00000001, TRUE);
+               write_client_reg(GPIOIC, 0x000003FF, TRUE);
+               write_client_reg(GPIODATA, 0x00060006, TRUE);
+               write_client_reg(GPIODATA, 0x00080008, TRUE);
+               write_client_reg(GPIODATA, 0x02000200, TRUE);
+
+               if (TM_GET_PID(mfd->panel.id) == LCD_TOSHIBA_2P4_WVGA) {
+                       mddi_wait(400);
+                       write_client_reg(DRAMPWR, 0x00000001, TRUE);
+
+                       write_client_reg(CNT_DIS, 0x00000002, TRUE);
+                       write_client_reg(BITMAP0, 0x01E00320, TRUE);
+                       write_client_reg(PORT_ENB, 0x00000001, TRUE);
+                       write_client_reg(PORT, 0x00000004, TRUE);
+                       write_client_reg(PXL, 0x0000003A, TRUE);
+                       write_client_reg(MPLFBUF, 0x00000000, TRUE);
+                       write_client_reg(HCYCLE, 0x00000253, TRUE);
+                       write_client_reg(HSW, 0x00000003, TRUE);
+                       write_client_reg(HDE_START, 0x00000017, TRUE);
+                       write_client_reg(HDE_SIZE, 0x0000018F, TRUE);
+                       write_client_reg(VCYCLE, 0x000001FF, TRUE);
+                       write_client_reg(VSW, 0x00000001, TRUE);
+                       write_client_reg(VDE_START, 0x00000003, TRUE);
+                       write_client_reg(VDE_SIZE, 0x000001DF, TRUE);
+                       write_client_reg(START, 0x00000001, TRUE);
+                       mddi_wait(1);
+                       write_client_reg(TIMER0CTRL, 0x00000060, TRUE);
+                       write_client_reg(TIMER0LOAD, 0x00001388, TRUE);
+                       write_client_reg(TIMER1CTRL, 0x00000060, TRUE);
+                       write_client_reg(TIMER1LOAD, 0x00001388, TRUE);
+                       write_client_reg(PWM1OFF, 0x00000087, TRUE);
+               } else {
+                       write_client_reg(DRAMPWR, 0x00000001, TRUE);
+                       write_client_reg(TIMER0CTRL, 0x00000060, TRUE);
+                       write_client_reg(TIMER0LOAD, 0x00001388, TRUE);
+                       write_client_reg(TIMER1CTRL, 0x00000060, TRUE);
+                       write_client_reg(TIMER1LOAD, 0x00001388, TRUE);
+                       write_client_reg(PWM1OFF, 0x00001387, TRUE);
+               }
+
+               write_client_reg(TIMER0CTRL, 0x000000E0, TRUE);
+               write_client_reg(TIMER1CTRL, 0x000000E0, TRUE);
+               write_client_reg(PWMCR, 0x00000003, TRUE);
+               mddi_wait(1);
+               write_client_reg(SSICTL, 0x00000799, TRUE);
+               write_client_reg(SSITIME, 0x00000100, TRUE);
+               write_client_reg(SSICTL, 0x0000079b, TRUE);
+               write_client_reg(SSITX, 0x00000000, TRUE);
+               mddi_wait(1);
+               write_client_reg(SSITX, 0x00000000, TRUE);
+               mddi_wait(1);
+               write_client_reg(SSITX, 0x00000000, TRUE);
+               mddi_wait(1);
+               write_client_reg(SSITX, 0x000800BA, TRUE);
+               write_client_reg(SSITX, 0x00000111, TRUE);
+               write_client_reg(SSITX, 0x00080036, TRUE);
+               write_client_reg(SSITX, 0x00000100, TRUE);
+               mddi_wait(2);
+               write_client_reg(SSITX, 0x000800BB, TRUE);
+               write_client_reg(SSITX, 0x00000100, TRUE);
+               write_client_reg(SSITX, 0x0008003A, TRUE);
+               write_client_reg(SSITX, 0x00000160, TRUE);
+               mddi_wait(2);
+               write_client_reg(SSITX, 0x000800BF, TRUE);
+               write_client_reg(SSITX, 0x00000100, TRUE);
+               write_client_reg(SSITX, 0x000800B1, TRUE);
+               write_client_reg(SSITX, 0x0000015D, TRUE);
+               mddi_wait(2);
+               write_client_reg(SSITX, 0x000800B2, TRUE);
+               write_client_reg(SSITX, 0x00000133, TRUE);
+               write_client_reg(SSITX, 0x000800B3, TRUE);
+               write_client_reg(SSITX, 0x00000122, TRUE);
+               mddi_wait(2);
+               write_client_reg(SSITX, 0x000800B4, TRUE);
+               write_client_reg(SSITX, 0x00000102, TRUE);
+               write_client_reg(SSITX, 0x000800B5, TRUE);
+               write_client_reg(SSITX, 0x0000011F, TRUE);
+               mddi_wait(2);
+               write_client_reg(SSITX, 0x000800B6, TRUE);
+               write_client_reg(SSITX, 0x00000128, TRUE);
+               write_client_reg(SSITX, 0x000800B7, TRUE);
+               write_client_reg(SSITX, 0x00000103, TRUE);
+               mddi_wait(2);
+               write_client_reg(SSITX, 0x000800B9, TRUE);
+               write_client_reg(SSITX, 0x00000120, TRUE);
+               write_client_reg(SSITX, 0x000800BD, TRUE);
+               write_client_reg(SSITX, 0x00000102, TRUE);
+               mddi_wait(2);
+               write_client_reg(SSITX, 0x000800BE, TRUE);
+               write_client_reg(SSITX, 0x00000100, TRUE);
+               write_client_reg(SSITX, 0x000800C0, TRUE);
+               write_client_reg(SSITX, 0x00000111, TRUE);
+               mddi_wait(2);
+               write_client_reg(SSITX, 0x000800C1, TRUE);
+               write_client_reg(SSITX, 0x00000111, TRUE);
+               write_client_reg(SSITX, 0x000800C2, TRUE);
+               write_client_reg(SSITX, 0x00000111, TRUE);
+               mddi_wait(2);
+               write_client_reg(SSITX, 0x000800C3, TRUE);
+               write_client_reg(SSITX, 0x0008010A, TRUE);
+               write_client_reg(SSITX, 0x0000010A, TRUE);
+               mddi_wait(2);
+               write_client_reg(SSITX, 0x000800C4, TRUE);
+               write_client_reg(SSITX, 0x00080160, TRUE);
+               write_client_reg(SSITX, 0x00000160, TRUE);
+               mddi_wait(2);
+               write_client_reg(SSITX, 0x000800C5, TRUE);
+               write_client_reg(SSITX, 0x00080160, TRUE);
+               write_client_reg(SSITX, 0x00000160, TRUE);
+               mddi_wait(2);
+               write_client_reg(SSITX, 0x000800C6, TRUE);
+               write_client_reg(SSITX, 0x00080160, TRUE);
+               write_client_reg(SSITX, 0x00000160, TRUE);
+               mddi_wait(2);
+               write_client_reg(SSITX, 0x000800C7, TRUE);
+               write_client_reg(SSITX, 0x00080133, TRUE);
+               write_client_reg(SSITX, 0x00000143, TRUE);
+               mddi_wait(2);
+               write_client_reg(SSITX, 0x000800C8, TRUE);
+               write_client_reg(SSITX, 0x00000144, TRUE);
+               write_client_reg(SSITX, 0x000800C9, TRUE);
+               write_client_reg(SSITX, 0x00000133, TRUE);
+               mddi_wait(2);
+               write_client_reg(SSITX, 0x000800CA, TRUE);
+               write_client_reg(SSITX, 0x00000100, TRUE);
+               mddi_wait(2);
+               write_client_reg(SSITX, 0x000800EC, TRUE);
+               write_client_reg(SSITX, 0x00080102, TRUE);
+               write_client_reg(SSITX, 0x00000118, TRUE);
+               mddi_wait(2);
+               write_client_reg(SSITX, 0x000800CF, TRUE);
+               write_client_reg(SSITX, 0x00000101, TRUE);
+               mddi_wait(2);
+               write_client_reg(SSITX, 0x000800D0, TRUE);
+               write_client_reg(SSITX, 0x00080110, TRUE);
+               write_client_reg(SSITX, 0x00000104, TRUE);
+               mddi_wait(2);
+               write_client_reg(SSITX, 0x000800D1, TRUE);
+               write_client_reg(SSITX, 0x00000101, TRUE);
+               mddi_wait(2);
+               write_client_reg(SSITX, 0x000800D2, TRUE);
+               write_client_reg(SSITX, 0x00080100, TRUE);
+               write_client_reg(SSITX, 0x0000013A, TRUE);
+               mddi_wait(2);
+               write_client_reg(SSITX, 0x000800D3, TRUE);
+               write_client_reg(SSITX, 0x00080100, TRUE);
+               write_client_reg(SSITX, 0x0000013A, TRUE);
+               mddi_wait(2);
+               write_client_reg(SSITX, 0x000800D4, TRUE);
+               write_client_reg(SSITX, 0x00080124, TRUE);
+               write_client_reg(SSITX, 0x0000016E, TRUE);
+               mddi_wait(1);
+               write_client_reg(SSITX, 0x000800D5, TRUE);
+               write_client_reg(SSITX, 0x00000124, TRUE);
+               mddi_wait(2);
+               write_client_reg(SSITX, 0x000800ED, TRUE);
+               write_client_reg(SSITX, 0x00080101, TRUE);
+               write_client_reg(SSITX, 0x0000010A, TRUE);
+               mddi_wait(2);
+               write_client_reg(SSITX, 0x000800D6, TRUE);
+               write_client_reg(SSITX, 0x00000101, TRUE);
+               mddi_wait(2);
+               write_client_reg(SSITX, 0x000800D7, TRUE);
+               write_client_reg(SSITX, 0x00080110, TRUE);
+               write_client_reg(SSITX, 0x0000010A, TRUE);
+               mddi_wait(2);
+               write_client_reg(SSITX, 0x000800D8, TRUE);
+               write_client_reg(SSITX, 0x00000101, TRUE);
+               mddi_wait(2);
+               write_client_reg(SSITX, 0x000800D9, TRUE);
+               write_client_reg(SSITX, 0x00080100, TRUE);
+               write_client_reg(SSITX, 0x00000114, TRUE);
+               mddi_wait(2);
+               write_client_reg(SSITX, 0x000800DE, TRUE);
+               write_client_reg(SSITX, 0x00080100, TRUE);
+               write_client_reg(SSITX, 0x00000114, TRUE);
+               mddi_wait(2);
+               write_client_reg(SSITX, 0x000800DF, TRUE);
+               write_client_reg(SSITX, 0x00080112, TRUE);
+               write_client_reg(SSITX, 0x0000013F, TRUE);
+               mddi_wait(2);
+               write_client_reg(SSITX, 0x000800E0, TRUE);
+               write_client_reg(SSITX, 0x0000010B, TRUE);
+               write_client_reg(SSITX, 0x000800E2, TRUE);
+               write_client_reg(SSITX, 0x00000101, TRUE);
+               mddi_wait(2);
+               write_client_reg(SSITX, 0x000800E3, TRUE);
+               write_client_reg(SSITX, 0x00000136, TRUE);
+               mddi_wait(2);
+               write_client_reg(SSITX, 0x000800E4, TRUE);
+               write_client_reg(SSITX, 0x00080100, TRUE);
+               write_client_reg(SSITX, 0x00000103, TRUE);
+               mddi_wait(2);
+               write_client_reg(SSITX, 0x000800E5, TRUE);
+               write_client_reg(SSITX, 0x00080102, TRUE);
+               write_client_reg(SSITX, 0x00000104, TRUE);
+               mddi_wait(2);
+               write_client_reg(SSITX, 0x000800E6, TRUE);
+               write_client_reg(SSITX, 0x00000103, TRUE);
+               mddi_wait(2);
+               write_client_reg(SSITX, 0x000800E7, TRUE);
+               write_client_reg(SSITX, 0x00080104, TRUE);
+               write_client_reg(SSITX, 0x0000010A, TRUE);
+               mddi_wait(2);
+               write_client_reg(SSITX, 0x000800E8, TRUE);
+               write_client_reg(SSITX, 0x00000104, TRUE);
+               write_client_reg(CLKENB, 0x000001EF, TRUE);
+               write_client_reg(START, 0x00000000, TRUE);
+               write_client_reg(WRSTB, 0x0000003F, TRUE);
+               write_client_reg(RDSTB, 0x00000432, TRUE);
+               write_client_reg(PORT_ENB, 0x00000002, TRUE);
+               write_client_reg(VSYNIF, 0x00000000, TRUE);
+               write_client_reg(ASY_DATA, 0x80000000, TRUE);
+               write_client_reg(ASY_DATB, 0x00000001, TRUE);
+               write_client_reg(ASY_CMDSET, 0x00000005, TRUE);
+               write_client_reg(ASY_CMDSET, 0x00000004, TRUE);
+               mddi_wait(10);
+               write_client_reg(ASY_DATA, 0x80000000, TRUE);
+               write_client_reg(ASY_DATB, 0x80000000, TRUE);
+               write_client_reg(ASY_DATC, 0x80000000, TRUE);
+               write_client_reg(ASY_DATD, 0x80000000, TRUE);
+               write_client_reg(ASY_CMDSET, 0x00000009, TRUE);
+               write_client_reg(ASY_CMDSET, 0x00000008, TRUE);
+               write_client_reg(ASY_DATA, 0x80000007, TRUE);
+               write_client_reg(ASY_DATB, 0x00004005, TRUE);
+               write_client_reg(ASY_CMDSET, 0x00000005, TRUE);
+               write_client_reg(ASY_CMDSET, 0x00000004, TRUE);
+               mddi_wait(20);
+               write_client_reg(ASY_DATA, 0x80000059, TRUE);
+               write_client_reg(ASY_DATB, 0x00000000, TRUE);
+               write_client_reg(ASY_CMDSET, 0x00000005, TRUE);
+               write_client_reg(ASY_CMDSET, 0x00000004, TRUE);
+               write_client_reg(VSYNIF, 0x00000001, TRUE);
+               write_client_reg(PORT_ENB, 0x00000001, TRUE);
+       }
+
+       mddi_toshiba_state_transition(TOSHIBA_STATE_PRIM_SEC_STANDBY,
+                                     TOSHIBA_STATE_PRIM_SEC_READY);
+}
+
+static void toshiba_prim_start(struct msm_fb_data_type *mfd)
+{
+       if (TM_GET_PID(mfd->panel.id) == LCD_TOSHIBA_2P4_WVGA_PT)
+               return;
+
+       if (TM_GET_PID(mfd->panel.id) == LCD_SHARP_2P4_VGA) {
+               write_client_reg(BITMAP1, 0x01E000F0, TRUE);
+               write_client_reg(BITMAP2, 0x01E000F0, TRUE);
+               write_client_reg(BITMAP3, 0x01E000F0, TRUE);
+               write_client_reg(BITMAP4, 0x00DC00B0, TRUE);
+               write_client_reg(CLKENB, 0x000001EF, TRUE);
+               write_client_reg(PORT_ENB, 0x00000001, TRUE);
+               write_client_reg(PORT, 0x00000016, TRUE);
+               write_client_reg(PXL, 0x00000002, TRUE);
+               write_client_reg(MPLFBUF, 0x00000000, TRUE);
+               write_client_reg(HCYCLE, 0x00000185, TRUE);
+               write_client_reg(HSW, 0x00000018, TRUE);
+               write_client_reg(HDE_START, 0x0000004A, TRUE);
+               write_client_reg(HDE_SIZE, 0x000000EF, TRUE);
+               write_client_reg(VCYCLE, 0x0000028E, TRUE);
+               write_client_reg(VSW, 0x00000004, TRUE);
+               write_client_reg(VDE_START, 0x00000009, TRUE);
+               write_client_reg(VDE_SIZE, 0x0000027F, TRUE);
+               write_client_reg(START, 0x00000001, TRUE);
+               write_client_reg(SYSTEM_BLOCK1_BASE, 0x00000002, TRUE);
+       } else{
+
+               write_client_reg(VSYNIF, 0x00000001, TRUE);
+               write_client_reg(PORT_ENB, 0x00000001, TRUE);
+               write_client_reg(BITMAP1, 0x01E000F0, TRUE);
+               write_client_reg(BITMAP2, 0x01E000F0, TRUE);
+               write_client_reg(BITMAP3, 0x01E000F0, TRUE);
+               write_client_reg(BITMAP4, 0x00DC00B0, TRUE);
+               write_client_reg(CLKENB, 0x000001EF, TRUE);
+               write_client_reg(PORT_ENB, 0x00000001, TRUE);
+               write_client_reg(PORT, 0x00000004, TRUE);
+               write_client_reg(PXL, 0x00000002, TRUE);
+               write_client_reg(MPLFBUF, 0x00000000, TRUE);
+
+               if (mddi_toshiba_61Hz_refresh) {
+                       write_client_reg(HCYCLE, 0x000000FC, TRUE);
+                       mddi_toshiba_rows_per_second = 39526;
+                       mddi_toshiba_rows_per_refresh = 646;
+                       mddi_toshiba_usecs_per_refresh = 16344;
+               } else {
+                       write_client_reg(HCYCLE, 0x0000010b, TRUE);
+                       mddi_toshiba_rows_per_second = 37313;
+                       mddi_toshiba_rows_per_refresh = 646;
+                       mddi_toshiba_usecs_per_refresh = 17313;
+               }
+
+               write_client_reg(HSW, 0x00000003, TRUE);
+               write_client_reg(HDE_START, 0x00000007, TRUE);
+               write_client_reg(HDE_SIZE, 0x000000EF, TRUE);
+               write_client_reg(VCYCLE, 0x00000285, TRUE);
+               write_client_reg(VSW, 0x00000001, TRUE);
+               write_client_reg(VDE_START, 0x00000003, TRUE);
+               write_client_reg(VDE_SIZE, 0x0000027F, TRUE);
+               write_client_reg(START, 0x00000001, TRUE);
+               mddi_wait(10);
+               write_client_reg(SSITX, 0x000800BC, TRUE);
+               write_client_reg(SSITX, 0x00000180, TRUE);
+               write_client_reg(SSITX, 0x0008003B, TRUE);
+               write_client_reg(SSITX, 0x00000100, TRUE);
+               mddi_wait(1);
+               write_client_reg(SSITX, 0x000800B0, TRUE);
+               write_client_reg(SSITX, 0x00000116, TRUE);
+               mddi_wait(1);
+               write_client_reg(SSITX, 0x000800B8, TRUE);
+               write_client_reg(SSITX, 0x000801FF, TRUE);
+               write_client_reg(SSITX, 0x000001F5, TRUE);
+               mddi_wait(1);
+               write_client_reg(SSITX, 0x00000011, TRUE);
+               write_client_reg(SSITX, 0x00000029, TRUE);
+               write_client_reg(WKREQ, 0x00000000, TRUE);
+               write_client_reg(WAKEUP, 0x00000000, TRUE);
+               write_client_reg(INTMSK, 0x00000001, TRUE);
+       }
+
+       mddi_toshiba_state_transition(TOSHIBA_STATE_PRIM_SEC_READY,
+                                     TOSHIBA_STATE_PRIM_NORMAL_MODE);
+}
+
+static void toshiba_sec_start(struct msm_fb_data_type *mfd)
+{
+       if (TM_GET_PID(mfd->panel.id) == LCD_TOSHIBA_2P4_WVGA_PT)
+               return;
+
+       write_client_reg(VSYNIF, 0x00000000, TRUE);
+       write_client_reg(PORT_ENB, 0x00000002, TRUE);
+       write_client_reg(CLKENB, 0x000011EF, TRUE);
+       write_client_reg(BITMAP0, 0x028001E0, TRUE);
+       write_client_reg(BITMAP1, 0x00000000, TRUE);
+       write_client_reg(BITMAP2, 0x00000000, TRUE);
+       write_client_reg(BITMAP3, 0x00000000, TRUE);
+       write_client_reg(BITMAP4, 0x00DC00B0, TRUE);
+       write_client_reg(PORT, 0x00000000, TRUE);
+       write_client_reg(PXL, 0x00000000, TRUE);
+       write_client_reg(MPLFBUF, 0x00000004, TRUE);
+       write_client_reg(HCYCLE, 0x0000006B, TRUE);
+       write_client_reg(HSW, 0x00000003, TRUE);
+       write_client_reg(HDE_START, 0x00000007, TRUE);
+       write_client_reg(HDE_SIZE, 0x00000057, TRUE);
+       write_client_reg(VCYCLE, 0x000000E6, TRUE);
+       write_client_reg(VSW, 0x00000001, TRUE);
+       write_client_reg(VDE_START, 0x00000003, TRUE);
+       write_client_reg(VDE_SIZE, 0x000000DB, TRUE);
+       write_client_reg(ASY_DATA, 0x80000001, TRUE);
+       write_client_reg(ASY_DATB, 0x0000011B, TRUE);
+       write_client_reg(ASY_DATC, 0x80000002, TRUE);
+       write_client_reg(ASY_DATD, 0x00000700, TRUE);
+       write_client_reg(ASY_DATE, 0x80000003, TRUE);
+       write_client_reg(ASY_DATF, 0x00000230, TRUE);
+       write_client_reg(ASY_DATG, 0x80000008, TRUE);
+       write_client_reg(ASY_DATH, 0x00000402, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000001, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000000, TRUE);
+       write_client_reg(ASY_DATA, 0x80000009, TRUE);
+       write_client_reg(ASY_DATB, 0x00000000, TRUE);
+       write_client_reg(ASY_DATC, 0x8000000B, TRUE);
+       write_client_reg(ASY_DATD, 0x00000000, TRUE);
+       write_client_reg(ASY_DATE, 0x8000000C, TRUE);
+       write_client_reg(ASY_DATF, 0x00000000, TRUE);
+       write_client_reg(ASY_DATG, 0x8000000D, TRUE);
+       write_client_reg(ASY_DATH, 0x00000409, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000001, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000000, TRUE);
+       write_client_reg(ASY_DATA, 0x8000000E, TRUE);
+       write_client_reg(ASY_DATB, 0x00000409, TRUE);
+       write_client_reg(ASY_DATC, 0x80000030, TRUE);
+       write_client_reg(ASY_DATD, 0x00000000, TRUE);
+       write_client_reg(ASY_DATE, 0x80000031, TRUE);
+       write_client_reg(ASY_DATF, 0x00000100, TRUE);
+       write_client_reg(ASY_DATG, 0x80000032, TRUE);
+       write_client_reg(ASY_DATH, 0x00000104, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000001, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000000, TRUE);
+       write_client_reg(ASY_DATA, 0x80000033, TRUE);
+       write_client_reg(ASY_DATB, 0x00000400, TRUE);
+       write_client_reg(ASY_DATC, 0x80000034, TRUE);
+       write_client_reg(ASY_DATD, 0x00000306, TRUE);
+       write_client_reg(ASY_DATE, 0x80000035, TRUE);
+       write_client_reg(ASY_DATF, 0x00000706, TRUE);
+       write_client_reg(ASY_DATG, 0x80000036, TRUE);
+       write_client_reg(ASY_DATH, 0x00000707, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000001, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000000, TRUE);
+       write_client_reg(ASY_DATA, 0x80000037, TRUE);
+       write_client_reg(ASY_DATB, 0x00000004, TRUE);
+       write_client_reg(ASY_DATC, 0x80000038, TRUE);
+       write_client_reg(ASY_DATD, 0x00000000, TRUE);
+       write_client_reg(ASY_DATE, 0x80000039, TRUE);
+       write_client_reg(ASY_DATF, 0x00000000, TRUE);
+       write_client_reg(ASY_DATG, 0x8000003A, TRUE);
+       write_client_reg(ASY_DATH, 0x00000001, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000001, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000000, TRUE);
+       write_client_reg(ASY_DATA, 0x80000044, TRUE);
+       write_client_reg(ASY_DATB, 0x0000AF00, TRUE);
+       write_client_reg(ASY_DATC, 0x80000045, TRUE);
+       write_client_reg(ASY_DATD, 0x0000DB00, TRUE);
+       write_client_reg(ASY_DATE, 0x08000042, TRUE);
+       write_client_reg(ASY_DATF, 0x0000DB00, TRUE);
+       write_client_reg(ASY_DATG, 0x80000021, TRUE);
+       write_client_reg(ASY_DATH, 0x00000000, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000001, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000000, TRUE);
+       write_client_reg(PXL, 0x0000000C, TRUE);
+       write_client_reg(VSYNIF, 0x00000001, TRUE);
+       write_client_reg(ASY_DATA, 0x80000022, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000003, TRUE);
+       write_client_reg(START, 0x00000001, TRUE);
+       mddi_wait(60);
+       write_client_reg(PXL, 0x00000000, TRUE);
+       write_client_reg(VSYNIF, 0x00000000, TRUE);
+       write_client_reg(START, 0x00000000, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000000, TRUE);
+       write_client_reg(ASY_DATA, 0x80000050, TRUE);
+       write_client_reg(ASY_DATB, 0x00000000, TRUE);
+       write_client_reg(ASY_DATC, 0x80000051, TRUE);
+       write_client_reg(ASY_DATD, 0x00000E00, TRUE);
+       write_client_reg(ASY_DATE, 0x80000052, TRUE);
+       write_client_reg(ASY_DATF, 0x00000D01, TRUE);
+       write_client_reg(ASY_DATG, 0x80000053, TRUE);
+       write_client_reg(ASY_DATH, 0x00000000, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000001, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000000, TRUE);
+       write_client_reg(ASY_DATA, 0x80000058, TRUE);
+       write_client_reg(ASY_DATB, 0x00000000, TRUE);
+       write_client_reg(ASY_DATC, 0x8000005A, TRUE);
+       write_client_reg(ASY_DATD, 0x00000E01, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000009, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000008, TRUE);
+       write_client_reg(ASY_DATA, 0x80000011, TRUE);
+       write_client_reg(ASY_DATB, 0x00000812, TRUE);
+       write_client_reg(ASY_DATC, 0x80000012, TRUE);
+       write_client_reg(ASY_DATD, 0x00000003, TRUE);
+       write_client_reg(ASY_DATE, 0x80000013, TRUE);
+       write_client_reg(ASY_DATF, 0x00000909, TRUE);
+       write_client_reg(ASY_DATG, 0x80000010, TRUE);
+       write_client_reg(ASY_DATH, 0x00000040, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000001, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000000, TRUE);
+       mddi_wait(40);
+       write_client_reg(ASY_DATA, 0x80000010, TRUE);
+       write_client_reg(ASY_DATB, 0x00000340, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000005, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000004, TRUE);
+       mddi_wait(60);
+       write_client_reg(ASY_DATA, 0x80000010, TRUE);
+       write_client_reg(ASY_DATB, 0x00003340, TRUE);
+       write_client_reg(ASY_DATC, 0x80000007, TRUE);
+       write_client_reg(ASY_DATD, 0x00004007, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000009, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000008, TRUE);
+       mddi_wait(1);
+       write_client_reg(ASY_DATA, 0x80000007, TRUE);
+       write_client_reg(ASY_DATB, 0x00004017, TRUE);
+       write_client_reg(ASY_DATC, 0x8000005B, TRUE);
+       write_client_reg(ASY_DATD, 0x00000000, TRUE);
+       write_client_reg(ASY_DATE, 0x80000059, TRUE);
+       write_client_reg(ASY_DATF, 0x00000011, TRUE);
+       write_client_reg(ASY_CMDSET, 0x0000000D, TRUE);
+       write_client_reg(ASY_CMDSET, 0x0000000C, TRUE);
+       mddi_wait(20);
+       write_client_reg(ASY_DATA, 0x80000059, TRUE);
+       /* LTPS I/F control */
+       write_client_reg(ASY_DATB, 0x00000019, TRUE);
+       /* Direct cmd transfer enable */
+       write_client_reg(ASY_CMDSET, 0x00000005, TRUE);
+       /* Direct cmd transfer disable */
+       write_client_reg(ASY_CMDSET, 0x00000004, TRUE);
+       mddi_wait(20);
+       /* Index setting of SUB LCDD */
+       write_client_reg(ASY_DATA, 0x80000059, TRUE);
+       /* LTPS I/F control */
+       write_client_reg(ASY_DATB, 0x00000079, TRUE);
+       /* Direct cmd transfer enable */
+       write_client_reg(ASY_CMDSET, 0x00000005, TRUE);
+       /* Direct cmd transfer disable */
+       write_client_reg(ASY_CMDSET, 0x00000004, TRUE);
+       mddi_wait(20);
+       /* Index setting of SUB LCDD */
+       write_client_reg(ASY_DATA, 0x80000059, TRUE);
+       /* LTPS I/F control */
+       write_client_reg(ASY_DATB, 0x000003FD, TRUE);
+       /* Direct cmd transfer enable */
+       write_client_reg(ASY_CMDSET, 0x00000005, TRUE);
+       /* Direct cmd transfer disable */
+       write_client_reg(ASY_CMDSET, 0x00000004, TRUE);
+       mddi_wait(20);
+       mddi_toshiba_state_transition(TOSHIBA_STATE_PRIM_SEC_READY,
+                                     TOSHIBA_STATE_SEC_NORMAL_MODE);
+}
+
+static void toshiba_prim_lcd_off(struct msm_fb_data_type *mfd)
+{
+       if (TM_GET_PID(mfd->panel.id) == LCD_SHARP_2P4_VGA) {
+               gordon_disp_off();
+       } else{
+
+               /* Main panel power off (Deep standby in) */
+               write_client_reg(SSITX, 0x000800BC, TRUE);
+               write_client_reg(SSITX, 0x00000100, TRUE);
+               write_client_reg(SSITX, 0x00000028, TRUE);
+               mddi_wait(1);
+               write_client_reg(SSITX, 0x000800B8, TRUE);
+               write_client_reg(SSITX, 0x00000180, TRUE);
+               write_client_reg(SSITX, 0x00000102, TRUE);
+               write_client_reg(SSITX, 0x00000010, TRUE);
+       }
+       write_client_reg(PORT, 0x00000003, TRUE);
+       write_client_reg(REGENB, 0x00000001, TRUE);
+       mddi_wait(1);
+       write_client_reg(PXL, 0x00000000, TRUE);
+       write_client_reg(START, 0x00000000, TRUE);
+       write_client_reg(REGENB, 0x00000001, TRUE);
+       mddi_wait(3);
+       if (TM_GET_PID(mfd->panel.id) != LCD_SHARP_2P4_VGA) {
+               write_client_reg(SSITX, 0x000800B0, TRUE);
+               write_client_reg(SSITX, 0x00000100, TRUE);
+       }
+       mddi_toshiba_state_transition(TOSHIBA_STATE_PRIM_NORMAL_MODE,
+                                     TOSHIBA_STATE_PRIM_SEC_STANDBY);
+}
+
+static void toshiba_sec_lcd_off(struct msm_fb_data_type *mfd)
+{
+       if (TM_GET_PID(mfd->panel.id) == LCD_TOSHIBA_2P4_WVGA_PT)
+               return;
+
+       write_client_reg(VSYNIF, 0x00000000, TRUE);
+       write_client_reg(PORT_ENB, 0x00000002, TRUE);
+       write_client_reg(ASY_DATA, 0x80000007, TRUE);
+       write_client_reg(ASY_DATB, 0x00004016, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000005, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000004, TRUE);
+       mddi_wait(2);
+       write_client_reg(ASY_DATA, 0x80000059, TRUE);
+       write_client_reg(ASY_DATB, 0x00000019, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000005, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000004, TRUE);
+       mddi_wait(2);
+       write_client_reg(ASY_DATA, 0x80000059, TRUE);
+       write_client_reg(ASY_DATB, 0x0000000B, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000005, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000004, TRUE);
+       mddi_wait(2);
+       write_client_reg(ASY_DATA, 0x80000059, TRUE);
+       write_client_reg(ASY_DATB, 0x00000002, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000005, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000004, TRUE);
+       mddi_wait(4);
+       write_client_reg(ASY_DATA, 0x80000010, TRUE);
+       write_client_reg(ASY_DATB, 0x00000300, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000005, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000004, TRUE);
+       mddi_wait(4);
+       write_client_reg(ASY_DATA, 0x80000059, TRUE);
+       write_client_reg(ASY_DATB, 0x00000000, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000005, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000004, TRUE);
+       mddi_wait(2);
+       write_client_reg(ASY_DATA, 0x80000007, TRUE);
+       write_client_reg(ASY_DATB, 0x00004004, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000005, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000004, TRUE);
+       mddi_wait(2);
+       write_client_reg(PORT, 0x00000000, TRUE);
+       write_client_reg(PXL, 0x00000000, TRUE);
+       write_client_reg(START, 0x00000000, TRUE);
+       write_client_reg(VSYNIF, 0x00000001, TRUE);
+       write_client_reg(PORT_ENB, 0x00000001, TRUE);
+       write_client_reg(REGENB, 0x00000001, TRUE);
+       mddi_toshiba_state_transition(TOSHIBA_STATE_SEC_NORMAL_MODE,
+                                     TOSHIBA_STATE_PRIM_SEC_STANDBY);
+}
+
+static void toshiba_sec_cont_update_start(struct msm_fb_data_type *mfd)
+{
+
+       if (TM_GET_PID(mfd->panel.id) == LCD_TOSHIBA_2P4_WVGA_PT)
+               return;
+
+       write_client_reg(VSYNIF, 0x00000000, TRUE);
+       write_client_reg(PORT_ENB, 0x00000002, TRUE);
+       write_client_reg(INTMASK, 0x00000001, TRUE);
+       write_client_reg(TTBUSSEL, 0x0000000B, TRUE);
+       write_client_reg(MONI, 0x00000008, TRUE);
+       write_client_reg(CLKENB, 0x000000EF, TRUE);
+       write_client_reg(CLKENB, 0x000010EF, TRUE);
+       write_client_reg(CLKENB, 0x000011EF, TRUE);
+       write_client_reg(BITMAP4, 0x00DC00B0, TRUE);
+       write_client_reg(HCYCLE, 0x0000006B, TRUE);
+       write_client_reg(HSW, 0x00000003, TRUE);
+       write_client_reg(HDE_START, 0x00000002, TRUE);
+       write_client_reg(HDE_SIZE, 0x00000057, TRUE);
+       write_client_reg(VCYCLE, 0x000000E6, TRUE);
+       write_client_reg(VSW, 0x00000001, TRUE);
+       write_client_reg(VDE_START, 0x00000003, TRUE);
+       write_client_reg(VDE_SIZE, 0x000000DB, TRUE);
+       write_client_reg(WRSTB, 0x00000015, TRUE);
+       write_client_reg(MPLFBUF, 0x00000004, TRUE);
+       write_client_reg(ASY_DATA, 0x80000021, TRUE);
+       write_client_reg(ASY_DATB, 0x00000000, TRUE);
+       write_client_reg(ASY_DATC, 0x80000022, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000007, TRUE);
+       write_client_reg(PXL, 0x00000089, TRUE);
+       write_client_reg(VSYNIF, 0x00000001, TRUE);
+       mddi_wait(2);
+}
+
+static void toshiba_sec_cont_update_stop(struct msm_fb_data_type *mfd)
+{
+       if (TM_GET_PID(mfd->panel.id) == LCD_TOSHIBA_2P4_WVGA_PT)
+               return;
+
+       write_client_reg(PXL, 0x00000000, TRUE);
+       write_client_reg(VSYNIF, 0x00000000, TRUE);
+       write_client_reg(START, 0x00000000, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000000, TRUE);
+       mddi_wait(3);
+       write_client_reg(SRST, 0x00000002, TRUE);
+       mddi_wait(3);
+       write_client_reg(SRST, 0x00000003, TRUE);
+}
+
+static void toshiba_sec_backlight_on(struct msm_fb_data_type *mfd)
+{
+       if (TM_GET_PID(mfd->panel.id) == LCD_TOSHIBA_2P4_WVGA_PT)
+               return;
+
+       write_client_reg(TIMER0CTRL, 0x00000060, TRUE);
+       write_client_reg(TIMER0LOAD, 0x00001388, TRUE);
+       write_client_reg(PWM0OFF, 0x00000001, TRUE);
+       write_client_reg(TIMER1CTRL, 0x00000060, TRUE);
+       write_client_reg(TIMER1LOAD, 0x00001388, TRUE);
+       write_client_reg(PWM1OFF, 0x00001387, TRUE);
+       write_client_reg(TIMER0CTRL, 0x000000E0, TRUE);
+       write_client_reg(TIMER1CTRL, 0x000000E0, TRUE);
+       write_client_reg(PWMCR, 0x00000003, TRUE);
+}
+
+static void toshiba_sec_sleep_in(struct msm_fb_data_type *mfd)
+{
+       if (TM_GET_PID(mfd->panel.id) == LCD_TOSHIBA_2P4_WVGA_PT)
+               return;
+
+       write_client_reg(VSYNIF, 0x00000000, TRUE);
+       write_client_reg(PORT_ENB, 0x00000002, TRUE);
+       write_client_reg(ASY_DATA, 0x80000007, TRUE);
+       write_client_reg(ASY_DATB, 0x00004016, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000005, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000004, TRUE);
+       mddi_wait(2);
+       write_client_reg(ASY_DATA, 0x80000059, TRUE);
+       write_client_reg(ASY_DATB, 0x00000019, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000005, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000004, TRUE);
+       mddi_wait(2);
+       write_client_reg(ASY_DATA, 0x80000059, TRUE);
+       write_client_reg(ASY_DATB, 0x0000000B, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000005, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000004, TRUE);
+       mddi_wait(2);
+       write_client_reg(ASY_DATA, 0x80000059, TRUE);
+       write_client_reg(ASY_DATB, 0x00000002, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000005, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000004, TRUE);
+       mddi_wait(4);
+       write_client_reg(ASY_DATA, 0x80000010, TRUE);
+       write_client_reg(ASY_DATB, 0x00000300, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000005, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000004, TRUE);
+       mddi_wait(4);
+       write_client_reg(ASY_DATA, 0x80000059, TRUE);
+       write_client_reg(ASY_DATB, 0x00000000, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000005, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000004, TRUE);
+       mddi_wait(2);
+       write_client_reg(ASY_DATA, 0x80000007, TRUE);
+       write_client_reg(ASY_DATB, 0x00004004, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000005, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000004, TRUE);
+       mddi_wait(2);
+       write_client_reg(PORT, 0x00000000, TRUE);
+       write_client_reg(PXL, 0x00000000, TRUE);
+       write_client_reg(START, 0x00000000, TRUE);
+       write_client_reg(REGENB, 0x00000001, TRUE);
+       /* Sleep in sequence */
+       write_client_reg(ASY_DATA, 0x80000010, TRUE);
+       write_client_reg(ASY_DATB, 0x00000302, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000005, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000004, TRUE);
+}
+
+static void toshiba_sec_sleep_out(struct msm_fb_data_type *mfd)
+{
+       if (TM_GET_PID(mfd->panel.id) == LCD_TOSHIBA_2P4_WVGA_PT)
+               return;
+
+       write_client_reg(VSYNIF, 0x00000000, TRUE);
+       write_client_reg(PORT_ENB, 0x00000002, TRUE);
+       write_client_reg(ASY_DATA, 0x80000010, TRUE);
+       write_client_reg(ASY_DATB, 0x00000300, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000005, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000004, TRUE);
+       /*  Display ON sequence */
+       write_client_reg(ASY_DATA, 0x80000011, TRUE);
+       write_client_reg(ASY_DATB, 0x00000812, TRUE);
+       write_client_reg(ASY_DATC, 0x80000012, TRUE);
+       write_client_reg(ASY_DATD, 0x00000003, TRUE);
+       write_client_reg(ASY_DATE, 0x80000013, TRUE);
+       write_client_reg(ASY_DATF, 0x00000909, TRUE);
+       write_client_reg(ASY_DATG, 0x80000010, TRUE);
+       write_client_reg(ASY_DATH, 0x00000040, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000001, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000000, TRUE);
+       mddi_wait(4);
+       write_client_reg(ASY_DATA, 0x80000010, TRUE);
+       write_client_reg(ASY_DATB, 0x00000340, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000005, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000004, TRUE);
+       mddi_wait(6);
+       write_client_reg(ASY_DATA, 0x80000010, TRUE);
+       write_client_reg(ASY_DATB, 0x00003340, TRUE);
+       write_client_reg(ASY_DATC, 0x80000007, TRUE);
+       write_client_reg(ASY_DATD, 0x00004007, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000009, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000008, TRUE);
+       mddi_wait(1);
+       write_client_reg(ASY_DATA, 0x80000007, TRUE);
+       write_client_reg(ASY_DATB, 0x00004017, TRUE);
+       write_client_reg(ASY_DATC, 0x8000005B, TRUE);
+       write_client_reg(ASY_DATD, 0x00000000, TRUE);
+       write_client_reg(ASY_DATE, 0x80000059, TRUE);
+       write_client_reg(ASY_DATF, 0x00000011, TRUE);
+       write_client_reg(ASY_CMDSET, 0x0000000D, TRUE);
+       write_client_reg(ASY_CMDSET, 0x0000000C, TRUE);
+       mddi_wait(2);
+       write_client_reg(ASY_DATA, 0x80000059, TRUE);
+       write_client_reg(ASY_DATB, 0x00000019, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000005, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000004, TRUE);
+       mddi_wait(2);
+       write_client_reg(ASY_DATA, 0x80000059, TRUE);
+       write_client_reg(ASY_DATB, 0x00000079, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000005, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000004, TRUE);
+       mddi_wait(2);
+       write_client_reg(ASY_DATA, 0x80000059, TRUE);
+       write_client_reg(ASY_DATB, 0x000003FD, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000005, TRUE);
+       write_client_reg(ASY_CMDSET, 0x00000004, TRUE);
+       mddi_wait(2);
+}
+
+static void mddi_toshiba_lcd_set_backlight(struct msm_fb_data_type *mfd)
+{
+       int32 level;
+       int ret = -EPERM;
+       int max = mfd->panel_info.bl_max;
+       int min = mfd->panel_info.bl_min;
+
+       if (mddi_toshiba_pdata && mddi_toshiba_pdata->pmic_backlight) {
+               ret = mddi_toshiba_pdata->pmic_backlight(mfd->bl_level);
+               if (!ret)
+                       return;
+       }
+
+       if (ret && mddi_toshiba_pdata && mddi_toshiba_pdata->backlight_level) {
+               level = mddi_toshiba_pdata->backlight_level(mfd->bl_level,
+                                                               max, min);
+
+               if (level < 0)
+                       return;
+
+               if (TM_GET_PID(mfd->panel.id) == LCD_SHARP_2P4_VGA)
+                       write_client_reg(TIMER0LOAD, 0x00001388, TRUE);
+       } else {
+               if (!max)
+                       level = 0;
+               else
+                       level = (mfd->bl_level * 4999) / max;
+       }
+
+       write_client_reg(PWM0OFF, level, TRUE);
+}
+
+static void mddi_toshiba_vsync_set_handler(msm_fb_vsync_handler_type handler,  /* ISR to be executed */
+                                          void *arg)
+{
+       boolean error = FALSE;
+       unsigned long flags;
+
+       /* Disable interrupts */
+       spin_lock_irqsave(&mddi_host_spin_lock, flags);
+       /* INTLOCK(); */
+
+       if (mddi_toshiba_vsync_handler != NULL) {
+               error = TRUE;
+       } else {
+               /* Register the handler for this particular GROUP interrupt source */
+               mddi_toshiba_vsync_handler = handler;
+               mddi_toshiba_vsync_handler_arg = arg;
+       }
+
+       /* Restore interrupts */
+       spin_unlock_irqrestore(&mddi_host_spin_lock, flags);
+       /* MDDI_INTFREE(); */
+       if (error) {
+               MDDI_MSG_ERR("MDDI: Previous Vsync handler never called\n");
+       } else {
+               /* Enable the vsync wakeup */
+               mddi_queue_register_write(INTMSK, 0x0000, FALSE, 0);
+
+               mddi_toshiba_vsync_attempts = 1;
+               mddi_vsync_detect_enabled = TRUE;
+       }
+}                              /* mddi_toshiba_vsync_set_handler */
+
+static void mddi_toshiba_lcd_vsync_detected(boolean detected)
+{
+       /* static timetick_type start_time = 0; */
+       static struct timeval start_time;
+       static boolean first_time = TRUE;
+       /* uint32 mdp_cnt_val = 0; */
+       /* timetick_type elapsed_us; */
+       struct timeval now;
+       uint32 elapsed_us;
+       uint32 num_vsyncs;
+
+       if ((detected) || (mddi_toshiba_vsync_attempts > 5)) {
+               if ((detected) && (mddi_toshiba_monitor_refresh_value)) {
+                       /* if (start_time != 0) */
+                       if (!first_time) {
+                               jiffies_to_timeval(jiffies, &now);
+                               elapsed_us =
+                                   (now.tv_sec - start_time.tv_sec) * 1000000 +
+                                   now.tv_usec - start_time.tv_usec;
+                               /*
+                                * LCD is configured for a refresh every usecs,
+                                *  so to determine the number of vsyncs that
+                                *  have occurred since the last measurement
+                                *  add half that to the time difference and
+                                *  divide by the refresh rate.
+                                */
+                               num_vsyncs = (elapsed_us +
+                                             (mddi_toshiba_usecs_per_refresh >>
+                                              1)) /
+                                   mddi_toshiba_usecs_per_refresh;
+                               /*
+                                * LCD is configured for * hsyncs (rows) per
+                                * refresh cycle. Calculate new rows_per_second
+                                * value based upon these new measurements.
+                                * MDP can update with this new value.
+                                */
+                               mddi_toshiba_rows_per_second =
+                                   (mddi_toshiba_rows_per_refresh * 1000 *
+                                    num_vsyncs) / (elapsed_us / 1000);
+                       }
+                       /* start_time = timetick_get(); */
+                       first_time = FALSE;
+                       jiffies_to_timeval(jiffies, &start_time);
+                       if (mddi_toshiba_report_refresh_measurements) {
+                               (void)mddi_queue_register_read_int(VPOS,
+                                                                  &mddi_toshiba_curr_vpos);
+                               /* mdp_cnt_val = MDP_LINE_COUNT; */
+                       }
+               }
+               /* if detected = TRUE, client initiated wakeup was detected */
+               if (mddi_toshiba_vsync_handler != NULL) {
+                       (*mddi_toshiba_vsync_handler)
+                           (mddi_toshiba_vsync_handler_arg);
+                       mddi_toshiba_vsync_handler = NULL;
+               }
+               mddi_vsync_detect_enabled = FALSE;
+               mddi_toshiba_vsync_attempts = 0;
+               /* need to disable the interrupt wakeup */
+               if (!mddi_queue_register_write_int(INTMSK, 0x0001))
+                       MDDI_MSG_ERR("Vsync interrupt disable failed!\n");
+               if (!detected) {
+                       /* give up after 5 failed attempts but show error */
+                       MDDI_MSG_NOTICE("Vsync detection failed!\n");
+               } else if ((mddi_toshiba_monitor_refresh_value) &&
+                          (mddi_toshiba_report_refresh_measurements)) {
+                       MDDI_MSG_NOTICE("  Last Line Counter=%d!\n",
+                                       mddi_toshiba_curr_vpos);
+               /* MDDI_MSG_NOTICE("  MDP Line Counter=%d!\n",mdp_cnt_val); */
+                       MDDI_MSG_NOTICE("  Lines Per Second=%d!\n",
+                                       mddi_toshiba_rows_per_second);
+               }
+               /* clear the interrupt */
+               if (!mddi_queue_register_write_int(INTFLG, 0x0001))
+                       MDDI_MSG_ERR("Vsync interrupt clear failed!\n");
+       } else {
+               /* if detected = FALSE, we woke up from hibernation, but did not
+                * detect client initiated wakeup.
+                */
+               mddi_toshiba_vsync_attempts++;
+       }
+}
+
+static void mddi_toshiba_prim_init(struct msm_fb_data_type *mfd)
+{
+
+       switch (toshiba_state) {
+       case TOSHIBA_STATE_PRIM_SEC_READY:
+               break;
+       case TOSHIBA_STATE_OFF:
+               toshiba_state = TOSHIBA_STATE_PRIM_SEC_STANDBY;
+               toshiba_common_initial_setup(mfd);
+               break;
+       case TOSHIBA_STATE_PRIM_SEC_STANDBY:
+               toshiba_common_initial_setup(mfd);
+               break;
+       case TOSHIBA_STATE_SEC_NORMAL_MODE:
+               toshiba_sec_cont_update_stop(mfd);
+               toshiba_sec_sleep_in(mfd);
+               toshiba_sec_sleep_out(mfd);
+               toshiba_sec_lcd_off(mfd);
+               toshiba_common_initial_setup(mfd);
+               break;
+       default:
+               MDDI_MSG_ERR("mddi_toshiba_prim_init from state %d\n",
+                            toshiba_state);
+       }
+
+       toshiba_prim_start(mfd);
+       if (TM_GET_PID(mfd->panel.id) == LCD_SHARP_2P4_VGA)
+               gordon_disp_init();
+       mddi_host_write_pix_attr_reg(0x00C3);
+}
+
+static void mddi_toshiba_sec_init(struct msm_fb_data_type *mfd)
+{
+
+       switch (toshiba_state) {
+       case TOSHIBA_STATE_PRIM_SEC_READY:
+               break;
+       case TOSHIBA_STATE_PRIM_SEC_STANDBY:
+               toshiba_common_initial_setup(mfd);
+               break;
+       case TOSHIBA_STATE_PRIM_NORMAL_MODE:
+               toshiba_prim_lcd_off(mfd);
+               toshiba_common_initial_setup(mfd);
+               break;
+       default:
+               MDDI_MSG_ERR("mddi_toshiba_sec_init from state %d\n",
+                            toshiba_state);
+       }
+
+       toshiba_sec_start(mfd);
+       toshiba_sec_backlight_on(mfd);
+       toshiba_sec_cont_update_start(mfd);
+       mddi_host_write_pix_attr_reg(0x0400);
+}
+
+static void mddi_toshiba_lcd_powerdown(struct msm_fb_data_type *mfd)
+{
+       switch (toshiba_state) {
+       case TOSHIBA_STATE_PRIM_SEC_READY:
+               mddi_toshiba_prim_init(mfd);
+               mddi_toshiba_lcd_powerdown(mfd);
+               return;
+       case TOSHIBA_STATE_PRIM_SEC_STANDBY:
+               break;
+       case TOSHIBA_STATE_PRIM_NORMAL_MODE:
+               toshiba_prim_lcd_off(mfd);
+               break;
+       case TOSHIBA_STATE_SEC_NORMAL_MODE:
+               toshiba_sec_cont_update_stop(mfd);
+               toshiba_sec_sleep_in(mfd);
+               toshiba_sec_sleep_out(mfd);
+               toshiba_sec_lcd_off(mfd);
+               break;
+       default:
+               MDDI_MSG_ERR("mddi_toshiba_lcd_powerdown from state %d\n",
+                            toshiba_state);
+       }
+}
+
+static int mddi_sharpgordon_firsttime = 1;
+
+static int mddi_toshiba_lcd_on(struct platform_device *pdev)
+{
+       struct msm_fb_data_type *mfd;
+       mfd = platform_get_drvdata(pdev);
+       if (!mfd)
+               return -ENODEV;
+       if (mfd->key != MFD_KEY)
+               return -EINVAL;
+
+       if (TM_GET_DID(mfd->panel.id) == TOSHIBA_VGA_PRIM)
+               mddi_toshiba_prim_init(mfd);
+       else
+               mddi_toshiba_sec_init(mfd);
+       if (TM_GET_PID(mfd->panel.id) == LCD_SHARP_2P4_VGA) {
+               if (mddi_sharpgordon_firsttime) {
+                       mddi_sharpgordon_firsttime = 0;
+                       write_client_reg(REGENB, 0x00000001, TRUE);
+               }
+       }
+       return 0;
+}
+
+static int mddi_toshiba_lcd_off(struct platform_device *pdev)
+{
+       mddi_toshiba_lcd_powerdown(platform_get_drvdata(pdev));
+       return 0;
+}
+
+static int __init mddi_toshiba_lcd_probe(struct platform_device *pdev)
+{
+       if (pdev->id == 0) {
+               mddi_toshiba_pdata = pdev->dev.platform_data;
+               return 0;
+       }
+
+       msm_fb_add_device(pdev);
+
+       return 0;
+}
+
+static struct platform_driver this_driver = {
+       .probe  = mddi_toshiba_lcd_probe,
+       .driver = {
+               .name   = "mddi_toshiba",
+       },
+};
+
+static struct msm_fb_panel_data toshiba_panel_data = {
+       .on             = mddi_toshiba_lcd_on,
+       .off            = mddi_toshiba_lcd_off,
+};
+
+static int ch_used[3];
+
+int mddi_toshiba_device_register(struct msm_panel_info *pinfo,
+                                       u32 channel, u32 panel)
+{
+       struct platform_device *pdev = NULL;
+       int ret;
+
+       if ((channel >= 3) || ch_used[channel])
+               return -ENODEV;
+
+       if ((channel != TOSHIBA_VGA_PRIM) &&
+           mddi_toshiba_pdata && mddi_toshiba_pdata->panel_num)
+               if (mddi_toshiba_pdata->panel_num() < 2)
+                       return -ENODEV;
+
+       ch_used[channel] = TRUE;
+
+       pdev = platform_device_alloc("mddi_toshiba", (panel << 8)|channel);
+       if (!pdev)
+               return -ENOMEM;
+
+       if (channel == TOSHIBA_VGA_PRIM) {
+               toshiba_panel_data.set_backlight =
+                               mddi_toshiba_lcd_set_backlight;
+
+               if (pinfo->lcd.vsync_enable) {
+                       toshiba_panel_data.set_vsync_notifier =
+                               mddi_toshiba_vsync_set_handler;
+                       mddi_lcd.vsync_detected =
+                               mddi_toshiba_lcd_vsync_detected;
+               }
+       } else {
+               toshiba_panel_data.set_backlight = NULL;
+               toshiba_panel_data.set_vsync_notifier = NULL;
+       }
+
+       toshiba_panel_data.panel_info = *pinfo;
+
+       ret = platform_device_add_data(pdev, &toshiba_panel_data,
+               sizeof(toshiba_panel_data));
+       if (ret) {
+               printk(KERN_ERR
+                 "%s: platform_device_add_data failed!\n", __func__);
+               goto err_device_put;
+       }
+
+       ret = platform_device_add(pdev);
+       if (ret) {
+               printk(KERN_ERR
+                 "%s: platform_device_register failed!\n", __func__);
+               goto err_device_put;
+       }
+
+       return 0;
+
+err_device_put:
+       platform_device_put(pdev);
+       return ret;
+}
+
+static int __init mddi_toshiba_lcd_init(void)
+{
+       return platform_driver_register(&this_driver);
+}
+
+module_init(mddi_toshiba_lcd_init);
diff --git a/drivers/staging/msm/mddi_toshiba.h b/drivers/staging/msm/mddi_toshiba.h
new file mode 100644 (file)
index 0000000..2d22b9a
--- /dev/null
@@ -0,0 +1,52 @@
+/* Copyright (c) 2009, Code Aurora Forum. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Code Aurora nor
+ *       the names of its contributors may be used to endorse or promote
+ *       products derived from this software without specific prior written
+ *       permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NON-INFRINGEMENT ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef MDDI_TOSHIBA_H
+#define MDDI_TOSHIBA_H
+
+#define TOSHIBA_VGA_PRIM 1
+#define TOSHIBA_VGA_SECD 2
+
+#define LCD_TOSHIBA_2P4_VGA    0
+#define LCD_TOSHIBA_2P4_WVGA   1
+#define LCD_TOSHIBA_2P4_WVGA_PT        2
+#define LCD_SHARP_2P4_VGA      3
+
+#define GPIO_BLOCK_BASE        0x150000
+#define SYSTEM_BLOCK2_BASE     0x170000
+
+#define GPIODIR     (GPIO_BLOCK_BASE|0x04)
+#define GPIOSEL     (SYSTEM_BLOCK2_BASE|0x00)
+#define GPIOPC      (GPIO_BLOCK_BASE|0x28)
+#define GPIODATA    (GPIO_BLOCK_BASE|0x00)
+
+#define write_client_reg(__X, __Y, __Z) {\
+  mddi_queue_register_write(__X, __Y, TRUE, 0);\
+}
+
+#endif /* MDDI_TOSHIBA_H */
diff --git a/drivers/staging/msm/mddi_toshiba_vga.c b/drivers/staging/msm/mddi_toshiba_vga.c
new file mode 100644 (file)
index 0000000..7e61d3a
--- /dev/null
@@ -0,0 +1,136 @@
+/* Copyright (c) 2009, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include "msm_fb.h"
+#include "mddihost.h"
+#include "mddihosti.h"
+#include "mddi_toshiba.h"
+
+static uint32 read_client_reg(uint32 addr)
+{
+       uint32 val;
+       mddi_queue_register_read(addr, &val, TRUE, 0);
+       return val;
+}
+
+static uint32 toshiba_lcd_gpio_read(void)
+{
+       uint32 val;
+
+       write_client_reg(GPIODIR, 0x0000000C, TRUE);
+       write_client_reg(GPIOSEL, 0x00000000, TRUE);
+       write_client_reg(GPIOSEL, 0x00000000, TRUE);
+       write_client_reg(GPIOPC, 0x03CF00C0, TRUE);
+       val = read_client_reg(GPIODATA) & 0x2C0;
+
+       return val;
+}
+
+static u32 mddi_toshiba_panel_detect(void)
+{
+       mddi_host_type host_idx = MDDI_HOST_PRIM;
+       uint32 lcd_gpio;
+       u32 mddi_toshiba_lcd = LCD_TOSHIBA_2P4_VGA;
+
+       /* Toshiba display requires larger drive_lo value */
+       mddi_host_reg_out(DRIVE_LO, 0x0050);
+
+       lcd_gpio = toshiba_lcd_gpio_read();
+       switch (lcd_gpio) {
+       case 0x0080:
+               mddi_toshiba_lcd = LCD_SHARP_2P4_VGA;
+               break;
+
+       case 0x00C0:
+       default:
+               mddi_toshiba_lcd = LCD_TOSHIBA_2P4_VGA;
+               break;
+       }
+
+       return mddi_toshiba_lcd;
+}
+
+static int __init mddi_toshiba_vga_init(void)
+{
+       int ret;
+       struct msm_panel_info pinfo;
+       u32 panel;
+
+#ifdef CONFIG_FB_MSM_MDDI_AUTO_DETECT
+       u32 id;
+
+       ret = msm_fb_detect_client("mddi_toshiba_vga");
+       if (ret == -ENODEV)
+               return 0;
+
+       if (ret) {
+               id = mddi_get_client_id();
+               if ((id >> 16) != 0xD263)
+                       return 0;
+       }
+#endif
+
+       panel = mddi_toshiba_panel_detect();
+
+       pinfo.xres = 480;
+       pinfo.yres = 640;
+       pinfo.type = MDDI_PANEL;
+       pinfo.pdest = DISPLAY_1;
+       pinfo.mddi.vdopkt = MDDI_DEFAULT_PRIM_PIX_ATTR;
+       pinfo.wait_cycle = 0;
+       pinfo.bpp = 18;
+       pinfo.lcd.vsync_enable = TRUE;
+       pinfo.lcd.refx100 = 6118;
+       pinfo.lcd.v_back_porch = 6;
+       pinfo.lcd.v_front_porch = 0;
+       pinfo.lcd.v_pulse_width = 0;
+       pinfo.lcd.hw_vsync_mode = FALSE;
+       pinfo.lcd.vsync_notifier_period = (1 * HZ);
+       pinfo.bl_max = 99;
+       pinfo.bl_min = 1;
+       pinfo.clk_rate = 122880000;
+       pinfo.clk_min =  120000000;
+       pinfo.clk_max =  200000000;
+       pinfo.fb_num = 2;
+
+       ret = mddi_toshiba_device_register(&pinfo, TOSHIBA_VGA_PRIM, panel);
+       if (ret) {
+               printk(KERN_ERR "%s: failed to register device!\n", __func__);
+               return ret;
+       }
+
+       pinfo.xres = 176;
+       pinfo.yres = 220;
+       pinfo.type = MDDI_PANEL;
+       pinfo.pdest = DISPLAY_2;
+       pinfo.mddi.vdopkt = 0x400;
+       pinfo.wait_cycle = 0;
+       pinfo.bpp = 18;
+       pinfo.clk_rate = 122880000;
+       pinfo.clk_min =  120000000;
+       pinfo.clk_max =  200000000;
+       pinfo.fb_num = 2;
+
+       ret = mddi_toshiba_device_register(&pinfo, TOSHIBA_VGA_SECD, panel);
+       if (ret)
+               printk(KERN_WARNING
+                       "%s: failed to register device!\n", __func__);
+
+       return ret;
+}
+
+module_init(mddi_toshiba_vga_init);
diff --git a/drivers/staging/msm/mddi_toshiba_wvga.c b/drivers/staging/msm/mddi_toshiba_wvga.c
new file mode 100644 (file)
index 0000000..557b0f0
--- /dev/null
@@ -0,0 +1,63 @@
+/* Copyright (c) 2009, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include "msm_fb.h"
+#include "mddihost.h"
+#include "mddi_toshiba.h"
+
+static int __init mddi_toshiba_wvga_init(void)
+{
+       int ret;
+       struct msm_panel_info pinfo;
+
+#ifdef CONFIG_FB_MSM_MDDI_AUTO_DETECT
+       if (msm_fb_detect_client("mddi_toshiba_wvga"))
+               return 0;
+#endif
+
+       pinfo.xres = 800;
+       pinfo.yres = 480;
+       pinfo.pdest = DISPLAY_2;
+       pinfo.type = MDDI_PANEL;
+       pinfo.mddi.vdopkt = MDDI_DEFAULT_PRIM_PIX_ATTR;
+       pinfo.wait_cycle = 0;
+       pinfo.bpp = 18;
+       pinfo.lcd.vsync_enable = TRUE;
+       pinfo.lcd.refx100 = 6118;
+       pinfo.lcd.v_back_porch = 6;
+       pinfo.lcd.v_front_porch = 0;
+       pinfo.lcd.v_pulse_width = 0;
+       pinfo.lcd.hw_vsync_mode = FALSE;
+       pinfo.lcd.vsync_notifier_period = (1 * HZ);
+       pinfo.bl_max = 4;
+       pinfo.bl_min = 1;
+       pinfo.clk_rate = 192000000;
+       pinfo.clk_min =  190000000;
+       pinfo.clk_max =  200000000;
+       pinfo.fb_num = 2;
+
+       ret = mddi_toshiba_device_register(&pinfo, TOSHIBA_VGA_PRIM,
+                                          LCD_TOSHIBA_2P4_WVGA);
+       if (ret) {
+               printk(KERN_ERR "%s: failed to register device!\n", __func__);
+               return ret;
+       }
+
+       return ret;
+}
+
+module_init(mddi_toshiba_wvga_init);
diff --git a/drivers/staging/msm/mddi_toshiba_wvga_pt.c b/drivers/staging/msm/mddi_toshiba_wvga_pt.c
new file mode 100644 (file)
index 0000000..fc7d4e0
--- /dev/null
@@ -0,0 +1,64 @@
+/* Copyright (c) 2009, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include "msm_fb.h"
+#include "mddihost.h"
+#include "mddihosti.h"
+#include "mddi_toshiba.h"
+
+static int __init mddi_toshiba_wvga_pt_init(void)
+{
+       int ret;
+       struct msm_panel_info pinfo;
+#ifdef CONFIG_FB_MSM_MDDI_AUTO_DETECT
+       uint id;
+
+       ret = msm_fb_detect_client("mddi_toshiba_wvga_pt");
+       if (ret == -ENODEV)
+               return 0;
+
+       if (ret) {
+               id = mddi_get_client_id();
+               if (id != 0xd2638722)
+                       return 0;
+       }
+#endif
+
+       pinfo.xres = 480;
+       pinfo.yres = 800;
+       pinfo.type = MDDI_PANEL;
+       pinfo.pdest = DISPLAY_1;
+       pinfo.mddi.vdopkt = MDDI_DEFAULT_PRIM_PIX_ATTR;
+       pinfo.wait_cycle = 0;
+       pinfo.bpp = 18;
+       pinfo.lcd.vsync_enable = FALSE;
+       pinfo.bl_max = 15;
+       pinfo.bl_min = 1;
+       pinfo.clk_rate = 192000000;
+       pinfo.clk_min =  190000000;
+       pinfo.clk_max =  200000000;
+       pinfo.fb_num = 2;
+
+       ret = mddi_toshiba_device_register(&pinfo, TOSHIBA_VGA_PRIM,
+                                               LCD_TOSHIBA_2P4_WVGA_PT);
+       if (ret)
+               printk(KERN_ERR "%s: failed to register device!\n", __func__);
+
+       return ret;
+}
+
+module_init(mddi_toshiba_wvga_pt_init);
diff --git a/drivers/staging/msm/mddihost.c b/drivers/staging/msm/mddihost.c
new file mode 100644 (file)
index 0000000..c6c1ee4
--- /dev/null
@@ -0,0 +1,377 @@
+/* Copyright (c) 2008-2009, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/delay.h>
+#include <linux/mm.h>
+#include <linux/fb.h>
+#include <linux/init.h>
+#include <linux/ioport.h>
+#include <linux/device.h>
+#include <linux/dma-mapping.h>
+
+#include "msm_fb.h"
+#include "mddihost.h"
+#include "mddihosti.h"
+
+#include <linux/clk.h>
+#include <mach/clk.h>
+
+struct semaphore mddi_host_mutex;
+
+struct clk *mddi_io_clk;
+static boolean mddi_host_powered = FALSE;
+static boolean mddi_host_initialized = FALSE;
+extern uint32 *mddi_reg_read_value_ptr;
+
+mddi_lcd_func_type mddi_lcd;
+
+extern mddi_client_capability_type mddi_client_capability_pkt;
+
+#ifdef FEATURE_MDDI_HITACHI
+extern void mddi_hitachi_window_adjust(uint16 x1,
+                                      uint16 x2, uint16 y1, uint16 y2);
+#endif
+
+extern void mddi_toshiba_lcd_init(void);
+
+#ifdef FEATURE_MDDI_S6D0142
+extern void mddi_s6d0142_lcd_init(void);
+extern void mddi_s6d0142_window_adjust(uint16 x1,
+                                      uint16 x2,
+                                      uint16 y1,
+                                      uint16 y2,
+                                      mddi_llist_done_cb_type done_cb);
+#endif
+
+void mddi_init(void)
+{
+       if (mddi_host_initialized)
+               return;
+
+       mddi_host_initialized = TRUE;
+
+       init_MUTEX(&mddi_host_mutex);
+
+       if (!mddi_host_powered) {
+               down(&mddi_host_mutex);
+               mddi_host_init(MDDI_HOST_PRIM);
+               mddi_host_powered = TRUE;
+               up(&mddi_host_mutex);
+               mdelay(10);
+       }
+}
+
+int mddi_host_register_read(uint32 reg_addr,
+     uint32 *reg_value_ptr, boolean wait, mddi_host_type host) {
+       mddi_linked_list_type *curr_llist_ptr;
+       mddi_register_access_packet_type *regacc_pkt_ptr;
+       uint16 curr_llist_idx;
+       int ret = 0;
+
+       if (in_interrupt())
+               MDDI_MSG_CRIT("Called from ISR context\n");
+
+       if (!mddi_host_powered) {
+               MDDI_MSG_ERR("MDDI powered down!\n");
+               mddi_init();
+       }
+
+       down(&mddi_host_mutex);
+
+       mddi_reg_read_value_ptr = reg_value_ptr;
+       curr_llist_idx = mddi_get_reg_read_llist_item(host, TRUE);
+       if (curr_llist_idx == UNASSIGNED_INDEX) {
+               up(&mddi_host_mutex);
+
+               /* need to change this to some sort of wait */
+               MDDI_MSG_ERR("Attempting to queue up more than 1 reg read\n");
+               return -EINVAL;
+       }
+
+       curr_llist_ptr = &llist_extern[host][curr_llist_idx];
+       curr_llist_ptr->link_controller_flags = 0x11;
+       curr_llist_ptr->packet_header_count = 14;
+       curr_llist_ptr->packet_data_count = 0;
+
+       curr_llist_ptr->next_packet_pointer = NULL;
+       curr_llist_ptr->packet_data_pointer = NULL;
+       curr_llist_ptr->reserved = 0;
+
+       regacc_pkt_ptr = &curr_llist_ptr->packet_header.register_pkt;
+
+       regacc_pkt_ptr->packet_length = curr_llist_ptr->packet_header_count;
+       regacc_pkt_ptr->packet_type = 146;      /* register access packet */
+       regacc_pkt_ptr->bClient_ID = 0;
+       regacc_pkt_ptr->read_write_info = 0x8001;
+       regacc_pkt_ptr->register_address = reg_addr;
+
+       /* now adjust pointers */
+       mddi_queue_forward_packets(curr_llist_idx, curr_llist_idx, wait,
+                                  NULL, host);
+       /* need to check if we can write the pointer or not */
+
+       up(&mddi_host_mutex);
+
+       if (wait) {
+               int wait_ret;
+
+               mddi_linked_list_notify_type *llist_notify_ptr;
+               llist_notify_ptr = &llist_extern_notify[host][curr_llist_idx];
+               wait_ret = wait_for_completion_timeout(
+                                       &(llist_notify_ptr->done_comp), 5 * HZ);
+
+               if (wait_ret <= 0)
+                       ret = -EBUSY;
+
+               if (wait_ret < 0)
+                       printk(KERN_ERR "%s: failed to wait for completion!\n",
+                               __func__);
+               else if (!wait_ret)
+                       printk(KERN_ERR "%s: Timed out waiting!\n", __func__);
+       }
+
+       MDDI_MSG_DEBUG("Reg Read value=0x%x\n", *reg_value_ptr);
+
+       return ret;
+}                              /* mddi_host_register_read */
+
+int mddi_host_register_write(uint32 reg_addr,
+     uint32 reg_val, enum mddi_data_packet_size_type packet_size,
+     boolean wait, mddi_llist_done_cb_type done_cb, mddi_host_type host) {
+       mddi_linked_list_type *curr_llist_ptr;
+       mddi_linked_list_type *curr_llist_dma_ptr;
+       mddi_register_access_packet_type *regacc_pkt_ptr;
+       uint16 curr_llist_idx;
+       int ret = 0;
+
+       if (in_interrupt())
+               MDDI_MSG_CRIT("Called from ISR context\n");
+
+       if (!mddi_host_powered) {
+               MDDI_MSG_ERR("MDDI powered down!\n");
+               mddi_init();
+       }
+
+       down(&mddi_host_mutex);
+
+       curr_llist_idx = mddi_get_next_free_llist_item(host, TRUE);
+       curr_llist_ptr = &llist_extern[host][curr_llist_idx];
+       curr_llist_dma_ptr = &llist_dma_extern[host][curr_llist_idx];
+
+       curr_llist_ptr->link_controller_flags = 1;
+       curr_llist_ptr->packet_header_count = 14;
+       curr_llist_ptr->packet_data_count = 4;
+
+       curr_llist_ptr->next_packet_pointer = NULL;
+       curr_llist_ptr->reserved = 0;
+
+       regacc_pkt_ptr = &curr_llist_ptr->packet_header.register_pkt;
+
+       regacc_pkt_ptr->packet_length = curr_llist_ptr->packet_header_count +
+                                       (uint16)packet_size;
+       regacc_pkt_ptr->packet_type = 146;      /* register access packet */
+       regacc_pkt_ptr->bClient_ID = 0;
+       regacc_pkt_ptr->read_write_info = 0x0001;
+       regacc_pkt_ptr->register_address = reg_addr;
+       regacc_pkt_ptr->register_data_list = reg_val;
+
+       MDDI_MSG_DEBUG("Reg Access write reg=0x%x, value=0x%x\n",
+                      regacc_pkt_ptr->register_address,
+                      regacc_pkt_ptr->register_data_list);
+
+       regacc_pkt_ptr = &curr_llist_dma_ptr->packet_header.register_pkt;
+       curr_llist_ptr->packet_data_pointer =
+           (void *)(&regacc_pkt_ptr->register_data_list);
+
+       /* now adjust pointers */
+       mddi_queue_forward_packets(curr_llist_idx, curr_llist_idx, wait,
+                                  done_cb, host);
+
+       up(&mddi_host_mutex);
+
+       if (wait) {
+               int wait_ret;
+
+               mddi_linked_list_notify_type *llist_notify_ptr;
+               llist_notify_ptr = &llist_extern_notify[host][curr_llist_idx];
+               wait_ret = wait_for_completion_timeout(
+                                       &(llist_notify_ptr->done_comp), 5 * HZ);
+
+               if (wait_ret <= 0)
+                       ret = -EBUSY;
+
+               if (wait_ret < 0)
+                       printk(KERN_ERR "%s: failed to wait for completion!\n",
+                               __func__);
+               else if (!wait_ret)
+                       printk(KERN_ERR "%s: Timed out waiting!\n", __func__);
+       }
+
+       return ret;
+}                              /* mddi_host_register_write */
+
+boolean mddi_host_register_read_int
+    (uint32 reg_addr, uint32 *reg_value_ptr, mddi_host_type host) {
+       mddi_linked_list_type *curr_llist_ptr;
+       mddi_register_access_packet_type *regacc_pkt_ptr;
+       uint16 curr_llist_idx;
+
+       if (!in_interrupt())
+               MDDI_MSG_CRIT("Called from TASK context\n");
+
+       if (!mddi_host_powered) {
+               MDDI_MSG_ERR("MDDI powered down!\n");
+               return FALSE;
+       }
+
+       if (down_trylock(&mddi_host_mutex) != 0)
+               return FALSE;
+
+       mddi_reg_read_value_ptr = reg_value_ptr;
+       curr_llist_idx = mddi_get_reg_read_llist_item(host, FALSE);
+       if (curr_llist_idx == UNASSIGNED_INDEX) {
+               up(&mddi_host_mutex);
+               return FALSE;
+       }
+
+       curr_llist_ptr = &llist_extern[host][curr_llist_idx];
+       curr_llist_ptr->link_controller_flags = 0x11;
+       curr_llist_ptr->packet_header_count = 14;
+       curr_llist_ptr->packet_data_count = 0;
+
+       curr_llist_ptr->next_packet_pointer = NULL;
+       curr_llist_ptr->packet_data_pointer = NULL;
+       curr_llist_ptr->reserved = 0;
+
+       regacc_pkt_ptr = &curr_llist_ptr->packet_header.register_pkt;
+
+       regacc_pkt_ptr->packet_length = curr_llist_ptr->packet_header_count;
+       regacc_pkt_ptr->packet_type = 146;      /* register access packet */
+       regacc_pkt_ptr->bClient_ID = 0;
+       regacc_pkt_ptr->read_write_info = 0x8001;
+       regacc_pkt_ptr->register_address = reg_addr;
+
+       /* now adjust pointers */
+       mddi_queue_forward_packets(curr_llist_idx, curr_llist_idx, FALSE,
+                                  NULL, host);
+       /* need to check if we can write the pointer or not */
+
+       up(&mddi_host_mutex);
+
+       return TRUE;
+
+}                              /* mddi_host_register_read */
+
+boolean mddi_host_register_write_int
+    (uint32 reg_addr,
+     uint32 reg_val, mddi_llist_done_cb_type done_cb, mddi_host_type host) {
+       mddi_linked_list_type *curr_llist_ptr;
+       mddi_linked_list_type *curr_llist_dma_ptr;
+       mddi_register_access_packet_type *regacc_pkt_ptr;
+       uint16 curr_llist_idx;
+
+       if (!in_interrupt())
+               MDDI_MSG_CRIT("Called from TASK context\n");
+
+       if (!mddi_host_powered) {
+               MDDI_MSG_ERR("MDDI powered down!\n");
+               return FALSE;
+       }
+
+       if (down_trylock(&mddi_host_mutex) != 0)
+               return FALSE;
+
+       curr_llist_idx = mddi_get_next_free_llist_item(host, FALSE);
+       if (curr_llist_idx == UNASSIGNED_INDEX) {
+               up(&mddi_host_mutex);
+               return FALSE;
+       }
+
+       curr_llist_ptr = &llist_extern[host][curr_llist_idx];
+       curr_llist_dma_ptr = &llist_dma_extern[host][curr_llist_idx];
+
+       curr_llist_ptr->link_controller_flags = 1;
+       curr_llist_ptr->packet_header_count = 14;
+       curr_llist_ptr->packet_data_count = 4;
+
+       curr_llist_ptr->next_packet_pointer = NULL;
+       curr_llist_ptr->reserved = 0;
+
+       regacc_pkt_ptr = &curr_llist_ptr->packet_header.register_pkt;
+
+       regacc_pkt_ptr->packet_length = curr_llist_ptr->packet_header_count + 4;
+       regacc_pkt_ptr->packet_type = 146;      /* register access packet */
+       regacc_pkt_ptr->bClient_ID = 0;
+       regacc_pkt_ptr->read_write_info = 0x0001;
+       regacc_pkt_ptr->register_address = reg_addr;
+       regacc_pkt_ptr->register_data_list = reg_val;
+
+       regacc_pkt_ptr = &curr_llist_dma_ptr->packet_header.register_pkt;
+       curr_llist_ptr->packet_data_pointer =
+           (void *)(&(regacc_pkt_ptr->register_data_list));
+
+       /* now adjust pointers */
+       mddi_queue_forward_packets(curr_llist_idx, curr_llist_idx, FALSE,
+                                  done_cb, host);
+       up(&mddi_host_mutex);
+
+       return TRUE;
+
+}                              /* mddi_host_register_write */
+
+void mddi_wait(uint16 time_ms)
+{
+       mdelay(time_ms);
+}
+
+void mddi_client_lcd_vsync_detected(boolean detected)
+{
+       if (mddi_lcd.vsync_detected)
+               (*mddi_lcd.vsync_detected) (detected);
+}
+
+/* extended version of function includes done callback */
+void mddi_window_adjust_ext(struct msm_fb_data_type *mfd,
+                           uint16 x1,
+                           uint16 x2,
+                           uint16 y1,
+                           uint16 y2, mddi_llist_done_cb_type done_cb)
+{
+#ifdef FEATURE_MDDI_HITACHI
+       if (mfd->panel.id == HITACHI)
+               mddi_hitachi_window_adjust(x1, x2, y1, y2);
+#elif defined(FEATURE_MDDI_S6D0142)
+       if (mfd->panel.id == MDDI_LCD_S6D0142)
+               mddi_s6d0142_window_adjust(x1, x2, y1, y2, done_cb);
+#else
+       /* Do nothing then... except avoid lint/compiler warnings */
+       (void)x1;
+       (void)x2;
+       (void)y1;
+       (void)y2;
+       (void)done_cb;
+#endif
+}
+
+void mddi_window_adjust(struct msm_fb_data_type *mfd,
+                       uint16 x1, uint16 x2, uint16 y1, uint16 y2)
+{
+       mddi_window_adjust_ext(mfd, x1, x2, y1, y2, NULL);
+}
diff --git a/drivers/staging/msm/mddihost.h b/drivers/staging/msm/mddihost.h
new file mode 100644 (file)
index 0000000..20b8178
--- /dev/null
@@ -0,0 +1,225 @@
+/* Copyright (c) 2008-2009, Code Aurora Forum. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Code Aurora nor
+ *       the names of its contributors may be used to endorse or promote
+ *       products derived from this software without specific prior written
+ *       permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NON-INFRINGEMENT ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef MDDIHOST_H
+#define MDDIHOST_H
+
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/time.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include "linux/proc_fs.h"
+#include <linux/types.h>
+#include <linux/dma-mapping.h>
+#include <linux/clk.h>
+
+#include <mach/hardware.h>
+#include <linux/io.h>
+
+#include <asm/system.h>
+#include <asm/mach-types.h>
+#include <linux/types.h>
+#include <linux/dma-mapping.h>
+
+#include "msm_fb_panel.h"
+
+#undef FEATURE_MDDI_MC4
+#undef FEATURE_MDDI_S6D0142
+#undef FEATURE_MDDI_HITACHI
+#define FEATURE_MDDI_SHARP
+#define FEATURE_MDDI_TOSHIBA
+#undef FEATURE_MDDI_E751
+#define FEATURE_MDDI_CORONA
+#define FEATURE_MDDI_PRISM
+
+#define T_MSM7500
+
+typedef enum {
+       format_16bpp,
+       format_18bpp,
+       format_24bpp
+} mddi_video_format;
+
+typedef enum {
+       MDDI_LCD_NONE = 0,
+       MDDI_LCD_MC4,
+       MDDI_LCD_S6D0142,
+       MDDI_LCD_SHARP,
+       MDDI_LCD_E751,
+       MDDI_LCD_CORONA,
+       MDDI_LCD_HITACHI,
+       MDDI_LCD_TOSHIBA,
+       MDDI_LCD_PRISM,
+       MDDI_LCD_TP2,
+       MDDI_NUM_LCD_TYPES,
+       MDDI_LCD_DEFAULT = MDDI_LCD_TOSHIBA
+} mddi_lcd_type;
+
+typedef enum {
+       MDDI_HOST_PRIM = 0,
+       MDDI_HOST_EXT,
+       MDDI_NUM_HOST_CORES
+} mddi_host_type;
+
+typedef enum {
+       MDDI_DRIVER_RESET,      /* host core registers have not been written. */
+       MDDI_DRIVER_DISABLED,   /* registers written, interrupts disabled. */
+       MDDI_DRIVER_ENABLED     /* registers written, interrupts enabled. */
+} mddi_host_driver_state_type;
+
+typedef enum {
+       MDDI_GPIO_INT_0 = 0,
+       MDDI_GPIO_INT_1,
+       MDDI_GPIO_INT_2,
+       MDDI_GPIO_INT_3,
+       MDDI_GPIO_INT_4,
+       MDDI_GPIO_INT_5,
+       MDDI_GPIO_INT_6,
+       MDDI_GPIO_INT_7,
+       MDDI_GPIO_INT_8,
+       MDDI_GPIO_INT_9,
+       MDDI_GPIO_INT_10,
+       MDDI_GPIO_INT_11,
+       MDDI_GPIO_INT_12,
+       MDDI_GPIO_INT_13,
+       MDDI_GPIO_INT_14,
+       MDDI_GPIO_INT_15,
+       MDDI_GPIO_NUM_INTS
+} mddi_gpio_int_type;
+
+enum mddi_data_packet_size_type {
+       MDDI_DATA_PACKET_4_BYTES  = 4,
+       MDDI_DATA_PACKET_8_BYTES  = 8,
+       MDDI_DATA_PACKET_12_BYTES = 12,
+       MDDI_DATA_PACKET_16_BYTES = 16,
+       MDDI_DATA_PACKET_24_BYTES = 24
+};
+
+typedef struct {
+       uint32 addr;
+       uint32 value;
+} mddi_reg_write_type;
+
+boolean mddi_vsync_set_handler(msm_fb_vsync_handler_type handler, void *arg);
+
+typedef void (*mddi_llist_done_cb_type) (void);
+
+typedef void (*mddi_rev_handler_type) (void *);
+
+boolean mddi_set_rev_handler(mddi_rev_handler_type handler, uint16 pkt_type);
+
+#define MDDI_DEFAULT_PRIM_PIX_ATTR 0xC3
+#define MDDI_DEFAULT_SECD_PIX_ATTR 0xC0
+
+typedef int gpio_int_polarity_type;
+typedef int gpio_int_handler_type;
+
+typedef struct {
+       void (*vsync_detected) (boolean);
+} mddi_lcd_func_type;
+
+extern mddi_lcd_func_type mddi_lcd;
+void mddi_init(void);
+
+void mddi_powerdown(void);
+
+void mddi_host_start_ext_display(void);
+void mddi_host_stop_ext_display(void);
+
+extern spinlock_t mddi_host_spin_lock;
+#ifdef T_MSM7500
+void mddi_reset(void);
+#ifdef FEATURE_DUAL_PROC_MODEM_DISPLAY
+void mddi_host_switch_proc_control(boolean on);
+#endif
+#endif
+void mddi_host_exit_power_collapse(void);
+
+void mddi_queue_splash_screen
+    (void *buf_ptr,
+     boolean clear_area,
+     int16 src_width,
+     int16 src_starting_row,
+     int16 src_starting_column,
+     int16 num_of_rows,
+     int16 num_of_columns, int16 dst_starting_row, int16 dst_starting_column);
+
+void mddi_queue_image
+    (void *buf_ptr,
+     uint8 stereo_video,
+     boolean clear_area,
+     int16 src_width,
+     int16 src_starting_row,
+     int16 src_starting_column,
+     int16 num_of_rows,
+     int16 num_of_columns, int16 dst_starting_row, int16 dst_starting_column);
+
+int mddi_host_register_read
+    (uint32 reg_addr,
+     uint32 *reg_value_ptr, boolean wait, mddi_host_type host_idx);
+int mddi_host_register_write
+    (uint32 reg_addr, uint32 reg_val,
+     enum mddi_data_packet_size_type packet_size,
+     boolean wait, mddi_llist_done_cb_type done_cb, mddi_host_type host);
+boolean mddi_host_register_write_int
+    (uint32 reg_addr,
+     uint32 reg_val, mddi_llist_done_cb_type done_cb, mddi_host_type host);
+boolean mddi_host_register_read_int
+    (uint32 reg_addr, uint32 *reg_value_ptr, mddi_host_type host_idx);
+void mddi_queue_register_write_static
+    (uint32 reg_addr,
+     uint32 reg_val, boolean wait, mddi_llist_done_cb_type done_cb);
+void mddi_queue_static_window_adjust
+    (const mddi_reg_write_type *reg_write,
+     uint16 num_writes, mddi_llist_done_cb_type done_cb);
+
+#define mddi_queue_register_read(reg, val_ptr, wait, sig) \
+       mddi_host_register_read(reg, val_ptr, wait, MDDI_HOST_PRIM)
+#define mddi_queue_register_write(reg, val, wait, sig) \
+       mddi_host_register_write(reg, val, MDDI_DATA_PACKET_4_BYTES,\
+       wait, NULL, MDDI_HOST_PRIM)
+#define mddi_queue_register_write_extn(reg, val, pkt_size, wait, sig) \
+       mddi_host_register_write(reg, val, pkt_size, \
+       wait, NULL, MDDI_HOST_PRIM)
+#define mddi_queue_register_write_int(reg, val) \
+       mddi_host_register_write_int(reg, val, NULL, MDDI_HOST_PRIM)
+#define mddi_queue_register_read_int(reg, val_ptr) \
+       mddi_host_register_read_int(reg, val_ptr, MDDI_HOST_PRIM)
+#define mddi_queue_register_writes(reg_ptr, val, wait, sig) \
+       mddi_host_register_writes(reg_ptr, val, wait, sig, MDDI_HOST_PRIM)
+
+void mddi_wait(uint16 time_ms);
+void mddi_assign_max_pkt_dimensions(uint16 image_cols,
+                                   uint16 image_rows,
+                                   uint16 bpp,
+                                   uint16 *max_cols, uint16 * max_rows);
+uint16 mddi_assign_pkt_height(uint16 pkt_width, uint16 pkt_height, uint16 bpp);
+void mddi_queue_reverse_encapsulation(boolean wait);
+void mddi_disable(int lock);
+#endif /* MDDIHOST_H */
diff --git a/drivers/staging/msm/mddihost_e.c b/drivers/staging/msm/mddihost_e.c
new file mode 100644 (file)
index 0000000..7de5eda
--- /dev/null
@@ -0,0 +1,63 @@
+/* Copyright (c) 2008-2009, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/delay.h>
+#include <linux/mm.h>
+#include <linux/fb.h>
+#include <linux/init.h>
+#include <linux/ioport.h>
+#include <linux/device.h>
+#include <linux/dma-mapping.h>
+
+#include "msm_fb.h"
+#include "mddihost.h"
+#include "mddihosti.h"
+
+#include <linux/clk.h>
+#include <mach/clk.h>
+
+extern struct semaphore mddi_host_mutex;
+static boolean mddi_host_ext_powered = FALSE;
+
+void mddi_host_start_ext_display(void)
+{
+       down(&mddi_host_mutex);
+
+       if (!mddi_host_ext_powered) {
+               mddi_host_init(MDDI_HOST_EXT);
+
+               mddi_host_ext_powered = TRUE;
+       }
+
+       up(&mddi_host_mutex);
+}
+
+void mddi_host_stop_ext_display(void)
+{
+       down(&mddi_host_mutex);
+
+       if (mddi_host_ext_powered) {
+               mddi_host_powerdown(MDDI_HOST_EXT);
+
+               mddi_host_ext_powered = FALSE;
+       }
+
+       up(&mddi_host_mutex);
+}
diff --git a/drivers/staging/msm/mddihosti.c b/drivers/staging/msm/mddihosti.c
new file mode 100644 (file)
index 0000000..f9d6e91
--- /dev/null
@@ -0,0 +1,2239 @@
+/* Copyright (c) 2008-2009, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/delay.h>
+#include <linux/mm.h>
+#include <linux/fb.h>
+#include <linux/init.h>
+#include <linux/ioport.h>
+#include <linux/device.h>
+#include <linux/dma-mapping.h>
+
+#include "msm_fb_panel.h"
+#include "mddihost.h"
+#include "mddihosti.h"
+
+#define FEATURE_MDDI_UNDERRUN_RECOVERY
+#ifndef FEATURE_MDDI_DISABLE_REVERSE
+static void mddi_read_rev_packet(byte *data_ptr);
+#endif
+
+struct timer_list mddi_host_timer;
+
+#define MDDI_DEFAULT_TIMER_LENGTH 5000 /* 5 seconds */
+uint32 mddi_rtd_frequency = 60000;     /* send RTD every 60 seconds */
+uint32 mddi_client_status_frequency = 60000;   /* get status pkt every 60 secs */
+
+boolean mddi_vsync_detect_enabled = FALSE;
+mddi_gpio_info_type mddi_gpio;
+
+uint32 mddi_host_core_version;
+boolean mddi_debug_log_statistics = FALSE;
+/* #define FEATURE_MDDI_HOST_ENABLE_EARLY_HIBERNATION */
+/* default to TRUE in case MDP does not vote */
+static boolean mddi_host_mdp_active_flag = TRUE;
+static uint32 mddi_log_stats_counter;
+uint32 mddi_log_stats_frequency = 4000;
+
+#define MDDI_DEFAULT_REV_PKT_SIZE            0x20
+
+#ifndef FEATURE_MDDI_DISABLE_REVERSE
+static boolean mddi_rev_ptr_workaround = TRUE;
+static uint32 mddi_reg_read_retry;
+static uint32 mddi_reg_read_retry_max = 20;
+static boolean mddi_enable_reg_read_retry = TRUE;
+static boolean mddi_enable_reg_read_retry_once = FALSE;
+
+#define MDDI_MAX_REV_PKT_SIZE                0x60
+
+#define MDDI_CLIENT_CAPABILITY_REV_PKT_SIZE  0x60
+
+#define MDDI_VIDEO_REV_PKT_SIZE              0x40
+#define MDDI_REV_BUFFER_SIZE  MDDI_MAX_REV_PKT_SIZE
+static byte rev_packet_data[MDDI_MAX_REV_PKT_SIZE];
+#endif /* FEATURE_MDDI_DISABLE_REVERSE */
+/* leave these variables so graphics will compile */
+
+#define MDDI_MAX_REV_DATA_SIZE  128
+/*lint -d__align(x) */
+boolean mddi_debug_clear_rev_data = TRUE;
+
+uint32 *mddi_reg_read_value_ptr;
+
+mddi_client_capability_type mddi_client_capability_pkt;
+static boolean mddi_client_capability_request = FALSE;
+
+#ifndef FEATURE_MDDI_DISABLE_REVERSE
+
+#define MAX_MDDI_REV_HANDLERS 2
+#define INVALID_PKT_TYPE 0xFFFF
+
+typedef struct {
+       mddi_rev_handler_type handler;  /* ISR to be executed */
+       uint16 pkt_type;
+} mddi_rev_pkt_handler_type;
+static mddi_rev_pkt_handler_type mddi_rev_pkt_handler[MAX_MDDI_REV_HANDLERS] =
+    { {NULL, INVALID_PKT_TYPE}, {NULL, INVALID_PKT_TYPE} };
+
+static boolean mddi_rev_encap_user_request = FALSE;
+static mddi_linked_list_notify_type mddi_rev_user;
+
+spinlock_t mddi_host_spin_lock;
+extern uint32 mdp_in_processing;
+#endif
+
+typedef enum {
+       MDDI_REV_IDLE
+#ifndef FEATURE_MDDI_DISABLE_REVERSE
+           , MDDI_REV_REG_READ_ISSUED,
+       MDDI_REV_REG_READ_SENT,
+       MDDI_REV_ENCAP_ISSUED,
+       MDDI_REV_STATUS_REQ_ISSUED,
+       MDDI_REV_CLIENT_CAP_ISSUED
+#endif
+} mddi_rev_link_state_type;
+
+typedef enum {
+       MDDI_LINK_DISABLED,
+       MDDI_LINK_HIBERNATING,
+       MDDI_LINK_ACTIVATING,
+       MDDI_LINK_ACTIVE
+} mddi_host_link_state_type;
+
+typedef struct {
+       uint32 count;
+       uint32 in_count;
+       uint32 disp_req_count;
+       uint32 state_change_count;
+       uint32 ll_done_count;
+       uint32 rev_avail_count;
+       uint32 error_count;
+       uint32 rev_encap_count;
+       uint32 llist_ptr_write_1;
+       uint32 llist_ptr_write_2;
+} mddi_host_int_type;
+
+typedef struct {
+       uint32 fwd_crc_count;
+       uint32 rev_crc_count;
+       uint32 pri_underflow;
+       uint32 sec_underflow;
+       uint32 rev_overflow;
+       uint32 pri_overwrite;
+       uint32 sec_overwrite;
+       uint32 rev_overwrite;
+       uint32 dma_failure;
+       uint32 rtd_failure;
+       uint32 reg_read_failure;
+#ifdef FEATURE_MDDI_UNDERRUN_RECOVERY
+       uint32 pri_underrun_detected;
+#endif
+} mddi_host_stat_type;
+
+typedef struct {
+       uint32 rtd_cnt;
+       uint32 rev_enc_cnt;
+       uint32 vid_cnt;
+       uint32 reg_acc_cnt;
+       uint32 cli_stat_cnt;
+       uint32 cli_cap_cnt;
+       uint32 reg_read_cnt;
+       uint32 link_active_cnt;
+       uint32 link_hibernate_cnt;
+       uint32 vsync_response_cnt;
+       uint32 fwd_crc_cnt;
+       uint32 rev_crc_cnt;
+} mddi_log_params_struct_type;
+
+typedef struct {
+       uint32 rtd_value;
+       uint32 rtd_counter;
+       uint32 client_status_cnt;
+       boolean rev_ptr_written;
+       uint8 *rev_ptr_start;
+       uint8 *rev_ptr_curr;
+       uint32 mddi_rev_ptr_write_val;
+       dma_addr_t rev_data_dma_addr;
+       uint16 rev_pkt_size;
+       mddi_rev_link_state_type rev_state;
+       mddi_host_link_state_type link_state;
+       mddi_host_driver_state_type driver_state;
+       boolean disable_hibernation;
+       uint32 saved_int_reg;
+       uint32 saved_int_en;
+       mddi_linked_list_type *llist_ptr;
+       dma_addr_t llist_dma_addr;
+       mddi_linked_list_type *llist_dma_ptr;
+       uint32 *rev_data_buf;
+       struct completion mddi_llist_avail_comp;
+       boolean mddi_waiting_for_llist_avail;
+       mddi_host_int_type int_type;
+       mddi_host_stat_type stats;
+       mddi_log_params_struct_type log_parms;
+       mddi_llist_info_type llist_info;
+       mddi_linked_list_notify_type llist_notify[MDDI_MAX_NUM_LLIST_ITEMS];
+} mddi_host_cntl_type;
+
+static mddi_host_type mddi_curr_host = MDDI_HOST_PRIM;
+static mddi_host_cntl_type mhctl[MDDI_NUM_HOST_CORES];
+mddi_linked_list_type *llist_extern[MDDI_NUM_HOST_CORES];
+mddi_linked_list_type *llist_dma_extern[MDDI_NUM_HOST_CORES];
+mddi_linked_list_notify_type *llist_extern_notify[MDDI_NUM_HOST_CORES];
+static mddi_log_params_struct_type prev_parms[MDDI_NUM_HOST_CORES];
+
+extern uint32 mdp_total_vdopkts;
+
+static boolean mddi_host_io_clock_on = FALSE;
+static boolean mddi_host_hclk_on = FALSE;
+
+int int_mddi_pri_flag = FALSE;
+int int_mddi_ext_flag = FALSE;
+
+static void mddi_report_errors(uint32 int_reg)
+{
+       mddi_host_type host_idx = mddi_curr_host;
+       mddi_host_cntl_type *pmhctl = &(mhctl[host_idx]);
+
+       if (int_reg & MDDI_INT_PRI_UNDERFLOW) {
+               pmhctl->stats.pri_underflow++;
+               MDDI_MSG_ERR("!!! MDDI Primary Underflow !!!\n");
+       }
+       if (int_reg & MDDI_INT_SEC_UNDERFLOW) {
+               pmhctl->stats.sec_underflow++;
+               MDDI_MSG_ERR("!!! MDDI Secondary Underflow !!!\n");
+       }
+#ifndef FEATURE_MDDI_DISABLE_REVERSE
+       if (int_reg & MDDI_INT_REV_OVERFLOW) {
+               pmhctl->stats.rev_overflow++;
+               MDDI_MSG_ERR("!!! MDDI Reverse Overflow !!!\n");
+               pmhctl->rev_ptr_curr = pmhctl->rev_ptr_start;
+               mddi_host_reg_out(REV_PTR, pmhctl->mddi_rev_ptr_write_val);
+
+       }
+       if (int_reg & MDDI_INT_CRC_ERROR)
+               MDDI_MSG_ERR("!!! MDDI Reverse CRC Error !!!\n");
+#endif
+       if (int_reg & MDDI_INT_PRI_OVERWRITE) {
+               pmhctl->stats.pri_overwrite++;
+               MDDI_MSG_ERR("!!! MDDI Primary Overwrite !!!\n");
+       }
+       if (int_reg & MDDI_INT_SEC_OVERWRITE) {
+               pmhctl->stats.sec_overwrite++;
+               MDDI_MSG_ERR("!!! MDDI Secondary Overwrite !!!\n");
+       }
+#ifndef FEATURE_MDDI_DISABLE_REVERSE
+       if (int_reg & MDDI_INT_REV_OVERWRITE) {
+               pmhctl->stats.rev_overwrite++;
+               /* This will show up normally and is not a problem */
+               MDDI_MSG_DEBUG("MDDI Reverse Overwrite!\n");
+       }
+       if (int_reg & MDDI_INT_RTD_FAILURE) {
+               mddi_host_reg_outm(INTEN, MDDI_INT_RTD_FAILURE, 0);
+               pmhctl->stats.rtd_failure++;
+               MDDI_MSG_ERR("!!! MDDI RTD Failure !!!\n");
+       }
+#endif
+       if (int_reg & MDDI_INT_DMA_FAILURE) {
+               pmhctl->stats.dma_failure++;
+               MDDI_MSG_ERR("!!! MDDI DMA Abort !!!\n");
+       }
+}
+
+static void mddi_host_enable_io_clock(void)
+{
+       if (!MDDI_HOST_IS_IO_CLOCK_ON)
+               MDDI_HOST_ENABLE_IO_CLOCK;
+}
+
+static void mddi_host_enable_hclk(void)
+{
+
+       if (!MDDI_HOST_IS_HCLK_ON)
+               MDDI_HOST_ENABLE_HCLK;
+}
+
+static void mddi_host_disable_io_clock(void)
+{
+#ifndef FEATURE_MDDI_HOST_IO_CLOCK_CONTROL_DISABLE
+       if (MDDI_HOST_IS_IO_CLOCK_ON)
+               MDDI_HOST_DISABLE_IO_CLOCK;
+#endif
+}
+
+static void mddi_host_disable_hclk(void)
+{
+#ifndef FEATURE_MDDI_HOST_HCLK_CONTROL_DISABLE
+       if (MDDI_HOST_IS_HCLK_ON)
+               MDDI_HOST_DISABLE_HCLK;
+#endif
+}
+
+static void mddi_vote_to_sleep(mddi_host_type host_idx, boolean sleep)
+{
+       uint16 vote_mask;
+
+       if (host_idx == MDDI_HOST_PRIM)
+               vote_mask = 0x01;
+       else
+               vote_mask = 0x02;
+}
+
+static void mddi_report_state_change(uint32 int_reg)
+{
+       mddi_host_type host_idx = mddi_curr_host;
+       mddi_host_cntl_type *pmhctl = &(mhctl[host_idx]);
+
+       if ((pmhctl->saved_int_reg & MDDI_INT_IN_HIBERNATION) &&
+           (pmhctl->saved_int_reg & MDDI_INT_LINK_ACTIVE)) {
+               /* recover from condition where the io_clock was turned off by the
+                  clock driver during a transition to hibernation. The io_clock
+                  disable is to prevent MDP/MDDI underruns when changing ARM
+                  clock speeds. In the process of halting the ARM, the hclk
+                  divider needs to be set to 1. When it is set to 1, there is
+                  a small time (usecs) when hclk is off or slow, and this can
+                  cause an underrun. To prevent the underrun, clock driver turns
+                  off the MDDI io_clock before making the change. */
+               mddi_host_reg_out(CMD, MDDI_CMD_POWERUP);
+       }
+
+       if (int_reg & MDDI_INT_LINK_ACTIVE) {
+               pmhctl->link_state = MDDI_LINK_ACTIVE;
+               pmhctl->log_parms.link_active_cnt++;
+               pmhctl->rtd_value = mddi_host_reg_in(RTD_VAL);
+               MDDI_MSG_DEBUG("!!! MDDI Active RTD:0x%x!!!\n",
+                              pmhctl->rtd_value);
+               /* now interrupt on hibernation */
+               mddi_host_reg_outm(INTEN,
+                                  (MDDI_INT_IN_HIBERNATION |
+                                   MDDI_INT_LINK_ACTIVE),
+                                  MDDI_INT_IN_HIBERNATION);
+
+#ifdef DEBUG_MDDIHOSTI
+               /* if gpio interrupt is enabled, start polling at fastest
+                * registered rate
+                */
+               if (mddi_gpio.polling_enabled) {
+                       timer_reg(&mddi_gpio_poll_timer,
+               mddi_gpio_poll_timer_cb, 0, mddi_gpio.polling_interval, 0);
+               }
+#endif
+#ifndef FEATURE_MDDI_DISABLE_REVERSE
+               if (mddi_rev_ptr_workaround) {
+                       /* HW CR: need to reset reverse register stuff */
+                       pmhctl->rev_ptr_written = FALSE;
+                       pmhctl->rev_ptr_curr = pmhctl->rev_ptr_start;
+               }
+#endif
+               /* vote on sleep */
+               mddi_vote_to_sleep(host_idx, FALSE);
+
+               if (host_idx == MDDI_HOST_PRIM) {
+                       if (mddi_vsync_detect_enabled) {
+                               /*
+                                * Indicate to client specific code that vsync
+                                * was enabled, but we did not detect a client
+                                * intiated wakeup. The client specific
+                                * handler can either reassert vsync detection,
+                                * or treat this as a valid vsync.
+                                */
+                               mddi_client_lcd_vsync_detected(FALSE);
+                               pmhctl->log_parms.vsync_response_cnt++;
+                       }
+               }
+       }
+       if (int_reg & MDDI_INT_IN_HIBERNATION) {
+               pmhctl->link_state = MDDI_LINK_HIBERNATING;
+               pmhctl->log_parms.link_hibernate_cnt++;
+               MDDI_MSG_DEBUG("!!! MDDI Hibernating !!!\n");
+               /* now interrupt on link_active */
+#ifdef FEATURE_MDDI_DISABLE_REVERSE
+               mddi_host_reg_outm(INTEN,
+                                  (MDDI_INT_MDDI_IN |
+                                   MDDI_INT_IN_HIBERNATION |
+                                   MDDI_INT_LINK_ACTIVE),
+                                  MDDI_INT_LINK_ACTIVE);
+#else
+               mddi_host_reg_outm(INTEN,
+                                  (MDDI_INT_MDDI_IN |
+                                   MDDI_INT_IN_HIBERNATION |
+                                   MDDI_INT_LINK_ACTIVE),
+                                  (MDDI_INT_MDDI_IN | MDDI_INT_LINK_ACTIVE));
+
+               pmhctl->rtd_counter = mddi_rtd_frequency;
+
+               if (pmhctl->rev_state != MDDI_REV_IDLE) {
+                       /* a rev_encap will not wake up the link, so we do that here */
+                       pmhctl->link_state = MDDI_LINK_ACTIVATING;
+                       mddi_host_reg_out(CMD, MDDI_CMD_LINK_ACTIVE);
+               }
+#endif
+
+               if (pmhctl->disable_hibernation) {
+                       mddi_host_reg_out(CMD, MDDI_CMD_HIBERNATE);
+                       mddi_host_reg_out(CMD, MDDI_CMD_LINK_ACTIVE);
+                       pmhctl->link_state = MDDI_LINK_ACTIVATING;
+               }
+#ifdef FEATURE_MDDI_UNDERRUN_RECOVERY
+               if ((pmhctl->llist_info.transmitting_start_idx !=
+                    UNASSIGNED_INDEX)
+                   &&
+                   ((pmhctl->
+                     saved_int_reg & (MDDI_INT_PRI_LINK_LIST_DONE |
+                                      MDDI_INT_PRI_PTR_READ)) ==
+                    MDDI_INT_PRI_PTR_READ)) {
+                       mddi_linked_list_type *llist_dma;
+                       llist_dma = pmhctl->llist_dma_ptr;
+                       /*
+                        * All indications are that we have not received a
+                        * linked list done interrupt, due to an underrun
+                        * condition. Recovery attempt is to send again.
+                        */
+                       dma_coherent_pre_ops();
+                       /* Write to primary pointer register again */
+                       mddi_host_reg_out(PRI_PTR,
+                                         &llist_dma[pmhctl->llist_info.
+                                                    transmitting_start_idx]);
+                       pmhctl->stats.pri_underrun_detected++;
+               }
+#endif
+
+               /* vote on sleep */
+               if (pmhctl->link_state == MDDI_LINK_HIBERNATING) {
+                       mddi_vote_to_sleep(host_idx, TRUE);
+               }
+
+#ifdef DEBUG_MDDIHOSTI
+               /* need to stop polling timer */
+               if (mddi_gpio.polling_enabled) {
+                       (void) timer_clr(&mddi_gpio_poll_timer, T_NONE);
+               }
+#endif
+       }
+}
+
+void mddi_host_timer_service(unsigned long data)
+{
+#ifndef FEATURE_MDDI_DISABLE_REVERSE
+       unsigned long flags;
+#endif
+       mddi_host_type host_idx;
+       mddi_host_cntl_type *pmhctl;
+
+       unsigned long time_ms = MDDI_DEFAULT_TIMER_LENGTH;
+       init_timer(&mddi_host_timer);
+       mddi_host_timer.function = mddi_host_timer_service;
+       mddi_host_timer.data = 0;
+
+       mddi_host_timer.expires = jiffies + ((time_ms * HZ) / 1000);
+       add_timer(&mddi_host_timer);
+
+       for (host_idx = MDDI_HOST_PRIM; host_idx < MDDI_NUM_HOST_CORES;
+            host_idx++) {
+               pmhctl = &(mhctl[host_idx]);
+               mddi_log_stats_counter += (uint32) time_ms;
+#ifndef FEATURE_MDDI_DISABLE_REVERSE
+               pmhctl->rtd_counter += (uint32) time_ms;
+               pmhctl->client_status_cnt += (uint32) time_ms;
+
+               if (host_idx == MDDI_HOST_PRIM) {
+                       if (pmhctl->client_status_cnt >=
+                           mddi_client_status_frequency) {
+                               if ((pmhctl->link_state ==
+                                    MDDI_LINK_HIBERNATING)
+                                   && (pmhctl->client_status_cnt >
+                                       mddi_client_status_frequency)) {
+                                       /*
+                                        * special case where we are hibernating
+                                        * and mddi_host_isr is not firing, so
+                                        * kick the link so that the status can
+                                        * be retrieved
+                                        */
+
+                                       /* need to wake up link before issuing
+                                        * rev encap command
+                                        */
+                                       MDDI_MSG_INFO("wake up link!\n");
+                                       spin_lock_irqsave(&mddi_host_spin_lock,
+                                                         flags);
+                                       mddi_host_enable_hclk();
+                                       mddi_host_enable_io_clock();
+                                       pmhctl->link_state =
+                                           MDDI_LINK_ACTIVATING;
+                                       mddi_host_reg_out(CMD,
+                                                         MDDI_CMD_LINK_ACTIVE);
+                                       spin_unlock_irqrestore
+                                           (&mddi_host_spin_lock, flags);
+                               } else
+                                   if ((pmhctl->link_state == MDDI_LINK_ACTIVE)
+                                       && pmhctl->disable_hibernation) {
+                                       /*
+                                        * special case where we have disabled
+                                        * hibernation and mddi_host_isr
+                                        * is not firing, so enable interrupt
+                                        * for no pkts pending, which will
+                                        * generate an interrupt
+                                        */
+                                       MDDI_MSG_INFO("kick isr!\n");
+                                       spin_lock_irqsave(&mddi_host_spin_lock,
+                                                         flags);
+                                       mddi_host_enable_hclk();
+                                       mddi_host_reg_outm(INTEN,
+                                                          MDDI_INT_NO_CMD_PKTS_PEND,
+                                                          MDDI_INT_NO_CMD_PKTS_PEND);
+                                       spin_unlock_irqrestore
+                                           (&mddi_host_spin_lock, flags);
+                               }
+                       }
+               }
+#endif /* #ifndef FEATURE_MDDI_DISABLE_REVERSE */
+       }
+
+       /* Check if logging is turned on */
+       for (host_idx = MDDI_HOST_PRIM; host_idx < MDDI_NUM_HOST_CORES;
+            host_idx++) {
+               mddi_log_params_struct_type *prev_ptr = &(prev_parms[host_idx]);
+               pmhctl = &(mhctl[host_idx]);
+
+               if (mddi_debug_log_statistics) {
+
+                       /* get video pkt count from MDP, since MDDI sw cannot know this */
+                       pmhctl->log_parms.vid_cnt = mdp_total_vdopkts;
+
+                       if (mddi_log_stats_counter >= mddi_log_stats_frequency) {
+                               /* mddi_log_stats_counter = 0; */
+                               if (mddi_debug_log_statistics) {
+                                       MDDI_MSG_NOTICE
+                                           ("MDDI Statistics since last report:\n");
+                                       MDDI_MSG_NOTICE("  Packets sent:\n");
+                                       MDDI_MSG_NOTICE
+                                           ("    %d RTD packet(s)\n",
+                                            pmhctl->log_parms.rtd_cnt -
+                                            prev_ptr->rtd_cnt);
+                                       if (prev_ptr->rtd_cnt !=
+                                           pmhctl->log_parms.rtd_cnt) {
+                                               unsigned long flags;
+                                               spin_lock_irqsave
+                                                   (&mddi_host_spin_lock,
+                                                    flags);
+                                               mddi_host_enable_hclk();
+                                               pmhctl->rtd_value =
+                                                   mddi_host_reg_in(RTD_VAL);
+                                               spin_unlock_irqrestore
+                                                   (&mddi_host_spin_lock,
+                                                    flags);
+                                               MDDI_MSG_NOTICE
+                                                   ("      RTD value=%d\n",
+                                                    pmhctl->rtd_value);
+                                       }
+                                       MDDI_MSG_NOTICE
+                                           ("    %d VIDEO packets\n",
+                                            pmhctl->log_parms.vid_cnt -
+                                            prev_ptr->vid_cnt);
+                                       MDDI_MSG_NOTICE
+                                           ("    %d Register Access packets\n",
+                                            pmhctl->log_parms.reg_acc_cnt -
+                                            prev_ptr->reg_acc_cnt);
+                                       MDDI_MSG_NOTICE
+                                           ("    %d Reverse Encapsulation packet(s)\n",
+                                            pmhctl->log_parms.rev_enc_cnt -
+                                            prev_ptr->rev_enc_cnt);
+                                       if (prev_ptr->rev_enc_cnt !=
+                                           pmhctl->log_parms.rev_enc_cnt) {
+                                               /* report # of reverse CRC errors */
+                                               MDDI_MSG_NOTICE
+                                                   ("      %d reverse CRC errors detected\n",
+                                                    pmhctl->log_parms.
+                                                    rev_crc_cnt -
+                                                    prev_ptr->rev_crc_cnt);
+                                       }
+                                       MDDI_MSG_NOTICE
+                                           ("  Packets received:\n");
+                                       MDDI_MSG_NOTICE
+                                           ("    %d Client Status packets",
+                                            pmhctl->log_parms.cli_stat_cnt -
+                                            prev_ptr->cli_stat_cnt);
+                                       if (prev_ptr->cli_stat_cnt !=
+                                           pmhctl->log_parms.cli_stat_cnt) {
+                                               MDDI_MSG_NOTICE
+                                                   ("      %d forward CRC errors reported\n",
+                                                    pmhctl->log_parms.
+                                                    fwd_crc_cnt -
+                                                    prev_ptr->fwd_crc_cnt);
+                                       }
+                                       MDDI_MSG_NOTICE
+                                           ("    %d Register Access Read packets\n",
+                                            pmhctl->log_parms.reg_read_cnt -
+                                            prev_ptr->reg_read_cnt);
+
+                                       if (pmhctl->link_state ==
+                                           MDDI_LINK_ACTIVE) {
+                                               MDDI_MSG_NOTICE
+                                                   ("  Current Link Status: Active\n");
+                                       } else
+                                           if ((pmhctl->link_state ==
+                                                MDDI_LINK_HIBERNATING)
+                                               || (pmhctl->link_state ==
+                                                   MDDI_LINK_ACTIVATING)) {
+                                               MDDI_MSG_NOTICE
+                                                   ("  Current Link Status: Hibernation\n");
+                                       } else {
+                                               MDDI_MSG_NOTICE
+                                                   ("  Current Link Status: Inactive\n");
+                                       }
+                                       MDDI_MSG_NOTICE
+                                           ("    Active state entered %d times\n",
+                                            pmhctl->log_parms.link_active_cnt -
+                                            prev_ptr->link_active_cnt);
+                                       MDDI_MSG_NOTICE
+                                           ("    Hibernation state entered %d times\n",
+                                            pmhctl->log_parms.
+                                            link_hibernate_cnt -
+                                            prev_ptr->link_hibernate_cnt);
+                               }
+                       }
+                       prev_parms[host_idx] = pmhctl->log_parms;
+               }
+       }
+       if (mddi_log_stats_counter >= mddi_log_stats_frequency)
+               mddi_log_stats_counter = 0;
+
+       return;
+}                              /* mddi_host_timer_cb */
+
+static void mddi_process_link_list_done(void)
+{
+       mddi_host_type host_idx = mddi_curr_host;
+       mddi_host_cntl_type *pmhctl = &(mhctl[host_idx]);
+
+       /* normal forward linked list packet(s) were sent */
+       if (pmhctl->llist_info.transmitting_start_idx == UNASSIGNED_INDEX) {
+               MDDI_MSG_ERR("**** getting LL done, but no list ****\n");
+       } else {
+               uint16 idx;
+
+#ifndef FEATURE_MDDI_DISABLE_REVERSE
+               if (pmhctl->rev_state == MDDI_REV_REG_READ_ISSUED) {
+                       /* special case where a register read packet was sent */
+                       pmhctl->rev_state = MDDI_REV_REG_READ_SENT;
+                       if (pmhctl->llist_info.reg_read_idx == UNASSIGNED_INDEX) {
+                               MDDI_MSG_ERR
+                                   ("**** getting LL done, but no list ****\n");
+                       }
+               }
+#endif
+               for (idx = pmhctl->llist_info.transmitting_start_idx;;) {
+                       uint16 next_idx = pmhctl->llist_notify[idx].next_idx;
+                       /* with reg read we don't release the waiting tcb until after
+                        * the reverse encapsulation has completed.
+                        */
+                       if (idx != pmhctl->llist_info.reg_read_idx) {
+                               /* notify task that may be waiting on this completion */
+                               if (pmhctl->llist_notify[idx].waiting) {
+                                       complete(&
+                                                (pmhctl->llist_notify[idx].
+                                                 done_comp));
+                               }
+                               if (pmhctl->llist_notify[idx].done_cb != NULL) {
+                                       (*(pmhctl->llist_notify[idx].done_cb))
+                                           ();
+                               }
+
+                               pmhctl->llist_notify[idx].in_use = FALSE;
+                               pmhctl->llist_notify[idx].waiting = FALSE;
+                               pmhctl->llist_notify[idx].done_cb = NULL;
+                               if (idx < MDDI_NUM_DYNAMIC_LLIST_ITEMS) {
+                                       /* static LLIST items are configured only once */
+                                       pmhctl->llist_notify[idx].next_idx =
+                                           UNASSIGNED_INDEX;
+                               }
+                               /*
+                                * currently, all linked list packets are
+                                * register access, so we can increment the
+                                * counter for that packet type here.
+                                */
+                               pmhctl->log_parms.reg_acc_cnt++;
+                       }
+                       if (idx == pmhctl->llist_info.transmitting_end_idx)
+                               break;
+                       idx = next_idx;
+                       if (idx == UNASSIGNED_INDEX)
+                               MDDI_MSG_CRIT("MDDI linked list corruption!\n");
+               }
+
+               pmhctl->llist_info.transmitting_start_idx = UNASSIGNED_INDEX;
+               pmhctl->llist_info.transmitting_end_idx = UNASSIGNED_INDEX;
+
+               if (pmhctl->mddi_waiting_for_llist_avail) {
+                       if (!
+                           (pmhctl->
+                            llist_notify[pmhctl->llist_info.next_free_idx].
+                            in_use)) {
+                               pmhctl->mddi_waiting_for_llist_avail = FALSE;
+                               complete(&(pmhctl->mddi_llist_avail_comp));
+                       }
+               }
+       }
+
+       /* Turn off MDDI_INT_PRI_LINK_LIST_DONE interrupt */
+       mddi_host_reg_outm(INTEN, MDDI_INT_PRI_LINK_LIST_DONE, 0);
+
+}
+
+static void mddi_queue_forward_linked_list(void)
+{
+       uint16 first_pkt_index;
+       mddi_linked_list_type *llist_dma;
+       mddi_host_type host_idx = mddi_curr_host;
+       mddi_host_cntl_type *pmhctl = &(mhctl[host_idx]);
+       llist_dma = pmhctl->llist_dma_ptr;
+
+       first_pkt_index = UNASSIGNED_INDEX;
+
+       if (pmhctl->llist_info.transmitting_start_idx == UNASSIGNED_INDEX) {
+#ifndef FEATURE_MDDI_DISABLE_REVERSE
+               if (pmhctl->llist_info.reg_read_waiting) {
+                       if (pmhctl->rev_state == MDDI_REV_IDLE) {
+                               /*
+                                * we have a register read to send and
+                                * can send it now
+                                */
+                               pmhctl->rev_state = MDDI_REV_REG_READ_ISSUED;
+                               mddi_reg_read_retry = 0;
+                               first_pkt_index =
+                                   pmhctl->llist_info.waiting_start_idx;
+                               pmhctl->llist_info.reg_read_waiting = FALSE;
+                       }
+               } else
+#endif
+               {
+                       /*
+                        * not register read to worry about, go ahead and write
+                        * anything that may be on the waiting list.
+                        */
+                       first_pkt_index = pmhctl->llist_info.waiting_start_idx;
+               }
+       }
+
+       if (first_pkt_index != UNASSIGNED_INDEX) {
+               pmhctl->llist_info.transmitting_start_idx =
+                   pmhctl->llist_info.waiting_start_idx;
+               pmhctl->llist_info.transmitting_end_idx =
+                   pmhctl->llist_info.waiting_end_idx;
+               pmhctl->llist_info.waiting_start_idx = UNASSIGNED_INDEX;
+               pmhctl->llist_info.waiting_end_idx = UNASSIGNED_INDEX;
+
+               /* write to the primary pointer register */
+               MDDI_MSG_DEBUG("MDDI writing primary ptr with idx=%d\n",
+                              first_pkt_index);
+
+               pmhctl->int_type.llist_ptr_write_2++;
+
+               dma_coherent_pre_ops();
+               mddi_host_reg_out(PRI_PTR, &llist_dma[first_pkt_index]);
+
+               /* enable interrupt when complete */
+               mddi_host_reg_outm(INTEN, MDDI_INT_PRI_LINK_LIST_DONE,
+                                  MDDI_INT_PRI_LINK_LIST_DONE);
+
+       }
+
+}
+
+#ifndef FEATURE_MDDI_DISABLE_REVERSE
+static void mddi_read_rev_packet(byte *data_ptr)
+{
+       uint16 i, length;
+       mddi_host_type host_idx = mddi_curr_host;
+       mddi_host_cntl_type *pmhctl = &(mhctl[host_idx]);
+
+       uint8 *rev_ptr_overflow =
+           (pmhctl->rev_ptr_start + MDDI_REV_BUFFER_SIZE);
+
+       /* first determine the length and handle invalid lengths */
+       length = *pmhctl->rev_ptr_curr++;
+       if (pmhctl->rev_ptr_curr >= rev_ptr_overflow)
+               pmhctl->rev_ptr_curr = pmhctl->rev_ptr_start;
+       length |= ((*pmhctl->rev_ptr_curr++) << 8);
+       if (pmhctl->rev_ptr_curr >= rev_ptr_overflow)
+               pmhctl->rev_ptr_curr = pmhctl->rev_ptr_start;
+       if (length > (pmhctl->rev_pkt_size - 2)) {
+               MDDI_MSG_ERR("Invalid rev pkt length %d\n", length);
+               /* rev_pkt_size should always be <= rev_ptr_size so limit to packet size */
+               length = pmhctl->rev_pkt_size - 2;
+       }
+
+       /* If the data pointer is NULL, just increment the pmhctl->rev_ptr_curr.
+        * Loop around if necessary. Don't bother reading the data.
+        */
+       if (data_ptr == NULL) {
+               pmhctl->rev_ptr_curr += length;
+               if (pmhctl->rev_ptr_curr >= rev_ptr_overflow)
+                       pmhctl->rev_ptr_curr -= MDDI_REV_BUFFER_SIZE;
+               return;
+       }
+
+       data_ptr[0] = length & 0x0ff;
+       data_ptr[1] = length >> 8;
+       data_ptr += 2;
+       /* copy the data to data_ptr byte-at-a-time */
+       for (i = 0; (i < length) && (pmhctl->rev_ptr_curr < rev_ptr_overflow);
+            i++)
+               *data_ptr++ = *pmhctl->rev_ptr_curr++;
+       if (pmhctl->rev_ptr_curr >= rev_ptr_overflow)
+               pmhctl->rev_ptr_curr = pmhctl->rev_ptr_start;
+       for (; (i < length) && (pmhctl->rev_ptr_curr < rev_ptr_overflow); i++)
+               *data_ptr++ = *pmhctl->rev_ptr_curr++;
+}
+
+static void mddi_process_rev_packets(void)
+{
+       uint32 rev_packet_count;
+       word i;
+       uint32 crc_errors;
+       boolean mddi_reg_read_successful = FALSE;
+       mddi_host_type host_idx = mddi_curr_host;
+       mddi_host_cntl_type *pmhctl = &(mhctl[host_idx]);
+
+       pmhctl->log_parms.rev_enc_cnt++;
+       if ((pmhctl->rev_state != MDDI_REV_ENCAP_ISSUED) &&
+           (pmhctl->rev_state != MDDI_REV_STATUS_REQ_ISSUED) &&
+           (pmhctl->rev_state != MDDI_REV_CLIENT_CAP_ISSUED)) {
+               MDDI_MSG_ERR("Wrong state %d for reverse int\n",
+                            pmhctl->rev_state);
+       }
+       /* Turn off MDDI_INT_REV_AVAIL interrupt */
+       mddi_host_reg_outm(INTEN, MDDI_INT_REV_DATA_AVAIL, 0);
+
+       /* Clear rev data avail int */
+       mddi_host_reg_out(INT, MDDI_INT_REV_DATA_AVAIL);
+
+       /* Get Number of packets */
+       rev_packet_count = mddi_host_reg_in(REV_PKT_CNT);
+
+#ifndef T_MSM7500
+       /* Clear out rev packet counter */
+       mddi_host_reg_out(REV_PKT_CNT, 0x0000);
+#endif
+
+#if defined(CONFIG_FB_MSM_MDP31) || defined(CONFIG_FB_MSM_MDP40)
+       if ((pmhctl->rev_state == MDDI_REV_CLIENT_CAP_ISSUED) &&
+           (rev_packet_count > 0) &&
+           (mddi_host_core_version == 0x28 ||
+            mddi_host_core_version == 0x30)) {
+
+               uint32 int_reg;
+               uint32 max_count = 0;
+
+               mddi_host_reg_out(REV_PTR, pmhctl->mddi_rev_ptr_write_val);
+               int_reg = mddi_host_reg_in(INT);
+               while ((int_reg & 0x100000) == 0) {
+                       udelay(3);
+                       int_reg = mddi_host_reg_in(INT);
+                       if (++max_count > 100)
+                               break;
+               }
+       }
+#endif
+
+       /* Get CRC error count */
+       crc_errors = mddi_host_reg_in(REV_CRC_ERR);
+       if (crc_errors != 0) {
+               pmhctl->log_parms.rev_crc_cnt += crc_errors;
+               pmhctl->stats.rev_crc_count += crc_errors;
+               MDDI_MSG_ERR("!!! MDDI %d Reverse CRC Error(s) !!!\n",
+                            crc_errors);
+#ifndef T_MSM7500
+               /* Clear CRC error count */
+               mddi_host_reg_out(REV_CRC_ERR, 0x0000);
+#endif
+               /* also issue an RTD to attempt recovery */
+               pmhctl->rtd_counter = mddi_rtd_frequency;
+       }
+
+       pmhctl->rtd_value = mddi_host_reg_in(RTD_VAL);
+
+       MDDI_MSG_DEBUG("MDDI rev pkt cnt=%d, ptr=0x%x, RTD:0x%x\n",
+                      rev_packet_count,
+                      pmhctl->rev_ptr_curr - pmhctl->rev_ptr_start,
+                      pmhctl->rtd_value);
+
+       if (rev_packet_count >= 1) {
+               mddi_invalidate_cache_lines((uint32 *) pmhctl->rev_ptr_start,
+                                           MDDI_REV_BUFFER_SIZE);
+       }
+       /* order the reads */
+       dma_coherent_post_ops();
+       for (i = 0; i < rev_packet_count; i++) {
+               mddi_rev_packet_type *rev_pkt_ptr;
+
+               mddi_read_rev_packet(rev_packet_data);
+
+               rev_pkt_ptr = (mddi_rev_packet_type *) rev_packet_data;
+
+               if (rev_pkt_ptr->packet_length > pmhctl->rev_pkt_size) {
+                       MDDI_MSG_ERR("!!!invalid packet size: %d\n",
+                                    rev_pkt_ptr->packet_length);
+               }
+
+               MDDI_MSG_DEBUG("MDDI rev pkt 0x%x size 0x%x\n",
+                              rev_pkt_ptr->packet_type,
+                              rev_pkt_ptr->packet_length);
+
+               /* Do whatever you want to do with the data based on the packet type */
+               switch (rev_pkt_ptr->packet_type) {
+               case 66:        /* Client Capability */
+                       {
+                               mddi_client_capability_type
+                                   *client_capability_pkt_ptr;
+
+                               client_capability_pkt_ptr =
+                                   (mddi_client_capability_type *)
+                                   rev_packet_data;
+                               MDDI_MSG_NOTICE
+                                   ("Client Capability: Week=%d, Year=%d\n",
+                                    client_capability_pkt_ptr->
+                                    Week_of_Manufacture,
+                                    client_capability_pkt_ptr->
+                                    Year_of_Manufacture);
+                               memcpy((void *)&mddi_client_capability_pkt,
+                                      (void *)rev_packet_data,
+                                      sizeof(mddi_client_capability_type));
+                               pmhctl->log_parms.cli_cap_cnt++;
+                       }
+                       break;
+
+               case 70:        /* Display Status */
+                       {
+                               mddi_client_status_type *client_status_pkt_ptr;
+
+                               client_status_pkt_ptr =
+                                   (mddi_client_status_type *) rev_packet_data;
+                               if ((client_status_pkt_ptr->crc_error_count !=
+                                    0)
+                                   || (client_status_pkt_ptr->
+                                       reverse_link_request != 0)) {
+                                       MDDI_MSG_ERR
+                                           ("Client Status: RevReq=%d, CrcErr=%d\n",
+                                            client_status_pkt_ptr->
+                                            reverse_link_request,
+                                            client_status_pkt_ptr->
+                                            crc_error_count);
+                               } else {
+                                       MDDI_MSG_DEBUG
+                                           ("Client Status: RevReq=%d, CrcErr=%d\n",
+                                            client_status_pkt_ptr->
+                                            reverse_link_request,
+                                            client_status_pkt_ptr->
+                                            crc_error_count);
+                               }
+                               pmhctl->log_parms.fwd_crc_cnt +=
+                                   client_status_pkt_ptr->crc_error_count;
+                               pmhctl->stats.fwd_crc_count +=
+                                   client_status_pkt_ptr->crc_error_count;
+                               pmhctl->log_parms.cli_stat_cnt++;
+                       }
+                       break;
+
+               case 146:       /* register access packet */
+                       {
+                               mddi_register_access_packet_type
+                                   * regacc_pkt_ptr;
+
+                               regacc_pkt_ptr =
+                                   (mddi_register_access_packet_type *)
+                                   rev_packet_data;
+
+                               MDDI_MSG_DEBUG
+                                   ("Reg Acc parse reg=0x%x, value=0x%x\n",
+                                    regacc_pkt_ptr->register_address,
+                                    regacc_pkt_ptr->register_data_list);
+
+                               /* Copy register value to location passed in */
+                               if (mddi_reg_read_value_ptr) {
+#if defined(T_MSM6280) && !defined(T_MSM7200)
+                                       /* only least significant 16 bits are valid with 6280 */
+                                       *mddi_reg_read_value_ptr =
+                                           regacc_pkt_ptr->
+                                           register_data_list & 0x0000ffff;
+#else
+                                       *mddi_reg_read_value_ptr =
+                                           regacc_pkt_ptr->register_data_list;
+#endif
+                                       mddi_reg_read_successful = TRUE;
+                                       mddi_reg_read_value_ptr = NULL;
+                               }
+
+#ifdef DEBUG_MDDIHOSTI
+                               if ((mddi_gpio.polling_enabled) &&
+                                   (regacc_pkt_ptr->register_address ==
+                                    mddi_gpio.polling_reg)) {
+                                       /*
+                                        * ToDo: need to call Linux GPIO call
+                                        * here...
+                                        */
+                                        mddi_client_lcd_gpio_poll(
+                                        regacc_pkt_ptr->register_data_list);
+                               }
+#endif
+                               pmhctl->log_parms.reg_read_cnt++;
+                       }
+                       break;
+
+               default:        /* any other packet */
+                       {
+                               uint16 hdlr;
+
+                               for (hdlr = 0; hdlr < MAX_MDDI_REV_HANDLERS;
+                                    hdlr++) {
+                                       if (mddi_rev_pkt_handler[hdlr].
+                                           pkt_type ==
+                                           rev_pkt_ptr->packet_type) {
+                                               (*
+                                                (mddi_rev_pkt_handler[hdlr].
+                                                 handler)) (rev_pkt_ptr);
+                                       /* pmhctl->rev_state = MDDI_REV_IDLE; */
+                                               break;
+                                       }
+                               }
+                               if (hdlr >= MAX_MDDI_REV_HANDLERS)
+                                       MDDI_MSG_ERR("MDDI unknown rev pkt\n");
+                       }
+                       break;
+               }
+       }
+       if ((pmhctl->rev_ptr_curr + pmhctl->rev_pkt_size) >=
+           (pmhctl->rev_ptr_start + MDDI_REV_BUFFER_SIZE)) {
+               pmhctl->rev_ptr_written = FALSE;
+       }
+
+       if (pmhctl->rev_state == MDDI_REV_ENCAP_ISSUED) {
+               pmhctl->rev_state = MDDI_REV_IDLE;
+               if (mddi_rev_user.waiting) {
+                       mddi_rev_user.waiting = FALSE;
+                       complete(&(mddi_rev_user.done_comp));
+               } else if (pmhctl->llist_info.reg_read_idx == UNASSIGNED_INDEX) {
+                       MDDI_MSG_ERR
+                           ("Reverse Encap state, but no reg read in progress\n");
+               } else {
+                       if ((!mddi_reg_read_successful) &&
+                           (mddi_reg_read_retry < mddi_reg_read_retry_max) &&
+                           (mddi_enable_reg_read_retry)) {
+                               /*
+                                * There is a race condition that can happen
+                                * where the reverse encapsulation message is
+                                * sent out by the MDDI host before the register
+                                * read packet is sent. As a work-around for
+                                * that problem we issue the reverse
+                                * encapsulation one more time before giving up.
+                                */
+                               if (mddi_enable_reg_read_retry_once)
+                                       mddi_reg_read_retry =
+                                           mddi_reg_read_retry_max;
+                               pmhctl->rev_state = MDDI_REV_REG_READ_SENT;
+                               pmhctl->stats.reg_read_failure++;
+                       } else {
+                               uint16 reg_read_idx =
+                                   pmhctl->llist_info.reg_read_idx;
+
+                               mddi_reg_read_retry = 0;
+                               if (pmhctl->llist_notify[reg_read_idx].waiting) {
+                                       complete(&
+                                                (pmhctl->
+                                                 llist_notify[reg_read_idx].
+                                                 done_comp));
+                               }
+                               pmhctl->llist_info.reg_read_idx =
+                                   UNASSIGNED_INDEX;
+                               if (pmhctl->llist_notify[reg_read_idx].
+                                   done_cb != NULL) {
+                                       (*
+                                        (pmhctl->llist_notify[reg_read_idx].
+                                         done_cb)) ();
+                               }
+                               pmhctl->llist_notify[reg_read_idx].next_idx =
+                                   UNASSIGNED_INDEX;
+                               pmhctl->llist_notify[reg_read_idx].in_use =
+                                   FALSE;
+                               pmhctl->llist_notify[reg_read_idx].waiting =
+                                   FALSE;
+                               pmhctl->llist_notify[reg_read_idx].done_cb =
+                                   NULL;
+                               if (!mddi_reg_read_successful)
+                                       pmhctl->stats.reg_read_failure++;
+                       }
+               }
+       } else if (pmhctl->rev_state == MDDI_REV_CLIENT_CAP_ISSUED) {
+#if defined(CONFIG_FB_MSM_MDP31) || defined(CONFIG_FB_MSM_MDP40)
+               if (mddi_host_core_version == 0x28 ||
+                   mddi_host_core_version == 0x30) {
+                       mddi_host_reg_out(FIFO_ALLOC, 0x00);
+                       pmhctl->rev_ptr_written = TRUE;
+                       mddi_host_reg_out(REV_PTR,
+                               pmhctl->mddi_rev_ptr_write_val);
+                       pmhctl->rev_ptr_curr = pmhctl->rev_ptr_start;
+                       mddi_host_reg_out(CMD, 0xC00);
+               }
+#endif
+
+               if (mddi_rev_user.waiting) {
+                       mddi_rev_user.waiting = FALSE;
+                       complete(&(mddi_rev_user.done_comp));
+               }
+               pmhctl->rev_state = MDDI_REV_IDLE;
+       } else {
+               pmhctl->rev_state = MDDI_REV_IDLE;
+       }
+
+       /* pmhctl->rev_state = MDDI_REV_IDLE; */
+
+       /* Re-enable interrupt */
+       mddi_host_reg_outm(INTEN, MDDI_INT_REV_DATA_AVAIL,
+                          MDDI_INT_REV_DATA_AVAIL);
+
+}
+
+static void mddi_issue_reverse_encapsulation(void)
+{
+       mddi_host_type host_idx = mddi_curr_host;
+       mddi_host_cntl_type *pmhctl = &(mhctl[host_idx]);
+       /* Only issue a reverse encapsulation packet if:
+        * 1) another reverse is not in progress (MDDI_REV_IDLE).
+        * 2) a register read has been sent (MDDI_REV_REG_READ_SENT).
+        * 3) forward is not in progress, because of a hw bug in client that
+        *    causes forward crc errors on packet immediately after rev encap.
+        */
+       if (((pmhctl->rev_state == MDDI_REV_IDLE) ||
+            (pmhctl->rev_state == MDDI_REV_REG_READ_SENT)) &&
+           (pmhctl->llist_info.transmitting_start_idx == UNASSIGNED_INDEX) &&
+           (!mdp_in_processing)) {
+               uint32 mddi_command = MDDI_CMD_SEND_REV_ENCAP;
+
+               if ((pmhctl->rev_state == MDDI_REV_REG_READ_SENT) ||
+                   (mddi_rev_encap_user_request == TRUE)) {
+                       mddi_host_enable_io_clock();
+                       if (pmhctl->link_state == MDDI_LINK_HIBERNATING) {
+                               /* need to wake up link before issuing rev encap command */
+                               MDDI_MSG_DEBUG("wake up link!\n");
+                               pmhctl->link_state = MDDI_LINK_ACTIVATING;
+                               mddi_host_reg_out(CMD, MDDI_CMD_LINK_ACTIVE);
+                       } else {
+                               if (pmhctl->rtd_counter >= mddi_rtd_frequency) {
+                                       MDDI_MSG_DEBUG
+                                           ("mddi sending RTD command!\n");
+                                       mddi_host_reg_out(CMD,
+                                                         MDDI_CMD_SEND_RTD);
+                                       pmhctl->rtd_counter = 0;
+                                       pmhctl->log_parms.rtd_cnt++;
+                               }
+                               if (pmhctl->rev_state != MDDI_REV_REG_READ_SENT) {
+                                       /* this is generic reverse request by user, so
+                                        * reset the waiting flag. */
+                                       mddi_rev_encap_user_request = FALSE;
+                               }
+                               /* link is active so send reverse encap to get register read results */
+                               pmhctl->rev_state = MDDI_REV_ENCAP_ISSUED;
+                               mddi_command = MDDI_CMD_SEND_REV_ENCAP;
+                               MDDI_MSG_DEBUG("sending rev encap!\n");
+                       }
+               } else
+                   if ((pmhctl->client_status_cnt >=
+                        mddi_client_status_frequency)
+                       || mddi_client_capability_request) {
+                       mddi_host_enable_io_clock();
+                       if (pmhctl->link_state == MDDI_LINK_HIBERNATING) {
+                               /* only wake up the link if it client status is overdue */
+                               if ((pmhctl->client_status_cnt >=
+                                    (mddi_client_status_frequency * 2))
+                                   || mddi_client_capability_request) {
+                                       /* need to wake up link before issuing rev encap command */
+                                       MDDI_MSG_DEBUG("wake up link!\n");
+                                       pmhctl->link_state =
+                                           MDDI_LINK_ACTIVATING;
+                                       mddi_host_reg_out(CMD,
+                                                         MDDI_CMD_LINK_ACTIVE);
+                               }
+                       } else {
+                               if (pmhctl->rtd_counter >= mddi_rtd_frequency) {
+                                       MDDI_MSG_DEBUG
+                                           ("mddi sending RTD command!\n");
+                                       mddi_host_reg_out(CMD,
+                                                         MDDI_CMD_SEND_RTD);
+                                       pmhctl->rtd_counter = 0;
+                                       pmhctl->log_parms.rtd_cnt++;
+                               }
+                               /* periodically get client status */
+                               MDDI_MSG_DEBUG
+                                   ("mddi sending rev enc! (get status)\n");
+                               if (mddi_client_capability_request) {
+                                       pmhctl->rev_state =
+                                           MDDI_REV_CLIENT_CAP_ISSUED;
+                                       mddi_command = MDDI_CMD_GET_CLIENT_CAP;
+                                       mddi_client_capability_request = FALSE;
+                               } else {
+                                       pmhctl->rev_state =
+                                           MDDI_REV_STATUS_REQ_ISSUED;
+                                       pmhctl->client_status_cnt = 0;
+                                       mddi_command =
+                                           MDDI_CMD_GET_CLIENT_STATUS;
+                               }
+                       }
+               }
+               if ((pmhctl->rev_state == MDDI_REV_ENCAP_ISSUED) ||
+                   (pmhctl->rev_state == MDDI_REV_STATUS_REQ_ISSUED) ||
+                   (pmhctl->rev_state == MDDI_REV_CLIENT_CAP_ISSUED)) {
+                       pmhctl->int_type.rev_encap_count++;
+#if defined(T_MSM6280) && !defined(T_MSM7200)
+                       mddi_rev_pointer_written = TRUE;
+                       mddi_host_reg_out(REV_PTR, mddi_rev_ptr_write_val);
+                       mddi_rev_ptr_curr = mddi_rev_ptr_start;
+                       /* force new rev ptr command */
+                       mddi_host_reg_out(CMD, 0xC00);
+#else
+                       if (!pmhctl->rev_ptr_written) {
+                               MDDI_MSG_DEBUG("writing reverse pointer!\n");
+                               pmhctl->rev_ptr_written = TRUE;
+#if defined(CONFIG_FB_MSM_MDP31) || defined(CONFIG_FB_MSM_MDP40)
+                               if ((pmhctl->rev_state ==
+                                    MDDI_REV_CLIENT_CAP_ISSUED) &&
+                                   (mddi_host_core_version == 0x28 ||
+                                    mddi_host_core_version == 0x30)) {
+                                       pmhctl->rev_ptr_written = FALSE;
+                                       mddi_host_reg_out(FIFO_ALLOC, 0x02);
+                               } else
+                                       mddi_host_reg_out(REV_PTR,
+                                                 pmhctl->
+                                                 mddi_rev_ptr_write_val);
+#else
+                               mddi_host_reg_out(REV_PTR,
+                                                 pmhctl->
+                                                 mddi_rev_ptr_write_val);
+#endif
+                       }
+#endif
+                       if (mddi_debug_clear_rev_data) {
+                               uint16 i;
+                               for (i = 0; i < MDDI_MAX_REV_DATA_SIZE / 4; i++)
+                                       pmhctl->rev_data_buf[i] = 0xdddddddd;
+                               /* clean cache */
+                               mddi_flush_cache_lines(pmhctl->rev_data_buf,
+                                                      MDDI_MAX_REV_DATA_SIZE);
+                       }
+
+                       /* send reverse encapsulation to get needed data */
+                       mddi_host_reg_out(CMD, mddi_command);
+               }
+       }
+
+}
+
+static void mddi_process_client_initiated_wakeup(void)
+{
+       mddi_host_type host_idx = mddi_curr_host;
+       mddi_host_cntl_type *pmhctl = &(mhctl[host_idx]);
+
+       /* Disable MDDI_INT Interrupt, we detect client initiated wakeup one
+        * time for each entry into hibernation */
+       mddi_host_reg_outm(INTEN, MDDI_INT_MDDI_IN, 0);
+
+       if (host_idx == MDDI_HOST_PRIM) {
+               if (mddi_vsync_detect_enabled) {
+                       mddi_host_enable_io_clock();
+#ifndef MDDI_HOST_DISP_LISTEN
+                       /* issue command to bring up link */
+                       /* need to do this to clear the vsync condition */
+                       if (pmhctl->link_state == MDDI_LINK_HIBERNATING) {
+                               pmhctl->link_state = MDDI_LINK_ACTIVATING;
+                               mddi_host_reg_out(CMD, MDDI_CMD_LINK_ACTIVE);
+                       }
+#endif
+                       /*
+                        * Indicate to client specific code that vsync was
+                        * enabled, and we did not detect a client initiated
+                        * wakeup. The client specific handler can clear the
+                        * condition if necessary to prevent subsequent
+                        * client initiated wakeups.
+                        */
+                       mddi_client_lcd_vsync_detected(TRUE);
+                       pmhctl->log_parms.vsync_response_cnt++;
+                       MDDI_MSG_NOTICE("MDDI_INT_IN condition\n");
+
+               }
+       }
+
+       if (mddi_gpio.polling_enabled) {
+               mddi_host_enable_io_clock();
+               /* check interrupt status now */
+               (void)mddi_queue_register_read_int(mddi_gpio.polling_reg,
+                                                  &mddi_gpio.polling_val);
+       }
+}
+#endif /* FEATURE_MDDI_DISABLE_REVERSE */
+
+static void mddi_host_isr(void)
+{
+       uint32 int_reg, int_en;
+#ifndef FEATURE_MDDI_DISABLE_REVERSE
+       uint32 status_reg;
+#endif
+       mddi_host_type host_idx = mddi_curr_host;
+       mddi_host_cntl_type *pmhctl = &(mhctl[host_idx]);
+
+       if (!MDDI_HOST_IS_HCLK_ON) {
+               MDDI_HOST_ENABLE_HCLK;
+               MDDI_MSG_DEBUG("HCLK disabled, but isr is firing\n");
+       }
+       int_reg = mddi_host_reg_in(INT);
+       int_en = mddi_host_reg_in(INTEN);
+       pmhctl->saved_int_reg = int_reg;
+       pmhctl->saved_int_en = int_en;
+       int_reg = int_reg & int_en;
+       pmhctl->int_type.count++;
+
+
+#ifndef FEATURE_MDDI_DISABLE_REVERSE
+       status_reg = mddi_host_reg_in(STAT);
+
+       if ((int_reg & MDDI_INT_MDDI_IN) ||
+           ((int_en & MDDI_INT_MDDI_IN) &&
+            ((int_reg == 0) || (status_reg & MDDI_STAT_CLIENT_WAKEUP_REQ)))) {
+               /*
+                * The MDDI_IN condition will clear itself, and so it is
+                * possible that MDDI_IN was the reason for the isr firing,
+                * even though the interrupt register does not have the
+                * MDDI_IN bit set. To check if this was the case we need to
+                * look at the status register bit that signifies a client
+                * initiated wakeup. If the status register bit is set, as well
+                * as the MDDI_IN interrupt enabled, then we treat this as a
+                * client initiated wakeup.
+                */
+               if (int_reg & MDDI_INT_MDDI_IN)
+                       pmhctl->int_type.in_count++;
+               mddi_process_client_initiated_wakeup();
+       }
+#endif
+
+       if (int_reg & MDDI_INT_LINK_STATE_CHANGES) {
+               pmhctl->int_type.state_change_count++;
+               mddi_report_state_change(int_reg);
+       }
+
+       if (int_reg & MDDI_INT_PRI_LINK_LIST_DONE) {
+               pmhctl->int_type.ll_done_count++;
+               mddi_process_link_list_done();
+       }
+#ifndef FEATURE_MDDI_DISABLE_REVERSE
+       if (int_reg & MDDI_INT_REV_DATA_AVAIL) {
+               pmhctl->int_type.rev_avail_count++;
+               mddi_process_rev_packets();
+       }
+#endif
+
+       if (int_reg & MDDI_INT_ERROR_CONDITIONS) {
+               pmhctl->int_type.error_count++;
+               mddi_report_errors(int_reg);
+
+               mddi_host_reg_out(INT, int_reg & MDDI_INT_ERROR_CONDITIONS);
+       }
+#ifndef FEATURE_MDDI_DISABLE_REVERSE
+       mddi_issue_reverse_encapsulation();
+
+       if ((pmhctl->rev_state != MDDI_REV_ENCAP_ISSUED) &&
+           (pmhctl->rev_state != MDDI_REV_STATUS_REQ_ISSUED))
+#endif
+               /* don't want simultaneous reverse and forward with Eagle */
+               mddi_queue_forward_linked_list();
+
+       if (int_reg & MDDI_INT_NO_CMD_PKTS_PEND) {
+               /* this interrupt is used to kick the isr when hibernation is disabled */
+               mddi_host_reg_outm(INTEN, MDDI_INT_NO_CMD_PKTS_PEND, 0);
+       }
+
+       if ((!mddi_host_mdp_active_flag) &&
+           (!mddi_vsync_detect_enabled) &&
+           (pmhctl->llist_info.transmitting_start_idx == UNASSIGNED_INDEX) &&
+           (pmhctl->llist_info.waiting_start_idx == UNASSIGNED_INDEX) &&
+           (pmhctl->rev_state == MDDI_REV_IDLE)) {
+               if (pmhctl->link_state == MDDI_LINK_HIBERNATING) {
+                       mddi_host_disable_io_clock();
+                       mddi_host_disable_hclk();
+               }
+#ifdef FEATURE_MDDI_HOST_ENABLE_EARLY_HIBERNATION
+               else if ((pmhctl->link_state == MDDI_LINK_ACTIVE) &&
+                        (!pmhctl->disable_hibernation)) {
+                       mddi_host_reg_out(CMD, MDDI_CMD_POWERDOWN);
+               }
+#endif
+       }
+}
+
+static void mddi_host_isr_primary(void)
+{
+       mddi_curr_host = MDDI_HOST_PRIM;
+       mddi_host_isr();
+}
+
+irqreturn_t mddi_pmdh_isr_proxy(int irq, void *ptr)
+{
+       mddi_host_isr_primary();
+       return IRQ_HANDLED;
+}
+
+static void mddi_host_isr_external(void)
+{
+       mddi_curr_host = MDDI_HOST_EXT;
+       mddi_host_isr();
+       mddi_curr_host = MDDI_HOST_PRIM;
+}
+
+irqreturn_t mddi_emdh_isr_proxy(int irq, void *ptr)
+{
+       mddi_host_isr_external();
+       return IRQ_HANDLED;
+}
+
+static void mddi_host_initialize_registers(mddi_host_type host_idx)
+{
+       uint32 pad_reg_val;
+       mddi_host_cntl_type *pmhctl = &(mhctl[host_idx]);
+
+       if (pmhctl->driver_state == MDDI_DRIVER_ENABLED)
+               return;
+
+       /* turn on HCLK to MDDI host core */
+       mddi_host_enable_hclk();
+
+       /* MDDI Reset command */
+       mddi_host_reg_out(CMD, MDDI_CMD_RESET);
+
+       /* Version register (= 0x01) */
+       mddi_host_reg_out(VERSION, 0x0001);
+
+       /* Bytes per subframe register */
+       mddi_host_reg_out(BPS, MDDI_HOST_BYTES_PER_SUBFRAME);
+
+       /* Subframes per media frames register (= 0x03) */
+       mddi_host_reg_out(SPM, 0x0003);
+
+       /* Turn Around 1 register (= 0x05) */
+       mddi_host_reg_out(TA1_LEN, 0x0005);
+
+       /* Turn Around 2 register (= 0x0C) */
+       mddi_host_reg_out(TA2_LEN, MDDI_HOST_TA2_LEN);
+
+       /* Drive hi register (= 0x96) */
+       mddi_host_reg_out(DRIVE_HI, 0x0096);
+
+       /* Drive lo register (= 0x32) */
+       mddi_host_reg_out(DRIVE_LO, 0x0032);
+
+       /* Display wakeup count register (= 0x3c) */
+       mddi_host_reg_out(DISP_WAKE, 0x003c);
+
+       /* Reverse Rate Divisor register (= 0x2) */
+       mddi_host_reg_out(REV_RATE_DIV, MDDI_HOST_REV_RATE_DIV);
+
+#ifndef FEATURE_MDDI_DISABLE_REVERSE
+       /* Reverse Pointer Size */
+       mddi_host_reg_out(REV_SIZE, MDDI_REV_BUFFER_SIZE);
+
+       /* Rev Encap Size */
+       mddi_host_reg_out(REV_ENCAP_SZ, pmhctl->rev_pkt_size);
+#endif
+
+       /* Periodic Rev Encap */
+       /* don't send periodically */
+       mddi_host_reg_out(CMD, MDDI_CMD_PERIODIC_REV_ENCAP);
+
+       pad_reg_val = mddi_host_reg_in(PAD_CTL);
+       if (pad_reg_val == 0) {
+               /* If we are turning on band gap, need to wait 5us before turning
+                * on the rest of the PAD */
+               mddi_host_reg_out(PAD_CTL, 0x08000);
+               udelay(5);
+       }
+#ifdef T_MSM7200
+       /* Recommendation from PAD hw team */
+       mddi_host_reg_out(PAD_CTL, 0xa850a);
+#else
+       /* Recommendation from PAD hw team */
+       mddi_host_reg_out(PAD_CTL, 0xa850f);
+#endif
+
+#if defined(CONFIG_FB_MSM_MDP31) || defined(CONFIG_FB_MSM_MDP40)
+       mddi_host_reg_out(PAD_IO_CTL, 0x00320000);
+       mddi_host_reg_out(PAD_CAL, 0x00220020);
+#endif
+
+       mddi_host_core_version = mddi_host_reg_inm(CORE_VER, 0xffff);
+
+#ifndef FEATURE_MDDI_DISABLE_REVERSE
+       if (mddi_host_core_version >= 8)
+               mddi_rev_ptr_workaround = FALSE;
+       pmhctl->rev_ptr_curr = pmhctl->rev_ptr_start;
+#endif
+
+       if ((mddi_host_core_version > 8) && (mddi_host_core_version < 0x19))
+               mddi_host_reg_out(TEST, 0x2);
+
+       /* Need an even number for counts */
+       mddi_host_reg_out(DRIVER_START_CNT, 0x60006);
+
+#ifndef T_MSM7500
+       /* Setup defaults for MDP related register */
+       mddi_host_reg_out(MDP_VID_FMT_DES, 0x5666);
+       mddi_host_reg_out(MDP_VID_PIX_ATTR, 0x00C3);
+       mddi_host_reg_out(MDP_VID_CLIENTID, 0);
+#endif
+
+       /* automatically hibernate after 1 empty subframe */
+       if (pmhctl->disable_hibernation)
+               mddi_host_reg_out(CMD, MDDI_CMD_HIBERNATE);
+       else
+               mddi_host_reg_out(CMD, MDDI_CMD_HIBERNATE | 1);
+
+       /* Bring up link if display (client) requests it */
+#ifdef MDDI_HOST_DISP_LISTEN
+       mddi_host_reg_out(CMD, MDDI_CMD_DISP_LISTEN);
+#else
+       mddi_host_reg_out(CMD, MDDI_CMD_DISP_IGNORE);
+#endif
+
+}
+
+void mddi_host_configure_interrupts(mddi_host_type host_idx, boolean enable)
+{
+       unsigned long flags;
+       mddi_host_cntl_type *pmhctl = &(mhctl[host_idx]);
+
+       spin_lock_irqsave(&mddi_host_spin_lock, flags);
+
+       /* turn on HCLK to MDDI host core if it has been disabled */
+       mddi_host_enable_hclk();
+       /* Clear MDDI Interrupt enable reg */
+       mddi_host_reg_out(INTEN, 0);
+
+       spin_unlock_irqrestore(&mddi_host_spin_lock, flags);
+
+       if (enable) {
+               pmhctl->driver_state = MDDI_DRIVER_ENABLED;
+
+               if (host_idx == MDDI_HOST_PRIM) {
+                       if (request_irq
+                           (INT_MDDI_PRI, mddi_pmdh_isr_proxy, IRQF_DISABLED,
+                            "PMDH", 0) != 0)
+                               printk(KERN_ERR
+                                      "a mddi: unable to request_irq\n");
+                       else
+                               int_mddi_pri_flag = TRUE;
+               } else {
+                       if (request_irq
+                           (INT_MDDI_EXT, mddi_emdh_isr_proxy, IRQF_DISABLED,
+                            "EMDH", 0) != 0)
+                               printk(KERN_ERR
+                                      "b mddi: unable to request_irq\n");
+                       else
+                               int_mddi_ext_flag = TRUE;
+               }
+
+               /* Set MDDI Interrupt enable reg -- Enable Reverse data avail */
+#ifdef FEATURE_MDDI_DISABLE_REVERSE
+               mddi_host_reg_out(INTEN,
+                                 MDDI_INT_ERROR_CONDITIONS |
+                                 MDDI_INT_LINK_STATE_CHANGES);
+#else
+               /* Reverse Pointer register */
+               pmhctl->rev_ptr_written = FALSE;
+
+               mddi_host_reg_out(INTEN,
+                                 MDDI_INT_REV_DATA_AVAIL |
+                                 MDDI_INT_ERROR_CONDITIONS |
+                                 MDDI_INT_LINK_STATE_CHANGES);
+               pmhctl->rtd_counter = mddi_rtd_frequency;
+               pmhctl->client_status_cnt = 0;
+#endif
+       } else {
+               if (pmhctl->driver_state == MDDI_DRIVER_ENABLED)
+                       pmhctl->driver_state = MDDI_DRIVER_DISABLED;
+       }
+
+}
+
+static void mddi_host_powerup(mddi_host_type host_idx)
+{
+       mddi_host_cntl_type *pmhctl = &(mhctl[host_idx]);
+
+       if (pmhctl->link_state != MDDI_LINK_DISABLED)
+               return;
+
+       /* enable IO_CLK and hclk to MDDI host core */
+       mddi_host_enable_io_clock();
+
+       mddi_host_initialize_registers(host_idx);
+       mddi_host_configure_interrupts(host_idx, TRUE);
+
+       pmhctl->link_state = MDDI_LINK_ACTIVATING;
+
+       /* Link activate command */
+       mddi_host_reg_out(CMD, MDDI_CMD_LINK_ACTIVE);
+
+#ifdef CLKRGM_MDDI_IO_CLOCK_IN_MHZ
+       MDDI_MSG_NOTICE("MDDI Host: Activating Link %d Mbps\n",
+                       CLKRGM_MDDI_IO_CLOCK_IN_MHZ * 2);
+#else
+       MDDI_MSG_NOTICE("MDDI Host: Activating Link\n");
+#endif
+
+       /* Initialize the timer */
+       if (host_idx == MDDI_HOST_PRIM)
+               mddi_host_timer_service(0);
+}
+
+void mddi_host_init(mddi_host_type host_idx)
+/* Write out the MDDI configuration registers */
+{
+       static boolean initialized = FALSE;
+       mddi_host_cntl_type *pmhctl;
+
+       if (host_idx >= MDDI_NUM_HOST_CORES) {
+               MDDI_MSG_ERR("Invalid host core index\n");
+               return;
+       }
+
+       if (!initialized) {
+               uint16 idx;
+               mddi_host_type host;
+               for (host = MDDI_HOST_PRIM; host < MDDI_NUM_HOST_CORES; host++) {
+                       pmhctl = &(mhctl[host]);
+                       initialized = TRUE;
+
+                       pmhctl->llist_ptr =
+                           dma_alloc_coherent(NULL, MDDI_LLIST_POOL_SIZE,
+                                              &(pmhctl->llist_dma_addr),
+                                              GFP_KERNEL);
+                       pmhctl->llist_dma_ptr =
+                           (mddi_linked_list_type *) (void *)pmhctl->
+                           llist_dma_addr;
+#ifdef FEATURE_MDDI_DISABLE_REVERSE
+                       pmhctl->rev_data_buf = NULL;
+                       if (pmhctl->llist_ptr == NULL)
+#else
+                       mddi_rev_user.waiting = FALSE;
+                       init_completion(&(mddi_rev_user.done_comp));
+                       pmhctl->rev_data_buf =
+                           dma_alloc_coherent(NULL, MDDI_MAX_REV_DATA_SIZE,
+                                              &(pmhctl->rev_data_dma_addr),
+                                              GFP_KERNEL);
+                       if ((pmhctl->llist_ptr == NULL)
+                           || (pmhctl->rev_data_buf == NULL))
+#endif
+                       {
+                               MDDI_MSG_CRIT
+                                   ("unable to alloc non-cached memory\n");
+                       }
+                       llist_extern[host] = pmhctl->llist_ptr;
+                       llist_dma_extern[host] = pmhctl->llist_dma_ptr;
+                       llist_extern_notify[host] = pmhctl->llist_notify;
+
+                       for (idx = 0; idx < UNASSIGNED_INDEX; idx++) {
+                               init_completion(&
+                                               (pmhctl->llist_notify[idx].
+                                                done_comp));
+                       }
+                       init_completion(&(pmhctl->mddi_llist_avail_comp));
+                       spin_lock_init(&mddi_host_spin_lock);
+                       pmhctl->mddi_waiting_for_llist_avail = FALSE;
+                       pmhctl->mddi_rev_ptr_write_val =
+                           (uint32) (void *)(pmhctl->rev_data_dma_addr);
+                       pmhctl->rev_ptr_start = (void *)pmhctl->rev_data_buf;
+
+                       pmhctl->rev_pkt_size = MDDI_DEFAULT_REV_PKT_SIZE;
+                       pmhctl->rev_state = MDDI_REV_IDLE;
+#ifdef IMAGE_MODEM_PROC
+                       /* assume hibernation state is last state from APPS proc, so that
+                        * we don't reinitialize the host core */
+                       pmhctl->link_state = MDDI_LINK_HIBERNATING;
+#else
+                       pmhctl->link_state = MDDI_LINK_DISABLED;
+#endif
+                       pmhctl->driver_state = MDDI_DRIVER_DISABLED;
+                       pmhctl->disable_hibernation = FALSE;
+
+                       /* initialize llist variables */
+                       pmhctl->llist_info.transmitting_start_idx =
+                           UNASSIGNED_INDEX;
+                       pmhctl->llist_info.transmitting_end_idx =
+                           UNASSIGNED_INDEX;
+                       pmhctl->llist_info.waiting_start_idx = UNASSIGNED_INDEX;
+                       pmhctl->llist_info.waiting_end_idx = UNASSIGNED_INDEX;
+                       pmhctl->llist_info.reg_read_idx = UNASSIGNED_INDEX;
+                       pmhctl->llist_info.next_free_idx =
+                           MDDI_FIRST_DYNAMIC_LLIST_IDX;
+                       pmhctl->llist_info.reg_read_waiting = FALSE;
+
+                       mddi_vsync_detect_enabled = FALSE;
+                       mddi_gpio.polling_enabled = FALSE;
+
+                       pmhctl->int_type.count = 0;
+                       pmhctl->int_type.in_count = 0;
+                       pmhctl->int_type.disp_req_count = 0;
+                       pmhctl->int_type.state_change_count = 0;
+                       pmhctl->int_type.ll_done_count = 0;
+                       pmhctl->int_type.rev_avail_count = 0;
+                       pmhctl->int_type.error_count = 0;
+                       pmhctl->int_type.rev_encap_count = 0;
+                       pmhctl->int_type.llist_ptr_write_1 = 0;
+                       pmhctl->int_type.llist_ptr_write_2 = 0;
+
+                       pmhctl->stats.fwd_crc_count = 0;
+                       pmhctl->stats.rev_crc_count = 0;
+                       pmhctl->stats.pri_underflow = 0;
+                       pmhctl->stats.sec_underflow = 0;
+                       pmhctl->stats.rev_overflow = 0;
+                       pmhctl->stats.pri_overwrite = 0;
+                       pmhctl->stats.sec_overwrite = 0;
+                       pmhctl->stats.rev_overwrite = 0;
+                       pmhctl->stats.dma_failure = 0;
+                       pmhctl->stats.rtd_failure = 0;
+                       pmhctl->stats.reg_read_failure = 0;
+#ifdef FEATURE_MDDI_UNDERRUN_RECOVERY
+                       pmhctl->stats.pri_underrun_detected = 0;
+#endif
+
+                       pmhctl->log_parms.rtd_cnt = 0;
+                       pmhctl->log_parms.rev_enc_cnt = 0;
+                       pmhctl->log_parms.vid_cnt = 0;
+                       pmhctl->log_parms.reg_acc_cnt = 0;
+                       pmhctl->log_parms.cli_stat_cnt = 0;
+                       pmhctl->log_parms.cli_cap_cnt = 0;
+                       pmhctl->log_parms.reg_read_cnt = 0;
+                       pmhctl->log_parms.link_active_cnt = 0;
+                       pmhctl->log_parms.link_hibernate_cnt = 0;
+                       pmhctl->log_parms.fwd_crc_cnt = 0;
+                       pmhctl->log_parms.rev_crc_cnt = 0;
+                       pmhctl->log_parms.vsync_response_cnt = 0;
+
+                       prev_parms[host_idx] = pmhctl->log_parms;
+                       mddi_client_capability_pkt.packet_length = 0;
+               }
+
+#ifndef T_MSM7500
+               /* tell clock driver we are user of this PLL */
+               MDDI_HOST_ENABLE_IO_CLOCK;
+#endif
+       }
+
+       mddi_host_powerup(host_idx);
+       pmhctl = &(mhctl[host_idx]);
+}
+
+#ifdef CONFIG_FB_MSM_MDDI_AUTO_DETECT
+static uint32 mddi_client_id;
+
+uint32 mddi_get_client_id(void)
+{
+
+#ifndef FEATURE_MDDI_DISABLE_REVERSE
+       mddi_host_type host_idx = MDDI_HOST_PRIM;
+       static boolean client_detection_try = FALSE;
+       mddi_host_cntl_type *pmhctl;
+       unsigned long flags;
+       uint16 saved_rev_pkt_size;
+
+       if (!client_detection_try) {
+               /* Toshiba display requires larger drive_lo value */
+               mddi_host_reg_out(DRIVE_LO, 0x0050);
+
+               pmhctl = &(mhctl[MDDI_HOST_PRIM]);
+
+               saved_rev_pkt_size = pmhctl->rev_pkt_size;
+
+               /* Increase Rev Encap Size */
+               pmhctl->rev_pkt_size = MDDI_CLIENT_CAPABILITY_REV_PKT_SIZE;
+               mddi_host_reg_out(REV_ENCAP_SZ, pmhctl->rev_pkt_size);
+
+               /* disable hibernation temporarily */
+               if (!pmhctl->disable_hibernation)
+                       mddi_host_reg_out(CMD, MDDI_CMD_HIBERNATE);
+
+               mddi_rev_user.waiting = TRUE;
+               INIT_COMPLETION(mddi_rev_user.done_comp);
+
+               spin_lock_irqsave(&mddi_host_spin_lock, flags);
+
+               /* turn on clock(s), if they have been disabled */
+               mddi_host_enable_hclk();
+               mddi_host_enable_io_clock();
+
+               mddi_client_capability_request = TRUE;
+
+               if (pmhctl->rev_state == MDDI_REV_IDLE) {
+                       /* attempt to send the reverse encapsulation now */
+                       mddi_issue_reverse_encapsulation();
+               }
+               spin_unlock_irqrestore(&mddi_host_spin_lock, flags);
+
+               wait_for_completion_killable(&(mddi_rev_user.done_comp));
+
+               /* Set Rev Encap Size back to its original value */
+               pmhctl->rev_pkt_size = saved_rev_pkt_size;
+               mddi_host_reg_out(REV_ENCAP_SZ, pmhctl->rev_pkt_size);
+
+               /* reenable auto-hibernate */
+               if (!pmhctl->disable_hibernation)
+                       mddi_host_reg_out(CMD, MDDI_CMD_HIBERNATE | 1);
+
+               mddi_host_reg_out(DRIVE_LO, 0x0032);
+               client_detection_try = TRUE;
+
+               mddi_client_id = (mddi_client_capability_pkt.Mfr_Name<<16) |
+                               mddi_client_capability_pkt.Product_Code;
+
+               if (!mddi_client_id)
+                       mddi_disable(1);
+       }
+
+#if 0
+       switch (mddi_client_capability_pkt.Mfr_Name) {
+       case 0x4474:
+               if ((mddi_client_capability_pkt.Product_Code != 0x8960) &&
+                   (target == DISPLAY_1)) {
+                       ret = PRISM_WVGA;
+               }
+               break;
+
+       case 0xD263:
+               if (target == DISPLAY_1)
+                       ret = TOSHIBA_VGA_PRIM;
+               else if (target == DISPLAY_2)
+                       ret = TOSHIBA_QCIF_SECD;
+               break;
+
+       case 0:
+               if (mddi_client_capability_pkt.Product_Code == 0x8835) {
+                       if (target == DISPLAY_1)
+                               ret = SHARP_QVGA_PRIM;
+                       else if (target == DISPLAY_2)
+                               ret = SHARP_128x128_SECD;
+               }
+               break;
+
+       default:
+               break;
+       }
+
+       if ((!client_detection_try) && (ret != TOSHIBA_VGA_PRIM)
+           && (ret != TOSHIBA_QCIF_SECD)) {
+               /* Not a Toshiba display, so change drive_lo back to default value */
+               mddi_host_reg_out(DRIVE_LO, 0x0032);
+       }
+#endif
+
+#endif
+
+       return mddi_client_id;
+}
+#endif
+
+void mddi_host_powerdown(mddi_host_type host_idx)
+{
+       mddi_host_cntl_type *pmhctl = &(mhctl[host_idx]);
+
+       if (host_idx >= MDDI_NUM_HOST_CORES) {
+               MDDI_MSG_ERR("Invalid host core index\n");
+               return;
+       }
+
+       if (pmhctl->driver_state == MDDI_DRIVER_RESET) {
+               return;
+       }
+
+       if (host_idx == MDDI_HOST_PRIM) {
+               /* disable timer */
+               del_timer(&mddi_host_timer);
+       }
+
+       mddi_host_configure_interrupts(host_idx, FALSE);
+
+       /* turn on HCLK to MDDI host core if it has been disabled */
+       mddi_host_enable_hclk();
+
+       /* MDDI Reset command */
+       mddi_host_reg_out(CMD, MDDI_CMD_RESET);
+
+       /* Pad Control Register */
+       mddi_host_reg_out(PAD_CTL, 0x0);
+
+       /* disable IO_CLK and hclk to MDDI host core */
+       mddi_host_disable_io_clock();
+       mddi_host_disable_hclk();
+
+       pmhctl->link_state = MDDI_LINK_DISABLED;
+       pmhctl->driver_state = MDDI_DRIVER_RESET;
+
+       MDDI_MSG_NOTICE("MDDI Host: Disabling Link\n");
+
+}
+
+uint16 mddi_get_next_free_llist_item(mddi_host_type host_idx, boolean wait)
+{
+       unsigned long flags;
+       uint16 ret_idx;
+       boolean forced_wait = FALSE;
+       mddi_host_cntl_type *pmhctl = &(mhctl[host_idx]);
+
+       ret_idx = pmhctl->llist_info.next_free_idx;
+
+       pmhctl->llist_info.next_free_idx++;
+       if (pmhctl->llist_info.next_free_idx >= MDDI_NUM_DYNAMIC_LLIST_ITEMS)
+               pmhctl->llist_info.next_free_idx = MDDI_FIRST_DYNAMIC_LLIST_IDX;
+       spin_lock_irqsave(&mddi_host_spin_lock, flags);
+       if (pmhctl->llist_notify[ret_idx].in_use) {
+               if (!wait) {
+                       pmhctl->llist_info.next_free_idx = ret_idx;
+                       ret_idx = UNASSIGNED_INDEX;
+               } else {
+                       forced_wait = TRUE;
+                       INIT_COMPLETION(pmhctl->mddi_llist_avail_comp);
+               }
+       }
+       spin_unlock_irqrestore(&mddi_host_spin_lock, flags);
+
+       if (forced_wait) {
+               wait_for_completion_killable(&
+                                                 (pmhctl->
+                                                  mddi_llist_avail_comp));
+               MDDI_MSG_ERR("task waiting on mddi llist item\n");
+       }
+
+       if (ret_idx != UNASSIGNED_INDEX) {
+               pmhctl->llist_notify[ret_idx].waiting = FALSE;
+               pmhctl->llist_notify[ret_idx].done_cb = NULL;
+               pmhctl->llist_notify[ret_idx].in_use = TRUE;
+               pmhctl->llist_notify[ret_idx].next_idx = UNASSIGNED_INDEX;
+       }
+
+       return ret_idx;
+}
+
+uint16 mddi_get_reg_read_llist_item(mddi_host_type host_idx, boolean wait)
+{
+#ifdef FEATURE_MDDI_DISABLE_REVERSE
+       MDDI_MSG_CRIT("No reverse link available\n");
+       (void)wait;
+       return FALSE;
+#else
+       unsigned long flags;
+       uint16 ret_idx;
+       boolean error = FALSE;
+       mddi_host_cntl_type *pmhctl = &(mhctl[host_idx]);
+
+       spin_lock_irqsave(&mddi_host_spin_lock, flags);
+       if (pmhctl->llist_info.reg_read_idx != UNASSIGNED_INDEX) {
+               /* need to block here or is this an error condition? */
+               error = TRUE;
+               ret_idx = UNASSIGNED_INDEX;
+       }
+       spin_unlock_irqrestore(&mddi_host_spin_lock, flags);
+
+       if (!error) {
+               ret_idx = pmhctl->llist_info.reg_read_idx =
+                   mddi_get_next_free_llist_item(host_idx, wait);
+               /* clear the reg_read_waiting flag */
+               pmhctl->llist_info.reg_read_waiting = FALSE;
+       }
+
+       if (error)
+               MDDI_MSG_ERR("***** Reg read still in progress! ****\n");
+       return ret_idx;
+#endif
+
+}
+
+void mddi_queue_forward_packets(uint16 first_llist_idx,
+                               uint16 last_llist_idx,
+                               boolean wait,
+                               mddi_llist_done_cb_type llist_done_cb,
+                               mddi_host_type host_idx)
+{
+       unsigned long flags;
+       mddi_linked_list_type *llist;
+       mddi_linked_list_type *llist_dma;
+       mddi_host_cntl_type *pmhctl = &(mhctl[host_idx]);
+
+       if ((first_llist_idx >= UNASSIGNED_INDEX) ||
+           (last_llist_idx >= UNASSIGNED_INDEX)) {
+               MDDI_MSG_ERR("MDDI queueing invalid linked list\n");
+               return;
+       }
+
+       if (pmhctl->link_state == MDDI_LINK_DISABLED)
+               MDDI_MSG_CRIT("MDDI host powered down!\n");
+
+       llist = pmhctl->llist_ptr;
+       llist_dma = pmhctl->llist_dma_ptr;
+
+       /* clean cache so MDDI host can read data */
+       memory_barrier();
+
+       pmhctl->llist_notify[last_llist_idx].waiting = wait;
+       if (wait)
+               INIT_COMPLETION(pmhctl->llist_notify[last_llist_idx].done_comp);
+       pmhctl->llist_notify[last_llist_idx].done_cb = llist_done_cb;
+
+       spin_lock_irqsave(&mddi_host_spin_lock, flags);
+
+       if ((pmhctl->llist_info.transmitting_start_idx == UNASSIGNED_INDEX) &&
+           (pmhctl->llist_info.waiting_start_idx == UNASSIGNED_INDEX) &&
+           (pmhctl->rev_state == MDDI_REV_IDLE)) {
+               /* no packets are currently transmitting */
+#ifndef FEATURE_MDDI_DISABLE_REVERSE
+               if (first_llist_idx == pmhctl->llist_info.reg_read_idx) {
+                       /* This is the special case where the packet is a register read. */
+                       pmhctl->rev_state = MDDI_REV_REG_READ_ISSUED;
+                       mddi_reg_read_retry = 0;
+                       /* mddi_rev_reg_read_attempt = 1; */
+               }
+#endif
+               /* assign transmitting index values */
+               pmhctl->llist_info.transmitting_start_idx = first_llist_idx;
+               pmhctl->llist_info.transmitting_end_idx = last_llist_idx;
+
+               /* turn on clock(s), if they have been disabled */
+               mddi_host_enable_hclk();
+               mddi_host_enable_io_clock();
+               pmhctl->int_type.llist_ptr_write_1++;
+               /* Write to primary pointer register */
+               dma_coherent_pre_ops();
+               mddi_host_reg_out(PRI_PTR, &llist_dma[first_llist_idx]);
+
+               /* enable interrupt when complete */
+               mddi_host_reg_outm(INTEN, MDDI_INT_PRI_LINK_LIST_DONE,
+                                  MDDI_INT_PRI_LINK_LIST_DONE);
+
+       } else if (pmhctl->llist_info.waiting_start_idx == UNASSIGNED_INDEX) {
+#ifndef FEATURE_MDDI_DISABLE_REVERSE
+               if (first_llist_idx == pmhctl->llist_info.reg_read_idx) {
+                       /*
+                        * we have a register read to send but need to wait
+                        * for current reverse activity to end or there are
+                        * packets currently transmitting
+                        */
+                       /* mddi_rev_reg_read_attempt = 0; */
+                       pmhctl->llist_info.reg_read_waiting = TRUE;
+               }
+#endif
+
+               /* assign waiting index values */
+               pmhctl->llist_info.waiting_start_idx = first_llist_idx;
+               pmhctl->llist_info.waiting_end_idx = last_llist_idx;
+       } else {
+               uint16 prev_end_idx = pmhctl->llist_info.waiting_end_idx;
+#ifndef FEATURE_MDDI_DISABLE_REVERSE
+               if (first_llist_idx == pmhctl->llist_info.reg_read_idx) {
+                       /*
+                        * we have a register read to send but need to wait
+                        * for current reverse activity to end or there are
+                        * packets currently transmitting
+                        */
+                       /* mddi_rev_reg_read_attempt = 0; */
+                       pmhctl->llist_info.reg_read_waiting = TRUE;
+               }
+#endif
+
+               llist = pmhctl->llist_ptr;
+
+               /* clear end flag in previous last packet */
+               llist[prev_end_idx].link_controller_flags = 0;
+               pmhctl->llist_notify[prev_end_idx].next_idx = first_llist_idx;
+
+               /* set the next_packet_pointer of the previous last packet */
+               llist[prev_end_idx].next_packet_pointer =
+                   (void *)(&llist_dma[first_llist_idx]);
+
+               /* clean cache so MDDI host can read data */
+               memory_barrier();
+
+               /* assign new waiting last index value */
+               pmhctl->llist_info.waiting_end_idx = last_llist_idx;
+       }
+
+       spin_unlock_irqrestore(&mddi_host_spin_lock, flags);
+
+}
+
+void mddi_host_write_pix_attr_reg(uint32 value)
+{
+       (void)value;
+}
+
+void mddi_queue_reverse_encapsulation(boolean wait)
+{
+#ifdef FEATURE_MDDI_DISABLE_REVERSE
+       MDDI_MSG_CRIT("No reverse link available\n");
+       (void)wait;
+#else
+       unsigned long flags;
+       boolean error = FALSE;
+       mddi_host_type host_idx = MDDI_HOST_PRIM;
+       mddi_host_cntl_type *pmhctl = &(mhctl[MDDI_HOST_PRIM]);
+
+       spin_lock_irqsave(&mddi_host_spin_lock, flags);
+
+       /* turn on clock(s), if they have been disabled */
+       mddi_host_enable_hclk();
+       mddi_host_enable_io_clock();
+
+       if (wait) {
+               if (!mddi_rev_user.waiting) {
+                       mddi_rev_user.waiting = TRUE;
+                       INIT_COMPLETION(mddi_rev_user.done_comp);
+               } else
+                       error = TRUE;
+       }
+       mddi_rev_encap_user_request = TRUE;
+
+       if (pmhctl->rev_state == MDDI_REV_IDLE) {
+               /* attempt to send the reverse encapsulation now */
+               mddi_host_type orig_host_idx = mddi_curr_host;
+               mddi_curr_host = host_idx;
+               mddi_issue_reverse_encapsulation();
+               mddi_curr_host = orig_host_idx;
+       }
+       spin_unlock_irqrestore(&mddi_host_spin_lock, flags);
+
+       if (error) {
+               MDDI_MSG_ERR("Reverse Encap request already in progress\n");
+       } else if (wait)
+               wait_for_completion_killable(&(mddi_rev_user.done_comp));
+#endif
+}
+
+/* ISR to be executed */
+boolean mddi_set_rev_handler(mddi_rev_handler_type handler, uint16 pkt_type)
+{
+#ifdef FEATURE_MDDI_DISABLE_REVERSE
+       MDDI_MSG_CRIT("No reverse link available\n");
+       (void)handler;
+       (void)pkt_type;
+       return (FALSE);
+#else
+       unsigned long flags;
+       uint16 hdlr;
+       boolean handler_set = FALSE;
+       boolean overwrite = FALSE;
+       mddi_host_type host_idx = MDDI_HOST_PRIM;
+       mddi_host_cntl_type *pmhctl = &(mhctl[MDDI_HOST_PRIM]);
+
+       /* Disable interrupts */
+       spin_lock_irqsave(&mddi_host_spin_lock, flags);
+
+       for (hdlr = 0; hdlr < MAX_MDDI_REV_HANDLERS; hdlr++) {
+               if (mddi_rev_pkt_handler[hdlr].pkt_type == pkt_type) {
+                       mddi_rev_pkt_handler[hdlr].handler = handler;
+                       if (handler == NULL) {
+                               /* clearing handler from table */
+                               mddi_rev_pkt_handler[hdlr].pkt_type =
+                                   INVALID_PKT_TYPE;
+                               handler_set = TRUE;
+                               if (pkt_type == 0x10) { /* video stream packet */
+                                       /* ensure HCLK on to MDDI host core before register write */
+                                       mddi_host_enable_hclk();
+                                       /* No longer getting video, so reset rev encap size to default */
+                                       pmhctl->rev_pkt_size =
+                                           MDDI_DEFAULT_REV_PKT_SIZE;
+                                       mddi_host_reg_out(REV_ENCAP_SZ,
+                                                         pmhctl->rev_pkt_size);
+                               }
+                       } else {
+                               /* already a handler for this packet */
+                               overwrite = TRUE;
+                       }
+                       break;
+               }
+       }
+       if ((hdlr >= MAX_MDDI_REV_HANDLERS) && (handler != NULL)) {
+               /* assigning new handler */
+               for (hdlr = 0; hdlr < MAX_MDDI_REV_HANDLERS; hdlr++) {
+                       if (mddi_rev_pkt_handler[hdlr].pkt_type ==
+                           INVALID_PKT_TYPE) {
+                               if ((pkt_type == 0x10) &&       /* video stream packet */
+                                   (pmhctl->rev_pkt_size <
+                                    MDDI_VIDEO_REV_PKT_SIZE)) {
+                                       /* ensure HCLK on to MDDI host core before register write */
+                                       mddi_host_enable_hclk();
+                                       /* Increase Rev Encap Size */
+                                       pmhctl->rev_pkt_size =
+                                           MDDI_VIDEO_REV_PKT_SIZE;
+                                       mddi_host_reg_out(REV_ENCAP_SZ,
+                                                         pmhctl->rev_pkt_size);
+                               }
+                               mddi_rev_pkt_handler[hdlr].handler = handler;
+                               mddi_rev_pkt_handler[hdlr].pkt_type = pkt_type;
+                               handler_set = TRUE;
+                               break;
+                       }
+               }
+       }
+
+       /* Restore interrupts */
+       spin_unlock_irqrestore(&mddi_host_spin_lock, flags);
+
+       if (overwrite)
+               MDDI_MSG_ERR("Overwriting previous rev packet handler\n");
+
+       return handler_set;
+
+#endif
+}                              /* mddi_set_rev_handler */
+
+void mddi_host_disable_hibernation(boolean disable)
+{
+       mddi_host_type host_idx = MDDI_HOST_PRIM;
+       mddi_host_cntl_type *pmhctl = &(mhctl[MDDI_HOST_PRIM]);
+
+       if (disable) {
+               pmhctl->disable_hibernation = TRUE;
+               /* hibernation will be turned off by isr next time it is entered */
+       } else {
+               if (pmhctl->disable_hibernation) {
+                       unsigned long flags;
+                       spin_lock_irqsave(&mddi_host_spin_lock, flags);
+                       if (!MDDI_HOST_IS_HCLK_ON)
+                               MDDI_HOST_ENABLE_HCLK;
+                       mddi_host_reg_out(CMD, MDDI_CMD_HIBERNATE | 1);
+                       spin_unlock_irqrestore(&mddi_host_spin_lock, flags);
+                       pmhctl->disable_hibernation = FALSE;
+               }
+       }
+}
+
+void mddi_mhctl_remove(mddi_host_type host_idx)
+{
+       mddi_host_cntl_type *pmhctl;
+
+       pmhctl = &(mhctl[host_idx]);
+
+       dma_free_coherent(NULL, MDDI_LLIST_POOL_SIZE, (void *)pmhctl->llist_ptr,
+                         pmhctl->llist_dma_addr);
+
+       dma_free_coherent(NULL, MDDI_MAX_REV_DATA_SIZE,
+                         (void *)pmhctl->rev_data_buf,
+                         pmhctl->rev_data_dma_addr);
+}
diff --git a/drivers/staging/msm/mddihosti.h b/drivers/staging/msm/mddihosti.h
new file mode 100644 (file)
index 0000000..7b26a42
--- /dev/null
@@ -0,0 +1,547 @@
+/* Copyright (c) 2008-2009, Code Aurora Forum. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Code Aurora nor
+ *       the names of its contributors may be used to endorse or promote
+ *       products derived from this software without specific prior written
+ *       permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NON-INFRINGEMENT ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef MDDIHOSTI_H
+#define MDDIHOSTI_H
+
+#include "msm_fb.h"
+#include "mddihost.h"
+#include <linux/clk.h>
+
+/* Register offsets in MDDI, applies to both msm_pmdh_base and
+ * (u32)msm_emdh_base. */
+#define MDDI_CMD               0x0000
+#define MDDI_VERSION                   0x0004
+#define MDDI_PRI_PTR           0x0008
+#define MDDI_BPS               0x0010
+#define MDDI_SPM               0x0014
+#define MDDI_INT               0x0018
+#define MDDI_INTEN             0x001c
+#define MDDI_REV_PTR           0x0020
+#define MDDI_REV_SIZE          0x0024
+#define MDDI_STAT              0x0028
+#define MDDI_REV_RATE_DIV      0x002c
+#define MDDI_REV_CRC_ERR       0x0030
+#define MDDI_TA1_LEN           0x0034
+#define MDDI_TA2_LEN           0x0038
+#define MDDI_TEST              0x0040
+#define MDDI_REV_PKT_CNT       0x0044
+#define MDDI_DRIVE_HI          0x0048
+#define MDDI_DRIVE_LO          0x004c
+#define MDDI_DISP_WAKE         0x0050
+#define MDDI_REV_ENCAP_SZ      0x0054
+#define MDDI_RTD_VAL           0x0058
+#define MDDI_PAD_CTL           0x0068
+#define MDDI_DRIVER_START_CNT  0x006c
+#define MDDI_CORE_VER          0x008c
+#define MDDI_FIFO_ALLOC         0x0090
+#define MDDI_PAD_IO_CTL         0x00a0
+#define MDDI_PAD_CAL            0x00a4
+
+extern u32 mddi_msg_level;
+
+/* No longer need to write to clear these registers */
+#define xxxx_mddi_host_reg_outm(reg, mask, val)  \
+do { \
+       if (host_idx == MDDI_HOST_PRIM) \
+               mddi_host_reg_outm_pmdh(reg, mask, val); \
+       else \
+               mddi_host_reg_outm_emdh(reg, mask, val); \
+} while (0)
+
+#define mddi_host_reg_outm(reg, mask, val) \
+do { \
+       unsigned long __addr; \
+       if (host_idx == MDDI_HOST_PRIM) \
+               __addr = (u32)msm_pmdh_base + MDDI_##reg; \
+       else \
+               __addr = (u32)msm_emdh_base + MDDI_##reg; \
+       writel((readl(__addr) & ~(mask)) | ((val) & (mask)), __addr); \
+} while (0)
+
+#define xxxx_mddi_host_reg_out(reg, val) \
+do { \
+       if (host_idx == MDDI_HOST_PRIM)  \
+               mddi_host_reg_out_pmdh(reg, val); \
+       else \
+               mddi_host_reg_out_emdh(reg, val); \
+       } while (0)
+
+#define mddi_host_reg_out(reg, val) \
+do { \
+       if (host_idx == MDDI_HOST_PRIM) \
+               writel(val, (u32)msm_pmdh_base + MDDI_##reg); \
+       else \
+               writel(val, (u32)msm_emdh_base + MDDI_##reg); \
+} while (0)
+
+#define xxxx_mddi_host_reg_in(reg)  \
+  ((host_idx) ? \
+     mddi_host_reg_in_emdh(reg) : mddi_host_reg_in_pmdh(reg));
+
+#define mddi_host_reg_in(reg) \
+((host_idx) ? \
+       readl((u32)msm_emdh_base + MDDI_##reg) : \
+       readl((u32)msm_pmdh_base + MDDI_##reg)) \
+
+#define xxxx_mddi_host_reg_inm(reg, mask)  \
+  ((host_idx) ? \
+    mddi_host_reg_inm_emdh(reg, mask) : \
+    mddi_host_reg_inm_pmdh(reg, mask);)
+
+#define mddi_host_reg_inm(reg, mask) \
+((host_idx) ? \
+       readl((u32)msm_emdh_base + MDDI_##reg) & (mask) : \
+       readl((u32)msm_pmdh_base + MDDI_##reg) & (mask)) \
+
+/* Using non-cacheable pmem, so do nothing */
+#define mddi_invalidate_cache_lines(addr_start, num_bytes)
+/*
+ * Using non-cacheable pmem, so do nothing with cache
+ * but, ensure write goes out to memory
+ */
+#define mddi_flush_cache_lines(addr_start, num_bytes)  \
+    (void) addr_start; \
+    (void) num_bytes;  \
+    memory_barrier()
+
+/* Since this translates to Remote Procedure Calls to check on clock status
+* just use a local variable to keep track of io_clock */
+#define MDDI_HOST_IS_IO_CLOCK_ON mddi_host_io_clock_on
+#define MDDI_HOST_ENABLE_IO_CLOCK
+#define MDDI_HOST_DISABLE_IO_CLOCK
+#define MDDI_HOST_IS_HCLK_ON mddi_host_hclk_on
+#define MDDI_HOST_ENABLE_HCLK
+#define MDDI_HOST_DISABLE_HCLK
+#define FEATURE_MDDI_HOST_IO_CLOCK_CONTROL_DISABLE
+#define FEATURE_MDDI_HOST_HCLK_CONTROL_DISABLE
+
+#define TRAMP_MDDI_HOST_ISR TRAMP_MDDI_PRI_ISR
+#define TRAMP_MDDI_HOST_EXT_ISR TRAMP_MDDI_EXT_ISR
+#define MDP_LINE_COUNT_BMSK  0x3ff
+#define MDP_SYNC_STATUS  0x000c
+#define MDP_LINE_COUNT      \
+(readl(msm_mdp_base + MDP_SYNC_STATUS) & MDP_LINE_COUNT_BMSK)
+
+/* MDP sends 256 pixel packets, so lower value hibernates more without
+* significantly increasing latency of waiting for next subframe */
+#define MDDI_HOST_BYTES_PER_SUBFRAME  0x3C00
+
+#if defined(CONFIG_FB_MSM_MDP31) || defined(CONFIG_FB_MSM_MDP40)
+#define MDDI_HOST_TA2_LEN       0x001a
+#define MDDI_HOST_REV_RATE_DIV  0x0004
+#else
+#define MDDI_HOST_TA2_LEN       0x000c
+#define MDDI_HOST_REV_RATE_DIV  0x0002
+#endif
+
+#define MDDI_MSG_EMERG(msg, ...)    \
+       if (mddi_msg_level > 0)  \
+               printk(KERN_EMERG msg, ## __VA_ARGS__);
+#define MDDI_MSG_ALERT(msg, ...)    \
+       if (mddi_msg_level > 1)  \
+               printk(KERN_ALERT msg, ## __VA_ARGS__);
+#define MDDI_MSG_CRIT(msg, ...)    \
+       if (mddi_msg_level > 2)  \
+               printk(KERN_CRIT msg, ## __VA_ARGS__);
+#define MDDI_MSG_ERR(msg, ...)    \
+       if (mddi_msg_level > 3)  \
+               printk(KERN_ERR msg, ## __VA_ARGS__);
+#define MDDI_MSG_WARNING(msg, ...)    \
+       if (mddi_msg_level > 4)  \
+               printk(KERN_WARNING msg, ## __VA_ARGS__);
+#define MDDI_MSG_NOTICE(msg, ...)    \
+       if (mddi_msg_level > 5)  \
+               printk(KERN_NOTICE msg, ## __VA_ARGS__);
+#define MDDI_MSG_INFO(msg, ...)    \
+       if (mddi_msg_level > 6)  \
+               printk(KERN_INFO msg, ## __VA_ARGS__);
+#define MDDI_MSG_DEBUG(msg, ...)    \
+       if (mddi_msg_level > 7)  \
+               printk(KERN_DEBUG msg, ## __VA_ARGS__);
+
+#define GCC_PACKED __attribute__((packed))
+typedef struct GCC_PACKED {
+       uint16 packet_length;
+       /* total # of bytes in the packet not including
+               the packet_length field. */
+
+       uint16 packet_type;
+       /* A Packet Type of 70 identifies the packet as
+               a Client status Packet. */
+
+       uint16 bClient_ID;
+       /* This field is reserved for future use and shall
+               be set to zero. */
+
+} mddi_rev_packet_type;
+
+typedef struct GCC_PACKED {
+       uint16 packet_length;
+       /* total # of bytes in the packet not including
+               the packet_length field. */
+
+       uint16 packet_type;
+       /* A Packet Type of 70 identifies the packet as
+               a Client status Packet. */
+
+       uint16 bClient_ID;
+       /* This field is reserved for future use and shall
+               be set to zero. */
+
+       uint16 reverse_link_request;
+       /* 16 bit unsigned integer with number of bytes client
+               needs in the * reverse encapsulation message
+               to transmit data. */
+
+       uint8 crc_error_count;
+       uint8 capability_change;
+       uint16 graphics_busy_flags;
+
+       uint16 parameter_CRC;
+       /* 16-bit CRC of all the bytes in the packet
+               including Packet Length. */
+
+} mddi_client_status_type;
+
+typedef struct GCC_PACKED {
+       uint16 packet_length;
+       /* total # of bytes in the packet not including
+               the packet_length field. */
+
+       uint16 packet_type;
+       /* A Packet Type of 66 identifies the packet as
+               a Client Capability Packet. */
+
+       uint16 bClient_ID;
+       /* This field is reserved for future use and
+               shall be set to zero. */
+
+       uint16 Protocol_Version;
+       uint16 Minimum_Protocol_Version;
+       uint16 Data_Rate_Capability;
+       uint8 Interface_Type_Capability;
+       uint8 Number_of_Alt_Displays;
+       uint16 PostCal_Data_Rate;
+       uint16 Bitmap_Width;
+       uint16 Bitmap_Height;
+       uint16 Display_Window_Width;
+       uint16 Display_Window_Height;
+       uint32 Color_Map_Size;
+       uint16 Color_Map_RGB_Width;
+       uint16 RGB_Capability;
+       uint8 Monochrome_Capability;
+       uint8 Reserved_1;
+       uint16 Y_Cb_Cr_Capability;
+       uint16 Bayer_Capability;
+       uint16 Alpha_Cursor_Image_Planes;
+       uint32 Client_Feature_Capability_Indicators;
+       uint8 Maximum_Video_Frame_Rate_Capability;
+       uint8 Minimum_Video_Frame_Rate_Capability;
+       uint16 Minimum_Sub_frame_Rate;
+       uint16 Audio_Buffer_Depth;
+       uint16 Audio_Channel_Capability;
+       uint16 Audio_Sample_Rate_Capability;
+       uint8 Audio_Sample_Resolution;
+       uint8 Mic_Audio_Sample_Resolution;
+       uint16 Mic_Sample_Rate_Capability;
+       uint8 Keyboard_Data_Format;
+       uint8 pointing_device_data_format;
+       uint16 content_protection_type;
+       uint16 Mfr_Name;
+       uint16 Product_Code;
+       uint16 Reserved_3;
+       uint32 Serial_Number;
+       uint8 Week_of_Manufacture;
+       uint8 Year_of_Manufacture;
+
+       uint16 parameter_CRC;
+       /* 16-bit CRC of all the bytes in the packet including Packet Length. */
+
+} mddi_client_capability_type;
+
+typedef struct GCC_PACKED {
+       uint16 packet_length;
+       /* total # of bytes in the packet not including the packet_length field. */
+
+       uint16 packet_type;
+       /* A Packet Type of 16 identifies the packet as a Video Stream Packet. */
+
+       uint16 bClient_ID;
+       /* This field is reserved for future use and shall be set to zero. */
+
+       uint16 video_data_format_descriptor;
+       /* format of each pixel in the Pixel Data in the present stream in the
+        * present packet.
+        * If bits [15:13] = 000 monochrome
+        * If bits [15:13] = 001 color pixels (palette).
+        * If bits [15:13] = 010 color pixels in raw RGB
+        * If bits [15:13] = 011 data in 4:2:2 Y Cb Cr format
+        * If bits [15:13] = 100 Bayer pixels
+        */
+
+       uint16 pixel_data_attributes;
+       /* interpreted as follows:
+        * Bits [1:0] = 11  pixel data is displayed to both eyes
+        * Bits [1:0] = 10  pixel data is routed to the left eye only.
+        * Bits [1:0] = 01  pixel data is routed to the right eye only.
+        * Bits [1:0] = 00  pixel data is routed to the alternate display.
+        * Bit 2 is 0  Pixel Data is in the standard progressive format.
+        * Bit 2 is 1  Pixel Data is in interlace format.
+        * Bit 3 is 0  Pixel Data is in the standard progressive format.
+        * Bit 3 is 1  Pixel Data is in alternate pixel format.
+        * Bit 4 is 0  Pixel Data is to or from the display frame buffer.
+        * Bit 4 is 1  Pixel Data is to or from the camera.
+        * Bit 5 is 0  pixel data contains the next consecutive row of pixels.
+        * Bit 5 is 1  X Left Edge, Y Top Edge, X Right Edge, Y Bottom Edge,
+        *             X Start, and Y Start parameters are not defined and
+        *             shall be ignored by the client.
+        * Bits [7:6] = 01  Pixel data is written to the offline image buffer.
+        * Bits [7:6] = 00  Pixel data is written to the buffer to refresh display.
+        * Bits [7:6] = 11  Pixel data is written to all image buffers.
+        * Bits [7:6] = 10  Invalid. Reserved for future use.
+        * Bits 8 through 11 alternate display number.
+        * Bits 12 through 14 are reserved for future use and shall be set to zero.
+        * Bit 15 is 1 the row of pixels is the last row of pixels in a frame.
+        */
+
+       uint16 x_left_edge;
+       uint16 y_top_edge;
+       /* X,Y coordinate of the top left edge of the screen window */
+
+       uint16 x_right_edge;
+       uint16 y_bottom_edge;
+       /*  X,Y coordinate of the bottom right edge of the window being updated. */
+
+       uint16 x_start;
+       uint16 y_start;
+       /*  (X Start, Y Start) is the first pixel in the Pixel Data field below. */
+
+       uint16 pixel_count;
+       /*  number of pixels in the Pixel Data field below. */
+
+       uint16 parameter_CRC;
+       /*  16-bit CRC of all bytes from the Packet Length to the Pixel Count. */
+
+       uint16 reserved;
+       /* 16-bit variable to make structure align on 4 byte boundary */
+
+} mddi_video_stream_packet_type;
+
+typedef struct GCC_PACKED {
+       uint16 packet_length;
+       /* total # of bytes in the packet not including the packet_length field. */
+
+       uint16 packet_type;
+       /* A Packet Type of 146 identifies the packet as a Register Access Packet. */
+
+       uint16 bClient_ID;
+       /* This field is reserved for future use and shall be set to zero. */
+
+       uint16 read_write_info;
+       /* Bits 13:0  a 14-bit unsigned integer that specifies the number of
+        *            32-bit Register Data List items to be transferred in the
+        *            Register Data List field.
+        * Bits[15:14] = 00  Write to register(s);
+        * Bits[15:14] = 10  Read from register(s);
+        * Bits[15:14] = 11  Response to a Read.
+        * Bits[15:14] = 01  this value is reserved for future use. */
+
+       uint32 register_address;
+       /* the register address that is to be written to or read from. */
+
+       uint16 parameter_CRC;
+       /* 16-bit CRC of all bytes from the Packet Length to the Register Address. */
+
+       uint32 register_data_list;
+       /* list of 4-byte register data values for/from client registers */
+
+} mddi_register_access_packet_type;
+
+typedef union GCC_PACKED {
+       mddi_video_stream_packet_type video_pkt;
+       mddi_register_access_packet_type register_pkt;
+       /* add 48 byte pad to ensure 64 byte llist struct, that can be
+        * manipulated easily with cache */
+       uint32 alignment_pad[12];       /* 48 bytes */
+} mddi_packet_header_type;
+
+typedef struct GCC_PACKED mddi_host_llist_struct {
+       uint16 link_controller_flags;
+       uint16 packet_header_count;
+       uint16 packet_data_count;
+       void *packet_data_pointer;
+       struct mddi_host_llist_struct *next_packet_pointer;
+       uint16 reserved;
+       mddi_packet_header_type packet_header;
+} mddi_linked_list_type;
+
+typedef struct {
+       struct completion done_comp;
+       mddi_llist_done_cb_type done_cb;
+       uint16 next_idx;
+       boolean waiting;
+       boolean in_use;
+} mddi_linked_list_notify_type;
+
+#define MDDI_LLIST_POOL_SIZE 0x1000
+#define MDDI_MAX_NUM_LLIST_ITEMS (MDDI_LLIST_POOL_SIZE / \
+                sizeof(mddi_linked_list_type))
+#define UNASSIGNED_INDEX MDDI_MAX_NUM_LLIST_ITEMS
+#define MDDI_FIRST_DYNAMIC_LLIST_IDX 0
+
+/* Static llist items can be used for applications that frequently send
+ * the same set of packets using the linked list interface. */
+/* Here we configure for 6 static linked list items:
+ *  The 1st is used for a the adaptive backlight setting.
+ *  and the remaining 5 are used for sending window adjustments for
+ *  MDDI clients that need windowing info sent separate from video
+ *  packets. */
+#define MDDI_NUM_STATIC_ABL_ITEMS 1
+#define MDDI_NUM_STATIC_WINDOW_ITEMS 5
+#define MDDI_NUM_STATIC_LLIST_ITEMS (MDDI_NUM_STATIC_ABL_ITEMS + \
+                               MDDI_NUM_STATIC_WINDOW_ITEMS)
+#define MDDI_NUM_DYNAMIC_LLIST_ITEMS (MDDI_MAX_NUM_LLIST_ITEMS - \
+                               MDDI_NUM_STATIC_LLIST_ITEMS)
+
+#define MDDI_FIRST_STATIC_LLIST_IDX  MDDI_NUM_DYNAMIC_LLIST_ITEMS
+#define MDDI_FIRST_STATIC_ABL_IDX  MDDI_FIRST_STATIC_LLIST_IDX
+#define MDDI_FIRST_STATIC_WINDOW_IDX  (MDDI_FIRST_STATIC_LLIST_IDX + \
+                               MDDI_NUM_STATIC_ABL_ITEMS)
+
+/* GPIO registers */
+#define VSYNC_WAKEUP_REG          0x80
+#define GPIO_REG                  0x81
+#define GPIO_OUTPUT_REG           0x82
+#define GPIO_INTERRUPT_REG        0x83
+#define GPIO_INTERRUPT_ENABLE_REG 0x84
+#define GPIO_POLARITY_REG         0x85
+
+/* Interrupt Bits */
+#define MDDI_INT_PRI_PTR_READ       0x0001
+#define MDDI_INT_SEC_PTR_READ       0x0002
+#define MDDI_INT_REV_DATA_AVAIL     0x0004
+#define MDDI_INT_DISP_REQ           0x0008
+#define MDDI_INT_PRI_UNDERFLOW      0x0010
+#define MDDI_INT_SEC_UNDERFLOW      0x0020
+#define MDDI_INT_REV_OVERFLOW       0x0040
+#define MDDI_INT_CRC_ERROR          0x0080
+#define MDDI_INT_MDDI_IN            0x0100
+#define MDDI_INT_PRI_OVERWRITE      0x0200
+#define MDDI_INT_SEC_OVERWRITE      0x0400
+#define MDDI_INT_REV_OVERWRITE      0x0800
+#define MDDI_INT_DMA_FAILURE        0x1000
+#define MDDI_INT_LINK_ACTIVE        0x2000
+#define MDDI_INT_IN_HIBERNATION     0x4000
+#define MDDI_INT_PRI_LINK_LIST_DONE 0x8000
+#define MDDI_INT_SEC_LINK_LIST_DONE 0x10000
+#define MDDI_INT_NO_CMD_PKTS_PEND   0x20000
+#define MDDI_INT_RTD_FAILURE        0x40000
+
+#define MDDI_INT_ERROR_CONDITIONS ( \
+       MDDI_INT_PRI_UNDERFLOW | MDDI_INT_SEC_UNDERFLOW | \
+       MDDI_INT_REV_OVERFLOW | MDDI_INT_CRC_ERROR | \
+       MDDI_INT_PRI_OVERWRITE | MDDI_INT_SEC_OVERWRITE | \
+       MDDI_INT_RTD_FAILURE | \
+       MDDI_INT_REV_OVERWRITE | MDDI_INT_DMA_FAILURE)
+
+#define MDDI_INT_LINK_STATE_CHANGES ( \
+       MDDI_INT_LINK_ACTIVE | MDDI_INT_IN_HIBERNATION)
+
+/* Status Bits */
+#define MDDI_STAT_LINK_ACTIVE        0x0001
+#define MDDI_STAT_NEW_REV_PTR        0x0002
+#define MDDI_STAT_NEW_PRI_PTR        0x0004
+#define MDDI_STAT_NEW_SEC_PTR        0x0008
+#define MDDI_STAT_IN_HIBERNATION     0x0010
+#define MDDI_STAT_PRI_LINK_LIST_DONE 0x0020
+#define MDDI_STAT_SEC_LINK_LIST_DONE 0x0040
+#define MDDI_STAT_PENDING_TIMING_PKT 0x0080
+#define MDDI_STAT_PENDING_REV_ENCAP  0x0100
+#define MDDI_STAT_PENDING_POWERDOWN  0x0200
+#define MDDI_STAT_RTD_MEAS_FAIL      0x0800
+#define MDDI_STAT_CLIENT_WAKEUP_REQ  0x1000
+
+/* Command Bits */
+#define MDDI_CMD_POWERDOWN           0x0100
+#define MDDI_CMD_POWERUP             0x0200
+#define MDDI_CMD_HIBERNATE           0x0300
+#define MDDI_CMD_RESET               0x0400
+#define MDDI_CMD_DISP_IGNORE         0x0501
+#define MDDI_CMD_DISP_LISTEN         0x0500
+#define MDDI_CMD_SEND_REV_ENCAP      0x0600
+#define MDDI_CMD_GET_CLIENT_CAP      0x0601
+#define MDDI_CMD_GET_CLIENT_STATUS   0x0602
+#define MDDI_CMD_SEND_RTD            0x0700
+#define MDDI_CMD_LINK_ACTIVE         0x0900
+#define MDDI_CMD_PERIODIC_REV_ENCAP  0x0A00
+
+extern void mddi_host_init(mddi_host_type host);
+extern void mddi_host_powerdown(mddi_host_type host);
+extern uint16 mddi_get_next_free_llist_item(mddi_host_type host, boolean wait);
+extern uint16 mddi_get_reg_read_llist_item(mddi_host_type host, boolean wait);
+extern void mddi_queue_forward_packets(uint16 first_llist_idx,
+                                      uint16 last_llist_idx,
+                                      boolean wait,
+                                      mddi_llist_done_cb_type llist_done_cb,
+                                      mddi_host_type host);
+
+extern void mddi_host_write_pix_attr_reg(uint32 value);
+extern void mddi_client_lcd_gpio_poll(uint32 poll_reg_val);
+extern void mddi_client_lcd_vsync_detected(boolean detected);
+extern void mddi_host_disable_hibernation(boolean disable);
+
+extern mddi_linked_list_type *llist_extern[];
+extern mddi_linked_list_type *llist_dma_extern[];
+extern mddi_linked_list_notify_type *llist_extern_notify[];
+extern struct timer_list mddi_host_timer;
+
+typedef struct {
+       uint16 transmitting_start_idx;
+       uint16 transmitting_end_idx;
+       uint16 waiting_start_idx;
+       uint16 waiting_end_idx;
+       uint16 reg_read_idx;
+       uint16 next_free_idx;
+       boolean reg_read_waiting;
+} mddi_llist_info_type;
+
+extern mddi_llist_info_type mddi_llist;
+
+#define MDDI_GPIO_DEFAULT_POLLING_INTERVAL 200
+typedef struct {
+       uint32 polling_reg;
+       uint32 polling_val;
+       uint32 polling_interval;
+       boolean polling_enabled;
+} mddi_gpio_info_type;
+
+uint32 mddi_get_client_id(void);
+void mddi_mhctl_remove(mddi_host_type host_idx);
+void mddi_host_timer_service(unsigned long data);
+#endif /* MDDIHOSTI_H */
diff --git a/drivers/staging/msm/mdp.c b/drivers/staging/msm/mdp.c
new file mode 100644 (file)
index 0000000..36053af
--- /dev/null
@@ -0,0 +1,1113 @@
+/* Copyright (c) 2008-2010, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/time.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/spinlock.h>
+#include <linux/hrtimer.h>
+#include <linux/clk.h>
+#include <mach/hardware.h>
+#include <linux/io.h>
+#include <linux/debugfs.h>
+#include <linux/delay.h>
+#include <linux/mutex.h>
+
+#include <asm/system.h>
+#include <asm/mach-types.h>
+#include <linux/semaphore.h>
+#include <linux/uaccess.h>
+
+#include "mdp.h"
+#include "msm_fb.h"
+#ifdef CONFIG_FB_MSM_MDP40
+#include "mdp4.h"
+#endif
+
+static struct clk *mdp_clk;
+static struct clk *mdp_pclk;
+
+struct completion mdp_ppp_comp;
+struct semaphore mdp_ppp_mutex;
+struct semaphore mdp_pipe_ctrl_mutex;
+
+unsigned long mdp_timer_duration = (HZ);   /* 1 sec */
+/* unsigned long mdp_mdp_timer_duration=0; */
+
+boolean mdp_ppp_waiting = FALSE;
+uint32 mdp_tv_underflow_cnt;
+uint32 mdp_lcdc_underflow_cnt;
+
+boolean mdp_current_clk_on = FALSE;
+boolean mdp_is_in_isr = FALSE;
+
+/*
+ * legacy mdp_in_processing is only for DMA2-MDDI
+ * this applies to DMA2 block only
+ */
+uint32 mdp_in_processing = FALSE;
+
+#ifdef CONFIG_FB_MSM_MDP40
+uint32 mdp_intr_mask = MDP4_ANY_INTR_MASK;
+#else
+uint32 mdp_intr_mask = MDP_ANY_INTR_MASK;
+#endif
+
+MDP_BLOCK_TYPE mdp_debug[MDP_MAX_BLOCK];
+
+int32 mdp_block_power_cnt[MDP_MAX_BLOCK];
+
+spinlock_t mdp_spin_lock;
+struct workqueue_struct *mdp_dma_wq;   /*mdp dma wq */
+struct workqueue_struct *mdp_vsync_wq; /*mdp vsync wq */
+
+static struct workqueue_struct *mdp_pipe_ctrl_wq; /* mdp mdp pipe ctrl wq */
+static struct delayed_work mdp_pipe_ctrl_worker;
+
+#ifdef CONFIG_FB_MSM_MDP40
+struct mdp_dma_data dma2_data;
+struct mdp_dma_data dma_s_data;
+struct mdp_dma_data dma_e_data;
+#else
+static struct mdp_dma_data dma2_data;
+static struct mdp_dma_data dma_s_data;
+static struct mdp_dma_data dma_e_data;
+#endif
+static struct mdp_dma_data dma3_data;
+
+extern ktime_t mdp_dma2_last_update_time;
+
+extern uint32 mdp_dma2_update_time_in_usec;
+extern int mdp_lcd_rd_cnt_offset_slow;
+extern int mdp_lcd_rd_cnt_offset_fast;
+extern int mdp_usec_diff_threshold;
+
+#ifdef CONFIG_FB_MSM_LCDC
+extern int mdp_lcdc_pclk_clk_rate;
+extern int mdp_lcdc_pad_pclk_clk_rate;
+extern int first_pixel_start_x;
+extern int first_pixel_start_y;
+#endif
+
+#ifdef MSM_FB_ENABLE_DBGFS
+struct dentry *mdp_dir;
+#endif
+
+#if defined(CONFIG_PM) && !defined(CONFIG_HAS_EARLYSUSPEND)
+static int mdp_suspend(struct platform_device *pdev, pm_message_t state);
+#else
+#define mdp_suspend NULL
+#endif
+
+struct timeval mdp_dma2_timeval;
+struct timeval mdp_ppp_timeval;
+
+#ifdef CONFIG_HAS_EARLYSUSPEND
+static struct early_suspend early_suspend;
+#endif
+
+#ifndef CONFIG_FB_MSM_MDP22
+DEFINE_MUTEX(mdp_lut_push_sem);
+static int mdp_lut_i;
+static int mdp_lut_hw_update(struct fb_cmap *cmap)
+{
+       int i;
+       u16 *c[3];
+       u16 r, g, b;
+
+       c[0] = cmap->green;
+       c[1] = cmap->blue;
+       c[2] = cmap->red;
+
+       for (i = 0; i < cmap->len; i++) {
+               if (copy_from_user(&r, cmap->red++, sizeof(r)) ||
+                   copy_from_user(&g, cmap->green++, sizeof(g)) ||
+                   copy_from_user(&b, cmap->blue++, sizeof(b)))
+                       return -EFAULT;
+
+#ifdef CONFIG_FB_MSM_MDP40
+               MDP_OUTP(MDP_BASE + 0x94800 +
+#else
+               MDP_OUTP(MDP_BASE + 0x93800 +
+#endif
+                       (0x400*mdp_lut_i) + cmap->start*4 + i*4,
+                               ((g & 0xff) |
+                                ((b & 0xff) << 8) |
+                                ((r & 0xff) << 16)));
+       }
+
+       return 0;
+}
+
+static int mdp_lut_push;
+static int mdp_lut_push_i;
+static int mdp_lut_update_nonlcdc(struct fb_info *info, struct fb_cmap *cmap)
+{
+       int ret;
+
+       mdp_pipe_ctrl(MDP_CMD_BLOCK, MDP_BLOCK_POWER_ON, FALSE);
+       ret = mdp_lut_hw_update(cmap);
+       mdp_pipe_ctrl(MDP_CMD_BLOCK, MDP_BLOCK_POWER_OFF, FALSE);
+
+       if (ret)
+               return ret;
+
+       mutex_lock(&mdp_lut_push_sem);
+       mdp_lut_push = 1;
+       mdp_lut_push_i = mdp_lut_i;
+       mutex_unlock(&mdp_lut_push_sem);
+
+       mdp_lut_i = (mdp_lut_i + 1)%2;
+
+       return 0;
+}
+
+static int mdp_lut_update_lcdc(struct fb_info *info, struct fb_cmap *cmap)
+{
+       int ret;
+
+       mdp_pipe_ctrl(MDP_CMD_BLOCK, MDP_BLOCK_POWER_ON, FALSE);
+       ret = mdp_lut_hw_update(cmap);
+
+       if (ret) {
+               mdp_pipe_ctrl(MDP_CMD_BLOCK, MDP_BLOCK_POWER_OFF, FALSE);
+               return ret;
+       }
+
+       MDP_OUTP(MDP_BASE + 0x90070, (mdp_lut_i << 10) | 0x17);
+       mdp_pipe_ctrl(MDP_CMD_BLOCK, MDP_BLOCK_POWER_OFF, FALSE);
+       mdp_lut_i = (mdp_lut_i + 1)%2;
+
+       return 0;
+}
+
+#define MDP_HIST_MAX_BIN 32
+static __u32 mdp_hist_r[MDP_HIST_MAX_BIN];
+static __u32 mdp_hist_g[MDP_HIST_MAX_BIN];
+static __u32 mdp_hist_b[MDP_HIST_MAX_BIN];
+
+#ifdef CONFIG_FB_MSM_MDP40
+struct mdp_histogram mdp_hist;
+struct completion mdp_hist_comp;
+#else
+static struct mdp_histogram mdp_hist;
+static struct completion mdp_hist_comp;
+#endif
+
+static int mdp_do_histogram(struct fb_info *info, struct mdp_histogram *hist)
+{
+       int ret = 0;
+
+       if (!hist->frame_cnt || (hist->bin_cnt == 0) ||
+                                (hist->bin_cnt > MDP_HIST_MAX_BIN))
+               return -EINVAL;
+
+       INIT_COMPLETION(mdp_hist_comp);
+
+       mdp_hist.bin_cnt = hist->bin_cnt;
+       mdp_hist.r = (hist->r) ? mdp_hist_r : 0;
+       mdp_hist.g = (hist->g) ? mdp_hist_g : 0;
+       mdp_hist.b = (hist->b) ? mdp_hist_b : 0;
+
+#ifdef CONFIG_FB_MSM_MDP40
+       MDP_OUTP(MDP_BASE + 0x95004, hist->frame_cnt);
+       MDP_OUTP(MDP_BASE + 0x95000, 1);
+#else
+       MDP_OUTP(MDP_BASE + 0x94004, hist->frame_cnt);
+       MDP_OUTP(MDP_BASE + 0x94000, 1);
+#endif
+       wait_for_completion_killable(&mdp_hist_comp);
+
+       if (hist->r) {
+               ret = copy_to_user(hist->r, mdp_hist.r, hist->bin_cnt*4);
+               if (ret)
+                       goto hist_err;
+       }
+       if (hist->g) {
+               ret = copy_to_user(hist->g, mdp_hist.g, hist->bin_cnt*4);
+               if (ret)
+                       goto hist_err;
+       }
+       if (hist->b) {
+               ret = copy_to_user(hist->b, mdp_hist.b, hist->bin_cnt*4);
+               if (ret)
+                       goto hist_err;
+       }
+       return 0;
+
+hist_err:
+       printk(KERN_ERR "%s: invalid hist buffer\n", __func__);
+       return ret;
+}
+#endif
+
+/* Returns < 0 on error, 0 on timeout, or > 0 on successful wait */
+
+int mdp_ppp_pipe_wait(void)
+{
+       int ret = 1;
+
+       /* wait 5 seconds for the operation to complete before declaring
+       the MDP hung */
+
+       if (mdp_ppp_waiting == TRUE) {
+               ret = wait_for_completion_interruptible_timeout(&mdp_ppp_comp,
+                                                               5 * HZ);
+
+               if (!ret)
+                       printk(KERN_ERR "%s: Timed out waiting for the MDP.\n",
+                                       __func__);
+       }
+
+       return ret;
+}
+
+static DEFINE_SPINLOCK(mdp_lock);
+static int mdp_irq_mask;
+static int mdp_irq_enabled;
+
+void mdp_enable_irq(uint32 term)
+{
+       unsigned long irq_flags;
+
+       spin_lock_irqsave(&mdp_lock, irq_flags);
+       if (mdp_irq_mask & term) {
+               printk(KERN_ERR "MDP IRQ term-0x%x is already set\n", term);
+       } else {
+               mdp_irq_mask |= term;
+               if (mdp_irq_mask && !mdp_irq_enabled) {
+                       mdp_irq_enabled = 1;
+                       enable_irq(INT_MDP);
+               }
+       }
+       spin_unlock_irqrestore(&mdp_lock, irq_flags);
+}
+
+void mdp_disable_irq(uint32 term)
+{
+       unsigned long irq_flags;
+
+       spin_lock_irqsave(&mdp_lock, irq_flags);
+       if (!(mdp_irq_mask & term)) {
+               printk(KERN_ERR "MDP IRQ term-0x%x is not set\n", term);
+       } else {
+               mdp_irq_mask &= ~term;
+               if (!mdp_irq_mask && mdp_irq_enabled) {
+                       mdp_irq_enabled = 0;
+                       disable_irq(INT_MDP);
+               }
+       }
+       spin_unlock_irqrestore(&mdp_lock, irq_flags);
+}
+
+void mdp_disable_irq_nolock(uint32 term)
+{
+
+       if (!(mdp_irq_mask & term)) {
+               printk(KERN_ERR "MDP IRQ term-0x%x is not set\n", term);
+       } else {
+               mdp_irq_mask &= ~term;
+               if (!mdp_irq_mask && mdp_irq_enabled) {
+                       mdp_irq_enabled = 0;
+                       disable_irq(INT_MDP);
+               }
+       }
+}
+
+void mdp_pipe_kickoff(uint32 term, struct msm_fb_data_type *mfd)
+{
+
+       dmb();  /* memory barrier */
+
+       /* kick off PPP engine */
+       if (term == MDP_PPP_TERM) {
+               if (mdp_debug[MDP_PPP_BLOCK])
+                       jiffies_to_timeval(jiffies, &mdp_ppp_timeval);
+
+               /* let's turn on PPP block */
+               mdp_pipe_ctrl(MDP_PPP_BLOCK, MDP_BLOCK_POWER_ON, FALSE);
+
+               mdp_enable_irq(term);
+               INIT_COMPLETION(mdp_ppp_comp);
+               mdp_ppp_waiting = TRUE;
+               outpdw(MDP_BASE + 0x30, 0x1000);
+               wait_for_completion_killable(&mdp_ppp_comp);
+               mdp_disable_irq(term);
+
+               if (mdp_debug[MDP_PPP_BLOCK]) {
+                       struct timeval now;
+
+                       jiffies_to_timeval(jiffies, &now);
+                       mdp_ppp_timeval.tv_usec =
+                           now.tv_usec - mdp_ppp_timeval.tv_usec;
+                       MSM_FB_INFO("MDP-PPP: %d\n",
+                                   (int)mdp_ppp_timeval.tv_usec);
+               }
+       } else if (term == MDP_DMA2_TERM) {
+               if (mdp_debug[MDP_DMA2_BLOCK]) {
+                       MSM_FB_INFO("MDP-DMA2: %d\n",
+                                   (int)mdp_dma2_timeval.tv_usec);
+                       jiffies_to_timeval(jiffies, &mdp_dma2_timeval);
+               }
+               /* DMA update timestamp */
+               mdp_dma2_last_update_time = ktime_get_real();
+               /* let's turn on DMA2 block */
+#if 0
+               mdp_pipe_ctrl(MDP_DMA2_BLOCK, MDP_BLOCK_POWER_ON, FALSE);
+#endif
+#ifdef CONFIG_FB_MSM_MDP22
+               outpdw(MDP_CMD_DEBUG_ACCESS_BASE + 0x0044, 0x0);/* start DMA */
+#else
+               if (mdp_lut_push) {
+                       mutex_lock(&mdp_lut_push_sem);
+                       mdp_lut_push = 0;
+                       MDP_OUTP(MDP_BASE + 0x90070,
+                                       (mdp_lut_push_i << 10) | 0x17);
+                       mutex_unlock(&mdp_lut_push_sem);
+               }
+#ifdef CONFIG_FB_MSM_MDP40
+               outpdw(MDP_BASE + 0x000c, 0x0); /* start DMA */
+#else
+               outpdw(MDP_BASE + 0x0044, 0x0); /* start DMA */
+#endif
+#endif
+#ifdef CONFIG_FB_MSM_MDP40
+       } else if (term == MDP_DMA_S_TERM) {
+               mdp_pipe_ctrl(MDP_DMA_S_BLOCK, MDP_BLOCK_POWER_ON, FALSE);
+               outpdw(MDP_BASE + 0x0010, 0x0); /* start DMA */
+       } else if (term == MDP_DMA_E_TERM) {
+               mdp_pipe_ctrl(MDP_DMA_E_BLOCK, MDP_BLOCK_POWER_ON, FALSE);
+               outpdw(MDP_BASE + 0x0014, 0x0); /* start DMA */
+       } else if (term == MDP_OVERLAY0_TERM) {
+               mdp_pipe_ctrl(MDP_OVERLAY0_BLOCK, MDP_BLOCK_POWER_ON, FALSE);
+               outpdw(MDP_BASE + 0x0004, 0);
+       } else if (term == MDP_OVERLAY1_TERM) {
+               mdp_pipe_ctrl(MDP_OVERLAY1_BLOCK, MDP_BLOCK_POWER_ON, FALSE);
+               outpdw(MDP_BASE + 0x0008, 0);
+       }
+#else
+       } else if (term == MDP_DMA_S_TERM) {
+               mdp_pipe_ctrl(MDP_DMA_S_BLOCK, MDP_BLOCK_POWER_ON, FALSE);
+               outpdw(MDP_BASE + 0x0048, 0x0); /* start DMA */
+       }
+#endif
+}
+
+static void mdp_pipe_ctrl_workqueue_handler(struct work_struct *work)
+{
+       mdp_pipe_ctrl(MDP_MASTER_BLOCK, MDP_BLOCK_POWER_OFF, FALSE);
+}
+
+void mdp_pipe_ctrl(MDP_BLOCK_TYPE block, MDP_BLOCK_POWER_STATE state,
+                  boolean isr)
+{
+       boolean mdp_all_blocks_off = TRUE;
+       int i;
+       unsigned long flag;
+
+       spin_lock_irqsave(&mdp_spin_lock, flag);
+       if (MDP_BLOCK_POWER_ON == state) {
+               mdp_block_power_cnt[block]++;
+
+               if (MDP_DMA2_BLOCK == block)
+                       mdp_in_processing = TRUE;
+       } else {
+               mdp_block_power_cnt[block]--;
+
+               if (mdp_block_power_cnt[block] < 0) {
+                       /*
+                       * Master has to serve a request to power off MDP always
+                       * It also has a timer to power off.  So, in case of
+                       * timer expires first and DMA2 finishes later,
+                       * master has to power off two times
+                       * There shouldn't be multiple power-off request for
+                       * other blocks
+                       */
+                       if (block != MDP_MASTER_BLOCK) {
+                               MSM_FB_INFO("mdp_block_power_cnt[block=%d] \
+                               multiple power-off request\n", block);
+                       }
+                       mdp_block_power_cnt[block] = 0;
+               }
+
+               if (MDP_DMA2_BLOCK == block)
+                       mdp_in_processing = FALSE;
+       }
+       spin_unlock_irqrestore(&mdp_spin_lock, flag);
+
+       /*
+        * If it's in isr, we send our request to workqueue.
+        * Otherwise, processing happens in the current context
+        */
+       if (isr) {
+               /* checking all blocks power state */
+               for (i = 0; i < MDP_MAX_BLOCK; i++) {
+                       if (mdp_block_power_cnt[i] > 0)
+                               mdp_all_blocks_off = FALSE;
+               }
+
+               if ((mdp_all_blocks_off) && (mdp_current_clk_on)) {
+                       /* send workqueue to turn off mdp power */
+                       queue_delayed_work(mdp_pipe_ctrl_wq,
+                                          &mdp_pipe_ctrl_worker,
+                                          mdp_timer_duration);
+               }
+       } else {
+               down(&mdp_pipe_ctrl_mutex);
+               /* checking all blocks power state */
+               for (i = 0; i < MDP_MAX_BLOCK; i++) {
+                       if (mdp_block_power_cnt[i] > 0)
+                               mdp_all_blocks_off = FALSE;
+               }
+
+               /*
+                * find out whether a delayable work item is currently
+                * pending
+                */
+
+               if (delayed_work_pending(&mdp_pipe_ctrl_worker)) {
+                       /*
+                        * try to cancel the current work if it fails to
+                        * stop (which means del_timer can't delete it
+                        * from the list, it's about to expire and run),
+                        * we have to let it run. queue_delayed_work won't
+                        * accept the next job which is same as
+                        * queue_delayed_work(mdp_timer_duration = 0)
+                        */
+                       cancel_delayed_work(&mdp_pipe_ctrl_worker);
+               }
+
+               if ((mdp_all_blocks_off) && (mdp_current_clk_on)) {
+                       if (block == MDP_MASTER_BLOCK) {
+                               mdp_current_clk_on = FALSE;
+                               /* turn off MDP clks */
+                               if (mdp_clk != NULL) {
+                                       clk_disable(mdp_clk);
+                                       MSM_FB_DEBUG("MDP CLK OFF\n");
+                               }
+                               if (mdp_pclk != NULL) {
+                                       clk_disable(mdp_pclk);
+                                       MSM_FB_DEBUG("MDP PCLK OFF\n");
+                               }
+                       } else {
+                               /* send workqueue to turn off mdp power */
+                               queue_delayed_work(mdp_pipe_ctrl_wq,
+                                                  &mdp_pipe_ctrl_worker,
+                                                  mdp_timer_duration);
+                       }
+               } else if ((!mdp_all_blocks_off) && (!mdp_current_clk_on)) {
+                       mdp_current_clk_on = TRUE;
+                       /* turn on MDP clks */
+                       if (mdp_clk != NULL) {
+                               clk_enable(mdp_clk);
+                               MSM_FB_DEBUG("MDP CLK ON\n");
+                       }
+                       if (mdp_pclk != NULL) {
+                               clk_enable(mdp_pclk);
+                               MSM_FB_DEBUG("MDP PCLK ON\n");
+                       }
+               }
+               up(&mdp_pipe_ctrl_mutex);
+       }
+}
+
+#ifndef CONFIG_FB_MSM_MDP40
+irqreturn_t mdp_isr(int irq, void *ptr)
+{
+       uint32 mdp_interrupt = 0;
+       struct mdp_dma_data *dma;
+
+       mdp_is_in_isr = TRUE;
+       do {
+               mdp_interrupt = inp32(MDP_INTR_STATUS);
+               outp32(MDP_INTR_CLEAR, mdp_interrupt);
+
+               mdp_interrupt &= mdp_intr_mask;
+
+               if (mdp_interrupt & TV_ENC_UNDERRUN) {
+                       mdp_interrupt &= ~(TV_ENC_UNDERRUN);
+                       mdp_tv_underflow_cnt++;
+               }
+
+               if (!mdp_interrupt)
+                       break;
+
+               /* DMA3 TV-Out Start */
+               if (mdp_interrupt & TV_OUT_DMA3_START) {
+                       /* let's disable TV out interrupt */
+                       mdp_intr_mask &= ~TV_OUT_DMA3_START;
+                       outp32(MDP_INTR_ENABLE, mdp_intr_mask);
+
+                       dma = &dma3_data;
+                       if (dma->waiting) {
+                               dma->waiting = FALSE;
+                               complete(&dma->comp);
+                       }
+               }
+#ifndef CONFIG_FB_MSM_MDP22
+               if (mdp_interrupt & MDP_HIST_DONE) {
+                       outp32(MDP_BASE + 0x94018, 0x3);
+                       outp32(MDP_INTR_CLEAR, MDP_HIST_DONE);
+                       if (mdp_hist.r)
+                               memcpy(mdp_hist.r, MDP_BASE + 0x94100,
+                                               mdp_hist.bin_cnt*4);
+                       if (mdp_hist.g)
+                               memcpy(mdp_hist.g, MDP_BASE + 0x94200,
+                                               mdp_hist.bin_cnt*4);
+                       if (mdp_hist.b)
+                               memcpy(mdp_hist.b, MDP_BASE + 0x94300,
+                                               mdp_hist.bin_cnt*4);
+                       complete(&mdp_hist_comp);
+               }
+
+               /* LCDC UnderFlow */
+               if (mdp_interrupt & LCDC_UNDERFLOW) {
+                       mdp_lcdc_underflow_cnt++;
+               }
+               /* LCDC Frame Start */
+               if (mdp_interrupt & LCDC_FRAME_START) {
+                       /* let's disable LCDC interrupt */
+                       mdp_intr_mask &= ~LCDC_FRAME_START;
+                       outp32(MDP_INTR_ENABLE, mdp_intr_mask);
+
+                       dma = &dma2_data;
+                       if (dma->waiting) {
+                               dma->waiting = FALSE;
+                               complete(&dma->comp);
+                       }
+               }
+
+               /* DMA2 LCD-Out Complete */
+               if (mdp_interrupt & MDP_DMA_S_DONE) {
+                       dma = &dma_s_data;
+                       dma->busy = FALSE;
+                       mdp_pipe_ctrl(MDP_DMA_S_BLOCK, MDP_BLOCK_POWER_OFF,
+                                     TRUE);
+                       complete(&dma->comp);
+               }
+#endif
+
+               /* DMA2 LCD-Out Complete */
+               if (mdp_interrupt & MDP_DMA_P_DONE) {
+                       struct timeval now;
+                       ktime_t now_k;
+
+                       now_k = ktime_get_real();
+                       mdp_dma2_last_update_time.tv.sec =
+                           now_k.tv.sec - mdp_dma2_last_update_time.tv.sec;
+                       mdp_dma2_last_update_time.tv.nsec =
+                           now_k.tv.nsec - mdp_dma2_last_update_time.tv.nsec;
+
+                       if (mdp_debug[MDP_DMA2_BLOCK]) {
+                               jiffies_to_timeval(jiffies, &now);
+                               mdp_dma2_timeval.tv_usec =
+                                   now.tv_usec - mdp_dma2_timeval.tv_usec;
+                       }
+
+                       dma = &dma2_data;
+                       dma->busy = FALSE;
+                       mdp_pipe_ctrl(MDP_DMA2_BLOCK, MDP_BLOCK_POWER_OFF,
+                                     TRUE);
+                       complete(&dma->comp);
+               }
+               /* PPP Complete */
+               if (mdp_interrupt & MDP_PPP_DONE) {
+#ifdef CONFIG_MDP_PPP_ASYNC_OP
+                       mdp_ppp_djob_done();
+#else
+                       mdp_pipe_ctrl(MDP_PPP_BLOCK,
+                               MDP_BLOCK_POWER_OFF, TRUE);
+                       if (mdp_ppp_waiting) {
+                               mdp_ppp_waiting = FALSE;
+                               complete(&mdp_ppp_comp);
+                       }
+#endif
+               }
+       } while (1);
+
+       mdp_is_in_isr = FALSE;
+
+       return IRQ_HANDLED;
+}
+#endif
+
+static void mdp_drv_init(void)
+{
+       int i;
+
+       for (i = 0; i < MDP_MAX_BLOCK; i++) {
+               mdp_debug[i] = 0;
+       }
+
+       /* initialize spin lock and workqueue */
+       spin_lock_init(&mdp_spin_lock);
+       mdp_dma_wq = create_singlethread_workqueue("mdp_dma_wq");
+       mdp_vsync_wq = create_singlethread_workqueue("mdp_vsync_wq");
+       mdp_pipe_ctrl_wq = create_singlethread_workqueue("mdp_pipe_ctrl_wq");
+       INIT_DELAYED_WORK(&mdp_pipe_ctrl_worker,
+                         mdp_pipe_ctrl_workqueue_handler);
+#ifdef CONFIG_MDP_PPP_ASYNC_OP
+       mdp_ppp_dq_init();
+#endif
+
+       /* initialize semaphore */
+       init_completion(&mdp_ppp_comp);
+       init_MUTEX(&mdp_ppp_mutex);
+       init_MUTEX(&mdp_pipe_ctrl_mutex);
+
+       dma2_data.busy = FALSE;
+       dma2_data.waiting = FALSE;
+       init_completion(&dma2_data.comp);
+       init_MUTEX(&dma2_data.mutex);
+       mutex_init(&dma2_data.ov_mutex);
+
+       dma3_data.busy = FALSE;
+       dma3_data.waiting = FALSE;
+       init_completion(&dma3_data.comp);
+       init_MUTEX(&dma3_data.mutex);
+
+       dma_s_data.busy = FALSE;
+       dma_s_data.waiting = FALSE;
+       init_completion(&dma_s_data.comp);
+       init_MUTEX(&dma_s_data.mutex);
+
+       dma_e_data.busy = FALSE;
+       dma_e_data.waiting = FALSE;
+       init_completion(&dma_e_data.comp);
+
+#ifndef CONFIG_FB_MSM_MDP22
+       init_completion(&mdp_hist_comp);
+#endif
+
+       /* initializing mdp power block counter to 0 */
+       for (i = 0; i < MDP_MAX_BLOCK; i++) {
+               mdp_block_power_cnt[i] = 0;
+       }
+
+#ifdef MSM_FB_ENABLE_DBGFS
+       {
+               struct dentry *root;
+               char sub_name[] = "mdp";
+
+               root = msm_fb_get_debugfs_root();
+               if (root != NULL) {
+                       mdp_dir = debugfs_create_dir(sub_name, root);
+
+                       if (mdp_dir) {
+                               msm_fb_debugfs_file_create(mdp_dir,
+                                       "dma2_update_time_in_usec",
+                                       (u32 *) &mdp_dma2_update_time_in_usec);
+                               msm_fb_debugfs_file_create(mdp_dir,
+                                       "vs_rdcnt_slow",
+                                       (u32 *) &mdp_lcd_rd_cnt_offset_slow);
+                               msm_fb_debugfs_file_create(mdp_dir,
+                                       "vs_rdcnt_fast",
+                                       (u32 *) &mdp_lcd_rd_cnt_offset_fast);
+                               msm_fb_debugfs_file_create(mdp_dir,
+                                       "mdp_usec_diff_threshold",
+                                       (u32 *) &mdp_usec_diff_threshold);
+                               msm_fb_debugfs_file_create(mdp_dir,
+                                       "mdp_current_clk_on",
+                                       (u32 *) &mdp_current_clk_on);
+#ifdef CONFIG_FB_MSM_LCDC
+                               msm_fb_debugfs_file_create(mdp_dir,
+                                       "lcdc_start_x",
+                                       (u32 *) &first_pixel_start_x);
+                               msm_fb_debugfs_file_create(mdp_dir,
+                                       "lcdc_start_y",
+                                       (u32 *) &first_pixel_start_y);
+                               msm_fb_debugfs_file_create(mdp_dir,
+                                       "mdp_lcdc_pclk_clk_rate",
+                                       (u32 *) &mdp_lcdc_pclk_clk_rate);
+                               msm_fb_debugfs_file_create(mdp_dir,
+                                       "mdp_lcdc_pad_pclk_clk_rate",
+                                       (u32 *) &mdp_lcdc_pad_pclk_clk_rate);
+#endif
+                       }
+               }
+       }
+#endif
+}
+
+static int mdp_probe(struct platform_device *pdev);
+static int mdp_remove(struct platform_device *pdev);
+
+static struct platform_driver mdp_driver = {
+       .probe = mdp_probe,
+       .remove = mdp_remove,
+#ifndef CONFIG_HAS_EARLYSUSPEND
+       .suspend = mdp_suspend,
+       .resume = NULL,
+#endif
+       .shutdown = NULL,
+       .driver = {
+               /*
+                * Driver name must match the device name added in
+                * platform.c.
+                */
+               .name = "mdp",
+       },
+};
+
+static int mdp_off(struct platform_device *pdev)
+{
+       int ret = 0;
+
+#ifdef MDP_HW_VSYNC
+       struct msm_fb_data_type *mfd = platform_get_drvdata(pdev);
+#endif
+
+       ret = panel_next_off(pdev);
+
+#ifdef MDP_HW_VSYNC
+       mdp_hw_vsync_clk_disable(mfd);
+#endif
+
+       return ret;
+}
+
+static int mdp_on(struct platform_device *pdev)
+{
+#ifdef MDP_HW_VSYNC
+       struct msm_fb_data_type *mfd = platform_get_drvdata(pdev);
+#endif
+
+       int ret = 0;
+
+#ifdef MDP_HW_VSYNC
+       mdp_hw_vsync_clk_enable(mfd);
+#endif
+
+       ret = panel_next_on(pdev);
+
+       return ret;
+}
+
+static int mdp_irq_clk_setup(void)
+{
+       int ret;
+
+#ifdef CONFIG_FB_MSM_MDP40
+       ret = request_irq(INT_MDP, mdp4_isr, IRQF_DISABLED, "MDP", 0);
+#else
+       ret = request_irq(INT_MDP, mdp_isr, IRQF_DISABLED, "MDP", 0);
+#endif
+       if (ret) {
+               printk(KERN_ERR "mdp request_irq() failed!\n");
+               return ret;
+       }
+       disable_irq(INT_MDP);
+
+       mdp_clk = clk_get(NULL, "mdp_clk");
+
+       if (IS_ERR(mdp_clk)) {
+               ret = PTR_ERR(mdp_clk);
+               printk(KERN_ERR "can't get mdp_clk error:%d!\n", ret);
+               free_irq(INT_MDP, 0);
+               return ret;
+       }
+
+       mdp_pclk = clk_get(NULL, "mdp_pclk");
+       if (IS_ERR(mdp_pclk))
+               mdp_pclk = NULL;
+
+
+#ifdef CONFIG_FB_MSM_MDP40
+       /*
+        * mdp_clk should greater than mdp_pclk always
+        */
+       clk_set_rate(mdp_clk, 122880000); /* 122.88 Mhz */
+       printk(KERN_INFO "mdp_clk: mdp_clk=%d mdp_pclk=%d\n",
+               (int)clk_get_rate(mdp_clk), (int)clk_get_rate(mdp_pclk));
+#endif
+
+       return 0;
+}
+
+static struct platform_device *pdev_list[MSM_FB_MAX_DEV_LIST];
+static int pdev_list_cnt;
+static int mdp_resource_initialized;
+static struct msm_panel_common_pdata *mdp_pdata;
+
+static int mdp_probe(struct platform_device *pdev)
+{
+       struct platform_device *msm_fb_dev = NULL;
+       struct msm_fb_data_type *mfd;
+       struct msm_fb_panel_data *pdata = NULL;
+       int rc;
+       resource_size_t  size ;
+#ifdef CONFIG_FB_MSM_MDP40
+       int intf, if_no;
+#else
+       unsigned long flag;
+#endif
+
+       if ((pdev->id == 0) && (pdev->num_resources > 0)) {
+               mdp_pdata = pdev->dev.platform_data;
+
+               size =  resource_size(&pdev->resource[0]);
+               msm_mdp_base = ioremap(pdev->resource[0].start, size);
+
+               MSM_FB_INFO("MDP HW Base phy_Address = 0x%x virt = 0x%x\n",
+                       (int)pdev->resource[0].start, (int)msm_mdp_base);
+
+               if (unlikely(!msm_mdp_base))
+                       return -ENOMEM;
+
+               printk("irq clk setup\n");
+               rc = mdp_irq_clk_setup();
+               printk("irq clk setup done\n");
+               if (rc)
+                       return rc;
+
+               /* initializing mdp hw */
+#ifdef CONFIG_FB_MSM_MDP40
+               mdp4_hw_init();
+#else
+               mdp_hw_init();
+#endif
+
+               mdp_resource_initialized = 1;
+               return 0;
+       }
+
+       if (!mdp_resource_initialized)
+               return -EPERM;
+
+       mfd = platform_get_drvdata(pdev);
+
+       if (!mfd)
+               return -ENODEV;
+
+       if (mfd->key != MFD_KEY)
+               return -EINVAL;
+
+       if (pdev_list_cnt >= MSM_FB_MAX_DEV_LIST)
+               return -ENOMEM;
+
+       msm_fb_dev = platform_device_alloc("msm_fb", pdev->id);
+       if (!msm_fb_dev)
+               return -ENOMEM;
+
+       /* link to the latest pdev */
+       mfd->pdev = msm_fb_dev;
+
+       /* add panel data */
+       if (platform_device_add_data
+           (msm_fb_dev, pdev->dev.platform_data,
+            sizeof(struct msm_fb_panel_data))) {
+               printk(KERN_ERR "mdp_probe: platform_device_add_data failed!\n");
+               rc = -ENOMEM;
+               goto mdp_probe_err;
+       }
+       /* data chain */
+       pdata = msm_fb_dev->dev.platform_data;
+       pdata->on = mdp_on;
+       pdata->off = mdp_off;
+       pdata->next = pdev;
+
+       switch (mfd->panel.type) {
+       case EXT_MDDI_PANEL:
+       case MDDI_PANEL:
+       case EBI2_PANEL:
+               INIT_WORK(&mfd->dma_update_worker,
+                         mdp_lcd_update_workqueue_handler);
+               INIT_WORK(&mfd->vsync_resync_worker,
+                         mdp_vsync_resync_workqueue_handler);
+               mfd->hw_refresh = FALSE;
+
+               if (mfd->panel.type == EXT_MDDI_PANEL) {
+                       /* 15 fps -> 66 msec */
+                       mfd->refresh_timer_duration = (66 * HZ / 1000);
+               } else {
+                       /* 24 fps -> 42 msec */
+                       mfd->refresh_timer_duration = (42 * HZ / 1000);
+               }
+
+#ifdef CONFIG_FB_MSM_MDP22
+               mfd->dma_fnc = mdp_dma2_update;
+               mfd->dma = &dma2_data;
+#else
+               if (mfd->panel_info.pdest == DISPLAY_1) {
+#ifdef CONFIG_FB_MSM_OVERLAY
+                       mfd->dma_fnc = mdp4_mddi_overlay;
+#else
+                       mfd->dma_fnc = mdp_dma2_update;
+#endif
+                       mfd->dma = &dma2_data;
+                       mfd->lut_update = mdp_lut_update_nonlcdc;
+                       mfd->do_histogram = mdp_do_histogram;
+               } else {
+                       mfd->dma_fnc = mdp_dma_s_update;
+                       mfd->dma = &dma_s_data;
+               }
+#endif
+               if (mdp_pdata)
+                       mfd->vsync_gpio = mdp_pdata->gpio;
+               else
+                       mfd->vsync_gpio = -1;
+
+#ifdef CONFIG_FB_MSM_MDP40
+               if (mfd->panel.type == EBI2_PANEL)
+                       intf = EBI2_INTF;
+               else
+                       intf = MDDI_INTF;
+
+               if (mfd->panel_info.pdest == DISPLAY_1)
+                       if_no = PRIMARY_INTF_SEL;
+               else
+                       if_no = SECONDARY_INTF_SEL;
+
+               mdp4_display_intf_sel(if_no, intf);
+#endif
+               mdp_config_vsync(mfd);
+               break;
+
+       case HDMI_PANEL:
+       case LCDC_PANEL:
+               pdata->on = mdp_lcdc_on;
+               pdata->off = mdp_lcdc_off;
+               mfd->hw_refresh = TRUE;
+               mfd->cursor_update = mdp_hw_cursor_update;
+#ifndef CONFIG_FB_MSM_MDP22
+               mfd->lut_update = mdp_lut_update_lcdc;
+               mfd->do_histogram = mdp_do_histogram;
+#endif
+#ifdef CONFIG_FB_MSM_OVERLAY
+               mfd->dma_fnc = mdp4_lcdc_overlay;
+#else
+               mfd->dma_fnc = mdp_lcdc_update;
+#endif
+
+#ifdef CONFIG_FB_MSM_MDP40
+               if (mfd->panel.type == HDMI_PANEL) {
+                       mfd->dma = &dma_e_data;
+                       mdp4_display_intf_sel(EXTERNAL_INTF_SEL, LCDC_RGB_INTF);
+               } else {
+                       mfd->dma = &dma2_data;
+                       mdp4_display_intf_sel(PRIMARY_INTF_SEL, LCDC_RGB_INTF);
+               }
+#else
+               mfd->dma = &dma2_data;
+               spin_lock_irqsave(&mdp_spin_lock, flag);
+               mdp_intr_mask &= ~MDP_DMA_P_DONE;
+               outp32(MDP_INTR_ENABLE, mdp_intr_mask);
+               spin_unlock_irqrestore(&mdp_spin_lock, flag);
+#endif
+               break;
+
+       case TV_PANEL:
+               pdata->on = mdp_dma3_on;
+               pdata->off = mdp_dma3_off;
+               mfd->hw_refresh = TRUE;
+               mfd->dma_fnc = mdp_dma3_update;
+               mfd->dma = &dma3_data;
+               break;
+
+       default:
+               printk(KERN_ERR "mdp_probe: unknown device type!\n");
+               rc = -ENODEV;
+               goto mdp_probe_err;
+       }
+
+       /* set driver data */
+       platform_set_drvdata(msm_fb_dev, mfd);
+
+       rc = platform_device_add(msm_fb_dev);
+       if (rc) {
+               goto mdp_probe_err;
+       }
+
+       pdev_list[pdev_list_cnt++] = pdev;
+       return 0;
+
+      mdp_probe_err:
+       platform_device_put(msm_fb_dev);
+       return rc;
+}
+
+static void mdp_suspend_sub(void)
+{
+       /* cancel pipe ctrl worker */
+       cancel_delayed_work(&mdp_pipe_ctrl_worker);
+
+       /* for workder can't be cancelled... */
+       flush_workqueue(mdp_pipe_ctrl_wq);
+
+       /* let's wait for PPP completion */
+       while (mdp_block_power_cnt[MDP_PPP_BLOCK] > 0) ;
+
+       /* try to power down */
+       mdp_pipe_ctrl(MDP_MASTER_BLOCK, MDP_BLOCK_POWER_OFF, FALSE);
+}
+
+#if defined(CONFIG_PM) && !defined(CONFIG_HAS_EARLYSUSPEND)
+static int mdp_suspend(struct platform_device *pdev, pm_message_t state)
+{
+       mdp_suspend_sub();
+       return 0;
+}
+#endif
+
+#ifdef CONFIG_HAS_EARLYSUSPEND
+static void mdp_early_suspend(struct early_suspend *h)
+{
+       mdp_suspend_sub();
+}
+#endif
+
+static int mdp_remove(struct platform_device *pdev)
+{
+       iounmap(msm_mdp_base);
+       return 0;
+}
+
+static int mdp_register_driver(void)
+{
+#ifdef CONFIG_HAS_EARLYSUSPEND
+       early_suspend.level = EARLY_SUSPEND_LEVEL_DISABLE_FB - 1;
+       early_suspend.suspend = mdp_early_suspend;
+       register_early_suspend(&early_suspend);
+#endif
+
+       return platform_driver_register(&mdp_driver);
+}
+
+static int __init mdp_driver_init(void)
+{
+       int ret;
+
+       mdp_drv_init();
+
+       ret = mdp_register_driver();
+       if (ret) {
+               printk(KERN_ERR "mdp_register_driver() failed!\n");
+               return ret;
+       }
+
+#if defined(CONFIG_DEBUG_FS) && defined(CONFIG_FB_MSM_MDP40)
+       mdp4_debugfs_init();
+#endif
+
+       return 0;
+
+}
+
+module_init(mdp_driver_init);
diff --git a/drivers/staging/msm/mdp.h b/drivers/staging/msm/mdp.h
new file mode 100644 (file)
index 0000000..0a5d6ac
--- /dev/null
@@ -0,0 +1,695 @@
+/* Copyright (c) 2008-2010, Code Aurora Forum. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Code Aurora nor
+ *       the names of its contributors may be used to endorse or promote
+ *       products derived from this software without specific prior written
+ *       permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NON-INFRINGEMENT ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef MDP_H
+#define MDP_H
+
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/time.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/fb.h>
+#include <linux/hrtimer.h>
+#include "msm_mdp.h"
+
+#include <mach/hardware.h>
+#include <linux/io.h>
+
+#include <asm/system.h>
+#include <asm/mach-types.h>
+
+#include "msm_fb_panel.h"
+
+#ifdef CONFIG_MDP_PPP_ASYNC_OP
+#include "mdp_ppp_dq.h"
+#endif
+
+#ifdef BIT
+#undef BIT
+#endif
+
+#define BIT(x)  (1<<(x))
+
+#define MDPOP_NOP               0
+#define MDPOP_LR                BIT(0) /* left to right flip */
+#define MDPOP_UD                BIT(1) /* up and down flip */
+#define MDPOP_ROT90             BIT(2) /* rotate image to 90 degree */
+#define MDPOP_ROT180            (MDPOP_UD|MDPOP_LR)
+#define MDPOP_ROT270            (MDPOP_ROT90|MDPOP_UD|MDPOP_LR)
+#define MDPOP_ASCALE            BIT(7)
+#define MDPOP_ALPHAB            BIT(8) /* enable alpha blending */
+#define MDPOP_TRANSP            BIT(9) /* enable transparency */
+#define MDPOP_DITHER            BIT(10)        /* enable dither */
+#define MDPOP_SHARPENING       BIT(11) /* enable sharpening */
+#define MDPOP_BLUR             BIT(12) /* enable blur */
+#define MDPOP_FG_PM_ALPHA       BIT(13)
+
+struct mdp_table_entry {
+       uint32_t reg;
+       uint32_t val;
+};
+
+extern struct mdp_ccs mdp_ccs_yuv2rgb ;
+extern struct mdp_ccs mdp_ccs_rgb2yuv ;
+
+/*
+ * MDP Image Structure
+ */
+typedef struct mdpImg_ {
+       uint32 imgType;         /* Image type */
+       uint32 *bmy_addr;       /* bitmap or y addr */
+       uint32 *cbcr_addr;      /* cbcr addr */
+       uint32 width;           /* image width */
+       uint32 mdpOp;           /* image opertion (rotation,flip up/down, alpha/tp) */
+       uint32 tpVal;           /* transparency color */
+       uint32 alpha;           /* alpha percentage 0%(0x0) ~ 100%(0x100) */
+       int    sp_value;        /* sharpening strength */
+} MDPIMG;
+
+#ifdef CONFIG_MDP_PPP_ASYNC_OP
+#define MDP_OUTP(addr, data)   mdp_ppp_outdw((uint32_t)(addr), \
+                                        (uint32_t)(data))
+#else
+#define MDP_OUTP(addr, data) outpdw((addr), (data))
+#endif
+
+#define MDP_KTIME2USEC(kt) (kt.tv.sec*1000000 + kt.tv.nsec/1000)
+
+#define MDP_BASE msm_mdp_base
+
+typedef enum {
+       MDP_BC_SCALE_POINT2_POINT4,
+       MDP_BC_SCALE_POINT4_POINT6,
+       MDP_BC_SCALE_POINT6_POINT8,
+       MDP_BC_SCALE_POINT8_1,
+       MDP_BC_SCALE_UP,
+       MDP_PR_SCALE_POINT2_POINT4,
+       MDP_PR_SCALE_POINT4_POINT6,
+       MDP_PR_SCALE_POINT6_POINT8,
+       MDP_PR_SCALE_POINT8_1,
+       MDP_PR_SCALE_UP,
+       MDP_SCALE_BLUR,
+       MDP_INIT_SCALE
+} MDP_SCALE_MODE;
+
+typedef enum {
+       MDP_BLOCK_POWER_OFF,
+       MDP_BLOCK_POWER_ON
+} MDP_BLOCK_POWER_STATE;
+
+typedef enum {
+       MDP_MASTER_BLOCK,
+       MDP_CMD_BLOCK,
+       MDP_PPP_BLOCK,
+       MDP_DMA2_BLOCK,
+       MDP_DMA3_BLOCK,
+       MDP_DMA_S_BLOCK,
+       MDP_DMA_E_BLOCK,
+       MDP_OVERLAY0_BLOCK,
+       MDP_OVERLAY1_BLOCK,
+       MDP_MAX_BLOCK
+} MDP_BLOCK_TYPE;
+
+/* Let's keep Q Factor power of 2 for optimization */
+#define MDP_SCALE_Q_FACTOR 512
+
+#ifdef CONFIG_FB_MSM_MDP31
+#define MDP_MAX_X_SCALE_FACTOR (MDP_SCALE_Q_FACTOR*8)
+#define MDP_MIN_X_SCALE_FACTOR (MDP_SCALE_Q_FACTOR/8)
+#define MDP_MAX_Y_SCALE_FACTOR (MDP_SCALE_Q_FACTOR*8)
+#define MDP_MIN_Y_SCALE_FACTOR (MDP_SCALE_Q_FACTOR/8)
+#else
+#define MDP_MAX_X_SCALE_FACTOR (MDP_SCALE_Q_FACTOR*4)
+#define MDP_MIN_X_SCALE_FACTOR (MDP_SCALE_Q_FACTOR/4)
+#define MDP_MAX_Y_SCALE_FACTOR (MDP_SCALE_Q_FACTOR*4)
+#define MDP_MIN_Y_SCALE_FACTOR (MDP_SCALE_Q_FACTOR/4)
+#endif
+
+/* SHIM Q Factor */
+#define PHI_Q_FACTOR          29
+#define PQF_PLUS_5            (PHI_Q_FACTOR + 5)       /* due to 32 phases */
+#define PQF_PLUS_4            (PHI_Q_FACTOR + 4)
+#define PQF_PLUS_2            (PHI_Q_FACTOR + 2)       /* to get 4.0 */
+#define PQF_MINUS_2           (PHI_Q_FACTOR - 2)       /* to get 0.25 */
+#define PQF_PLUS_5_PLUS_2     (PQF_PLUS_5 + 2)
+#define PQF_PLUS_5_MINUS_2    (PQF_PLUS_5 - 2)
+
+#define MDP_CONVTP(tpVal) (((tpVal&0xF800)<<8)|((tpVal&0x7E0)<<5)|((tpVal&0x1F)<<3))
+
+#define MDPOP_ROTATION (MDPOP_ROT90|MDPOP_LR|MDPOP_UD)
+#define MDP_CHKBIT(val, bit) ((bit) == ((val) & (bit)))
+
+/* overlay interface API defines */
+typedef enum {
+       MORE_IBUF,
+       FINAL_IBUF,
+       COMPLETE_IBUF
+} MDP_IBUF_STATE;
+
+struct mdp_dirty_region {
+       __u32 xoffset;          /* source origin in the x-axis */
+       __u32 yoffset;          /* source origin in the y-axis */
+       __u32 width;            /* number of pixels in the x-axis */
+       __u32 height;           /* number of pixels in the y-axis */
+};
+
+/*
+ * MDP extended data types
+ */
+typedef struct mdp_roi_s {
+       uint32 x;
+       uint32 y;
+       uint32 width;
+       uint32 height;
+       int32 lcd_x;
+       int32 lcd_y;
+       uint32 dst_width;
+       uint32 dst_height;
+} MDP_ROI;
+
+typedef struct mdp_ibuf_s {
+       uint8 *buf;
+       uint32 bpp;
+       uint32 ibuf_type;
+       uint32 ibuf_width;
+       uint32 ibuf_height;
+
+       MDP_ROI roi;
+       MDPIMG mdpImg;
+
+       int32 dma_x;
+       int32 dma_y;
+       uint32 dma_w;
+       uint32 dma_h;
+
+       uint32 vsync_enable;
+       uint32 visible_swapped;
+} MDPIBUF;
+
+struct mdp_dma_data {
+       boolean busy;
+       boolean waiting;
+       struct mutex ov_mutex;
+       struct semaphore mutex;
+       struct completion comp;
+};
+
+#define MDP_CMD_DEBUG_ACCESS_BASE   (MDP_BASE+0x10000)
+
+#define MDP_DMA2_TERM 0x1
+#define MDP_DMA3_TERM 0x2
+#define MDP_PPP_TERM 0x4
+#define MDP_DMA_S_TERM 0x8
+#ifdef CONFIG_FB_MSM_MDP40
+#define MDP_DMA_E_TERM 0x10
+#define MDP_OVERLAY0_TERM 0x20
+#define MDP_OVERLAY1_TERM 0x40
+#endif
+
+#define ACTIVE_START_X_EN BIT(31)
+#define ACTIVE_START_Y_EN BIT(31)
+#define ACTIVE_HIGH 0
+#define ACTIVE_LOW 1
+#define MDP_DMA_S_DONE  BIT(2)
+#define LCDC_FRAME_START    BIT(15)
+#define LCDC_UNDERFLOW      BIT(16)
+
+#ifdef CONFIG_FB_MSM_MDP22
+#define MDP_DMA_P_DONE         BIT(2)
+#else
+#define MDP_DMA_P_DONE         BIT(14)
+#endif
+
+#define MDP_PPP_DONE                           BIT(0)
+#define TV_OUT_DMA3_DONE    BIT(6)
+#define TV_ENC_UNDERRUN     BIT(7)
+#define TV_OUT_DMA3_START   BIT(13)
+#define MDP_HIST_DONE       BIT(20)
+
+#ifdef CONFIG_FB_MSM_MDP22
+#define MDP_ANY_INTR_MASK (MDP_PPP_DONE| \
+                       MDP_DMA_P_DONE| \
+                       TV_ENC_UNDERRUN)
+#else
+#define MDP_ANY_INTR_MASK (MDP_PPP_DONE| \
+                       MDP_DMA_P_DONE| \
+                       MDP_DMA_S_DONE| \
+                       LCDC_UNDERFLOW| \
+                       MDP_HIST_DONE| \
+                       TV_ENC_UNDERRUN)
+#endif
+
+#define MDP_TOP_LUMA       16
+#define MDP_TOP_CHROMA     0
+#define MDP_BOTTOM_LUMA    19
+#define MDP_BOTTOM_CHROMA  3
+#define MDP_LEFT_LUMA      22
+#define MDP_LEFT_CHROMA    6
+#define MDP_RIGHT_LUMA     25
+#define MDP_RIGHT_CHROMA   9
+
+#define CLR_G 0x0
+#define CLR_B 0x1
+#define CLR_R 0x2
+#define CLR_ALPHA 0x3
+
+#define CLR_Y  CLR_G
+#define CLR_CB CLR_B
+#define CLR_CR CLR_R
+
+/* from lsb to msb */
+#define MDP_GET_PACK_PATTERN(a,x,y,z,bit) (((a)<<(bit*3))|((x)<<(bit*2))|((y)<<bit)|(z))
+
+/*
+ * 0x0000 0x0004 0x0008 MDP sync config
+ */
+#ifdef CONFIG_FB_MSM_MDP22
+#define MDP_SYNCFG_HGT_LOC 22
+#define MDP_SYNCFG_VSYNC_EXT_EN BIT(21)
+#define MDP_SYNCFG_VSYNC_INT_EN BIT(20)
+#else
+#define MDP_SYNCFG_HGT_LOC 21
+#define MDP_SYNCFG_VSYNC_EXT_EN BIT(20)
+#define MDP_SYNCFG_VSYNC_INT_EN BIT(19)
+#define MDP_HW_VSYNC
+#endif
+
+/*
+ * 0x0018 MDP VSYNC THREASH
+ */
+#define MDP_PRIM_BELOW_LOC 0
+#define MDP_PRIM_ABOVE_LOC 8
+
+/*
+ * MDP_PRIMARY_VSYNC_OUT_CTRL
+ * 0x0080,84,88 internal vsync pulse config
+ */
+#define VSYNC_PULSE_EN BIT(31)
+#define VSYNC_PULSE_INV BIT(30)
+
+/*
+ * 0x008c MDP VSYNC CONTROL
+ */
+#define DISP0_VSYNC_MAP_VSYNC0 0
+#define DISP0_VSYNC_MAP_VSYNC1 BIT(0)
+#define DISP0_VSYNC_MAP_VSYNC2 BIT(0)|BIT(1)
+
+#define DISP1_VSYNC_MAP_VSYNC0 0
+#define DISP1_VSYNC_MAP_VSYNC1 BIT(2)
+#define DISP1_VSYNC_MAP_VSYNC2 BIT(2)|BIT(3)
+
+#define PRIMARY_LCD_SYNC_EN BIT(4)
+#define PRIMARY_LCD_SYNC_DISABLE 0
+
+#define SECONDARY_LCD_SYNC_EN BIT(5)
+#define SECONDARY_LCD_SYNC_DISABLE 0
+
+#define EXTERNAL_LCD_SYNC_EN BIT(6)
+#define EXTERNAL_LCD_SYNC_DISABLE 0
+
+/*
+ * 0x101f0 MDP VSYNC Threshold
+ */
+#define VSYNC_THRESHOLD_ABOVE_LOC 0
+#define VSYNC_THRESHOLD_BELOW_LOC 16
+#define VSYNC_ANTI_TEAR_EN BIT(31)
+
+/*
+ * 0x10004 command config
+ */
+#define MDP_CMD_DBGBUS_EN BIT(0)
+
+/*
+ * 0x10124 or 0x101d4PPP source config
+ */
+#define PPP_SRC_C0G_8BITS (BIT(1)|BIT(0))
+#define PPP_SRC_C1B_8BITS (BIT(3)|BIT(2))
+#define PPP_SRC_C2R_8BITS (BIT(5)|BIT(4))
+#define PPP_SRC_C3A_8BITS (BIT(7)|BIT(6))
+
+#define PPP_SRC_C0G_6BITS BIT(1)
+#define PPP_SRC_C1B_6BITS BIT(3)
+#define PPP_SRC_C2R_6BITS BIT(5)
+
+#define PPP_SRC_C0G_5BITS BIT(0)
+#define PPP_SRC_C1B_5BITS BIT(2)
+#define PPP_SRC_C2R_5BITS BIT(4)
+
+#define PPP_SRC_C3_ALPHA_EN BIT(8)
+
+#define PPP_SRC_BPP_INTERLVD_1BYTES 0
+#define PPP_SRC_BPP_INTERLVD_2BYTES BIT(9)
+#define PPP_SRC_BPP_INTERLVD_3BYTES BIT(10)
+#define PPP_SRC_BPP_INTERLVD_4BYTES (BIT(10)|BIT(9))
+
+#define PPP_SRC_BPP_ROI_ODD_X BIT(11)
+#define PPP_SRC_BPP_ROI_ODD_Y BIT(12)
+#define PPP_SRC_INTERLVD_2COMPONENTS BIT(13)
+#define PPP_SRC_INTERLVD_3COMPONENTS BIT(14)
+#define PPP_SRC_INTERLVD_4COMPONENTS (BIT(14)|BIT(13))
+
+/*
+ * RGB666 unpack format
+ * TIGHT means R6+G6+B6 together
+ * LOOSE means R6+2 +G6+2+ B6+2 (with MSB)
+ * or 2+R6 +2+G6 +2+B6 (with LSB)
+ */
+#define PPP_SRC_UNPACK_TIGHT BIT(17)
+#define PPP_SRC_UNPACK_LOOSE 0
+#define PPP_SRC_UNPACK_ALIGN_LSB 0
+#define PPP_SRC_UNPACK_ALIGN_MSB BIT(18)
+
+#define PPP_SRC_FETCH_PLANES_INTERLVD 0
+#define PPP_SRC_FETCH_PLANES_PSEUDOPLNR BIT(20)
+
+#define PPP_SRC_WMV9_MODE BIT(21)      /* window media version 9 */
+
+/*
+ * 0x10138 PPP operation config
+ */
+#define PPP_OP_SCALE_X_ON BIT(0)
+#define PPP_OP_SCALE_Y_ON BIT(1)
+
+#define PPP_OP_CONVERT_RGB2YCBCR 0
+#define PPP_OP_CONVERT_YCBCR2RGB BIT(2)
+#define PPP_OP_CONVERT_ON BIT(3)
+
+#define PPP_OP_CONVERT_MATRIX_PRIMARY 0
+#define PPP_OP_CONVERT_MATRIX_SECONDARY BIT(4)
+
+#define PPP_OP_LUT_C0_ON BIT(5)
+#define PPP_OP_LUT_C1_ON BIT(6)
+#define PPP_OP_LUT_C2_ON BIT(7)
+
+/* rotate or blend enable */
+#define PPP_OP_ROT_ON BIT(8)
+
+#define PPP_OP_ROT_90 BIT(9)
+#define PPP_OP_FLIP_LR BIT(10)
+#define PPP_OP_FLIP_UD BIT(11)
+
+#define PPP_OP_BLEND_ON BIT(12)
+
+#define PPP_OP_BLEND_SRCPIXEL_ALPHA 0
+#define PPP_OP_BLEND_DSTPIXEL_ALPHA BIT(13)
+#define PPP_OP_BLEND_CONSTANT_ALPHA BIT(14)
+#define PPP_OP_BLEND_SRCPIXEL_TRANSP (BIT(13)|BIT(14))
+
+#define PPP_OP_BLEND_ALPHA_BLEND_NORMAL 0
+#define PPP_OP_BLEND_ALPHA_BLEND_REVERSE BIT(15)
+
+#define PPP_OP_DITHER_EN BIT(16)
+
+#define PPP_OP_COLOR_SPACE_RGB 0
+#define PPP_OP_COLOR_SPACE_YCBCR BIT(17)
+
+#define PPP_OP_SRC_CHROMA_RGB 0
+#define PPP_OP_SRC_CHROMA_H2V1 BIT(18)
+#define PPP_OP_SRC_CHROMA_H1V2 BIT(19)
+#define PPP_OP_SRC_CHROMA_420 (BIT(18)|BIT(19))
+#define PPP_OP_SRC_CHROMA_COSITE 0
+#define PPP_OP_SRC_CHROMA_OFFSITE BIT(20)
+
+#define PPP_OP_DST_CHROMA_RGB 0
+#define PPP_OP_DST_CHROMA_H2V1 BIT(21)
+#define PPP_OP_DST_CHROMA_H1V2 BIT(22)
+#define PPP_OP_DST_CHROMA_420 (BIT(21)|BIT(22))
+#define PPP_OP_DST_CHROMA_COSITE 0
+#define PPP_OP_DST_CHROMA_OFFSITE BIT(23)
+
+#define PPP_BLEND_CALPHA_TRNASP BIT(24)
+
+#define PPP_OP_BG_CHROMA_RGB 0
+#define PPP_OP_BG_CHROMA_H2V1 BIT(25)
+#define PPP_OP_BG_CHROMA_H1V2 BIT(26)
+#define PPP_OP_BG_CHROMA_420 BIT(25)|BIT(26)
+#define PPP_OP_BG_CHROMA_SITE_COSITE 0
+#define PPP_OP_BG_CHROMA_SITE_OFFSITE BIT(27)
+#define PPP_OP_DEINT_EN BIT(29)
+
+#define PPP_BLEND_BG_USE_ALPHA_SEL      (1 << 0)
+#define PPP_BLEND_BG_ALPHA_REVERSE      (1 << 3)
+#define PPP_BLEND_BG_SRCPIXEL_ALPHA     (0 << 1)
+#define PPP_BLEND_BG_DSTPIXEL_ALPHA     (1 << 1)
+#define PPP_BLEND_BG_CONSTANT_ALPHA     (2 << 1)
+#define PPP_BLEND_BG_CONST_ALPHA_VAL(x) ((x) << 24)
+
+#define PPP_OP_DST_RGB 0
+#define PPP_OP_DST_YCBCR BIT(30)
+/*
+ * 0x10150 PPP destination config
+ */
+#define PPP_DST_C0G_8BIT (BIT(0)|BIT(1))
+#define PPP_DST_C1B_8BIT (BIT(3)|BIT(2))
+#define PPP_DST_C2R_8BIT (BIT(5)|BIT(4))
+#define PPP_DST_C3A_8BIT (BIT(7)|BIT(6))
+
+#define PPP_DST_C0G_6BIT BIT(1)
+#define PPP_DST_C1B_6BIT BIT(3)
+#define PPP_DST_C2R_6BIT BIT(5)
+
+#define PPP_DST_C0G_5BIT BIT(0)
+#define PPP_DST_C1B_5BIT BIT(2)
+#define PPP_DST_C2R_5BIT BIT(4)
+
+#define PPP_DST_C3A_8BIT (BIT(7)|BIT(6))
+#define PPP_DST_C3ALPHA_EN BIT(8)
+
+#define PPP_DST_PACKET_CNT_INTERLVD_2ELEM BIT(9)
+#define PPP_DST_PACKET_CNT_INTERLVD_3ELEM BIT(10)
+#define PPP_DST_PACKET_CNT_INTERLVD_4ELEM (BIT(10)|BIT(9))
+#define PPP_DST_PACKET_CNT_INTERLVD_6ELEM (BIT(11)|BIT(9))
+
+#define PPP_DST_PACK_LOOSE 0
+#define PPP_DST_PACK_TIGHT BIT(13)
+#define PPP_DST_PACK_ALIGN_LSB 0
+#define PPP_DST_PACK_ALIGN_MSB BIT(14)
+
+#define PPP_DST_OUT_SEL_AXI 0
+#define PPP_DST_OUT_SEL_MDDI BIT(15)
+
+#define PPP_DST_BPP_2BYTES BIT(16)
+#define PPP_DST_BPP_3BYTES BIT(17)
+#define PPP_DST_BPP_4BYTES (BIT(17)|BIT(16))
+
+#define PPP_DST_PLANE_INTERLVD 0
+#define PPP_DST_PLANE_PLANAR BIT(18)
+#define PPP_DST_PLANE_PSEUDOPLN BIT(19)
+
+#define PPP_DST_TO_TV BIT(20)
+
+#define PPP_DST_MDDI_PRIMARY 0
+#define PPP_DST_MDDI_SECONDARY BIT(21)
+#define PPP_DST_MDDI_EXTERNAL BIT(22)
+
+/*
+ * 0x10180 DMA config
+ */
+#define DMA_DSTC0G_8BITS (BIT(1)|BIT(0))
+#define DMA_DSTC1B_8BITS (BIT(3)|BIT(2))
+#define DMA_DSTC2R_8BITS (BIT(5)|BIT(4))
+
+#define DMA_DSTC0G_6BITS BIT(1)
+#define DMA_DSTC1B_6BITS BIT(3)
+#define DMA_DSTC2R_6BITS BIT(5)
+
+#define DMA_DSTC0G_5BITS BIT(0)
+#define DMA_DSTC1B_5BITS BIT(2)
+#define DMA_DSTC2R_5BITS BIT(4)
+
+#define DMA_PACK_TIGHT                      BIT(6)
+#define DMA_PACK_LOOSE                      0
+#define DMA_PACK_ALIGN_LSB                  0
+/*
+ * use DMA_PACK_ALIGN_MSB if the upper 6 bits from 8 bits output
+ * from LCDC block maps into 6 pins out to the panel
+ */
+#define DMA_PACK_ALIGN_MSB                  BIT(7)
+#define DMA_PACK_PATTERN_RGB \
+       (MDP_GET_PACK_PATTERN(0, CLR_R, CLR_G, CLR_B, 2)<<8)
+#define DMA_PACK_PATTERN_BGR \
+       (MDP_GET_PACK_PATTERN(0, CLR_B, CLR_G, CLR_R, 2)<<8)
+#define DMA_OUT_SEL_AHB                     0
+#define DMA_OUT_SEL_LCDC                    BIT(20)
+#define DMA_IBUF_FORMAT_RGB888              0
+#define DMA_IBUF_FORMAT_xRGB8888_OR_ARGB8888  BIT(26)
+
+#ifdef CONFIG_FB_MSM_MDP22
+#define DMA_OUT_SEL_MDDI BIT(14)
+#define DMA_AHBM_LCD_SEL_PRIMARY 0
+#define DMA_AHBM_LCD_SEL_SECONDARY BIT(15)
+#define DMA_IBUF_C3ALPHA_EN BIT(16)
+#define DMA_DITHER_EN BIT(17)
+#define DMA_MDDI_DMAOUT_LCD_SEL_PRIMARY 0
+#define DMA_MDDI_DMAOUT_LCD_SEL_SECONDARY BIT(18)
+#define DMA_MDDI_DMAOUT_LCD_SEL_EXTERNAL BIT(19)
+#define DMA_IBUF_FORMAT_RGB565 BIT(20)
+#define DMA_IBUF_FORMAT_RGB888_OR_ARGB8888 0
+#define DMA_IBUF_NONCONTIGUOUS BIT(21)
+#else
+#define DMA_OUT_SEL_MDDI                    BIT(19)
+#define DMA_AHBM_LCD_SEL_PRIMARY            0
+#define DMA_AHBM_LCD_SEL_SECONDARY          0
+#define DMA_IBUF_C3ALPHA_EN                 0
+#define DMA_DITHER_EN                       BIT(24)
+#define DMA_MDDI_DMAOUT_LCD_SEL_PRIMARY     0
+#define DMA_MDDI_DMAOUT_LCD_SEL_SECONDARY   0
+#define DMA_MDDI_DMAOUT_LCD_SEL_EXTERNAL    0
+#define DMA_IBUF_FORMAT_RGB565              BIT(25)
+#define DMA_IBUF_NONCONTIGUOUS 0
+#endif
+
+/*
+ * MDDI Register
+ */
+#define MDDI_VDO_PACKET_DESC  0x5666
+
+#ifdef CONFIG_FB_MSM_MDP40
+#define MDP_INTR_ENABLE                (msm_mdp_base + 0x0050)
+#define MDP_INTR_STATUS                (msm_mdp_base + 0x0054)
+#define MDP_INTR_CLEAR         (msm_mdp_base + 0x0058)
+#define MDP_EBI2_LCD0          (msm_mdp_base + 0x0060)
+#define MDP_EBI2_LCD1          (msm_mdp_base + 0x0064)
+#define MDP_EBI2_PORTMAP_MODE  (msm_mdp_base + 0x0070)
+
+#define MDP_DMA_P_HIST_INTR_STATUS     (msm_mdp_base + 0x95014)
+#define MDP_DMA_P_HIST_INTR_CLEAR      (msm_mdp_base + 0x95018)
+#define MDP_DMA_P_HIST_INTR_ENABLE     (msm_mdp_base + 0x9501C)
+#else
+#define MDP_INTR_ENABLE                (msm_mdp_base + 0x0020)
+#define MDP_INTR_STATUS                (msm_mdp_base + 0x0024)
+#define MDP_INTR_CLEAR         (msm_mdp_base + 0x0028)
+#define MDP_EBI2_LCD0          (msm_mdp_base + 0x003c)
+#define MDP_EBI2_LCD1          (msm_mdp_base + 0x0040)
+#define MDP_EBI2_PORTMAP_MODE  (msm_mdp_base + 0x005c)
+#endif
+
+#define MDP_FULL_BYPASS_WORD43  (msm_mdp_base + 0x101ac)
+
+#define MDP_CSC_PFMVn(n)       (msm_mdp_base + 0x40400 + 4 * (n))
+#define MDP_CSC_PRMVn(n)       (msm_mdp_base + 0x40440 + 4 * (n))
+#define MDP_CSC_PRE_BV1n(n)    (msm_mdp_base + 0x40500 + 4 * (n))
+#define MDP_CSC_PRE_BV2n(n)    (msm_mdp_base + 0x40540 + 4 * (n))
+#define MDP_CSC_POST_BV1n(n)   (msm_mdp_base + 0x40580 + 4 * (n))
+#define MDP_CSC_POST_BV2n(n)   (msm_mdp_base + 0x405c0 + 4 * (n))
+
+#ifdef CONFIG_FB_MSM_MDP31
+#define MDP_CSC_PRE_LV1n(n)    (msm_mdp_base + 0x40600 + 4 * (n))
+#define MDP_CSC_PRE_LV2n(n)    (msm_mdp_base + 0x40640 + 4 * (n))
+#define MDP_CSC_POST_LV1n(n)   (msm_mdp_base + 0x40680 + 4 * (n))
+#define MDP_CSC_POST_LV2n(n)   (msm_mdp_base + 0x406c0 + 4 * (n))
+#define MDP_PPP_SCALE_COEFF_LSBn(n)    (msm_mdp_base + 0x50400 + 8 * (n))
+#define MDP_PPP_SCALE_COEFF_MSBn(n)    (msm_mdp_base + 0x50404 + 8 * (n))
+
+#define SCALE_D0_SET  0
+#define SCALE_D1_SET  BIT(0)
+#define SCALE_D2_SET  BIT(1)
+#define SCALE_U1_SET  (BIT(0)|BIT(1))
+
+#else
+#define MDP_CSC_PRE_LV1n(n)    (msm_mdp_base + 0x40580 + 4 * (n))
+#endif
+
+#define MDP_CURSOR_WIDTH 64
+#define MDP_CURSOR_HEIGHT 64
+#define MDP_CURSOR_SIZE (MDP_CURSOR_WIDTH*MDP_CURSOR_WIDTH*4)
+
+#define MDP_DMA_P_LUT_C0_EN   BIT(0)
+#define MDP_DMA_P_LUT_C1_EN   BIT(1)
+#define MDP_DMA_P_LUT_C2_EN   BIT(2)
+#define MDP_DMA_P_LUT_POST    BIT(4)
+
+void mdp_hw_init(void);
+int mdp_ppp_pipe_wait(void);
+void mdp_pipe_kickoff(uint32 term, struct msm_fb_data_type *mfd);
+void mdp_pipe_ctrl(MDP_BLOCK_TYPE block, MDP_BLOCK_POWER_STATE state,
+                  boolean isr);
+void mdp_set_dma_pan_info(struct fb_info *info, struct mdp_dirty_region *dirty,
+                         boolean sync);
+void mdp_dma_pan_update(struct fb_info *info);
+void mdp_refresh_screen(unsigned long data);
+int mdp_ppp_blit(struct fb_info *info, struct mdp_blit_req *req,
+               struct file **pp_src, struct file **pp_dest);
+void mdp_lcd_update_workqueue_handler(struct work_struct *work);
+void mdp_vsync_resync_workqueue_handler(struct work_struct *work);
+void mdp_dma2_update(struct msm_fb_data_type *mfd);
+void mdp_config_vsync(struct msm_fb_data_type *);
+uint32 mdp_get_lcd_line_counter(struct msm_fb_data_type *mfd);
+enum hrtimer_restart mdp_dma2_vsync_hrtimer_handler(struct hrtimer *ht);
+void mdp_set_scale(MDPIBUF *iBuf,
+                  uint32 dst_roi_width,
+                  uint32 dst_roi_height,
+                  boolean inputRGB, boolean outputRGB, uint32 *pppop_reg_ptr);
+void mdp_init_scale_table(void);
+void mdp_adjust_start_addr(uint8 **src0,
+                          uint8 **src1,
+                          int v_slice,
+                          int h_slice,
+                          int x,
+                          int y,
+                          uint32 width,
+                          uint32 height, int bpp, MDPIBUF *iBuf, int layer);
+void mdp_set_blend_attr(MDPIBUF *iBuf,
+                       uint32 *alpha,
+                       uint32 *tpVal,
+                       uint32 perPixelAlpha, uint32 *pppop_reg_ptr);
+
+int mdp_dma3_on(struct platform_device *pdev);
+int mdp_dma3_off(struct platform_device *pdev);
+void mdp_dma3_update(struct msm_fb_data_type *mfd);
+
+int mdp_lcdc_on(struct platform_device *pdev);
+int mdp_lcdc_off(struct platform_device *pdev);
+void mdp_lcdc_update(struct msm_fb_data_type *mfd);
+int mdp_hw_cursor_update(struct fb_info *info, struct fb_cursor *cursor);
+void mdp_enable_irq(uint32 term);
+void mdp_disable_irq(uint32 term);
+void mdp_disable_irq_nolock(uint32 term);
+uint32_t mdp_get_bytes_per_pixel(uint32_t format);
+
+#ifdef MDP_HW_VSYNC
+void mdp_hw_vsync_clk_enable(struct msm_fb_data_type *mfd);
+void mdp_hw_vsync_clk_disable(struct msm_fb_data_type *mfd);
+#endif
+
+void mdp_dma_s_update(struct msm_fb_data_type *mfd);
+
+/* Added to support flipping */
+void mdp_set_offset_info(struct fb_info *info, uint32 address, uint32 interval);
+
+int get_gem_img(struct mdp_img *img, unsigned long *start,
+               unsigned long *len);
+int get_img(struct mdp_img *img, struct fb_info *info,
+               unsigned long *start, unsigned long *len,
+               struct file **pp_file);
+
+
+/*int get_img(struct msmfb_data *img, struct fb_info *info,
+       unsigned long *start, unsigned long *len, struct file **pp_file);*/
+#endif /* MDP_H */
diff --git a/drivers/staging/msm/mdp4.h b/drivers/staging/msm/mdp4.h
new file mode 100644 (file)
index 0000000..26ec8f1
--- /dev/null
@@ -0,0 +1,352 @@
+/* Copyright (c) 2008-2009, Code Aurora Forum. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Code Aurora nor
+ *       the names of its contributors may be used to endorse or promote
+ *       products derived from this software without specific prior written
+ *       permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NON-INFRINGEMENT ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef MDP4_H
+#define MDP4_H
+
+extern struct mdp_dma_data dma2_data;
+extern struct mdp_dma_data dma_s_data;
+extern struct mdp_dma_data dma_e_data;
+extern struct mdp_histogram mdp_hist;
+extern struct completion mdp_hist_comp;
+extern boolean mdp_is_in_isr;
+extern uint32 mdp_intr_mask;
+extern spinlock_t mdp_spin_lock;
+
+
+#define MDP4_NONBLOCKING       /* enable non blocking ioctl */
+
+#define MDP4_OVERLAYPROC0_BASE 0x10000
+#define MDP4_OVERLAYPROC1_BASE 0x18000
+
+#define MDP4_VIDEO_BASE 0x20000
+#define MDP4_VIDEO_OFF 0x10000
+
+#define MDP4_RGB_BASE 0x40000
+#define MDP4_RGB_OFF 0x10000
+
+enum {         /* display */
+       PRIMARY_INTF_SEL,
+       SECONDARY_INTF_SEL,
+       EXTERNAL_INTF_SEL
+};
+
+enum {
+       LCDC_RGB_INTF,
+       DTV_INTF = LCDC_RGB_INTF,
+       MDDI_LCDC_INTF,
+       MDDI_INTF,
+       EBI2_INTF
+};
+
+enum {
+       MDDI_PRIMARY_SET,
+       MDDI_SECONDARY_SET,
+       MDDI_EXTERNAL_SET
+};
+
+enum {
+       EBI2_LCD0,
+       EBI2_LCD1
+};
+
+enum {
+       OVERLAY_MODE_NONE,
+       OVERLAY_MODE_BLT
+};
+
+enum {
+       OVERLAY_REFRESH_ON_DEMAND,
+       OVERLAY_REFRESH_VSYNC,
+       OVERLAY_REFRESH_VSYNC_HALF,
+       OVERLAY_REFRESH_VSYNC_QUARTER
+};
+
+enum {
+       OVERLAY_FRAMEBUF,
+       OVERLAY_DIRECTOUT
+};
+
+/* system interrupts */
+#define INTR_OVERLAY0_DONE             BIT(0)
+#define INTR_OVERLAY1_DONE             BIT(1)
+#define INTR_DMA_S_DONE                        BIT(2)
+#define INTR_DMA_E_DONE                        BIT(3)
+#define INTR_DMA_P_DONE                        BIT(4)
+#define INTR_VG1_HISTOGRAM             BIT(5)
+#define INTR_VG2_HISTOGRAM             BIT(6)
+#define INTR_PRIMARY_VSYNC             BIT(7)
+#define INTR_PRIMARY_INTF_UDERRUN      BIT(8)
+#define INTR_EXTERNAL_VSYNC            BIT(9)
+#define INTR_EXTERNAL_INTF_UDERRUN     BIT(10)
+#define INTR_DMA_P_HISTOGRAM           BIT(17)
+
+/* histogram interrupts */
+#define INTR_HIST_DONE                 BIT(0)
+#define INTR_HIST_RESET_SEQ_DONE       BIT(1)
+
+
+#ifdef CONFIG_FB_MSM_OVERLAY
+#define MDP4_ANY_INTR_MASK     (INTR_OVERLAY0_DONE)
+#else
+#define MDP4_ANY_INTR_MASK     (INTR_DMA_P_DONE)
+#endif
+
+enum {
+       OVERLAY_PIPE_RGB1,
+       OVERLAY_PIPE_RGB2,
+};
+
+enum {
+       OVERLAY_PIPE_VG1,       /* video/graphic */
+       OVERLAY_PIPE_VG2
+};
+
+enum {
+       OVERLAY_TYPE_RGB,
+       OVERLAY_TYPE_VG         /* video/graphic */
+};
+
+enum {
+       MDP4_MIXER0,
+       MDP4_MIXER1
+};
+
+#define MDP4_MAX_MIXER 2
+
+enum {
+       OVERLAY_PLANE_INTERLEAVED,
+       OVERLAY_PLANE_PLANAR,
+       OVERLAY_PLANE_PSEUDO_PLANAR
+};
+
+enum {
+       MDP4_MIXER_STAGE_UNUNSED,       /* pipe not used */
+       MDP4_MIXER_STAGE_BASE,
+       MDP4_MIXER_STAGE0,      /* zorder 0 */
+       MDP4_MIXER_STAGE1,      /* zorder 1 */
+       MDP4_MIXER_STAGE2       /* zorder 2 */
+};
+
+#define MDP4_MAX_STAGE 4
+
+enum {
+       MDP4_FRAME_FORMAT_LINEAR,
+       MDP4_FRAME_FORMAT_ARGB_TILE,
+       MDP4_FRAME_FORMAT_VIDEO_SUPERTILE
+};
+
+enum {
+       MDP4_CHROMA_RGB,
+       MDP4_CHROMA_H2V1,
+       MDP4_CHROMA_H1V2,
+       MDP4_CHROMA_420
+};
+
+#define MDP4_BLEND_BG_TRANSP_EN                BIT(9)
+#define MDP4_BLEND_FG_TRANSP_EN                BIT(8)
+#define MDP4_BLEND_BG_MOD_ALPHA                BIT(7)
+#define MDP4_BLEND_BG_INV_ALPHA                BIT(6)
+#define MDP4_BLEND_BG_ALPHA_FG_CONST   (0 << 4)
+#define MDP4_BLEND_BG_ALPHA_BG_CONST   (1 << 4)
+#define MDP4_BLEND_BG_ALPHA_FG_PIXEL   (2 << 4)
+#define MDP4_BLEND_BG_ALPHA_BG_PIXEL   (3 << 4)
+#define MDP4_BLEND_FG_MOD_ALPHA                BIT(3)
+#define MDP4_BLEND_FG_INV_ALPHA                BIT(2)
+#define MDP4_BLEND_FG_ALPHA_FG_CONST   (0 << 0)
+#define MDP4_BLEND_FG_ALPHA_BG_CONST   (1 << 0)
+#define MDP4_BLEND_FG_ALPHA_FG_PIXEL   (2 << 0)
+#define MDP4_BLEND_FG_ALPHA_BG_PIXEL   (3 << 0)
+
+#define MDP4_FORMAT_SOLID_FILL         BIT(22)
+#define MDP4_FORMAT_UNPACK_ALIGN_MSB   BIT(18)
+#define MDP4_FORMAT_UNPACK_TIGHT       BIT(17)
+#define MDP4_FORMAT_90_ROTATED         BIT(12)
+#define MDP4_FORMAT_ALPHA_ENABLE       BIT(8)
+
+#define MDP4_OP_DEINT_ODD_REF          BIT(19)
+#define MDP4_OP_IGC_LUT_EN     BIT(16)
+#define MDP4_OP_DITHER_EN      BIT(15)
+#define MDP4_OP_FLIP_UD                BIT(14)
+#define MDP4_OP_FLIP_LR                BIT(13)
+#define MDP4_OP_CSC_EN         BIT(11)
+#define MDP4_OP_SRC_DATA_YCBCR BIT(9)
+#define MDP4_OP_SCALEY_FIR             (0 << 4)
+#define MDP4_OP_SCALEY_MN_PHASE        (1 << 4)
+#define MDP4_OP_SCALEY_PIXEL_RPT       (2 << 4)
+#define MDP4_OP_SCALEX_FIR             (0 << 2)
+#define MDP4_OP_SCALEX_MN_PHASE        (1 << 2)
+#define MDP4_OP_SCALEX_PIXEL_RPT       (2 << 2)
+#define MDP4_OP_SCALEY_EN      BIT(1)
+#define MDP4_OP_SCALEX_EN      BIT(0)
+
+#define MDP4_PIPE_PER_MIXER    2
+
+#define MDP4_MAX_PLANE         4
+
+#define MDP4_MAX_VIDEO_PIPE 2
+#define MDP4_MAX_RGB_PIPE 2
+#define MDP4_MAX_OVERLAY_PIPE  16
+
+
+struct mdp4_overlay_pipe {
+       uint32 pipe_type;               /* rgb, video/graphic */
+       uint32 pipe_num;
+       uint32 pipe_ndx;
+       uint32 mixer_num;               /* which mixer used */
+       uint32 mixer_stage;             /* which stage of mixer used */
+       uint32 src_format;
+       uint32 src_width;       /* source img width */
+       uint32 src_height;      /* source img height */
+       uint32 src_w;           /* roi */
+       uint32 src_h;           /* roi */
+       uint32 src_x;           /* roi */
+       uint32 src_y;           /* roi */
+       uint32 dst_w;           /* roi */
+       uint32 dst_h;           /* roi */
+       uint32 dst_x;           /* roi */
+       uint32 dst_y;           /* roi */
+       uint32 op_mode;
+       uint32 transp;
+       uint32 blend_op;
+       uint32 phasex_step;
+       uint32 phasey_step;
+       uint32 alpha;
+       uint32 is_fg;           /* control alpha & color key */
+       uint32 srcp0_addr;      /* interleave, luma */
+       uint32 srcp0_ystride;
+       uint32 srcp1_addr;      /* pseudoplanar, chroma plane */
+       uint32 srcp1_ystride;
+       uint32 srcp2_addr;      /* planar color 2*/
+       uint32 srcp2_ystride;
+       uint32 srcp3_addr;      /* alpha/color 3 */
+       uint32 srcp3_ystride;
+       uint32 fetch_plane;
+       uint32 frame_format;            /* video */
+       uint32 chroma_site;             /* video */
+       uint32 chroma_sample;           /* video */
+       uint32 solid_fill;
+       uint32 vc1_reduce;              /* video */
+       uint32 fatch_planes;            /* video */
+       uint32 unpack_align_msb;/* 0 to LSB, 1 to MSB */
+       uint32 unpack_tight;/* 0 for loose, 1 for tight */
+       uint32 unpack_count;/* 0 = 1 component, 1 = 2 component ... */
+       uint32 rotated_90; /* has been rotated 90 degree */
+       uint32 bpp;     /* byte per pixel */
+       uint32 alpha_enable;/*  source has alpha */
+       /*
+        * number of bits for source component,
+        * 0 = 1 bit, 1 = 2 bits, 2 = 6 bits, 3 = 8 bits
+        */
+       uint32 a_bit;   /* component 3, alpha */
+       uint32 r_bit;   /* component 2, R_Cr */
+       uint32 b_bit;   /* component 1, B_Cb */
+       uint32 g_bit;   /* component 0, G_lumz */
+       /*
+        * unpack pattern
+        * A = C3, R = C2, B = C1, G = C0
+        */
+       uint32 element3; /* 0 = C0, 1 = C1, 2 = C2, 3 = C3 */
+       uint32 element2; /* 0 = C0, 1 = C1, 2 = C2, 3 = C3 */
+       uint32 element1; /* 0 = C0, 1 = C1, 2 = C2, 3 = C3 */
+       uint32 element0; /* 0 = C0, 1 = C1, 2 = C2, 3 = C3 */
+       struct completion comp;
+       struct mdp_overlay req_data;
+};
+
+void mdp4_sw_reset(unsigned long bits);
+void mdp4_display_intf_sel(int output, unsigned long intf);
+void mdp4_overlay_cfg(int layer, int blt_mode, int refresh, int direct_out);
+void mdp4_ebi2_lcd_setup(int lcd, unsigned long base, int ystride);
+void mdp4_mddi_setup(int which, unsigned long id);
+unsigned long mdp4_display_status(void);
+void mdp4_enable_clk_irq(void);
+void mdp4_disable_clk_irq(void);
+void mdp4_dma_p_update(struct msm_fb_data_type *mfd);
+void mdp4_dma_s_update(struct msm_fb_data_type *mfd);
+void mdp_pipe_ctrl(MDP_BLOCK_TYPE block, MDP_BLOCK_POWER_STATE state,
+                  boolean isr);
+void mdp4_pipe_kickoff(uint32 pipe, struct msm_fb_data_type *mfd);
+int mdp4_lcdc_on(struct platform_device *pdev);
+int mdp4_lcdc_off(struct platform_device *pdev);
+void mdp4_lcdc_update(struct msm_fb_data_type *mfd);
+void mdp4_intr_clear_set(ulong clear, ulong set);
+void mdp4_dma_p_cfg(void);
+void mdp4_hw_init(void);
+void mdp4_isr_read(int);
+void mdp4_clear_lcdc(void);
+void mdp4_mixer_blend_init(int mixer_num);
+void mdp4_vg_qseed_init(int vg_num);
+void mdp4_vg_csc_mv_setup(int vp_num);
+void mdp4_vg_csc_pre_bv_setup(int vp_num);
+void mdp4_vg_csc_post_bv_setup(int vp_num);
+void mdp4_vg_csc_pre_lv_setup(int vp_num);
+void mdp4_vg_csc_post_lv_setup(int vp_num);
+irqreturn_t mdp4_isr(int irq, void *ptr);
+void mdp4_overlay_format_to_pipe(uint32 format, struct mdp4_overlay_pipe *pipe);
+uint32 mdp4_overlay_format(struct mdp4_overlay_pipe *pipe);
+uint32 mdp4_overlay_unpack_pattern(struct mdp4_overlay_pipe *pipe);
+uint32 mdp4_overlay_op_mode(struct mdp4_overlay_pipe *pipe);
+void mdp4_lcdc_overlay(struct msm_fb_data_type *mfd);
+void mdp4_overlay_rgb_setup(struct mdp4_overlay_pipe *pipe);
+void mdp4_overlay_reg_flush(struct mdp4_overlay_pipe *pipe, int all);
+void mdp4_mixer_blend_setup(struct mdp4_overlay_pipe *pipe);
+void mdp4_mixer_stage_up(struct mdp4_overlay_pipe *pipe);
+void mdp4_mixer_stage_down(struct mdp4_overlay_pipe *pipe);
+int mdp4_mixer_stage_can_run(struct mdp4_overlay_pipe *pipe);
+void mdp4_overlayproc_cfg(struct mdp4_overlay_pipe *pipe);
+void mdp4_mddi_overlay(struct msm_fb_data_type *mfd);
+int mdp4_overlay_format2type(uint32 format);
+int mdp4_overlay_format2pipe(struct mdp4_overlay_pipe *pipe);
+int mdp4_overlay_get(struct fb_info *info, struct mdp_overlay *req);
+int mdp4_overlay_set(struct fb_info *info, struct mdp_overlay *req);
+int mdp4_overlay_unset(struct fb_info *info, int ndx);
+int mdp4_overlay_play(struct fb_info *info, struct msmfb_overlay_data *req,
+                               struct file **pp_src_file);
+struct mdp4_overlay_pipe *mdp4_overlay_pipe_alloc(void);
+void mdp4_overlay_pipe_free(struct mdp4_overlay_pipe *pipe);
+void mdp4_overlay_dmap_cfg(struct msm_fb_data_type *mfd, int lcdc);
+void mdp4_overlay_dmap_xy(struct mdp4_overlay_pipe *pipe);
+int mdp4_overlay_active(int mixer);
+void mdp4_overlay0_done_lcdc(void);
+void mdp4_overlay0_done_mddi(void);
+void mdp4_mddi_overlay_restore(void);
+void mdp4_mddi_overlay_kickoff(struct msm_fb_data_type *mfd,
+                               struct mdp4_overlay_pipe *pipe);
+void mdp4_rgb_igc_lut_setup(int num);
+void mdp4_vg_igc_lut_setup(int num);
+void mdp4_mixer_gc_lut_setup(int mixer_num);
+
+#ifdef CONFIG_DEBUG_FS
+int mdp4_debugfs_init(void);
+#endif
+
+int mdp_ppp_blit(struct fb_info *info, struct mdp_blit_req *req,
+       struct file **pp_src_file, struct file **pp_dst_file);
+
+#endif /* MDP_H */
diff --git a/drivers/staging/msm/mdp4_debugfs.c b/drivers/staging/msm/mdp4_debugfs.c
new file mode 100644 (file)
index 0000000..844d467
--- /dev/null
@@ -0,0 +1,181 @@
+/* Copyright (c) 2009, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/time.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/spinlock.h>
+#include <linux/hrtimer.h>
+#include <linux/clk.h>
+#include <mach/hardware.h>
+#include <linux/io.h>
+#include <linux/debugfs.h>
+
+#include <asm/system.h>
+#include <asm/mach-types.h>
+#include <linux/semaphore.h>
+#include <linux/uaccess.h>
+
+#include "mdp.h"
+#include "msm_fb.h"
+#include "mdp4.h"
+
+
+#define MDP4_DEBUG_BUF 128
+
+
+static char mdp4_debug_buf[MDP4_DEBUG_BUF];
+static ulong mdp4_debug_offset;
+static ulong mdp4_base_addr;
+
+static int mdp4_offset_set(void *data, u64 val)
+{
+       mdp4_debug_offset = (int)val;
+       return 0;
+}
+
+static int mdp4_offset_get(void *data, u64 *val)
+{
+       *val = (u64)mdp4_debug_offset;
+       return 0;
+}
+
+DEFINE_SIMPLE_ATTRIBUTE(
+                       mdp4_offset_fops,
+                       mdp4_offset_get,
+                       mdp4_offset_set,
+                       "%llx\n");
+
+
+static int mdp4_debugfs_open(struct inode *inode, struct file *file)
+{
+       /* non-seekable */
+       file->f_mode &= ~(FMODE_LSEEK | FMODE_PREAD | FMODE_PWRITE);
+       return 0;
+}
+
+static int mdp4_debugfs_release(struct inode *inode, struct file *file)
+{
+       return 0;
+}
+
+static ssize_t mdp4_debugfs_write(
+       struct file *file,
+       const char __user *buff,
+       size_t count,
+       loff_t *ppos)
+{
+       int cnt;
+       unsigned int data;
+
+       printk(KERN_INFO "%s: offset=%d count=%d *ppos=%d\n",
+               __func__, (int)mdp4_debug_offset, (int)count, (int)*ppos);
+
+       if (count > sizeof(mdp4_debug_buf))
+               return -EFAULT;
+
+       if (copy_from_user(mdp4_debug_buf, buff, count))
+               return -EFAULT;
+
+
+       mdp4_debug_buf[count] = 0;      /* end of string */
+
+       cnt = sscanf(mdp4_debug_buf, "%x", &data);
+       if (cnt < 1) {
+               printk(KERN_ERR "%s: sscanf failed cnt=%d" , __func__, cnt);
+               return -EINVAL;
+       }
+
+       writel(&data, mdp4_base_addr + mdp4_debug_offset);
+
+       return 0;
+}
+
+static ssize_t mdp4_debugfs_read(
+       struct file *file,
+       char __user *buff,
+       size_t count,
+       loff_t *ppos)
+{
+       int len = 0;
+       unsigned int data;
+
+       printk(KERN_INFO "%s: offset=%d count=%d *ppos=%d\n",
+               __func__, (int)mdp4_debug_offset, (int)count, (int)*ppos);
+
+       if (*ppos)
+               return 0;       /* the end */
+
+       data = readl(mdp4_base_addr + mdp4_debug_offset);
+
+       len = snprintf(mdp4_debug_buf, 4, "%x\n", data);
+
+       if (len > 0) {
+               if (len > count)
+                       len = count;
+               if (copy_to_user(buff, mdp4_debug_buf, len))
+                       return -EFAULT;
+       }
+
+       printk(KERN_INFO "%s: len=%d\n", __func__, len);
+
+       if (len < 0)
+               return 0;
+
+       *ppos += len;   /* increase offset */
+
+       return len;
+}
+
+static const struct file_operations mdp4_debugfs_fops = {
+       .open = mdp4_debugfs_open,
+       .release = mdp4_debugfs_release,
+       .read = mdp4_debugfs_read,
+       .write = mdp4_debugfs_write,
+};
+
+int mdp4_debugfs_init(void)
+{
+       struct dentry *dent = debugfs_create_dir("mdp4", NULL);
+
+       if (IS_ERR(dent)) {
+               printk(KERN_ERR "%s(%d): debugfs_create_dir fail, error %ld\n",
+                       __FILE__, __LINE__, PTR_ERR(dent));
+               return -1;
+       }
+
+       if (debugfs_create_file("offset", 0644, dent, 0, &mdp4_offset_fops)
+                       == NULL) {
+               printk(KERN_ERR "%s(%d): debugfs_create_file: offset fail\n",
+                       __FILE__, __LINE__);
+               return -1;
+       }
+
+       if (debugfs_create_file("regs", 0644, dent, 0, &mdp4_debugfs_fops)
+                       == NULL) {
+               printk(KERN_ERR "%s(%d): debugfs_create_file: regs fail\n",
+                       __FILE__, __LINE__);
+               return -1;
+       }
+
+       mdp4_debug_offset = 0;
+       mdp4_base_addr = (ulong) msm_mdp_base;  /* defined at msm_fb_def.h */
+
+       return 0;
+}
diff --git a/drivers/staging/msm/mdp4_overlay.c b/drivers/staging/msm/mdp4_overlay.c
new file mode 100644 (file)
index 0000000..304bb82
--- /dev/null
@@ -0,0 +1,1259 @@
+/* Copyright (c) 2008-2009, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/time.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/spinlock.h>
+#include <linux/hrtimer.h>
+#include <linux/clk.h>
+#include <mach/hardware.h>
+#include <linux/io.h>
+#include <linux/debugfs.h>
+#include <linux/fb.h>
+#include <msm_mdp.h>
+#include <linux/file.h>
+#include "android_pmem.h"
+#include <linux/major.h>
+#include <asm/system.h>
+#include <asm/mach-types.h>
+#include <linux/semaphore.h>
+#include <linux/uaccess.h>
+#include <linux/mutex.h>
+
+#include "mdp.h"
+#include "msm_fb.h"
+#include "mdp4.h"
+
+
+struct mdp4_overlay_ctrl {
+       struct mdp4_overlay_pipe plist[MDP4_MAX_OVERLAY_PIPE];
+       struct mdp4_overlay_pipe *stage[MDP4_MAX_MIXER][MDP4_MAX_STAGE];
+} mdp4_overlay_db;
+
+static struct mdp4_overlay_ctrl *ctrl = &mdp4_overlay_db;
+
+
+void mdp4_overlay_dmap_cfg(struct msm_fb_data_type *mfd, int lcdc)
+{
+       uint32  dma2_cfg_reg;
+
+       dma2_cfg_reg = DMA_DITHER_EN;
+
+       if (mfd->fb_imgType == MDP_BGR_565)
+               dma2_cfg_reg |= DMA_PACK_PATTERN_BGR;
+       else
+               dma2_cfg_reg |= DMA_PACK_PATTERN_RGB;
+
+
+       if (mfd->panel_info.bpp == 18) {
+               dma2_cfg_reg |= DMA_DSTC0G_6BITS |      /* 666 18BPP */
+                   DMA_DSTC1B_6BITS | DMA_DSTC2R_6BITS;
+       } else if (mfd->panel_info.bpp == 16) {
+               dma2_cfg_reg |= DMA_DSTC0G_6BITS |      /* 565 16BPP */
+                   DMA_DSTC1B_5BITS | DMA_DSTC2R_5BITS;
+       } else {
+               dma2_cfg_reg |= DMA_DSTC0G_8BITS |      /* 888 16BPP */
+                   DMA_DSTC1B_8BITS | DMA_DSTC2R_8BITS;
+       }
+
+       if (lcdc)
+               dma2_cfg_reg |= DMA_PACK_ALIGN_MSB;
+
+       /* dma2 config register */
+       MDP_OUTP(MDP_BASE + 0x90000, dma2_cfg_reg);
+
+}
+
+void mdp4_overlay_dmap_xy(struct mdp4_overlay_pipe *pipe)
+{
+
+       /* dma_p source */
+       MDP_OUTP(MDP_BASE + 0x90004,
+                       (pipe->src_height << 16 | pipe->src_width));
+       MDP_OUTP(MDP_BASE + 0x90008, pipe->srcp0_addr);
+       MDP_OUTP(MDP_BASE + 0x9000c, pipe->srcp0_ystride);
+
+       /* dma_p dest */
+       MDP_OUTP(MDP_BASE + 0x90010, (pipe->dst_y << 16 | pipe->dst_x));
+}
+
+#define MDP4_VG_PHASE_STEP_DEFAULT     0x20000000
+#define MDP4_VG_PHASE_STEP_SHIFT       29
+
+static int mdp4_leading_0(uint32 num)
+{
+       uint32 bit = 0x80000000;
+       int i;
+
+       for (i = 0; i < 32; i++) {
+               if (bit & num)
+                       return i;
+               bit >>= 1;
+       }
+
+       return i;
+}
+
+static uint32 mdp4_scale_phase_step(int f_num, uint32 src, uint32 dst)
+{
+       uint32 val;
+       int     n;
+
+       n = mdp4_leading_0(src);
+       if (n > f_num)
+               n = f_num;
+       val = src << n; /* maximum to reduce lose of resolution */
+       val /= dst;
+       if (n < f_num) {
+               n = f_num - n;
+               val <<= n;
+       }
+
+       return val;
+}
+
+static void mdp4_scale_setup(struct mdp4_overlay_pipe *pipe)
+{
+
+       pipe->phasex_step = MDP4_VG_PHASE_STEP_DEFAULT;
+       pipe->phasey_step = MDP4_VG_PHASE_STEP_DEFAULT;
+
+       if (pipe->dst_h && pipe->src_h != pipe->dst_h) {
+               if (pipe->dst_h >= pipe->src_h * 8)     /* too much */
+                       return;
+               pipe->op_mode |= MDP4_OP_SCALEY_EN;
+
+               if (pipe->pipe_type == OVERLAY_TYPE_VG) {
+                       if (pipe->dst_h <= (pipe->src_h / 4))
+                               pipe->op_mode |= MDP4_OP_SCALEY_MN_PHASE;
+                       else
+                               pipe->op_mode |= MDP4_OP_SCALEY_FIR;
+               }
+
+               pipe->phasey_step = mdp4_scale_phase_step(29,
+                                       pipe->src_h, pipe->dst_h);
+       }
+
+       if (pipe->dst_w && pipe->src_w != pipe->dst_w) {
+               if (pipe->dst_w >= pipe->src_w * 8)     /* too much */
+                       return;
+               pipe->op_mode |= MDP4_OP_SCALEX_EN;
+
+               if (pipe->pipe_type == OVERLAY_TYPE_VG) {
+                       if (pipe->dst_w <= (pipe->src_w / 4))
+                               pipe->op_mode |= MDP4_OP_SCALEY_MN_PHASE;
+                       else
+                               pipe->op_mode |= MDP4_OP_SCALEY_FIR;
+               }
+
+               pipe->phasex_step = mdp4_scale_phase_step(29,
+                                       pipe->src_w, pipe->dst_w);
+       }
+}
+
+void mdp4_overlay_rgb_setup(struct mdp4_overlay_pipe *pipe)
+{
+       char *rgb_base;
+       uint32 src_size, src_xy, dst_size, dst_xy;
+       uint32 format, pattern;
+
+       rgb_base = MDP_BASE + MDP4_RGB_BASE;
+       rgb_base += (MDP4_RGB_OFF * pipe->pipe_num);
+
+       src_size = ((pipe->src_h << 16) | pipe->src_w);
+       src_xy = ((pipe->src_y << 16) | pipe->src_x);
+       dst_size = ((pipe->dst_h << 16) | pipe->dst_w);
+       dst_xy = ((pipe->dst_y << 16) | pipe->dst_x);
+
+       format = mdp4_overlay_format(pipe);
+       pattern = mdp4_overlay_unpack_pattern(pipe);
+
+       pipe->op_mode |= MDP4_OP_IGC_LUT_EN;
+
+       mdp4_scale_setup(pipe);
+
+       outpdw(rgb_base + 0x0000, src_size);    /* MDP_RGB_SRC_SIZE */
+       outpdw(rgb_base + 0x0004, src_xy);      /* MDP_RGB_SRC_XY */
+       outpdw(rgb_base + 0x0008, dst_size);    /* MDP_RGB_DST_SIZE */
+       outpdw(rgb_base + 0x000c, dst_xy);      /* MDP_RGB_DST_XY */
+
+       outpdw(rgb_base + 0x0010, pipe->srcp0_addr);
+       outpdw(rgb_base + 0x0040, pipe->srcp0_ystride);
+
+       outpdw(rgb_base + 0x0050, format);/* MDP_RGB_SRC_FORMAT */
+       outpdw(rgb_base + 0x0054, pattern);/* MDP_RGB_SRC_UNPACK_PATTERN */
+       outpdw(rgb_base + 0x0058, pipe->op_mode);/* MDP_RGB_OP_MODE */
+       outpdw(rgb_base + 0x005c, pipe->phasex_step);
+       outpdw(rgb_base + 0x0060, pipe->phasey_step);
+
+       /* 16 bytes-burst x 3 req <= 48 bytes */
+       outpdw(rgb_base + 0x1004, 0xc2);        /* MDP_RGB_FETCH_CFG */
+}
+
+void mdp4_overlay_vg_setup(struct mdp4_overlay_pipe *pipe)
+{
+       char *vg_base;
+       uint32 frame_size, src_size, src_xy, dst_size, dst_xy;
+       uint32 format, pattern;
+
+       vg_base = MDP_BASE + MDP4_VIDEO_BASE;
+       vg_base += (MDP4_VIDEO_OFF * pipe->pipe_num);
+
+       frame_size = ((pipe->src_height << 16) | pipe->src_width);
+       src_size = ((pipe->src_h << 16) | pipe->src_w);
+       src_xy = ((pipe->src_y << 16) | pipe->src_x);
+       dst_size = ((pipe->dst_h << 16) | pipe->dst_w);
+       dst_xy = ((pipe->dst_y << 16) | pipe->dst_x);
+
+       format = mdp4_overlay_format(pipe);
+       pattern = mdp4_overlay_unpack_pattern(pipe);
+
+       pipe->op_mode |= (MDP4_OP_CSC_EN | MDP4_OP_SRC_DATA_YCBCR |
+                               MDP4_OP_IGC_LUT_EN);
+
+       mdp4_scale_setup(pipe);
+
+       outpdw(vg_base + 0x0000, src_size);     /* MDP_RGB_SRC_SIZE */
+       outpdw(vg_base + 0x0004, src_xy);       /* MDP_RGB_SRC_XY */
+       outpdw(vg_base + 0x0008, dst_size);     /* MDP_RGB_DST_SIZE */
+       outpdw(vg_base + 0x000c, dst_xy);       /* MDP_RGB_DST_XY */
+       outpdw(vg_base + 0x0048, frame_size);   /* TILE frame size */
+
+       /* luma component plane */
+       outpdw(vg_base + 0x0010, pipe->srcp0_addr);
+
+       /* chroma component plane */
+       outpdw(vg_base + 0x0014, pipe->srcp1_addr);
+
+       outpdw(vg_base + 0x0040,
+                       pipe->srcp1_ystride << 16 | pipe->srcp0_ystride);
+
+       outpdw(vg_base + 0x0050, format);       /* MDP_RGB_SRC_FORMAT */
+       outpdw(vg_base + 0x0054, pattern);      /* MDP_RGB_SRC_UNPACK_PATTERN */
+       outpdw(vg_base + 0x0058, pipe->op_mode);/* MDP_RGB_OP_MODE */
+       outpdw(vg_base + 0x005c, pipe->phasex_step);
+       outpdw(vg_base + 0x0060, pipe->phasey_step);
+
+       if (pipe->op_mode & MDP4_OP_DITHER_EN) {
+               outpdw(vg_base + 0x0068,
+                       pipe->r_bit << 4 | pipe->b_bit << 2 | pipe->g_bit);
+       }
+
+       /* 16 bytes-burst x 3 req <= 48 bytes */
+       outpdw(vg_base + 0x1004, 0xc2); /* MDP_VG_FETCH_CFG */
+}
+
+int mdp4_overlay_format2type(uint32 format)
+{
+       switch (format) {
+       case MDP_RGB_565:
+       case MDP_RGB_888:
+       case MDP_BGR_565:
+       case MDP_ARGB_8888:
+       case MDP_RGBA_8888:
+       case MDP_BGRA_8888:
+               return OVERLAY_TYPE_RGB;
+       case MDP_YCRYCB_H2V1:
+       case MDP_Y_CRCB_H2V1:
+       case MDP_Y_CBCR_H2V1:
+       case MDP_Y_CRCB_H2V2:
+       case MDP_Y_CBCR_H2V2:
+       case MDP_Y_CBCR_H2V2_TILE:
+       case MDP_Y_CRCB_H2V2_TILE:
+               return OVERLAY_TYPE_VG;
+       default:
+               return -ERANGE;
+       }
+
+}
+
+#define C3_ALPHA       3       /* alpha */
+#define C2_R_Cr                2       /* R/Cr */
+#define C1_B_Cb                1       /* B/Cb */
+#define C0_G_Y         0       /* G/luma */
+
+int mdp4_overlay_format2pipe(struct mdp4_overlay_pipe *pipe)
+{
+       switch (pipe->src_format) {
+       case MDP_RGB_565:
+               pipe->frame_format = MDP4_FRAME_FORMAT_LINEAR;
+               pipe->fetch_plane = OVERLAY_PLANE_INTERLEAVED;
+               pipe->a_bit = 0;
+               pipe->r_bit = 1;        /* R, 5 bits */
+               pipe->b_bit = 1;        /* B, 5 bits */
+               pipe->g_bit = 2;        /* G, 6 bits */
+               pipe->alpha_enable = 0;
+               pipe->unpack_tight = 1;
+               pipe->unpack_align_msb = 0;
+               pipe->unpack_count = 2;
+               pipe->element2 = C2_R_Cr;       /* R */
+               pipe->element1 = C0_G_Y;        /* G */
+               pipe->element0 = C1_B_Cb;       /* B */
+               pipe->bpp = 2;  /* 2 bpp */
+               break;
+       case MDP_RGB_888:
+               pipe->frame_format = MDP4_FRAME_FORMAT_LINEAR;
+               pipe->fetch_plane = OVERLAY_PLANE_INTERLEAVED;
+               pipe->a_bit = 0;
+               pipe->r_bit = 3;        /* R, 8 bits */
+               pipe->b_bit = 3;        /* B, 8 bits */
+               pipe->g_bit = 3;        /* G, 8 bits */
+               pipe->alpha_enable = 0;
+               pipe->unpack_tight = 1;
+               pipe->unpack_align_msb = 0;
+               pipe->unpack_count = 2;
+               pipe->element2 = C2_R_Cr;       /* R */
+               pipe->element1 = C0_G_Y;        /* G */
+               pipe->element0 = C1_B_Cb;       /* B */
+               pipe->bpp = 3;  /* 3 bpp */
+               break;
+       case MDP_BGR_565:
+               pipe->frame_format = MDP4_FRAME_FORMAT_LINEAR;
+               pipe->fetch_plane = OVERLAY_PLANE_INTERLEAVED;
+               pipe->a_bit = 0;
+               pipe->r_bit = 1;        /* R, 5 bits */
+               pipe->b_bit = 1;        /* B, 5 bits */
+               pipe->g_bit = 2;        /* G, 6 bits */
+               pipe->alpha_enable = 0;
+               pipe->unpack_tight = 1;
+               pipe->unpack_align_msb = 0;
+               pipe->unpack_count = 2;
+               pipe->element2 = C1_B_Cb;       /* B */
+               pipe->element1 = C0_G_Y;        /* G */
+               pipe->element0 = C2_R_Cr;       /* R */
+               pipe->bpp = 2;  /* 2 bpp */
+               break;
+       case MDP_ARGB_8888:
+               pipe->frame_format = MDP4_FRAME_FORMAT_LINEAR;
+               pipe->fetch_plane = OVERLAY_PLANE_INTERLEAVED;
+               pipe->a_bit = 3;        /* alpha, 4 bits */
+               pipe->r_bit = 3;        /* R, 8 bits */
+               pipe->b_bit = 3;        /* B, 8 bits */
+               pipe->g_bit = 3;        /* G, 8 bits */
+               pipe->alpha_enable = 1;
+               pipe->unpack_tight = 1;
+               pipe->unpack_align_msb = 0;
+               pipe->unpack_count = 3;
+               pipe->element3 = C3_ALPHA;      /* alpha */
+               pipe->element2 = C2_R_Cr;       /* R */
+               pipe->element1 = C0_G_Y;        /* G */
+               pipe->element0 = C1_B_Cb;       /* B */
+               pipe->bpp = 4;          /* 4 bpp */
+               break;
+       case MDP_RGBA_8888:
+               pipe->frame_format = MDP4_FRAME_FORMAT_LINEAR;
+               pipe->fetch_plane = OVERLAY_PLANE_INTERLEAVED;
+               pipe->a_bit = 3;        /* alpha, 4 bits */
+               pipe->r_bit = 3;        /* R, 8 bits */
+               pipe->b_bit = 3;        /* B, 8 bits */
+               pipe->g_bit = 3;        /* G, 8 bits */
+               pipe->alpha_enable = 1;
+               pipe->unpack_tight = 1;
+               pipe->unpack_align_msb = 0;
+               pipe->unpack_count = 3;
+               pipe->element3 = C2_R_Cr;       /* R */
+               pipe->element2 = C0_G_Y;        /* G */
+               pipe->element1 = C1_B_Cb;       /* B */
+               pipe->element0 = C3_ALPHA;      /* alpha */
+               pipe->bpp = 4;          /* 4 bpp */
+               break;
+       case MDP_BGRA_8888:
+               pipe->frame_format = MDP4_FRAME_FORMAT_LINEAR;
+               pipe->fetch_plane = OVERLAY_PLANE_INTERLEAVED;
+               pipe->a_bit = 3;        /* alpha, 4 bits */
+               pipe->r_bit = 3;        /* R, 8 bits */
+               pipe->b_bit = 3;        /* B, 8 bits */
+               pipe->g_bit = 3;        /* G, 8 bits */
+               pipe->alpha_enable = 1;
+               pipe->unpack_tight = 1;
+               pipe->unpack_align_msb = 0;
+               pipe->unpack_count = 3;
+               pipe->element3 = C1_B_Cb;       /* B */
+               pipe->element2 = C0_G_Y;        /* G */
+               pipe->element1 = C2_R_Cr;       /* R */
+               pipe->element0 = C3_ALPHA;      /* alpha */
+               pipe->bpp = 4;          /* 4 bpp */
+               break;
+       case MDP_YCRYCB_H2V1:
+               pipe->frame_format = MDP4_FRAME_FORMAT_LINEAR;
+               pipe->fetch_plane = OVERLAY_PLANE_INTERLEAVED;
+               pipe->a_bit = 0;        /* alpha, 4 bits */
+               pipe->r_bit = 3;        /* R, 8 bits */
+               pipe->b_bit = 3;        /* B, 8 bits */
+               pipe->g_bit = 3;        /* G, 8 bits */
+               pipe->alpha_enable = 0;
+               pipe->unpack_tight = 1;
+               pipe->unpack_align_msb = 0;
+               pipe->unpack_count = 3;
+               pipe->element3 = C0_G_Y;        /* G */
+               pipe->element2 = C2_R_Cr;       /* R */
+               pipe->element1 = C0_G_Y;        /* G */
+               pipe->element0 = C1_B_Cb;       /* B */
+               pipe->bpp = 2;          /* 2 bpp */
+               pipe->chroma_sample = MDP4_CHROMA_H2V1;
+               break;
+       case MDP_Y_CRCB_H2V1:
+       case MDP_Y_CBCR_H2V1:
+       case MDP_Y_CRCB_H2V2:
+       case MDP_Y_CBCR_H2V2:
+               pipe->frame_format = MDP4_FRAME_FORMAT_LINEAR;
+               pipe->fetch_plane = OVERLAY_PLANE_PSEUDO_PLANAR;
+               pipe->a_bit = 0;
+               pipe->r_bit = 3;        /* R, 8 bits */
+               pipe->b_bit = 3;        /* B, 8 bits */
+               pipe->g_bit = 3;        /* G, 8 bits */
+               pipe->alpha_enable = 0;
+               pipe->unpack_tight = 1;
+               pipe->unpack_align_msb = 0;
+               pipe->unpack_count = 1;         /* 2 */
+               pipe->element3 = C0_G_Y;        /* not used */
+               pipe->element2 = C0_G_Y;        /* not used */
+               if (pipe->src_format == MDP_Y_CRCB_H2V1) {
+                       pipe->element1 = C2_R_Cr;       /* R */
+                       pipe->element0 = C1_B_Cb;       /* B */
+                       pipe->chroma_sample = MDP4_CHROMA_H2V1;
+               } else if (pipe->src_format == MDP_Y_CBCR_H2V1) {
+                       pipe->element1 = C1_B_Cb;       /* B */
+                       pipe->element0 = C2_R_Cr;       /* R */
+                       pipe->chroma_sample = MDP4_CHROMA_H2V1;
+               } else if (pipe->src_format == MDP_Y_CRCB_H2V2) {
+                       pipe->element1 = C2_R_Cr;       /* R */
+                       pipe->element0 = C1_B_Cb;       /* B */
+                       pipe->chroma_sample = MDP4_CHROMA_420;
+               } else if (pipe->src_format == MDP_Y_CBCR_H2V2) {
+                       pipe->element1 = C1_B_Cb;       /* B */
+                       pipe->element0 = C2_R_Cr;       /* R */
+                       pipe->chroma_sample = MDP4_CHROMA_420;
+               }
+               pipe->bpp = 2;  /* 2 bpp */
+               break;
+       case MDP_Y_CBCR_H2V2_TILE:
+       case MDP_Y_CRCB_H2V2_TILE:
+               pipe->frame_format = MDP4_FRAME_FORMAT_VIDEO_SUPERTILE;
+               pipe->fetch_plane = OVERLAY_PLANE_PSEUDO_PLANAR;
+               pipe->a_bit = 0;
+               pipe->r_bit = 3;        /* R, 8 bits */
+               pipe->b_bit = 3;        /* B, 8 bits */
+               pipe->g_bit = 3;        /* G, 8 bits */
+               pipe->alpha_enable = 0;
+               pipe->unpack_tight = 1;
+               pipe->unpack_align_msb = 0;
+               pipe->unpack_count = 1;         /* 2 */
+               pipe->element3 = C0_G_Y;        /* not used */
+               pipe->element2 = C0_G_Y;        /* not used */
+               if (pipe->src_format == MDP_Y_CRCB_H2V2_TILE) {
+                       pipe->element1 = C2_R_Cr;       /* R */
+                       pipe->element0 = C1_B_Cb;       /* B */
+                       pipe->chroma_sample = MDP4_CHROMA_420;
+               } else if (pipe->src_format == MDP_Y_CBCR_H2V2_TILE) {
+                       pipe->element1 = C1_B_Cb;       /* B */
+                       pipe->element0 = C2_R_Cr;       /* R */
+                       pipe->chroma_sample = MDP4_CHROMA_420;
+               }
+               pipe->bpp = 2;  /* 2 bpp */
+               break;
+       default:
+               /* not likely */
+               return -ERANGE;
+       }
+
+       return 0;
+}
+
+/*
+ * color_key_convert: output with 12 bits color key
+ */
+static uint32 color_key_convert(int start, int num, uint32 color)
+{
+
+       uint32 data;
+
+       data = (color >> start) & ((1 << num) - 1);
+
+       if (num == 5)
+               data = (data << 7) + (data << 2) + (data >> 3);
+       else if (num == 6)
+               data = (data << 6) + data;
+       else    /* 8 bits */
+               data = (data << 4) + (data >> 4);
+
+       return data;
+
+}
+
+void transp_color_key(int format, uint32 transp,
+                       uint32 *c0, uint32 *c1, uint32 *c2)
+{
+       int b_start, g_start, r_start;
+       int b_num, g_num, r_num;
+
+       switch (format) {
+       case MDP_RGB_565:
+               b_start = 0;
+               g_start = 5;
+               r_start = 11;
+               r_num = 5;
+               g_num = 6;
+               b_num = 5;
+               break;
+       case MDP_RGB_888:
+       case MDP_XRGB_8888:
+       case MDP_ARGB_8888:
+               b_start = 0;
+               g_start = 8;
+               r_start = 16;
+               r_num = 8;
+               g_num = 8;
+               b_num = 8;
+               break;
+       case MDP_BGR_565:
+               b_start = 11;
+               g_start = 5;
+               r_start = 0;
+               r_num = 5;
+               g_num = 6;
+               b_num = 5;
+               break;
+       case MDP_Y_CBCR_H2V2:
+       case MDP_Y_CBCR_H2V1:
+               b_start = 8;
+               g_start = 16;
+               r_start = 0;
+               r_num = 8;
+               g_num = 8;
+               b_num = 8;
+               break;
+       case MDP_Y_CRCB_H2V2:
+       case MDP_Y_CRCB_H2V1:
+               b_start = 0;
+               g_start = 16;
+               r_start = 8;
+               r_num = 8;
+               g_num = 8;
+               b_num = 8;
+               break;
+       default:
+               b_start = 0;
+               g_start = 8;
+               r_start = 16;
+               r_num = 8;
+               g_num = 8;
+               b_num = 8;
+               break;
+       }
+
+       *c0 = color_key_convert(g_start, g_num, transp);
+       *c1 = color_key_convert(b_start, b_num, transp);
+       *c2 = color_key_convert(r_start, r_num, transp);
+}
+
+uint32 mdp4_overlay_format(struct mdp4_overlay_pipe *pipe)
+{
+       uint32  format;
+
+       format = 0;
+
+       if (pipe->solid_fill)
+               format |= MDP4_FORMAT_SOLID_FILL;
+
+       if (pipe->unpack_align_msb)
+               format |= MDP4_FORMAT_UNPACK_ALIGN_MSB;
+
+       if (pipe->unpack_tight)
+               format |= MDP4_FORMAT_UNPACK_TIGHT;
+
+       if (pipe->alpha_enable)
+               format |= MDP4_FORMAT_ALPHA_ENABLE;
+
+       format |= (pipe->unpack_count << 13);
+       format |= ((pipe->bpp - 1) << 9);
+       format |= (pipe->a_bit << 6);
+       format |= (pipe->r_bit << 4);
+       format |= (pipe->b_bit << 2);
+       format |= pipe->g_bit;
+
+       format |= (pipe->frame_format << 29);
+
+       if (pipe->fetch_plane == OVERLAY_PLANE_PSEUDO_PLANAR) {
+               /* video/graphic */
+               format |= (pipe->fetch_plane << 19);
+               format |= (pipe->chroma_site << 28);
+               format |= (pipe->chroma_sample << 26);
+       }
+
+       return format;
+}
+
+uint32 mdp4_overlay_unpack_pattern(struct mdp4_overlay_pipe *pipe)
+{
+       return (pipe->element3 << 24) | (pipe->element2 << 16) |
+                       (pipe->element1 << 8) | pipe->element0;
+}
+
+void mdp4_overlayproc_cfg(struct mdp4_overlay_pipe *pipe)
+{
+       uint32 data;
+       char *overlay_base;
+
+       if (pipe->mixer_num == MDP4_MIXER1)
+               overlay_base = MDP_BASE + MDP4_OVERLAYPROC1_BASE;/* 0x18000 */
+       else
+               overlay_base = MDP_BASE + MDP4_OVERLAYPROC0_BASE;/* 0x10000 */
+
+       /* MDP_OVERLAYPROC_CFG */
+       outpdw(overlay_base + 0x0004, 0x01); /* directout */
+       data = pipe->src_height;
+       data <<= 16;
+       data |= pipe->src_width;
+       outpdw(overlay_base + 0x0008, data); /* ROI, height + width */
+       outpdw(overlay_base + 0x000c, pipe->srcp0_addr);
+       outpdw(overlay_base + 0x0010, pipe->srcp0_ystride);
+       outpdw(overlay_base + 0x0014, 0x4);     /* GC_LUT_EN, 888 */
+}
+
+int mdp4_overlay_active(int mixer)
+{
+       uint32 data, mask, i;
+       int p1, p2;
+
+       data = inpdw(MDP_BASE + 0x10100);
+       p1 = 0;
+       p2 = 0;
+       for (i = 0; i < 8; i++) {
+               mask = data & 0x0f;
+               if (mask) {
+                       if (mask <= 4)
+                               p1++;
+                       else
+                               p2++;
+               }
+               data >>= 4;
+       }
+
+       if (mixer)
+               return p2;
+       else
+               return p1;
+}
+
+void mdp4_mixer_stage_up(struct mdp4_overlay_pipe *pipe)
+{
+       uint32 data, mask, snum, stage, mixer;
+
+       stage = pipe->mixer_stage;
+       mixer = pipe->mixer_num;
+
+       /* MDP_LAYERMIXER_IN_CFG, shard by both mixer 0 and 1  */
+       data = inpdw(MDP_BASE + 0x10100);
+
+       if (mixer == MDP4_MIXER1)
+               stage += 8;
+
+       if (pipe->pipe_type == OVERLAY_TYPE_VG) {/* VG1 and VG2 */
+               snum = 0;
+               snum += (4 * pipe->pipe_num);
+       } else {
+               snum = 8;
+               snum += (4 * pipe->pipe_num);   /* RGB1 and RGB2 */
+       }
+
+       mask = 0x0f;
+       mask <<= snum;
+       stage <<= snum;
+       data &= ~mask;  /* clear old bits */
+
+       data |= stage;
+
+       outpdw(MDP_BASE + 0x10100, data); /* MDP_LAYERMIXER_IN_CFG */
+
+       data = inpdw(MDP_BASE + 0x10100);
+
+       ctrl->stage[pipe->mixer_num][pipe->mixer_stage] = pipe; /* keep it */
+}
+
+void mdp4_mixer_stage_down(struct mdp4_overlay_pipe *pipe)
+{
+       uint32 data, mask, snum, stage, mixer;
+
+       stage = pipe->mixer_stage;
+       mixer = pipe->mixer_num;
+
+       if (pipe != ctrl->stage[mixer][stage])  /* not runing */
+               return;
+
+       /* MDP_LAYERMIXER_IN_CFG, shard by both mixer 0 and 1  */
+       data = inpdw(MDP_BASE + 0x10100);
+
+       if (mixer == MDP4_MIXER1)
+               stage += 8;
+
+       if (pipe->pipe_type == OVERLAY_TYPE_VG) {/* VG1 and VG2 */
+               snum = 0;
+               snum += (4 * pipe->pipe_num);
+       } else {
+               snum = 8;
+               snum += (4 * pipe->pipe_num);   /* RGB1 and RGB2 */
+       }
+
+       mask = 0x0f;
+       mask <<= snum;
+       data &= ~mask;  /* clear old bits */
+
+       outpdw(MDP_BASE + 0x10100, data); /* MDP_LAYERMIXER_IN_CFG */
+
+       data = inpdw(MDP_BASE + 0x10100);
+
+       ctrl->stage[pipe->mixer_num][pipe->mixer_stage] = NULL; /* clear it */
+}
+
+void mdp4_mixer_blend_setup(struct mdp4_overlay_pipe *pipe)
+{
+       unsigned char *overlay_base;
+       uint32 c0, c1, c2, blend_op;
+       int off;
+
+       if (pipe->mixer_num)    /* mixer number, /dev/fb0, /dev/fb1 */
+               overlay_base = MDP_BASE + MDP4_OVERLAYPROC1_BASE;/* 0x18000 */
+       else
+               overlay_base = MDP_BASE + MDP4_OVERLAYPROC0_BASE;/* 0x10000 */
+
+       /* stage 0 to stage 2 */
+       off = 0x20 * (pipe->mixer_stage - MDP4_MIXER_STAGE0);
+
+       blend_op = 0;
+       if (pipe->alpha_enable)         /* ARGB */
+               blend_op = MDP4_BLEND_FG_ALPHA_FG_PIXEL |
+                               MDP4_BLEND_BG_ALPHA_FG_PIXEL;
+       else
+               blend_op = (MDP4_BLEND_BG_ALPHA_BG_CONST |
+                               MDP4_BLEND_FG_ALPHA_FG_CONST);
+
+
+       if (pipe->alpha_enable == 0) {  /* not ARGB */
+               if (pipe->is_fg) {
+                       outpdw(overlay_base + off + 0x108, pipe->alpha);
+                       outpdw(overlay_base + off + 0x10c, 0xff - pipe->alpha);
+               } else {
+                       outpdw(overlay_base + off + 0x108, 0xff - pipe->alpha);
+                       outpdw(overlay_base + off + 0x10c, pipe->alpha);
+               }
+       }
+
+       if (pipe->transp != MDP_TRANSP_NOP) {
+               transp_color_key(pipe->src_format, pipe->transp, &c0, &c1, &c2);
+               if (pipe->is_fg) {
+                       blend_op |= MDP4_BLEND_FG_TRANSP_EN; /* Fg blocked */
+                       /* lower limit */
+                       if (c0 > 0x10)
+                               c0 -= 0x10;
+                       if (c1 > 0x10)
+                               c1 -= 0x10;
+                       if (c2 > 0x10)
+                               c2 -= 0x10;
+                       outpdw(overlay_base + off + 0x110,
+                                               (c1 << 16 | c0));/* low */
+                       outpdw(overlay_base + off + 0x114, c2);/* low */
+                       /* upper limit */
+                       if ((c0 + 0x20) < 0x0fff)
+                               c0 += 0x20;
+                       else
+                               c0 = 0x0fff;
+                       if ((c1 + 0x20) < 0x0fff)
+                               c1 += 0x20;
+                       else
+                               c1 = 0x0fff;
+                       if ((c2 + 0x20) < 0x0fff)
+                               c2 += 0x20;
+                       else
+                               c2 = 0x0fff;
+                       outpdw(overlay_base + off + 0x118,
+                                       (c1 << 16 | c0));/* high */
+                       outpdw(overlay_base + off + 0x11c, c2);/* high */
+               } else {
+                       blend_op |= MDP4_BLEND_BG_TRANSP_EN; /* bg blocked */
+                       /* lower limit */
+                       if (c0 > 0x10)
+                               c0 -= 0x10;
+                       if (c1 > 0x10)
+                               c1 -= 0x10;
+                       if (c2 > 0x10)
+                               c2 -= 0x10;
+                       outpdw(overlay_base + 0x180,
+                                               (c1 << 16 | c0));/* low */
+                       outpdw(overlay_base + 0x184, c2);/* low */
+                       /* upper limit */
+                       if ((c0 + 0x20) < 0x0fff)
+                               c0 += 0x20;
+                       else
+                               c0 = 0x0fff;
+                       if ((c1 + 0x20) < 0x0fff)
+                               c1 += 0x20;
+                       else
+                               c1 = 0x0fff;
+                       if ((c2 + 0x20) < 0x0fff)
+                               c2 += 0x20;
+                       else
+                               c2 = 0x0fff;
+                       outpdw(overlay_base + 0x188,
+                                               (c1 << 16 | c0));/* high */
+                       outpdw(overlay_base + 0x18c, c2);/* high */
+               }
+       }
+       outpdw(overlay_base + off + 0x104, blend_op);
+}
+
+void mdp4_overlay_reg_flush(struct mdp4_overlay_pipe *pipe, int all)
+{
+       uint32 bits = 0;
+
+       if (pipe->mixer_num == MDP4_MIXER1)
+               bits |= 0x02;
+       else
+               bits |= 0x01;
+
+       if (all) {
+               if (pipe->pipe_type == OVERLAY_TYPE_RGB) {
+                       if (pipe->pipe_num == OVERLAY_PIPE_RGB2)
+                               bits |= 0x20;
+                       else
+                               bits |= 0x10;
+               } else {
+                       if (pipe->pipe_num == OVERLAY_PIPE_VG2)
+                               bits |= 0x08;
+                       else
+                               bits |= 0x04;
+               }
+       }
+
+       outpdw(MDP_BASE + 0x18000, bits);       /* MDP_OVERLAY_REG_FLUSH */
+
+       while (inpdw(MDP_BASE + 0x18000) & bits) /* self clear when complete */
+               ;
+}
+
+struct mdp4_overlay_pipe *mdp4_overlay_ndx2pipe(int ndx)
+{
+       struct mdp4_overlay_pipe *pipe;
+
+       if (ndx == 0 || ndx >= MDP4_MAX_OVERLAY_PIPE)
+               return NULL;
+
+       pipe = &ctrl->plist[ndx - 1];   /* ndx start from 1 */
+
+       if (pipe->pipe_ndx == 0)
+               return NULL;
+
+       return pipe;
+}
+
+struct mdp4_overlay_pipe *mdp4_overlay_pipe_alloc(void)
+{
+       int i;
+       struct mdp4_overlay_pipe *pipe;
+
+       pipe = &ctrl->plist[0];
+       for (i = 0; i < MDP4_MAX_OVERLAY_PIPE; i++) {
+               if (pipe->pipe_ndx == 0) {
+                       pipe->pipe_ndx = i + 1; /* start from 1 */
+                       init_completion(&pipe->comp);
+       printk(KERN_INFO "mdp4_overlay_pipe_alloc: pipe=%x ndx=%d\n",
+                                       (int)pipe, pipe->pipe_ndx);
+                       return pipe;
+               }
+               pipe++;
+       }
+
+       return NULL;
+}
+
+
+void mdp4_overlay_pipe_free(struct mdp4_overlay_pipe *pipe)
+{
+       printk(KERN_INFO "mdp4_overlay_pipe_free: pipe=%x ndx=%d\n",
+                                       (int)pipe, pipe->pipe_ndx);
+       memset(pipe, 0, sizeof(*pipe));
+}
+
+static int get_pipe_num(int ptype, int stage)
+{
+       if (ptype == OVERLAY_TYPE_RGB) {
+               if (stage == MDP4_MIXER_STAGE_BASE)
+                       return OVERLAY_PIPE_RGB1;
+               else
+                       return OVERLAY_PIPE_RGB2;
+       } else {
+               if (stage == MDP4_MIXER_STAGE0)
+                       return OVERLAY_PIPE_VG1;
+               else
+                       return OVERLAY_PIPE_VG2;
+       }
+}
+
+int mdp4_overlay_req_check(uint32 id, uint32 z_order, uint32 mixer)
+{
+       struct mdp4_overlay_pipe *pipe;
+
+       pipe = ctrl->stage[mixer][z_order];
+
+       if (pipe == NULL)
+               return 0;
+
+       if (pipe->pipe_ndx == id)       /* same req, recycle */
+               return 0;
+
+       return -EPERM;
+}
+
+static int mdp4_overlay_req2pipe(struct mdp_overlay *req, int mixer,
+                       struct mdp4_overlay_pipe **ppipe)
+{
+       struct mdp4_overlay_pipe *pipe;
+       int ret, ptype;
+
+       if (mixer >= MDP4_MAX_MIXER) {
+               printk(KERN_ERR "mpd_overlay_req2pipe: mixer out of range!\n");
+               return -ERANGE;
+       }
+
+       if (req->z_order < 0 || req->z_order > 2) {
+               printk(KERN_ERR "mpd_overlay_req2pipe: z_order=%d out of range!\n",
+                               req->z_order);
+               return -ERANGE;
+       }
+
+       if (req->src_rect.h == 0 || req->src_rect.w == 0) {
+               printk(KERN_ERR "mpd_overlay_req2pipe: src img of zero size!\n");
+               return -EINVAL;
+       }
+
+       ret = mdp4_overlay_req_check(req->id, req->z_order, mixer);
+       if (ret < 0)
+               return ret;
+
+       ptype = mdp4_overlay_format2type(req->src.format);
+       if (ptype < 0)
+               return ptype;
+
+       if (req->id == MSMFB_NEW_REQUEST)  /* new request */
+               pipe = mdp4_overlay_pipe_alloc();
+       else
+               pipe = mdp4_overlay_ndx2pipe(req->id);
+
+       if (pipe == NULL)
+               return -ENOMEM;
+
+       pipe->src_format = req->src.format;
+       ret = mdp4_overlay_format2pipe(pipe);
+
+       if (ret < 0)
+               return ret;
+
+       /*
+        * base layer == 1, reserved for frame buffer
+        * zorder 0 == stage 0 == 2
+        * zorder 1 == stage 1 == 3
+        * zorder 2 == stage 2 == 4
+        */
+       if (req->id == MSMFB_NEW_REQUEST) {  /* new request */
+               pipe->mixer_stage = req->z_order + MDP4_MIXER_STAGE0;
+               pipe->pipe_type = ptype;
+               pipe->pipe_num = get_pipe_num(ptype, pipe->mixer_stage);
+               printk(KERN_INFO "mpd4_overlay_req2pipe: zorder=%d pipe_num=%d\n",
+                               req->z_order, pipe->pipe_num);
+       }
+
+       pipe->src_width = req->src.width & 0x07ff;      /* source img width */
+       pipe->src_height = req->src.height & 0x07ff;    /* source img height */
+       pipe->src_h = req->src_rect.h & 0x07ff;
+       pipe->src_w = req->src_rect.w & 0x07ff;
+       pipe->src_y = req->src_rect.y & 0x07ff;
+       pipe->src_x = req->src_rect.x & 0x07ff;
+       pipe->dst_h = req->dst_rect.h & 0x07ff;
+       pipe->dst_w = req->dst_rect.w & 0x07ff;
+       pipe->dst_y = req->dst_rect.y & 0x07ff;
+       pipe->dst_x = req->dst_rect.x & 0x07ff;
+
+       if (req->flags & MDP_FLIP_LR)
+               pipe->op_mode |= MDP4_OP_FLIP_LR;
+
+       if (req->flags & MDP_FLIP_UD)
+               pipe->op_mode |= MDP4_OP_FLIP_UD;
+
+       if (req->flags & MDP_DITHER)
+               pipe->op_mode |= MDP4_OP_DITHER_EN;
+
+       if (req->flags & MDP_DEINTERLACE)
+               pipe->op_mode |= MDP4_OP_DEINT_ODD_REF;
+
+       pipe->is_fg = req->is_fg;/* control alpha and color key */
+
+       pipe->alpha = req->alpha & 0x0ff;
+
+       pipe->transp = req->transp_mask;
+
+       *ppipe = pipe;
+
+       return 0;
+}
+
+int get_img(struct msmfb_data *img, struct fb_info *info,
+       unsigned long *start, unsigned long *len, struct file **pp_file)
+{
+       int put_needed, ret = 0;
+       struct file *file;
+#ifdef CONFIG_ANDROID_PMEM
+       unsigned long vstart;
+#endif
+
+#ifdef CONFIG_ANDROID_PMEM
+       if (!get_pmem_file(img->memory_id, start, &vstart, len, pp_file))
+               return 0;
+#endif
+       file = fget_light(img->memory_id, &put_needed);
+       if (file == NULL)
+               return -1;
+
+       if (MAJOR(file->f_dentry->d_inode->i_rdev) == FB_MAJOR) {
+               *start = info->fix.smem_start;
+               *len = info->fix.smem_len;
+               *pp_file = file;
+       } else {
+               ret = -1;
+               fput_light(file, put_needed);
+       }
+       return ret;
+}
+int mdp4_overlay_get(struct fb_info *info, struct mdp_overlay *req)
+{
+       struct mdp4_overlay_pipe *pipe;
+
+       pipe = mdp4_overlay_ndx2pipe(req->id);
+       if (pipe == NULL)
+               return -ENODEV;
+
+       *req = pipe->req_data;
+
+       return 0;
+}
+
+int mdp4_overlay_set(struct fb_info *info, struct mdp_overlay *req)
+{
+       struct msm_fb_data_type *mfd = (struct msm_fb_data_type *)info->par;
+       int ret, mixer;
+       struct mdp4_overlay_pipe *pipe;
+       int lcdc;
+
+       if (mfd == NULL)
+               return -ENODEV;
+
+       if (req->src.format == MDP_FB_FORMAT)
+               req->src.format = mfd->fb_imgType;
+
+       if (mutex_lock_interruptible(&mfd->dma->ov_mutex))
+               return -EINTR;
+
+       mixer = info->node; /* minor number of char device */
+
+       ret = mdp4_overlay_req2pipe(req, mixer, &pipe);
+       if (ret < 0) {
+               mutex_unlock(&mfd->dma->ov_mutex);
+               return ret;
+       }
+
+       lcdc = inpdw(MDP_BASE + 0xc0000);
+
+       if (lcdc == 0) { /* mddi */
+               /* MDP cmd block enable */
+               mdp_pipe_ctrl(MDP_CMD_BLOCK, MDP_BLOCK_POWER_ON, FALSE);
+       }
+
+       /* return id back to user */
+       req->id = pipe->pipe_ndx;       /* pipe_ndx start from 1 */
+       pipe->req_data = *req;          /* keep original req */
+
+       mutex_unlock(&mfd->dma->ov_mutex);
+
+       return 0;
+}
+
+int mdp4_overlay_unset(struct fb_info *info, int ndx)
+{
+       struct msm_fb_data_type *mfd = (struct msm_fb_data_type *)info->par;
+       struct mdp4_overlay_pipe *pipe;
+       int lcdc;
+
+       if (mfd == NULL)
+               return -ENODEV;
+
+       if (mutex_lock_interruptible(&mfd->dma->ov_mutex))
+               return -EINTR;
+
+       pipe = mdp4_overlay_ndx2pipe(ndx);
+
+       if (pipe == NULL) {
+               mutex_unlock(&mfd->dma->ov_mutex);
+               return -ENODEV;
+       }
+
+       lcdc = inpdw(MDP_BASE + 0xc0000);
+
+       mdp4_mixer_stage_down(pipe);
+
+       if (lcdc == 0) { /* mddi */
+               /* MDP cmd block disable */
+               mdp_pipe_ctrl(MDP_CMD_BLOCK, MDP_BLOCK_POWER_OFF, FALSE);
+       }
+
+       if (lcdc) /* LCDC mode */
+               mdp4_overlay_reg_flush(pipe, 0);
+
+       mdp4_overlay_pipe_free(pipe);
+
+       if (lcdc == 0) { /* mddi */
+               mdp4_mddi_overlay_restore();
+       }
+
+       mutex_unlock(&mfd->dma->ov_mutex);
+
+       return 0;
+}
+
+struct tile_desc {
+       uint32 width;  /* tile's width */
+       uint32 height; /* tile's height */
+       uint32 row_tile_w; /* tiles per row's width */
+       uint32 row_tile_h; /* tiles per row's height */
+};
+
+void tile_samsung(struct tile_desc *tp)
+{
+       /*
+        * each row of samsung tile consists of two tiles in height
+        * and two tiles in width which means width should align to
+        * 64 x 2 bytes and height should align to 32 x 2 bytes.
+        * video decoder generate two tiles in width and one tile
+        * in height which ends up height align to 32 X 1 bytes.
+        */
+       tp->width = 64;         /* 64 bytes */
+       tp->row_tile_w = 2;     /* 2 tiles per row's width */
+       tp->height = 32;        /* 32 bytes */
+       tp->row_tile_h = 1;     /* 1 tiles per row's height */
+}
+
+uint32 tile_mem_size(struct mdp4_overlay_pipe *pipe, struct tile_desc *tp)
+{
+       uint32 tile_w, tile_h;
+       uint32 row_num_w, row_num_h;
+
+
+       tile_w = tp->width * tp->row_tile_w;
+       tile_h = tp->height * tp->row_tile_h;
+
+       row_num_w = (pipe->src_width + tile_w - 1) / tile_w;
+       row_num_h = (pipe->src_height + tile_h - 1) / tile_h;
+
+       return row_num_w * row_num_h * tile_w * tile_h;
+}
+
+int mdp4_overlay_play(struct fb_info *info, struct msmfb_overlay_data *req,
+               struct file **pp_src_file)
+{
+       struct msm_fb_data_type *mfd = (struct msm_fb_data_type *)info->par;
+       struct msmfb_data *img;
+       struct mdp4_overlay_pipe *pipe;
+       ulong start, addr;
+       ulong len = 0;
+       struct file *p_src_file = 0;
+       int lcdc;
+
+       if (mfd == NULL)
+               return -ENODEV;
+
+       pipe = mdp4_overlay_ndx2pipe(req->id);
+       if (pipe == NULL)
+               return -ENODEV;
+
+       if (mutex_lock_interruptible(&mfd->dma->ov_mutex))
+               return -EINTR;
+
+       img = &req->data;
+       get_img(img, info, &start, &len, &p_src_file);
+       if (len == 0) {
+               mutex_unlock(&mfd->dma->ov_mutex);
+               printk(KERN_ERR "mdp_overlay_play: could not retrieve"
+                                      " image from memory\n");
+               return -1;
+       }
+       *pp_src_file = p_src_file;
+
+       addr = start + img->offset;
+       pipe->srcp0_addr = addr;
+       pipe->srcp0_ystride = pipe->src_width * pipe->bpp;
+
+       if (pipe->fetch_plane == OVERLAY_PLANE_PSEUDO_PLANAR) {
+               if (pipe->frame_format == MDP4_FRAME_FORMAT_VIDEO_SUPERTILE) {
+                       struct tile_desc tile;
+
+                       tile_samsung(&tile);
+                       pipe->srcp1_addr = addr + tile_mem_size(pipe, &tile);
+               } else
+                       pipe->srcp1_addr = addr +
+                                       pipe->src_width * pipe->src_height;
+
+               pipe->srcp0_ystride = pipe->src_width;
+               pipe->srcp1_ystride = pipe->src_width;
+       }
+
+       lcdc = inpdw(MDP_BASE + 0xc0000);
+       lcdc &= 0x01; /* LCDC mode */
+
+       if (pipe->pipe_type == OVERLAY_TYPE_VG)
+               mdp4_overlay_vg_setup(pipe);    /* video/graphic pipe */
+       else
+               mdp4_overlay_rgb_setup(pipe);   /* rgb pipe */
+
+       mdp4_mixer_blend_setup(pipe);
+       mdp4_mixer_stage_up(pipe);
+
+       if (lcdc) { /* LCDC mode */
+               mdp4_overlay_reg_flush(pipe, 1);
+       }
+
+       if (lcdc) { /* LCDC mode */
+               if (pipe->mixer_stage != MDP4_MIXER_STAGE_BASE) { /* done */
+                       mutex_unlock(&mfd->dma->ov_mutex);
+                       return 0;
+               }
+       }
+
+       if (lcdc == 0) { /* MDDI mode */
+#ifdef MDP4_NONBLOCKING
+               if (mfd->panel_power_on)
+#else
+               if (!mfd->dma->busy && mfd->panel_power_on)
+#endif
+                       mdp4_mddi_overlay_kickoff(mfd, pipe);
+       }
+
+       mutex_unlock(&mfd->dma->ov_mutex);
+
+       return 0;
+}
diff --git a/drivers/staging/msm/mdp4_overlay_lcdc.c b/drivers/staging/msm/mdp4_overlay_lcdc.c
new file mode 100644 (file)
index 0000000..a6ab8ec
--- /dev/null
@@ -0,0 +1,313 @@
+/* Copyright (c) 2008-2009, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/time.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/hrtimer.h>
+#include <linux/delay.h>
+#include <mach/hardware.h>
+#include <linux/io.h>
+
+#include <asm/system.h>
+#include <asm/mach-types.h>
+#include <linux/semaphore.h>
+#include <linux/spinlock.h>
+
+#include <linux/fb.h>
+
+#include "mdp.h"
+#include "msm_fb.h"
+#include "mdp4.h"
+
+#ifdef CONFIG_FB_MSM_MDP40
+#define LCDC_BASE      0xC0000
+#else
+#define LCDC_BASE      0xE0000
+#endif
+
+int first_pixel_start_x;
+int first_pixel_start_y;
+
+static struct mdp4_overlay_pipe *lcdc_pipe;
+
+int mdp_lcdc_on(struct platform_device *pdev)
+{
+       int lcdc_width;
+       int lcdc_height;
+       int lcdc_bpp;
+       int lcdc_border_clr;
+       int lcdc_underflow_clr;
+       int lcdc_hsync_skew;
+
+       int hsync_period;
+       int hsync_ctrl;
+       int vsync_period;
+       int display_hctl;
+       int display_v_start;
+       int display_v_end;
+       int active_hctl;
+       int active_h_start;
+       int active_h_end;
+       int active_v_start;
+       int active_v_end;
+       int ctrl_polarity;
+       int h_back_porch;
+       int h_front_porch;
+       int v_back_porch;
+       int v_front_porch;
+       int hsync_pulse_width;
+       int vsync_pulse_width;
+       int hsync_polarity;
+       int vsync_polarity;
+       int data_en_polarity;
+       int hsync_start_x;
+       int hsync_end_x;
+       uint8 *buf;
+       int bpp, ptype;
+       uint32 format;
+       struct fb_info *fbi;
+       struct fb_var_screeninfo *var;
+       struct msm_fb_data_type *mfd;
+       struct mdp4_overlay_pipe *pipe;
+       int ret;
+
+       mfd = (struct msm_fb_data_type *)platform_get_drvdata(pdev);
+
+       if (!mfd)
+               return -ENODEV;
+
+       if (mfd->key != MFD_KEY)
+               return -EINVAL;
+
+       fbi = mfd->fbi;
+       var = &fbi->var;
+
+       /* MDP cmd block enable */
+       mdp_pipe_ctrl(MDP_CMD_BLOCK, MDP_BLOCK_POWER_ON, FALSE);
+
+       bpp = fbi->var.bits_per_pixel / 8;
+       buf = (uint8 *) fbi->fix.smem_start;
+       buf += fbi->var.xoffset * bpp +
+               fbi->var.yoffset * fbi->fix.line_length;
+
+       if (bpp == 2)
+               format = MDP_RGB_565;
+       else if (bpp == 3)
+               format = MDP_RGB_888;
+       else
+               format = MDP_ARGB_8888;
+
+
+       if (lcdc_pipe == NULL) {
+               ptype = mdp4_overlay_format2type(format);
+               pipe = mdp4_overlay_pipe_alloc();
+               pipe->pipe_type = ptype;
+               /* use RGB1 pipe */
+               pipe->pipe_num  = OVERLAY_PIPE_RGB1;
+               pipe->mixer_stage  = MDP4_MIXER_STAGE_BASE;
+               pipe->mixer_num  = MDP4_MIXER0;
+               pipe->src_format = format;
+               mdp4_overlay_format2pipe(pipe);
+
+               lcdc_pipe = pipe; /* keep it */
+       } else {
+               pipe = lcdc_pipe;
+       }
+
+       pipe->src_height = fbi->var.yres;
+       pipe->src_width = fbi->var.xres;
+       pipe->src_h = fbi->var.yres;
+       pipe->src_w = fbi->var.xres;
+       pipe->src_y = 0;
+       pipe->src_x = 0;
+       pipe->srcp0_addr = (uint32) buf;
+       pipe->srcp0_ystride = fbi->fix.line_length;
+
+       mdp4_overlay_dmap_xy(pipe);
+       mdp4_overlay_dmap_cfg(mfd, 1);
+
+       mdp4_overlay_rgb_setup(pipe);
+
+       mdp4_mixer_stage_up(pipe);
+
+       mdp4_overlayproc_cfg(pipe);
+
+       /*
+        * LCDC timing setting
+        */
+       h_back_porch = var->left_margin;
+       h_front_porch = var->right_margin;
+       v_back_porch = var->upper_margin;
+       v_front_porch = var->lower_margin;
+       hsync_pulse_width = var->hsync_len;
+       vsync_pulse_width = var->vsync_len;
+       lcdc_border_clr = mfd->panel_info.lcdc.border_clr;
+       lcdc_underflow_clr = mfd->panel_info.lcdc.underflow_clr;
+       lcdc_hsync_skew = mfd->panel_info.lcdc.hsync_skew;
+
+       lcdc_width = mfd->panel_info.xres;
+       lcdc_height = mfd->panel_info.yres;
+       lcdc_bpp = mfd->panel_info.bpp;
+
+       hsync_period =
+           hsync_pulse_width + h_back_porch + lcdc_width + h_front_porch;
+       hsync_ctrl = (hsync_period << 16) | hsync_pulse_width;
+       hsync_start_x = hsync_pulse_width + h_back_porch;
+       hsync_end_x = hsync_period - h_front_porch - 1;
+       display_hctl = (hsync_end_x << 16) | hsync_start_x;
+
+       vsync_period =
+           (vsync_pulse_width + v_back_porch + lcdc_height +
+            v_front_porch) * hsync_period;
+       display_v_start =
+           (vsync_pulse_width + v_back_porch) * hsync_period + lcdc_hsync_skew;
+       display_v_end =
+           vsync_period - (v_front_porch * hsync_period) + lcdc_hsync_skew - 1;
+
+       if (lcdc_width != var->xres) {
+               active_h_start = hsync_start_x + first_pixel_start_x;
+               active_h_end = active_h_start + var->xres - 1;
+               active_hctl =
+                   ACTIVE_START_X_EN | (active_h_end << 16) | active_h_start;
+       } else {
+               active_hctl = 0;
+       }
+
+       if (lcdc_height != var->yres) {
+               active_v_start =
+                   display_v_start + first_pixel_start_y * hsync_period;
+               active_v_end = active_v_start + (var->yres) * hsync_period - 1;
+               active_v_start |= ACTIVE_START_Y_EN;
+       } else {
+               active_v_start = 0;
+               active_v_end = 0;
+       }
+
+
+#ifdef CONFIG_FB_MSM_MDP40
+       hsync_polarity = 1;
+       vsync_polarity = 1;
+       lcdc_underflow_clr |= 0x80000000;       /* enable recovery */
+#else
+       hsync_polarity = 0;
+       vsync_polarity = 0;
+#endif
+       data_en_polarity = 0;
+
+       ctrl_polarity =
+           (data_en_polarity << 2) | (vsync_polarity << 1) | (hsync_polarity);
+
+       MDP_OUTP(MDP_BASE + LCDC_BASE + 0x4, hsync_ctrl);
+       MDP_OUTP(MDP_BASE + LCDC_BASE + 0x8, vsync_period);
+       MDP_OUTP(MDP_BASE + LCDC_BASE + 0xc, vsync_pulse_width * hsync_period);
+       MDP_OUTP(MDP_BASE + LCDC_BASE + 0x10, display_hctl);
+       MDP_OUTP(MDP_BASE + LCDC_BASE + 0x14, display_v_start);
+       MDP_OUTP(MDP_BASE + LCDC_BASE + 0x18, display_v_end);
+       MDP_OUTP(MDP_BASE + LCDC_BASE + 0x28, lcdc_border_clr);
+       MDP_OUTP(MDP_BASE + LCDC_BASE + 0x2c, lcdc_underflow_clr);
+       MDP_OUTP(MDP_BASE + LCDC_BASE + 0x30, lcdc_hsync_skew);
+       MDP_OUTP(MDP_BASE + LCDC_BASE + 0x38, ctrl_polarity);
+       MDP_OUTP(MDP_BASE + LCDC_BASE + 0x1c, active_hctl);
+       MDP_OUTP(MDP_BASE + LCDC_BASE + 0x20, active_v_start);
+       MDP_OUTP(MDP_BASE + LCDC_BASE + 0x24, active_v_end);
+
+       ret = panel_next_on(pdev);
+       if (ret == 0) {
+               /* enable LCDC block */
+               MDP_OUTP(MDP_BASE + LCDC_BASE, 1);
+               mdp_pipe_ctrl(MDP_DMA2_BLOCK, MDP_BLOCK_POWER_ON, FALSE);
+       }
+       /* MDP cmd block disable */
+       mdp_pipe_ctrl(MDP_CMD_BLOCK, MDP_BLOCK_POWER_OFF, FALSE);
+
+       return ret;
+}
+
+int mdp_lcdc_off(struct platform_device *pdev)
+{
+       int ret = 0;
+       struct mdp4_overlay_pipe *pipe;
+
+       /* MDP cmd block enable */
+       mdp_pipe_ctrl(MDP_CMD_BLOCK, MDP_BLOCK_POWER_ON, FALSE);
+       MDP_OUTP(MDP_BASE + LCDC_BASE, 0);
+       /* MDP cmd block disable */
+       mdp_pipe_ctrl(MDP_CMD_BLOCK, MDP_BLOCK_POWER_OFF, FALSE);
+       mdp_pipe_ctrl(MDP_DMA2_BLOCK, MDP_BLOCK_POWER_OFF, FALSE);
+
+       ret = panel_next_off(pdev);
+
+       /* delay to make sure the last frame finishes */
+       mdelay(100);
+
+       /* dis-engage rgb0 from mixer */
+       pipe = lcdc_pipe;
+       mdp4_mixer_stage_down(pipe);
+
+       return ret;
+}
+
+/*
+ * mdp4_overlay0_done_lcdc: called from isr
+ */
+void mdp4_overlay0_done_lcdc()
+{
+       complete(&lcdc_pipe->comp);
+}
+
+void mdp4_lcdc_overlay(struct msm_fb_data_type *mfd)
+{
+       struct fb_info *fbi = mfd->fbi;
+       uint8 *buf;
+       int bpp;
+       unsigned long flag;
+       struct mdp4_overlay_pipe *pipe;
+
+       if (!mfd->panel_power_on)
+               return;
+
+       /* no need to power on cmd block since it's lcdc mode */
+       bpp = fbi->var.bits_per_pixel / 8;
+       buf = (uint8 *) fbi->fix.smem_start;
+       buf += fbi->var.xoffset * bpp +
+               fbi->var.yoffset * fbi->fix.line_length;
+
+       mutex_lock(&mfd->dma->ov_mutex);
+
+       pipe = lcdc_pipe;
+       pipe->srcp0_addr = (uint32) buf;
+       mdp4_overlay_rgb_setup(pipe);
+       mdp4_overlay_reg_flush(pipe, 1); /* rgb1 and mixer0 */
+
+       /* enable irq */
+       spin_lock_irqsave(&mdp_spin_lock, flag);
+       mdp_enable_irq(MDP_OVERLAY0_TERM);
+       INIT_COMPLETION(lcdc_pipe->comp);
+       mfd->dma->waiting = TRUE;
+       outp32(MDP_INTR_CLEAR, INTR_OVERLAY0_DONE);
+       mdp_intr_mask |= INTR_OVERLAY0_DONE;
+       outp32(MDP_INTR_ENABLE, mdp_intr_mask);
+       spin_unlock_irqrestore(&mdp_spin_lock, flag);
+       wait_for_completion_killable(&lcdc_pipe->comp);
+       mdp_disable_irq(MDP_OVERLAY0_TERM);
+
+       mutex_unlock(&mfd->dma->ov_mutex);
+}
diff --git a/drivers/staging/msm/mdp4_overlay_mddi.c b/drivers/staging/msm/mdp4_overlay_mddi.c
new file mode 100644 (file)
index 0000000..be1b287
--- /dev/null
@@ -0,0 +1,254 @@
+/* Copyright (c) 2008-2009, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/time.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/hrtimer.h>
+#include <linux/delay.h>
+#include <mach/hardware.h>
+#include <linux/io.h>
+
+#include <asm/system.h>
+#include <asm/mach-types.h>
+#include <linux/semaphore.h>
+#include <linux/spinlock.h>
+
+#include <linux/fb.h>
+
+#include "mdp.h"
+#include "msm_fb.h"
+#include "mdp4.h"
+
+static struct mdp4_overlay_pipe *mddi_pipe;
+static struct mdp4_overlay_pipe *pending_pipe;
+static struct msm_fb_data_type *mddi_mfd;
+
+#define WHOLESCREEN
+
+void mdp4_overlay_update_lcd(struct msm_fb_data_type *mfd)
+{
+       MDPIBUF *iBuf = &mfd->ibuf;
+       uint8 *src;
+       int bpp, ptype;
+       uint32 format;
+       uint32 mddi_ld_param;
+       uint16 mddi_vdo_packet_reg;
+       struct mdp4_overlay_pipe *pipe;
+
+       if (mfd->key != MFD_KEY)
+               return;
+
+       mddi_mfd = mfd;         /* keep it */
+
+       bpp = iBuf->bpp;
+
+       if (bpp == 2)
+               format = MDP_RGB_565;
+       else if (bpp == 3)
+               format = MDP_RGB_888;
+       else
+               format = MDP_ARGB_8888;
+
+       /* MDP cmd block enable */
+       mdp_pipe_ctrl(MDP_CMD_BLOCK, MDP_BLOCK_POWER_ON, FALSE);
+
+       if (mddi_pipe == NULL) {
+               ptype = mdp4_overlay_format2type(format);
+               pipe = mdp4_overlay_pipe_alloc();
+               pipe->pipe_type = ptype;
+               /* use RGB1 pipe */
+               pipe->pipe_num  = OVERLAY_PIPE_RGB1;
+               pipe->mixer_num  = MDP4_MIXER0;
+               pipe->src_format = format;
+               mdp4_overlay_format2pipe(pipe);
+
+               mddi_pipe = pipe; /* keep it */
+
+               mddi_ld_param = 0;
+               mddi_vdo_packet_reg = mfd->panel_info.mddi.vdopkt;
+
+               if (mfd->panel_info.type == MDDI_PANEL) {
+                       if (mfd->panel_info.pdest == DISPLAY_1)
+                               mddi_ld_param = 0;
+                       else
+                               mddi_ld_param = 1;
+               } else {
+                       mddi_ld_param = 2;
+               }
+
+               MDP_OUTP(MDP_BASE + 0x00090, mddi_ld_param);
+               MDP_OUTP(MDP_BASE + 0x00094,
+                        (MDDI_VDO_PACKET_DESC << 16) | mddi_vdo_packet_reg);
+       } else {
+               pipe = mddi_pipe;
+       }
+
+
+       src = (uint8 *) iBuf->buf;
+
+#ifdef WHOLESCREEN
+       {
+               struct fb_info *fbi;
+
+               fbi = mfd->fbi;
+               pipe->src_height = fbi->var.yres;
+               pipe->src_width = fbi->var.xres;
+               pipe->src_h = fbi->var.yres;
+               pipe->src_w = fbi->var.xres;
+               pipe->src_y = 0;
+               pipe->src_x = 0;
+               pipe->dst_h = fbi->var.yres;
+               pipe->dst_w = fbi->var.xres;
+               pipe->dst_y = 0;
+               pipe->dst_x = 0;
+               pipe->srcp0_addr = (uint32)src;
+               pipe->srcp0_ystride = fbi->var.xres_virtual * bpp;
+       }
+
+#else
+       if (mdp4_overlay_active(MDP4_MIXER0)) {
+               struct fb_info *fbi;
+
+               fbi = mfd->fbi;
+               pipe->src_height = fbi->var.yres;
+               pipe->src_width = fbi->var.xres;
+               pipe->src_h = fbi->var.yres;
+               pipe->src_w = fbi->var.xres;
+               pipe->src_y = 0;
+               pipe->src_x = 0;
+               pipe->dst_h = fbi->var.yres;
+               pipe->dst_w = fbi->var.xres;
+               pipe->dst_y = 0;
+               pipe->dst_x = 0;
+               pipe->srcp0_addr = (uint32) src;
+               pipe->srcp0_ystride = fbi->var.xres_virtual * bpp;
+       } else {
+               /* starting input address */
+               src += (iBuf->dma_x + iBuf->dma_y * iBuf->ibuf_width) * bpp;
+
+               pipe->src_height = iBuf->dma_h;
+               pipe->src_width = iBuf->dma_w;
+               pipe->src_h = iBuf->dma_h;
+               pipe->src_w = iBuf->dma_w;
+               pipe->src_y = 0;
+               pipe->src_x = 0;
+               pipe->dst_h = iBuf->dma_h;
+               pipe->dst_w = iBuf->dma_w;
+               pipe->dst_y = iBuf->dma_y;
+               pipe->dst_x = iBuf->dma_x;
+               pipe->srcp0_addr = (uint32) src;
+               pipe->srcp0_ystride = iBuf->ibuf_width * bpp;
+       }
+#endif
+
+       pipe->mixer_stage  = MDP4_MIXER_STAGE_BASE;
+
+       mdp4_overlay_rgb_setup(pipe);
+
+       mdp4_mixer_stage_up(pipe);
+
+       mdp4_overlayproc_cfg(pipe);
+
+       mdp4_overlay_dmap_xy(pipe);
+
+       mdp4_overlay_dmap_cfg(mfd, 0);
+
+       /* MDP cmd block disable */
+       mdp_pipe_ctrl(MDP_CMD_BLOCK, MDP_BLOCK_POWER_OFF, FALSE);
+
+}
+
+/*
+ * mdp4_overlay0_done_mddi: called from isr
+ */
+void mdp4_overlay0_done_mddi()
+{
+       if (pending_pipe)
+               complete(&pending_pipe->comp);
+}
+
+void mdp4_mddi_overlay_restore(void)
+{
+       /* mutex holded by caller */
+       mdp4_overlay_update_lcd(mddi_mfd);
+       mdp4_mddi_overlay_kickoff(mddi_mfd, mddi_pipe);
+}
+
+void mdp4_mddi_overlay_kickoff(struct msm_fb_data_type *mfd,
+                               struct mdp4_overlay_pipe *pipe)
+{
+#ifdef MDP4_NONBLOCKING
+       unsigned long flag;
+
+       spin_lock_irqsave(&mdp_spin_lock, flag);
+       if (mfd->dma->busy == TRUE) {
+               INIT_COMPLETION(pipe->comp);
+               pending_pipe = pipe;
+       }
+       spin_unlock_irqrestore(&mdp_spin_lock, flag);
+
+       if (pending_pipe != NULL) {
+               /* wait until DMA finishes the current job */
+               wait_for_completion_killable(&pipe->comp);
+               pending_pipe = NULL;
+       }
+       down(&mfd->sem);
+       mdp_enable_irq(MDP_OVERLAY0_TERM);
+       mfd->dma->busy = TRUE;
+       /* start OVERLAY pipe */
+       mdp_pipe_kickoff(MDP_OVERLAY0_TERM, mfd);
+       up(&mfd->sem);
+#else
+       down(&mfd->sem);
+       mdp_enable_irq(MDP_OVERLAY0_TERM);
+       mfd->dma->busy = TRUE;
+       INIT_COMPLETION(pipe->comp);
+       pending_pipe = pipe;
+
+       /* start OVERLAY pipe */
+       mdp_pipe_kickoff(MDP_OVERLAY0_TERM, mfd);
+       up(&mfd->sem);
+
+       /* wait until DMA finishes the current job */
+       wait_for_completion_killable(&pipe->comp);
+       mdp_disable_irq(MDP_OVERLAY0_TERM);
+#endif
+
+}
+
+void mdp4_mddi_overlay(struct msm_fb_data_type *mfd)
+{
+       mutex_lock(&mfd->dma->ov_mutex);
+
+       if ((mfd) && (!mfd->dma->busy) && (mfd->panel_power_on)) {
+               mdp4_overlay_update_lcd(mfd);
+
+               mdp4_mddi_overlay_kickoff(mfd, mddi_pipe);
+
+       /* signal if pan function is waiting for the update completion */
+               if (mfd->pan_waiting) {
+                       mfd->pan_waiting = FALSE;
+                       complete(&mfd->pan_comp);
+               }
+       }
+
+       mutex_unlock(&mfd->dma->ov_mutex);
+}
diff --git a/drivers/staging/msm/mdp4_util.c b/drivers/staging/msm/mdp4_util.c
new file mode 100644 (file)
index 0000000..fd97f52
--- /dev/null
@@ -0,0 +1,1686 @@
+
+/* Copyright (c) 2009, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/time.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/spinlock.h>
+#include <linux/hrtimer.h>
+#include <linux/clk.h>
+#include <mach/hardware.h>
+#include <linux/io.h>
+#include <linux/debugfs.h>
+
+#include <asm/system.h>
+#include <asm/mach-types.h>
+#include <linux/semaphore.h>
+#include <linux/uaccess.h>
+
+#include "mdp.h"
+#include "msm_fb.h"
+#include "mdp4.h"
+
+void mdp4_sw_reset(ulong bits)
+{
+       bits &= 0x1f;   /* 5 bits */
+       outpdw(MDP_BASE + 0x001c, bits);        /* MDP_SW_RESET */
+
+       while (inpdw(MDP_BASE + 0x001c) & bits) /* self clear when complete */
+               ;
+       MSM_FB_INFO("mdp4_sw_reset: 0x%x\n", (int)bits);
+}
+
+void mdp4_overlay_cfg(int overlayer, int blt_mode, int refresh, int direct_out)
+{
+       ulong bits = 0;
+
+       if (blt_mode)
+               bits |= (1 << 3);
+       refresh &= 0x03;        /* 2 bites */
+       bits |= (refresh << 1);
+       direct_out &= 0x01;
+       bits |= direct_out;
+
+       if (overlayer == MDP4_MIXER0)
+               outpdw(MDP_BASE + 0x10004, bits); /* MDP_OVERLAY0_CFG */
+       else
+               outpdw(MDP_BASE + 0x18004, bits); /* MDP_OVERLAY1_CFG */
+
+       MSM_FB_INFO("mdp4_overlay_cfg: 0x%x\n", (int)inpdw(MDP_BASE + 0x10004));
+}
+
+void mdp4_display_intf_sel(int output, ulong intf)
+{
+       ulong bits, mask;
+
+       bits = inpdw(MDP_BASE + 0x0038);        /* MDP_DISP_INTF_SEL */
+
+       mask = 0x03;    /* 2 bits */
+       intf &= 0x03;   /* 2 bits */
+
+       switch (output) {
+       case EXTERNAL_INTF_SEL:
+               intf <<= 4;
+               mask <<= 4;
+               break;
+       case SECONDARY_INTF_SEL:
+               intf &= 0x02;   /* only MDDI and EBI2 support */
+               intf <<= 2;
+               mask <<= 2;
+               break;
+       default:
+               break;
+       }
+
+
+       bits &= ~mask;
+       bits |= intf;
+
+       outpdw(MDP_BASE + 0x0038, bits);        /* MDP_DISP_INTF_SEL */
+
+  MSM_FB_INFO("mdp4_display_intf_sel: 0x%x\n", (int)inpdw(MDP_BASE + 0x0038));
+}
+
+unsigned long mdp4_display_status(void)
+{
+       return inpdw(MDP_BASE + 0x0018) & 0x3ff;        /* MDP_DISPLAY_STATUS */
+}
+
+void mdp4_ebi2_lcd_setup(int lcd, ulong base, int ystride)
+{
+       /* always use memory map */
+       ystride &= 0x01fff;     /* 13 bits */
+       if (lcd == EBI2_LCD0) {
+               outpdw(MDP_BASE + 0x0060, base);/* MDP_EBI2_LCD0 */
+               outpdw(MDP_BASE + 0x0068, ystride);/* MDP_EBI2_LCD0_YSTRIDE */
+       } else {
+               outpdw(MDP_BASE + 0x0064, base);/* MDP_EBI2_LCD1 */
+               outpdw(MDP_BASE + 0x006c, ystride);/* MDP_EBI2_LCD1_YSTRIDE */
+       }
+}
+
+void mdp4_mddi_setup(int mddi, unsigned long id)
+{
+       ulong   bits;
+
+       if (mddi == MDDI_EXTERNAL_SET)
+               bits = 0x02;
+       else if (mddi == MDDI_SECONDARY_SET)
+               bits = 0x01;
+       else
+               bits = 0;       /* PRIMARY_SET */
+
+       id <<= 16;
+
+       bits |= id;
+
+       outpdw(MDP_BASE + 0x0090, bits); /* MDP_MDDI_PARAM_WR_SEL */
+}
+
+int mdp_ppp_blit(struct fb_info *info, struct mdp_blit_req *req,
+       struct file **pp_src_file, struct file **pp_dst_file)
+{
+
+       /* not implemented yet */
+       return -1;
+}
+
+void mdp4_hw_init(void)
+{
+       ulong bits;
+
+       /* MDP cmd block enable */
+       mdp_pipe_ctrl(MDP_CMD_BLOCK, MDP_BLOCK_POWER_ON, FALSE);
+
+#ifdef MDP4_ERROR
+       /*
+        * Issue software reset on DMA_P will casue DMA_P dma engine stall
+        * on LCDC mode. However DMA_P does not stall at MDDI mode.
+        * This need further investigation.
+        */
+       mdp4_sw_reset(0x17);
+#endif
+
+       mdp4_clear_lcdc();
+
+       mdp4_mixer_blend_init(0);
+       mdp4_mixer_blend_init(1);
+       mdp4_vg_qseed_init(0);
+       mdp4_vg_qseed_init(1);
+       mdp4_vg_csc_mv_setup(0);
+       mdp4_vg_csc_mv_setup(1);
+       mdp4_vg_csc_pre_bv_setup(0);
+       mdp4_vg_csc_pre_bv_setup(1);
+       mdp4_vg_csc_post_bv_setup(0);
+       mdp4_vg_csc_post_bv_setup(1);
+       mdp4_vg_csc_pre_lv_setup(0);
+       mdp4_vg_csc_pre_lv_setup(1);
+       mdp4_vg_csc_post_lv_setup(0);
+       mdp4_vg_csc_post_lv_setup(1);
+
+       mdp4_mixer_gc_lut_setup(0);
+       mdp4_mixer_gc_lut_setup(1);
+
+       mdp4_vg_igc_lut_setup(0);
+       mdp4_vg_igc_lut_setup(1);
+
+        mdp4_rgb_igc_lut_setup(0);
+        mdp4_rgb_igc_lut_setup(1);
+
+       outp32(MDP_EBI2_PORTMAP_MODE, 0x3);
+
+       /* system interrupts */
+
+       bits =  mdp_intr_mask;
+       outpdw(MDP_BASE + 0x0050, bits);/* enable specififed interrupts */
+
+       /* histogram */
+       MDP_OUTP(MDP_BASE + 0x95010, 1);        /* auto clear HIST */
+
+       /* enable histogram interrupts */
+       outpdw(MDP_BASE + 0x9501c, INTR_HIST_DONE);
+
+       /* For the max read pending cmd config below, if the MDP clock     */
+       /* is less than the AXI clock, then we must use 3 pending          */
+       /* pending requests.  Otherwise, we should use 8 pending requests. */
+       /* In the future we should do this detection automatically.        */
+
+       /* max read pending cmd config */
+       outpdw(MDP_BASE + 0x004c, 0x02222);     /* 3 pending requests */
+
+       /* dma_p fetch config */
+       outpdw(MDP_BASE + 0x91004, 0x27);       /* burst size of 8 */
+
+#ifndef CONFIG_FB_MSM_OVERLAY
+       /* both REFRESH_MODE and DIRECT_OUT are ignored at BLT mode */
+       mdp4_overlay_cfg(MDP4_MIXER0, OVERLAY_MODE_BLT, 0, 0);
+       mdp4_overlay_cfg(MDP4_MIXER1, OVERLAY_MODE_BLT, 0, 0);
+#endif
+
+       /* MDP cmd block disable */
+       mdp_pipe_ctrl(MDP_CMD_BLOCK, MDP_BLOCK_POWER_OFF, FALSE);
+}
+
+
+void mdp4_clear_lcdc(void)
+{
+       uint32 bits;
+
+       bits = inpdw(MDP_BASE + 0xc0000);
+       if (bits & 0x01) /* enabled already */
+               return;
+
+       outpdw(MDP_BASE + 0xc0004, 0);  /* vsync ctrl out */
+       outpdw(MDP_BASE + 0xc0008, 0);  /* vsync period */
+       outpdw(MDP_BASE + 0xc000c, 0);  /* vsync pusle width */
+       outpdw(MDP_BASE + 0xc0010, 0);  /* lcdc display HCTL */
+       outpdw(MDP_BASE + 0xc0014, 0);  /* lcdc display v start */
+       outpdw(MDP_BASE + 0xc0018, 0);  /* lcdc display v end */
+       outpdw(MDP_BASE + 0xc001c, 0);  /* lcdc active hctl */
+       outpdw(MDP_BASE + 0xc0020, 0);  /* lcdc active v start */
+       outpdw(MDP_BASE + 0xc0024, 0);  /* lcdc active v end */
+       outpdw(MDP_BASE + 0xc0028, 0);  /* lcdc board color */
+       outpdw(MDP_BASE + 0xc002c, 0);  /* lcdc underflow ctrl */
+       outpdw(MDP_BASE + 0xc0030, 0);  /* lcdc hsync skew */
+       outpdw(MDP_BASE + 0xc0034, 0);  /* lcdc test ctl */
+       outpdw(MDP_BASE + 0xc0038, 0);  /* lcdc ctl polarity */
+}
+
+static struct mdp_dma_data overlay1_data;
+static int intr_dma_p;
+static int intr_dma_s;
+static int intr_dma_e;
+static int intr_overlay0;
+static int intr_overlay1;
+
+irqreturn_t mdp4_isr(int irq, void *ptr)
+{
+       uint32 isr, mask, lcdc;
+       struct mdp_dma_data *dma;
+
+       mdp_is_in_isr = TRUE;
+
+       while (1) {
+               isr = inpdw(MDP_INTR_STATUS);
+               if (isr == 0)
+                       break;
+
+               mask = inpdw(MDP_INTR_ENABLE);
+               outpdw(MDP_INTR_CLEAR, isr);
+
+               isr &= mask;
+
+               if (unlikely(isr == 0))
+                       break;
+
+               if (isr & INTR_DMA_P_DONE) {
+                       intr_dma_p++;
+                       lcdc = inpdw(MDP_BASE + 0xc0000);
+                       dma = &dma2_data;
+                       if (lcdc & 0x01) {      /* LCDC enable */
+                               /* disable LCDC interrupt */
+                               mdp_intr_mask &= ~INTR_DMA_P_DONE;
+                               outp32(MDP_INTR_ENABLE, mdp_intr_mask);
+                               dma->waiting = FALSE;
+                       } else {
+                               dma->busy = FALSE;
+                               mdp_pipe_ctrl(MDP_DMA2_BLOCK,
+                                       MDP_BLOCK_POWER_OFF, TRUE);
+                       }
+                       complete(&dma->comp);
+               }
+               if (isr & INTR_DMA_S_DONE) {
+                       intr_dma_s++;
+                       dma = &dma_s_data;
+                       dma->busy = FALSE;
+                       mdp_pipe_ctrl(MDP_DMA_S_BLOCK,
+                                       MDP_BLOCK_POWER_OFF, TRUE);
+                       complete(&dma->comp);
+               }
+               if (isr & INTR_DMA_E_DONE) {
+                       intr_dma_e++;
+                       dma = &dma_e_data;
+                       mdp_intr_mask &= ~INTR_DMA_E_DONE;
+                       outp32(MDP_INTR_ENABLE, mdp_intr_mask);
+                       dma->busy = FALSE;
+
+                       if (dma->waiting) {
+                               dma->waiting = FALSE;
+                               complete(&dma->comp);
+                       }
+               }
+               if (isr & INTR_OVERLAY0_DONE) {
+                       intr_overlay0++;
+                       lcdc = inpdw(MDP_BASE + 0xc0000);
+                       dma = &dma2_data;
+                       if (lcdc & 0x01) {      /* LCDC enable */
+                               /* disable LCDC interrupt */
+                               mdp_intr_mask &= ~INTR_OVERLAY0_DONE;
+                               outp32(MDP_INTR_ENABLE, mdp_intr_mask);
+                               dma->waiting = FALSE;
+                               mdp4_overlay0_done_lcdc();
+                       } else {        /* MDDI */
+                               dma->busy = FALSE;
+#ifdef MDP4_NONBLOCKING
+                               mdp_disable_irq_nolock(MDP_OVERLAY0_TERM);
+#endif
+                               mdp_pipe_ctrl(MDP_OVERLAY0_BLOCK,
+                                       MDP_BLOCK_POWER_OFF, TRUE);
+                               mdp4_overlay0_done_mddi();
+                       }
+               }
+               if (isr & INTR_OVERLAY1_DONE) {
+                       intr_overlay1++;
+                       dma = &overlay1_data;
+                       dma->busy = FALSE;
+                       mdp_pipe_ctrl(MDP_OVERLAY1_BLOCK,
+                                       MDP_BLOCK_POWER_OFF, TRUE);
+                       complete(&dma->comp);
+               }
+               if (isr & INTR_DMA_P_HISTOGRAM) {
+                       isr = inpdw(MDP_DMA_P_HIST_INTR_STATUS);
+                       mask = inpdw(MDP_DMA_P_HIST_INTR_ENABLE);
+                       outpdw(MDP_DMA_P_HIST_INTR_CLEAR, isr);
+                       isr &= mask;
+                       if (isr & INTR_HIST_DONE) {
+                               if (mdp_hist.r)
+                                       memcpy(mdp_hist.r, MDP_BASE + 0x95100,
+                                                       mdp_hist.bin_cnt*4);
+                               if (mdp_hist.g)
+                                       memcpy(mdp_hist.g, MDP_BASE + 0x95200,
+                                                       mdp_hist.bin_cnt*4);
+                               if (mdp_hist.b)
+                                       memcpy(mdp_hist.b, MDP_BASE + 0x95300,
+                                               mdp_hist.bin_cnt*4);
+                               complete(&mdp_hist_comp);
+                       }
+               }
+       }
+
+       mdp_is_in_isr = FALSE;
+
+       return IRQ_HANDLED;
+}
+
+
+/*
+ * QSEED tables
+ */
+
+static uint32 vg_qseed_table0[] = {
+       0x5556aaff, 0x00000000, 0x00000000, 0x00000000
+};
+
+static uint32 vg_qseed_table1[] = {
+       0x76543210, 0xfedcba98
+};
+
+static uint32 vg_qseed_table2[] = {
+       0x02000000, 0x00000000, 0x02060ff2, 0x00000008,
+       0x02090fe4, 0x00000013, 0x020a0fd9, 0x0ffc0021,
+       0x02080fce, 0x0ffa0030, 0x02030fc5, 0x0ff60042,
+       0x01fd0fbe, 0x0ff10054, 0x01f50fb6, 0x0fed0068,
+       0x01e90fb1, 0x0fe60080, 0x01dc0fae, 0x0fe10095,
+       0x01ca0fae, 0x0fda00ae, 0x01b70fad, 0x0fd600c6,
+       0x01a40fad, 0x0fcf00e0, 0x018f0faf, 0x0fc800fa,
+       0x01780fb1, 0x0fc30114, 0x015f0fb5, 0x0fbf012d,
+       0x01490fb7, 0x0fb70149, 0x012d0fbf, 0x0fb5015f,
+       0x01140fc3, 0x0fb10178, 0x00fa0fc8, 0x0faf018f,
+       0x00e00fcf, 0x0fad01a4, 0x00c60fd6, 0x0fad01b7,
+       0x00ae0fda, 0x0fae01ca, 0x00950fe1, 0x0fae01dc,
+       0x00800fe6, 0x0fb101e9, 0x00680fed, 0x0fb601f5,
+       0x00540ff1, 0x0fbe01fd, 0x00420ff6, 0x0fc50203,
+       0x00300ffa, 0x0fce0208, 0x00210ffc, 0x0fd9020a,
+       0x00130000, 0x0fe40209, 0x00080000, 0x0ff20206,
+       0x02000000, 0x00000000, 0x02040ff2, 0x0000000a,
+       0x02040fe4, 0x00000018, 0x02010fda, 0x0ffc0029,
+       0x01fc0fcf, 0x0ffa003b, 0x01f30fc7, 0x0ff60050,
+       0x01e90fc0, 0x0ff20065, 0x01dc0fba, 0x0fee007c,
+       0x01cc0fb6, 0x0fe80096, 0x01ba0fb4, 0x0fe400ae,
+       0x01a70fb4, 0x0fdd00c8, 0x018f0fb5, 0x0fda00e2,
+       0x017a0fb5, 0x0fd400fd, 0x01630fb8, 0x0fce0117,
+       0x014c0fba, 0x0fca0130, 0x01320fbf, 0x0fc70148,
+       0x011b0fc1, 0x0fc10163, 0x01010fc8, 0x0fc00177,
+       0x00e90fcd, 0x0fbd018d, 0x00d10fd1, 0x0fbc01a2,
+       0x00ba0fd7, 0x0fbb01b4, 0x00a30fdd, 0x0fbc01c4,
+       0x008e0fe1, 0x0fbd01d4, 0x00790fe7, 0x0fbe01e2,
+       0x00670feb, 0x0fc001ee, 0x00540ff1, 0x0fc501f6,
+       0x00430ff4, 0x0fcb01fe, 0x00340ff8, 0x0fd10203,
+       0x00260ffb, 0x0fd80207, 0x001a0ffd, 0x0fe10208,
+       0x000f0000, 0x0fea0207, 0x00060000, 0x0ff50205,
+       0x02000000, 0x00000000, 0x02020ff2, 0x0000000c,
+       0x02000fe4, 0x0000001c, 0x01fa0fda, 0x0ffc0030,
+       0x01f10fd0, 0x0ffa0045, 0x01e50fc8, 0x0ff6005d,
+       0x01d60fc3, 0x0ff30074, 0x01c60fbd, 0x0fef008e,
+       0x01b30fba, 0x0fe900aa, 0x019e0fb9, 0x0fe500c4,
+       0x01870fba, 0x0fe000df, 0x016f0fbb, 0x0fdd00f9,
+       0x01580fbc, 0x0fd80114, 0x01400fbf, 0x0fd3012e,
+       0x01280fc2, 0x0fd00146, 0x010f0fc6, 0x0fce015d,
+       0x00f90fc9, 0x0fc90175, 0x00e00fcf, 0x0fc90188,
+       0x00ca0fd4, 0x0fc6019c, 0x00b40fd8, 0x0fc601ae,
+       0x009f0fdd, 0x0fc501bf, 0x008b0fe3, 0x0fc601cc,
+       0x00780fe6, 0x0fc701db, 0x00660feb, 0x0fc801e7,
+       0x00560fef, 0x0fcb01f0, 0x00460ff3, 0x0fcf01f8,
+       0x00380ff6, 0x0fd401fe, 0x002c0ff9, 0x0fd90202,
+       0x00200ffc, 0x0fdf0205, 0x00160ffe, 0x0fe60206,
+       0x000c0000, 0x0fed0207, 0x00050000, 0x0ff70204,
+       0x02000000, 0x00000000, 0x01fe0ff3, 0x0000000f,
+       0x01f60fe5, 0x00000025, 0x01ea0fdb, 0x0ffd003e,
+       0x01db0fd2, 0x0ffb0058, 0x01c80fcc, 0x0ff70075,
+       0x01b50fc7, 0x0ff40090, 0x01a00fc3, 0x0ff000ad,
+       0x01880fc1, 0x0feb00cc, 0x01700fc1, 0x0fe800e7,
+       0x01550fc3, 0x0fe40104, 0x013b0fc5, 0x0fe2011e,
+       0x01240fc6, 0x0fde0138, 0x010c0fca, 0x0fda0150,
+       0x00f40fcd, 0x0fd90166, 0x00dd0fd1, 0x0fd7017b,
+       0x00c80fd4, 0x0fd40190, 0x00b20fd9, 0x0fd401a1,
+       0x009f0fdd, 0x0fd301b1, 0x008c0fe1, 0x0fd301c0,
+       0x007b0fe5, 0x0fd301cd, 0x006a0fea, 0x0fd401d8,
+       0x005c0fec, 0x0fd501e3, 0x004d0ff0, 0x0fd601ed,
+       0x00410ff3, 0x0fd801f4, 0x00340ff7, 0x0fdb01fa,
+       0x002a0ff9, 0x0fdf01fe, 0x00200ffb, 0x0fe30202,
+       0x00180ffd, 0x0fe70204, 0x00100ffe, 0x0fed0205,
+       0x00090000, 0x0ff20205, 0x00040000, 0x0ff90203,
+       0x02000000, 0x00000000, 0x02050ff5, 0x00000006,
+       0x02070fea, 0x0000000f, 0x02080fe1, 0x0ffd001a,
+       0x02070fd8, 0x0ffb0026, 0x02030fd1, 0x0ff80034,
+       0x01fe0fcb, 0x0ff40043, 0x01f60fc5, 0x0ff10054,
+       0x01ee0fc0, 0x0feb0067, 0x01e20fbe, 0x0fe70079,
+       0x01d40fbd, 0x0fe1008e, 0x01c40fbc, 0x0fdd00a3,
+       0x01b40fbb, 0x0fd700ba, 0x01a20fbc, 0x0fd100d1,
+       0x018d0fbd, 0x0fcd00e9, 0x01770fc0, 0x0fc80101,
+       0x01630fc1, 0x0fc1011b, 0x01480fc7, 0x0fbf0132,
+       0x01300fca, 0x0fba014c, 0x01170fce, 0x0fb80163,
+       0x00fd0fd4, 0x0fb5017a, 0x00e20fda, 0x0fb5018f,
+       0x00c80fdd, 0x0fb401a7, 0x00ae0fe4, 0x0fb401ba,
+       0x00960fe8, 0x0fb601cc, 0x007c0fee, 0x0fba01dc,
+       0x00650ff2, 0x0fc001e9, 0x00500ff6, 0x0fc701f3,
+       0x003b0ffa, 0x0fcf01fc, 0x00290ffc, 0x0fda0201,
+       0x00180000, 0x0fe40204, 0x000a0000, 0x0ff20204,
+       0x02000000, 0x00000000, 0x02030ff5, 0x00000008,
+       0x02030fea, 0x00000013, 0x02020fe1, 0x0ffd0020,
+       0x01fc0fd9, 0x0ffc002f, 0x01f60fd2, 0x0ff80040,
+       0x01ed0fcd, 0x0ff50051, 0x01e30fc7, 0x0ff10065,
+       0x01d70fc3, 0x0fec007a, 0x01c60fc2, 0x0fe9008f,
+       0x01b60fc1, 0x0fe300a6, 0x01a20fc1, 0x0fe000bd,
+       0x018f0fc1, 0x0fdb00d5, 0x017b0fc2, 0x0fd500ee,
+       0x01640fc4, 0x0fd20106, 0x014d0fc8, 0x0fce011d,
+       0x01370fc9, 0x0fc90137, 0x011d0fce, 0x0fc8014d,
+       0x01060fd2, 0x0fc40164, 0x00ee0fd5, 0x0fc2017b,
+       0x00d50fdb, 0x0fc1018f, 0x00bd0fe0, 0x0fc101a2,
+       0x00a60fe3, 0x0fc101b6, 0x008f0fe9, 0x0fc201c6,
+       0x007a0fec, 0x0fc301d7, 0x00650ff1, 0x0fc701e3,
+       0x00510ff5, 0x0fcd01ed, 0x00400ff8, 0x0fd201f6,
+       0x002f0ffc, 0x0fd901fc, 0x00200ffd, 0x0fe10202,
+       0x00130000, 0x0fea0203, 0x00080000, 0x0ff50203,
+       0x02000000, 0x00000000, 0x02020ff5, 0x00000009,
+       0x01ff0fea, 0x00000017, 0x01fb0fe2, 0x0ffd0026,
+       0x01f30fda, 0x0ffc0037, 0x01ea0fd3, 0x0ff8004b,
+       0x01df0fce, 0x0ff5005e, 0x01d10fc9, 0x0ff20074,
+       0x01c10fc6, 0x0fed008c, 0x01ae0fc5, 0x0fea00a3,
+       0x019b0fc5, 0x0fe500bb, 0x01850fc6, 0x0fe200d3,
+       0x01700fc6, 0x0fde00ec, 0x015a0fc8, 0x0fd90105,
+       0x01430fca, 0x0fd6011d, 0x012b0fcd, 0x0fd30135,
+       0x01150fcf, 0x0fcf014d, 0x00fc0fd4, 0x0fce0162,
+       0x00e50fd8, 0x0fcc0177, 0x00cf0fdb, 0x0fca018c,
+       0x00b80fe0, 0x0fc9019f, 0x00a20fe5, 0x0fca01af,
+       0x008e0fe8, 0x0fcb01bf, 0x00790fec, 0x0fcb01d0,
+       0x00670fef, 0x0fcd01dd, 0x00550ff4, 0x0fd001e7,
+       0x00440ff7, 0x0fd501f0, 0x00350ffa, 0x0fda01f7,
+       0x00270ffc, 0x0fdf01fe, 0x001b0ffe, 0x0fe70200,
+       0x00100000, 0x0fee0202, 0x00060000, 0x0ff70203,
+       0x02000000, 0x00000000, 0x01ff0ff5, 0x0000000c,
+       0x01f80fea, 0x0000001e, 0x01ef0fe2, 0x0ffd0032,
+       0x01e20fdb, 0x0ffc0047, 0x01d30fd5, 0x0ff9005f,
+       0x01c20fd1, 0x0ff60077, 0x01b00fcd, 0x0ff30090,
+       0x019b0fcb, 0x0fef00ab, 0x01850fcb, 0x0fec00c4,
+       0x016e0fcc, 0x0fe800de, 0x01550fcd, 0x0fe600f8,
+       0x013f0fce, 0x0fe20111, 0x01280fd0, 0x0fdf0129,
+       0x01110fd2, 0x0fdd0140, 0x00f90fd6, 0x0fdb0156,
+       0x00e40fd8, 0x0fd8016c, 0x00cd0fdd, 0x0fd8017e,
+       0x00b80fe0, 0x0fd60192, 0x00a40fe3, 0x0fd601a3,
+       0x00910fe7, 0x0fd501b3, 0x007f0feb, 0x0fd601c0,
+       0x006e0fed, 0x0fd701ce, 0x005d0ff1, 0x0fd701db,
+       0x004f0ff3, 0x0fd901e5, 0x00400ff7, 0x0fdc01ed,
+       0x00330ff9, 0x0fe001f4, 0x00280ffb, 0x0fe301fa,
+       0x001d0ffd, 0x0fe801fe, 0x00140ffe, 0x0fed0201,
+       0x000c0000, 0x0ff20202, 0x00050000, 0x0ff90202,
+       0x02000000, 0x00000000, 0x02040ff7, 0x00000005,
+       0x02070fed, 0x0000000c, 0x02060fe6, 0x0ffe0016,
+       0x02050fdf, 0x0ffc0020, 0x02020fd9, 0x0ff9002c,
+       0x01fe0fd4, 0x0ff60038, 0x01f80fcf, 0x0ff30046,
+       0x01f00fcb, 0x0fef0056, 0x01e70fc8, 0x0feb0066,
+       0x01db0fc7, 0x0fe60078, 0x01cc0fc6, 0x0fe3008b,
+       0x01bf0fc5, 0x0fdd009f, 0x01ae0fc6, 0x0fd800b4,
+       0x019c0fc6, 0x0fd400ca, 0x01880fc9, 0x0fcf00e0,
+       0x01750fc9, 0x0fc900f9, 0x015d0fce, 0x0fc6010f,
+       0x01460fd0, 0x0fc20128, 0x012e0fd3, 0x0fbf0140,
+       0x01140fd8, 0x0fbc0158, 0x00f90fdd, 0x0fbb016f,
+       0x00df0fe0, 0x0fba0187, 0x00c40fe5, 0x0fb9019e,
+       0x00aa0fe9, 0x0fba01b3, 0x008e0fef, 0x0fbd01c6,
+       0x00740ff3, 0x0fc301d6, 0x005d0ff6, 0x0fc801e5,
+       0x00450ffa, 0x0fd001f1, 0x00300ffc, 0x0fda01fa,
+       0x001c0000, 0x0fe40200, 0x000c0000, 0x0ff20202,
+       0x02000000, 0x00000000, 0x02030ff7, 0x00000006,
+       0x02020fee, 0x00000010, 0x02000fe7, 0x0ffe001b,
+       0x01fe0fdf, 0x0ffc0027, 0x01f70fda, 0x0ffa0035,
+       0x01f00fd5, 0x0ff70044, 0x01e70fd0, 0x0ff40055,
+       0x01dd0fcd, 0x0fef0067, 0x01d00fcb, 0x0fec0079,
+       0x01bf0fcb, 0x0fe8008e, 0x01af0fca, 0x0fe500a2,
+       0x019f0fc9, 0x0fe000b8, 0x018c0fca, 0x0fdb00cf,
+       0x01770fcc, 0x0fd800e5, 0x01620fce, 0x0fd400fc,
+       0x014d0fcf, 0x0fcf0115, 0x01350fd3, 0x0fcd012b,
+       0x011d0fd6, 0x0fca0143, 0x01050fd9, 0x0fc8015a,
+       0x00ec0fde, 0x0fc60170, 0x00d30fe2, 0x0fc60185,
+       0x00bb0fe5, 0x0fc5019b, 0x00a30fea, 0x0fc501ae,
+       0x008c0fed, 0x0fc601c1, 0x00740ff2, 0x0fc901d1,
+       0x005e0ff5, 0x0fce01df, 0x004b0ff8, 0x0fd301ea,
+       0x00370ffc, 0x0fda01f3, 0x00260ffd, 0x0fe201fb,
+       0x00170000, 0x0fea01ff, 0x00090000, 0x0ff50202,
+       0x02000000, 0x00000000, 0x02010ff7, 0x00000008,
+       0x01ff0fee, 0x00000013, 0x01fb0fe7, 0x0ffe0020,
+       0x01f60fe0, 0x0ffc002e, 0x01ed0fda, 0x0ffa003f,
+       0x01e40fd6, 0x0ff7004f, 0x01d80fd2, 0x0ff40062,
+       0x01ca0fcf, 0x0ff00077, 0x01bb0fcd, 0x0fed008b,
+       0x01a90fcd, 0x0fe900a1, 0x01960fcd, 0x0fe600b7,
+       0x01830fcd, 0x0fe200ce, 0x016d0fcf, 0x0fde00e6,
+       0x01580fd0, 0x0fdb00fd, 0x01410fd3, 0x0fd80114,
+       0x012c0fd4, 0x0fd4012c, 0x01140fd8, 0x0fd30141,
+       0x00fd0fdb, 0x0fd00158, 0x00e60fde, 0x0fcf016d,
+       0x00ce0fe2, 0x0fcd0183, 0x00b70fe6, 0x0fcd0196,
+       0x00a10fe9, 0x0fcd01a9, 0x008b0fed, 0x0fcd01bb,
+       0x00770ff0, 0x0fcf01ca, 0x00620ff4, 0x0fd201d8,
+       0x004f0ff7, 0x0fd601e4, 0x003f0ffa, 0x0fda01ed,
+       0x002e0ffc, 0x0fe001f6, 0x00200ffe, 0x0fe701fb,
+       0x00130000, 0x0fee01ff, 0x00080000, 0x0ff70201,
+       0x02000000, 0x00000000, 0x01ff0ff7, 0x0000000a,
+       0x01f90fee, 0x00000019, 0x01f10fe7, 0x0ffe002a,
+       0x01e60fe1, 0x0ffd003c, 0x01d90fdc, 0x0ffa0051,
+       0x01cc0fd8, 0x0ff70065, 0x01bb0fd5, 0x0ff5007b,
+       0x01a80fd3, 0x0ff10094, 0x01950fd2, 0x0fef00aa,
+       0x01800fd2, 0x0feb00c3, 0x016a0fd3, 0x0fe900da,
+       0x01540fd3, 0x0fe600f3, 0x013f0fd5, 0x0fe2010a,
+       0x01280fd7, 0x0fe00121, 0x01100fda, 0x0fde0138,
+       0x00fb0fdb, 0x0fdb014f, 0x00e40fdf, 0x0fdb0162,
+       0x00ce0fe2, 0x0fd90177, 0x00b90fe4, 0x0fd8018b,
+       0x00a50fe8, 0x0fd8019b, 0x00910fec, 0x0fd801ab,
+       0x007e0fee, 0x0fd801bc, 0x006c0ff2, 0x0fd901c9,
+       0x005c0ff4, 0x0fda01d6, 0x004b0ff7, 0x0fdd01e1,
+       0x003c0ff9, 0x0fe001eb, 0x002f0ffb, 0x0fe401f2,
+       0x00230ffd, 0x0fe801f8, 0x00180ffe, 0x0fed01fd,
+       0x000e0000, 0x0ff20200, 0x00060000, 0x0ff90201,
+       0x02000000, 0x00000000, 0x02030ff9, 0x00000004,
+       0x02050ff2, 0x00000009, 0x02050fed, 0x0ffe0010,
+       0x02040fe7, 0x0ffd0018, 0x02020fe3, 0x0ffb0020,
+       0x01fe0fdf, 0x0ff9002a, 0x01fa0fdb, 0x0ff70034,
+       0x01f40fd8, 0x0ff30041, 0x01ed0fd6, 0x0ff0004d,
+       0x01e30fd5, 0x0fec005c, 0x01d80fd4, 0x0fea006a,
+       0x01cd0fd3, 0x0fe5007b, 0x01c00fd3, 0x0fe1008c,
+       0x01b10fd3, 0x0fdd009f, 0x01a10fd4, 0x0fd900b2,
+       0x01900fd4, 0x0fd400c8, 0x017b0fd7, 0x0fd100dd,
+       0x01660fd9, 0x0fcd00f4, 0x01500fda, 0x0fca010c,
+       0x01380fde, 0x0fc60124, 0x011e0fe2, 0x0fc5013b,
+       0x01040fe4, 0x0fc30155, 0x00e70fe8, 0x0fc10170,
+       0x00cc0feb, 0x0fc10188, 0x00ad0ff0, 0x0fc301a0,
+       0x00900ff4, 0x0fc701b5, 0x00750ff7, 0x0fcc01c8,
+       0x00580ffb, 0x0fd201db, 0x003e0ffd, 0x0fdb01ea,
+       0x00250000, 0x0fe501f6, 0x000f0000, 0x0ff301fe,
+       0x02000000, 0x00000000, 0x02020ff9, 0x00000005,
+       0x02020ff2, 0x0000000c, 0x02010fed, 0x0ffe0014,
+       0x01fe0fe8, 0x0ffd001d, 0x01fa0fe3, 0x0ffb0028,
+       0x01f40fe0, 0x0ff90033, 0x01ed0fdc, 0x0ff70040,
+       0x01e50fd9, 0x0ff3004f, 0x01db0fd7, 0x0ff1005d,
+       0x01ce0fd7, 0x0fed006e, 0x01c00fd6, 0x0feb007f,
+       0x01b30fd5, 0x0fe70091, 0x01a30fd6, 0x0fe300a4,
+       0x01920fd6, 0x0fe000b8, 0x017e0fd8, 0x0fdd00cd,
+       0x016c0fd8, 0x0fd800e4, 0x01560fdb, 0x0fd600f9,
+       0x01400fdd, 0x0fd20111, 0x01290fdf, 0x0fd00128,
+       0x01110fe2, 0x0fce013f, 0x00f80fe6, 0x0fcd0155,
+       0x00de0fe8, 0x0fcc016e, 0x00c40fec, 0x0fcb0185,
+       0x00ab0fef, 0x0fcb019b, 0x00900ff3, 0x0fcd01b0,
+       0x00770ff6, 0x0fd101c2, 0x005f0ff9, 0x0fd501d3,
+       0x00470ffc, 0x0fdb01e2, 0x00320ffd, 0x0fe201ef,
+       0x001e0000, 0x0fea01f8, 0x000c0000, 0x0ff501ff,
+       0x02000000, 0x00000000, 0x02010ff9, 0x00000006,
+       0x02000ff2, 0x0000000e, 0x01fd0fed, 0x0ffe0018,
+       0x01f80fe8, 0x0ffd0023, 0x01f20fe4, 0x0ffb002f,
+       0x01eb0fe0, 0x0ff9003c, 0x01e10fdd, 0x0ff7004b,
+       0x01d60fda, 0x0ff4005c, 0x01c90fd9, 0x0ff2006c,
+       0x01bc0fd8, 0x0fee007e, 0x01ab0fd8, 0x0fec0091,
+       0x019b0fd8, 0x0fe800a5, 0x018b0fd8, 0x0fe400b9,
+       0x01770fd9, 0x0fe200ce, 0x01620fdb, 0x0fdf00e4,
+       0x014f0fdb, 0x0fdb00fb, 0x01380fde, 0x0fda0110,
+       0x01210fe0, 0x0fd70128, 0x010a0fe2, 0x0fd5013f,
+       0x00f30fe6, 0x0fd30154, 0x00da0fe9, 0x0fd3016a,
+       0x00c30feb, 0x0fd20180, 0x00aa0fef, 0x0fd20195,
+       0x00940ff1, 0x0fd301a8, 0x007b0ff5, 0x0fd501bb,
+       0x00650ff7, 0x0fd801cc, 0x00510ffa, 0x0fdc01d9,
+       0x003c0ffd, 0x0fe101e6, 0x002a0ffe, 0x0fe701f1,
+       0x00190000, 0x0fee01f9, 0x000a0000, 0x0ff701ff,
+       0x02000000, 0x00000000, 0x01ff0ff9, 0x00000008,
+       0x01fb0ff2, 0x00000013, 0x01f50fed, 0x0ffe0020,
+       0x01ed0fe8, 0x0ffd002e, 0x01e30fe4, 0x0ffb003e,
+       0x01d80fe1, 0x0ff9004e, 0x01cb0fde, 0x0ff70060,
+       0x01bc0fdc, 0x0ff40074, 0x01ac0fdb, 0x0ff20087,
+       0x019a0fdb, 0x0fef009c, 0x01870fdb, 0x0fed00b1,
+       0x01740fdb, 0x0fea00c7, 0x01600fdc, 0x0fe700dd,
+       0x014b0fdd, 0x0fe500f3, 0x01350fdf, 0x0fe30109,
+       0x01200fe0, 0x0fe00120, 0x01090fe3, 0x0fdf0135,
+       0x00f30fe5, 0x0fdd014b, 0x00dd0fe7, 0x0fdc0160,
+       0x00c70fea, 0x0fdb0174, 0x00b10fed, 0x0fdb0187,
+       0x009c0fef, 0x0fdb019a, 0x00870ff2, 0x0fdb01ac,
+       0x00740ff4, 0x0fdc01bc, 0x00600ff7, 0x0fde01cb,
+       0x004e0ff9, 0x0fe101d8, 0x003e0ffb, 0x0fe401e3,
+       0x002e0ffd, 0x0fe801ed, 0x00200ffe, 0x0fed01f5,
+       0x00130000, 0x0ff201fb, 0x00080000, 0x0ff901ff,
+       0x02000000, 0x00000000, 0x02060ff2, 0x00000008,
+       0x02090fe4, 0x00000013, 0x020a0fd9, 0x0ffc0021,
+       0x02080fce, 0x0ffa0030, 0x02030fc5, 0x0ff60042,
+       0x01fd0fbe, 0x0ff10054, 0x01f50fb6, 0x0fed0068,
+       0x01e90fb1, 0x0fe60080, 0x01dc0fae, 0x0fe10095,
+       0x01ca0fae, 0x0fda00ae, 0x01b70fad, 0x0fd600c6,
+       0x01a40fad, 0x0fcf00e0, 0x018f0faf, 0x0fc800fa,
+       0x01780fb1, 0x0fc30114, 0x015f0fb5, 0x0fbf012d,
+       0x01490fb7, 0x0fb70149, 0x012d0fbf, 0x0fb5015f,
+       0x01140fc3, 0x0fb10178, 0x00fa0fc8, 0x0faf018f,
+       0x00e00fcf, 0x0fad01a4, 0x00c60fd6, 0x0fad01b7,
+       0x00ae0fda, 0x0fae01ca, 0x00950fe1, 0x0fae01dc,
+       0x00800fe6, 0x0fb101e9, 0x00680fed, 0x0fb601f5,
+       0x00540ff1, 0x0fbe01fd, 0x00420ff6, 0x0fc50203,
+       0x00300ffa, 0x0fce0208, 0x00210ffc, 0x0fd9020a,
+       0x00130000, 0x0fe40209, 0x00080000, 0x0ff20206,
+       0x02000000, 0x00000000, 0x02040ff2, 0x0000000a,
+       0x02040fe4, 0x00000018, 0x02010fda, 0x0ffc0029,
+       0x01fc0fcf, 0x0ffa003b, 0x01f30fc7, 0x0ff60050,
+       0x01e90fc0, 0x0ff20065, 0x01dc0fba, 0x0fee007c,
+       0x01cc0fb6, 0x0fe80096, 0x01ba0fb4, 0x0fe400ae,
+       0x01a70fb4, 0x0fdd00c8, 0x018f0fb5, 0x0fda00e2,
+       0x017a0fb5, 0x0fd400fd, 0x01630fb8, 0x0fce0117,
+       0x014c0fba, 0x0fca0130, 0x01320fbf, 0x0fc70148,
+       0x011b0fc1, 0x0fc10163, 0x01010fc8, 0x0fc00177,
+       0x00e90fcd, 0x0fbd018d, 0x00d10fd1, 0x0fbc01a2,
+       0x00ba0fd7, 0x0fbb01b4, 0x00a30fdd, 0x0fbc01c4,
+       0x008e0fe1, 0x0fbd01d4, 0x00790fe7, 0x0fbe01e2,
+       0x00670feb, 0x0fc001ee, 0x00540ff1, 0x0fc501f6,
+       0x00430ff4, 0x0fcb01fe, 0x00340ff8, 0x0fd10203,
+       0x00260ffb, 0x0fd80207, 0x001a0ffd, 0x0fe10208,
+       0x000f0000, 0x0fea0207, 0x00060000, 0x0ff50205,
+       0x02000000, 0x00000000, 0x02020ff2, 0x0000000c,
+       0x02000fe4, 0x0000001c, 0x01fa0fda, 0x0ffc0030,
+       0x01f10fd0, 0x0ffa0045, 0x01e50fc8, 0x0ff6005d,
+       0x01d60fc3, 0x0ff30074, 0x01c60fbd, 0x0fef008e,
+       0x01b30fba, 0x0fe900aa, 0x019e0fb9, 0x0fe500c4,
+       0x01870fba, 0x0fe000df, 0x016f0fbb, 0x0fdd00f9,
+       0x01580fbc, 0x0fd80114, 0x01400fbf, 0x0fd3012e,
+       0x01280fc2, 0x0fd00146, 0x010f0fc6, 0x0fce015d,
+       0x00f90fc9, 0x0fc90175, 0x00e00fcf, 0x0fc90188,
+       0x00ca0fd4, 0x0fc6019c, 0x00b40fd8, 0x0fc601ae,
+       0x009f0fdd, 0x0fc501bf, 0x008b0fe3, 0x0fc601cc,
+       0x00780fe6, 0x0fc701db, 0x00660feb, 0x0fc801e7,
+       0x00560fef, 0x0fcb01f0, 0x00460ff3, 0x0fcf01f8,
+       0x00380ff6, 0x0fd401fe, 0x002c0ff9, 0x0fd90202,
+       0x00200ffc, 0x0fdf0205, 0x00160ffe, 0x0fe60206,
+       0x000c0000, 0x0fed0207, 0x00050000, 0x0ff70204,
+       0x02000000, 0x00000000, 0x01fe0ff3, 0x0000000f,
+       0x01f60fe5, 0x00000025, 0x01ea0fdb, 0x0ffd003e,
+       0x01db0fd2, 0x0ffb0058, 0x01c80fcc, 0x0ff70075,
+       0x01b50fc7, 0x0ff40090, 0x01a00fc3, 0x0ff000ad,
+       0x01880fc1, 0x0feb00cc, 0x01700fc1, 0x0fe800e7,
+       0x01550fc3, 0x0fe40104, 0x013b0fc5, 0x0fe2011e,
+       0x01240fc6, 0x0fde0138, 0x010c0fca, 0x0fda0150,
+       0x00f40fcd, 0x0fd90166, 0x00dd0fd1, 0x0fd7017b,
+       0x00c80fd4, 0x0fd40190, 0x00b20fd9, 0x0fd401a1,
+       0x009f0fdd, 0x0fd301b1, 0x008c0fe1, 0x0fd301c0,
+       0x007b0fe5, 0x0fd301cd, 0x006a0fea, 0x0fd401d8,
+       0x005c0fec, 0x0fd501e3, 0x004d0ff0, 0x0fd601ed,
+       0x00410ff3, 0x0fd801f4, 0x00340ff7, 0x0fdb01fa,
+       0x002a0ff9, 0x0fdf01fe, 0x00200ffb, 0x0fe30202,
+       0x00180ffd, 0x0fe70204, 0x00100ffe, 0x0fed0205,
+       0x00090000, 0x0ff20205, 0x00040000, 0x0ff90203,
+       0x02000000, 0x00000000, 0x02050ff5, 0x00000006,
+       0x02070fea, 0x0000000f, 0x02080fe1, 0x0ffd001a,
+       0x02070fd8, 0x0ffb0026, 0x02030fd1, 0x0ff80034,
+       0x01fe0fcb, 0x0ff40043, 0x01f60fc5, 0x0ff10054,
+       0x01ee0fc0, 0x0feb0067, 0x01e20fbe, 0x0fe70079,
+       0x01d40fbd, 0x0fe1008e, 0x01c40fbc, 0x0fdd00a3,
+       0x01b40fbb, 0x0fd700ba, 0x01a20fbc, 0x0fd100d1,
+       0x018d0fbd, 0x0fcd00e9, 0x01770fc0, 0x0fc80101,
+       0x01630fc1, 0x0fc1011b, 0x01480fc7, 0x0fbf0132,
+       0x01300fca, 0x0fba014c, 0x01170fce, 0x0fb80163,
+       0x00fd0fd4, 0x0fb5017a, 0x00e20fda, 0x0fb5018f,
+       0x00c80fdd, 0x0fb401a7, 0x00ae0fe4, 0x0fb401ba,
+       0x00960fe8, 0x0fb601cc, 0x007c0fee, 0x0fba01dc,
+       0x00650ff2, 0x0fc001e9, 0x00500ff6, 0x0fc701f3,
+       0x003b0ffa, 0x0fcf01fc, 0x00290ffc, 0x0fda0201,
+       0x00180000, 0x0fe40204, 0x000a0000, 0x0ff20204,
+       0x02000000, 0x00000000, 0x02030ff5, 0x00000008,
+       0x02030fea, 0x00000013, 0x02020fe1, 0x0ffd0020,
+       0x01fc0fd9, 0x0ffc002f, 0x01f60fd2, 0x0ff80040,
+       0x01ed0fcd, 0x0ff50051, 0x01e30fc7, 0x0ff10065,
+       0x01d70fc3, 0x0fec007a, 0x01c60fc2, 0x0fe9008f,
+       0x01b60fc1, 0x0fe300a6, 0x01a20fc1, 0x0fe000bd,
+       0x018f0fc1, 0x0fdb00d5, 0x017b0fc2, 0x0fd500ee,
+       0x01640fc4, 0x0fd20106, 0x014d0fc8, 0x0fce011d,
+       0x01370fc9, 0x0fc90137, 0x011d0fce, 0x0fc8014d,
+       0x01060fd2, 0x0fc40164, 0x00ee0fd5, 0x0fc2017b,
+       0x00d50fdb, 0x0fc1018f, 0x00bd0fe0, 0x0fc101a2,
+       0x00a60fe3, 0x0fc101b6, 0x008f0fe9, 0x0fc201c6,
+       0x007a0fec, 0x0fc301d7, 0x00650ff1, 0x0fc701e3,
+       0x00510ff5, 0x0fcd01ed, 0x00400ff8, 0x0fd201f6,
+       0x002f0ffc, 0x0fd901fc, 0x00200ffd, 0x0fe10202,
+       0x00130000, 0x0fea0203, 0x00080000, 0x0ff50203,
+       0x02000000, 0x00000000, 0x02020ff5, 0x00000009,
+       0x01ff0fea, 0x00000017, 0x01fb0fe2, 0x0ffd0026,
+       0x01f30fda, 0x0ffc0037, 0x01ea0fd3, 0x0ff8004b,
+       0x01df0fce, 0x0ff5005e, 0x01d10fc9, 0x0ff20074,
+       0x01c10fc6, 0x0fed008c, 0x01ae0fc5, 0x0fea00a3,
+       0x019b0fc5, 0x0fe500bb, 0x01850fc6, 0x0fe200d3,
+       0x01700fc6, 0x0fde00ec, 0x015a0fc8, 0x0fd90105,
+       0x01430fca, 0x0fd6011d, 0x012b0fcd, 0x0fd30135,
+       0x01150fcf, 0x0fcf014d, 0x00fc0fd4, 0x0fce0162,
+       0x00e50fd8, 0x0fcc0177, 0x00cf0fdb, 0x0fca018c,
+       0x00b80fe0, 0x0fc9019f, 0x00a20fe5, 0x0fca01af,
+       0x008e0fe8, 0x0fcb01bf, 0x00790fec, 0x0fcb01d0,
+       0x00670fef, 0x0fcd01dd, 0x00550ff4, 0x0fd001e7,
+       0x00440ff7, 0x0fd501f0, 0x00350ffa, 0x0fda01f7,
+       0x00270ffc, 0x0fdf01fe, 0x001b0ffe, 0x0fe70200,
+       0x00100000, 0x0fee0202, 0x00060000, 0x0ff70203,
+       0x02000000, 0x00000000, 0x01ff0ff5, 0x0000000c,
+       0x01f80fea, 0x0000001e, 0x01ef0fe2, 0x0ffd0032,
+       0x01e20fdb, 0x0ffc0047, 0x01d30fd5, 0x0ff9005f,
+       0x01c20fd1, 0x0ff60077, 0x01b00fcd, 0x0ff30090,
+       0x019b0fcb, 0x0fef00ab, 0x01850fcb, 0x0fec00c4,
+       0x016e0fcc, 0x0fe800de, 0x01550fcd, 0x0fe600f8,
+       0x013f0fce, 0x0fe20111, 0x01280fd0, 0x0fdf0129,
+       0x01110fd2, 0x0fdd0140, 0x00f90fd6, 0x0fdb0156,
+       0x00e40fd8, 0x0fd8016c, 0x00cd0fdd, 0x0fd8017e,
+       0x00b80fe0, 0x0fd60192, 0x00a40fe3, 0x0fd601a3,
+       0x00910fe7, 0x0fd501b3, 0x007f0feb, 0x0fd601c0,
+       0x006e0fed, 0x0fd701ce, 0x005d0ff1, 0x0fd701db,
+       0x004f0ff3, 0x0fd901e5, 0x00400ff7, 0x0fdc01ed,
+       0x00330ff9, 0x0fe001f4, 0x00280ffb, 0x0fe301fa,
+       0x001d0ffd, 0x0fe801fe, 0x00140ffe, 0x0fed0201,
+       0x000c0000, 0x0ff20202, 0x00050000, 0x0ff90202,
+       0x02000000, 0x00000000, 0x02040ff7, 0x00000005,
+       0x02070fed, 0x0000000c, 0x02060fe6, 0x0ffe0016,
+       0x02050fdf, 0x0ffc0020, 0x02020fd9, 0x0ff9002c,
+       0x01fe0fd4, 0x0ff60038, 0x01f80fcf, 0x0ff30046,
+       0x01f00fcb, 0x0fef0056, 0x01e70fc8, 0x0feb0066,
+       0x01db0fc7, 0x0fe60078, 0x01cc0fc6, 0x0fe3008b,
+       0x01bf0fc5, 0x0fdd009f, 0x01ae0fc6, 0x0fd800b4,
+       0x019c0fc6, 0x0fd400ca, 0x01880fc9, 0x0fcf00e0,
+       0x01750fc9, 0x0fc900f9, 0x015d0fce, 0x0fc6010f,
+       0x01460fd0, 0x0fc20128, 0x012e0fd3, 0x0fbf0140,
+       0x01140fd8, 0x0fbc0158, 0x00f90fdd, 0x0fbb016f,
+       0x00df0fe0, 0x0fba0187, 0x00c40fe5, 0x0fb9019e,
+       0x00aa0fe9, 0x0fba01b3, 0x008e0fef, 0x0fbd01c6,
+       0x00740ff3, 0x0fc301d6, 0x005d0ff6, 0x0fc801e5,
+       0x00450ffa, 0x0fd001f1, 0x00300ffc, 0x0fda01fa,
+       0x001c0000, 0x0fe40200, 0x000c0000, 0x0ff20202,
+       0x02000000, 0x00000000, 0x02030ff7, 0x00000006,
+       0x02020fee, 0x00000010, 0x02000fe7, 0x0ffe001b,
+       0x01fe0fdf, 0x0ffc0027, 0x01f70fda, 0x0ffa0035,
+       0x01f00fd5, 0x0ff70044, 0x01e70fd0, 0x0ff40055,
+       0x01dd0fcd, 0x0fef0067, 0x01d00fcb, 0x0fec0079,
+       0x01bf0fcb, 0x0fe8008e, 0x01af0fca, 0x0fe500a2,
+       0x019f0fc9, 0x0fe000b8, 0x018c0fca, 0x0fdb00cf,
+       0x01770fcc, 0x0fd800e5, 0x01620fce, 0x0fd400fc,
+       0x014d0fcf, 0x0fcf0115, 0x01350fd3, 0x0fcd012b,
+       0x011d0fd6, 0x0fca0143, 0x01050fd9, 0x0fc8015a,
+       0x00ec0fde, 0x0fc60170, 0x00d30fe2, 0x0fc60185,
+       0x00bb0fe5, 0x0fc5019b, 0x00a30fea, 0x0fc501ae,
+       0x008c0fed, 0x0fc601c1, 0x00740ff2, 0x0fc901d1,
+       0x005e0ff5, 0x0fce01df, 0x004b0ff8, 0x0fd301ea,
+       0x00370ffc, 0x0fda01f3, 0x00260ffd, 0x0fe201fb,
+       0x00170000, 0x0fea01ff, 0x00090000, 0x0ff50202,
+       0x02000000, 0x00000000, 0x02010ff7, 0x00000008,
+       0x01ff0fee, 0x00000013, 0x01fb0fe7, 0x0ffe0020,
+       0x01f60fe0, 0x0ffc002e, 0x01ed0fda, 0x0ffa003f,
+       0x01e40fd6, 0x0ff7004f, 0x01d80fd2, 0x0ff40062,
+       0x01ca0fcf, 0x0ff00077, 0x01bb0fcd, 0x0fed008b,
+       0x01a90fcd, 0x0fe900a1, 0x01960fcd, 0x0fe600b7,
+       0x01830fcd, 0x0fe200ce, 0x016d0fcf, 0x0fde00e6,
+       0x01580fd0, 0x0fdb00fd, 0x01410fd3, 0x0fd80114,
+       0x012c0fd4, 0x0fd4012c, 0x01140fd8, 0x0fd30141,
+       0x00fd0fdb, 0x0fd00158, 0x00e60fde, 0x0fcf016d,
+       0x00ce0fe2, 0x0fcd0183, 0x00b70fe6, 0x0fcd0196,
+       0x00a10fe9, 0x0fcd01a9, 0x008b0fed, 0x0fcd01bb,
+       0x00770ff0, 0x0fcf01ca, 0x00620ff4, 0x0fd201d8,
+       0x004f0ff7, 0x0fd601e4, 0x003f0ffa, 0x0fda01ed,
+       0x002e0ffc, 0x0fe001f6, 0x00200ffe, 0x0fe701fb,
+       0x00130000, 0x0fee01ff, 0x00080000, 0x0ff70201,
+       0x02000000, 0x00000000, 0x01ff0ff7, 0x0000000a,
+       0x01f90fee, 0x00000019, 0x01f10fe7, 0x0ffe002a,
+       0x01e60fe1, 0x0ffd003c, 0x01d90fdc, 0x0ffa0051,
+       0x01cc0fd8, 0x0ff70065, 0x01bb0fd5, 0x0ff5007b,
+       0x01a80fd3, 0x0ff10094, 0x01950fd2, 0x0fef00aa,
+       0x01800fd2, 0x0feb00c3, 0x016a0fd3, 0x0fe900da,
+       0x01540fd3, 0x0fe600f3, 0x013f0fd5, 0x0fe2010a,
+       0x01280fd7, 0x0fe00121, 0x01100fda, 0x0fde0138,
+       0x00fb0fdb, 0x0fdb014f, 0x00e40fdf, 0x0fdb0162,
+       0x00ce0fe2, 0x0fd90177, 0x00b90fe4, 0x0fd8018b,
+       0x00a50fe8, 0x0fd8019b, 0x00910fec, 0x0fd801ab,
+       0x007e0fee, 0x0fd801bc, 0x006c0ff2, 0x0fd901c9,
+       0x005c0ff4, 0x0fda01d6, 0x004b0ff7, 0x0fdd01e1,
+       0x003c0ff9, 0x0fe001eb, 0x002f0ffb, 0x0fe401f2,
+       0x00230ffd, 0x0fe801f8, 0x00180ffe, 0x0fed01fd,
+       0x000e0000, 0x0ff20200, 0x00060000, 0x0ff90201,
+       0x02000000, 0x00000000, 0x02030ff9, 0x00000004,
+       0x02050ff2, 0x00000009, 0x02050fed, 0x0ffe0010,
+       0x02040fe7, 0x0ffd0018, 0x02020fe3, 0x0ffb0020,
+       0x01fe0fdf, 0x0ff9002a, 0x01fa0fdb, 0x0ff70034,
+       0x01f40fd8, 0x0ff30041, 0x01ed0fd6, 0x0ff0004d,
+       0x01e30fd5, 0x0fec005c, 0x01d80fd4, 0x0fea006a,
+       0x01cd0fd3, 0x0fe5007b, 0x01c00fd3, 0x0fe1008c,
+       0x01b10fd3, 0x0fdd009f, 0x01a10fd4, 0x0fd900b2,
+       0x01900fd4, 0x0fd400c8, 0x017b0fd7, 0x0fd100dd,
+       0x01660fd9, 0x0fcd00f4, 0x01500fda, 0x0fca010c,
+       0x01380fde, 0x0fc60124, 0x011e0fe2, 0x0fc5013b,
+       0x01040fe4, 0x0fc30155, 0x00e70fe8, 0x0fc10170,
+       0x00cc0feb, 0x0fc10188, 0x00ad0ff0, 0x0fc301a0,
+       0x00900ff4, 0x0fc701b5, 0x00750ff7, 0x0fcc01c8,
+       0x00580ffb, 0x0fd201db, 0x003e0ffd, 0x0fdb01ea,
+       0x00250000, 0x0fe501f6, 0x000f0000, 0x0ff301fe,
+       0x02000000, 0x00000000, 0x02020ff9, 0x00000005,
+       0x02020ff2, 0x0000000c, 0x02010fed, 0x0ffe0014,
+       0x01fe0fe8, 0x0ffd001d, 0x01fa0fe3, 0x0ffb0028,
+       0x01f40fe0, 0x0ff90033, 0x01ed0fdc, 0x0ff70040,
+       0x01e50fd9, 0x0ff3004f, 0x01db0fd7, 0x0ff1005d,
+       0x01ce0fd7, 0x0fed006e, 0x01c00fd6, 0x0feb007f,
+       0x01b30fd5, 0x0fe70091, 0x01a30fd6, 0x0fe300a4,
+       0x01920fd6, 0x0fe000b8, 0x017e0fd8, 0x0fdd00cd,
+       0x016c0fd8, 0x0fd800e4, 0x01560fdb, 0x0fd600f9,
+       0x01400fdd, 0x0fd20111, 0x01290fdf, 0x0fd00128,
+       0x01110fe2, 0x0fce013f, 0x00f80fe6, 0x0fcd0155,
+       0x00de0fe8, 0x0fcc016e, 0x00c40fec, 0x0fcb0185,
+       0x00ab0fef, 0x0fcb019b, 0x00900ff3, 0x0fcd01b0,
+       0x00770ff6, 0x0fd101c2, 0x005f0ff9, 0x0fd501d3,
+       0x00470ffc, 0x0fdb01e2, 0x00320ffd, 0x0fe201ef,
+       0x001e0000, 0x0fea01f8, 0x000c0000, 0x0ff501ff,
+       0x02000000, 0x00000000, 0x02010ff9, 0x00000006,
+       0x02000ff2, 0x0000000e, 0x01fd0fed, 0x0ffe0018,
+       0x01f80fe8, 0x0ffd0023, 0x01f20fe4, 0x0ffb002f,
+       0x01eb0fe0, 0x0ff9003c, 0x01e10fdd, 0x0ff7004b,
+       0x01d60fda, 0x0ff4005c, 0x01c90fd9, 0x0ff2006c,
+       0x01bc0fd8, 0x0fee007e, 0x01ab0fd8, 0x0fec0091,
+       0x019b0fd8, 0x0fe800a5, 0x018b0fd8, 0x0fe400b9,
+       0x01770fd9, 0x0fe200ce, 0x01620fdb, 0x0fdf00e4,
+       0x014f0fdb, 0x0fdb00fb, 0x01380fde, 0x0fda0110,
+       0x01210fe0, 0x0fd70128, 0x010a0fe2, 0x0fd5013f,
+       0x00f30fe6, 0x0fd30154, 0x00da0fe9, 0x0fd3016a,
+       0x00c30feb, 0x0fd20180, 0x00aa0fef, 0x0fd20195,
+       0x00940ff1, 0x0fd301a8, 0x007b0ff5, 0x0fd501bb,
+       0x00650ff7, 0x0fd801cc, 0x00510ffa, 0x0fdc01d9,
+       0x003c0ffd, 0x0fe101e6, 0x002a0ffe, 0x0fe701f1,
+       0x00190000, 0x0fee01f9, 0x000a0000, 0x0ff701ff,
+       0x02000000, 0x00000000, 0x01ff0ff9, 0x00000008,
+       0x01fb0ff2, 0x00000013, 0x01f50fed, 0x0ffe0020,
+       0x01ed0fe8, 0x0ffd002e, 0x01e30fe4, 0x0ffb003e,
+       0x01d80fe1, 0x0ff9004e, 0x01cb0fde, 0x0ff70060,
+       0x01bc0fdc, 0x0ff40074, 0x01ac0fdb, 0x0ff20087,
+       0x019a0fdb, 0x0fef009c, 0x01870fdb, 0x0fed00b1,
+       0x01740fdb, 0x0fea00c7, 0x01600fdc, 0x0fe700dd,
+       0x014b0fdd, 0x0fe500f3, 0x01350fdf, 0x0fe30109,
+       0x01200fe0, 0x0fe00120, 0x01090fe3, 0x0fdf0135,
+       0x00f30fe5, 0x0fdd014b, 0x00dd0fe7, 0x0fdc0160,
+       0x00c70fea, 0x0fdb0174, 0x00b10fed, 0x0fdb0187,
+       0x009c0fef, 0x0fdb019a, 0x00870ff2, 0x0fdb01ac,
+       0x00740ff4, 0x0fdc01bc, 0x00600ff7, 0x0fde01cb,
+       0x004e0ff9, 0x0fe101d8, 0x003e0ffb, 0x0fe401e3,
+       0x002e0ffd, 0x0fe801ed, 0x00200ffe, 0x0fed01f5,
+       0x00130000, 0x0ff201fb, 0x00080000, 0x0ff901ff
+};
+
+
+#define MDP4_QSEED_TABLE0_OFF 0x8100
+#define MDP4_QSEED_TABLE1_OFF 0x8200
+#define MDP4_QSEED_TABLE2_OFF 0x9000
+
+void mdp4_vg_qseed_init(int vp_num)
+{
+       uint32 *off;
+       int i, voff;
+
+       voff = MDP4_VIDEO_OFF * vp_num;
+       off = (uint32 *)(MDP_BASE + MDP4_VIDEO_BASE + voff +
+                                               MDP4_QSEED_TABLE0_OFF);
+       for (i = 0; i < (sizeof(vg_qseed_table0) / sizeof(uint32)); i++) {
+               outpdw(off, vg_qseed_table0[i]);
+               off++;
+       }
+
+       off = (uint32 *)(MDP_BASE + MDP4_VIDEO_BASE + voff +
+                                               MDP4_QSEED_TABLE1_OFF);
+       for (i = 0; i < (sizeof(vg_qseed_table1) / sizeof(uint32)); i++) {
+               outpdw(off, vg_qseed_table1[i]);
+               off++;
+       }
+
+       off = (uint32 *)(MDP_BASE + MDP4_VIDEO_BASE + voff +
+                                               MDP4_QSEED_TABLE2_OFF);
+       for (i = 0; i < (sizeof(vg_qseed_table2) / sizeof(uint32)); i++) {
+               outpdw(off, vg_qseed_table2[i]);
+               off++;
+       }
+
+}
+
+void mdp4_mixer_blend_init(mixer_num)
+{
+       unsigned char *overlay_base;
+       int off;
+
+       if (mixer_num)  /* mixer number, /dev/fb0, /dev/fb1 */
+               overlay_base = MDP_BASE + MDP4_OVERLAYPROC1_BASE;/* 0x18000 */
+       else
+               overlay_base = MDP_BASE + MDP4_OVERLAYPROC0_BASE;/* 0x10000 */
+
+       /* stage 0 to stage 2 */
+       off = 0;
+       outpdw(overlay_base + off + 0x104, 0x010);
+       outpdw(overlay_base + off + 0x108, 0xff);/* FG */
+       outpdw(overlay_base + off + 0x10c, 0x00);/* BG */
+
+       off += 0x20;
+       outpdw(overlay_base + off + 0x104, 0x010);
+       outpdw(overlay_base + off + 0x108, 0xff);/* FG */
+       outpdw(overlay_base + off + 0x10c, 0x00);/* BG */
+
+       off += 0x20;
+       outpdw(overlay_base + off + 0x104, 0x010);
+       outpdw(overlay_base + off + 0x108, 0xff);/* FG */
+       outpdw(overlay_base + off + 0x10c, 0x00);/* BG */
+}
+
+
+static uint32 csc_matrix_tab[9] = {
+       0x0254, 0x0000, 0x0331,
+       0x0254, 0xff37, 0xfe60,
+       0x0254, 0x0409, 0x0000
+};
+
+static uint32 csc_pre_bv_tab[3] = {0xfff0, 0xff80, 0xff80 };
+static uint32 csc_post_bv_tab[3] = {0, 0, 0 };
+
+static  uint32 csc_pre_lv_tab[6] =  {0, 0xff, 0, 0xff, 0, 0xff };
+static  uint32 csc_post_lv_tab[6] = {0, 0xff, 0, 0xff, 0, 0xff };
+
+#define MDP4_CSC_MV_OFF        0x4400
+#define MDP4_CSC_PRE_BV_OFF    0x4500
+#define MDP4_CSC_POST_BV_OFF   0x4580
+#define MDP4_CSC_PRE_LV_OFF    0x4600
+#define MDP4_CSC_POST_LV_OFF   0x4680
+
+void mdp4_vg_csc_mv_setup(int vp_num)
+{
+       uint32 *off;
+       int i, voff;
+
+       voff = MDP4_VIDEO_OFF * vp_num;
+       off = (uint32 *)(MDP_BASE + MDP4_VIDEO_BASE + voff +
+                                       MDP4_CSC_MV_OFF);
+       for (i = 0; i < 9; i++) {
+               outpdw(off, csc_matrix_tab[i]);
+               off++;
+       }
+}
+
+void mdp4_vg_csc_pre_bv_setup(int vp_num)
+{
+       uint32 *off;
+       int i, voff;
+
+       voff = MDP4_VIDEO_OFF * vp_num;
+       off = (uint32 *)(MDP_BASE + MDP4_VIDEO_BASE + voff +
+                                       MDP4_CSC_PRE_BV_OFF);
+       for (i = 0; i < 3; i++) {
+               outpdw(off, csc_pre_bv_tab[i]);
+               off++;
+       }
+}
+
+void mdp4_vg_csc_post_bv_setup(int vp_num)
+{
+       uint32 *off;
+       int i, voff;
+
+       voff = MDP4_VIDEO_OFF * vp_num;
+       off = (uint32 *)(MDP_BASE + MDP4_VIDEO_BASE + voff +
+                                       MDP4_CSC_POST_BV_OFF);
+       for (i = 0; i < 3; i++) {
+               outpdw(off, csc_post_bv_tab[i]);
+               off++;
+       }
+}
+
+void mdp4_vg_csc_pre_lv_setup(int vp_num)
+{
+       uint32 *off;
+       int i, voff;
+
+       voff = MDP4_VIDEO_OFF * vp_num;
+       off = (uint32 *)(MDP_BASE + MDP4_VIDEO_BASE + voff +
+                                       MDP4_CSC_PRE_LV_OFF);
+
+       for (i = 0; i < 6; i++) {
+               outpdw(off, csc_pre_lv_tab[i]);
+               off++;
+       }
+}
+
+void mdp4_vg_csc_post_lv_setup(int vp_num)
+{
+       uint32 *off;
+       int i, voff;
+
+       voff = MDP4_VIDEO_OFF * vp_num;
+       off = (uint32 *)(MDP_BASE + MDP4_VIDEO_BASE + voff +
+                                       MDP4_CSC_POST_LV_OFF);
+
+       for (i = 0; i < 6; i++) {
+               outpdw(off, csc_post_lv_tab[i]);
+               off++;
+       }
+}
+
+char gc_lut[] = {
+       0x0, 0x1, 0x2, 0x2, 0x3, 0x4, 0x5, 0x6,
+       0x6, 0x7, 0x8, 0x9, 0xA, 0xA, 0xB, 0xC,
+       0xD, 0xD, 0xE, 0xF, 0xF, 0x10, 0x10, 0x11,
+       0x12, 0x12, 0x13, 0x13, 0x14, 0x14, 0x15, 0x15,
+       0x16, 0x16, 0x17, 0x17, 0x17, 0x18, 0x18, 0x19,
+       0x19, 0x19, 0x1A, 0x1A, 0x1B, 0x1B, 0x1B, 0x1C,
+       0x1C, 0x1D, 0x1D, 0x1D, 0x1E, 0x1E, 0x1E, 0x1F,
+       0x1F, 0x1F, 0x20, 0x20, 0x20, 0x21, 0x21, 0x21,
+       0x22, 0x22, 0x22, 0x22, 0x23, 0x23, 0x23, 0x24,
+       0x24, 0x24, 0x25, 0x25, 0x25, 0x25, 0x26, 0x26,
+       0x26, 0x26, 0x27, 0x27, 0x27, 0x28, 0x28, 0x28,
+       0x28, 0x29, 0x29, 0x29, 0x29, 0x2A, 0x2A, 0x2A,
+       0x2A, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2C, 0x2C,
+       0x2C, 0x2C, 0x2D, 0x2D, 0x2D, 0x2D, 0x2E, 0x2E,
+       0x2E, 0x2E, 0x2E, 0x2F, 0x2F, 0x2F, 0x2F, 0x30,
+       0x30, 0x30, 0x30, 0x30, 0x31, 0x31, 0x31, 0x31,
+       0x31, 0x32, 0x32, 0x32, 0x32, 0x32, 0x33, 0x33,
+       0x33, 0x33, 0x33, 0x34, 0x34, 0x34, 0x34, 0x34,
+       0x35, 0x35, 0x35, 0x35, 0x35, 0x36, 0x36, 0x36,
+       0x36, 0x36, 0x37, 0x37, 0x37, 0x37, 0x37, 0x37,
+       0x38, 0x38, 0x38, 0x38, 0x38, 0x39, 0x39, 0x39,
+       0x39, 0x39, 0x39, 0x3A, 0x3A, 0x3A, 0x3A, 0x3A,
+       0x3A, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3C,
+       0x3C, 0x3C, 0x3C, 0x3C, 0x3C, 0x3D, 0x3D, 0x3D,
+       0x3D, 0x3D, 0x3D, 0x3E, 0x3E, 0x3E, 0x3E, 0x3E,
+       0x3E, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x40,
+       0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x41, 0x41,
+       0x41, 0x41, 0x41, 0x41, 0x42, 0x42, 0x42, 0x42,
+       0x42, 0x42, 0x42, 0x43, 0x43, 0x43, 0x43, 0x43,
+       0x43, 0x43, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44,
+       0x44, 0x45, 0x45, 0x45, 0x45, 0x45, 0x45, 0x45,
+       0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x47,
+       0x47, 0x47, 0x47, 0x47, 0x47, 0x47, 0x48, 0x48,
+       0x48, 0x48, 0x48, 0x48, 0x48, 0x48, 0x49, 0x49,
+       0x49, 0x49, 0x49, 0x49, 0x49, 0x4A, 0x4A, 0x4A,
+       0x4A, 0x4A, 0x4A, 0x4A, 0x4A, 0x4B, 0x4B, 0x4B,
+       0x4B, 0x4B, 0x4B, 0x4B, 0x4B, 0x4C, 0x4C, 0x4C,
+       0x4C, 0x4C, 0x4C, 0x4C, 0x4D, 0x4D, 0x4D, 0x4D,
+       0x4D, 0x4D, 0x4D, 0x4D, 0x4E, 0x4E, 0x4E, 0x4E,
+       0x4E, 0x4E, 0x4E, 0x4E, 0x4E, 0x4F, 0x4F, 0x4F,
+       0x4F, 0x4F, 0x4F, 0x4F, 0x4F, 0x50, 0x50, 0x50,
+       0x50, 0x50, 0x50, 0x50, 0x50, 0x51, 0x51, 0x51,
+       0x51, 0x51, 0x51, 0x51, 0x51, 0x51, 0x52, 0x52,
+       0x52, 0x52, 0x52, 0x52, 0x52, 0x52, 0x53, 0x53,
+       0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x54,
+       0x54, 0x54, 0x54, 0x54, 0x54, 0x54, 0x54, 0x54,
+       0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+       0x55, 0x56, 0x56, 0x56, 0x56, 0x56, 0x56, 0x56,
+       0x56, 0x56, 0x57, 0x57, 0x57, 0x57, 0x57, 0x57,
+       0x57, 0x57, 0x57, 0x58, 0x58, 0x58, 0x58, 0x58,
+       0x58, 0x58, 0x58, 0x58, 0x58, 0x59, 0x59, 0x59,
+       0x59, 0x59, 0x59, 0x59, 0x59, 0x59, 0x5A, 0x5A,
+       0x5A, 0x5A, 0x5A, 0x5A, 0x5A, 0x5A, 0x5A, 0x5A,
+       0x5B, 0x5B, 0x5B, 0x5B, 0x5B, 0x5B, 0x5B, 0x5B,
+       0x5B, 0x5B, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C,
+       0x5C, 0x5C, 0x5C, 0x5C, 0x5D, 0x5D, 0x5D, 0x5D,
+       0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5E, 0x5E,
+       0x5E, 0x5E, 0x5E, 0x5E, 0x5E, 0x5E, 0x5E, 0x5E,
+       0x5F, 0x5F, 0x5F, 0x5F, 0x5F, 0x5F, 0x5F, 0x5F,
+       0x5F, 0x5F, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60,
+       0x60, 0x60, 0x60, 0x60, 0x60, 0x61, 0x61, 0x61,
+       0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x62,
+       0x62, 0x62, 0x62, 0x62, 0x62, 0x62, 0x62, 0x62,
+       0x62, 0x62, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63,
+       0x63, 0x63, 0x63, 0x63, 0x63, 0x64, 0x64, 0x64,
+       0x64, 0x64, 0x64, 0x64, 0x64, 0x64, 0x64, 0x64,
+       0x65, 0x65, 0x65, 0x65, 0x65, 0x65, 0x65, 0x65,
+       0x65, 0x65, 0x65, 0x66, 0x66, 0x66, 0x66, 0x66,
+       0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x67, 0x67,
+       0x67, 0x67, 0x67, 0x67, 0x67, 0x67, 0x67, 0x67,
+       0x67, 0x67, 0x68, 0x68, 0x68, 0x68, 0x68, 0x68,
+       0x68, 0x68, 0x68, 0x68, 0x68, 0x69, 0x69, 0x69,
+       0x69, 0x69, 0x69, 0x69, 0x69, 0x69, 0x69, 0x69,
+       0x69, 0x6A, 0x6A, 0x6A, 0x6A, 0x6A, 0x6A, 0x6A,
+       0x6A, 0x6A, 0x6A, 0x6A, 0x6A, 0x6B, 0x6B, 0x6B,
+       0x6B, 0x6B, 0x6B, 0x6B, 0x6B, 0x6B, 0x6B, 0x6B,
+       0x6B, 0x6C, 0x6C, 0x6C, 0x6C, 0x6C, 0x6C, 0x6C,
+       0x6C, 0x6C, 0x6C, 0x6C, 0x6C, 0x6D, 0x6D, 0x6D,
+       0x6D, 0x6D, 0x6D, 0x6D, 0x6D, 0x6D, 0x6D, 0x6D,
+       0x6D, 0x6E, 0x6E, 0x6E, 0x6E, 0x6E, 0x6E, 0x6E,
+       0x6E, 0x6E, 0x6E, 0x6E, 0x6E, 0x6F, 0x6F, 0x6F,
+       0x6F, 0x6F, 0x6F, 0x6F, 0x6F, 0x6F, 0x6F, 0x6F,
+       0x6F, 0x6F, 0x70, 0x70, 0x70, 0x70, 0x70, 0x70,
+       0x70, 0x70, 0x70, 0x70, 0x70, 0x70, 0x71, 0x71,
+       0x71, 0x71, 0x71, 0x71, 0x71, 0x71, 0x71, 0x71,
+       0x71, 0x71, 0x71, 0x72, 0x72, 0x72, 0x72, 0x72,
+       0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72,
+       0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73,
+       0x73, 0x73, 0x73, 0x73, 0x73, 0x74, 0x74, 0x74,
+       0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74,
+       0x74, 0x74, 0x75, 0x75, 0x75, 0x75, 0x75, 0x75,
+       0x75, 0x75, 0x75, 0x75, 0x75, 0x75, 0x75, 0x75,
+       0x76, 0x76, 0x76, 0x76, 0x76, 0x76, 0x76, 0x76,
+       0x76, 0x76, 0x76, 0x76, 0x76, 0x77, 0x77, 0x77,
+       0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77,
+       0x77, 0x77, 0x77, 0x78, 0x78, 0x78, 0x78, 0x78,
+       0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78,
+       0x78, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79,
+       0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x7A, 0x7A,
+       0x7A, 0x7A, 0x7A, 0x7A, 0x7A, 0x7A, 0x7A, 0x7A,
+       0x7A, 0x7A, 0x7A, 0x7A, 0x7A, 0x7B, 0x7B, 0x7B,
+       0x7B, 0x7B, 0x7B, 0x7B, 0x7B, 0x7B, 0x7B, 0x7B,
+       0x7B, 0x7B, 0x7B, 0x7C, 0x7C, 0x7C, 0x7C, 0x7C,
+       0x7C, 0x7C, 0x7C, 0x7C, 0x7C, 0x7C, 0x7C, 0x7C,
+       0x7C, 0x7D, 0x7D, 0x7D, 0x7D, 0x7D, 0x7D, 0x7D,
+       0x7D, 0x7D, 0x7D, 0x7D, 0x7D, 0x7D, 0x7D, 0x7D,
+       0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 0x7E,
+       0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 0x7F, 0x7F,
+       0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F,
+       0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x80, 0x80, 0x80,
+       0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+       0x80, 0x80, 0x80, 0x80, 0x81, 0x81, 0x81, 0x81,
+       0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+       0x81, 0x81, 0x81, 0x82, 0x82, 0x82, 0x82, 0x82,
+       0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82,
+       0x82, 0x82, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83,
+       0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83,
+       0x83, 0x83, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84,
+       0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84,
+       0x84, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85,
+       0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85,
+       0x85, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86,
+       0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86,
+       0x86, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87,
+       0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87,
+       0x87, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88,
+       0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88,
+       0x88, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89,
+       0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89,
+       0x89, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A,
+       0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A,
+       0x8A, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B,
+       0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B,
+       0x8B, 0x8B, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C,
+       0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C,
+       0x8C, 0x8C, 0x8C, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D,
+       0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D,
+       0x8D, 0x8D, 0x8D, 0x8D, 0x8E, 0x8E, 0x8E, 0x8E,
+       0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E,
+       0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8F, 0x8F, 0x8F,
+       0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F,
+       0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x90, 0x90,
+       0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90,
+       0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x91,
+       0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91,
+       0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91,
+       0x91, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92,
+       0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92,
+       0x92, 0x92, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93,
+       0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93,
+       0x93, 0x93, 0x93, 0x93, 0x94, 0x94, 0x94, 0x94,
+       0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94,
+       0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x95, 0x95,
+       0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95,
+       0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95,
+       0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96,
+       0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96,
+       0x96, 0x96, 0x96, 0x97, 0x97, 0x97, 0x97, 0x97,
+       0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97,
+       0x97, 0x97, 0x97, 0x97, 0x97, 0x98, 0x98, 0x98,
+       0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98,
+       0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98,
+       0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99,
+       0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99,
+       0x99, 0x99, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A,
+       0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A,
+       0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9B, 0x9B, 0x9B,
+       0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B,
+       0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B,
+       0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C,
+       0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C,
+       0x9C, 0x9C, 0x9C, 0x9C, 0x9D, 0x9D, 0x9D, 0x9D,
+       0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D,
+       0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9E,
+       0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E,
+       0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E,
+       0x9E, 0x9E, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F,
+       0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F,
+       0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0xA0, 0xA0,
+       0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0,
+       0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0,
+       0xA0, 0xA0, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1,
+       0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1,
+       0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA2, 0xA2,
+       0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2,
+       0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2,
+       0xA2, 0xA2, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3,
+       0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3,
+       0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA4, 0xA4,
+       0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4,
+       0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4,
+       0xA4, 0xA4, 0xA4, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5,
+       0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5,
+       0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5,
+       0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6,
+       0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6,
+       0xA6, 0xA6, 0xA6, 0xA6, 0xA7, 0xA7, 0xA7, 0xA7,
+       0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7,
+       0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7,
+       0xA7, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8,
+       0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8,
+       0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA9,
+       0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9,
+       0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9,
+       0xA9, 0xA9, 0xA9, 0xA9, 0xAA, 0xAA, 0xAA, 0xAA,
+       0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
+       0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
+       0xAA, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB,
+       0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB,
+       0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAC,
+       0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC,
+       0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC,
+       0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAD, 0xAD, 0xAD,
+       0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD,
+       0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD,
+       0xAD, 0xAD, 0xAD, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE,
+       0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE,
+       0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE,
+       0xAE, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF,
+       0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF,
+       0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xB0,
+       0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0,
+       0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0,
+       0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB1, 0xB1,
+       0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1,
+       0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1,
+       0xB1, 0xB1, 0xB1, 0xB1, 0xB2, 0xB2, 0xB2, 0xB2,
+       0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2,
+       0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2,
+       0xB2, 0xB2, 0xB2, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3,
+       0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3,
+       0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3,
+       0xB3, 0xB3, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4,
+       0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4,
+       0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4,
+       0xB4, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5,
+       0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5,
+       0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5,
+       0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6,
+       0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6,
+       0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6,
+       0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7,
+       0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7,
+       0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB8,
+       0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8,
+       0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8,
+       0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB9,
+       0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9,
+       0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9,
+       0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xBA,
+       0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA,
+       0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA,
+       0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBB,
+       0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB,
+       0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB,
+       0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB,
+       0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC,
+       0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC,
+       0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC,
+       0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD,
+       0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD,
+       0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD,
+       0xBD, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE,
+       0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE,
+       0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE,
+       0xBE, 0xBE, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF,
+       0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF,
+       0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF,
+       0xBF, 0xBF, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0,
+       0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0,
+       0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0,
+       0xC0, 0xC0, 0xC0, 0xC0, 0xC1, 0xC1, 0xC1, 0xC1,
+       0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1,
+       0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1,
+       0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC2, 0xC2, 0xC2,
+       0xC2, 0xC2, 0xC2, 0xC2, 0xC2, 0xC2, 0xC2, 0xC2,
+       0xC2, 0xC2, 0xC2, 0xC2, 0xC2, 0xC2, 0xC2, 0xC2,
+       0xC2, 0xC2, 0xC2, 0xC2, 0xC2, 0xC2, 0xC3, 0xC3,
+       0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3,
+       0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3,
+       0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3,
+       0xC4, 0xC4, 0xC4, 0xC4, 0xC4, 0xC4, 0xC4, 0xC4,
+       0xC4, 0xC4, 0xC4, 0xC4, 0xC4, 0xC4, 0xC4, 0xC4,
+       0xC4, 0xC4, 0xC4, 0xC4, 0xC4, 0xC4, 0xC4, 0xC4,
+       0xC4, 0xC4, 0xC5, 0xC5, 0xC5, 0xC5, 0xC5, 0xC5,
+       0xC5, 0xC5, 0xC5, 0xC5, 0xC5, 0xC5, 0xC5, 0xC5,
+       0xC5, 0xC5, 0xC5, 0xC5, 0xC5, 0xC5, 0xC5, 0xC5,
+       0xC5, 0xC5, 0xC5, 0xC5, 0xC6, 0xC6, 0xC6, 0xC6,
+       0xC6, 0xC6, 0xC6, 0xC6, 0xC6, 0xC6, 0xC6, 0xC6,
+       0xC6, 0xC6, 0xC6, 0xC6, 0xC6, 0xC6, 0xC6, 0xC6,
+       0xC6, 0xC6, 0xC6, 0xC6, 0xC6, 0xC6, 0xC7, 0xC7,
+       0xC7, 0xC7, 0xC7, 0xC7, 0xC7, 0xC7, 0xC7, 0xC7,
+       0xC7, 0xC7, 0xC7, 0xC7, 0xC7, 0xC7, 0xC7, 0xC7,
+       0xC7, 0xC7, 0xC7, 0xC7, 0xC7, 0xC7, 0xC7, 0xC7,
+       0xC8, 0xC8, 0xC8, 0xC8, 0xC8, 0xC8, 0xC8, 0xC8,
+       0xC8, 0xC8, 0xC8, 0xC8, 0xC8, 0xC8, 0xC8, 0xC8,
+       0xC8, 0xC8, 0xC8, 0xC8, 0xC8, 0xC8, 0xC8, 0xC8,
+       0xC8, 0xC8, 0xC8, 0xC9, 0xC9, 0xC9, 0xC9, 0xC9,
+       0xC9, 0xC9, 0xC9, 0xC9, 0xC9, 0xC9, 0xC9, 0xC9,
+       0xC9, 0xC9, 0xC9, 0xC9, 0xC9, 0xC9, 0xC9, 0xC9,
+       0xC9, 0xC9, 0xC9, 0xC9, 0xC9, 0xC9, 0xCA, 0xCA,
+       0xCA, 0xCA, 0xCA, 0xCA, 0xCA, 0xCA, 0xCA, 0xCA,
+       0xCA, 0xCA, 0xCA, 0xCA, 0xCA, 0xCA, 0xCA, 0xCA,
+       0xCA, 0xCA, 0xCA, 0xCA, 0xCA, 0xCA, 0xCA, 0xCA,
+       0xCA, 0xCB, 0xCB, 0xCB, 0xCB, 0xCB, 0xCB, 0xCB,
+       0xCB, 0xCB, 0xCB, 0xCB, 0xCB, 0xCB, 0xCB, 0xCB,
+       0xCB, 0xCB, 0xCB, 0xCB, 0xCB, 0xCB, 0xCB, 0xCB,
+       0xCB, 0xCB, 0xCB, 0xCB, 0xCC, 0xCC, 0xCC, 0xCC,
+       0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC,
+       0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC,
+       0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCD,
+       0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD,
+       0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD,
+       0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD,
+       0xCD, 0xCD, 0xCE, 0xCE, 0xCE, 0xCE, 0xCE, 0xCE,
+       0xCE, 0xCE, 0xCE, 0xCE, 0xCE, 0xCE, 0xCE, 0xCE,
+       0xCE, 0xCE, 0xCE, 0xCE, 0xCE, 0xCE, 0xCE, 0xCE,
+       0xCE, 0xCE, 0xCE, 0xCE, 0xCE, 0xCE, 0xCF, 0xCF,
+       0xCF, 0xCF, 0xCF, 0xCF, 0xCF, 0xCF, 0xCF, 0xCF,
+       0xCF, 0xCF, 0xCF, 0xCF, 0xCF, 0xCF, 0xCF, 0xCF,
+       0xCF, 0xCF, 0xCF, 0xCF, 0xCF, 0xCF, 0xCF, 0xCF,
+       0xCF, 0xCF, 0xD0, 0xD0, 0xD0, 0xD0, 0xD0, 0xD0,
+       0xD0, 0xD0, 0xD0, 0xD0, 0xD0, 0xD0, 0xD0, 0xD0,
+       0xD0, 0xD0, 0xD0, 0xD0, 0xD0, 0xD0, 0xD0, 0xD0,
+       0xD0, 0xD0, 0xD0, 0xD0, 0xD0, 0xD1, 0xD1, 0xD1,
+       0xD1, 0xD1, 0xD1, 0xD1, 0xD1, 0xD1, 0xD1, 0xD1,
+       0xD1, 0xD1, 0xD1, 0xD1, 0xD1, 0xD1, 0xD1, 0xD1,
+       0xD1, 0xD1, 0xD1, 0xD1, 0xD1, 0xD1, 0xD1, 0xD1,
+       0xD1, 0xD1, 0xD2, 0xD2, 0xD2, 0xD2, 0xD2, 0xD2,
+       0xD2, 0xD2, 0xD2, 0xD2, 0xD2, 0xD2, 0xD2, 0xD2,
+       0xD2, 0xD2, 0xD2, 0xD2, 0xD2, 0xD2, 0xD2, 0xD2,
+       0xD2, 0xD2, 0xD2, 0xD2, 0xD2, 0xD2, 0xD3, 0xD3,
+       0xD3, 0xD3, 0xD3, 0xD3, 0xD3, 0xD3, 0xD3, 0xD3,
+       0xD3, 0xD3, 0xD3, 0xD3, 0xD3, 0xD3, 0xD3, 0xD3,
+       0xD3, 0xD3, 0xD3, 0xD3, 0xD3, 0xD3, 0xD3, 0xD3,
+       0xD3, 0xD3, 0xD4, 0xD4, 0xD4, 0xD4, 0xD4, 0xD4,
+       0xD4, 0xD4, 0xD4, 0xD4, 0xD4, 0xD4, 0xD4, 0xD4,
+       0xD4, 0xD4, 0xD4, 0xD4, 0xD4, 0xD4, 0xD4, 0xD4,
+       0xD4, 0xD4, 0xD4, 0xD4, 0xD4, 0xD4, 0xD4, 0xD5,
+       0xD5, 0xD5, 0xD5, 0xD5, 0xD5, 0xD5, 0xD5, 0xD5,
+       0xD5, 0xD5, 0xD5, 0xD5, 0xD5, 0xD5, 0xD5, 0xD5,
+       0xD5, 0xD5, 0xD5, 0xD5, 0xD5, 0xD5, 0xD5, 0xD5,
+       0xD5, 0xD5, 0xD5, 0xD5, 0xD6, 0xD6, 0xD6, 0xD6,
+       0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6,
+       0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6,
+       0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6,
+       0xD6, 0xD7, 0xD7, 0xD7, 0xD7, 0xD7, 0xD7, 0xD7,
+       0xD7, 0xD7, 0xD7, 0xD7, 0xD7, 0xD7, 0xD7, 0xD7,
+       0xD7, 0xD7, 0xD7, 0xD7, 0xD7, 0xD7, 0xD7, 0xD7,
+       0xD7, 0xD7, 0xD7, 0xD7, 0xD7, 0xD7, 0xD8, 0xD8,
+       0xD8, 0xD8, 0xD8, 0xD8, 0xD8, 0xD8, 0xD8, 0xD8,
+       0xD8, 0xD8, 0xD8, 0xD8, 0xD8, 0xD8, 0xD8, 0xD8,
+       0xD8, 0xD8, 0xD8, 0xD8, 0xD8, 0xD8, 0xD8, 0xD8,
+       0xD8, 0xD8, 0xD8, 0xD9, 0xD9, 0xD9, 0xD9, 0xD9,
+       0xD9, 0xD9, 0xD9, 0xD9, 0xD9, 0xD9, 0xD9, 0xD9,
+       0xD9, 0xD9, 0xD9, 0xD9, 0xD9, 0xD9, 0xD9, 0xD9,
+       0xD9, 0xD9, 0xD9, 0xD9, 0xD9, 0xD9, 0xD9, 0xD9,
+       0xD9, 0xDA, 0xDA, 0xDA, 0xDA, 0xDA, 0xDA, 0xDA,
+       0xDA, 0xDA, 0xDA, 0xDA, 0xDA, 0xDA, 0xDA, 0xDA,
+       0xDA, 0xDA, 0xDA, 0xDA, 0xDA, 0xDA, 0xDA, 0xDA,
+       0xDA, 0xDA, 0xDA, 0xDA, 0xDA, 0xDA, 0xDB, 0xDB,
+       0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB,
+       0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB,
+       0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB,
+       0xDB, 0xDB, 0xDB, 0xDB, 0xDC, 0xDC, 0xDC, 0xDC,
+       0xDC, 0xDC, 0xDC, 0xDC, 0xDC, 0xDC, 0xDC, 0xDC,
+       0xDC, 0xDC, 0xDC, 0xDC, 0xDC, 0xDC, 0xDC, 0xDC,
+       0xDC, 0xDC, 0xDC, 0xDC, 0xDC, 0xDC, 0xDC, 0xDC,
+       0xDC, 0xDC, 0xDD, 0xDD, 0xDD, 0xDD, 0xDD, 0xDD,
+       0xDD, 0xDD, 0xDD, 0xDD, 0xDD, 0xDD, 0xDD, 0xDD,
+       0xDD, 0xDD, 0xDD, 0xDD, 0xDD, 0xDD, 0xDD, 0xDD,
+       0xDD, 0xDD, 0xDD, 0xDD, 0xDD, 0xDD, 0xDD, 0xDD,
+       0xDD, 0xDE, 0xDE, 0xDE, 0xDE, 0xDE, 0xDE, 0xDE,
+       0xDE, 0xDE, 0xDE, 0xDE, 0xDE, 0xDE, 0xDE, 0xDE,
+       0xDE, 0xDE, 0xDE, 0xDE, 0xDE, 0xDE, 0xDE, 0xDE,
+       0xDE, 0xDE, 0xDE, 0xDE, 0xDE, 0xDE, 0xDE, 0xDF,
+       0xDF, 0xDF, 0xDF, 0xDF, 0xDF, 0xDF, 0xDF, 0xDF,
+       0xDF, 0xDF, 0xDF, 0xDF, 0xDF, 0xDF, 0xDF, 0xDF,
+       0xDF, 0xDF, 0xDF, 0xDF, 0xDF, 0xDF, 0xDF, 0xDF,
+       0xDF, 0xDF, 0xDF, 0xDF, 0xDF, 0xDF, 0xE0, 0xE0,
+       0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0,
+       0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0,
+       0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0,
+       0xE0, 0xE0, 0xE0, 0xE0, 0xE1, 0xE1, 0xE1, 0xE1,
+       0xE1, 0xE1, 0xE1, 0xE1, 0xE1, 0xE1, 0xE1, 0xE1,
+       0xE1, 0xE1, 0xE1, 0xE1, 0xE1, 0xE1, 0xE1, 0xE1,
+       0xE1, 0xE1, 0xE1, 0xE1, 0xE1, 0xE1, 0xE1, 0xE1,
+       0xE1, 0xE1, 0xE1, 0xE2, 0xE2, 0xE2, 0xE2, 0xE2,
+       0xE2, 0xE2, 0xE2, 0xE2, 0xE2, 0xE2, 0xE2, 0xE2,
+       0xE2, 0xE2, 0xE2, 0xE2, 0xE2, 0xE2, 0xE2, 0xE2,
+       0xE2, 0xE2, 0xE2, 0xE2, 0xE2, 0xE2, 0xE2, 0xE2,
+       0xE2, 0xE2, 0xE3, 0xE3, 0xE3, 0xE3, 0xE3, 0xE3,
+       0xE3, 0xE3, 0xE3, 0xE3, 0xE3, 0xE3, 0xE3, 0xE3,
+       0xE3, 0xE3, 0xE3, 0xE3, 0xE3, 0xE3, 0xE3, 0xE3,
+       0xE3, 0xE3, 0xE3, 0xE3, 0xE3, 0xE3, 0xE3, 0xE3,
+       0xE3, 0xE3, 0xE4, 0xE4, 0xE4, 0xE4, 0xE4, 0xE4,
+       0xE4, 0xE4, 0xE4, 0xE4, 0xE4, 0xE4, 0xE4, 0xE4,
+       0xE4, 0xE4, 0xE4, 0xE4, 0xE4, 0xE4, 0xE4, 0xE4,
+       0xE4, 0xE4, 0xE4, 0xE4, 0xE4, 0xE4, 0xE4, 0xE4,
+       0xE4, 0xE5, 0xE5, 0xE5, 0xE5, 0xE5, 0xE5, 0xE5,
+       0xE5, 0xE5, 0xE5, 0xE5, 0xE5, 0xE5, 0xE5, 0xE5,
+       0xE5, 0xE5, 0xE5, 0xE5, 0xE5, 0xE5, 0xE5, 0xE5,
+       0xE5, 0xE5, 0xE5, 0xE5, 0xE5, 0xE5, 0xE5, 0xE5,
+       0xE5, 0xE6, 0xE6, 0xE6, 0xE6, 0xE6, 0xE6, 0xE6,
+       0xE6, 0xE6, 0xE6, 0xE6, 0xE6, 0xE6, 0xE6, 0xE6,
+       0xE6, 0xE6, 0xE6, 0xE6, 0xE6, 0xE6, 0xE6, 0xE6,
+       0xE6, 0xE6, 0xE6, 0xE6, 0xE6, 0xE6, 0xE6, 0xE6,
+       0xE6, 0xE7, 0xE7, 0xE7, 0xE7, 0xE7, 0xE7, 0xE7,
+       0xE7, 0xE7, 0xE7, 0xE7, 0xE7, 0xE7, 0xE7, 0xE7,
+       0xE7, 0xE7, 0xE7, 0xE7, 0xE7, 0xE7, 0xE7, 0xE7,
+       0xE7, 0xE7, 0xE7, 0xE7, 0xE7, 0xE7, 0xE7, 0xE7,
+       0xE7, 0xE8, 0xE8, 0xE8, 0xE8, 0xE8, 0xE8, 0xE8,
+       0xE8, 0xE8, 0xE8, 0xE8, 0xE8, 0xE8, 0xE8, 0xE8,
+       0xE8, 0xE8, 0xE8, 0xE8, 0xE8, 0xE8, 0xE8, 0xE8,
+       0xE8, 0xE8, 0xE8, 0xE8, 0xE8, 0xE8, 0xE8, 0xE8,
+       0xE8, 0xE9, 0xE9, 0xE9, 0xE9, 0xE9, 0xE9, 0xE9,
+       0xE9, 0xE9, 0xE9, 0xE9, 0xE9, 0xE9, 0xE9, 0xE9,
+       0xE9, 0xE9, 0xE9, 0xE9, 0xE9, 0xE9, 0xE9, 0xE9,
+       0xE9, 0xE9, 0xE9, 0xE9, 0xE9, 0xE9, 0xE9, 0xE9,
+       0xE9, 0xE9, 0xEA, 0xEA, 0xEA, 0xEA, 0xEA, 0xEA,
+       0xEA, 0xEA, 0xEA, 0xEA, 0xEA, 0xEA, 0xEA, 0xEA,
+       0xEA, 0xEA, 0xEA, 0xEA, 0xEA, 0xEA, 0xEA, 0xEA,
+       0xEA, 0xEA, 0xEA, 0xEA, 0xEA, 0xEA, 0xEA, 0xEA,
+       0xEA, 0xEA, 0xEB, 0xEB, 0xEB, 0xEB, 0xEB, 0xEB,
+       0xEB, 0xEB, 0xEB, 0xEB, 0xEB, 0xEB, 0xEB, 0xEB,
+       0xEB, 0xEB, 0xEB, 0xEB, 0xEB, 0xEB, 0xEB, 0xEB,
+       0xEB, 0xEB, 0xEB, 0xEB, 0xEB, 0xEB, 0xEB, 0xEB,
+       0xEB, 0xEB, 0xEB, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC,
+       0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC,
+       0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC,
+       0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC,
+       0xEC, 0xEC, 0xEC, 0xEC, 0xED, 0xED, 0xED, 0xED,
+       0xED, 0xED, 0xED, 0xED, 0xED, 0xED, 0xED, 0xED,
+       0xED, 0xED, 0xED, 0xED, 0xED, 0xED, 0xED, 0xED,
+       0xED, 0xED, 0xED, 0xED, 0xED, 0xED, 0xED, 0xED,
+       0xED, 0xED, 0xED, 0xED, 0xED, 0xEE, 0xEE, 0xEE,
+       0xEE, 0xEE, 0xEE, 0xEE, 0xEE, 0xEE, 0xEE, 0xEE,
+       0xEE, 0xEE, 0xEE, 0xEE, 0xEE, 0xEE, 0xEE, 0xEE,
+       0xEE, 0xEE, 0xEE, 0xEE, 0xEE, 0xEE, 0xEE, 0xEE,
+       0xEE, 0xEE, 0xEE, 0xEE, 0xEE, 0xEE, 0xEF, 0xEF,
+       0xEF, 0xEF, 0xEF, 0xEF, 0xEF, 0xEF, 0xEF, 0xEF,
+       0xEF, 0xEF, 0xEF, 0xEF, 0xEF, 0xEF, 0xEF, 0xEF,
+       0xEF, 0xEF, 0xEF, 0xEF, 0xEF, 0xEF, 0xEF, 0xEF,
+       0xEF, 0xEF, 0xEF, 0xEF, 0xEF, 0xEF, 0xEF, 0xEF,
+       0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0,
+       0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0,
+       0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0,
+       0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0,
+       0xF0, 0xF0, 0xF1, 0xF1, 0xF1, 0xF1, 0xF1, 0xF1,
+       0xF1, 0xF1, 0xF1, 0xF1, 0xF1, 0xF1, 0xF1, 0xF1,
+       0xF1, 0xF1, 0xF1, 0xF1, 0xF1, 0xF1, 0xF1, 0xF1,
+       0xF1, 0xF1, 0xF1, 0xF1, 0xF1, 0xF1, 0xF1, 0xF1,
+       0xF1, 0xF1, 0xF1, 0xF1, 0xF2, 0xF2, 0xF2, 0xF2,
+       0xF2, 0xF2, 0xF2, 0xF2, 0xF2, 0xF2, 0xF2, 0xF2,
+       0xF2, 0xF2, 0xF2, 0xF2, 0xF2, 0xF2, 0xF2, 0xF2,
+       0xF2, 0xF2, 0xF2, 0xF2, 0xF2, 0xF2, 0xF2, 0xF2,
+       0xF2, 0xF2, 0xF2, 0xF2, 0xF2, 0xF2, 0xF3, 0xF3,
+       0xF3, 0xF3, 0xF3, 0xF3, 0xF3, 0xF3, 0xF3, 0xF3,
+       0xF3, 0xF3, 0xF3, 0xF3, 0xF3, 0xF3, 0xF3, 0xF3,
+       0xF3, 0xF3, 0xF3, 0xF3, 0xF3, 0xF3, 0xF3, 0xF3,
+       0xF3, 0xF3, 0xF3, 0xF3, 0xF3, 0xF3, 0xF3, 0xF3,
+       0xF4, 0xF4, 0xF4, 0xF4, 0xF4, 0xF4, 0xF4, 0xF4,
+       0xF4, 0xF4, 0xF4, 0xF4, 0xF4, 0xF4, 0xF4, 0xF4,
+       0xF4, 0xF4, 0xF4, 0xF4, 0xF4, 0xF4, 0xF4, 0xF4,
+       0xF4, 0xF4, 0xF4, 0xF4, 0xF4, 0xF4, 0xF4, 0xF4,
+       0xF4, 0xF4, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5,
+       0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5,
+       0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5,
+       0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5,
+       0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF6, 0xF6, 0xF6,
+       0xF6, 0xF6, 0xF6, 0xF6, 0xF6, 0xF6, 0xF6, 0xF6,
+       0xF6, 0xF6, 0xF6, 0xF6, 0xF6, 0xF6, 0xF6, 0xF6,
+       0xF6, 0xF6, 0xF6, 0xF6, 0xF6, 0xF6, 0xF6, 0xF6,
+       0xF6, 0xF6, 0xF6, 0xF6, 0xF6, 0xF6, 0xF6, 0xF6,
+       0xF7, 0xF7, 0xF7, 0xF7, 0xF7, 0xF7, 0xF7, 0xF7,
+       0xF7, 0xF7, 0xF7, 0xF7, 0xF7, 0xF7, 0xF7, 0xF7,
+       0xF7, 0xF7, 0xF7, 0xF7, 0xF7, 0xF7, 0xF7, 0xF7,
+       0xF7, 0xF7, 0xF7, 0xF7, 0xF7, 0xF7, 0xF7, 0xF7,
+       0xF7, 0xF7, 0xF7, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8,
+       0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8,
+       0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8,
+       0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8,
+       0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF9, 0xF9,
+       0xF9, 0xF9, 0xF9, 0xF9, 0xF9, 0xF9, 0xF9, 0xF9,
+       0xF9, 0xF9, 0xF9, 0xF9, 0xF9, 0xF9, 0xF9, 0xF9,
+       0xF9, 0xF9, 0xF9, 0xF9, 0xF9, 0xF9, 0xF9, 0xF9,
+       0xF9, 0xF9, 0xF9, 0xF9, 0xF9, 0xF9, 0xF9, 0xF9,
+       0xF9, 0xFA, 0xFA, 0xFA, 0xFA, 0xFA, 0xFA, 0xFA,
+       0xFA, 0xFA, 0xFA, 0xFA, 0xFA, 0xFA, 0xFA, 0xFA,
+       0xFA, 0xFA, 0xFA, 0xFA, 0xFA, 0xFA, 0xFA, 0xFA,
+       0xFA, 0xFA, 0xFA, 0xFA, 0xFA, 0xFA, 0xFA, 0xFA,
+       0xFA, 0xFA, 0xFA, 0xFA, 0xFA, 0xFB, 0xFB, 0xFB,
+       0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB,
+       0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB,
+       0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB,
+       0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB,
+       0xFB, 0xFC, 0xFC, 0xFC, 0xFC, 0xFC, 0xFC, 0xFC,
+       0xFC, 0xFC, 0xFC, 0xFC, 0xFC, 0xFC, 0xFC, 0xFC,
+       0xFC, 0xFC, 0xFC, 0xFC, 0xFC, 0xFC, 0xFC, 0xFC,
+       0xFC, 0xFC, 0xFC, 0xFC, 0xFC, 0xFC, 0xFC, 0xFC,
+       0xFC, 0xFC, 0xFC, 0xFC, 0xFC, 0xFD, 0xFD, 0xFD,
+       0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD,
+       0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD,
+       0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD,
+       0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD,
+       0xFD, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE,
+       0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE,
+       0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE,
+       0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE,
+       0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFF, 0xFF, 0xFF,
+       0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+       0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+};
+
+void mdp4_mixer_gc_lut_setup(int mixer_num)
+{
+       unsigned char *base;
+       uint32 data;
+       char val;
+       int i, off;
+
+       if (mixer_num)  /* mixer number, /dev/fb0, /dev/fb1 */
+               base = MDP_BASE + MDP4_OVERLAYPROC1_BASE;/* 0x18000 */
+       else
+               base = MDP_BASE + MDP4_OVERLAYPROC0_BASE;/* 0x10000 */
+
+       base += 0x4000; /* GC_LUT offset */
+
+       off = 0;
+       for (i = 0; i < 4096; i++) {
+               val = gc_lut[i];
+               data = (val << 16 | val << 8 | val); /* R, B, and G are same */
+               outpdw(base + off, data);
+               off += 4;
+       }
+}
+
+uint32 igc_video_lut[] = {      /* non linear */
+       0x0, 0x1, 0x2, 0x4, 0x5, 0x6, 0x7, 0x9,
+       0xA, 0xB, 0xC, 0xE, 0xF, 0x10, 0x12, 0x14,
+       0x15, 0x17, 0x19, 0x1B, 0x1D, 0x1F, 0x21, 0x23,
+       0x25, 0x28, 0x2A, 0x2D, 0x30, 0x32, 0x35, 0x38,
+       0x3B, 0x3E, 0x42, 0x45, 0x48, 0x4C, 0x4F, 0x53,
+       0x57, 0x5B, 0x5F, 0x63, 0x67, 0x6B, 0x70, 0x74,
+       0x79, 0x7E, 0x83, 0x88, 0x8D, 0x92, 0x97, 0x9C,
+       0xA2, 0xA8, 0xAD, 0xB3, 0xB9, 0xBF, 0xC5, 0xCC,
+       0xD2, 0xD8, 0xDF, 0xE6, 0xED, 0xF4, 0xFB, 0x102,
+       0x109, 0x111, 0x118, 0x120, 0x128, 0x130, 0x138, 0x140,
+       0x149, 0x151, 0x15A, 0x162, 0x16B, 0x174, 0x17D, 0x186,
+       0x190, 0x199, 0x1A3, 0x1AC, 0x1B6, 0x1C0, 0x1CA, 0x1D5,
+       0x1DF, 0x1EA, 0x1F4, 0x1FF, 0x20A, 0x215, 0x220, 0x22B,
+       0x237, 0x242, 0x24E, 0x25A, 0x266, 0x272, 0x27F, 0x28B,
+       0x298, 0x2A4, 0x2B1, 0x2BE, 0x2CB, 0x2D8, 0x2E6, 0x2F3,
+       0x301, 0x30F, 0x31D, 0x32B, 0x339, 0x348, 0x356, 0x365,
+       0x374, 0x383, 0x392, 0x3A1, 0x3B1, 0x3C0, 0x3D0, 0x3E0,
+       0x3F0, 0x400, 0x411, 0x421, 0x432, 0x443, 0x454, 0x465,
+       0x476, 0x487, 0x499, 0x4AB, 0x4BD, 0x4CF, 0x4E1, 0x4F3,
+       0x506, 0x518, 0x52B, 0x53E, 0x551, 0x565, 0x578, 0x58C,
+       0x5A0, 0x5B3, 0x5C8, 0x5DC, 0x5F0, 0x605, 0x61A, 0x62E,
+       0x643, 0x659, 0x66E, 0x684, 0x699, 0x6AF, 0x6C5, 0x6DB,
+       0x6F2, 0x708, 0x71F, 0x736, 0x74D, 0x764, 0x77C, 0x793,
+       0x7AB, 0x7C3, 0x7DB, 0x7F3, 0x80B, 0x824, 0x83D, 0x855,
+       0x86F, 0x888, 0x8A1, 0x8BB, 0x8D4, 0x8EE, 0x908, 0x923,
+       0x93D, 0x958, 0x973, 0x98E, 0x9A9, 0x9C4, 0x9DF, 0x9FB,
+       0xA17, 0xA33, 0xA4F, 0xA6C, 0xA88, 0xAA5, 0xAC2, 0xADF,
+       0xAFC, 0xB19, 0xB37, 0xB55, 0xB73, 0xB91, 0xBAF, 0xBCE,
+       0xBEC, 0xC0B, 0xC2A, 0xC4A, 0xC69, 0xC89, 0xCA8, 0xCC8,
+       0xCE8, 0xD09, 0xD29, 0xD4A, 0xD6B, 0xD8C, 0xDAD, 0xDCF,
+       0xDF0, 0xE12, 0xE34, 0xE56, 0xE79, 0xE9B, 0xEBE, 0xEE1,
+       0xF04, 0xF27, 0xF4B, 0xF6E, 0xF92, 0xFB6, 0xFDB, 0xFFF,
+};
+
+void mdp4_vg_igc_lut_setup(int vp_num)
+{
+       unsigned char *base;
+       int i, voff, off;
+       uint32 data, val;
+
+       voff = MDP4_VIDEO_OFF * vp_num;
+       base = MDP_BASE + MDP4_VIDEO_BASE + voff + 0x5000;
+
+       off = 0;
+       for (i = 0; i < 256; i++) {
+               val = igc_video_lut[i];
+               data = (val << 16 | val);       /* color 0 and 1 */
+               outpdw(base + off, data);
+               outpdw(base + off + 0x800, val);        /* color 2 */
+               off += 4;
+       }
+}
+
+uint32 igc_rgb_lut[] = {   /* linear */
+       0x0, 0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70,
+       0x80, 0x91, 0xA1, 0xB1, 0xC1, 0xD1, 0xE1, 0xF1,
+       0x101, 0x111, 0x121, 0x131, 0x141, 0x151, 0x161, 0x171,
+       0x181, 0x191, 0x1A2, 0x1B2, 0x1C2, 0x1D2, 0x1E2, 0x1F2,
+       0x202, 0x212, 0x222, 0x232, 0x242, 0x252, 0x262, 0x272,
+       0x282, 0x292, 0x2A2, 0x2B3, 0x2C3, 0x2D3, 0x2E3, 0x2F3,
+       0x303, 0x313, 0x323, 0x333, 0x343, 0x353, 0x363, 0x373,
+       0x383, 0x393, 0x3A3, 0x3B3, 0x3C4, 0x3D4, 0x3E4, 0x3F4,
+       0x404, 0x414, 0x424, 0x434, 0x444, 0x454, 0x464, 0x474,
+       0x484, 0x494, 0x4A4, 0x4B4, 0x4C4, 0x4D5, 0x4E5, 0x4F5,
+       0x505, 0x515, 0x525, 0x535, 0x545, 0x555, 0x565, 0x575,
+       0x585, 0x595, 0x5A5, 0x5B5, 0x5C5, 0x5D5, 0x5E6, 0x5F6,
+       0x606, 0x616, 0x626, 0x636, 0x646, 0x656, 0x666, 0x676,
+       0x686, 0x696, 0x6A6, 0x6B6, 0x6C6, 0x6D6, 0x6E6, 0x6F7,
+       0x707, 0x717, 0x727, 0x737, 0x747, 0x757, 0x767, 0x777,
+       0x787, 0x797, 0x7A7, 0x7B7, 0x7C7, 0x7D7, 0x7E7, 0x7F7,
+       0x808, 0x818, 0x828, 0x838, 0x848, 0x858, 0x868, 0x878,
+       0x888, 0x898, 0x8A8, 0x8B8, 0x8C8, 0x8D8, 0x8E8, 0x8F8,
+       0x908, 0x919, 0x929, 0x939, 0x949, 0x959, 0x969, 0x979,
+       0x989, 0x999, 0x9A9, 0x9B9, 0x9C9, 0x9D9, 0x9E9, 0x9F9,
+       0xA09, 0xA19, 0xA2A, 0xA3A, 0xA4A, 0xA5A, 0xA6A, 0xA7A,
+       0xA8A, 0xA9A, 0xAAA, 0xABA, 0xACA, 0xADA, 0xAEA, 0xAFA,
+       0xB0A, 0xB1A, 0xB2A, 0xB3B, 0xB4B, 0xB5B, 0xB6B, 0xB7B,
+       0xB8B, 0xB9B, 0xBAB, 0xBBB, 0xBCB, 0xBDB, 0xBEB, 0xBFB,
+       0xC0B, 0xC1B, 0xC2B, 0xC3B, 0xC4C, 0xC5C, 0xC6C, 0xC7C,
+       0xC8C, 0xC9C, 0xCAC, 0xCBC, 0xCCC, 0xCDC, 0xCEC, 0xCFC,
+       0xD0C, 0xD1C, 0xD2C, 0xD3C, 0xD4C, 0xD5D, 0xD6D, 0xD7D,
+       0xD8D, 0xD9D, 0xDAD, 0xDBD, 0xDCD, 0xDDD, 0xDED, 0xDFD,
+       0xE0D, 0xE1D, 0xE2D, 0xE3D, 0xE4D, 0xE5D, 0xE6E, 0xE7E,
+       0xE8E, 0xE9E, 0xEAE, 0xEBE, 0xECE, 0xEDE, 0xEEE, 0xEFE,
+       0xF0E, 0xF1E, 0xF2E, 0xF3E, 0xF4E, 0xF5E, 0xF6E, 0xF7F,
+       0xF8F, 0xF9F, 0xFAF, 0xFBF, 0xFCF, 0xFDF, 0xFEF, 0xFFF,
+};
+
+void mdp4_rgb_igc_lut_setup(int num)
+{
+       unsigned char *base;
+       int i, voff, off;
+       uint32 data, val;
+
+       voff = MDP4_RGB_OFF * num;
+       base = MDP_BASE + MDP4_RGB_BASE + voff + 0x5000;
+
+       off = 0;
+       for (i = 0; i < 256; i++) {
+               val = igc_rgb_lut[i];
+               data = (val << 16 | val);       /* color 0 and 1 */
+               outpdw(base + off, data);
+               outpdw(base + off + 0x800, val);        /* color 2 */
+               off += 4;
+       }
+}
diff --git a/drivers/staging/msm/mdp_cursor.c b/drivers/staging/msm/mdp_cursor.c
new file mode 100644 (file)
index 0000000..7d28f30
--- /dev/null
@@ -0,0 +1,104 @@
+/* Copyright (c) 2008-2009, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/time.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/hrtimer.h>
+
+#include <mach/hardware.h>
+#include <asm/io.h>
+
+#include <asm/system.h>
+#include <asm/mach-types.h>
+#include <linux/semaphore.h>
+#include <linux/spinlock.h>
+
+#include <linux/fb.h>
+
+#include "mdp.h"
+#include "msm_fb.h"
+
+static int cursor_enabled;
+
+int mdp_hw_cursor_update(struct fb_info *info, struct fb_cursor *cursor)
+{
+       struct msm_fb_data_type *mfd = (struct msm_fb_data_type *)info->par;
+       struct fb_image *img = &cursor->image;
+       int calpha_en, transp_en;
+       int alpha;
+       int ret = 0;
+
+       if ((img->width > MDP_CURSOR_WIDTH) ||
+           (img->height > MDP_CURSOR_HEIGHT) ||
+           (img->depth != 32))
+               return -EINVAL;
+
+       if (cursor->set & FB_CUR_SETPOS)
+               MDP_OUTP(MDP_BASE + 0x9004c, (img->dy << 16) | img->dx);
+
+       if (cursor->set & FB_CUR_SETIMAGE) {
+               ret = copy_from_user(mfd->cursor_buf, img->data,
+                                       img->width*img->height*4);
+               if (ret)
+                       return ret;
+
+               if (img->bg_color == 0xffffffff)
+                       transp_en = 0;
+               else
+                       transp_en = 1;
+
+               alpha = (img->fg_color & 0xff000000) >> 24;
+
+               if (alpha)
+                       calpha_en = 0x2; /* xrgb */
+               else
+                       calpha_en = 0x1; /* argb */
+
+               MDP_OUTP(MDP_BASE + 0x90044, (img->height << 16) | img->width);
+               MDP_OUTP(MDP_BASE + 0x90048, mfd->cursor_buf_phys);
+               /* order the writes the cursor_buf before updating the
+                * hardware */
+//             dma_coherent_pre_ops();
+               MDP_OUTP(MDP_BASE + 0x90060,
+                        (transp_en << 3) | (calpha_en << 1) |
+                        (inp32(MDP_BASE + 0x90060) & 0x1));
+#ifdef CONFIG_FB_MSM_MDP40
+               MDP_OUTP(MDP_BASE + 0x90064, (alpha << 24));
+               MDP_OUTP(MDP_BASE + 0x90068, (0xffffff & img->bg_color));
+               MDP_OUTP(MDP_BASE + 0x9006C, (0xffffff & img->bg_color));
+#else
+               MDP_OUTP(MDP_BASE + 0x90064,
+                        (alpha << 24) | (0xffffff & img->bg_color));
+               MDP_OUTP(MDP_BASE + 0x90068, 0);
+#endif
+       }
+
+       if ((cursor->enable) && (!cursor_enabled)) {
+               cursor_enabled = 1;
+               MDP_OUTP(MDP_BASE + 0x90060, inp32(MDP_BASE + 0x90060) | 0x1);
+       } else if ((!cursor->enable) && (cursor_enabled)) {
+               cursor_enabled = 0;
+               MDP_OUTP(MDP_BASE + 0x90060,
+                        inp32(MDP_BASE + 0x90060) & (~0x1));
+       }
+
+       return 0;
+}
diff --git a/drivers/staging/msm/mdp_dma.c b/drivers/staging/msm/mdp_dma.c
new file mode 100644 (file)
index 0000000..639918b
--- /dev/null
@@ -0,0 +1,561 @@
+/* Copyright (c) 2008-2009, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/time.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/hrtimer.h>
+
+#include <mach/hardware.h>
+#include <linux/io.h>
+
+#include <asm/system.h>
+#include <asm/mach-types.h>
+#include <linux/semaphore.h>
+#include <linux/spinlock.h>
+
+#include <linux/fb.h>
+
+#include "mdp.h"
+#include "msm_fb.h"
+#include "mddihost.h"
+
+static uint32 mdp_last_dma2_update_width;
+static uint32 mdp_last_dma2_update_height;
+static uint32 mdp_curr_dma2_update_width;
+static uint32 mdp_curr_dma2_update_height;
+
+ktime_t mdp_dma2_last_update_time = { 0 };
+
+int mdp_lcd_rd_cnt_offset_slow = 20;
+int mdp_lcd_rd_cnt_offset_fast = 20;
+int mdp_vsync_usec_wait_line_too_short = 5;
+uint32 mdp_dma2_update_time_in_usec;
+uint32 mdp_total_vdopkts;
+
+extern u32 msm_fb_debug_enabled;
+extern struct workqueue_struct *mdp_dma_wq;
+
+int vsync_start_y_adjust = 4;
+
+static void mdp_dma2_update_lcd(struct msm_fb_data_type *mfd)
+{
+       MDPIBUF *iBuf = &mfd->ibuf;
+       int mddi_dest = FALSE;
+       uint32 outBpp = iBuf->bpp;
+       uint32 dma2_cfg_reg;
+       uint8 *src;
+       uint32 mddi_ld_param;
+       uint16 mddi_vdo_packet_reg;
+       struct msm_fb_panel_data *pdata =
+           (struct msm_fb_panel_data *)mfd->pdev->dev.platform_data;
+       uint32 ystride = mfd->fbi->fix.line_length;
+
+       dma2_cfg_reg = DMA_PACK_TIGHT | DMA_PACK_ALIGN_LSB |
+           DMA_OUT_SEL_AHB | DMA_IBUF_NONCONTIGUOUS;
+
+#ifdef CONFIG_FB_MSM_MDP30
+       /*
+        * Software workaround:  On 7x25/7x27, the MDP will not
+        * respond if dma_w is 1 pixel.  Set the update width to
+        * 2 pixels and adjust the x offset if needed.
+        */
+       if (iBuf->dma_w == 1) {
+               iBuf->dma_w = 2;
+               if (iBuf->dma_x == (iBuf->ibuf_width - 2))
+                       iBuf->dma_x--;
+       }
+#endif
+
+       if (mfd->fb_imgType == MDP_BGR_565)
+               dma2_cfg_reg |= DMA_PACK_PATTERN_BGR;
+       else
+               dma2_cfg_reg |= DMA_PACK_PATTERN_RGB;
+
+       if (outBpp == 4)
+               dma2_cfg_reg |= DMA_IBUF_C3ALPHA_EN;
+
+       if (outBpp == 2)
+               dma2_cfg_reg |= DMA_IBUF_FORMAT_RGB565;
+
+       mddi_ld_param = 0;
+       mddi_vdo_packet_reg = mfd->panel_info.mddi.vdopkt;
+
+       if ((mfd->panel_info.type == MDDI_PANEL) ||
+           (mfd->panel_info.type == EXT_MDDI_PANEL)) {
+               dma2_cfg_reg |= DMA_OUT_SEL_MDDI;
+               mddi_dest = TRUE;
+
+               if (mfd->panel_info.type == MDDI_PANEL) {
+                       mdp_total_vdopkts++;
+                       if (mfd->panel_info.pdest == DISPLAY_1) {
+                               dma2_cfg_reg |= DMA_MDDI_DMAOUT_LCD_SEL_PRIMARY;
+                               mddi_ld_param = 0;
+#ifdef MDDI_HOST_WINDOW_WORKAROUND
+                               mddi_window_adjust(mfd, iBuf->dma_x,
+                                                  iBuf->dma_w - 1, iBuf->dma_y,
+                                                  iBuf->dma_h - 1);
+#endif
+                       } else {
+                               dma2_cfg_reg |=
+                                   DMA_MDDI_DMAOUT_LCD_SEL_SECONDARY;
+                               mddi_ld_param = 1;
+#ifdef MDDI_HOST_WINDOW_WORKAROUND
+                               mddi_window_adjust(mfd, iBuf->dma_x,
+                                                  iBuf->dma_w - 1, iBuf->dma_y,
+                                                  iBuf->dma_h - 1);
+#endif
+                       }
+               } else {
+                       dma2_cfg_reg |= DMA_MDDI_DMAOUT_LCD_SEL_EXTERNAL;
+                       mddi_ld_param = 2;
+               }
+       } else {
+               if (mfd->panel_info.pdest == DISPLAY_1) {
+                       dma2_cfg_reg |= DMA_AHBM_LCD_SEL_PRIMARY;
+                       outp32(MDP_EBI2_LCD0, mfd->data_port_phys);
+               } else {
+                       dma2_cfg_reg |= DMA_AHBM_LCD_SEL_SECONDARY;
+                       outp32(MDP_EBI2_LCD1, mfd->data_port_phys);
+               }
+       }
+
+       dma2_cfg_reg |= DMA_DITHER_EN;
+
+       src = (uint8 *) iBuf->buf;
+       /* starting input address */
+       src += iBuf->dma_x * outBpp + iBuf->dma_y * ystride;
+
+       mdp_curr_dma2_update_width = iBuf->dma_w;
+       mdp_curr_dma2_update_height = iBuf->dma_h;
+
+       /* MDP cmd block enable */
+       mdp_pipe_ctrl(MDP_CMD_BLOCK, MDP_BLOCK_POWER_ON, FALSE);
+
+#ifdef CONFIG_FB_MSM_MDP22
+       MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x0184,
+                       (iBuf->dma_h << 16 | iBuf->dma_w));
+       MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x0188, src);
+       MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x018C, ystride);
+#else
+       MDP_OUTP(MDP_BASE + 0x90004, (iBuf->dma_h << 16 | iBuf->dma_w));
+       MDP_OUTP(MDP_BASE + 0x90008, src);
+       MDP_OUTP(MDP_BASE + 0x9000c, ystride);
+#endif
+
+       if (mfd->panel_info.bpp == 18) {
+               dma2_cfg_reg |= DMA_DSTC0G_6BITS |      /* 666 18BPP */
+                   DMA_DSTC1B_6BITS | DMA_DSTC2R_6BITS;
+       } else {
+               dma2_cfg_reg |= DMA_DSTC0G_6BITS |      /* 565 16BPP */
+                   DMA_DSTC1B_5BITS | DMA_DSTC2R_5BITS;
+       }
+
+       if (mddi_dest) {
+#ifdef CONFIG_FB_MSM_MDP22
+               MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x0194,
+                        (iBuf->dma_y << 16) | iBuf->dma_x);
+               MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x01a0, mddi_ld_param);
+               MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x01a4,
+                        (MDDI_VDO_PACKET_DESC << 16) | mddi_vdo_packet_reg);
+#else
+               MDP_OUTP(MDP_BASE + 0x90010, (iBuf->dma_y << 16) | iBuf->dma_x);
+               MDP_OUTP(MDP_BASE + 0x00090, mddi_ld_param);
+               MDP_OUTP(MDP_BASE + 0x00094,
+                        (MDDI_VDO_PACKET_DESC << 16) | mddi_vdo_packet_reg);
+#endif
+       } else {
+               /* setting EBI2 LCDC write window */
+               pdata->set_rect(iBuf->dma_x, iBuf->dma_y, iBuf->dma_w,
+                               iBuf->dma_h);
+       }
+
+       /* dma2 config register */
+#ifdef MDP_HW_VSYNC
+       MDP_OUTP(MDP_BASE + 0x90000, dma2_cfg_reg);
+
+       if ((mfd->use_mdp_vsync) &&
+           (mfd->ibuf.vsync_enable) && (mfd->panel_info.lcd.vsync_enable)) {
+               uint32 start_y;
+
+               if (vsync_start_y_adjust <= iBuf->dma_y)
+                       start_y = iBuf->dma_y - vsync_start_y_adjust;
+               else
+                       start_y =
+                           (mfd->total_lcd_lines - 1) - (vsync_start_y_adjust -
+                                                         iBuf->dma_y);
+
+               /*
+                * MDP VSYNC clock must be On by now so, we don't have to
+                * re-enable it
+                */
+               MDP_OUTP(MDP_BASE + 0x210, start_y);
+               MDP_OUTP(MDP_BASE + 0x20c, 1);  /* enable prim vsync */
+       } else {
+               MDP_OUTP(MDP_BASE + 0x20c, 0);  /* disable prim vsync */
+       }
+#else
+#ifdef CONFIG_FB_MSM_MDP22
+       MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x0180, dma2_cfg_reg);
+#else
+       MDP_OUTP(MDP_BASE + 0x90000, dma2_cfg_reg);
+#endif
+#endif /* MDP_HW_VSYNC */
+
+       /* MDP cmd block disable */
+       mdp_pipe_ctrl(MDP_CMD_BLOCK, MDP_BLOCK_POWER_OFF, FALSE);
+}
+
+static ktime_t vt = { 0 };
+int mdp_usec_diff_threshold = 100;
+int mdp_expected_usec_wait;
+
+enum hrtimer_restart mdp_dma2_vsync_hrtimer_handler(struct hrtimer *ht)
+{
+       struct msm_fb_data_type *mfd = NULL;
+
+       mfd = container_of(ht, struct msm_fb_data_type, dma_hrtimer);
+
+       mdp_pipe_kickoff(MDP_DMA2_TERM, mfd);
+
+       if (msm_fb_debug_enabled) {
+               ktime_t t;
+               int usec_diff;
+               int actual_wait;
+
+               t = ktime_get_real();
+
+               actual_wait =
+                   (t.tv.sec - vt.tv.sec) * 1000000 + (t.tv.nsec -
+                                                       vt.tv.nsec) / 1000;
+               usec_diff = actual_wait - mdp_expected_usec_wait;
+
+               if ((mdp_usec_diff_threshold < usec_diff) || (usec_diff < 0))
+                       MSM_FB_DEBUG
+                           ("HRT Diff = %d usec Exp=%d usec  Act=%d usec\n",
+                            usec_diff, mdp_expected_usec_wait, actual_wait);
+       }
+
+       return HRTIMER_NORESTART;
+}
+
+static void mdp_dma_schedule(struct msm_fb_data_type *mfd, uint32 term)
+{
+       /*
+        * dma2 configure VSYNC block
+        * vsync supported on Primary LCD only for now
+        */
+       int32 mdp_lcd_rd_cnt;
+       uint32 usec_wait_time;
+       uint32 start_y;
+
+       /*
+        * ToDo: if we can move HRT timer callback to workqueue, we can
+        * move DMA2 power on under mdp_pipe_kickoff().
+        * This will save a power for hrt time wait.
+        * However if the latency for context switch (hrt irq -> workqueue)
+        * is too big, we will miss the vsync timing.
+        */
+       if (term == MDP_DMA2_TERM)
+               mdp_pipe_ctrl(MDP_DMA2_BLOCK, MDP_BLOCK_POWER_ON, FALSE);
+
+       mdp_dma2_update_time_in_usec =
+           MDP_KTIME2USEC(mdp_dma2_last_update_time);
+
+       if ((!mfd->ibuf.vsync_enable) || (!mfd->panel_info.lcd.vsync_enable)
+           || (mfd->use_mdp_vsync)) {
+               mdp_pipe_kickoff(term, mfd);
+               return;
+       }
+       /* SW vsync logic starts here */
+
+       /* get current rd counter */
+       mdp_lcd_rd_cnt = mdp_get_lcd_line_counter(mfd);
+       if (mdp_dma2_update_time_in_usec != 0) {
+               uint32 num, den;
+
+               /*
+                * roi width boundary calculation to know the size of pixel
+                * width that MDP can send faster or slower than LCD read
+                * pointer
+                */
+
+               num = mdp_last_dma2_update_width * mdp_last_dma2_update_height;
+               den =
+                   (((mfd->panel_info.lcd.refx100 * mfd->total_lcd_lines) /
+                     1000) * (mdp_dma2_update_time_in_usec / 100)) / 1000;
+
+               if (den == 0)
+                       mfd->vsync_width_boundary[mdp_last_dma2_update_width] =
+                           mfd->panel_info.xres + 1;
+               else
+                       mfd->vsync_width_boundary[mdp_last_dma2_update_width] =
+                           (int)(num / den);
+       }
+
+       if (mfd->vsync_width_boundary[mdp_last_dma2_update_width] >
+           mdp_curr_dma2_update_width) {
+               /* MDP wrp is faster than LCD rdp */
+               mdp_lcd_rd_cnt += mdp_lcd_rd_cnt_offset_fast;
+       } else {
+               /* MDP wrp is slower than LCD rdp */
+               mdp_lcd_rd_cnt -= mdp_lcd_rd_cnt_offset_slow;
+       }
+
+       if (mdp_lcd_rd_cnt < 0)
+               mdp_lcd_rd_cnt = mfd->total_lcd_lines + mdp_lcd_rd_cnt;
+       else if (mdp_lcd_rd_cnt > mfd->total_lcd_lines)
+               mdp_lcd_rd_cnt = mdp_lcd_rd_cnt - mfd->total_lcd_lines - 1;
+
+       /* get wrt pointer position */
+       start_y = mfd->ibuf.dma_y;
+
+       /* measure line difference between start_y and rd counter */
+       if (start_y > mdp_lcd_rd_cnt) {
+               /*
+                * *100 for lcd_ref_hzx100 was already multiplied by 100
+                * *1000000 is for usec conversion
+                */
+
+               if ((start_y - mdp_lcd_rd_cnt) <=
+                   mdp_vsync_usec_wait_line_too_short)
+                       usec_wait_time = 0;
+               else
+                       usec_wait_time =
+                           ((start_y -
+                             mdp_lcd_rd_cnt) * 1000000) /
+                           ((mfd->total_lcd_lines *
+                             mfd->panel_info.lcd.refx100) / 100);
+       } else {
+               if ((start_y + (mfd->total_lcd_lines - mdp_lcd_rd_cnt)) <=
+                   mdp_vsync_usec_wait_line_too_short)
+                       usec_wait_time = 0;
+               else
+                       usec_wait_time =
+                           ((start_y +
+                             (mfd->total_lcd_lines -
+                              mdp_lcd_rd_cnt)) * 1000000) /
+                           ((mfd->total_lcd_lines *
+                             mfd->panel_info.lcd.refx100) / 100);
+       }
+
+       mdp_last_dma2_update_width = mdp_curr_dma2_update_width;
+       mdp_last_dma2_update_height = mdp_curr_dma2_update_height;
+
+       if (usec_wait_time == 0) {
+               mdp_pipe_kickoff(term, mfd);
+       } else {
+               ktime_t wait_time;
+
+               wait_time.tv.sec = 0;
+               wait_time.tv.nsec = usec_wait_time * 1000;
+
+               if (msm_fb_debug_enabled) {
+                       vt = ktime_get_real();
+                       mdp_expected_usec_wait = usec_wait_time;
+               }
+               hrtimer_start(&mfd->dma_hrtimer, wait_time, HRTIMER_MODE_REL);
+       }
+}
+
+#ifdef MDDI_HOST_WINDOW_WORKAROUND
+void mdp_dma2_update(struct msm_fb_data_type *mfd)
+{
+       MDPIBUF *iBuf;
+       uint32 upper_height;
+
+       if (mfd->panel.type == EXT_MDDI_PANEL) {
+               mdp_dma2_update_sub(mfd);
+               return;
+       }
+
+       iBuf = &mfd->ibuf;
+
+       upper_height =
+           (uint32) mddi_assign_pkt_height((uint16) iBuf->dma_w,
+                                           (uint16) iBuf->dma_h, 18);
+
+       if (upper_height >= iBuf->dma_h) {
+               mdp_dma2_update_sub(mfd);
+       } else {
+               MDPIBUF lower_height;
+
+               /* sending the upper region first */
+               lower_height = iBuf->dma_h - upper_height;
+               iBuf->dma_h = upper_height;
+               mdp_dma2_update_sub(mfd);
+
+               /* sending the lower region second */
+               iBuf->dma_h = lower_height;
+               iBuf->dma_y += lower_height;
+               iBuf->vsync_enable = FALSE;
+               mdp_dma2_update_sub(mfd);
+       }
+}
+
+void mdp_dma2_update_sub(struct msm_fb_data_type *mfd)
+#else
+void mdp_dma2_update(struct msm_fb_data_type *mfd)
+#endif
+{
+       down(&mfd->dma->mutex);
+       if ((mfd) && (!mfd->dma->busy) && (mfd->panel_power_on)) {
+               down(&mfd->sem);
+               mfd->ibuf_flushed = TRUE;
+               mdp_dma2_update_lcd(mfd);
+
+               mdp_enable_irq(MDP_DMA2_TERM);
+               mfd->dma->busy = TRUE;
+               INIT_COMPLETION(mfd->dma->comp);
+
+               /* schedule DMA to start */
+               mdp_dma_schedule(mfd, MDP_DMA2_TERM);
+               up(&mfd->sem);
+
+               /* wait until DMA finishes the current job */
+               wait_for_completion_killable(&mfd->dma->comp);
+               mdp_disable_irq(MDP_DMA2_TERM);
+
+       /* signal if pan function is waiting for the update completion */
+               if (mfd->pan_waiting) {
+                       mfd->pan_waiting = FALSE;
+                       complete(&mfd->pan_comp);
+               }
+       }
+       up(&mfd->dma->mutex);
+}
+
+void mdp_lcd_update_workqueue_handler(struct work_struct *work)
+{
+       struct msm_fb_data_type *mfd = NULL;
+
+       mfd = container_of(work, struct msm_fb_data_type, dma_update_worker);
+       if (mfd)
+               mfd->dma_fnc(mfd);
+}
+
+void mdp_set_dma_pan_info(struct fb_info *info, struct mdp_dirty_region *dirty,
+                         boolean sync)
+{
+       struct msm_fb_data_type *mfd = (struct msm_fb_data_type *)info->par;
+       MDPIBUF *iBuf;
+       int bpp = info->var.bits_per_pixel / 8;
+
+       down(&mfd->sem);
+       iBuf = &mfd->ibuf;
+       iBuf->buf = (uint8 *) info->fix.smem_start;
+       iBuf->buf += info->var.xoffset * bpp +
+                       info->var.yoffset * info->fix.line_length;
+
+       iBuf->ibuf_width = info->var.xres_virtual;
+       iBuf->bpp = bpp;
+
+       iBuf->vsync_enable = sync;
+
+       if (dirty) {
+               /*
+                * ToDo: dirty region check inside var.xoffset+xres
+                * <-> var.yoffset+yres
+                */
+               iBuf->dma_x = dirty->xoffset % info->var.xres;
+               iBuf->dma_y = dirty->yoffset % info->var.yres;
+               iBuf->dma_w = dirty->width;
+               iBuf->dma_h = dirty->height;
+       } else {
+               iBuf->dma_x = 0;
+               iBuf->dma_y = 0;
+               iBuf->dma_w = info->var.xres;
+               iBuf->dma_h = info->var.yres;
+       }
+       mfd->ibuf_flushed = FALSE;
+       up(&mfd->sem);
+}
+
+void mdp_set_offset_info(struct fb_info *info, uint32 addr, uint32 sync)
+{
+       struct msm_fb_data_type *mfd = (struct msm_fb_data_type *)info->par;
+       MDPIBUF *iBuf;
+
+       int bpp = info->var.bits_per_pixel / 8;
+
+       down(&mfd->sem);
+       iBuf = &mfd->ibuf;
+       iBuf->ibuf_width = info->var.xres_virtual;
+       iBuf->bpp = bpp;
+       iBuf->vsync_enable = sync;
+       iBuf->dma_x = 0;
+       iBuf->dma_y = 0;
+       iBuf->dma_w = info->var.xres;
+       iBuf->dma_h = info->var.yres;
+       iBuf->buf = (uint8 *) addr;
+
+       mfd->ibuf_flushed = FALSE;
+       up(&mfd->sem);
+}
+
+void mdp_dma_pan_update(struct fb_info *info)
+{
+       struct msm_fb_data_type *mfd = (struct msm_fb_data_type *)info->par;
+       MDPIBUF *iBuf;
+
+       iBuf = &mfd->ibuf;
+
+       if (mfd->sw_currently_refreshing) {
+               /* we need to wait for the pending update */
+               mfd->pan_waiting = TRUE;
+               if (!mfd->ibuf_flushed) {
+                       wait_for_completion_killable(&mfd->pan_comp);
+               }
+               /* waiting for this update to complete */
+               mfd->pan_waiting = TRUE;
+               wait_for_completion_killable(&mfd->pan_comp);
+       } else
+               mfd->dma_fnc(mfd);
+}
+
+void mdp_refresh_screen(unsigned long data)
+{
+       struct msm_fb_data_type *mfd = (struct msm_fb_data_type *)data;
+
+       if ((mfd->sw_currently_refreshing) && (mfd->sw_refreshing_enable)) {
+               init_timer(&mfd->refresh_timer);
+               mfd->refresh_timer.function = mdp_refresh_screen;
+               mfd->refresh_timer.data = data;
+
+               if (mfd->dma->busy)
+                       /* come back in 1 msec */
+                       mfd->refresh_timer.expires = jiffies + (HZ / 1000);
+               else
+                       mfd->refresh_timer.expires =
+                           jiffies + mfd->refresh_timer_duration;
+
+               add_timer(&mfd->refresh_timer);
+
+               if (!mfd->dma->busy) {
+                       if (!queue_work(mdp_dma_wq, &mfd->dma_update_worker)) {
+                               MSM_FB_DEBUG("mdp_dma: can't queue_work! -> \
+                       MDP/MDDI/LCD clock speed needs to be increased\n");
+                       }
+               }
+       } else {
+               if (!mfd->hw_refresh)
+                       complete(&mfd->refresher_comp);
+       }
+}
diff --git a/drivers/staging/msm/mdp_dma_lcdc.c b/drivers/staging/msm/mdp_dma_lcdc.c
new file mode 100644 (file)
index 0000000..b57fa1a
--- /dev/null
@@ -0,0 +1,379 @@
+/* Copyright (c) 2008-2009, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/time.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/hrtimer.h>
+#include <linux/delay.h>
+#include <mach/hardware.h>
+#include <linux/io.h>
+
+#include <asm/system.h>
+#include <asm/mach-types.h>
+#include <linux/semaphore.h>
+#include <linux/spinlock.h>
+
+#include <linux/fb.h>
+
+#include "mdp.h"
+#include "msm_fb.h"
+#include "mdp4.h"
+
+#ifdef CONFIG_FB_MSM_MDP40
+#define LCDC_BASE      0xC0000
+#define DTV_BASE       0xD0000
+#define DMA_E_BASE      0xB0000
+#else
+#define LCDC_BASE      0xE0000
+#endif
+
+#define DMA_P_BASE      0x90000
+
+extern spinlock_t mdp_spin_lock;
+#ifndef CONFIG_FB_MSM_MDP40
+extern uint32 mdp_intr_mask;
+#endif
+
+int first_pixel_start_x;
+int first_pixel_start_y;
+
+int mdp_lcdc_on(struct platform_device *pdev)
+{
+       int lcdc_width;
+       int lcdc_height;
+       int lcdc_bpp;
+       int lcdc_border_clr;
+       int lcdc_underflow_clr;
+       int lcdc_hsync_skew;
+
+       int hsync_period;
+       int hsync_ctrl;
+       int vsync_period;
+       int display_hctl;
+       int display_v_start;
+       int display_v_end;
+       int active_hctl;
+       int active_h_start;
+       int active_h_end;
+       int active_v_start;
+       int active_v_end;
+       int ctrl_polarity;
+       int h_back_porch;
+       int h_front_porch;
+       int v_back_porch;
+       int v_front_porch;
+       int hsync_pulse_width;
+       int vsync_pulse_width;
+       int hsync_polarity;
+       int vsync_polarity;
+       int data_en_polarity;
+       int hsync_start_x;
+       int hsync_end_x;
+       uint8 *buf;
+       int bpp;
+       uint32 dma2_cfg_reg;
+       struct fb_info *fbi;
+       struct fb_var_screeninfo *var;
+       struct msm_fb_data_type *mfd;
+       uint32 dma_base;
+       uint32 timer_base = LCDC_BASE;
+       uint32 block = MDP_DMA2_BLOCK;
+       int ret;
+
+       mfd = (struct msm_fb_data_type *)platform_get_drvdata(pdev);
+
+       if (!mfd)
+               return -ENODEV;
+
+       if (mfd->key != MFD_KEY)
+               return -EINVAL;
+
+       fbi = mfd->fbi;
+       var = &fbi->var;
+
+       /* MDP cmd block enable */
+       mdp_pipe_ctrl(MDP_CMD_BLOCK, MDP_BLOCK_POWER_ON, FALSE);
+
+       bpp = fbi->var.bits_per_pixel / 8;
+       buf = (uint8 *) fbi->fix.smem_start;
+       buf += fbi->var.xoffset * bpp + fbi->var.yoffset * fbi->fix.line_length;
+
+       dma2_cfg_reg = DMA_PACK_ALIGN_LSB | DMA_DITHER_EN | DMA_OUT_SEL_LCDC;
+
+       if (mfd->fb_imgType == MDP_BGR_565)
+               dma2_cfg_reg |= DMA_PACK_PATTERN_BGR;
+       else
+               dma2_cfg_reg |= DMA_PACK_PATTERN_RGB;
+
+       if (bpp == 2)
+               dma2_cfg_reg |= DMA_IBUF_FORMAT_RGB565;
+       else if (bpp == 3)
+               dma2_cfg_reg |= DMA_IBUF_FORMAT_RGB888;
+       else
+               dma2_cfg_reg |= DMA_IBUF_FORMAT_xRGB8888_OR_ARGB8888;
+
+       switch (mfd->panel_info.bpp) {
+       case 24:
+               dma2_cfg_reg |= DMA_DSTC0G_8BITS |
+                   DMA_DSTC1B_8BITS | DMA_DSTC2R_8BITS;
+               break;
+
+       case 18:
+               dma2_cfg_reg |= DMA_DSTC0G_6BITS |
+                   DMA_DSTC1B_6BITS | DMA_DSTC2R_6BITS;
+               break;
+
+       case 16:
+               dma2_cfg_reg |= DMA_DSTC0G_6BITS |
+                   DMA_DSTC1B_5BITS | DMA_DSTC2R_5BITS;
+               break;
+
+       default:
+               printk(KERN_ERR "mdp lcdc can't support format %d bpp!\n",
+                      mfd->panel_info.bpp);
+               return -ENODEV;
+       }
+
+       /* DMA register config */
+
+       dma_base = DMA_P_BASE;
+
+#ifdef CONFIG_FB_MSM_MDP40
+       if (mfd->panel.type == HDMI_PANEL)
+               dma_base = DMA_E_BASE;
+#endif
+
+       /* starting address */
+       MDP_OUTP(MDP_BASE + dma_base + 0x8, (uint32) buf);
+       /* active window width and height */
+       MDP_OUTP(MDP_BASE + dma_base + 0x4, ((fbi->var.yres) << 16) |
+                                               (fbi->var.xres));
+       /* buffer ystride */
+       MDP_OUTP(MDP_BASE + dma_base + 0xc, fbi->fix.line_length);
+       /* x/y coordinate = always 0 for lcdc */
+       MDP_OUTP(MDP_BASE + dma_base + 0x10, 0);
+       /* dma config */
+       MDP_OUTP(MDP_BASE + dma_base, dma2_cfg_reg);
+
+       /*
+        * LCDC timing setting
+        */
+       h_back_porch = var->left_margin;
+       h_front_porch = var->right_margin;
+       v_back_porch = var->upper_margin;
+       v_front_porch = var->lower_margin;
+       hsync_pulse_width = var->hsync_len;
+       vsync_pulse_width = var->vsync_len;
+       lcdc_border_clr = mfd->panel_info.lcdc.border_clr;
+       lcdc_underflow_clr = mfd->panel_info.lcdc.underflow_clr;
+       lcdc_hsync_skew = mfd->panel_info.lcdc.hsync_skew;
+
+       lcdc_width = mfd->panel_info.xres;
+       lcdc_height = mfd->panel_info.yres;
+       lcdc_bpp = mfd->panel_info.bpp;
+
+       hsync_period =
+           hsync_pulse_width + h_back_porch + lcdc_width + h_front_porch;
+       hsync_ctrl = (hsync_period << 16) | hsync_pulse_width;
+       hsync_start_x = hsync_pulse_width + h_back_porch;
+       hsync_end_x = hsync_period - h_front_porch - 1;
+       display_hctl = (hsync_end_x << 16) | hsync_start_x;
+
+       vsync_period =
+           (vsync_pulse_width + v_back_porch + lcdc_height +
+            v_front_porch) * hsync_period;
+       display_v_start =
+           (vsync_pulse_width + v_back_porch) * hsync_period + lcdc_hsync_skew;
+       display_v_end =
+           vsync_period - (v_front_porch * hsync_period) + lcdc_hsync_skew - 1;
+
+       if (lcdc_width != var->xres) {
+               active_h_start = hsync_start_x + first_pixel_start_x;
+               active_h_end = active_h_start + var->xres - 1;
+               active_hctl =
+                   ACTIVE_START_X_EN | (active_h_end << 16) | active_h_start;
+       } else {
+               active_hctl = 0;
+       }
+
+       if (lcdc_height != var->yres) {
+               active_v_start =
+                   display_v_start + first_pixel_start_y * hsync_period;
+               active_v_end = active_v_start + (var->yres) * hsync_period - 1;
+               active_v_start |= ACTIVE_START_Y_EN;
+       } else {
+               active_v_start = 0;
+               active_v_end = 0;
+       }
+
+
+#ifdef CONFIG_FB_MSM_MDP40
+       if (mfd->panel.type == HDMI_PANEL) {
+               block = MDP_DMA_E_BLOCK;
+               timer_base = DTV_BASE;
+               hsync_polarity = 0;
+               vsync_polarity = 0;
+       } else {
+               hsync_polarity = 1;
+               vsync_polarity = 1;
+       }
+
+       lcdc_underflow_clr |= 0x80000000;       /* enable recovery */
+#else
+       hsync_polarity = 0;
+       vsync_polarity = 0;
+#endif
+       data_en_polarity = 0;
+
+       ctrl_polarity =
+           (data_en_polarity << 2) | (vsync_polarity << 1) | (hsync_polarity);
+
+       MDP_OUTP(MDP_BASE + timer_base + 0x4, hsync_ctrl);
+       MDP_OUTP(MDP_BASE + timer_base + 0x8, vsync_period);
+       MDP_OUTP(MDP_BASE + timer_base + 0xc, vsync_pulse_width * hsync_period);
+       if (timer_base == LCDC_BASE) {
+               MDP_OUTP(MDP_BASE + timer_base + 0x10, display_hctl);
+               MDP_OUTP(MDP_BASE + timer_base + 0x14, display_v_start);
+               MDP_OUTP(MDP_BASE + timer_base + 0x18, display_v_end);
+               MDP_OUTP(MDP_BASE + timer_base + 0x28, lcdc_border_clr);
+               MDP_OUTP(MDP_BASE + timer_base + 0x2c, lcdc_underflow_clr);
+               MDP_OUTP(MDP_BASE + timer_base + 0x30, lcdc_hsync_skew);
+               MDP_OUTP(MDP_BASE + timer_base + 0x38, ctrl_polarity);
+               MDP_OUTP(MDP_BASE + timer_base + 0x1c, active_hctl);
+               MDP_OUTP(MDP_BASE + timer_base + 0x20, active_v_start);
+               MDP_OUTP(MDP_BASE + timer_base + 0x24, active_v_end);
+       } else {
+               MDP_OUTP(MDP_BASE + timer_base + 0x18, display_hctl);
+               MDP_OUTP(MDP_BASE + timer_base + 0x1c, display_v_start);
+               MDP_OUTP(MDP_BASE + timer_base + 0x20, display_v_end);
+               MDP_OUTP(MDP_BASE + timer_base + 0x40, lcdc_border_clr);
+               MDP_OUTP(MDP_BASE + timer_base + 0x44, lcdc_underflow_clr);
+               MDP_OUTP(MDP_BASE + timer_base + 0x48, lcdc_hsync_skew);
+               MDP_OUTP(MDP_BASE + timer_base + 0x50, ctrl_polarity);
+               MDP_OUTP(MDP_BASE + timer_base + 0x2c, active_hctl);
+               MDP_OUTP(MDP_BASE + timer_base + 0x30, active_v_start);
+               MDP_OUTP(MDP_BASE + timer_base + 0x38, active_v_end);
+       }
+
+       ret = panel_next_on(pdev);
+       if (ret == 0) {
+               /* enable LCDC block */
+               MDP_OUTP(MDP_BASE + timer_base, 1);
+               mdp_pipe_ctrl(block, MDP_BLOCK_POWER_ON, FALSE);
+       }
+       /* MDP cmd block disable */
+       mdp_pipe_ctrl(MDP_CMD_BLOCK, MDP_BLOCK_POWER_OFF, FALSE);
+
+       return ret;
+}
+
+int mdp_lcdc_off(struct platform_device *pdev)
+{
+       int ret = 0;
+       struct msm_fb_data_type *mfd;
+       uint32 timer_base = LCDC_BASE;
+       uint32 block = MDP_DMA2_BLOCK;
+
+       mfd = (struct msm_fb_data_type *)platform_get_drvdata(pdev);
+
+#ifdef CONFIG_FB_MSM_MDP40
+       if (mfd->panel.type == HDMI_PANEL) {
+               block = MDP_DMA_E_BLOCK;
+               timer_base = DTV_BASE;
+       }
+#endif
+
+       /* MDP cmd block enable */
+       mdp_pipe_ctrl(MDP_CMD_BLOCK, MDP_BLOCK_POWER_ON, FALSE);
+       MDP_OUTP(MDP_BASE + timer_base, 0);
+       /* MDP cmd block disable */
+       mdp_pipe_ctrl(MDP_CMD_BLOCK, MDP_BLOCK_POWER_OFF, FALSE);
+       mdp_pipe_ctrl(block, MDP_BLOCK_POWER_OFF, FALSE);
+
+       ret = panel_next_off(pdev);
+
+       /* delay to make sure the last frame finishes */
+       mdelay(100);
+
+       return ret;
+}
+
+void mdp_lcdc_update(struct msm_fb_data_type *mfd)
+{
+       struct fb_info *fbi = mfd->fbi;
+       uint8 *buf;
+       int bpp;
+       unsigned long flag;
+       uint32 dma_base;
+       int irq_block = MDP_DMA2_TERM;
+#ifdef CONFIG_FB_MSM_MDP40
+       int intr = INTR_DMA_P_DONE;
+#endif
+
+       if (!mfd->panel_power_on)
+               return;
+
+       /* no need to power on cmd block since it's lcdc mode */
+
+       if (!mfd->ibuf.visible_swapped) {
+               bpp = fbi->var.bits_per_pixel / 8;
+               buf = (uint8 *) fbi->fix.smem_start;
+               buf += fbi->var.xoffset * bpp +
+               fbi->var.yoffset * fbi->fix.line_length;
+       } else {
+               /* we've done something to update the pointer. */
+               bpp =  mfd->ibuf.bpp;
+               buf = mfd->ibuf.buf;
+       }
+
+       dma_base = DMA_P_BASE;
+
+#ifdef CONFIG_FB_MSM_MDP40
+       if (mfd->panel.type == HDMI_PANEL) {
+               intr = INTR_DMA_E_DONE;
+               irq_block = MDP_DMA_E_TERM;
+               dma_base = DMA_E_BASE;
+       }
+#endif
+
+       /* starting address */
+       MDP_OUTP(MDP_BASE + dma_base + 0x8, (uint32) buf);
+
+       /* enable LCDC irq */
+       spin_lock_irqsave(&mdp_spin_lock, flag);
+       mdp_enable_irq(irq_block);
+       INIT_COMPLETION(mfd->dma->comp);
+       mfd->dma->waiting = TRUE;
+#ifdef CONFIG_FB_MSM_MDP40
+       outp32(MDP_INTR_CLEAR, intr);
+       mdp_intr_mask |= intr;
+       outp32(MDP_INTR_ENABLE, mdp_intr_mask);
+#else
+       outp32(MDP_INTR_CLEAR, LCDC_FRAME_START);
+       mdp_intr_mask |= LCDC_FRAME_START;
+       outp32(MDP_INTR_ENABLE, mdp_intr_mask);
+#endif
+       spin_unlock_irqrestore(&mdp_spin_lock, flag);
+
+       if (mfd->ibuf.vsync_enable)
+               wait_for_completion_killable(&mfd->dma->comp);
+       mdp_disable_irq(irq_block);
+}
diff --git a/drivers/staging/msm/mdp_dma_s.c b/drivers/staging/msm/mdp_dma_s.c
new file mode 100644 (file)
index 0000000..0c34a10
--- /dev/null
@@ -0,0 +1,139 @@
+/* Copyright (c) 2008-2009, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/time.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/hrtimer.h>
+
+#include <mach/hardware.h>
+#include <linux/io.h>
+
+#include <asm/system.h>
+#include <asm/mach-types.h>
+#include <linux/semaphore.h>
+#include <linux/spinlock.h>
+
+#include <linux/fb.h>
+
+#include "mdp.h"
+#include "msm_fb.h"
+
+static void mdp_dma_s_update_lcd(struct msm_fb_data_type *mfd)
+{
+       MDPIBUF *iBuf = &mfd->ibuf;
+       int mddi_dest = FALSE;
+       uint32 outBpp = iBuf->bpp;
+       uint32 dma_s_cfg_reg;
+       uint8 *src;
+       struct msm_fb_panel_data *pdata =
+           (struct msm_fb_panel_data *)mfd->pdev->dev.platform_data;
+
+       dma_s_cfg_reg = DMA_PACK_TIGHT | DMA_PACK_ALIGN_LSB |
+           DMA_OUT_SEL_AHB | DMA_IBUF_NONCONTIGUOUS;
+
+       if (mfd->fb_imgType == MDP_BGR_565)
+               dma_s_cfg_reg |= DMA_PACK_PATTERN_BGR;
+       else
+               dma_s_cfg_reg |= DMA_PACK_PATTERN_RGB;
+
+       if (outBpp == 4)
+               dma_s_cfg_reg |= DMA_IBUF_C3ALPHA_EN;
+
+       if (outBpp == 2)
+               dma_s_cfg_reg |= DMA_IBUF_FORMAT_RGB565;
+
+       if (mfd->panel_info.pdest != DISPLAY_2) {
+               printk(KERN_ERR "error: non-secondary type through dma_s!\n");
+               return;
+       }
+
+       if (mfd->panel_info.type == MDDI_PANEL) {
+               dma_s_cfg_reg |= DMA_OUT_SEL_MDDI;
+               mddi_dest = TRUE;
+       } else {
+               dma_s_cfg_reg |= DMA_AHBM_LCD_SEL_SECONDARY;
+               outp32(MDP_EBI2_LCD1, mfd->data_port_phys);
+       }
+
+       dma_s_cfg_reg |= DMA_DITHER_EN;
+
+       src = (uint8 *) iBuf->buf;
+       /* starting input address */
+       src += (iBuf->dma_x + iBuf->dma_y * iBuf->ibuf_width) * outBpp;
+
+       /* MDP cmd block enable */
+       mdp_pipe_ctrl(MDP_CMD_BLOCK, MDP_BLOCK_POWER_ON, FALSE);
+       /* PIXELSIZE */
+       MDP_OUTP(MDP_BASE + 0xa0004, (iBuf->dma_h << 16 | iBuf->dma_w));
+       MDP_OUTP(MDP_BASE + 0xa0008, src);      /* ibuf address */
+       MDP_OUTP(MDP_BASE + 0xa000c, iBuf->ibuf_width * outBpp);/* ystride */
+
+       if (mfd->panel_info.bpp == 18) {
+               dma_s_cfg_reg |= DMA_DSTC0G_6BITS |     /* 666 18BPP */
+                   DMA_DSTC1B_6BITS | DMA_DSTC2R_6BITS;
+       } else {
+               dma_s_cfg_reg |= DMA_DSTC0G_6BITS |     /* 565 16BPP */
+                   DMA_DSTC1B_5BITS | DMA_DSTC2R_5BITS;
+       }
+
+       if (mddi_dest) {
+               MDP_OUTP(MDP_BASE + 0xa0010, (iBuf->dma_y << 16) | iBuf->dma_x);
+               MDP_OUTP(MDP_BASE + 0x00090, 1);
+               MDP_OUTP(MDP_BASE + 0x00094,
+                               (MDDI_VDO_PACKET_DESC << 16) |
+                               mfd->panel_info.mddi.vdopkt);
+       } else {
+               /* setting LCDC write window */
+               pdata->set_rect(iBuf->dma_x, iBuf->dma_y, iBuf->dma_w,
+                               iBuf->dma_h);
+       }
+
+       MDP_OUTP(MDP_BASE + 0xa0000, dma_s_cfg_reg);
+
+       /* MDP cmd block disable */
+       mdp_pipe_ctrl(MDP_CMD_BLOCK, MDP_BLOCK_POWER_OFF, FALSE);
+       mdp_pipe_kickoff(MDP_DMA_S_TERM, mfd);
+}
+
+void mdp_dma_s_update(struct msm_fb_data_type *mfd)
+{
+       down(&mfd->dma->mutex);
+       if ((mfd) && (!mfd->dma->busy) && (mfd->panel_power_on)) {
+               down(&mfd->sem);
+               mdp_enable_irq(MDP_DMA_S_TERM);
+               mfd->dma->busy = TRUE;
+               INIT_COMPLETION(mfd->dma->comp);
+               mfd->ibuf_flushed = TRUE;
+               mdp_dma_s_update_lcd(mfd);
+               up(&mfd->sem);
+
+               /* wait until DMA finishes the current job */
+               wait_for_completion_killable(&mfd->dma->comp);
+               mdp_disable_irq(MDP_DMA_S_TERM);
+
+       /* signal if pan function is waiting for the update completion */
+               if (mfd->pan_waiting) {
+                       mfd->pan_waiting = FALSE;
+                       complete(&mfd->pan_comp);
+               }
+       }
+       up(&mfd->dma->mutex);
+}
diff --git a/drivers/staging/msm/mdp_dma_tv.c b/drivers/staging/msm/mdp_dma_tv.c
new file mode 100644 (file)
index 0000000..70989fb
--- /dev/null
@@ -0,0 +1,142 @@
+/* Copyright (c) 2008-2009, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/time.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/hrtimer.h>
+#include <linux/delay.h>
+
+#include <mach/hardware.h>
+#include <linux/io.h>
+
+#include <asm/system.h>
+#include <asm/mach-types.h>
+#include <linux/semaphore.h>
+#include <linux/spinlock.h>
+
+#include <linux/fb.h>
+
+#include "mdp.h"
+#include "msm_fb.h"
+
+extern spinlock_t mdp_spin_lock;
+extern uint32 mdp_intr_mask;
+
+int mdp_dma3_on(struct platform_device *pdev)
+{
+       struct msm_fb_data_type *mfd;
+       struct fb_info *fbi;
+       uint8 *buf;
+       int bpp;
+       int ret = 0;
+
+       mfd = (struct msm_fb_data_type *)platform_get_drvdata(pdev);
+
+       if (!mfd)
+               return -ENODEV;
+
+       if (mfd->key != MFD_KEY)
+               return -EINVAL;
+
+       fbi = mfd->fbi;
+       /* MDP cmd block enable */
+       mdp_pipe_ctrl(MDP_CMD_BLOCK, MDP_BLOCK_POWER_ON, FALSE);
+
+       bpp = fbi->var.bits_per_pixel / 8;
+       buf = (uint8 *) fbi->fix.smem_start;
+       buf += fbi->var.xoffset * bpp +
+               fbi->var.yoffset * fbi->fix.line_length;
+
+       /* starting address[31..8] of Video frame buffer is CS0 */
+       MDP_OUTP(MDP_BASE + 0xC0008, (uint32) buf >> 3);
+
+       mdp_pipe_ctrl(MDP_DMA3_BLOCK, MDP_BLOCK_POWER_ON, FALSE);
+
+       MDP_OUTP(MDP_BASE + 0xC0004, 0x4c60674); /* flicker filter enabled */
+       MDP_OUTP(MDP_BASE + 0xC0010, 0x20);     /* sobel treshold */
+
+       MDP_OUTP(MDP_BASE + 0xC0018, 0xeb0010); /* Y  Max, Y  min */
+       MDP_OUTP(MDP_BASE + 0xC001C, 0xf00010); /* Cb Max, Cb min */
+       MDP_OUTP(MDP_BASE + 0xC0020, 0xf00010); /* Cb Max, Cb min */
+
+       MDP_OUTP(MDP_BASE + 0xC000C, 0x67686970); /* add a few chars for CC */
+       MDP_OUTP(MDP_BASE + 0xC0000, 0x1);      /* MDP tv out enable */
+
+       /* MDP cmd block disable */
+       mdp_pipe_ctrl(MDP_CMD_BLOCK, MDP_BLOCK_POWER_OFF, FALSE);
+
+       ret = panel_next_on(pdev);
+
+       return ret;
+}
+
+int mdp_dma3_off(struct platform_device *pdev)
+{
+       int ret = 0;
+
+       ret = panel_next_off(pdev);
+       if (ret)
+               return ret;
+
+       /* MDP cmd block enable */
+       mdp_pipe_ctrl(MDP_CMD_BLOCK, MDP_BLOCK_POWER_ON, FALSE);
+       MDP_OUTP(MDP_BASE + 0xC0000, 0x0);
+       /* MDP cmd block disable */
+       mdp_pipe_ctrl(MDP_CMD_BLOCK, MDP_BLOCK_POWER_OFF, FALSE);
+
+       mdp_pipe_ctrl(MDP_DMA3_BLOCK, MDP_BLOCK_POWER_OFF, FALSE);
+
+       /* delay to make sure the last frame finishes */
+       mdelay(100);
+
+       return ret;
+}
+
+void mdp_dma3_update(struct msm_fb_data_type *mfd)
+{
+       struct fb_info *fbi = mfd->fbi;
+       uint8 *buf;
+       int bpp;
+       unsigned long flag;
+
+       if (!mfd->panel_power_on)
+               return;
+
+       /* no need to power on cmd block since dma3 is running */
+       bpp = fbi->var.bits_per_pixel / 8;
+       buf = (uint8 *) fbi->fix.smem_start;
+       buf += fbi->var.xoffset * bpp +
+               fbi->var.yoffset * fbi->fix.line_length;
+       MDP_OUTP(MDP_BASE + 0xC0008, (uint32) buf >> 3);
+
+       spin_lock_irqsave(&mdp_spin_lock, flag);
+       mdp_enable_irq(MDP_DMA3_TERM);
+       INIT_COMPLETION(mfd->dma->comp);
+       mfd->dma->waiting = TRUE;
+
+       outp32(MDP_INTR_CLEAR, TV_OUT_DMA3_START);
+       mdp_intr_mask |= TV_OUT_DMA3_START;
+       outp32(MDP_INTR_ENABLE, mdp_intr_mask);
+       spin_unlock_irqrestore(&mdp_spin_lock, flag);
+
+       wait_for_completion_killable(&mfd->dma->comp);
+       mdp_disable_irq(MDP_DMA3_TERM);
+}
diff --git a/drivers/staging/msm/mdp_hw_init.c b/drivers/staging/msm/mdp_hw_init.c
new file mode 100644 (file)
index 0000000..807362a
--- /dev/null
@@ -0,0 +1,720 @@
+/* Copyright (c) 2008-2009, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include "mdp.h"
+
+/* mdp primary csc limit vector */
+uint32 mdp_plv[] = { 0x10, 0xeb, 0x10, 0xf0 };
+
+/* Color Coefficient matrix for YUV -> RGB */
+struct mdp_ccs mdp_ccs_yuv2rgb = {
+       MDP_CCS_YUV2RGB,
+       {
+               0x254,
+               0x000,
+               0x331,
+               0x254,
+               0xff38,
+               0xfe61,
+               0x254,
+               0x409,
+               0x000,
+       },
+       {
+#ifdef CONFIG_FB_MSM_MDP31
+               0x1f0,
+               0x180,
+               0x180
+#else
+               0x10,
+               0x80,
+               0x80
+#endif
+       }
+};
+
+/* Color Coefficient matrix for RGB -> YUV */
+struct mdp_ccs mdp_ccs_rgb2yuv = {
+       MDP_CCS_RGB2YUV,
+       {
+               0x83,
+               0x102,
+               0x32,
+               0xffb5,
+               0xff6c,
+               0xe1,
+               0xe1,
+               0xff45,
+               0xffdc,
+       },
+#ifdef CONFIG_FB_MSM_MDP31
+       {
+               0x10,
+               0x80,
+               0x80
+       }
+#endif
+};
+
+static void mdp_load_lut_param(void)
+{
+       outpdw(MDP_BASE + 0x40800, 0x0);
+       outpdw(MDP_BASE + 0x40804, 0x151515);
+       outpdw(MDP_BASE + 0x40808, 0x1d1d1d);
+       outpdw(MDP_BASE + 0x4080c, 0x232323);
+       outpdw(MDP_BASE + 0x40810, 0x272727);
+       outpdw(MDP_BASE + 0x40814, 0x2b2b2b);
+       outpdw(MDP_BASE + 0x40818, 0x2f2f2f);
+       outpdw(MDP_BASE + 0x4081c, 0x333333);
+       outpdw(MDP_BASE + 0x40820, 0x363636);
+       outpdw(MDP_BASE + 0x40824, 0x393939);
+       outpdw(MDP_BASE + 0x40828, 0x3b3b3b);
+       outpdw(MDP_BASE + 0x4082c, 0x3e3e3e);
+       outpdw(MDP_BASE + 0x40830, 0x404040);
+       outpdw(MDP_BASE + 0x40834, 0x434343);
+       outpdw(MDP_BASE + 0x40838, 0x454545);
+       outpdw(MDP_BASE + 0x4083c, 0x474747);
+       outpdw(MDP_BASE + 0x40840, 0x494949);
+       outpdw(MDP_BASE + 0x40844, 0x4b4b4b);
+       outpdw(MDP_BASE + 0x40848, 0x4d4d4d);
+       outpdw(MDP_BASE + 0x4084c, 0x4f4f4f);
+       outpdw(MDP_BASE + 0x40850, 0x515151);
+       outpdw(MDP_BASE + 0x40854, 0x535353);
+       outpdw(MDP_BASE + 0x40858, 0x555555);
+       outpdw(MDP_BASE + 0x4085c, 0x565656);
+       outpdw(MDP_BASE + 0x40860, 0x585858);
+       outpdw(MDP_BASE + 0x40864, 0x5a5a5a);
+       outpdw(MDP_BASE + 0x40868, 0x5b5b5b);
+       outpdw(MDP_BASE + 0x4086c, 0x5d5d5d);
+       outpdw(MDP_BASE + 0x40870, 0x5e5e5e);
+       outpdw(MDP_BASE + 0x40874, 0x606060);
+       outpdw(MDP_BASE + 0x40878, 0x616161);
+       outpdw(MDP_BASE + 0x4087c, 0x636363);
+       outpdw(MDP_BASE + 0x40880, 0x646464);
+       outpdw(MDP_BASE + 0x40884, 0x666666);
+       outpdw(MDP_BASE + 0x40888, 0x676767);
+       outpdw(MDP_BASE + 0x4088c, 0x686868);
+       outpdw(MDP_BASE + 0x40890, 0x6a6a6a);
+       outpdw(MDP_BASE + 0x40894, 0x6b6b6b);
+       outpdw(MDP_BASE + 0x40898, 0x6c6c6c);
+       outpdw(MDP_BASE + 0x4089c, 0x6e6e6e);
+       outpdw(MDP_BASE + 0x408a0, 0x6f6f6f);
+       outpdw(MDP_BASE + 0x408a4, 0x707070);
+       outpdw(MDP_BASE + 0x408a8, 0x717171);
+       outpdw(MDP_BASE + 0x408ac, 0x727272);
+       outpdw(MDP_BASE + 0x408b0, 0x747474);
+       outpdw(MDP_BASE + 0x408b4, 0x757575);
+       outpdw(MDP_BASE + 0x408b8, 0x767676);
+       outpdw(MDP_BASE + 0x408bc, 0x777777);
+       outpdw(MDP_BASE + 0x408c0, 0x787878);
+       outpdw(MDP_BASE + 0x408c4, 0x797979);
+       outpdw(MDP_BASE + 0x408c8, 0x7a7a7a);
+       outpdw(MDP_BASE + 0x408cc, 0x7c7c7c);
+       outpdw(MDP_BASE + 0x408d0, 0x7d7d7d);
+       outpdw(MDP_BASE + 0x408d4, 0x7e7e7e);
+       outpdw(MDP_BASE + 0x408d8, 0x7f7f7f);
+       outpdw(MDP_BASE + 0x408dc, 0x808080);
+       outpdw(MDP_BASE + 0x408e0, 0x818181);
+       outpdw(MDP_BASE + 0x408e4, 0x828282);
+       outpdw(MDP_BASE + 0x408e8, 0x838383);
+       outpdw(MDP_BASE + 0x408ec, 0x848484);
+       outpdw(MDP_BASE + 0x408f0, 0x858585);
+       outpdw(MDP_BASE + 0x408f4, 0x868686);
+       outpdw(MDP_BASE + 0x408f8, 0x878787);
+       outpdw(MDP_BASE + 0x408fc, 0x888888);
+       outpdw(MDP_BASE + 0x40900, 0x898989);
+       outpdw(MDP_BASE + 0x40904, 0x8a8a8a);
+       outpdw(MDP_BASE + 0x40908, 0x8b8b8b);
+       outpdw(MDP_BASE + 0x4090c, 0x8c8c8c);
+       outpdw(MDP_BASE + 0x40910, 0x8d8d8d);
+       outpdw(MDP_BASE + 0x40914, 0x8e8e8e);
+       outpdw(MDP_BASE + 0x40918, 0x8f8f8f);
+       outpdw(MDP_BASE + 0x4091c, 0x8f8f8f);
+       outpdw(MDP_BASE + 0x40920, 0x909090);
+       outpdw(MDP_BASE + 0x40924, 0x919191);
+       outpdw(MDP_BASE + 0x40928, 0x929292);
+       outpdw(MDP_BASE + 0x4092c, 0x939393);
+       outpdw(MDP_BASE + 0x40930, 0x949494);
+       outpdw(MDP_BASE + 0x40934, 0x959595);
+       outpdw(MDP_BASE + 0x40938, 0x969696);
+       outpdw(MDP_BASE + 0x4093c, 0x969696);
+       outpdw(MDP_BASE + 0x40940, 0x979797);
+       outpdw(MDP_BASE + 0x40944, 0x989898);
+       outpdw(MDP_BASE + 0x40948, 0x999999);
+       outpdw(MDP_BASE + 0x4094c, 0x9a9a9a);
+       outpdw(MDP_BASE + 0x40950, 0x9b9b9b);
+       outpdw(MDP_BASE + 0x40954, 0x9c9c9c);
+       outpdw(MDP_BASE + 0x40958, 0x9c9c9c);
+       outpdw(MDP_BASE + 0x4095c, 0x9d9d9d);
+       outpdw(MDP_BASE + 0x40960, 0x9e9e9e);
+       outpdw(MDP_BASE + 0x40964, 0x9f9f9f);
+       outpdw(MDP_BASE + 0x40968, 0xa0a0a0);
+       outpdw(MDP_BASE + 0x4096c, 0xa0a0a0);
+       outpdw(MDP_BASE + 0x40970, 0xa1a1a1);
+       outpdw(MDP_BASE + 0x40974, 0xa2a2a2);
+       outpdw(MDP_BASE + 0x40978, 0xa3a3a3);
+       outpdw(MDP_BASE + 0x4097c, 0xa4a4a4);
+       outpdw(MDP_BASE + 0x40980, 0xa4a4a4);
+       outpdw(MDP_BASE + 0x40984, 0xa5a5a5);
+       outpdw(MDP_BASE + 0x40988, 0xa6a6a6);
+       outpdw(MDP_BASE + 0x4098c, 0xa7a7a7);
+       outpdw(MDP_BASE + 0x40990, 0xa7a7a7);
+       outpdw(MDP_BASE + 0x40994, 0xa8a8a8);
+       outpdw(MDP_BASE + 0x40998, 0xa9a9a9);
+       outpdw(MDP_BASE + 0x4099c, 0xaaaaaa);
+       outpdw(MDP_BASE + 0x409a0, 0xaaaaaa);
+       outpdw(MDP_BASE + 0x409a4, 0xababab);
+       outpdw(MDP_BASE + 0x409a8, 0xacacac);
+       outpdw(MDP_BASE + 0x409ac, 0xadadad);
+       outpdw(MDP_BASE + 0x409b0, 0xadadad);
+       outpdw(MDP_BASE + 0x409b4, 0xaeaeae);
+       outpdw(MDP_BASE + 0x409b8, 0xafafaf);
+       outpdw(MDP_BASE + 0x409bc, 0xafafaf);
+       outpdw(MDP_BASE + 0x409c0, 0xb0b0b0);
+       outpdw(MDP_BASE + 0x409c4, 0xb1b1b1);
+       outpdw(MDP_BASE + 0x409c8, 0xb2b2b2);
+       outpdw(MDP_BASE + 0x409cc, 0xb2b2b2);
+       outpdw(MDP_BASE + 0x409d0, 0xb3b3b3);
+       outpdw(MDP_BASE + 0x409d4, 0xb4b4b4);
+       outpdw(MDP_BASE + 0x409d8, 0xb4b4b4);
+       outpdw(MDP_BASE + 0x409dc, 0xb5b5b5);
+       outpdw(MDP_BASE + 0x409e0, 0xb6b6b6);
+       outpdw(MDP_BASE + 0x409e4, 0xb6b6b6);
+       outpdw(MDP_BASE + 0x409e8, 0xb7b7b7);
+       outpdw(MDP_BASE + 0x409ec, 0xb8b8b8);
+       outpdw(MDP_BASE + 0x409f0, 0xb8b8b8);
+       outpdw(MDP_BASE + 0x409f4, 0xb9b9b9);
+       outpdw(MDP_BASE + 0x409f8, 0xbababa);
+       outpdw(MDP_BASE + 0x409fc, 0xbababa);
+       outpdw(MDP_BASE + 0x40a00, 0xbbbbbb);
+       outpdw(MDP_BASE + 0x40a04, 0xbcbcbc);
+       outpdw(MDP_BASE + 0x40a08, 0xbcbcbc);
+       outpdw(MDP_BASE + 0x40a0c, 0xbdbdbd);
+       outpdw(MDP_BASE + 0x40a10, 0xbebebe);
+       outpdw(MDP_BASE + 0x40a14, 0xbebebe);
+       outpdw(MDP_BASE + 0x40a18, 0xbfbfbf);
+       outpdw(MDP_BASE + 0x40a1c, 0xc0c0c0);
+       outpdw(MDP_BASE + 0x40a20, 0xc0c0c0);
+       outpdw(MDP_BASE + 0x40a24, 0xc1c1c1);
+       outpdw(MDP_BASE + 0x40a28, 0xc1c1c1);
+       outpdw(MDP_BASE + 0x40a2c, 0xc2c2c2);
+       outpdw(MDP_BASE + 0x40a30, 0xc3c3c3);
+       outpdw(MDP_BASE + 0x40a34, 0xc3c3c3);
+       outpdw(MDP_BASE + 0x40a38, 0xc4c4c4);
+       outpdw(MDP_BASE + 0x40a3c, 0xc5c5c5);
+       outpdw(MDP_BASE + 0x40a40, 0xc5c5c5);
+       outpdw(MDP_BASE + 0x40a44, 0xc6c6c6);
+       outpdw(MDP_BASE + 0x40a48, 0xc6c6c6);
+       outpdw(MDP_BASE + 0x40a4c, 0xc7c7c7);
+       outpdw(MDP_BASE + 0x40a50, 0xc8c8c8);
+       outpdw(MDP_BASE + 0x40a54, 0xc8c8c8);
+       outpdw(MDP_BASE + 0x40a58, 0xc9c9c9);
+       outpdw(MDP_BASE + 0x40a5c, 0xc9c9c9);
+       outpdw(MDP_BASE + 0x40a60, 0xcacaca);
+       outpdw(MDP_BASE + 0x40a64, 0xcbcbcb);
+       outpdw(MDP_BASE + 0x40a68, 0xcbcbcb);
+       outpdw(MDP_BASE + 0x40a6c, 0xcccccc);
+       outpdw(MDP_BASE + 0x40a70, 0xcccccc);
+       outpdw(MDP_BASE + 0x40a74, 0xcdcdcd);
+       outpdw(MDP_BASE + 0x40a78, 0xcecece);
+       outpdw(MDP_BASE + 0x40a7c, 0xcecece);
+       outpdw(MDP_BASE + 0x40a80, 0xcfcfcf);
+       outpdw(MDP_BASE + 0x40a84, 0xcfcfcf);
+       outpdw(MDP_BASE + 0x40a88, 0xd0d0d0);
+       outpdw(MDP_BASE + 0x40a8c, 0xd0d0d0);
+       outpdw(MDP_BASE + 0x40a90, 0xd1d1d1);
+       outpdw(MDP_BASE + 0x40a94, 0xd2d2d2);
+       outpdw(MDP_BASE + 0x40a98, 0xd2d2d2);
+       outpdw(MDP_BASE + 0x40a9c, 0xd3d3d3);
+       outpdw(MDP_BASE + 0x40aa0, 0xd3d3d3);
+       outpdw(MDP_BASE + 0x40aa4, 0xd4d4d4);
+       outpdw(MDP_BASE + 0x40aa8, 0xd4d4d4);
+       outpdw(MDP_BASE + 0x40aac, 0xd5d5d5);
+       outpdw(MDP_BASE + 0x40ab0, 0xd6d6d6);
+       outpdw(MDP_BASE + 0x40ab4, 0xd6d6d6);
+       outpdw(MDP_BASE + 0x40ab8, 0xd7d7d7);
+       outpdw(MDP_BASE + 0x40abc, 0xd7d7d7);
+       outpdw(MDP_BASE + 0x40ac0, 0xd8d8d8);
+       outpdw(MDP_BASE + 0x40ac4, 0xd8d8d8);
+       outpdw(MDP_BASE + 0x40ac8, 0xd9d9d9);
+       outpdw(MDP_BASE + 0x40acc, 0xd9d9d9);
+       outpdw(MDP_BASE + 0x40ad0, 0xdadada);
+       outpdw(MDP_BASE + 0x40ad4, 0xdbdbdb);
+       outpdw(MDP_BASE + 0x40ad8, 0xdbdbdb);
+       outpdw(MDP_BASE + 0x40adc, 0xdcdcdc);
+       outpdw(MDP_BASE + 0x40ae0, 0xdcdcdc);
+       outpdw(MDP_BASE + 0x40ae4, 0xdddddd);
+       outpdw(MDP_BASE + 0x40ae8, 0xdddddd);
+       outpdw(MDP_BASE + 0x40aec, 0xdedede);
+       outpdw(MDP_BASE + 0x40af0, 0xdedede);
+       outpdw(MDP_BASE + 0x40af4, 0xdfdfdf);
+       outpdw(MDP_BASE + 0x40af8, 0xdfdfdf);
+       outpdw(MDP_BASE + 0x40afc, 0xe0e0e0);
+       outpdw(MDP_BASE + 0x40b00, 0xe0e0e0);
+       outpdw(MDP_BASE + 0x40b04, 0xe1e1e1);
+       outpdw(MDP_BASE + 0x40b08, 0xe1e1e1);
+       outpdw(MDP_BASE + 0x40b0c, 0xe2e2e2);
+       outpdw(MDP_BASE + 0x40b10, 0xe3e3e3);
+       outpdw(MDP_BASE + 0x40b14, 0xe3e3e3);
+       outpdw(MDP_BASE + 0x40b18, 0xe4e4e4);
+       outpdw(MDP_BASE + 0x40b1c, 0xe4e4e4);
+       outpdw(MDP_BASE + 0x40b20, 0xe5e5e5);
+       outpdw(MDP_BASE + 0x40b24, 0xe5e5e5);
+       outpdw(MDP_BASE + 0x40b28, 0xe6e6e6);
+       outpdw(MDP_BASE + 0x40b2c, 0xe6e6e6);
+       outpdw(MDP_BASE + 0x40b30, 0xe7e7e7);
+       outpdw(MDP_BASE + 0x40b34, 0xe7e7e7);
+       outpdw(MDP_BASE + 0x40b38, 0xe8e8e8);
+       outpdw(MDP_BASE + 0x40b3c, 0xe8e8e8);
+       outpdw(MDP_BASE + 0x40b40, 0xe9e9e9);
+       outpdw(MDP_BASE + 0x40b44, 0xe9e9e9);
+       outpdw(MDP_BASE + 0x40b48, 0xeaeaea);
+       outpdw(MDP_BASE + 0x40b4c, 0xeaeaea);
+       outpdw(MDP_BASE + 0x40b50, 0xebebeb);
+       outpdw(MDP_BASE + 0x40b54, 0xebebeb);
+       outpdw(MDP_BASE + 0x40b58, 0xececec);
+       outpdw(MDP_BASE + 0x40b5c, 0xececec);
+       outpdw(MDP_BASE + 0x40b60, 0xededed);
+       outpdw(MDP_BASE + 0x40b64, 0xededed);
+       outpdw(MDP_BASE + 0x40b68, 0xeeeeee);
+       outpdw(MDP_BASE + 0x40b6c, 0xeeeeee);
+       outpdw(MDP_BASE + 0x40b70, 0xefefef);
+       outpdw(MDP_BASE + 0x40b74, 0xefefef);
+       outpdw(MDP_BASE + 0x40b78, 0xf0f0f0);
+       outpdw(MDP_BASE + 0x40b7c, 0xf0f0f0);
+       outpdw(MDP_BASE + 0x40b80, 0xf1f1f1);
+       outpdw(MDP_BASE + 0x40b84, 0xf1f1f1);
+       outpdw(MDP_BASE + 0x40b88, 0xf2f2f2);
+       outpdw(MDP_BASE + 0x40b8c, 0xf2f2f2);
+       outpdw(MDP_BASE + 0x40b90, 0xf2f2f2);
+       outpdw(MDP_BASE + 0x40b94, 0xf3f3f3);
+       outpdw(MDP_BASE + 0x40b98, 0xf3f3f3);
+       outpdw(MDP_BASE + 0x40b9c, 0xf4f4f4);
+       outpdw(MDP_BASE + 0x40ba0, 0xf4f4f4);
+       outpdw(MDP_BASE + 0x40ba4, 0xf5f5f5);
+       outpdw(MDP_BASE + 0x40ba8, 0xf5f5f5);
+       outpdw(MDP_BASE + 0x40bac, 0xf6f6f6);
+       outpdw(MDP_BASE + 0x40bb0, 0xf6f6f6);
+       outpdw(MDP_BASE + 0x40bb4, 0xf7f7f7);
+       outpdw(MDP_BASE + 0x40bb8, 0xf7f7f7);
+       outpdw(MDP_BASE + 0x40bbc, 0xf8f8f8);
+       outpdw(MDP_BASE + 0x40bc0, 0xf8f8f8);
+       outpdw(MDP_BASE + 0x40bc4, 0xf9f9f9);
+       outpdw(MDP_BASE + 0x40bc8, 0xf9f9f9);
+       outpdw(MDP_BASE + 0x40bcc, 0xfafafa);
+       outpdw(MDP_BASE + 0x40bd0, 0xfafafa);
+       outpdw(MDP_BASE + 0x40bd4, 0xfafafa);
+       outpdw(MDP_BASE + 0x40bd8, 0xfbfbfb);
+       outpdw(MDP_BASE + 0x40bdc, 0xfbfbfb);
+       outpdw(MDP_BASE + 0x40be0, 0xfcfcfc);
+       outpdw(MDP_BASE + 0x40be4, 0xfcfcfc);
+       outpdw(MDP_BASE + 0x40be8, 0xfdfdfd);
+       outpdw(MDP_BASE + 0x40bec, 0xfdfdfd);
+       outpdw(MDP_BASE + 0x40bf0, 0xfefefe);
+       outpdw(MDP_BASE + 0x40bf4, 0xfefefe);
+       outpdw(MDP_BASE + 0x40bf8, 0xffffff);
+       outpdw(MDP_BASE + 0x40bfc, 0xffffff);
+       outpdw(MDP_BASE + 0x40c00, 0x0);
+       outpdw(MDP_BASE + 0x40c04, 0x0);
+       outpdw(MDP_BASE + 0x40c08, 0x0);
+       outpdw(MDP_BASE + 0x40c0c, 0x0);
+       outpdw(MDP_BASE + 0x40c10, 0x0);
+       outpdw(MDP_BASE + 0x40c14, 0x0);
+       outpdw(MDP_BASE + 0x40c18, 0x0);
+       outpdw(MDP_BASE + 0x40c1c, 0x0);
+       outpdw(MDP_BASE + 0x40c20, 0x0);
+       outpdw(MDP_BASE + 0x40c24, 0x0);
+       outpdw(MDP_BASE + 0x40c28, 0x0);
+       outpdw(MDP_BASE + 0x40c2c, 0x0);
+       outpdw(MDP_BASE + 0x40c30, 0x0);
+       outpdw(MDP_BASE + 0x40c34, 0x0);
+       outpdw(MDP_BASE + 0x40c38, 0x0);
+       outpdw(MDP_BASE + 0x40c3c, 0x0);
+       outpdw(MDP_BASE + 0x40c40, 0x10101);
+       outpdw(MDP_BASE + 0x40c44, 0x10101);
+       outpdw(MDP_BASE + 0x40c48, 0x10101);
+       outpdw(MDP_BASE + 0x40c4c, 0x10101);
+       outpdw(MDP_BASE + 0x40c50, 0x10101);
+       outpdw(MDP_BASE + 0x40c54, 0x10101);
+       outpdw(MDP_BASE + 0x40c58, 0x10101);
+       outpdw(MDP_BASE + 0x40c5c, 0x10101);
+       outpdw(MDP_BASE + 0x40c60, 0x10101);
+       outpdw(MDP_BASE + 0x40c64, 0x10101);
+       outpdw(MDP_BASE + 0x40c68, 0x20202);
+       outpdw(MDP_BASE + 0x40c6c, 0x20202);
+       outpdw(MDP_BASE + 0x40c70, 0x20202);
+       outpdw(MDP_BASE + 0x40c74, 0x20202);
+       outpdw(MDP_BASE + 0x40c78, 0x20202);
+       outpdw(MDP_BASE + 0x40c7c, 0x20202);
+       outpdw(MDP_BASE + 0x40c80, 0x30303);
+       outpdw(MDP_BASE + 0x40c84, 0x30303);
+       outpdw(MDP_BASE + 0x40c88, 0x30303);
+       outpdw(MDP_BASE + 0x40c8c, 0x30303);
+       outpdw(MDP_BASE + 0x40c90, 0x30303);
+       outpdw(MDP_BASE + 0x40c94, 0x40404);
+       outpdw(MDP_BASE + 0x40c98, 0x40404);
+       outpdw(MDP_BASE + 0x40c9c, 0x40404);
+       outpdw(MDP_BASE + 0x40ca0, 0x40404);
+       outpdw(MDP_BASE + 0x40ca4, 0x40404);
+       outpdw(MDP_BASE + 0x40ca8, 0x50505);
+       outpdw(MDP_BASE + 0x40cac, 0x50505);
+       outpdw(MDP_BASE + 0x40cb0, 0x50505);
+       outpdw(MDP_BASE + 0x40cb4, 0x50505);
+       outpdw(MDP_BASE + 0x40cb8, 0x60606);
+       outpdw(MDP_BASE + 0x40cbc, 0x60606);
+       outpdw(MDP_BASE + 0x40cc0, 0x60606);
+       outpdw(MDP_BASE + 0x40cc4, 0x70707);
+       outpdw(MDP_BASE + 0x40cc8, 0x70707);
+       outpdw(MDP_BASE + 0x40ccc, 0x70707);
+       outpdw(MDP_BASE + 0x40cd0, 0x70707);
+       outpdw(MDP_BASE + 0x40cd4, 0x80808);
+       outpdw(MDP_BASE + 0x40cd8, 0x80808);
+       outpdw(MDP_BASE + 0x40cdc, 0x80808);
+       outpdw(MDP_BASE + 0x40ce0, 0x90909);
+       outpdw(MDP_BASE + 0x40ce4, 0x90909);
+       outpdw(MDP_BASE + 0x40ce8, 0xa0a0a);
+       outpdw(MDP_BASE + 0x40cec, 0xa0a0a);
+       outpdw(MDP_BASE + 0x40cf0, 0xa0a0a);
+       outpdw(MDP_BASE + 0x40cf4, 0xb0b0b);
+       outpdw(MDP_BASE + 0x40cf8, 0xb0b0b);
+       outpdw(MDP_BASE + 0x40cfc, 0xb0b0b);
+       outpdw(MDP_BASE + 0x40d00, 0xc0c0c);
+       outpdw(MDP_BASE + 0x40d04, 0xc0c0c);
+       outpdw(MDP_BASE + 0x40d08, 0xd0d0d);
+       outpdw(MDP_BASE + 0x40d0c, 0xd0d0d);
+       outpdw(MDP_BASE + 0x40d10, 0xe0e0e);
+       outpdw(MDP_BASE + 0x40d14, 0xe0e0e);
+       outpdw(MDP_BASE + 0x40d18, 0xe0e0e);
+       outpdw(MDP_BASE + 0x40d1c, 0xf0f0f);
+       outpdw(MDP_BASE + 0x40d20, 0xf0f0f);
+       outpdw(MDP_BASE + 0x40d24, 0x101010);
+       outpdw(MDP_BASE + 0x40d28, 0x101010);
+       outpdw(MDP_BASE + 0x40d2c, 0x111111);
+       outpdw(MDP_BASE + 0x40d30, 0x111111);
+       outpdw(MDP_BASE + 0x40d34, 0x121212);
+       outpdw(MDP_BASE + 0x40d38, 0x121212);
+       outpdw(MDP_BASE + 0x40d3c, 0x131313);
+       outpdw(MDP_BASE + 0x40d40, 0x131313);
+       outpdw(MDP_BASE + 0x40d44, 0x141414);
+       outpdw(MDP_BASE + 0x40d48, 0x151515);
+       outpdw(MDP_BASE + 0x40d4c, 0x151515);
+       outpdw(MDP_BASE + 0x40d50, 0x161616);
+       outpdw(MDP_BASE + 0x40d54, 0x161616);
+       outpdw(MDP_BASE + 0x40d58, 0x171717);
+       outpdw(MDP_BASE + 0x40d5c, 0x171717);
+       outpdw(MDP_BASE + 0x40d60, 0x181818);
+       outpdw(MDP_BASE + 0x40d64, 0x191919);
+       outpdw(MDP_BASE + 0x40d68, 0x191919);
+       outpdw(MDP_BASE + 0x40d6c, 0x1a1a1a);
+       outpdw(MDP_BASE + 0x40d70, 0x1b1b1b);
+       outpdw(MDP_BASE + 0x40d74, 0x1b1b1b);
+       outpdw(MDP_BASE + 0x40d78, 0x1c1c1c);
+       outpdw(MDP_BASE + 0x40d7c, 0x1c1c1c);
+       outpdw(MDP_BASE + 0x40d80, 0x1d1d1d);
+       outpdw(MDP_BASE + 0x40d84, 0x1e1e1e);
+       outpdw(MDP_BASE + 0x40d88, 0x1f1f1f);
+       outpdw(MDP_BASE + 0x40d8c, 0x1f1f1f);
+       outpdw(MDP_BASE + 0x40d90, 0x202020);
+       outpdw(MDP_BASE + 0x40d94, 0x212121);
+       outpdw(MDP_BASE + 0x40d98, 0x212121);
+       outpdw(MDP_BASE + 0x40d9c, 0x222222);
+       outpdw(MDP_BASE + 0x40da0, 0x232323);
+       outpdw(MDP_BASE + 0x40da4, 0x242424);
+       outpdw(MDP_BASE + 0x40da8, 0x242424);
+       outpdw(MDP_BASE + 0x40dac, 0x252525);
+       outpdw(MDP_BASE + 0x40db0, 0x262626);
+       outpdw(MDP_BASE + 0x40db4, 0x272727);
+       outpdw(MDP_BASE + 0x40db8, 0x272727);
+       outpdw(MDP_BASE + 0x40dbc, 0x282828);
+       outpdw(MDP_BASE + 0x40dc0, 0x292929);
+       outpdw(MDP_BASE + 0x40dc4, 0x2a2a2a);
+       outpdw(MDP_BASE + 0x40dc8, 0x2b2b2b);
+       outpdw(MDP_BASE + 0x40dcc, 0x2c2c2c);
+       outpdw(MDP_BASE + 0x40dd0, 0x2c2c2c);
+       outpdw(MDP_BASE + 0x40dd4, 0x2d2d2d);
+       outpdw(MDP_BASE + 0x40dd8, 0x2e2e2e);
+       outpdw(MDP_BASE + 0x40ddc, 0x2f2f2f);
+       outpdw(MDP_BASE + 0x40de0, 0x303030);
+       outpdw(MDP_BASE + 0x40de4, 0x313131);
+       outpdw(MDP_BASE + 0x40de8, 0x323232);
+       outpdw(MDP_BASE + 0x40dec, 0x333333);
+       outpdw(MDP_BASE + 0x40df0, 0x333333);
+       outpdw(MDP_BASE + 0x40df4, 0x343434);
+       outpdw(MDP_BASE + 0x40df8, 0x353535);
+       outpdw(MDP_BASE + 0x40dfc, 0x363636);
+       outpdw(MDP_BASE + 0x40e00, 0x373737);
+       outpdw(MDP_BASE + 0x40e04, 0x383838);
+       outpdw(MDP_BASE + 0x40e08, 0x393939);
+       outpdw(MDP_BASE + 0x40e0c, 0x3a3a3a);
+       outpdw(MDP_BASE + 0x40e10, 0x3b3b3b);
+       outpdw(MDP_BASE + 0x40e14, 0x3c3c3c);
+       outpdw(MDP_BASE + 0x40e18, 0x3d3d3d);
+       outpdw(MDP_BASE + 0x40e1c, 0x3e3e3e);
+       outpdw(MDP_BASE + 0x40e20, 0x3f3f3f);
+       outpdw(MDP_BASE + 0x40e24, 0x404040);
+       outpdw(MDP_BASE + 0x40e28, 0x414141);
+       outpdw(MDP_BASE + 0x40e2c, 0x424242);
+       outpdw(MDP_BASE + 0x40e30, 0x434343);
+       outpdw(MDP_BASE + 0x40e34, 0x444444);
+       outpdw(MDP_BASE + 0x40e38, 0x464646);
+       outpdw(MDP_BASE + 0x40e3c, 0x474747);
+       outpdw(MDP_BASE + 0x40e40, 0x484848);
+       outpdw(MDP_BASE + 0x40e44, 0x494949);
+       outpdw(MDP_BASE + 0x40e48, 0x4a4a4a);
+       outpdw(MDP_BASE + 0x40e4c, 0x4b4b4b);
+       outpdw(MDP_BASE + 0x40e50, 0x4c4c4c);
+       outpdw(MDP_BASE + 0x40e54, 0x4d4d4d);
+       outpdw(MDP_BASE + 0x40e58, 0x4f4f4f);
+       outpdw(MDP_BASE + 0x40e5c, 0x505050);
+       outpdw(MDP_BASE + 0x40e60, 0x515151);
+       outpdw(MDP_BASE + 0x40e64, 0x525252);
+       outpdw(MDP_BASE + 0x40e68, 0x535353);
+       outpdw(MDP_BASE + 0x40e6c, 0x545454);
+       outpdw(MDP_BASE + 0x40e70, 0x565656);
+       outpdw(MDP_BASE + 0x40e74, 0x575757);
+       outpdw(MDP_BASE + 0x40e78, 0x585858);
+       outpdw(MDP_BASE + 0x40e7c, 0x595959);
+       outpdw(MDP_BASE + 0x40e80, 0x5b5b5b);
+       outpdw(MDP_BASE + 0x40e84, 0x5c5c5c);
+       outpdw(MDP_BASE + 0x40e88, 0x5d5d5d);
+       outpdw(MDP_BASE + 0x40e8c, 0x5e5e5e);
+       outpdw(MDP_BASE + 0x40e90, 0x606060);
+       outpdw(MDP_BASE + 0x40e94, 0x616161);
+       outpdw(MDP_BASE + 0x40e98, 0x626262);
+       outpdw(MDP_BASE + 0x40e9c, 0x646464);
+       outpdw(MDP_BASE + 0x40ea0, 0x656565);
+       outpdw(MDP_BASE + 0x40ea4, 0x666666);
+       outpdw(MDP_BASE + 0x40ea8, 0x686868);
+       outpdw(MDP_BASE + 0x40eac, 0x696969);
+       outpdw(MDP_BASE + 0x40eb0, 0x6a6a6a);
+       outpdw(MDP_BASE + 0x40eb4, 0x6c6c6c);
+       outpdw(MDP_BASE + 0x40eb8, 0x6d6d6d);
+       outpdw(MDP_BASE + 0x40ebc, 0x6f6f6f);
+       outpdw(MDP_BASE + 0x40ec0, 0x707070);
+       outpdw(MDP_BASE + 0x40ec4, 0x717171);
+       outpdw(MDP_BASE + 0x40ec8, 0x737373);
+       outpdw(MDP_BASE + 0x40ecc, 0x747474);
+       outpdw(MDP_BASE + 0x40ed0, 0x767676);
+       outpdw(MDP_BASE + 0x40ed4, 0x777777);
+       outpdw(MDP_BASE + 0x40ed8, 0x797979);
+       outpdw(MDP_BASE + 0x40edc, 0x7a7a7a);
+       outpdw(MDP_BASE + 0x40ee0, 0x7c7c7c);
+       outpdw(MDP_BASE + 0x40ee4, 0x7d7d7d);
+       outpdw(MDP_BASE + 0x40ee8, 0x7f7f7f);
+       outpdw(MDP_BASE + 0x40eec, 0x808080);
+       outpdw(MDP_BASE + 0x40ef0, 0x828282);
+       outpdw(MDP_BASE + 0x40ef4, 0x838383);
+       outpdw(MDP_BASE + 0x40ef8, 0x858585);
+       outpdw(MDP_BASE + 0x40efc, 0x868686);
+       outpdw(MDP_BASE + 0x40f00, 0x888888);
+       outpdw(MDP_BASE + 0x40f04, 0x898989);
+       outpdw(MDP_BASE + 0x40f08, 0x8b8b8b);
+       outpdw(MDP_BASE + 0x40f0c, 0x8d8d8d);
+       outpdw(MDP_BASE + 0x40f10, 0x8e8e8e);
+       outpdw(MDP_BASE + 0x40f14, 0x909090);
+       outpdw(MDP_BASE + 0x40f18, 0x919191);
+       outpdw(MDP_BASE + 0x40f1c, 0x939393);
+       outpdw(MDP_BASE + 0x40f20, 0x959595);
+       outpdw(MDP_BASE + 0x40f24, 0x969696);
+       outpdw(MDP_BASE + 0x40f28, 0x989898);
+       outpdw(MDP_BASE + 0x40f2c, 0x9a9a9a);
+       outpdw(MDP_BASE + 0x40f30, 0x9b9b9b);
+       outpdw(MDP_BASE + 0x40f34, 0x9d9d9d);
+       outpdw(MDP_BASE + 0x40f38, 0x9f9f9f);
+       outpdw(MDP_BASE + 0x40f3c, 0xa1a1a1);
+       outpdw(MDP_BASE + 0x40f40, 0xa2a2a2);
+       outpdw(MDP_BASE + 0x40f44, 0xa4a4a4);
+       outpdw(MDP_BASE + 0x40f48, 0xa6a6a6);
+       outpdw(MDP_BASE + 0x40f4c, 0xa7a7a7);
+       outpdw(MDP_BASE + 0x40f50, 0xa9a9a9);
+       outpdw(MDP_BASE + 0x40f54, 0xababab);
+       outpdw(MDP_BASE + 0x40f58, 0xadadad);
+       outpdw(MDP_BASE + 0x40f5c, 0xafafaf);
+       outpdw(MDP_BASE + 0x40f60, 0xb0b0b0);
+       outpdw(MDP_BASE + 0x40f64, 0xb2b2b2);
+       outpdw(MDP_BASE + 0x40f68, 0xb4b4b4);
+       outpdw(MDP_BASE + 0x40f6c, 0xb6b6b6);
+       outpdw(MDP_BASE + 0x40f70, 0xb8b8b8);
+       outpdw(MDP_BASE + 0x40f74, 0xbababa);
+       outpdw(MDP_BASE + 0x40f78, 0xbbbbbb);
+       outpdw(MDP_BASE + 0x40f7c, 0xbdbdbd);
+       outpdw(MDP_BASE + 0x40f80, 0xbfbfbf);
+       outpdw(MDP_BASE + 0x40f84, 0xc1c1c1);
+       outpdw(MDP_BASE + 0x40f88, 0xc3c3c3);
+       outpdw(MDP_BASE + 0x40f8c, 0xc5c5c5);
+       outpdw(MDP_BASE + 0x40f90, 0xc7c7c7);
+       outpdw(MDP_BASE + 0x40f94, 0xc9c9c9);
+       outpdw(MDP_BASE + 0x40f98, 0xcbcbcb);
+       outpdw(MDP_BASE + 0x40f9c, 0xcdcdcd);
+       outpdw(MDP_BASE + 0x40fa0, 0xcfcfcf);
+       outpdw(MDP_BASE + 0x40fa4, 0xd1d1d1);
+       outpdw(MDP_BASE + 0x40fa8, 0xd3d3d3);
+       outpdw(MDP_BASE + 0x40fac, 0xd5d5d5);
+       outpdw(MDP_BASE + 0x40fb0, 0xd7d7d7);
+       outpdw(MDP_BASE + 0x40fb4, 0xd9d9d9);
+       outpdw(MDP_BASE + 0x40fb8, 0xdbdbdb);
+       outpdw(MDP_BASE + 0x40fbc, 0xdddddd);
+       outpdw(MDP_BASE + 0x40fc0, 0xdfdfdf);
+       outpdw(MDP_BASE + 0x40fc4, 0xe1e1e1);
+       outpdw(MDP_BASE + 0x40fc8, 0xe3e3e3);
+       outpdw(MDP_BASE + 0x40fcc, 0xe5e5e5);
+       outpdw(MDP_BASE + 0x40fd0, 0xe7e7e7);
+       outpdw(MDP_BASE + 0x40fd4, 0xe9e9e9);
+       outpdw(MDP_BASE + 0x40fd8, 0xebebeb);
+       outpdw(MDP_BASE + 0x40fdc, 0xeeeeee);
+       outpdw(MDP_BASE + 0x40fe0, 0xf0f0f0);
+       outpdw(MDP_BASE + 0x40fe4, 0xf2f2f2);
+       outpdw(MDP_BASE + 0x40fe8, 0xf4f4f4);
+       outpdw(MDP_BASE + 0x40fec, 0xf6f6f6);
+       outpdw(MDP_BASE + 0x40ff0, 0xf8f8f8);
+       outpdw(MDP_BASE + 0x40ff4, 0xfbfbfb);
+       outpdw(MDP_BASE + 0x40ff8, 0xfdfdfd);
+       outpdw(MDP_BASE + 0x40ffc, 0xffffff);
+}
+
+#define   IRQ_EN_1__MDP_IRQ___M    0x00000800
+
+void mdp_hw_init(void)
+{
+       int i;
+
+       /* MDP cmd block enable */
+       mdp_pipe_ctrl(MDP_CMD_BLOCK, MDP_BLOCK_POWER_ON, FALSE);
+
+       /* debug interface write access */
+       outpdw(MDP_BASE + 0x60, 1);
+
+       outp32(MDP_INTR_ENABLE, MDP_ANY_INTR_MASK);
+       outp32(MDP_EBI2_PORTMAP_MODE, 0x3);
+       outpdw(MDP_CMD_DEBUG_ACCESS_BASE + 0x01f8, 0x0);
+       outpdw(MDP_CMD_DEBUG_ACCESS_BASE + 0x01fc, 0x0);
+       outpdw(MDP_BASE + 0x60, 0x1);
+       mdp_load_lut_param();
+
+       /*
+        * clear up unused fg/main registers
+        */
+       /* comp.plane 2&3 ystride */
+       MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x0120, 0x0);
+       /* unpacked pattern */
+       MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x012c, 0x0);
+       /* unpacked pattern */
+       MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x0130, 0x0);
+       /* unpacked pattern */
+       MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x0134, 0x0);
+       MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x0158, 0x0);
+       MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x15c, 0x0);
+       MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x0160, 0x0);
+       MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x0170, 0x0);
+       MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x0174, 0x0);
+       MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x017c, 0x0);
+
+       /* comp.plane 2 */
+       MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x0114, 0x0);
+       /* comp.plane 3 */
+       MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x0118, 0x0);
+
+       /* clear up unused bg registers */
+       MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x01c8, 0);
+       MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x01d0, 0);
+       MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x01dc, 0);
+       MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x01e0, 0);
+       MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x01e4, 0);
+
+#ifndef CONFIG_FB_MSM_MDP22
+       MDP_OUTP(MDP_BASE + 0xE0000, 0);
+       MDP_OUTP(MDP_BASE + 0x100, 0xffffffff);
+       MDP_OUTP(MDP_BASE + 0x90070, 0);
+       MDP_OUTP(MDP_BASE + 0x94010, 1);
+       MDP_OUTP(MDP_BASE + 0x9401c, 2);
+#endif
+
+       /*
+        * limit vector
+        * pre gets applied before color matrix conversion
+        * post is after ccs
+        */
+       writel(mdp_plv[0], MDP_CSC_PRE_LV1n(0));
+       writel(mdp_plv[1], MDP_CSC_PRE_LV1n(1));
+       writel(mdp_plv[2], MDP_CSC_PRE_LV1n(2));
+       writel(mdp_plv[3], MDP_CSC_PRE_LV1n(3));
+
+#ifdef CONFIG_FB_MSM_MDP31
+       writel(mdp_plv[2], MDP_CSC_PRE_LV1n(4));
+       writel(mdp_plv[3], MDP_CSC_PRE_LV1n(5));
+
+       writel(0, MDP_CSC_POST_LV1n(0));
+       writel(0xff, MDP_CSC_POST_LV1n(1));
+       writel(0, MDP_CSC_POST_LV1n(2));
+       writel(0xff, MDP_CSC_POST_LV1n(3));
+       writel(0, MDP_CSC_POST_LV1n(4));
+       writel(0xff, MDP_CSC_POST_LV1n(5));
+
+       writel(0, MDP_CSC_PRE_LV2n(0));
+       writel(0xff, MDP_CSC_PRE_LV2n(1));
+       writel(0, MDP_CSC_PRE_LV2n(2));
+       writel(0xff, MDP_CSC_PRE_LV2n(3));
+       writel(0, MDP_CSC_PRE_LV2n(4));
+       writel(0xff, MDP_CSC_PRE_LV2n(5));
+
+       writel(mdp_plv[0], MDP_CSC_POST_LV2n(0));
+       writel(mdp_plv[1], MDP_CSC_POST_LV2n(1));
+       writel(mdp_plv[2], MDP_CSC_POST_LV2n(2));
+       writel(mdp_plv[3], MDP_CSC_POST_LV2n(3));
+       writel(mdp_plv[2], MDP_CSC_POST_LV2n(4));
+       writel(mdp_plv[3], MDP_CSC_POST_LV2n(5));
+#endif
+
+       /* primary forward matrix */
+       for (i = 0; i < MDP_CCS_SIZE; i++)
+               writel(mdp_ccs_rgb2yuv.ccs[i], MDP_CSC_PFMVn(i));
+
+#ifdef CONFIG_FB_MSM_MDP31
+       for (i = 0; i < MDP_BV_SIZE; i++)
+               writel(mdp_ccs_rgb2yuv.bv[i], MDP_CSC_POST_BV2n(i));
+
+       writel(0, MDP_CSC_PRE_BV2n(0));
+       writel(0, MDP_CSC_PRE_BV2n(1));
+       writel(0, MDP_CSC_PRE_BV2n(2));
+#endif
+       /* primary reverse matrix */
+       for (i = 0; i < MDP_CCS_SIZE; i++)
+               writel(mdp_ccs_yuv2rgb.ccs[i], MDP_CSC_PRMVn(i));
+
+       for (i = 0; i < MDP_BV_SIZE; i++)
+               writel(mdp_ccs_yuv2rgb.bv[i], MDP_CSC_PRE_BV1n(i));
+
+#ifdef CONFIG_FB_MSM_MDP31
+       writel(0, MDP_CSC_POST_BV1n(0));
+       writel(0, MDP_CSC_POST_BV1n(1));
+       writel(0, MDP_CSC_POST_BV1n(2));
+
+       outpdw(MDP_BASE + 0x30010, 0x03e0);
+       outpdw(MDP_BASE + 0x30014, 0x0360);
+       outpdw(MDP_BASE + 0x30018, 0x0120);
+       outpdw(MDP_BASE + 0x3001c, 0x0140);
+#endif
+       mdp_init_scale_table();
+
+#ifndef CONFIG_FB_MSM_MDP31
+       MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x0104,
+                ((16 << 6) << 16) | (16) << 6);
+#endif
+
+       /* MDP cmd block disable */
+       mdp_pipe_ctrl(MDP_CMD_BLOCK, MDP_BLOCK_POWER_OFF, FALSE);
+}
\ No newline at end of file
diff --git a/drivers/staging/msm/mdp_ppp.c b/drivers/staging/msm/mdp_ppp.c
new file mode 100644 (file)
index 0000000..c35a6ae
--- /dev/null
@@ -0,0 +1,1502 @@
+/* drivers/video/msm/src/drv/mdp/mdp_ppp.c
+ *
+ * Copyright (C) 2007 Google Incorporated
+ * Copyright (c) 2008-2010, Code Aurora Forum. All rights reserved.
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/time.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/fb.h>
+#include <msm_mdp.h>
+#include <linux/file.h>
+#include <linux/major.h>
+
+#include "linux/proc_fs.h"
+
+#include <mach/hardware.h>
+#include <linux/io.h>
+
+#include <asm/system.h>
+#include <asm/mach-types.h>
+#include <linux/semaphore.h>
+
+#include "mdp.h"
+#include "msm_fb.h"
+
+#define MDP_IS_IMGTYPE_BAD(x) (((x) >= MDP_IMGTYPE_LIMIT) && \
+                               (((x) < MDP_IMGTYPE2_START) || \
+                                ((x) >= MDP_IMGTYPE_LIMIT2)))
+
+static uint32_t bytes_per_pixel[] = {
+       [MDP_RGB_565] = 2,
+       [MDP_RGB_888] = 3,
+       [MDP_XRGB_8888] = 4,
+       [MDP_ARGB_8888] = 4,
+       [MDP_RGBA_8888] = 4,
+       [MDP_BGRA_8888] = 4,
+       [MDP_Y_CBCR_H2V1] = 1,
+       [MDP_Y_CBCR_H2V2] = 1,
+       [MDP_Y_CRCB_H2V1] = 1,
+       [MDP_Y_CRCB_H2V2] = 1,
+       [MDP_YCRYCB_H2V1] = 2,
+       [MDP_BGR_565] = 2
+};
+
+extern uint32 mdp_plv[];
+extern struct semaphore mdp_ppp_mutex;
+
+uint32_t mdp_get_bytes_per_pixel(uint32_t format)
+{
+       uint32_t bpp = 0;
+       if (format < ARRAY_SIZE(bytes_per_pixel))
+               bpp = bytes_per_pixel[format];
+
+       BUG_ON(!bpp);
+       return bpp;
+}
+
+static uint32 mdp_conv_matx_rgb2yuv(uint32 input_pixel,
+                                   uint16 *matrix_and_bias_vector,
+                                   uint32 *clamp_vector,
+                                   uint32 *look_up_table)
+{
+       uint8 input_C2, input_C0, input_C1;
+       uint32 output;
+       int32 comp_C2, comp_C1, comp_C0, temp;
+       int32 temp1, temp2, temp3;
+       int32 matrix[9];
+       int32 bias_vector[3];
+       int32 Y_low_limit, Y_high_limit, C_low_limit, C_high_limit;
+       int32 i;
+       uint32 _is_lookup_table_enabled;
+
+       input_C2 = (input_pixel >> 16) & 0xFF;
+       input_C1 = (input_pixel >> 8) & 0xFF;
+       input_C0 = (input_pixel >> 0) & 0xFF;
+
+       comp_C0 = input_C0;
+       comp_C1 = input_C1;
+       comp_C2 = input_C2;
+
+       for (i = 0; i < 9; i++)
+               matrix[i] =
+                   ((int32) (((int32) matrix_and_bias_vector[i]) << 20)) >> 20;
+
+       bias_vector[0] = (int32) (matrix_and_bias_vector[9] & 0xFF);
+       bias_vector[1] = (int32) (matrix_and_bias_vector[10] & 0xFF);
+       bias_vector[2] = (int32) (matrix_and_bias_vector[11] & 0xFF);
+
+       Y_low_limit = (int32) clamp_vector[0];
+       Y_high_limit = (int32) clamp_vector[1];
+       C_low_limit = (int32) clamp_vector[2];
+       C_high_limit = (int32) clamp_vector[3];
+
+       if (look_up_table == 0) /* check for NULL point */
+               _is_lookup_table_enabled = 0;
+       else
+               _is_lookup_table_enabled = 1;
+
+       if (_is_lookup_table_enabled == 1) {
+               comp_C2 = (look_up_table[comp_C2] >> 16) & 0xFF;
+               comp_C1 = (look_up_table[comp_C1] >> 8) & 0xFF;
+               comp_C0 = (look_up_table[comp_C0] >> 0) & 0xFF;
+       }
+       /*
+        * Color Conversion
+        * reorder input colors
+        */
+       temp = comp_C2;
+       comp_C2 = comp_C1;
+       comp_C1 = comp_C0;
+       comp_C0 = temp;
+
+       /* matrix multiplication */
+       temp1 = comp_C0 * matrix[0] + comp_C1 * matrix[1] + comp_C2 * matrix[2];
+       temp2 = comp_C0 * matrix[3] + comp_C1 * matrix[4] + comp_C2 * matrix[5];
+       temp3 = comp_C0 * matrix[6] + comp_C1 * matrix[7] + comp_C2 * matrix[8];
+
+       comp_C0 = temp1 + 0x100;
+       comp_C1 = temp2 + 0x100;
+       comp_C2 = temp3 + 0x100;
+
+       /* take interger part */
+       comp_C0 >>= 9;
+       comp_C1 >>= 9;
+       comp_C2 >>= 9;
+
+       /* post bias (+) */
+       comp_C0 += bias_vector[0];
+       comp_C1 += bias_vector[1];
+       comp_C2 += bias_vector[2];
+
+       /* limit pixel to 8-bit */
+       if (comp_C0 < 0)
+               comp_C0 = 0;
+
+       if (comp_C0 > 255)
+               comp_C0 = 255;
+
+       if (comp_C1 < 0)
+               comp_C1 = 0;
+
+       if (comp_C1 > 255)
+               comp_C1 = 255;
+
+       if (comp_C2 < 0)
+               comp_C2 = 0;
+
+       if (comp_C2 > 255)
+               comp_C2 = 255;
+
+       /* clamp */
+       if (comp_C0 < Y_low_limit)
+               comp_C0 = Y_low_limit;
+
+       if (comp_C0 > Y_high_limit)
+               comp_C0 = Y_high_limit;
+
+       if (comp_C1 < C_low_limit)
+               comp_C1 = C_low_limit;
+
+       if (comp_C1 > C_high_limit)
+               comp_C1 = C_high_limit;
+
+       if (comp_C2 < C_low_limit)
+               comp_C2 = C_low_limit;
+
+       if (comp_C2 > C_high_limit)
+               comp_C2 = C_high_limit;
+
+       output = (comp_C2 << 16) | (comp_C1 << 8) | comp_C0;
+       return output;
+}
+
+uint32 mdp_conv_matx_yuv2rgb(uint32 input_pixel,
+                            uint16 *matrix_and_bias_vector,
+                            uint32 *clamp_vector, uint32 *look_up_table)
+{
+       uint8 input_C2, input_C0, input_C1;
+       uint32 output;
+       int32 comp_C2, comp_C1, comp_C0, temp;
+       int32 temp1, temp2, temp3;
+       int32 matrix[9];
+       int32 bias_vector[3];
+       int32 Y_low_limit, Y_high_limit, C_low_limit, C_high_limit;
+       int32 i;
+       uint32 _is_lookup_table_enabled;
+
+       input_C2 = (input_pixel >> 16) & 0xFF;
+       input_C1 = (input_pixel >> 8) & 0xFF;
+       input_C0 = (input_pixel >> 0) & 0xFF;
+
+       comp_C0 = input_C0;
+       comp_C1 = input_C1;
+       comp_C2 = input_C2;
+
+       for (i = 0; i < 9; i++)
+               matrix[i] =
+                   ((int32) (((int32) matrix_and_bias_vector[i]) << 20)) >> 20;
+
+       bias_vector[0] = (int32) (matrix_and_bias_vector[9] & 0xFF);
+       bias_vector[1] = (int32) (matrix_and_bias_vector[10] & 0xFF);
+       bias_vector[2] = (int32) (matrix_and_bias_vector[11] & 0xFF);
+
+       Y_low_limit = (int32) clamp_vector[0];
+       Y_high_limit = (int32) clamp_vector[1];
+       C_low_limit = (int32) clamp_vector[2];
+       C_high_limit = (int32) clamp_vector[3];
+
+       if (look_up_table == 0) /* check for NULL point */
+               _is_lookup_table_enabled = 0;
+       else
+               _is_lookup_table_enabled = 1;
+
+       /* clamp */
+       if (comp_C0 < Y_low_limit)
+               comp_C0 = Y_low_limit;
+
+       if (comp_C0 > Y_high_limit)
+               comp_C0 = Y_high_limit;
+
+       if (comp_C1 < C_low_limit)
+               comp_C1 = C_low_limit;
+
+       if (comp_C1 > C_high_limit)
+               comp_C1 = C_high_limit;
+
+       if (comp_C2 < C_low_limit)
+               comp_C2 = C_low_limit;
+
+       if (comp_C2 > C_high_limit)
+               comp_C2 = C_high_limit;
+
+       /*
+        * Color Conversion
+        * pre bias (-)
+        */
+       comp_C0 -= bias_vector[0];
+       comp_C1 -= bias_vector[1];
+       comp_C2 -= bias_vector[2];
+
+       /* matrix multiplication */
+       temp1 = comp_C0 * matrix[0] + comp_C1 * matrix[1] + comp_C2 * matrix[2];
+       temp2 = comp_C0 * matrix[3] + comp_C1 * matrix[4] + comp_C2 * matrix[5];
+       temp3 = comp_C0 * matrix[6] + comp_C1 * matrix[7] + comp_C2 * matrix[8];
+
+       comp_C0 = temp1 + 0x100;
+       comp_C1 = temp2 + 0x100;
+       comp_C2 = temp3 + 0x100;
+
+       /* take interger part */
+       comp_C0 >>= 9;
+       comp_C1 >>= 9;
+       comp_C2 >>= 9;
+
+       /* reorder output colors */
+       temp = comp_C0;
+       comp_C0 = comp_C1;
+       comp_C1 = comp_C2;
+       comp_C2 = temp;
+
+       /* limit pixel to 8-bit */
+       if (comp_C0 < 0)
+               comp_C0 = 0;
+
+       if (comp_C0 > 255)
+               comp_C0 = 255;
+
+       if (comp_C1 < 0)
+               comp_C1 = 0;
+
+       if (comp_C1 > 255)
+               comp_C1 = 255;
+
+       if (comp_C2 < 0)
+               comp_C2 = 0;
+
+       if (comp_C2 > 255)
+               comp_C2 = 255;
+
+       /* Look-up table */
+       if (_is_lookup_table_enabled == 1) {
+               comp_C2 = (look_up_table[comp_C2] >> 16) & 0xFF;
+               comp_C1 = (look_up_table[comp_C1] >> 8) & 0xFF;
+               comp_C0 = (look_up_table[comp_C0] >> 0) & 0xFF;
+       }
+
+       output = (comp_C2 << 16) | (comp_C1 << 8) | comp_C0;
+       return output;
+}
+
+static uint32 mdp_calc_tpval(MDPIMG *mdpImg)
+{
+       uint32 tpVal;
+       uint8 plane_tp;
+
+       tpVal = 0;
+       if ((mdpImg->imgType == MDP_RGB_565)
+           || (mdpImg->imgType == MDP_BGR_565)) {
+               /*
+                * transparent color conversion into 24 bpp
+                *
+                * C2R_8BIT
+                * left shift the entire bit and or it with the upper most bits
+                */
+               plane_tp = (uint8) ((mdpImg->tpVal & 0xF800) >> 11);
+               tpVal |= ((plane_tp << 3) | ((plane_tp & 0x1C) >> 2)) << 16;
+
+               /* C1B_8BIT */
+               plane_tp = (uint8) (mdpImg->tpVal & 0x1F);
+               tpVal |= ((plane_tp << 3) | ((plane_tp & 0x1C) >> 2)) << 8;
+
+               /* C0G_8BIT */
+               plane_tp = (uint8) ((mdpImg->tpVal & 0x7E0) >> 5);
+               tpVal |= ((plane_tp << 2) | ((plane_tp & 0x30) >> 4));
+       } else {
+               /* 24bit RGB to RBG conversion */
+
+               tpVal = (mdpImg->tpVal & 0xFF00) >> 8;
+               tpVal |= (mdpImg->tpVal & 0xFF) << 8;
+               tpVal |= (mdpImg->tpVal & 0xFF0000);
+       }
+
+       return tpVal;
+}
+
+static uint8 *mdp_get_chroma_addr(MDPIBUF *iBuf)
+{
+       uint8 *dest1;
+
+       dest1 = NULL;
+       switch (iBuf->ibuf_type) {
+       case MDP_Y_CBCR_H2V2:
+       case MDP_Y_CRCB_H2V2:
+       case MDP_Y_CBCR_H2V1:
+       case MDP_Y_CRCB_H2V1:
+               dest1 = (uint8 *) iBuf->buf;
+               dest1 += iBuf->ibuf_width * iBuf->ibuf_height * iBuf->bpp;
+               break;
+
+       default:
+               break;
+       }
+
+       return dest1;
+}
+
+static void mdp_ppp_setbg(MDPIBUF *iBuf)
+{
+       uint8 *bg0_addr;
+       uint8 *bg1_addr;
+       uint32 bg0_ystride, bg1_ystride;
+       uint32 ppp_src_cfg_reg, unpack_pattern;
+       int v_slice, h_slice;
+
+       v_slice = h_slice = 1;
+       bg0_addr = (uint8 *) iBuf->buf;
+       bg1_addr = mdp_get_chroma_addr(iBuf);
+
+       bg0_ystride = iBuf->ibuf_width * iBuf->bpp;
+       bg1_ystride = iBuf->ibuf_width * iBuf->bpp;
+
+       switch (iBuf->ibuf_type) {
+       case MDP_BGR_565:
+       case MDP_RGB_565:
+               /* 888 = 3bytes
+                * RGB = 3Components
+                * RGB interleaved
+                */
+               ppp_src_cfg_reg = PPP_SRC_C2R_5BITS | PPP_SRC_C0G_6BITS |
+                       PPP_SRC_C1B_5BITS | PPP_SRC_BPP_INTERLVD_2BYTES |
+                       PPP_SRC_INTERLVD_3COMPONENTS | PPP_SRC_UNPACK_TIGHT |
+                       PPP_SRC_UNPACK_ALIGN_LSB |
+                       PPP_SRC_FETCH_PLANES_INTERLVD;
+
+               if (iBuf->ibuf_type == MDP_RGB_565)
+                       unpack_pattern =
+                           MDP_GET_PACK_PATTERN(0, CLR_R, CLR_G, CLR_B, 8);
+               else
+                       unpack_pattern =
+                           MDP_GET_PACK_PATTERN(0, CLR_B, CLR_G, CLR_R, 8);
+               break;
+
+       case MDP_RGB_888:
+               /*
+                * 888 = 3bytes
+                * RGB = 3Components
+                * RGB interleaved
+                */
+               ppp_src_cfg_reg = PPP_SRC_C2R_8BITS | PPP_SRC_C0G_8BITS |
+               PPP_SRC_C1B_8BITS | PPP_SRC_BPP_INTERLVD_3BYTES |
+               PPP_SRC_INTERLVD_3COMPONENTS | PPP_SRC_UNPACK_TIGHT |
+               PPP_SRC_UNPACK_ALIGN_LSB | PPP_SRC_FETCH_PLANES_INTERLVD;
+
+               unpack_pattern =
+                   MDP_GET_PACK_PATTERN(0, CLR_R, CLR_G, CLR_B, 8);
+               break;
+
+       case MDP_BGRA_8888:
+       case MDP_RGBA_8888:
+       case MDP_ARGB_8888:
+       case MDP_XRGB_8888:
+               /*
+                * 8888 = 4bytes
+                * ARGB = 4Components
+                * ARGB interleaved
+                */
+               ppp_src_cfg_reg = PPP_SRC_C2R_8BITS | PPP_SRC_C0G_8BITS |
+               PPP_SRC_C1B_8BITS | PPP_SRC_C3A_8BITS | PPP_SRC_C3_ALPHA_EN |
+               PPP_SRC_BPP_INTERLVD_4BYTES | PPP_SRC_INTERLVD_4COMPONENTS |
+               PPP_SRC_UNPACK_TIGHT | PPP_SRC_UNPACK_ALIGN_LSB |
+               PPP_SRC_FETCH_PLANES_INTERLVD;
+
+               if (iBuf->ibuf_type == MDP_BGRA_8888)
+                       unpack_pattern =
+                           MDP_GET_PACK_PATTERN(CLR_ALPHA, CLR_R, CLR_G, CLR_B,
+                                                8);
+               else if (iBuf->ibuf_type == MDP_RGBA_8888)
+                       unpack_pattern =
+                           MDP_GET_PACK_PATTERN(CLR_ALPHA, CLR_B, CLR_G, CLR_R,
+                                                8);
+               else
+                       unpack_pattern =
+                           MDP_GET_PACK_PATTERN(CLR_ALPHA, CLR_R, CLR_G, CLR_B,
+                                                8);
+               break;
+
+       case MDP_Y_CBCR_H2V2:
+       case MDP_Y_CRCB_H2V2:
+               ppp_src_cfg_reg = PPP_SRC_C2R_8BITS |
+                   PPP_SRC_C0G_8BITS |
+                   PPP_SRC_C1B_8BITS |
+                   PPP_SRC_C3A_8BITS |
+                   PPP_SRC_BPP_INTERLVD_2BYTES |
+                   PPP_SRC_INTERLVD_2COMPONENTS |
+                   PPP_SRC_UNPACK_TIGHT |
+                   PPP_SRC_UNPACK_ALIGN_LSB | PPP_SRC_FETCH_PLANES_PSEUDOPLNR;
+
+               if (iBuf->ibuf_type == MDP_Y_CBCR_H2V1)
+                       unpack_pattern =
+                           MDP_GET_PACK_PATTERN(0, 0, CLR_CB, CLR_CR, 8);
+               else
+                       unpack_pattern =
+                           MDP_GET_PACK_PATTERN(0, 0, CLR_CR, CLR_CB, 8);
+               v_slice = h_slice = 2;
+               break;
+
+       case MDP_YCRYCB_H2V1:
+               ppp_src_cfg_reg = PPP_SRC_C2R_8BITS |
+                   PPP_SRC_C0G_8BITS |
+                   PPP_SRC_C1B_8BITS |
+                   PPP_SRC_C3A_8BITS |
+                   PPP_SRC_BPP_INTERLVD_2BYTES |
+                   PPP_SRC_INTERLVD_4COMPONENTS |
+                   PPP_SRC_UNPACK_TIGHT | PPP_SRC_UNPACK_ALIGN_LSB;
+
+               unpack_pattern =
+                   MDP_GET_PACK_PATTERN(CLR_Y, CLR_CR, CLR_Y, CLR_CB, 8);
+               h_slice = 2;
+               break;
+
+       case MDP_Y_CBCR_H2V1:
+       case MDP_Y_CRCB_H2V1:
+               ppp_src_cfg_reg = PPP_SRC_C2R_8BITS |
+                   PPP_SRC_C0G_8BITS |
+                   PPP_SRC_C1B_8BITS |
+                   PPP_SRC_C3A_8BITS |
+                   PPP_SRC_BPP_INTERLVD_2BYTES |
+                   PPP_SRC_INTERLVD_2COMPONENTS |
+                   PPP_SRC_UNPACK_TIGHT |
+                   PPP_SRC_UNPACK_ALIGN_LSB | PPP_SRC_FETCH_PLANES_PSEUDOPLNR;
+
+               if (iBuf->ibuf_type == MDP_Y_CBCR_H2V1)
+                       unpack_pattern =
+                           MDP_GET_PACK_PATTERN(0, 0, CLR_CB, CLR_CR, 8);
+               else
+                       unpack_pattern =
+                           MDP_GET_PACK_PATTERN(0, 0, CLR_CR, CLR_CB, 8);
+               h_slice = 2;
+               break;
+
+       default:
+               return;
+       }
+
+       /* starting input address adjustment */
+       mdp_adjust_start_addr(&bg0_addr, &bg1_addr, v_slice, h_slice,
+                             iBuf->roi.lcd_x, iBuf->roi.lcd_y,
+                             iBuf->ibuf_width, iBuf->ibuf_height, iBuf->bpp,
+                             iBuf, 1);
+
+       /*
+        * 0x01c0: background plane 0 addr
+        * 0x01c4: background plane 1 addr
+        * 0x01c8: background plane 2 addr
+        * 0x01cc: bg y stride for plane 0 and 1
+        * 0x01d0: bg y stride for plane 2
+        * 0x01d4: bg src PPP config
+        * 0x01d8: unpack pattern
+        */
+       MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x01c0, bg0_addr);
+       MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x01c4, bg1_addr);
+
+       MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x01cc,
+                (bg1_ystride << 16) | bg0_ystride);
+       MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x01d4, ppp_src_cfg_reg);
+
+       MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x01d8, unpack_pattern);
+}
+
+#define IS_PSEUDOPLNR(img) ((img == MDP_Y_CRCB_H2V2) | \
+                               (img == MDP_Y_CBCR_H2V2) | \
+                               (img == MDP_Y_CRCB_H2V1) | \
+                               (img == MDP_Y_CBCR_H2V1))
+
+#define IMG_LEN(rect_h, w, rect_w, bpp) (((rect_h) * w) * bpp)
+
+#define Y_TO_CRCB_RATIO(format) \
+       ((format == MDP_Y_CBCR_H2V2 || format == MDP_Y_CRCB_H2V2) ?  2 :\
+       (format == MDP_Y_CBCR_H2V1 || format == MDP_Y_CRCB_H2V1) ?  1 : 1)
+
+static void get_len(struct mdp_img *img, struct mdp_rect *rect, uint32_t bpp,
+                       uint32_t *len0, uint32_t *len1)
+{
+       *len0 = IMG_LEN(rect->h, img->width, rect->w, bpp);
+       if (IS_PSEUDOPLNR(img->format))
+               *len1 = *len0/Y_TO_CRCB_RATIO(img->format);
+       else
+               *len1 = 0;
+}
+
+static void flush_imgs(struct mdp_blit_req *req, int src_bpp, int dst_bpp,
+                       struct file *p_src_file, struct file *p_dst_file)
+{
+#ifdef CONFIG_ANDROID_PMEM
+       uint32_t src0_len, src1_len, dst0_len, dst1_len;
+
+       /* flush src images to memory before dma to mdp */
+       get_len(&req->src, &req->src_rect, src_bpp,
+       &src0_len, &src1_len);
+
+       flush_pmem_file(p_src_file,
+       req->src.offset, src0_len);
+
+       if (IS_PSEUDOPLNR(req->src.format))
+               flush_pmem_file(p_src_file,
+                       req->src.offset + src0_len, src1_len);
+
+       get_len(&req->dst, &req->dst_rect, dst_bpp, &dst0_len, &dst1_len);
+       flush_pmem_file(p_dst_file, req->dst.offset, dst0_len);
+
+       if (IS_PSEUDOPLNR(req->dst.format))
+               flush_pmem_file(p_dst_file,
+                       req->dst.offset + dst0_len, dst1_len);
+#endif
+}
+
+static void mdp_start_ppp(struct msm_fb_data_type *mfd, MDPIBUF *iBuf,
+struct mdp_blit_req *req, struct file *p_src_file, struct file *p_dst_file)
+{
+       uint8 *src0, *src1;
+       uint8 *dest0, *dest1;
+       uint16 inpBpp;
+       uint32 dest0_ystride;
+       uint32 src_width;
+       uint32 src_height;
+       uint32 src0_ystride;
+       uint32 dst_roi_width;
+       uint32 dst_roi_height;
+       uint32 ppp_src_cfg_reg, ppp_operation_reg, ppp_dst_cfg_reg;
+       uint32 alpha, tpVal;
+       uint32 packPattern;
+       uint32 dst_packPattern;
+       boolean inputRGB, outputRGB, pseudoplanr_output;
+       int sv_slice, sh_slice;
+       int dv_slice, dh_slice;
+       boolean perPixelAlpha = FALSE;
+       boolean ppp_lookUp_enable = FALSE;
+
+       sv_slice = sh_slice = dv_slice = dh_slice = 1;
+       alpha = tpVal = 0;
+       src_width = iBuf->mdpImg.width;
+       src_height = iBuf->roi.y + iBuf->roi.height;
+       src1 = NULL;
+       dest1 = NULL;
+
+       inputRGB = outputRGB = TRUE;
+       pseudoplanr_output = FALSE;
+       ppp_operation_reg = 0;
+       ppp_dst_cfg_reg = 0;
+       ppp_src_cfg_reg = 0;
+
+       /* Wait for the pipe to clear */
+       do { } while (mdp_ppp_pipe_wait() <= 0);
+
+       /*
+        * destination config
+        */
+       switch (iBuf->ibuf_type) {
+       case MDP_RGB_888:
+               dst_packPattern =
+                   MDP_GET_PACK_PATTERN(0, CLR_R, CLR_G, CLR_B, 8);
+               ppp_dst_cfg_reg =
+                   PPP_DST_C0G_8BIT | PPP_DST_C1B_8BIT | PPP_DST_C2R_8BIT |
+                   PPP_DST_PACKET_CNT_INTERLVD_3ELEM | PPP_DST_PACK_TIGHT |
+                   PPP_DST_PACK_ALIGN_LSB | PPP_DST_OUT_SEL_AXI |
+                   PPP_DST_BPP_3BYTES | PPP_DST_PLANE_INTERLVD;
+               break;
+
+       case MDP_XRGB_8888:
+       case MDP_ARGB_8888:
+       case MDP_RGBA_8888:
+               if (iBuf->ibuf_type == MDP_BGRA_8888)
+                       dst_packPattern =
+                           MDP_GET_PACK_PATTERN(CLR_ALPHA, CLR_R, CLR_G, CLR_B,
+                                                8);
+               else if (iBuf->ibuf_type == MDP_RGBA_8888)
+                       dst_packPattern =
+                           MDP_GET_PACK_PATTERN(CLR_ALPHA, CLR_B, CLR_G, CLR_R,
+                                                8);
+               else
+                       dst_packPattern =
+                           MDP_GET_PACK_PATTERN(CLR_ALPHA, CLR_R, CLR_G, CLR_B,
+                                                8);
+
+               ppp_dst_cfg_reg = PPP_DST_C0G_8BIT |
+                   PPP_DST_C1B_8BIT |
+                   PPP_DST_C2R_8BIT |
+                   PPP_DST_C3A_8BIT |
+                   PPP_DST_C3ALPHA_EN |
+                   PPP_DST_PACKET_CNT_INTERLVD_4ELEM |
+                   PPP_DST_PACK_TIGHT |
+                   PPP_DST_PACK_ALIGN_LSB |
+                   PPP_DST_OUT_SEL_AXI |
+                   PPP_DST_BPP_4BYTES | PPP_DST_PLANE_INTERLVD;
+               break;
+
+       case MDP_Y_CBCR_H2V2:
+       case MDP_Y_CRCB_H2V2:
+               if (iBuf->ibuf_type == MDP_Y_CBCR_H2V2)
+                       dst_packPattern =
+                           MDP_GET_PACK_PATTERN(0, 0, CLR_CB, CLR_CR, 8);
+               else
+                       dst_packPattern =
+                           MDP_GET_PACK_PATTERN(0, 0, CLR_CR, CLR_CB, 8);
+
+               ppp_dst_cfg_reg = PPP_DST_C2R_8BIT |
+                   PPP_DST_C0G_8BIT |
+                   PPP_DST_C1B_8BIT |
+                   PPP_DST_C3A_8BIT |
+                   PPP_DST_PACKET_CNT_INTERLVD_2ELEM |
+                   PPP_DST_PACK_TIGHT |
+                   PPP_DST_PACK_ALIGN_LSB |
+                   PPP_DST_OUT_SEL_AXI | PPP_DST_BPP_2BYTES;
+
+               ppp_operation_reg |= PPP_OP_DST_CHROMA_420;
+               outputRGB = FALSE;
+               pseudoplanr_output = TRUE;
+               /*
+                * vertically (y direction) and horizontally (x direction)
+                * sample reduction by 2
+                */
+
+               /*
+                * H2V2(YUV420) Cosite
+                *
+                * Y    Y    Y    Y
+                * CbCr      CbCr
+                * Y    Y    Y    Y
+                * Y    Y    Y    Y
+                * CbCr      CbCr
+                * Y    Y    Y    Y
+                */
+               dv_slice = dh_slice = 2;
+
+               /* (x,y) and (width,height) must be even numbern */
+               iBuf->roi.lcd_x = (iBuf->roi.lcd_x / 2) * 2;
+               iBuf->roi.dst_width = (iBuf->roi.dst_width / 2) * 2;
+               iBuf->roi.x = (iBuf->roi.x / 2) * 2;
+               iBuf->roi.width = (iBuf->roi.width / 2) * 2;
+
+               iBuf->roi.lcd_y = (iBuf->roi.lcd_y / 2) * 2;
+               iBuf->roi.dst_height = (iBuf->roi.dst_height / 2) * 2;
+               iBuf->roi.y = (iBuf->roi.y / 2) * 2;
+               iBuf->roi.height = (iBuf->roi.height / 2) * 2;
+               break;
+
+       case MDP_YCRYCB_H2V1:
+               dst_packPattern =
+                   MDP_GET_PACK_PATTERN(CLR_Y, CLR_CR, CLR_Y, CLR_CB, 8);
+               ppp_dst_cfg_reg =
+                   PPP_DST_C2R_8BIT | PPP_DST_C0G_8BIT | PPP_DST_C1B_8BIT |
+                   PPP_DST_C3A_8BIT | PPP_DST_PACKET_CNT_INTERLVD_4ELEM |
+                   PPP_DST_PACK_TIGHT | PPP_DST_PACK_ALIGN_LSB |
+                   PPP_DST_OUT_SEL_AXI | PPP_DST_BPP_2BYTES |
+                   PPP_DST_PLANE_INTERLVD;
+
+               ppp_operation_reg |= PPP_OP_DST_CHROMA_H2V1;
+               outputRGB = FALSE;
+               /*
+                * horizontally (x direction) sample reduction by 2
+                *
+                * H2V1(YUV422) Cosite
+                *
+                * YCbCr    Y    YCbCr    Y
+                * YCbCr    Y    YCbCr    Y
+                * YCbCr    Y    YCbCr    Y
+                * YCbCr    Y    YCbCr    Y
+                */
+               dh_slice = 2;
+
+               /*
+                * if it's TV-Out/MDP_YCRYCB_H2V1, let's go through the
+                * preloaded gamma setting of 2.2 when the content is
+                * non-linear ppp_lookUp_enable = TRUE;
+                */
+
+               /* x and width must be even number */
+               iBuf->roi.lcd_x = (iBuf->roi.lcd_x / 2) * 2;
+               iBuf->roi.dst_width = (iBuf->roi.dst_width / 2) * 2;
+               iBuf->roi.x = (iBuf->roi.x / 2) * 2;
+               iBuf->roi.width = (iBuf->roi.width / 2) * 2;
+               break;
+
+       case MDP_Y_CBCR_H2V1:
+       case MDP_Y_CRCB_H2V1:
+               if (iBuf->ibuf_type == MDP_Y_CBCR_H2V1)
+                       dst_packPattern =
+                           MDP_GET_PACK_PATTERN(0, 0, CLR_CB, CLR_CR, 8);
+               else
+                       dst_packPattern =
+                           MDP_GET_PACK_PATTERN(0, 0, CLR_CR, CLR_CB, 8);
+
+               ppp_dst_cfg_reg = PPP_DST_C2R_8BIT |
+                   PPP_DST_C0G_8BIT |
+                   PPP_DST_C1B_8BIT |
+                   PPP_DST_C3A_8BIT |
+                   PPP_DST_PACKET_CNT_INTERLVD_2ELEM |
+                   PPP_DST_PACK_TIGHT |
+                   PPP_DST_PACK_ALIGN_LSB |
+                   PPP_DST_OUT_SEL_AXI | PPP_DST_BPP_2BYTES;
+
+               ppp_operation_reg |= PPP_OP_DST_CHROMA_H2V1;
+               outputRGB = FALSE;
+               pseudoplanr_output = TRUE;
+               /* horizontally (x direction) sample reduction by 2 */
+               dh_slice = 2;
+
+               /* x and width must be even number */
+               iBuf->roi.lcd_x = (iBuf->roi.lcd_x / 2) * 2;
+               iBuf->roi.dst_width = (iBuf->roi.dst_width / 2) * 2;
+               iBuf->roi.x = (iBuf->roi.x / 2) * 2;
+               iBuf->roi.width = (iBuf->roi.width / 2) * 2;
+               break;
+
+       case MDP_BGR_565:
+       case MDP_RGB_565:
+       default:
+               if (iBuf->ibuf_type == MDP_RGB_565)
+                       dst_packPattern =
+                           MDP_GET_PACK_PATTERN(0, CLR_R, CLR_G, CLR_B, 8);
+               else
+                       dst_packPattern =
+                           MDP_GET_PACK_PATTERN(0, CLR_B, CLR_G, CLR_R, 8);
+
+               ppp_dst_cfg_reg = PPP_DST_C0G_6BIT |
+                   PPP_DST_C1B_5BIT |
+                   PPP_DST_C2R_5BIT |
+                   PPP_DST_PACKET_CNT_INTERLVD_3ELEM |
+                   PPP_DST_PACK_TIGHT |
+                   PPP_DST_PACK_ALIGN_LSB |
+                   PPP_DST_OUT_SEL_AXI |
+                   PPP_DST_BPP_2BYTES | PPP_DST_PLANE_INTERLVD;
+               break;
+       }
+
+       /* source config */
+       switch (iBuf->mdpImg.imgType) {
+       case MDP_RGB_888:
+               inpBpp = 3;
+               /*
+                * 565 = 2bytes
+                * RGB = 3Components
+                * RGB interleaved
+                */
+               ppp_src_cfg_reg = PPP_SRC_C2R_8BITS | PPP_SRC_C0G_8BITS |
+                       PPP_SRC_C1B_8BITS | PPP_SRC_BPP_INTERLVD_3BYTES |
+                       PPP_SRC_INTERLVD_3COMPONENTS | PPP_SRC_UNPACK_TIGHT |
+                       PPP_SRC_UNPACK_ALIGN_LSB |
+                       PPP_SRC_FETCH_PLANES_INTERLVD;
+
+               packPattern = MDP_GET_PACK_PATTERN(0, CLR_R, CLR_G, CLR_B, 8);
+
+               ppp_operation_reg |= PPP_OP_COLOR_SPACE_RGB |
+                   PPP_OP_SRC_CHROMA_RGB | PPP_OP_DST_CHROMA_RGB;
+               break;
+
+       case MDP_BGRA_8888:
+       case MDP_RGBA_8888:
+       case MDP_ARGB_8888:
+               perPixelAlpha = TRUE;
+       case MDP_XRGB_8888:
+               inpBpp = 4;
+               /*
+                * 8888 = 4bytes
+                * ARGB = 4Components
+                * ARGB interleaved
+                */
+               ppp_src_cfg_reg = PPP_SRC_C2R_8BITS | PPP_SRC_C0G_8BITS |
+                       PPP_SRC_C1B_8BITS | PPP_SRC_C3A_8BITS |
+                       PPP_SRC_C3_ALPHA_EN | PPP_SRC_BPP_INTERLVD_4BYTES |
+                       PPP_SRC_INTERLVD_4COMPONENTS | PPP_SRC_UNPACK_TIGHT |
+                       PPP_SRC_UNPACK_ALIGN_LSB |
+                       PPP_SRC_FETCH_PLANES_INTERLVD;
+
+               if (iBuf->mdpImg.imgType == MDP_BGRA_8888)
+                       packPattern =
+                           MDP_GET_PACK_PATTERN(CLR_ALPHA, CLR_R, CLR_G, CLR_B,
+                                                8);
+               else if (iBuf->mdpImg.imgType == MDP_RGBA_8888)
+                       packPattern =
+                           MDP_GET_PACK_PATTERN(CLR_ALPHA, CLR_B, CLR_G, CLR_R,
+                                                8);
+               else
+                       packPattern =
+                           MDP_GET_PACK_PATTERN(CLR_ALPHA, CLR_R, CLR_G, CLR_B,
+                                                8);
+
+               ppp_operation_reg |= PPP_OP_COLOR_SPACE_RGB |
+                   PPP_OP_SRC_CHROMA_RGB | PPP_OP_DST_CHROMA_RGB;
+               break;
+
+       case MDP_Y_CBCR_H2V2:
+       case MDP_Y_CRCB_H2V2:
+               inpBpp = 1;
+               src1 = (uint8 *) iBuf->mdpImg.cbcr_addr;
+
+               /*
+                * CbCr = 2bytes
+                * CbCr = 2Components
+                * Y+CbCr
+                */
+               ppp_src_cfg_reg = PPP_SRC_C2R_8BITS | PPP_SRC_C0G_8BITS |
+                       PPP_SRC_C1B_8BITS | PPP_SRC_BPP_INTERLVD_2BYTES |
+                       PPP_SRC_INTERLVD_2COMPONENTS | PPP_SRC_UNPACK_TIGHT |
+                       PPP_SRC_UNPACK_ALIGN_LSB |
+                       PPP_SRC_FETCH_PLANES_PSEUDOPLNR;
+
+               if (iBuf->mdpImg.imgType == MDP_Y_CRCB_H2V2)
+                       packPattern =
+                           MDP_GET_PACK_PATTERN(0, 0, CLR_CR, CLR_CB, 8);
+               else
+                       packPattern =
+                           MDP_GET_PACK_PATTERN(0, 0, CLR_CB, CLR_CR, 8);
+
+               ppp_operation_reg |= PPP_OP_COLOR_SPACE_YCBCR |
+                   PPP_OP_SRC_CHROMA_420 |
+                   PPP_OP_SRC_CHROMA_COSITE |
+                   PPP_OP_DST_CHROMA_RGB | PPP_OP_DST_CHROMA_COSITE;
+
+               inputRGB = FALSE;
+               sh_slice = sv_slice = 2;
+               break;
+
+       case MDP_YCRYCB_H2V1:
+               inpBpp = 2;
+               ppp_src_cfg_reg = PPP_SRC_C2R_8BITS |
+                   PPP_SRC_C0G_8BITS |
+                   PPP_SRC_C1B_8BITS |
+                   PPP_SRC_C3A_8BITS |
+                   PPP_SRC_BPP_INTERLVD_2BYTES |
+                   PPP_SRC_INTERLVD_4COMPONENTS |
+                   PPP_SRC_UNPACK_TIGHT | PPP_SRC_UNPACK_ALIGN_LSB;
+
+               packPattern =
+                   MDP_GET_PACK_PATTERN(CLR_Y, CLR_CR, CLR_Y, CLR_CB, 8);
+
+               ppp_operation_reg |= PPP_OP_SRC_CHROMA_H2V1 |
+                   PPP_OP_SRC_CHROMA_COSITE | PPP_OP_DST_CHROMA_COSITE;
+
+               /*
+                * if it's TV-Out/MDP_YCRYCB_H2V1, let's go through the
+                * preloaded inverse gamma setting of 2.2 since they're
+                * symetric when the content is non-linear
+                * ppp_lookUp_enable = TRUE;
+                */
+
+               /* x and width must be even number */
+               iBuf->roi.lcd_x = (iBuf->roi.lcd_x / 2) * 2;
+               iBuf->roi.dst_width = (iBuf->roi.dst_width / 2) * 2;
+               iBuf->roi.x = (iBuf->roi.x / 2) * 2;
+               iBuf->roi.width = (iBuf->roi.width / 2) * 2;
+
+               inputRGB = FALSE;
+               sh_slice = 2;
+               break;
+
+       case MDP_Y_CBCR_H2V1:
+       case MDP_Y_CRCB_H2V1:
+               inpBpp = 1;
+               src1 = (uint8 *) iBuf->mdpImg.cbcr_addr;
+
+               ppp_src_cfg_reg = PPP_SRC_C2R_8BITS |
+                   PPP_SRC_C0G_8BITS |
+                   PPP_SRC_C1B_8BITS |
+                   PPP_SRC_C3A_8BITS |
+                   PPP_SRC_BPP_INTERLVD_2BYTES |
+                   PPP_SRC_INTERLVD_2COMPONENTS |
+                   PPP_SRC_UNPACK_TIGHT |
+                   PPP_SRC_UNPACK_ALIGN_LSB | PPP_SRC_FETCH_PLANES_PSEUDOPLNR;
+
+               if (iBuf->mdpImg.imgType == MDP_Y_CBCR_H2V1)
+                       packPattern =
+                           MDP_GET_PACK_PATTERN(0, 0, CLR_CB, CLR_CR, 8);
+               else
+                       packPattern =
+                           MDP_GET_PACK_PATTERN(0, 0, CLR_CR, CLR_CB, 8);
+
+               ppp_operation_reg |= PPP_OP_SRC_CHROMA_H2V1 |
+                   PPP_OP_SRC_CHROMA_COSITE | PPP_OP_DST_CHROMA_COSITE;
+               inputRGB = FALSE;
+               sh_slice = 2;
+               break;
+
+       case MDP_BGR_565:
+       case MDP_RGB_565:
+       default:
+               inpBpp = 2;
+               /*
+                * 565 = 2bytes
+                * RGB = 3Components
+                * RGB interleaved
+                */
+               ppp_src_cfg_reg = PPP_SRC_C2R_5BITS | PPP_SRC_C0G_6BITS |
+                       PPP_SRC_C1B_5BITS | PPP_SRC_BPP_INTERLVD_2BYTES |
+                       PPP_SRC_INTERLVD_3COMPONENTS | PPP_SRC_UNPACK_TIGHT |
+                       PPP_SRC_UNPACK_ALIGN_LSB |
+                       PPP_SRC_FETCH_PLANES_INTERLVD;
+
+               if (iBuf->mdpImg.imgType == MDP_RGB_565)
+                       packPattern =
+                           MDP_GET_PACK_PATTERN(0, CLR_R, CLR_G, CLR_B, 8);
+               else
+                       packPattern =
+                           MDP_GET_PACK_PATTERN(0, CLR_B, CLR_G, CLR_R, 8);
+
+               ppp_operation_reg |= PPP_OP_COLOR_SPACE_RGB |
+                   PPP_OP_SRC_CHROMA_RGB | PPP_OP_DST_CHROMA_RGB;
+               break;
+
+       }
+
+       if (pseudoplanr_output)
+               ppp_dst_cfg_reg |= PPP_DST_PLANE_PSEUDOPLN;
+
+       /* YCbCr to RGB color conversion flag */
+       if ((!inputRGB) && (outputRGB)) {
+               ppp_operation_reg |= PPP_OP_CONVERT_YCBCR2RGB |
+                   PPP_OP_CONVERT_ON;
+
+               /*
+                * primary/secondary is sort of misleading term...but
+                * in mdp2.2/3.0 we only use primary matrix (forward/rev)
+                * in mdp3.1 we use set1(prim) and set2(secd)
+                */
+#ifdef CONFIG_FB_MSM_MDP31
+               ppp_operation_reg |= PPP_OP_CONVERT_MATRIX_SECONDARY |
+                                       PPP_OP_DST_RGB;
+               MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x0240, 0);
+#endif
+
+               if (ppp_lookUp_enable) {
+                       ppp_operation_reg |= PPP_OP_LUT_C0_ON |
+                           PPP_OP_LUT_C1_ON | PPP_OP_LUT_C2_ON;
+               }
+       }
+       /* RGB to YCbCr color conversion flag */
+       if ((inputRGB) && (!outputRGB)) {
+               ppp_operation_reg |= PPP_OP_CONVERT_RGB2YCBCR |
+                   PPP_OP_CONVERT_ON;
+
+#ifdef CONFIG_FB_MSM_MDP31
+               ppp_operation_reg |= PPP_OP_CONVERT_MATRIX_PRIMARY |
+                                       PPP_OP_DST_YCBCR;
+               MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x0240, 0x1e);
+#endif
+
+               if (ppp_lookUp_enable) {
+                       ppp_operation_reg |= PPP_OP_LUT_C0_ON |
+                           PPP_OP_LUT_C1_ON | PPP_OP_LUT_C2_ON;
+               }
+       }
+       /* YCbCr to YCbCr color conversion flag */
+       if ((!inputRGB) && (!outputRGB)) {
+               if ((ppp_lookUp_enable) &&
+                   (iBuf->mdpImg.imgType != iBuf->ibuf_type)) {
+                       ppp_operation_reg |= PPP_OP_LUT_C0_ON;
+               }
+       }
+
+       ppp_src_cfg_reg |= (iBuf->roi.x % 2) ? PPP_SRC_BPP_ROI_ODD_X : 0;
+       ppp_src_cfg_reg |= (iBuf->roi.y % 2) ? PPP_SRC_BPP_ROI_ODD_Y : 0;
+
+       if (req->flags & MDP_DEINTERLACE)
+               ppp_operation_reg |= PPP_OP_DEINT_EN;
+
+       /* Dither at DMA side only since iBuf format is RGB888 */
+       if (iBuf->mdpImg.mdpOp & MDPOP_DITHER)
+               ppp_operation_reg |= PPP_OP_DITHER_EN;
+
+       if (iBuf->mdpImg.mdpOp & MDPOP_ROTATION) {
+               ppp_operation_reg |= PPP_OP_ROT_ON;
+
+               if (iBuf->mdpImg.mdpOp & MDPOP_ROT90) {
+                       ppp_operation_reg |= PPP_OP_ROT_90;
+               }
+               if (iBuf->mdpImg.mdpOp & MDPOP_LR) {
+                       ppp_operation_reg |= PPP_OP_FLIP_LR;
+               }
+               if (iBuf->mdpImg.mdpOp & MDPOP_UD) {
+                       ppp_operation_reg |= PPP_OP_FLIP_UD;
+               }
+       }
+
+       src0_ystride = src_width * inpBpp;
+       dest0_ystride = iBuf->ibuf_width * iBuf->bpp;
+
+       /* no need to care about rotation since it's the real-XY. */
+       dst_roi_width = iBuf->roi.dst_width;
+       dst_roi_height = iBuf->roi.dst_height;
+
+       src0 = (uint8 *) iBuf->mdpImg.bmy_addr;
+       dest0 = (uint8 *) iBuf->buf;
+
+       /* Jumping from Y-Plane to Chroma Plane */
+       dest1 = mdp_get_chroma_addr(iBuf);
+
+       /* first pixel addr calculation */
+       mdp_adjust_start_addr(&src0, &src1, sv_slice, sh_slice, iBuf->roi.x,
+                             iBuf->roi.y, src_width, src_height, inpBpp, iBuf,
+                             0);
+       mdp_adjust_start_addr(&dest0, &dest1, dv_slice, dh_slice,
+                             iBuf->roi.lcd_x, iBuf->roi.lcd_y,
+                             iBuf->ibuf_width, iBuf->ibuf_height, iBuf->bpp,
+                             iBuf, 2);
+
+       /* set scale operation */
+       mdp_set_scale(iBuf, dst_roi_width, dst_roi_height,
+                     inputRGB, outputRGB, &ppp_operation_reg);
+
+       /*
+        * setting background source for blending
+        */
+       mdp_set_blend_attr(iBuf, &alpha, &tpVal, perPixelAlpha,
+                          &ppp_operation_reg);
+
+       if (ppp_operation_reg & PPP_OP_BLEND_ON) {
+               mdp_ppp_setbg(iBuf);
+
+               if (iBuf->ibuf_type == MDP_YCRYCB_H2V1) {
+                       ppp_operation_reg |= PPP_OP_BG_CHROMA_H2V1;
+
+                       if (iBuf->mdpImg.mdpOp & MDPOP_TRANSP) {
+                               tpVal = mdp_conv_matx_rgb2yuv(tpVal,
+                                                     (uint16 *) &
+                                                     mdp_ccs_rgb2yuv,
+                                                     &mdp_plv[0], NULL);
+                       }
+               }
+       }
+
+       /*
+        * 0x0004: enable dbg bus
+        * 0x0100: "don't care" Edge Condit until scaling is on
+        * 0x0104: xrc tile x&y size u7.6 format = 7bit.6bit
+        * 0x0108: src pixel size
+        * 0x010c: component plane 0 starting address
+        * 0x011c: component plane 0 ystride
+        * 0x0124: PPP source config register
+        * 0x0128: unpacked pattern from lsb to msb (eg. RGB->BGR)
+        */
+       MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x0108, (iBuf->roi.height << 16 |
+                                                     iBuf->roi.width));
+       MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x010c, src0); /* comp.plane 0 */
+       MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x0110, src1); /* comp.plane 1 */
+       MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x011c,
+                (src0_ystride << 16 | src0_ystride));
+
+       /* setup for rgb 565 */
+       MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x0124, ppp_src_cfg_reg);
+       MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x0128, packPattern);
+       /*
+        * 0x0138: PPP destination operation register
+        * 0x014c: constant_alpha|transparent_color
+        * 0x0150: PPP destination config register
+        * 0x0154: PPP packing pattern
+        */
+       MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x0138, ppp_operation_reg);
+       MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x014c, alpha << 24 | tpVal);
+       MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x0150, ppp_dst_cfg_reg);
+       MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x0154, dst_packPattern);
+
+       /*
+        * 0x0164: ROI height and width
+        * 0x0168: Component Plane 0 starting addr
+        * 0x016c: Component Plane 1 starting addr
+        * 0x0178: Component Plane 1/0 y stride
+        */
+       MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x0164,
+                (dst_roi_height << 16 | dst_roi_width));
+       MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x0168, dest0);
+       MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x016c, dest1);
+       MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x0178,
+                (dest0_ystride << 16 | dest0_ystride));
+
+       flush_imgs(req, inpBpp, iBuf->bpp, p_src_file, p_dst_file);
+#ifdef CONFIG_MDP_PPP_ASYNC_OP
+       mdp_ppp_process_curr_djob();
+#else
+       mdp_pipe_kickoff(MDP_PPP_TERM, mfd);
+#endif
+}
+
+static int mdp_ppp_verify_req(struct mdp_blit_req *req)
+{
+       u32 src_width, src_height, dst_width, dst_height;
+
+       if (req == NULL)
+               return -1;
+
+       if (MDP_IS_IMGTYPE_BAD(req->src.format) ||
+           MDP_IS_IMGTYPE_BAD(req->dst.format))
+               return -1;
+
+       if ((req->src.width == 0) || (req->src.height == 0) ||
+           (req->src_rect.w == 0) || (req->src_rect.h == 0) ||
+           (req->dst.width == 0) || (req->dst.height == 0) ||
+           (req->dst_rect.w == 0) || (req->dst_rect.h == 0))
+
+               return -1;
+
+       if (((req->src_rect.x + req->src_rect.w) > req->src.width) ||
+           ((req->src_rect.y + req->src_rect.h) > req->src.height))
+               return -1;
+
+       if (((req->dst_rect.x + req->dst_rect.w) > req->dst.width) ||
+           ((req->dst_rect.y + req->dst_rect.h) > req->dst.height))
+               return -1;
+
+       /*
+        * scaling range check
+        */
+       src_width = req->src_rect.w;
+       src_height = req->src_rect.h;
+
+       if (req->flags & MDP_ROT_90) {
+               dst_width = req->dst_rect.h;
+               dst_height = req->dst_rect.w;
+       } else {
+               dst_width = req->dst_rect.w;
+               dst_height = req->dst_rect.h;
+       }
+
+       switch (req->dst.format) {
+       case MDP_Y_CRCB_H2V2:
+       case MDP_Y_CBCR_H2V2:
+               src_width = (src_width / 2) * 2;
+               src_height = (src_height / 2) * 2;
+               dst_width = (src_width / 2) * 2;
+               dst_height = (src_height / 2) * 2;
+               break;
+
+       case MDP_Y_CRCB_H2V1:
+       case MDP_Y_CBCR_H2V1:
+       case MDP_YCRYCB_H2V1:
+               src_width = (src_width / 2) * 2;
+               dst_width = (src_width / 2) * 2;
+               break;
+
+       default:
+               break;
+       }
+
+       if (((MDP_SCALE_Q_FACTOR * dst_width) / src_width >
+            MDP_MAX_X_SCALE_FACTOR)
+           || ((MDP_SCALE_Q_FACTOR * dst_width) / src_width <
+               MDP_MIN_X_SCALE_FACTOR))
+               return -1;
+
+       if (((MDP_SCALE_Q_FACTOR * dst_height) / src_height >
+            MDP_MAX_Y_SCALE_FACTOR)
+           || ((MDP_SCALE_Q_FACTOR * dst_height) / src_height <
+               MDP_MIN_Y_SCALE_FACTOR))
+               return -1;
+
+       return 0;
+}
+
+/**
+ * get_gem_img() - retrieve drm obj's start address and size
+ * @img:       contains drm file descriptor and gem handle
+ * @start:     repository of starting address of drm obj allocated memory
+ * @len:       repository of size of drm obj alloacted memory
+ *
+ **/
+int get_gem_img(struct mdp_img *img, unsigned long *start, unsigned long *len)
+{
+       panic("waaaaaaaah");
+       //return kgsl_gem_obj_addr(img->memory_id, (int)img->priv, start, len);
+}
+
+int get_img(struct mdp_img *img, struct fb_info *info, unsigned long *start,
+           unsigned long *len, struct file **pp_file)
+{
+       int put_needed, ret = 0;
+       struct file *file;
+       unsigned long vstart;
+#ifdef CONFIG_ANDROID_PMEM
+       if (!get_pmem_file(img->memory_id, start, &vstart, len, pp_file))
+               return 0;
+#endif
+       file = fget_light(img->memory_id, &put_needed);
+       if (file == NULL)
+               return -1;
+
+       if (MAJOR(file->f_dentry->d_inode->i_rdev) == FB_MAJOR) {
+               *start = info->fix.smem_start;
+               *len = info->fix.smem_len;
+               *pp_file = file;
+       } else {
+               ret = -1;
+               fput_light(file, put_needed);
+       }
+       return ret;
+}
+
+int mdp_ppp_blit(struct fb_info *info, struct mdp_blit_req *req,
+       struct file **pp_src_file, struct file **pp_dst_file)
+{
+       unsigned long src_start, dst_start;
+       unsigned long src_len = 0;
+       unsigned long dst_len = 0;
+       MDPIBUF iBuf;
+       u32 dst_width, dst_height;
+       struct file *p_src_file = 0 , *p_dst_file = 0;
+       struct msm_fb_data_type *mfd = (struct msm_fb_data_type *)info->par;
+
+       if (req->dst.format == MDP_FB_FORMAT)
+               req->dst.format =  mfd->fb_imgType;
+       if (req->src.format == MDP_FB_FORMAT)
+               req->src.format = mfd->fb_imgType;
+
+       if (req->flags & MDP_BLIT_SRC_GEM) {
+               if (get_gem_img(&req->src, &src_start, &src_len) < 0)
+                       return -1;
+       } else {
+               get_img(&req->src, info, &src_start, &src_len, &p_src_file);
+       }
+       if (src_len == 0) {
+               printk(KERN_ERR "mdp_ppp: could not retrieve image from "
+                      "memory\n");
+               return -1;
+       }
+
+       if (req->flags & MDP_BLIT_DST_GEM) {
+               if (get_gem_img(&req->dst, &dst_start, &dst_len) < 0)
+                       return -1;
+       } else {
+               get_img(&req->dst, info, &dst_start, &dst_len, &p_dst_file);
+       }
+       if (dst_len == 0) {
+               printk(KERN_ERR "mdp_ppp: could not retrieve image from "
+                      "memory\n");
+               return -1;
+       }
+       *pp_src_file = p_src_file;
+       *pp_dst_file = p_dst_file;
+       if (mdp_ppp_verify_req(req)) {
+               printk(KERN_ERR "mdp_ppp: invalid image!\n");
+               return -1;
+       }
+
+       iBuf.ibuf_width = req->dst.width;
+       iBuf.ibuf_height = req->dst.height;
+       iBuf.bpp = bytes_per_pixel[req->dst.format];
+
+       iBuf.ibuf_type = req->dst.format;
+       iBuf.buf = (uint8 *) dst_start;
+       iBuf.buf += req->dst.offset;
+
+       iBuf.roi.lcd_x = req->dst_rect.x;
+       iBuf.roi.lcd_y = req->dst_rect.y;
+       iBuf.roi.dst_width = req->dst_rect.w;
+       iBuf.roi.dst_height = req->dst_rect.h;
+
+       iBuf.roi.x = req->src_rect.x;
+       iBuf.roi.width = req->src_rect.w;
+       iBuf.roi.y = req->src_rect.y;
+       iBuf.roi.height = req->src_rect.h;
+
+       iBuf.mdpImg.width = req->src.width;
+       iBuf.mdpImg.imgType = req->src.format;
+
+       iBuf.mdpImg.bmy_addr = (uint32 *) (src_start + req->src.offset);
+       iBuf.mdpImg.cbcr_addr =
+           (uint32 *) ((uint32) iBuf.mdpImg.bmy_addr +
+                       req->src.width * req->src.height);
+
+       iBuf.mdpImg.mdpOp = MDPOP_NOP;
+
+       /* blending check */
+       if (req->transp_mask != MDP_TRANSP_NOP) {
+               iBuf.mdpImg.mdpOp |= MDPOP_TRANSP;
+               iBuf.mdpImg.tpVal = req->transp_mask;
+               iBuf.mdpImg.tpVal = mdp_calc_tpval(&iBuf.mdpImg);
+       }
+
+       req->alpha &= 0xff;
+       if (req->alpha < MDP_ALPHA_NOP) {
+               iBuf.mdpImg.mdpOp |= MDPOP_ALPHAB;
+               iBuf.mdpImg.alpha = req->alpha;
+       }
+
+       /* rotation check */
+       if (req->flags & MDP_FLIP_LR)
+               iBuf.mdpImg.mdpOp |= MDPOP_LR;
+       if (req->flags & MDP_FLIP_UD)
+               iBuf.mdpImg.mdpOp |= MDPOP_UD;
+       if (req->flags & MDP_ROT_90)
+               iBuf.mdpImg.mdpOp |= MDPOP_ROT90;
+       if (req->flags & MDP_DITHER)
+               iBuf.mdpImg.mdpOp |= MDPOP_DITHER;
+
+       if (req->flags & MDP_BLEND_FG_PREMULT) {
+#ifdef CONFIG_FB_MSM_MDP31
+               iBuf.mdpImg.mdpOp |= MDPOP_FG_PM_ALPHA;
+#else
+               return -EINVAL;
+#endif
+       }
+
+       if (req->flags & MDP_DEINTERLACE) {
+#ifdef CONFIG_FB_MSM_MDP31
+               if ((req->src.format != MDP_Y_CBCR_H2V2) &&
+                       (req->src.format != MDP_Y_CRCB_H2V2))
+#endif
+               return -EINVAL;
+       }
+
+       /* scale check */
+       if (req->flags & MDP_ROT_90) {
+               dst_width = req->dst_rect.h;
+               dst_height = req->dst_rect.w;
+       } else {
+               dst_width = req->dst_rect.w;
+               dst_height = req->dst_rect.h;
+       }
+
+       if ((iBuf.roi.width != dst_width) || (iBuf.roi.height != dst_height))
+               iBuf.mdpImg.mdpOp |= MDPOP_ASCALE;
+
+       if (req->flags & MDP_BLUR) {
+#ifdef CONFIG_FB_MSM_MDP31
+               if (req->flags & MDP_SHARPENING)
+                       printk(KERN_WARNING
+                               "mdp: MDP_SHARPENING is set with MDP_BLUR!\n");
+               req->flags |= MDP_SHARPENING;
+               req->sharpening_strength = -127;
+#else
+               iBuf.mdpImg.mdpOp |= MDPOP_ASCALE | MDPOP_BLUR;
+
+#endif
+       }
+
+       if (req->flags & MDP_SHARPENING) {
+#ifdef CONFIG_FB_MSM_MDP31
+               if ((req->sharpening_strength > 127) ||
+                       (req->sharpening_strength < -127)) {
+                       printk(KERN_ERR
+                               "%s: sharpening strength out of range\n",
+                               __func__);
+                       return -EINVAL;
+               }
+
+               iBuf.mdpImg.mdpOp |= MDPOP_ASCALE | MDPOP_SHARPENING;
+               iBuf.mdpImg.sp_value = req->sharpening_strength & 0xff;
+#else
+               return -EINVAL;
+#endif
+       }
+
+       down(&mdp_ppp_mutex);
+       /* MDP cmd block enable */
+       mdp_pipe_ctrl(MDP_CMD_BLOCK, MDP_BLOCK_POWER_ON, FALSE);
+
+#ifdef CONFIG_FB_MSM_MDP31
+       mdp_start_ppp(mfd, &iBuf, req, p_src_file, p_dst_file);
+#else
+       /* bg tile fetching HW workaround */
+       if (((iBuf.mdpImg.mdpOp & (MDPOP_TRANSP | MDPOP_ALPHAB)) ||
+            (req->src.format == MDP_ARGB_8888) ||
+            (req->src.format == MDP_BGRA_8888) ||
+            (req->src.format == MDP_RGBA_8888)) &&
+           (iBuf.mdpImg.mdpOp & MDPOP_ROT90) && (req->dst_rect.w <= 16)) {
+               int dst_h, src_w, i;
+
+               src_w = req->src_rect.w;
+               dst_h = iBuf.roi.dst_height;
+
+               for (i = 0; i < (req->dst_rect.h / 16); i++) {
+                       /* this tile size */
+                       iBuf.roi.dst_height = 16;
+                       iBuf.roi.width =
+                           (16 * req->src_rect.w) / req->dst_rect.h;
+
+                       /* if it's out of scale range... */
+                       if (((MDP_SCALE_Q_FACTOR * iBuf.roi.dst_height) /
+                            iBuf.roi.width) > MDP_MAX_X_SCALE_FACTOR)
+                               iBuf.roi.width =
+                                   (MDP_SCALE_Q_FACTOR * iBuf.roi.dst_height) /
+                                   MDP_MAX_X_SCALE_FACTOR;
+                       else if (((MDP_SCALE_Q_FACTOR * iBuf.roi.dst_height) /
+                                 iBuf.roi.width) < MDP_MIN_X_SCALE_FACTOR)
+                               iBuf.roi.width =
+                                   (MDP_SCALE_Q_FACTOR * iBuf.roi.dst_height) /
+                                   MDP_MIN_X_SCALE_FACTOR;
+
+                       mdp_start_ppp(mfd, &iBuf, req, p_src_file, p_dst_file);
+
+                       /* next tile location */
+                       iBuf.roi.lcd_y += 16;
+                       iBuf.roi.x += iBuf.roi.width;
+
+                       /* this is for a remainder update */
+                       dst_h -= 16;
+                       src_w -= iBuf.roi.width;
+               }
+
+               if ((dst_h < 0) || (src_w < 0))
+                       printk
+                           ("msm_fb: mdp_blt_ex() unexpected result! line:%d\n",
+                            __LINE__);
+
+               /* remainder update */
+               if ((dst_h > 0) && (src_w > 0)) {
+                       u32 tmp_v;
+
+                       iBuf.roi.dst_height = dst_h;
+                       iBuf.roi.width = src_w;
+
+                       if (((MDP_SCALE_Q_FACTOR * iBuf.roi.dst_height) /
+                            iBuf.roi.width) > MDP_MAX_X_SCALE_FACTOR) {
+                               tmp_v =
+                                   (MDP_SCALE_Q_FACTOR * iBuf.roi.dst_height) /
+                                   MDP_MAX_X_SCALE_FACTOR +
+                                   (MDP_SCALE_Q_FACTOR * iBuf.roi.dst_height) %
+                                   MDP_MAX_X_SCALE_FACTOR ? 1 : 0;
+
+                               /* move x location as roi width gets bigger */
+                               iBuf.roi.x -= tmp_v - iBuf.roi.width;
+                               iBuf.roi.width = tmp_v;
+                       } else
+                           if (((MDP_SCALE_Q_FACTOR * iBuf.roi.dst_height) /
+                                iBuf.roi.width) < MDP_MIN_X_SCALE_FACTOR) {
+                               tmp_v =
+                                   (MDP_SCALE_Q_FACTOR * iBuf.roi.dst_height) /
+                                   MDP_MIN_X_SCALE_FACTOR +
+                                   (MDP_SCALE_Q_FACTOR * iBuf.roi.dst_height) %
+                                   MDP_MIN_X_SCALE_FACTOR ? 1 : 0;
+
+                               /*
+                                * we don't move x location for continuity of
+                                * source image
+                                */
+                               iBuf.roi.width = tmp_v;
+                       }
+
+                       mdp_start_ppp(mfd, &iBuf, req, p_src_file, p_dst_file);
+               }
+       } else {
+               mdp_start_ppp(mfd, &iBuf, req, p_src_file, p_dst_file);
+       }
+#endif
+
+       /* MDP cmd block disable */
+       mdp_pipe_ctrl(MDP_CMD_BLOCK, MDP_BLOCK_POWER_OFF, FALSE);
+       up(&mdp_ppp_mutex);
+
+       return 0;
+}
diff --git a/drivers/staging/msm/mdp_ppp_dq.c b/drivers/staging/msm/mdp_ppp_dq.c
new file mode 100644 (file)
index 0000000..3dc1c0c
--- /dev/null
@@ -0,0 +1,347 @@
+/* Copyright (c) 2009-2010, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include "mdp.h"
+
+static boolean mdp_ppp_intr_flag = FALSE;
+static boolean mdp_ppp_busy_flag = FALSE;
+
+/* Queue to keep track of the completed jobs for cleaning */
+static LIST_HEAD(mdp_ppp_djob_clnrq);
+static DEFINE_SPINLOCK(mdp_ppp_djob_clnrq_lock);
+
+/* Worker to cleanup Display Jobs */
+static struct workqueue_struct *mdp_ppp_djob_clnr;
+
+/* Display Queue (DQ) for MDP PPP Block */
+static LIST_HEAD(mdp_ppp_dq);
+static DEFINE_SPINLOCK(mdp_ppp_dq_lock);
+
+/* Current Display Job for MDP PPP */
+static struct mdp_ppp_djob *curr_djob;
+
+/* Track ret code for the last opeartion */
+static int mdp_ppp_ret_code;
+
+inline int mdp_ppp_get_ret_code(void)
+{
+       return mdp_ppp_ret_code;
+}
+
+/* Push <Reg, Val> pair into DQ (if available) to later
+ * program the MDP PPP Block */
+inline void mdp_ppp_outdw(uint32_t addr, uint32_t data)
+{
+       if (curr_djob) {
+
+               /* get the last node of the list. */
+               struct mdp_ppp_roi_cmd_set *node =
+                       list_entry(curr_djob->roi_cmd_list.prev,
+                               struct mdp_ppp_roi_cmd_set, node);
+
+               /* If a node is already full, create a new one and add it to
+                * the list (roi_cmd_list).
+                */
+               if (node->ncmds == MDP_PPP_ROI_NODE_SIZE) {
+                       node = kmalloc(sizeof(struct mdp_ppp_roi_cmd_set),
+                               GFP_KERNEL);
+                       if (!node) {
+                               printk(KERN_ERR
+                                       "MDP_PPP: not enough memory.\n");
+                               mdp_ppp_ret_code = -EINVAL;
+                               return;
+                       }
+
+                       /* no ROI commands initially */
+                       node->ncmds = 0;
+
+                       /* add one node to roi_cmd_list. */
+                       list_add_tail(&node->node, &curr_djob->roi_cmd_list);
+               }
+
+               /* register ROI commands */
+               node->cmd[node->ncmds].reg = addr;
+               node->cmd[node->ncmds].val = data;
+               node->ncmds++;
+       } else
+               /* program MDP PPP block now */
+               outpdw((addr), (data));
+}
+
+/* Initialize DQ */
+inline void mdp_ppp_dq_init(void)
+{
+       mdp_ppp_djob_clnr = create_singlethread_workqueue("MDPDJobClnrThrd");
+}
+
+/* Release resources of a job (DJob). */
+static void mdp_ppp_del_djob(struct mdp_ppp_djob *job)
+{
+       struct mdp_ppp_roi_cmd_set *node, *tmp;
+
+       /* release mem */
+       mdp_ppp_put_img(job->p_src_file, job->p_dst_file);
+
+       /* release roi_cmd_list */
+       list_for_each_entry_safe(node, tmp, &job->roi_cmd_list, node) {
+               list_del(&node->node);
+               kfree(node);
+       }
+
+       /* release job struct */
+       kfree(job);
+}
+
+/* Worker thread to reclaim resources once a display job is done */
+static void mdp_ppp_djob_cleaner(struct work_struct *work)
+{
+       struct mdp_ppp_djob *job;
+
+       MDP_PPP_DEBUG_MSG("mdp ppp display job cleaner started \n");
+
+       /* cleanup display job */
+       job = container_of(work, struct mdp_ppp_djob, cleaner.work);
+       if (likely(work && job))
+               mdp_ppp_del_djob(job);
+}
+
+/* Create a new Display Job (DJob) */
+inline struct mdp_ppp_djob *mdp_ppp_new_djob(void)
+{
+       struct mdp_ppp_djob *job;
+       struct mdp_ppp_roi_cmd_set *node;
+
+       /* create a new djob */
+       job = kmalloc(sizeof(struct mdp_ppp_djob), GFP_KERNEL);
+       if (!job)
+               return NULL;
+
+       /* add the first node to curr_djob->roi_cmd_list */
+       node = kmalloc(sizeof(struct mdp_ppp_roi_cmd_set), GFP_KERNEL);
+       if (!node) {
+               kfree(job);
+               return NULL;
+       }
+
+       /* make this current djob container to keep track of the curr djob not
+        * used in the async path i.e. no sync needed
+        *
+        * Should not contain any references from the past djob
+        */
+       BUG_ON(curr_djob);
+       curr_djob = job;
+       INIT_LIST_HEAD(&curr_djob->roi_cmd_list);
+
+       /* no ROI commands initially */
+       node->ncmds = 0;
+       INIT_LIST_HEAD(&node->node);
+       list_add_tail(&node->node, &curr_djob->roi_cmd_list);
+
+       /* register this djob with the djob cleaner
+        * initializes 'work' data struct
+        */
+       INIT_DELAYED_WORK(&curr_djob->cleaner, mdp_ppp_djob_cleaner);
+       INIT_LIST_HEAD(&curr_djob->entry);
+
+       curr_djob->p_src_file = 0;
+       curr_djob->p_dst_file = 0;
+
+       return job;
+}
+
+/* Undo the effect of mdp_ppp_new_djob() */
+inline void mdp_ppp_clear_curr_djob(void)
+{
+       if (likely(curr_djob)) {
+               mdp_ppp_del_djob(curr_djob);
+               curr_djob = NULL;
+       }
+}
+
+/* Cleanup dirty djobs */
+static void mdp_ppp_flush_dirty_djobs(void *cond)
+{
+       unsigned long flags;
+       struct mdp_ppp_djob *job;
+
+       /* Flush the jobs from the djob clnr queue */
+       while (cond && test_bit(0, (unsigned long *)cond)) {
+
+               /* Until we are done with the cleanup queue */
+               spin_lock_irqsave(&mdp_ppp_djob_clnrq_lock, flags);
+               if (list_empty(&mdp_ppp_djob_clnrq)) {
+                       spin_unlock_irqrestore(&mdp_ppp_djob_clnrq_lock, flags);
+                       break;
+               }
+
+               MDP_PPP_DEBUG_MSG("flushing djobs ... loop \n");
+
+               /* Retrieve the job that needs to be cleaned */
+               job = list_entry(mdp_ppp_djob_clnrq.next,
+                               struct mdp_ppp_djob, entry);
+               list_del_init(&job->entry);
+               spin_unlock_irqrestore(&mdp_ppp_djob_clnrq_lock, flags);
+
+               /* Keep mem state coherent */
+               msm_fb_ensure_mem_coherency_after_dma(job->info, &job->req, 1);
+
+               /* Schedule jobs for cleanup
+                * A seperate worker thread does this */
+               queue_delayed_work(mdp_ppp_djob_clnr, &job->cleaner,
+                       mdp_timer_duration);
+       }
+}
+
+/* If MDP PPP engine is busy, wait until it is available again */
+void mdp_ppp_wait(void)
+{
+       unsigned long flags;
+       int cond = 1;
+
+       /* keep flushing dirty djobs as long as MDP PPP engine is busy */
+       mdp_ppp_flush_dirty_djobs(&mdp_ppp_busy_flag);
+
+       /* block if MDP PPP engine is still busy */
+       spin_lock_irqsave(&mdp_ppp_dq_lock, flags);
+       if (test_bit(0, (unsigned long *)&mdp_ppp_busy_flag)) {
+
+               /* prepare for the wakeup event */
+               test_and_set_bit(0, (unsigned long *)&mdp_ppp_waiting);
+               INIT_COMPLETION(mdp_ppp_comp);
+               spin_unlock_irqrestore(&mdp_ppp_dq_lock, flags);
+
+               /* block uninterruptibly until available */
+               MDP_PPP_DEBUG_MSG("waiting for mdp... \n");
+               wait_for_completion_killable(&mdp_ppp_comp);
+
+               /* if MDP PPP engine is still free,
+                * disable INT_MDP if enabled
+                */
+               spin_lock_irqsave(&mdp_ppp_dq_lock, flags);
+               if (!test_bit(0, (unsigned long *)&mdp_ppp_busy_flag) &&
+               test_and_clear_bit(0, (unsigned long *)&mdp_ppp_intr_flag))
+                       mdp_disable_irq(MDP_PPP_TERM);
+       }
+       spin_unlock_irqrestore(&mdp_ppp_dq_lock, flags);
+
+       /* flush remaining dirty djobs, if any */
+       mdp_ppp_flush_dirty_djobs(&cond);
+}
+
+/* Program MDP PPP block to process this ROI */
+static void mdp_ppp_process_roi(struct list_head *roi_cmd_list)
+{
+
+       /* program PPP engine with registered ROI commands */
+       struct mdp_ppp_roi_cmd_set *node;
+       list_for_each_entry(node, roi_cmd_list, node) {
+               int i = 0;
+               for (; i < node->ncmds; i++) {
+                       MDP_PPP_DEBUG_MSG("%d: reg: 0x%x val: 0x%x \n",
+                                       i, node->cmd[i].reg, node->cmd[i].val);
+                       outpdw(node->cmd[i].reg, node->cmd[i].val);
+               }
+       }
+
+       /* kickoff MDP PPP engine */
+       MDP_PPP_DEBUG_MSG("kicking off mdp \n");
+       outpdw(MDP_BASE + 0x30, 0x1000);
+}
+
+/* Submit this display job to MDP PPP engine */
+static void mdp_ppp_dispatch_djob(struct mdp_ppp_djob *job)
+{
+       /* enable INT_MDP if disabled */
+       if (!test_and_set_bit(0, (unsigned long *)&mdp_ppp_intr_flag))
+               mdp_enable_irq(MDP_PPP_TERM);
+
+       /* turn on PPP and CMD blocks */
+       mdp_pipe_ctrl(MDP_CMD_BLOCK, MDP_BLOCK_POWER_ON, FALSE);
+       mdp_pipe_ctrl(MDP_PPP_BLOCK, MDP_BLOCK_POWER_ON, FALSE);
+
+       /* process this ROI */
+       mdp_ppp_process_roi(&job->roi_cmd_list);
+}
+
+/* Enqueue this display job to be cleaned up later in "mdp_ppp_djob_done" */
+static inline void mdp_ppp_enqueue_djob(struct mdp_ppp_djob *job)
+{
+       unsigned long flags;
+
+       spin_lock_irqsave(&mdp_ppp_dq_lock, flags);
+       list_add_tail(&job->entry, &mdp_ppp_dq);
+       spin_unlock_irqrestore(&mdp_ppp_dq_lock, flags);
+}
+
+/* First enqueue display job for cleanup and dispatch immediately
+ * if MDP PPP engine is free */
+void mdp_ppp_process_curr_djob(void)
+{
+       /* enqueue djob */
+       mdp_ppp_enqueue_djob(curr_djob);
+
+       /* dispatch now if MDP PPP engine is free */
+       if (!test_and_set_bit(0, (unsigned long *)&mdp_ppp_busy_flag))
+               mdp_ppp_dispatch_djob(curr_djob);
+
+       /* done with the current djob */
+       curr_djob = NULL;
+}
+
+/* Called from mdp_isr - cleanup finished job and start with next
+ * if available else set MDP PPP engine free */
+void mdp_ppp_djob_done(void)
+{
+       struct mdp_ppp_djob *curr, *next;
+       unsigned long flags;
+
+       /* dequeue current */
+       spin_lock_irqsave(&mdp_ppp_dq_lock, flags);
+       curr = list_entry(mdp_ppp_dq.next, struct mdp_ppp_djob, entry);
+       list_del_init(&curr->entry);
+       spin_unlock_irqrestore(&mdp_ppp_dq_lock, flags);
+
+       /* cleanup current - enqueue in the djob clnr queue */
+       spin_lock_irqsave(&mdp_ppp_djob_clnrq_lock, flags);
+       list_add_tail(&curr->entry, &mdp_ppp_djob_clnrq);
+       spin_unlock_irqrestore(&mdp_ppp_djob_clnrq_lock, flags);
+
+       /* grab next pending */
+       spin_lock_irqsave(&mdp_ppp_dq_lock, flags);
+       if (!list_empty(&mdp_ppp_dq)) {
+               next = list_entry(mdp_ppp_dq.next, struct mdp_ppp_djob,
+                       entry);
+               spin_unlock_irqrestore(&mdp_ppp_dq_lock, flags);
+
+               /* process next in the queue */
+               mdp_ppp_process_roi(&next->roi_cmd_list);
+       } else {
+               /* no pending display job */
+               spin_unlock_irqrestore(&mdp_ppp_dq_lock, flags);
+
+               /* turn off PPP and CMD blocks - "in_isr" is TRUE */
+               mdp_pipe_ctrl(MDP_PPP_BLOCK, MDP_BLOCK_POWER_OFF, TRUE);
+               mdp_pipe_ctrl(MDP_CMD_BLOCK, MDP_BLOCK_POWER_OFF, TRUE);
+
+               /* notify if waiting */
+               if (test_and_clear_bit(0, (unsigned long *)&mdp_ppp_waiting))
+                       complete(&mdp_ppp_comp);
+
+               /* set free */
+               test_and_clear_bit(0, (unsigned long *)&mdp_ppp_busy_flag);
+       }
+}
diff --git a/drivers/staging/msm/mdp_ppp_dq.h b/drivers/staging/msm/mdp_ppp_dq.h
new file mode 100644 (file)
index 0000000..03e4e9a
--- /dev/null
@@ -0,0 +1,86 @@
+/* Copyright (c) 2009-2010, Code Aurora Forum. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ *       copyright notice, this list of conditions and the following
+ *       disclaimer in the documentation and/or other materials provided
+ *       with the distribution.
+ *     * Neither the name of Code Aurora Forum, Inc. nor the names of its
+ *       contributors may be used to endorse or promote products derived
+ *       from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef MDP_PPP_DQ_H
+#define MDP_PPP_DQ_H
+
+#include "msm_fb_def.h"
+
+#define MDP_PPP_DEBUG_MSG MSM_FB_DEBUG
+
+/* The maximum number of <Reg,Val> pairs in an mdp_ppp_roi_cmd_set structure (a
+ * node)
+ */
+#define MDP_PPP_ROI_NODE_SIZE 32
+
+/* ROI config command (<Reg,Val> pair) for MDP PPP block */
+struct mdp_ppp_roi_cmd {
+       uint32_t reg;
+       uint32_t val;
+};
+
+/* ROI config commands for MDP PPP block are stored in a list of
+ * mdp_ppp_roi_cmd_set structures (nodes).
+ */
+struct mdp_ppp_roi_cmd_set {
+       struct list_head node;
+       uint32_t ncmds; /* number of commands in this set (node). */
+       struct mdp_ppp_roi_cmd cmd[MDP_PPP_ROI_NODE_SIZE];
+};
+
+/* MDP PPP Display Job (DJob) */
+struct mdp_ppp_djob {
+       struct list_head entry;
+       /* One ROI per MDP PPP DJob */
+       struct list_head roi_cmd_list;
+       struct mdp_blit_req req;
+       struct fb_info *info;
+       struct delayed_work cleaner;
+       struct file *p_src_file, *p_dst_file;
+};
+
+extern struct completion mdp_ppp_comp;
+extern boolean mdp_ppp_waiting;
+extern unsigned long mdp_timer_duration;
+
+unsigned int mdp_ppp_async_op_get(void);
+void mdp_ppp_async_op_set(unsigned int flag);
+void msm_fb_ensure_mem_coherency_after_dma(struct fb_info *info,
+       struct mdp_blit_req *req_list, int req_list_count);
+void mdp_ppp_put_img(struct file *p_src_file, struct file *p_dst_file);
+void mdp_ppp_dq_init(void);
+void mdp_ppp_outdw(uint32_t addr, uint32_t data);
+struct mdp_ppp_djob *mdp_ppp_new_djob(void);
+void mdp_ppp_clear_curr_djob(void);
+void mdp_ppp_process_curr_djob(void);
+int mdp_ppp_get_ret_code(void);
+void mdp_ppp_djob_done(void);
+void mdp_ppp_wait(void);
+
+#endif /* MDP_PPP_DQ_H */
diff --git a/drivers/staging/msm/mdp_ppp_v20.c b/drivers/staging/msm/mdp_ppp_v20.c
new file mode 100644 (file)
index 0000000..b5b7271
--- /dev/null
@@ -0,0 +1,2486 @@
+/* Copyright (c) 2008-2009, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/time.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/fb.h>
+#include "linux/proc_fs.h"
+
+#include <mach/hardware.h>
+#include <linux/io.h>
+
+#include <asm/system.h>
+#include <asm/mach-types.h>
+#include <linux/semaphore.h>
+#include <asm/div64.h>
+
+#include "mdp.h"
+#include "msm_fb.h"
+
+static MDP_SCALE_MODE mdp_curr_up_scale_xy;
+static MDP_SCALE_MODE mdp_curr_down_scale_x;
+static MDP_SCALE_MODE mdp_curr_down_scale_y;
+
+static long long mdp_do_div(long long num, long long den)
+{
+       do_div(num, den);
+       return num;
+}
+
+struct mdp_table_entry mdp_gaussian_blur_table[] = {
+       /* max variance */
+       { 0x5fffc, 0x20000080 },
+       { 0x50280, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50284, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50288, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x5028c, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50290, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50294, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50298, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x5029c, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x502a0, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x502a4, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x502a8, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x502ac, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x502b0, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x502b4, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x502b8, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x502bc, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x502c0, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x502c4, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x502c8, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x502cc, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x502d0, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x502d4, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x502d8, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x502dc, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x502e0, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x502e4, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x502e8, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x502ec, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x502f0, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x502f4, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x502f8, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x502fc, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50300, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50304, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50308, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x5030c, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50310, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50314, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50318, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x5031c, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50320, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50324, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50328, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x5032c, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50330, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50334, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50338, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x5033c, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50340, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50344, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50348, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x5034c, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50350, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50354, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50358, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x5035c, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50360, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50364, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50368, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x5036c, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50370, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50374, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50378, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x5037c, 0x20000080 },
+};
+
+static void load_scale_table(
+       struct mdp_table_entry *table, int len)
+{
+       int i;
+       for (i = 0; i < len; i++)
+               MDP_OUTP(MDP_BASE + table[i].reg, table[i].val);
+}
+
+static void mdp_load_pr_upscale_table(void)
+{
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50200, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50204, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50208, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5020c, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50210, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50214, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50218, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5021c, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50220, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50224, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50228, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5022c, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50230, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50234, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50238, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5023c, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50240, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50244, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50248, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x5024c, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50250, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50254, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50258, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x5025c, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50260, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50264, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50268, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x5026c, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50270, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50274, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50278, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x5027c, 0x0);
+}
+
+static void mdp_load_pr_downscale_table_x_point2TOpoint4(void)
+{
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50280, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50284, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50288, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5028c, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50290, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50294, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50298, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5029c, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x502a0, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x502a4, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x502a8, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x502ac, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x502b0, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x502b4, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x502b8, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x502bc, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502c0, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502c4, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502c8, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502cc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502d0, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502d4, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502d8, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502dc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502e0, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502e4, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502e8, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502ec, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502f0, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502f4, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502f8, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502fc, 0x0);
+}
+
+static void mdp_load_pr_downscale_table_y_point2TOpoint4(void)
+{
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50300, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50304, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50308, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5030c, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50310, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50314, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50318, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5031c, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50320, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50324, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50328, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5032c, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50330, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50334, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50338, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5033c, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50340, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50344, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50348, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x5034c, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50350, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50354, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50358, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x5035c, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50360, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50364, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50368, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x5036c, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50370, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50374, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50378, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x5037c, 0x0);
+}
+
+static void mdp_load_pr_downscale_table_x_point4TOpoint6(void)
+{
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50280, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50284, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50288, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5028c, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50290, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50294, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50298, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5029c, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x502a0, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x502a4, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x502a8, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x502ac, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x502b0, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x502b4, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x502b8, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x502bc, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502c0, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502c4, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502c8, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502cc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502d0, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502d4, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502d8, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502dc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502e0, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502e4, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502e8, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502ec, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502f0, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502f4, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502f8, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502fc, 0x0);
+}
+
+static void mdp_load_pr_downscale_table_y_point4TOpoint6(void)
+{
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50300, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50304, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50308, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5030c, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50310, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50314, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50318, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5031c, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50320, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50324, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50328, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5032c, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50330, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50334, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50338, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5033c, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50340, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50344, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50348, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x5034c, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50350, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50354, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50358, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x5035c, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50360, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50364, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50368, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x5036c, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50370, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50374, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50378, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x5037c, 0x0);
+}
+
+static void mdp_load_pr_downscale_table_x_point6TOpoint8(void)
+{
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50280, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50284, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50288, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5028c, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50290, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50294, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50298, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5029c, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x502a0, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x502a4, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x502a8, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x502ac, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x502b0, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x502b4, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x502b8, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x502bc, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502c0, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502c4, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502c8, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502cc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502d0, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502d4, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502d8, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502dc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502e0, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502e4, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502e8, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502ec, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502f0, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502f4, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502f8, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502fc, 0x0);
+}
+
+static void mdp_load_pr_downscale_table_y_point6TOpoint8(void)
+{
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50300, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50304, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50308, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5030c, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50310, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50314, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50318, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5031c, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50320, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50324, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50328, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5032c, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50330, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50334, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50338, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5033c, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50340, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50344, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50348, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x5034c, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50350, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50354, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50358, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x5035c, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50360, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50364, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50368, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x5036c, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50370, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50374, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50378, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x5037c, 0x0);
+}
+
+static void mdp_load_pr_downscale_table_x_point8TO1(void)
+{
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50280, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50284, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50288, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5028c, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50290, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50294, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50298, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5029c, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x502a0, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x502a4, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x502a8, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x502ac, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x502b0, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x502b4, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x502b8, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x502bc, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502c0, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502c4, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502c8, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502cc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502d0, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502d4, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502d8, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502dc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502e0, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502e4, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502e8, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502ec, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502f0, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502f4, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502f8, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x502fc, 0x0);
+}
+
+static void mdp_load_pr_downscale_table_y_point8TO1(void)
+{
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50300, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50304, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50308, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5030c, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50310, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50314, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50318, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5031c, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50320, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50324, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50328, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5032c, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50330, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50334, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50338, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5033c, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50340, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50344, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50348, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x5034c, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50350, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50354, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50358, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x5035c, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50360, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50364, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50368, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x5036c, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50370, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50374, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x50378, 0x0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ff);
+       MDP_OUTP(MDP_BASE + 0x5037c, 0x0);
+}
+
+static void mdp_load_bc_upscale_table(void)
+{
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50200, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xff80000d);
+       MDP_OUTP(MDP_BASE + 0x50204, 0x7ec003f9);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xfec0001c);
+       MDP_OUTP(MDP_BASE + 0x50208, 0x7d4003f3);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xfe40002b);
+       MDP_OUTP(MDP_BASE + 0x5020c, 0x7b8003ed);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xfd80003c);
+       MDP_OUTP(MDP_BASE + 0x50210, 0x794003e8);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xfcc0004d);
+       MDP_OUTP(MDP_BASE + 0x50214, 0x76c003e4);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xfc40005f);
+       MDP_OUTP(MDP_BASE + 0x50218, 0x73c003e0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xfb800071);
+       MDP_OUTP(MDP_BASE + 0x5021c, 0x708003de);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xfac00085);
+       MDP_OUTP(MDP_BASE + 0x50220, 0x6d0003db);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xfa000098);
+       MDP_OUTP(MDP_BASE + 0x50224, 0x698003d9);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf98000ac);
+       MDP_OUTP(MDP_BASE + 0x50228, 0x654003d8);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf8c000c1);
+       MDP_OUTP(MDP_BASE + 0x5022c, 0x610003d7);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf84000d5);
+       MDP_OUTP(MDP_BASE + 0x50230, 0x5c8003d7);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf7c000e9);
+       MDP_OUTP(MDP_BASE + 0x50234, 0x580003d7);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf74000fd);
+       MDP_OUTP(MDP_BASE + 0x50238, 0x534003d8);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf6c00112);
+       MDP_OUTP(MDP_BASE + 0x5023c, 0x4e8003d8);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf6800126);
+       MDP_OUTP(MDP_BASE + 0x50240, 0x494003da);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf600013a);
+       MDP_OUTP(MDP_BASE + 0x50244, 0x448003db);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf600014d);
+       MDP_OUTP(MDP_BASE + 0x50248, 0x3f4003dd);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf5c00160);
+       MDP_OUTP(MDP_BASE + 0x5024c, 0x3a4003df);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf5c00172);
+       MDP_OUTP(MDP_BASE + 0x50250, 0x354003e1);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf5c00184);
+       MDP_OUTP(MDP_BASE + 0x50254, 0x304003e3);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf6000195);
+       MDP_OUTP(MDP_BASE + 0x50258, 0x2b0003e6);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf64001a6);
+       MDP_OUTP(MDP_BASE + 0x5025c, 0x260003e8);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf6c001b4);
+       MDP_OUTP(MDP_BASE + 0x50260, 0x214003eb);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf78001c2);
+       MDP_OUTP(MDP_BASE + 0x50264, 0x1c4003ee);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf80001cf);
+       MDP_OUTP(MDP_BASE + 0x50268, 0x17c003f1);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf90001db);
+       MDP_OUTP(MDP_BASE + 0x5026c, 0x134003f3);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xfa0001e5);
+       MDP_OUTP(MDP_BASE + 0x50270, 0xf0003f6);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xfb4001ee);
+       MDP_OUTP(MDP_BASE + 0x50274, 0xac003f9);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xfcc001f5);
+       MDP_OUTP(MDP_BASE + 0x50278, 0x70003fb);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xfe4001fb);
+       MDP_OUTP(MDP_BASE + 0x5027c, 0x34003fe);
+}
+
+static void mdp_load_bc_downscale_table_x_point2TOpoint4(void)
+{
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ac00084);
+       MDP_OUTP(MDP_BASE + 0x50280, 0x23400083);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1b000084);
+       MDP_OUTP(MDP_BASE + 0x50284, 0x23000083);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1b400084);
+       MDP_OUTP(MDP_BASE + 0x50288, 0x23000082);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1b400085);
+       MDP_OUTP(MDP_BASE + 0x5028c, 0x23000081);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1b800085);
+       MDP_OUTP(MDP_BASE + 0x50290, 0x23000080);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1bc00086);
+       MDP_OUTP(MDP_BASE + 0x50294, 0x22c0007f);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1c000086);
+       MDP_OUTP(MDP_BASE + 0x50298, 0x2280007f);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1c400086);
+       MDP_OUTP(MDP_BASE + 0x5029c, 0x2280007e);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1c800086);
+       MDP_OUTP(MDP_BASE + 0x502a0, 0x2280007d);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1cc00086);
+       MDP_OUTP(MDP_BASE + 0x502a4, 0x2240007d);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1cc00087);
+       MDP_OUTP(MDP_BASE + 0x502a8, 0x2240007c);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1d000087);
+       MDP_OUTP(MDP_BASE + 0x502ac, 0x2240007b);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1d400087);
+       MDP_OUTP(MDP_BASE + 0x502b0, 0x2200007b);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1d400088);
+       MDP_OUTP(MDP_BASE + 0x502b4, 0x22400079);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1d800088);
+       MDP_OUTP(MDP_BASE + 0x502b8, 0x22400078);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1dc00088);
+       MDP_OUTP(MDP_BASE + 0x502bc, 0x22400077);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1dc00089);
+       MDP_OUTP(MDP_BASE + 0x502c0, 0x22000077);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1e000089);
+       MDP_OUTP(MDP_BASE + 0x502c4, 0x22000076);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1e400089);
+       MDP_OUTP(MDP_BASE + 0x502c8, 0x22000075);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ec00088);
+       MDP_OUTP(MDP_BASE + 0x502cc, 0x21c00075);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ec00089);
+       MDP_OUTP(MDP_BASE + 0x502d0, 0x21c00074);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1f000089);
+       MDP_OUTP(MDP_BASE + 0x502d4, 0x21c00073);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1f400089);
+       MDP_OUTP(MDP_BASE + 0x502d8, 0x21800073);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1f40008a);
+       MDP_OUTP(MDP_BASE + 0x502dc, 0x21800072);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1f80008a);
+       MDP_OUTP(MDP_BASE + 0x502e0, 0x21800071);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1fc0008a);
+       MDP_OUTP(MDP_BASE + 0x502e4, 0x21800070);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1fc0008b);
+       MDP_OUTP(MDP_BASE + 0x502e8, 0x2180006f);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x2000008c);
+       MDP_OUTP(MDP_BASE + 0x502ec, 0x2140006e);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x2040008c);
+       MDP_OUTP(MDP_BASE + 0x502f0, 0x2140006d);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x2080008c);
+       MDP_OUTP(MDP_BASE + 0x502f4, 0x2100006d);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x20c0008c);
+       MDP_OUTP(MDP_BASE + 0x502f8, 0x2100006c);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x20c0008d);
+       MDP_OUTP(MDP_BASE + 0x502fc, 0x2100006b);
+}
+
+static void mdp_load_bc_downscale_table_y_point2TOpoint4(void)
+{
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ac00084);
+       MDP_OUTP(MDP_BASE + 0x50300, 0x23400083);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1b000084);
+       MDP_OUTP(MDP_BASE + 0x50304, 0x23000083);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1b400084);
+       MDP_OUTP(MDP_BASE + 0x50308, 0x23000082);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1b400085);
+       MDP_OUTP(MDP_BASE + 0x5030c, 0x23000081);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1b800085);
+       MDP_OUTP(MDP_BASE + 0x50310, 0x23000080);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1bc00086);
+       MDP_OUTP(MDP_BASE + 0x50314, 0x22c0007f);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1c000086);
+       MDP_OUTP(MDP_BASE + 0x50318, 0x2280007f);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1c400086);
+       MDP_OUTP(MDP_BASE + 0x5031c, 0x2280007e);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1c800086);
+       MDP_OUTP(MDP_BASE + 0x50320, 0x2280007d);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1cc00086);
+       MDP_OUTP(MDP_BASE + 0x50324, 0x2240007d);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1cc00087);
+       MDP_OUTP(MDP_BASE + 0x50328, 0x2240007c);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1d000087);
+       MDP_OUTP(MDP_BASE + 0x5032c, 0x2240007b);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1d400087);
+       MDP_OUTP(MDP_BASE + 0x50330, 0x2200007b);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1d400088);
+       MDP_OUTP(MDP_BASE + 0x50334, 0x22400079);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1d800088);
+       MDP_OUTP(MDP_BASE + 0x50338, 0x22400078);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1dc00088);
+       MDP_OUTP(MDP_BASE + 0x5033c, 0x22400077);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1dc00089);
+       MDP_OUTP(MDP_BASE + 0x50340, 0x22000077);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1e000089);
+       MDP_OUTP(MDP_BASE + 0x50344, 0x22000076);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1e400089);
+       MDP_OUTP(MDP_BASE + 0x50348, 0x22000075);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ec00088);
+       MDP_OUTP(MDP_BASE + 0x5034c, 0x21c00075);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ec00089);
+       MDP_OUTP(MDP_BASE + 0x50350, 0x21c00074);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1f000089);
+       MDP_OUTP(MDP_BASE + 0x50354, 0x21c00073);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1f400089);
+       MDP_OUTP(MDP_BASE + 0x50358, 0x21800073);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1f40008a);
+       MDP_OUTP(MDP_BASE + 0x5035c, 0x21800072);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1f80008a);
+       MDP_OUTP(MDP_BASE + 0x50360, 0x21800071);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1fc0008a);
+       MDP_OUTP(MDP_BASE + 0x50364, 0x21800070);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1fc0008b);
+       MDP_OUTP(MDP_BASE + 0x50368, 0x2180006f);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x2000008c);
+       MDP_OUTP(MDP_BASE + 0x5036c, 0x2140006e);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x2040008c);
+       MDP_OUTP(MDP_BASE + 0x50370, 0x2140006d);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x2080008c);
+       MDP_OUTP(MDP_BASE + 0x50374, 0x2100006d);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x20c0008c);
+       MDP_OUTP(MDP_BASE + 0x50378, 0x2100006c);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x20c0008d);
+       MDP_OUTP(MDP_BASE + 0x5037c, 0x2100006b);
+}
+
+static void mdp_load_bc_downscale_table_x_point4TOpoint6(void)
+{
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x740008c);
+       MDP_OUTP(MDP_BASE + 0x50280, 0x33800088);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x800008e);
+       MDP_OUTP(MDP_BASE + 0x50284, 0x33400084);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x8400092);
+       MDP_OUTP(MDP_BASE + 0x50288, 0x33000080);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x9000094);
+       MDP_OUTP(MDP_BASE + 0x5028c, 0x3300007b);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x9c00098);
+       MDP_OUTP(MDP_BASE + 0x50290, 0x32400077);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xa40009b);
+       MDP_OUTP(MDP_BASE + 0x50294, 0x32000073);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xb00009d);
+       MDP_OUTP(MDP_BASE + 0x50298, 0x31c0006f);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xbc000a0);
+       MDP_OUTP(MDP_BASE + 0x5029c, 0x3140006b);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xc8000a2);
+       MDP_OUTP(MDP_BASE + 0x502a0, 0x31000067);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xd8000a5);
+       MDP_OUTP(MDP_BASE + 0x502a4, 0x30800062);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xe4000a8);
+       MDP_OUTP(MDP_BASE + 0x502a8, 0x2fc0005f);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xec000aa);
+       MDP_OUTP(MDP_BASE + 0x502ac, 0x2fc0005b);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf8000ad);
+       MDP_OUTP(MDP_BASE + 0x502b0, 0x2f400057);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x108000b0);
+       MDP_OUTP(MDP_BASE + 0x502b4, 0x2e400054);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x114000b2);
+       MDP_OUTP(MDP_BASE + 0x502b8, 0x2e000050);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x124000b4);
+       MDP_OUTP(MDP_BASE + 0x502bc, 0x2d80004c);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x130000b6);
+       MDP_OUTP(MDP_BASE + 0x502c0, 0x2d000049);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x140000b8);
+       MDP_OUTP(MDP_BASE + 0x502c4, 0x2c800045);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x150000b9);
+       MDP_OUTP(MDP_BASE + 0x502c8, 0x2c000042);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x15c000bd);
+       MDP_OUTP(MDP_BASE + 0x502cc, 0x2b40003e);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x16c000bf);
+       MDP_OUTP(MDP_BASE + 0x502d0, 0x2a80003b);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x17c000bf);
+       MDP_OUTP(MDP_BASE + 0x502d4, 0x2a000039);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x188000c2);
+       MDP_OUTP(MDP_BASE + 0x502d8, 0x29400036);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x19c000c4);
+       MDP_OUTP(MDP_BASE + 0x502dc, 0x28800032);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ac000c5);
+       MDP_OUTP(MDP_BASE + 0x502e0, 0x2800002f);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1bc000c7);
+       MDP_OUTP(MDP_BASE + 0x502e4, 0x2740002c);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1cc000c8);
+       MDP_OUTP(MDP_BASE + 0x502e8, 0x26c00029);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1dc000c9);
+       MDP_OUTP(MDP_BASE + 0x502ec, 0x26000027);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ec000cc);
+       MDP_OUTP(MDP_BASE + 0x502f0, 0x25000024);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x200000cc);
+       MDP_OUTP(MDP_BASE + 0x502f4, 0x24800021);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x210000cd);
+       MDP_OUTP(MDP_BASE + 0x502f8, 0x23800020);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x220000ce);
+       MDP_OUTP(MDP_BASE + 0x502fc, 0x2300001d);
+}
+
+static void mdp_load_bc_downscale_table_y_point4TOpoint6(void)
+{
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x740008c);
+       MDP_OUTP(MDP_BASE + 0x50300, 0x33800088);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x800008e);
+       MDP_OUTP(MDP_BASE + 0x50304, 0x33400084);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x8400092);
+       MDP_OUTP(MDP_BASE + 0x50308, 0x33000080);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x9000094);
+       MDP_OUTP(MDP_BASE + 0x5030c, 0x3300007b);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x9c00098);
+       MDP_OUTP(MDP_BASE + 0x50310, 0x32400077);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xa40009b);
+       MDP_OUTP(MDP_BASE + 0x50314, 0x32000073);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xb00009d);
+       MDP_OUTP(MDP_BASE + 0x50318, 0x31c0006f);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xbc000a0);
+       MDP_OUTP(MDP_BASE + 0x5031c, 0x3140006b);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xc8000a2);
+       MDP_OUTP(MDP_BASE + 0x50320, 0x31000067);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xd8000a5);
+       MDP_OUTP(MDP_BASE + 0x50324, 0x30800062);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xe4000a8);
+       MDP_OUTP(MDP_BASE + 0x50328, 0x2fc0005f);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xec000aa);
+       MDP_OUTP(MDP_BASE + 0x5032c, 0x2fc0005b);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf8000ad);
+       MDP_OUTP(MDP_BASE + 0x50330, 0x2f400057);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x108000b0);
+       MDP_OUTP(MDP_BASE + 0x50334, 0x2e400054);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x114000b2);
+       MDP_OUTP(MDP_BASE + 0x50338, 0x2e000050);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x124000b4);
+       MDP_OUTP(MDP_BASE + 0x5033c, 0x2d80004c);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x130000b6);
+       MDP_OUTP(MDP_BASE + 0x50340, 0x2d000049);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x140000b8);
+       MDP_OUTP(MDP_BASE + 0x50344, 0x2c800045);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x150000b9);
+       MDP_OUTP(MDP_BASE + 0x50348, 0x2c000042);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x15c000bd);
+       MDP_OUTP(MDP_BASE + 0x5034c, 0x2b40003e);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x16c000bf);
+       MDP_OUTP(MDP_BASE + 0x50350, 0x2a80003b);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x17c000bf);
+       MDP_OUTP(MDP_BASE + 0x50354, 0x2a000039);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x188000c2);
+       MDP_OUTP(MDP_BASE + 0x50358, 0x29400036);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x19c000c4);
+       MDP_OUTP(MDP_BASE + 0x5035c, 0x28800032);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ac000c5);
+       MDP_OUTP(MDP_BASE + 0x50360, 0x2800002f);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1bc000c7);
+       MDP_OUTP(MDP_BASE + 0x50364, 0x2740002c);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1cc000c8);
+       MDP_OUTP(MDP_BASE + 0x50368, 0x26c00029);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1dc000c9);
+       MDP_OUTP(MDP_BASE + 0x5036c, 0x26000027);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1ec000cc);
+       MDP_OUTP(MDP_BASE + 0x50370, 0x25000024);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x200000cc);
+       MDP_OUTP(MDP_BASE + 0x50374, 0x24800021);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x210000cd);
+       MDP_OUTP(MDP_BASE + 0x50378, 0x23800020);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x220000ce);
+       MDP_OUTP(MDP_BASE + 0x5037c, 0x2300001d);
+}
+
+static void mdp_load_bc_downscale_table_x_point6TOpoint8(void)
+{
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xfe000070);
+       MDP_OUTP(MDP_BASE + 0x50280, 0x4bc00068);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xfe000078);
+       MDP_OUTP(MDP_BASE + 0x50284, 0x4bc00060);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xfe000080);
+       MDP_OUTP(MDP_BASE + 0x50288, 0x4b800059);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xfe000089);
+       MDP_OUTP(MDP_BASE + 0x5028c, 0x4b000052);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xfe400091);
+       MDP_OUTP(MDP_BASE + 0x50290, 0x4a80004b);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xfe40009a);
+       MDP_OUTP(MDP_BASE + 0x50294, 0x4a000044);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xfe8000a3);
+       MDP_OUTP(MDP_BASE + 0x50298, 0x4940003d);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xfec000ac);
+       MDP_OUTP(MDP_BASE + 0x5029c, 0x48400037);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xff0000b4);
+       MDP_OUTP(MDP_BASE + 0x502a0, 0x47800031);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xff8000bd);
+       MDP_OUTP(MDP_BASE + 0x502a4, 0x4640002b);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xc5);
+       MDP_OUTP(MDP_BASE + 0x502a8, 0x45000026);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x8000ce);
+       MDP_OUTP(MDP_BASE + 0x502ac, 0x43800021);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x10000d6);
+       MDP_OUTP(MDP_BASE + 0x502b0, 0x4240001c);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x18000df);
+       MDP_OUTP(MDP_BASE + 0x502b4, 0x40800018);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x24000e6);
+       MDP_OUTP(MDP_BASE + 0x502b8, 0x3f000014);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x30000ee);
+       MDP_OUTP(MDP_BASE + 0x502bc, 0x3d400010);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x40000f5);
+       MDP_OUTP(MDP_BASE + 0x502c0, 0x3b80000c);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x50000fc);
+       MDP_OUTP(MDP_BASE + 0x502c4, 0x39800009);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x6000102);
+       MDP_OUTP(MDP_BASE + 0x502c8, 0x37c00006);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x7000109);
+       MDP_OUTP(MDP_BASE + 0x502cc, 0x35800004);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x840010e);
+       MDP_OUTP(MDP_BASE + 0x502d0, 0x33800002);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x9800114);
+       MDP_OUTP(MDP_BASE + 0x502d4, 0x31400000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xac00119);
+       MDP_OUTP(MDP_BASE + 0x502d8, 0x2f4003fe);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xc40011e);
+       MDP_OUTP(MDP_BASE + 0x502dc, 0x2d0003fc);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xdc00121);
+       MDP_OUTP(MDP_BASE + 0x502e0, 0x2b0003fb);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf400125);
+       MDP_OUTP(MDP_BASE + 0x502e4, 0x28c003fa);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x11000128);
+       MDP_OUTP(MDP_BASE + 0x502e8, 0x268003f9);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x12c0012a);
+       MDP_OUTP(MDP_BASE + 0x502ec, 0x244003f9);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1480012c);
+       MDP_OUTP(MDP_BASE + 0x502f0, 0x224003f8);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1640012e);
+       MDP_OUTP(MDP_BASE + 0x502f4, 0x200003f8);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1800012f);
+       MDP_OUTP(MDP_BASE + 0x502f8, 0x1e0003f8);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1a00012f);
+       MDP_OUTP(MDP_BASE + 0x502fc, 0x1c0003f8);
+}
+
+static void mdp_load_bc_downscale_table_y_point6TOpoint8(void)
+{
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xfe000070);
+       MDP_OUTP(MDP_BASE + 0x50300, 0x4bc00068);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xfe000078);
+       MDP_OUTP(MDP_BASE + 0x50304, 0x4bc00060);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xfe000080);
+       MDP_OUTP(MDP_BASE + 0x50308, 0x4b800059);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xfe000089);
+       MDP_OUTP(MDP_BASE + 0x5030c, 0x4b000052);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xfe400091);
+       MDP_OUTP(MDP_BASE + 0x50310, 0x4a80004b);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xfe40009a);
+       MDP_OUTP(MDP_BASE + 0x50314, 0x4a000044);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xfe8000a3);
+       MDP_OUTP(MDP_BASE + 0x50318, 0x4940003d);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xfec000ac);
+       MDP_OUTP(MDP_BASE + 0x5031c, 0x48400037);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xff0000b4);
+       MDP_OUTP(MDP_BASE + 0x50320, 0x47800031);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xff8000bd);
+       MDP_OUTP(MDP_BASE + 0x50324, 0x4640002b);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xc5);
+       MDP_OUTP(MDP_BASE + 0x50328, 0x45000026);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x8000ce);
+       MDP_OUTP(MDP_BASE + 0x5032c, 0x43800021);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x10000d6);
+       MDP_OUTP(MDP_BASE + 0x50330, 0x4240001c);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x18000df);
+       MDP_OUTP(MDP_BASE + 0x50334, 0x40800018);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x24000e6);
+       MDP_OUTP(MDP_BASE + 0x50338, 0x3f000014);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x30000ee);
+       MDP_OUTP(MDP_BASE + 0x5033c, 0x3d400010);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x40000f5);
+       MDP_OUTP(MDP_BASE + 0x50340, 0x3b80000c);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x50000fc);
+       MDP_OUTP(MDP_BASE + 0x50344, 0x39800009);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x6000102);
+       MDP_OUTP(MDP_BASE + 0x50348, 0x37c00006);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x7000109);
+       MDP_OUTP(MDP_BASE + 0x5034c, 0x35800004);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x840010e);
+       MDP_OUTP(MDP_BASE + 0x50350, 0x33800002);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x9800114);
+       MDP_OUTP(MDP_BASE + 0x50354, 0x31400000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xac00119);
+       MDP_OUTP(MDP_BASE + 0x50358, 0x2f4003fe);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xc40011e);
+       MDP_OUTP(MDP_BASE + 0x5035c, 0x2d0003fc);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xdc00121);
+       MDP_OUTP(MDP_BASE + 0x50360, 0x2b0003fb);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf400125);
+       MDP_OUTP(MDP_BASE + 0x50364, 0x28c003fa);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x11000128);
+       MDP_OUTP(MDP_BASE + 0x50368, 0x268003f9);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x12c0012a);
+       MDP_OUTP(MDP_BASE + 0x5036c, 0x244003f9);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1480012c);
+       MDP_OUTP(MDP_BASE + 0x50370, 0x224003f8);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1640012e);
+       MDP_OUTP(MDP_BASE + 0x50374, 0x200003f8);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1800012f);
+       MDP_OUTP(MDP_BASE + 0x50378, 0x1e0003f8);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x1a00012f);
+       MDP_OUTP(MDP_BASE + 0x5037c, 0x1c0003f8);
+}
+
+static void mdp_load_bc_downscale_table_x_point8TO1(void)
+{
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50280, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xff80000d);
+       MDP_OUTP(MDP_BASE + 0x50284, 0x7ec003f9);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xfec0001c);
+       MDP_OUTP(MDP_BASE + 0x50288, 0x7d4003f3);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xfe40002b);
+       MDP_OUTP(MDP_BASE + 0x5028c, 0x7b8003ed);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xfd80003c);
+       MDP_OUTP(MDP_BASE + 0x50290, 0x794003e8);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xfcc0004d);
+       MDP_OUTP(MDP_BASE + 0x50294, 0x76c003e4);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xfc40005f);
+       MDP_OUTP(MDP_BASE + 0x50298, 0x73c003e0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xfb800071);
+       MDP_OUTP(MDP_BASE + 0x5029c, 0x708003de);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xfac00085);
+       MDP_OUTP(MDP_BASE + 0x502a0, 0x6d0003db);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xfa000098);
+       MDP_OUTP(MDP_BASE + 0x502a4, 0x698003d9);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf98000ac);
+       MDP_OUTP(MDP_BASE + 0x502a8, 0x654003d8);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf8c000c1);
+       MDP_OUTP(MDP_BASE + 0x502ac, 0x610003d7);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf84000d5);
+       MDP_OUTP(MDP_BASE + 0x502b0, 0x5c8003d7);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf7c000e9);
+       MDP_OUTP(MDP_BASE + 0x502b4, 0x580003d7);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf74000fd);
+       MDP_OUTP(MDP_BASE + 0x502b8, 0x534003d8);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf6c00112);
+       MDP_OUTP(MDP_BASE + 0x502bc, 0x4e8003d8);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf6800126);
+       MDP_OUTP(MDP_BASE + 0x502c0, 0x494003da);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf600013a);
+       MDP_OUTP(MDP_BASE + 0x502c4, 0x448003db);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf600014d);
+       MDP_OUTP(MDP_BASE + 0x502c8, 0x3f4003dd);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf5c00160);
+       MDP_OUTP(MDP_BASE + 0x502cc, 0x3a4003df);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf5c00172);
+       MDP_OUTP(MDP_BASE + 0x502d0, 0x354003e1);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf5c00184);
+       MDP_OUTP(MDP_BASE + 0x502d4, 0x304003e3);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf6000195);
+       MDP_OUTP(MDP_BASE + 0x502d8, 0x2b0003e6);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf64001a6);
+       MDP_OUTP(MDP_BASE + 0x502dc, 0x260003e8);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf6c001b4);
+       MDP_OUTP(MDP_BASE + 0x502e0, 0x214003eb);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf78001c2);
+       MDP_OUTP(MDP_BASE + 0x502e4, 0x1c4003ee);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf80001cf);
+       MDP_OUTP(MDP_BASE + 0x502e8, 0x17c003f1);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf90001db);
+       MDP_OUTP(MDP_BASE + 0x502ec, 0x134003f3);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xfa0001e5);
+       MDP_OUTP(MDP_BASE + 0x502f0, 0xf0003f6);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xfb4001ee);
+       MDP_OUTP(MDP_BASE + 0x502f4, 0xac003f9);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xfcc001f5);
+       MDP_OUTP(MDP_BASE + 0x502f8, 0x70003fb);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xfe4001fb);
+       MDP_OUTP(MDP_BASE + 0x502fc, 0x34003fe);
+}
+
+static void mdp_load_bc_downscale_table_y_point8TO1(void)
+{
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0x0);
+       MDP_OUTP(MDP_BASE + 0x50300, 0x7fc00000);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xff80000d);
+       MDP_OUTP(MDP_BASE + 0x50304, 0x7ec003f9);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xfec0001c);
+       MDP_OUTP(MDP_BASE + 0x50308, 0x7d4003f3);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xfe40002b);
+       MDP_OUTP(MDP_BASE + 0x5030c, 0x7b8003ed);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xfd80003c);
+       MDP_OUTP(MDP_BASE + 0x50310, 0x794003e8);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xfcc0004d);
+       MDP_OUTP(MDP_BASE + 0x50314, 0x76c003e4);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xfc40005f);
+       MDP_OUTP(MDP_BASE + 0x50318, 0x73c003e0);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xfb800071);
+       MDP_OUTP(MDP_BASE + 0x5031c, 0x708003de);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xfac00085);
+       MDP_OUTP(MDP_BASE + 0x50320, 0x6d0003db);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xfa000098);
+       MDP_OUTP(MDP_BASE + 0x50324, 0x698003d9);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf98000ac);
+       MDP_OUTP(MDP_BASE + 0x50328, 0x654003d8);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf8c000c1);
+       MDP_OUTP(MDP_BASE + 0x5032c, 0x610003d7);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf84000d5);
+       MDP_OUTP(MDP_BASE + 0x50330, 0x5c8003d7);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf7c000e9);
+       MDP_OUTP(MDP_BASE + 0x50334, 0x580003d7);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf74000fd);
+       MDP_OUTP(MDP_BASE + 0x50338, 0x534003d8);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf6c00112);
+       MDP_OUTP(MDP_BASE + 0x5033c, 0x4e8003d8);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf6800126);
+       MDP_OUTP(MDP_BASE + 0x50340, 0x494003da);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf600013a);
+       MDP_OUTP(MDP_BASE + 0x50344, 0x448003db);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf600014d);
+       MDP_OUTP(MDP_BASE + 0x50348, 0x3f4003dd);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf5c00160);
+       MDP_OUTP(MDP_BASE + 0x5034c, 0x3a4003df);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf5c00172);
+       MDP_OUTP(MDP_BASE + 0x50350, 0x354003e1);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf5c00184);
+       MDP_OUTP(MDP_BASE + 0x50354, 0x304003e3);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf6000195);
+       MDP_OUTP(MDP_BASE + 0x50358, 0x2b0003e6);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf64001a6);
+       MDP_OUTP(MDP_BASE + 0x5035c, 0x260003e8);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf6c001b4);
+       MDP_OUTP(MDP_BASE + 0x50360, 0x214003eb);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf78001c2);
+       MDP_OUTP(MDP_BASE + 0x50364, 0x1c4003ee);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf80001cf);
+       MDP_OUTP(MDP_BASE + 0x50368, 0x17c003f1);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xf90001db);
+       MDP_OUTP(MDP_BASE + 0x5036c, 0x134003f3);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xfa0001e5);
+       MDP_OUTP(MDP_BASE + 0x50370, 0xf0003f6);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xfb4001ee);
+       MDP_OUTP(MDP_BASE + 0x50374, 0xac003f9);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xfcc001f5);
+       MDP_OUTP(MDP_BASE + 0x50378, 0x70003fb);
+       MDP_OUTP(MDP_BASE + 0x5fffc, 0xfe4001fb);
+       MDP_OUTP(MDP_BASE + 0x5037c, 0x34003fe);
+}
+
+static int mdp_get_edge_cond(MDPIBUF *iBuf, uint32 *dup, uint32 *dup2)
+{
+       uint32 reg;
+       uint32 dst_roi_width;   /* Dimensions of DST ROI. */
+       uint32 dst_roi_height;  /* Used to calculate scaling ratios. */
+
+       /*
+        * positions of the luma pixel(relative to the image ) required for
+        * scaling the ROI
+        */
+       int32 luma_interp_point_left = 0; /* left-most luma pixel needed */
+       int32 luma_interp_point_right = 0; /* right-most luma pixel needed */
+       int32 luma_interp_point_top = 0; /* top-most luma pixel needed */
+       int32 luma_interp_point_bottom = 0; /* bottom-most luma pixel needed */
+
+       /*
+        * positions of the chroma pixel(relative to the image ) required for
+        * interpolating a chroma value at all required luma positions
+        */
+       /* left-most chroma pixel needed */
+       int32 chroma_interp_point_left = 0;
+       /* right-most chroma pixel needed */
+       int32 chroma_interp_point_right = 0;
+       /* top-most chroma pixel needed */
+       int32 chroma_interp_point_top = 0;
+       /* bottom-most chroma pixel needed */
+       int32 chroma_interp_point_bottom = 0;
+
+       /*
+        * a rectangular region within the chroma plane of the "image".
+        * Chroma pixels falling inside of this rectangle belongs to the ROI
+        */
+       int32 chroma_bound_left = 0;
+       int32 chroma_bound_right = 0;
+       int32 chroma_bound_top = 0;
+       int32 chroma_bound_bottom = 0;
+
+       /*
+        * number of chroma pixels to replicate on the left, right,
+        * top and bottom edge of the ROI.
+        */
+       int32 chroma_repeat_left = 0;
+       int32 chroma_repeat_right = 0;
+       int32 chroma_repeat_top = 0;
+       int32 chroma_repeat_bottom = 0;
+
+       /*
+        * number of luma pixels to replicate on the left, right,
+        * top and bottom edge of the ROI.
+        */
+       int32 luma_repeat_left = 0;
+       int32 luma_repeat_right = 0;
+       int32 luma_repeat_top = 0;
+       int32 luma_repeat_bottom = 0;
+
+       boolean chroma_edge_enable;
+
+       uint32 _is_scale_enabled = 0;
+       uint32 _is_yuv_offsite_vertical = 0;
+
+       /* fg edge duplicate */
+       reg = 0x0;
+
+       if (iBuf->mdpImg.mdpOp & MDPOP_ASCALE) {        /* if scaling enabled */
+
+               _is_scale_enabled = 1;
+
+               /*
+                * if rotation mode involves a 90 deg rotation, flip
+                * dst_roi_width with dst_roi_height.
+                * Scaling ratios is based on source ROI dimensions, and
+                * dst ROI dimensions before rotation.
+                */
+               if (iBuf->mdpImg.mdpOp & MDPOP_ROT90) {
+                       dst_roi_width = iBuf->roi.dst_height;
+                       dst_roi_height = iBuf->roi.dst_width;
+               } else {
+                       dst_roi_width = iBuf->roi.dst_width;
+                       dst_roi_height = iBuf->roi.dst_height;
+               }
+
+               /*
+                * Find out the luma pixels needed for scaling in the
+                * x direction (LEFT and RIGHT).  Locations of pixels are
+                * relative to the ROI. Upper-left corner of ROI corresponds
+                * to coordinates (0,0). Also set the number of luma pixel
+                * to repeat.
+                */
+               if (iBuf->roi.width > 3 * dst_roi_width) {
+                       /* scale factor < 1/3 */
+                       luma_interp_point_left = 0;
+                       luma_interp_point_right = (iBuf->roi.width - 1);
+                       luma_repeat_left = 0;
+                       luma_repeat_right = 0;
+               } else if (iBuf->roi.width == 3 * dst_roi_width) {
+                       /* scale factor == 1/3 */
+                       luma_interp_point_left = 0;
+                       luma_interp_point_right = (iBuf->roi.width - 1) + 1;
+                       luma_repeat_left = 0;
+                       luma_repeat_right = 1;
+               } else if ((iBuf->roi.width > dst_roi_width) &&
+                          (iBuf->roi.width < 3 * dst_roi_width)) {
+                       /* 1/3 < scale factor < 1 */
+                       luma_interp_point_left = -1;
+                       luma_interp_point_right = (iBuf->roi.width - 1) + 1;
+                       luma_repeat_left = 1;
+                       luma_repeat_right = 1;
+               }
+
+               else if (iBuf->roi.width == dst_roi_width) {
+                       /* scale factor == 1 */
+                       luma_interp_point_left = -1;
+                       luma_interp_point_right = (iBuf->roi.width - 1) + 2;
+                       luma_repeat_left = 1;
+                       luma_repeat_right = 2;
+               } else {        /* (iBuf->roi.width < dst_roi_width) */
+                         /* scale factor > 1 */
+                       luma_interp_point_left = -2;
+                       luma_interp_point_right = (iBuf->roi.width - 1) + 2;
+                       luma_repeat_left = 2;
+                       luma_repeat_right = 2;
+               }
+
+               /*
+                * Find out the number of pixels needed for scaling in the
+                * y direction (TOP and BOTTOM).  Locations of pixels are
+                * relative to the ROI. Upper-left corner of ROI corresponds
+                * to coordinates (0,0). Also set the number of luma pixel
+                * to repeat.
+                */
+               if (iBuf->roi.height > 3 * dst_roi_height) {
+                       /* scale factor < 1/3 */
+                       luma_interp_point_top = 0;
+                       luma_interp_point_bottom = (iBuf->roi.height - 1);
+                       luma_repeat_top = 0;
+                       luma_repeat_bottom = 0;
+               } else if (iBuf->roi.height == 3 * dst_roi_height) {
+                       /* scale factor == 1/3 */
+                       luma_interp_point_top = 0;
+                       luma_interp_point_bottom = (iBuf->roi.height - 1) + 1;
+                       luma_repeat_top = 0;
+                       luma_repeat_bottom = 1;
+               } else if ((iBuf->roi.height > dst_roi_height) &&
+                          (iBuf->roi.height < 3 * dst_roi_height)) {
+                       /* 1/3 < scale factor < 1 */
+                       luma_interp_point_top = -1;
+                       luma_interp_point_bottom = (iBuf->roi.height - 1) + 1;
+                       luma_repeat_top = 1;
+                       luma_repeat_bottom = 1;
+               } else if (iBuf->roi.height == dst_roi_height) {
+                       /* scale factor == 1 */
+                       luma_interp_point_top = -1;
+                       luma_interp_point_bottom = (iBuf->roi.height - 1) + 2;
+                       luma_repeat_top = 1;
+                       luma_repeat_bottom = 2;
+               } else {        /* (iBuf->roi.height < dst_roi_height) */
+                        /* scale factor > 1 */
+                       luma_interp_point_top = -2;
+                       luma_interp_point_bottom = (iBuf->roi.height - 1) + 2;
+                       luma_repeat_top = 2;
+                       luma_repeat_bottom = 2;
+               }
+       }                       /* if (iBuf->scale.scale_flag) */
+       else {                  /* scaling disabled */
+               /*
+                * Since no scaling needed, Tile Fetch does not require any
+                * more luma pixel than what the ROI contains.
+                */
+               luma_interp_point_left = (int32) 0;
+               luma_interp_point_right = (int32) (iBuf->roi.width - 1);
+               luma_interp_point_top = (int32) 0;
+               luma_interp_point_bottom = (int32) (iBuf->roi.height - 1);
+
+               luma_repeat_left = 0;
+               luma_repeat_right = 0;
+               luma_repeat_top = 0;
+               luma_repeat_bottom = 0;
+       }
+
+       /* After adding the ROI offsets, we have locations of
+        * luma_interp_points relative to the image.
+        */
+       luma_interp_point_left += (int32) (iBuf->roi.x);
+       luma_interp_point_right += (int32) (iBuf->roi.x);
+       luma_interp_point_top += (int32) (iBuf->roi.y);
+       luma_interp_point_bottom += (int32) (iBuf->roi.y);
+
+       /*
+        * After adding the ROI offsets, we have locations of
+        * chroma_interp_points relative to the image.
+        */
+       chroma_interp_point_left = luma_interp_point_left;
+       chroma_interp_point_right = luma_interp_point_right;
+       chroma_interp_point_top = luma_interp_point_top;
+       chroma_interp_point_bottom = luma_interp_point_bottom;
+
+       chroma_edge_enable = TRUE;
+       /* find out which chroma pixels are needed for chroma upsampling. */
+       switch (iBuf->mdpImg.imgType) {
+               /*
+                * cosite in horizontal axis
+                * fully sampled in vertical axis
+                */
+       case MDP_Y_CBCR_H2V1:
+       case MDP_Y_CRCB_H2V1:
+       case MDP_YCRYCB_H2V1:
+               /* floor( luma_interp_point_left / 2 ); */
+               chroma_interp_point_left = luma_interp_point_left >> 1;
+               /* floor( ( luma_interp_point_right + 1 ) / 2 ); */
+               chroma_interp_point_right = (luma_interp_point_right + 1) >> 1;
+
+               chroma_interp_point_top = luma_interp_point_top;
+               chroma_interp_point_bottom = luma_interp_point_bottom;
+               break;
+
+               /*
+                * cosite in horizontal axis
+                * offsite in vertical axis
+                */
+       case MDP_Y_CBCR_H2V2:
+       case MDP_Y_CRCB_H2V2:
+               /* floor( luma_interp_point_left / 2) */
+               chroma_interp_point_left = luma_interp_point_left >> 1;
+
+               /* floor( ( luma_interp_point_right + 1 )/ 2 ) */
+               chroma_interp_point_right = (luma_interp_point_right + 1) >> 1;
+
+               /* floor( (luma_interp_point_top - 1 ) / 2 ) */
+               chroma_interp_point_top = (luma_interp_point_top - 1) >> 1;
+
+               /* floor( ( luma_interp_point_bottom + 1 ) / 2 ) */
+               chroma_interp_point_bottom =
+                   (luma_interp_point_bottom + 1) >> 1;
+
+               _is_yuv_offsite_vertical = 1;
+               break;
+
+       default:
+               chroma_edge_enable = FALSE;
+               chroma_interp_point_left = luma_interp_point_left;
+               chroma_interp_point_right = luma_interp_point_right;
+               chroma_interp_point_top = luma_interp_point_top;
+               chroma_interp_point_bottom = luma_interp_point_bottom;
+
+               break;
+       }
+
+       /* only if the image type is in YUV domain, we calculate chroma edge */
+       if (chroma_edge_enable) {
+               /* Defines which chroma pixels belongs to the roi */
+               switch (iBuf->mdpImg.imgType) {
+                       /*
+                        * Cosite in horizontal direction, and fully sampled
+                        * in vertical direction.
+                        */
+               case MDP_Y_CBCR_H2V1:
+               case MDP_Y_CRCB_H2V1:
+               case MDP_YCRYCB_H2V1:
+                       /*
+                        * width of chroma ROI is 1/2 of size of luma ROI
+                        * height of chroma ROI same as size of luma ROI
+                        */
+                       chroma_bound_left = iBuf->roi.x / 2;
+
+                       /* there are half as many chroma pixel as luma pixels */
+                       chroma_bound_right =
+                           (iBuf->roi.width + iBuf->roi.x - 1) / 2;
+                       chroma_bound_top = iBuf->roi.y;
+                       chroma_bound_bottom =
+                           (iBuf->roi.height + iBuf->roi.y - 1);
+                       break;
+
+               case MDP_Y_CBCR_H2V2:
+               case MDP_Y_CRCB_H2V2:
+                       /*
+                        * cosite in horizontal dir, and offsite in vertical dir
+                        * width of chroma ROI is 1/2 of size of luma ROI
+                        * height of chroma ROI is 1/2 of size of luma ROI
+                        */
+
+                       chroma_bound_left = iBuf->roi.x / 2;
+                       chroma_bound_right =
+                           (iBuf->roi.width + iBuf->roi.x - 1) / 2;
+                       chroma_bound_top = iBuf->roi.y / 2;
+                       chroma_bound_bottom =
+                           (iBuf->roi.height + iBuf->roi.y - 1) / 2;
+                       break;
+
+               default:
+                       /*
+                        * If no valid chroma sub-sampling format specified,
+                        * assume 4:4:4 ( i.e. fully sampled).  Set ROI
+                        * boundaries for chroma same as ROI boundaries for
+                        * luma.
+                        */
+                       chroma_bound_left = iBuf->roi.x;
+                       chroma_bound_right = iBuf->roi.width + iBuf->roi.x - 1;
+                       chroma_bound_top = iBuf->roi.y;
+                       chroma_bound_bottom =
+                           (iBuf->roi.height + iBuf->roi.y - 1);
+                       break;
+               }
+
+               /*
+                * Knowing which chroma pixels are needed, and which chroma
+                * pixels belong to the ROI (i.e. available for fetching ),
+                * calculate how many chroma pixels Tile Fetch needs to
+                * duplicate.  If any required chroma pixels falls outside
+                * of the ROI, Tile Fetch must obtain them by replicating
+                * pixels.
+                */
+               if (chroma_bound_left > chroma_interp_point_left)
+                       chroma_repeat_left =
+                           chroma_bound_left - chroma_interp_point_left;
+               else
+                       chroma_repeat_left = 0;
+
+               if (chroma_interp_point_right > chroma_bound_right)
+                       chroma_repeat_right =
+                           chroma_interp_point_right - chroma_bound_right;
+               else
+                       chroma_repeat_right = 0;
+
+               if (chroma_bound_top > chroma_interp_point_top)
+                       chroma_repeat_top =
+                           chroma_bound_top - chroma_interp_point_top;
+               else
+                       chroma_repeat_top = 0;
+
+               if (chroma_interp_point_bottom > chroma_bound_bottom)
+                       chroma_repeat_bottom =
+                           chroma_interp_point_bottom - chroma_bound_bottom;
+               else
+                       chroma_repeat_bottom = 0;
+
+               if (_is_scale_enabled && (iBuf->roi.height == 1)
+                   && _is_yuv_offsite_vertical) {
+                       chroma_repeat_bottom = 3;
+                       chroma_repeat_top = 0;
+               }
+       }
+       /* make sure chroma repeats are non-negative */
+       if ((chroma_repeat_left < 0) || (chroma_repeat_right < 0) ||
+           (chroma_repeat_top < 0) || (chroma_repeat_bottom < 0))
+               return -1;
+
+       /* make sure chroma repeats are no larger than 3 pixels */
+       if ((chroma_repeat_left > 3) || (chroma_repeat_right > 3) ||
+           (chroma_repeat_top > 3) || (chroma_repeat_bottom > 3))
+               return -1;
+
+       /* make sure luma repeats are non-negative */
+       if ((luma_repeat_left < 0) || (luma_repeat_right < 0) ||
+           (luma_repeat_top < 0) || (luma_repeat_bottom < 0))
+               return -1;
+
+       /* make sure luma repeats are no larger than 3 pixels */
+       if ((luma_repeat_left > 3) || (luma_repeat_right > 3) ||
+           (luma_repeat_top > 3) || (luma_repeat_bottom > 3))
+               return -1;
+
+       /* write chroma_repeat_left to register */
+       reg |= (chroma_repeat_left & 3) << MDP_LEFT_CHROMA;
+
+       /* write chroma_repeat_right to register */
+       reg |= (chroma_repeat_right & 3) << MDP_RIGHT_CHROMA;
+
+       /* write chroma_repeat_top to register */
+       reg |= (chroma_repeat_top & 3) << MDP_TOP_CHROMA;
+
+       /* write chroma_repeat_bottom to register */
+       reg |= (chroma_repeat_bottom & 3) << MDP_BOTTOM_CHROMA;
+
+       /* write luma_repeat_left to register */
+       reg |= (luma_repeat_left & 3) << MDP_LEFT_LUMA;
+
+       /* write luma_repeat_right to register */
+       reg |= (luma_repeat_right & 3) << MDP_RIGHT_LUMA;
+
+       /* write luma_repeat_top to register */
+       reg |= (luma_repeat_top & 3) << MDP_TOP_LUMA;
+
+       /* write luma_repeat_bottom to register */
+       reg |= (luma_repeat_bottom & 3) << MDP_BOTTOM_LUMA;
+
+       /* done with reg */
+       *dup = reg;
+
+       /* bg edge duplicate */
+       reg = 0x0;
+
+       switch (iBuf->ibuf_type) {
+       case MDP_Y_CBCR_H2V2:
+       case MDP_Y_CRCB_H2V2:
+               /*
+                * Edge condition for MDP_Y_CRCB/CBCR_H2V2 cosite only.
+                * For 420 cosite, 1 chroma replicated on all sides except
+                * left, so reg 101b8 should be 0x0209. For 420 offsite,
+                * 1 chroma replicated all sides.
+                */
+               if (iBuf->roi.lcd_y == 0) {
+                       reg |= BIT(MDP_TOP_CHROMA);
+               }
+
+               if ((iBuf->roi.lcd_y + iBuf->roi.dst_height) ==
+                   iBuf->ibuf_height) {
+                       reg |= BIT(MDP_BOTTOM_CHROMA);
+               }
+
+               if (((iBuf->roi.lcd_x + iBuf->roi.dst_width) ==
+                    iBuf->ibuf_width) && ((iBuf->roi.dst_width % 2) == 0)) {
+                       reg |= BIT(MDP_RIGHT_CHROMA);
+               }
+
+               break;
+
+       case MDP_Y_CBCR_H2V1:
+       case MDP_Y_CRCB_H2V1:
+       case MDP_YCRYCB_H2V1:
+               if (((iBuf->roi.lcd_x + iBuf->roi.dst_width) ==
+                    iBuf->ibuf_width) && ((iBuf->roi.dst_width % 2) == 0)) {
+                       reg |= BIT(MDP_RIGHT_CHROMA);
+               }
+               break;
+       default:
+               break;
+       }
+
+       *dup2 = reg;
+
+       return 0;
+}
+
+#define ADJUST_IP              /* for 1/3 scale factor fix */
+
+static int mdp_calc_scale_params(
+/* ROI origin coordinate for the dimension */
+                                       uint32 org,
+/* src ROI dimension */
+                                       uint32 dim_in,
+/* scaled ROI dimension*/
+                                       uint32 dim_out,
+/* is this ROI width dimension? */
+                                       boolean is_W,
+/* initial phase location address */
+                                       int32 *phase_init_ptr,
+/* phase increment location address */
+                                       uint32 *phase_step_ptr,
+/* ROI start over-fetch location address */
+                                       uint32 *num_repl_beg_ptr,
+/* ROI end over-fetch location address */
+                                       uint32 *num_repl_end_ptr)
+{
+       boolean rpa_on = FALSE;
+       int init_phase = 0;
+       uint32 beg_of = 0;
+       uint32 end_of = 0;
+       uint64 numer = 0;
+       uint64 denom = 0;
+       /*uint64 inverter = 1; */
+       int64 point5 = 1;
+       int64 one = 1;
+       int64 k1, k2, k3, k4;   /* linear equation coefficients */
+       uint64 int_mask;
+       uint64 fract_mask;
+       uint64 Os;
+       int64 Osprime;
+       int64 Od;
+       int64 Odprime;
+       int64 Oreq;
+       uint64 Es;
+       uint64 Ed;
+       uint64 Ereq;
+#ifdef ADJUST_IP
+       int64 IP64;
+       int64 delta;
+#endif
+       uint32 mult;
+
+       /*
+        * The phase accumulator should really be rational for all cases in a
+        * general purpose polyphase scaler for a tiled architecture with
+        * non-zero * origin capability because there is no way to represent
+        * certain scale factors in fixed point regardless of precision.
+        * The error incurred in attempting to use fixed point is most
+        * eggregious for SF where 1/SF is an integral multiple of 1/3.
+        *
+        * However, since the MDP2 has already been committed to HW, we
+        * only use the rational phase accumulator (RPA) when 1/SF is an
+        * integral multiple of 1/3.  This will help minimize regressions in
+        * matching the HW to the C-Sim.
+        */
+       /*
+        * Set the RPA flag for this dimension.
+        *
+        * In order for 1/SF (dim_in/dim_out) to be an integral multiple of
+        * 1/3, dim_out must be an integral multiple of 3.
+        */
+       if (!(dim_out % 3)) {
+               mult = dim_out / 3;
+               rpa_on = (!(dim_in % mult));
+       }
+
+       numer = dim_out;
+       denom = dim_in;
+
+       /*
+        * convert to U30.34 before division
+        *
+        * The K vectors carry 4 extra bits of precision
+        * and are rounded.
+        *
+        * We initially go 5 bits over then round by adding
+        * 1 and right shifting by 1
+        * so final result is U31.33
+        */
+       numer <<= PQF_PLUS_5;
+
+       /* now calculate the scale factor (aka k3) */
+       k3 = ((mdp_do_div(numer, denom) + 1) >> 1);
+
+       /* check scale factor for legal range [0.25 - 4.0] */
+       if (((k3 >> 4) < (1LL << PQF_MINUS_2)) ||
+           ((k3 >> 4) > (1LL << PQF_PLUS_2))) {
+               return -1;
+       }
+
+       /* calculate inverse scale factor (aka k1) for phase init */
+       numer = dim_in;
+       denom = dim_out;
+       numer <<= PQF_PLUS_5;
+       k1 = ((mdp_do_div(numer, denom) + 1) >> 1);
+
+       /*
+        * calculate initial phase and ROI overfetch
+        */
+       /* convert point5 & one to S39.24 (will always be positive) */
+       point5 <<= (PQF_PLUS_4 - 1);
+       one <<= PQF_PLUS_4;
+       k2 = ((k1 - one) >> 1);
+       init_phase = (int)(k2 >> 4);
+       k4 = ((k3 - one) >> 1);
+       if (k3 == one) {
+               /* the simple case; SF = 1.0 */
+               beg_of = 1;
+               end_of = 2;
+       } else {
+               /* calculate the masks */
+               fract_mask = one - 1;
+               int_mask = ~fract_mask;
+
+               if (!rpa_on) {
+                       /*
+                        * FIXED POINT IMPLEMENTATION
+                        */
+                       if (!org) {
+                               /* A fairly simple case; ROI origin = 0 */
+                               if (k1 < one) {
+                                       /* upscaling */
+                                       beg_of = end_of = 2;
+                               }
+                               /* 0.33 <= SF < 1.0 */
+                               else if (k1 < (3LL << PQF_PLUS_4))
+                                       beg_of = end_of = 1;
+                               /* 0.33 == SF */
+                               else if (k1 == (3LL << PQF_PLUS_4)) {
+                                       beg_of = 0;
+                                       end_of = 1;
+                               }
+                               /* 0.25 <= SF < 0.33 */
+                               else
+                                       beg_of = end_of = 0;
+                       } else {
+                               /*
+                                * The complicated case; ROI origin != 0
+                                * init_phase needs to be adjusted
+                                * OF is also position dependent
+                                */
+
+                               /* map (org - .5) into destination space */
+                               Os = ((uint64) org << 1) - 1;
+                               Od = ((k3 * Os) >> 1) + k4;
+
+                               /* take the ceiling */
+                               Odprime = (Od & int_mask);
+                               if (Odprime != Od)
+                                       Odprime += one;
+
+                               /* now map that back to source space */
+                               Osprime = (k1 * (Odprime >> PQF_PLUS_4)) + k2;
+
+                               /* then floor & decrement to calculate the required
+                                  starting coordinate */
+                               Oreq = (Osprime & int_mask) - one;
+
+                               /* calculate end coord in destination space then map to
+                                  source space */
+                               Ed = Odprime +
+                                   ((uint64) dim_out << PQF_PLUS_4) - one;
+                               Es = (k1 * (Ed >> PQF_PLUS_4)) + k2;
+
+                               /* now floor & increment by 2 to calculate the required
+                                  ending coordinate */
+                               Ereq = (Es & int_mask) + (one << 1);
+
+                               /* calculate initial phase */
+#ifdef ADJUST_IP
+
+                               IP64 = Osprime - Oreq;
+                               delta = ((int64) (org) << PQF_PLUS_4) - Oreq;
+                               IP64 -= delta;
+
+                               /* limit to valid range before the left shift */
+                               delta = (IP64 & (1LL << 63)) ? 4 : -4;
+                               delta <<= PQF_PLUS_4;
+                               while (abs((int)(IP64 >> PQF_PLUS_4)) > 4)
+                                       IP64 += delta;
+
+                               /* right shift to account for extra bits of precision */
+                               init_phase = (int)(IP64 >> 4);
+
+#else /* ADJUST_IP */
+
+                               /* just calculate the real initial phase */
+                               init_phase = (int)((Osprime - Oreq) >> 4);
+
+#endif /* ADJUST_IP */
+
+                               /* calculate the overfetch */
+                               beg_of = org - (uint32) (Oreq >> PQF_PLUS_4);
+                               end_of =
+                                   (uint32) (Ereq >> PQF_PLUS_4) - (org +
+                                                                    dim_in -
+                                                                    1);
+                       }
+               } else {
+                       /*
+                        * RPA IMPLEMENTATION
+                        *
+                        * init_phase needs to be calculated in all RPA_on cases
+                        * because it's a numerator, not a fixed point value.
+                        */
+
+                       /* map (org - .5) into destination space */
+                       Os = ((uint64) org << PQF_PLUS_4) - point5;
+                       Od = mdp_do_div((dim_out * (Os + point5)),
+                                       dim_in) - point5;
+
+                       /* take the ceiling */
+                       Odprime = (Od & int_mask);
+                       if (Odprime != Od)
+                               Odprime += one;
+
+                       /* now map that back to source space */
+                       Osprime =
+                           mdp_do_div((dim_in * (Odprime + point5)),
+                                      dim_out) - point5;
+
+                       /* then floor & decrement to calculate the required
+                          starting coordinate */
+                       Oreq = (Osprime & int_mask) - one;
+
+                       /* calculate end coord in destination space then map to
+                          source space */
+                       Ed = Odprime + ((uint64) dim_out << PQF_PLUS_4) - one;
+                       Es = mdp_do_div((dim_in * (Ed + point5)),
+                                       dim_out) - point5;
+
+                       /* now floor & increment by 2 to calculate the required
+                          ending coordinate */
+                       Ereq = (Es & int_mask) + (one << 1);
+
+                       /* calculate initial phase */
+
+#ifdef ADJUST_IP
+
+                       IP64 = Osprime - Oreq;
+                       delta = ((int64) (org) << PQF_PLUS_4) - Oreq;
+                       IP64 -= delta;
+
+                       /* limit to valid range before the left shift */
+                       delta = (IP64 & (1LL << 63)) ? 4 : -4;
+                       delta <<= PQF_PLUS_4;
+                       while (abs((int)(IP64 >> PQF_PLUS_4)) > 4)
+                               IP64 += delta;
+
+                       /* right shift to account for extra bits of precision */
+                       init_phase = (int)(IP64 >> 4);
+
+#else /* ADJUST_IP */
+
+                       /* just calculate the real initial phase */
+                       init_phase = (int)((Osprime - Oreq) >> 4);
+
+#endif /* ADJUST_IP */
+
+                       /* calculate the overfetch */
+                       beg_of = org - (uint32) (Oreq >> PQF_PLUS_4);
+                       end_of =
+                           (uint32) (Ereq >> PQF_PLUS_4) - (org + dim_in - 1);
+               }
+       }
+
+       /* return the scale parameters */
+       *phase_init_ptr = init_phase;
+       *phase_step_ptr = (uint32) (k1 >> 4);
+       *num_repl_beg_ptr = beg_of;
+       *num_repl_end_ptr = end_of;
+
+       return 0;
+}
+
+static uint8 *mdp_adjust_rot_addr(MDPIBUF *iBuf, uint8 *addr, uint32 uv)
+{
+       uint32 dest_ystride = iBuf->ibuf_width * iBuf->bpp;
+       uint32 h_slice = 1;
+
+       if (uv && ((iBuf->ibuf_type == MDP_Y_CBCR_H2V2) ||
+               (iBuf->ibuf_type == MDP_Y_CRCB_H2V2)))
+               h_slice = 2;
+
+       if (MDP_CHKBIT(iBuf->mdpImg.mdpOp, MDPOP_ROT90) ^
+           MDP_CHKBIT(iBuf->mdpImg.mdpOp, MDPOP_LR)) {
+               addr =
+                   addr + (iBuf->roi.dst_width -
+                           MIN(16, iBuf->roi.dst_width)) * iBuf->bpp;
+       }
+       if (MDP_CHKBIT(iBuf->mdpImg.mdpOp, MDPOP_UD)) {
+               addr =
+                   addr + ((iBuf->roi.dst_height -
+                       MIN(16, iBuf->roi.dst_height))/h_slice) * dest_ystride;
+       }
+
+       return addr;
+}
+
+void mdp_set_scale(MDPIBUF *iBuf,
+                  uint32 dst_roi_width,
+                  uint32 dst_roi_height,
+                  boolean inputRGB, boolean outputRGB, uint32 *pppop_reg_ptr)
+{
+       uint32 dst_roi_width_scale;
+       uint32 dst_roi_height_scale;
+       boolean use_pr;
+       uint32 phasex_step = 0;
+       uint32 phasey_step = 0;
+       int32 phasex_init = 0;
+       int32 phasey_init = 0;
+       uint32 lines_dup = 0;
+       uint32 lines_dup_bg = 0;
+       uint32 dummy;
+       uint32 mdp_blur = 0;
+
+       if (iBuf->mdpImg.mdpOp & MDPOP_ASCALE) {
+               if (iBuf->mdpImg.mdpOp & MDPOP_ROT90) {
+                       dst_roi_width_scale = dst_roi_height;
+                       dst_roi_height_scale = dst_roi_width;
+               } else {
+                       dst_roi_width_scale = dst_roi_width;
+                       dst_roi_height_scale = dst_roi_height;
+               }
+
+               mdp_blur = iBuf->mdpImg.mdpOp & MDPOP_BLUR;
+
+               if ((dst_roi_width_scale != iBuf->roi.width) ||
+                   (dst_roi_height_scale != iBuf->roi.height) ||
+                       mdp_blur) {
+                       *pppop_reg_ptr |=
+                           (PPP_OP_SCALE_Y_ON | PPP_OP_SCALE_X_ON);
+
+               /* let's use SHIM logic to calculate the partial ROI scaling */
+#if 0
+                       phasex_step =
+                           (uint32) mdp_do_div(0x20000000 * iBuf->roi.width,
+                                               dst_roi_width_scale);
+                       phasey_step =
+                           (uint32) mdp_do_div(0x20000000 * iBuf->roi.height,
+                                               dst_roi_height_scale);
+
+/*
+    phasex_step= ((long long) iBuf->roi.width * 0x20000000)/dst_roi_width_scale;
+    phasey_step= ((long long)iBuf->roi.height * 0x20000000)/dst_roi_height_scale;
+*/
+
+                       phasex_init =
+                           (((long long)phasex_step - 0x20000000) >> 1);
+                       phasey_init =
+                           (((long long)phasey_step - 0x20000000) >> 1);
+
+#else
+                       mdp_calc_scale_params(iBuf->roi.x, iBuf->roi.width,
+                                             dst_roi_width_scale, 1,
+                                             &phasex_init, &phasex_step,
+                                             &dummy, &dummy);
+                       mdp_calc_scale_params(iBuf->roi.y, iBuf->roi.height,
+                                             dst_roi_height_scale, 0,
+                                             &phasey_init, &phasey_step,
+                                             &dummy, &dummy);
+#endif
+                       MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x013c,
+                                phasex_init);
+                       MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x0140,
+                                phasey_init);
+                       MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x0144,
+                                phasex_step);
+                       MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x0148,
+                                phasey_step);
+
+                       use_pr = (inputRGB) && (outputRGB);
+
+                       if ((dst_roi_width_scale > iBuf->roi.width) ||
+                           (dst_roi_height_scale > iBuf->roi.height)) {
+                               if ((use_pr)
+                                   && (mdp_curr_up_scale_xy !=
+                                       MDP_PR_SCALE_UP)) {
+                                       mdp_load_pr_upscale_table();
+                                       mdp_curr_up_scale_xy = MDP_PR_SCALE_UP;
+                               } else if ((!use_pr)
+                                          && (mdp_curr_up_scale_xy !=
+                                              MDP_BC_SCALE_UP)) {
+                                       mdp_load_bc_upscale_table();
+                                       mdp_curr_up_scale_xy = MDP_BC_SCALE_UP;
+                               }
+                       }
+
+                       if (mdp_blur) {
+                               load_scale_table(mdp_gaussian_blur_table,
+                                       ARRAY_SIZE(mdp_gaussian_blur_table));
+                               mdp_curr_down_scale_x = MDP_SCALE_BLUR;
+                               mdp_curr_down_scale_y = MDP_SCALE_BLUR;
+                       }
+
+                       /* 0.2 < x <= 1 scaling factor */
+                       if ((dst_roi_width_scale <= iBuf->roi.width) &&
+                               !mdp_blur) {
+                               if (((dst_roi_width_scale * 10) /
+                                    iBuf->roi.width) > 8) {
+                                       if ((use_pr)
+                                           && (mdp_curr_down_scale_x !=
+                                               MDP_PR_SCALE_POINT8_1)) {
+                                               mdp_load_pr_downscale_table_x_point8TO1
+                                                   ();
+                                               mdp_curr_down_scale_x =
+                                                   MDP_PR_SCALE_POINT8_1;
+                                       } else if ((!use_pr)
+                                                  && (mdp_curr_down_scale_x !=
+                                                      MDP_BC_SCALE_POINT8_1)) {
+                                               mdp_load_bc_downscale_table_x_point8TO1
+                                                   ();
+                                               mdp_curr_down_scale_x =
+                                                   MDP_BC_SCALE_POINT8_1;
+                                       }
+                               } else
+                                   if (((dst_roi_width_scale * 10) /
+                                        iBuf->roi.width) > 6) {
+                                       if ((use_pr)
+                                           && (mdp_curr_down_scale_x !=
+                                               MDP_PR_SCALE_POINT6_POINT8)) {
+                                               mdp_load_pr_downscale_table_x_point6TOpoint8
+                                                   ();
+                                               mdp_curr_down_scale_x =
+                                                   MDP_PR_SCALE_POINT6_POINT8;
+                                       } else if ((!use_pr)
+                                                  && (mdp_curr_down_scale_x !=
+                                                      MDP_BC_SCALE_POINT6_POINT8))
+                                       {
+                                               mdp_load_bc_downscale_table_x_point6TOpoint8
+                                                   ();
+                                               mdp_curr_down_scale_x =
+                                                   MDP_BC_SCALE_POINT6_POINT8;
+                                       }
+                               } else
+                                   if (((dst_roi_width_scale * 10) /
+                                        iBuf->roi.width) > 4) {
+                                       if ((use_pr)
+                                           && (mdp_curr_down_scale_x !=
+                                               MDP_PR_SCALE_POINT4_POINT6)) {
+                                               mdp_load_pr_downscale_table_x_point4TOpoint6
+                                                   ();
+                                               mdp_curr_down_scale_x =
+                                                   MDP_PR_SCALE_POINT4_POINT6;
+                                       } else if ((!use_pr)
+                                                  && (mdp_curr_down_scale_x !=
+                                                      MDP_BC_SCALE_POINT4_POINT6))
+                                       {
+                                               mdp_load_bc_downscale_table_x_point4TOpoint6
+                                                   ();
+                                               mdp_curr_down_scale_x =
+                                                   MDP_BC_SCALE_POINT4_POINT6;
+                                       }
+                               } else {
+                                       if ((use_pr)
+                                           && (mdp_curr_down_scale_x !=
+                                               MDP_PR_SCALE_POINT2_POINT4)) {
+                                               mdp_load_pr_downscale_table_x_point2TOpoint4
+                                                   ();
+                                               mdp_curr_down_scale_x =
+                                                   MDP_PR_SCALE_POINT2_POINT4;
+                                       } else if ((!use_pr)
+                                                  && (mdp_curr_down_scale_x !=
+                                                      MDP_BC_SCALE_POINT2_POINT4))
+                                       {
+                                               mdp_load_bc_downscale_table_x_point2TOpoint4
+                                                   ();
+                                               mdp_curr_down_scale_x =
+                                                   MDP_BC_SCALE_POINT2_POINT4;
+                                       }
+                               }
+                       }
+                       /* 0.2 < y <= 1 scaling factor */
+                       if ((dst_roi_height_scale <= iBuf->roi.height) &&
+                               !mdp_blur) {
+                               if (((dst_roi_height_scale * 10) /
+                                    iBuf->roi.height) > 8) {
+                                       if ((use_pr)
+                                           && (mdp_curr_down_scale_y !=
+                                               MDP_PR_SCALE_POINT8_1)) {
+                                               mdp_load_pr_downscale_table_y_point8TO1
+                                                   ();
+                                               mdp_curr_down_scale_y =
+                                                   MDP_PR_SCALE_POINT8_1;
+                                       } else if ((!use_pr)
+                                                  && (mdp_curr_down_scale_y !=
+                                                      MDP_BC_SCALE_POINT8_1)) {
+                                               mdp_load_bc_downscale_table_y_point8TO1
+                                                   ();
+                                               mdp_curr_down_scale_y =
+                                                   MDP_BC_SCALE_POINT8_1;
+                                       }
+                               } else
+                                   if (((dst_roi_height_scale * 10) /
+                                        iBuf->roi.height) > 6) {
+                                       if ((use_pr)
+                                           && (mdp_curr_down_scale_y !=
+                                               MDP_PR_SCALE_POINT6_POINT8)) {
+                                               mdp_load_pr_downscale_table_y_point6TOpoint8
+                                                   ();
+                                               mdp_curr_down_scale_y =
+                                                   MDP_PR_SCALE_POINT6_POINT8;
+                                       } else if ((!use_pr)
+                                                  && (mdp_curr_down_scale_y !=
+                                                      MDP_BC_SCALE_POINT6_POINT8))
+                                       {
+                                               mdp_load_bc_downscale_table_y_point6TOpoint8
+                                                   ();
+                                               mdp_curr_down_scale_y =
+                                                   MDP_BC_SCALE_POINT6_POINT8;
+                                       }
+                               } else
+                                   if (((dst_roi_height_scale * 10) /
+                                        iBuf->roi.height) > 4) {
+                                       if ((use_pr)
+                                           && (mdp_curr_down_scale_y !=
+                                               MDP_PR_SCALE_POINT4_POINT6)) {
+                                               mdp_load_pr_downscale_table_y_point4TOpoint6
+                                                   ();
+                                               mdp_curr_down_scale_y =
+                                                   MDP_PR_SCALE_POINT4_POINT6;
+                                       } else if ((!use_pr)
+                                                  && (mdp_curr_down_scale_y !=
+                                                      MDP_BC_SCALE_POINT4_POINT6))
+                                       {
+                                               mdp_load_bc_downscale_table_y_point4TOpoint6
+                                                   ();
+                                               mdp_curr_down_scale_y =
+                                                   MDP_BC_SCALE_POINT4_POINT6;
+                                       }
+                               } else {
+                                       if ((use_pr)
+                                           && (mdp_curr_down_scale_y !=
+                                               MDP_PR_SCALE_POINT2_POINT4)) {
+                                               mdp_load_pr_downscale_table_y_point2TOpoint4
+                                                   ();
+                                               mdp_curr_down_scale_y =
+                                                   MDP_PR_SCALE_POINT2_POINT4;
+                                       } else if ((!use_pr)
+                                                  && (mdp_curr_down_scale_y !=
+                                                      MDP_BC_SCALE_POINT2_POINT4))
+                                       {
+                                               mdp_load_bc_downscale_table_y_point2TOpoint4
+                                                   ();
+                                               mdp_curr_down_scale_y =
+                                                   MDP_BC_SCALE_POINT2_POINT4;
+                                       }
+                               }
+                       }
+               } else {
+                       iBuf->mdpImg.mdpOp &= ~(MDPOP_ASCALE);
+               }
+       }
+       /* setting edge condition here after scaling check */
+       if (mdp_get_edge_cond(iBuf, &lines_dup, &lines_dup_bg))
+               printk(KERN_ERR "msm_fb: mdp_get_edge_cond() error!\n");
+
+       MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x01b8, lines_dup);
+       MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x01bc, lines_dup_bg);
+}
+
+void mdp_init_scale_table(void)
+{
+       mdp_curr_up_scale_xy = MDP_INIT_SCALE;
+       mdp_curr_down_scale_x = MDP_INIT_SCALE;
+       mdp_curr_down_scale_y = MDP_INIT_SCALE;
+}
+
+void mdp_adjust_start_addr(uint8 **src0,
+                          uint8 **src1,
+                          int v_slice,
+                          int h_slice,
+                          int x,
+                          int y,
+                          uint32 width,
+                          uint32 height, int bpp, MDPIBUF *iBuf, int layer)
+{
+       *src0 += (x + y * width) * bpp;
+
+       /* if it's dest/bg buffer, we need to adjust it for rotation */
+       if (layer != 0)
+               *src0 = mdp_adjust_rot_addr(iBuf, *src0, 0);
+
+       if (*src1) {
+               /*
+                * MDP_Y_CBCR_H2V2/MDP_Y_CRCB_H2V2 cosite for now
+                * we need to shift x direction same as y dir for offsite
+                */
+               *src1 +=
+                   ((x / h_slice) * h_slice +
+                    ((y == 0) ? 0 : ((y + 1) / v_slice - 1) * width)) * bpp;
+
+               /* if it's dest/bg buffer, we need to adjust it for rotation */
+               if (layer != 0)
+                       *src1 = mdp_adjust_rot_addr(iBuf, *src1, 1);
+       }
+}
+
+void mdp_set_blend_attr(MDPIBUF *iBuf,
+                       uint32 *alpha,
+                       uint32 *tpVal,
+                       uint32 perPixelAlpha, uint32 *pppop_reg_ptr)
+{
+       if (perPixelAlpha) {
+               *pppop_reg_ptr |= PPP_OP_ROT_ON |
+                   PPP_OP_BLEND_ON | PPP_OP_BLEND_SRCPIXEL_ALPHA;
+       } else {
+               if ((iBuf->mdpImg.mdpOp & MDPOP_ALPHAB)
+                   && (iBuf->mdpImg.alpha == 0xff)) {
+                       iBuf->mdpImg.mdpOp &= ~(MDPOP_ALPHAB);
+               }
+
+               if ((iBuf->mdpImg.mdpOp & MDPOP_ALPHAB)
+                   && (iBuf->mdpImg.mdpOp & MDPOP_TRANSP)) {
+                       *pppop_reg_ptr |=
+                           PPP_OP_ROT_ON | PPP_OP_BLEND_ON |
+                           PPP_OP_BLEND_CONSTANT_ALPHA |
+                           PPP_OP_BLEND_ALPHA_BLEND_NORMAL |
+                           PPP_BLEND_CALPHA_TRNASP;
+
+                       *alpha = iBuf->mdpImg.alpha;
+                       *tpVal = iBuf->mdpImg.tpVal;
+               } else {
+                       if (iBuf->mdpImg.mdpOp & MDPOP_TRANSP) {
+                               *pppop_reg_ptr |= PPP_OP_ROT_ON |
+                                   PPP_OP_BLEND_ON |
+                                   PPP_OP_BLEND_SRCPIXEL_TRANSP;
+                               *tpVal = iBuf->mdpImg.tpVal;
+                       } else if (iBuf->mdpImg.mdpOp & MDPOP_ALPHAB) {
+                               *pppop_reg_ptr |= PPP_OP_ROT_ON |
+                                   PPP_OP_BLEND_ON |
+                                   PPP_OP_BLEND_ALPHA_BLEND_NORMAL |
+                                   PPP_OP_BLEND_CONSTANT_ALPHA;
+                               *alpha = iBuf->mdpImg.alpha;
+                       }
+               }
+       }
+}
diff --git a/drivers/staging/msm/mdp_ppp_v31.c b/drivers/staging/msm/mdp_ppp_v31.c
new file mode 100644 (file)
index 0000000..76495db
--- /dev/null
@@ -0,0 +1,828 @@
+/* Copyright (c) 2008-2010, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/time.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/fb.h>
+#include "linux/proc_fs.h"
+
+#include <mach/hardware.h>
+#include <linux/io.h>
+
+#include <asm/system.h>
+#include <asm/mach-types.h>
+#include <linux/semaphore.h>
+#include <asm/div64.h>
+
+#include "mdp.h"
+#include "msm_fb.h"
+
+#define MDP_SCALE_COEFF_NUM      32
+#define MDP_SCALE_0P2_TO_0P4_INDEX 0
+#define MDP_SCALE_0P4_TO_0P6_INDEX 32
+#define MDP_SCALE_0P6_TO_0P8_INDEX 64
+#define MDP_SCALE_0P8_TO_8P0_INDEX 96
+#define MDP_SCALE_COEFF_MASK 0x3ff
+
+#define MDP_SCALE_PR  0
+#define MDP_SCALE_FIR 1
+
+static uint32 mdp_scale_0p8_to_8p0_mode;
+static uint32 mdp_scale_0p6_to_0p8_mode;
+static uint32 mdp_scale_0p4_to_0p6_mode;
+static uint32 mdp_scale_0p2_to_0p4_mode;
+
+/* -------- All scaling range, "pixel repeat" -------- */
+static int16 mdp_scale_pixel_repeat_C0[MDP_SCALE_COEFF_NUM] = {
+       0, 0, 0, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 0, 0, 0
+};
+
+static int16 mdp_scale_pixel_repeat_C1[MDP_SCALE_COEFF_NUM] = {
+       511, 511, 511, 511, 511, 511, 511, 511,
+       511, 511, 511, 511, 511, 511, 511, 511,
+       511, 511, 511, 511, 511, 511, 511, 511,
+       511, 511, 511, 511, 511, 511, 511, 511
+};
+
+static int16 mdp_scale_pixel_repeat_C2[MDP_SCALE_COEFF_NUM] = {
+       0, 0, 0, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 0, 0, 0
+};
+
+static int16 mdp_scale_pixel_repeat_C3[MDP_SCALE_COEFF_NUM] = {
+       0, 0, 0, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 0, 0, 0
+};
+
+/* --------------------------- FIR ------------------------------------- */
+/* -------- Downscale, ranging from 0.8x to 8.0x of original size -------- */
+
+static int16 mdp_scale_0p8_to_8p0_C0[MDP_SCALE_COEFF_NUM] = {
+       0, -7, -13, -19, -24, -28, -32, -34, -37, -39,
+       -40, -41, -41, -41, -40, -40, -38, -37, -35, -33,
+       -31, -29, -26, -24, -21, -18, -15, -13, -10, -7,
+       -5, -2
+};
+
+static int16 mdp_scale_0p8_to_8p0_C1[MDP_SCALE_COEFF_NUM] = {
+       511, 507, 501, 494, 485, 475, 463, 450, 436, 422,
+       405, 388, 370, 352, 333, 314, 293, 274, 253, 233,
+       213, 193, 172, 152, 133, 113, 95, 77, 60, 43,
+       28, 13
+};
+
+static int16 mdp_scale_0p8_to_8p0_C2[MDP_SCALE_COEFF_NUM] = {
+       0, 13, 28, 43, 60, 77, 95, 113, 133, 152,
+       172, 193, 213, 233, 253, 274, 294, 314, 333, 352,
+       370, 388, 405, 422, 436, 450, 463, 475, 485, 494,
+       501, 507,
+};
+
+static int16 mdp_scale_0p8_to_8p0_C3[MDP_SCALE_COEFF_NUM] = {
+       0, -2, -5, -7, -10, -13, -15, -18, -21, -24,
+       -26, -29, -31, -33, -35, -37, -38, -40, -40, -41,
+       -41, -41, -40, -39, -37, -34, -32, -28, -24, -19,
+       -13, -7
+};
+
+/* -------- Downscale, ranging from 0.6x to 0.8x of original size -------- */
+
+static int16 mdp_scale_0p6_to_0p8_C0[MDP_SCALE_COEFF_NUM] = {
+       104, 96, 89, 82, 75, 68, 61, 55, 49, 43,
+       38, 33, 28, 24, 20, 16, 12, 9, 6, 4,
+       2, 0, -2, -4, -5, -6, -7, -7, -8, -8,
+       -8, -8
+};
+
+static int16 mdp_scale_0p6_to_0p8_C1[MDP_SCALE_COEFF_NUM] = {
+       303, 303, 302, 300, 298, 296, 293, 289, 286, 281,
+       276, 270, 265, 258, 252, 245, 238, 230, 223, 214,
+       206, 197, 189, 180, 172, 163, 154, 145, 137, 128,
+       120, 112
+};
+
+static int16 mdp_scale_0p6_to_0p8_C2[MDP_SCALE_COEFF_NUM] = {
+       112, 120, 128, 137, 145, 154, 163, 172, 180, 189,
+       197, 206, 214, 223, 230, 238, 245, 252, 258, 265,
+       270, 276, 281, 286, 289, 293, 296, 298, 300, 302,
+       303, 303
+};
+
+static int16 mdp_scale_0p6_to_0p8_C3[MDP_SCALE_COEFF_NUM] = {
+       -8, -8, -8, -8, -7, -7, -6, -5, -4, -2,
+       0, 2, 4, 6, 9, 12, 16, 20, 24, 28,
+       33, 38, 43, 49, 55, 61, 68, 75, 82, 89,
+       96, 104
+};
+
+/* -------- Downscale, ranging from 0.4x to 0.6x of original size -------- */
+
+static int16 mdp_scale_0p4_to_0p6_C0[MDP_SCALE_COEFF_NUM] = {
+       136, 132, 128, 123, 119, 115, 111, 107, 103, 98,
+       95, 91, 87, 84, 80, 76, 73, 69, 66, 62,
+       59, 57, 54, 50, 47, 44, 41, 39, 36, 33,
+       32, 29
+};
+
+static int16 mdp_scale_0p4_to_0p6_C1[MDP_SCALE_COEFF_NUM] = {
+       206, 205, 204, 204, 201, 200, 199, 197, 196, 194,
+       191, 191, 189, 185, 184, 182, 180, 178, 176, 173,
+       170, 168, 165, 162, 160, 157, 155, 152, 148, 146,
+       142, 140
+};
+
+static int16 mdp_scale_0p4_to_0p6_C2[MDP_SCALE_COEFF_NUM] = {
+       140, 142, 146, 148, 152, 155, 157, 160, 162, 165,
+       168, 170, 173, 176, 178, 180, 182, 184, 185, 189,
+       191, 191, 194, 196, 197, 199, 200, 201, 204, 204,
+       205, 206
+};
+
+static int16 mdp_scale_0p4_to_0p6_C3[MDP_SCALE_COEFF_NUM] = {
+       29, 32, 33, 36, 39, 41, 44, 47, 50, 54,
+       57, 59, 62, 66, 69, 73, 76, 80, 84, 87,
+       91, 95, 98, 103, 107, 111, 115, 119, 123, 128,
+       132, 136
+};
+
+/* -------- Downscale, ranging from 0.2x to 0.4x of original size -------- */
+
+static int16 mdp_scale_0p2_to_0p4_C0[MDP_SCALE_COEFF_NUM] = {
+       131, 131, 130, 129, 128, 127, 127, 126, 125, 125,
+       124, 123, 123, 121, 120, 119, 119, 118, 117, 117,
+       116, 115, 115, 114, 113, 112, 111, 110, 109, 109,
+       108, 107
+};
+
+static int16 mdp_scale_0p2_to_0p4_C1[MDP_SCALE_COEFF_NUM] = {
+       141, 140, 140, 140, 140, 139, 138, 138, 138, 137,
+       137, 137, 136, 137, 137, 137, 136, 136, 136, 135,
+       135, 135, 134, 134, 134, 134, 134, 133, 133, 132,
+       132, 132
+};
+
+static int16 mdp_scale_0p2_to_0p4_C2[MDP_SCALE_COEFF_NUM] = {
+       132, 132, 132, 133, 133, 134, 134, 134, 134, 134,
+       135, 135, 135, 136, 136, 136, 137, 137, 137, 136,
+       137, 137, 137, 138, 138, 138, 139, 140, 140, 140,
+       140, 141
+};
+
+static int16 mdp_scale_0p2_to_0p4_C3[MDP_SCALE_COEFF_NUM] = {
+       107, 108, 109, 109, 110, 111, 112, 113, 114, 115,
+       115, 116, 117, 117, 118, 119, 119, 120, 121, 123,
+       123, 124, 125, 125, 126, 127, 127, 128, 129, 130,
+       131, 131
+};
+
+static void mdp_update_scale_table(int index, int16 *c0, int16 *c1,
+                                  int16 *c2, int16 *c3)
+{
+       int i, val;
+
+       for (i = 0; i < MDP_SCALE_COEFF_NUM; i++) {
+               val =
+                   ((MDP_SCALE_COEFF_MASK & c1[i]) << 16) |
+                   (MDP_SCALE_COEFF_MASK & c0[i]);
+               MDP_OUTP(MDP_PPP_SCALE_COEFF_LSBn(index), val);
+               val =
+                   ((MDP_SCALE_COEFF_MASK & c3[i]) << 16) |
+                   (MDP_SCALE_COEFF_MASK & c2[i]);
+               MDP_OUTP(MDP_PPP_SCALE_COEFF_MSBn(index), val);
+               index++;
+       }
+}
+
+void mdp_init_scale_table(void)
+{
+       mdp_scale_0p2_to_0p4_mode = MDP_SCALE_FIR;
+       mdp_update_scale_table(MDP_SCALE_0P2_TO_0P4_INDEX,
+                              mdp_scale_0p2_to_0p4_C0,
+                              mdp_scale_0p2_to_0p4_C1,
+                              mdp_scale_0p2_to_0p4_C2,
+                              mdp_scale_0p2_to_0p4_C3);
+
+       mdp_scale_0p4_to_0p6_mode = MDP_SCALE_FIR;
+       mdp_update_scale_table(MDP_SCALE_0P4_TO_0P6_INDEX,
+                              mdp_scale_0p4_to_0p6_C0,
+                              mdp_scale_0p4_to_0p6_C1,
+                              mdp_scale_0p4_to_0p6_C2,
+                              mdp_scale_0p4_to_0p6_C3);
+
+       mdp_scale_0p6_to_0p8_mode = MDP_SCALE_FIR;
+       mdp_update_scale_table(MDP_SCALE_0P6_TO_0P8_INDEX,
+                              mdp_scale_0p6_to_0p8_C0,
+                              mdp_scale_0p6_to_0p8_C1,
+                              mdp_scale_0p6_to_0p8_C2,
+                              mdp_scale_0p6_to_0p8_C3);
+
+       mdp_scale_0p8_to_8p0_mode = MDP_SCALE_FIR;
+       mdp_update_scale_table(MDP_SCALE_0P8_TO_8P0_INDEX,
+                              mdp_scale_0p8_to_8p0_C0,
+                              mdp_scale_0p8_to_8p0_C1,
+                              mdp_scale_0p8_to_8p0_C2,
+                              mdp_scale_0p8_to_8p0_C3);
+}
+
+static long long mdp_do_div(long long num, long long den)
+{
+       do_div(num, den);
+       return num;
+}
+
+#define SCALER_PHASE_BITS 29
+#define HAL_MDP_PHASE_STEP_2P50    0x50000000
+#define HAL_MDP_PHASE_STEP_1P66    0x35555555
+#define HAL_MDP_PHASE_STEP_1P25    0x28000000
+
+struct phase_val {
+       int phase_init_x;
+       int phase_init_y;
+       int phase_step_x;
+       int phase_step_y;
+};
+
+static void mdp_calc_scaleInitPhase_3p1(uint32 in_w,
+                                       uint32 in_h,
+                                       uint32 out_w,
+                                       uint32 out_h,
+                                       boolean is_rotate,
+                                       boolean is_pp_x,
+                                       boolean is_pp_y, struct phase_val *pval)
+{
+       uint64 dst_ROI_width;
+       uint64 dst_ROI_height;
+       uint64 src_ROI_width;
+       uint64 src_ROI_height;
+
+       /*
+        * phase_step_x, phase_step_y, phase_init_x and phase_init_y
+        * are represented in fixed-point, unsigned 3.29 format
+        */
+       uint32 phase_step_x = 0;
+       uint32 phase_step_y = 0;
+       uint32 phase_init_x = 0;
+       uint32 phase_init_y = 0;
+       uint32 yscale_filter_sel, xscale_filter_sel;
+       uint32 scale_unit_sel_x, scale_unit_sel_y;
+
+       uint64 numerator, denominator;
+       uint64 temp_dim;
+
+       src_ROI_width = in_w;
+       src_ROI_height = in_h;
+       dst_ROI_width = out_w;
+       dst_ROI_height = out_h;
+
+       /* if there is a 90 degree rotation */
+       if (is_rotate) {
+               /* decide whether to use FIR or M/N for scaling */
+
+               /* if down-scaling by a factor smaller than 1/4 */
+               if (src_ROI_width > (4 * dst_ROI_height))
+                       scale_unit_sel_x = 1;   /* use M/N scalar */
+               else
+                       scale_unit_sel_x = 0;   /* use FIR scalar */
+
+               /* if down-scaling by a factor smaller than 1/4 */
+               if (src_ROI_height > (4 * dst_ROI_width))
+                       scale_unit_sel_y = 1;   /* use M/N scalar */
+               else
+                       scale_unit_sel_y = 0;   /* use FIR scalar */
+       } else {
+               /* decide whether to use FIR or M/N for scaling */
+
+               if (src_ROI_width > (4 * dst_ROI_width))
+                       scale_unit_sel_x = 1;   /* use M/N scalar */
+               else
+                       scale_unit_sel_x = 0;   /* use FIR scalar */
+
+               if (src_ROI_height > (4 * dst_ROI_height))
+                       scale_unit_sel_y = 1;   /* use M/N scalar */
+               else
+                       scale_unit_sel_y = 0;   /* use FIR scalar */
+
+       }
+
+       /* if there is a 90 degree rotation */
+       if (is_rotate) {
+               /* swap the width and height of dst ROI */
+               temp_dim = dst_ROI_width;
+               dst_ROI_width = dst_ROI_height;
+               dst_ROI_height = temp_dim;
+       }
+
+       /* calculate phase step for the x direction */
+
+       /* if destination is only 1 pixel wide, the value of phase_step_x
+          is unimportant. Assigning phase_step_x to src ROI width
+          as an arbitrary value. */
+       if (dst_ROI_width == 1)
+               phase_step_x = (uint32) ((src_ROI_width) << SCALER_PHASE_BITS);
+
+       /* if using FIR scalar */
+       else if (scale_unit_sel_x == 0) {
+
+               /* Calculate the quotient ( src_ROI_width - 1 ) / ( dst_ROI_width - 1)
+                  with u3.29 precision. Quotient is rounded up to the larger
+                  29th decimal point. */
+               numerator = (src_ROI_width - 1) << SCALER_PHASE_BITS;
+               denominator = (dst_ROI_width - 1);      /* never equals to 0 because of the "( dst_ROI_width == 1 ) case" */
+               phase_step_x = (uint32) mdp_do_div((numerator + denominator - 1), denominator); /* divide and round up to the larger 29th decimal point. */
+
+       }
+
+       /* if M/N scalar */
+       else if (scale_unit_sel_x == 1) {
+               /* Calculate the quotient ( src_ROI_width ) / ( dst_ROI_width)
+                  with u3.29 precision. Quotient is rounded down to the
+                  smaller 29th decimal point. */
+               numerator = (src_ROI_width) << SCALER_PHASE_BITS;
+               denominator = (dst_ROI_width);
+               phase_step_x = (uint32) mdp_do_div(numerator, denominator);
+       }
+       /* calculate phase step for the y direction */
+
+       /* if destination is only 1 pixel wide, the value of
+          phase_step_x is unimportant. Assigning phase_step_x
+          to src ROI width as an arbitrary value. */
+       if (dst_ROI_height == 1)
+               phase_step_y = (uint32) ((src_ROI_height) << SCALER_PHASE_BITS);
+
+       /* if FIR scalar */
+       else if (scale_unit_sel_y == 0) {
+               /* Calculate the quotient ( src_ROI_height - 1 ) / ( dst_ROI_height - 1)
+                  with u3.29 precision. Quotient is rounded up to the larger
+                  29th decimal point. */
+               numerator = (src_ROI_height - 1) << SCALER_PHASE_BITS;
+               denominator = (dst_ROI_height - 1);     /* never equals to 0 because of the "( dst_ROI_height == 1 )" case */
+               phase_step_y = (uint32) mdp_do_div((numerator + denominator - 1), denominator); /* Quotient is rounded up to the larger 29th decimal point. */
+
+       }
+
+       /* if M/N scalar */
+       else if (scale_unit_sel_y == 1) {
+               /* Calculate the quotient ( src_ROI_height ) / ( dst_ROI_height)
+                  with u3.29 precision. Quotient is rounded down to the smaller
+                  29th decimal point. */
+               numerator = (src_ROI_height) << SCALER_PHASE_BITS;
+               denominator = (dst_ROI_height);
+               phase_step_y = (uint32) mdp_do_div(numerator, denominator);
+       }
+
+       /* decide which set of FIR coefficients to use */
+       if (phase_step_x > HAL_MDP_PHASE_STEP_2P50)
+               xscale_filter_sel = 0;
+       else if (phase_step_x > HAL_MDP_PHASE_STEP_1P66)
+               xscale_filter_sel = 1;
+       else if (phase_step_x > HAL_MDP_PHASE_STEP_1P25)
+               xscale_filter_sel = 2;
+       else
+               xscale_filter_sel = 3;
+
+       if (phase_step_y > HAL_MDP_PHASE_STEP_2P50)
+               yscale_filter_sel = 0;
+       else if (phase_step_y > HAL_MDP_PHASE_STEP_1P66)
+               yscale_filter_sel = 1;
+       else if (phase_step_y > HAL_MDP_PHASE_STEP_1P25)
+               yscale_filter_sel = 2;
+       else
+               yscale_filter_sel = 3;
+
+       /* calculate phase init for the x direction */
+
+       /* if using FIR scalar */
+       if (scale_unit_sel_x == 0) {
+               if (dst_ROI_width == 1)
+                       phase_init_x =
+                           (uint32) ((src_ROI_width - 1) << SCALER_PHASE_BITS);
+               else
+                       phase_init_x = 0;
+
+       }
+       /* M over N scalar  */
+       else if (scale_unit_sel_x == 1)
+               phase_init_x = 0;
+
+       /* calculate phase init for the y direction
+          if using FIR scalar */
+       if (scale_unit_sel_y == 0) {
+               if (dst_ROI_height == 1)
+                       phase_init_y =
+                           (uint32) ((src_ROI_height -
+                                      1) << SCALER_PHASE_BITS);
+               else
+                       phase_init_y = 0;
+
+       }
+       /* M over N scalar   */
+       else if (scale_unit_sel_y == 1)
+               phase_init_y = 0;
+
+       /* write registers */
+       pval->phase_step_x = (uint32) phase_step_x;
+       pval->phase_step_y = (uint32) phase_step_y;
+       pval->phase_init_x = (uint32) phase_init_x;
+       pval->phase_init_y = (uint32) phase_init_y;
+
+       return;
+}
+
+void mdp_set_scale(MDPIBUF *iBuf,
+                  uint32 dst_roi_width,
+                  uint32 dst_roi_height,
+                  boolean inputRGB, boolean outputRGB, uint32 *pppop_reg_ptr)
+{
+       uint32 dst_roi_width_scale;
+       uint32 dst_roi_height_scale;
+       struct phase_val pval;
+       boolean use_pr;
+       uint32 ppp_scale_config = 0;
+
+       if (!inputRGB)
+               ppp_scale_config |= BIT(6);
+
+       if (iBuf->mdpImg.mdpOp & MDPOP_ASCALE) {
+               if (iBuf->mdpImg.mdpOp & MDPOP_ROT90) {
+                       dst_roi_width_scale = dst_roi_height;
+                       dst_roi_height_scale = dst_roi_width;
+               } else {
+                       dst_roi_width_scale = dst_roi_width;
+                       dst_roi_height_scale = dst_roi_height;
+               }
+
+               if ((dst_roi_width_scale != iBuf->roi.width) ||
+                   (dst_roi_height_scale != iBuf->roi.height) ||
+                       (iBuf->mdpImg.mdpOp & MDPOP_SHARPENING)) {
+                       *pppop_reg_ptr |=
+                           (PPP_OP_SCALE_Y_ON | PPP_OP_SCALE_X_ON);
+
+                       mdp_calc_scaleInitPhase_3p1(iBuf->roi.width,
+                                                   iBuf->roi.height,
+                                                   dst_roi_width,
+                                                   dst_roi_height,
+                                                   iBuf->mdpImg.
+                                                   mdpOp & MDPOP_ROT90, 1, 1,
+                                                   &pval);
+
+                       MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x013c,
+                                pval.phase_init_x);
+                       MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x0140,
+                                pval.phase_init_y);
+                       MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x0144,
+                                pval.phase_step_x);
+                       MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x0148,
+                                pval.phase_step_y);
+
+                       use_pr = (inputRGB) && (outputRGB);
+
+                       /* x-direction */
+                       if ((dst_roi_width_scale == iBuf->roi.width) &&
+                               !(iBuf->mdpImg.mdpOp & MDPOP_SHARPENING)) {
+                               *pppop_reg_ptr &= ~PPP_OP_SCALE_X_ON;
+                       } else
+                           if (((dst_roi_width_scale * 10) / iBuf->roi.width) >
+                               8) {
+                               if ((use_pr)
+                                   && (mdp_scale_0p8_to_8p0_mode !=
+                                       MDP_SCALE_PR)) {
+                                       mdp_scale_0p8_to_8p0_mode =
+                                           MDP_SCALE_PR;
+                                       mdp_update_scale_table
+                                           (MDP_SCALE_0P8_TO_8P0_INDEX,
+                                            mdp_scale_pixel_repeat_C0,
+                                            mdp_scale_pixel_repeat_C1,
+                                            mdp_scale_pixel_repeat_C2,
+                                            mdp_scale_pixel_repeat_C3);
+                               } else if ((!use_pr)
+                                          && (mdp_scale_0p8_to_8p0_mode !=
+                                              MDP_SCALE_FIR)) {
+                                       mdp_scale_0p8_to_8p0_mode =
+                                           MDP_SCALE_FIR;
+                                       mdp_update_scale_table
+                                           (MDP_SCALE_0P8_TO_8P0_INDEX,
+                                            mdp_scale_0p8_to_8p0_C0,
+                                            mdp_scale_0p8_to_8p0_C1,
+                                            mdp_scale_0p8_to_8p0_C2,
+                                            mdp_scale_0p8_to_8p0_C3);
+                               }
+                               ppp_scale_config |= (SCALE_U1_SET << 2);
+                       } else
+                           if (((dst_roi_width_scale * 10) / iBuf->roi.width) >
+                               6) {
+                               if ((use_pr)
+                                   && (mdp_scale_0p6_to_0p8_mode !=
+                                       MDP_SCALE_PR)) {
+                                       mdp_scale_0p6_to_0p8_mode =
+                                           MDP_SCALE_PR;
+                                       mdp_update_scale_table
+                                           (MDP_SCALE_0P6_TO_0P8_INDEX,
+                                            mdp_scale_pixel_repeat_C0,
+                                            mdp_scale_pixel_repeat_C1,
+                                            mdp_scale_pixel_repeat_C2,
+                                            mdp_scale_pixel_repeat_C3);
+                               } else if ((!use_pr)
+                                          && (mdp_scale_0p6_to_0p8_mode !=
+                                              MDP_SCALE_FIR)) {
+                                       mdp_scale_0p6_to_0p8_mode =
+                                           MDP_SCALE_FIR;
+                                       mdp_update_scale_table
+                                           (MDP_SCALE_0P6_TO_0P8_INDEX,
+                                            mdp_scale_0p6_to_0p8_C0,
+                                            mdp_scale_0p6_to_0p8_C1,
+                                            mdp_scale_0p6_to_0p8_C2,
+                                            mdp_scale_0p6_to_0p8_C3);
+                               }
+                               ppp_scale_config |= (SCALE_D2_SET << 2);
+                       } else
+                           if (((dst_roi_width_scale * 10) / iBuf->roi.width) >
+                               4) {
+                               if ((use_pr)
+                                   && (mdp_scale_0p4_to_0p6_mode !=
+                                       MDP_SCALE_PR)) {
+                                       mdp_scale_0p4_to_0p6_mode =
+                                           MDP_SCALE_PR;
+                                       mdp_update_scale_table
+                                           (MDP_SCALE_0P4_TO_0P6_INDEX,
+                                            mdp_scale_pixel_repeat_C0,
+                                            mdp_scale_pixel_repeat_C1,
+                                            mdp_scale_pixel_repeat_C2,
+                                            mdp_scale_pixel_repeat_C3);
+                               } else if ((!use_pr)
+                                          && (mdp_scale_0p4_to_0p6_mode !=
+                                              MDP_SCALE_FIR)) {
+                                       mdp_scale_0p4_to_0p6_mode =
+                                           MDP_SCALE_FIR;
+                                       mdp_update_scale_table
+                                           (MDP_SCALE_0P4_TO_0P6_INDEX,
+                                            mdp_scale_0p4_to_0p6_C0,
+                                            mdp_scale_0p4_to_0p6_C1,
+                                            mdp_scale_0p4_to_0p6_C2,
+                                            mdp_scale_0p4_to_0p6_C3);
+                               }
+                               ppp_scale_config |= (SCALE_D1_SET << 2);
+                       } else
+                           if (((dst_roi_width_scale * 4) / iBuf->roi.width) >=
+                               1) {
+                               if ((use_pr)
+                                   && (mdp_scale_0p2_to_0p4_mode !=
+                                       MDP_SCALE_PR)) {
+                                       mdp_scale_0p2_to_0p4_mode =
+                                           MDP_SCALE_PR;
+                                       mdp_update_scale_table
+                                           (MDP_SCALE_0P2_TO_0P4_INDEX,
+                                            mdp_scale_pixel_repeat_C0,
+                                            mdp_scale_pixel_repeat_C1,
+                                            mdp_scale_pixel_repeat_C2,
+                                            mdp_scale_pixel_repeat_C3);
+                               } else if ((!use_pr)
+                                          && (mdp_scale_0p2_to_0p4_mode !=
+                                              MDP_SCALE_FIR)) {
+                                       mdp_scale_0p2_to_0p4_mode =
+                                           MDP_SCALE_FIR;
+                                       mdp_update_scale_table
+                                           (MDP_SCALE_0P2_TO_0P4_INDEX,
+                                            mdp_scale_0p2_to_0p4_C0,
+                                            mdp_scale_0p2_to_0p4_C1,
+                                            mdp_scale_0p2_to_0p4_C2,
+                                            mdp_scale_0p2_to_0p4_C3);
+                               }
+                               ppp_scale_config |= (SCALE_D0_SET << 2);
+                       } else
+                               ppp_scale_config |= BIT(0);
+
+                       /* y-direction */
+                       if ((dst_roi_height_scale == iBuf->roi.height) &&
+                               !(iBuf->mdpImg.mdpOp & MDPOP_SHARPENING)) {
+                               *pppop_reg_ptr &= ~PPP_OP_SCALE_Y_ON;
+                       } else if (((dst_roi_height_scale * 10) /
+                                       iBuf->roi.height) > 8) {
+                               if ((use_pr)
+                                   && (mdp_scale_0p8_to_8p0_mode !=
+                                       MDP_SCALE_PR)) {
+                                       mdp_scale_0p8_to_8p0_mode =
+                                           MDP_SCALE_PR;
+                                       mdp_update_scale_table
+                                           (MDP_SCALE_0P8_TO_8P0_INDEX,
+                                            mdp_scale_pixel_repeat_C0,
+                                            mdp_scale_pixel_repeat_C1,
+                                            mdp_scale_pixel_repeat_C2,
+                                            mdp_scale_pixel_repeat_C3);
+                               } else if ((!use_pr)
+                                          && (mdp_scale_0p8_to_8p0_mode !=
+                                              MDP_SCALE_FIR)) {
+                                       mdp_scale_0p8_to_8p0_mode =
+                                           MDP_SCALE_FIR;
+                                       mdp_update_scale_table
+                                           (MDP_SCALE_0P8_TO_8P0_INDEX,
+                                            mdp_scale_0p8_to_8p0_C0,
+                                            mdp_scale_0p8_to_8p0_C1,
+                                            mdp_scale_0p8_to_8p0_C2,
+                                            mdp_scale_0p8_to_8p0_C3);
+                               }
+                               ppp_scale_config |= (SCALE_U1_SET << 4);
+                       } else
+                           if (((dst_roi_height_scale * 10) /
+                                iBuf->roi.height) > 6) {
+                               if ((use_pr)
+                                   && (mdp_scale_0p6_to_0p8_mode !=
+                                       MDP_SCALE_PR)) {
+                                       mdp_scale_0p6_to_0p8_mode =
+                                           MDP_SCALE_PR;
+                                       mdp_update_scale_table
+                                           (MDP_SCALE_0P6_TO_0P8_INDEX,
+                                            mdp_scale_pixel_repeat_C0,
+                                            mdp_scale_pixel_repeat_C1,
+                                            mdp_scale_pixel_repeat_C2,
+                                            mdp_scale_pixel_repeat_C3);
+                               } else if ((!use_pr)
+                                          && (mdp_scale_0p6_to_0p8_mode !=
+                                              MDP_SCALE_FIR)) {
+                                       mdp_scale_0p6_to_0p8_mode =
+                                           MDP_SCALE_FIR;
+                                       mdp_update_scale_table
+                                           (MDP_SCALE_0P6_TO_0P8_INDEX,
+                                            mdp_scale_0p6_to_0p8_C0,
+                                            mdp_scale_0p6_to_0p8_C1,
+                                            mdp_scale_0p6_to_0p8_C2,
+                                            mdp_scale_0p6_to_0p8_C3);
+                               }
+                               ppp_scale_config |= (SCALE_D2_SET << 4);
+                       } else
+                           if (((dst_roi_height_scale * 10) /
+                                iBuf->roi.height) > 4) {
+                               if ((use_pr)
+                                   && (mdp_scale_0p4_to_0p6_mode !=
+                                       MDP_SCALE_PR)) {
+                                       mdp_scale_0p4_to_0p6_mode =
+                                           MDP_SCALE_PR;
+                                       mdp_update_scale_table
+                                           (MDP_SCALE_0P4_TO_0P6_INDEX,
+                                            mdp_scale_pixel_repeat_C0,
+                                            mdp_scale_pixel_repeat_C1,
+                                            mdp_scale_pixel_repeat_C2,
+                                            mdp_scale_pixel_repeat_C3);
+                               } else if ((!use_pr)
+                                          && (mdp_scale_0p4_to_0p6_mode !=
+                                              MDP_SCALE_FIR)) {
+                                       mdp_scale_0p4_to_0p6_mode =
+                                           MDP_SCALE_FIR;
+                                       mdp_update_scale_table
+                                           (MDP_SCALE_0P4_TO_0P6_INDEX,
+                                            mdp_scale_0p4_to_0p6_C0,
+                                            mdp_scale_0p4_to_0p6_C1,
+                                            mdp_scale_0p4_to_0p6_C2,
+                                            mdp_scale_0p4_to_0p6_C3);
+                               }
+                               ppp_scale_config |= (SCALE_D1_SET << 4);
+                       } else
+                           if (((dst_roi_height_scale * 4) /
+                                iBuf->roi.height) >= 1) {
+                               if ((use_pr)
+                                   && (mdp_scale_0p2_to_0p4_mode !=
+                                       MDP_SCALE_PR)) {
+                                       mdp_scale_0p2_to_0p4_mode =
+                                           MDP_SCALE_PR;
+                                       mdp_update_scale_table
+                                           (MDP_SCALE_0P2_TO_0P4_INDEX,
+                                            mdp_scale_pixel_repeat_C0,
+                                            mdp_scale_pixel_repeat_C1,
+                                            mdp_scale_pixel_repeat_C2,
+                                            mdp_scale_pixel_repeat_C3);
+                               } else if ((!use_pr)
+                                          && (mdp_scale_0p2_to_0p4_mode !=
+                                              MDP_SCALE_FIR)) {
+                                       mdp_scale_0p2_to_0p4_mode =
+                                           MDP_SCALE_FIR;
+                                       mdp_update_scale_table
+                                           (MDP_SCALE_0P2_TO_0P4_INDEX,
+                                            mdp_scale_0p2_to_0p4_C0,
+                                            mdp_scale_0p2_to_0p4_C1,
+                                            mdp_scale_0p2_to_0p4_C2,
+                                            mdp_scale_0p2_to_0p4_C3);
+                               }
+                               ppp_scale_config |= (SCALE_D0_SET << 4);
+                       } else
+                               ppp_scale_config |= BIT(1);
+
+                       if (iBuf->mdpImg.mdpOp & MDPOP_SHARPENING) {
+                               ppp_scale_config |= BIT(7);
+                               MDP_OUTP(MDP_BASE + 0x50020,
+                                               iBuf->mdpImg.sp_value);
+                       }
+
+                       MDP_OUTP(MDP_BASE + 0x10230, ppp_scale_config);
+               } else {
+                       iBuf->mdpImg.mdpOp &= ~(MDPOP_ASCALE);
+               }
+       }
+}
+
+void mdp_adjust_start_addr(uint8 **src0,
+                          uint8 **src1,
+                          int v_slice,
+                          int h_slice,
+                          int x,
+                          int y,
+                          uint32 width,
+                          uint32 height, int bpp, MDPIBUF *iBuf, int layer)
+{
+       switch (layer) {
+       case 0:
+               MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x0200, (y << 16) | (x));
+               MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x0208,
+                        (height << 16) | (width));
+               break;
+
+       case 1:
+               /* MDP 3.1 HW bug workaround */
+               if (iBuf->ibuf_type == MDP_YCRYCB_H2V1) {
+                       *src0 += (x + y * width) * bpp;
+                       x = y = 0;
+                       width = iBuf->roi.dst_width;
+                       height = iBuf->roi.dst_height;
+               }
+
+               MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x0204, (y << 16) | (x));
+               MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x020c,
+                        (height << 16) | (width));
+               break;
+
+       case 2:
+               MDP_OUTP(MDP_CMD_DEBUG_ACCESS_BASE + 0x019c, (y << 16) | (x));
+               break;
+       }
+}
+
+void mdp_set_blend_attr(MDPIBUF *iBuf,
+                       uint32 *alpha,
+                       uint32 *tpVal,
+                       uint32 perPixelAlpha, uint32 *pppop_reg_ptr)
+{
+       int bg_alpha;
+
+       *alpha = iBuf->mdpImg.alpha;
+       *tpVal = iBuf->mdpImg.tpVal;
+
+       if (iBuf->mdpImg.mdpOp & MDPOP_FG_PM_ALPHA) {
+               *pppop_reg_ptr |= PPP_OP_ROT_ON |
+                   PPP_OP_BLEND_ON | PPP_OP_BLEND_CONSTANT_ALPHA;
+
+               bg_alpha = PPP_BLEND_BG_USE_ALPHA_SEL |
+                               PPP_BLEND_BG_ALPHA_REVERSE;
+
+               if (perPixelAlpha)
+                       bg_alpha |= PPP_BLEND_BG_SRCPIXEL_ALPHA;
+               else
+                       bg_alpha |= PPP_BLEND_BG_CONSTANT_ALPHA;
+
+               outpdw(MDP_BASE + 0x70010, bg_alpha);
+
+               if (iBuf->mdpImg.mdpOp & MDPOP_TRANSP)
+                       *pppop_reg_ptr |= PPP_BLEND_CALPHA_TRNASP;
+       } else if (perPixelAlpha) {
+               *pppop_reg_ptr |= PPP_OP_ROT_ON |
+                   PPP_OP_BLEND_ON | PPP_OP_BLEND_SRCPIXEL_ALPHA;
+       } else {
+               if ((iBuf->mdpImg.mdpOp & MDPOP_ALPHAB)
+                   && (iBuf->mdpImg.alpha == 0xff)) {
+                       iBuf->mdpImg.mdpOp &= ~(MDPOP_ALPHAB);
+               }
+
+               if ((iBuf->mdpImg.mdpOp & MDPOP_ALPHAB)
+                   || (iBuf->mdpImg.mdpOp & MDPOP_TRANSP)) {
+                       *pppop_reg_ptr |=
+                           PPP_OP_ROT_ON | PPP_OP_BLEND_ON |
+                           PPP_OP_BLEND_CONSTANT_ALPHA |
+                           PPP_OP_BLEND_ALPHA_BLEND_NORMAL;
+               }
+
+               if (iBuf->mdpImg.mdpOp & MDPOP_TRANSP)
+                       *pppop_reg_ptr |= PPP_BLEND_CALPHA_TRNASP;
+       }
+}
diff --git a/drivers/staging/msm/mdp_vsync.c b/drivers/staging/msm/mdp_vsync.c
new file mode 100644 (file)
index 0000000..bbd4560
--- /dev/null
@@ -0,0 +1,389 @@
+/* Copyright (c) 2008-2009, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/time.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/spinlock.h>
+#include <linux/hrtimer.h>
+#include <linux/vmalloc.h>
+#include <linux/clk.h>
+
+#include <mach/hardware.h>
+#include <linux/io.h>
+
+#include <asm/system.h>
+#include <asm/mach-types.h>
+#include <linux/semaphore.h>
+#include <linux/uaccess.h>
+#include <mach/gpio.h>
+
+#include "mdp.h"
+#include "msm_fb.h"
+#include "mddihost.h"
+
+#ifdef CONFIG_FB_MSM_MDP40
+#define MDP_SYNC_CFG_0         0x100
+#define MDP_SYNC_STATUS_0      0x10c
+#define MDP_PRIM_VSYNC_OUT_CTRL        0x118
+#define MDP_PRIM_VSYNC_INIT_VAL        0x128
+#else
+#define MDP_SYNC_CFG_0         0x300
+#define MDP_SYNC_STATUS_0      0x30c
+#define MDP_PRIM_VSYNC_OUT_CTRL        0x318
+#define MDP_PRIM_VSYNC_INIT_VAL        0x328
+#endif
+
+extern mddi_lcd_type mddi_lcd_idx;
+extern spinlock_t mdp_spin_lock;
+extern struct workqueue_struct *mdp_vsync_wq;
+extern int lcdc_mode;
+extern int vsync_mode;
+
+#ifdef MDP_HW_VSYNC
+int vsync_above_th = 4;
+int vsync_start_th = 1;
+int vsync_load_cnt;
+
+struct clk *mdp_vsync_clk;
+
+void mdp_hw_vsync_clk_enable(struct msm_fb_data_type *mfd)
+{
+       if (mfd->use_mdp_vsync)
+               clk_enable(mdp_vsync_clk);
+}
+
+void mdp_hw_vsync_clk_disable(struct msm_fb_data_type *mfd)
+{
+       if (mfd->use_mdp_vsync)
+               clk_disable(mdp_vsync_clk);
+}
+#endif
+
+static void mdp_set_vsync(unsigned long data)
+{
+       struct msm_fb_data_type *mfd = (struct msm_fb_data_type *)data;
+       struct msm_fb_panel_data *pdata = NULL;
+
+       pdata = (struct msm_fb_panel_data *)mfd->pdev->dev.platform_data;
+
+       if ((pdata) && (pdata->set_vsync_notifier == NULL))
+               return;
+
+       init_timer(&mfd->vsync_resync_timer);
+       mfd->vsync_resync_timer.function = mdp_set_vsync;
+       mfd->vsync_resync_timer.data = data;
+       mfd->vsync_resync_timer.expires =
+           jiffies + mfd->panel_info.lcd.vsync_notifier_period;
+       add_timer(&mfd->vsync_resync_timer);
+
+       if ((mfd->panel_info.lcd.vsync_enable) && (mfd->panel_power_on)
+           && (!mfd->vsync_handler_pending)) {
+               mfd->vsync_handler_pending = TRUE;
+               if (!queue_work(mdp_vsync_wq, &mfd->vsync_resync_worker)) {
+                       MSM_FB_INFO
+                           ("mdp_set_vsync: can't queue_work! -> needs to increase vsync_resync_timer_duration\n");
+               }
+       } else {
+               MSM_FB_DEBUG
+                   ("mdp_set_vsync failed!  EN:%d  PWR:%d  PENDING:%d\n",
+                    mfd->panel_info.lcd.vsync_enable, mfd->panel_power_on,
+                    mfd->vsync_handler_pending);
+       }
+}
+
+static void mdp_vsync_handler(void *data)
+{
+       struct msm_fb_data_type *mfd = (struct msm_fb_data_type *)data;
+
+       if (mfd->use_mdp_vsync) {
+#ifdef MDP_HW_VSYNC
+               if (mfd->panel_power_on)
+                       MDP_OUTP(MDP_BASE + MDP_SYNC_STATUS_0, vsync_load_cnt);
+
+               mdp_pipe_ctrl(MDP_CMD_BLOCK, MDP_BLOCK_POWER_OFF, TRUE);
+#endif
+       } else {
+               mfd->last_vsync_timetick = ktime_get_real();
+       }
+
+       mfd->vsync_handler_pending = FALSE;
+}
+
+irqreturn_t mdp_hw_vsync_handler_proxy(int irq, void *data)
+{
+       /*
+        * ToDo: tried enabling/disabling GPIO MDP HW VSYNC interrupt
+        * but getting inaccurate timing in mdp_vsync_handler()
+        * disable_irq(MDP_HW_VSYNC_IRQ);
+        */
+       mdp_vsync_handler(data);
+
+       return IRQ_HANDLED;
+}
+
+#ifdef MDP_HW_VSYNC
+static void mdp_set_sync_cfg_0(struct msm_fb_data_type *mfd, int vsync_cnt)
+{
+       unsigned long cfg;
+
+       cfg = mfd->total_lcd_lines - 1;
+       cfg <<= MDP_SYNCFG_HGT_LOC;
+       if (mfd->panel_info.lcd.hw_vsync_mode)
+               cfg |= MDP_SYNCFG_VSYNC_EXT_EN;
+       cfg |= (MDP_SYNCFG_VSYNC_INT_EN | vsync_cnt);
+
+       MDP_OUTP(MDP_BASE + MDP_SYNC_CFG_0, cfg);
+}
+#endif
+
+void mdp_config_vsync(struct msm_fb_data_type *mfd)
+{
+
+       /* vsync on primary lcd only for now */
+       if ((mfd->dest != DISPLAY_LCD) || (mfd->panel_info.pdest != DISPLAY_1)
+           || (!vsync_mode)) {
+               goto err_handle;
+       }
+
+       if (mfd->panel_info.lcd.vsync_enable) {
+               mfd->total_porch_lines = mfd->panel_info.lcd.v_back_porch +
+                   mfd->panel_info.lcd.v_front_porch +
+                   mfd->panel_info.lcd.v_pulse_width;
+               mfd->total_lcd_lines =
+                   mfd->panel_info.yres + mfd->total_porch_lines;
+               mfd->lcd_ref_usec_time =
+                   100000000 / mfd->panel_info.lcd.refx100;
+               mfd->vsync_handler_pending = FALSE;
+               mfd->last_vsync_timetick.tv.sec = 0;
+               mfd->last_vsync_timetick.tv.nsec = 0;
+
+#ifdef MDP_HW_VSYNC
+               if (mdp_vsync_clk == NULL)
+                       mdp_vsync_clk = clk_get(NULL, "mdp_vsync_clk");
+
+               if (IS_ERR(mdp_vsync_clk)) {
+                       printk(KERN_ERR "error: can't get mdp_vsync_clk!\n");
+                       mfd->use_mdp_vsync = 0;
+               } else
+                       mfd->use_mdp_vsync = 1;
+
+               if (mfd->use_mdp_vsync) {
+                       uint32 vsync_cnt_cfg, vsync_cnt_cfg_dem;
+                       uint32 mdp_vsync_clk_speed_hz;
+
+                       mdp_vsync_clk_speed_hz = clk_get_rate(mdp_vsync_clk);
+
+                       if (mdp_vsync_clk_speed_hz == 0) {
+                               mfd->use_mdp_vsync = 0;
+                       } else {
+                               /*
+                                * Do this calculation in 2 steps for
+                                * rounding uint32 properly.
+                                */
+                               vsync_cnt_cfg_dem =
+                                   (mfd->panel_info.lcd.refx100 *
+                                    mfd->total_lcd_lines) / 100;
+                               vsync_cnt_cfg =
+                                   (mdp_vsync_clk_speed_hz) /
+                                   vsync_cnt_cfg_dem;
+
+                               /* MDP cmd block enable */
+                               mdp_pipe_ctrl(MDP_CMD_BLOCK, MDP_BLOCK_POWER_ON,
+                                             FALSE);
+                               mdp_hw_vsync_clk_enable(mfd);
+
+                               mdp_set_sync_cfg_0(mfd, vsync_cnt_cfg);
+
+                               /*
+                                * load the last line + 1 to be in the
+                                * safety zone
+                                */
+                               vsync_load_cnt = mfd->panel_info.yres;
+
+                               /* line counter init value at the next pulse */
+                               MDP_OUTP(MDP_BASE + MDP_PRIM_VSYNC_INIT_VAL,
+                                                       vsync_load_cnt);
+
+                               /*
+                                * external vsync source pulse width and
+                                * polarity flip
+                                */
+                               MDP_OUTP(MDP_BASE + MDP_PRIM_VSYNC_OUT_CTRL,
+                                                       BIT(30) | BIT(0));
+
+
+                               /* threshold */
+                               MDP_OUTP(MDP_BASE + 0x200,
+                                        (vsync_above_th << 16) |
+                                        (vsync_start_th));
+
+                               mdp_hw_vsync_clk_disable(mfd);
+                               /* MDP cmd block disable */
+                               mdp_pipe_ctrl(MDP_CMD_BLOCK,
+                                             MDP_BLOCK_POWER_OFF, FALSE);
+                       }
+               }
+#else
+               mfd->use_mdp_vsync = 0;
+               hrtimer_init(&mfd->dma_hrtimer, CLOCK_MONOTONIC,
+                            HRTIMER_MODE_REL);
+               mfd->dma_hrtimer.function = mdp_dma2_vsync_hrtimer_handler;
+               mfd->vsync_width_boundary = vmalloc(mfd->panel_info.xres * 4);
+#endif
+
+               mfd->channel_irq = 0;
+               if (mfd->panel_info.lcd.hw_vsync_mode) {
+                       u32 vsync_gpio = mfd->vsync_gpio;
+                       u32 ret;
+
+                       if (vsync_gpio == -1) {
+                               MSM_FB_INFO("vsync_gpio not defined!\n");
+                               goto err_handle;
+                       }
+
+                       ret = gpio_tlmm_config(GPIO_CFG
+                                       (vsync_gpio,
+                                       (mfd->use_mdp_vsync) ? 1 : 0,
+                                       GPIO_INPUT,
+                                       GPIO_PULL_DOWN,
+                                       GPIO_2MA),
+                                       GPIO_ENABLE);
+                       if (ret)
+                               goto err_handle;
+
+                       if (!mfd->use_mdp_vsync) {
+                               mfd->channel_irq = MSM_GPIO_TO_INT(vsync_gpio);
+                               if (request_irq
+                                   (mfd->channel_irq,
+                                    &mdp_hw_vsync_handler_proxy,
+                                    IRQF_TRIGGER_FALLING, "VSYNC_GPIO",
+                                    (void *)mfd)) {
+                                       MSM_FB_INFO
+                                       ("irq=%d failed! vsync_gpio=%d\n",
+                                               mfd->channel_irq,
+                                               vsync_gpio);
+                                       goto err_handle;
+                               }
+                       }
+               }
+
+               mdp_set_vsync((unsigned long)mfd);
+       }
+
+       return;
+
+err_handle:
+       if (mfd->vsync_width_boundary)
+               vfree(mfd->vsync_width_boundary);
+       mfd->panel_info.lcd.vsync_enable = FALSE;
+       printk(KERN_ERR "%s: failed!\n", __func__);
+}
+
+void mdp_vsync_resync_workqueue_handler(struct work_struct *work)
+{
+       struct msm_fb_data_type *mfd = NULL;
+       int vsync_fnc_enabled = FALSE;
+       struct msm_fb_panel_data *pdata = NULL;
+
+       mfd = container_of(work, struct msm_fb_data_type, vsync_resync_worker);
+
+       if (mfd) {
+               if (mfd->panel_power_on) {
+                       pdata =
+                           (struct msm_fb_panel_data *)mfd->pdev->dev.
+                           platform_data;
+
+                       /*
+                        * we need to turn on MDP power if it uses MDP vsync
+                        * HW block in SW mode
+                        */
+                       if ((!mfd->panel_info.lcd.hw_vsync_mode) &&
+                           (mfd->use_mdp_vsync) &&
+                           (pdata) && (pdata->set_vsync_notifier != NULL)) {
+                               /*
+                                * enable pwr here since we can't enable it in
+                                * vsync callback in isr mode
+                                */
+                               mdp_pipe_ctrl(MDP_CMD_BLOCK, MDP_BLOCK_POWER_ON,
+                                             FALSE);
+                       }
+
+                       if (pdata->set_vsync_notifier != NULL) {
+                               vsync_fnc_enabled = TRUE;
+                               pdata->set_vsync_notifier(mdp_vsync_handler,
+                                                         (void *)mfd);
+                       }
+               }
+       }
+
+       if ((mfd) && (!vsync_fnc_enabled))
+               mfd->vsync_handler_pending = FALSE;
+}
+
+boolean mdp_hw_vsync_set_handler(msm_fb_vsync_handler_type handler, void *data)
+{
+       /*
+        * ToDo: tried enabling/disabling GPIO MDP HW VSYNC interrupt
+        * but getting inaccurate timing in mdp_vsync_handler()
+        * enable_irq(MDP_HW_VSYNC_IRQ);
+        */
+
+       return TRUE;
+}
+
+uint32 mdp_get_lcd_line_counter(struct msm_fb_data_type *mfd)
+{
+       uint32 elapsed_usec_time;
+       uint32 lcd_line;
+       ktime_t last_vsync_timetick_local;
+       ktime_t curr_time;
+       unsigned long flag;
+
+       if ((!mfd->panel_info.lcd.vsync_enable) || (!vsync_mode))
+               return 0;
+
+       spin_lock_irqsave(&mdp_spin_lock, flag);
+       last_vsync_timetick_local = mfd->last_vsync_timetick;
+       spin_unlock_irqrestore(&mdp_spin_lock, flag);
+
+       curr_time = ktime_get_real();
+       elapsed_usec_time =
+           ((curr_time.tv.sec - last_vsync_timetick_local.tv.sec) * 1000000) +
+           ((curr_time.tv.nsec - last_vsync_timetick_local.tv.nsec) / 1000);
+
+       elapsed_usec_time = elapsed_usec_time % mfd->lcd_ref_usec_time;
+
+       /* lcd line calculation referencing to line counter = 0 */
+       lcd_line =
+           (elapsed_usec_time * mfd->total_lcd_lines) / mfd->lcd_ref_usec_time;
+
+       /* lcd line adjusment referencing to the actual line counter at vsync */
+       lcd_line =
+           (mfd->total_lcd_lines - mfd->panel_info.lcd.v_back_porch +
+            lcd_line) % (mfd->total_lcd_lines + 1);
+
+       if (lcd_line > mfd->total_lcd_lines) {
+               MSM_FB_INFO
+                   ("mdp_get_lcd_line_counter: mdp_lcd_rd_cnt >= mfd->total_lcd_lines error!\n");
+       }
+
+       return lcd_line;
+}
diff --git a/drivers/staging/msm/memory.c b/drivers/staging/msm/memory.c
new file mode 100644 (file)
index 0000000..cc80fdf
--- /dev/null
@@ -0,0 +1,214 @@
+/* arch/arm/mach-msm/memory.c
+ *
+ * Copyright (C) 2007 Google, Inc.
+ * Copyright (c) 2009-2010, Code Aurora Forum. All rights reserved.
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#include <linux/mm.h>
+#include <linux/mm_types.h>
+#include <linux/bootmem.h>
+#include <linux/module.h>
+#include <asm/pgtable.h>
+#include <asm/io.h>
+#include <asm/mach/map.h>
+#include "memory_ll.h"
+#include <asm/cacheflush.h>
+#if defined(CONFIG_MSM_NPA_REMOTE)
+#include "npa_remote.h"
+#include <linux/completion.h>
+#include <linux/err.h>
+#endif
+
+int arch_io_remap_pfn_range(struct vm_area_struct *vma, unsigned long addr,
+                           unsigned long pfn, unsigned long size, pgprot_t prot)
+{
+       unsigned long pfn_addr = pfn << PAGE_SHIFT;
+/*
+       if ((pfn_addr >= 0x88000000) && (pfn_addr < 0xD0000000)) {
+               prot = pgprot_device(prot);
+               printk("remapping device %lx\n", prot);
+       }
+*/
+       panic("Memory remap PFN stuff not done\n");
+       return remap_pfn_range(vma, addr, pfn, size, prot);
+}
+
+void *zero_page_strongly_ordered;
+
+static void map_zero_page_strongly_ordered(void)
+{
+       if (zero_page_strongly_ordered)
+               return;
+/*
+       zero_page_strongly_ordered =
+               ioremap_strongly_ordered(page_to_pfn(empty_zero_page)
+               << PAGE_SHIFT, PAGE_SIZE);
+*/
+       panic("Strongly ordered memory functions not implemented\n");
+}
+
+void write_to_strongly_ordered_memory(void)
+{
+       map_zero_page_strongly_ordered();
+       *(int *)zero_page_strongly_ordered = 0;
+}
+EXPORT_SYMBOL(write_to_strongly_ordered_memory);
+
+void flush_axi_bus_buffer(void)
+{
+       __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 5" \
+                                   : : "r" (0) : "memory");
+       write_to_strongly_ordered_memory();
+}
+
+#define CACHE_LINE_SIZE 32
+
+/* These cache related routines make the assumption that the associated
+ * physical memory is contiguous. They will operate on all (L1
+ * and L2 if present) caches.
+ */
+void clean_and_invalidate_caches(unsigned long vstart,
+       unsigned long length, unsigned long pstart)
+{
+       unsigned long vaddr;
+
+       for (vaddr = vstart; vaddr < vstart + length; vaddr += CACHE_LINE_SIZE)
+               asm ("mcr p15, 0, %0, c7, c14, 1" : : "r" (vaddr));
+#ifdef CONFIG_OUTER_CACHE
+       outer_flush_range(pstart, pstart + length);
+#endif
+       asm ("mcr p15, 0, %0, c7, c10, 4" : : "r" (0));
+       asm ("mcr p15, 0, %0, c7, c5, 0" : : "r" (0));
+
+       flush_axi_bus_buffer();
+}
+
+void clean_caches(unsigned long vstart,
+       unsigned long length, unsigned long pstart)
+{
+       unsigned long vaddr;
+
+       for (vaddr = vstart; vaddr < vstart + length; vaddr += CACHE_LINE_SIZE)
+               asm ("mcr p15, 0, %0, c7, c10, 1" : : "r" (vaddr));
+#ifdef CONFIG_OUTER_CACHE
+       outer_clean_range(pstart, pstart + length);
+#endif
+       asm ("mcr p15, 0, %0, c7, c10, 4" : : "r" (0));
+       asm ("mcr p15, 0, %0, c7, c5, 0" : : "r" (0));
+
+       flush_axi_bus_buffer();
+}
+
+void invalidate_caches(unsigned long vstart,
+       unsigned long length, unsigned long pstart)
+{
+       unsigned long vaddr;
+
+       for (vaddr = vstart; vaddr < vstart + length; vaddr += CACHE_LINE_SIZE)
+               asm ("mcr p15, 0, %0, c7, c6, 1" : : "r" (vaddr));
+#ifdef CONFIG_OUTER_CACHE
+       outer_inv_range(pstart, pstart + length);
+#endif
+       asm ("mcr p15, 0, %0, c7, c10, 4" : : "r" (0));
+       asm ("mcr p15, 0, %0, c7, c5, 0" : : "r" (0));
+
+       flush_axi_bus_buffer();
+}
+
+void *alloc_bootmem_aligned(unsigned long size, unsigned long alignment)
+{
+       void *unused_addr = NULL;
+       unsigned long addr, tmp_size, unused_size;
+
+       /* Allocate maximum size needed, see where it ends up.
+        * Then free it -- in this path there are no other allocators
+        * so we can depend on getting the same address back
+        * when we allocate a smaller piece that is aligned
+        * at the end (if necessary) and the piece we really want,
+        * then free the unused first piece.
+        */
+
+       tmp_size = size + alignment - PAGE_SIZE;
+       addr = (unsigned long)alloc_bootmem(tmp_size);
+       free_bootmem(__pa(addr), tmp_size);
+
+       unused_size = alignment - (addr % alignment);
+       if (unused_size)
+               unused_addr = alloc_bootmem(unused_size);
+
+       addr = (unsigned long)alloc_bootmem(size);
+       if (unused_size)
+               free_bootmem(__pa(unused_addr), unused_size);
+
+       return (void *)addr;
+}
+
+#if defined(CONFIG_MSM_NPA_REMOTE)
+struct npa_client *npa_memory_client;
+#endif
+
+static int change_memory_power_state(unsigned long start_pfn,
+       unsigned long nr_pages, int state)
+{
+#if defined(CONFIG_MSM_NPA_REMOTE)
+       static atomic_t node_created_flag = ATOMIC_INIT(1);
+#else
+       unsigned long start;
+       unsigned long size;
+       unsigned long virtual;
+#endif
+       int rc = 0;
+
+#if defined(CONFIG_MSM_NPA_REMOTE)
+       if (atomic_dec_and_test(&node_created_flag)) {
+               /* Create NPA 'required' client. */
+               npa_memory_client = npa_create_sync_client(NPA_MEMORY_NODE_NAME,
+                       "memory node", NPA_CLIENT_REQUIRED);
+               if (IS_ERR(npa_memory_client)) {
+                       rc = PTR_ERR(npa_memory_client);
+                       return rc;
+               }
+       }
+
+       rc = npa_issue_required_request(npa_memory_client, state);
+#else
+       if (state == MEMORY_DEEP_POWERDOWN) {
+               /* simulate turning off memory by writing bit pattern into it */
+               start = start_pfn << PAGE_SHIFT;
+               size = nr_pages << PAGE_SHIFT;
+               virtual = __phys_to_virt(start);
+               memset((void *)virtual, 0x27, size);
+       }
+#endif
+       return rc;
+}
+
+int platform_physical_remove_pages(unsigned long start_pfn,
+       unsigned long nr_pages)
+{
+       return change_memory_power_state(start_pfn, nr_pages,
+               MEMORY_DEEP_POWERDOWN);
+}
+
+int platform_physical_add_pages(unsigned long start_pfn,
+       unsigned long nr_pages)
+{
+       return change_memory_power_state(start_pfn, nr_pages, MEMORY_ACTIVE);
+}
+
+int platform_physical_low_power_pages(unsigned long start_pfn,
+       unsigned long nr_pages)
+{
+       return change_memory_power_state(start_pfn, nr_pages,
+               MEMORY_SELF_REFRESH);
+}
diff --git a/drivers/staging/msm/memory_ll.h b/drivers/staging/msm/memory_ll.h
new file mode 100644 (file)
index 0000000..18a239a
--- /dev/null
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2007 Google, Inc.
+ * Copyright (c) 2009-2010, Code Aurora Forum. All rights reserved.
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+#ifndef __ASM_ARCH_MEMORY_LL_H
+#define __ASM_ARCH_MEMORY_LL_H
+
+#define MAX_PHYSMEM_BITS 32
+#define SECTION_SIZE_BITS 25
+
+#define HAS_ARCH_IO_REMAP_PFN_RANGE
+
+#ifndef __ASSEMBLY__
+void *alloc_bootmem_aligned(unsigned long size, unsigned long alignment);
+void clean_and_invalidate_caches(unsigned long, unsigned long, unsigned long);
+void clean_caches(unsigned long, unsigned long, unsigned long);
+void invalidate_caches(unsigned long, unsigned long, unsigned long);
+int platform_physical_remove_pages(unsigned long, unsigned long);
+int platform_physical_add_pages(unsigned long, unsigned long);
+int platform_physical_low_power_pages(unsigned long, unsigned long);
+
+#ifdef CONFIG_ARCH_MSM_ARM11
+void write_to_strongly_ordered_memory(void);
+
+#include <asm/mach-types.h>
+
+#define arch_barrier_extra() do \
+       { if (machine_is_msm7x27_surf() || machine_is_msm7x27_ffa())  \
+               write_to_strongly_ordered_memory(); \
+       } while (0)
+#endif
+
+#ifdef CONFIG_CACHE_L2X0
+extern void l2x0_cache_sync(void);
+#define finish_arch_switch(prev)     do { l2x0_cache_sync(); } while (0)
+#endif
+
+#endif
+
+#ifdef CONFIG_ARCH_MSM_SCORPION
+#define arch_has_speculative_dfetch()  1
+#endif
+
+#endif
+
+/* these correspond to values known by the modem */
+#define MEMORY_DEEP_POWERDOWN  0
+#define MEMORY_SELF_REFRESH    1
+#define MEMORY_ACTIVE          2
+
+#define NPA_MEMORY_NODE_NAME   "/mem/ebi1/cs1"
diff --git a/drivers/staging/msm/msm_fb.c b/drivers/staging/msm/msm_fb.c
new file mode 100644 (file)
index 0000000..af5620e
--- /dev/null
@@ -0,0 +1,2354 @@
+/*
+ *
+ * Core MSM framebuffer driver.
+ *
+ * Copyright (C) 2007 Google Incorporated
+ * Copyright (c) 2008-2010, Code Aurora Forum. All rights reserved.
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/delay.h>
+#include <linux/mm.h>
+#include <linux/fb.h>
+#include "msm_mdp.h"
+#include <linux/init.h>
+#include <linux/ioport.h>
+#include <linux/device.h>
+#include <linux/dma-mapping.h>
+#include <mach/board.h>
+#include <linux/uaccess.h>
+
+#include <linux/workqueue.h>
+#include <linux/string.h>
+#include <linux/version.h>
+#include <linux/proc_fs.h>
+#include <linux/vmalloc.h>
+#include <linux/debugfs.h>
+#include <linux/console.h>
+#include <linux/leds.h>
+#include <asm/dma-mapping.h>
+
+
+#define MSM_FB_C
+#include "msm_fb.h"
+#include "mddihosti.h"
+#include "tvenc.h"
+#include "mdp.h"
+#include "mdp4.h"
+
+#ifdef CONFIG_FB_MSM_LOGO
+#define INIT_IMAGE_FILE "/logo.rle"
+extern int load_565rle_image(char *filename);
+#endif
+
+
+#define pgprot_noncached(prot) \
+       __pgprot_modify(prot, L_PTE_MT_MASK, L_PTE_MT_UNCACHED)
+#define pgprot_writecombine(prot) \
+       __pgprot_modify(prot, L_PTE_MT_MASK, L_PTE_MT_BUFFERABLE)
+#define pgprot_device(prot) \
+       __pgprot_modify(prot, L_PTE_MT_MASK|L_PTE_EXEC, L_PTE_MT_DEV_NONSHARED)
+#define pgprot_writethroughcache(prot) \
+       __pgprot((pgprot_val(prot) & ~L_PTE_MT_MASK) | L_PTE_MT_WRITETHROUGH)
+#define pgprot_writebackcache(prot) \
+       __pgprot((pgprot_val(prot) & ~L_PTE_MT_MASK) | L_PTE_MT_WRITEBACK)
+#define pgprot_writebackwacache(prot) \
+       __pgprot((pgprot_val(prot) & ~L_PTE_MT_MASK) | L_PTE_MT_WRITEALLOC)
+
+static unsigned char *fbram;
+static unsigned char *fbram_phys;
+static int fbram_size;
+
+static struct platform_device *pdev_list[MSM_FB_MAX_DEV_LIST];
+static int pdev_list_cnt;
+
+int vsync_mode = 1;
+
+#define MAX_FBI_LIST 32
+static struct fb_info *fbi_list[MAX_FBI_LIST];
+static int fbi_list_index;
+
+static struct msm_fb_data_type *mfd_list[MAX_FBI_LIST];
+static int mfd_list_index;
+
+static u32 msm_fb_pseudo_palette[16] = {
+       0x00000000, 0xffffffff, 0xffffffff, 0xffffffff,
+       0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+       0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+       0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff
+};
+
+u32 msm_fb_debug_enabled;
+/* Setting msm_fb_msg_level to 8 prints out ALL messages */
+u32 msm_fb_msg_level = 7;
+
+/* Setting mddi_msg_level to 8 prints out ALL messages */
+u32 mddi_msg_level = 5;
+
+extern int32 mdp_block_power_cnt[MDP_MAX_BLOCK];
+extern unsigned long mdp_timer_duration;
+
+static int msm_fb_register(struct msm_fb_data_type *mfd);
+static int msm_fb_open(struct fb_info *info, int user);
+static int msm_fb_release(struct fb_info *info, int user);
+static int msm_fb_pan_display(struct fb_var_screeninfo *var,
+                             struct fb_info *info);
+static int msm_fb_stop_sw_refresher(struct msm_fb_data_type *mfd);
+int msm_fb_resume_sw_refresher(struct msm_fb_data_type *mfd);
+static int msm_fb_check_var(struct fb_var_screeninfo *var,
+                           struct fb_info *info);
+static int msm_fb_set_par(struct fb_info *info);
+static int msm_fb_blank_sub(int blank_mode, struct fb_info *info,
+                           boolean op_enable);
+static int msm_fb_suspend_sub(struct msm_fb_data_type *mfd);
+static int msm_fb_resume_sub(struct msm_fb_data_type *mfd);
+static int msm_fb_ioctl(struct fb_info *info, unsigned int cmd,
+                       unsigned long arg);
+static int msm_fb_mmap(struct fb_info *info, struct vm_area_struct * vma);
+
+#ifdef MSM_FB_ENABLE_DBGFS
+
+#define MSM_FB_MAX_DBGFS 1024
+#define MAX_BACKLIGHT_BRIGHTNESS 255
+
+int msm_fb_debugfs_file_index;
+struct dentry *msm_fb_debugfs_root;
+struct dentry *msm_fb_debugfs_file[MSM_FB_MAX_DBGFS];
+
+struct dentry *msm_fb_get_debugfs_root(void)
+{
+       if (msm_fb_debugfs_root == NULL)
+               msm_fb_debugfs_root = debugfs_create_dir("msm_fb", NULL);
+
+       return msm_fb_debugfs_root;
+}
+
+void msm_fb_debugfs_file_create(struct dentry *root, const char *name,
+                               u32 *var)
+{
+       if (msm_fb_debugfs_file_index >= MSM_FB_MAX_DBGFS)
+               return;
+
+       msm_fb_debugfs_file[msm_fb_debugfs_file_index++] =
+           debugfs_create_u32(name, S_IRUGO | S_IWUSR, root, var);
+}
+#endif
+
+int msm_fb_cursor(struct fb_info *info, struct fb_cursor *cursor)
+{
+       struct msm_fb_data_type *mfd = (struct msm_fb_data_type *)info->par;
+
+       if (!mfd->cursor_update)
+               return -ENODEV;
+
+       return mfd->cursor_update(info, cursor);
+}
+
+static int msm_fb_resource_initialized;
+
+#ifndef CONFIG_FB_BACKLIGHT
+static int lcd_backlight_registered;
+
+static void msm_fb_set_bl_brightness(struct led_classdev *led_cdev,
+                                       enum led_brightness value)
+{
+       struct msm_fb_data_type *mfd = dev_get_drvdata(led_cdev->dev->parent);
+       int bl_lvl;
+
+       if (value > MAX_BACKLIGHT_BRIGHTNESS)
+               value = MAX_BACKLIGHT_BRIGHTNESS;
+
+       /* This maps android backlight level 0 to 255 into
+          driver backlight level 0 to bl_max with rounding */
+       bl_lvl = (2 * value * mfd->panel_info.bl_max + MAX_BACKLIGHT_BRIGHTNESS)
+               /(2 * MAX_BACKLIGHT_BRIGHTNESS);
+
+       if (!bl_lvl && value)
+               bl_lvl = 1;
+
+       msm_fb_set_backlight(mfd, bl_lvl, 1);
+}
+
+static struct led_classdev backlight_led = {
+       .name           = "lcd-backlight",
+       .brightness     = MAX_BACKLIGHT_BRIGHTNESS,
+       .brightness_set = msm_fb_set_bl_brightness,
+};
+#endif
+
+static struct msm_fb_platform_data *msm_fb_pdata;
+
+int msm_fb_detect_client(const char *name)
+{
+       int ret = -EPERM;
+#ifdef CONFIG_FB_MSM_MDDI_AUTO_DETECT
+       u32 id;
+#endif
+
+       if (msm_fb_pdata && msm_fb_pdata->detect_client) {
+               ret = msm_fb_pdata->detect_client(name);
+
+               /* if it's non mddi panel, we need to pre-scan
+                  mddi client to see if we can disable mddi host */
+
+#ifdef CONFIG_FB_MSM_MDDI_AUTO_DETECT
+               if (!ret && msm_fb_pdata->mddi_prescan)
+                       id = mddi_get_client_id();
+#endif
+       }
+
+       return ret;
+}
+
+static int msm_fb_probe(struct platform_device *pdev)
+{
+       struct msm_fb_data_type *mfd;
+       int rc;
+
+       MSM_FB_DEBUG("msm_fb_probe\n");
+
+       if ((pdev->id == 0) && (pdev->num_resources > 0)) {
+               msm_fb_pdata = pdev->dev.platform_data;
+               fbram_size =
+                       pdev->resource[0].end - pdev->resource[0].start + 1;
+               fbram_phys = (char *)pdev->resource[0].start;
+               fbram = ioremap((unsigned long)fbram_phys, fbram_size);
+
+               if (!fbram) {
+                       printk(KERN_ERR "fbram ioremap failed!\n");
+                       return -ENOMEM;
+               }
+               MSM_FB_INFO("msm_fb_probe:  phy_Addr = 0x%x virt = 0x%x\n",
+                            (int)fbram_phys, (int)fbram);
+
+               msm_fb_resource_initialized = 1;
+               return 0;
+       }
+
+       if (!msm_fb_resource_initialized)
+               return -EPERM;
+
+       mfd = (struct msm_fb_data_type *)platform_get_drvdata(pdev);
+
+       if (!mfd)
+               return -ENODEV;
+
+       if (mfd->key != MFD_KEY)
+               return -EINVAL;
+
+       if (pdev_list_cnt >= MSM_FB_MAX_DEV_LIST)
+               return -ENOMEM;
+
+       mfd->panel_info.frame_count = 0;
+       mfd->bl_level = mfd->panel_info.bl_max;
+
+       if (mfd->panel_info.type == LCDC_PANEL)
+               mfd->allow_set_offset =
+               msm_fb_pdata->allow_set_offset != NULL ?
+               msm_fb_pdata->allow_set_offset() : 0;
+       else
+               mfd->allow_set_offset = 0;
+
+       rc = msm_fb_register(mfd);
+       if (rc)
+               return rc;
+
+#ifdef CONFIG_FB_BACKLIGHT
+       msm_fb_config_backlight(mfd);
+#else
+       /* android supports only one lcd-backlight/lcd for now */
+       if (!lcd_backlight_registered) {
+               if (led_classdev_register(&pdev->dev, &backlight_led))
+                       printk(KERN_ERR "led_classdev_register failed\n");
+               else
+                       lcd_backlight_registered = 1;
+       }
+#endif
+
+       pdev_list[pdev_list_cnt++] = pdev;
+       return 0;
+}
+
+static int msm_fb_remove(struct platform_device *pdev)
+{
+       struct msm_fb_data_type *mfd;
+
+       MSM_FB_DEBUG("msm_fb_remove\n");
+
+       mfd = (struct msm_fb_data_type *)platform_get_drvdata(pdev);
+
+       if (!mfd)
+               return -ENODEV;
+
+       if (mfd->key != MFD_KEY)
+               return -EINVAL;
+
+       if (msm_fb_suspend_sub(mfd))
+               printk(KERN_ERR "msm_fb_remove: can't stop the device %d\n", mfd->index);
+
+       if (mfd->channel_irq != 0)
+               free_irq(mfd->channel_irq, (void *)mfd);
+
+       if (mfd->vsync_width_boundary)
+               vfree(mfd->vsync_width_boundary);
+
+       if (mfd->vsync_resync_timer.function)
+               del_timer(&mfd->vsync_resync_timer);
+
+       if (mfd->refresh_timer.function)
+               del_timer(&mfd->refresh_timer);
+
+       if (mfd->dma_hrtimer.function)
+               hrtimer_cancel(&mfd->dma_hrtimer);
+
+       /* remove /dev/fb* */
+       unregister_framebuffer(mfd->fbi);
+
+#ifdef CONFIG_FB_BACKLIGHT
+       /* remove /sys/class/backlight */
+       backlight_device_unregister(mfd->fbi->bl_dev);
+#else
+       if (lcd_backlight_registered) {
+               lcd_backlight_registered = 0;
+               led_classdev_unregister(&backlight_led);
+       }
+#endif
+
+#ifdef MSM_FB_ENABLE_DBGFS
+       if (mfd->sub_dir)
+               debugfs_remove(mfd->sub_dir);
+#endif
+
+       return 0;
+}
+
+#if defined(CONFIG_PM) && !defined(CONFIG_HAS_EARLYSUSPEND)
+static int msm_fb_suspend(struct platform_device *pdev, pm_message_t state)
+{
+       struct msm_fb_data_type *mfd;
+       int ret = 0;
+
+       MSM_FB_DEBUG("msm_fb_suspend\n");
+
+       mfd = (struct msm_fb_data_type *)platform_get_drvdata(pdev);
+
+       if ((!mfd) || (mfd->key != MFD_KEY))
+               return 0;
+
+       acquire_console_sem();
+       fb_set_suspend(mfd->fbi, 1);
+
+       ret = msm_fb_suspend_sub(mfd);
+       if (ret != 0) {
+               printk(KERN_ERR "msm_fb: failed to suspend! %d\n", ret);
+               fb_set_suspend(mfd->fbi, 0);
+       } else {
+               pdev->dev.power.power_state = state;
+       }
+
+       release_console_sem();
+       return ret;
+}
+#else
+#define msm_fb_suspend NULL
+#endif
+
+static int msm_fb_suspend_sub(struct msm_fb_data_type *mfd)
+{
+       int ret = 0;
+
+       if ((!mfd) || (mfd->key != MFD_KEY))
+               return 0;
+
+       /*
+        * suspend this channel
+        */
+       mfd->suspend.sw_refreshing_enable = mfd->sw_refreshing_enable;
+       mfd->suspend.op_enable = mfd->op_enable;
+       mfd->suspend.panel_power_on = mfd->panel_power_on;
+
+       if (mfd->op_enable) {
+               ret =
+                    msm_fb_blank_sub(FB_BLANK_POWERDOWN, mfd->fbi,
+                                     mfd->suspend.op_enable);
+               if (ret) {
+                       MSM_FB_INFO
+                           ("msm_fb_suspend: can't turn off display!\n");
+                       return ret;
+               }
+               mfd->op_enable = FALSE;
+       }
+       /*
+        * try to power down
+        */
+       mdp_pipe_ctrl(MDP_MASTER_BLOCK, MDP_BLOCK_POWER_OFF, FALSE);
+
+       /*
+        * detach display channel irq if there's any
+        * or wait until vsync-resync completes
+        */
+       if ((mfd->dest == DISPLAY_LCD)) {
+               if (mfd->panel_info.lcd.vsync_enable) {
+                       if (mfd->panel_info.lcd.hw_vsync_mode) {
+                               if (mfd->channel_irq != 0)
+                                       disable_irq(mfd->channel_irq);
+                       } else {
+                               volatile boolean vh_pending;
+                               do {
+                                       vh_pending = mfd->vsync_handler_pending;
+                               } while (vh_pending);
+                       }
+               }
+       }
+
+       return 0;
+}
+
+#if defined(CONFIG_PM) && !defined(CONFIG_HAS_EARLYSUSPEND)
+static int msm_fb_resume(struct platform_device *pdev)
+{
+       /* This resume function is called when interrupt is enabled.
+        */
+       int ret = 0;
+       struct msm_fb_data_type *mfd;
+
+       MSM_FB_DEBUG("msm_fb_resume\n");
+
+       mfd = (struct msm_fb_data_type *)platform_get_drvdata(pdev);
+
+       if ((!mfd) || (mfd->key != MFD_KEY))
+               return 0;
+
+       acquire_console_sem();
+       ret = msm_fb_resume_sub(mfd);
+       pdev->dev.power.power_state = PMSG_ON;
+       fb_set_suspend(mfd->fbi, 1);
+       release_console_sem();
+
+       return ret;
+}
+#else
+#define msm_fb_resume NULL
+#endif
+
+static int msm_fb_resume_sub(struct msm_fb_data_type *mfd)
+{
+       int ret = 0;
+
+       if ((!mfd) || (mfd->key != MFD_KEY))
+               return 0;
+
+       /* attach display channel irq if there's any */
+       if (mfd->channel_irq != 0)
+               enable_irq(mfd->channel_irq);
+
+       /* resume state var recover */
+       mfd->sw_refreshing_enable = mfd->suspend.sw_refreshing_enable;
+       mfd->op_enable = mfd->suspend.op_enable;
+
+       if (mfd->suspend.panel_power_on) {
+               ret =
+                    msm_fb_blank_sub(FB_BLANK_UNBLANK, mfd->fbi,
+                                     mfd->op_enable);
+               if (ret)
+                       MSM_FB_INFO("msm_fb_resume: can't turn on display!\n");
+       }
+
+       return ret;
+}
+
+static struct platform_driver msm_fb_driver = {
+       .probe = msm_fb_probe,
+       .remove = msm_fb_remove,
+#ifndef CONFIG_HAS_EARLYSUSPEND
+       .suspend = msm_fb_suspend,
+       .resume = msm_fb_resume,
+#endif
+       .shutdown = NULL,
+       .driver = {
+                  /* Driver name must match the device name added in platform.c. */
+                  .name = "msm_fb",
+                  },
+};
+
+#ifdef CONFIG_HAS_EARLYSUSPEND
+static void msmfb_early_suspend(struct early_suspend *h)
+{
+       struct msm_fb_data_type *mfd = container_of(h, struct msm_fb_data_type,
+                                                   early_suspend);
+       msm_fb_suspend_sub(mfd);
+}
+
+static void msmfb_early_resume(struct early_suspend *h)
+{
+       struct msm_fb_data_type *mfd = container_of(h, struct msm_fb_data_type,
+                                                   early_suspend);
+       msm_fb_resume_sub(mfd);
+}
+#endif
+
+void msm_fb_set_backlight(struct msm_fb_data_type *mfd, __u32 bkl_lvl, u32 save)
+{
+       struct msm_fb_panel_data *pdata;
+
+       pdata = (struct msm_fb_panel_data *)mfd->pdev->dev.platform_data;
+
+       if ((pdata) && (pdata->set_backlight)) {
+               down(&mfd->sem);
+               if ((bkl_lvl != mfd->bl_level) || (!save)) {
+                       u32 old_lvl;
+
+                       old_lvl = mfd->bl_level;
+                       mfd->bl_level = bkl_lvl;
+                       pdata->set_backlight(mfd);
+
+                       if (!save)
+                               mfd->bl_level = old_lvl;
+               }
+               up(&mfd->sem);
+       }
+}
+
+static int msm_fb_blank_sub(int blank_mode, struct fb_info *info,
+                           boolean op_enable)
+{
+       struct msm_fb_data_type *mfd = (struct msm_fb_data_type *)info->par;
+       struct msm_fb_panel_data *pdata = NULL;
+       int ret = 0;
+
+       if (!op_enable)
+               return -EPERM;
+
+       pdata = (struct msm_fb_panel_data *)mfd->pdev->dev.platform_data;
+       if ((!pdata) || (!pdata->on) || (!pdata->off)) {
+               printk(KERN_ERR "msm_fb_blank_sub: no panel operation detected!\n");
+               return -ENODEV;
+       }
+
+       switch (blank_mode) {
+       case FB_BLANK_UNBLANK:
+               if (!mfd->panel_power_on) {
+                       mdelay(100);
+                       ret = pdata->on(mfd->pdev);
+                       if (ret == 0) {
+                               mfd->panel_power_on = TRUE;
+
+                               msm_fb_set_backlight(mfd,
+                                                    mfd->bl_level, 0);
+
+/* ToDo: possible conflict with android which doesn't expect sw refresher */
+/*
+         if (!mfd->hw_refresh)
+         {
+           if ((ret = msm_fb_resume_sw_refresher(mfd)) != 0)
+           {
+             MSM_FB_INFO("msm_fb_blank_sub: msm_fb_resume_sw_refresher failed = %d!\n",ret);
+           }
+         }
+*/
+                       }
+               }
+               break;
+
+       case FB_BLANK_VSYNC_SUSPEND:
+       case FB_BLANK_HSYNC_SUSPEND:
+       case FB_BLANK_NORMAL:
+       case FB_BLANK_POWERDOWN:
+       default:
+               if (mfd->panel_power_on) {
+                       int curr_pwr_state;
+
+                       mfd->op_enable = FALSE;
+                       curr_pwr_state = mfd->panel_power_on;
+                       mfd->panel_power_on = FALSE;
+
+                       mdelay(100);
+                       ret = pdata->off(mfd->pdev);
+                       if (ret)
+                               mfd->panel_power_on = curr_pwr_state;
+
+                       msm_fb_set_backlight(mfd, 0, 0);
+                       mfd->op_enable = TRUE;
+               }
+               break;
+       }
+
+       return ret;
+}
+
+static void msm_fb_fillrect(struct fb_info *info,
+                           const struct fb_fillrect *rect)
+{
+       struct msm_fb_data_type *mfd = (struct msm_fb_data_type *)info->par;
+
+       cfb_fillrect(info, rect);
+       if (!mfd->hw_refresh && (info->var.yoffset == 0) &&
+               !mfd->sw_currently_refreshing) {
+               struct fb_var_screeninfo var;
+
+               var = info->var;
+               var.reserved[0] = 0x54445055;
+               var.reserved[1] = (rect->dy << 16) | (rect->dx);
+               var.reserved[2] = ((rect->dy + rect->height) << 16) |
+                   (rect->dx + rect->width);
+
+               msm_fb_pan_display(&var, info);
+       }
+}
+
+static void msm_fb_copyarea(struct fb_info *info,
+                           const struct fb_copyarea *area)
+{
+       struct msm_fb_data_type *mfd = (struct msm_fb_data_type *)info->par;
+
+       cfb_copyarea(info, area);
+       if (!mfd->hw_refresh && (info->var.yoffset == 0) &&
+               !mfd->sw_currently_refreshing) {
+               struct fb_var_screeninfo var;
+
+               var = info->var;
+               var.reserved[0] = 0x54445055;
+               var.reserved[1] = (area->dy << 16) | (area->dx);
+               var.reserved[2] = ((area->dy + area->height) << 16) |
+                   (area->dx + area->width);
+
+               msm_fb_pan_display(&var, info);
+       }
+}
+
+static void msm_fb_imageblit(struct fb_info *info, const struct fb_image *image)
+{
+       struct msm_fb_data_type *mfd = (struct msm_fb_data_type *)info->par;
+
+       cfb_imageblit(info, image);
+       if (!mfd->hw_refresh && (info->var.yoffset == 0) &&
+               !mfd->sw_currently_refreshing) {
+               struct fb_var_screeninfo var;
+
+               var = info->var;
+               var.reserved[0] = 0x54445055;
+               var.reserved[1] = (image->dy << 16) | (image->dx);
+               var.reserved[2] = ((image->dy + image->height) << 16) |
+                   (image->dx + image->width);
+
+               msm_fb_pan_display(&var, info);
+       }
+}
+
+static int msm_fb_blank(int blank_mode, struct fb_info *info)
+{
+       struct msm_fb_data_type *mfd = (struct msm_fb_data_type *)info->par;
+       return msm_fb_blank_sub(blank_mode, info, mfd->op_enable);
+}
+
+static int msm_fb_set_lut(struct fb_cmap *cmap, struct fb_info *info)
+{
+       struct msm_fb_data_type *mfd = (struct msm_fb_data_type *)info->par;
+
+       if (!mfd->lut_update)
+               return -ENODEV;
+
+       mfd->lut_update(info, cmap);
+       return 0;
+}
+
+/*
+ * Custom Framebuffer mmap() function for MSM driver.
+ * Differs from standard mmap() function by allowing for customized
+ * page-protection.
+ */
+static int msm_fb_mmap(struct fb_info *info, struct vm_area_struct * vma)
+{
+       /* Get frame buffer memory range. */
+       unsigned long start = info->fix.smem_start;
+       u32 len = PAGE_ALIGN((start & ~PAGE_MASK) + info->fix.smem_len);
+       unsigned long off = vma->vm_pgoff << PAGE_SHIFT;
+       struct msm_fb_data_type *mfd = (struct msm_fb_data_type *)info->par;
+       if (off >= len) {
+               /* memory mapped io */
+               off -= len;
+               if (info->var.accel_flags) {
+                       mutex_unlock(&info->lock);
+                       return -EINVAL;
+               }
+               start = info->fix.mmio_start;
+               len = PAGE_ALIGN((start & ~PAGE_MASK) + info->fix.mmio_len);
+       }
+
+       /* Set VM flags. */
+       start &= PAGE_MASK;
+       if ((vma->vm_end - vma->vm_start + off) > len)
+               return -EINVAL;
+       off += start;
+       vma->vm_pgoff = off >> PAGE_SHIFT;
+       /* This is an IO map - tell maydump to skip this VMA */
+       vma->vm_flags |= VM_IO | VM_RESERVED;
+
+       /* Set VM page protection */
+       if (mfd->mdp_fb_page_protection == MDP_FB_PAGE_PROTECTION_WRITECOMBINE)
+               vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
+       else if (mfd->mdp_fb_page_protection ==
+                       MDP_FB_PAGE_PROTECTION_WRITETHROUGHCACHE)
+               vma->vm_page_prot = pgprot_writethroughcache(vma->vm_page_prot);
+       else if (mfd->mdp_fb_page_protection ==
+                       MDP_FB_PAGE_PROTECTION_WRITEBACKCACHE)
+               vma->vm_page_prot = pgprot_writebackcache(vma->vm_page_prot);
+       else if (mfd->mdp_fb_page_protection ==
+                       MDP_FB_PAGE_PROTECTION_WRITEBACKWACACHE)
+               vma->vm_page_prot = pgprot_writebackwacache(vma->vm_page_prot);
+       else
+               vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
+
+       /* Remap the frame buffer I/O range */
+       if (io_remap_pfn_range(vma, vma->vm_start, off >> PAGE_SHIFT,
+                               vma->vm_end - vma->vm_start,
+                               vma->vm_page_prot))
+               return -EAGAIN;
+
+       return 0;
+}
+
+static struct fb_ops msm_fb_ops = {
+       .owner = THIS_MODULE,
+       .fb_open = msm_fb_open,
+       .fb_release = msm_fb_release,
+       .fb_read = NULL,
+       .fb_write = NULL,
+       .fb_cursor = NULL,
+       .fb_check_var = msm_fb_check_var,       /* vinfo check */
+       .fb_set_par = msm_fb_set_par,   /* set the video mode according to info->var */
+       .fb_setcolreg = NULL,   /* set color register */
+       .fb_blank = msm_fb_blank,       /* blank display */
+       .fb_pan_display = msm_fb_pan_display,   /* pan display */
+       .fb_fillrect = msm_fb_fillrect, /* Draws a rectangle */
+       .fb_copyarea = msm_fb_copyarea, /* Copy data from area to another */
+       .fb_imageblit = msm_fb_imageblit,       /* Draws a image to the display */
+       .fb_rotate = NULL,
+       .fb_sync = NULL,        /* wait for blit idle, optional */
+       .fb_ioctl = msm_fb_ioctl,       /* perform fb specific ioctl (optional) */
+       .fb_mmap = msm_fb_mmap,
+};
+
+static int msm_fb_register(struct msm_fb_data_type *mfd)
+{
+       int ret = -ENODEV;
+       int bpp;
+       struct msm_panel_info *panel_info = &mfd->panel_info;
+       struct fb_info *fbi = mfd->fbi;
+       struct fb_fix_screeninfo *fix;
+       struct fb_var_screeninfo *var;
+       int *id;
+       int fbram_offset;
+
+       /*
+        * fb info initialization
+        */
+       fix = &fbi->fix;
+       var = &fbi->var;
+
+       fix->type_aux = 0;      /* if type == FB_TYPE_INTERLEAVED_PLANES */
+       fix->visual = FB_VISUAL_TRUECOLOR;      /* True Color */
+       fix->ywrapstep = 0;     /* No support */
+       fix->mmio_start = 0;    /* No MMIO Address */
+       fix->mmio_len = 0;      /* No MMIO Address */
+       fix->accel = FB_ACCEL_NONE;/* FB_ACCEL_MSM needes to be added in fb.h */
+
+       var->xoffset = 0,       /* Offset from virtual to visible */
+       var->yoffset = 0,       /* resolution */
+       var->grayscale = 0,     /* No graylevels */
+       var->nonstd = 0,        /* standard pixel format */
+       var->activate = FB_ACTIVATE_VBL,        /* activate it at vsync */
+       var->height = -1,       /* height of picture in mm */
+       var->width = -1,        /* width of picture in mm */
+       var->accel_flags = 0,   /* acceleration flags */
+       var->sync = 0,  /* see FB_SYNC_* */
+       var->rotate = 0,        /* angle we rotate counter clockwise */
+       mfd->op_enable = FALSE;
+
+       switch (mfd->fb_imgType) {
+       case MDP_RGB_565:
+               fix->type = FB_TYPE_PACKED_PIXELS;
+               fix->xpanstep = 1;
+               fix->ypanstep = 1;
+               var->vmode = FB_VMODE_NONINTERLACED;
+               var->blue.offset = 0;
+               var->green.offset = 5;
+               var->red.offset = 11;
+               var->blue.length = 5;
+               var->green.length = 6;
+               var->red.length = 5;
+               var->blue.msb_right = 0;
+               var->green.msb_right = 0;
+               var->red.msb_right = 0;
+               var->transp.offset = 0;
+               var->transp.length = 0;
+               bpp = 2;
+               break;
+
+       case MDP_RGB_888:
+               fix->type = FB_TYPE_PACKED_PIXELS;
+               fix->xpanstep = 1;
+               fix->ypanstep = 1;
+               var->vmode = FB_VMODE_NONINTERLACED;
+               var->blue.offset = 0;
+               var->green.offset = 8;
+               var->red.offset = 16;
+               var->blue.length = 8;
+               var->green.length = 8;
+               var->red.length = 8;
+               var->blue.msb_right = 0;
+               var->green.msb_right = 0;
+               var->red.msb_right = 0;
+               var->transp.offset = 0;
+               var->transp.length = 0;
+               bpp = 3;
+               break;
+
+       case MDP_ARGB_8888:
+               fix->type = FB_TYPE_PACKED_PIXELS;
+               fix->xpanstep = 1;
+               fix->ypanstep = 1;
+               var->vmode = FB_VMODE_NONINTERLACED;
+               var->blue.offset = 0;
+               var->green.offset = 8;
+               var->red.offset = 16;
+               var->blue.length = 8;
+               var->green.length = 8;
+               var->red.length = 8;
+               var->blue.msb_right = 0;
+               var->green.msb_right = 0;
+               var->red.msb_right = 0;
+               var->transp.offset = 24;
+               var->transp.length = 8;
+               bpp = 3;
+               break;
+
+       case MDP_YCRYCB_H2V1:
+               /* ToDo: need to check TV-Out YUV422i framebuffer format */
+               /*       we might need to create new type define */
+               fix->type = FB_TYPE_INTERLEAVED_PLANES;
+               fix->xpanstep = 2;
+               fix->ypanstep = 1;
+               var->vmode = FB_VMODE_NONINTERLACED;
+
+               /* how about R/G/B offset? */
+               var->blue.offset = 0;
+               var->green.offset = 5;
+               var->red.offset = 11;
+               var->blue.length = 5;
+               var->green.length = 6;
+               var->red.length = 5;
+               var->blue.msb_right = 0;
+               var->green.msb_right = 0;
+               var->red.msb_right = 0;
+               var->transp.offset = 0;
+               var->transp.length = 0;
+               bpp = 2;
+               break;
+
+       default:
+               MSM_FB_ERR("msm_fb_init: fb %d unkown image type!\n",
+                          mfd->index);
+               return ret;
+       }
+
+       /* The adreno GPU hardware requires that the pitch be aligned to
+          32 pixels for color buffers, so for the cases where the GPU
+          is writing directly to fb0, the framebuffer pitch
+          also needs to be 32 pixel aligned */
+
+       if (mfd->index == 0)
+               fix->line_length = ALIGN(panel_info->xres * bpp, 32);
+       else
+               fix->line_length = panel_info->xres * bpp;
+
+       fix->smem_len = fix->line_length * panel_info->yres * mfd->fb_page;
+
+       mfd->var_xres = panel_info->xres;
+       mfd->var_yres = panel_info->yres;
+
+       var->pixclock = mfd->panel_info.clk_rate;
+       mfd->var_pixclock = var->pixclock;
+
+       var->xres = panel_info->xres;
+       var->yres = panel_info->yres;
+       var->xres_virtual = panel_info->xres;
+       var->yres_virtual = panel_info->yres * mfd->fb_page;
+       var->bits_per_pixel = bpp * 8,  /* FrameBuffer color depth */
+               /*
+                * id field for fb app
+                */
+           id = (int *)&mfd->panel;
+
+#if defined(CONFIG_FB_MSM_MDP22)
+       snprintf(fix->id, sizeof(fix->id), "msmfb22_%x", (__u32) *id);
+#elif defined(CONFIG_FB_MSM_MDP30)
+       snprintf(fix->id, sizeof(fix->id), "msmfb30_%x", (__u32) *id);
+#elif defined(CONFIG_FB_MSM_MDP31)
+       snprintf(fix->id, sizeof(fix->id), "msmfb31_%x", (__u32) *id);
+#elif defined(CONFIG_FB_MSM_MDP40)
+       snprintf(fix->id, sizeof(fix->id), "msmfb40_%x", (__u32) *id);
+#else
+       error CONFIG_FB_MSM_MDP undefined !
+#endif
+        fbi->fbops = &msm_fb_ops;
+       fbi->flags = FBINFO_FLAG_DEFAULT;
+       fbi->pseudo_palette = msm_fb_pseudo_palette;
+
+       mfd->ref_cnt = 0;
+       mfd->sw_currently_refreshing = FALSE;
+       mfd->sw_refreshing_enable = TRUE;
+       mfd->panel_power_on = FALSE;
+
+       mfd->pan_waiting = FALSE;
+       init_completion(&mfd->pan_comp);
+       init_completion(&mfd->refresher_comp);
+       init_MUTEX(&mfd->sem);
+
+       fbram_offset = PAGE_ALIGN((int)fbram)-(int)fbram;
+       fbram += fbram_offset;
+       fbram_phys += fbram_offset;
+       fbram_size -= fbram_offset;
+
+       if (fbram_size < fix->smem_len) {
+               printk(KERN_ERR "error: no more framebuffer memory!\n");
+               return -ENOMEM;
+       }
+
+       fbi->screen_base = fbram;
+       fbi->fix.smem_start = (unsigned long)fbram_phys;
+
+       memset(fbi->screen_base, 0x0, fix->smem_len);
+
+       mfd->op_enable = TRUE;
+       mfd->panel_power_on = FALSE;
+
+       /* cursor memory allocation */
+       if (mfd->cursor_update) {
+               mfd->cursor_buf = dma_alloc_coherent(NULL,
+                                       MDP_CURSOR_SIZE,
+                                       (dma_addr_t *) &mfd->cursor_buf_phys,
+                                       GFP_KERNEL);
+               if (!mfd->cursor_buf)
+                       mfd->cursor_update = 0;
+       }
+
+       if (mfd->lut_update) {
+               ret = fb_alloc_cmap(&fbi->cmap, 256, 0);
+               if (ret)
+                       printk(KERN_ERR "%s: fb_alloc_cmap() failed!\n",
+                                       __func__);
+       }
+
+       if (register_framebuffer(fbi) < 0) {
+               if (mfd->lut_update)
+                       fb_dealloc_cmap(&fbi->cmap);
+
+               if (mfd->cursor_buf)
+                       dma_free_coherent(NULL,
+                               MDP_CURSOR_SIZE,
+                               mfd->cursor_buf,
+                               (dma_addr_t) mfd->cursor_buf_phys);
+
+               mfd->op_enable = FALSE;
+               return -EPERM;
+       }
+
+       fbram += fix->smem_len;
+       fbram_phys += fix->smem_len;
+       fbram_size -= fix->smem_len;
+
+       MSM_FB_INFO
+           ("FrameBuffer[%d] %dx%d size=%d bytes is registered successfully!\n",
+            mfd->index, fbi->var.xres, fbi->var.yres, fbi->fix.smem_len);
+
+#ifdef CONFIG_FB_MSM_LOGO
+       if (!load_565rle_image(INIT_IMAGE_FILE)) ;      /* Flip buffer */
+#endif
+       ret = 0;
+
+#ifdef CONFIG_HAS_EARLYSUSPEND
+       mfd->early_suspend.suspend = msmfb_early_suspend;
+       mfd->early_suspend.resume = msmfb_early_resume;
+       mfd->early_suspend.level = EARLY_SUSPEND_LEVEL_DISABLE_FB - 2;
+       register_early_suspend(&mfd->early_suspend);
+#endif
+
+#ifdef MSM_FB_ENABLE_DBGFS
+       {
+               struct dentry *root;
+               struct dentry *sub_dir;
+               char sub_name[2];
+
+               root = msm_fb_get_debugfs_root();
+               if (root != NULL) {
+                       sub_name[0] = (char)(mfd->index + 0x30);
+                       sub_name[1] = '\0';
+                       sub_dir = debugfs_create_dir(sub_name, root);
+               } else {
+                       sub_dir = NULL;
+               }
+
+               mfd->sub_dir = sub_dir;
+
+               if (sub_dir) {
+                       msm_fb_debugfs_file_create(sub_dir, "op_enable",
+                                                  (u32 *) &mfd->op_enable);
+                       msm_fb_debugfs_file_create(sub_dir, "panel_power_on",
+                                                  (u32 *) &mfd->
+                                                  panel_power_on);
+                       msm_fb_debugfs_file_create(sub_dir, "ref_cnt",
+                                                  (u32 *) &mfd->ref_cnt);
+                       msm_fb_debugfs_file_create(sub_dir, "fb_imgType",
+                                                  (u32 *) &mfd->fb_imgType);
+                       msm_fb_debugfs_file_create(sub_dir,
+                                                  "sw_currently_refreshing",
+                                                  (u32 *) &mfd->
+                                                  sw_currently_refreshing);
+                       msm_fb_debugfs_file_create(sub_dir,
+                                                  "sw_refreshing_enable",
+                                                  (u32 *) &mfd->
+                                                  sw_refreshing_enable);
+
+                       msm_fb_debugfs_file_create(sub_dir, "xres",
+                                                  (u32 *) &mfd->panel_info.
+                                                  xres);
+                       msm_fb_debugfs_file_create(sub_dir, "yres",
+                                                  (u32 *) &mfd->panel_info.
+                                                  yres);
+                       msm_fb_debugfs_file_create(sub_dir, "bpp",
+                                                  (u32 *) &mfd->panel_info.
+                                                  bpp);
+                       msm_fb_debugfs_file_create(sub_dir, "type",
+                                                  (u32 *) &mfd->panel_info.
+                                                  type);
+                       msm_fb_debugfs_file_create(sub_dir, "wait_cycle",
+                                                  (u32 *) &mfd->panel_info.
+                                                  wait_cycle);
+                       msm_fb_debugfs_file_create(sub_dir, "pdest",
+                                                  (u32 *) &mfd->panel_info.
+                                                  pdest);
+                       msm_fb_debugfs_file_create(sub_dir, "backbuff",
+                                                  (u32 *) &mfd->panel_info.
+                                                  fb_num);
+                       msm_fb_debugfs_file_create(sub_dir, "clk_rate",
+                                                  (u32 *) &mfd->panel_info.
+                                                  clk_rate);
+                       msm_fb_debugfs_file_create(sub_dir, "frame_count",
+                                                  (u32 *) &mfd->panel_info.
+                                                  frame_count);
+
+
+                       switch (mfd->dest) {
+                       case DISPLAY_LCD:
+                               msm_fb_debugfs_file_create(sub_dir,
+                               "vsync_enable",
+                               (u32 *)&mfd->panel_info.lcd.vsync_enable);
+                               msm_fb_debugfs_file_create(sub_dir,
+                               "refx100",
+                               (u32 *) &mfd->panel_info.lcd. refx100);
+                               msm_fb_debugfs_file_create(sub_dir,
+                               "v_back_porch",
+                               (u32 *) &mfd->panel_info.lcd.v_back_porch);
+                               msm_fb_debugfs_file_create(sub_dir,
+                               "v_front_porch",
+                               (u32 *) &mfd->panel_info.lcd.v_front_porch);
+                               msm_fb_debugfs_file_create(sub_dir,
+                               "v_pulse_width",
+                               (u32 *) &mfd->panel_info.lcd.v_pulse_width);
+                               msm_fb_debugfs_file_create(sub_dir,
+                               "hw_vsync_mode",
+                               (u32 *) &mfd->panel_info.lcd.hw_vsync_mode);
+                               msm_fb_debugfs_file_create(sub_dir,
+                               "vsync_notifier_period", (u32 *)
+                               &mfd->panel_info.lcd.vsync_notifier_period);
+                               break;
+
+                       case DISPLAY_LCDC:
+                               msm_fb_debugfs_file_create(sub_dir,
+                               "h_back_porch",
+                               (u32 *) &mfd->panel_info.lcdc.h_back_porch);
+                               msm_fb_debugfs_file_create(sub_dir,
+                               "h_front_porch",
+                               (u32 *) &mfd->panel_info.lcdc.h_front_porch);
+                               msm_fb_debugfs_file_create(sub_dir,
+                               "h_pulse_width",
+                               (u32 *) &mfd->panel_info.lcdc.h_pulse_width);
+                               msm_fb_debugfs_file_create(sub_dir,
+                               "v_back_porch",
+                               (u32 *) &mfd->panel_info.lcdc.v_back_porch);
+                               msm_fb_debugfs_file_create(sub_dir,
+                               "v_front_porch",
+                               (u32 *) &mfd->panel_info.lcdc.v_front_porch);
+                               msm_fb_debugfs_file_create(sub_dir,
+                               "v_pulse_width",
+                               (u32 *) &mfd->panel_info.lcdc.v_pulse_width);
+                               msm_fb_debugfs_file_create(sub_dir,
+                               "border_clr",
+                               (u32 *) &mfd->panel_info.lcdc.border_clr);
+                               msm_fb_debugfs_file_create(sub_dir,
+                               "underflow_clr",
+                               (u32 *) &mfd->panel_info.lcdc.underflow_clr);
+                               msm_fb_debugfs_file_create(sub_dir,
+                               "hsync_skew",
+                               (u32 *) &mfd->panel_info.lcdc.hsync_skew);
+                               break;
+
+                       default:
+                               break;
+                       }
+               }
+       }
+#endif /* MSM_FB_ENABLE_DBGFS */
+
+       return ret;
+}
+
+static int msm_fb_open(struct fb_info *info, int user)
+{
+       struct msm_fb_data_type *mfd = (struct msm_fb_data_type *)info->par;
+
+       if (!mfd->ref_cnt) {
+               mdp_set_dma_pan_info(info, NULL, TRUE);
+
+               if (msm_fb_blank_sub(FB_BLANK_UNBLANK, info, mfd->op_enable)) {
+                       printk(KERN_ERR "msm_fb_open: can't turn on display!\n");
+                       return -1;
+               }
+       }
+
+       mfd->ref_cnt++;
+       return 0;
+}
+
+static int msm_fb_release(struct fb_info *info, int user)
+{
+       struct msm_fb_data_type *mfd = (struct msm_fb_data_type *)info->par;
+       int ret = 0;
+
+       if (!mfd->ref_cnt) {
+               MSM_FB_INFO("msm_fb_release: try to close unopened fb %d!\n",
+                           mfd->index);
+               return -EINVAL;
+       }
+
+       mfd->ref_cnt--;
+
+       if (!mfd->ref_cnt) {
+               if ((ret =
+                    msm_fb_blank_sub(FB_BLANK_POWERDOWN, info,
+                                     mfd->op_enable)) != 0) {
+                       printk(KERN_ERR "msm_fb_release: can't turn off display!\n");
+                       return ret;
+               }
+       }
+
+       return ret;
+}
+
+DECLARE_MUTEX(msm_fb_pan_sem);
+
+static int msm_fb_pan_display(struct fb_var_screeninfo *var,
+                             struct fb_info *info)
+{
+       struct mdp_dirty_region dirty;
+       struct mdp_dirty_region *dirtyPtr = NULL;
+       struct msm_fb_data_type *mfd = (struct msm_fb_data_type *)info->par;
+
+       if ((!mfd->op_enable) || (!mfd->panel_power_on))
+               return -EPERM;
+
+       if (var->xoffset > (info->var.xres_virtual - info->var.xres))
+               return -EINVAL;
+
+       if (var->yoffset > (info->var.yres_virtual - info->var.yres))
+               return -EINVAL;
+
+       if (info->fix.xpanstep)
+               info->var.xoffset =
+                   (var->xoffset / info->fix.xpanstep) * info->fix.xpanstep;
+
+       if (info->fix.ypanstep)
+               info->var.yoffset =
+                   (var->yoffset / info->fix.ypanstep) * info->fix.ypanstep;
+
+       /* "UPDT" */
+       if (var->reserved[0] == 0x54445055) {
+               dirty.xoffset = var->reserved[1] & 0xffff;
+               dirty.yoffset = (var->reserved[1] >> 16) & 0xffff;
+
+               if ((var->reserved[2] & 0xffff) <= dirty.xoffset)
+                       return -EINVAL;
+               if (((var->reserved[2] >> 16) & 0xffff) <= dirty.yoffset)
+                       return -EINVAL;
+
+               dirty.width = (var->reserved[2] & 0xffff) - dirty.xoffset;
+               dirty.height =
+                   ((var->reserved[2] >> 16) & 0xffff) - dirty.yoffset;
+               info->var.yoffset = var->yoffset;
+
+               if (dirty.xoffset < 0)
+                       return -EINVAL;
+
+               if (dirty.yoffset < 0)
+                       return -EINVAL;
+
+               if ((dirty.xoffset + dirty.width) > info->var.xres)
+                       return -EINVAL;
+
+               if ((dirty.yoffset + dirty.height) > info->var.yres)
+                       return -EINVAL;
+
+               if ((dirty.width <= 0) || (dirty.height <= 0))
+                       return -EINVAL;
+
+               dirtyPtr = &dirty;
+       }
+
+       /* Flip */
+       /* A constant value is used to indicate that we should change the DMA
+          output buffer instead of just panning */
+
+       if (var->reserved[0] == 0x466c6970) {
+               unsigned long length, address;
+               struct file *p_src_file;
+               struct mdp_img imgdata;
+               int bpp;
+
+               if (mfd->allow_set_offset) {
+                       imgdata.memory_id = var->reserved[1];
+                       imgdata.priv = var->reserved[2];
+
+                       /* If there is no memory ID then we want to reset back
+                          to the original fb visibility */
+                       if (var->reserved[1]) {
+                               if (var->reserved[4] == MDP_BLIT_SRC_GEM) {
+                                       panic("waaaaaaaaaaaaaah");
+                                       if ( /*get_gem_img(&imgdata,
+                                               (unsigned long *) &address,
+                                                &length)*/ -1 < 0) {
+                                               return -1;
+                                       }
+                               } else {
+                                       /*get_img(&imgdata, info, &address,
+                                                       &length, &p_src_file);*/
+                                       panic("waaaaaah");
+                               }
+                               mfd->ibuf.visible_swapped = TRUE;
+                       } else {
+                               /* Flip back to the original address
+                                  adjusted for xoffset and yoffset */
+
+                               bpp = info->var.bits_per_pixel / 8;
+                               address = (unsigned long) info->fix.smem_start;
+                               address += info->var.xoffset * bpp +
+                               info->var.yoffset * info->fix.line_length;
+
+                               mfd->ibuf.visible_swapped = FALSE;
+                       }
+
+                       mdp_set_offset_info(info, address,
+                               (var->activate == FB_ACTIVATE_VBL));
+
+                       mfd->dma_fnc(mfd);
+                       return 0;
+               } else
+                       return -EINVAL;
+       }
+
+       down(&msm_fb_pan_sem);
+       mdp_set_dma_pan_info(info, dirtyPtr,
+                            (var->activate == FB_ACTIVATE_VBL));
+       mdp_dma_pan_update(info);
+       up(&msm_fb_pan_sem);
+
+       ++mfd->panel_info.frame_count;
+       return 0;
+}
+
+static int msm_fb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
+{
+       struct msm_fb_data_type *mfd = (struct msm_fb_data_type *)info->par;
+
+       if (var->rotate != FB_ROTATE_UR)
+               return -EINVAL;
+       if (var->grayscale != info->var.grayscale)
+               return -EINVAL;
+
+       switch (var->bits_per_pixel) {
+       case 16:
+               if ((var->green.offset != 5) ||
+                       !((var->blue.offset == 11)
+                               || (var->blue.offset == 0)) ||
+                       !((var->red.offset == 11)
+                               || (var->red.offset == 0)) ||
+                       (var->blue.length != 5) ||
+                       (var->green.length != 6) ||
+                       (var->red.length != 5) ||
+                       (var->blue.msb_right != 0) ||
+                       (var->green.msb_right != 0) ||
+                       (var->red.msb_right != 0) ||
+                       (var->transp.offset != 0) ||
+                       (var->transp.length != 0))
+                               return -EINVAL;
+               break;
+
+       case 24:
+               if ((var->blue.offset != 0) ||
+                       (var->green.offset != 8) ||
+                       (var->red.offset != 16) ||
+                       (var->blue.length != 8) ||
+                       (var->green.length != 8) ||
+                       (var->red.length != 8) ||
+                       (var->blue.msb_right != 0) ||
+                       (var->green.msb_right != 0) ||
+                       (var->red.msb_right != 0) ||
+                       !(((var->transp.offset == 0) &&
+                               (var->transp.length == 0)) ||
+                         ((var->transp.offset == 24) &&
+                               (var->transp.length == 8))))
+                               return -EINVAL;
+               break;
+
+       default:
+               return -EINVAL;
+       }
+
+       if ((var->xres_virtual <= 0) || (var->yres_virtual <= 0))
+               return -EINVAL;
+
+       if (info->fix.smem_len <
+               (var->xres_virtual*var->yres_virtual*(var->bits_per_pixel/8)))
+               return -EINVAL;
+
+       if ((var->xres == 0) || (var->yres == 0))
+               return -EINVAL;
+
+       if ((var->xres > mfd->panel_info.xres) ||
+               (var->yres > mfd->panel_info.yres))
+               return -EINVAL;
+
+       if (var->xoffset > (var->xres_virtual - var->xres))
+               return -EINVAL;
+
+       if (var->yoffset > (var->yres_virtual - var->yres))
+               return -EINVAL;
+
+       return 0;
+}
+
+static int msm_fb_set_par(struct fb_info *info)
+{
+       struct msm_fb_data_type *mfd = (struct msm_fb_data_type *)info->par;
+       struct fb_var_screeninfo *var = &info->var;
+       int old_imgType;
+       int blank = 0;
+
+       old_imgType = mfd->fb_imgType;
+       switch (var->bits_per_pixel) {
+       case 16:
+               if (var->red.offset == 0)
+                       mfd->fb_imgType = MDP_BGR_565;
+               else
+                       mfd->fb_imgType = MDP_RGB_565;
+               break;
+
+       case 24:
+               if ((var->transp.offset == 0) && (var->transp.length == 0))
+                       mfd->fb_imgType = MDP_RGB_888;
+               else if ((var->transp.offset == 24) &&
+                               (var->transp.length == 8)) {
+                       mfd->fb_imgType = MDP_ARGB_8888;
+                       info->var.bits_per_pixel = 32;
+               }
+               break;
+
+       default:
+               return -EINVAL;
+       }
+
+       if ((mfd->var_pixclock != var->pixclock) ||
+               (mfd->hw_refresh && ((mfd->fb_imgType != old_imgType) ||
+                               (mfd->var_pixclock != var->pixclock) ||
+                               (mfd->var_xres != var->xres) ||
+                               (mfd->var_yres != var->yres)))) {
+               mfd->var_xres = var->xres;
+               mfd->var_yres = var->yres;
+               mfd->var_pixclock = var->pixclock;
+               blank = 1;
+       }
+
+       if (blank) {
+               msm_fb_blank_sub(FB_BLANK_POWERDOWN, info, mfd->op_enable);
+               msm_fb_blank_sub(FB_BLANK_UNBLANK, info, mfd->op_enable);
+       }
+
+       return 0;
+}
+
+static int msm_fb_stop_sw_refresher(struct msm_fb_data_type *mfd)
+{
+       if (mfd->hw_refresh)
+               return -EPERM;
+
+       if (mfd->sw_currently_refreshing) {
+               down(&mfd->sem);
+               mfd->sw_currently_refreshing = FALSE;
+               up(&mfd->sem);
+
+               /* wait until the refresher finishes the last job */
+               wait_for_completion_killable(&mfd->refresher_comp);
+       }
+
+       return 0;
+}
+
+int msm_fb_resume_sw_refresher(struct msm_fb_data_type *mfd)
+{
+       boolean do_refresh;
+
+       if (mfd->hw_refresh)
+               return -EPERM;
+
+       down(&mfd->sem);
+       if ((!mfd->sw_currently_refreshing) && (mfd->sw_refreshing_enable)) {
+               do_refresh = TRUE;
+               mfd->sw_currently_refreshing = TRUE;
+       } else {
+               do_refresh = FALSE;
+       }
+       up(&mfd->sem);
+
+       if (do_refresh)
+               mdp_refresh_screen((unsigned long)mfd);
+
+       return 0;
+}
+
+void mdp_ppp_put_img(struct file *p_src_file, struct file *p_dst_file)
+{
+#ifdef CONFIG_ANDROID_PMEM
+       if (p_src_file)
+               put_pmem_file(p_src_file);
+       if (p_dst_file)
+               put_pmem_file(p_dst_file);
+#endif
+}
+
+int mdp_blit(struct fb_info *info, struct mdp_blit_req *req)
+{
+       int ret;
+       struct file *p_src_file = 0, *p_dst_file = 0;
+       if (unlikely(req->src_rect.h == 0 || req->src_rect.w == 0)) {
+               printk(KERN_ERR "mpd_ppp: src img of zero size!\n");
+               return -EINVAL;
+       }
+       if (unlikely(req->dst_rect.h == 0 || req->dst_rect.w == 0))
+               return 0;
+
+       ret = mdp_ppp_blit(info, req, &p_src_file, &p_dst_file);
+       mdp_ppp_put_img(p_src_file, p_dst_file);
+       return ret;
+}
+
+typedef void (*msm_dma_barrier_function_pointer) (void *, size_t);
+
+static inline void msm_fb_dma_barrier_for_rect(struct fb_info *info,
+                       struct mdp_img *img, struct mdp_rect *rect,
+                       msm_dma_barrier_function_pointer dma_barrier_fp
+                       )
+{
+       /*
+        * Compute the start and end addresses of the rectangles.
+        * NOTE: As currently implemented, the data between
+        *       the end of one row and the start of the next is
+        *       included in the address range rather than
+        *       doing multiple calls for each row.
+        */
+
+       char * const pmem_start = info->screen_base;
+/*     int bytes_per_pixel = mdp_get_bytes_per_pixel(img->format);
+       unsigned long start = (unsigned long)pmem_start + img->offset +
+               (img->width * rect->y + rect->x) * bytes_per_pixel;
+       size_t size  = ((rect->h - 1) * img->width + rect->w) * bytes_per_pixel;
+       (*dma_barrier_fp) ((void *) start, size);
+*/
+       panic("waaaaah");
+}
+
+static inline void msm_dma_nc_pre(void)
+{
+       dmb();
+}
+static inline void msm_dma_wt_pre(void)
+{
+       dmb();
+}
+static inline void msm_dma_todevice_wb_pre(void *start, size_t size)
+{
+       #warning this
+//     dma_cache_pre_ops(start, size, DMA_TO_DEVICE);
+}
+
+static inline void msm_dma_fromdevice_wb_pre(void *start, size_t size)
+{
+       #warning this
+//     dma_cache_pre_ops(start, size, DMA_FROM_DEVICE);
+}
+
+static inline void msm_dma_nc_post(void)
+{
+       dmb();
+}
+
+static inline void msm_dma_fromdevice_wt_post(void *start, size_t size)
+{
+       #warning this
+//     dma_cache_post_ops(start, size, DMA_FROM_DEVICE);
+}
+
+static inline void msm_dma_todevice_wb_post(void *start, size_t size)
+{
+       #warning this
+//     dma_cache_post_ops(start, size, DMA_TO_DEVICE);
+}
+
+static inline void msm_dma_fromdevice_wb_post(void *start, size_t size)
+{
+       #warning this
+//     dma_cache_post_ops(start, size, DMA_FROM_DEVICE);
+}
+
+/*
+ * Do the write barriers required to guarantee data is committed to RAM
+ * (from CPU cache or internal buffers) before a DMA operation starts.
+ * NOTE: As currently implemented, the data between
+ *       the end of one row and the start of the next is
+ *       included in the address range rather than
+ *       doing multiple calls for each row.
+*/
+static void msm_fb_ensure_memory_coherency_before_dma(struct fb_info *info,
+               struct mdp_blit_req *req_list,
+               int req_list_count)
+{
+#ifdef CONFIG_ARCH_QSD8X50
+       int i;
+
+       /*
+        * Normally, do the requested barriers for each address
+        * range that corresponds to a rectangle.
+        *
+        * But if at least one write barrier is requested for data
+        * going to or from the device but no address range is
+        * needed for that barrier, then do the barrier, but do it
+        * only once, no matter how many requests there are.
+        */
+       struct msm_fb_data_type *mfd = (struct msm_fb_data_type *)info->par;
+       switch (mfd->mdp_fb_page_protection)    {
+       default:
+       case MDP_FB_PAGE_PROTECTION_NONCACHED:
+       case MDP_FB_PAGE_PROTECTION_WRITECOMBINE:
+               /*
+                * The following barrier is only done at most once,
+                * since further calls would be redundant.
+                */
+               for (i = 0; i < req_list_count; i++) {
+                       if (!(req_list[i].flags
+                               & MDP_NO_DMA_BARRIER_START)) {
+                               msm_dma_nc_pre();
+                               break;
+                       }
+               }
+               break;
+
+       case MDP_FB_PAGE_PROTECTION_WRITETHROUGHCACHE:
+               /*
+                * The following barrier is only done at most once,
+                * since further calls would be redundant.
+                */
+               for (i = 0; i < req_list_count; i++) {
+                       if (!(req_list[i].flags
+                               & MDP_NO_DMA_BARRIER_START)) {
+                               msm_dma_wt_pre();
+                               break;
+                       }
+               }
+               break;
+
+       case MDP_FB_PAGE_PROTECTION_WRITEBACKCACHE:
+       case MDP_FB_PAGE_PROTECTION_WRITEBACKWACACHE:
+               for (i = 0; i < req_list_count; i++) {
+                       if (!(req_list[i].flags &
+                                       MDP_NO_DMA_BARRIER_START)) {
+
+                               msm_fb_dma_barrier_for_rect(info,
+                                               &(req_list[i].src),
+                                               &(req_list[i].src_rect),
+                                               msm_dma_todevice_wb_pre
+                                               );
+
+                               msm_fb_dma_barrier_for_rect(info,
+                                               &(req_list[i].dst),
+                                               &(req_list[i].dst_rect),
+                                               msm_dma_todevice_wb_pre
+                                               );
+                       }
+               }
+               break;
+       }
+#else
+       dmb();
+#endif
+}
+
+
+/*
+ * Do the write barriers required to guarantee data will be re-read from RAM by
+ * the CPU after a DMA operation ends.
+ * NOTE: As currently implemented, the data between
+ *       the end of one row and the start of the next is
+ *       included in the address range rather than
+ *       doing multiple calls for each row.
+*/
+static void msm_fb_ensure_memory_coherency_after_dma(struct fb_info *info,
+               struct mdp_blit_req *req_list,
+               int req_list_count)
+{
+#ifdef CONFIG_ARCH_QSD8X50
+       int i;
+
+       struct msm_fb_data_type *mfd = (struct msm_fb_data_type *)info->par;
+       switch (mfd->mdp_fb_page_protection)    {
+       default:
+       case MDP_FB_PAGE_PROTECTION_NONCACHED:
+       case MDP_FB_PAGE_PROTECTION_WRITECOMBINE:
+               /*
+                * The following barrier is only done at most once,
+                * since further calls would be redundant.
+                */
+               for (i = 0; i < req_list_count; i++) {
+                       if (!(req_list[i].flags
+                               & MDP_NO_DMA_BARRIER_END)) {
+                               msm_dma_nc_post();
+                               break;
+                       }
+               }
+               break;
+
+       case MDP_FB_PAGE_PROTECTION_WRITETHROUGHCACHE:
+               for (i = 0; i < req_list_count; i++) {
+                       if (!(req_list[i].flags &
+                                       MDP_NO_DMA_BARRIER_END)) {
+
+                               msm_fb_dma_barrier_for_rect(info,
+                                               &(req_list[i].dst),
+                                               &(req_list[i].dst_rect),
+                                               msm_dma_fromdevice_wt_post
+                                               );
+                       }
+               }
+               break;
+       case MDP_FB_PAGE_PROTECTION_WRITEBACKCACHE:
+       case MDP_FB_PAGE_PROTECTION_WRITEBACKWACACHE:
+               for (i = 0; i < req_list_count; i++) {
+                       if (!(req_list[i].flags &
+                                       MDP_NO_DMA_BARRIER_END)) {
+
+                               msm_fb_dma_barrier_for_rect(info,
+                                               &(req_list[i].dst),
+                                               &(req_list[i].dst_rect),
+                                               msm_dma_fromdevice_wb_post
+                                               );
+                       }
+               }
+               break;
+       }
+#else
+       dmb();
+#endif
+}
+
+#ifdef CONFIG_MDP_PPP_ASYNC_OP
+void msm_fb_ensure_mem_coherency_after_dma(struct fb_info *info,
+       struct mdp_blit_req *req_list, int req_list_count)
+{
+       BUG_ON(!info);
+
+       /*
+        * Ensure that CPU cache and other internal CPU state is
+        * updated to reflect any change in memory modified by MDP blit
+        * DMA.
+        */
+       msm_fb_ensure_memory_coherency_after_dma(info,
+                       req_list, req_list_count);
+}
+
+static int msmfb_async_blit(struct fb_info *info, void __user *p)
+{
+       /*
+        * CAUTION: The names of the struct types intentionally *DON'T* match
+        * the names of the variables declared -- they appear to be swapped.
+        * Read the code carefully and you should see that the variable names
+        * make sense.
+        */
+       const int MAX_LIST_WINDOW = 16;
+       struct mdp_blit_req req_list[MAX_LIST_WINDOW];
+       struct mdp_blit_req_list req_list_header;
+
+       int count, i, req_list_count;
+
+       /* Get the count size for the total BLIT request. */
+       if (copy_from_user(&req_list_header, p, sizeof(req_list_header)))
+               return -EFAULT;
+       p += sizeof(req_list_header);
+       count = req_list_header.count;
+       while (count > 0) {
+               /*
+                * Access the requests through a narrow window to decrease copy
+                * overhead and make larger requests accessible to the
+                * coherency management code.
+                * NOTE: The window size is intended to be larger than the
+                *       typical request size, but not require more than 2
+                *       kbytes of stack storage.
+                */
+               req_list_count = count;
+               if (req_list_count > MAX_LIST_WINDOW)
+                       req_list_count = MAX_LIST_WINDOW;
+               if (copy_from_user(&req_list, p,
+                               sizeof(struct mdp_blit_req)*req_list_count))
+                       return -EFAULT;
+
+               /*
+                * Ensure that any data CPU may have previously written to
+                * internal state (but not yet committed to memory) is
+                * guaranteed to be committed to memory now.
+                */
+               msm_fb_ensure_memory_coherency_before_dma(info,
+                               req_list, req_list_count);
+
+               /*
+                * Do the blit DMA, if required -- returning early only if
+                * there is a failure.
+                */
+               for (i = 0; i < req_list_count; i++) {
+                       if (!(req_list[i].flags & MDP_NO_BLIT)) {
+                               int ret = 0;
+                               struct mdp_ppp_djob *job = NULL;
+
+                               if (unlikely(req_list[i].src_rect.h == 0 ||
+                                       req_list[i].src_rect.w == 0)) {
+                                       MSM_FB_ERR("mpd_ppp: "
+                                               "src img of zero size!\n");
+                                       return -EINVAL;
+                               }
+
+                               if (unlikely(req_list[i].dst_rect.h == 0 ||
+                                       req_list[i].dst_rect.w == 0))
+                                       continue;
+
+                               /* create a new display job */
+                               job = mdp_ppp_new_djob();
+                               if (unlikely(!job))
+                                       return -ENOMEM;
+
+                               job->info = info;
+                               memcpy(&job->req, &req_list[i],
+                                       sizeof(struct mdp_blit_req));
+
+                               /* Do the actual blit. */
+                               ret = mdp_ppp_blit(info, &job->req,
+                                       &job->p_src_file, &job->p_dst_file);
+
+                               /*
+                                * Note that early returns don't guarantee
+                                * memory coherency.
+                                */
+                               if (ret || mdp_ppp_get_ret_code()) {
+                                       mdp_ppp_clear_curr_djob();
+                                       return ret;
+                               }
+                       }
+               }
+
+               /* Go to next window of requests. */
+               count -= req_list_count;
+               p += sizeof(struct mdp_blit_req)*req_list_count;
+       }
+       return 0;
+}
+#else
+
+/*
+ * NOTE: The userspace issues blit operations in a sequence, the sequence
+ * start with a operation marked START and ends in an operation marked
+ * END. It is guranteed by the userspace that all the blit operations
+ * between START and END are only within the regions of areas designated
+ * by the START and END operations and that the userspace doesnt modify
+ * those areas. Hence it would be enough to perform barrier/cache operations
+ * only on the START and END operations.
+ */
+static int msmfb_blit(struct fb_info *info, void __user *p)
+{
+       /*
+        * CAUTION: The names of the struct types intentionally *DON'T* match
+        * the names of the variables declared -- they appear to be swapped.
+        * Read the code carefully and you should see that the variable names
+        * make sense.
+        */
+       const int MAX_LIST_WINDOW = 16;
+       struct mdp_blit_req req_list[MAX_LIST_WINDOW];
+       struct mdp_blit_req_list req_list_header;
+
+       int count, i, req_list_count;
+
+       /* Get the count size for the total BLIT request. */
+       if (copy_from_user(&req_list_header, p, sizeof(req_list_header)))
+               return -EFAULT;
+       p += sizeof(req_list_header);
+       count = req_list_header.count;
+       while (count > 0) {
+               /*
+                * Access the requests through a narrow window to decrease copy
+                * overhead and make larger requests accessible to the
+                * coherency management code.
+                * NOTE: The window size is intended to be larger than the
+                *       typical request size, but not require more than 2
+                *       kbytes of stack storage.
+                */
+               req_list_count = count;
+               if (req_list_count > MAX_LIST_WINDOW)
+                       req_list_count = MAX_LIST_WINDOW;
+               if (copy_from_user(&req_list, p,
+                               sizeof(struct mdp_blit_req)*req_list_count))
+                       return -EFAULT;
+
+               /*
+                * Ensure that any data CPU may have previously written to
+                * internal state (but not yet committed to memory) is
+                * guaranteed to be committed to memory now.
+                */
+               msm_fb_ensure_memory_coherency_before_dma(info,
+                               req_list, req_list_count);
+
+               /*
+                * Do the blit DMA, if required -- returning early only if
+                * there is a failure.
+                */
+               for (i = 0; i < req_list_count; i++) {
+                       if (!(req_list[i].flags & MDP_NO_BLIT)) {
+                               /* Do the actual blit. */
+                               int ret = mdp_blit(info, &(req_list[i]));
+
+                               /*
+                                * Note that early returns don't guarantee
+                                * memory coherency.
+                                */
+                               if (ret)
+                                       return ret;
+                       }
+               }
+
+               /*
+                * Ensure that CPU cache and other internal CPU state is
+                * updated to reflect any change in memory modified by MDP blit
+                * DMA.
+                */
+               msm_fb_ensure_memory_coherency_after_dma(info,
+                               req_list,
+                               req_list_count);
+
+               /* Go to next window of requests. */
+               count -= req_list_count;
+               p += sizeof(struct mdp_blit_req)*req_list_count;
+       }
+       return 0;
+}
+#endif
+
+#ifdef CONFIG_FB_MSM_OVERLAY
+static int msmfb_overlay_get(struct fb_info *info, void __user *p)
+{
+       struct mdp_overlay req;
+       int ret;
+
+       if (copy_from_user(&req, p, sizeof(req)))
+               return -EFAULT;
+
+       ret = mdp4_overlay_get(info, &req);
+       if (ret) {
+               printk(KERN_ERR "%s: ioctl failed \n",
+                       __func__);
+               return ret;
+       }
+       if (copy_to_user(p, &req, sizeof(req))) {
+               printk(KERN_ERR "%s: copy2user failed \n",
+                       __func__);
+               return -EFAULT;
+       }
+
+       return 0;
+}
+
+static int msmfb_overlay_set(struct fb_info *info, void __user *p)
+{
+       struct mdp_overlay req;
+       int ret;
+
+       if (copy_from_user(&req, p, sizeof(req)))
+               return -EFAULT;
+
+       ret = mdp4_overlay_set(info, &req);
+       if (ret) {
+               printk(KERN_ERR "%s:ioctl failed \n",
+                       __func__);
+               return ret;
+       }
+
+       if (copy_to_user(p, &req, sizeof(req))) {
+               printk(KERN_ERR "%s: copy2user failed \n",
+                       __func__);
+               return -EFAULT;
+       }
+
+       return 0;
+}
+
+static int msmfb_overlay_unset(struct fb_info *info, unsigned long *argp)
+{
+       int     ret, ndx;
+
+       ret = copy_from_user(&ndx, argp, sizeof(ndx));
+       if (ret) {
+               printk(KERN_ERR "%s:msmfb_overlay_unset ioctl failed \n",
+                       __func__);
+               return ret;
+       }
+
+       return mdp4_overlay_unset(info, ndx);
+}
+
+static int msmfb_overlay_play(struct fb_info *info, unsigned long *argp)
+{
+       int     ret;
+       struct msmfb_overlay_data req;
+       struct file *p_src_file = 0;
+
+       ret = copy_from_user(&req, argp, sizeof(req));
+       if (ret) {
+               printk(KERN_ERR "%s:msmfb_overlay_play ioctl failed \n",
+                       __func__);
+               return ret;
+       }
+
+       ret = mdp4_overlay_play(info, &req, &p_src_file);
+
+       if (p_src_file)
+               put_pmem_file(p_src_file);
+
+       return ret;
+}
+
+#endif
+
+DECLARE_MUTEX(msm_fb_ioctl_ppp_sem);
+DEFINE_MUTEX(msm_fb_ioctl_lut_sem);
+DEFINE_MUTEX(msm_fb_ioctl_hist_sem);
+
+/* Set color conversion matrix from user space */
+
+#ifndef CONFIG_FB_MSM_MDP40
+static void msmfb_set_color_conv(struct mdp_ccs *p)
+{
+       int i;
+
+       if (p->direction == MDP_CCS_RGB2YUV) {
+               /* MDP cmd block enable */
+               mdp_pipe_ctrl(MDP_CMD_BLOCK, MDP_BLOCK_POWER_ON, FALSE);
+
+               /* RGB->YUV primary forward matrix */
+               for (i = 0; i < MDP_CCS_SIZE; i++)
+                       writel(p->ccs[i], MDP_CSC_PFMVn(i));
+
+               #ifdef CONFIG_FB_MSM_MDP31
+               for (i = 0; i < MDP_BV_SIZE; i++)
+                       writel(p->bv[i], MDP_CSC_POST_BV2n(i));
+               #endif
+
+               /* MDP cmd block disable */
+               mdp_pipe_ctrl(MDP_CMD_BLOCK, MDP_BLOCK_POWER_OFF, FALSE);
+       } else {
+               /* MDP cmd block enable */
+               mdp_pipe_ctrl(MDP_CMD_BLOCK, MDP_BLOCK_POWER_ON, FALSE);
+
+               /* YUV->RGB primary reverse matrix */
+               for (i = 0; i < MDP_CCS_SIZE; i++)
+                       writel(p->ccs[i], MDP_CSC_PRMVn(i));
+               for (i = 0; i < MDP_BV_SIZE; i++)
+                       writel(p->bv[i], MDP_CSC_PRE_BV1n(i));
+
+               /* MDP cmd block disable */
+               mdp_pipe_ctrl(MDP_CMD_BLOCK, MDP_BLOCK_POWER_OFF, FALSE);
+       }
+}
+#endif
+
+
+static int msm_fb_ioctl(struct fb_info *info, unsigned int cmd,
+                       unsigned long arg)
+{
+       struct msm_fb_data_type *mfd = (struct msm_fb_data_type *)info->par;
+       void __user *argp = (void __user *)arg;
+       struct fb_cursor cursor;
+       struct fb_cmap cmap;
+       struct mdp_histogram hist;
+#ifndef CONFIG_FB_MSM_MDP40
+       struct mdp_ccs ccs_matrix;
+#endif
+       struct mdp_page_protection fb_page_protection;
+       int ret = 0;
+
+       if (!mfd->op_enable)
+               return -EPERM;
+
+       switch (cmd) {
+#ifdef CONFIG_FB_MSM_OVERLAY
+       case MSMFB_OVERLAY_GET:
+               down(&msm_fb_ioctl_ppp_sem);
+               ret = msmfb_overlay_get(info, argp);
+               up(&msm_fb_ioctl_ppp_sem);
+               break;
+       case MSMFB_OVERLAY_SET:
+               down(&msm_fb_ioctl_ppp_sem);
+               ret = msmfb_overlay_set(info, argp);
+               up(&msm_fb_ioctl_ppp_sem);
+               break;
+       case MSMFB_OVERLAY_UNSET:
+               down(&msm_fb_ioctl_ppp_sem);
+               ret = msmfb_overlay_unset(info, argp);
+               up(&msm_fb_ioctl_ppp_sem);
+               break;
+       case MSMFB_OVERLAY_PLAY:
+               down(&msm_fb_ioctl_ppp_sem);
+               ret = msmfb_overlay_play(info, argp);
+               up(&msm_fb_ioctl_ppp_sem);
+               break;
+#endif
+       case MSMFB_BLIT:
+               down(&msm_fb_ioctl_ppp_sem);
+#ifdef CONFIG_MDP_PPP_ASYNC_OP
+               ret = msmfb_async_blit(info, argp);
+               mdp_ppp_wait(); /* Wait for all blits to be finished. */
+#else
+               ret = msmfb_blit(info, argp);
+#endif
+               up(&msm_fb_ioctl_ppp_sem);
+
+               break;
+
+       /* Ioctl for setting ccs matrix from user space */
+       case MSMFB_SET_CCS_MATRIX:
+#ifndef CONFIG_FB_MSM_MDP40
+               ret = copy_from_user(&ccs_matrix, argp, sizeof(ccs_matrix));
+               if (ret) {
+                       printk(KERN_ERR
+                               "%s:MSMFB_SET_CCS_MATRIX ioctl failed \n",
+                               __func__);
+                       return ret;
+               }
+
+               down(&msm_fb_ioctl_ppp_sem);
+               if (ccs_matrix.direction == MDP_CCS_RGB2YUV)
+                       mdp_ccs_rgb2yuv = ccs_matrix;
+               else
+                       mdp_ccs_yuv2rgb = ccs_matrix;
+
+               msmfb_set_color_conv(&ccs_matrix) ;
+               up(&msm_fb_ioctl_ppp_sem);
+#else
+               ret = -EINVAL;
+#endif
+
+               break;
+
+       /* Ioctl for getting ccs matrix to user space */
+       case MSMFB_GET_CCS_MATRIX:
+#ifndef CONFIG_FB_MSM_MDP40
+               ret = copy_from_user(&ccs_matrix, argp, sizeof(ccs_matrix)) ;
+               if (ret) {
+                       printk(KERN_ERR
+                               "%s:MSMFB_GET_CCS_MATRIX ioctl failed \n",
+                                __func__);
+                       return ret;
+               }
+
+               down(&msm_fb_ioctl_ppp_sem);
+               if (ccs_matrix.direction == MDP_CCS_RGB2YUV)
+                       ccs_matrix = mdp_ccs_rgb2yuv;
+                else
+                       ccs_matrix =  mdp_ccs_yuv2rgb;
+
+               ret = copy_to_user(argp, &ccs_matrix, sizeof(ccs_matrix));
+
+               if (ret)        {
+                       printk(KERN_ERR
+                               "%s:MSMFB_GET_CCS_MATRIX ioctl failed \n",
+                                __func__);
+                       return ret ;
+               }
+               up(&msm_fb_ioctl_ppp_sem);
+#else
+               ret = -EINVAL;
+#endif
+
+               break;
+
+#ifdef CONFIG_MDP_PPP_ASYNC_OP
+       case MSMFB_ASYNC_BLIT:
+               down(&msm_fb_ioctl_ppp_sem);
+               ret = msmfb_async_blit(info, argp);
+               up(&msm_fb_ioctl_ppp_sem);
+               break;
+
+       case MSMFB_BLIT_FLUSH:
+               down(&msm_fb_ioctl_ppp_sem);
+               mdp_ppp_wait();
+               up(&msm_fb_ioctl_ppp_sem);
+               break;
+#endif
+
+       case MSMFB_GRP_DISP:
+#ifdef CONFIG_FB_MSM_MDP22
+               {
+                       unsigned long grp_id;
+
+                       ret = copy_from_user(&grp_id, argp, sizeof(grp_id));
+                       if (ret)
+                               return ret;
+
+                       mdp_pipe_ctrl(MDP_CMD_BLOCK, MDP_BLOCK_POWER_ON, FALSE);
+                       writel(grp_id, MDP_FULL_BYPASS_WORD43);
+                       mdp_pipe_ctrl(MDP_CMD_BLOCK, MDP_BLOCK_POWER_OFF,
+                                     FALSE);
+                       break;
+               }
+#else
+               return -EFAULT;
+#endif
+       case MSMFB_SUSPEND_SW_REFRESHER:
+               if (!mfd->panel_power_on)
+                       return -EPERM;
+
+               mfd->sw_refreshing_enable = FALSE;
+               ret = msm_fb_stop_sw_refresher(mfd);
+               break;
+
+       case MSMFB_RESUME_SW_REFRESHER:
+               if (!mfd->panel_power_on)
+                       return -EPERM;
+
+               mfd->sw_refreshing_enable = TRUE;
+               ret = msm_fb_resume_sw_refresher(mfd);
+               break;
+
+       case MSMFB_CURSOR:
+               ret = copy_from_user(&cursor, argp, sizeof(cursor));
+               if (ret)
+                       return ret;
+
+               ret = msm_fb_cursor(info, &cursor);
+               break;
+
+       case MSMFB_SET_LUT:
+               ret = copy_from_user(&cmap, argp, sizeof(cmap));
+               if (ret)
+                       return ret;
+
+               mutex_lock(&msm_fb_ioctl_lut_sem);
+               ret = msm_fb_set_lut(&cmap, info);
+               mutex_unlock(&msm_fb_ioctl_lut_sem);
+               break;
+
+       case MSMFB_HISTOGRAM:
+               if (!mfd->do_histogram)
+                       return -ENODEV;
+
+               ret = copy_from_user(&hist, argp, sizeof(hist));
+               if (ret)
+                       return ret;
+
+               mutex_lock(&msm_fb_ioctl_hist_sem);
+               ret = mfd->do_histogram(info, &hist);
+               mutex_unlock(&msm_fb_ioctl_hist_sem);
+               break;
+
+       case MSMFB_GET_PAGE_PROTECTION:
+               fb_page_protection.page_protection
+                       = mfd->mdp_fb_page_protection;
+               ret = copy_to_user(argp, &fb_page_protection,
+                               sizeof(fb_page_protection));
+               if (ret)
+                               return ret;
+               break;
+
+       case MSMFB_SET_PAGE_PROTECTION:
+#ifdef CONFIG_ARCH_QSD8X50
+               ret = copy_from_user(&fb_page_protection, argp,
+                               sizeof(fb_page_protection));
+               if (ret)
+                               return ret;
+
+               /* Validate the proposed page protection settings. */
+               switch (fb_page_protection.page_protection)     {
+               case MDP_FB_PAGE_PROTECTION_NONCACHED:
+               case MDP_FB_PAGE_PROTECTION_WRITECOMBINE:
+               case MDP_FB_PAGE_PROTECTION_WRITETHROUGHCACHE:
+               /* Write-back cache (read allocate)  */
+               case MDP_FB_PAGE_PROTECTION_WRITEBACKCACHE:
+               /* Write-back cache (write allocate) */
+               case MDP_FB_PAGE_PROTECTION_WRITEBACKWACACHE:
+                       mfd->mdp_fb_page_protection =
+                               fb_page_protection.page_protection;
+                       break;
+               default:
+                       ret = -EINVAL;
+                       break;
+               }
+#else
+               /*
+                * Don't allow caching until 7k DMA cache operations are
+                * available.
+                */
+               ret = -EINVAL;
+#endif
+               break;
+
+       default:
+               MSM_FB_INFO("MDP: unknown ioctl (cmd=%d) received!\n", cmd);
+               ret = -EINVAL;
+               break;
+       }
+
+       return ret;
+}
+
+static int msm_fb_register_driver(void)
+{
+       return platform_driver_register(&msm_fb_driver);
+}
+
+void msm_fb_add_device(struct platform_device *pdev)
+{
+       struct msm_fb_panel_data *pdata;
+       struct platform_device *this_dev = NULL;
+       struct fb_info *fbi;
+       struct msm_fb_data_type *mfd = NULL;
+       u32 type, id, fb_num;
+
+       if (!pdev)
+               return;
+       id = pdev->id;
+
+       pdata = pdev->dev.platform_data;
+       if (!pdata)
+               return;
+       type = pdata->panel_info.type;
+       fb_num = pdata->panel_info.fb_num;
+
+       if (fb_num <= 0)
+               return;
+
+       if (fbi_list_index >= MAX_FBI_LIST) {
+               printk(KERN_ERR "msm_fb: no more framebuffer info list!\n");
+               return;
+       }
+       /*
+        * alloc panel device data
+        */
+       this_dev = msm_fb_device_alloc(pdata, type, id);
+
+       if (!this_dev) {
+               printk(KERN_ERR
+               "%s: msm_fb_device_alloc failed!\n", __func__);
+               return;
+       }
+
+       /*
+        * alloc framebuffer info + par data
+        */
+       fbi = framebuffer_alloc(sizeof(struct msm_fb_data_type), NULL);
+       if (fbi == NULL) {
+               platform_device_put(this_dev);
+               printk(KERN_ERR "msm_fb: can't alloca framebuffer info data!\n");
+               return;
+       }
+
+       mfd = (struct msm_fb_data_type *)fbi->par;
+       mfd->key = MFD_KEY;
+       mfd->fbi = fbi;
+       mfd->panel.type = type;
+       mfd->panel.id = id;
+       mfd->fb_page = fb_num;
+       mfd->index = fbi_list_index;
+       mfd->mdp_fb_page_protection = MDP_FB_PAGE_PROTECTION_WRITECOMBINE;
+
+       /* link to the latest pdev */
+       mfd->pdev = this_dev;
+
+       mfd_list[mfd_list_index++] = mfd;
+       fbi_list[fbi_list_index++] = fbi;
+
+       /*
+        * set driver data
+        */
+       platform_set_drvdata(this_dev, mfd);
+
+       if (platform_device_add(this_dev)) {
+               printk(KERN_ERR "msm_fb: platform_device_add failed!\n");
+               platform_device_put(this_dev);
+               framebuffer_release(fbi);
+               fbi_list_index--;
+               return;
+       }
+}
+EXPORT_SYMBOL(msm_fb_add_device);
+
+int __init msm_fb_init(void)
+{
+       int rc = -ENODEV;
+
+       if (msm_fb_register_driver())
+               return rc;
+
+#ifdef MSM_FB_ENABLE_DBGFS
+       {
+               struct dentry *root;
+
+               if ((root = msm_fb_get_debugfs_root()) != NULL) {
+                       msm_fb_debugfs_file_create(root,
+                                                  "msm_fb_msg_printing_level",
+                                                  (u32 *) &msm_fb_msg_level);
+                       msm_fb_debugfs_file_create(root,
+                                                  "mddi_msg_printing_level",
+                                                  (u32 *) &mddi_msg_level);
+                       msm_fb_debugfs_file_create(root, "msm_fb_debug_enabled",
+                                                  (u32 *) &msm_fb_debug_enabled);
+               }
+       }
+#endif
+
+       return 0;
+}
+
+module_init(msm_fb_init);
diff --git a/drivers/staging/msm/msm_fb.h b/drivers/staging/msm/msm_fb.h
new file mode 100644 (file)
index 0000000..f939138
--- /dev/null
@@ -0,0 +1,174 @@
+/* Copyright (c) 2008-2009, Code Aurora Forum. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Code Aurora nor
+ *       the names of its contributors may be used to endorse or promote
+ *       products derived from this software without specific prior written
+ *       permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NON-INFRINGEMENT ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef MSM_FB_H
+#define MSM_FB_H
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/time.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include "linux/proc_fs.h"
+
+#include <mach/hardware.h>
+#include <linux/io.h>
+#include <mach/board.h>
+
+#include <asm/system.h>
+#include <asm/mach-types.h>
+#include <mach/memory.h>
+#include <linux/semaphore.h>
+#include <linux/spinlock.h>
+#include <linux/workqueue.h>
+#include <linux/hrtimer.h>
+
+#include <linux/fb.h>
+
+#ifdef CONFIG_HAS_EARLYSUSPEND
+#include <linux/earlysuspend.h>
+#endif
+
+#include "msm_fb_panel.h"
+#include "mdp.h"
+
+#define MSM_FB_DEFAULT_PAGE_SIZE 2
+#define MFD_KEY  0x11161126
+#define MSM_FB_MAX_DEV_LIST 32
+
+struct disp_info_type_suspend {
+       boolean op_enable;
+       boolean sw_refreshing_enable;
+       boolean panel_power_on;
+};
+
+struct msm_fb_data_type {
+       __u32 key;
+       __u32 index;
+       __u32 ref_cnt;
+       __u32 fb_page;
+
+       panel_id_type panel;
+       struct msm_panel_info panel_info;
+
+       DISP_TARGET dest;
+       struct fb_info *fbi;
+
+       boolean op_enable;
+       uint32 fb_imgType;
+       boolean sw_currently_refreshing;
+       boolean sw_refreshing_enable;
+       boolean hw_refresh;
+
+       MDPIBUF ibuf;
+       boolean ibuf_flushed;
+       struct timer_list refresh_timer;
+       struct completion refresher_comp;
+
+       boolean pan_waiting;
+       struct completion pan_comp;
+
+       /* vsync */
+       boolean use_mdp_vsync;
+       __u32 vsync_gpio;
+       __u32 total_lcd_lines;
+       __u32 total_porch_lines;
+       __u32 lcd_ref_usec_time;
+       __u32 refresh_timer_duration;
+
+       struct hrtimer dma_hrtimer;
+
+       boolean panel_power_on;
+       struct work_struct dma_update_worker;
+       struct semaphore sem;
+
+       struct timer_list vsync_resync_timer;
+       boolean vsync_handler_pending;
+       struct work_struct vsync_resync_worker;
+
+       ktime_t last_vsync_timetick;
+
+       __u32 *vsync_width_boundary;
+
+       unsigned int pmem_id;
+       struct disp_info_type_suspend suspend;
+
+       __u32 channel_irq;
+
+       struct mdp_dma_data *dma;
+       void (*dma_fnc) (struct msm_fb_data_type *mfd);
+       int (*cursor_update) (struct fb_info *info,
+                             struct fb_cursor *cursor);
+       int (*lut_update) (struct fb_info *info,
+                             struct fb_cmap *cmap);
+       int (*do_histogram) (struct fb_info *info,
+                             struct mdp_histogram *hist);
+       void *cursor_buf;
+       void *cursor_buf_phys;
+
+       void *cmd_port;
+       void *data_port;
+       void *data_port_phys;
+
+       __u32 bl_level;
+
+       struct platform_device *pdev;
+
+       __u32 var_xres;
+       __u32 var_yres;
+       __u32 var_pixclock;
+
+#ifdef MSM_FB_ENABLE_DBGFS
+       struct dentry *sub_dir;
+#endif
+
+#ifdef CONFIG_HAS_EARLYSUSPEND
+       struct early_suspend early_suspend;
+       struct early_suspend mddi_early_suspend;
+       struct early_suspend mddi_ext_early_suspend;
+#endif
+       u32 mdp_fb_page_protection;
+       int allow_set_offset;
+};
+
+struct dentry *msm_fb_get_debugfs_root(void);
+void msm_fb_debugfs_file_create(struct dentry *root, const char *name,
+                               u32 *var);
+void msm_fb_set_backlight(struct msm_fb_data_type *mfd, __u32 bkl_lvl,
+                               u32 save);
+
+void msm_fb_add_device(struct platform_device *pdev);
+
+int msm_fb_detect_client(const char *name);
+
+#ifdef CONFIG_FB_BACKLIGHT
+void msm_fb_config_backlight(struct msm_fb_data_type *mfd);
+#endif
+
+#endif /* MSM_FB_H */
diff --git a/drivers/staging/msm/msm_fb_bl.c b/drivers/staging/msm/msm_fb_bl.c
new file mode 100644 (file)
index 0000000..033fc94
--- /dev/null
@@ -0,0 +1,79 @@
+/* Copyright (c) 2008-2009, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/fb.h>
+#include <linux/string.h>
+#include <linux/version.h>
+#include <linux/backlight.h>
+
+#include "msm_fb.h"
+
+static int msm_fb_bl_get_brightness(struct backlight_device *pbd)
+{
+       return pbd->props.brightness;
+}
+
+static int msm_fb_bl_update_status(struct backlight_device *pbd)
+{
+       struct msm_fb_data_type *mfd = bl_get_data(pbd);
+       __u32 bl_lvl;
+
+       bl_lvl = pbd->props.brightness;
+       bl_lvl = mfd->fbi->bl_curve[bl_lvl];
+       msm_fb_set_backlight(mfd, bl_lvl, 1);
+       return 0;
+}
+
+static struct backlight_ops msm_fb_bl_ops = {
+       .get_brightness = msm_fb_bl_get_brightness,
+       .update_status = msm_fb_bl_update_status,
+};
+
+void msm_fb_config_backlight(struct msm_fb_data_type *mfd)
+{
+       struct msm_fb_panel_data *pdata;
+       struct backlight_device *pbd;
+       struct fb_info *fbi;
+       char name[16];
+
+       fbi = mfd->fbi;
+       pdata = (struct msm_fb_panel_data *)mfd->pdev->dev.platform_data;
+
+       if ((pdata) && (pdata->set_backlight)) {
+               snprintf(name, sizeof(name), "msmfb_bl%d", mfd->index);
+               pbd =
+                   backlight_device_register(name, fbi->dev, mfd,
+                                             &msm_fb_bl_ops);
+               if (!IS_ERR(pbd)) {
+                       fbi->bl_dev = pbd;
+                       fb_bl_default_curve(fbi,
+                                           0,
+                                           mfd->panel_info.bl_min,
+                                           mfd->panel_info.bl_max);
+                       pbd->props.max_brightness = FB_BACKLIGHT_LEVELS - 1;
+                       pbd->props.brightness = FB_BACKLIGHT_LEVELS - 1;
+                       backlight_update_status(pbd);
+               } else {
+                       fbi->bl_dev = NULL;
+                       printk(KERN_ERR "msm_fb: backlight_device_register failed!\n");
+               }
+       }
+}
diff --git a/drivers/staging/msm/msm_fb_def.h b/drivers/staging/msm/msm_fb_def.h
new file mode 100644 (file)
index 0000000..6de4409
--- /dev/null
@@ -0,0 +1,201 @@
+/* Copyright (c) 2008-2009, Code Aurora Forum. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Code Aurora nor
+ *       the names of its contributors may be used to endorse or promote
+ *       products derived from this software without specific prior written
+ *       permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NON-INFRINGEMENT ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef MSM_FB_DEF_H
+#define MSM_FB_DEF_H
+
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/delay.h>
+#include <linux/mm.h>
+#include <linux/fb.h>
+#include "msm_mdp.h"
+#include <linux/init.h>
+#include <linux/ioport.h>
+#include <linux/device.h>
+#include <linux/dma-mapping.h>
+#include <linux/uaccess.h>
+#include <linux/workqueue.h>
+#include <linux/string.h>
+#include <linux/version.h>
+#include <linux/proc_fs.h>
+#include <linux/vmalloc.h>
+#include <linux/debugfs.h>
+#include <linux/console.h>
+
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/time.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include "linux/proc_fs.h"
+#include <mach/hardware.h>
+#include <linux/io.h>
+#include <linux/fb.h>
+#include <asm/system.h>
+#include <asm/mach-types.h>
+#include <linux/platform_device.h>
+
+typedef s64 int64;
+typedef s32 int32;
+typedef s16 int16;
+typedef s8 int8;
+
+typedef u64 uint64;
+typedef u32 uint32;
+typedef u16 uint16;
+typedef u8 uint8;
+
+typedef s32 int4;
+typedef s16 int2;
+typedef s8 int1;
+
+typedef u32 uint4;
+typedef u16 uint2;
+typedef u8 uint1;
+
+typedef u32 dword;
+typedef u16 word;
+typedef u8 byte;
+
+typedef unsigned int boolean;
+
+#ifndef TRUE
+#define TRUE 1
+#endif
+
+#ifndef FALSE
+#define FALSE 0
+#endif
+
+#define MSM_FB_ENABLE_DBGFS
+#define FEATURE_MDDI
+
+#define outp32(addr, val) writel(val, addr)
+#define outp16(addr, val) writew(val, addr)
+#define outp8(addr, val) writeb(val, addr)
+#define outp(addr, val) outp32(addr, val)
+
+#ifndef MAX
+#define  MAX( x, y ) (((x) > (y)) ? (x) : (y))
+#endif
+
+#ifndef MIN
+#define  MIN( x, y ) (((x) < (y)) ? (x) : (y))
+#endif
+
+/*--------------------------------------------------------------------------*/
+
+#define inp32(addr) readl(addr)
+#define inp16(addr) readw(addr)
+#define inp8(addr) readb(addr)
+#define inp(addr) inp32(addr)
+
+#define inpw(port)             readw(port)
+#define outpw(port, val)       writew(val, port)
+#define inpdw(port)            readl(port)
+#define outpdw(port, val)      writel(val, port)
+
+
+#define clk_busy_wait(x) msleep_interruptible((x)/1000)
+
+#define memory_barrier()
+
+#define assert(expr) \
+       if(!(expr)) { \
+               printk(KERN_ERR "msm_fb: assertion failed! %s,%s,%s,line=%d\n",\
+                       #expr, __FILE__, __func__, __LINE__); \
+       }
+
+#define ASSERT(x)   assert(x)
+
+#define DISP_EBI2_LOCAL_DEFINE
+#ifdef DISP_EBI2_LOCAL_DEFINE
+#define LCD_PRIM_BASE_PHYS 0x98000000
+#define LCD_SECD_BASE_PHYS 0x9c000000
+#define EBI2_PRIM_LCD_RS_PIN 0x20000
+#define EBI2_SECD_LCD_RS_PIN 0x20000
+
+#define EBI2_PRIM_LCD_CLR 0xC0
+#define EBI2_PRIM_LCD_SEL 0x40
+
+#define EBI2_SECD_LCD_CLR 0x300
+#define EBI2_SECD_LCD_SEL 0x100
+#endif
+
+extern u32 msm_fb_msg_level;
+
+/*
+ * Message printing priorities:
+ * LEVEL 0 KERN_EMERG (highest priority)
+ * LEVEL 1 KERN_ALERT
+ * LEVEL 2 KERN_CRIT
+ * LEVEL 3 KERN_ERR
+ * LEVEL 4 KERN_WARNING
+ * LEVEL 5 KERN_NOTICE
+ * LEVEL 6 KERN_INFO
+ * LEVEL 7 KERN_DEBUG (Lowest priority)
+ */
+#define MSM_FB_EMERG(msg, ...)    \
+       if (msm_fb_msg_level > 0)  \
+               printk(KERN_EMERG msg, ## __VA_ARGS__);
+#define MSM_FB_ALERT(msg, ...)    \
+       if (msm_fb_msg_level > 1)  \
+               printk(KERN_ALERT msg, ## __VA_ARGS__);
+#define MSM_FB_CRIT(msg, ...)    \
+       if (msm_fb_msg_level > 2)  \
+               printk(KERN_CRIT msg, ## __VA_ARGS__);
+#define MSM_FB_ERR(msg, ...)    \
+       if (msm_fb_msg_level > 3)  \
+               printk(KERN_ERR msg, ## __VA_ARGS__);
+#define MSM_FB_WARNING(msg, ...)    \
+       if (msm_fb_msg_level > 4)  \
+               printk(KERN_WARNING msg, ## __VA_ARGS__);
+#define MSM_FB_NOTICE(msg, ...)    \
+       if (msm_fb_msg_level > 5)  \
+               printk(KERN_NOTICE msg, ## __VA_ARGS__);
+#define MSM_FB_INFO(msg, ...)    \
+       if (msm_fb_msg_level > 6)  \
+               printk(KERN_INFO msg, ## __VA_ARGS__);
+#define MSM_FB_DEBUG(msg, ...)    \
+       if (msm_fb_msg_level > 7)  \
+               printk(KERN_DEBUG msg, ## __VA_ARGS__);
+
+#ifdef MSM_FB_C
+unsigned char *msm_mdp_base;
+unsigned char *msm_pmdh_base;
+unsigned char *msm_emdh_base;
+#else
+extern unsigned char *msm_mdp_base;
+extern unsigned char *msm_pmdh_base;
+extern unsigned char *msm_emdh_base;
+#endif
+
+#endif /* MSM_FB_DEF_H */
diff --git a/drivers/staging/msm/msm_fb_panel.c b/drivers/staging/msm/msm_fb_panel.c
new file mode 100644 (file)
index 0000000..b17a239
--- /dev/null
@@ -0,0 +1,136 @@
+/* Copyright (c) 2008-2009, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/delay.h>
+#include <linux/mm.h>
+#include <linux/fb.h>
+#include <linux/init.h>
+#include <linux/ioport.h>
+#include <linux/device.h>
+#include <linux/dma-mapping.h>
+#include <linux/uaccess.h>
+#include <linux/workqueue.h>
+#include <linux/string.h>
+#include <linux/version.h>
+#include <linux/proc_fs.h>
+#include <linux/vmalloc.h>
+#include <linux/debugfs.h>
+
+#include "msm_fb_panel.h"
+
+int panel_next_on(struct platform_device *pdev)
+{
+       int ret = 0;
+       struct msm_fb_panel_data *pdata;
+       struct msm_fb_panel_data *next_pdata;
+       struct platform_device *next_pdev;
+
+       pdata = (struct msm_fb_panel_data *)pdev->dev.platform_data;
+
+       if (pdata) {
+               next_pdev = pdata->next;
+               if (next_pdev) {
+                       next_pdata =
+                           (struct msm_fb_panel_data *)next_pdev->dev.
+                           platform_data;
+                       if ((next_pdata) && (next_pdata->on))
+                               ret = next_pdata->on(next_pdev);
+               }
+       }
+
+       return ret;
+}
+
+int panel_next_off(struct platform_device *pdev)
+{
+       int ret = 0;
+       struct msm_fb_panel_data *pdata;
+       struct msm_fb_panel_data *next_pdata;
+       struct platform_device *next_pdev;
+
+       pdata = (struct msm_fb_panel_data *)pdev->dev.platform_data;
+
+       if (pdata) {
+               next_pdev = pdata->next;
+               if (next_pdev) {
+                       next_pdata =
+                           (struct msm_fb_panel_data *)next_pdev->dev.
+                           platform_data;
+                       if ((next_pdata) && (next_pdata->on))
+                               ret = next_pdata->off(next_pdev);
+               }
+       }
+
+       return ret;
+}
+
+struct platform_device *msm_fb_device_alloc(struct msm_fb_panel_data *pdata,
+                                               u32 type, u32 id)
+{
+       struct platform_device *this_dev = NULL;
+       char dev_name[16];
+
+       switch (type) {
+       case EBI2_PANEL:
+               snprintf(dev_name, sizeof(dev_name), "ebi2_lcd");
+               break;
+
+       case MDDI_PANEL:
+               snprintf(dev_name, sizeof(dev_name), "mddi");
+               break;
+
+       case EXT_MDDI_PANEL:
+               snprintf(dev_name, sizeof(dev_name), "mddi_ext");
+               break;
+
+       case TV_PANEL:
+               snprintf(dev_name, sizeof(dev_name), "tvenc");
+               break;
+
+       case HDMI_PANEL:
+       case LCDC_PANEL:
+               snprintf(dev_name, sizeof(dev_name), "lcdc");
+               break;
+
+       default:
+               return NULL;
+       }
+
+       if (pdata != NULL)
+               pdata->next = NULL;
+       else
+               return NULL;
+
+       this_dev =
+           platform_device_alloc(dev_name, ((u32) type << 16) | (u32) id);
+
+       if (this_dev) {
+               if (platform_device_add_data
+                   (this_dev, pdata, sizeof(struct msm_fb_panel_data))) {
+                       printk
+                           ("msm_fb_device_alloc: platform_device_add_data failed!\n");
+                       platform_device_put(this_dev);
+                       return NULL;
+               }
+       }
+
+       return this_dev;
+}
diff --git a/drivers/staging/msm/msm_fb_panel.h b/drivers/staging/msm/msm_fb_panel.h
new file mode 100644 (file)
index 0000000..ab45831
--- /dev/null
@@ -0,0 +1,145 @@
+/* Copyright (c) 2008-2009, Code Aurora Forum. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Code Aurora nor
+ *       the names of its contributors may be used to endorse or promote
+ *       products derived from this software without specific prior written
+ *       permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NON-INFRINGEMENT ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef MSM_FB_PANEL_H
+#define MSM_FB_PANEL_H
+
+#include "msm_fb_def.h"
+
+struct msm_fb_data_type;
+
+typedef void (*msm_fb_vsync_handler_type) (void *arg);
+
+/* panel id type */
+typedef struct panel_id_s {
+       uint16 id;
+       uint16 type;
+} panel_id_type;
+
+/* panel type list */
+#define NO_PANEL       0xffff  /* No Panel */
+#define MDDI_PANEL     1       /* MDDI */
+#define EBI2_PANEL     2       /* EBI2 */
+#define LCDC_PANEL     3       /* internal LCDC type */
+#define EXT_MDDI_PANEL 4       /* Ext.MDDI */
+#define TV_PANEL       5       /* TV */
+#define HDMI_PANEL     6       /* HDMI TV */
+
+/* panel class */
+typedef enum {
+       DISPLAY_LCD = 0,        /* lcd = ebi2/mddi */
+       DISPLAY_LCDC,           /* lcdc */
+       DISPLAY_TV,             /* TV Out */
+       DISPLAY_EXT_MDDI,       /* External MDDI */
+} DISP_TARGET;
+
+/* panel device locaiton */
+typedef enum {
+       DISPLAY_1 = 0,          /* attached as first device */
+       DISPLAY_2,              /* attached on second device */
+       MAX_PHYS_TARGET_NUM,
+} DISP_TARGET_PHYS;
+
+/* panel info type */
+struct lcd_panel_info {
+       __u32 vsync_enable;
+       __u32 refx100;
+       __u32 v_back_porch;
+       __u32 v_front_porch;
+       __u32 v_pulse_width;
+       __u32 hw_vsync_mode;
+       __u32 vsync_notifier_period;
+};
+
+struct lcdc_panel_info {
+       __u32 h_back_porch;
+       __u32 h_front_porch;
+       __u32 h_pulse_width;
+       __u32 v_back_porch;
+       __u32 v_front_porch;
+       __u32 v_pulse_width;
+       __u32 border_clr;
+       __u32 underflow_clr;
+       __u32 hsync_skew;
+};
+
+struct mddi_panel_info {
+       __u32 vdopkt;
+};
+
+struct msm_panel_info {
+       __u32 xres;
+       __u32 yres;
+       __u32 bpp;
+       __u32 type;
+       __u32 wait_cycle;
+       DISP_TARGET_PHYS pdest;
+       __u32 bl_max;
+       __u32 bl_min;
+       __u32 fb_num;
+       __u32 clk_rate;
+       __u32 clk_min;
+       __u32 clk_max;
+       __u32 frame_count;
+
+       union {
+               struct mddi_panel_info mddi;
+       };
+
+       union {
+               struct lcd_panel_info lcd;
+               struct lcdc_panel_info lcdc;
+       };
+};
+
+struct msm_fb_panel_data {
+       struct msm_panel_info panel_info;
+       void (*set_rect) (int x, int y, int xres, int yres);
+       void (*set_vsync_notifier) (msm_fb_vsync_handler_type, void *arg);
+       void (*set_backlight) (struct msm_fb_data_type *);
+
+       /* function entry chain */
+       int (*on) (struct platform_device *pdev);
+       int (*off) (struct platform_device *pdev);
+       struct platform_device *next;
+};
+
+/*===========================================================================
+  FUNCTIONS PROTOTYPES
+============================================================================*/
+struct platform_device *msm_fb_device_alloc(struct msm_fb_panel_data *pdata,
+                                               u32 type, u32 id);
+int panel_next_on(struct platform_device *pdev);
+int panel_next_off(struct platform_device *pdev);
+
+int lcdc_device_register(struct msm_panel_info *pinfo);
+
+int mddi_toshiba_device_register(struct msm_panel_info *pinfo,
+                                       u32 channel, u32 panel);
+
+#endif /* MSM_FB_PANEL_H */
diff --git a/drivers/staging/msm/msm_mdp.h b/drivers/staging/msm/msm_mdp.h
new file mode 100644 (file)
index 0000000..2d5323f
--- /dev/null
@@ -0,0 +1,245 @@
+/* include/linux/msm_mdp.h
+ *
+ * Copyright (C) 2007 Google Incorporated
+ * Copyright (c) 2009-2010, Code Aurora Forum. All rights reserved.
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+#ifndef _MSM_MDP_H_
+#define _MSM_MDP_H_
+
+#include <linux/types.h>
+#include <linux/fb.h>
+
+#define MSMFB_IOCTL_MAGIC 'm'
+#define MSMFB_GRP_DISP          _IOW(MSMFB_IOCTL_MAGIC, 1, unsigned int)
+#define MSMFB_BLIT              _IOW(MSMFB_IOCTL_MAGIC, 2, unsigned int)
+#define MSMFB_SUSPEND_SW_REFRESHER _IOW(MSMFB_IOCTL_MAGIC, 128, unsigned int)
+#define MSMFB_RESUME_SW_REFRESHER _IOW(MSMFB_IOCTL_MAGIC, 129, unsigned int)
+#define MSMFB_CURSOR _IOW(MSMFB_IOCTL_MAGIC, 130, struct fb_cursor)
+#define MSMFB_SET_LUT _IOW(MSMFB_IOCTL_MAGIC, 131, struct fb_cmap)
+#define MSMFB_HISTOGRAM _IOWR(MSMFB_IOCTL_MAGIC, 132, struct mdp_histogram)
+/* new ioctls's for set/get ccs matrix */
+#define MSMFB_GET_CCS_MATRIX  _IOWR(MSMFB_IOCTL_MAGIC, 133, struct mdp_ccs)
+#define MSMFB_SET_CCS_MATRIX  _IOW(MSMFB_IOCTL_MAGIC, 134, struct mdp_ccs)
+#define MSMFB_OVERLAY_SET       _IOWR(MSMFB_IOCTL_MAGIC, 135, \
+                                               struct mdp_overlay)
+#define MSMFB_OVERLAY_UNSET     _IOW(MSMFB_IOCTL_MAGIC, 136, unsigned int)
+#define MSMFB_OVERLAY_PLAY      _IOW(MSMFB_IOCTL_MAGIC, 137, \
+                                               struct msmfb_overlay_data)
+#define MSMFB_GET_PAGE_PROTECTION _IOR(MSMFB_IOCTL_MAGIC, 138, \
+                                       struct mdp_page_protection)
+#define MSMFB_SET_PAGE_PROTECTION _IOW(MSMFB_IOCTL_MAGIC, 139, \
+                                       struct mdp_page_protection)
+#define MSMFB_OVERLAY_GET      _IOR(MSMFB_IOCTL_MAGIC, 140, \
+                                               struct mdp_overlay)
+
+/* new ioctls for async MDP ops */
+#define MSMFB_ASYNC_BLIT _IOW(MSMFB_IOCTL_MAGIC, 141, unsigned int)
+#define MSMFB_BLIT_FLUSH _IOR(MSMFB_IOCTL_MAGIC, 142, unsigned int)
+
+#define MDP_IMGTYPE2_START 0x10000
+
+enum {
+       MDP_RGB_565,      /* RGB 565 planer */
+       MDP_XRGB_8888,    /* RGB 888 padded */
+       MDP_Y_CBCR_H2V2,  /* Y and CbCr, pseudo planer w/ Cb is in MSB */
+       MDP_ARGB_8888,    /* ARGB 888 */
+       MDP_RGB_888,      /* RGB 888 planer */
+       MDP_Y_CRCB_H2V2,  /* Y and CrCb, pseudo planer w/ Cr is in MSB */
+       MDP_YCRYCB_H2V1,  /* YCrYCb interleave */
+       MDP_Y_CRCB_H2V1,  /* Y and CrCb, pseduo planer w/ Cr is in MSB */
+       MDP_Y_CBCR_H2V1,   /* Y and CrCb, pseduo planer w/ Cr is in MSB */
+       MDP_RGBA_8888,    /* ARGB 888 */
+       MDP_BGRA_8888,    /* ABGR 888 */
+       MDP_Y_CRCB_H2V2_TILE,  /* Y and CrCb, pseudo planer tile */
+       MDP_Y_CBCR_H2V2_TILE,  /* Y and CbCr, pseudo planer tile */
+       MDP_IMGTYPE_LIMIT,
+       MDP_BGR_565 = MDP_IMGTYPE2_START,      /* BGR 565 planer */
+       MDP_FB_FORMAT,    /* framebuffer format */
+       MDP_IMGTYPE_LIMIT2 /* Non valid image type after this enum */
+};
+
+enum {
+       PMEM_IMG,
+       FB_IMG,
+};
+
+/* mdp_blit_req flag values */
+#define MDP_ROT_NOP 0
+#define MDP_FLIP_LR 0x1
+#define MDP_FLIP_UD 0x2
+#define MDP_ROT_90 0x4
+#define MDP_ROT_180 (MDP_FLIP_UD|MDP_FLIP_LR)
+#define MDP_ROT_270 (MDP_ROT_90|MDP_FLIP_UD|MDP_FLIP_LR)
+#define MDP_DITHER 0x8
+#define MDP_BLUR 0x10
+#define MDP_BLEND_FG_PREMULT 0x20000
+
+#define MDP_DEINTERLACE        0x80000000
+#define MDP_SHARPENING         0x40000000
+
+#define MDP_NO_DMA_BARRIER_START       0x20000000
+#define MDP_NO_DMA_BARRIER_END         0x10000000
+#define MDP_NO_BLIT                    0x08000000
+#define MDP_BLIT_WITH_DMA_BARRIERS     0x000
+#define MDP_BLIT_WITH_NO_DMA_BARRIERS    \
+       (MDP_NO_DMA_BARRIER_START | MDP_NO_DMA_BARRIER_END)
+#define MDP_TRANSP_NOP 0xffffffff
+#define MDP_ALPHA_NOP 0xff
+
+#define MDP_BLIT_SRC_GEM       0x02000000 /* set for GEM, clear for PMEM */
+#define MDP_BLIT_DST_GEM       0x01000000 /* set for GEM, clear for PMEM */
+
+#define MDP_FB_PAGE_PROTECTION_NONCACHED         (0)
+#define MDP_FB_PAGE_PROTECTION_WRITECOMBINE      (1)
+#define MDP_FB_PAGE_PROTECTION_WRITETHROUGHCACHE (2)
+#define MDP_FB_PAGE_PROTECTION_WRITEBACKCACHE    (3)
+#define MDP_FB_PAGE_PROTECTION_WRITEBACKWACACHE  (4)
+/* Sentinel: Don't use! */
+#define MDP_FB_PAGE_PROTECTION_INVALID           (5)
+/* Count of the number of MDP_FB_PAGE_PROTECTION_... values. */
+#define MDP_NUM_FB_PAGE_PROTECTION_VALUES        (5)
+
+struct mdp_rect {
+       uint32_t x;
+       uint32_t y;
+       uint32_t w;
+       uint32_t h;
+};
+
+struct mdp_img {
+       uint32_t width;
+       uint32_t height;
+       uint32_t format;
+       uint32_t offset;
+       int memory_id;          /* the file descriptor */
+       uint32_t priv;
+};
+
+/*
+ * {3x3} + {3} ccs matrix
+ */
+
+#define MDP_CCS_RGB2YUV        0
+#define MDP_CCS_YUV2RGB        1
+
+#define MDP_CCS_SIZE   9
+#define MDP_BV_SIZE    3
+
+struct mdp_ccs {
+       int direction;                  /* MDP_CCS_RGB2YUV or YUV2RGB */
+       uint16_t ccs[MDP_CCS_SIZE];     /* 3x3 color coefficients */
+       uint16_t bv[MDP_BV_SIZE];       /* 1x3 bias vector */
+};
+
+/* The version of the mdp_blit_req structure so that
+ * user applications can selectively decide which functionality
+ * to include
+ */
+
+#define MDP_BLIT_REQ_VERSION 2
+
+struct mdp_blit_req {
+       struct mdp_img src;
+       struct mdp_img dst;
+       struct mdp_rect src_rect;
+       struct mdp_rect dst_rect;
+       uint32_t alpha;
+       uint32_t transp_mask;
+       uint32_t flags;
+       int sharpening_strength;  /* -127 <--> 127, default 64 */
+};
+
+struct mdp_blit_req_list {
+       uint32_t count;
+       struct mdp_blit_req req[];
+};
+
+struct msmfb_data {
+       uint32_t offset;
+       int memory_id;
+       int id;
+};
+
+#define MSMFB_NEW_REQUEST -1
+
+struct msmfb_overlay_data {
+       uint32_t id;
+       struct msmfb_data data;
+};
+
+struct msmfb_img {
+       uint32_t width;
+       uint32_t height;
+       uint32_t format;
+};
+
+struct mdp_overlay {
+       struct msmfb_img src;
+       struct mdp_rect src_rect;
+       struct mdp_rect dst_rect;
+       uint32_t z_order;       /* stage number */
+       uint32_t is_fg;         /* control alpha & transp */
+       uint32_t alpha;
+       uint32_t transp_mask;
+       uint32_t flags;
+       uint32_t id;
+       uint32_t user_data[8];
+};
+
+struct mdp_histogram {
+       uint32_t frame_cnt;
+       uint32_t bin_cnt;
+       uint32_t *r;
+       uint32_t *g;
+       uint32_t *b;
+};
+
+struct mdp_page_protection {
+       uint32_t page_protection;
+};
+
+
+struct msm_panel_common_pdata {
+       int gpio;
+       int (*backlight_level)(int level, int max, int min);
+       int (*pmic_backlight)(int level);
+       int (*panel_num)(void);
+       void (*panel_config_gpio)(int);
+       int *gpio_num;
+};
+
+struct lcdc_platform_data {
+       int (*lcdc_gpio_config)(int on);
+       void (*lcdc_power_save)(int);
+};
+
+struct tvenc_platform_data {
+       int (*pm_vid_en)(int on);
+};
+
+struct mddi_platform_data {
+       void (*mddi_power_save)(int on);
+       int (*mddi_sel_clk)(u32 *clk_rate);
+};
+
+struct msm_fb_platform_data {
+       int (*detect_client)(const char *name);
+       int mddi_prescan;
+       int (*allow_set_offset)(void);
+};
+
+struct msm_hdmi_platform_data {
+       int irq;
+       int (*cable_detect)(int insert);
+};
+
+#endif /*_MSM_MDP_H_*/
diff --git a/drivers/staging/msm/staging-devices.c b/drivers/staging/msm/staging-devices.c
new file mode 100644 (file)
index 0000000..0f8ec3e
--- /dev/null
@@ -0,0 +1,323 @@
+#include <linux/kernel.h>
+#include <linux/irq.h>
+#include <linux/gpio.h>
+#include <linux/platform_device.h>
+#include <linux/bootmem.h>
+#include <linux/delay.h>
+
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+#include <asm/io.h>
+#include <asm/setup.h>
+
+#include <mach/board.h>
+#include <mach/irqs.h>
+#include <mach/sirc.h>
+#include <mach/gpio.h>
+
+#include "msm_mdp.h"
+#include "memory_ll.h"
+//#include "android_pmem.h"
+#include <mach/board.h>
+
+#ifdef CONFIG_MSM_SOC_REV_A
+#define MSM_SMI_BASE 0xE0000000
+#else
+#define MSM_SMI_BASE 0x00000000
+#endif
+
+
+#define TOUCHPAD_SUSPEND       34
+#define TOUCHPAD_IRQ           38
+
+#define MSM_PMEM_MDP_SIZE      0x1591000
+
+#ifdef CONFIG_MSM_SOC_REV_A
+#define SMEM_SPINLOCK_I2C      "D:I2C02000021"
+#else
+#define SMEM_SPINLOCK_I2C      "S:6"
+#endif
+
+#define MSM_PMEM_ADSP_SIZE     0x1C00000
+
+#define MSM_FB_SIZE             0x500000
+#define MSM_FB_SIZE_ST15       0x800000
+#define MSM_AUDIO_SIZE         0x80000
+#define MSM_GPU_PHYS_SIZE      SZ_2M
+
+#ifdef CONFIG_MSM_SOC_REV_A
+#define MSM_SMI_BASE           0xE0000000
+#else
+#define MSM_SMI_BASE           0x00000000
+#endif
+
+#define MSM_SHARED_RAM_PHYS    (MSM_SMI_BASE + 0x00100000)
+
+#define MSM_PMEM_SMI_BASE      (MSM_SMI_BASE + 0x02B00000)
+#define MSM_PMEM_SMI_SIZE      0x01500000
+
+#define MSM_FB_BASE            MSM_PMEM_SMI_BASE
+#define MSM_GPU_PHYS_BASE      (MSM_FB_BASE + MSM_FB_SIZE)
+#define MSM_PMEM_SMIPOOL_BASE  (MSM_GPU_PHYS_BASE + MSM_GPU_PHYS_SIZE)
+#define MSM_PMEM_SMIPOOL_SIZE  (MSM_PMEM_SMI_SIZE - MSM_FB_SIZE \
+                                       - MSM_GPU_PHYS_SIZE)
+
+#if defined(CONFIG_FB_MSM_MDP40)
+#define MDP_BASE          0xA3F00000
+#define PMDH_BASE         0xAD600000
+#define EMDH_BASE         0xAD700000
+#define TVENC_BASE        0xAD400000
+#else
+#define MDP_BASE          0xAA200000
+#define PMDH_BASE         0xAA600000
+#define EMDH_BASE         0xAA700000
+#define TVENC_BASE        0xAA400000
+#endif
+
+#define PMEM_KERNEL_EBI1_SIZE  (CONFIG_PMEM_KERNEL_SIZE * 1024 * 1024)
+
+static struct resource msm_fb_resources[] = {
+       {
+               .flags  = IORESOURCE_DMA,
+       }
+};
+
+static struct resource msm_mdp_resources[] = {
+       {
+               .name   = "mdp",
+               .start  = MDP_BASE,
+               .end    = MDP_BASE + 0x000F0000 - 1,
+               .flags  = IORESOURCE_MEM,
+       }
+};
+
+static struct platform_device msm_mdp_device = {
+       .name   = "mdp",
+       .id     = 0,
+       .num_resources  = ARRAY_SIZE(msm_mdp_resources),
+       .resource       = msm_mdp_resources,
+};
+
+static struct platform_device msm_lcdc_device = {
+       .name   = "lcdc",
+       .id     = 0,
+};
+
+static int msm_fb_detect_panel(const char *name)
+{
+       int ret = -EPERM;
+
+       if (machine_is_qsd8x50_ffa() || machine_is_qsd8x50a_ffa()) {
+               if (!strncmp(name, "mddi_toshiba_wvga_pt", 20))
+                       ret = 0;
+               else
+                       ret = -ENODEV;
+       } else if ((machine_is_qsd8x50_surf() || machine_is_qsd8x50a_surf())
+                       && !strcmp(name, "lcdc_external"))
+               ret = 0;
+       else if (0 /*machine_is_qsd8x50_grapefruit() */) {
+               if (!strcmp(name, "lcdc_grapefruit_vga"))
+                       ret = 0;
+               else
+                       ret = -ENODEV;
+       } else if (machine_is_qsd8x50_st1()) {
+               if (!strcmp(name, "lcdc_st1_wxga"))
+                       ret = 0;
+               else
+                       ret = -ENODEV;
+       } else if (machine_is_qsd8x50a_st1_5()) {
+               if (!strcmp(name, "lcdc_st15") ||
+                   !strcmp(name, "hdmi_sii9022"))
+                       ret = 0;
+               else
+                       ret = -ENODEV;
+       }
+
+       return ret;
+}
+
+/* Only allow a small subset of machines to set the offset via
+   FB PAN_DISPLAY */
+
+static int msm_fb_allow_set_offset(void)
+{
+       return (machine_is_qsd8x50_st1() ||
+               machine_is_qsd8x50a_st1_5()) ? 1 : 0;
+}
+
+
+static struct msm_fb_platform_data msm_fb_pdata = {
+       .detect_client = msm_fb_detect_panel,
+       .allow_set_offset = msm_fb_allow_set_offset,
+};
+
+static struct platform_device msm_fb_device = {
+       .name   = "msm_fb",
+       .id     = 0,
+       .num_resources  = ARRAY_SIZE(msm_fb_resources),
+       .resource       = msm_fb_resources,
+       .dev    = {
+               .platform_data = &msm_fb_pdata,
+       }
+};
+
+static void __init qsd8x50_allocate_memory_regions(void)
+{
+       void *addr;
+       unsigned long size;
+       if (machine_is_qsd8x50a_st1_5())
+               size = MSM_FB_SIZE_ST15;
+       else
+               size = MSM_FB_SIZE;
+
+       addr = alloc_bootmem(size); // (void *)MSM_FB_BASE;
+       if (!addr)
+               printk("Failed to allocate bootmem for framebuffer\n");
+
+
+       msm_fb_resources[0].start = __pa(addr);
+       msm_fb_resources[0].end = msm_fb_resources[0].start + size - 1;
+       pr_info(KERN_ERR "using %lu bytes of SMI at %lx physical for fb\n",
+               size, (unsigned long)addr);
+}
+
+static int msm_fb_lcdc_gpio_config(int on)
+{
+//     return 0;
+       if (machine_is_qsd8x50_st1()) {
+               if (on) {
+                       gpio_set_value(32, 1);
+                       mdelay(100);
+                       gpio_set_value(20, 1);
+                       gpio_set_value(17, 1);
+                       gpio_set_value(19, 1);
+               } else {
+                       gpio_set_value(17, 0);
+                       gpio_set_value(19, 0);
+                       gpio_set_value(20, 0);
+                       mdelay(100);
+                       gpio_set_value(32, 0);
+               }
+       } else if (machine_is_qsd8x50a_st1_5()) {
+               if (on) {
+                       gpio_set_value(17, 1);
+                       gpio_set_value(19, 1);
+                       gpio_set_value(20, 1);
+                       gpio_set_value(22, 0);
+                       gpio_set_value(32, 1);
+                       gpio_set_value(155, 1);
+                       //st15_hdmi_power(1);
+                       gpio_set_value(22, 1);
+
+               } else {
+                       gpio_set_value(17, 0);
+                       gpio_set_value(19, 0);
+                       gpio_set_value(22, 0);
+                       gpio_set_value(32, 0);
+                       gpio_set_value(155, 0);
+               //      st15_hdmi_power(0);
+               }
+       }
+       return 0;
+}
+
+
+static struct lcdc_platform_data lcdc_pdata = {
+       .lcdc_gpio_config = msm_fb_lcdc_gpio_config,
+};
+
+static struct msm_gpio msm_fb_st15_gpio_config_data[] = {
+       { GPIO_CFG(17, 0, GPIO_OUTPUT, GPIO_NO_PULL, GPIO_2MA), "lcdc_en0" },
+       { GPIO_CFG(19, 0, GPIO_OUTPUT, GPIO_NO_PULL, GPIO_2MA), "dat_pwr_sv" },
+       { GPIO_CFG(20, 0, GPIO_OUTPUT, GPIO_NO_PULL, GPIO_2MA), "lvds_pwr_dn" },
+       { GPIO_CFG(22, 0, GPIO_OUTPUT, GPIO_NO_PULL, GPIO_2MA), "lcdc_en1" },
+       { GPIO_CFG(32, 0, GPIO_OUTPUT, GPIO_NO_PULL, GPIO_2MA), "lcdc_en2" },
+       { GPIO_CFG(103, 0, GPIO_INPUT, GPIO_NO_PULL, GPIO_2MA), "hdmi_irq" },
+       { GPIO_CFG(155, 0, GPIO_OUTPUT, GPIO_NO_PULL, GPIO_2MA), "hdmi_3v3" },
+};
+
+static struct msm_panel_common_pdata mdp_pdata = {
+       .gpio = 98,
+};
+
+static struct platform_device *devices[] __initdata = {
+       &msm_fb_device,
+};
+
+
+static void __init msm_register_device(struct platform_device *pdev, void *data)
+{
+       int ret;
+
+       pdev->dev.platform_data = data;
+
+       ret = platform_device_register(pdev);
+       if (ret)
+               dev_err(&pdev->dev,
+                         "%s: platform_device_register() failed = %d\n",
+                         __func__, ret);
+}
+
+void __init msm_fb_register_device(char *name, void *data)
+{
+       if (!strncmp(name, "mdp", 3))
+               msm_register_device(&msm_mdp_device, data);
+/*
+       else if (!strncmp(name, "pmdh", 4))
+               msm_register_device(&msm_mddi_device, data);
+       else if (!strncmp(name, "emdh", 4))
+               msm_register_device(&msm_mddi_ext_device, data);
+       else if (!strncmp(name, "ebi2", 4))
+               msm_register_device(&msm_ebi2_lcd_device, data);
+       else if (!strncmp(name, "tvenc", 5))
+               msm_register_device(&msm_tvenc_device, data);
+       else */
+
+       if (!strncmp(name, "lcdc", 4))
+               msm_register_device(&msm_lcdc_device, data);
+       /*else
+               printk(KERN_ERR "%s: unknown device! %s\n", __func__, name);
+*/
+}
+
+static void __init msm_fb_add_devices(void)
+{
+       int rc;
+       msm_fb_register_device("mdp", &mdp_pdata);
+//     msm_fb_register_device("pmdh", &mddi_pdata);
+//     msm_fb_register_device("emdh", &mddi_pdata);
+//     msm_fb_register_device("tvenc", 0);
+
+       if (machine_is_qsd8x50a_st1_5()) {
+/*             rc = st15_hdmi_vreg_init();
+               if (rc)
+                       return;
+*/
+               rc = msm_gpios_request_enable(
+                       msm_fb_st15_gpio_config_data,
+                       ARRAY_SIZE(msm_fb_st15_gpio_config_data));
+               if (rc) {
+                       printk(KERN_ERR "%s: unable to init lcdc gpios\n",
+                              __func__);
+                       return;
+               }
+               msm_fb_register_device("lcdc", &lcdc_pdata);
+       } else
+               msm_fb_register_device("lcdc", 0);
+}
+
+int __init staging_init_pmem(void)
+{
+       qsd8x50_allocate_memory_regions();
+       return 0;
+}
+
+int __init staging_init_devices(void)
+{
+       platform_add_devices(devices, ARRAY_SIZE(devices));
+       msm_fb_add_devices();
+       return 0;
+}
+
+arch_initcall(staging_init_pmem);
+arch_initcall(staging_init_devices);
diff --git a/drivers/staging/msm/tv_ntsc.c b/drivers/staging/msm/tv_ntsc.c
new file mode 100644 (file)
index 0000000..5eb6761
--- /dev/null
@@ -0,0 +1,163 @@
+/* Copyright (c) 2008-2009, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/time.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/spinlock.h>
+#include <linux/delay.h>
+#include <mach/hardware.h>
+#include <linux/io.h>
+
+#include <asm/system.h>
+#include <asm/mach-types.h>
+#include <linux/semaphore.h>
+#include <linux/uaccess.h>
+#include <linux/clk.h>
+
+#include "msm_fb.h"
+#include "tvenc.h"
+
+#define NTSC_TV_DIMENSION_WIDTH      720
+#define NTSC_TV_DIMENSION_HEIGHT     480
+
+static int ntsc_off(struct platform_device *pdev);
+static int ntsc_on(struct platform_device *pdev);
+
+static int ntsc_on(struct platform_device *pdev)
+{
+       uint32 reg = 0;
+       int ret = 0;
+       struct msm_fb_data_type *mfd;
+
+       mfd = platform_get_drvdata(pdev);
+
+       if (!mfd)
+               return -ENODEV;
+
+       if (mfd->key != MFD_KEY)
+               return -EINVAL;
+
+       TV_OUT(TV_ENC_CTL, 0);  /* disable TV encoder */
+
+       if (mfd->panel.id == NTSC_M) {
+               /* Cr gain 11, Cb gain C6, y_gain 97 */
+               TV_OUT(TV_GAIN, 0x0081B697);
+       } else {
+               /* Cr gain 11, Cb gain C6, y_gain 97 */
+               TV_OUT(TV_GAIN, 0x008bc4a3);
+               reg |= TVENC_CTL_NTSCJ_MODE;
+       }
+
+       TV_OUT(TV_CGMS, 0x0);
+       /*  NTSC Timing */
+       TV_OUT(TV_SYNC_1, 0x0020009e);
+       TV_OUT(TV_SYNC_2, 0x011306B4);
+       TV_OUT(TV_SYNC_3, 0x0006000C);
+       TV_OUT(TV_SYNC_4, 0x0028020D);
+       TV_OUT(TV_SYNC_5, 0x005E02FB);
+       TV_OUT(TV_SYNC_6, 0x0006000C);
+       TV_OUT(TV_SYNC_7, 0x00000012);
+       TV_OUT(TV_BURST_V1, 0x0013020D);
+       TV_OUT(TV_BURST_V2, 0x0014020C);
+       TV_OUT(TV_BURST_V3, 0x0013020D);
+       TV_OUT(TV_BURST_V4, 0x0014020C);
+       TV_OUT(TV_BURST_H, 0x00AE00F2);
+       TV_OUT(TV_SOL_REQ_ODD, 0x00280208);
+       TV_OUT(TV_SOL_REQ_EVEN, 0x00290209);
+
+       reg |= TVENC_CTL_TV_MODE_NTSC_M_PAL60;
+
+       reg |= TVENC_CTL_Y_FILTER_EN |
+           TVENC_CTL_CR_FILTER_EN |
+           TVENC_CTL_CB_FILTER_EN | TVENC_CTL_SINX_FILTER_EN;
+#ifdef CONFIG_FB_MSM_TVOUT_SVIDEO
+       reg |= TVENC_CTL_S_VIDEO_EN;
+#endif
+
+       TV_OUT(TV_LEVEL, 0x00000000);   /* DC offset to 0. */
+       TV_OUT(TV_OFFSET, 0x008080f0);
+
+#ifdef CONFIG_FB_MSM_MDP31
+       TV_OUT(TV_DAC_INTF, 0x29);
+#endif
+       TV_OUT(TV_ENC_CTL, reg);
+
+       reg |= TVENC_CTL_ENC_EN;
+       TV_OUT(TV_ENC_CTL, reg);
+
+       return ret;
+}
+
+static int ntsc_off(struct platform_device *pdev)
+{
+       TV_OUT(TV_ENC_CTL, 0);  /* disable TV encoder */
+       return 0;
+}
+
+static int __init ntsc_probe(struct platform_device *pdev)
+{
+       msm_fb_add_device(pdev);
+
+       return 0;
+}
+
+static struct platform_driver this_driver = {
+       .probe  = ntsc_probe,
+       .driver = {
+               .name   = "tv_ntsc",
+       },
+};
+
+static struct msm_fb_panel_data ntsc_panel_data = {
+       .panel_info.xres = NTSC_TV_DIMENSION_WIDTH,
+       .panel_info.yres = NTSC_TV_DIMENSION_HEIGHT,
+       .panel_info.type = TV_PANEL,
+       .panel_info.pdest = DISPLAY_1,
+       .panel_info.wait_cycle = 0,
+       .panel_info.bpp = 16,
+       .panel_info.fb_num = 2,
+       .on = ntsc_on,
+       .off = ntsc_off,
+};
+
+static struct platform_device this_device = {
+       .name   = "tv_ntsc",
+       .id     = 0,
+       .dev    = {
+               .platform_data = &ntsc_panel_data,
+       }
+};
+
+static int __init ntsc_init(void)
+{
+       int ret;
+
+       ret = platform_driver_register(&this_driver);
+       if (!ret) {
+               ret = platform_device_register(&this_device);
+               if (ret)
+                       platform_driver_unregister(&this_driver);
+       }
+
+       return ret;
+}
+
+module_init(ntsc_init);
\ No newline at end of file
diff --git a/drivers/staging/msm/tv_pal.c b/drivers/staging/msm/tv_pal.c
new file mode 100644 (file)
index 0000000..204da51
--- /dev/null
@@ -0,0 +1,213 @@
+/* Copyright (c) 2008-2009, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/time.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/spinlock.h>
+#include <linux/delay.h>
+#include <mach/hardware.h>
+#include <linux/io.h>
+
+#include <asm/system.h>
+#include <asm/mach-types.h>
+#include <linux/semaphore.h>
+#include <linux/uaccess.h>
+#include <linux/clk.h>
+
+#include "msm_fb.h"
+#include "tvenc.h"
+
+#ifdef CONFIG_FB_MSM_TVOUT_PAL_M
+#define PAL_TV_DIMENSION_WIDTH      720
+#define PAL_TV_DIMENSION_HEIGHT     480
+#else
+#define PAL_TV_DIMENSION_WIDTH      720
+#define PAL_TV_DIMENSION_HEIGHT     576
+#endif
+
+static int pal_on(struct platform_device *pdev)
+{
+       uint32 reg = 0;
+       int ret = 0;
+       struct msm_fb_data_type *mfd;
+
+       mfd = platform_get_drvdata(pdev);
+
+       if (!mfd)
+               return -ENODEV;
+
+       if (mfd->key != MFD_KEY)
+               return -EINVAL;
+
+       TV_OUT(TV_ENC_CTL, 0);  /* disable TV encoder */
+
+       switch (mfd->panel.id) {
+       case PAL_BDGHIN:
+               /* Cr gain 11, Cb gain C6, y_gain 97 */
+               TV_OUT(TV_GAIN, 0x0088c1a0);
+               TV_OUT(TV_CGMS, 0x00012345);
+               TV_OUT(TV_TEST_MUX, 0x0);
+               /*  PAL Timing */
+               TV_OUT(TV_SYNC_1, 0x00180097);
+               TV_OUT(TV_SYNC_2, 0x011f06c0);
+               TV_OUT(TV_SYNC_3, 0x0005000a);
+               TV_OUT(TV_SYNC_4, 0x00320271);
+               TV_OUT(TV_SYNC_5, 0x005602f9);
+               TV_OUT(TV_SYNC_6, 0x0005000a);
+               TV_OUT(TV_SYNC_7, 0x0000000f);
+               TV_OUT(TV_BURST_V1, 0x0012026e);
+               TV_OUT(TV_BURST_V2, 0x0011026d);
+               TV_OUT(TV_BURST_V3, 0x00100270);
+               TV_OUT(TV_BURST_V4, 0x0013026f);
+               TV_OUT(TV_BURST_H, 0x00af00ea);
+               TV_OUT(TV_SOL_REQ_ODD, 0x0030026e);
+               TV_OUT(TV_SOL_REQ_EVEN, 0x0031026f);
+
+               reg |= TVENC_CTL_TV_MODE_PAL_BDGHIN;
+               break;
+       case PAL_M:
+               /* Cr gain 11, Cb gain C6, y_gain 97 */
+               TV_OUT(TV_GAIN, 0x0081b697);
+               TV_OUT(TV_CGMS, 0x000af317);
+               TV_OUT(TV_TEST_MUX, 0x000001c3);
+               TV_OUT(TV_TEST_MODE, 0x00000002);
+               /*  PAL Timing */
+               TV_OUT(TV_SYNC_1, 0x0020009e);
+               TV_OUT(TV_SYNC_2, 0x011306b4);
+               TV_OUT(TV_SYNC_3, 0x0006000c);
+               TV_OUT(TV_SYNC_4, 0x0028020D);
+               TV_OUT(TV_SYNC_5, 0x005e02fb);
+               TV_OUT(TV_SYNC_6, 0x0006000c);
+               TV_OUT(TV_SYNC_7, 0x00000012);
+               TV_OUT(TV_BURST_V1, 0x0012020b);
+               TV_OUT(TV_BURST_V2, 0x0016020c);
+               TV_OUT(TV_BURST_V3, 0x00150209);
+               TV_OUT(TV_BURST_V4, 0x0013020c);
+               TV_OUT(TV_BURST_H, 0x00bf010b);
+               TV_OUT(TV_SOL_REQ_ODD, 0x00280208);
+               TV_OUT(TV_SOL_REQ_EVEN, 0x00290209);
+
+               reg |= TVENC_CTL_TV_MODE_PAL_M;
+               break;
+       case PAL_N:
+               /* Cr gain 11, Cb gain C6, y_gain 97 */
+               TV_OUT(TV_GAIN, 0x0081b697);
+               TV_OUT(TV_CGMS, 0x000af317);
+               TV_OUT(TV_TEST_MUX, 0x000001c3);
+               TV_OUT(TV_TEST_MODE, 0x00000002);
+               /*  PAL Timing */
+               TV_OUT(TV_SYNC_1, 0x00180097);
+               TV_OUT(TV_SYNC_2, 0x12006c0);
+               TV_OUT(TV_SYNC_3, 0x0005000a);
+               TV_OUT(TV_SYNC_4, 0x00320271);
+               TV_OUT(TV_SYNC_5, 0x005602f9);
+               TV_OUT(TV_SYNC_6, 0x0005000a);
+               TV_OUT(TV_SYNC_7, 0x0000000f);
+               TV_OUT(TV_BURST_V1, 0x0012026e);
+               TV_OUT(TV_BURST_V2, 0x0011026d);
+               TV_OUT(TV_BURST_V3, 0x00100270);
+               TV_OUT(TV_BURST_V4, 0x0013026f);
+               TV_OUT(TV_BURST_H, 0x00af00fa);
+               TV_OUT(TV_SOL_REQ_ODD, 0x0030026e);
+               TV_OUT(TV_SOL_REQ_EVEN, 0x0031026f);
+
+               reg |= TVENC_CTL_TV_MODE_PAL_N;
+               break;
+
+       default:
+               return -ENODEV;
+       }
+
+       reg |= TVENC_CTL_Y_FILTER_EN |
+           TVENC_CTL_CR_FILTER_EN |
+           TVENC_CTL_CB_FILTER_EN | TVENC_CTL_SINX_FILTER_EN;
+#ifdef CONFIG_FB_MSM_TVOUT_SVIDEO
+       reg |= TVENC_CTL_S_VIDEO_EN;
+#endif
+
+       TV_OUT(TV_LEVEL, 0x00000000);   /* DC offset to 0. */
+       TV_OUT(TV_OFFSET, 0x008080f0);
+
+#ifdef CONFIG_FB_MSM_MDP31
+       TV_OUT(TV_DAC_INTF, 0x29);
+#endif
+       TV_OUT(TV_ENC_CTL, reg);
+
+       reg |= TVENC_CTL_ENC_EN;
+       TV_OUT(TV_ENC_CTL, reg);
+
+       return ret;
+}
+
+static int pal_off(struct platform_device *pdev)
+{
+       TV_OUT(TV_ENC_CTL, 0);  /* disable TV encoder */
+       return 0;
+}
+
+static int __init pal_probe(struct platform_device *pdev)
+{
+       msm_fb_add_device(pdev);
+
+       return 0;
+}
+
+static struct platform_driver this_driver = {
+       .probe  = pal_probe,
+       .driver = {
+               .name   = "tv_pal",
+       },
+};
+
+static struct msm_fb_panel_data pal_panel_data = {
+       .panel_info.xres = PAL_TV_DIMENSION_WIDTH,
+       .panel_info.yres = PAL_TV_DIMENSION_HEIGHT,
+       .panel_info.type = TV_PANEL,
+       .panel_info.pdest = DISPLAY_1,
+       .panel_info.wait_cycle = 0,
+       .panel_info.bpp = 16,
+       .panel_info.fb_num = 2,
+       .on = pal_on,
+       .off = pal_off,
+};
+
+static struct platform_device this_device = {
+       .name   = "tv_pal",
+       .id     = 0,
+       .dev    = {
+               .platform_data = &pal_panel_data,
+       }
+};
+
+static int __init pal_init(void)
+{
+       int ret;
+
+       ret = platform_driver_register(&this_driver);
+       if (!ret) {
+               ret = platform_device_register(&this_device);
+               if (ret)
+                       platform_driver_unregister(&this_driver);
+       }
+
+       return ret;
+}
+
+module_init(pal_init);
diff --git a/drivers/staging/msm/tvenc.c b/drivers/staging/msm/tvenc.c
new file mode 100644 (file)
index 0000000..f41c5ac
--- /dev/null
@@ -0,0 +1,295 @@
+/* Copyright (c) 2008-2009, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/time.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/spinlock.h>
+#include <linux/delay.h>
+#include <mach/hardware.h>
+#include <linux/io.h>
+
+#include <asm/system.h>
+#include <asm/mach-types.h>
+#include <linux/semaphore.h>
+#include <linux/uaccess.h>
+#include <linux/clk.h>
+#include <linux/platform_device.h>
+#include <linux/pm_qos_params.h>
+
+#define TVENC_C
+#include "tvenc.h"
+#include "msm_fb.h"
+
+static int tvenc_probe(struct platform_device *pdev);
+static int tvenc_remove(struct platform_device *pdev);
+
+static int tvenc_off(struct platform_device *pdev);
+static int tvenc_on(struct platform_device *pdev);
+
+static struct platform_device *pdev_list[MSM_FB_MAX_DEV_LIST];
+static int pdev_list_cnt;
+
+static struct clk *tvenc_clk;
+static struct clk *tvdac_clk;
+
+static struct platform_driver tvenc_driver = {
+       .probe = tvenc_probe,
+       .remove = tvenc_remove,
+       .suspend = NULL,
+//     .suspend_late = NULL,
+//     .resume_early = NULL,
+       .resume = NULL,
+       .shutdown = NULL,
+       .driver = {
+                  .name = "tvenc",
+                  },
+};
+
+static struct tvenc_platform_data *tvenc_pdata;
+
+static int tvenc_off(struct platform_device *pdev)
+{
+       int ret = 0;
+
+       ret = panel_next_off(pdev);
+
+       clk_disable(tvenc_clk);
+       clk_disable(tvdac_clk);
+
+       if (tvenc_pdata && tvenc_pdata->pm_vid_en)
+               ret = tvenc_pdata->pm_vid_en(0);
+
+       //pm_qos_update_requirement(PM_QOS_SYSTEM_BUS_FREQ , "tvenc",
+       //                              PM_QOS_DEFAULT_VALUE);
+
+       if (ret)
+               printk(KERN_ERR "%s: pm_vid_en(off) failed! %d\n",
+               __func__, ret);
+
+       return ret;
+}
+
+static int tvenc_on(struct platform_device *pdev)
+{
+       int ret = 0;
+
+//     pm_qos_update_requirement(PM_QOS_SYSTEM_BUS_FREQ , "tvenc",
+//                             128000);
+       if (tvenc_pdata && tvenc_pdata->pm_vid_en)
+               ret = tvenc_pdata->pm_vid_en(1);
+
+       if (ret) {
+               printk(KERN_ERR "%s: pm_vid_en(on) failed! %d\n",
+               __func__, ret);
+               return ret;
+       }
+
+       clk_enable(tvenc_clk);
+       clk_enable(tvdac_clk);
+
+       ret = panel_next_on(pdev);
+
+       return ret;
+}
+
+void tvenc_gen_test_pattern(struct msm_fb_data_type *mfd)
+{
+       uint32 reg = 0, i;
+
+       reg = readl(MSM_TV_ENC_CTL);
+       reg |= TVENC_CTL_TEST_PATT_EN;
+
+       for (i = 0; i < 3; i++) {
+               TV_OUT(TV_ENC_CTL, 0);  /* disable TV encoder */
+
+               switch (i) {
+                       /*
+                        * TV Encoder - Color Bar Test Pattern
+                        */
+               case 0:
+                       reg |= TVENC_CTL_TPG_CLRBAR;
+                       break;
+                       /*
+                        * TV Encoder - Red Frame Test Pattern
+                        */
+               case 1:
+                       reg |= TVENC_CTL_TPG_REDCLR;
+                       break;
+                       /*
+                        * TV Encoder - Modulated Ramp Test Pattern
+                        */
+               default:
+                       reg |= TVENC_CTL_TPG_MODRAMP;
+                       break;
+               }
+
+               TV_OUT(TV_ENC_CTL, reg);
+               mdelay(5000);
+
+               switch (i) {
+                       /*
+                        * TV Encoder - Color Bar Test Pattern
+                        */
+               case 0:
+                       reg &= ~TVENC_CTL_TPG_CLRBAR;
+                       break;
+                       /*
+                        * TV Encoder - Red Frame Test Pattern
+                        */
+               case 1:
+                       reg &= ~TVENC_CTL_TPG_REDCLR;
+                       break;
+                       /*
+                        * TV Encoder - Modulated Ramp Test Pattern
+                        */
+               default:
+                       reg &= ~TVENC_CTL_TPG_MODRAMP;
+                       break;
+               }
+       }
+}
+
+static int tvenc_resource_initialized;
+
+static int tvenc_probe(struct platform_device *pdev)
+{
+       struct msm_fb_data_type *mfd;
+       struct platform_device *mdp_dev = NULL;
+       struct msm_fb_panel_data *pdata = NULL;
+       int rc;
+
+       if (pdev->id == 0) {
+               tvenc_base = ioremap(pdev->resource[0].start,
+                                       pdev->resource[0].end -
+                                       pdev->resource[0].start + 1);
+               if (!tvenc_base) {
+                       printk(KERN_ERR
+                               "tvenc_base ioremap failed!\n");
+                       return -ENOMEM;
+               }
+               tvenc_pdata = pdev->dev.platform_data;
+               tvenc_resource_initialized = 1;
+               return 0;
+       }
+
+       if (!tvenc_resource_initialized)
+               return -EPERM;
+
+       mfd = platform_get_drvdata(pdev);
+
+       if (!mfd)
+               return -ENODEV;
+
+       if (mfd->key != MFD_KEY)
+               return -EINVAL;
+
+       if (pdev_list_cnt >= MSM_FB_MAX_DEV_LIST)
+               return -ENOMEM;
+
+       if (tvenc_base == NULL)
+               return -ENOMEM;
+
+       mdp_dev = platform_device_alloc("mdp", pdev->id);
+       if (!mdp_dev)
+               return -ENOMEM;
+
+       /*
+        * link to the latest pdev
+        */
+       mfd->pdev = mdp_dev;
+       mfd->dest = DISPLAY_TV;
+
+       /*
+        * alloc panel device data
+        */
+       if (platform_device_add_data
+           (mdp_dev, pdev->dev.platform_data,
+            sizeof(struct msm_fb_panel_data))) {
+               printk(KERN_ERR "tvenc_probe: platform_device_add_data failed!\n");
+               platform_device_put(mdp_dev);
+               return -ENOMEM;
+       }
+       /*
+        * data chain
+        */
+       pdata = mdp_dev->dev.platform_data;
+       pdata->on = tvenc_on;
+       pdata->off = tvenc_off;
+       pdata->next = pdev;
+
+       /*
+        * get/set panel specific fb info
+        */
+       mfd->panel_info = pdata->panel_info;
+       mfd->fb_imgType = MDP_YCRYCB_H2V1;
+
+       /*
+        * set driver data
+        */
+       platform_set_drvdata(mdp_dev, mfd);
+
+       /*
+        * register in mdp driver
+        */
+       rc = platform_device_add(mdp_dev);
+       if (rc)
+               goto tvenc_probe_err;
+
+       pdev_list[pdev_list_cnt++] = pdev;
+       return 0;
+
+tvenc_probe_err:
+       platform_device_put(mdp_dev);
+       return rc;
+}
+
+static int tvenc_remove(struct platform_device *pdev)
+{
+//     pm_qos_remove_requirement(PM_QOS_SYSTEM_BUS_FREQ , "tvenc");
+       return 0;
+}
+
+static int tvenc_register_driver(void)
+{
+       return platform_driver_register(&tvenc_driver);
+}
+
+static int __init tvenc_driver_init(void)
+{
+       tvenc_clk = clk_get(NULL, "tv_enc_clk");
+       tvdac_clk = clk_get(NULL, "tv_dac_clk");
+
+       if (IS_ERR(tvenc_clk)) {
+               printk(KERN_ERR "error: can't get tvenc_clk!\n");
+               return IS_ERR(tvenc_clk);
+       }
+
+       if (IS_ERR(tvdac_clk)) {
+               printk(KERN_ERR "error: can't get tvdac_clk!\n");
+               return IS_ERR(tvdac_clk);
+       }
+
+//     pm_qos_add_requirement(PM_QOS_SYSTEM_BUS_FREQ , "tvenc",
+//                             PM_QOS_DEFAULT_VALUE);
+       return tvenc_register_driver();
+}
+
+module_init(tvenc_driver_init);
diff --git a/drivers/staging/msm/tvenc.h b/drivers/staging/msm/tvenc.h
new file mode 100644 (file)
index 0000000..a682dbe
--- /dev/null
@@ -0,0 +1,117 @@
+/* Copyright (c) 2008-2009, Code Aurora Forum. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Code Aurora nor
+ *       the names of its contributors may be used to endorse or promote
+ *       products derived from this software without specific prior written
+ *       permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NON-INFRINGEMENT ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef TVENC_H
+#define TVENC_H
+
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/time.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/fb.h>
+
+#include <mach/hardware.h>
+#include <linux/io.h>
+
+#include <asm/system.h>
+#include <asm/mach-types.h>
+
+#include "msm_fb_panel.h"
+
+#define NTSC_M         0 /* North America, Korea */
+#define NTSC_J         1 /* Japan */
+#define PAL_BDGHIN     2 /* Non-argentina PAL-N */
+#define PAL_M          3 /* PAL-M */
+#define PAL_N          4 /* Argentina PAL-N */
+
+/* 3.57954545 Mhz */
+#define TVENC_CTL_TV_MODE_NTSC_M_PAL60  0
+/* 3.57961149 Mhz */
+#define TVENC_CTL_TV_MODE_PAL_M             BIT(0)
+/*non-Argintina = 4.3361875 Mhz */
+#define TVENC_CTL_TV_MODE_PAL_BDGHIN        BIT(1)
+/*Argentina = 3.582055625 Mhz */
+#define TVENC_CTL_TV_MODE_PAL_N             (BIT(1)|BIT(0))
+
+#define TVENC_CTL_ENC_EN                    BIT(2)
+#define TVENC_CTL_CC_EN                     BIT(3)
+#define TVENC_CTL_CGMS_EN                   BIT(4)
+#define TVENC_CTL_MACRO_EN                  BIT(5)
+#define TVENC_CTL_Y_FILTER_W_NOTCH          BIT(6)
+#define TVENC_CTL_Y_FILTER_WO_NOTCH         0
+#define TVENC_CTL_Y_FILTER_EN               BIT(7)
+#define TVENC_CTL_CR_FILTER_EN              BIT(8)
+#define TVENC_CTL_CB_FILTER_EN              BIT(9)
+#define TVENC_CTL_SINX_FILTER_EN            BIT(10)
+#define TVENC_CTL_TEST_PATT_EN              BIT(11)
+#define TVENC_CTL_OUTPUT_INV                BIT(12)
+#define TVENC_CTL_PAL60_MODE                BIT(13)
+#define TVENC_CTL_NTSCJ_MODE                BIT(14)
+#define TVENC_CTL_TPG_CLRBAR                0
+#define TVENC_CTL_TPG_MODRAMP               BIT(15)
+#define TVENC_CTL_TPG_REDCLR                BIT(16)
+#define TVENC_CTL_S_VIDEO_EN                BIT(19)
+
+#ifdef TVENC_C
+void *tvenc_base;
+#else
+extern void *tvenc_base;
+#endif
+
+#define TV_OUT(reg, v)  writel(v, tvenc_base + MSM_##reg)
+
+#define MSM_TV_ENC_CTL                 0x00
+#define MSM_TV_LEVEL                   0x04
+#define MSM_TV_GAIN                    0x08
+#define MSM_TV_OFFSET                  0x0c
+#define MSM_TV_CGMS                    0x10
+#define MSM_TV_SYNC_1                  0x14
+#define MSM_TV_SYNC_2                  0x18
+#define MSM_TV_SYNC_3                  0x1c
+#define MSM_TV_SYNC_4                  0x20
+#define MSM_TV_SYNC_5                  0x24
+#define MSM_TV_SYNC_6                  0x28
+#define MSM_TV_SYNC_7                  0x2c
+#define MSM_TV_BURST_V1                        0x30
+#define MSM_TV_BURST_V2                        0x34
+#define MSM_TV_BURST_V3                        0x38
+#define MSM_TV_BURST_V4                        0x3c
+#define MSM_TV_BURST_H                 0x40
+#define MSM_TV_SOL_REQ_ODD             0x44
+#define MSM_TV_SOL_REQ_EVEN            0x48
+#define MSM_TV_DAC_CTL                 0x4c
+#define MSM_TV_TEST_MUX                        0x50
+#define MSM_TV_TEST_MODE               0x54
+#define MSM_TV_TEST_MISR_RESET         0x58
+#define MSM_TV_TEST_EXPORT_MISR                0x5c
+#define MSM_TV_TEST_MISR_CURR_VAL      0x60
+#define MSM_TV_TEST_SOF_CFG            0x64
+#define MSM_TV_DAC_INTF                        0x100
+
+#endif /* TVENC_H */
index d3c65d315a2e4cec4e297d0988b7b2542ab3486c..1b56119a765752c76440f4f5a76d5a527c526ed1 100644 (file)
@@ -1,5 +1,5 @@
 config IDE_PHISON
        tristate "PCIE ATA PS5000 IDE support"
-       depends on PCI && ATA && ATA_SFF
+       depends on PCI && ATA && ATA_SFF && ATA_BMDMA
        ---help---
          This is an experimental driver for PS5000 IDE driver.
index 112da7a6c417a9886b337f301f25af465797c346..6b8268d3dc75a776b190694128fcbb4f43bf342e 100644 (file)
@@ -2522,6 +2522,8 @@ int rt28xx_sta_ioctl(IN struct net_device *net_dev,
                        Status =
                            copy_to_user(erq->pointer, pAd->nickname,
                                         erq->length);
+                       if (Status)
+                               Status = -EFAULT;
                        break;
                }
        case SIOCGIWRATE:       /*get default bit rate (bps) */
index 0332c370fd8285c884fbd602369468788d13903f..ecbde3467b1b90bbcc5a105eb2d2fa8117904391 100644 (file)
@@ -594,8 +594,10 @@ static int sep_allocate_data_pool_memory_handler(struct sep_device *sep,
        dbg("SEP Driver:--------> sep_allocate_data_pool_memory_handler start\n");
 
        error = copy_from_user(&command_args, (void *) arg, sizeof(struct sep_driver_alloc_t));
-       if (error)
+       if (error) {
+               error = -EFAULT;
                goto end_function;
+       }
 
        /* allocate memory */
        if ((sep->data_pool_bytes_allocated + command_args.num_bytes) > SEP_DRIVER_DATA_POOL_SHARED_AREA_SIZE_IN_BYTES) {
@@ -609,8 +611,10 @@ static int sep_allocate_data_pool_memory_handler(struct sep_device *sep,
 
        /* write the memory back to the user space */
        error = copy_to_user((void *) arg, (void *) &command_args, sizeof(struct sep_driver_alloc_t));
-       if (error)
+       if (error) {
+               error = -EFAULT;
                goto end_function;
+       }
 
        /* set the allocation */
        sep->data_pool_bytes_allocated += command_args.num_bytes;
@@ -661,6 +665,8 @@ static int sep_write_into_data_pool_handler(struct sep_device *sep, unsigned lon
        }
        /* copy the application data */
        error = copy_from_user(virt_address, (void *) app_in_address, num_bytes);
+       if (error)
+               error = -EFAULT;
 end_function:
        dbg("SEP Driver:<-------- sep_write_into_data_pool_handler end\n");
        return error;
@@ -711,6 +717,8 @@ static int sep_read_from_data_pool_handler(struct sep_device *sep, unsigned long
 
        /* copy the application data */
        error = copy_to_user((void *) app_out_address, virt_address, num_bytes);
+       if (error)
+               error = -EFAULT;
 end_function:
        dbg("SEP Driver:<-------- sep_read_from_data_pool_handler end\n");
        return error;
@@ -1448,8 +1456,10 @@ static int sep_create_sync_dma_tables_handler(struct sep_device *sep,
        dbg("SEP Driver:--------> sep_create_sync_dma_tables_handler start\n");
 
        error = copy_from_user(&command_args, (void *) arg, sizeof(struct sep_driver_build_sync_table_t));
-       if (error)
+       if (error) {
+               error = -EFAULT;
                goto end_function;
+       }
 
        edbg("app_in_address is %08lx\n", command_args.app_in_address);
        edbg("app_out_address is %08lx\n", command_args.app_out_address);
@@ -1799,8 +1809,10 @@ static int sep_create_flow_dma_tables_handler(struct sep_device *sep,
                goto end_function;
 
        error = copy_from_user(&command_args, (void *) arg, sizeof(struct sep_driver_build_flow_table_t));
-       if (error)
+       if (error) {
+               error = -EFAULT;
                goto end_function;
+       }
 
        /* create flow tables */
        error = sep_prepare_flow_dma_tables(sep, command_args.num_virtual_buffers, command_args.virt_buff_data_addr, flow_context_ptr, &first_table_data, &last_table_data, command_args.isKernelVirtualAddress);
@@ -1819,8 +1831,10 @@ static int sep_create_flow_dma_tables_handler(struct sep_device *sep,
 
        /* send the parameters to user application */
        error = copy_to_user((void *) arg, &command_args, sizeof(struct sep_driver_build_flow_table_t));
-       if (error)
+       if (error) {
+               error = -EFAULT;
                goto end_function_with_error;
+       }
 
        /* all the flow created  - update the flow entry with temp id */
        flow_context_ptr->flow_id = SEP_TEMP_FLOW_ID;
@@ -1861,8 +1875,10 @@ static int sep_add_flow_tables_handler(struct sep_device *sep, unsigned long arg
 
        /* get input parameters */
        error = copy_from_user(&command_args, (void *) arg, sizeof(struct sep_driver_add_flow_table_t));
-       if (error)
+       if (error) {
+               error = -EFAULT;
                goto end_function;
+       }
 
        /* find the flow structure for the flow id */
        flow_context_ptr = sep_find_flow_context(sep, command_args.flow_id);
@@ -1933,6 +1949,8 @@ static int sep_add_flow_tables_handler(struct sep_device *sep, unsigned long arg
 
        /* send the parameters to user application */
        error = copy_to_user((void *) arg, &command_args, sizeof(struct sep_driver_add_flow_table_t));
+       if (error)
+               error = -EFAULT;
 end_function_with_error:
        /* free the allocated tables */
        sep_deallocated_flow_tables(&first_table_data);
@@ -1953,8 +1971,10 @@ static int sep_add_flow_tables_message_handler(struct sep_device *sep, unsigned
        dbg("SEP Driver:--------> sep_add_flow_tables_message_handler start\n");
 
        error = copy_from_user(&command_args, (void *) arg, sizeof(struct sep_driver_add_message_t));
-       if (error)
+       if (error) {
+               error = -EFAULT;
                goto end_function;
+       }
 
        /* check input */
        if (command_args.message_size_in_bytes > SEP_MAX_ADD_MESSAGE_LENGTH_IN_BYTES) {
@@ -1970,6 +1990,8 @@ static int sep_add_flow_tables_message_handler(struct sep_device *sep, unsigned
        /* copy the message into context */
        flow_context_ptr->message_size_in_bytes = command_args.message_size_in_bytes;
        error = copy_from_user(flow_context_ptr->message, (void *) command_args.message_address, command_args.message_size_in_bytes);
+       if (error)
+               error = -EFAULT;
 end_function:
        dbg("SEP Driver:<-------- sep_add_flow_tables_message_handler end\n");
        return error;
@@ -1994,6 +2016,8 @@ static int sep_get_static_pool_addr_handler(struct sep_device *sep, unsigned lon
 
        /* send the parameters to user application */
        error = copy_to_user((void *) arg, &command_args, sizeof(struct sep_driver_static_pool_addr_t));
+       if (error)
+               error = -EFAULT;
        dbg("SEP Driver:<-------- sep_get_static_pool_addr_handler end\n");
        return error;
 }
@@ -2010,8 +2034,10 @@ static int sep_get_physical_mapped_offset_handler(struct sep_device *sep, unsign
        dbg("SEP Driver:--------> sep_get_physical_mapped_offset_handler start\n");
 
        error = copy_from_user(&command_args, (void *) arg, sizeof(struct sep_driver_get_mapped_offset_t));
-       if (error)
+       if (error) {
+               error = -EFAULT;
                goto end_function;
+       }
 
        if (command_args.physical_address < sep->shared_bus) {
                error = -EINVAL;
@@ -2025,6 +2051,8 @@ static int sep_get_physical_mapped_offset_handler(struct sep_device *sep, unsign
 
        /* send the parameters to user application */
        error = copy_to_user((void *) arg, &command_args, sizeof(struct sep_driver_get_mapped_offset_t));
+       if (error)
+               error = -EFAULT;
 end_function:
        dbg("SEP Driver:<-------- sep_get_physical_mapped_offset_handler end\n");
        return error;
@@ -2070,11 +2098,11 @@ static int sep_init_handler(struct sep_device *sep, unsigned long arg)
        error = 0;
 
        error = copy_from_user(&command_args, (void *) arg, sizeof(struct sep_driver_init_t));
-
-       dbg("SEP Driver:--------> sep_init_handler - finished copy_from_user \n");
-
-       if (error)
+       if (error) {
+               error = -EFAULT;
                goto end_function;
+       }
+       dbg("SEP Driver:--------> sep_init_handler - finished copy_from_user\n");
 
        /* PATCH - configure the DMA to single -burst instead of multi-burst */
        /*sep_configure_dma_burst(); */
index 5fe759cc2ee9bab49d53648efea14245d288ed7a..3657e33e88178694daf970d930f77a17e0b193ad 100644 (file)
@@ -2,7 +2,8 @@ config VIDEO_TM6000
        tristate "TV Master TM5600/6000/6010 driver"
        depends on VIDEO_DEV && I2C && INPUT && USB && EXPERIMENTAL
        select VIDEO_TUNER
-       select TUNER_XC2028
+       select MEDIA_TUNER_XC2028
+       select MEDIA_TUNER_XC5000
        select VIDEOBUF_VMALLOC
        help
          Support for TM5600/TM6000/TM6010 USB Device
index bc89f9d280027239986b0d33ec46f50d36443241..ce081cd44ad4a08e82cc9902ff8a1ecbd4f1724e 100644 (file)
@@ -410,5 +410,28 @@ error:
        snd_card_free(card);
        return rc;
 }
-EXPORT_SYMBOL_GPL(tm6000_audio_init);
 
+static int tm6000_audio_fini(struct tm6000_core *dev)
+{
+       return 0;
+}
+
+struct tm6000_ops audio_ops = {
+       .id     = TM6000_AUDIO,
+       .name   = "TM6000 Audio Extension",
+       .init   = tm6000_audio_init,
+       .fini   = tm6000_audio_fini,
+};
+
+static int __init tm6000_alsa_register(void)
+{
+       return tm6000_register_extension(&audio_ops);
+}
+
+static void __exit tm6000_alsa_unregister(void)
+{
+       tm6000_unregister_extension(&audio_ops);
+}
+
+module_init(tm6000_alsa_register);
+module_exit(tm6000_alsa_unregister);
index 6143e20d139da525178dcab356109582d5a8ebf8..cedd9044022f9dc514f6d89489cf137dd7fca262 100644 (file)
@@ -363,13 +363,7 @@ int tm6000_tuner_callback(void *ptr, int component, int command, int arg)
                tm6000_set_reg(dev, REQ_04_EN_DISABLE_MCU_INT,
                                        0x02, arg);
                msleep(10);
-               rc = tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN,
-                                       TM6000_GPIO_CLK, 0);
-               if (rc < 0)
-                       return rc;
-               msleep(10);
-               rc = tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN,
-                                       TM6000_GPIO_CLK, 1);
+               rc = tm6000_i2c_reset(dev, 10);
                break;
        case XC2028_TUNER_RESET:
                /* Reset codes during load firmware */
@@ -423,14 +417,7 @@ int tm6000_tuner_callback(void *ptr, int component, int command, int arg)
                        break;
 
                case 2:
-                       rc = tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN,
-                                               TM6000_GPIO_CLK, 0);
-                       if (rc < 0)
-                               return rc;
-                       msleep(100);
-                       rc = tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN,
-                                               TM6000_GPIO_CLK, 1);
-                       msleep(100);
+                       rc = tm6000_i2c_reset(dev, 100);
                        break;
                }
        }
@@ -563,7 +550,7 @@ static void tm6000_config_tuner(struct tm6000_core *dev)
 
        switch (dev->tuner_type) {
        case TUNER_XC2028:
-               tun_setup.tuner_callback = tm6000_tuner_callback;;
+               tun_setup.tuner_callback = tm6000_tuner_callback;
                break;
        case TUNER_XC5000:
                tun_setup.tuner_callback = tm6000_xc5000_callback;
@@ -692,6 +679,10 @@ static int tm6000_init_dev(struct tm6000_core *dev)
        if (rc < 0)
                goto err;
 
+       tm6000_add_into_devlist(dev);
+
+       tm6000_init_extension(dev);
+
        if (dev->caps.has_dvb) {
                dev->dvb = kzalloc(sizeof(*(dev->dvb)), GFP_KERNEL);
                if (!dev->dvb) {
@@ -921,6 +912,25 @@ static void tm6000_usb_disconnect(struct usb_interface *interface)
        }
 #endif
 
+       if (dev->gpio.power_led) {
+               switch (dev->model) {
+               case TM6010_BOARD_HAUPPAUGE_900H:
+               case TM6010_BOARD_TERRATEC_CINERGY_HYBRID_XE:
+               case TM6010_BOARD_TWINHAN_TU501:
+                       /* Power led off */
+                       tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN,
+                               dev->gpio.power_led, 0x01);
+                       msleep(15);
+                       break;
+               case TM6010_BOARD_BEHOLD_WANDER:
+               case TM6010_BOARD_BEHOLD_VOYAGER:
+                       /* Power led off */
+                       tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN,
+                               dev->gpio.power_led, 0x00);
+                       msleep(15);
+                       break;
+               }
+       }
        tm6000_v4l2_unregister(dev);
 
        tm6000_i2c_unregister(dev);
@@ -931,6 +941,9 @@ static void tm6000_usb_disconnect(struct usb_interface *interface)
 
        usb_put_dev(dev->udev);
 
+       tm6000_remove_from_devlist(dev);
+       tm6000_close_extension(dev);
+
        mutex_unlock(&dev->lock);
        kfree(dev);
 }
index bfbc53bd291217136c58ac5d9380e30e9945acab..27f3f551b5457285575ef1bce5b4ddfb194d0636 100644 (file)
@@ -153,6 +153,22 @@ int tm6000_get_reg32 (struct tm6000_core *dev, u8 req, u16 value, u16 index)
        return buf[3] | buf[2] << 8 | buf[1] << 16 | buf[0] << 24;
 }
 
+int tm6000_i2c_reset(struct tm6000_core *dev, u16 tsleep)
+{
+       int rc;
+
+       rc = tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN, TM6000_GPIO_CLK, 0);
+       if (rc < 0)
+               return rc;
+
+       msleep(tsleep);
+
+       rc = tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN, TM6000_GPIO_CLK, 1);
+       msleep(tsleep);
+
+       return rc;
+}
+
 void tm6000_set_fourcc_format(struct tm6000_core *dev)
 {
        if (dev->dev_type == TM6010) {
@@ -323,6 +339,12 @@ int tm6000_init_analog_mode (struct tm6000_core *dev)
        tm6000_set_standard (dev, &dev->norm);
        tm6000_set_audio_bitrate (dev,48000);
 
+       /* switch dvb led off */
+       if (dev->gpio.dvb_led) {
+               tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN,
+                       dev->gpio.dvb_led, 0x01);
+       }
+
        return 0;
 }
 
@@ -375,6 +397,13 @@ int tm6000_init_digital_mode (struct tm6000_core *dev)
                tm6000_set_reg (dev, REQ_04_EN_DISABLE_MCU_INT, 0x0020, 0x00);
                msleep(100);
        }
+
+       /* switch dvb led on */
+       if (dev->gpio.dvb_led) {
+               tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN,
+                       dev->gpio.dvb_led, 0x00);
+       }
+
        return 0;
 }
 
@@ -600,3 +629,95 @@ printk("Original value=%d\n",val);
        return val;
 }
 EXPORT_SYMBOL_GPL(tm6000_set_audio_bitrate);
+
+static LIST_HEAD(tm6000_devlist);
+static DEFINE_MUTEX(tm6000_devlist_mutex);
+
+/*
+ * tm6000_realease_resource()
+ */
+
+void tm6000_remove_from_devlist(struct tm6000_core *dev)
+{
+       mutex_lock(&tm6000_devlist_mutex);
+       list_del(&dev->devlist);
+       mutex_unlock(&tm6000_devlist_mutex);
+};
+
+void tm6000_add_into_devlist(struct tm6000_core *dev)
+{
+       mutex_lock(&tm6000_devlist_mutex);
+       list_add_tail(&dev->devlist, &tm6000_devlist);
+       mutex_unlock(&tm6000_devlist_mutex);
+};
+
+/*
+ * Extension interface
+ */
+
+static LIST_HEAD(tm6000_extension_devlist);
+static DEFINE_MUTEX(tm6000_extension_devlist_lock);
+
+int tm6000_register_extension(struct tm6000_ops *ops)
+{
+       struct tm6000_core *dev = NULL;
+
+       mutex_lock(&tm6000_devlist_mutex);
+       mutex_lock(&tm6000_extension_devlist_lock);
+       list_add_tail(&ops->next, &tm6000_extension_devlist);
+       list_for_each_entry(dev, &tm6000_devlist, devlist) {
+               if (dev)
+                       ops->init(dev);
+       }
+       printk(KERN_INFO "tm6000: Initialized (%s) extension\n", ops->name);
+       mutex_unlock(&tm6000_extension_devlist_lock);
+       mutex_unlock(&tm6000_devlist_mutex);
+       return 0;
+}
+EXPORT_SYMBOL(tm6000_register_extension);
+
+void tm6000_unregister_extension(struct tm6000_ops *ops)
+{
+       struct tm6000_core *dev = NULL;
+
+       mutex_lock(&tm6000_devlist_mutex);
+       list_for_each_entry(dev, &tm6000_devlist, devlist) {
+               if (dev)
+                       ops->fini(dev);
+       }
+
+       mutex_lock(&tm6000_extension_devlist_lock);
+       printk(KERN_INFO "tm6000: Remove (%s) extension\n", ops->name);
+       list_del(&ops->next);
+       mutex_unlock(&tm6000_extension_devlist_lock);
+       mutex_unlock(&tm6000_devlist_mutex);
+}
+EXPORT_SYMBOL(tm6000_unregister_extension);
+
+void tm6000_init_extension(struct tm6000_core *dev)
+{
+       struct tm6000_ops *ops = NULL;
+
+       mutex_lock(&tm6000_extension_devlist_lock);
+       if (!list_empty(&tm6000_extension_devlist)) {
+               list_for_each_entry(ops, &tm6000_extension_devlist, next) {
+                       if (ops->init)
+                               ops->init(dev);
+               }
+       }
+       mutex_unlock(&tm6000_extension_devlist_lock);
+}
+
+void tm6000_close_extension(struct tm6000_core *dev)
+{
+       struct tm6000_ops *ops = NULL;
+
+       mutex_lock(&tm6000_extension_devlist_lock);
+       if (!list_empty(&tm6000_extension_devlist)) {
+               list_for_each_entry(ops, &tm6000_extension_devlist, next) {
+                       if (ops->fini)
+                               ops->fini(dev);
+               }
+       }
+       mutex_unlock(&tm6000_extension_devlist_lock);
+}
index eafc89c22b6bec9982902b6584266bcd72c325e6..261e66acbe46b7ea061d2c2be4bd3737b1f8cffa 100644 (file)
@@ -28,6 +28,7 @@
 #include <media/tuner.h>
 
 #include "tuner-xc2028.h"
+#include "xc5000.h"
 
 static void inline print_err_status (struct tm6000_core *dev,
                                     int packet, int status)
@@ -100,7 +101,10 @@ int tm6000_start_stream(struct tm6000_core *dev)
 
        printk(KERN_INFO "tm6000: got start stream request %s\n",__FUNCTION__);
 
-       tm6000_init_digital_mode(dev);
+       if (dev->mode != TM6000_MODE_DIGITAL) {
+               tm6000_init_digital_mode(dev);
+               dev->mode = TM6000_MODE_DIGITAL;
+       }
 
        dvb->bulk_urb = usb_alloc_urb(0, GFP_KERNEL);
        if(dvb->bulk_urb == NULL) {
@@ -254,27 +258,55 @@ int tm6000_dvb_register(struct tm6000_core *dev)
        dvb->adapter.priv = dev;
 
        if (dvb->frontend) {
-               struct xc2028_config cfg = {
-                       .i2c_adap = &dev->i2c_adap,
-                       .i2c_addr = dev->tuner_addr,
-               };
-
-               dvb->frontend->callback = tm6000_tuner_callback;
-               ret = dvb_register_frontend(&dvb->adapter, dvb->frontend);
-               if (ret < 0) {
-                       printk(KERN_ERR
-                               "tm6000: couldn't register frontend\n");
-                       goto adapter_err;
-               }
-
-               if (!dvb_attach(xc2028_attach, dvb->frontend, &cfg)) {
-                       printk(KERN_ERR "tm6000: couldn't register "
-                                       "frontend (xc3028)\n");
-                       ret = -EINVAL;
-                       goto frontend_err;
+               switch (dev->tuner_type) {
+               case TUNER_XC2028: {
+                       struct xc2028_config cfg = {
+                               .i2c_adap = &dev->i2c_adap,
+                               .i2c_addr = dev->tuner_addr,
+                       };
+
+                       dvb->frontend->callback = tm6000_tuner_callback;
+                       ret = dvb_register_frontend(&dvb->adapter, dvb->frontend);
+                       if (ret < 0) {
+                               printk(KERN_ERR
+                                       "tm6000: couldn't register frontend\n");
+                               goto adapter_err;
+                       }
+
+                       if (!dvb_attach(xc2028_attach, dvb->frontend, &cfg)) {
+                               printk(KERN_ERR "tm6000: couldn't register "
+                                               "frontend (xc3028)\n");
+                               ret = -EINVAL;
+                               goto frontend_err;
+                       }
+                       printk(KERN_INFO "tm6000: XC2028/3028 asked to be "
+                                        "attached to frontend!\n");
+                       break;
+                       }
+               case TUNER_XC5000: {
+                       struct xc5000_config cfg = {
+                               .i2c_address = dev->tuner_addr,
+                       };
+
+                       dvb->frontend->callback = tm6000_xc5000_callback;
+                       ret = dvb_register_frontend(&dvb->adapter, dvb->frontend);
+                       if (ret < 0) {
+                               printk(KERN_ERR
+                                       "tm6000: couldn't register frontend\n");
+                               goto adapter_err;
+                       }
+
+                       if (!dvb_attach(xc5000_attach, dvb->frontend, &dev->i2c_adap, &cfg)) {
+                               printk(KERN_ERR "tm6000: couldn't register "
+                                               "frontend (xc5000)\n");
+                               ret = -EINVAL;
+                               goto frontend_err;
+                       }
+                       printk(KERN_INFO "tm6000: XC5000 asked to be "
+                                        "attached to frontend!\n");
+                       break;
+                       }
                }
-               printk(KERN_INFO "tm6000: XC2028/3028 asked to be "
-                                "attached to frontend!\n");
        } else {
                printk(KERN_ERR "tm6000: no frontend found\n");
        }
index f2b7fe4a3581e5da6acd72ae040a66a5d35f6a72..56fa371e08c89e21c1b7eed1e3afd6ccad7b8820 100644 (file)
@@ -48,7 +48,7 @@
 #define TM6000_MIN_BUF 4
 #define TM6000_DEF_BUF 8
 
-#define TM6000_MAX_ISO_PACKETS 40      /* Max number of ISO packets */
+#define TM6000_MAX_ISO_PACKETS 46      /* Max number of ISO packets */
 
 /* Declare static vars that will be used as parameters */
 static unsigned int vid_limit = 16;    /* Video memory limit, in Mb */
@@ -205,7 +205,11 @@ static int copy_packet(struct urb *urb, u32 header, u8 **ptr, u8 *endp,
                c = (header >> 24) & 0xff;
 
                /* split the header fields */
-               size  = (((header & 0x7e) << 1) -1) *4;
+               size  = ((header & 0x7e) << 1);
+
+               if (size > 0)
+                       size -= 4;
+
                block = (header >> 7) & 0xf;
                field = (header >> 11) & 0x1;
                line  = (header >> 12) & 0x1ff;
@@ -307,10 +311,12 @@ static int copy_packet(struct urb *urb, u32 header, u8 **ptr, u8 *endp,
                case TM6000_URB_MSG_PTS:
                        break;
                case TM6000_URB_MSG_AUDIO:
-/* Need some code to process audio */
-printk ("%ld: cmd=%s, size=%d\n", jiffies,
+                       /* Need some code to process audio */
+                       printk ("%ld: cmd=%s, size=%d\n", jiffies,
                                tm6000_msg_type[cmd],size);
                        break;
+               case TM6000_URB_MSG_VBI:
+                       break;
                default:
                        dprintk (dev, V4L2_DEBUG_ISOC, "cmd=%s, size=%d\n",
                                                tm6000_msg_type[cmd],size);
@@ -333,14 +339,23 @@ printk ("%ld: cmd=%s, size=%d\n", jiffies,
        return rc;
 }
 
-static int copy_streams(u8 *data, u8 *out_p, unsigned long len,
-                       struct urb *urb, struct tm6000_buffer **buf)
+static int copy_streams(u8 *data, unsigned long len,
+                       struct urb *urb)
 {
        struct tm6000_dmaqueue  *dma_q = urb->context;
        struct tm6000_core *dev= container_of(dma_q,struct tm6000_core,vidq);
        u8 *ptr=data, *endp=data+len;
        unsigned long header=0;
        int rc=0;
+       struct tm6000_buffer *buf;
+       char *outp = NULL;
+
+       get_next_buf(dma_q, &buf);
+       if (buf)
+               outp = videobuf_to_vmalloc(&buf->vb);
+
+       if (!outp)
+               return 0;
 
        for (ptr=data; ptr<endp;) {
                if (!dev->isoc_ctl.cmd) {
@@ -388,14 +403,14 @@ static int copy_streams(u8 *data, u8 *out_p, unsigned long len,
                }
 HEADER:
                /* Copy or continue last copy */
-               rc=copy_packet(urb,header,&ptr,endp,out_p,buf);
+               rc=copy_packet(urb,header,&ptr,endp,outp,&buf);
                if (rc<0) {
                        buf=NULL;
                        printk(KERN_ERR "tm6000: buffer underrun at %ld\n",
                                        jiffies);
                        return rc;
                }
-               if (!*buf)
+               if (!buf)
                        return 0;
        }
 
@@ -404,31 +419,40 @@ HEADER:
 /*
  * Identify the tm5600/6000 buffer header type and properly handles
  */
-static int copy_multiplexed(u8 *ptr, u8 *out_p, unsigned long len,
-                       struct urb *urb, struct tm6000_buffer **buf)
+static int copy_multiplexed(u8 *ptr, unsigned long len,
+                       struct urb *urb)
 {
        struct tm6000_dmaqueue  *dma_q = urb->context;
        struct tm6000_core *dev= container_of(dma_q,struct tm6000_core,vidq);
        unsigned int pos=dev->isoc_ctl.pos,cpysize;
        int rc=1;
+       struct tm6000_buffer *buf;
+       char *outp = NULL;
+
+       get_next_buf(dma_q, &buf);
+       if (buf)
+               outp = videobuf_to_vmalloc(&buf->vb);
+
+       if (!outp)
+               return 0;
 
        while (len>0) {
-               cpysize=min(len,(*buf)->vb.size-pos);
-//printk("Copying %d bytes (max=%lu) from %p to %p[%u]\n",cpysize,(*buf)->vb.size,ptr,out_p,pos);
-               memcpy(&out_p[pos], ptr, cpysize);
+               cpysize=min(len,buf->vb.size-pos);
+               //printk("Copying %d bytes (max=%lu) from %p to %p[%u]\n",cpysize,(*buf)->vb.size,ptr,out_p,pos);
+               memcpy(&outp[pos], ptr, cpysize);
                pos+=cpysize;
                ptr+=cpysize;
                len-=cpysize;
-               if (pos >= (*buf)->vb.size) {
+               if (pos >= buf->vb.size) {
                        pos=0;
                        /* Announces that a new buffer were filled */
-                       buffer_filled (dev, dma_q, *buf);
+                       buffer_filled (dev, dma_q, buf);
                        dprintk(dev, V4L2_DEBUG_ISOC, "new buffer filled\n");
-                       get_next_buf (dma_q, buf);
-                       if (!*buf)
+                       get_next_buf (dma_q, &buf);
+                       if (!buf)
                                break;
-                       out_p = videobuf_to_vmalloc(&((*buf)->vb));
-                       if (!out_p)
+                       outp = videobuf_to_vmalloc(&(buf->vb));
+                       if (!outp)
                                return rc;
                        pos = 0;
                }
@@ -487,52 +511,36 @@ static inline int tm6000_isoc_copy(struct urb *urb)
        struct tm6000_dmaqueue  *dma_q = urb->context;
        struct tm6000_core *dev= container_of(dma_q,struct tm6000_core,vidq);
        struct tm6000_buffer *buf;
-       int i, len=0, rc=1;
-       int size;
-       char *outp = NULL, *p;
-       unsigned long copied;
-
-       get_next_buf(dma_q, &buf);
-       if (buf)
-               outp = videobuf_to_vmalloc(&buf->vb);
+       int i, len=0, rc=1, status;
+       char *p;
 
-       if (!outp)
-               return 0;
-
-       size = buf->vb.size;
-
-       copied=0;
-
-       if (urb->status<0) {
-               print_err_status (dev,-1,urb->status);
+       if (urb->status < 0) {
+               print_err_status (dev, -1, urb->status);
                return 0;
        }
 
        for (i = 0; i < urb->number_of_packets; i++) {
-               int status = urb->iso_frame_desc[i].status;
+               status = urb->iso_frame_desc[i].status;
 
                if (status<0) {
                        print_err_status (dev,i,status);
                        continue;
                }
 
-               len=urb->iso_frame_desc[i].actual_length;
+               len = urb->iso_frame_desc[i].actual_length;
 
-//             if (len>=TM6000_URB_MSG_LEN) {
-                       p=urb->transfer_buffer + urb->iso_frame_desc[i].offset;
+               if (len > 0) {
+                       p = urb->transfer_buffer + urb->iso_frame_desc[i].offset;
                        if (!urb->iso_frame_desc[i].status) {
-                               if ((buf->fmt->fourcc)==V4L2_PIX_FMT_TM6000) {
-                                       rc=copy_multiplexed(p, outp, len, urb, &buf);
+                               if ((dev->fourcc)==V4L2_PIX_FMT_TM6000) {
+                                       rc=copy_multiplexed(p, len, urb);
                                        if (rc<=0)
                                                return rc;
                                } else {
-                                       copy_streams(p, outp, len, urb, &buf);
+                                       copy_streams(p, len, urb);
                                }
                        }
-                       copied += len;
-                       if (copied >= size || !buf)
-                               break;
-//             }
+               }
        }
        return rc;
 }
@@ -612,7 +620,7 @@ static void tm6000_uninit_isoc(struct tm6000_core *dev)
 static int tm6000_prepare_isoc(struct tm6000_core *dev, unsigned int framesize)
 {
        struct tm6000_dmaqueue *dma_q = &dev->vidq;
-       int i, j, sb_size, pipe, size, max_packets, num_bufs = 5;
+       int i, j, sb_size, pipe, size, max_packets, num_bufs = 8;
        struct urb *urb;
 
        /* De-allocates all pending stuff */
index 6812d6867d578e5fde797935bbaf89db1b25e0fd..7bbaf26dea14f292b1808820698a702981514ebe 100644 (file)
@@ -168,6 +168,10 @@ struct tm6000_core {
        struct i2c_adapter              i2c_adap;
        struct i2c_client               i2c_client;
 
+
+       /* extension */
+       struct list_head                devlist;
+
        /* video for linux */
        int                             users;
 
@@ -203,6 +207,16 @@ struct tm6000_core {
        spinlock_t                   slock;
 };
 
+#define TM6000_AUDIO 0x10
+
+struct tm6000_ops {
+       struct list_head        next;
+       char                    *name;
+       int                     id;
+       int (*init)(struct tm6000_core *);
+       int (*fini)(struct tm6000_core *);
+};
+
 struct tm6000_fh {
        struct tm6000_core           *dev;
 
@@ -232,6 +246,8 @@ int tm6000_get_reg (struct tm6000_core *dev, u8 req, u16 value, u16 index);
 int tm6000_get_reg16(struct tm6000_core *dev, u8 req, u16 value, u16 index);
 int tm6000_get_reg32(struct tm6000_core *dev, u8 req, u16 value, u16 index);
 int tm6000_set_reg (struct tm6000_core *dev, u8 req, u16 value, u16 index);
+int tm6000_i2c_reset(struct tm6000_core *dev, u16 tsleep);
+
 int tm6000_init (struct tm6000_core *dev);
 
 int tm6000_init_analog_mode (struct tm6000_core *dev);
@@ -246,6 +262,13 @@ int tm6000_v4l2_unregister(struct tm6000_core *dev);
 int tm6000_v4l2_exit(void);
 void tm6000_set_fourcc_format(struct tm6000_core *dev);
 
+void tm6000_remove_from_devlist(struct tm6000_core *dev);
+void tm6000_add_into_devlist(struct tm6000_core *dev);
+int tm6000_register_extension(struct tm6000_ops *ops);
+void tm6000_unregister_extension(struct tm6000_ops *ops);
+void tm6000_init_extension(struct tm6000_core *dev);
+void tm6000_close_extension(struct tm6000_core *dev);
+
 /* In tm6000-stds.c */
 void tm6000_get_std_res(struct tm6000_core *dev);
 int tm6000_set_standard (struct tm6000_core *dev, v4l2_std_id *norm);
@@ -275,7 +298,7 @@ unsigned int tm6000_v4l2_poll(struct file *file,
 int tm6000_queue_init(struct tm6000_core *dev);
 
 /* In tm6000-alsa.c */
-int tm6000_audio_init(struct tm6000_core *dev, int idx);
+/*int tm6000_audio_init(struct tm6000_core *dev, int idx);*/
 
 
 /* Debug stuff */
index 0c82eb47a28dd706d554788533252231b3f6fe82..0f9ea58ff71705bb10823b83158ad99ae996c1d9 100644 (file)
@@ -523,7 +523,7 @@ static int ca91cx42_alloc_resource(struct vme_master_resource *image,
        }
 
        if (image->bus_resource.name == NULL) {
-               image->bus_resource.name = kmalloc(VMENAMSIZ+3, GFP_KERNEL);
+               image->bus_resource.name = kmalloc(VMENAMSIZ+3, GFP_ATOMIC);
                if (image->bus_resource.name == NULL) {
                        dev_err(ca91cx42_bridge->parent, "Unable to allocate "
                                "memory for resource name\n");
index abe88a380b726894f82aae35158038e6a944d239..f09cac163139680a20eee6b9905c42ebce2b05f5 100644 (file)
@@ -828,7 +828,7 @@ static int tsi148_alloc_resource(struct vme_master_resource *image,
                return 0;
 
        if (image->bus_resource.name == NULL) {
-               image->bus_resource.name = kmalloc(VMENAMSIZ+3, GFP_KERNEL);
+               image->bus_resource.name = kmalloc(VMENAMSIZ+3, GFP_ATOMIC);
                if (image->bus_resource.name == NULL) {
                        dev_err(tsi148_bridge->parent, "Unable to allocate "
                                "memory for resource name\n");
index b6fc2ca7d85c60b1eb9593c5db1f702f630b1b5b..3efcbf8afedfb019581f9cc978444351ce5c3145 100644 (file)
@@ -1,9 +1,11 @@
 config WLAGS49_H2
        tristate "Agere Systems HERMES II Wireless PC Card Model 0110"
-       depends on WLAN && WIRELESS_EXT && PCMCIA
+       depends on WLAN && PCMCIA
+       select WIRELESS_EXT
        select WEXT_SPY
+       select WEXT_PRIV
        ---help---
-         Driver for wireless cards using Agere's HERMES II chipset
-         which are identified with Manufacture ID: 0156,0003
-         The software is a modified version of wl_lkm_722_abg.tar.gz
-         from the Agere Systems website, addapted for Ubuntu 9.04.
+       Driver for wireless cards using Agere's HERMES II chipset
+       which are identified with Manufacture ID: 0156,0003
+       The software is a modified version of wl_lkm_722_abg.tar.gz
+       from the Agere Systems website, addapted for Ubuntu 9.04.
index dcc170929c13729827369108ea8c0e14a5f2c087..bf5664a51cd4aaef06fd11965a76d2fd09860989 100644 (file)
@@ -1,9 +1,11 @@
 config WLAGS49_H25
        tristate "Linksys HERMES II.5 WCF54G_Wireless-G_CompactFlash_Card"
-       depends on WLAN && WIRELESS_EXT && PCMCIA
+       depends on WLAN && PCMCIA
+       select WIRELESS_EXT
        select WEXT_SPY
+       select WEXT_PRIV
        ---help---
-         Driver for wireless cards using Agere's HERMES II.5 chipset
-         which are identified with Manufacture ID: 0156,0004
-         The software is a modified version of wl_lkm_722_abg.tar.gz
-         from the Agere Systems website, addapted for Ubuntu 9.04.
+       Driver for wireless cards using Agere's HERMES II.5 chipset
+       which are identified with Manufacture ID: 0156,0004
+       The software is a modified version of wl_lkm_722_abg.tar.gz
+       from the Agere Systems website, addapted for Ubuntu 9.04.
diff --git a/drivers/staging/xgifb/Kconfig b/drivers/staging/xgifb/Kconfig
new file mode 100644 (file)
index 0000000..bb0ca59
--- /dev/null
@@ -0,0 +1,11 @@
+config FB_XGI
+       tristate "XGI display support"
+       depends on FB && PCI
+       select FB_CFB_FILLRECT
+       select FB_CFB_COPYAREA
+       select FB_CFB_IMAGEBLIT
+       help
+         This driver supports notebooks with XGI Z7,Z9,Z11 PCI chips.
+         Say Y if you have such a graphics card.
+         To compile this driver as a module, choose M here: the
+         module will be called xgifb.ko
diff --git a/drivers/staging/xgifb/Makefile b/drivers/staging/xgifb/Makefile
new file mode 100644 (file)
index 0000000..2a31770
--- /dev/null
@@ -0,0 +1,4 @@
+obj-$(CONFIG_FB_XGI)  += xgifb.o
+
+xgifb-objs := XGI_main_26.o XGI_accel.o vb_init.o vb_setmode.o vb_util.o vb_ext.o
+
diff --git a/drivers/staging/xgifb/TODO b/drivers/staging/xgifb/TODO
new file mode 100644 (file)
index 0000000..7d71019
--- /dev/null
@@ -0,0 +1,15 @@
+This drivers still need a lot of work. I can list all cleanups to do but it's
+going to be long. So, I'm writing "cleanups" and not the list.
+
+Arnaud
+
+TODO:
+- clean ups
+- fix build warnings when module
+- sort out dup ids with SiS driver
+- remove useless/wrong/unused #ifdef/code/...
+- fix printk usages
+- get rid of non-linux related stuff
+
+Please send patches to:
+Arnaud Patard <apatard@mandriva.com>
diff --git a/drivers/staging/xgifb/XGI.h b/drivers/staging/xgifb/XGI.h
new file mode 100644 (file)
index 0000000..87803dd
--- /dev/null
@@ -0,0 +1,10 @@
+#ifndef _XGI_H
+#define _XGI_H
+
+#if 1
+#define TWDEBUG(x)
+#else
+#define TWDEBUG(x) printk(KERN_INFO x "\n");
+#endif
+
+#endif
diff --git a/drivers/staging/xgifb/XGI_accel.c b/drivers/staging/xgifb/XGI_accel.c
new file mode 100644 (file)
index 0000000..86ec342
--- /dev/null
@@ -0,0 +1,596 @@
+/*
+ * XGI 300/630/730/540/315/550/650/740 frame buffer driver
+ * for Linux kernels 2.4.x and 2.5.x
+ *
+ * 2D acceleration part
+ *
+ * Based on the X driver's XGI300_accel.c which is
+ *     Copyright Xavier Ducoin <x.ducoin@lectra.com>
+ *     Copyright 2002 by Thomas Winischhofer, Vienna, Austria
+ * and XGI310_accel.c which is
+ *     Copyright 2002 by Thomas Winischhofer, Vienna, Austria
+ *
+ * Author: Thomas Winischhofer <thomas@winischhofer.net>
+ *                     (see http://www.winischhofer.net/
+ *                     for more information and updates)
+ */
+
+//#include <linux/config.h>
+#include <linux/version.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/string.h>
+#include <linux/mm.h>
+#include <linux/tty.h>
+#include <linux/slab.h>
+#include <linux/delay.h>
+#include <linux/fb.h>
+#include <linux/console.h>
+#include <linux/selection.h>
+#include <linux/ioport.h>
+#include <linux/init.h>
+#include <linux/pci.h>
+#include <linux/vt_kern.h>
+#include <linux/capability.h>
+#include <linux/fs.h>
+#include <linux/agp_backend.h>
+
+#include <linux/types.h>
+/*
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+#include <linux/XGIfb.h>
+#else
+#include <video/XGIfb.h>
+#endif
+*/
+#include <asm/io.h>
+
+#ifdef CONFIG_MTRR
+#include <asm/mtrr.h>
+#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+#include <video/fbcon.h>
+#include <video/fbcon-cfb8.h>
+#include <video/fbcon-cfb16.h>
+#include <video/fbcon-cfb24.h>
+#include <video/fbcon-cfb32.h>
+#endif
+
+#include "osdef.h"
+#include "vgatypes.h"
+#include "vb_struct.h"
+#include "XGIfb.h"
+#include "XGI_accel.h"
+
+
+extern struct     video_info xgi_video_info;
+extern int XGIfb_accel;
+
+static const int XGIALUConv[] =
+{
+    0x00,       /* dest = 0;            0,      GXclear,        0 */
+    0x88,       /* dest &= src;         DSa,    GXand,          0x1 */
+    0x44,       /* dest = src & ~dest;  SDna,   GXandReverse,   0x2 */
+    0xCC,       /* dest = src;          S,      GXcopy,         0x3 */
+    0x22,       /* dest &= ~src;        DSna,   GXandInverted,  0x4 */
+    0xAA,       /* dest = dest;         D,      GXnoop,         0x5 */
+    0x66,       /* dest = ^src;         DSx,    GXxor,          0x6 */
+    0xEE,       /* dest |= src;         DSo,    GXor,           0x7 */
+    0x11,       /* dest = ~src & ~dest; DSon,   GXnor,          0x8 */
+    0x99,       /* dest ^= ~src ;       DSxn,   GXequiv,        0x9 */
+    0x55,       /* dest = ~dest;        Dn,     GXInvert,       0xA */
+    0xDD,       /* dest = src|~dest ;   SDno,   GXorReverse,    0xB */
+    0x33,       /* dest = ~src;         Sn,     GXcopyInverted, 0xC */
+    0xBB,       /* dest |= ~src;        DSno,   GXorInverted,   0xD */
+    0x77,       /* dest = ~src|~dest;   DSan,   GXnand,         0xE */
+    0xFF,       /* dest = 0xFF;         1,      GXset,          0xF */
+};
+/* same ROP but with Pattern as Source */
+static const int XGIPatALUConv[] =
+{
+    0x00,       /* dest = 0;            0,      GXclear,        0 */
+    0xA0,       /* dest &= src;         DPa,    GXand,          0x1 */
+    0x50,       /* dest = src & ~dest;  PDna,   GXandReverse,   0x2 */
+    0xF0,       /* dest = src;          P,      GXcopy,         0x3 */
+    0x0A,       /* dest &= ~src;        DPna,   GXandInverted,  0x4 */
+    0xAA,       /* dest = dest;         D,      GXnoop,         0x5 */
+    0x5A,       /* dest = ^src;         DPx,    GXxor,          0x6 */
+    0xFA,       /* dest |= src;         DPo,    GXor,           0x7 */
+    0x05,       /* dest = ~src & ~dest; DPon,   GXnor,          0x8 */
+    0xA5,       /* dest ^= ~src ;       DPxn,   GXequiv,        0x9 */
+    0x55,       /* dest = ~dest;        Dn,     GXInvert,       0xA */
+    0xF5,       /* dest = src|~dest ;   PDno,   GXorReverse,    0xB */
+    0x0F,       /* dest = ~src;         Pn,     GXcopyInverted, 0xC */
+    0xAF,       /* dest |= ~src;        DPno,   GXorInverted,   0xD */
+    0x5F,       /* dest = ~src|~dest;   DPan,   GXnand,         0xE */
+    0xFF,       /* dest = 0xFF;         1,      GXset,          0xF */
+};
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,34)
+static const unsigned char myrops[] = {
+       3, 10, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3
+   };
+#endif
+
+/* 300 series */
+#if 0
+static void
+XGI300Sync(void)
+{
+       XGI300Idle
+}
+#endif
+static void
+XGI310Sync(void)
+{
+       XGI310Idle
+}
+#if 0
+static void
+XGI300SetupForScreenToScreenCopy(int xdir, int ydir, int rop,
+                                unsigned int planemask, int trans_color)
+{
+       XGI300SetupDSTColorDepth(xgi_video_info.DstColor);
+       XGI300SetupSRCPitch(xgi_video_info.video_linelength)
+       XGI300SetupDSTRect(xgi_video_info.video_linelength, 0xFFF)
+
+       if(trans_color != -1) {
+               XGI300SetupROP(0x0A)
+               XGI300SetupSRCTrans(trans_color)
+               XGI300SetupCMDFlag(TRANSPARENT_BITBLT)
+       } else {
+               XGI300SetupROP(XGIALUConv[rop])
+       }
+       if(xdir > 0) {
+               XGI300SetupCMDFlag(X_INC)
+       }
+       if(ydir > 0) {
+               XGI300SetupCMDFlag(Y_INC)
+       }
+}
+
+static void
+XGI300SubsequentScreenToScreenCopy(int src_x, int src_y, int dst_x, int dst_y,
+                                int width, int height)
+{
+       long srcbase, dstbase;
+
+       srcbase = dstbase = 0;
+       if (src_y >= 2048) {
+               srcbase = xgi_video_info.video_linelength * src_y;
+               src_y = 0;
+       }
+       if (dst_y >= 2048) {
+               dstbase = xgi_video_info.video_linelength * dst_y;
+               dst_y = 0;
+       }
+
+       XGI300SetupSRCBase(srcbase);
+       XGI300SetupDSTBase(dstbase);
+
+       if(!(xgi_video_info.CommandReg & X_INC))  {
+               src_x += width-1;
+               dst_x += width-1;
+       }
+       if(!(xgi_video_info.CommandReg & Y_INC))  {
+               src_y += height-1;
+               dst_y += height-1;
+       }
+       XGI300SetupRect(width, height)
+       XGI300SetupSRCXY(src_x, src_y)
+       XGI300SetupDSTXY(dst_x, dst_y)
+       XGI300DoCMD
+}
+
+static void
+XGI300SetupForSolidFill(int color, int rop, unsigned int planemask)
+{
+       XGI300SetupPATFG(color)
+       XGI300SetupDSTRect(xgi_video_info.video_linelength, 0xFFF)
+       XGI300SetupDSTColorDepth(xgi_video_info.DstColor);
+       XGI300SetupROP(XGIPatALUConv[rop])
+       XGI300SetupCMDFlag(PATFG)
+}
+
+static void
+XGI300SubsequentSolidFillRect(int x, int y, int w, int h)
+{
+       long dstbase;
+
+       dstbase = 0;
+       if(y >= 2048) {
+               dstbase = xgi_video_info.video_linelength * y;
+               y = 0;
+       }
+       XGI300SetupDSTBase(dstbase)
+       XGI300SetupDSTXY(x,y)
+       XGI300SetupRect(w,h)
+       XGI300SetupCMDFlag(X_INC | Y_INC | BITBLT)
+       XGI300DoCMD
+}
+#endif
+/* 310/325 series ------------------------------------------------ */
+
+static void
+XGI310SetupForScreenToScreenCopy(int xdir, int ydir, int rop,
+                                unsigned int planemask, int trans_color)
+{
+       XGI310SetupDSTColorDepth(xgi_video_info.DstColor);
+       XGI310SetupSRCPitch(xgi_video_info.video_linelength)
+       XGI310SetupDSTRect(xgi_video_info.video_linelength, 0xFFF)
+       if (trans_color != -1) {
+               XGI310SetupROP(0x0A)
+               XGI310SetupSRCTrans(trans_color)
+               XGI310SetupCMDFlag(TRANSPARENT_BITBLT)
+       } else {
+               XGI310SetupROP(XGIALUConv[rop])
+               /* Set command - not needed, both 0 */
+               /* XGISetupCMDFlag(BITBLT | SRCVIDEO) */
+       }
+       XGI310SetupCMDFlag(xgi_video_info.XGI310_AccelDepth)
+       /* TW: The 310/325 series is smart enough to know the direction */
+}
+
+static void
+XGI310SubsequentScreenToScreenCopy(int src_x, int src_y, int dst_x, int dst_y,
+                                int width, int height)
+{
+       long srcbase, dstbase;
+       int mymin, mymax;
+
+       srcbase = dstbase = 0;
+       mymin = min(src_y, dst_y);
+       mymax = max(src_y, dst_y);
+
+       /* Although the chip knows the direction to use
+        * if the source and destination areas overlap,
+        * that logic fails if we fiddle with the bitmap
+        * addresses. Therefore, we check if the source
+        * and destination blitting areas overlap and
+        * adapt the bitmap addresses synchronously
+        * if the coordinates exceed the valid range.
+        * The the areas do not overlap, we do our
+        * normal check.
+        */
+       if((mymax - mymin) < height) {
+          if((src_y >= 2048) || (dst_y >= 2048)) {
+             srcbase = xgi_video_info.video_linelength * mymin;
+             dstbase = xgi_video_info.video_linelength * mymin;
+             src_y -= mymin;
+             dst_y -= mymin;
+          }
+       } else {
+          if(src_y >= 2048) {
+             srcbase = xgi_video_info.video_linelength * src_y;
+             src_y = 0;
+          }
+          if(dst_y >= 2048) {
+             dstbase = xgi_video_info.video_linelength * dst_y;
+             dst_y = 0;
+          }
+       }
+
+       XGI310SetupSRCBase(srcbase);
+       XGI310SetupDSTBase(dstbase);
+       XGI310SetupRect(width, height)
+       XGI310SetupSRCXY(src_x, src_y)
+       XGI310SetupDSTXY(dst_x, dst_y)
+       XGI310DoCMD
+}
+
+static void
+XGI310SetupForSolidFill(int color, int rop, unsigned int planemask)
+{
+       XGI310SetupPATFG(color)
+       XGI310SetupDSTRect(xgi_video_info.video_linelength, 0xFFF)
+       XGI310SetupDSTColorDepth(xgi_video_info.DstColor);
+       XGI310SetupROP(XGIPatALUConv[rop])
+       XGI310SetupCMDFlag(PATFG | xgi_video_info.XGI310_AccelDepth)
+}
+
+static void
+XGI310SubsequentSolidFillRect(int x, int y, int w, int h)
+{
+       long dstbase;
+
+       dstbase = 0;
+       if(y >= 2048) {
+               dstbase = xgi_video_info.video_linelength * y;
+               y = 0;
+       }
+       XGI310SetupDSTBase(dstbase)
+       XGI310SetupDSTXY(x,y)
+       XGI310SetupRect(w,h)
+       XGI310SetupCMDFlag(BITBLT)
+       XGI310DoCMD
+}
+
+/* --------------------------------------------------------------------- */
+
+/* The exported routines */
+
+int XGIfb_initaccel(void)
+{
+#ifdef XGIFB_USE_SPINLOCKS
+    spin_lock_init(&xgi_video_info.lockaccel);
+#endif
+    return(0);
+}
+
+void XGIfb_syncaccel(void)
+{
+
+    XGI310Sync();
+
+}
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,34)  /* --- KERNEL 2.5.34 and later --- */
+
+int fbcon_XGI_sync(struct fb_info *info)
+{
+    if(!XGIfb_accel) return 0;
+    CRITFLAGS
+
+    XGI310Sync();
+
+   CRITEND
+   return 0;
+}
+
+void fbcon_XGI_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
+{
+   int col=0;
+   CRITFLAGS
+
+
+   if(!rect->width || !rect->height)
+       return;
+
+   if(!XGIfb_accel) {
+       cfb_fillrect(info, rect);
+       return;
+   }
+
+   switch(info->var.bits_per_pixel) {
+               case 8: col = rect->color;
+                       break;
+               case 16: col = ((u32 *)(info->pseudo_palette))[rect->color];
+                        break;
+               case 32: col = ((u32 *)(info->pseudo_palette))[rect->color];
+                        break;
+       }
+
+
+          CRITBEGIN
+          XGI310SetupForSolidFill(col, myrops[rect->rop], 0);
+          XGI310SubsequentSolidFillRect(rect->dx, rect->dy, rect->width, rect->height);
+          CRITEND
+          XGI310Sync();
+
+
+}
+
+void fbcon_XGI_copyarea(struct fb_info *info, const struct fb_copyarea *area)
+{
+   int xdir, ydir;
+   CRITFLAGS
+
+
+   if(!XGIfb_accel) {
+       cfb_copyarea(info, area);
+       return;
+   }
+
+   if(!area->width || !area->height)
+       return;
+
+   if(area->sx < area->dx) xdir = 0;
+   else                    xdir = 1;
+   if(area->sy < area->dy) ydir = 0;
+   else                    ydir = 1;
+
+      CRITBEGIN
+      XGI310SetupForScreenToScreenCopy(xdir, ydir, 3, 0, -1);
+      XGI310SubsequentScreenToScreenCopy(area->sx, area->sy, area->dx, area->dy, area->width, area->height);
+      CRITEND
+      XGI310Sync();
+
+}
+
+#endif
+
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,33)  /* ------ KERNEL <2.5.34 ------ */
+
+void fbcon_XGI_bmove(struct display *p, int srcy, int srcx,
+                           int dsty, int dstx, int height, int width)
+{
+        int xdir, ydir;
+       CRITFLAGS
+
+       if(!xgi_video_info.accel) {
+           switch(xgi_video_info.video_bpp) {
+           case 8:
+#ifdef FBCON_HAS_CFB8
+              fbcon_cfb8_bmove(p, srcy, srcx, dsty, dstx, height, width);
+#endif
+              break;
+           case 16:
+#ifdef FBCON_HAS_CFB16
+              fbcon_cfb16_bmove(p, srcy, srcx, dsty, dstx, height, width);
+#endif
+              break;
+           case 32:
+#ifdef FBCON_HAS_CFB32
+              fbcon_cfb32_bmove(p, srcy, srcx, dsty, dstx, height, width);
+#endif
+              break;
+            }
+           return;
+       }
+
+       srcx *= fontwidth(p);
+       srcy *= fontheight(p);
+       dstx *= fontwidth(p);
+       dsty *= fontheight(p);
+       width *= fontwidth(p);
+       height *= fontheight(p);
+
+       if(srcx < dstx) xdir = 0;
+       else            xdir = 1;
+       if(srcy < dsty) ydir = 0;
+       else            ydir = 1;
+
+
+          CRITBEGIN
+          XGI310SetupForScreenToScreenCopy(xdir, ydir, 3, 0, -1);
+          XGI310SubsequentScreenToScreenCopy(srcx, srcy, dstx, dsty, width, height);
+          CRITEND
+          XGI310Sync();
+#if 0
+          printk(KERN_INFO "XGI_bmove sx %d sy %d dx %d dy %d w %d h %d\n",
+               srcx, srcy, dstx, dsty, width, height);
+#endif
+
+}
+
+
+static void fbcon_XGI_clear(struct vc_data *conp, struct display *p,
+                       int srcy, int srcx, int height, int width, int color)
+{
+       CRITFLAGS
+
+       srcx *= fontwidth(p);
+       srcy *= fontheight(p);
+       width *= fontwidth(p);
+       height *= fontheight(p);
+
+
+          CRITBEGIN
+          XGI310SetupForSolidFill(color, 3, 0);
+          XGI310SubsequentSolidFillRect(srcx, srcy, width, height);
+          CRITEND
+          XGI310Sync();
+
+}
+
+void fbcon_XGI_clear8(struct vc_data *conp, struct display *p,
+                       int srcy, int srcx, int height, int width)
+{
+       u32 bgx;
+
+       if(!xgi_video_info.accel) {
+#ifdef FBCON_HAS_CFB8
+           fbcon_cfb8_clear(conp, p, srcy, srcx, height, width);
+#endif
+           return;
+       }
+
+       bgx = attr_bgcol_ec(p, conp);
+       fbcon_XGI_clear(conp, p, srcy, srcx, height, width, bgx);
+}
+
+void fbcon_XGI_clear16(struct vc_data *conp, struct display *p,
+                       int srcy, int srcx, int height, int width)
+{
+       u32 bgx;
+       if(!xgi_video_info.accel) {
+#ifdef FBCON_HAS_CFB16
+           fbcon_cfb16_clear(conp, p, srcy, srcx, height, width);
+#endif
+           return;
+       }
+
+       bgx = ((u_int16_t*)p->dispsw_data)[attr_bgcol_ec(p, conp)];
+       fbcon_XGI_clear(conp, p, srcy, srcx, height, width, bgx);
+}
+
+void fbcon_XGI_clear32(struct vc_data *conp, struct display *p,
+                       int srcy, int srcx, int height, int width)
+{
+       u32 bgx;
+
+       if(!xgi_video_info.accel) {
+#ifdef FBCON_HAS_CFB32
+           fbcon_cfb32_clear(conp, p, srcy, srcx, height, width);
+#endif
+           return;
+       }
+
+       bgx = ((u_int32_t*)p->dispsw_data)[attr_bgcol_ec(p, conp)];
+       fbcon_XGI_clear(conp, p, srcy, srcx, height, width, bgx);
+}
+
+void fbcon_XGI_revc(struct display *p, int srcx, int srcy)
+{
+       CRITFLAGS
+
+       if(!xgi_video_info.accel) {
+           switch(xgi_video_info.video_bpp) {
+           case 16:
+#ifdef FBCON_HAS_CFB16
+              fbcon_cfb16_revc(p, srcx, srcy);
+#endif
+              break;
+           case 32:
+#ifdef FBCON_HAS_CFB32
+              fbcon_cfb32_revc(p, srcx, srcy);
+#endif
+              break;
+            }
+           return;
+       }
+
+       srcx *= fontwidth(p);
+       srcy *= fontheight(p);
+
+
+          CRITBEGIN
+          XGI310SetupForSolidFill(0, 0x0a, 0);
+          XGI310SubsequentSolidFillRect(srcx, srcy, fontwidth(p), fontheight(p));
+          CRITEND
+          XGI310Sync();
+
+}
+
+#ifdef FBCON_HAS_CFB8
+struct display_switch fbcon_XGI8 = {
+       setup:                  fbcon_cfb8_setup,
+       bmove:                  fbcon_XGI_bmove,
+       clear:                  fbcon_XGI_clear8,
+       putc:                   fbcon_cfb8_putc,
+       putcs:                  fbcon_cfb8_putcs,
+       revc:                   fbcon_cfb8_revc,
+       clear_margins:          fbcon_cfb8_clear_margins,
+       fontwidthmask:          FONTWIDTH(4)|FONTWIDTH(8)|FONTWIDTH(12)|FONTWIDTH(16)
+};
+#endif
+#ifdef FBCON_HAS_CFB16
+struct display_switch fbcon_XGI16 = {
+       setup:                  fbcon_cfb16_setup,
+       bmove:                  fbcon_XGI_bmove,
+       clear:                  fbcon_XGI_clear16,
+       putc:                   fbcon_cfb16_putc,
+       putcs:                  fbcon_cfb16_putcs,
+       revc:                   fbcon_XGI_revc,
+       clear_margins:          fbcon_cfb16_clear_margins,
+       fontwidthmask:          FONTWIDTH(4)|FONTWIDTH(8)|FONTWIDTH(12)|FONTWIDTH(16)
+};
+#endif
+#ifdef FBCON_HAS_CFB32
+struct display_switch fbcon_XGI32 = {
+       setup:                  fbcon_cfb32_setup,
+       bmove:                  fbcon_XGI_bmove,
+       clear:                  fbcon_XGI_clear32,
+       putc:                   fbcon_cfb32_putc,
+       putcs:                  fbcon_cfb32_putcs,
+       revc:                   fbcon_XGI_revc,
+       clear_margins:          fbcon_cfb32_clear_margins,
+       fontwidthmask:          FONTWIDTH(4)|FONTWIDTH(8)|FONTWIDTH(12)|FONTWIDTH(16)
+};
+#endif
+
+#endif /* KERNEL VERSION */
+
+
diff --git a/drivers/staging/xgifb/XGI_accel.h b/drivers/staging/xgifb/XGI_accel.h
new file mode 100644 (file)
index 0000000..04e1267
--- /dev/null
@@ -0,0 +1,511 @@
+/*
+ * XGI 300/630/730/540/315/550/650/740 frame buffer driver
+ * for Linux kernels 2.4.x and 2.5.x
+ *
+ * 2D acceleration part
+ *
+ * Based on the X driver's XGI300_accel.h which is
+ *     Copyright Xavier Ducoin <x.ducoin@lectra.com>
+ *     Copyright 2002 by Thomas Winischhofer, Vienna, Austria
+ * and XGI310_accel.h which is
+ *     Copyright 2002 by Thomas Winischhofer, Vienna, Austria
+ *
+ * Author:   Thomas Winischhofer <thomas@winischhofer.net>:
+ *                     (see http://www.winischhofer.net/
+ *                     for more information and updates)
+ */
+
+#ifndef _XGIFB_ACCEL_H
+#define _XGIFB_ACCEL_H
+
+/* Guard accelerator accesses with spin_lock_irqsave? Works well without. */
+#undef XGIFB_USE_SPINLOCKS
+
+#ifdef XGIFB_USE_SPINLOCKS
+#include <linux/spinlock.h>
+#define CRITBEGIN  spin_lock_irqsave(&xgi_video_info.lockaccel), critflags);
+#define CRITEND           spin_unlock_irqrestore(&xgi_video_info.lockaccel), critflags);
+#define CRITFLAGS  unsigned long critflags;
+#else
+#define CRITBEGIN
+#define CRITEND
+#define CRITFLAGS
+#endif
+
+/* Definitions for the XGI engine communication. */
+
+#define PATREGSIZE      384  /* Pattern register size. 384 bytes @ 0x8300 */
+#define BR(x)   (0x8200 | (x) << 2)
+#define PBR(x)  (0x8300 | (x) << 2)
+
+/* XGI300 engine commands */
+#define BITBLT                  0x00000000  /* Blit */
+#define COLOREXP                0x00000001  /* Color expand */
+#define ENCOLOREXP              0x00000002  /* Enhanced color expand */
+#define MULTIPLE_SCANLINE       0x00000003  /* ? */
+#define LINE                    0x00000004  /* Draw line */
+#define TRAPAZOID_FILL          0x00000005  /* Fill trapezoid */
+#define TRANSPARENT_BITBLT      0x00000006  /* Transparent Blit */
+
+/* Additional engine commands for 310/325 */
+#define ALPHA_BLEND            0x00000007  /* Alpha blend ? */
+#define A3D_FUNCTION           0x00000008  /* 3D command ? */
+#define        CLEAR_Z_BUFFER          0x00000009  /* ? */
+#define GRADIENT_FILL          0x0000000A  /* Gradient fill */
+#define STRETCH_BITBLT         0x0000000B  /* Stretched Blit */
+
+/* source select */
+#define SRCVIDEO                0x00000000  /* source is video RAM */
+#define SRCSYSTEM               0x00000010  /* source is system memory */
+#define SRCCPUBLITBUF           SRCSYSTEM   /* source is CPU-driven BitBuffer (for color expand) */
+#define SRCAGP                  0x00000020  /* source is AGP memory (?) */
+
+/* Pattern flags */
+#define PATFG                   0x00000000  /* foreground color */
+#define PATPATREG               0x00000040  /* pattern in pattern buffer (0x8300) */
+#define PATMONO                 0x00000080  /* mono pattern */
+
+/* blitting direction (300 series only) */
+#define X_INC                   0x00010000
+#define X_DEC                   0x00000000
+#define Y_INC                   0x00020000
+#define Y_DEC                   0x00000000
+
+/* Clipping flags */
+#define NOCLIP                  0x00000000
+#define NOMERGECLIP             0x04000000
+#define CLIPENABLE              0x00040000
+#define CLIPWITHOUTMERGE        0x04040000
+
+/* Transparency */
+#define OPAQUE                  0x00000000
+#define TRANSPARENT             0x00100000
+
+/* ? */
+#define DSTAGP                  0x02000000
+#define DSTVIDEO                0x02000000
+
+/* Line */
+#define LINE_STYLE              0x00800000
+#define NO_RESET_COUNTER        0x00400000
+#define NO_LAST_PIXEL           0x00200000
+
+/* Subfunctions for Color/Enhanced Color Expansion (310/325 only) */
+#define COLOR_TO_MONO          0x00100000
+#define AA_TEXT                        0x00200000
+
+/* Some general registers for 310/325 series */
+#define SRC_ADDR               0x8200
+#define SRC_PITCH              0x8204
+#define AGP_BASE               0x8206 /* color-depth dependent value */
+#define SRC_Y                  0x8208
+#define SRC_X                  0x820A
+#define DST_Y                  0x820C
+#define DST_X                  0x820E
+#define DST_ADDR               0x8210
+#define DST_PITCH              0x8214
+#define DST_HEIGHT             0x8216
+#define RECT_WIDTH             0x8218
+#define RECT_HEIGHT            0x821A
+#define PAT_FGCOLOR            0x821C
+#define PAT_BGCOLOR            0x8220
+#define SRC_FGCOLOR            0x8224
+#define SRC_BGCOLOR            0x8228
+#define MONO_MASK              0x822C
+#define LEFT_CLIP              0x8234
+#define TOP_CLIP               0x8236
+#define RIGHT_CLIP             0x8238
+#define BOTTOM_CLIP            0x823A
+#define COMMAND_READY          0x823C
+#define FIRE_TRIGGER           0x8240
+
+#define PATTERN_REG            0x8300  /* 384 bytes pattern buffer */
+
+/* Line registers */
+#define LINE_X0                        SRC_Y
+#define LINE_X1                        DST_Y
+#define LINE_Y0                        SRC_X
+#define LINE_Y1                        DST_X
+#define LINE_COUNT             RECT_WIDTH
+#define LINE_STYLE_PERIOD      RECT_HEIGHT
+#define LINE_STYLE_0           MONO_MASK
+#define LINE_STYLE_1           0x8230
+#define LINE_XN                        PATTERN_REG
+#define LINE_YN                        PATTERN_REG+2
+
+/* Transparent bitblit registers */
+#define TRANS_DST_KEY_HIGH     PAT_FGCOLOR
+#define TRANS_DST_KEY_LOW      PAT_BGCOLOR
+#define TRANS_SRC_KEY_HIGH     SRC_FGCOLOR
+#define TRANS_SRC_KEY_LOW      SRC_BGCOLOR
+
+/* Queue */
+#define Q_BASE_ADDR            0x85C0  /* Base address of software queue (?) */
+#define Q_WRITE_PTR            0x85C4  /* Current write pointer (?) */
+#define Q_READ_PTR             0x85C8  /* Current read pointer (?) */
+#define Q_STATUS               0x85CC  /* queue status */
+
+
+#define MMIO_IN8(base, offset) \
+       *(volatile u8 *)(((u8*)(base)) + (offset))
+#define MMIO_IN16(base, offset) \
+       *(volatile u16 *)(void *)(((u8*)(base)) + (offset))
+#define MMIO_IN32(base, offset) \
+       *(volatile u32 *)(void *)(((u8*)(base)) + (offset))
+#define MMIO_OUT8(base, offset, val) \
+       *(volatile u8 *)(((u8*)(base)) + (offset)) = (val)
+#define MMIO_OUT16(base, offset, val) \
+       *(volatile u16 *)(void *)(((u8*)(base)) + (offset)) = (val)
+#define MMIO_OUT32(base, offset, val) \
+       *(volatile u32 *)(void *)(((u8*)(base)) + (offset)) = (val)
+
+
+
+/* ------------- XGI 300 series -------------- */
+
+/* Macros to do useful things with the XGI BitBLT engine */
+
+/* BR(16) (0x8420):
+
+   bit 31 2D engine: 1 is idle,
+   bit 30 3D engine: 1 is idle,
+   bit 29 Command queue: 1 is empty
+
+   bits 28:24: Current CPU driven BitBlt buffer stage bit[4:0]
+
+   bits 15:0:  Current command queue length
+
+*/
+
+/* TW: BR(16)+2 = 0x8242 */
+
+int     xgiCmdQueLen;
+
+#define XGI300Idle \
+  { \
+  while( (MMIO_IN16(xgi_video_info.mmio_vbase, BR(16)+2) & 0xE000) != 0xE000){}; \
+  while( (MMIO_IN16(xgi_video_info.mmio_vbase, BR(16)+2) & 0xE000) != 0xE000){}; \
+  while( (MMIO_IN16(xgi_video_info.mmio_vbase, BR(16)+2) & 0xE000) != 0xE000){}; \
+  xgiCmdQueLen=MMIO_IN16(xgi_video_info.mmio_vbase, 0x8240); \
+  }
+/* TW: (do three times, because 2D engine seems quite unsure about whether or not it's idle) */
+
+#define XGI300SetupSRCBase(base) \
+                if (xgiCmdQueLen <= 0)  XGI300Idle;\
+                MMIO_OUT32(xgi_video_info.mmio_vbase, BR(0), base);\
+                xgiCmdQueLen --;
+
+#define XGI300SetupSRCPitch(pitch) \
+                if (xgiCmdQueLen <= 0)  XGI300Idle;\
+                MMIO_OUT16(xgi_video_info.mmio_vbase, BR(1), pitch);\
+                xgiCmdQueLen --;
+
+#define XGI300SetupSRCXY(x,y) \
+                if (xgiCmdQueLen <= 0)  XGI300Idle;\
+                MMIO_OUT32(xgi_video_info.mmio_vbase, BR(2), (x)<<16 | (y) );\
+                xgiCmdQueLen --;
+
+#define XGI300SetupDSTBase(base) \
+                if (xgiCmdQueLen <= 0)  XGI300Idle;\
+                MMIO_OUT32(xgi_video_info.mmio_vbase, BR(4), base);\
+                xgiCmdQueLen --;
+
+#define XGI300SetupDSTXY(x,y) \
+                if (xgiCmdQueLen <= 0)  XGI300Idle;\
+                MMIO_OUT32(xgi_video_info.mmio_vbase, BR(3), (x)<<16 | (y) );\
+                xgiCmdQueLen --;
+
+#define XGI300SetupDSTRect(x,y) \
+                if (xgiCmdQueLen <= 0)  XGI300Idle;\
+                MMIO_OUT32(xgi_video_info.mmio_vbase, BR(5), (y)<<16 | (x) );\
+                xgiCmdQueLen --;
+
+#define XGI300SetupDSTColorDepth(bpp) \
+                if (xgiCmdQueLen <= 0)  XGI300Idle;\
+                MMIO_OUT16(xgi_video_info.mmio_vbase, BR(1)+2, bpp);\
+                xgiCmdQueLen --;
+
+#define XGI300SetupRect(w,h) \
+                if (xgiCmdQueLen <= 0)  XGI300Idle;\
+                MMIO_OUT32(xgi_video_info.mmio_vbase, BR(6), (h)<<16 | (w) );\
+                xgiCmdQueLen --;
+
+#define XGI300SetupPATFG(color) \
+                if (xgiCmdQueLen <= 0)  XGI300Idle;\
+                MMIO_OUT32(xgi_video_info.mmio_vbase, BR(7), color);\
+                xgiCmdQueLen --;
+
+#define XGI300SetupPATBG(color) \
+                if (xgiCmdQueLen <= 0)  XGI300Idle;\
+                MMIO_OUT32(xgi_video_info.mmio_vbase, BR(8), color);\
+                xgiCmdQueLen --;
+
+#define XGI300SetupSRCFG(color) \
+                if (xgiCmdQueLen <= 0)  XGI300Idle;\
+                MMIO_OUT32(xgi_video_info.mmio_vbase, BR(9), color);\
+                xgiCmdQueLen --;
+
+#define XGI300SetupSRCBG(color) \
+                if (xgiCmdQueLen <= 0)  XGI300Idle;\
+                MMIO_OUT32(xgi_video_info.mmio_vbase, BR(10), color);\
+                xgiCmdQueLen --;
+
+/* 0x8224 src colorkey high */
+/* 0x8228 src colorkey low */
+/* 0x821c dest colorkey high */
+/* 0x8220 dest colorkey low */
+#define XGI300SetupSRCTrans(color) \
+                if (xgiCmdQueLen <= 1)  XGI300Idle;\
+                MMIO_OUT32(xgi_video_info.mmio_vbase, 0x8224, color);\
+               MMIO_OUT32(xgi_video_info.mmio_vbase, 0x8228, color);\
+               xgiCmdQueLen -= 2;
+
+#define XGI300SetupDSTTrans(color) \
+               if (xgiCmdQueLen <= 1)  XGI300Idle;\
+               MMIO_OUT32(xgi_video_info.mmio_vbase, 0x821C, color); \
+               MMIO_OUT32(xgi_video_info.mmio_vbase, 0x8220, color); \
+                xgiCmdQueLen -= 2;
+
+#define XGI300SetupMONOPAT(p0,p1) \
+                if (xgiCmdQueLen <= 1)  XGI300Idle;\
+                MMIO_OUT32(xgi_video_info.mmio_vbase, BR(11), p0);\
+                MMIO_OUT32(xgi_video_info.mmio_vbase, BR(12), p1);\
+                xgiCmdQueLen -= 2;
+
+#define XGI300SetupClipLT(left,top) \
+                if (xgiCmdQueLen <= 0)  XGI300Idle;\
+                MMIO_OUT32(xgi_video_info.mmio_vbase, BR(13), ((left) & 0xFFFF) | (top)<<16 );\
+                xgiCmdQueLen--;
+
+#define XGI300SetupClipRB(right,bottom) \
+                if (xgiCmdQueLen <= 0)  XGI300Idle;\
+                MMIO_OUT32(xgi_video_info.mmio_vbase, BR(14), ((right) & 0xFFFF) | (bottom)<<16 );\
+                xgiCmdQueLen--;
+
+/* General */
+#define XGI300SetupROP(rop) \
+                xgi_video_info.CommandReg = (rop) << 8;
+
+#define XGI300SetupCMDFlag(flags) \
+                xgi_video_info.CommandReg |= (flags);
+
+#define XGI300DoCMD \
+                if (xgiCmdQueLen <= 1)  XGI300Idle;\
+                MMIO_OUT32(xgi_video_info.mmio_vbase, BR(15), xgi_video_info.CommandReg); \
+                MMIO_OUT32(xgi_video_info.mmio_vbase, BR(16), 0);\
+                xgiCmdQueLen -= 2;
+
+/* Line */
+#define XGI300SetupX0Y0(x,y) \
+                if (xgiCmdQueLen <= 0)  XGI300Idle;\
+                MMIO_OUT32(xgi_video_info.mmio_vbase, BR(2), (y)<<16 | (x) );\
+                xgiCmdQueLen--;
+
+#define XGI300SetupX1Y1(x,y) \
+                if (xgiCmdQueLen <= 0)  XGI300Idle;\
+                MMIO_OUT32(xgi_video_info.mmio_vbase, BR(3), (y)<<16 | (x) );\
+                xgiCmdQueLen--;
+
+#define XGI300SetupLineCount(c) \
+                if (xgiCmdQueLen <= 0)  XGI300Idle;\
+                MMIO_OUT16(xgi_video_info.mmio_vbase, BR(6), c);\
+                xgiCmdQueLen--;
+
+#define XGI300SetupStylePeriod(p) \
+                if (xgiCmdQueLen <= 0)  XGI300Idle;\
+                MMIO_OUT16(xgi_video_info.mmio_vbase, BR(6)+2, p);\
+                xgiCmdQueLen--;
+
+#define XGI300SetupStyleLow(ls) \
+                if (xgiCmdQueLen <= 0)  XGI300Idle;\
+                MMIO_OUT32(xgi_video_info.mmio_vbase, BR(11), ls);\
+                xgiCmdQueLen--;
+
+#define XGI300SetupStyleHigh(ls) \
+                if (xgiCmdQueLen <= 0)  XGI300Idle;\
+                MMIO_OUT32(xgi_video_info.mmio_vbase, BR(12), ls);\
+                xgiCmdQueLen--;
+
+
+
+/* ----------- XGI 310/325 series --------------- */
+
+/* Q_STATUS:
+   bit 31 = 1: All engines idle and all queues empty
+   bit 30 = 1: Hardware Queue (=HW CQ, 2D queue, 3D queue) empty
+   bit 29 = 1: 2D engine is idle
+   bit 28 = 1: 3D engine is idle
+   bit 27 = 1: HW command queue empty
+   bit 26 = 1: 2D queue empty
+   bit 25 = 1: 3D queue empty
+   bit 24 = 1: SW command queue empty
+   bits 23:16: 2D counter 3
+   bits 15:8:  2D counter 2
+   bits 7:0:   2D counter 1
+
+   Where is the command queue length (current amount of commands the queue
+   can accept) on the 310/325 series? (The current implementation is taken
+   from 300 series and certainly wrong...)
+*/
+
+/* TW: FIXME: xgiCmdQueLen is... where....? */
+#define XGI310Idle \
+  { \
+  while( (MMIO_IN16(xgi_video_info.mmio_vbase, Q_STATUS+2) & 0x8000) != 0x8000){}; \
+  while( (MMIO_IN16(xgi_video_info.mmio_vbase, Q_STATUS+2) & 0x8000) != 0x8000){}; \
+  xgiCmdQueLen=MMIO_IN16(xgi_video_info.mmio_vbase, Q_STATUS); \
+  }
+
+#define XGI310SetupSRCBase(base) \
+      if (xgiCmdQueLen <= 0)  XGI310Idle;\
+      MMIO_OUT32(xgi_video_info.mmio_vbase, SRC_ADDR, base);\
+      xgiCmdQueLen--;
+
+#define XGI310SetupSRCPitch(pitch) \
+      if (xgiCmdQueLen <= 0)  XGI310Idle;\
+      MMIO_OUT16(xgi_video_info.mmio_vbase, SRC_PITCH, pitch);\
+      xgiCmdQueLen--;
+
+#define XGI310SetupSRCXY(x,y) \
+      if (xgiCmdQueLen <= 0)  XGI310Idle;\
+      MMIO_OUT32(xgi_video_info.mmio_vbase, SRC_Y, (x)<<16 | (y) );\
+      xgiCmdQueLen--;
+
+#define XGI310SetupDSTBase(base) \
+      if (xgiCmdQueLen <= 0)  XGI310Idle;\
+      MMIO_OUT32(xgi_video_info.mmio_vbase, DST_ADDR, base);\
+      xgiCmdQueLen--;
+
+#define XGI310SetupDSTXY(x,y) \
+      if (xgiCmdQueLen <= 0)  XGI310Idle;\
+      MMIO_OUT32(xgi_video_info.mmio_vbase, DST_Y, (x)<<16 | (y) );\
+      xgiCmdQueLen--;
+
+#define XGI310SetupDSTRect(x,y) \
+      if (xgiCmdQueLen <= 0)  XGI310Idle;\
+      MMIO_OUT32(xgi_video_info.mmio_vbase, DST_PITCH, (y)<<16 | (x) );\
+      xgiCmdQueLen--;
+
+#define XGI310SetupDSTColorDepth(bpp) \
+      if (xgiCmdQueLen <= 0)  XGI310Idle;\
+      MMIO_OUT16(xgi_video_info.mmio_vbase, AGP_BASE, bpp);\
+      xgiCmdQueLen--;
+
+#define XGI310SetupRect(w,h) \
+      if (xgiCmdQueLen <= 0)  XGI310Idle;\
+      MMIO_OUT32(xgi_video_info.mmio_vbase, RECT_WIDTH, (h)<<16 | (w) );\
+      xgiCmdQueLen--;
+
+#define XGI310SetupPATFG(color) \
+      if (xgiCmdQueLen <= 0)  XGI310Idle;\
+      MMIO_OUT32(xgi_video_info.mmio_vbase, PAT_FGCOLOR, color);\
+      xgiCmdQueLen--;
+
+#define XGI310SetupPATBG(color) \
+      if (xgiCmdQueLen <= 0)  XGI310Idle;\
+      MMIO_OUT32(xgi_video_info.mmio_vbase, PAT_BGCOLOR, color);\
+      xgiCmdQueLen--;
+
+#define XGI310SetupSRCFG(color) \
+      if (xgiCmdQueLen <= 0)  XGI310Idle;\
+      MMIO_OUT32(xgi_video_info.mmio_vbase, SRC_FGCOLOR, color);\
+      xgiCmdQueLen--;
+
+#define XGI310SetupSRCBG(color) \
+      if (xgiCmdQueLen <= 0)  XGI310Idle;\
+      MMIO_OUT32(xgi_video_info.mmio_vbase, SRC_BGCOLOR, color);\
+      xgiCmdQueLen--;
+
+#define XGI310SetupSRCTrans(color) \
+      if (xgiCmdQueLen <= 1)  XGI310Idle;\
+      MMIO_OUT32(xgi_video_info.mmio_vbase, TRANS_SRC_KEY_HIGH, color);\
+      MMIO_OUT32(xgi_video_info.mmio_vbase, TRANS_SRC_KEY_LOW, color);\
+      xgiCmdQueLen -= 2;
+
+#define XGI310SetupDSTTrans(color) \
+      if (xgiCmdQueLen <= 1)  XGI310Idle;\
+      MMIO_OUT32(xgi_video_info.mmio_vbase, TRANS_DST_KEY_HIGH, color); \
+      MMIO_OUT32(xgi_video_info.mmio_vbase, TRANS_DST_KEY_LOW, color); \
+      xgiCmdQueLen -= 2;
+
+#define XGI310SetupMONOPAT(p0,p1) \
+      if (xgiCmdQueLen <= 1)  XGI310Idle;\
+      MMIO_OUT32(xgi_video_info.mmio_vbase, MONO_MASK, p0);\
+      MMIO_OUT32(xgi_video_info.mmio_vbase, MONO_MASK+4, p1);\
+      xgiCmdQueLen -= 2;
+
+#define XGI310SetupClipLT(left,top) \
+      if (xgiCmdQueLen <= 0)  XGI310Idle;\
+      MMIO_OUT32(xgi_video_info.mmio_vbase, LEFT_CLIP, ((left) & 0xFFFF) | (top)<<16 );\
+      xgiCmdQueLen--;
+
+#define XGI310SetupClipRB(right,bottom) \
+      if (xgiCmdQueLen <= 0)  XGI310Idle;\
+      MMIO_OUT32(xgi_video_info.mmio_vbase, RIGHT_CLIP, ((right) & 0xFFFF) | (bottom)<<16 );\
+      xgiCmdQueLen--;
+
+#define XGI310SetupROP(rop) \
+      xgi_video_info.CommandReg = (rop) << 8;
+
+#define XGI310SetupCMDFlag(flags) \
+      xgi_video_info.CommandReg |= (flags);
+
+#define XGI310DoCMD \
+      if (xgiCmdQueLen <= 1)  XGI310Idle;\
+      MMIO_OUT32(xgi_video_info.mmio_vbase, COMMAND_READY, xgi_video_info.CommandReg); \
+      MMIO_OUT32(xgi_video_info.mmio_vbase, FIRE_TRIGGER, 0); \
+      xgiCmdQueLen -= 2;
+
+#define XGI310SetupX0Y0(x,y) \
+      if (xgiCmdQueLen <= 0)  XGI310Idle;\
+      MMIO_OUT32(xgi_video_info.mmio_vbase, LINE_X0, (y)<<16 | (x) );\
+      xgiCmdQueLen--;
+
+#define XGI310SetupX1Y1(x,y) \
+      if (xgiCmdQueLen <= 0)  XGI310Idle;\
+      MMIO_OUT32(xgi_video_info.mmio_vbase, LINE_X1, (y)<<16 | (x) );\
+      xgiCmdQueLen--;
+
+#define XGI310SetupLineCount(c) \
+      if (xgiCmdQueLen <= 0)  XGI310Idle;\
+      MMIO_OUT16(xgi_video_info.mmio_vbase, LINE_COUNT, c);\
+      xgiCmdQueLen--;
+
+#define XGI310SetupStylePeriod(p) \
+      if (xgiCmdQueLen <= 0)  XGI310Idle;\
+      MMIO_OUT16(xgi_video_info.mmio_vbase, LINE_STYLE_PERIOD, p);\
+      xgiCmdQueLen--;
+
+#define XGI310SetupStyleLow(ls) \
+      if (xgiCmdQueLen <= 0)  XGI310Idle;\
+      MMIO_OUT32(xgi_video_info.mmio_vbase, LINE_STYLE_0, ls);\
+      xgiCmdQueLen--;
+
+#define XGI310SetupStyleHigh(ls) \
+      if (xgiCmdQueLen <= 0)  XGI310Idle;\
+      MMIO_OUT32(xgi_video_info.mmio_vbase, LINE_STYLE_1, ls);\
+      xgiCmdQueLen--;
+
+int  XGIfb_initaccel(void);
+void XGIfb_syncaccel(void);
+
+extern struct video_info xgi_video_info;
+
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,33)
+void fbcon_XGI_bmove(struct display *p, int srcy, int srcx, int dsty,
+                     int dstx, int height, int width);
+void fbcon_XGI_revc(struct display *p, int srcy, int srcx);
+void fbcon_XGI_clear8(struct vc_data *conp, struct display *p, int srcy,
+                      int srcx, int height, int width);
+void fbcon_XGI_clear16(struct vc_data *conp, struct display *p, int srcy,
+                       int srcx, int height, int width);
+void fbcon_XGI_clear32(struct vc_data *conp, struct display *p, int srcy,
+                       int srcx, int height, int width);
+#endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,34)
+extern int XGIfb_accel;
+void fbcon_XGI_fillrect(struct fb_info *info, const struct fb_fillrect *rect);
+void fbcon_XGI_copyarea(struct fb_info *info, const struct fb_copyarea *area);
+#endif
+
+#endif
diff --git a/drivers/staging/xgifb/XGI_main.h b/drivers/staging/xgifb/XGI_main.h
new file mode 100644 (file)
index 0000000..4f4171e
--- /dev/null
@@ -0,0 +1,1023 @@
+#ifndef _XGIFB_MAIN
+#define _XGIFB_MAIN
+
+
+/* ------------------- Constant Definitions ------------------------- */
+
+
+#include "XGIfb.h"
+#include "vb_struct.h"
+#include "vb_def.h"
+
+//#define LINUXBIOS   /* turn this on when compiling for LINUXBIOS */
+#define AGPOFF     /* default is turn off AGP */
+
+#define XGIFAIL(x) do { printk(x "\n"); return -EINVAL; } while(0)
+
+#define VER_MAJOR                 0
+#define VER_MINOR                 8
+#define VER_LEVEL                 1
+
+#define DRIVER_DESC  "XGI Volari Frame Buffer Module Version 0.8.1"
+
+#ifndef PCI_VENDOR_ID_XG
+#define PCI_VENDOR_ID_XG          0x18CA
+#endif
+
+#ifndef PCI_DEVICE_ID_XG_40
+#define PCI_DEVICE_ID_XG_40      0x040
+#endif
+#ifndef PCI_DEVICE_ID_XG_41
+#define PCI_DEVICE_ID_XG_41      0x041
+#endif
+#ifndef PCI_DEVICE_ID_XG_42
+#define PCI_DEVICE_ID_XG_42      0x042
+#endif
+#ifndef PCI_DEVICE_ID_XG_20
+#define PCI_DEVICE_ID_XG_20      0x020
+#endif
+#ifndef PCI_DEVICE_ID_XG_27
+#define PCI_DEVICE_ID_XG_27      0x027
+#endif
+
+
+
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,8)
+#define XGI_IOTYPE1 void __iomem
+#define XGI_IOTYPE2 __iomem
+#define XGIINITSTATIC static
+#else
+#define XGI_IOTYPE1 unsigned char
+#define XGI_IOTYPE2
+#define XGIINITSTATIC
+#endif
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+static struct pci_device_id __devinitdata xgifb_pci_table[] = {
+
+       { PCI_VENDOR_ID_XG, PCI_DEVICE_ID_XG_20, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+       { PCI_VENDOR_ID_XG, PCI_DEVICE_ID_XG_27, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1},
+       { PCI_VENDOR_ID_XG, PCI_DEVICE_ID_XG_40, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2},
+       { PCI_VENDOR_ID_XG, PCI_DEVICE_ID_XG_42, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 3},
+       { 0 }
+};
+
+MODULE_DEVICE_TABLE(pci, xgifb_pci_table);
+#endif
+/* To be included in fb.h */
+#ifndef FB_ACCEL_XGI_GLAMOUR_2
+#define FB_ACCEL_XGI_GLAMOUR_2  40     /* XGI 315, 650, 740            */
+#endif
+#ifndef FB_ACCEL_XGI_XABRE
+#define FB_ACCEL_XGI_XABRE      41     /* XGI 330 ("Xabre")            */
+#endif
+
+#define MAX_ROM_SCAN              0x10000
+
+#define HW_CURSOR_CAP             0x80
+#define TURBO_QUEUE_CAP           0x40
+#define AGP_CMD_QUEUE_CAP         0x20
+#define VM_CMD_QUEUE_CAP          0x10
+#define MMIO_CMD_QUEUE_CAP        0x08
+
+
+
+/* For 315 series */
+
+#define COMMAND_QUEUE_AREA_SIZE   0x80000 /* 512K */
+#define COMMAND_QUEUE_THRESHOLD   0x1F
+
+
+/* TW */
+#define HW_CURSOR_AREA_SIZE_315   0x4000  /* 16K */
+#define HW_CURSOR_AREA_SIZE_300   0x1000  /* 4K */
+
+#define OH_ALLOC_SIZE             4000
+#define SENTINEL                  0x7fffffff
+
+#define SEQ_ADR                   0x14
+#define SEQ_DATA                  0x15
+#define DAC_ADR                   0x18
+#define DAC_DATA                  0x19
+#define CRTC_ADR                  0x24
+#define CRTC_DATA                 0x25
+#define DAC2_ADR                  (0x16-0x30)
+#define DAC2_DATA                 (0x17-0x30)
+#define VB_PART1_ADR              (0x04-0x30)
+#define VB_PART1_DATA             (0x05-0x30)
+#define VB_PART2_ADR              (0x10-0x30)
+#define VB_PART2_DATA             (0x11-0x30)
+#define VB_PART3_ADR              (0x12-0x30)
+#define VB_PART3_DATA             (0x13-0x30)
+#define VB_PART4_ADR              (0x14-0x30)
+#define VB_PART4_DATA             (0x15-0x30)
+
+#define XGISR                    XGI_Pr.P3c4
+#define XGICR                     XGI_Pr.P3d4
+#define XGIDACA                   XGI_Pr.P3c8
+#define XGIDACD                   XGI_Pr.P3c9
+#define XGIPART1                  XGI_Pr.Part1Port
+#define XGIPART2                  XGI_Pr.Part2Port
+#define XGIPART3                  XGI_Pr.Part3Port
+#define XGIPART4                  XGI_Pr.Part4Port
+#define XGIPART5                  XGI_Pr.Part5Port
+#define XGIDAC2A                  XGIPART5
+#define XGIDAC2D                  (XGIPART5 + 1)
+#define XGIMISCR                  (XGI_Pr.RelIO + 0x1c)
+#define XGIINPSTAT               (XGI_Pr.RelIO + 0x2a)
+
+#define IND_XGI_PASSWORD          0x05  /* SRs */
+#define IND_XGI_COLOR_MODE        0x06
+#define IND_XGI_RAMDAC_CONTROL    0x07
+#define IND_XGI_DRAM_SIZE         0x14
+#define IND_XGI_SCRATCH_REG_16    0x16
+#define IND_XGI_SCRATCH_REG_17    0x17
+#define IND_XGI_SCRATCH_REG_1A    0x1A
+#define IND_XGI_MODULE_ENABLE     0x1E
+#define IND_XGI_PCI_ADDRESS_SET   0x20
+#define IND_XGI_TURBOQUEUE_ADR    0x26
+#define IND_XGI_TURBOQUEUE_SET    0x27
+#define IND_XGI_POWER_ON_TRAP     0x38
+#define IND_XGI_POWER_ON_TRAP2    0x39
+#define IND_XGI_CMDQUEUE_SET      0x26
+#define IND_XGI_CMDQUEUE_THRESHOLD  0x27
+
+#define IND_XGI_SCRATCH_REG_CR30  0x30  /* CRs */
+#define IND_XGI_SCRATCH_REG_CR31  0x31
+#define IND_XGI_SCRATCH_REG_CR32  0x32
+#define IND_XGI_SCRATCH_REG_CR33  0x33
+#define IND_XGI_LCD_PANEL         0x36
+#define IND_XGI_SCRATCH_REG_CR37  0x37
+#define IND_XGI_AGP_IO_PAD        0x48
+
+#define IND_BRI_DRAM_STATUS       0x63 /* PCI config memory size offset */
+
+#define MMIO_QUEUE_PHYBASE        0x85C0
+#define MMIO_QUEUE_WRITEPORT      0x85C4
+#define MMIO_QUEUE_READPORT       0x85C8
+
+#define IND_XGI_CRT2_WRITE_ENABLE_300 0x24
+#define IND_XGI_CRT2_WRITE_ENABLE_315 0x2F
+
+#define XGI_PASSWORD              0x86  /* SR05 */
+#define XGI_INTERLACED_MODE       0x20  /* SR06 */
+#define XGI_8BPP_COLOR_MODE       0x0
+#define XGI_15BPP_COLOR_MODE      0x1
+#define XGI_16BPP_COLOR_MODE      0x2
+#define XGI_32BPP_COLOR_MODE      0x4
+
+#define XGI_DRAM_SIZE_MASK     0xF0  /*SR14 */
+#define XGI_DRAM_SIZE_1MB      0x00
+#define XGI_DRAM_SIZE_2MB      0x01
+#define XGI_DRAM_SIZE_4MB      0x02
+#define XGI_DRAM_SIZE_8MB      0x03
+#define XGI_DRAM_SIZE_16MB     0x04
+#define XGI_DRAM_SIZE_32MB     0x05
+#define XGI_DRAM_SIZE_64MB     0x06
+#define XGI_DRAM_SIZE_128MB    0x07
+#define XGI_DRAM_SIZE_256MB    0x08
+#define XGI_DATA_BUS_MASK      0x02
+#define XGI_DATA_BUS_64        0x00
+#define XGI_DATA_BUS_128       0x01
+#define XGI_DUAL_CHANNEL_MASK  0x0C
+#define XGI_SINGLE_CHANNEL_1_RANK      0x0
+#define XGI_SINGLE_CHANNEL_2_RANK      0x1
+#define XGI_ASYM_DDR                   0x02
+#define XGI_DUAL_CHANNEL_1_RANK        0x3
+
+#define XGI550_DRAM_SIZE_MASK     0x3F  /* 550/650/740 SR14 */
+#define XGI550_DRAM_SIZE_4MB      0x00
+#define XGI550_DRAM_SIZE_8MB      0x01
+#define XGI550_DRAM_SIZE_16MB     0x03
+#define XGI550_DRAM_SIZE_24MB     0x05
+#define XGI550_DRAM_SIZE_32MB     0x07
+#define XGI550_DRAM_SIZE_64MB     0x0F
+#define XGI550_DRAM_SIZE_96MB     0x17
+#define XGI550_DRAM_SIZE_128MB    0x1F
+#define XGI550_DRAM_SIZE_256MB    0x3F
+
+#define XGI_SCRATCH_REG_1A_MASK   0x10
+
+#define XGI_ENABLE_2D             0x40  /* SR1E */
+
+#define XGI_MEM_MAP_IO_ENABLE     0x01  /* SR20 */
+#define XGI_PCI_ADDR_ENABLE       0x80
+
+#define XGI_AGP_CMDQUEUE_ENABLE   0x80  /* 315/650/740 SR26 */
+#define XGI_VRAM_CMDQUEUE_ENABLE  0x40
+#define XGI_MMIO_CMD_ENABLE       0x20
+#define XGI_CMD_QUEUE_SIZE_512k   0x00
+#define XGI_CMD_QUEUE_SIZE_1M     0x04
+#define XGI_CMD_QUEUE_SIZE_2M     0x08
+#define XGI_CMD_QUEUE_SIZE_4M     0x0C
+#define XGI_CMD_QUEUE_RESET       0x01
+#define XGI_CMD_AUTO_CORR        0x02
+
+#define XGI_SIMULTANEOUS_VIEW_ENABLE  0x01  /* CR30 */
+#define XGI_MODE_SELECT_CRT2      0x02
+#define XGI_VB_OUTPUT_COMPOSITE   0x04
+#define XGI_VB_OUTPUT_SVIDEO      0x08
+#define XGI_VB_OUTPUT_SCART       0x10
+#define XGI_VB_OUTPUT_LCD         0x20
+#define XGI_VB_OUTPUT_CRT2        0x40
+#define XGI_VB_OUTPUT_HIVISION    0x80
+
+#define XGI_VB_OUTPUT_DISABLE     0x20  /* CR31 */
+#define XGI_DRIVER_MODE           0x40
+
+#define XGI_VB_COMPOSITE          0x01  /* CR32 */
+#define XGI_VB_SVIDEO             0x02
+#define XGI_VB_SCART              0x04
+#define XGI_VB_LCD                0x08
+#define XGI_VB_CRT2               0x10
+#define XGI_CRT1                  0x20
+#define XGI_VB_HIVISION           0x40
+#define XGI_VB_YPBPR                0x80
+#define XGI_VB_TV                 (XGI_VB_COMPOSITE | XGI_VB_SVIDEO | \
+                                   XGI_VB_SCART | XGI_VB_HIVISION|XGI_VB_YPBPR)
+
+#define XGI_EXTERNAL_CHIP_MASK            0x0E  /* CR37 */
+#define XGI_EXTERNAL_CHIP_XGI301           0x01  /* in CR37 << 1 ! */
+#define XGI_EXTERNAL_CHIP_LVDS             0x02  /* in CR37 << 1 ! */
+#define XGI_EXTERNAL_CHIP_TRUMPION         0x03  /* in CR37 << 1 ! */
+#define XGI_EXTERNAL_CHIP_LVDS_CHRONTEL    0x04  /* in CR37 << 1 ! */
+#define XGI_EXTERNAL_CHIP_CHRONTEL         0x05  /* in CR37 << 1 ! */
+#define XGI310_EXTERNAL_CHIP_LVDS          0x02  /* in CR37 << 1 ! */
+#define XGI310_EXTERNAL_CHIP_LVDS_CHRONTEL 0x03  /* in CR37 << 1 ! */
+
+#define XGI_AGP_2X                0x20  /* CR48 */
+
+#define BRI_DRAM_SIZE_MASK        0x70  /* PCI bridge config data */
+#define BRI_DRAM_SIZE_2MB         0x00
+#define BRI_DRAM_SIZE_4MB         0x01
+#define BRI_DRAM_SIZE_8MB         0x02
+#define BRI_DRAM_SIZE_16MB        0x03
+#define BRI_DRAM_SIZE_32MB        0x04
+#define BRI_DRAM_SIZE_64MB        0x05
+
+#define HW_DEVICE_EXTENSION      XGI_HW_DEVICE_INFO
+#define PHW_DEVICE_EXTENSION      PXGI_HW_DEVICE_INFO
+
+#define SR_BUFFER_SIZE            5
+#define CR_BUFFER_SIZE            5
+
+/* Useful macros */
+#define inXGIREG(base)          inb(base)
+#define outXGIREG(base,val)     outb(val,base)
+#define orXGIREG(base,val)      do { \
+                                  unsigned char __Temp = inb(base); \
+                                  outXGIREG(base, __Temp | (val)); \
+                                } while (0)
+#define andXGIREG(base,val)     do { \
+                                  unsigned char __Temp = inb(base); \
+                                  outXGIREG(base, __Temp & (val)); \
+                                } while (0)
+#define inXGIIDXREG(base,idx,var)   do { \
+                                      outb(idx,base); var=inb((base)+1); \
+                                    } while (0)
+#define outXGIIDXREG(base,idx,val)  do { \
+                                      outb(idx,base); outb((val),(base)+1); \
+                                    } while (0)
+#define orXGIIDXREG(base,idx,val)   do { \
+                                      unsigned char __Temp; \
+                                      outb(idx,base);   \
+                                      __Temp = inb((base)+1)|(val); \
+                                      outXGIIDXREG(base,idx,__Temp); \
+                                    } while (0)
+#define andXGIIDXREG(base,idx,and)  do { \
+                                      unsigned char __Temp; \
+                                      outb(idx,base);   \
+                                      __Temp = inb((base)+1)&(and); \
+                                      outXGIIDXREG(base,idx,__Temp); \
+                                    } while (0)
+#define setXGIIDXREG(base,idx,and,or)   do { \
+                                          unsigned char __Temp; \
+                                          outb(idx,base);   \
+                                          __Temp = (inb((base)+1)&(and))|(or); \
+                                          outXGIIDXREG(base,idx,__Temp); \
+                                        } while (0)
+
+/* ------------------- Global Variables ----------------------------- */
+
+/* Fbcon variables */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+static struct fb_info* fb_info;
+#else
+static struct fb_info XGI_fb_info;
+#endif
+
+
+static int    video_type = FB_TYPE_PACKED_PIXELS;
+
+static struct fb_var_screeninfo default_var = {
+       .xres           = 0,
+       .yres           = 0,
+       .xres_virtual   = 0,
+       .yres_virtual   = 0,
+       .xoffset        = 0,
+       .yoffset        = 0,
+       .bits_per_pixel = 0,
+       .grayscale      = 0,
+       .red            = {0, 8, 0},
+       .green          = {0, 8, 0},
+       .blue           = {0, 8, 0},
+       .transp         = {0, 0, 0},
+       .nonstd         = 0,
+       .activate       = FB_ACTIVATE_NOW,
+       .height         = -1,
+       .width          = -1,
+       .accel_flags    = 0,
+       .pixclock       = 0,
+       .left_margin    = 0,
+       .right_margin   = 0,
+       .upper_margin   = 0,
+       .lower_margin   = 0,
+       .hsync_len      = 0,
+       .vsync_len      = 0,
+       .sync           = 0,
+       .vmode          = FB_VMODE_NONINTERLACED,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+       .reserved       = {0, 0, 0, 0, 0, 0}
+#endif
+};
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+static struct fb_fix_screeninfo XGIfb_fix = {
+       .id             = "XGI",
+       .type           = FB_TYPE_PACKED_PIXELS,
+       .xpanstep       = 1,
+       .ypanstep       = 1,
+};
+static char myid[20];
+static u32 pseudo_palette[17];
+#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+static struct display XGI_disp;
+
+static struct display_switch XGIfb_sw;
+
+static struct {
+       u16 blue, green, red, pad;
+} XGI_palette[256];
+
+static union {
+#ifdef FBCON_HAS_CFB16
+       u16 cfb16[16];
+#endif
+#ifdef FBCON_HAS_CFB32
+       u32 cfb32[16];
+#endif
+} XGI_fbcon_cmap;
+
+static int XGIfb_inverse = 0;
+#endif
+
+/* display status */
+static int XGIfb_off = 0;
+static int XGIfb_crt1off = 0;
+static int XGIfb_forcecrt1 = -1;
+static int XGIvga_enabled = 0;
+static int XGIfb_userom = 0;
+//static int XGIfb_useoem = -1;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+static int currcon = 0;
+#endif
+
+/* global flags */
+static int XGIfb_registered;
+static int XGIfb_tvmode = 0;
+static int XGIfb_mem = 0;
+static int XGIfb_pdc = 0;
+static int enable_dstn = 0;
+static int XGIfb_ypan = -1;
+
+
+int       XGIfb_accel = 0;
+
+
+static int XGIfb_hwcursor_size = 0;
+static int XGIfb_CRT2_write_enable = 0;
+
+int XGIfb_crt2type  = -1;      /* TW: CRT2 type (for overriding autodetection) */
+int XGIfb_tvplug    = -1;      /* PR: Tv plug type (for overriding autodetection) */
+
+int XGIfb_queuemode = -1;      /* TW: Use MMIO queue mode by default (310/325 series only) */
+
+unsigned char XGIfb_detectedpdc = 0;
+
+unsigned char XGIfb_detectedlcda = 0xff;
+
+
+
+
+/* TW: For ioctl XGIFB_GET_INFO */
+/* XGIfb_info XGIfbinfo; */
+
+/* TW: Hardware extension; contains data on hardware */
+HW_DEVICE_EXTENSION XGIhw_ext;
+
+/* TW: XGI private structure */
+VB_DEVICE_INFO  XGI_Pr;
+
+/* card parameters */
+static unsigned long XGIfb_mmio_size = 0;
+static u8            XGIfb_caps = 0;
+
+typedef enum _XGI_CMDTYPE {
+       MMIO_CMD = 0,
+       AGP_CMD_QUEUE,
+       VM_CMD_QUEUE,
+} XGI_CMDTYPE;
+
+#define MD_XGI300 1
+#define MD_XGI315 2
+
+/* mode table */
+/* NOT const - will be patched for 1280x960 mode number chaos reasons */
+struct _XGIbios_mode {
+       char name[15];
+       u8 mode_no;
+       u16 vesa_mode_no_1;  /* "XGI defined" VESA mode number */
+       u16 vesa_mode_no_2;  /* Real VESA mode numbers */
+       u16 xres;
+       u16 yres;
+       u16 bpp;
+       u16 rate_idx;
+       u16 cols;
+       u16 rows;
+       u8  chipset;
+} XGIbios_mode[] = {
+#define MODE_INDEX_NONE           0  /* TW: index for mode=none */
+       {"none",         0xFF, 0x0000, 0x0000,    0,    0,  0, 0,   0,  0, MD_XGI300|MD_XGI315},  /* TW: for mode "none" */
+       {"320x240x16",   0x56, 0x0000, 0x0000,  320,  240, 16, 1,  40, 15,           MD_XGI315},
+       {"320x480x8",    0x5A, 0x0000, 0x0000,  320,  480,  8, 1,  40, 30,           MD_XGI315},  /* TW: FSTN */
+       {"320x480x16",   0x5B, 0x0000, 0x0000,  320,  480, 16, 1,  40, 30,           MD_XGI315},  /* TW: FSTN */
+       {"640x480x8",    0x2E, 0x0101, 0x0101,  640,  480,  8, 1,  80, 30, MD_XGI300|MD_XGI315},
+       {"640x480x16",   0x44, 0x0111, 0x0111,  640,  480, 16, 1,  80, 30, MD_XGI300|MD_XGI315},
+       {"640x480x24",   0x62, 0x013a, 0x0112,  640,  480, 32, 1,  80, 30, MD_XGI300|MD_XGI315},  /* TW: That's for people who mix up color- and fb depth */
+       {"640x480x32",   0x62, 0x013a, 0x0112,  640,  480, 32, 1,  80, 30, MD_XGI300|MD_XGI315},
+       {"720x480x8",    0x31, 0x0000, 0x0000,  720,  480,  8, 1,  90, 30, MD_XGI300|MD_XGI315},
+       {"720x480x16",   0x33, 0x0000, 0x0000,  720,  480, 16, 1,  90, 30, MD_XGI300|MD_XGI315},
+       {"720x480x24",   0x35, 0x0000, 0x0000,  720,  480, 32, 1,  90, 30, MD_XGI300|MD_XGI315},
+       {"720x480x32",   0x35, 0x0000, 0x0000,  720,  480, 32, 1,  90, 30, MD_XGI300|MD_XGI315},
+       {"720x576x8",    0x32, 0x0000, 0x0000,  720,  576,  8, 1,  90, 36, MD_XGI300|MD_XGI315},
+       {"720x576x16",   0x34, 0x0000, 0x0000,  720,  576, 16, 1,  90, 36, MD_XGI300|MD_XGI315},
+       {"720x576x24",   0x36, 0x0000, 0x0000,  720,  576, 32, 1,  90, 36, MD_XGI300|MD_XGI315},
+       {"720x576x32",   0x36, 0x0000, 0x0000,  720,  576, 32, 1,  90, 36, MD_XGI300|MD_XGI315},
+       {"800x480x8",    0x70, 0x0000, 0x0000,  800,  480,  8, 1, 100, 30, MD_XGI300|MD_XGI315},
+       {"800x480x16",   0x7a, 0x0000, 0x0000,  800,  480, 16, 1, 100, 30, MD_XGI300|MD_XGI315},
+       {"800x480x24",   0x76, 0x0000, 0x0000,  800,  480, 32, 1, 100, 30, MD_XGI300|MD_XGI315},
+       {"800x480x32",   0x76, 0x0000, 0x0000,  800,  480, 32, 1, 100, 30, MD_XGI300|MD_XGI315},
+#define DEFAULT_MODE              21 /* TW: index for 800x600x8 */
+#define DEFAULT_LCDMODE           21 /* TW: index for 800x600x8 */
+#define DEFAULT_TVMODE            21 /* TW: index for 800x600x8 */
+       {"800x600x8",    0x30, 0x0103, 0x0103,  800,  600,  8, 1, 100, 37, MD_XGI300|MD_XGI315},
+       {"800x600x16",   0x47, 0x0114, 0x0114,  800,  600, 16, 1, 100, 37, MD_XGI300|MD_XGI315},
+       {"800x600x24",   0x63, 0x013b, 0x0115,  800,  600, 32, 1, 100, 37, MD_XGI300|MD_XGI315},
+       {"800x600x32",   0x63, 0x013b, 0x0115,  800,  600, 32, 1, 100, 37, MD_XGI300|MD_XGI315},
+       {"1024x576x8",   0x71, 0x0000, 0x0000, 1024,  576,  8, 1, 128, 36, MD_XGI300|MD_XGI315},
+       {"1024x576x16",  0x74, 0x0000, 0x0000, 1024,  576, 16, 1, 128, 36, MD_XGI300|MD_XGI315},
+       {"1024x576x24",  0x77, 0x0000, 0x0000, 1024,  576, 32, 1, 128, 36, MD_XGI300|MD_XGI315},
+       {"1024x576x32",  0x77, 0x0000, 0x0000, 1024,  576, 32, 1, 128, 36, MD_XGI300|MD_XGI315},
+       {"1024x600x8",   0x20, 0x0000, 0x0000, 1024,  600,  8, 1, 128, 37, MD_XGI300          },  /* TW: 300 series only */
+       {"1024x600x16",  0x21, 0x0000, 0x0000, 1024,  600, 16, 1, 128, 37, MD_XGI300          },
+       {"1024x600x24",  0x22, 0x0000, 0x0000, 1024,  600, 32, 1, 128, 37, MD_XGI300          },
+       {"1024x600x32",  0x22, 0x0000, 0x0000, 1024,  600, 32, 1, 128, 37, MD_XGI300          },
+       {"1024x768x8",   0x38, 0x0105, 0x0105, 1024,  768,  8, 1, 128, 48, MD_XGI300|MD_XGI315},
+       {"1024x768x16",  0x4A, 0x0117, 0x0117, 1024,  768, 16, 1, 128, 48, MD_XGI300|MD_XGI315},
+       {"1024x768x24",  0x64, 0x013c, 0x0118, 1024,  768, 32, 1, 128, 48, MD_XGI300|MD_XGI315},
+       {"1024x768x32",  0x64, 0x013c, 0x0118, 1024,  768, 32, 1, 128, 48, MD_XGI300|MD_XGI315},
+       {"1152x768x8",   0x23, 0x0000, 0x0000, 1152,  768,  8, 1, 144, 48, MD_XGI300          },  /* TW: 300 series only */
+       {"1152x768x16",  0x24, 0x0000, 0x0000, 1152,  768, 16, 1, 144, 48, MD_XGI300          },
+       {"1152x768x24",  0x25, 0x0000, 0x0000, 1152,  768, 32, 1, 144, 48, MD_XGI300          },
+       {"1152x768x32",  0x25, 0x0000, 0x0000, 1152,  768, 32, 1, 144, 48, MD_XGI300          },
+       {"1280x720x8",   0x79, 0x0000, 0x0000, 1280,  720,  8, 1, 160, 45, MD_XGI300|MD_XGI315},
+       {"1280x720x16",  0x75, 0x0000, 0x0000, 1280,  720, 16, 1, 160, 45, MD_XGI300|MD_XGI315},
+       {"1280x720x24",  0x78, 0x0000, 0x0000, 1280,  720, 32, 1, 160, 45, MD_XGI300|MD_XGI315},
+       {"1280x720x32",  0x78, 0x0000, 0x0000, 1280,  720, 32, 1, 160, 45, MD_XGI300|MD_XGI315},
+       {"1280x768x8",   0x23, 0x0000, 0x0000, 1280,  768,  8, 1, 160, 48,           MD_XGI315},  /* TW: 310/325 series only */
+       {"1280x768x16",  0x24, 0x0000, 0x0000, 1280,  768, 16, 1, 160, 48,           MD_XGI315},
+       {"1280x768x24",  0x25, 0x0000, 0x0000, 1280,  768, 32, 1, 160, 48,           MD_XGI315},
+       {"1280x768x32",  0x25, 0x0000, 0x0000, 1280,  768, 32, 1, 160, 48,           MD_XGI315},
+#define MODEINDEX_1280x960 48
+       {"1280x960x8",   0x7C, 0x0000, 0x0000, 1280,  960,  8, 1, 160, 60, MD_XGI300|MD_XGI315},  /* TW: Modenumbers being patched */
+       {"1280x960x16",  0x7D, 0x0000, 0x0000, 1280,  960, 16, 1, 160, 60, MD_XGI300|MD_XGI315},
+       {"1280x960x24",  0x7E, 0x0000, 0x0000, 1280,  960, 32, 1, 160, 60, MD_XGI300|MD_XGI315},
+       {"1280x960x32",  0x7E, 0x0000, 0x0000, 1280,  960, 32, 1, 160, 60, MD_XGI300|MD_XGI315},
+       {"1280x1024x8",  0x3A, 0x0107, 0x0107, 1280, 1024,  8, 1, 160, 64, MD_XGI300|MD_XGI315},
+       {"1280x1024x16", 0x4D, 0x011a, 0x011a, 1280, 1024, 16, 1, 160, 64, MD_XGI300|MD_XGI315},
+       {"1280x1024x24", 0x65, 0x013d, 0x011b, 1280, 1024, 32, 1, 160, 64, MD_XGI300|MD_XGI315},
+       {"1280x1024x32", 0x65, 0x013d, 0x011b, 1280, 1024, 32, 1, 160, 64, MD_XGI300|MD_XGI315},
+       {"1400x1050x8",  0x26, 0x0000, 0x0000, 1400, 1050,  8, 1, 175, 65,           MD_XGI315},  /* TW: 310/325 series only */
+       {"1400x1050x16", 0x27, 0x0000, 0x0000, 1400, 1050, 16, 1, 175, 65,           MD_XGI315},
+       {"1400x1050x24", 0x28, 0x0000, 0x0000, 1400, 1050, 32, 1, 175, 65,           MD_XGI315},
+       {"1400x1050x32", 0x28, 0x0000, 0x0000, 1400, 1050, 32, 1, 175, 65,           MD_XGI315},
+       {"1600x1200x8",  0x3C, 0x0130, 0x011c, 1600, 1200,  8, 1, 200, 75, MD_XGI300|MD_XGI315},
+       {"1600x1200x16", 0x3D, 0x0131, 0x011e, 1600, 1200, 16, 1, 200, 75, MD_XGI300|MD_XGI315},
+       {"1600x1200x24", 0x66, 0x013e, 0x011f, 1600, 1200, 32, 1, 200, 75, MD_XGI300|MD_XGI315},
+       {"1600x1200x32", 0x66, 0x013e, 0x011f, 1600, 1200, 32, 1, 200, 75, MD_XGI300|MD_XGI315},
+       {"1920x1440x8",  0x68, 0x013f, 0x0000, 1920, 1440,  8, 1, 240, 75, MD_XGI300|MD_XGI315},
+       {"1920x1440x16", 0x69, 0x0140, 0x0000, 1920, 1440, 16, 1, 240, 75, MD_XGI300|MD_XGI315},
+       {"1920x1440x24", 0x6B, 0x0141, 0x0000, 1920, 1440, 32, 1, 240, 75, MD_XGI300|MD_XGI315},
+       {"1920x1440x32", 0x6B, 0x0141, 0x0000, 1920, 1440, 32, 1, 240, 75, MD_XGI300|MD_XGI315},
+       {"2048x1536x8",  0x6c, 0x0000, 0x0000, 2048, 1536,  8, 1, 256, 96,           MD_XGI315},  /* TW: 310/325 series only */
+       {"2048x1536x16", 0x6d, 0x0000, 0x0000, 2048, 1536, 16, 1, 256, 96,           MD_XGI315},
+       {"2048x1536x24", 0x6e, 0x0000, 0x0000, 2048, 1536, 32, 1, 256, 96,           MD_XGI315},
+       {"2048x1536x32", 0x6e, 0x0000, 0x0000, 2048, 1536, 32, 1, 256, 96,           MD_XGI315},
+       {"\0", 0x00, 0, 0, 0, 0, 0, 0, 0}
+};
+
+/* mode-related variables */
+#ifdef MODULE
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+static int xgifb_mode_idx = 1;
+#else
+static int XGIfb_mode_idx = MODE_INDEX_NONE;  /* Don't use a mode by default if we are a module */
+#endif
+#else
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+static int xgifb_mode_idx = -1;               /* Use a default mode if we are inside the kernel */
+#else
+static int XGIfb_mode_idx = -1;
+#endif
+#endif
+u8  XGIfb_mode_no  = 0;
+u8  XGIfb_rate_idx = 0;
+
+/* TW: CR36 evaluation */
+const USHORT XGI300paneltype[] =
+    { LCD_UNKNOWN,   LCD_800x600,  LCD_1024x768,  LCD_1280x1024,
+      LCD_1280x960,  LCD_640x480,  LCD_1024x600,  LCD_1152x768,
+       LCD_1024x768, LCD_1024x768,  LCD_1024x768,
+      LCD_1024x768,  LCD_1024x768, LCD_1024x768,  LCD_1024x768 };
+
+const USHORT XGI310paneltype[] =
+    { LCD_UNKNOWN,   LCD_800x600,  LCD_1024x768,  LCD_1280x1024,
+      LCD_640x480,   LCD_1024x600, LCD_1152x864,  LCD_1280x960,
+      LCD_1152x768,  LCD_1400x1050,LCD_1280x768,  LCD_1600x1200,
+      LCD_1024x768, LCD_1024x768,  LCD_1024x768 };
+
+static const struct _XGI_crt2type {
+       char name[10];
+       int type_no;
+       int tvplug_no;
+} XGI_crt2type[] = {
+       {"NONE",        0,              -1},
+       {"LCD",         DISPTYPE_LCD,   -1},
+       {"TV",          DISPTYPE_TV,    -1},
+       {"VGA",         DISPTYPE_CRT2,  -1},
+       {"SVIDEO",      DISPTYPE_TV,    TVPLUG_SVIDEO},
+       {"COMPOSITE",   DISPTYPE_TV,    TVPLUG_COMPOSITE},
+       {"SCART",       DISPTYPE_TV,    TVPLUG_SCART},
+       {"none",        0,              -1},
+       {"lcd",         DISPTYPE_LCD,   -1},
+       {"tv",          DISPTYPE_TV,    -1},
+       {"vga",         DISPTYPE_CRT2,  -1},
+       {"svideo",      DISPTYPE_TV,    TVPLUG_SVIDEO},
+       {"composite",   DISPTYPE_TV,    TVPLUG_COMPOSITE},
+       {"scart",       DISPTYPE_TV,    TVPLUG_SCART},
+       {"\0",          -1,             -1}
+};
+
+/* Queue mode selection for 310 series */
+static const struct _XGI_queuemode {
+       char name[6];
+       int type_no;
+} XGI_queuemode[] = {
+       {"AGP",         AGP_CMD_QUEUE},
+       {"VRAM",        VM_CMD_QUEUE},
+       {"MMIO",        MMIO_CMD},
+       {"agp",         AGP_CMD_QUEUE},
+       {"vram",        VM_CMD_QUEUE},
+       {"mmio",        MMIO_CMD},
+       {"\0",          -1}
+};
+
+/* TV standard */
+static const struct _XGI_tvtype {
+       char name[6];
+       int type_no;
+} XGI_tvtype[] = {
+       {"PAL",         1},
+       {"NTSC",        2},
+       {"pal",         1},
+       {"ntsc",        2},
+       {"\0",          -1}
+};
+
+static const struct _XGI_vrate {
+       u16 idx;
+       u16 xres;
+       u16 yres;
+       u16 refresh;
+} XGIfb_vrate[] = {
+       {1,  640,  480, 60}, {2,  640,  480,  72}, {3, 640,   480,  75}, {4,  640, 480,  85},
+       {5,  640,  480,100}, {6,  640,  480, 120}, {7, 640,   480, 160}, {8,  640, 480, 200},
+       {1,  720,  480, 60},
+       {1,  720,  576, 58},
+       {1,  800,  480, 60}, {2,  800,  480,  75}, {3, 800,   480,  85},
+        {1,  800,  600,  60}, {2, 800,   600,  72}, {3,  800, 600,  75},
+       {4,  800,  600, 85}, {5,  800,  600, 100}, {6, 800,   600, 120}, {7,  800, 600, 160},
+       {1, 1024,  768,  60}, {2, 1024,  768,  70}, {3, 1024, 768,  75},
+       {4, 1024,  768, 85}, {5, 1024,  768, 100}, {6, 1024,  768, 120},
+       {1, 1024,  576, 60}, {2, 1024,  576,  75}, {3, 1024,  576,  85},
+       {1, 1024,  600, 60},
+       {1, 1152,  768, 60},
+       {1, 1280,  720, 60}, {2, 1280,  720,  75}, {3, 1280,  720,  85},
+       {1, 1280,  768, 60},
+        {1, 1280, 1024,  60}, {2, 1280, 1024,  75}, {3, 1280, 1024,  85},
+       {1, 1280,  960, 70},
+       {1, 1400, 1050, 60},
+       {1, 1600, 1200, 60}, {2, 1600, 1200,  65}, {3, 1600, 1200,  70}, {4, 1600, 1200,  75},
+       {5, 1600, 1200, 85}, {6, 1600, 1200, 100}, {7, 1600, 1200, 120},
+       {1, 1920, 1440, 60}, {2, 1920, 1440,  65}, {3, 1920, 1440,  70}, {4, 1920, 1440,  75},
+       {5, 1920, 1440, 85}, {6, 1920, 1440, 100},
+       {1, 2048, 1536, 60}, {2, 2048, 1536,  65}, {3, 2048, 1536,  70}, {4, 2048, 1536,  75},
+       {5, 2048, 1536, 85},
+       {0, 0, 0, 0}
+};
+
+static const struct _chswtable {
+    int subsysVendor;
+    int subsysCard;
+    char *vendorName;
+    char *cardName;
+} mychswtable[] = {
+        { 0x1631, 0x1002, "Mitachi", "0x1002" },
+       { 0,      0,      ""       , ""       }
+};
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+/* Offscreen layout */
+typedef struct _XGI_GLYINFO {
+       unsigned char ch;
+       int fontwidth;
+       int fontheight;
+       u8 gmask[72];
+       int ngmask;
+} XGI_GLYINFO;
+#endif
+
+typedef struct _XGI_OH {
+       struct _XGI_OH *poh_next;
+       struct _XGI_OH *poh_prev;
+       unsigned long offset;
+       unsigned long size;
+} XGI_OH;
+
+typedef struct _XGI_OHALLOC {
+       struct _XGI_OHALLOC *poha_next;
+       XGI_OH aoh[1];
+} XGI_OHALLOC;
+
+typedef struct _XGI_HEAP {
+       XGI_OH oh_free;
+       XGI_OH oh_used;
+       XGI_OH *poh_freelist;
+       XGI_OHALLOC *poha_chain;
+       unsigned long max_freesize;
+} XGI_HEAP;
+
+static unsigned long XGIfb_hwcursor_vbase;
+
+static unsigned long XGIfb_heap_start;
+static unsigned long XGIfb_heap_end;
+static unsigned long XGIfb_heap_size;
+static XGI_HEAP      XGIfb_heap;
+
+// Eden Chen
+static const struct _XGI_TV_filter {
+       u8 filter[9][4];
+} XGI_TV_filter[] = {
+       { {{0x00,0x00,0x00,0x40},  /* NTSCFilter_0 */
+          {0x00,0xE0,0x10,0x60},
+          {0x00,0xEE,0x10,0x44},
+          {0x00,0xF4,0x10,0x38},
+          {0xF8,0xF4,0x18,0x38},
+          {0xFC,0xFB,0x14,0x2A},
+          {0x00,0x00,0x10,0x20},
+          {0x00,0x04,0x10,0x18},
+          {0xFF,0xFF,0xFF,0xFF} }},
+       { {{0x00,0x00,0x00,0x40},  /* NTSCFilter_1 */
+          {0x00,0xE0,0x10,0x60},
+          {0x00,0xEE,0x10,0x44},
+          {0x00,0xF4,0x10,0x38},
+          {0xF8,0xF4,0x18,0x38},
+          {0xFC,0xFB,0x14,0x2A},
+          {0x00,0x00,0x10,0x20},
+          {0x00,0x04,0x10,0x18},
+          {0xFF,0xFF,0xFF,0xFF} }},
+       { {{0x00,0x00,0x00,0x40},  /* NTSCFilter_2 */
+          {0xF5,0xEE,0x1B,0x44},
+          {0xF8,0xF4,0x18,0x38},
+          {0xEB,0x04,0x25,0x18},
+          {0xF1,0x05,0x1F,0x16},
+          {0xF6,0x06,0x1A,0x14},
+          {0xFA,0x06,0x16,0x14},
+          {0x00,0x04,0x10,0x18},
+          {0xFF,0xFF,0xFF,0xFF} }},
+       { {{0x00,0x00,0x00,0x40},  /* NTSCFilter_3 */
+          {0xF1,0x04,0x1F,0x18},
+          {0xEE,0x0D,0x22,0x06},
+          {0xF7,0x06,0x19,0x14},
+          {0xF4,0x0B,0x1C,0x0A},
+          {0xFA,0x07,0x16,0x12},
+          {0xF9,0x0A,0x17,0x0C},
+          {0x00,0x07,0x10,0x12},
+          {0xFF,0xFF,0xFF,0xFF} }},
+       { {{0x00,0x00,0x00,0x40},  /* NTSCFilter_4 */
+          {0x00,0xE0,0x10,0x60},
+          {0x00,0xEE,0x10,0x44},
+          {0x00,0xF4,0x10,0x38},
+          {0xF8,0xF4,0x18,0x38},
+          {0xFC,0xFB,0x14,0x2A},
+          {0x00,0x00,0x10,0x20},
+          {0x00,0x04,0x10,0x18},
+          {0xFF,0xFF,0xFF,0xFF} }},
+       { {{0x00,0x00,0x00,0x40},  /* NTSCFilter_5 */
+          {0xF5,0xEE,0x1B,0x44},
+          {0xF8,0xF4,0x18,0x38},
+          {0xEB,0x04,0x25,0x18},
+          {0xF1,0x05,0x1F,0x16},
+          {0xF6,0x06,0x1A,0x14},
+          {0xFA,0x06,0x16,0x14},
+          {0x00,0x04,0x10,0x18},
+          {0xFF,0xFF,0xFF,0xFF} }},
+       { {{0x00,0x00,0x00,0x40},  /* NTSCFilter_6 */
+          {0xEB,0x04,0x25,0x18},
+          {0xE7,0x0E,0x29,0x04},
+          {0xEE,0x0C,0x22,0x08},
+          {0xF6,0x0B,0x1A,0x0A},
+          {0xF9,0x0A,0x17,0x0C},
+          {0xFC,0x0A,0x14,0x0C},
+          {0x00,0x08,0x10,0x10},
+          {0xFF,0xFF,0xFF,0xFF} }},
+       { {{0x00,0x00,0x00,0x40},  /* NTSCFilter_7 */
+          {0xEC,0x02,0x24,0x1C},
+          {0xF2,0x04,0x1E,0x18},
+          {0xEB,0x15,0x25,0xF6},
+          {0xF4,0x10,0x1C,0x00},
+          {0xF8,0x0F,0x18,0x02},
+          {0x00,0x04,0x10,0x18},
+          {0x01,0x06,0x0F,0x14},
+          {0xFF,0xFF,0xFF,0xFF} }},
+       { {{0x00,0x00,0x00,0x40},  /* PALFilter_0 */
+          {0x00,0xE0,0x10,0x60},
+          {0x00,0xEE,0x10,0x44},
+          {0x00,0xF4,0x10,0x38},
+          {0xF8,0xF4,0x18,0x38},
+          {0xFC,0xFB,0x14,0x2A},
+          {0x00,0x00,0x10,0x20},
+          {0x00,0x04,0x10,0x18},
+          {0xFF,0xFF,0xFF,0xFF} }},
+       { {{0x00,0x00,0x00,0x40},  /* PALFilter_1 */
+          {0x00,0xE0,0x10,0x60},
+          {0x00,0xEE,0x10,0x44},
+          {0x00,0xF4,0x10,0x38},
+          {0xF8,0xF4,0x18,0x38},
+          {0xFC,0xFB,0x14,0x2A},
+          {0x00,0x00,0x10,0x20},
+          {0x00,0x04,0x10,0x18},
+          {0xFF,0xFF,0xFF,0xFF} }},
+       { {{0x00,0x00,0x00,0x40},  /* PALFilter_2 */
+          {0xF5,0xEE,0x1B,0x44},
+          {0xF8,0xF4,0x18,0x38},
+          {0xF1,0xF7,0x01,0x32},
+          {0xF5,0xFB,0x1B,0x2A},
+          {0xF9,0xFF,0x17,0x22},
+          {0xFB,0x01,0x15,0x1E},
+          {0x00,0x04,0x10,0x18},
+          {0xFF,0xFF,0xFF,0xFF} }},
+       { {{0x00,0x00,0x00,0x40},  /* PALFilter_3 */
+          {0xF5,0xFB,0x1B,0x2A},
+          {0xEE,0xFE,0x22,0x24},
+          {0xF3,0x00,0x1D,0x20},
+          {0xF9,0x03,0x17,0x1A},
+          {0xFB,0x02,0x14,0x1E},
+          {0xFB,0x04,0x15,0x18},
+          {0x00,0x06,0x10,0x14},
+          {0xFF,0xFF,0xFF,0xFF} }},
+       { {{0x00,0x00,0x00,0x40},  /* PALFilter_4 */
+          {0x00,0xE0,0x10,0x60},
+          {0x00,0xEE,0x10,0x44},
+          {0x00,0xF4,0x10,0x38},
+          {0xF8,0xF4,0x18,0x38},
+          {0xFC,0xFB,0x14,0x2A},
+          {0x00,0x00,0x10,0x20},
+          {0x00,0x04,0x10,0x18},
+          {0xFF,0xFF,0xFF,0xFF} }},
+       { {{0x00,0x00,0x00,0x40},  /* PALFilter_5 */
+          {0xF5,0xEE,0x1B,0x44},
+          {0xF8,0xF4,0x18,0x38},
+          {0xF1,0xF7,0x1F,0x32},
+          {0xF5,0xFB,0x1B,0x2A},
+          {0xF9,0xFF,0x17,0x22},
+          {0xFB,0x01,0x15,0x1E},
+          {0x00,0x04,0x10,0x18},
+          {0xFF,0xFF,0xFF,0xFF} }},
+       { {{0x00,0x00,0x00,0x40},  /* PALFilter_6 */
+          {0xF5,0xEE,0x1B,0x2A},
+          {0xEE,0xFE,0x22,0x24},
+          {0xF3,0x00,0x1D,0x20},
+          {0xF9,0x03,0x17,0x1A},
+          {0xFB,0x02,0x14,0x1E},
+          {0xFB,0x04,0x15,0x18},
+          {0x00,0x06,0x10,0x14},
+          {0xFF,0xFF,0xFF,0xFF} }},
+       { {{0x00,0x00,0x00,0x40},  /* PALFilter_7 */
+          {0xF5,0xEE,0x1B,0x44},
+          {0xF8,0xF4,0x18,0x38},
+          {0xFC,0xFB,0x14,0x2A},
+          {0xEB,0x05,0x25,0x16},
+          {0xF1,0x05,0x1F,0x16},
+          {0xFA,0x07,0x16,0x12},
+          {0x00,0x07,0x10,0x12},
+          {0xFF,0xFF,0xFF,0xFF} }}
+};
+
+static int           filter = -1;
+static unsigned char filter_tb;
+
+
+/* ---------------------- Routine prototypes ------------------------- */
+
+/* Interface used by the world */
+#ifndef MODULE
+XGIINITSTATIC int __init XGIfb_setup(char *options);
+#endif
+
+/* Interface to the low level console driver */
+
+
+
+/* fbdev routines */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+       int     XGIfb_init(void);
+static int      XGIfb_get_fix(struct fb_fix_screeninfo *fix,
+                             int con,
+                             struct fb_info *info);
+static int      XGIfb_get_var(struct fb_var_screeninfo *var,
+                             int con,
+                             struct fb_info *info);
+static int      XGIfb_set_var(struct fb_var_screeninfo *var,
+                             int con,
+                             struct fb_info *info);
+static void     XGIfb_crtc_to_var(struct fb_var_screeninfo *var);
+static int      XGIfb_get_cmap(struct fb_cmap *cmap,
+                              int kspc,
+                              int con,
+                              struct fb_info *info);
+static int      XGIfb_set_cmap(struct fb_cmap *cmap,
+                              int kspc,
+                              int con,
+                              struct fb_info *info);
+static int      XGIfb_update_var(int con,
+                                struct fb_info *info);
+static int      XGIfb_switch(int con,
+                            struct fb_info *info);
+static void     XGIfb_blank(int blank,
+                           struct fb_info *info);
+static void     XGIfb_set_disp(int con,
+                              struct fb_var_screeninfo *var,
+                               struct fb_info *info);
+static int      XGI_getcolreg(unsigned regno, unsigned *red, unsigned *green,
+                             unsigned *blue, unsigned *transp,
+                             struct fb_info *fb_info);
+static void     XGIfb_do_install_cmap(int con,
+                                      struct fb_info *info);
+static void     XGI_get_glyph(struct fb_info *info,
+                              XGI_GLYINFO *gly);
+static int     XGIfb_mmap(struct fb_info *info, struct file *file,
+                          struct vm_area_struct *vma);
+static int      XGIfb_ioctl(struct inode *inode, struct file *file,
+                           unsigned int cmd, unsigned long arg, int con,
+                           struct fb_info *info);
+#endif
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+XGIINITSTATIC int __init xgifb_init(void);
+static int      XGIfb_set_par(struct fb_info *info);
+static int      XGIfb_blank(int blank,
+                            struct fb_info *info);
+/*static int   XGIfb_mmap(struct fb_info *info, struct file *file,
+                          struct vm_area_struct *vma);
+*/
+extern void     fbcon_XGI_fillrect(struct fb_info *info,
+                                   const struct fb_fillrect *rect);
+extern void     fbcon_XGI_copyarea(struct fb_info *info,
+                                   const struct fb_copyarea *area);
+#if 0
+extern void     cfb_imageblit(struct fb_info *info,
+                              const struct fb_image *image);
+#endif
+extern int      fbcon_XGI_sync(struct fb_info *info);
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
+static int XGIfb_ioctl(struct fb_info *info, unsigned int cmd,
+                           unsigned long arg);
+#else
+static int      XGIfb_ioctl(struct inode *inode,
+                           struct file *file,
+                           unsigned int cmd,
+                           unsigned long arg,
+                           struct fb_info *info);
+#endif
+
+/*
+extern int     XGIfb_mode_rate_to_dclock(VB_DEVICE_INFO *XGI_Pr,
+                             PXGI_HW_DEVICE_INFO HwDeviceExtension,
+                             unsigned char modeno, unsigned char rateindex);
+extern int      XGIfb_mode_rate_to_ddata(VB_DEVICE_INFO *XGI_Pr, PXGI_HW_DEVICE_INFO HwDeviceExtension,
+                        unsigned char modeno, unsigned char rateindex,
+                        unsigned int *left_margin, unsigned int *right_margin,
+                        unsigned int *upper_margin, unsigned int *lower_margin,
+                        unsigned int *hsync_len, unsigned int *vsync_len,
+                        unsigned int *sync, unsigned int *vmode);
+*/
+#endif
+                       extern   BOOLEAN  XGI_SearchModeID( USHORT ModeNo,USHORT  *ModeIdIndex, PVB_DEVICE_INFO );
+static int      XGIfb_get_fix(struct fb_fix_screeninfo *fix, int con,
+                             struct fb_info *info);
+
+/* Internal 2D accelerator functions */
+extern int      XGIfb_initaccel(void);
+extern void     XGIfb_syncaccel(void);
+
+/* Internal general routines */
+static void     XGIfb_search_mode(const char *name);
+static int      XGIfb_validate_mode(int modeindex);
+static u8       XGIfb_search_refresh_rate(unsigned int rate);
+static int      XGIfb_setcolreg(unsigned regno, unsigned red, unsigned green,
+                       unsigned blue, unsigned transp,
+                       struct fb_info *fb_info);
+static int      XGIfb_do_set_var(struct fb_var_screeninfo *var, int isactive,
+                       struct fb_info *info);
+static void     XGIfb_pre_setmode(void);
+static void     XGIfb_post_setmode(void);
+
+static BOOLEAN  XGIfb_CheckVBRetrace(void);
+static BOOLEAN  XGIfbcheckvretracecrt2(void);
+static BOOLEAN  XGIfbcheckvretracecrt1(void);
+static BOOLEAN  XGIfb_bridgeisslave(void);
+
+struct XGI_memreq {
+       unsigned long offset;
+       unsigned long size;
+};
+
+/* XGI-specific Export functions */
+void            XGI_dispinfo(struct ap_data *rec);
+void            XGI_malloc(struct XGI_memreq *req);
+void            XGI_free(unsigned long base);
+
+/* Internal hardware access routines */
+void            XGIfb_set_reg4(u16 port, unsigned long data);
+u32             XGIfb_get_reg3(u16 port);
+
+/* Chipset-dependent internal routines */
+
+
+static int      XGIfb_get_dram_size(void);
+static void     XGIfb_detect_VB(void);
+static void     XGIfb_get_VB_type(void);
+static int      XGIfb_has_VB(void);
+
+
+/* Internal heap routines */
+static int      XGIfb_heap_init(void);
+static XGI_OH   *XGIfb_poh_new_node(void);
+static XGI_OH   *XGIfb_poh_allocate(unsigned long size);
+static void     XGIfb_delete_node(XGI_OH *poh);
+static void     XGIfb_insert_node(XGI_OH *pohList, XGI_OH *poh);
+static XGI_OH   *XGIfb_poh_free(unsigned long base);
+static void     XGIfb_free_node(XGI_OH *poh);
+
+/* Internal routines to access PCI configuration space */
+BOOLEAN         XGIfb_query_VGA_config_space(PXGI_HW_DEVICE_INFO pXGIhw_ext,
+                       unsigned long offset, unsigned long set, unsigned long *value);
+//BOOLEAN         XGIfb_query_north_bridge_space(PXGI_HW_DEVICE_INFO pXGIhw_ext,
+//                     unsigned long offset, unsigned long set, unsigned long *value);
+
+
+/* Routines from init.c/init301.c */
+extern void     InitTo330Pointer(UCHAR,PVB_DEVICE_INFO pVBInfo);
+extern BOOLEAN  XGIInitNew(PXGI_HW_DEVICE_INFO HwDeviceExtension);
+extern BOOLEAN  XGISetModeNew(PXGI_HW_DEVICE_INFO HwDeviceExtension, USHORT ModeNo);
+//extern void     XGI_SetEnableDstn(VB_DEVICE_INFO *XGI_Pr);
+extern void     XGI_LongWait(VB_DEVICE_INFO *XGI_Pr);
+extern USHORT   XGI_GetRatePtrCRT2( PXGI_HW_DEVICE_INFO pXGIHWDE, USHORT ModeNo,USHORT ModeIdIndex,PVB_DEVICE_INFO pVBInfo );
+/* TW: Chrontel TV functions */
+extern USHORT  XGI_GetCH700x(VB_DEVICE_INFO *XGI_Pr, USHORT tempbx);
+extern void    XGI_SetCH700x(VB_DEVICE_INFO *XGI_Pr, USHORT tempbx);
+extern USHORT  XGI_GetCH701x(VB_DEVICE_INFO *XGI_Pr, USHORT tempbx);
+extern void    XGI_SetCH701x(VB_DEVICE_INFO *XGI_Pr, USHORT tempbx);
+extern void     XGI_SetCH70xxANDOR(VB_DEVICE_INFO *XGI_Pr, USHORT tempax,USHORT tempbh);
+extern void     XGI_DDC2Delay(VB_DEVICE_INFO *XGI_Pr, USHORT delaytime);
+
+/* TW: Sensing routines */
+void            XGI_Sense30x(void);
+int             XGIDoSense(int tempbl, int tempbh, int tempcl, int tempch);
+
+extern XGI21_LVDSCapStruct XGI21_LCDCapList[13];
+#endif
diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c
new file mode 100644 (file)
index 0000000..867012b
--- /dev/null
@@ -0,0 +1,3773 @@
+/*
+ * XG20, XG21, XG40, XG42 frame buffer device
+ * for Linux kernels  2.5.x, 2.6.x
+ * Base on TW's sis fbdev code.
+ */
+
+//#include <linux/config.h>
+#include <linux/version.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/kernel.h>
+#include <linux/spinlock.h>
+#include <linux/errno.h>
+#include <linux/string.h>
+#include <linux/mm.h>
+#include <linux/tty.h>
+#include <linux/slab.h>
+#include <linux/delay.h>
+#include <linux/fb.h>
+#include <linux/console.h>
+#include <linux/selection.h>
+#include <linux/ioport.h>
+#include <linux/init.h>
+#include <linux/pci.h>
+#include <linux/vmalloc.h>
+#include <linux/vt_kern.h>
+#include <linux/capability.h>
+#include <linux/fs.h>
+#include <linux/types.h>
+#include <linux/proc_fs.h>
+#include <linux/kernel.h>
+
+#include "osdef.h"
+
+
+#ifndef XGIFB_PAN
+#define XGIFB_PAN
+#endif
+
+#include <asm/io.h>
+#ifdef CONFIG_MTRR
+#include <asm/mtrr.h>
+#endif
+
+#include "XGIfb.h"
+#include "vgatypes.h"
+#include "XGI_main.h"
+#include "vb_util.h"
+
+
+#define Index_CR_GPIO_Reg1 0x48
+#define Index_CR_GPIO_Reg2 0x49
+#define Index_CR_GPIO_Reg3 0x4a
+
+#define GPIOG_EN    (1<<6)
+#define GPIOG_WRITE (1<<6)
+#define GPIOG_READ  (1<<1)
+int XGIfb_GetXG21DefaultLVDSModeIdx(void);
+
+/* -------------------- Macro definitions ---------------------------- */
+
+#undef XGIFBDEBUG
+
+#ifdef XGIFBDEBUG
+#define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __FUNCTION__ , ## args)
+#else
+#define DPRINTK(fmt, args...)
+#endif
+
+#ifdef XGIFBDEBUG
+static void dumpVGAReg(void)
+{
+    u8 i,reg;
+
+outXGIIDXREG(XGISR, 0x05, 0x86);
+/*
+outXGIIDXREG(XGISR, 0x08, 0x4f);
+outXGIIDXREG(XGISR, 0x0f, 0x20);
+outXGIIDXREG(XGISR, 0x11, 0x4f);
+outXGIIDXREG(XGISR, 0x13, 0x45);
+outXGIIDXREG(XGISR, 0x14, 0x51);
+outXGIIDXREG(XGISR, 0x1e, 0x41);
+outXGIIDXREG(XGISR, 0x1f, 0x0);
+outXGIIDXREG(XGISR, 0x20, 0xa1);
+outXGIIDXREG(XGISR, 0x22, 0xfb);
+outXGIIDXREG(XGISR, 0x26, 0x22);
+outXGIIDXREG(XGISR, 0x3e, 0x07);
+*/
+
+//outXGIIDXREG(XGICR, 0x19, 0x00);
+//outXGIIDXREG(XGICR, 0x1a, 0x3C);
+//outXGIIDXREG(XGICR, 0x22, 0xff);
+//outXGIIDXREG(XGICR, 0x3D, 0x10);
+
+//outXGIIDXREG(XGICR, 0x4a, 0xf3);
+
+//outXGIIDXREG(XGICR, 0x57, 0x0);
+//outXGIIDXREG(XGICR, 0x7a, 0x2c);
+
+//outXGIIDXREG(XGICR, 0x82, 0xcc);
+//outXGIIDXREG(XGICR, 0x8c, 0x0);
+/*
+outXGIIDXREG(XGICR, 0x99, 0x1);
+outXGIIDXREG(XGICR, 0x41, 0x40);
+*/
+
+    for(i=0; i < 0x4f; i++)
+    {
+        inXGIIDXREG(XGISR, i, reg);
+        printk("\no 3c4 %x",i);
+        printk("\ni 3c5 => %x",reg);
+    }
+
+    for(i=0; i < 0xF0; i++)
+    {
+        inXGIIDXREG(XGICR, i, reg);
+        printk("\no 3d4 %x",i);
+        printk("\ni 3d5 => %x",reg);
+    }
+/*
+
+    outXGIIDXREG(XGIPART1,0x2F,1);
+    for(i=1; i < 0x50; i++)
+    {
+        inXGIIDXREG(XGIPART1, i, reg);
+        printk("\no d004 %x",i);
+        printk("\ni d005 => %x",reg);
+    }
+
+    for(i=0; i < 0x50; i++)
+    {
+        inXGIIDXREG(XGIPART2, i, reg);
+        printk("\no d010 %x",i);
+        printk("\ni d011 => %x",reg);
+    }
+    for(i=0; i < 0x50; i++)
+    {
+        inXGIIDXREG(XGIPART3, i, reg);
+        printk("\no d012 %x",i);
+        printk("\ni d013 => %x",reg);
+    }
+    for(i=0; i < 0x50; i++)
+    {
+        inXGIIDXREG(XGIPART4, i, reg);
+        printk("\no d014 %x",i);
+        printk("\ni d015 => %x",reg);
+    }
+*/
+}
+#else
+static inline void dumpVGAReg(void) {}
+#endif
+
+/* data for XGI components */
+struct video_info  xgi_video_info;
+
+
+#if 1
+#define DEBUGPRN(x)
+#else
+#define DEBUGPRN(x) printk(KERN_INFO x "\n");
+#endif
+
+
+/* --------------- Hardware Access Routines -------------------------- */
+
+#ifdef LINUX_KERNEL
+int
+XGIfb_mode_rate_to_dclock(VB_DEVICE_INFO *XGI_Pr, PXGI_HW_DEVICE_INFO HwDeviceExtension,
+                         unsigned char modeno, unsigned char rateindex)
+{
+    USHORT ModeNo = modeno;
+    USHORT ModeIdIndex = 0, ClockIndex = 0;
+    USHORT RefreshRateTableIndex = 0;
+
+    /*ULONG  temp = 0;*/
+    int    Clock;
+    XGI_Pr->ROMAddr  = HwDeviceExtension->pjVirtualRomBase;
+    InitTo330Pointer( HwDeviceExtension->jChipType, XGI_Pr ) ;
+
+    RefreshRateTableIndex = XGI_GetRatePtrCRT2( HwDeviceExtension, ModeNo , ModeIdIndex, XGI_Pr ) ;
+
+/*
+    temp = XGI_SearchModeID( ModeNo , &ModeIdIndex,  XGI_Pr ) ;
+    if(!temp) {
+       printk(KERN_ERR "Could not find mode %x\n", ModeNo);
+       return 65000;
+    }
+
+    RefreshRateTableIndex = XGI_Pr->EModeIDTable[ModeIdIndex].REFindex;
+    RefreshRateTableIndex += (rateindex - 1);
+
+*/
+    ClockIndex = XGI_Pr->RefIndex[RefreshRateTableIndex].Ext_CRTVCLK;
+    if(HwDeviceExtension->jChipType < XGI_315H) {
+       ClockIndex &= 0x3F;
+    }
+    Clock = XGI_Pr->VCLKData[ClockIndex].CLOCK * 1000 ;
+
+    return(Clock);
+}
+
+int
+XGIfb_mode_rate_to_ddata(VB_DEVICE_INFO *XGI_Pr, PXGI_HW_DEVICE_INFO HwDeviceExtension,
+                        unsigned char modeno, unsigned char rateindex,
+                        u32 *left_margin, u32 *right_margin,
+                        u32 *upper_margin, u32 *lower_margin,
+                        u32 *hsync_len, u32 *vsync_len,
+                        u32 *sync, u32 *vmode)
+{
+    USHORT ModeNo = modeno;
+    USHORT ModeIdIndex = 0, index = 0;
+    USHORT RefreshRateTableIndex = 0;
+
+    unsigned short VRE, VBE, VRS, VBS, VDE, VT;
+    unsigned short HRE, HBE, HRS, HBS, HDE, HT;
+    unsigned char  sr_data, cr_data, cr_data2;
+    unsigned long cr_data3;
+    int            A, B, C, D, E, F, temp, j;
+    XGI_Pr->ROMAddr  = HwDeviceExtension->pjVirtualRomBase;
+    InitTo330Pointer( HwDeviceExtension->jChipType, XGI_Pr ) ;
+  RefreshRateTableIndex = XGI_GetRatePtrCRT2( HwDeviceExtension, ModeNo , ModeIdIndex, XGI_Pr ) ;
+/*
+    temp = XGI_SearchModeID( ModeNo, &ModeIdIndex, XGI_Pr);
+    if(!temp) return 0;
+
+    RefreshRateTableIndex = XGI_Pr->EModeIDTable[ModeIdIndex].REFindex;
+    RefreshRateTableIndex += (rateindex - 1);
+*/
+    index = XGI_Pr->RefIndex[RefreshRateTableIndex].Ext_CRT1CRTC;
+
+    sr_data = XGI_Pr->XGINEWUB_CRT1Table[index].CR[5];
+
+    cr_data = XGI_Pr->XGINEWUB_CRT1Table[index].CR[0];
+
+    /* Horizontal total */
+    HT = (cr_data & 0xff) |
+         ((unsigned short) (sr_data & 0x03) << 8);
+    A = HT + 5;
+
+    /*cr_data = XGI_Pr->XGINEWUB_CRT1Table[index].CR[1];
+
+     Horizontal display enable end
+    HDE = (cr_data & 0xff) |
+          ((unsigned short) (sr_data & 0x0C) << 6);*/
+    HDE = (XGI_Pr->RefIndex[RefreshRateTableIndex].XRes >> 3) -1;
+    E = HDE + 1;
+
+    cr_data = XGI_Pr->XGINEWUB_CRT1Table[index].CR[3];
+
+    /* Horizontal retrace (=sync) start */
+    HRS = (cr_data & 0xff) |
+          ((unsigned short) (sr_data & 0xC0) << 2);
+    F = HRS - E - 3;
+
+    cr_data = XGI_Pr->XGINEWUB_CRT1Table[index].CR[1];
+
+    /* Horizontal blank start */
+    HBS = (cr_data & 0xff) |
+          ((unsigned short) (sr_data & 0x30) << 4);
+
+    sr_data = XGI_Pr->XGINEWUB_CRT1Table[index].CR[6];
+
+    cr_data = XGI_Pr->XGINEWUB_CRT1Table[index].CR[2];
+
+    cr_data2 = XGI_Pr->XGINEWUB_CRT1Table[index].CR[4];
+
+    /* Horizontal blank end */
+    HBE = (cr_data & 0x1f) |
+          ((unsigned short) (cr_data2 & 0x80) >> 2) |
+         ((unsigned short) (sr_data & 0x03) << 6);
+
+    /* Horizontal retrace (=sync) end */
+    HRE = (cr_data2 & 0x1f) | ((sr_data & 0x04) << 3);
+
+    temp = HBE - ((E - 1) & 255);
+    B = (temp > 0) ? temp : (temp + 256);
+
+    temp = HRE - ((E + F + 3) & 63);
+    C = (temp > 0) ? temp : (temp + 64);
+
+    D = B - F - C;
+
+    *left_margin = D * 8;
+    *right_margin = F * 8;
+    *hsync_len = C * 8;
+
+    sr_data = XGI_Pr->XGINEWUB_CRT1Table[index].CR[14];
+
+    cr_data = XGI_Pr->XGINEWUB_CRT1Table[index].CR[8];
+
+    cr_data2 = XGI_Pr->XGINEWUB_CRT1Table[index].CR[9];
+
+    /* Vertical total */
+    VT = (cr_data & 0xFF) |
+         ((unsigned short) (cr_data2 & 0x01) << 8) |
+        ((unsigned short)(cr_data2 & 0x20) << 4) |
+        ((unsigned short) (sr_data & 0x01) << 10);
+    A = VT + 2;
+
+    //cr_data = XGI_Pr->XGINEWUB_CRT1Table[index].CR[10];
+
+    /* Vertical display enable end */
+/*    VDE = (cr_data & 0xff) |
+          ((unsigned short) (cr_data2 & 0x02) << 7) |
+         ((unsigned short) (cr_data2 & 0x40) << 3) |
+         ((unsigned short) (sr_data & 0x02) << 9); */
+    VDE = XGI_Pr->RefIndex[RefreshRateTableIndex].YRes  -1;
+    E = VDE + 1;
+
+    cr_data = XGI_Pr->XGINEWUB_CRT1Table[index].CR[10];
+
+    /* Vertical retrace (=sync) start */
+    VRS = (cr_data & 0xff) |
+          ((unsigned short) (cr_data2 & 0x04) << 6) |
+         ((unsigned short) (cr_data2 & 0x80) << 2) |
+         ((unsigned short) (sr_data & 0x08) << 7);
+    F = VRS + 1 - E;
+
+    cr_data =  XGI_Pr->XGINEWUB_CRT1Table[index].CR[12];
+
+    cr_data3 = (XGI_Pr->XGINEWUB_CRT1Table[index].CR[14] & 0x80) << 5;
+
+    /* Vertical blank start */
+    VBS = (cr_data & 0xff) |
+          ((unsigned short) (cr_data2 & 0x08) << 5) |
+         ((unsigned short) (cr_data3 & 0x20) << 4) |
+         ((unsigned short) (sr_data & 0x04) << 8);
+
+    cr_data =  XGI_Pr->XGINEWUB_CRT1Table[index].CR[13];
+
+    /* Vertical blank end */
+    VBE = (cr_data & 0xff) |
+          ((unsigned short) (sr_data & 0x10) << 4);
+    temp = VBE - ((E - 1) & 511);
+    B = (temp > 0) ? temp : (temp + 512);
+
+    cr_data = XGI_Pr->XGINEWUB_CRT1Table[index].CR[11];
+
+    /* Vertical retrace (=sync) end */
+    VRE = (cr_data & 0x0f) | ((sr_data & 0x20) >> 1);
+    temp = VRE - ((E + F - 1) & 31);
+    C = (temp > 0) ? temp : (temp + 32);
+
+    D = B - F - C;
+
+    *upper_margin = D;
+    *lower_margin = F;
+    *vsync_len = C;
+
+    if(XGI_Pr->RefIndex[RefreshRateTableIndex].Ext_InfoFlag & 0x8000)
+       *sync &= ~FB_SYNC_VERT_HIGH_ACT;
+    else
+       *sync |= FB_SYNC_VERT_HIGH_ACT;
+
+    if(XGI_Pr->RefIndex[RefreshRateTableIndex].Ext_InfoFlag & 0x4000)
+       *sync &= ~FB_SYNC_HOR_HIGH_ACT;
+    else
+       *sync |= FB_SYNC_HOR_HIGH_ACT;
+
+    *vmode = FB_VMODE_NONINTERLACED;
+    if(XGI_Pr->RefIndex[RefreshRateTableIndex].Ext_InfoFlag & 0x0080)
+       *vmode = FB_VMODE_INTERLACED;
+    else {
+      j = 0;
+      while(XGI_Pr->EModeIDTable[j].Ext_ModeID != 0xff) {
+          if(XGI_Pr->EModeIDTable[j].Ext_ModeID ==
+                         XGI_Pr->RefIndex[RefreshRateTableIndex].ModeID) {
+              if(XGI_Pr->EModeIDTable[j].Ext_ModeFlag & DoubleScanMode) {
+                 *vmode = FB_VMODE_DOUBLE;
+              }
+             break;
+          }
+         j++;
+      }
+    }
+
+#if 0  /* That's bullshit, only the resolution needs to be shifted */
+    if((*vmode & FB_VMODE_MASK) == FB_VMODE_INTERLACED) {
+       *upper_margin <<= 1;
+       *lower_margin <<= 1;
+       *vsync_len <<= 1;
+    } else if((*vmode & FB_VMODE_MASK) == FB_VMODE_DOUBLE) {
+       *upper_margin >>= 1;
+       *lower_margin >>= 1;
+       *vsync_len >>= 1;
+    }
+#endif
+
+    return 1;
+}
+
+#endif
+
+
+
+void XGIRegInit(VB_DEVICE_INFO *XGI_Pr, ULONG BaseAddr)
+{
+   XGI_Pr->RelIO = BaseAddr;
+   XGI_Pr->P3c4 = BaseAddr + 0x14;
+   XGI_Pr->P3d4 = BaseAddr + 0x24;
+   XGI_Pr->P3c0 = BaseAddr + 0x10;
+   XGI_Pr->P3ce = BaseAddr + 0x1e;
+   XGI_Pr->P3c2 = BaseAddr + 0x12;
+   XGI_Pr->P3ca = BaseAddr + 0x1a;
+   XGI_Pr->P3c6 = BaseAddr + 0x16;
+   XGI_Pr->P3c7 = BaseAddr + 0x17;
+   XGI_Pr->P3c8 = BaseAddr + 0x18;
+   XGI_Pr->P3c9 = BaseAddr + 0x19;
+   XGI_Pr->P3da = BaseAddr + 0x2A;
+   XGI_Pr->Part1Port = BaseAddr + XGI_CRT2_PORT_04;   /* Digital video interface registers (LCD) */
+   XGI_Pr->Part2Port = BaseAddr + XGI_CRT2_PORT_10;   /* 301 TV Encoder registers */
+   XGI_Pr->Part3Port = BaseAddr + XGI_CRT2_PORT_12;   /* 301 Macrovision registers */
+   XGI_Pr->Part4Port = BaseAddr + XGI_CRT2_PORT_14;   /* 301 VGA2 (and LCD) registers */
+   XGI_Pr->Part5Port = BaseAddr + XGI_CRT2_PORT_14+2; /* 301 palette address port registers */
+
+}
+
+
+void XGIfb_set_reg4(u16 port, unsigned long data)
+{
+       outl((u32) (data & 0xffffffff), port);
+}
+
+u32 XGIfb_get_reg3(u16 port)
+{
+       u32 data;
+
+       data = inl(port);
+       return (data);
+}
+
+/* ------------ Interface for init & mode switching code ------------- */
+
+BOOLEAN
+XGIfb_query_VGA_config_space(PXGI_HW_DEVICE_INFO pXGIhw_ext,
+       unsigned long offset, unsigned long set, unsigned long *value)
+{
+       static struct pci_dev *pdev = NULL;
+       static unsigned char init = 0, valid_pdev = 0;
+
+       if (!set)
+               DPRINTK("XGIfb: Get VGA offset 0x%lx\n", offset);
+       else
+               DPRINTK("XGIfb: Set offset 0x%lx to 0x%lx\n", offset, *value);
+
+       if (!init) {
+               init = TRUE;
+               pdev = pci_get_device(PCI_VENDOR_ID_XG, xgi_video_info.chip_id, pdev);
+               if (pdev) {
+                       valid_pdev = TRUE;
+                       pci_dev_put(pdev);
+               }
+       }
+
+       if (!valid_pdev) {
+               printk(KERN_DEBUG "XGIfb: Can't find XGI %d VGA device.\n",
+                               xgi_video_info.chip_id);
+               return FALSE;
+       }
+
+       if (set == 0)
+               pci_read_config_dword(pdev, offset, (u32 *)value);
+       else
+               pci_write_config_dword(pdev, offset, (u32)(*value));
+
+       return TRUE;
+}
+
+/*BOOLEAN XGIfb_query_north_bridge_space(PXGI_HW_DEVICE_INFO pXGIhw_ext,
+       unsigned long offset, unsigned long set, unsigned long *value)
+{
+       static struct pci_dev *pdev = NULL;
+       static unsigned char init = 0, valid_pdev = 0;
+       u16 nbridge_id = 0;
+
+       if (!init) {
+               init = TRUE;
+               switch (xgi_video_info.chip) {
+               case XGI_540:
+                       nbridge_id = PCI_DEVICE_ID_XG_540;
+                       break;
+               case XGI_630:
+                       nbridge_id = PCI_DEVICE_ID_XG_630;
+                       break;
+               case XGI_730:
+                       nbridge_id = PCI_DEVICE_ID_XG_730;
+                       break;
+               case XGI_550:
+                       nbridge_id = PCI_DEVICE_ID_XG_550;
+                       break;
+               case XGI_650:
+                       nbridge_id = PCI_DEVICE_ID_XG_650;
+                       break;
+               case XGI_740:
+                       nbridge_id = PCI_DEVICE_ID_XG_740;
+                       break;
+               default:
+                       nbridge_id = 0;
+                       break;
+               }
+
+               pdev = pci_find_device(PCI_VENDOR_ID_SI, nbridge_id, pdev);
+               if (pdev)
+                       valid_pdev = TRUE;
+       }
+
+       if (!valid_pdev) {
+               printk(KERN_DEBUG "XGIfb: Can't find XGI %d North Bridge device.\n",
+                               nbridge_id);
+               return FALSE;
+       }
+
+       if (set == 0)
+               pci_read_config_dword(pdev, offset, (u32 *)value);
+       else
+               pci_write_config_dword(pdev, offset, (u32)(*value));
+
+       return TRUE;
+}
+*/
+/* ------------------ Internal helper routines ----------------- */
+
+static void XGIfb_search_mode(const char *name)
+{
+       int i = 0, j = 0, l;
+
+       if(name == NULL) {
+          printk(KERN_ERR "XGIfb: Internal error, using default mode.\n");
+          xgifb_mode_idx = DEFAULT_MODE;
+          if ((xgi_video_info.chip == XG21) && ((xgi_video_info.disp_state & DISPTYPE_DISP2) == DISPTYPE_LCD))
+          {
+              xgifb_mode_idx = XGIfb_GetXG21DefaultLVDSModeIdx();
+          }
+          return;
+       }
+
+
+        if (!strcmp(name, XGIbios_mode[MODE_INDEX_NONE].name)) {
+          printk(KERN_ERR "XGIfb: Mode 'none' not supported anymore. Using default.\n");
+          xgifb_mode_idx = DEFAULT_MODE;
+          if ((xgi_video_info.chip == XG21) && ((xgi_video_info.disp_state & DISPTYPE_DISP2) == DISPTYPE_LCD))
+          {
+              xgifb_mode_idx = XGIfb_GetXG21DefaultLVDSModeIdx();
+          }
+          return;
+       }
+
+       while(XGIbios_mode[i].mode_no != 0) {
+               l = min(strlen(name), strlen(XGIbios_mode[i].name));
+               if (!strncmp(name, XGIbios_mode[i].name, l)) {
+                       xgifb_mode_idx = i;
+                       j = 1;
+                       break;
+               }
+               i++;
+       }
+       if(!j) printk(KERN_INFO "XGIfb: Invalid mode '%s'\n", name);
+}
+
+static void XGIfb_search_vesamode(unsigned int vesamode)
+{
+       int i = 0, j = 0;
+
+       if(vesamode == 0) {
+
+               printk(KERN_ERR "XGIfb: Mode 'none' not supported anymore. Using default.\n");
+               xgifb_mode_idx = DEFAULT_MODE;
+               if ((xgi_video_info.chip == XG21) && ((xgi_video_info.disp_state & DISPTYPE_DISP2) == DISPTYPE_LCD))
+               {
+                   xgifb_mode_idx = XGIfb_GetXG21DefaultLVDSModeIdx();
+               }
+               return;
+       }
+
+       vesamode &= 0x1dff;  /* Clean VESA mode number from other flags */
+
+       while(XGIbios_mode[i].mode_no != 0) {
+               if( (XGIbios_mode[i].vesa_mode_no_1 == vesamode) ||
+                   (XGIbios_mode[i].vesa_mode_no_2 == vesamode) ) {
+                       xgifb_mode_idx = i;
+                       j = 1;
+                       break;
+               }
+               i++;
+       }
+       if(!j) printk(KERN_INFO "XGIfb: Invalid VESA mode 0x%x'\n", vesamode);
+}
+
+int XGIfb_GetXG21LVDSData(void)
+{
+    u8 tmp;
+    unsigned char *pData;
+    int i,j,k;
+
+    inXGIIDXREG(XGISR,0x1e,tmp);
+    outXGIIDXREG(XGISR, 0x1e, tmp|4);
+
+    pData = xgi_video_info.mmio_vbase+0x20000;
+    if ((pData[0x0]==0x55) && (pData[0x1]==0xAA) && (pData[0x65] & 0x1))
+    {
+        i = pData[ 0x316 ] | ( pData[ 0x317 ] << 8 );
+        j = pData[ i-1 ] ;
+        if ( j == 0xff )
+        {
+         j = 1;
+       }
+        k = 0;
+        do
+        {
+                XGI21_LCDCapList[k].LVDS_Capability = pData[ i ] | ( pData[ i + 1 ] << 8 );
+                XGI21_LCDCapList[k].LVDSHT = pData[ i + 2 ] | ( pData[ i + 3 ] << 8 ) ;
+                XGI21_LCDCapList[k].LVDSVT = pData[ i + 4 ] | ( pData[ i + 5 ] << 8 );
+                XGI21_LCDCapList[k].LVDSHDE = pData[ i + 6 ] | ( pData[ i + 7 ] << 8 );
+                XGI21_LCDCapList[k].LVDSVDE = pData[ i + 8 ] | ( pData[ i + 9 ] << 8 );
+                XGI21_LCDCapList[k].LVDSHFP = pData[ i + 10 ] | ( pData[ i + 11 ] << 8 );
+                XGI21_LCDCapList[k].LVDSVFP = pData[ i + 12 ] | ( pData[ i + 13 ] << 8 );
+                XGI21_LCDCapList[k].LVDSHSYNC = pData[ i + 14 ] | ( pData[ i + 15 ] << 8 );
+                XGI21_LCDCapList[k].LVDSVSYNC = pData[ i + 16 ] | ( pData[ i + 17 ] << 8 );
+                XGI21_LCDCapList[k].VCLKData1 = pData[ i + 18 ] ;
+                XGI21_LCDCapList[k].VCLKData2 = pData[ i + 19 ] ;
+                XGI21_LCDCapList[k].PSC_S1 = pData[ i + 20 ] ;
+                XGI21_LCDCapList[k].PSC_S2 = pData[ i + 21 ] ;
+                XGI21_LCDCapList[k].PSC_S3 = pData[ i + 22 ] ;
+                XGI21_LCDCapList[k].PSC_S4 = pData[ i + 23 ] ;
+                XGI21_LCDCapList[k].PSC_S5 = pData[ i + 24 ] ;
+                i += 25;
+                j--;
+                k++;
+        } while ( (j>0) && ( k < (sizeof(XGI21_LCDCapList)/sizeof(XGI21_LVDSCapStruct)) ) );
+        return 1;
+    }
+    return 0;
+}
+
+int XGIfb_GetXG21DefaultLVDSModeIdx(void)
+{
+
+       int found_mode = 0;
+       int XGIfb_mode_idx = 0;
+
+       found_mode = 0;
+       while( (XGIbios_mode[XGIfb_mode_idx].mode_no != 0) &&
+              (XGIbios_mode[XGIfb_mode_idx].xres <= XGI21_LCDCapList[0].LVDSHDE) )
+       {
+               if( (XGIbios_mode[XGIfb_mode_idx].xres == XGI21_LCDCapList[0].LVDSHDE) &&
+                   (XGIbios_mode[XGIfb_mode_idx].yres == XGI21_LCDCapList[0].LVDSVDE) &&
+                   (XGIbios_mode[XGIfb_mode_idx].bpp == 8))
+               {
+                       XGIfb_mode_no = XGIbios_mode[XGIfb_mode_idx].mode_no;
+                       found_mode = 1;
+                       break;
+               }
+               XGIfb_mode_idx++;
+       }
+        if (!found_mode)
+         XGIfb_mode_idx = 0;
+
+       return (XGIfb_mode_idx);
+}
+
+
+static int XGIfb_validate_mode(int myindex)
+{
+   u16 xres, yres;
+
+    if (xgi_video_info.chip == XG21)
+    {
+        if ((xgi_video_info.disp_state & DISPTYPE_DISP2) == DISPTYPE_LCD)
+        {
+           xres = XGI21_LCDCapList[0].LVDSHDE;
+           yres = XGI21_LCDCapList[0].LVDSVDE;
+           if(XGIbios_mode[myindex].xres > xres)
+               return(-1);
+            if(XGIbios_mode[myindex].yres > yres)
+               return(-1);
+            if ((XGIbios_mode[myindex].xres < xres) && (XGIbios_mode[myindex].yres < yres) )
+           {
+              if (XGIbios_mode[myindex].bpp > 8)
+                 return(-1);
+           }
+
+       }
+       return(myindex);
+
+    }
+
+    /* FIXME: for now, all is valid on XG27 */
+    if (xgi_video_info.chip == XG27)
+           return(myindex);
+
+    if(!(XGIbios_mode[myindex].chipset & MD_XGI315))
+        return(-1);
+
+   switch (xgi_video_info.disp_state & DISPTYPE_DISP2) {
+     case DISPTYPE_LCD:
+       switch (XGIhw_ext.ulCRT2LCDType) {
+       case LCD_640x480:
+               xres =  640; yres =  480;  break;
+       case LCD_800x600:
+               xres =  800; yres =  600;  break;
+        case LCD_1024x600:
+               xres = 1024; yres =  600;  break;
+       case LCD_1024x768:
+               xres = 1024; yres =  768;  break;
+       case LCD_1152x768:
+               xres = 1152; yres =  768;  break;
+       case LCD_1280x960:
+               xres = 1280; yres =  960;  break;
+       case LCD_1280x768:
+               xres = 1280; yres =  768;  break;
+       case LCD_1280x1024:
+               xres = 1280; yres = 1024;  break;
+       case LCD_1400x1050:
+               xres = 1400; yres = 1050;  break;
+       case LCD_1600x1200:
+               xres = 1600; yres = 1200;  break;
+//     case LCD_320x480:                               // TW: FSTN
+//             xres =  320; yres =  480;  break;
+       default:
+               xres =    0; yres =    0;  break;
+       }
+       if(XGIbios_mode[myindex].xres > xres) {
+               return(-1);
+       }
+        if(XGIbios_mode[myindex].yres > yres) {
+               return(-1);
+       }
+       if((XGIhw_ext.ulExternalChip == 0x01) ||   // LVDS
+           (XGIhw_ext.ulExternalChip == 0x05))    // LVDS+Chrontel
+       {
+          switch (XGIbios_mode[myindex].xres) {
+               case 512:
+                       if(XGIbios_mode[myindex].yres != 512) return -1;
+                       if(XGIhw_ext.ulCRT2LCDType == LCD_1024x600) return -1;
+                       break;
+               case 640:
+                       if((XGIbios_mode[myindex].yres != 400) &&
+                          (XGIbios_mode[myindex].yres != 480))
+                               return -1;
+                       break;
+               case 800:
+                       if(XGIbios_mode[myindex].yres != 600) return -1;
+                       break;
+               case 1024:
+                       if((XGIbios_mode[myindex].yres != 600) &&
+                          (XGIbios_mode[myindex].yres != 768))
+                               return -1;
+                       if((XGIbios_mode[myindex].yres == 600) &&
+                          (XGIhw_ext.ulCRT2LCDType != LCD_1024x600))
+                               return -1;
+                       break;
+               case 1152:
+                       if((XGIbios_mode[myindex].yres) != 768) return -1;
+                       if(XGIhw_ext.ulCRT2LCDType != LCD_1152x768) return -1;
+                       break;
+               case 1280:
+                       if((XGIbios_mode[myindex].yres != 768) &&
+                          (XGIbios_mode[myindex].yres != 1024))
+                               return -1;
+                       if((XGIbios_mode[myindex].yres == 768) &&
+                          (XGIhw_ext.ulCRT2LCDType != LCD_1280x768))
+                               return -1;
+                       break;
+               case 1400:
+                       if(XGIbios_mode[myindex].yres != 1050) return -1;
+                       break;
+               case 1600:
+                       if(XGIbios_mode[myindex].yres != 1200) return -1;
+                       break;
+               default:
+                       return -1;
+          }
+       } else {
+          switch (XGIbios_mode[myindex].xres) {
+               case 512:
+                       if(XGIbios_mode[myindex].yres != 512) return -1;
+                       break;
+               case 640:
+                       if((XGIbios_mode[myindex].yres != 400) &&
+                          (XGIbios_mode[myindex].yres != 480))
+                               return -1;
+                       break;
+               case 800:
+                       if(XGIbios_mode[myindex].yres != 600) return -1;
+                       break;
+               case 1024:
+                       if(XGIbios_mode[myindex].yres != 768) return -1;
+                       break;
+               case 1280:
+                       if((XGIbios_mode[myindex].yres != 960) &&
+                          (XGIbios_mode[myindex].yres != 1024))
+                               return -1;
+                       if(XGIbios_mode[myindex].yres == 960) {
+                           if(XGIhw_ext.ulCRT2LCDType == LCD_1400x1050)
+                               return -1;
+                       }
+                       break;
+               case 1400:
+                       if(XGIbios_mode[myindex].yres != 1050) return -1;
+                       break;
+               case 1600:
+                       if(XGIbios_mode[myindex].yres != 1200) return -1;
+                       break;
+               default:
+                       return -1;
+          }
+       }
+       break;
+     case DISPTYPE_TV:
+       switch (XGIbios_mode[myindex].xres) {
+       case 512:
+       case 640:
+       case 800:
+               break;
+       case 720:
+               if (xgi_video_info.TV_type == TVMODE_NTSC) {
+                       if (XGIbios_mode[myindex].yres != 480) {
+                               return(-1);
+                       }
+               } else if (xgi_video_info.TV_type == TVMODE_PAL) {
+                       if (XGIbios_mode[myindex].yres != 576) {
+                               return(-1);
+                       }
+               }
+               // TW: LVDS/CHRONTEL does not support 720
+               if (xgi_video_info.hasVB == HASVB_LVDS_CHRONTEL ||
+                                       xgi_video_info.hasVB == HASVB_CHRONTEL) {
+                               return(-1);
+               }
+               break;
+       case 1024:
+               if (xgi_video_info.TV_type == TVMODE_NTSC) {
+                       if(XGIbios_mode[myindex].bpp == 32) {
+                              return(-1);
+                       }
+               }
+               // TW: LVDS/CHRONTEL only supports < 800 (1024 on 650/Ch7019)
+               if (xgi_video_info.hasVB == HASVB_LVDS_CHRONTEL ||
+                                       xgi_video_info.hasVB == HASVB_CHRONTEL) {
+                   if(xgi_video_info.chip < XGI_315H) {
+                               return(-1);
+                   }
+               }
+               break;
+       default:
+               return(-1);
+       }
+       break;
+     case DISPTYPE_CRT2:
+        if(XGIbios_mode[myindex].xres > 1280) return -1;
+       break;
+     }
+     return(myindex);
+
+}
+
+static void XGIfb_search_crt2type(const char *name)
+{
+       int i = 0;
+
+       if(name == NULL)
+               return;
+
+       while(XGI_crt2type[i].type_no != -1) {
+               if (!strcmp(name, XGI_crt2type[i].name)) {
+                       XGIfb_crt2type = XGI_crt2type[i].type_no;
+                       XGIfb_tvplug = XGI_crt2type[i].tvplug_no;
+                       break;
+               }
+               i++;
+       }
+       if(XGIfb_crt2type < 0)
+               printk(KERN_INFO "XGIfb: Invalid CRT2 type: %s\n", name);
+}
+
+static void XGIfb_search_queuemode(const char *name)
+{
+       int i = 0;
+
+       if(name == NULL)
+               return;
+
+       while (XGI_queuemode[i].type_no != -1) {
+               if (!strcmp(name, XGI_queuemode[i].name)) {
+                       XGIfb_queuemode = XGI_queuemode[i].type_no;
+                       break;
+               }
+               i++;
+       }
+       if (XGIfb_queuemode < 0)
+               printk(KERN_INFO "XGIfb: Invalid queuemode type: %s\n", name);
+}
+
+static u8 XGIfb_search_refresh_rate(unsigned int rate)
+{
+       u16 xres, yres;
+       int i = 0;
+
+       xres = XGIbios_mode[xgifb_mode_idx].xres;
+       yres = XGIbios_mode[xgifb_mode_idx].yres;
+
+       XGIfb_rate_idx = 0;
+       while ((XGIfb_vrate[i].idx != 0) && (XGIfb_vrate[i].xres <= xres)) {
+               if ((XGIfb_vrate[i].xres == xres) && (XGIfb_vrate[i].yres == yres)) {
+                       if (XGIfb_vrate[i].refresh == rate) {
+                               XGIfb_rate_idx = XGIfb_vrate[i].idx;
+                               break;
+                       } else if (XGIfb_vrate[i].refresh > rate) {
+                               if ((XGIfb_vrate[i].refresh - rate) <= 3) {
+                                       DPRINTK("XGIfb: Adjusting rate from %d up to %d\n",
+                                               rate, XGIfb_vrate[i].refresh);
+                                       XGIfb_rate_idx = XGIfb_vrate[i].idx;
+                                       xgi_video_info.refresh_rate = XGIfb_vrate[i].refresh;
+                               } else if (((rate - XGIfb_vrate[i-1].refresh) <= 2)
+                                               && (XGIfb_vrate[i].idx != 1)) {
+                                       DPRINTK("XGIfb: Adjusting rate from %d down to %d\n",
+                                               rate, XGIfb_vrate[i-1].refresh);
+                                       XGIfb_rate_idx = XGIfb_vrate[i-1].idx;
+                                       xgi_video_info.refresh_rate = XGIfb_vrate[i-1].refresh;
+                               }
+                               break;
+                       } else if((rate - XGIfb_vrate[i].refresh) <= 2) {
+                               DPRINTK("XGIfb: Adjusting rate from %d down to %d\n",
+                                               rate, XGIfb_vrate[i].refresh);
+                               XGIfb_rate_idx = XGIfb_vrate[i].idx;
+                               break;
+                       }
+               }
+               i++;
+       }
+       if (XGIfb_rate_idx > 0) {
+               return XGIfb_rate_idx;
+       } else {
+               printk(KERN_INFO
+                       "XGIfb: Unsupported rate %d for %dx%d\n", rate, xres, yres);
+               return 0;
+       }
+}
+
+static void XGIfb_search_tvstd(const char *name)
+{
+       int i = 0;
+
+       if(name == NULL)
+               return;
+
+       while (XGI_tvtype[i].type_no != -1) {
+               if (!strcmp(name, XGI_tvtype[i].name)) {
+                       XGIfb_tvmode = XGI_tvtype[i].type_no;
+                       break;
+               }
+               i++;
+       }
+}
+
+static BOOLEAN XGIfb_bridgeisslave(void)
+{
+   unsigned char usScratchP1_00;
+
+   if(xgi_video_info.hasVB == HASVB_NONE) return FALSE;
+
+   inXGIIDXREG(XGIPART1,0x00,usScratchP1_00);
+   if( (usScratchP1_00 & 0x50) == 0x10)  {
+          return TRUE;
+   } else {
+           return FALSE;
+   }
+}
+
+static BOOLEAN XGIfbcheckvretracecrt1(void)
+{
+   unsigned char temp;
+
+   inXGIIDXREG(XGICR,0x17,temp);
+   if(!(temp & 0x80)) return FALSE;
+
+
+   inXGIIDXREG(XGISR,0x1f,temp);
+   if(temp & 0xc0) return FALSE;
+
+
+   if(inXGIREG(XGIINPSTAT) & 0x08) return TRUE;
+   else                           return FALSE;
+}
+
+static BOOLEAN XGIfbcheckvretracecrt2(void)
+{
+   unsigned char temp;
+   if(xgi_video_info.hasVB == HASVB_NONE) return FALSE;
+   inXGIIDXREG(XGIPART1, 0x30, temp);
+   if(temp & 0x02) return FALSE;
+   else           return TRUE;
+}
+
+static BOOLEAN XGIfb_CheckVBRetrace(void)
+{
+   if(xgi_video_info.disp_state & DISPTYPE_DISP2) {
+      if(XGIfb_bridgeisslave()) {
+         return(XGIfbcheckvretracecrt1());
+      } else {
+         return(XGIfbcheckvretracecrt2());
+      }
+   }
+   return(XGIfbcheckvretracecrt1());
+}
+
+/* ----------- FBDev related routines for all series ----------- */
+
+
+static void XGIfb_bpp_to_var(struct fb_var_screeninfo *var)
+{
+       switch(var->bits_per_pixel) {
+          case 8:
+               var->red.offset = var->green.offset = var->blue.offset = 0;
+               var->red.length = var->green.length = var->blue.length = 6;
+               xgi_video_info.video_cmap_len = 256;
+               break;
+          case 16:
+               var->red.offset = 11;
+               var->red.length = 5;
+               var->green.offset = 5;
+               var->green.length = 6;
+               var->blue.offset = 0;
+               var->blue.length = 5;
+               var->transp.offset = 0;
+               var->transp.length = 0;
+               xgi_video_info.video_cmap_len = 16;
+               break;
+          case 32:
+               var->red.offset = 16;
+               var->red.length = 8;
+               var->green.offset = 8;
+               var->green.length = 8;
+               var->blue.offset = 0;
+               var->blue.length = 8;
+               var->transp.offset = 24;
+               var->transp.length = 8;
+               xgi_video_info.video_cmap_len = 16;
+               break;
+       }
+}
+
+
+
+static int XGIfb_do_set_var(struct fb_var_screeninfo *var, int isactive,
+                     struct fb_info *info)
+{
+
+       unsigned int htotal = var->left_margin + var->xres +
+               var->right_margin + var->hsync_len;
+       unsigned int vtotal = var->upper_margin + var->yres +
+               var->lower_margin + var->vsync_len;
+#if defined(__powerpc__)
+       u8 sr_data, cr_data;
+#endif
+       unsigned int drate = 0, hrate = 0;
+       int found_mode = 0;
+       int old_mode;
+//     unsigned char reg,reg1;
+
+       DEBUGPRN("Inside do_set_var");
+//        printk(KERN_DEBUG "XGIfb:var->yres=%d, var->upper_margin=%d, var->lower_margin=%d, var->vsync_len=%d\n", var->yres,var->upper_margin,var->lower_margin,var->vsync_len);
+
+        info->var.xres_virtual = var->xres_virtual;
+        info->var.yres_virtual = var->yres_virtual;
+        info->var.bits_per_pixel = var->bits_per_pixel;
+
+       if ((var->vmode & FB_VMODE_MASK) == FB_VMODE_NONINTERLACED)
+               vtotal <<= 1;
+       else if ((var->vmode & FB_VMODE_MASK) == FB_VMODE_DOUBLE)
+               vtotal <<= 2;
+       else if ((var->vmode & FB_VMODE_MASK) == FB_VMODE_INTERLACED)
+       {
+//             vtotal <<= 1;
+//             var->yres <<= 1;
+       }
+
+       if(!htotal || !vtotal) {
+               DPRINTK("XGIfb: Invalid 'var' information\n");
+               return -EINVAL;
+       }
+        printk(KERN_DEBUG "XGIfb: var->pixclock=%d, htotal=%d, vtotal=%d\n",
+                var->pixclock,htotal,vtotal);
+
+
+
+       if(var->pixclock && htotal && vtotal) {
+               drate = 1000000000 / var->pixclock;
+               hrate = (drate * 1000) / htotal;
+               xgi_video_info.refresh_rate = (unsigned int) (hrate * 2 / vtotal);
+       } else {
+               xgi_video_info.refresh_rate = 60;
+       }
+
+       printk(KERN_DEBUG "XGIfb: Change mode to %dx%dx%d-%dHz\n",
+               var->xres,var->yres,var->bits_per_pixel,xgi_video_info.refresh_rate);
+
+       old_mode = xgifb_mode_idx;
+       xgifb_mode_idx = 0;
+
+       while( (XGIbios_mode[xgifb_mode_idx].mode_no != 0) &&
+              (XGIbios_mode[xgifb_mode_idx].xres <= var->xres) ) {
+               if( (XGIbios_mode[xgifb_mode_idx].xres == var->xres) &&
+                   (XGIbios_mode[xgifb_mode_idx].yres == var->yres) &&
+                   (XGIbios_mode[xgifb_mode_idx].bpp == var->bits_per_pixel)) {
+                       XGIfb_mode_no = XGIbios_mode[xgifb_mode_idx].mode_no;
+                       found_mode = 1;
+                       break;
+               }
+               xgifb_mode_idx++;
+       }
+
+       if(found_mode)
+               xgifb_mode_idx = XGIfb_validate_mode(xgifb_mode_idx);
+       else
+               xgifb_mode_idx = -1;
+
+               if(xgifb_mode_idx < 0) {
+               printk(KERN_ERR "XGIfb: Mode %dx%dx%d not supported\n", var->xres,
+                      var->yres, var->bits_per_pixel);
+               xgifb_mode_idx = old_mode;
+               return -EINVAL;
+       }
+
+       if(XGIfb_search_refresh_rate(xgi_video_info.refresh_rate) == 0) {
+               XGIfb_rate_idx = XGIbios_mode[xgifb_mode_idx].rate_idx;
+               xgi_video_info.refresh_rate = 60;
+       }
+
+       if(isactive) {
+
+
+               XGIfb_pre_setmode();
+               if(XGISetModeNew( &XGIhw_ext, XGIfb_mode_no) == 0) {
+                       printk(KERN_ERR "XGIfb: Setting mode[0x%x] failed\n", XGIfb_mode_no);
+                       return -EINVAL;
+               }
+       info->fix.line_length = ((info->var.xres_virtual * info->var.bits_per_pixel)>>6);
+
+       outXGIIDXREG(XGISR,IND_XGI_PASSWORD,XGI_PASSWORD);
+
+               outXGIIDXREG(XGICR,0x13,(info->fix.line_length & 0x00ff));
+               outXGIIDXREG(XGISR,0x0E,(info->fix.line_length & 0xff00)>>8);
+
+               XGIfb_post_setmode();
+
+               DPRINTK("XGIfb: Set new mode: %dx%dx%d-%d \n",
+                       XGIbios_mode[xgifb_mode_idx].xres,
+                       XGIbios_mode[xgifb_mode_idx].yres,
+                       XGIbios_mode[xgifb_mode_idx].bpp,
+                       xgi_video_info.refresh_rate);
+
+               xgi_video_info.video_bpp = XGIbios_mode[xgifb_mode_idx].bpp;
+               xgi_video_info.video_vwidth = info->var.xres_virtual;
+               xgi_video_info.video_width = XGIbios_mode[xgifb_mode_idx].xres;
+               xgi_video_info.video_vheight = info->var.yres_virtual;
+               xgi_video_info.video_height = XGIbios_mode[xgifb_mode_idx].yres;
+               xgi_video_info.org_x = xgi_video_info.org_y = 0;
+               xgi_video_info.video_linelength = info->var.xres_virtual * (xgi_video_info.video_bpp >> 3);
+               xgi_video_info.accel = 0;
+               if(XGIfb_accel) {
+                  xgi_video_info.accel = (var->accel_flags & FB_ACCELF_TEXT) ? -1 : 0;
+               }
+               switch(xgi_video_info.video_bpp)
+               {
+               case 8:
+                       xgi_video_info.DstColor = 0x0000;
+                       xgi_video_info.XGI310_AccelDepth = 0x00000000;
+                           xgi_video_info.video_cmap_len = 256;
+#if defined(__powerpc__)
+                inXGIIDXREG (XGICR, 0x4D, cr_data);
+                outXGIIDXREG(XGICR, 0x4D, (cr_data & 0xE0));
+#endif
+                break;
+               case 16:
+               xgi_video_info.DstColor = 0x8000;
+               xgi_video_info.XGI310_AccelDepth = 0x00010000;
+#if defined(__powerpc__)
+                inXGIIDXREG (XGICR, 0x4D, cr_data);
+                outXGIIDXREG(XGICR, 0x4D, ((cr_data & 0xE0) | 0x0B));
+#endif
+                           xgi_video_info.video_cmap_len = 16;
+               break;
+               case 32:
+               xgi_video_info.DstColor = 0xC000;
+                       xgi_video_info.XGI310_AccelDepth = 0x00020000;
+                           xgi_video_info.video_cmap_len = 16;
+#if defined(__powerpc__)
+                inXGIIDXREG (XGICR, 0x4D, cr_data);
+                outXGIIDXREG(XGICR, 0x4D, ((cr_data & 0xE0) | 0x15));
+#endif
+               break;
+                   default:
+                           xgi_video_info.video_cmap_len = 16;
+                       printk(KERN_ERR "XGIfb: Unsupported depth %d", xgi_video_info.video_bpp);
+                           xgi_video_info.accel = 0;
+                           break;
+       }
+       }
+       XGIfb_bpp_to_var(var); /*update ARGB info*/
+       DEBUGPRN("End of do_set_var");
+
+       dumpVGAReg();
+       return 0;
+}
+
+#ifdef XGIFB_PAN
+static int XGIfb_pan_var(struct fb_var_screeninfo *var)
+{
+       unsigned int base;
+
+//     printk("Inside pan_var");
+
+       if (var->xoffset > (var->xres_virtual - var->xres)) {
+//             printk( "Pan: xo: %d xv %d xr %d\n",
+//                     var->xoffset, var->xres_virtual, var->xres);
+               return -EINVAL;
+       }
+       if(var->yoffset > (var->yres_virtual - var->yres)) {
+//             printk( "Pan: yo: %d yv %d yr %d\n",
+//                     var->yoffset, var->yres_virtual, var->yres);
+               return -EINVAL;
+       }
+        base = var->yoffset * var->xres_virtual + var->xoffset;
+
+        /* calculate base bpp dep. */
+        switch(var->bits_per_pixel) {
+        case 16:
+               base >>= 1;
+               break;
+       case 32:
+               break;
+       case 8:
+        default:
+               base >>= 2;
+               break;
+        }
+
+       outXGIIDXREG(XGISR, IND_XGI_PASSWORD, XGI_PASSWORD);
+
+        outXGIIDXREG(XGICR, 0x0D, base & 0xFF);
+       outXGIIDXREG(XGICR, 0x0C, (base >> 8) & 0xFF);
+       outXGIIDXREG(XGISR, 0x0D, (base >> 16) & 0xFF);
+        outXGIIDXREG(XGISR, 0x37, (base >> 24) & 0x03);
+       setXGIIDXREG(XGISR, 0x37, 0xDF, (base >> 21) & 0x04);
+
+        if(xgi_video_info.disp_state & DISPTYPE_DISP2) {
+               orXGIIDXREG(XGIPART1, XGIfb_CRT2_write_enable, 0x01);
+               outXGIIDXREG(XGIPART1, 0x06, (base & 0xFF));
+               outXGIIDXREG(XGIPART1, 0x05, ((base >> 8) & 0xFF));
+               outXGIIDXREG(XGIPART1, 0x04, ((base >> 16) & 0xFF));
+               setXGIIDXREG(XGIPART1, 0x02, 0x7F, ((base >> 24) & 0x01) << 7);
+        }
+//     printk("End of pan_var");
+       return 0;
+}
+#endif
+
+
+void XGI_dispinfo(struct ap_data *rec)
+{
+       rec->minfo.bpp    = xgi_video_info.video_bpp;
+       rec->minfo.xres   = xgi_video_info.video_width;
+       rec->minfo.yres   = xgi_video_info.video_height;
+       rec->minfo.v_xres = xgi_video_info.video_vwidth;
+       rec->minfo.v_yres = xgi_video_info.video_vheight;
+       rec->minfo.org_x  = xgi_video_info.org_x;
+       rec->minfo.org_y  = xgi_video_info.org_y;
+       rec->minfo.vrate  = xgi_video_info.refresh_rate;
+       rec->iobase       = xgi_video_info.vga_base - 0x30;
+       rec->mem_size     = xgi_video_info.video_size;
+       rec->disp_state   = xgi_video_info.disp_state;
+       rec->version      = (VER_MAJOR << 24) | (VER_MINOR << 16) | VER_LEVEL;
+       rec->hasVB        = xgi_video_info.hasVB;
+       rec->TV_type      = xgi_video_info.TV_type;
+       rec->TV_plug      = xgi_video_info.TV_plug;
+       rec->chip         = xgi_video_info.chip;
+}
+
+
+
+
+static int XGIfb_open(struct fb_info *info, int user)
+{
+    return 0;
+}
+
+static int XGIfb_release(struct fb_info *info, int user)
+{
+    return 0;
+}
+
+static int XGIfb_get_cmap_len(const struct fb_var_screeninfo *var)
+{
+       int rc = 16;
+
+       switch(var->bits_per_pixel) {
+       case 8:
+               rc = 256;
+               break;
+       case 16:
+               rc = 16;
+               break;
+       case 32:
+               rc = 16;
+               break;
+       }
+       return rc;
+}
+
+static int XGIfb_setcolreg(unsigned regno, unsigned red, unsigned green, unsigned blue,
+                           unsigned transp, struct fb_info *info)
+{
+       if (regno >= XGIfb_get_cmap_len(&info->var))
+               return 1;
+
+       switch (info->var.bits_per_pixel) {
+       case 8:
+               outXGIREG(XGIDACA, regno);
+               outXGIREG(XGIDACD, (red >> 10));
+               outXGIREG(XGIDACD, (green >> 10));
+               outXGIREG(XGIDACD, (blue >> 10));
+               if (xgi_video_info.disp_state & DISPTYPE_DISP2) {
+                       outXGIREG(XGIDAC2A, regno);
+                       outXGIREG(XGIDAC2D, (red >> 8));
+                       outXGIREG(XGIDAC2D, (green >> 8));
+                       outXGIREG(XGIDAC2D, (blue >> 8));
+               }
+               break;
+       case 16:
+               ((u32 *)(info->pseudo_palette))[regno] =
+                   ((red & 0xf800)) | ((green & 0xfc00) >> 5) | ((blue & 0xf800) >> 11);
+               break;
+       case 32:
+               red >>= 8;
+               green >>= 8;
+               blue >>= 8;
+               ((u32 *) (info->pseudo_palette))[regno] =
+                       (red << 16) | (green << 8) | (blue);
+               break;
+       }
+       return 0;
+}
+
+static int XGIfb_set_par(struct fb_info *info)
+{
+       int err;
+
+//     printk("XGIfb: inside set_par\n");
+        if((err = XGIfb_do_set_var(&info->var, 1, info)))
+               return err;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
+       XGIfb_get_fix(&info->fix, info->currcon, info);
+#else
+       XGIfb_get_fix(&info->fix, -1, info);
+#endif
+//     printk("XGIfb:end of set_par\n");
+       return 0;
+}
+
+static int XGIfb_check_var(struct fb_var_screeninfo *var,
+                           struct fb_info *info)
+{
+       unsigned int htotal =
+               var->left_margin + var->xres + var->right_margin +
+               var->hsync_len;
+       unsigned int vtotal = 0;
+       unsigned int drate = 0, hrate = 0;
+       int found_mode = 0;
+       int refresh_rate, search_idx;
+
+       DEBUGPRN("Inside check_var");
+
+       if((var->vmode & FB_VMODE_MASK) == FB_VMODE_NONINTERLACED) {
+               vtotal = var->upper_margin + var->yres + var->lower_margin +
+                        var->vsync_len;
+               vtotal <<= 1;
+       } else if((var->vmode & FB_VMODE_MASK) == FB_VMODE_DOUBLE) {
+               vtotal = var->upper_margin + var->yres + var->lower_margin +
+                        var->vsync_len;
+               vtotal <<= 2;
+       } else if((var->vmode & FB_VMODE_MASK) == FB_VMODE_INTERLACED) {
+               vtotal = var->upper_margin + (var->yres/2) + var->lower_margin +
+                        var->vsync_len;
+       } else  vtotal = var->upper_margin + var->yres + var->lower_margin +
+                        var->vsync_len;
+
+       if(!(htotal) || !(vtotal)) {
+               XGIFAIL("XGIfb: no valid timing data");
+       }
+
+
+        if(var->pixclock && htotal && vtotal) {
+                drate = 1000000000 / var->pixclock;
+                hrate = (drate * 1000) / htotal;
+                xgi_video_info.refresh_rate = (unsigned int) (hrate * 2 / vtotal);
+       printk(KERN_DEBUG \
+               "%s: pixclock = %d ,htotal=%d, vtotal=%d\n" \
+               "%s: drate=%d, hrate=%d, refresh_rate=%d\n",
+               __func__,var->pixclock, htotal, vtotal,
+               __func__, drate, hrate, xgi_video_info.refresh_rate);
+        } else {
+                xgi_video_info.refresh_rate = 60;
+        }
+
+/*
+       if((var->pixclock) && (htotal)) {
+          drate = 1E12 / var->pixclock;
+          hrate = drate / htotal;
+          refresh_rate = (unsigned int) (hrate / vtotal * 2 + 0.5);
+       } else refresh_rate = 60;
+*/
+       /* TW: Calculation wrong for 1024x600 - force it to 60Hz */
+       if((var->xres == 1024) && (var->yres == 600)) refresh_rate = 60;
+
+       search_idx = 0;
+       while((XGIbios_mode[search_idx].mode_no != 0) &&
+              (XGIbios_mode[search_idx].xres <= var->xres) ) {
+           if((XGIbios_mode[search_idx].xres == var->xres) &&
+              (XGIbios_mode[search_idx].yres == var->yres) &&
+                   (XGIbios_mode[search_idx].bpp == var->bits_per_pixel)) {
+                       if(XGIfb_validate_mode(search_idx) > 0) {
+                   found_mode = 1;
+                   break;
+               }
+           }
+               search_idx++;
+       }
+
+       if(!found_mode) {
+
+               printk(KERN_ERR "XGIfb: %dx%dx%d is no valid mode\n",
+                       var->xres, var->yres, var->bits_per_pixel);
+
+                search_idx = 0;
+               while(XGIbios_mode[search_idx].mode_no != 0) {
+
+                  if( (var->xres <= XGIbios_mode[search_idx].xres) &&
+                      (var->yres <= XGIbios_mode[search_idx].yres) &&
+                      (var->bits_per_pixel == XGIbios_mode[search_idx].bpp) ) {
+                         if(XGIfb_validate_mode(search_idx) > 0) {
+                            found_mode = 1;
+                            break;
+                         }
+                  }
+                  search_idx++;
+               }
+               if(found_mode) {
+                       var->xres = XGIbios_mode[search_idx].xres;
+                       var->yres = XGIbios_mode[search_idx].yres;
+                       printk(KERN_DEBUG "XGIfb: Adapted to mode %dx%dx%d\n",
+                               var->xres, var->yres, var->bits_per_pixel);
+
+               } else {
+                       printk(KERN_ERR "XGIfb: Failed to find similar mode to %dx%dx%d\n",
+                               var->xres, var->yres, var->bits_per_pixel);
+                       return -EINVAL;
+               }
+       }
+
+       /* TW: TODO: Check the refresh rate */
+
+       /* Adapt RGB settings */
+       XGIfb_bpp_to_var(var);
+
+       /* Sanity check for offsets */
+       if (var->xoffset < 0)
+               var->xoffset = 0;
+       if (var->yoffset < 0)
+               var->yoffset = 0;
+
+
+       if(!XGIfb_ypan) {
+               if(var->xres != var->xres_virtual)
+                        var->xres_virtual = var->xres;
+               if(var->yres != var->yres_virtual)
+                       var->yres_virtual = var->yres;
+       }/* else {
+          // TW: Now patch yres_virtual if we use panning
+          // May I do this?
+          var->yres_virtual = xgi_video_info.heapstart / (var->xres * (var->bits_per_pixel >> 3));
+           if(var->yres_virtual <= var->yres) {
+               // TW: Paranoia check
+               var->yres_virtual = var->yres;
+           }
+       }*/
+
+       /* Truncate offsets to maximum if too high */
+       if (var->xoffset > var->xres_virtual - var->xres)
+               var->xoffset = var->xres_virtual - var->xres - 1;
+
+       if (var->yoffset > var->yres_virtual - var->yres)
+               var->yoffset = var->yres_virtual - var->yres - 1;
+
+       /* Set everything else to 0 */
+       var->red.msb_right =
+           var->green.msb_right =
+           var->blue.msb_right =
+           var->transp.offset = var->transp.length = var->transp.msb_right = 0;
+
+       DEBUGPRN("end of check_var");
+       return 0;
+}
+
+#ifdef XGIFB_PAN
+static int XGIfb_pan_display( struct fb_var_screeninfo *var,
+                                struct fb_info* info)
+{
+       int err;
+
+//     printk("\nInside pan_display:");
+
+       if (var->xoffset > (var->xres_virtual - var->xres))
+               return -EINVAL;
+       if (var->yoffset > (var->yres_virtual - var->yres))
+               return -EINVAL;
+
+       if (var->vmode & FB_VMODE_YWRAP) {
+               if (var->yoffset < 0
+                   || var->yoffset >= info->var.yres_virtual
+                   || var->xoffset) return -EINVAL;
+       } else {
+               if (var->xoffset + info->var.xres > info->var.xres_virtual ||
+                   var->yoffset + info->var.yres > info->var.yres_virtual)
+                       return -EINVAL;
+       }
+
+       if((err = XGIfb_pan_var(var)) < 0) return err;
+
+       info->var.xoffset = var->xoffset;
+       info->var.yoffset = var->yoffset;
+       if (var->vmode & FB_VMODE_YWRAP)
+               info->var.vmode |= FB_VMODE_YWRAP;
+       else
+               info->var.vmode &= ~FB_VMODE_YWRAP;
+
+//     printk(" End of pan_display");
+       return 0;
+}
+#endif
+
+#if 0
+static int XGIfb_mmap(struct fb_info *info, struct file *file,
+                     struct vm_area_struct *vma)
+{
+       unsigned long start;
+       unsigned long off;
+       u32 len, mmio_off;
+
+       DEBUGPRN("inside mmap");
+       if(vma->vm_pgoff > (~0UL >> PAGE_SHIFT))  return -EINVAL;
+
+       off = vma->vm_pgoff << PAGE_SHIFT;
+
+       start = (unsigned long) xgi_video_info.video_base;
+       len = PAGE_ALIGN((start & ~PAGE_MASK) + xgi_video_info.video_size);
+       start &= PAGE_MASK;
+#if 0
+       if (off >= len) {
+               off -= len;
+#endif
+       /* By Jake Page: Treat mmap request with offset beyond heapstart
+        *               as request for mapping the mmio area
+        */
+       #if 1
+       mmio_off = PAGE_ALIGN((start & ~PAGE_MASK) + xgi_video_info.heapstart);
+       if(off >= mmio_off) {
+               off -= mmio_off;
+               if(info->var.accel_flags) return -EINVAL;
+
+               start = (unsigned long) xgi_video_info.mmio_base;
+               len = PAGE_ALIGN((start & ~PAGE_MASK) + XGIfb_mmio_size);
+       }
+       start &= PAGE_MASK;
+       #endif
+       if((vma->vm_end - vma->vm_start + off) > len)   return -EINVAL;
+
+       off += start;
+       vma->vm_pgoff = off >> PAGE_SHIFT;
+       vma->vm_flags |= VM_IO;   /* by Jake Page; is that really needed? */
+
+#if defined(__i386__) || defined(__x86_64__)
+       if (boot_cpu_data.x86 > 3)
+               pgprot_val(vma->vm_page_prot) |= _PAGE_PCD;
+#endif
+       if (io_remap_pfn_range(vma, vma->vm_start, off >> PAGE_SHIFT, vma->vm_end - vma->vm_start,
+                               vma->vm_page_prot))
+               return -EAGAIN;
+
+        DEBUGPRN("end of mmap");
+       return 0;
+}
+#endif
+static int XGIfb_blank(int blank, struct fb_info *info)
+{
+       u8 reg;
+
+       inXGIIDXREG(XGICR, 0x17, reg);
+
+       if(blank > 0)
+               reg &= 0x7f;
+       else
+               reg |= 0x80;
+
+        outXGIIDXREG(XGICR, 0x17, reg);
+       outXGIIDXREG(XGISR, 0x00, 0x01);    /* Synchronous Reset */
+       outXGIIDXREG(XGISR, 0x00, 0x03);    /* End Reset */
+        return(0);
+}
+
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
+static int XGIfb_ioctl(struct fb_info *info, unsigned int cmd,
+                           unsigned long arg)
+#else
+static int XGIfb_ioctl(struct inode *inode, struct file *file,
+                      unsigned int cmd, unsigned long arg,
+                      struct fb_info *info)
+#endif
+
+{
+       DEBUGPRN("inside ioctl");
+       switch (cmd) {
+          case FBIO_ALLOC:
+               if (!capable(CAP_SYS_RAWIO))
+                       return -EPERM;
+               XGI_malloc((struct XGI_memreq *) arg);
+               break;
+          case FBIO_FREE:
+               if (!capable(CAP_SYS_RAWIO))
+                       return -EPERM;
+               XGI_free(*(unsigned long *) arg);
+               break;
+          case FBIOGET_HWCINFO:
+               {
+                       unsigned long *hwc_offset = (unsigned long *) arg;
+
+                       if (XGIfb_caps & HW_CURSOR_CAP)
+                               *hwc_offset = XGIfb_hwcursor_vbase -
+                                   (unsigned long) xgi_video_info.video_vbase;
+                       else
+                               *hwc_offset = 0;
+
+                       break;
+               }
+          case FBIOPUT_MODEINFO:
+               {
+                       struct mode_info *x = (struct mode_info *)arg;
+
+                       xgi_video_info.video_bpp        = x->bpp;
+                       xgi_video_info.video_width      = x->xres;
+                       xgi_video_info.video_height     = x->yres;
+                       xgi_video_info.video_vwidth     = x->v_xres;
+                       xgi_video_info.video_vheight    = x->v_yres;
+                       xgi_video_info.org_x            = x->org_x;
+                       xgi_video_info.org_y            = x->org_y;
+                       xgi_video_info.refresh_rate     = x->vrate;
+                       xgi_video_info.video_linelength = xgi_video_info.video_vwidth * (xgi_video_info.video_bpp >> 3);
+                       switch(xgi_video_info.video_bpp) {
+                       case 8:
+                               xgi_video_info.DstColor = 0x0000;
+                               xgi_video_info.XGI310_AccelDepth = 0x00000000;
+                               xgi_video_info.video_cmap_len = 256;
+                               break;
+                       case 16:
+                               xgi_video_info.DstColor = 0x8000;
+                               xgi_video_info.XGI310_AccelDepth = 0x00010000;
+                               xgi_video_info.video_cmap_len = 16;
+                               break;
+                       case 32:
+                               xgi_video_info.DstColor = 0xC000;
+                               xgi_video_info.XGI310_AccelDepth = 0x00020000;
+                               xgi_video_info.video_cmap_len = 16;
+                               break;
+                       default:
+                               xgi_video_info.video_cmap_len = 16;
+                               printk(KERN_ERR "XGIfb: Unsupported accel depth %d", xgi_video_info.video_bpp);
+                               xgi_video_info.accel = 0;
+                               break;
+                       }
+
+                       break;
+               }
+          case FBIOGET_DISPINFO:
+               XGI_dispinfo((struct ap_data *)arg);
+               break;
+          case XGIFB_GET_INFO:  /* TW: New for communication with X driver */
+               {
+                       XGIfb_info *x = (XGIfb_info *)arg;
+
+                       //x->XGIfb_id = XGIFB_ID;
+                       x->XGIfb_version = VER_MAJOR;
+                       x->XGIfb_revision = VER_MINOR;
+                       x->XGIfb_patchlevel = VER_LEVEL;
+                       x->chip_id = xgi_video_info.chip_id;
+                       x->memory = xgi_video_info.video_size / 1024;
+                       x->heapstart = xgi_video_info.heapstart / 1024;
+                       x->fbvidmode = XGIfb_mode_no;
+                       x->XGIfb_caps = XGIfb_caps;
+                       x->XGIfb_tqlen = 512; /* yet unused */
+                       x->XGIfb_pcibus = xgi_video_info.pcibus;
+                       x->XGIfb_pcislot = xgi_video_info.pcislot;
+                       x->XGIfb_pcifunc = xgi_video_info.pcifunc;
+                       x->XGIfb_lcdpdc = XGIfb_detectedpdc;
+                       x->XGIfb_lcda = XGIfb_detectedlcda;
+                       break;
+               }
+          case XGIFB_GET_VBRSTATUS:
+               {
+                       unsigned long *vbrstatus = (unsigned long *) arg;
+                       if(XGIfb_CheckVBRetrace()) *vbrstatus = 1;
+                       else                       *vbrstatus = 0;
+               }
+          default:
+               return -EINVAL;
+       }
+       DEBUGPRN("end of ioctl");
+       return 0;
+
+}
+
+
+
+/* ----------- FBDev related routines for all series ---------- */
+
+static int XGIfb_get_fix(struct fb_fix_screeninfo *fix, int con,
+                        struct fb_info *info)
+{
+       DEBUGPRN("inside get_fix");
+       memset(fix, 0, sizeof(struct fb_fix_screeninfo));
+
+       strcpy(fix->id, myid);
+
+       fix->smem_start = xgi_video_info.video_base;
+
+       fix->smem_len = xgi_video_info.video_size;
+
+
+/*        if((!XGIfb_mem) || (XGIfb_mem > (xgi_video_info.video_size/1024))) {
+           if (xgi_video_info.video_size > 0x1000000) {
+               fix->smem_len = 0xD00000;
+           } else if (xgi_video_info.video_size > 0x800000)
+               fix->smem_len = 0x800000;
+           else
+               fix->smem_len = 0x400000;
+        } else
+               fix->smem_len = XGIfb_mem * 1024;
+*/
+       fix->type        = video_type;
+       fix->type_aux    = 0;
+       if(xgi_video_info.video_bpp == 8)
+               fix->visual = FB_VISUAL_PSEUDOCOLOR;
+       else
+               fix->visual = FB_VISUAL_DIRECTCOLOR;
+       fix->xpanstep    = 0;
+#ifdef XGIFB_PAN
+        if(XGIfb_ypan)          fix->ypanstep = 1;
+#endif
+       fix->ywrapstep   = 0;
+       fix->line_length = xgi_video_info.video_linelength;
+       fix->mmio_start  = xgi_video_info.mmio_base;
+       fix->mmio_len    = XGIfb_mmio_size;
+    if(xgi_video_info.chip >= XG40)
+          fix->accel    = FB_ACCEL_XGI_XABRE;
+       else
+          fix->accel    = FB_ACCEL_XGI_GLAMOUR_2;
+
+
+       DEBUGPRN("end of get_fix");
+       return 0;
+}
+
+
+static struct fb_ops XGIfb_ops = {
+       .owner        = THIS_MODULE,
+       .fb_open      = XGIfb_open,
+       .fb_release   = XGIfb_release,
+       .fb_check_var = XGIfb_check_var,
+       .fb_set_par   = XGIfb_set_par,
+       .fb_setcolreg = XGIfb_setcolreg,
+#ifdef XGIFB_PAN
+        .fb_pan_display = XGIfb_pan_display,
+#endif
+        .fb_blank     = XGIfb_blank,
+       .fb_fillrect  = fbcon_XGI_fillrect,
+       .fb_copyarea  = fbcon_XGI_copyarea,
+       .fb_imageblit = cfb_imageblit,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)
+       .fb_cursor    = soft_cursor,
+#endif
+       .fb_sync      = fbcon_XGI_sync,
+       .fb_ioctl     = XGIfb_ioctl,
+//     .fb_mmap      = XGIfb_mmap,
+};
+
+/* ---------------- Chip generation dependent routines ---------------- */
+
+
+/* for XGI 315/550/650/740/330 */
+
+static int XGIfb_get_dram_size(void)
+{
+
+       u8  ChannelNum,tmp;
+       u8  reg = 0;
+
+       /* xorg driver sets 32MB * 1 channel */
+       if (xgi_video_info.chip == XG27)
+               outXGIIDXREG(XGISR, IND_XGI_DRAM_SIZE, 0x51);
+
+               inXGIIDXREG(XGISR, IND_XGI_DRAM_SIZE, reg);
+               switch ((reg & XGI_DRAM_SIZE_MASK) >> 4) {
+                  case XGI_DRAM_SIZE_1MB:
+                       xgi_video_info.video_size = 0x100000;
+                       break;
+                  case XGI_DRAM_SIZE_2MB:
+                       xgi_video_info.video_size = 0x200000;
+                       break;
+                  case XGI_DRAM_SIZE_4MB:
+                       xgi_video_info.video_size = 0x400000;
+                       break;
+                  case XGI_DRAM_SIZE_8MB:
+                       xgi_video_info.video_size = 0x800000;
+                       break;
+                  case XGI_DRAM_SIZE_16MB:
+                       xgi_video_info.video_size = 0x1000000;
+                       break;
+                  case XGI_DRAM_SIZE_32MB:
+                       xgi_video_info.video_size = 0x2000000;
+                       break;
+                  case XGI_DRAM_SIZE_64MB:
+                       xgi_video_info.video_size = 0x4000000;
+                       break;
+                  case XGI_DRAM_SIZE_128MB:
+                       xgi_video_info.video_size = 0x8000000;
+                       break;
+                  case XGI_DRAM_SIZE_256MB:
+                       xgi_video_info.video_size = 0x10000000;
+                       break;
+                  default:
+                       return -1;
+               }
+
+               tmp = (reg & 0x0c) >> 2;
+               switch(xgi_video_info.chip)
+               {
+                   case XG20:
+                    case XG21:
+                   case XG27:
+                       ChannelNum = 1;
+                       break;
+
+                   case XG42:
+                       if(reg & 0x04)
+                           ChannelNum = 2;
+                       else
+                           ChannelNum = 1;
+                       break;
+
+                   case XG45:
+                       if(tmp == 1)
+                    ChannelNum = 2;
+                else
+                if(tmp == 2)
+                    ChannelNum = 3;
+                else
+                if(tmp == 3)
+                    ChannelNum = 4;
+                else
+                    ChannelNum = 1;
+                       break;
+
+                   case XG40:
+                   default:
+                if(tmp == 2)
+                    ChannelNum = 2;
+                else
+                if(tmp == 3)
+                    ChannelNum = 3;
+                else
+                    ChannelNum = 1;
+                       break;
+               }
+
+
+               xgi_video_info.video_size = xgi_video_info.video_size * ChannelNum;
+               //PLiad fixed for benchmarking and fb set
+               //xgi_video_info.video_size = 0x200000;//1024x768x16
+               //xgi_video_info.video_size = 0x1000000;//benchmark
+
+               printk("XGIfb: SR14=%x DramSzie %x ChannelNum %x\n",reg,xgi_video_info.video_size ,ChannelNum );
+               return 0;
+
+}
+
+static void XGIfb_detect_VB(void)
+{
+       u8 cr32, temp=0;
+
+       xgi_video_info.TV_plug = xgi_video_info.TV_type = 0;
+
+        switch(xgi_video_info.hasVB) {
+         case HASVB_LVDS_CHRONTEL:
+         case HASVB_CHRONTEL:
+            break;
+         case HASVB_301:
+         case HASVB_302:
+//          XGI_Sense30x(); //Yi-Lin TV Sense?
+            break;
+       }
+
+       inXGIIDXREG(XGICR, IND_XGI_SCRATCH_REG_CR32, cr32);
+
+       if ((cr32 & XGI_CRT1) && !XGIfb_crt1off)
+               XGIfb_crt1off = 0;
+       else {
+               if (cr32 & 0x5F)
+                       XGIfb_crt1off = 1;
+               else
+                       XGIfb_crt1off = 0;
+       }
+
+       if (XGIfb_crt2type != -1)
+               /* TW: Override with option */
+               xgi_video_info.disp_state = XGIfb_crt2type;
+       else if (cr32 & XGI_VB_TV)
+               xgi_video_info.disp_state = DISPTYPE_TV;
+       else if (cr32 & XGI_VB_LCD)
+               xgi_video_info.disp_state = DISPTYPE_LCD;
+       else if (cr32 & XGI_VB_CRT2)
+               xgi_video_info.disp_state = DISPTYPE_CRT2;
+       else
+               xgi_video_info.disp_state = 0;
+
+       if(XGIfb_tvplug != -1)
+               /* PR/TW: Override with option */
+               xgi_video_info.TV_plug = XGIfb_tvplug;
+       else if (cr32 & XGI_VB_HIVISION) {
+               xgi_video_info.TV_type = TVMODE_HIVISION;
+               xgi_video_info.TV_plug = TVPLUG_SVIDEO;
+       }
+       else if (cr32 & XGI_VB_SVIDEO)
+               xgi_video_info.TV_plug = TVPLUG_SVIDEO;
+       else if (cr32 & XGI_VB_COMPOSITE)
+               xgi_video_info.TV_plug = TVPLUG_COMPOSITE;
+       else if (cr32 & XGI_VB_SCART)
+               xgi_video_info.TV_plug = TVPLUG_SCART;
+
+       if(xgi_video_info.TV_type == 0) {
+           /* TW: PAL/NTSC changed for 650 */
+           if((xgi_video_info.chip <= XGI_315PRO) || (xgi_video_info.chip >= XGI_330)) {
+
+                inXGIIDXREG(XGICR, 0x38, temp);
+               if(temp & 0x10)
+                       xgi_video_info.TV_type = TVMODE_PAL;
+               else
+                       xgi_video_info.TV_type = TVMODE_NTSC;
+
+           } else {
+
+               inXGIIDXREG(XGICR, 0x79, temp);
+               if(temp & 0x20)
+                       xgi_video_info.TV_type = TVMODE_PAL;
+               else
+                       xgi_video_info.TV_type = TVMODE_NTSC;
+           }
+       }
+
+       /* TW: Copy forceCRT1 option to CRT1off if option is given */
+       if (XGIfb_forcecrt1 != -1) {
+               if (XGIfb_forcecrt1) XGIfb_crt1off = 0;
+               else                 XGIfb_crt1off = 1;
+       }
+}
+
+static void XGIfb_get_VB_type(void)
+{
+       u8 reg;
+
+       if (!XGIfb_has_VB()) {
+               inXGIIDXREG(XGICR, IND_XGI_SCRATCH_REG_CR37, reg);
+               switch ((reg & XGI_EXTERNAL_CHIP_MASK) >> 1) {
+                  case XGI310_EXTERNAL_CHIP_LVDS:
+                       xgi_video_info.hasVB = HASVB_LVDS;
+                       break;
+                  case XGI310_EXTERNAL_CHIP_LVDS_CHRONTEL:
+                       xgi_video_info.hasVB = HASVB_LVDS_CHRONTEL;
+                       break;
+                  default:
+                       break;
+               }
+       }
+}
+
+
+static int XGIfb_has_VB(void)
+{
+       u8 vb_chipid;
+
+       inXGIIDXREG(XGIPART4, 0x00, vb_chipid);
+       switch (vb_chipid) {
+          case 0x01:
+               xgi_video_info.hasVB = HASVB_301;
+               break;
+          case 0x02:
+               xgi_video_info.hasVB = HASVB_302;
+               break;
+          default:
+               xgi_video_info.hasVB = HASVB_NONE;
+               return FALSE;
+       }
+       return TRUE;
+}
+
+
+
+/* ------------------ Sensing routines ------------------ */
+
+/* TW: Determine and detect attached devices on XGI30x */
+int
+XGIDoSense(int tempbl, int tempbh, int tempcl, int tempch)
+{
+    int temp,i;
+
+    outXGIIDXREG(XGIPART4,0x11,tempbl);
+    temp = tempbh | tempcl;
+    setXGIIDXREG(XGIPART4,0x10,0xe0,temp);
+    for(i=0; i<10; i++) XGI_LongWait(&XGI_Pr);
+    tempch &= 0x7f;
+    inXGIIDXREG(XGIPART4,0x03,temp);
+    temp ^= 0x0e;
+    temp &= tempch;
+    return(temp);
+}
+
+void
+XGI_Sense30x(void)
+{
+  u8 backupP4_0d;
+  u8 testsvhs_tempbl, testsvhs_tempbh;
+  u8 testsvhs_tempcl, testsvhs_tempch;
+  u8 testcvbs_tempbl, testcvbs_tempbh;
+  u8 testcvbs_tempcl, testcvbs_tempch;
+  u8 testvga2_tempbl, testvga2_tempbh;
+  u8 testvga2_tempcl, testvga2_tempch;
+  int myflag, result;
+
+  inXGIIDXREG(XGIPART4,0x0d,backupP4_0d);
+  outXGIIDXREG(XGIPART4,0x0d,(backupP4_0d | 0x04));
+
+
+
+       testvga2_tempbh = 0x00; testvga2_tempbl = 0xd1;
+        testsvhs_tempbh = 0x00; testsvhs_tempbl = 0xb9;
+       testcvbs_tempbh = 0x00; testcvbs_tempbl = 0xb3;
+       if((XGIhw_ext.ujVBChipID != VB_CHIP_301) &&
+          (XGIhw_ext.ujVBChipID != VB_CHIP_302)) {
+             testvga2_tempbh = 0x01; testvga2_tempbl = 0x90;
+             testsvhs_tempbh = 0x01; testsvhs_tempbl = 0x6b;
+             testcvbs_tempbh = 0x01; testcvbs_tempbl = 0x74;
+             if(XGIhw_ext.ujVBChipID == VB_CHIP_301LV ||
+                XGIhw_ext.ujVBChipID == VB_CHIP_302LV) {
+                testvga2_tempbh = 0x00; testvga2_tempbl = 0x00;
+                testsvhs_tempbh = 0x02; testsvhs_tempbl = 0x00;
+                testcvbs_tempbh = 0x01; testcvbs_tempbl = 0x00;
+             }
+       }
+       if(XGIhw_ext.ujVBChipID != VB_CHIP_301LV &&
+          XGIhw_ext.ujVBChipID != VB_CHIP_302LV) {
+          inXGIIDXREG(XGIPART4,0x01,myflag);
+          if(myflag & 0x04) {
+             testvga2_tempbh = 0x00; testvga2_tempbl = 0xfd;
+             testsvhs_tempbh = 0x00; testsvhs_tempbl = 0xdd;
+             testcvbs_tempbh = 0x00; testcvbs_tempbl = 0xee;
+          }
+       }
+       if((XGIhw_ext.ujVBChipID == VB_CHIP_301LV) ||
+          (XGIhw_ext.ujVBChipID == VB_CHIP_302LV) ) {
+          testvga2_tempbh = 0x00; testvga2_tempbl = 0x00;
+          testvga2_tempch = 0x00; testvga2_tempcl = 0x00;
+          testsvhs_tempch = 0x04; testsvhs_tempcl = 0x08;
+          testcvbs_tempch = 0x08; testcvbs_tempcl = 0x08;
+       } else {
+          testvga2_tempch = 0x0e; testvga2_tempcl = 0x08;
+          testsvhs_tempch = 0x06; testsvhs_tempcl = 0x04;
+          testcvbs_tempch = 0x08; testcvbs_tempcl = 0x04;
+       }
+
+
+    if(testvga2_tempch || testvga2_tempcl || testvga2_tempbh || testvga2_tempbl) {
+        result = XGIDoSense(testvga2_tempbl, testvga2_tempbh,
+                            testvga2_tempcl, testvga2_tempch);
+       if(result) {
+               printk(KERN_INFO "XGIfb: Detected secondary VGA connection\n");
+               orXGIIDXREG(XGICR, 0x32, 0x10);
+       }
+    }
+
+    result = XGIDoSense(testsvhs_tempbl, testsvhs_tempbh,
+                        testsvhs_tempcl, testsvhs_tempch);
+    if(result) {
+        printk(KERN_INFO "XGIfb: Detected TV connected to SVHS output\n");
+        /* TW: So we can be sure that there IS a SVHS output */
+       xgi_video_info.TV_plug = TVPLUG_SVIDEO;
+       orXGIIDXREG(XGICR, 0x32, 0x02);
+    }
+
+    if(!result) {
+        result = XGIDoSense(testcvbs_tempbl, testcvbs_tempbh,
+                           testcvbs_tempcl, testcvbs_tempch);
+       if(result) {
+           printk(KERN_INFO "XGIfb: Detected TV connected to CVBS output\n");
+           /* TW: So we can be sure that there IS a CVBS output */
+           xgi_video_info.TV_plug = TVPLUG_COMPOSITE;
+           orXGIIDXREG(XGICR, 0x32, 0x01);
+       }
+    }
+    XGIDoSense(0, 0, 0, 0);
+
+    outXGIIDXREG(XGIPART4,0x0d,backupP4_0d);
+}
+
+
+
+/* ------------------------ Heap routines -------------------------- */
+
+static int XGIfb_heap_init(void)
+{
+       XGI_OH *poh;
+       u8 temp=0;
+
+       int            agp_enabled = 1;
+       u32            agp_size;
+       unsigned long *cmdq_baseport = 0;
+       unsigned long *read_port = 0;
+       unsigned long *write_port = 0;
+       XGI_CMDTYPE    cmd_type;
+#ifndef AGPOFF
+       struct agp_kern_info  *agp_info;
+       struct agp_memory     *agp;
+       u32            agp_phys;
+#endif
+
+/* TW: The heap start is either set manually using the "mem" parameter, or
+ *     defaults as follows:
+ *     -) If more than 16MB videoRAM available, let our heap start at 12MB.
+ *     -) If more than  8MB videoRAM available, let our heap start at  8MB.
+ *     -) If 4MB or less is available, let it start at 4MB.
+ *     This is for avoiding a clash with X driver which uses the beginning
+ *     of the videoRAM. To limit size of X framebuffer, use Option MaxXFBMem
+ *     in XF86Config-4.
+ *     The heap start can also be specified by parameter "mem" when starting the XGIfb
+ *     driver. XGIfb mem=1024 lets heap starts at 1MB, etc.
+ */
+     if ((!XGIfb_mem) || (XGIfb_mem > (xgi_video_info.video_size/1024))) {
+        if (xgi_video_info.video_size > 0x1000000) {
+               xgi_video_info.heapstart = 0xD00000;
+       } else if (xgi_video_info.video_size > 0x800000) {
+               xgi_video_info.heapstart = 0x800000;
+       } else {
+               xgi_video_info.heapstart = 0x400000;
+       }
+     } else {
+           xgi_video_info.heapstart = XGIfb_mem * 1024;
+     }
+     XGIfb_heap_start =
+              (unsigned long) (xgi_video_info.video_vbase + xgi_video_info.heapstart);
+     printk(KERN_INFO "XGIfb: Memory heap starting at %dK\n",
+                                       (int)(xgi_video_info.heapstart / 1024));
+
+     XGIfb_heap_end = (unsigned long) xgi_video_info.video_vbase + xgi_video_info.video_size;
+     XGIfb_heap_size = XGIfb_heap_end - XGIfb_heap_start;
+
+
+
+        /* TW: Now initialize the 310 series' command queue mode.
+        * On 310/325, there are three queue modes available which
+        * are chosen by setting bits 7:5 in SR26:
+        * 1. MMIO queue mode (bit 5, 0x20). The hardware will keep
+        *    track of the queue, the FIFO, command parsing and so
+        *    on. This is the one comparable to the 300 series.
+        * 2. VRAM queue mode (bit 6, 0x40). In this case, one will
+        *    have to do queue management himself. Register 0x85c4 will
+        *    hold the location of the next free queue slot, 0x85c8
+        *    is the "queue read pointer" whose way of working is
+        *    unknown to me. Anyway, this mode would require a
+        *    translation of the MMIO commands to some kind of
+        *    accelerator assembly and writing these commands
+        *    to the memory location pointed to by 0x85c4.
+        *    We will not use this, as nobody knows how this
+        *    "assembly" works, and as it would require a complete
+        *    re-write of the accelerator code.
+        * 3. AGP queue mode (bit 7, 0x80). Works as 2., but keeps the
+        *    queue in AGP memory space.
+        *
+        * SR26 bit 4 is called "Bypass H/W queue".
+        * SR26 bit 1 is called "Enable Command Queue Auto Correction"
+        * SR26 bit 0 resets the queue
+        * Size of queue memory is encoded in bits 3:2 like this:
+        *    00  (0x00)  512K
+        *    01  (0x04)  1M
+        *    10  (0x08)  2M
+        *    11  (0x0C)  4M
+        * The queue location is to be written to 0x85C0.
+        *
+         */
+       cmdq_baseport = (unsigned long *)(xgi_video_info.mmio_vbase + MMIO_QUEUE_PHYBASE);
+       write_port    = (unsigned long *)(xgi_video_info.mmio_vbase + MMIO_QUEUE_WRITEPORT);
+       read_port     = (unsigned long *)(xgi_video_info.mmio_vbase + MMIO_QUEUE_READPORT);
+
+       DPRINTK("AGP base: 0x%p, read: 0x%p, write: 0x%p\n", cmdq_baseport, read_port, write_port);
+
+       agp_size  = COMMAND_QUEUE_AREA_SIZE;
+
+#ifndef AGPOFF
+       if (XGIfb_queuemode == AGP_CMD_QUEUE) {
+               agp_info = vmalloc(sizeof(*agp_info));
+               memset((void*)agp_info, 0x00, sizeof(*agp_info));
+               agp_copy_info(agp_info);
+
+               agp_backend_acquire();
+
+               agp = agp_allocate_memory(COMMAND_QUEUE_AREA_SIZE/PAGE_SIZE,
+                                         AGP_NORMAL_MEMORY);
+               if (agp == NULL) {
+                       DPRINTK("XGIfb: Allocating AGP buffer failed.\n");
+                       agp_enabled = 0;
+               } else {
+                       if (agp_bind_memory(agp, agp->pg_start) != 0) {
+                               DPRINTK("XGIfb: AGP: Failed to bind memory\n");
+                               /* TODO: Free AGP memory here */
+                               agp_enabled = 0;
+                       } else {
+                               agp_enable(0);
+                       }
+               }
+       }
+#else
+       agp_enabled = 0;
+#endif
+
+       /* TW: Now select the queue mode */
+
+       if ((agp_enabled) && (XGIfb_queuemode == AGP_CMD_QUEUE)) {
+               cmd_type = AGP_CMD_QUEUE;
+               printk(KERN_INFO "XGIfb: Using AGP queue mode\n");
+/*     } else if (XGIfb_heap_size >= COMMAND_QUEUE_AREA_SIZE)  */
+        } else if (XGIfb_queuemode == VM_CMD_QUEUE) {
+               cmd_type = VM_CMD_QUEUE;
+               printk(KERN_INFO "XGIfb: Using VRAM queue mode\n");
+       } else {
+               printk(KERN_INFO "XGIfb: Using MMIO queue mode\n");
+               cmd_type = MMIO_CMD;
+       }
+
+       switch (agp_size) {
+          case 0x80000:
+               temp = XGI_CMD_QUEUE_SIZE_512k;
+               break;
+          case 0x100000:
+               temp = XGI_CMD_QUEUE_SIZE_1M;
+               break;
+          case 0x200000:
+               temp = XGI_CMD_QUEUE_SIZE_2M;
+               break;
+          case 0x400000:
+               temp = XGI_CMD_QUEUE_SIZE_4M;
+               break;
+       }
+
+       switch (cmd_type) {
+          case AGP_CMD_QUEUE:
+#ifndef AGPOFF
+               DPRINTK("XGIfb: AGP buffer base = 0x%lx, offset = 0x%x, size = %dK\n",
+                       agp_info->aper_base, agp->physical, agp_size/1024);
+
+               agp_phys = agp_info->aper_base + agp->physical;
+
+               outXGIIDXREG(XGICR,  IND_XGI_AGP_IO_PAD, 0);
+               outXGIIDXREG(XGICR,  IND_XGI_AGP_IO_PAD, XGI_AGP_2X);
+
+                outXGIIDXREG(XGISR, IND_XGI_CMDQUEUE_THRESHOLD, COMMAND_QUEUE_THRESHOLD);
+
+               outXGIIDXREG(XGISR, IND_XGI_CMDQUEUE_SET, XGI_CMD_QUEUE_RESET);
+
+               *write_port = *read_port;
+
+               temp |= XGI_AGP_CMDQUEUE_ENABLE;
+               outXGIIDXREG(XGISR, IND_XGI_CMDQUEUE_SET, temp);
+
+               *cmdq_baseport = agp_phys;
+
+               XGIfb_caps |= AGP_CMD_QUEUE_CAP;
+#endif
+               break;
+
+          case VM_CMD_QUEUE:
+               XGIfb_heap_end -= COMMAND_QUEUE_AREA_SIZE;
+               XGIfb_heap_size -= COMMAND_QUEUE_AREA_SIZE;
+
+               outXGIIDXREG(XGISR, IND_XGI_CMDQUEUE_THRESHOLD, COMMAND_QUEUE_THRESHOLD);
+
+               outXGIIDXREG(XGISR, IND_XGI_CMDQUEUE_SET, XGI_CMD_QUEUE_RESET);
+
+               *write_port = *read_port;
+
+               temp |= XGI_VRAM_CMDQUEUE_ENABLE;
+               outXGIIDXREG(XGISR, IND_XGI_CMDQUEUE_SET, temp);
+
+               *cmdq_baseport = xgi_video_info.video_size - COMMAND_QUEUE_AREA_SIZE;
+
+               XGIfb_caps |= VM_CMD_QUEUE_CAP;
+
+               DPRINTK("XGIfb: VM Cmd Queue offset = 0x%lx, size is %dK\n",
+                       *cmdq_baseport, COMMAND_QUEUE_AREA_SIZE/1024);
+               break;
+
+          default:  /* MMIO */
+
+//             printk("%s:%d - I'm here\n", __FUNCTION__, __LINE__);
+               /* TW: This previously only wrote XGI_MMIO_CMD_ENABLE
+                * to IND_XGI_CMDQUEUE_SET. I doubt that this is
+                * enough. Reserve memory in any way.
+                */
+// FIXME               XGIfb_heap_end -= COMMAND_QUEUE_AREA_SIZE;
+// FIXME               XGIfb_heap_size -= COMMAND_QUEUE_AREA_SIZE;
+// FIXME
+// FIXME               outXGIIDXREG(XGISR, IND_XGI_CMDQUEUE_THRESHOLD, COMMAND_QUEUE_THRESHOLD);
+// FIXME               outXGIIDXREG(XGISR, IND_XGI_CMDQUEUE_SET, XGI_CMD_QUEUE_RESET);
+// FIXME
+// FIXME               *write_port = *read_port;
+// FIXME
+// FIXME               /* TW: Set Auto_Correction bit */
+// FIXME               temp |= (XGI_MMIO_CMD_ENABLE | XGI_CMD_AUTO_CORR);
+// FIXME               // FIXME outXGIIDXREG(XGISR, IND_XGI_CMDQUEUE_SET, temp);
+// FIXME
+// FIXME               *cmdq_baseport = xgi_video_info.video_size - COMMAND_QUEUE_AREA_SIZE;
+// FIXME
+// FIXME               XGIfb_caps |= MMIO_CMD_QUEUE_CAP;
+// FIXME
+// FIXME               DPRINTK("XGIfb: MMIO Cmd Queue offset = 0x%lx, size is %dK\n",
+// FIXME                       *cmdq_baseport, COMMAND_QUEUE_AREA_SIZE/1024);
+               break;
+       }
+
+
+
+
+     /* TW: Now reserve memory for the HWCursor. It is always located at the very
+            top of the videoRAM, right below the TB memory area (if used). */
+     if (XGIfb_heap_size >= XGIfb_hwcursor_size) {
+               XGIfb_heap_end -= XGIfb_hwcursor_size;
+               XGIfb_heap_size -= XGIfb_hwcursor_size;
+               XGIfb_hwcursor_vbase = XGIfb_heap_end;
+
+               XGIfb_caps |= HW_CURSOR_CAP;
+
+               DPRINTK("XGIfb: Hardware Cursor start at 0x%lx, size is %dK\n",
+                       XGIfb_heap_end, XGIfb_hwcursor_size/1024);
+     }
+
+     XGIfb_heap.poha_chain = NULL;
+     XGIfb_heap.poh_freelist = NULL;
+
+     poh = XGIfb_poh_new_node();
+
+     if(poh == NULL)  return 1;
+
+     poh->poh_next = &XGIfb_heap.oh_free;
+     poh->poh_prev = &XGIfb_heap.oh_free;
+     poh->size = XGIfb_heap_end - XGIfb_heap_start + 1;
+     poh->offset = XGIfb_heap_start - (unsigned long) xgi_video_info.video_vbase;
+
+     DPRINTK("XGIfb: Heap start:0x%p, end:0x%p, len=%dk\n",
+               (char *) XGIfb_heap_start, (char *) XGIfb_heap_end,
+               (unsigned int) poh->size / 1024);
+
+     DPRINTK("XGIfb: First Node offset:0x%x, size:%dk\n",
+               (unsigned int) poh->offset, (unsigned int) poh->size / 1024);
+
+     XGIfb_heap.oh_free.poh_next = poh;
+     XGIfb_heap.oh_free.poh_prev = poh;
+     XGIfb_heap.oh_free.size = 0;
+     XGIfb_heap.max_freesize = poh->size;
+
+     XGIfb_heap.oh_used.poh_next = &XGIfb_heap.oh_used;
+     XGIfb_heap.oh_used.poh_prev = &XGIfb_heap.oh_used;
+     XGIfb_heap.oh_used.size = SENTINEL;
+
+     return 0;
+}
+
+static XGI_OH *XGIfb_poh_new_node(void)
+{
+       int           i;
+       unsigned long cOhs;
+       XGI_OHALLOC   *poha;
+       XGI_OH        *poh;
+
+       if (XGIfb_heap.poh_freelist == NULL) {
+               poha = kmalloc(OH_ALLOC_SIZE, GFP_KERNEL);
+               if(!poha) return NULL;
+
+               poha->poha_next = XGIfb_heap.poha_chain;
+               XGIfb_heap.poha_chain = poha;
+
+               cOhs = (OH_ALLOC_SIZE - sizeof(XGI_OHALLOC)) / sizeof(XGI_OH) + 1;
+
+               poh = &poha->aoh[0];
+               for (i = cOhs - 1; i != 0; i--) {
+                       poh->poh_next = poh + 1;
+                       poh = poh + 1;
+               }
+
+               poh->poh_next = NULL;
+               XGIfb_heap.poh_freelist = &poha->aoh[0];
+       }
+
+       poh = XGIfb_heap.poh_freelist;
+       XGIfb_heap.poh_freelist = poh->poh_next;
+
+       return (poh);
+}
+
+static XGI_OH *XGIfb_poh_allocate(unsigned long size)
+{
+       XGI_OH *pohThis;
+       XGI_OH *pohRoot;
+       int     bAllocated = 0;
+
+       if (size > XGIfb_heap.max_freesize) {
+               DPRINTK("XGIfb: Can't allocate %dk size on offscreen\n",
+                       (unsigned int) size / 1024);
+               return (NULL);
+       }
+
+       pohThis = XGIfb_heap.oh_free.poh_next;
+
+       while (pohThis != &XGIfb_heap.oh_free) {
+               if (size <= pohThis->size) {
+                       bAllocated = 1;
+                       break;
+               }
+               pohThis = pohThis->poh_next;
+       }
+
+       if (!bAllocated) {
+               DPRINTK("XGIfb: Can't allocate %dk size on offscreen\n",
+                       (unsigned int) size / 1024);
+               return (NULL);
+       }
+
+       if (size == pohThis->size) {
+               pohRoot = pohThis;
+               XGIfb_delete_node(pohThis);
+       } else {
+               pohRoot = XGIfb_poh_new_node();
+
+               if (pohRoot == NULL) {
+                       return (NULL);
+               }
+
+               pohRoot->offset = pohThis->offset;
+               pohRoot->size = size;
+
+               pohThis->offset += size;
+               pohThis->size -= size;
+       }
+
+       XGIfb_heap.max_freesize -= size;
+
+       pohThis = &XGIfb_heap.oh_used;
+       XGIfb_insert_node(pohThis, pohRoot);
+
+       return (pohRoot);
+}
+
+static void XGIfb_delete_node(XGI_OH *poh)
+{
+       XGI_OH *poh_prev;
+       XGI_OH *poh_next;
+
+       poh_prev = poh->poh_prev;
+       poh_next = poh->poh_next;
+
+       poh_prev->poh_next = poh_next;
+       poh_next->poh_prev = poh_prev;
+
+}
+
+static void XGIfb_insert_node(XGI_OH *pohList, XGI_OH *poh)
+{
+       XGI_OH *pohTemp;
+
+       pohTemp = pohList->poh_next;
+
+       pohList->poh_next = poh;
+       pohTemp->poh_prev = poh;
+
+       poh->poh_prev = pohList;
+       poh->poh_next = pohTemp;
+}
+
+static XGI_OH *XGIfb_poh_free(unsigned long base)
+{
+       XGI_OH *pohThis;
+       XGI_OH *poh_freed;
+       XGI_OH *poh_prev;
+       XGI_OH *poh_next;
+       unsigned long ulUpper;
+       unsigned long ulLower;
+       int foundNode = 0;
+
+       poh_freed = XGIfb_heap.oh_used.poh_next;
+
+       while(poh_freed != &XGIfb_heap.oh_used) {
+               if(poh_freed->offset == base) {
+                       foundNode = 1;
+                       break;
+               }
+
+               poh_freed = poh_freed->poh_next;
+       }
+
+       if (!foundNode)  return (NULL);
+
+       XGIfb_heap.max_freesize += poh_freed->size;
+
+       poh_prev = poh_next = NULL;
+       ulUpper = poh_freed->offset + poh_freed->size;
+       ulLower = poh_freed->offset;
+
+       pohThis = XGIfb_heap.oh_free.poh_next;
+
+       while (pohThis != &XGIfb_heap.oh_free) {
+               if (pohThis->offset == ulUpper) {
+                       poh_next = pohThis;
+               }
+                       else if ((pohThis->offset + pohThis->size) ==
+                                ulLower) {
+                       poh_prev = pohThis;
+               }
+               pohThis = pohThis->poh_next;
+       }
+
+       XGIfb_delete_node(poh_freed);
+
+       if (poh_prev && poh_next) {
+               poh_prev->size += (poh_freed->size + poh_next->size);
+               XGIfb_delete_node(poh_next);
+               XGIfb_free_node(poh_freed);
+               XGIfb_free_node(poh_next);
+               return (poh_prev);
+       }
+
+       if (poh_prev) {
+               poh_prev->size += poh_freed->size;
+               XGIfb_free_node(poh_freed);
+               return (poh_prev);
+       }
+
+       if (poh_next) {
+               poh_next->size += poh_freed->size;
+               poh_next->offset = poh_freed->offset;
+               XGIfb_free_node(poh_freed);
+               return (poh_next);
+       }
+
+       XGIfb_insert_node(&XGIfb_heap.oh_free, poh_freed);
+
+       return (poh_freed);
+}
+
+static void XGIfb_free_node(XGI_OH *poh)
+{
+       if(poh == NULL) return;
+
+       poh->poh_next = XGIfb_heap.poh_freelist;
+       XGIfb_heap.poh_freelist = poh;
+
+}
+
+void XGI_malloc(struct XGI_memreq *req)
+{
+       XGI_OH *poh;
+
+       poh = XGIfb_poh_allocate(req->size);
+
+       if(poh == NULL) {
+               req->offset = 0;
+               req->size = 0;
+               DPRINTK("XGIfb: Video RAM allocation failed\n");
+       } else {
+               DPRINTK("XGIfb: Video RAM allocation succeeded: 0x%p\n",
+                       (char *) (poh->offset + (unsigned long) xgi_video_info.video_vbase));
+
+               req->offset = poh->offset;
+               req->size = poh->size;
+       }
+
+}
+
+void XGI_free(unsigned long base)
+{
+       XGI_OH *poh;
+
+       poh = XGIfb_poh_free(base);
+
+       if(poh == NULL) {
+               DPRINTK("XGIfb: XGIfb_poh_free() failed at base 0x%x\n",
+                       (unsigned int) base);
+       }
+}
+
+/* --------------------- SetMode routines ------------------------- */
+
+static void XGIfb_pre_setmode(void)
+{
+       u8 cr30 = 0, cr31 = 0;
+
+       inXGIIDXREG(XGICR, 0x31, cr31);
+       cr31 &= ~0x60;
+
+       switch (xgi_video_info.disp_state & DISPTYPE_DISP2) {
+          case DISPTYPE_CRT2:
+               cr30 = (XGI_VB_OUTPUT_CRT2 | XGI_SIMULTANEOUS_VIEW_ENABLE);
+               cr31 |= XGI_DRIVER_MODE;
+               break;
+          case DISPTYPE_LCD:
+               cr30  = (XGI_VB_OUTPUT_LCD | XGI_SIMULTANEOUS_VIEW_ENABLE);
+               cr31 |= XGI_DRIVER_MODE;
+               break;
+          case DISPTYPE_TV:
+               if (xgi_video_info.TV_type == TVMODE_HIVISION)
+                       cr30 = (XGI_VB_OUTPUT_HIVISION | XGI_SIMULTANEOUS_VIEW_ENABLE);
+               else if (xgi_video_info.TV_plug == TVPLUG_SVIDEO)
+                       cr30 = (XGI_VB_OUTPUT_SVIDEO | XGI_SIMULTANEOUS_VIEW_ENABLE);
+               else if (xgi_video_info.TV_plug == TVPLUG_COMPOSITE)
+                       cr30 = (XGI_VB_OUTPUT_COMPOSITE | XGI_SIMULTANEOUS_VIEW_ENABLE);
+               else if (xgi_video_info.TV_plug == TVPLUG_SCART)
+                       cr30 = (XGI_VB_OUTPUT_SCART | XGI_SIMULTANEOUS_VIEW_ENABLE);
+               cr31 |= XGI_DRIVER_MODE;
+
+               if (XGIfb_tvmode == 1 || xgi_video_info.TV_type == TVMODE_PAL)
+                       cr31 |= 0x01;
+                else
+                        cr31 &= ~0x01;
+               break;
+          default:     /* disable CRT2 */
+               cr30 = 0x00;
+               cr31 |= (XGI_DRIVER_MODE | XGI_VB_OUTPUT_DISABLE);
+       }
+
+       outXGIIDXREG(XGICR, IND_XGI_SCRATCH_REG_CR30, cr30);
+       outXGIIDXREG(XGICR, IND_XGI_SCRATCH_REG_CR31, cr31);
+        outXGIIDXREG(XGICR, IND_XGI_SCRATCH_REG_CR33, (XGIfb_rate_idx & 0x0F));
+
+       if(xgi_video_info.accel) XGIfb_syncaccel();
+
+
+}
+
+static void XGIfb_post_setmode(void)
+{
+       u8 reg;
+       BOOLEAN doit = TRUE;
+#if 0  /* TW: Wrong: Is not in MMIO space, but in RAM */
+       /* Backup mode number to MMIO space */
+       if(xgi_video_info.mmio_vbase) {
+         *(volatile u8 *)(((u8*)xgi_video_info.mmio_vbase) + 0x449) = (unsigned char)XGIfb_mode_no;
+       }
+#endif
+/*     outXGIIDXREG(XGISR,IND_XGI_PASSWORD,XGI_PASSWORD);
+       outXGIIDXREG(XGICR,0x13,0x00);
+       setXGIIDXREG(XGISR,0x0E,0xF0,0x01);
+*test**/
+       if (xgi_video_info.video_bpp == 8) {
+               /* TW: We can't switch off CRT1 on LVDS/Chrontel in 8bpp Modes */
+               if ((xgi_video_info.hasVB == HASVB_LVDS) || (xgi_video_info.hasVB == HASVB_LVDS_CHRONTEL)) {
+                       doit = FALSE;
+               }
+               /* TW: We can't switch off CRT1 on 301B-DH in 8bpp Modes if using LCD */
+               if  (xgi_video_info.disp_state & DISPTYPE_LCD)  {
+                       doit = FALSE;
+               }
+       }
+
+       /* TW: We can't switch off CRT1 if bridge is in slave mode */
+       if(xgi_video_info.hasVB != HASVB_NONE) {
+               inXGIIDXREG(XGIPART1, 0x00, reg);
+
+
+               if((reg & 0x50) == 0x10) {
+                       doit = FALSE;
+               }
+
+       } else XGIfb_crt1off = 0;
+
+       inXGIIDXREG(XGICR, 0x17, reg);
+       if((XGIfb_crt1off) && (doit))
+               reg &= ~0x80;
+       else
+               reg |= 0x80;
+       outXGIIDXREG(XGICR, 0x17, reg);
+
+        andXGIIDXREG(XGISR, IND_XGI_RAMDAC_CONTROL, ~0x04);
+
+       if((xgi_video_info.disp_state & DISPTYPE_TV) && (xgi_video_info.hasVB == HASVB_301)) {
+
+          inXGIIDXREG(XGIPART4, 0x01, reg);
+
+          if(reg < 0xB0) {             /* Set filter for XGI301 */
+
+               switch (xgi_video_info.video_width) {
+                  case 320:
+                       filter_tb = (xgi_video_info.TV_type == TVMODE_NTSC) ? 4 : 12;
+                       break;
+                  case 640:
+                       filter_tb = (xgi_video_info.TV_type == TVMODE_NTSC) ? 5 : 13;
+                       break;
+                  case 720:
+                       filter_tb = (xgi_video_info.TV_type == TVMODE_NTSC) ? 6 : 14;
+                       break;
+                  case 800:
+                       filter_tb = (xgi_video_info.TV_type == TVMODE_NTSC) ? 7 : 15;
+                       break;
+                  default:
+                       filter = -1;
+                       break;
+               }
+
+               orXGIIDXREG(XGIPART1, XGIfb_CRT2_write_enable, 0x01);
+
+               if(xgi_video_info.TV_type == TVMODE_NTSC) {
+
+                       andXGIIDXREG(XGIPART2, 0x3a, 0x1f);
+
+                       if (xgi_video_info.TV_plug == TVPLUG_SVIDEO) {
+
+                               andXGIIDXREG(XGIPART2, 0x30, 0xdf);
+
+                       } else if (xgi_video_info.TV_plug == TVPLUG_COMPOSITE) {
+
+                               orXGIIDXREG(XGIPART2, 0x30, 0x20);
+
+                               switch (xgi_video_info.video_width) {
+                               case 640:
+                                       outXGIIDXREG(XGIPART2, 0x35, 0xEB);
+                                       outXGIIDXREG(XGIPART2, 0x36, 0x04);
+                                       outXGIIDXREG(XGIPART2, 0x37, 0x25);
+                                       outXGIIDXREG(XGIPART2, 0x38, 0x18);
+                                       break;
+                               case 720:
+                                       outXGIIDXREG(XGIPART2, 0x35, 0xEE);
+                                       outXGIIDXREG(XGIPART2, 0x36, 0x0C);
+                                       outXGIIDXREG(XGIPART2, 0x37, 0x22);
+                                       outXGIIDXREG(XGIPART2, 0x38, 0x08);
+                                       break;
+                               case 800:
+                                       outXGIIDXREG(XGIPART2, 0x35, 0xEB);
+                                       outXGIIDXREG(XGIPART2, 0x36, 0x15);
+                                       outXGIIDXREG(XGIPART2, 0x37, 0x25);
+                                       outXGIIDXREG(XGIPART2, 0x38, 0xF6);
+                                       break;
+                               }
+                       }
+
+               } else if(xgi_video_info.TV_type == TVMODE_PAL) {
+
+                       andXGIIDXREG(XGIPART2, 0x3A, 0x1F);
+
+                       if (xgi_video_info.TV_plug == TVPLUG_SVIDEO) {
+
+                               andXGIIDXREG(XGIPART2, 0x30, 0xDF);
+
+                       } else if (xgi_video_info.TV_plug == TVPLUG_COMPOSITE) {
+
+                               orXGIIDXREG(XGIPART2, 0x30, 0x20);
+
+                               switch (xgi_video_info.video_width) {
+                               case 640:
+                                       outXGIIDXREG(XGIPART2, 0x35, 0xF1);
+                                       outXGIIDXREG(XGIPART2, 0x36, 0xF7);
+                                       outXGIIDXREG(XGIPART2, 0x37, 0x1F);
+                                       outXGIIDXREG(XGIPART2, 0x38, 0x32);
+                                       break;
+                               case 720:
+                                       outXGIIDXREG(XGIPART2, 0x35, 0xF3);
+                                       outXGIIDXREG(XGIPART2, 0x36, 0x00);
+                                       outXGIIDXREG(XGIPART2, 0x37, 0x1D);
+                                       outXGIIDXREG(XGIPART2, 0x38, 0x20);
+                                       break;
+                               case 800:
+                                       outXGIIDXREG(XGIPART2, 0x35, 0xFC);
+                                       outXGIIDXREG(XGIPART2, 0x36, 0xFB);
+                                       outXGIIDXREG(XGIPART2, 0x37, 0x14);
+                                       outXGIIDXREG(XGIPART2, 0x38, 0x2A);
+                                       break;
+                               }
+                       }
+               }
+
+               if ((filter >= 0) && (filter <=7)) {
+                       DPRINTK("FilterTable[%d]-%d: %02x %02x %02x %02x\n", filter_tb, filter,
+                               XGI_TV_filter[filter_tb].filter[filter][0],
+                               XGI_TV_filter[filter_tb].filter[filter][1],
+                               XGI_TV_filter[filter_tb].filter[filter][2],
+                               XGI_TV_filter[filter_tb].filter[filter][3]
+                       );
+                       outXGIIDXREG(XGIPART2, 0x35, (XGI_TV_filter[filter_tb].filter[filter][0]));
+                       outXGIIDXREG(XGIPART2, 0x36, (XGI_TV_filter[filter_tb].filter[filter][1]));
+                       outXGIIDXREG(XGIPART2, 0x37, (XGI_TV_filter[filter_tb].filter[filter][2]));
+                       outXGIIDXREG(XGIPART2, 0x38, (XGI_TV_filter[filter_tb].filter[filter][3]));
+               }
+
+            }
+
+       }
+
+}
+
+#ifndef MODULE
+XGIINITSTATIC int __init XGIfb_setup(char *options)
+{
+       char *this_opt;
+
+
+
+       xgi_video_info.refresh_rate = 0;
+
+        printk(KERN_INFO "XGIfb: Options %s\n", options);
+
+       if (!options || !*options)
+               return 0;
+
+       while((this_opt = strsep(&options, ",")) != NULL) {
+
+               if (!*this_opt) continue;
+
+               if (!strncmp(this_opt, "mode:", 5)) {
+                       XGIfb_search_mode(this_opt + 5);
+               } else if (!strncmp(this_opt, "vesa:", 5)) {
+                       XGIfb_search_vesamode(simple_strtoul(this_opt + 5, NULL, 0));
+               } else if (!strncmp(this_opt, "mode:", 5)) {
+                       XGIfb_search_mode(this_opt + 5);
+               } else if (!strncmp(this_opt, "vesa:", 5)) {
+                       XGIfb_search_vesamode(simple_strtoul(this_opt + 5, NULL, 0));
+               } else if (!strncmp(this_opt, "vrate:", 6)) {
+                       xgi_video_info.refresh_rate = simple_strtoul(this_opt + 6, NULL, 0);
+               } else if (!strncmp(this_opt, "rate:", 5)) {
+                       xgi_video_info.refresh_rate = simple_strtoul(this_opt + 5, NULL, 0);
+               } else if (!strncmp(this_opt, "off", 3)) {
+                       XGIfb_off = 1;
+               } else if (!strncmp(this_opt, "crt1off", 7)) {
+                       XGIfb_crt1off = 1;
+               } else if (!strncmp(this_opt, "filter:", 7)) {
+                       filter = (int)simple_strtoul(this_opt + 7, NULL, 0);
+               } else if (!strncmp(this_opt, "forcecrt2type:", 14)) {
+                       XGIfb_search_crt2type(this_opt + 14);
+               } else if (!strncmp(this_opt, "forcecrt1:", 10)) {
+                       XGIfb_forcecrt1 = (int)simple_strtoul(this_opt + 10, NULL, 0);
+                } else if (!strncmp(this_opt, "tvmode:",7)) {
+                       XGIfb_search_tvstd(this_opt + 7);
+                } else if (!strncmp(this_opt, "tvstandard:",11)) {
+                       XGIfb_search_tvstd(this_opt + 7);
+                } else if (!strncmp(this_opt, "mem:",4)) {
+                       XGIfb_mem = simple_strtoul(this_opt + 4, NULL, 0);
+                } else if (!strncmp(this_opt, "dstn", 4)) {
+                       enable_dstn = 1;
+                       /* TW: DSTN overrules forcecrt2type */
+                       XGIfb_crt2type = DISPTYPE_LCD;
+               } else if (!strncmp(this_opt, "queuemode:", 10)) {
+                       XGIfb_search_queuemode(this_opt + 10);
+               } else if (!strncmp(this_opt, "pdc:", 4)) {
+                       XGIfb_pdc = simple_strtoul(this_opt + 4, NULL, 0);
+                       if(XGIfb_pdc & ~0x3c) {
+                          printk(KERN_INFO "XGIfb: Illegal pdc parameter\n");
+                          XGIfb_pdc = 0;
+                       }
+               } else if (!strncmp(this_opt, "noaccel", 7)) {
+                       XGIfb_accel = 0;
+               } else if (!strncmp(this_opt, "noypan", 6)) {
+                       XGIfb_ypan = 0;
+               } else if (!strncmp(this_opt, "userom:", 7)) {
+                       XGIfb_userom = (int)simple_strtoul(this_opt + 7, NULL, 0);
+//             } else if (!strncmp(this_opt, "useoem:", 7)) {
+//                     XGIfb_useoem = (int)simple_strtoul(this_opt + 7, NULL, 0);
+               } else {
+                       XGIfb_search_mode(this_opt);
+//                     printk(KERN_INFO "XGIfb: Invalid option %s\n", this_opt);
+               }
+
+               /* TW: Acceleration only with MMIO mode */
+               if((XGIfb_queuemode != -1) && (XGIfb_queuemode != MMIO_CMD)) {
+                       XGIfb_ypan = 0;
+                       XGIfb_accel = 0;
+               }
+               /* TW: Panning only with acceleration */
+               if(XGIfb_accel == 0) XGIfb_ypan = 0;
+
+       }
+       printk("\nxgifb: outa xgifb_setup 3450");
+       return 0;
+}
+#endif
+
+static unsigned char VBIOS_BUF[65535];
+
+unsigned char* attempt_map_rom(struct pci_dev *dev,void *copy_address)
+{
+    u32 rom_size      = 0;
+    u32 rom_address   = 0;
+    int j;
+
+    /*  Get the size of the expansion rom */
+    pci_write_config_dword(dev, PCI_ROM_ADDRESS, 0xFFFFFFFF);
+    pci_read_config_dword(dev, PCI_ROM_ADDRESS, &rom_size);
+    if ((rom_size & 0x01) == 0)
+    {
+               printk("No ROM\n");
+               return NULL;
+    }
+
+    rom_size &= 0xFFFFF800;
+    rom_size = (~rom_size)+1;
+
+    rom_address = pci_resource_start(dev, 0);
+    if (rom_address == 0 || rom_address == 0xFFFFFFF0)
+    {
+               printk("No suitable rom address found\n"); return NULL;
+    }
+
+    printk("ROM Size is %dK, Address is %x\n", rom_size/1024, rom_address);
+
+    /*  Map ROM */
+    pci_write_config_dword(dev, PCI_ROM_ADDRESS, rom_address | PCI_ROM_ADDRESS_ENABLE);
+
+    /* memcpy(copy_address, rom_address, rom_size); */
+    {
+               unsigned char *virt_addr = ioremap(rom_address, 0x8000000);
+
+               unsigned char *from = (unsigned char *)virt_addr;
+               unsigned char *to = (unsigned char *)copy_address;
+               for (j=0; j<65536 /*rom_size*/; j++) *to++ = *from++;
+       }
+
+       pci_write_config_dword(dev, PCI_ROM_ADDRESS, 0);
+
+    printk("Copy is done\n");
+
+       return copy_address;
+}
+
+int __devinit xgifb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
+{
+       u16 reg16;
+       u8  reg, reg1;
+        u8 CR48,CR38;
+       if (XGIfb_off)
+               return -ENXIO;
+
+       XGIfb_registered = 0;
+
+       memset(&XGIhw_ext, 0, sizeof(HW_DEVICE_EXTENSION));
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,3))
+         fb_info = framebuffer_alloc(sizeof(struct fb_info), &pdev->dev);
+         if(!fb_info) return -ENOMEM;
+#else
+         XGI_fb_info = kmalloc( sizeof(struct fb_info), GFP_KERNEL);
+         if(!XGI_fb_info) return -ENOMEM;
+         memset(XGI_fb_info, 0,  sizeof(struct fb_info));
+#endif
+
+       xgi_video_info.chip_id = pdev->device;
+         pci_read_config_byte(pdev, PCI_REVISION_ID,&xgi_video_info.revision_id);
+         pci_read_config_word(pdev, PCI_COMMAND, &reg16);
+         XGIhw_ext.jChipRevision = xgi_video_info.revision_id;
+         XGIvga_enabled = reg16 & 0x01;
+
+         xgi_video_info.pcibus = pdev->bus->number;
+         xgi_video_info.pcislot = PCI_SLOT(pdev->devfn);
+         xgi_video_info.pcifunc = PCI_FUNC(pdev->devfn);
+         xgi_video_info.subsysvendor = pdev->subsystem_vendor;
+         xgi_video_info.subsysdevice = pdev->subsystem_device;
+
+         xgi_video_info.video_base = pci_resource_start(pdev, 0);
+         xgi_video_info.mmio_base = pci_resource_start(pdev, 1);
+         XGIfb_mmio_size =  pci_resource_len(pdev, 1);
+         xgi_video_info.vga_base = pci_resource_start(pdev, 2) + 0x30;
+         XGIhw_ext.pjIOAddress = (PUCHAR)xgi_video_info.vga_base;
+         //XGI_Pr.RelIO  = ioremap(pci_resource_start(pdev, 2), 128) + 0x30;
+         printk("XGIfb: Relocate IO address: %lx [%08lx] \n", (unsigned long)pci_resource_start(pdev, 2), XGI_Pr.RelIO);
+
+         if (pci_enable_device(pdev))
+                 return -EIO;
+
+    XGIRegInit(&XGI_Pr, (ULONG)XGIhw_ext.pjIOAddress);
+
+    outXGIIDXREG(XGISR, IND_XGI_PASSWORD, XGI_PASSWORD);
+    inXGIIDXREG(XGISR, IND_XGI_PASSWORD, reg1);
+
+    if(reg1 != 0xa1) /*I/O error */
+    {
+         printk("\nXGIfb: I/O error!!!");
+         return  -EIO;
+    }
+
+       switch (xgi_video_info.chip_id) {
+          case PCI_DEVICE_ID_XG_20:
+               orXGIIDXREG(XGICR, Index_CR_GPIO_Reg3, GPIOG_EN);
+               inXGIIDXREG(XGICR, Index_CR_GPIO_Reg1, CR48);
+               if (CR48&GPIOG_READ)
+                       xgi_video_info.chip = XG21;
+               else
+                       xgi_video_info.chip = XG20;
+               XGIfb_hwcursor_size = HW_CURSOR_AREA_SIZE_315 * 2;
+               XGIfb_CRT2_write_enable = IND_XGI_CRT2_WRITE_ENABLE_315;
+               break;
+           case PCI_DEVICE_ID_XG_40:
+               xgi_video_info.chip = XG40;
+               XGIfb_hwcursor_size = HW_CURSOR_AREA_SIZE_315 * 2;
+               XGIfb_CRT2_write_enable = IND_XGI_CRT2_WRITE_ENABLE_315;
+               break;
+           case PCI_DEVICE_ID_XG_41:
+               xgi_video_info.chip = XG41;
+               XGIfb_hwcursor_size = HW_CURSOR_AREA_SIZE_315 * 2;
+               XGIfb_CRT2_write_enable = IND_XGI_CRT2_WRITE_ENABLE_315;
+               break;
+           case PCI_DEVICE_ID_XG_42:
+               xgi_video_info.chip = XG42;
+               XGIfb_hwcursor_size = HW_CURSOR_AREA_SIZE_315 * 2;
+               XGIfb_CRT2_write_enable = IND_XGI_CRT2_WRITE_ENABLE_315;
+               break;
+           case PCI_DEVICE_ID_XG_27:
+               xgi_video_info.chip = XG27;
+               XGIfb_hwcursor_size = HW_CURSOR_AREA_SIZE_315 * 2;
+               XGIfb_CRT2_write_enable = IND_XGI_CRT2_WRITE_ENABLE_315;
+               break;
+           default:
+               return -ENODEV;
+       }
+
+       printk("XGIfb:chipid = %x\n",xgi_video_info.chip);
+        XGIhw_ext.jChipType = xgi_video_info.chip;
+
+               switch (xgi_video_info.chip) {
+                  case XG40:
+                  case XG41:
+                  case XG42:
+                  case XG45:
+                  case XG20:
+                  case XG21:
+                   case XG27:
+                   XGIhw_ext.bIntegratedMMEnabled = TRUE;
+                       break;
+
+                  default:
+                       break;
+               }
+
+
+         XGIhw_ext.pDevice = NULL;
+         if ((xgi_video_info.chip == XG21) || (XGIfb_userom))
+         {
+             XGIhw_ext.pjVirtualRomBase = attempt_map_rom(pdev, VBIOS_BUF);
+
+             if(XGIhw_ext.pjVirtualRomBase)
+                       printk(KERN_INFO "XGIfb: Video ROM found and mapped to %p\n",XGIhw_ext.pjVirtualRomBase);
+               else
+                       printk(KERN_INFO "XGIfb: Video ROM not found\n");
+    } else {
+               XGIhw_ext.pjVirtualRomBase = NULL;
+               printk(KERN_INFO "XGIfb: Video ROM usage disabled\n");
+    }
+         XGIhw_ext.pjCustomizedROMImage = NULL;
+         XGIhw_ext.bSkipDramSizing = 0;
+         XGIhw_ext.pQueryVGAConfigSpace = &XGIfb_query_VGA_config_space;
+//     XGIhw_ext.pQueryNorthBridgeSpace = &XGIfb_query_north_bridge_space;
+         strcpy(XGIhw_ext.szVBIOSVer, "0.84");
+
+
+    XGIhw_ext.pSR = vmalloc(sizeof(XGI_DSReg) * SR_BUFFER_SIZE);
+         if (XGIhw_ext.pSR == NULL)
+         {
+                   printk(KERN_ERR "XGIfb: Fatal error: Allocating SRReg space failed.\n");
+                   return -ENODEV;
+         }
+         XGIhw_ext.pSR[0].jIdx = XGIhw_ext.pSR[0].jVal = 0xFF;
+
+         XGIhw_ext.pCR = vmalloc(sizeof(XGI_DSReg) * CR_BUFFER_SIZE);
+         if (XGIhw_ext.pCR == NULL)
+         {
+             vfree(XGIhw_ext.pSR);
+                   printk(KERN_ERR "XGIfb: Fatal error: Allocating CRReg space failed.\n");
+                   return -ENODEV;
+         }
+         XGIhw_ext.pCR[0].jIdx = XGIhw_ext.pCR[0].jVal = 0xFF;
+
+
+
+
+       if (!XGIvga_enabled)
+       {
+                       /* Mapping Max FB Size for 315 Init */
+           XGIhw_ext.pjVideoMemoryAddress = ioremap(xgi_video_info.video_base, 0x10000000);
+           if((xgifb_mode_idx < 0) || ((XGIbios_mode[xgifb_mode_idx].mode_no) != 0xFF))
+           {
+#ifdef LINUXBIOS
+               printk("XGIfb: XGIInit() ...");
+               /* XGIInitNewt for LINUXBIOS only */
+               if(XGIInitNew(&XGIhw_ext))
+               {
+                       printk("OK\n");
+               }
+               else
+               {
+                   printk("Fail\n");
+               }
+#endif
+
+               outXGIIDXREG(XGISR, IND_XGI_PASSWORD, XGI_PASSWORD);
+
+
+           }
+       }
+#ifdef LINUXBIOS
+       else
+       {
+           XGIhw_ext.pjVideoMemoryAddress = ioremap(xgi_video_info.video_base, 0x10000000);
+           if((xgifb_mode_idx < 0) || ((XGIbios_mode[xgifb_mode_idx].mode_no) != 0xFF))
+           {
+
+               outXGIIDXREG(XGISR, IND_XGI_PASSWORD, XGI_PASSWORD);
+
+               // yilin Because no VBIOS DRAM Sizing, Dram size will error.
+               // Set SR13 ,14 temporarily for UDtech
+               outXGIIDXREG(XGISR, 0x13, 0x45);
+               outXGIIDXREG(XGISR, 0x14, 0x51);
+
+
+           }
+       }
+#endif
+       if (XGIfb_get_dram_size())
+       {
+           vfree(XGIhw_ext.pSR);
+           vfree(XGIhw_ext.pCR);
+           printk(KERN_INFO "XGIfb: Fatal error: Unable to determine RAM size.\n");
+           return -ENODEV;
+       }
+
+
+
+         if((xgifb_mode_idx < 0) || ((XGIbios_mode[xgifb_mode_idx].mode_no) != 0xFF))
+         {
+              /* Enable PCI_LINEAR_ADDRESSING and MMIO_ENABLE  */
+        orXGIIDXREG(XGISR, IND_XGI_PCI_ADDRESS_SET, (XGI_PCI_ADDR_ENABLE | XGI_MEM_MAP_IO_ENABLE));
+         /* Enable 2D accelerator engine */
+        orXGIIDXREG(XGISR, IND_XGI_MODULE_ENABLE, XGI_ENABLE_2D);
+    }
+
+         XGIhw_ext.ulVideoMemorySize = xgi_video_info.video_size;
+
+         if (!request_mem_region(xgi_video_info.video_base, xgi_video_info.video_size, "XGIfb FB"))
+         {         printk("unable request memory size %x",xgi_video_info.video_size);
+                   printk(KERN_ERR "XGIfb: Fatal error: Unable to reserve frame buffer memory\n");
+                   printk(KERN_ERR "XGIfb: Is there another framebuffer driver active?\n");
+                   vfree(XGIhw_ext.pSR);
+                   vfree(XGIhw_ext.pCR);
+                   return -ENODEV;
+         }
+
+         if (!request_mem_region(xgi_video_info.mmio_base, XGIfb_mmio_size, "XGIfb MMIO"))
+         {
+                   printk(KERN_ERR "XGIfb: Fatal error: Unable to reserve MMIO region\n");
+                   release_mem_region(xgi_video_info.video_base, xgi_video_info.video_size);
+                   vfree(XGIhw_ext.pSR);
+                   vfree(XGIhw_ext.pCR);
+                   return -ENODEV;
+         }
+
+         xgi_video_info.video_vbase = XGIhw_ext.pjVideoMemoryAddress =
+               ioremap(xgi_video_info.video_base, xgi_video_info.video_size);
+         xgi_video_info.mmio_vbase = ioremap(xgi_video_info.mmio_base, XGIfb_mmio_size);
+
+         printk(KERN_INFO "XGIfb: Framebuffer at 0x%lx, mapped to 0x%p, size %dk\n",
+             xgi_video_info.video_base, xgi_video_info.video_vbase,xgi_video_info.video_size / 1024);
+
+         printk(KERN_INFO "XGIfb: MMIO at 0x%lx, mapped to 0x%p, size %ldk\n",
+             xgi_video_info.mmio_base, xgi_video_info.mmio_vbase,XGIfb_mmio_size / 1024);
+          printk("XGIfb: XGIInitNew() ...");
+         if(XGIInitNew(&XGIhw_ext))
+         {
+                 printk("OK\n");
+         }
+         else
+         {
+               printk("Fail\n");
+         }
+
+         if(XGIfb_heap_init())
+         {
+                   printk(KERN_WARNING "XGIfb: Failed to initialize offscreen memory heap\n");
+         }
+
+
+         xgi_video_info.mtrr = (unsigned int) 0;
+
+         if((xgifb_mode_idx < 0) || ((XGIbios_mode[xgifb_mode_idx].mode_no) != 0xFF))
+         {
+                 xgi_video_info.hasVB = HASVB_NONE;
+        if((xgi_video_info.chip == XG20)||(xgi_video_info.chip == XG27))
+             xgi_video_info.hasVB = HASVB_NONE;
+        else if(xgi_video_info.chip == XG21) {
+            inXGIIDXREG(XGICR,0x38,CR38);
+            if ((CR38&0xE0) == 0xC0) {
+                   xgi_video_info.disp_state = DISPTYPE_LCD;
+                   if (!XGIfb_GetXG21LVDSData()) {
+                           int m;
+                           for (m=0; m < sizeof(XGI21_LCDCapList)/sizeof(XGI21_LVDSCapStruct); m++) {
+                                   if ((XGI21_LCDCapList[m].LVDSHDE == XGIbios_mode[xgifb_mode_idx].xres) &&
+                                       (XGI21_LCDCapList[m].LVDSVDE == XGIbios_mode[xgifb_mode_idx].yres)) {
+                                               XGINew_SetReg1( XGI_Pr.P3d4 , 0x36, m) ;
+                                   }
+                           }
+                   }
+            }
+            else if ((CR38&0xE0) == 0x60)
+               xgi_video_info.hasVB = HASVB_CHRONTEL ;
+            else
+               xgi_video_info.hasVB = HASVB_NONE;
+       }
+        else
+                   XGIfb_get_VB_type();
+
+                   XGIhw_ext.ujVBChipID = VB_CHIP_UNKNOWN;
+
+                   XGIhw_ext.ulExternalChip = 0;
+
+               switch (xgi_video_info.hasVB) {
+               case HASVB_301:
+                       inXGIIDXREG(XGIPART4, 0x01, reg);
+                       if (reg >= 0xE0) {
+                               XGIhw_ext.ujVBChipID = VB_CHIP_302LV;
+                               printk(KERN_INFO "XGIfb: XGI302LV bridge detected (revision 0x%02x)\n",reg);
+                       } else if (reg >= 0xD0) {
+                               XGIhw_ext.ujVBChipID = VB_CHIP_301LV;
+                               printk(KERN_INFO "XGIfb: XGI301LV bridge detected (revision 0x%02x)\n",reg);
+                       }
+                       /* else if (reg >= 0xB0) {
+                               XGIhw_ext.ujVBChipID = VB_CHIP_301B;
+                               inXGIIDXREG(XGIPART4,0x23,reg1);
+                              printk("XGIfb: XGI301B bridge detected\n");
+                       }*/
+                       else {
+                               XGIhw_ext.ujVBChipID = VB_CHIP_301;
+                               printk("XGIfb: XGI301 bridge detected\n");
+                       }
+                       break;
+               case HASVB_302:
+                       inXGIIDXREG(XGIPART4, 0x01, reg);
+                       if (reg >= 0xE0) {
+                               XGIhw_ext.ujVBChipID = VB_CHIP_302LV;
+                               printk(KERN_INFO "XGIfb: XGI302LV bridge detected (revision 0x%02x)\n",reg);
+                       } else if (reg >= 0xD0) {
+                               XGIhw_ext.ujVBChipID = VB_CHIP_301LV;
+                               printk(KERN_INFO "XGIfb: XGI302LV bridge detected (revision 0x%02x)\n",reg);
+                       } else if (reg >= 0xB0) {
+                               inXGIIDXREG(XGIPART4,0x23,reg1);
+
+                               XGIhw_ext.ujVBChipID = VB_CHIP_302B;
+
+                       } else {
+                               XGIhw_ext.ujVBChipID = VB_CHIP_302;
+                               printk(KERN_INFO "XGIfb: XGI302 bridge detected\n");
+                       }
+                       break;
+               case HASVB_LVDS:
+                       XGIhw_ext.ulExternalChip = 0x1;
+                       printk(KERN_INFO "XGIfb: LVDS transmitter detected\n");
+                       break;
+               case HASVB_TRUMPION:
+                       XGIhw_ext.ulExternalChip = 0x2;
+                       printk(KERN_INFO "XGIfb: Trumpion Zurac LVDS scaler detected\n");
+                       break;
+               case HASVB_CHRONTEL:
+                       XGIhw_ext.ulExternalChip = 0x4;
+                       printk(KERN_INFO "XGIfb: Chrontel TV encoder detected\n");
+                       break;
+               case HASVB_LVDS_CHRONTEL:
+                       XGIhw_ext.ulExternalChip = 0x5;
+                       printk(KERN_INFO "XGIfb: LVDS transmitter and Chrontel TV encoder detected\n");
+                       break;
+               default:
+                       printk(KERN_INFO "XGIfb: No or unknown bridge type detected\n");
+                       break;
+               }
+
+               if (xgi_video_info.hasVB != HASVB_NONE) {
+                   XGIfb_detect_VB();
+    }
+
+               if (xgi_video_info.disp_state & DISPTYPE_DISP2) {
+                       if (XGIfb_crt1off)
+                               xgi_video_info.disp_state |= DISPMODE_SINGLE;
+                       else
+                               xgi_video_info.disp_state |= (DISPMODE_MIRROR | DISPTYPE_CRT1);
+               } else {
+                       xgi_video_info.disp_state = DISPMODE_SINGLE | DISPTYPE_CRT1;
+               }
+
+               if (xgi_video_info.disp_state & DISPTYPE_LCD) {
+                   if (!enable_dstn) {
+                       inXGIIDXREG(XGICR, IND_XGI_LCD_PANEL, reg);
+                           reg &= 0x0f;
+                           XGIhw_ext.ulCRT2LCDType = XGI310paneltype[reg];
+
+                   } else {
+                       // TW: FSTN/DSTN
+                       XGIhw_ext.ulCRT2LCDType = LCD_320x480;
+                   }
+               }
+
+               XGIfb_detectedpdc = 0;
+
+               XGIfb_detectedlcda = 0xff;
+#ifndef LINUXBIOS
+
+                /* TW: Try to find about LCDA */
+
+        if((XGIhw_ext.ujVBChipID == VB_CHIP_302B) ||
+              (XGIhw_ext.ujVBChipID == VB_CHIP_301LV) ||
+              (XGIhw_ext.ujVBChipID == VB_CHIP_302LV))
+           {
+              int tmp;
+              inXGIIDXREG(XGICR,0x34,tmp);
+              if(tmp <= 0x13)
+              {
+                 // Currently on LCDA? (Some BIOSes leave CR38)
+                 inXGIIDXREG(XGICR,0x38,tmp);
+                     if((tmp & 0x03) == 0x03)
+                     {
+//                       XGI_Pr.XGI_UseLCDA = TRUE;
+                     }else
+                     {
+                    //  Currently on LCDA? (Some newer BIOSes set D0 in CR35)
+                        inXGIIDXREG(XGICR,0x35,tmp);
+                        if(tmp & 0x01)
+                        {
+//                           XGI_Pr.XGI_UseLCDA = TRUE;
+                          }else
+                          {
+                              inXGIIDXREG(XGICR,0x30,tmp);
+                              if(tmp & 0x20)
+                              {
+                                  inXGIIDXREG(XGIPART1,0x13,tmp);
+                                      if(tmp & 0x04)
+                                      {
+//                                     XGI_Pr.XGI_UseLCDA = TRUE;
+                                      }
+                              }
+                          }
+                       }
+                }
+
+        }
+
+
+#endif
+
+               if (xgifb_mode_idx >= 0)
+                       xgifb_mode_idx = XGIfb_validate_mode(xgifb_mode_idx);
+
+               if (xgifb_mode_idx < 0) {
+                       switch (xgi_video_info.disp_state & DISPTYPE_DISP2) {
+                          case DISPTYPE_LCD:
+                               xgifb_mode_idx = DEFAULT_LCDMODE;
+                               if (xgi_video_info.chip == XG21)
+                               {
+                                   xgifb_mode_idx = XGIfb_GetXG21DefaultLVDSModeIdx();
+                               }
+                               break;
+                          case DISPTYPE_TV:
+                               xgifb_mode_idx = DEFAULT_TVMODE;
+                               break;
+                          default:
+                               xgifb_mode_idx = DEFAULT_MODE;
+                               break;
+                       }
+               }
+
+               XGIfb_mode_no = XGIbios_mode[xgifb_mode_idx].mode_no;
+
+
+                if( xgi_video_info.refresh_rate == 0)
+                   xgi_video_info.refresh_rate = 60; /*yilin set default refresh rate */
+               if(XGIfb_search_refresh_rate(xgi_video_info.refresh_rate) == 0)
+                {
+                   XGIfb_rate_idx = XGIbios_mode[xgifb_mode_idx].rate_idx;
+                   xgi_video_info.refresh_rate = 60;
+               }
+
+               xgi_video_info.video_bpp = XGIbios_mode[xgifb_mode_idx].bpp;
+               xgi_video_info.video_vwidth = xgi_video_info.video_width = XGIbios_mode[xgifb_mode_idx].xres;
+               xgi_video_info.video_vheight = xgi_video_info.video_height = XGIbios_mode[xgifb_mode_idx].yres;
+               xgi_video_info.org_x = xgi_video_info.org_y = 0;
+               xgi_video_info.video_linelength = xgi_video_info.video_width * (xgi_video_info.video_bpp >> 3);
+               switch(xgi_video_info.video_bpp) {
+               case 8:
+                       xgi_video_info.DstColor = 0x0000;
+                       xgi_video_info.XGI310_AccelDepth = 0x00000000;
+                       xgi_video_info.video_cmap_len = 256;
+                       break;
+               case 16:
+                       xgi_video_info.DstColor = 0x8000;
+                       xgi_video_info.XGI310_AccelDepth = 0x00010000;
+                       xgi_video_info.video_cmap_len = 16;
+                       break;
+               case 32:
+                       xgi_video_info.DstColor = 0xC000;
+                       xgi_video_info.XGI310_AccelDepth = 0x00020000;
+                       xgi_video_info.video_cmap_len = 16;
+                       break;
+               default:
+                       xgi_video_info.video_cmap_len = 16;
+                       printk(KERN_INFO "XGIfb: Unsupported depth %d", xgi_video_info.video_bpp);
+                       break;
+               }
+
+
+
+               printk(KERN_INFO "XGIfb: Default mode is %dx%dx%d (%dHz)\n",
+                       xgi_video_info.video_width, xgi_video_info.video_height, xgi_video_info.video_bpp,
+                       xgi_video_info.refresh_rate);
+
+               default_var.xres = default_var.xres_virtual = xgi_video_info.video_width;
+               default_var.yres = default_var.yres_virtual = xgi_video_info.video_height;
+               default_var.bits_per_pixel = xgi_video_info.video_bpp;
+
+               XGIfb_bpp_to_var(&default_var);
+
+               default_var.pixclock = (u32) (1000000000 /
+                               XGIfb_mode_rate_to_dclock(&XGI_Pr, &XGIhw_ext,
+                                               XGIfb_mode_no, XGIfb_rate_idx));
+
+               if(XGIfb_mode_rate_to_ddata(&XGI_Pr, &XGIhw_ext,
+                        XGIfb_mode_no, XGIfb_rate_idx,
+                        &default_var.left_margin, &default_var.right_margin,
+                        &default_var.upper_margin, &default_var.lower_margin,
+                        &default_var.hsync_len, &default_var.vsync_len,
+                        &default_var.sync, &default_var.vmode)) {
+
+                  if((default_var.vmode & FB_VMODE_MASK) == FB_VMODE_INTERLACED) {
+                     default_var.yres <<= 1;
+                     default_var.yres_virtual <<= 1;
+                  } else if((default_var.vmode & FB_VMODE_MASK) == FB_VMODE_DOUBLE) {
+                     default_var.pixclock >>= 1;
+                     default_var.yres >>= 1;
+                     default_var.yres_virtual >>= 1;
+                  }
+
+               }
+
+
+#if 0
+#ifdef XGIFB_PAN
+               if(XGIfb_ypan) {
+                       default_var.yres_virtual =
+                               xgi_video_info.heapstart / (default_var.xres * (default_var.bits_per_pixel >> 3));
+                       if(default_var.yres_virtual <= default_var.yres) {
+                               default_var.yres_virtual = default_var.yres;
+                       }
+               }
+#endif
+#endif
+
+
+               xgi_video_info.accel = 0;
+               if(XGIfb_accel) {
+                  xgi_video_info.accel = -1;
+                  default_var.accel_flags |= FB_ACCELF_TEXT;
+                  XGIfb_initaccel();
+               }
+
+               fb_info->flags = FBINFO_FLAG_DEFAULT;
+               fb_info->var = default_var;
+               fb_info->fix = XGIfb_fix;
+               fb_info->par = &xgi_video_info;
+               fb_info->screen_base = xgi_video_info.video_vbase;
+               fb_info->fbops = &XGIfb_ops;
+               XGIfb_get_fix(&fb_info->fix, -1, fb_info);
+               fb_info->pseudo_palette = pseudo_palette;
+
+               fb_alloc_cmap(&fb_info->cmap, 256 , 0);
+
+
+#ifdef CONFIG_MTRR
+               xgi_video_info.mtrr = mtrr_add((unsigned int) xgi_video_info.video_base,
+                               (unsigned int) xgi_video_info.video_size,
+                               MTRR_TYPE_WRCOMB, 1);
+               if(xgi_video_info.mtrr) {
+                       printk(KERN_INFO "XGIfb: Added MTRRs\n");
+               }
+#endif
+
+               if(register_framebuffer(fb_info) < 0)
+    {
+                       return -EINVAL;
+    }
+
+               XGIfb_registered = 1;
+
+               printk(KERN_INFO "XGIfb: Installed XGIFB_GET_INFO ioctl (%x)\n", XGIFB_GET_INFO);
+
+/*             printk(KERN_INFO "XGIfb: 2D acceleration is %s, scrolling mode %s\n",
+                    XGIfb_accel ? "enabled" : "disabled",
+                    XGIfb_ypan  ? "ypan" : "redraw");
+*/
+               printk(KERN_INFO "fb%d: %s frame buffer device, Version %d.%d.%02d\n",
+                       fb_info->node, myid, VER_MAJOR, VER_MINOR, VER_LEVEL);
+
+
+       }
+
+       dumpVGAReg();
+
+       return 0;
+}
+
+
+/*****************************************************/
+/*                PCI DEVICE HANDLING                */
+/*****************************************************/
+
+static void __devexit xgifb_remove(struct pci_dev *pdev)
+{
+       /* Unregister the framebuffer */
+//     if(xgi_video_info.registered) {
+               unregister_framebuffer(fb_info);
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,3))
+               framebuffer_release(fb_info);
+#else
+               kfree(fb_info);
+#endif
+//     }
+
+       pci_set_drvdata(pdev, NULL);
+
+};
+
+static struct pci_driver xgifb_driver = {
+       .name           = "xgifb",
+       .id_table       = xgifb_pci_table,
+       .probe          = xgifb_probe,
+       .remove         = __devexit_p(xgifb_remove)
+};
+
+XGIINITSTATIC int __init xgifb_init(void)
+{
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,8)
+#ifndef MODULE
+       char *option = NULL;
+
+       if (fb_get_options("xgifb", &option))
+               return -ENODEV;
+       XGIfb_setup(option);
+#endif
+#endif
+       return(pci_register_driver(&xgifb_driver));
+}
+
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,8)
+#ifndef MODULE
+module_init(xgifb_init);
+#endif
+#endif
+
+/*****************************************************/
+/*                      MODULE                       */
+/*****************************************************/
+
+#ifdef MODULE
+
+static char         *mode = NULL;
+static int          vesa = 0;
+static unsigned int rate = 0;
+static unsigned int crt1off = 1;
+static unsigned int mem = 0;
+static char         *forcecrt2type = NULL;
+static int          forcecrt1 = -1;
+static int          pdc = -1;
+static int          pdc1 = -1;
+static int          noaccel = -1;
+static int          noypan  = -1;
+static int         nomax = -1;
+static int          userom = -1;
+static int          useoem = -1;
+static char         *tvstandard = NULL;
+static int         nocrt2rate = 0;
+static int          scalelcd = -1;
+static char        *specialtiming = NULL;
+static int         lvdshl = -1;
+static int         tvxposoffset = 0, tvyposoffset = 0;
+#if !defined(__i386__) && !defined(__x86_64__)
+static int         resetcard = 0;
+static int         videoram = 0;
+#endif
+
+MODULE_DESCRIPTION("Z7 Z9 Z9S Z11 framebuffer device driver");
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("XGITECH , Others");
+
+
+
+module_param(mem, int, 0);
+module_param(noaccel, int, 0);
+module_param(noypan, int, 0);
+module_param(nomax, int, 0);
+module_param(userom, int, 0);
+module_param(useoem, int, 0);
+module_param(mode, charp, 0);
+module_param(vesa, int, 0);
+module_param(rate, int, 0);
+module_param(forcecrt1, int, 0);
+module_param(forcecrt2type, charp, 0);
+module_param(scalelcd, int, 0);
+module_param(pdc, int, 0);
+module_param(pdc1, int, 0);
+module_param(specialtiming, charp, 0);
+module_param(lvdshl, int, 0);
+module_param(tvstandard, charp, 0);
+module_param(tvxposoffset, int, 0);
+module_param(tvyposoffset, int, 0);
+module_param(filter, int, 0);
+module_param(nocrt2rate, int, 0);
+#if !defined(__i386__) && !defined(__x86_64__)
+module_param(resetcard, int, 0);
+module_param(videoram, int, 0);
+#endif
+
+
+MODULE_PARM_DESC(mem,
+       "\nDetermines the beginning of the video memory heap in KB. This heap is used\n"
+         "for video RAM management for eg. DRM/DRI. On 300 series, the default depends\n"
+         "on the amount of video RAM available. If 8MB of video RAM or less is available,\n"
+         "the heap starts at 4096KB, if between 8 and 16MB are available at 8192KB,\n"
+         "otherwise at 12288KB. On 315 and Xabre series, the heap size is 32KB by default.\n"
+         "The value is to be specified without 'KB' and must match the MaxXFBMem setting\n"
+         "for XFree86 4.x/X.org 6.7 and later.\n");
+
+MODULE_PARM_DESC(noaccel,
+        "\nIf set to anything other than 0, 2D acceleration will be disabled.\n"
+         "(default: 0)\n");
+
+MODULE_PARM_DESC(noypan,
+        "\nIf set to anything other than 0, y-panning will be disabled and scrolling\n"
+         "will be performed by redrawing the screen. (default: 0)\n");
+
+MODULE_PARM_DESC(nomax,
+        "\nIf y-panning is enabled, xgifb will by default use the entire available video\n"
+         "memory for the virtual screen in order to optimize scrolling performance. If\n"
+         "this is set to anything other than 0, xgifb will not do this and thereby \n"
+         "enable the user to positively specify a virtual Y size of the screen using\n"
+         "fbset. (default: 0)\n");
+
+
+
+MODULE_PARM_DESC(mode,
+       "\nSelects the desired default display mode in the format XxYxDepth,\n"
+         "eg. 1024x768x16. Other formats supported include XxY-Depth and\n"
+        "XxY-Depth@Rate. If the parameter is only one (decimal or hexadecimal)\n"
+        "number, it will be interpreted as a VESA mode number. (default: 800x600x8)\n");
+
+MODULE_PARM_DESC(vesa,
+       "\nSelects the desired default display mode by VESA defined mode number, eg.\n"
+         "0x117 (default: 0x0103)\n");
+
+
+MODULE_PARM_DESC(rate,
+       "\nSelects the desired vertical refresh rate for CRT1 (external VGA) in Hz.\n"
+         "If the mode is specified in the format XxY-Depth@Rate, this parameter\n"
+         "will be ignored (default: 60)\n");
+
+MODULE_PARM_DESC(forcecrt1,
+       "\nNormally, the driver autodetects whether or not CRT1 (external VGA) is \n"
+         "connected. With this option, the detection can be overridden (1=CRT1 ON,\n"
+         "0=CRT1 OFF) (default: [autodetected])\n");
+
+MODULE_PARM_DESC(forcecrt2type,
+       "\nIf this option is omitted, the driver autodetects CRT2 output devices, such as\n"
+         "LCD, TV or secondary VGA. With this option, this autodetection can be\n"
+         "overridden. Possible parameters are LCD, TV, VGA or NONE. NONE disables CRT2.\n"
+         "On systems with a SiS video bridge, parameters SVIDEO, COMPOSITE or SCART can\n"
+         "be used instead of TV to override the TV detection. Furthermore, on systems\n"
+         "with a SiS video bridge, SVIDEO+COMPOSITE, HIVISION, YPBPR480I, YPBPR480P,\n"
+         "YPBPR720P and YPBPR1080I are understood. However, whether or not these work\n"
+         "depends on the very hardware in use. (default: [autodetected])\n");
+
+MODULE_PARM_DESC(scalelcd,
+       "\nSetting this to 1 will force the driver to scale the LCD image to the panel's\n"
+         "native resolution. Setting it to 0 will disable scaling; LVDS panels will\n"
+         "show black bars around the image, TMDS panels will probably do the scaling\n"
+         "themselves. Default: 1 on LVDS panels, 0 on TMDS panels\n");
+
+MODULE_PARM_DESC(pdc,
+        "\nThis is for manually selecting the LCD panel delay compensation. The driver\n"
+         "should detect this correctly in most cases; however, sometimes this is not\n"
+         "possible. If you see 'small waves' on the LCD, try setting this to 4, 32 or 24\n"
+         "on a 300 series chipset; 6 on a 315 series chipset. If the problem persists,\n"
+         "try other values (on 300 series: between 4 and 60 in steps of 4; on 315 series:\n"
+         "any value from 0 to 31). (default: autodetected, if LCD is active during start)\n");
+
+MODULE_PARM_DESC(pdc1,
+        "\nThis is same as pdc, but for LCD-via CRT1. Hence, this is for the 315/330\n"
+         "series only. (default: autodetected if LCD is in LCD-via-CRT1 mode during\n"
+         "startup) - Note: currently, this has no effect because LCD-via-CRT1 is not\n"
+         "implemented yet.\n");
+
+MODULE_PARM_DESC(specialtiming,
+       "\nPlease refer to documentation for more information on this option.\n");
+
+MODULE_PARM_DESC(lvdshl,
+       "\nPlease refer to documentation for more information on this option.\n");
+
+MODULE_PARM_DESC(tvstandard,
+       "\nThis allows overriding the BIOS default for the TV standard. Valid choices are\n"
+         "pal, ntsc, palm and paln. (default: [auto; pal or ntsc only])\n");
+
+MODULE_PARM_DESC(tvxposoffset,
+       "\nRelocate TV output horizontally. Possible parameters: -32 through 32.\n"
+         "Default: 0\n");
+
+MODULE_PARM_DESC(tvyposoffset,
+       "\nRelocate TV output vertically. Possible parameters: -32 through 32.\n"
+         "Default: 0\n");
+
+MODULE_PARM_DESC(filter,
+       "\nSelects TV flicker filter type (only for systems with a SiS301 video bridge).\n"
+         "(Possible values 0-7, default: [no filter])\n");
+
+MODULE_PARM_DESC(nocrt2rate,
+       "\nSetting this to 1 will force the driver to use the default refresh rate for\n"
+         "CRT2 if CRT2 type is VGA. (default: 0, use same rate as CRT1)\n");
+
+
+
+
+int __init xgifb_init_module(void)
+{
+        printk("\nXGIfb_init_module");
+       if(mode)
+               XGIfb_search_mode(mode);
+       else if (vesa != -1)
+               XGIfb_search_vesamode(vesa);
+
+        return(xgifb_init());
+}
+
+static void __exit xgifb_remove_module(void)
+{
+       pci_unregister_driver(&xgifb_driver);
+       printk(KERN_DEBUG "xgifb: Module unloaded\n");
+}
+
+module_init(xgifb_init_module);
+module_exit(xgifb_remove_module);
+
+#endif            /*  /MODULE  */
+
+EXPORT_SYMBOL(XGI_malloc);
+EXPORT_SYMBOL(XGI_free);
+
diff --git a/drivers/staging/xgifb/XGIfb.h b/drivers/staging/xgifb/XGIfb.h
new file mode 100644 (file)
index 0000000..41bf163
--- /dev/null
@@ -0,0 +1,215 @@
+#ifndef _LINUX_XGIFB
+#define _LINUX_XGIFB
+#include <linux/spinlock.h>
+#include <asm/ioctl.h>
+#include <asm/types.h>
+
+#define DISPTYPE_CRT1       0x00000008L
+#define DISPTYPE_CRT2       0x00000004L
+#define DISPTYPE_LCD        0x00000002L
+#define DISPTYPE_TV         0x00000001L
+#define DISPTYPE_DISP1      DISPTYPE_CRT1
+#define DISPTYPE_DISP2      (DISPTYPE_CRT2 | DISPTYPE_LCD | DISPTYPE_TV)
+#define DISPMODE_SINGLE            0x00000020L
+#define DISPMODE_MIRROR            0x00000010L
+#define DISPMODE_DUALVIEW   0x00000040L
+
+#define HASVB_NONE             0x00
+#define HASVB_301              0x01
+#define HASVB_LVDS             0x02
+#define HASVB_TRUMPION         0x04
+#define HASVB_LVDS_CHRONTEL    0x10
+#define HASVB_302              0x20
+#define HASVB_303              0x40
+#define HASVB_CHRONTEL         0x80
+
+#ifndef XGIFB_ID
+#define XGIFB_ID          0x53495346    /* Identify myself with 'XGIF' */
+#endif
+
+typedef enum _XGI_CHIP_TYPE {
+    XGI_VGALegacy = 0,
+    XGI_300,
+    XGI_630,
+    XGI_730,
+    XGI_540,
+    XGI_315H,
+    XGI_315,
+    XGI_315PRO,
+    XGI_550,
+    XGI_640,
+    XGI_740,
+    XGI_650,
+    XGI_650M,
+    XGI_330 = 16,
+    XGI_660,
+    XGI_661,
+    XGI_760,
+    XG40 = 32,
+    XG41,
+    XG42,
+    XG45,
+    XG20 = 48,
+    XG21,
+    XG27,
+    MAX_XGI_CHIP
+} XGI_CHIP_TYPE;
+
+typedef enum _TVTYPE {
+       TVMODE_NTSC = 0,
+       TVMODE_PAL,
+       TVMODE_HIVISION,
+       TVTYPE_PALM,    // vicki@030226
+       TVTYPE_PALN,    // vicki@030226
+       TVTYPE_NTSCJ,   // vicki@030226
+       TVMODE_TOTAL
+} XGI_TV_TYPE;
+
+
+typedef struct _XGIFB_INFO XGIfb_info;
+struct _XGIFB_INFO {
+
+unsigned long XGIfb_id;
+       int    chip_id;                 /* PCI ID of detected chip */
+       int    memory;                  /* video memory in KB which XGIfb manages */
+       int    heapstart;               /* heap start (= XGIfb "mem" argument) in KB */
+       unsigned char fbvidmode;        /* current XGIfb mode */
+
+       unsigned char XGIfb_version;
+       unsigned char XGIfb_revision;
+       unsigned char XGIfb_patchlevel;
+
+       unsigned char XGIfb_caps;       /* XGIfb capabilities */
+
+       int    XGIfb_tqlen;             /* turbo queue length (in KB) */
+
+       unsigned int XGIfb_pcibus;      /* The card's PCI ID */
+       unsigned int XGIfb_pcislot;
+       unsigned int XGIfb_pcifunc;
+
+       unsigned char XGIfb_lcdpdc;     /* PanelDelayCompensation */
+
+       unsigned char XGIfb_lcda;       /* Detected status of LCDA for low res/text modes */
+
+       char reserved[235];             /* for future use */
+};
+
+
+
+
+typedef enum _TVPLUGTYPE {     // vicki@030226
+//     TVPLUG_Legacy = 0,
+//     TVPLUG_COMPOSITE,
+//     TVPLUG_SVIDEO,
+//     TVPLUG_SCART,
+//     TVPLUG_TOTAL
+       TVPLUG_UNKNOWN = 0,
+       TVPLUG_COMPOSITE = 1,
+       TVPLUG_SVIDEO = 2,
+       TVPLUG_COMPOSITE_AND_SVIDEO = 3,
+       TVPLUG_SCART = 4,
+       TVPLUG_YPBPR_525i = 5,
+       TVPLUG_YPBPR_525P = 6,
+       TVPLUG_YPBPR_750P = 7,
+       TVPLUG_YPBPR_1080i = 8,
+       TVPLUG_TOTAL
+} XGI_TV_PLUG;
+
+
+struct mode_info {
+       int    bpp;
+       int    xres;
+       int    yres;
+       int    v_xres;
+       int    v_yres;
+       int    org_x;
+       int    org_y;
+       unsigned int  vrate;
+};
+
+struct ap_data {
+       struct mode_info minfo;
+       unsigned long iobase;
+       unsigned int  mem_size;
+       unsigned long disp_state;
+       XGI_CHIP_TYPE chip;
+       unsigned char hasVB;
+       XGI_TV_TYPE TV_type;
+       XGI_TV_PLUG TV_plug;
+       unsigned long version;
+       char reserved[256];
+};
+
+
+
+/*     If changing this, vgatypes.h must also be changed (for X driver)    */
+
+
+/*
+ * NOTE! The ioctl types used to be "size_t" by mistake, but were
+ * really meant to be __u32. Changed to "__u32" even though that
+ * changes the value on 64-bit architectures, because the value
+ * (with a 4-byte size) is also hardwired in vgatypes.h for user
+ * space exports. So "__u32" is actually more compatible, duh!
+ */
+#define XGIFB_GET_INFO         _IOR('n',0xF8,__u32)
+#define XGIFB_GET_VBRSTATUS    _IOR('n',0xF9,__u32)
+
+
+
+struct video_info{
+        int           chip_id;
+        unsigned int  video_size;
+        unsigned long video_base;
+        char  *       video_vbase;
+        unsigned long mmio_base;
+        char  *       mmio_vbase;
+        unsigned long vga_base;
+        unsigned long mtrr;
+        unsigned long heapstart;
+
+        int    video_bpp;
+        int    video_cmap_len;
+        int    video_width;
+        int    video_height;
+        int    video_vwidth;
+        int    video_vheight;
+        int    org_x;
+        int    org_y;
+        int    video_linelength;
+        unsigned int refresh_rate;
+
+        unsigned long disp_state;
+        unsigned char hasVB;
+        unsigned char TV_type;
+        unsigned char TV_plug;
+
+        XGI_CHIP_TYPE chip;
+        unsigned char revision_id;
+
+        unsigned short DstColor;
+        unsigned long  XGI310_AccelDepth;
+        unsigned long  CommandReg;
+
+        spinlock_t     lockaccel;
+
+        unsigned int   pcibus;
+        unsigned int   pcislot;
+        unsigned int   pcifunc;
+
+        int            accel;
+        unsigned short subsysvendor;
+        unsigned short subsysdevice;
+
+        char reserved[236];
+};
+
+
+extern struct video_info xgi_video_info;
+
+#ifdef __KERNEL__
+//extern void xgi_malloc(struct xgi_memreq *req);
+extern void xgi_free(unsigned long base);
+extern void xgi_dispinfo(struct ap_data *rec);
+#endif
+#endif
diff --git a/drivers/staging/xgifb/osdef.h b/drivers/staging/xgifb/osdef.h
new file mode 100644 (file)
index 0000000..4bc7d3a
--- /dev/null
@@ -0,0 +1,153 @@
+#ifndef _OSDEF_H_
+#define _OSDEF_H_
+
+/* #define WINCE_HEADER*/
+/*#define WIN2000*/
+/* #define TC */
+#define LINUX_KERNEL
+/* #define LINUX_XF86 */
+
+/**********************************************************************/
+#ifdef LINUX_KERNEL
+//#include <linux/config.h>
+#endif
+
+
+/**********************************************************************/
+#ifdef TC
+#endif
+#ifdef WIN2000
+#endif
+#ifdef WINCE_HEADER
+#endif
+#ifdef LINUX_XF86
+#define LINUX
+#endif
+#ifdef LINUX_KERNEL
+#define LINUX
+#endif
+
+/**********************************************************************/
+#ifdef TC
+#define XGI_SetMemory(MemoryAddress,MemorySize,value) memset(MemoryAddress, value, MemorySize);
+#endif
+#ifdef WIN2000
+#define XGI_SetMemory(MemoryAddress,MemorySize,value) MemFill((PVOID) MemoryAddress,(ULONG) MemorySize,(UCHAR) value);
+#endif
+#ifdef WINCE_HEADER
+#define XGI_SetMemory(MemoryAddress,MemorySize,value) memset(MemoryAddress, value, MemorySize);
+#endif
+#ifdef LINUX_XF86
+#define XGI_SetMemory(MemoryAddress,MemorySize,value) memset(MemoryAddress, value, MemorySize)
+#endif
+#ifdef LINUX_KERNEL
+#define XGI_SetMemory(MemoryAddress,MemorySize,value) memset(MemoryAddress, value, MemorySize)
+#endif
+/**********************************************************************/
+
+/**********************************************************************/
+
+#ifdef TC
+#define XGI_MemoryCopy(Destination,Soruce,Length) memmove(Destination, Soruce, Length);
+#endif
+#ifdef WIN2000
+#define XGI_MemoryCopy(Destination,Soruce,Length)  /*VideoPortMoveMemory((PUCHAR)Destination , Soruce,length);*/
+#endif
+#ifdef WINCE_HEADER
+#define XGI_MemoryCopy(Destination,Soruce,Length) memmove(Destination, Soruce, Length);
+#endif
+#ifdef LINUX_XF86
+#define XGI_MemoryCopy(Destination,Soruce,Length) memcpy(Destination,Soruce,Length)
+#endif
+#ifdef LINUX_KERNEL
+#define XGI_MemoryCopy(Destination,Soruce,Length) memcpy(Destination,Soruce,Length)
+#endif
+
+/**********************************************************************/
+
+#ifdef OutPortByte
+#undef OutPortByte
+#endif /* OutPortByte */
+
+#ifdef OutPortWord
+#undef OutPortWord
+#endif /* OutPortWord */
+
+#ifdef OutPortLong
+#undef OutPortLong
+#endif /* OutPortLong */
+
+#ifdef InPortByte
+#undef InPortByte
+#endif /* InPortByte */
+
+#ifdef InPortWord
+#undef InPortWord
+#endif /* InPortWord */
+
+#ifdef InPortLong
+#undef InPortLong
+#endif /* InPortLong */
+
+/**********************************************************************/
+/*  TC                                                                */
+/**********************************************************************/
+
+#ifdef TC
+#define OutPortByte(p,v) outp((unsigned short)(p),(unsigned char)(v))
+#define OutPortWord(p,v) outp((unsigned short)(p),(unsigned short)(v))
+#define OutPortLong(p,v) outp((unsigned short)(p),(unsigned long)(v))
+#define InPortByte(p)    inp((unsigned short)(p))
+#define InPortWord(p)    inp((unsigned short)(p))
+#define InPortLong(p)    ((inp((unsigned short)(p+2))<<16) | inp((unsigned short)(p)))
+#endif
+
+/**********************************************************************/
+/*  LINUX XF86                                                        */
+/**********************************************************************/
+
+#ifdef LINUX_XF86
+#define OutPortByte(p,v) outb((CARD16)(p),(CARD8)(v))
+#define OutPortWord(p,v) outw((CARD16)(p),(CARD16)(v))
+#define OutPortLong(p,v) outl((CARD16)(p),(CARD32)(v))
+#define InPortByte(p)    inb((CARD16)(p))
+#define InPortWord(p)    inw((CARD16)(p))
+#define InPortLong(p)    inl((CARD16)(p))
+#endif
+
+#ifdef LINUX_KERNEL
+#define OutPortByte(p,v) outb((u8)(v),(p))
+#define OutPortWord(p,v) outw((u16)(v),(p))
+#define OutPortLong(p,v) outl((u32)(v),(p))
+#define InPortByte(p)    inb(p)
+#define InPortWord(p)    inw(p)
+#define InPortLong(p)    inl(p)
+#endif
+
+/**********************************************************************/
+/*  WIN 2000                                                          */
+/**********************************************************************/
+
+#ifdef WIN2000
+#define OutPortByte(p,v) VideoPortWritePortUchar ((PUCHAR) (p), (UCHAR) (v))
+#define OutPortWord(p,v) VideoPortWritePortUshort((PUSHORT) (p), (USHORT) (v))
+#define OutPortLong(p,v) VideoPortWritePortUlong ((PULONG) (p), (ULONG) (v))
+#define InPortByte(p)    VideoPortReadPortUchar  ((PUCHAR) (p))
+#define InPortWord(p)    VideoPortReadPortUshort ((PUSHORT) (p))
+#define InPortLong(p)    VideoPortReadPortUlong  ((PULONG) (p))
+#endif
+
+
+/**********************************************************************/
+/*  WIN CE                                                          */
+/**********************************************************************/
+
+#ifdef WINCE_HEADER
+#define OutPortByte(p,v) WRITE_PORT_UCHAR ((PUCHAR) (p), (UCHAR) (v))
+#define OutPortWord(p,v) WRITE_PORT_USHORT((PUSHORT) (p), (USHORT) (v))
+#define OutPortLong(p,v) WRITE_PORT_ULONG ((PULONG) (p), (ULONG) (v))
+#define InPortByte(p)    READ_PORT_UCHAR  ((PUCHAR) (p))
+#define InPortWord(p)    READ_PORT_USHORT ((PUSHORT) (p))
+#define InPortLong(p)    READ_PORT_ULONG  ((PULONG) (p))
+#endif
+#endif // _OSDEF_H_
diff --git a/drivers/staging/xgifb/vb_def.h b/drivers/staging/xgifb/vb_def.h
new file mode 100644 (file)
index 0000000..17a7ada
--- /dev/null
@@ -0,0 +1,1017 @@
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/xgi/initdef.h,v 1.4 2000/12/02 01:16:17 dawes Exp $ */
+#ifndef _INITDEF_
+#define _INITDEF_
+
+#ifndef NewScratch
+#define NewScratch
+#endif
+/* shampoo */
+#ifdef LINUX_KERNEL
+#define SEQ_ADDRESS_PORT         0x0014
+#define SEQ_DATA_PORT            0x0015
+#define MISC_OUTPUT_REG_READ_PORT 0x001C
+#define MISC_OUTPUT_REG_WRITE_PORT 0x0012
+#define GRAPH_DATA_PORT                  0x1F
+#define GRAPH_ADDRESS_PORT       0x1E
+#define XGI_MASK_DUAL_CHIP       0x04  /* SR3A */
+#define CRTC_ADDRESS_PORT_COLOR   0x0024
+#define VIDEO_SUBSYSTEM_ENABLE_PORT 0x0013
+#define PCI_COMMAND            0x04
+#endif
+/* ~shampoo */
+
+
+#define VB_XGI301            0x0001  /*301b*/
+#define VB_XGI301B        0x0002
+#define VB_XGI302B        0x0004
+#define VB_XGI301LV     0x0008 /*301lv*/
+#define VB_XGI302LV     0x0010
+#define VB_XGI301C      0x0020       /* for 301C */
+#define  VB_NoLCD        0x8000
+/*end 301b*/
+
+#define VB_YPbPrInfo     0x07          /*301lv*/
+#define VB_YPbPr525i     0x00
+#define VB_YPbPr525p     0x01
+#define VB_YPbPr750p     0x02
+#define VB_YPbPr1080i    0x03
+
+/* #define CRT1Len 17 */
+#define LVDSCRT1Len             15
+#define CHTVRegDataLen          5
+
+/* #define ModeInfoFlag 0x07 */
+/* #define IsTextMode 0x07 */
+/* #define ModeText 0x00 */
+/* #define ModeCGA 0x01 */
+/* #define ModeEGA 0x02 */
+/* #define ModeVGA 0x03 */
+/* #define Mode15Bpp 0x04 */
+/* #define Mode16Bpp 0x05 */
+/* #define Mode24Bpp 0x06 */
+/* #define Mode32Bpp 0x07 */
+
+/* #define DACInfoFlag 0x18 */
+/* #define MemoryInfoFlag 0x1E0 */
+/* #define MemorySizeShift 0x05 */
+
+#define Charx8Dot               0x0200
+#define LineCompareOff          0x0400
+#define CRT2Mode                0x0800
+#define HalfDCLK                0x1000
+#define NoSupportSimuTV         0x2000
+#define DoubleScanMode          0x8000
+
+#define SupportAllCRT2          0x0078
+#define SupportTV               0x0008
+#define SupportHiVisionTV       0x0010
+#define SupportLCD              0x0020
+#define SupportRAMDAC2          0x0040
+#define NoSupportTV             0x0070
+#define NoSupportHiVisionTV     0x0060
+#define NoSupportLCD            0x0058
+#define SupportCHTV            0x0800
+#define SupportCRT2in301C       0x0100       /* for 301C */
+#define SupportTV1024           0x0800  /*301b*/
+#define SupportYPbPr            0x1000  /*301lv*/
+#define InterlaceMode           0x0080
+#define SyncPP                  0x0000
+#define SyncPN                  0x4000
+#define SyncNP                  0x8000
+/* #define SyncNN 0xc000 */
+#define ECLKindex0              0x0000
+#define ECLKindex1              0x0100
+#define ECLKindex2              0x0200
+#define ECLKindex3              0x0300
+#define ECLKindex4              0x0400
+
+#define SetSimuScanMode         0x0001
+#define SwitchToCRT2            0x0002
+/* #define SetCRT2ToTV 0x009C */
+#define SetCRT2ToAVIDEO         0x0004
+#define SetCRT2ToSVIDEO         0x0008
+#define SetCRT2ToSCART          0x0010
+#define SetCRT2ToLCD            0x0020
+#define SetCRT2ToRAMDAC         0x0040
+#define SetCRT2ToHiVisionTV     0x0080
+#define SetNTSCTV               0x0000
+/* #define SetPALTV 0x0100 */
+#define SetInSlaveMode          0x0200
+#define SetNotSimuMode          0x0400
+#define SetNotSimuTVMode        0x0400
+#define SetDispDevSwitch        0x0800
+#define LoadDACFlag             0x1000
+#define DisableCRT2Display      0x2000
+#define DriverMode              0x4000
+#define HotKeySwitch            0x8000
+#define SetCHTVOverScan        0x8000
+/* #define SetCRT2ToLCDA 0x8000 301b */
+#define PanelRGB18Bit           0x0100
+#define PanelRGB24Bit           0x0000
+
+#define TVOverScan              0x10
+#define TVOverScanShift         4
+#define ClearBufferFlag         0x20
+#define EnableDualEdge                 0x01            /*301b*/
+#define SetToLCDA              0x02
+
+#define YPbPrModeInfo           0x38
+/* #define YPbPrMode525i 0x00 */
+/* #define YPbPrMode525p 0x08 */
+/* #define YPbPrMode750p 0x10 */
+/* #define YPbPrMode1080i 0x18 */
+
+#define SetSCARTOutput          0x01
+#define BoardTVType             0x02
+#define  EnablePALMN           0x40
+/* #define ProgrammingCRT2 0x01 */
+/* #define TVSimuMode 0x02 */
+/* #define RPLLDIV2XO 0x04 */
+/* #define LCDVESATiming 0x08 */
+/* #define EnableLVDSDDA 0x10 */
+#define SetDispDevSwitchFlag    0x20
+#define CheckWinDos             0x40
+#define SetJDOSMode             0x80
+
+#define Panel320x480              0x07/*fstn*/
+/* [ycchen] 02/12/03 Modify for Multi-Sync. LCD Support */
+#define PanelResInfo            0x1F   /* CR36 Panel Type/LCDResInfo */
+#define PanelRefInfo            0x60
+#define Panel800x600            0x01
+#define Panel1024x768           0x02
+#define Panel1024x768x75        0x22
+#define Panel1280x1024          0x03
+#define Panel1280x1024x75       0x23
+#define Panel640x480            0x04
+#define Panel1024x600           0x05
+#define Panel1152x864           0x06
+#define Panel1280x960           0x07
+#define Panel1152x768           0x08
+#define Panel1400x1050          0x09
+#define Panel1280x768           0x0A
+#define Panel1600x1200          0x0B
+
+#define PanelRef60Hz            0x00
+#define PanelRef75Hz            0x20
+#define LCDRGB18Bit             0x01
+
+#define ExtChipTrumpion         0x06
+#define ExtChipCH7005           0x08
+#define ExtChipMitacTV          0x0a
+#define LCDNonExpanding         0x10
+#define LCDNonExpandingShift    4
+#define LCDSync                 0x20
+#define LCDSyncBit              0xe0
+#define LCDSyncShift            6
+
+/* #define DDC2DelayTime 300 */
+
+#define CRT2DisplayFlag         0x2000
+/* #define LCDDataLen 8 */
+/* #define HiTVDataLen 12 */
+/* #define TVDataLen 16 */
+/* #define SetPALTV 0x0100 */
+#define HalfDCLK                0x1000
+#define NTSCHT                  1716
+#define NTSCVT                  525
+#define PALHT                   1728
+#define PALVT                   625
+#define StHiTVHT                892
+#define StHiTVVT                1126
+#define StHiTextTVHT            1000
+#define StHiTextTVVT            1126
+#define ExtHiTVHT               2100
+#define ExtHiTVVT               1125
+
+#define St750pTVHT              1716
+#define St750pTVVT               525
+#define Ext750pTVHT             1716
+#define Ext750pTVVT              525
+#define St525pTVHT              1716
+#define St525pTVVT               525
+#define Ext525pTVHT             1716
+#define Ext525pTVVT              525
+#define St525iTVHT              1716
+#define St525iTVVT               525
+#define Ext525iTVHT             1716
+#define Ext525iTVVT              525
+
+#define VCLKStartFreq           25
+#define SoftDramType            0x80
+#define VCLK40                  0x04
+
+#define VCLK162                0x21
+
+#define LCDRGB18Bit             0x01
+#define LoadDACFlag             0x1000
+#define AfterLockCRT2           0x4000
+#define SetCRT2ToAVIDEO         0x0004
+#define SetCRT2ToSCART          0x0010
+#define Ext2StructSize          5
+
+
+#define YPbPr525iVCLK           0x03B
+#define YPbPr525iVCLK_2         0x03A
+
+#define SwitchToCRT2            0x0002
+/* #define LCDVESATiming 0x08 */
+#define SetSCARTOutput          0x01
+#define AVIDEOSense             0x01
+#define SVIDEOSense             0x02
+#define SCARTSense              0x04
+#define LCDSense                0x08
+#define Monitor1Sense           0x20
+#define Monitor2Sense           0x10
+#define HiTVSense               0x40
+#define BoardTVType             0x02
+#define HotPlugFunction         0x08
+#define StStructSize            0x06
+
+
+#define XGI_CRT2_PORT_00        0x00 - 0x030
+#define XGI_CRT2_PORT_04        0x04 - 0x030
+#define XGI_CRT2_PORT_10        0x10 - 0x30
+#define XGI_CRT2_PORT_12        0x12 - 0x30
+#define XGI_CRT2_PORT_14        0x14 - 0x30
+
+
+#define LCDNonExpanding         0x10
+#define ADR_CRT2PtrData         0x20E
+#define offset_Zurac            0x210
+#define ADR_LVDSDesPtrData      0x212
+#define ADR_LVDSCRT1DataPtr     0x214
+#define ADR_CHTVVCLKPtr         0x216
+#define ADR_CHTVRegDataPtr      0x218
+
+#define LVDSDataLen             6
+/* #define EnableLVDSDDA 0x10 */
+/* #define LVDSDesDataLen 3 */
+#define ActiveNonExpanding      0x40
+#define ActiveNonExpandingShift 6
+/* #define ActivePAL 0x20 */
+#define ActivePALShift          5
+/* #define ModeSwitchStatus 0x0F */
+#define SoftTVType              0x40
+#define SoftSettingAddr         0x52
+#define ModeSettingAddr         0x53
+
+/* #define SelectCRT1Rate 0x4 */
+
+#define _PanelType00             0x00
+#define _PanelType01             0x08
+#define _PanelType02             0x10
+#define _PanelType03             0x18
+#define _PanelType04             0x20
+#define _PanelType05             0x28
+#define _PanelType06             0x30
+#define _PanelType07             0x38
+#define _PanelType08             0x40
+#define _PanelType09             0x48
+#define _PanelType0A             0x50
+#define _PanelType0B             0x58
+#define _PanelType0C             0x60
+#define _PanelType0D             0x68
+#define _PanelType0E             0x70
+#define _PanelType0F             0x78
+
+
+#define PRIMARY_VGA       0     /* 1: XGI is primary vga 0:XGI is secondary vga */
+#define BIOSIDCodeAddr          0x235
+#define OEMUtilIDCodeAddr       0x237
+#define VBModeIDTableAddr       0x239
+#define OEMTVPtrAddr            0x241
+#define PhaseTableAddr          0x243
+#define NTSCFilterTableAddr     0x245
+#define PALFilterTableAddr      0x247
+#define OEMLCDPtr_1Addr         0x249
+#define OEMLCDPtr_2Addr         0x24B
+#define LCDHPosTable_1Addr      0x24D
+#define LCDHPosTable_2Addr      0x24F
+#define LCDVPosTable_1Addr      0x251
+#define LCDVPosTable_2Addr      0x253
+#define OEMLCDPIDTableAddr      0x255
+
+#define VBModeStructSize        5
+#define PhaseTableSize          4
+#define FilterTableSize         4
+#define LCDHPosTableSize        7
+#define LCDVPosTableSize        5
+#define OEMLVDSPIDTableSize     4
+#define LVDSHPosTableSize       4
+#define LVDSVPosTableSize       6
+
+#define VB_ModeID               0
+#define VB_TVTableIndex         1
+#define VB_LCDTableIndex        2
+#define VB_LCDHIndex            3
+#define VB_LCDVIndex            4
+
+#define OEMLCDEnable            0x0001
+#define OEMLCDDelayEnable       0x0002
+#define OEMLCDPOSEnable         0x0004
+#define OEMTVEnable             0x0100
+#define OEMTVDelayEnable        0x0200
+#define OEMTVFlickerEnable      0x0400
+#define OEMTVPhaseEnable        0x0800
+#define OEMTVFilterEnable       0x1000
+
+#define OEMLCDPanelIDSupport    0x0080
+
+/* #define LCDVESATiming 0x0001 //LCD Info CR37 */
+/* #define EnableLVDSDDA 0x0002 */
+#define EnableScalingLCD        0x0008
+#define SetPWDEnable            0x0004
+#define SetLCDtoNonExpanding    0x0010
+/* #define SetLCDPolarity 0x00E0 */
+#define SetLCDDualLink          0x0100
+#define SetLCDLowResolution     0x0200
+#define SetLCDStdMode           0x0400
+#define SetTVStdMode            0x0200
+#define SetTVLowResolution      0x0400
+/* =============================================================
+   for 310
+============================================================== */
+#define SoftDRAMType        0x80
+#define SoftSetting_OFFSET  0x52
+#define SR07_OFFSET  0x7C
+#define SR15_OFFSET  0x7D
+#define SR16_OFFSET  0x81
+#define SR17_OFFSET  0x85
+#define SR19_OFFSET  0x8D
+#define SR1F_OFFSET  0x99
+#define SR21_OFFSET  0x9A
+#define SR22_OFFSET  0x9B
+#define SR23_OFFSET  0x9C
+#define SR24_OFFSET  0x9D
+#define SR25_OFFSET  0x9E
+#define SR31_OFFSET  0x9F
+#define SR32_OFFSET  0xA0
+#define SR33_OFFSET  0xA1
+
+#define CR40_OFFSET  0xA2
+#define SR25_1_OFFSET  0xF6
+#define CR49_OFFSET  0xF7
+
+#define VB310Data_1_2_Offset  0xB6
+#define VB310Data_4_D_Offset  0xB7
+#define VB310Data_4_E_Offset  0xB8
+#define VB310Data_4_10_Offset 0xBB
+
+#define RGBSenseDataOffset    0xBD
+#define YCSenseDataOffset     0xBF
+#define VideoSenseDataOffset  0xC1
+#define OutputSelectOffset    0xF3
+
+#define ECLK_MCLK_DISTANCE  0x14
+#define VBIOSTablePointerStart    0x200
+#define StandTablePtrOffset       VBIOSTablePointerStart+0x02
+#define EModeIDTablePtrOffset     VBIOSTablePointerStart+0x04
+#define CRT1TablePtrOffset        VBIOSTablePointerStart+0x06
+#define ScreenOffsetPtrOffset     VBIOSTablePointerStart+0x08
+#define VCLKDataPtrOffset         VBIOSTablePointerStart+0x0A
+#define MCLKDataPtrOffset         VBIOSTablePointerStart+0x0E
+#define CRT2PtrDataPtrOffset      VBIOSTablePointerStart+0x10
+#define TVAntiFlickPtrOffset      VBIOSTablePointerStart+0x12
+#define TVDelayPtr1Offset         VBIOSTablePointerStart+0x14
+#define TVPhaseIncrPtr1Offset     VBIOSTablePointerStart+0x16
+#define TVYFilterPtr1Offset       VBIOSTablePointerStart+0x18
+#define LCDDelayPtr1Offset        VBIOSTablePointerStart+0x20
+#define TVEdgePtr1Offset          VBIOSTablePointerStart+0x24
+#define CRT2Delay1Offset          VBIOSTablePointerStart+0x28
+#define LCDDataDesOffset     VBIOSTablePointerStart-0x02
+#define LCDDataPtrOffset          VBIOSTablePointerStart+0x2A
+#define LCDDesDataPtrOffset     VBIOSTablePointerStart+0x2C
+#define LCDDataList            VBIOSTablePointerStart+0x22     /* add for GetLCDPtr */
+#define TVDataList             VBIOSTablePointerStart+0x36     /* add for GetTVPtr */
+/*  */
+/* Modify from 310.inc */
+/*  */
+/*  */
+
+
+#define                ShowMsgFlag                  0x20               /* SoftSetting */
+#define                ShowVESAFlag                 0x10
+#define                HotPlugFunction              0x08
+#define                ModeSoftSetting              0x04
+#define                TVSoftSetting                0x02
+#define                LCDSoftSetting               0x01
+
+#define                GatingCRTinLCDA              0x10
+#define                SetHiTVOutput                0x08
+#define                SetYPbPrOutput               0x04
+#define                BoardTVType                  0x02
+#define                SetSCARTOutput               0x01
+
+#define                ModeSettingYPbPr             0x02               /* TVModeSetting, Others as same as CR30 */
+
+/* TVModeSetting same as CR35 */
+
+/* LCDModeSetting same as CR37 */
+
+#define                EnableNewTVFont              0x10               /* MiscCapability */
+
+#define                EnableLCDOutput              0x80               /* LCDCfgSetting */
+
+#define                SoftDRAMType                 0x80               /* DRAMSetting */
+#define                SoftDRAMConfig               0x40
+#define                MosSelDRAMType               0x20
+#define                SDRAM                        000h
+#define                SGRAM                        0x01
+#define                ESDRAM                       0x02
+
+#define                EnableAGPCfgSetting          0x01               /* AGPCfgSetting */
+
+/* ---------------- SetMode Stack */
+#define                CRT1Len                      15
+#define                VCLKLen                      4
+#define                DefThreshold                 0x0100
+#define                ExtRegsSize                  (57+8+37+70+63+28+768+1)/64+1
+
+#define                VGA_XGI315                   0x0001       /* VGA Type Info */
+#define                VGA_SNewis315e                  0x0002       /* 315 series */
+#define                VGA_XGI550                   0x0004
+#define                VGA_XGI640                   0x0008
+#define                VGA_XGI740                   0x0010
+#define                VGA_XGI650                   0x0020
+#define                VGA_XGI650M                  0x0040
+#define                VGA_XGI651                   0x0080
+#define                VGA_XGI340                   0x0001       /* 340 series */
+#define                VGA_XGI330                   0x0001       /* 330 series */
+#define                VGA_XGI660                   0x0001       /* 660 series */
+
+#define                VB_XGI301                    0x0001       /* VB Type Info */
+#define                VB_XGI301B                   0x0002       /* 301 series */
+#define                VB_XGI302B                   0x0004
+#define                VB_NoLCD                     0x8000
+#define                VB_XGI301LV                  0x0008
+#define                VB_XGI302LV                  0x0010
+#define                VB_LVDS_NS                   0x0001       /* 3rd party chip */
+#define                VB_CH7017                    0x0002
+#define         VB_CH7007                    0x0080       /* [Billy] 07/05/03 */
+/* #define VB_LVDS_SI 0x0004 */
+
+#define                ModeInfoFlag                 0x0007
+#define                IsTextMode                   0x0007
+#define                ModeText                     0x0000
+#define                ModeCGA                      0x0001
+#define                ModeEGA                      0x0002       /* 16 colors mode */
+#define                ModeVGA                      0x0003       /* 256 colors mode */
+#define                Mode15Bpp                    0x0004       /* 15 Bpp Color Mode */
+#define                Mode16Bpp                    0x0005       /* 16 Bpp Color Mode */
+#define                Mode24Bpp                    0x0006       /* 24 Bpp Color Mode */
+#define                Mode32Bpp                    0x0007       /* 32 Bpp Color Mode */
+
+#define                DACInfoFlag                  0x0018
+#define                MONODAC                      0x0000
+#define                CGADAC                       0x0008
+#define                EGADAC                       0x0010
+#define                VGADAC                       0x0018
+
+#define                MemoryInfoFlag               0x01e0
+#define                MemorySizeShift              5
+#define                Need1MSize                   0x0000
+#define                Need2MSize                   0x0020
+#define                Need4MSize                   0x0060
+#define                Need8MSize                   0x00e0
+#define                Need16MSize                  0x01e0
+
+#define                Charx8Dot                    0x0200
+#define                LineCompareOff               0x0400
+#define                CRT2Mode                     0x0800
+#define                HalfDCLK                     0x1000
+#define                NoSupportSimuTV              0x2000
+#define                DoubleScanMode               0x8000
+
+/* -------------- Ext_InfoFlag */
+#define                SupportModeInfo              0x0007
+#define                Support256                   0x0003
+#define                Support15Bpp                 0x0004
+#define                Support16Bpp                 0x0005
+#define                Support24Bpp                 0x0006
+#define                Support32Bpp                 0x0007
+
+#define                SupportAllCRT2               0x0078
+#define                SupportTV                    0x0008
+#define                SupportHiVisionTV            0x0010
+#define                SupportLCD                   0x0020
+#define                SupportRAMDAC2               0x0040
+#define                NoSupportTV                  0x0070
+#define                NoSupportHiVisionTV          0x0060
+#define                NoSupportLCD                 0x0058
+#define                SupportTV1024                0x0800       /* 301btest */
+#define                SupportYPbPr                 0x1000       /* 301lv */
+#define                InterlaceMode                0x0080
+#define                SyncPP                       0x0000
+#define                SyncPN                       0x4000
+#define                SyncNP                       0x8000
+#define                SyncNN                       0xC000
+
+/* -------------- SetMode Stack/Scratch */
+#define                SetSimuScanMode              0x0001       /* VBInfo/CR30 & CR31 */
+#define                SwitchToCRT2                 0x0002
+#define                SetCRT2ToTV1                 0x009C
+#define                SetCRT2ToTV                  0x089C
+#define                SetCRT2ToAVIDEO              0x0004
+#define                SetCRT2ToSVIDEO              0x0008
+#define                SetCRT2ToSCART               0x0010
+#define                SetCRT2ToLCD                 0x0020
+#define                SetCRT2ToRAMDAC              0x0040
+#define                SetCRT2ToHiVisionTV          0x0080
+#define                SetCRT2ToLCDA                0x0100
+#define                SetInSlaveMode               0x0200
+#define                SetNotSimuMode               0x0400
+#define                HKEventMode                  0x0800
+#define                SetCRT2ToYPbPr               0x0800
+#define                LoadDACFlag                  0x1000
+#define                DisableCRT2Display           0x2000
+#define                DriverMode                   0x4000
+#define                SetCRT2ToDualEdge            0x8000
+#define                HotKeySwitch                 0x8000
+
+#define                ProgrammingCRT2              0x0001       /* Set Flag */
+#define                EnableVCMode                 0x0002
+#define                SetHKEventMode               0x0004
+#define                ReserveTVOption              0x0008
+#define                DisableRelocateIO            0x0010
+#define                Win9xDOSMode                 0x0020
+#define                JDOSMode                     0x0040
+/* #define SetWin9xforJap 0x0080 // not used now */
+/* #define SetWin9xforKorea 0x0100 // not used now */
+#define                GatingCRT                    0x0800
+#define                DisableChB                   0x1000
+#define                EnableChB                    0x2000
+#define                DisableChA                   0x4000
+#define                EnableChA                    0x8000
+
+#define                SetNTSCTV                    0x0000       /* TV Info */
+#define                SetPALTV                     0x0001
+#define                SetNTSCJ                     0x0002
+#define                SetPALMTV                    0x0004
+#define                SetPALNTV                    0x0008
+#define                SetCHTVUnderScan             0x0000
+/* #define SetCHTVOverScan 0x0010 */
+#define                SetYPbPrMode525i             0x0020
+#define                SetYPbPrMode525p             0x0040
+#define                SetYPbPrMode750p             0x0080
+#define                SetYPbPrMode1080i            0x0100
+#define                SetTVStdMode                 0x0200
+#define                SetTVLowResolution           0x0400
+#define                SetTVSimuMode                0x0800
+#define                TVSimuMode                   0x0800
+#define                RPLLDIV2XO                   0x1000
+#define                NTSC1024x768                 0x2000
+#define                SetTVLockMode                0x4000
+
+#define                LCDVESATiming                0x0001       /* LCD Info/CR37 */
+#define                EnableLVDSDDA                0x0002
+#define                EnableScalingLCD             0x0008
+#define                SetPWDEnable                 0x0004
+#define                SetLCDtoNonExpanding         0x0010
+#define                SetLCDPolarity               0x00e0
+#define                SetLCDDualLink               0x0100
+#define                SetLCDLowResolution          0x0200
+#define                SetLCDStdMode                0x0400
+
+#define                DefaultLCDCap                0x80ea       /* LCD Capability shampoo */
+#define                RLVDSDHL00                   0x0000
+#define                RLVDSDHL01                   0x0001
+#define                RLVDSDHL10                   0x0002       /* default */
+#define                RLVDSDHL11                   0x0003
+#define                EnableLCD24bpp               0x0004       /* default */
+#define                DisableLCD24bpp              0x0000
+#define                RLVDSClkSFT0                 0x0000
+#define                RLVDSClkSFT1                 0x0008       /* default */
+#define                EnableLVDSDCBal              0x0010
+#define                DisableLVDSDCBal             0x0000       /* default */
+#define                SinglePolarity               0x0020       /* default */
+#define                MultiPolarity                0x0000
+#define                LCDPolarity                  0x00c0       /* default: SyncNN */
+#define                LCDSingleLink                0x0000       /* default */
+#define                LCDDualLink                  0x0100
+#define                EnableSpectrum               0x0200
+#define                DisableSpectrum              0x0000       /* default */
+#define                PWDEnable                    0x0400
+#define                PWDDisable                   0x0000       /* default */
+#define                PWMEnable                    0x0800
+#define                PWMDisable                   0x0000       /* default */
+#define                EnableVBCLKDRVLOW            0x4000
+#define                EnableVBCLKDRVHigh           0x0000       /* default */
+#define                EnablePLLSPLOW               0x8000
+#define                EnablePLLSPHigh              0x0000       /* default */
+
+#define                LCDBToA                      0x20               /* LCD SetFlag */
+#define                StLCDBToA                    0x40
+#define                LockLCDBToA                  0x80
+#define        LCDToFull                    0x10
+#define                AVIDEOSense                  0x01               /* CR32 */
+#define                SVIDEOSense                  0x02
+#define                SCARTSense                   0x04
+#define                LCDSense                     0x08
+#define                Monitor2Sense                0x10
+#define                Monitor1Sense                0x20
+#define                HiTVSense                    0x40
+
+#ifdef                   NewScratch
+#define                YPbPrSense                   0x80    /* NEW SCRATCH */
+#endif
+
+#define                TVSense                      0xc7
+
+#define                TVOverScan                   0x10               /* CR35 */
+#define                TVOverScanShift              4
+
+#ifdef                   NewScratch
+#define                NTSCMode                     0x00
+#define                PALMode                      0x00
+#define                NTSCJMode                    0x02
+#define                PALMNMode                    0x0c
+#define                YPbPrMode                    0xe0
+#define                YPbPrMode525i                0x00
+#define                YPbPrMode525p                0x20
+#define                YPbPrMode750p                0x40
+#define                YPbPrMode1080i               0x60
+#else                    /* Old Scratch */
+#define                ClearBufferFlag              0x20
+#endif
+
+
+#define                LCDRGB18Bit                  0x01               /* CR37 */
+#define                LCDNonExpanding              0x10
+#define                LCDNonExpandingShift         4
+#define                LCDSync                      0x20
+#define                LCDSyncBit                   0xe0               /* H/V polarity & sync ID */
+#define                LCDSyncShift                 6
+
+#ifdef                   NewScratch
+#define                ScalingLCD                   0x08
+#else                    /* Old Scratch */
+#define                ExtChipType                  0x0e
+#define                ExtChip301                   0x02
+#define                ExtChipLVDS                  0x04
+#define                ExtChipCH7019                0x06
+#define                ScalingLCD                   0x10
+#endif
+
+#define                EnableDualEdge               0x01               /* CR38 */
+#define                SetToLCDA                    0x02
+#ifdef                   NewScratch
+#define                SetYPbPr                     0x04
+#define                DisableChannelA              0x08
+#define                DisableChannelB              0x10
+#define                ExtChipType                  0xe0
+#define                ExtChip301                   0x20
+#define                ExtChipLVDS                  0x40
+#define                ExtChipCH7019                0x60
+#else                    /* Old Scratch */
+#define                YPbPrSense                   0x04
+#define                SetYPbPr                     0x08
+#define                YPbPrMode                    0x30
+#define                YPbPrMode525i                0x00
+#define                YPbPrMode525p                0x10
+#define                YPbPrMode750p                0x20
+#define                YPbPrMode1080i               0x30
+#define                PALMNMode                    0xc0
+#endif
+
+#define                BacklightControlBit          0x01               /* CR3A */
+#define                Win9xforJap                  0x40
+#define                Win9xforKorea                0x80
+
+#define                ForceMDBits                  0x07               /* CR3B */
+#define                ForceMD_JDOS                 0x00
+#define                ForceMD_640x400T             0x01
+#define                ForceMD_640x350T             0x02
+#define                ForceMD_720x400T             0x03
+#define                ForceMD_640x480E             0x04
+#define                ForceMD_640x400E             0x05
+#define                ForceP1Bit                   0x10
+#define                ForceP2Bit                   0x20
+#define                EnableForceMDinBIOS          0x40
+#define                EnableForceMDinDrv           0x80
+
+#ifdef                   NewScratch                      /* New Scratch */
+/* ---------------------- VUMA Information */
+#define                LCDSettingFromCMOS           0x04               /* CR3C */
+#define                TVSettingFromCMOS            0x08
+#define                DisplayDeviceFromCMOS        0x10
+#define                HKSupportInSBIOS             0x20
+#define                OSDSupportInSBIOS            0x40
+#define                DisableLogo                  0x80
+
+/* ---------------------- HK Evnet Definition */
+#define                HKEvent                      0x0f               /* CR3D */
+#define                HK_ModeSwitch                0x01
+#define                HK_Expanding                 0x02
+#define                HK_OverScan                  0x03
+#define                HK_Brightness                0x04
+#define                HK_Contrast                  0x05
+#define                HK_Mute                      0x06
+#define                HK_Volume                    0x07
+#define                ModeSwitchStatus             0xf0
+#define                ActiveCRT1                   0x10
+#define                ActiveLCD                    0x0020
+#define                ActiveTV                     0x40
+#define                ActiveCRT2                   0x80
+
+#define                TVSwitchStatus               0x1f               /* CR3E */
+#define                ActiveAVideo                 0x01
+#define                ActiveSVideo                 0x02
+#define                ActiveSCART                  0x04
+#define                ActiveHiTV                   0x08
+#define                ActiveYPbPr                  0x10
+
+#define                EnableHKEvent                0x01               /* CR3F */
+#define                EnableOSDEvent               0x02
+#define                StartOSDEvent                0x04
+#define                IgnoreHKEvent                0x08
+#define                IgnoreOSDEvent               0x10
+#else                    /* Old Scratch */
+#define                OSD_SBIOS                    0x02       /* SR17 */
+#define                DisableLogo                  0x04
+#define                SelectKDOS                   0x08
+#define                KorWinMode                   0x10
+#define                KorMode3Bit                  0x0020
+#define                PSCCtrlBit                  0x40
+#define                NPSCCtrlBitShift             6
+#define                BlueScreenBit                0x80
+
+#define                HKEvent                      0x0f       /* CR79 */
+#define                HK_ModeSwitch                0x01
+#define                HK_Expanding                 0x02
+#define                HK_OverScan                  0x03
+#define                HK_Brightness                0x04
+#define                HK_Contrast                  0x05
+#define                HK_Mute                      0x06
+#define                HK_Volume                    0x07
+#define                ActivePAL                    0x0020
+#define                ActivePALShift               5
+#define                ActiveNonExpanding           0x40
+#define                ActiveNonExpandingShift      6
+#define                ActiveOverScan               0x80
+#define                ActiveOverScanShift          7
+
+#define                ModeSwitchStatus             0x0b       /* SR15 */
+#define                ActiveCRT1                   0x01
+#define                ActiveLCD                    0x02
+#define                ActiveCRT2                   0x08
+
+#define                TVSwitchStatus               0xf0       /* SR16 */
+#define                TVConfigShift                3
+#define                ActiveTV                     0x01
+#define                ActiveYPbPr                  0x04
+#define                ActiveAVideo                 0x10
+#define                ActiveSVideo                 0x0020
+#define                ActiveSCART                  0x40
+#define                ActiveHiTV                   0x80
+
+#define                EnableHKEvent                0x01       /* CR7A */
+#define                EnableOSDEvent               0x02
+#define                StartOSDEvent                0x04
+#define                CMOSSupport                  0x08
+#define                HotKeySupport                0x10
+#define                IngoreHKOSDEvent             0x20
+#endif
+
+/* //------------- Misc. Definition */
+#define                SelectCRT1Rate               00h
+/* #define SelectCRT2Rate 04h */
+
+#define                DDC1DelayTime                1000
+#ifdef           TRUMPION
+#define                DDC2DelayTime                15
+#else
+#define                DDC2DelayTime                150
+#endif
+
+#define                R_FACTOR                     04Dh
+#define                G_FACTOR                     097h
+#define                B_FACTOR                     01Ch
+/* --------------------------------------------------------- */
+/* translated from asm code 301def.h */
+/*  */
+/* --------------------------------------------------------- */
+#define                LCDDataLen                   8
+#define                HiTVDataLen                  12
+#define                TVDataLen                    12
+#define                LVDSCRT1Len_H                8
+#define                LVDSCRT1Len_V                7
+#define                LVDSDataLen                  6
+#define                LVDSDesDataLen               6
+#define                LCDDesDataLen                6
+#define                LVDSDesDataLen2              8
+#define                LCDDesDataLen2               8
+#define                CHTVRegLen                   16
+#define                CHLVRegLen                   12
+
+#define                StHiTVHT                     892
+#define                StHiTVVT                     1126
+#define                StHiTextTVHT                 1000
+#define                StHiTextTVVT                 1126
+#define                ExtHiTVHT                    2100
+#define                ExtHiTVVT                    1125
+#define                NTSCHT                       1716
+#define                NTSCVT                        525
+#define                NTSC1024x768HT               1908
+#define                NTSC1024x768VT                525
+#define                PALHT                        1728
+#define                PALVT                         625
+
+#define                YPbPrTV525iHT                1716            /* YPbPr */
+#define                YPbPrTV525iVT                 525
+#define                YPbPrTV525pHT                1716
+#define                YPbPrTV525pVT                 525
+#define                YPbPrTV750pHT                1650
+#define                YPbPrTV750pVT                 750
+
+#define                CRT2VCLKSel                  0xc0
+
+#define                CRT2Delay1                   0x04            /* XGI301 */
+#define                CRT2Delay2                   0x0A            /* 301B,302 */
+
+
+#define                VCLK25_175           0x00
+#define                VCLK28_322           0x01
+#define                VCLK31_5             0x02
+#define                VCLK36               0x03
+#define                VCLK40               0x04
+#define                VCLK43_163           0x05
+#define                VCLK44_9             0x06
+#define                VCLK49_5             0x07
+#define                VCLK50               0x08
+#define                VCLK52_406           0x09
+#define                VCLK56_25            0x0A
+#define                VCLK65               0x0B
+#define                VCLK67_765           0x0C
+#define                VCLK68_179           0x0D
+#define                VCLK72_852           0x0E
+#define                VCLK75               0x0F
+#define                VCLK75_8             0x10
+#define                VCLK78_75            0x11
+#define                VCLK79_411           0x12
+#define                VCLK83_95            0x13
+#define                VCLK84_8             0x14
+#define                VCLK86_6             0x15
+#define                VCLK94_5             0x16
+#define                VCLK104_998          0x17
+#define                VCLK105_882          0x18
+#define                VCLK108_2            0x19
+#define                VCLK109_175          0x1A
+#define                VCLK113_309          0x1B
+#define                VCLK116_406          0x1C
+#define                VCLK132_258          0x1D
+#define                VCLK135_5            0x1E
+#define                VCLK139_054          0x1F
+#define                VCLK157_5            0x20
+#define                VCLK162              0x21
+#define                VCLK175              0x22
+#define                VCLK189              0x23
+#define                VCLK194_4            0x24
+#define                VCLK202_5            0x25
+#define                VCLK229_5            0x26
+#define                VCLK234              0x27
+#define                VCLK252_699          0x28
+#define                VCLK254_817          0x29
+#define                VCLK265_728          0x2A
+#define                VCLK266_952          0x2B
+#define                VCLK269_655          0x2C
+#define                VCLK272_042          0x2D
+#define                VCLK277_015          0x2E
+#define                VCLK286_359          0x2F
+#define                VCLK291_132          0x30
+#define                VCLK291_766          0x31
+#define                VCLK309_789          0x32
+#define                VCLK315_195          0x33
+#define                VCLK323_586          0x34
+#define                VCLK330_615          0x35
+#define                VCLK332_177          0x36
+#define                VCLK340_477          0x37
+#define                VCLK375_847          0x38
+#define                VCLK388_631          0x39
+#define                VCLK125_999          0x51
+#define                VCLK148_5            0x52
+#define                VCLK178_992          0x54
+#define                VCLK217_325          0x55
+#define                VCLK299_505          0x56
+#define                YPbPr750pVCLK        0x57
+
+#define                TVVCLKDIV2              0x3A
+#define                TVVCLK                  0x3B
+#define                HiTVVCLKDIV2          0x3C
+#define                HiTVVCLK              0x3D
+#define                HiTVSimuVCLK          0x3E
+#define                HiTVTextVCLK          0x3F
+#define                VCLK39_77              0x40
+/* #define YPbPr750pVCLK 0x0F */
+#define                YPbPr525pVCLK           0x3A
+/* #define ;;YPbPr525iVCLK 0x3B */
+/* #define ;;YPbPr525iVCLK_2 0x3A */
+#define                NTSC1024VCLK         0x41
+#define                VCLK25_175_41        0x42                  /* ; ScaleLCD */
+#define                VCLK25_175_42        0x43
+#define                VCLK28_322_43        0x44
+#define                VCLK40_44            0x45
+#define                VCLKQVGA_1           0x46                   /* ; QVGA */
+#define                VCLKQVGA_2           0x47
+#define                VCLKQVGA_3           0x48
+#define                VCLK35_2             0x49                    /* ; 800x480 */
+#define                VCLK122_61           0x4A
+#define                VCLK80_350           0x4B
+#define                VCLK107_385          0x4C
+
+#define                CHTVVCLK30_2         0x50                 /* ;;CHTV */
+#define                CHTVVCLK28_1         0x51
+#define                CHTVVCLK43_6         0x52
+#define                CHTVVCLK26_4         0x53
+#define                CHTVVCLK24_6         0x54
+#define                CHTVVCLK47_8         0x55
+#define                CHTVVCLK31_5         0x56
+#define                CHTVVCLK26_2         0x57
+#define                CHTVVCLK39           0x58
+#define                CHTVVCLK36           0x59
+
+#define                CH7007TVVCLK30_2     0x00                 /* [Billy] 2007/05/18 For CH7007 */
+#define                CH7007TVVCLK28_1     0x01
+#define                CH7007TVVCLK43_6     0x02
+#define                CH7007TVVCLK26_4     0x03
+#define                CH7007TVVCLK24_6     0x04
+#define                CH7007TVVCLK47_8     0x05
+#define                CH7007TVVCLK31_5     0x06
+#define                CH7007TVVCLK26_2     0x07
+#define                CH7007TVVCLK39       0x08
+#define                CH7007TVVCLK36       0x09
+
+#define                RES320x200                   0x00
+#define                RES320x240                   0x01
+#define                RES400x300                   0x02
+#define                RES512x384                   0x03
+#define                RES640x400                   0x04
+#define                RES640x480x60                0x05
+#define                RES640x480x72                0x06
+#define                RES640x480x75                0x07
+#define                RES640x480x85                0x08
+#define                RES640x480x100               0x09
+#define                RES640x480x120               0x0A
+#define                RES640x480x160               0x0B
+#define                RES640x480x200               0x0C
+#define                RES800x600x56                0x0D
+#define                RES800x600x60                0x0E
+#define                RES800x600x72                0x0F
+#define                RES800x600x75                0x10
+#define                RES800x600x85                0x11
+#define                RES800x600x100               0x12
+#define                RES800x600x120               0x13
+#define                RES800x600x160               0x14
+#define                RES1024x768x43               0x15
+#define                RES1024x768x60               0x16
+#define                RES1024x768x70               0x17
+#define                RES1024x768x75               0x18
+#define                RES1024x768x85               0x19
+#define                RES1024x768x100              0x1A
+#define                RES1024x768x120              0x1B
+#define                RES1280x1024x43              0x1C
+#define                RES1280x1024x60              0x1D
+#define                RES1280x1024x75              0x1E
+#define                RES1280x1024x85              0x1F
+#define                RES1600x1200x60              0x20
+#define                RES1600x1200x65              0x21
+#define                RES1600x1200x70              0x22
+#define                RES1600x1200x75              0x23
+#define                RES1600x1200x85              0x24
+#define                RES1600x1200x100             0x25
+#define                RES1600x1200x120             0x26
+#define                RES1920x1440x60              0x27
+#define                RES1920x1440x65              0x28
+#define                RES1920x1440x70              0x29
+#define                RES1920x1440x75              0x2A
+#define                RES1920x1440x85              0x2B
+#define                RES1920x1440x100             0x2C
+#define                RES2048x1536x60              0x2D
+#define                RES2048x1536x65              0x2E
+#define                RES2048x1536x70              0x2F
+#define                RES2048x1536x75              0x30
+#define                RES2048x1536x85              0x31
+#define                RES800x480x60                0x32
+#define                RES800x480x75                0x33
+#define                RES800x480x85                0x34
+#define                RES1024x576x60               0x35
+#define                RES1024x576x75               0x36
+#define                RES1024x576x85               0x37
+#define                RES1280x720x60               0x38
+#define                RES1280x720x75               0x39
+#define                RES1280x720x85               0x3A
+#define                RES1280x960x60               0x3B
+#define                RES720x480x60                0x3C
+#define                RES720x576x56                0x3D
+#define                RES856x480x79I               0x3E
+#define                RES856x480x60                0x3F
+#define                RES1280x768x60               0x40
+#define                RES1400x1050x60              0x41
+#define                RES1152x864x60               0x42
+#define                RES1152x864x75               0x43
+#define                RES1024x768x160              0x44
+#define                RES1280x960x75               0x45
+#define                RES1280x960x85               0x46
+#define                RES1280x960x120              0x47
+
+#define        LFBDRAMTrap                  0x30
+#endif
diff --git a/drivers/staging/xgifb/vb_ext.c b/drivers/staging/xgifb/vb_ext.c
new file mode 100644 (file)
index 0000000..49b39ee
--- /dev/null
@@ -0,0 +1,1370 @@
+#include "osdef.h"
+
+
+
+
+#ifdef WIN2000
+
+#include <dderror.h>
+#include <devioctl.h>
+#include <miniport.h>
+#include <ntddvdeo.h>
+#include <video.h>
+#include "xgiv.h"
+#include "dd_i2c.h"
+#include "tools.h"
+#endif /* WIN2000 */
+
+#ifdef LINUX_XF86
+#include "xf86.h"
+#include "xf86PciInfo.h"
+#include "xgi.h"
+#include "xgi_regs.h"
+#endif
+
+#ifdef LINUX_KERNEL
+#include <linux/version.h>
+#include <asm/io.h>
+#include <linux/types.h>
+#include "XGIfb.h"
+/*#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+#include <video/XGIfb.h>
+#else
+#include <linux/XGIfb.h>
+#endif*/
+#endif
+
+
+
+#include "vb_def.h"
+#include "vgatypes.h"
+#include "vb_struct.h"
+#include "vb_util.h"
+#include "vb_setmode.h"
+#include "vb_ext.h"
+extern   UCHAR XGI330_SoftSetting;
+extern   UCHAR XGI330_OutputSelect;
+extern   USHORT XGI330_RGBSenseData2;
+extern   USHORT XGI330_YCSenseData2;
+extern   USHORT XGI330_VideoSenseData2;
+#ifdef WIN2000
+extern   UCHAR SenseCHTV(PHW_DEVICE_EXTENSION pHWDE);       /* 2007/05/17 Billy */
+#endif
+void     XGI_GetSenseStatus( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_INFO pVBInfo );
+BOOLEAN  XGINew_GetPanelID(PVB_DEVICE_INFO pVBInfo);
+USHORT   XGINew_SenseLCD(PXGI_HW_DEVICE_INFO,PVB_DEVICE_INFO pVBInfo);
+BOOLEAN  XGINew_GetLCDDDCInfo(PXGI_HW_DEVICE_INFO HwDeviceExtension,PVB_DEVICE_INFO pVBInfo);
+void XGISetDPMS( PXGI_HW_DEVICE_INFO pXGIHWDE , ULONG VESA_POWER_STATE ) ;
+BOOLEAN  XGINew_BridgeIsEnable(PXGI_HW_DEVICE_INFO,PVB_DEVICE_INFO pVBInfo );
+BOOLEAN  XGINew_Sense(USHORT tempbx,USHORT tempcx, PVB_DEVICE_INFO pVBInfo);
+BOOLEAN  XGINew_SenseHiTV( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_INFO pVBInfo ) ;
+
+/**************************************************************
+       Dynamic Sense
+*************************************************************/
+
+void XGI_WaitDisplay(void);
+BOOLEAN XGI_Is301C(PVB_DEVICE_INFO);
+BOOLEAN XGI_Is301LV(PVB_DEVICE_INFO);
+
+#ifdef WIN2000
+UCHAR XGI_SenseLCD(PHW_DEVICE_EXTENSION, PVB_DEVICE_INFO);
+UCHAR XGI_GetLCDDDCInfo(PHW_DEVICE_EXTENSION,PVB_DEVICE_INFO);
+
+extern BOOL bGetDdcInfo(
+PHW_DEVICE_EXTENSION  pHWDE,
+ULONG                 ulWhichOne,
+PUCHAR                pjQueryBuffer,
+ULONG                 ulBufferSize
+   );
+
+#endif
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGINew_Is301B */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+BOOLEAN XGINew_Is301B( PVB_DEVICE_INFO pVBInfo )
+{
+    USHORT flag ;
+
+    flag = XGINew_GetReg1( pVBInfo->Part4Port , 0x01 ) ;
+
+    if ( flag > 0x0B0 )
+        return( 0 ) ;  /* 301b */
+    else
+        return( 1 ) ;
+}
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_Is301C */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+BOOLEAN XGI_Is301C( PVB_DEVICE_INFO pVBInfo )
+{
+    if ( ( XGINew_GetReg1( pVBInfo->Part4Port , 0x01 ) & 0xF0 ) == 0xC0 )
+        return( 1 ) ;
+
+    if ( XGINew_GetReg1( pVBInfo->Part4Port , 0x01 ) >= 0xD0 )
+    {
+        if ( XGINew_GetReg1( pVBInfo->Part4Port , 0x39 ) == 0xE0 )
+            return( 1 ) ;
+    }
+
+    return( 0 ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_Is301LV */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+BOOLEAN XGI_Is301LV( PVB_DEVICE_INFO pVBInfo )
+{
+    if ( XGINew_GetReg1( pVBInfo->Part4Port , 0x01 ) >= 0xD0 )
+    {
+        if ( XGINew_GetReg1( pVBInfo->Part4Port , 0x39 ) == 0xFF )
+        {
+            return( 1 ) ;
+        }
+    }
+    return( 0 ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGINew_Sense */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+BOOLEAN XGINew_Sense(  USHORT tempbx , USHORT tempcx, PVB_DEVICE_INFO pVBInfo )
+{
+    USHORT temp , i , tempch ;
+
+    temp = tempbx & 0xFF ;
+    XGINew_SetReg1( pVBInfo->Part4Port , 0x11 , temp ) ;
+    temp = ( tempbx & 0xFF00 ) >> 8 ;
+    temp |= ( tempcx & 0x00FF ) ;
+    XGINew_SetRegANDOR( pVBInfo->Part4Port , 0x10 , ~0x1F , temp ) ;
+
+    for( i = 0 ; i < 10 ; i++ )
+        XGI_LongWait( pVBInfo) ;
+
+    tempch = ( tempcx & 0x7F00 ) >> 8 ;
+    temp = XGINew_GetReg1( pVBInfo->Part4Port , 0x03 ) ;
+    temp = temp ^ ( 0x0E ) ;
+    temp &= tempch ;
+
+    if ( temp > 0 )
+        return( 1 ) ;
+    else
+        return( 0 ) ;
+}
+
+#ifdef WIN2000
+/* --------------------------------------------------------------------- */
+/* Function : XGI_SenseLCD */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+UCHAR XGI_SenseLCD( PHW_DEVICE_EXTENSION pHWDE, PVB_DEVICE_INFO pVBInfo)
+{
+    USHORT tempax , tempbx , tempcx ;
+    UCHAR SoftSetting = XGI330_SoftSetting ;
+
+    if ( pVBInfo->VBType & ( VB_XGI301LV | VB_XGI302LV ) )
+        return( 1 ) ;
+
+
+    if ( SoftSetting & HotPlugFunction )       /* Hot Plug Detection */
+    {
+        XGINew_SetRegAND( pVBInfo->Part4Port , 0x0F , 0x3F ) ;
+        tempbx = 0 ;
+        tempcx = 0x9010 ;
+        if ( XGINew_Sense( tempbx , tempcx, pVBInfo ) )
+            return( 1 ) ;
+
+        return( 0 ) ;
+    }
+    else       /* Get LCD Info from EDID */
+        return(XGI_GetLCDDDCInfo(pHWDE, pVBInfo));
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_GetLCDDDCInfo */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+UCHAR XGI_GetLCDDDCInfo( PHW_DEVICE_EXTENSION pHWDE , PVB_DEVICE_INFO pVBInfo)
+{
+    UCHAR tempah , tempbl , tempbh ;
+    USHORT tempbx , temp ;
+    UCHAR pjEDIDBuf[ 256 ] ;
+    ULONG ulBufferSize = 256 ;
+    UCHAR bMASK_OUTPUTSTATE_CRT2LCD = 2 ; /* 0423 shampoo */
+
+    bGetDdcInfo( pHWDE , MASK_OUTPUTSTATE_CRT2LCD , pjEDIDBuf , ulBufferSize ) ;
+    if ( ( *( ( PULONG )pjEDIDBuf ) == 0xFFFFFF00 ) && ( *( ( PULONG )( pjEDIDBuf + 4 ) ) == 0x00FFFFFF ) )
+    {
+        tempah = Panel1024x768 ;
+        tempbl=( *( pjEDIDBuf + 0x3A ) ) & 0xf0 ;
+
+        if ( tempbl != 0x40 )
+        {
+            tempah = Panel1600x1200 ;
+            if ( tempbl != 0x60 )
+            {
+                tempah = Panel1280x1024 ;
+                tempbh = ( *( pjEDIDBuf + 0x3B ) ) ;
+                if ( tempbh != 0x00 )
+                {
+                    tempah = Panel1280x960 ;
+                    if ( tempbh != 0x0C0 )
+                    {
+                        tempbx = ( ( *( pjEDIDBuf + 0x24 ) ) << 8 ) | ( *( pjEDIDBuf + 0x23 ) ) ;
+                        tempah = Panel1280x1024 ;
+                        if ( !( tempbx & 0x0100 ) )
+                        {
+                            tempah = Panel1024x768 ;
+                            if ( !( tempbx & 0x0E00 ) )
+                            {
+                                tempah = Panel1280x1024 ;
+                            }
+                        }
+                    }
+
+                    if ( tempbx & 0x00FF )
+                    {
+                        temp = ScalingLCD ;
+                        XGINew_SetRegOR( pVBInfo->P3d4 , 0x37 , temp ) ;
+                    }
+                }
+            }
+        }
+        XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x36 , ( ~0x07 ) , tempah ) ;
+        tempah = ( ( *( pjEDIDBuf + 0x47 ) ) & 0x06 ) ;                /* Polarity */
+        tempah = ( tempah ^ 0x06 ) << 4 ;
+        tempah |= LCDSync ;
+        XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x37 , ( ~LCDSyncBit ) , tempah ) ;
+        tempbh= XGINew_GetReg1( pVBInfo->P3d4 , 0x36 ) ;
+        tempbh &= 0x07 ;
+        if ( tempbh == Panel1280x960 )
+            XGINew_SetRegAND( pVBInfo->P3d4 , 0x37 , 0x0E ) ;
+    }
+    else if ( *pjEDIDBuf == 0x20 )
+    {
+        tempah = Panel1024x768 ;
+        XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x36 , ( ~0x07 ) , tempah ) ;
+    }
+    else
+    {
+        return( 0 ) ;
+    }
+
+    return( 1 ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_DySense */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+BOOLEAN XGI_DySense( PHW_DEVICE_EXTENSION pHWDE , PUCHAR ujConnectStatus)
+{
+    UCHAR pre_CRD,pre_SR1E , pre_Part2_0 , pre_Part4_D ;
+    USHORT tempax , tempbx , tempcx , pushax , temp ;
+    VB_DEVICE_INFO VBINF;
+    PVB_DEVICE_INFO pVBInfo = &VBINF;
+    UCHAR OutputSelect = XGI330_OutputSelect ;
+    PXGI_HW_DEVICE_INFO HwDeviceExtension= pHWDE->pXGIHWDE ;
+    UCHAR   bConnectStatus = 0 ;
+    pVBInfo->BaseAddr = HwDeviceExtension->pjIOAddress ;
+    pVBInfo->ROMAddr  = pHWDE->pjVirtualRomBase ;
+
+    pVBInfo->P3c2 = pVBInfo->BaseAddr + 0x12 ;
+    pVBInfo->P3c4 = pVBInfo->BaseAddr + 0x14 ;
+    pVBInfo->P3d4 = pVBInfo->BaseAddr + 0x24 ;
+    pVBInfo->Part2Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_10 ;
+    pVBInfo->Part4Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_14 ;
+    pushax = XGINew_GetReg1( pVBInfo->P3d4 , 0x17 ) ;  /* 0512 Fix Dysense hanged */
+    temp = ( pushax & 0x00FF ) | 0x80 ;
+    XGINew_SetRegOR( pVBInfo->P3d4 , 0x17 , temp ) ;
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x05 , 0x86 ) ;
+    /* beginning of dynamic sense CRT1 */
+
+    pVBInfo->IF_DEF_CH7007 = 0;
+    if (pHWDE->bCH7007)
+    {
+       InitTo330Pointer( pHWDE->pXGIHWDE->jChipType, pVBInfo ) ;
+        HwDeviceExtension->pDevice = (PVOID)pHWDE;
+        pVBInfo->IF_DEF_CH7007 = 1;
+        /* [Billy] 2007/05/14 For CH7007 */
+        if ( pVBInfo->IF_DEF_CH7007 == 1 )
+        {
+           bConnectStatus = SenseCHTV(HwDeviceExtension->pDevice) ; /* 07/05/28 */
+           XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x32 , ~0x03 , (UCHAR)bConnectStatus ) ;
+        }
+    }
+    if(( pHWDE->jChipID >= XG40 ) || ( pHWDE->jChipID >= XG20 ))
+    {
+
+        if ( pHWDE->jChipID >= XG40 )
+           XGINew_SetReg1( pVBInfo->P3d4 , 0x57 , 0x4A ) ;     /* write sense pattern 30->4a */
+       else
+            XGINew_SetReg1( pVBInfo->P3d4 , 0x57 , 0x5F ) ;    /* write sense pattern */
+
+        XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x53 , 0xFF , 0x02 ) ;     /* enable sense DAC */
+        XGI_WaitDisply(pVBInfo) ;
+
+        if(XGINew_GetReg2( pVBInfo->P3c2 ) & 0x10 )
+            bConnectStatus |= Monitor1Sense ;
+
+        XGINew_SetRegAND( pVBInfo->P3d4 , 0x53 , 0xFD ) ;      /* disable sense DAC */
+        XGINew_SetRegAND( pVBInfo->P3d4 , 0x57 , 0x00 ) ;      /* clear sense pattern */
+
+
+        /* ---------- End of dynamic sense CRT1 ----------- */
+
+        /* ---------- beginning of dynamic sense VB ------------ */
+        pre_SR1E = XGINew_GetReg1( pVBInfo->P3c4 , 0x1E ) ;
+        XGINew_SetRegOR( pVBInfo->P3c4 , 0x1E , 0x20 ) ;       /* Enable CRT2,work-a-round for 301B/301LV/302LV */
+        pre_Part2_0 = XGINew_GetReg1( pVBInfo->Part2Port , 0x00 ) ;
+        pre_Part4_D = XGINew_GetReg1( pVBInfo->Part4Port , 0x0D ) ;
+
+        if ( XGI_Is301C( pVBInfo ) )   /* 301C only */
+            XGINew_SetRegANDOR( pVBInfo->Part4Port , 0x0D , ~0x07 , 0x01 ) ;   /* Set Part4 0x0D D[2:0] to 001b */
+
+        /* tempax = 0 ; */
+        if ( !XGI_Is301LV( pVBInfo ) )
+        {
+           tempbx = XGI330_RGBSenseData2 ;
+            tempcx = 0x0E08 ;
+            if(XGINew_Sense( tempbx , tempcx, pVBInfo ) )
+            {
+                bConnectStatus |= Monitor2Sense ;
+                if ( OutputSelect & SetSCARTOutput )
+                {
+                    bConnectStatus ^= ( Monitor2Sense | SCARTSense ) ;
+                }
+            }
+        }
+        if ( XGI_Is301C( pVBInfo ) )   /* 301C only */
+            XGINew_SetRegOR( pVBInfo->Part4Port , 0x0D , 0x04 ) ;      /* Set Part4 0x0D D[2]=1 for dynamic sense */
+
+        if ( ( XGINew_Is301B( pVBInfo ) ) )
+            XGINew_SetRegOR( pVBInfo->Part2Port , 0x00 , 0x0C ) ;    /* ????????? */
+
+       if ( XGINew_SenseHiTV( HwDeviceExtension , pVBInfo) )           /* add by kuku for Dysense HiTV //start */
+       {
+           bConnectStatus|= YPbPrSense ;
+       }
+       else
+       {
+        tempbx = XGI330_YCSenseData2 ; /* Y/C Sense Data Ptr */
+        tempcx = 0x0604 ;
+        if ( XGINew_Sense( tempbx , tempcx , pVBInfo) )
+            bConnectStatus |= SVIDEOSense ;
+
+        if ( OutputSelect & BoardTVType )
+        {
+            tempbx = XGI330_VideoSenseData2 ;
+            tempcx = 0x0804 ;
+            if ( XGINew_Sense(tempbx , tempcx, pVBInfo) )
+                bConnectStatus|= AVIDEOSense ;
+        }
+        else
+        {
+            if ( !( bConnectStatus & SVIDEOSense ) )
+            {
+                tempbx = XGI330_VideoSenseData2 ;
+                tempcx = 0x0804 ;
+                if ( XGINew_Sense( tempbx , tempcx, pVBInfo ) )
+                    bConnectStatus |= AVIDEOSense ;
+            }
+        }
+       } /* end */
+        /* DySenseVBCnt */
+
+        tempbx = 0 ;
+        tempcx = 0 ;
+        XGINew_Sense(tempbx , tempcx, pVBInfo ) ;
+
+        if ( !( bConnectStatus & Monitor2Sense ) )
+        {
+            if ( XGI_SenseLCD( pHWDE , pVBInfo ) )
+                bConnectStatus |= LCDSense ;
+        }
+
+        XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x32 , ~( AVIDEOSense | SVIDEOSense | LCDSense | Monitor2Sense | Monitor1Sense ) , bConnectStatus ) ;
+
+        XGINew_SetReg1( pVBInfo->Part4Port , 0x0D , pre_Part4_D ) ;
+        XGINew_SetReg1( pVBInfo->Part2Port , 0x00 , pre_Part2_0 ) ;
+        XGINew_SetReg1( pVBInfo->P3c4 , 0x1E , pre_SR1E ) ;
+
+        if ( XGI_Is301C( pVBInfo ) )   /* 301C only */
+        {
+            tempax = XGINew_GetReg1( pVBInfo->Part2Port , 0x00 ) ;
+            if ( tempax & 0x20 )
+            {
+                /* Reset VBPro */
+                for( tempcx = 2 ; tempcx > 0 ; tempcx-- )
+                {
+                    tempax ^= 0x20 ;
+                    XGINew_SetReg1( pVBInfo->Part2Port , 0x00 , tempax ) ;
+                }
+            }
+        }
+        /* End of dynamic sense VB */
+    }
+    else
+    {
+        XGI_SenseCRT1(pVBInfo) ;
+        XGI_GetSenseStatus( HwDeviceExtension, pVBInfo ) ;     /* sense CRT2 */
+        bConnectStatus = XGINew_GetReg1( pVBInfo->P3d4 , 0x32 ) ;
+    }
+    temp = pushax & 0x00FF ;           /* 0512 Fix Dysense hanged */
+    XGINew_SetReg1( pVBInfo->P3d4 , 0x17 , temp ) ;
+    if ( bConnectStatus )
+    {
+        *ujConnectStatus = bConnectStatus ;
+        return( 1 ) ;
+    }
+    else
+        return( 0 ) ;
+}
+
+#endif /* WIN2000 */
+
+/* --------------------------------------------------------------------- */
+/* Function : XGISetDPMS */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+VOID XGISetDPMS( PXGI_HW_DEVICE_INFO pXGIHWDE , ULONG VESA_POWER_STATE )
+{
+    USHORT ModeNo, ModeIdIndex ;
+    UCHAR  temp ;
+    VB_DEVICE_INFO VBINF;
+    PVB_DEVICE_INFO pVBInfo = &VBINF;
+    pVBInfo->BaseAddr = (ULONG)pXGIHWDE->pjIOAddress ;
+    pVBInfo->ROMAddr  = pXGIHWDE->pjVirtualRomBase ;
+
+
+    pVBInfo->IF_DEF_LVDS = 0 ;
+    pVBInfo->IF_DEF_CH7005 = 0 ;
+    pVBInfo->IF_DEF_HiVision = 1 ;
+    pVBInfo->IF_DEF_LCDA = 1 ;
+    pVBInfo->IF_DEF_CH7017 = 0 ;
+    pVBInfo->IF_DEF_YPbPr = 1 ;
+    pVBInfo->IF_DEF_CRT2Monitor = 0 ;
+    pVBInfo->IF_DEF_VideoCapture = 0 ;
+    pVBInfo->IF_DEF_ScaleLCD = 0 ;
+    pVBInfo->IF_DEF_OEMUtil = 0 ;
+    pVBInfo->IF_DEF_PWD = 0 ;
+
+    InitTo330Pointer( pXGIHWDE->jChipType,  pVBInfo ) ;
+    ReadVBIOSTablData( pXGIHWDE->jChipType , pVBInfo) ;
+
+    pVBInfo->P3c4 = pVBInfo->BaseAddr + 0x14 ;
+    pVBInfo->P3d4 = pVBInfo->BaseAddr + 0x24 ;
+    pVBInfo->P3c0 = pVBInfo->BaseAddr + 0x10 ;
+    pVBInfo->P3ce = pVBInfo->BaseAddr + 0x1e ;
+    pVBInfo->P3c2 = pVBInfo->BaseAddr + 0x12 ;
+    pVBInfo->P3ca = pVBInfo->BaseAddr + 0x1a ;
+    pVBInfo->P3c6 = pVBInfo->BaseAddr + 0x16 ;
+    pVBInfo->P3c7 = pVBInfo->BaseAddr + 0x17 ;
+    pVBInfo->P3c8 = pVBInfo->BaseAddr + 0x18 ;
+    pVBInfo->P3c9 = pVBInfo->BaseAddr + 0x19 ;
+    pVBInfo->P3da = pVBInfo->BaseAddr + 0x2A ;
+    pVBInfo->Part0Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_00 ;
+    pVBInfo->Part1Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_04 ;
+    pVBInfo->Part2Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_10 ;
+    pVBInfo->Part3Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_12 ;
+    pVBInfo->Part4Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_14 ;
+    pVBInfo->Part5Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_14 + 2 ;
+
+    if ( pXGIHWDE->jChipType == XG27 )
+    {
+        if ( ( XGINew_GetReg1( pVBInfo->P3d4 , 0x38 ) & 0xE0 ) == 0xC0 )
+        {
+          if ( XGINew_GetReg1( pVBInfo->P3d4 , 0x30 ) & 0x20 )
+          {
+            pVBInfo->IF_DEF_LVDS = 1 ;
+          }
+        }
+    }
+
+    if ( pVBInfo->IF_DEF_CH7007 == 0 )
+    {
+        XGINew_SetModeScratch ( pXGIHWDE , pVBInfo ) ;
+    }
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x05 , 0x86 ) ;    /* 1.Openkey */
+    XGI_UnLockCRT2( pXGIHWDE , pVBInfo) ;
+    ModeNo = XGINew_GetReg1( pVBInfo->P3d4 , 0x34 ) ;
+    XGI_SearchModeID( ModeNo , &ModeIdIndex, pVBInfo ) ;
+    XGI_GetVGAType( pXGIHWDE , pVBInfo ) ;
+
+    if ( ( pXGIHWDE->ujVBChipID == VB_CHIP_301 ) || ( pXGIHWDE->ujVBChipID == VB_CHIP_302 ) || ( pVBInfo->IF_DEF_CH7007 == 1 ))
+    {
+        XGI_GetVBType( pVBInfo ) ;
+        XGI_GetVBInfo( ModeNo , ModeIdIndex , pXGIHWDE, pVBInfo ) ;
+        XGI_GetTVInfo( ModeNo , ModeIdIndex, pVBInfo ) ;
+        XGI_GetLCDInfo( ModeNo , ModeIdIndex, pVBInfo ) ;
+    }
+
+    if ( VESA_POWER_STATE == 0x00000400 )
+      XGINew_SetReg1( pVBInfo->Part4Port , 0x31 , ( UCHAR )( XGINew_GetReg1( pVBInfo->Part4Port , 0x31 ) & 0xFE ) ) ;
+    else
+      XGINew_SetReg1( pVBInfo->Part4Port , 0x31 , ( UCHAR )( XGINew_GetReg1( pVBInfo->Part4Port , 0x31 ) | 0x01 ) ) ;
+
+    temp = ( UCHAR )XGINew_GetReg1( pVBInfo->P3c4 , 0x1f ) ;
+    temp &= 0x3f ;
+    switch ( VESA_POWER_STATE )
+    {
+        case 0x00000000: /* on */
+            if ( ( pXGIHWDE->ujVBChipID == VB_CHIP_301 ) || ( pXGIHWDE->ujVBChipID == VB_CHIP_302 ) )
+            {
+                XGINew_SetReg1( pVBInfo->P3c4 , 0x1f , ( UCHAR )( temp | 0x00 ) ) ;
+                XGI_EnableBridge( pXGIHWDE, pVBInfo ) ;
+            }
+            else
+            {
+               if ( pXGIHWDE->jChipType == XG21 )
+               {
+                 if ( pVBInfo->IF_DEF_LVDS == 1 )
+                 {
+                   XGI_XG21BLSignalVDD( 0x01 , 0x01, pVBInfo ) ; /* LVDS VDD on */
+                   XGI_XG21SetPanelDelay( 2,pVBInfo ) ;
+                 }
+               }
+               if ( pXGIHWDE->jChipType == XG27 )
+               {
+                 if ( pVBInfo->IF_DEF_LVDS == 1 )
+                 {
+                   XGI_XG27BLSignalVDD( 0x01 , 0x01, pVBInfo ) ; /* LVDS VDD on */
+                   XGI_XG21SetPanelDelay( 2,pVBInfo ) ;
+                 }
+               }
+               XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x1F , ~0xC0 , 0x00 ) ;
+               XGINew_SetRegAND( pVBInfo->P3c4 , 0x01 , ~0x20 ) ;              /* CRT on */
+
+               if ( pXGIHWDE->jChipType == XG21 )
+               {
+                 temp = XGINew_GetReg1( pVBInfo->P3d4 , 0x38 ) ;
+                 if ( temp & 0xE0 )
+                 {
+                   XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x09 , ~0x80 , 0x80 ) ; /* DVO ON */
+                   XGI_SetXG21FPBits( pVBInfo );
+                   XGINew_SetRegAND( pVBInfo->P3d4 , 0x4A , ~0x20 ) ;          /* Enable write GPIOF */
+                   /*XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x48 , ~0x20 , 0x20 ) ;*/     /* LCD Display ON */
+                 }
+                 XGI_XG21BLSignalVDD( 0x20 , 0x20, pVBInfo ) ; /* LVDS signal on */
+                 XGI_DisplayOn( pXGIHWDE, pVBInfo );
+               }
+               if ( pXGIHWDE->jChipType == XG27 )
+               {
+                 temp = XGINew_GetReg1( pVBInfo->P3d4 , 0x38 ) ;
+                 if ( temp & 0xE0 )
+                 {
+                   XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x09 , ~0x80 , 0x80 ) ; /* DVO ON */
+                   XGI_SetXG27FPBits( pVBInfo );
+                   XGINew_SetRegAND( pVBInfo->P3d4 , 0x4A , ~0x20 ) ;          /* Enable write GPIOF */
+                   /*XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x48 , ~0x20 , 0x20 ) ;*/     /* LCD Display ON */
+                 }
+                 XGI_XG27BLSignalVDD( 0x20 , 0x20, pVBInfo ) ; /* LVDS signal on */
+                 XGI_DisplayOn( pXGIHWDE, pVBInfo );
+               }
+            }
+            break ;
+        case 0x00000100: /* standby */
+            if ( pXGIHWDE->jChipType >= XG21 )
+            {
+                XGI_DisplayOff( pXGIHWDE, pVBInfo );
+            }
+
+            XGINew_SetReg1( pVBInfo->P3c4 , 0x1f , ( UCHAR )( temp | 0x40 ) ) ;
+            break ;
+        case 0x00000200: /* suspend */
+            if ( pXGIHWDE->jChipType == XG21 )
+            {
+                XGI_DisplayOff( pXGIHWDE, pVBInfo );
+                XGI_XG21BLSignalVDD( 0x20 , 0x00, pVBInfo ) ; /* LVDS signal off */
+            }
+            if ( pXGIHWDE->jChipType == XG27 )
+            {
+                XGI_DisplayOff( pXGIHWDE, pVBInfo );
+                XGI_XG27BLSignalVDD( 0x20 , 0x00, pVBInfo ) ; /* LVDS signal off */
+            }
+            XGINew_SetReg1( pVBInfo->P3c4 , 0x1f , ( UCHAR )( temp | 0x80 ) ) ;
+            break ;
+        case 0x00000400: /* off */
+            if ( (pXGIHWDE->ujVBChipID == VB_CHIP_301 ) || ( pXGIHWDE->ujVBChipID == VB_CHIP_302 ) )
+            {
+                XGINew_SetReg1( pVBInfo->P3c4 , 0x1f , ( UCHAR )( temp | 0xc0 ) ) ;
+                XGI_DisableBridge( pXGIHWDE, pVBInfo ) ;
+            }
+            else
+            {
+               if ( pXGIHWDE->jChipType == XG21 )
+               {
+                 XGI_DisplayOff( pXGIHWDE, pVBInfo );
+
+                 XGI_XG21BLSignalVDD( 0x20 , 0x00, pVBInfo ) ; /* LVDS signal off */
+
+                 temp = XGINew_GetReg1( pVBInfo->P3d4 , 0x38 ) ;
+                 if ( temp & 0xE0 )
+                 {
+                   XGINew_SetRegAND( pVBInfo->P3c4 , 0x09 , ~0x80 ) ;          /* DVO Off */
+                   XGINew_SetRegAND( pVBInfo->P3d4 , 0x4A , ~0x20 ) ;          /* Enable write GPIOF */
+                   /*XGINew_SetRegAND( pVBInfo->P3d4 , 0x48 , ~0x20 ) ;*/              /* LCD Display OFF */
+                 }
+               }
+               if ( pXGIHWDE->jChipType == XG27 )
+               {
+                 XGI_DisplayOff( pXGIHWDE, pVBInfo );
+
+                 XGI_XG27BLSignalVDD( 0x20 , 0x00, pVBInfo ) ; /* LVDS signal off */
+
+                 temp = XGINew_GetReg1( pVBInfo->P3d4 , 0x38 ) ;
+                 if ( temp & 0xE0 )
+                 {
+                   XGINew_SetRegAND( pVBInfo->P3c4 , 0x09 , ~0x80 ) ;          /* DVO Off */
+                 }
+               }
+               XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x1F , ~0xC0 , 0xC0 ) ;
+               XGINew_SetRegOR( pVBInfo->P3c4 , 0x01 , 0x20 ) ;                /* CRT Off */
+
+               if ( ( pXGIHWDE->jChipType == XG21 ) && ( pVBInfo->IF_DEF_LVDS == 1 ) )
+               {
+                 XGI_XG21SetPanelDelay( 4,pVBInfo ) ;
+                 XGI_XG21BLSignalVDD( 0x01 , 0x00, pVBInfo ) ; /* LVDS VDD off */
+                 XGI_XG21SetPanelDelay( 5,pVBInfo ) ;
+               }
+               if ( ( pXGIHWDE->jChipType == XG27 ) && ( pVBInfo->IF_DEF_LVDS == 1 ) )
+               {
+                 XGI_XG21SetPanelDelay( 4,pVBInfo ) ;
+                 XGI_XG27BLSignalVDD( 0x01 , 0x00, pVBInfo ) ; /* LVDS VDD off */
+                 XGI_XG21SetPanelDelay( 5,pVBInfo ) ;
+               }
+            }
+            break ;
+
+        default:
+            break ;
+    }
+    XGI_LockCRT2( pXGIHWDE , pVBInfo ) ;
+}
+
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_GetSenseStatus */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_GetSenseStatus( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_INFO pVBInfo)
+{
+    USHORT tempax = 0 , tempbx , tempcx , temp ,
+           P2reg0 = 0 , SenseModeNo = 0 , OutputSelect = *pVBInfo->pOutputSelect ,
+           ModeIdIndex , i ;
+    pVBInfo->BaseAddr = (ULONG)HwDeviceExtension->pjIOAddress ;
+
+    if ( pVBInfo->IF_DEF_LVDS == 1 )
+    {
+        tempax = XGINew_GetReg1( pVBInfo->P3c4 , 0x1A ) ;      /* ynlai 02/27/2002 */
+        tempbx = XGINew_GetReg1( pVBInfo->P3c4 , 0x1B ) ;
+        tempax = ( ( tempax & 0xFE ) >> 1 ) | ( tempbx << 8 ) ;
+        if ( tempax == 0x00 )
+        {              /* Get Panel id from DDC */
+            temp = XGINew_GetLCDDDCInfo( HwDeviceExtension, pVBInfo ) ;
+            if ( temp == 1 )
+            {          /* LCD connect */
+                XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x39 , 0xFF , 0x01 ) ;     /* set CR39 bit0="1" */
+                XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x37 , 0xEF , 0x00 ) ;     /* clean CR37 bit4="0" */
+                temp = LCDSense ;
+            }
+            else
+            {          /* LCD don't connect */
+                temp = 0 ;
+            }
+        }
+        else
+        {
+            XGINew_GetPanelID(pVBInfo) ;
+            temp = LCDSense ;
+        }
+
+        tempbx = ~( LCDSense | AVIDEOSense | SVIDEOSense ) ;
+        XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x32 , tempbx , temp ) ;
+    }
+    else
+    {          /* for 301 */
+        if ( pVBInfo->VBInfo & SetCRT2ToHiVisionTV )
+        {      /* for HiVision */
+            tempax = XGINew_GetReg1( pVBInfo->P3c4 , 0x38 ) ;
+            temp = tempax & 0x01 ;
+            tempax = XGINew_GetReg1( pVBInfo->P3c4 , 0x3A ) ;
+            temp = temp | ( tempax & 0x02 ) ;
+            XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x32 , 0xA0 , temp ) ;
+        }
+        else
+        {
+            if ( XGI_BridgeIsOn( pVBInfo ) )
+            {
+                P2reg0 = XGINew_GetReg1( pVBInfo->Part2Port , 0x00 ) ;
+                if ( !XGINew_BridgeIsEnable( HwDeviceExtension, pVBInfo ) )
+                {
+                    SenseModeNo = 0x2e ;
+                    /* XGINew_SetReg1( pVBInfo->P3d4 , 0x30 , 0x41 ) ; */
+                    /* XGISetModeNew( HwDeviceExtension , 0x2e ) ; // ynlai InitMode */
+
+                    temp = XGI_SearchModeID( SenseModeNo , &ModeIdIndex, pVBInfo ) ;
+                    XGI_GetVGAType( HwDeviceExtension , pVBInfo) ;
+                    XGI_GetVBType( pVBInfo ) ;
+                    pVBInfo->SetFlag = 0x00 ;
+                    pVBInfo->ModeType = ModeVGA ;
+                    pVBInfo->VBInfo = SetCRT2ToRAMDAC | LoadDACFlag | SetInSlaveMode ;
+                    XGI_GetLCDInfo( 0x2e , ModeIdIndex, pVBInfo ) ;
+                    XGI_GetTVInfo(  0x2e , ModeIdIndex, pVBInfo ) ;
+                    XGI_EnableBridge( HwDeviceExtension, pVBInfo ) ;
+                    XGI_SetCRT2Group301( SenseModeNo , HwDeviceExtension, pVBInfo ) ;
+                    XGI_SetCRT2ModeRegs( 0x2e , HwDeviceExtension, pVBInfo ) ;
+                    /* XGI_DisableBridge( HwDeviceExtension, pVBInfo ) ; */
+                    XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x01 , 0xDF , 0x20 ) ; /* Display Off 0212 */
+                    for( i = 0 ; i < 20 ; i++ )
+                    {
+                        XGI_LongWait(pVBInfo) ;
+                    }
+                }
+                XGINew_SetReg1( pVBInfo->Part2Port , 0x00 , 0x1c ) ;
+                tempax = 0 ;
+                tempbx = *pVBInfo->pRGBSenseData ;
+
+                if ( !( XGINew_Is301B( pVBInfo ) ) )
+                {
+                    tempbx = *pVBInfo->pRGBSenseData2 ;
+                }
+
+                tempcx = 0x0E08 ;
+                if ( XGINew_Sense(tempbx , tempcx, pVBInfo ) )
+                {
+                    if ( XGINew_Sense(tempbx , tempcx, pVBInfo ) )
+                    {
+                        tempax |= Monitor2Sense ;
+                    }
+                }
+
+                if ( pVBInfo->VBType & VB_XGI301C)
+                {
+                    XGINew_SetRegOR( pVBInfo->Part4Port , 0x0d , 0x04 ) ;
+                }
+
+               if ( XGINew_SenseHiTV( HwDeviceExtension , pVBInfo) )           /* add by kuku for Multi-adapter sense HiTV */
+               {
+                   tempax |= HiTVSense ;
+                    if ( ( pVBInfo->VBType & VB_XGI301C ) )
+                    {
+                       tempax ^= ( HiTVSense | YPbPrSense ) ;
+                    }
+                }
+
+               if ( !( tempax & ( HiTVSense | YPbPrSense ) ) )         /* start */
+                {
+
+                    tempbx = *pVBInfo->pYCSenseData ;
+
+                    if ( !( XGINew_Is301B(  pVBInfo ) ) )
+                    {
+                      tempbx=*pVBInfo->pYCSenseData2;
+                    }
+
+                    tempcx = 0x0604 ;
+                    if ( XGINew_Sense(tempbx , tempcx, pVBInfo ) )
+                    {
+                      if ( XGINew_Sense(tempbx , tempcx, pVBInfo ) )
+                      {
+                          tempax |= SVIDEOSense ;
+                      }
+                    }
+
+                    if ( OutputSelect & BoardTVType )
+                    {
+                      tempbx = *pVBInfo->pVideoSenseData ;
+
+                      if ( !( XGINew_Is301B( pVBInfo ) ) )
+                      {
+                          tempbx = *pVBInfo->pVideoSenseData2 ;
+                      }
+
+                      tempcx = 0x0804 ;
+                      if ( XGINew_Sense(tempbx , tempcx, pVBInfo ) )
+                      {
+                          if ( XGINew_Sense(tempbx , tempcx, pVBInfo ) )
+                          {
+                              tempax |= AVIDEOSense ;
+                          }
+                      }
+                    }
+                    else
+                    {
+                      if ( !( tempax & SVIDEOSense ) )
+                      {
+                        tempbx = *pVBInfo->pVideoSenseData ;
+
+                        if ( !( XGINew_Is301B( pVBInfo ) ) )
+                        {
+                            tempbx=*pVBInfo->pVideoSenseData2;
+                        }
+
+                        tempcx = 0x0804 ;
+                        if ( XGINew_Sense(tempbx , tempcx, pVBInfo ) )
+                        {
+                            if ( XGINew_Sense(tempbx , tempcx, pVBInfo ) )
+                            {
+                                tempax |= AVIDEOSense ;
+                            }
+                        }
+                      }
+                    }
+                }
+           } /* end */
+            if ( !( tempax & Monitor2Sense ) )
+            {
+                if ( XGINew_SenseLCD( HwDeviceExtension, pVBInfo ) )
+                {
+                    tempax |= LCDSense ;
+                }
+            }
+            tempbx = 0 ;
+            tempcx = 0 ;
+            XGINew_Sense(tempbx , tempcx, pVBInfo ) ;
+
+            XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x32 , ~0xDF , tempax ) ;
+            XGINew_SetReg1( pVBInfo->Part2Port , 0x00 , P2reg0 ) ;
+
+            if ( !( P2reg0 & 0x20 ) )
+            {
+                pVBInfo->VBInfo = DisableCRT2Display ;
+                /* XGI_SetCRT2Group301( SenseModeNo , HwDeviceExtension, pVBInfo ) ; */
+            }
+        }
+    }
+    XGI_DisableBridge( HwDeviceExtension, pVBInfo ) ;          /* shampoo 0226 */
+
+}
+
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGINew_SenseLCD */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+USHORT XGINew_SenseLCD( PXGI_HW_DEVICE_INFO HwDeviceExtension ,PVB_DEVICE_INFO pVBInfo)
+{
+    /* USHORT SoftSetting ; */
+    USHORT temp ;
+
+    if ( ( HwDeviceExtension->jChipType >= XG20 ) || ( HwDeviceExtension->jChipType >= XG40 ) )
+        temp = 0 ;
+    else
+        temp=XGINew_GetPanelID(pVBInfo) ;
+
+    if( !temp )
+        temp = XGINew_GetLCDDDCInfo( HwDeviceExtension, pVBInfo ) ;
+
+    return( temp ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGINew_GetLCDDDCInfo */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+BOOLEAN XGINew_GetLCDDDCInfo( PXGI_HW_DEVICE_INFO HwDeviceExtension,PVB_DEVICE_INFO pVBInfo)
+{
+    USHORT temp ;
+
+    /* add lcd sense */
+    if ( HwDeviceExtension->ulCRT2LCDType == LCD_UNKNOWN )
+    {
+        return( 0 ) ;
+    }
+    else
+    {
+        temp = ( USHORT )HwDeviceExtension->ulCRT2LCDType ;
+        switch( HwDeviceExtension->ulCRT2LCDType )
+        {
+            case LCD_INVALID:
+            case LCD_800x600:
+            case LCD_1024x768:
+            case LCD_1280x1024:
+                break ;
+
+            case LCD_640x480:
+            case LCD_1024x600:
+            case LCD_1152x864:
+            case LCD_1280x960:
+            case LCD_1152x768:
+                temp = 0 ;
+                break ;
+
+            case LCD_1400x1050:
+            case LCD_1280x768:
+            case LCD_1600x1200:
+                break ;
+
+            case LCD_1920x1440:
+            case LCD_2048x1536:
+                temp = 0 ;
+                break ;
+
+            default:
+                break ;
+        }
+        XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x36 , 0xF0 , temp ) ;
+        return( 1 ) ;
+    }
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+BOOLEAN XGINew_GetPanelID(PVB_DEVICE_INFO pVBInfo )
+{
+    USHORT PanelTypeTable[ 16 ] = { SyncNN | PanelRGB18Bit | Panel800x600  | _PanelType00 ,
+                                    SyncNN | PanelRGB18Bit | Panel1024x768 | _PanelType01 ,
+                                    SyncNN | PanelRGB18Bit | Panel800x600  | _PanelType02 ,
+                                    SyncNN | PanelRGB18Bit | Panel640x480  | _PanelType03 ,
+                                    SyncNN | PanelRGB18Bit | Panel1024x768 | _PanelType04 ,
+                                    SyncNN | PanelRGB18Bit | Panel1024x768 | _PanelType05 ,
+                                    SyncNN | PanelRGB18Bit | Panel1024x768 | _PanelType06 ,
+                                    SyncNN | PanelRGB24Bit | Panel1024x768 | _PanelType07 ,
+                                    SyncNN | PanelRGB18Bit | Panel800x600  | _PanelType08 ,
+                                    SyncNN | PanelRGB18Bit | Panel1024x768 | _PanelType09 ,
+                                    SyncNN | PanelRGB18Bit | Panel800x600  | _PanelType0A ,
+                                    SyncNN | PanelRGB18Bit | Panel1024x768 | _PanelType0B ,
+                                    SyncNN | PanelRGB18Bit | Panel1024x768 | _PanelType0C ,
+                                    SyncNN | PanelRGB24Bit | Panel1024x768 | _PanelType0D ,
+                                    SyncNN | PanelRGB18Bit | Panel1024x768 | _PanelType0E ,
+                                    SyncNN | PanelRGB18Bit | Panel1024x768 | _PanelType0F } ;
+    USHORT tempax , tempbx , temp ;
+    /* USHORT return_flag ; */
+
+    tempax = XGINew_GetReg1( pVBInfo->P3c4 , 0x1A ) ;
+    tempbx = tempax & 0x1E ;
+
+    if ( tempax == 0 )
+        return( 0 ) ;
+    else
+    {
+/*
+        if ( !( tempax & 0x10 ) )
+        {
+            if ( pVBInfo->IF_DEF_LVDS == 1 )
+            {
+                tempbx = 0 ;
+                temp = XGINew_GetReg1( pVBInfo->P3c4 , 0x38 ) ;
+                if ( temp & 0x40 )
+                    tempbx |= 0x08 ;
+                if ( temp & 0x20 )
+                    tempbx |= 0x02 ;
+                if ( temp & 0x01 )
+                    tempbx |= 0x01 ;
+
+                temp = XGINew_GetReg1( pVBInfo->P3c4 , 0x39 ) ;
+                if ( temp & 0x80 )
+                    tempbx |= 0x04 ;
+            }
+            else
+            {
+                return( 0 ) ;
+            }
+        }
+*/
+
+        tempbx = tempbx >> 1 ;
+        temp = tempbx & 0x00F ;
+        XGINew_SetReg1( pVBInfo->P3d4 , 0x36 , temp ) ;
+        tempbx-- ;
+        tempbx = PanelTypeTable[ tempbx ] ;
+
+        temp = ( tempbx & 0xFF00 ) >> 8 ;
+        XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x37 , ~( LCDSyncBit | LCDRGB18Bit ) , temp ) ;
+        return( 1 ) ;
+    }
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGINew_BridgeIsEnable */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+BOOLEAN XGINew_BridgeIsEnable( PXGI_HW_DEVICE_INFO HwDeviceExtension ,PVB_DEVICE_INFO pVBInfo)
+{
+    USHORT flag ;
+
+    if ( XGI_BridgeIsOn( pVBInfo ) == 0 )
+    {
+        flag = XGINew_GetReg1( pVBInfo->Part1Port , 0x0 ) ;
+
+        if ( flag & 0x050 )
+        {
+            return( 1 ) ;
+        }
+        else
+        {
+            return( 0 ) ;
+        }
+
+    }
+    return( 0 ) ;
+}
+
+/* ------------------------------------------------------ */
+/* Function : XGINew_SenseHiTV */
+/* Input : */
+/* Output : */
+/* Description : */
+/* ------------------------------------------------------ */
+BOOLEAN XGINew_SenseHiTV( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_INFO pVBInfo )
+{
+    USHORT tempbx , tempcx , temp , i , tempch;
+
+    tempbx = *pVBInfo->pYCSenseData2 ;
+
+    tempcx = 0x0604 ;
+
+    temp = tempbx & 0xFF ;
+    XGINew_SetReg1( pVBInfo->Part4Port , 0x11 , temp ) ;
+    temp = ( tempbx & 0xFF00 ) >> 8 ;
+    temp |= ( tempcx & 0x00FF ) ;
+    XGINew_SetRegANDOR( pVBInfo->Part4Port , 0x10 , ~0x1F , temp ) ;
+
+    for( i = 0 ; i < 10 ; i++ )
+        XGI_LongWait(pVBInfo) ;
+
+    tempch = ( tempcx & 0xFF00 ) >> 8;
+    temp = XGINew_GetReg1( pVBInfo->Part4Port , 0x03 ) ;
+    temp = temp ^ ( 0x0E ) ;
+    temp &= tempch ;
+
+    if ( temp !=  tempch )
+        return( 0 ) ;
+
+    tempbx = *pVBInfo->pVideoSenseData2 ;
+
+    tempcx = 0x0804 ;
+    temp = tempbx & 0xFF ;
+    XGINew_SetReg1( pVBInfo->Part4Port , 0x11 , temp ) ;
+    temp = ( tempbx & 0xFF00 ) >> 8 ;
+    temp |= ( tempcx & 0x00FF ) ;
+    XGINew_SetRegANDOR( pVBInfo->Part4Port , 0x10 , ~0x1F , temp ) ;
+
+    for( i = 0 ; i < 10 ; i++ )
+        XGI_LongWait(pVBInfo) ;
+
+    tempch = ( tempcx & 0xFF00 ) >> 8;
+    temp = XGINew_GetReg1( pVBInfo->Part4Port , 0x03 ) ;
+    temp = temp ^ ( 0x0E ) ;
+    temp &= tempch ;
+
+    if ( temp !=  tempch )
+        return( 0 ) ;
+    else
+    {
+      tempbx = 0x3FF ;
+      tempcx = 0x0804 ;
+      temp = tempbx & 0xFF ;
+      XGINew_SetReg1( pVBInfo->Part4Port , 0x11 , temp ) ;
+      temp = ( tempbx & 0xFF00 ) >> 8 ;
+      temp |= ( tempcx & 0x00FF ) ;
+      XGINew_SetRegANDOR( pVBInfo->Part4Port , 0x10 , ~0x1F , temp ) ;
+
+      for( i = 0 ; i < 10 ; i++ )
+          XGI_LongWait(pVBInfo) ;
+
+      tempch = ( tempcx & 0xFF00 ) >> 8;
+      temp = XGINew_GetReg1( pVBInfo->Part4Port , 0x03 ) ;
+      temp = temp ^ ( 0x0E ) ;
+      temp &= tempch ;
+
+      if ( temp != tempch )
+          return( 1 ) ;
+      else
+         return( 0 ) ;
+    }
+}
+
+
+
+/*
+;-----------------------------------------------------------------------------
+;       Description: Get Panel support
+;      O/P        :
+;            BL: Panel ID=81h for no scaler LVDS
+;                   BH: Panel enhanced Mode Count
+;                   CX: Panel H. resolution
+;                   DX: PAnel V. resolution
+;-----------------------------------------------------------------------------
+*/
+void XGI_XG21Fun14Sub70( PVB_DEVICE_INFO pVBInfo , PX86_REGS pBiosArguments )
+{
+
+    USHORT ModeIdIndex;
+    USHORT ModeNo;
+
+    USHORT EModeCount;
+    USHORT lvdstableindex;
+
+    lvdstableindex = XGI_GetLVDSOEMTableIndex( pVBInfo );
+    pBiosArguments->h.bl = 0x81;
+    pBiosArguments->x.cx = pVBInfo->XG21_LVDSCapList[lvdstableindex].LVDSHDE;
+    pBiosArguments->x.dx = pVBInfo->XG21_LVDSCapList[lvdstableindex].LVDSVDE;
+    EModeCount = 0;
+
+    pBiosArguments->x.ax = 0x0014;
+    for( ModeIdIndex = 0 ; ;  ModeIdIndex ++ )
+    {
+        ModeNo = pVBInfo->EModeIDTable[ ModeIdIndex ].Ext_ModeID;
+        if ( pVBInfo->EModeIDTable[ ModeIdIndex ].Ext_ModeID == 0xFF )
+        {
+            pBiosArguments->h.bh = (UCHAR) EModeCount;
+            return;
+        }
+        if ( !XGI_XG21CheckLVDSMode( ModeNo , ModeIdIndex, pVBInfo) )
+        {
+          continue;
+        }
+        EModeCount++ ;
+    }
+}
+/*(
+;-----------------------------------------------------------------------------
+;
+;       Description: Get Panel mode ID for enhanced mode
+;      I/P        : BH: EModeIndex ( which < Panel enhanced Mode Count )
+;      O/P        :
+;            BL: Mode ID
+;                   CX: H. resolution of the assigned by the index
+;                   DX: V. resolution of the assigned by the index
+;
+;-----------------------------------------------------------------------------
+*/
+void XGI_XG21Fun14Sub71( PVB_DEVICE_INFO pVBInfo , PX86_REGS pBiosArguments )
+{
+
+    USHORT EModeCount;
+    USHORT ModeIdIndex,resindex;
+    USHORT ModeNo;
+    USHORT EModeIndex = pBiosArguments->h.bh;
+
+    EModeCount = 0;
+    for( ModeIdIndex = 0 ; ;  ModeIdIndex ++ )
+    {
+        ModeNo = pVBInfo->EModeIDTable[ ModeIdIndex ].Ext_ModeID;
+        if ( pVBInfo->EModeIDTable[ ModeIdIndex ].Ext_ModeID == 0xFF )
+        {
+            pBiosArguments->x.ax = 0x0114;
+            return;
+        }
+        if ( !XGI_XG21CheckLVDSMode( ModeNo , ModeIdIndex, pVBInfo) )
+        {
+          continue;
+        }
+        if (EModeCount == EModeIndex)
+        {
+            resindex = XGI_GetResInfo( ModeNo , ModeIdIndex, pVBInfo ) ;
+            pBiosArguments->h.bl = (UCHAR) ModeNo;
+            pBiosArguments->x.cx = pVBInfo->ModeResInfo[ resindex ].HTotal ;                     /* xres->ax */
+            pBiosArguments->x.dx = pVBInfo->ModeResInfo[ resindex ].VTotal ;                     /* yres->bx */
+            pBiosArguments->x.ax = 0x0014;
+        }
+        EModeCount++ ;
+
+    }
+
+}
+/*
+;-----------------------------------------------------------------------------
+;
+;       Description: Validate Panel modes ID support
+;      I/P        :
+;            BL: ModeID
+;      O/P        :
+;                   CX: H. resolution of the assigned by the index
+;                   DX: V. resolution of the assigned by the index
+;
+;-----------------------------------------------------------------------------
+*/
+void XGI_XG21Fun14Sub72( PVB_DEVICE_INFO pVBInfo , PX86_REGS pBiosArguments )
+{
+    USHORT ModeIdIndex,resindex;
+    USHORT ModeNo;
+
+
+    ModeNo = pBiosArguments->h.bl ;
+    XGI_SearchModeID( ModeNo, &ModeIdIndex, pVBInfo);
+    if ( !XGI_XG21CheckLVDSMode( ModeNo , ModeIdIndex, pVBInfo) )
+    {
+        pBiosArguments->x.cx = 0;
+        pBiosArguments->x.dx = 0;
+        pBiosArguments->x.ax = 0x0114;
+        return;
+    }
+    resindex = XGI_GetResInfo( ModeNo , ModeIdIndex, pVBInfo ) ;
+    if ( ModeNo <= 0x13 )
+    {
+        pBiosArguments->x.cx = pVBInfo->StResInfo[ resindex ].HTotal ;
+        pBiosArguments->x.dx = pVBInfo->StResInfo[ resindex ].VTotal ;
+    }
+    else
+    {
+        pBiosArguments->x.cx = pVBInfo->ModeResInfo[ resindex ].HTotal ;                         /* xres->ax */
+        pBiosArguments->x.dx = pVBInfo->ModeResInfo[ resindex ].VTotal ;                         /* yres->bx */
+    }
+
+    pBiosArguments->x.ax = 0x0014;
+
+}
+
+/*
+;-----------------------------------------------------------------------------
+;      Description: Get Customized Panel misc. information support
+;      I/P        : Select
+;                   to get panel horizontal timing
+;                       to get panel vertical timing
+;                       to get channel clock parameter
+;            to get panel misc information
+;
+;      O/P        :
+;                   BL: for input Select = 0 ;
+;                       BX: *Value1 = Horizontal total
+;                       CX: *Value2 = Horizontal front porch
+;                       DX: *Value2 = Horizontal sync width
+;                   BL: for input Select = 1 ;
+;                       BX: *Value1 = Vertical total
+;                       CX: *Value2 = Vertical front porch
+;                       DX: *Value2 = Vertical sync width
+;            BL: for input Select = 2 ;
+;                       BX: Value1 = The first CLK parameter
+;                       CX: Value2 = The second CLK parameter
+;                   BL: for input Select = 4 ;
+;                       BX[15]: *Value1 D[15] VESA V. Polarity
+;                       BX[14]: *Value1 D[14] VESA H. Polarity
+;                       BX[7]: *Value1 D[7] Panel V. Polarity
+;                       BX[6]: *Value1 D[6] Panel H. Polarity
+;-----------------------------------------------------------------------------
+*/
+void XGI_XG21Fun14Sub73( PVB_DEVICE_INFO pVBInfo , PX86_REGS pBiosArguments )
+{
+    UCHAR Select;
+
+    USHORT lvdstableindex;
+
+    lvdstableindex = XGI_GetLVDSOEMTableIndex( pVBInfo );
+    Select = pBiosArguments->h.bl;
+
+    switch (Select)
+    {
+        case 0:
+                pBiosArguments->x.bx = pVBInfo->XG21_LVDSCapList[lvdstableindex].LVDSHT;
+                pBiosArguments->x.cx = pVBInfo->XG21_LVDSCapList[lvdstableindex].LVDSHFP;
+                pBiosArguments->x.dx = pVBInfo->XG21_LVDSCapList[lvdstableindex].LVDSHSYNC;
+                break;
+        case 1:
+                pBiosArguments->x.bx = pVBInfo->XG21_LVDSCapList[lvdstableindex].LVDSVT;
+                pBiosArguments->x.cx = pVBInfo->XG21_LVDSCapList[lvdstableindex].LVDSVFP;
+                pBiosArguments->x.dx = pVBInfo->XG21_LVDSCapList[lvdstableindex].LVDSVSYNC;
+                break;
+        case 2:
+                pBiosArguments->x.bx = pVBInfo->XG21_LVDSCapList[lvdstableindex].VCLKData1;
+                pBiosArguments->x.cx = pVBInfo->XG21_LVDSCapList[lvdstableindex].VCLKData2;
+                break;
+        case 4:
+                pBiosArguments->x.bx = pVBInfo->XG21_LVDSCapList[lvdstableindex].LVDS_Capability;
+                break;
+    }
+
+    pBiosArguments->x.ax = 0x0014;
+}
+
+
+void XGI_XG21Fun14( PXGI_HW_DEVICE_INFO pXGIHWDE, PX86_REGS pBiosArguments)
+{
+    VB_DEVICE_INFO VBINF;
+    PVB_DEVICE_INFO pVBInfo = &VBINF;
+
+    pVBInfo->IF_DEF_LVDS = 0 ;
+    pVBInfo->IF_DEF_CH7005 = 0 ;
+    pVBInfo->IF_DEF_HiVision = 1 ;
+    pVBInfo->IF_DEF_LCDA = 1 ;
+    pVBInfo->IF_DEF_CH7017 = 0 ;
+    pVBInfo->IF_DEF_YPbPr = 1 ;
+    pVBInfo->IF_DEF_CRT2Monitor = 0 ;
+    pVBInfo->IF_DEF_VideoCapture = 0 ;
+    pVBInfo->IF_DEF_ScaleLCD = 0 ;
+    pVBInfo->IF_DEF_OEMUtil = 0 ;
+    pVBInfo->IF_DEF_PWD = 0 ;
+
+    InitTo330Pointer( pXGIHWDE->jChipType,  pVBInfo ) ;
+    ReadVBIOSTablData( pXGIHWDE->jChipType , pVBInfo) ;
+
+    pVBInfo->P3c4 = pVBInfo->BaseAddr + 0x14 ;
+    pVBInfo->P3d4 = pVBInfo->BaseAddr + 0x24 ;
+    pVBInfo->P3c0 = pVBInfo->BaseAddr + 0x10 ;
+    pVBInfo->P3ce = pVBInfo->BaseAddr + 0x1e ;
+    pVBInfo->P3c2 = pVBInfo->BaseAddr + 0x12 ;
+    pVBInfo->P3ca = pVBInfo->BaseAddr + 0x1a ;
+    pVBInfo->P3c6 = pVBInfo->BaseAddr + 0x16 ;
+    pVBInfo->P3c7 = pVBInfo->BaseAddr + 0x17 ;
+    pVBInfo->P3c8 = pVBInfo->BaseAddr + 0x18 ;
+    pVBInfo->P3c9 = pVBInfo->BaseAddr + 0x19 ;
+    pVBInfo->P3da = pVBInfo->BaseAddr + 0x2A ;
+    pVBInfo->Part0Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_00 ;
+    pVBInfo->Part1Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_04 ;
+    pVBInfo->Part2Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_10 ;
+    pVBInfo->Part3Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_12 ;
+    pVBInfo->Part4Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_14 ;
+    pVBInfo->Part5Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_14 + 2 ;
+
+    switch(pBiosArguments->x.ax)
+    {
+    case 0x1470:
+         XGI_XG21Fun14Sub70( pVBInfo , pBiosArguments ) ;
+         break;
+    case 0x1471:
+         XGI_XG21Fun14Sub71( pVBInfo , pBiosArguments ) ;
+         break;
+    case 0x1472:
+         XGI_XG21Fun14Sub72( pVBInfo , pBiosArguments ) ;
+         break;
+    case 0x1473:
+         XGI_XG21Fun14Sub73( pVBInfo , pBiosArguments ) ;
+         break;
+    }
+}
diff --git a/drivers/staging/xgifb/vb_ext.h b/drivers/staging/xgifb/vb_ext.h
new file mode 100644 (file)
index 0000000..9a72f5e
--- /dev/null
@@ -0,0 +1,32 @@
+#ifndef  _VBEXT_
+#define  _VBEXT_
+
+struct DWORDREGS {
+    ULONG    Eax, Ebx, Ecx, Edx, Esi, Edi, Ebp;
+};
+
+struct WORDREGS {
+    USHORT    ax, hi_ax, bx, hi_bx, cx, hi_cx, dx, hi_dx, si, hi_si, di ,hi_di, bp, hi_bp;
+};
+
+struct BYTEREGS {
+    UCHAR   al, ah, hi_al, hi_ah, bl, bh, hi_bl, hi_bh, cl, ch, hi_cl, hi_ch, dl, dh, hi_dl, hi_dh;
+};
+
+typedef union   _X86_REGS    {
+    struct  DWORDREGS e;
+    struct  WORDREGS x;
+    struct  BYTEREGS h;
+} X86_REGS, *PX86_REGS;
+
+extern   void     XGI_XG21Fun14( PXGI_HW_DEVICE_INFO pXGIHWDE, PX86_REGS pBiosArguments);
+extern   void     XGISetDPMS( PXGI_HW_DEVICE_INFO pXGIHWDE , ULONG VESA_POWER_STATE ) ;
+extern   void     XGI_GetSenseStatus( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_INFO pVBInfo );
+extern   void     XGINew_SetModeScratch ( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_INFO pVBInfo ) ;
+extern   void    ReadVBIOSTablData( UCHAR ChipType , PVB_DEVICE_INFO pVBInfo);
+extern   USHORT   XGINew_SenseLCD(PXGI_HW_DEVICE_INFO,PVB_DEVICE_INFO pVBInfo);
+#ifdef WIN2000
+extern   BOOLEAN  XGI_DySense( PHW_DEVICE_EXTENSION pHWDE , PUCHAR ujConnectStatus );
+#endif /* WIN2000 */
+
+#endif
diff --git a/drivers/staging/xgifb/vb_init.c b/drivers/staging/xgifb/vb_init.c
new file mode 100644 (file)
index 0000000..b85ca9b
--- /dev/null
@@ -0,0 +1,3444 @@
+#include "osdef.h"
+#include "vgatypes.h"
+
+
+#ifdef LINUX_KERNEL
+#include <linux/version.h>
+#include <linux/types.h>
+#include <linux/delay.h> /* udelay */
+#include "XGIfb.h"
+/*#if LINUX_VERSxION_CODE >= KERNEL_VERSION(2,5,0)
+#include <video/XGIfb.h>
+#else
+#include <linux/XGIfb.h>
+#endif */
+#endif
+
+#ifdef WIN2000
+#include <dderror.h>
+#include <devioctl.h>
+#include <miniport.h>
+#include <ntddvdeo.h>
+#include <video.h>
+#include "xgiv.h"
+#include "dd_i2c.h"
+#include "tools.h"
+#endif
+
+#include "vb_def.h"
+#include "vb_struct.h"
+#include "vb_util.h"
+#include "vb_setmode.h"
+#include "vb_init.h"
+#include "vb_ext.h"
+
+#ifdef LINUX_XF86
+#include "xf86.h"
+#include "xf86PciInfo.h"
+#include "xgi.h"
+#include "xgi_regs.h"
+#endif
+
+#ifdef LINUX_KERNEL
+#include <asm/io.h>
+#include <linux/types.h>
+#endif
+
+
+
+
+UCHAR    XGINew_ChannelAB,XGINew_DataBusWidth;
+
+USHORT XGINew_DRAMType[17][5]={{0x0C,0x0A,0x02,0x40,0x39},{0x0D,0x0A,0x01,0x40,0x48},
+                     {0x0C,0x09,0x02,0x20,0x35},{0x0D,0x09,0x01,0x20,0x44},
+                     {0x0C,0x08,0x02,0x10,0x31},{0x0D,0x08,0x01,0x10,0x40},
+                     {0x0C,0x0A,0x01,0x20,0x34},{0x0C,0x09,0x01,0x08,0x32},
+                     {0x0B,0x08,0x02,0x08,0x21},{0x0C,0x08,0x01,0x08,0x30},
+                     {0x0A,0x08,0x02,0x04,0x11},{0x0B,0x0A,0x01,0x10,0x28},
+                     {0x09,0x08,0x02,0x02,0x01},{0x0B,0x09,0x01,0x08,0x24},
+                     {0x0B,0x08,0x01,0x04,0x20},{0x0A,0x08,0x01,0x02,0x10},
+                     {0x09,0x08,0x01,0x01,0x00}};
+
+USHORT XGINew_SDRDRAM_TYPE[13][5]=
+{
+{ 2,12, 9,64,0x35},
+{ 1,13, 9,64,0x44},
+{ 2,12, 8,32,0x31},
+{ 2,11, 9,32,0x25},
+{ 1,12, 9,32,0x34},
+{ 1,13, 8,32,0x40},
+{ 2,11, 8,16,0x21},
+{ 1,12, 8,16,0x30},
+{ 1,11, 9,16,0x24},
+{ 1,11, 8, 8,0x20},
+{ 2, 9, 8, 4,0x01},
+{ 1,10, 8, 4,0x10},
+{ 1, 9, 8, 2,0x00}
+};
+
+USHORT XGINew_DDRDRAM_TYPE[4][5]=
+{
+{ 2,12, 9,64,0x35},
+{ 2,12, 8,32,0x31},
+{ 2,11, 8,16,0x21},
+{ 2, 9, 8, 4,0x01}
+};
+USHORT XGINew_DDRDRAM_TYPE340[4][5]=
+{
+{ 2,13, 9,64,0x45},
+{ 2,12, 9,32,0x35},
+{ 2,12, 8,16,0x31},
+{ 2,11, 8, 8,0x21}
+};
+USHORT XGINew_DDRDRAM_TYPE20[12][5]=
+{
+{ 2,14,11,128,0x5D},
+{ 2,14,10,64,0x59},
+{ 2,13,11,64,0x4D},
+{ 2,14, 9,32,0x55},
+{ 2,13,10,32,0x49},
+{ 2,12,11,32,0x3D},
+{ 2,14, 8,16,0x51},
+{ 2,13, 9,16,0x45},
+{ 2,12,10,16,0x39},
+{ 2,13, 8, 8,0x41},
+{ 2,12, 9, 8,0x35},
+{ 2,12, 8, 4,0x31}
+};
+
+void     XGINew_SetDRAMSize_340(PXGI_HW_DEVICE_INFO, PVB_DEVICE_INFO);
+void     XGINew_SetDRAMSize_310(PXGI_HW_DEVICE_INFO, PVB_DEVICE_INFO);
+void     XGINew_SetMemoryClock(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO );
+void     XGINew_SetDRAMModeRegister(PVB_DEVICE_INFO );
+void     XGINew_SetDRAMModeRegister340( PXGI_HW_DEVICE_INFO HwDeviceExtension );
+void    XGINew_SetDRAMDefaultRegister340(PXGI_HW_DEVICE_INFO HwDeviceExtension, ULONG, PVB_DEVICE_INFO );
+UCHAR    XGINew_GetXG20DRAMType( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_INFO pVBInfo);
+BOOLEAN  XGIInitNew( PXGI_HW_DEVICE_INFO HwDeviceExtension) ;
+
+int      XGINew_DDRSizing340( PXGI_HW_DEVICE_INFO, PVB_DEVICE_INFO );
+void     XGINew_DisableRefresh( PXGI_HW_DEVICE_INFO ,PVB_DEVICE_INFO) ;
+void     XGINew_CheckBusWidth_310( PVB_DEVICE_INFO) ;
+int      XGINew_SDRSizing(PVB_DEVICE_INFO);
+int      XGINew_DDRSizing( PVB_DEVICE_INFO );
+void     XGINew_EnableRefresh( PXGI_HW_DEVICE_INFO, PVB_DEVICE_INFO);
+int      XGINew_RAMType;                  /*int      ModeIDOffset,StandTable,CRT1Table,ScreenOffset,REFIndex;*/
+ULONG   UNIROM;                          /* UNIROM */
+BOOLEAN  ChkLFB( PVB_DEVICE_INFO );
+void     XGINew_Delay15us(ULONG);
+void     SetPowerConsume (PXGI_HW_DEVICE_INFO HwDeviceExtension,ULONG XGI_P3d4Port);
+void    ReadVBIOSTablData( UCHAR ChipType , PVB_DEVICE_INFO pVBInfo);
+void    XGINew_DDR1x_MRS_XG20( ULONG P3c4 , PVB_DEVICE_INFO pVBInfo);
+void     XGINew_SetDRAMModeRegister_XG20( PXGI_HW_DEVICE_INFO HwDeviceExtension );
+void     XGINew_SetDRAMModeRegister_XG27( PXGI_HW_DEVICE_INFO HwDeviceExtension );
+void    XGINew_ChkSenseStatus ( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_INFO pVBInfo ) ;
+void     XGINew_SetModeScratch ( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_INFO pVBInfo ) ;
+void     XGINew_GetXG21Sense(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) ;
+UCHAR    GetXG21FPBits(PVB_DEVICE_INFO pVBInfo);
+void     XGINew_GetXG27Sense(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) ;
+UCHAR    GetXG27FPBits(PVB_DEVICE_INFO pVBInfo);
+
+#ifdef WIN2000
+/* [Billy] 2007/05/20 For CH7007 */
+extern  UCHAR CH7007TVReg_UNTSC[][8],CH7007TVReg_ONTSC[][8],CH7007TVReg_UPAL[][8],CH7007TVReg_OPAL[][8];
+extern  UCHAR XGI7007_CHTVVCLKUNTSC[],XGI7007_CHTVVCLKONTSC[],XGI7007_CHTVVCLKUPAL[],XGI7007_CHTVVCLKOPAL[];
+#endif
+
+#ifdef LINUX_KERNEL
+void DelayUS(ULONG MicroSeconds)
+{
+       udelay(MicroSeconds);
+}
+#endif
+
+/* --------------------------------------------------------------------- */
+/* Function : XGIInitNew */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+BOOLEAN XGIInitNew( PXGI_HW_DEVICE_INFO HwDeviceExtension )
+{
+
+    VB_DEVICE_INFO VBINF;
+    PVB_DEVICE_INFO pVBInfo = &VBINF;
+    UCHAR   i , temp = 0 , temp1 ;
+     //       VBIOSVersion[ 5 ] ;
+    PUCHAR  volatile pVideoMemory;
+
+    /* ULONG j, k ; */
+
+    PXGI_DSReg pSR ;
+
+    ULONG Temp ;
+
+    pVBInfo->ROMAddr = HwDeviceExtension->pjVirtualRomBase ;
+
+    pVBInfo->FBAddr = HwDeviceExtension->pjVideoMemoryAddress ;
+
+    pVBInfo->BaseAddr = (ULONG)HwDeviceExtension->pjIOAddress ;
+
+    pVideoMemory = ( PUCHAR )pVBInfo->ROMAddr;
+
+
+//    Newdebugcode( 0x99 ) ;
+
+
+   /* if ( pVBInfo->ROMAddr == 0 ) */
+   /* return( FALSE ) ; */
+
+    if ( pVBInfo->FBAddr == 0 )
+{
+       printk("\n pVBInfo->FBAddr == 0 ");
+       return( FALSE ) ;
+}
+printk("1");
+    if ( pVBInfo->BaseAddr == 0 )
+{
+       printk("\npVBInfo->BaseAddr == 0 ");
+        return( FALSE ) ;
+}
+printk("2");
+
+    XGINew_SetReg3( ( pVBInfo->BaseAddr + 0x12 ) , 0x67 ) ;    /* 3c2 <- 67 ,ynlai */
+
+    pVBInfo->ISXPDOS = 0 ;
+printk("3");
+
+if ( !HwDeviceExtension->bIntegratedMMEnabled )
+{
+        return( FALSE ) ;      /* alan */
+}
+printk("4");
+
+//    XGI_MemoryCopy( VBIOSVersion , HwDeviceExtension->szVBIOSVer , 4 ) ;
+
+ //   VBIOSVersion[ 4 ] = 0x0 ;
+
+    /* 09/07/99 modify by domao */
+
+    pVBInfo->P3c4 = pVBInfo->BaseAddr + 0x14 ;
+    pVBInfo->P3d4 = pVBInfo->BaseAddr + 0x24 ;
+    pVBInfo->P3c0 = pVBInfo->BaseAddr + 0x10 ;
+    pVBInfo->P3ce = pVBInfo->BaseAddr + 0x1e ;
+    pVBInfo->P3c2 = pVBInfo->BaseAddr + 0x12 ;
+    pVBInfo->P3ca = pVBInfo->BaseAddr + 0x1a ;
+    pVBInfo->P3c6 = pVBInfo->BaseAddr + 0x16 ;
+    pVBInfo->P3c7 = pVBInfo->BaseAddr + 0x17 ;
+    pVBInfo->P3c8 = pVBInfo->BaseAddr + 0x18 ;
+    pVBInfo->P3c9 = pVBInfo->BaseAddr + 0x19 ;
+    pVBInfo->P3da = pVBInfo->BaseAddr + 0x2A ;
+    pVBInfo->Part0Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_00 ;
+    pVBInfo->Part1Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_04 ;
+    pVBInfo->Part2Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_10 ;
+    pVBInfo->Part3Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_12 ;
+    pVBInfo->Part4Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_14 ;
+    pVBInfo->Part5Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_14 + 2 ;
+printk("5");
+
+    if ( HwDeviceExtension->jChipType < XG20 )                 /* kuku 2004/06/25 */
+    XGI_GetVBType( pVBInfo ) ;         /* Run XGI_GetVBType before InitTo330Pointer */
+
+    InitTo330Pointer( HwDeviceExtension->jChipType,  pVBInfo ) ;
+
+    /* ReadVBIOSData */
+    ReadVBIOSTablData( HwDeviceExtension->jChipType , pVBInfo) ;
+
+    /* 1.Openkey */
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x05 , 0x86 ) ;
+printk("6");
+
+    /* GetXG21Sense (GPIO) */
+    if ( HwDeviceExtension->jChipType == XG21 )
+    {
+       XGINew_GetXG21Sense(HwDeviceExtension, pVBInfo) ;
+    }
+    if ( HwDeviceExtension->jChipType == XG27 )
+    {
+       XGINew_GetXG27Sense(HwDeviceExtension, pVBInfo) ;
+    }
+printk("7");
+
+    /* 2.Reset Extended register */
+
+    for( i = 0x06 ; i < 0x20 ; i++ )
+        XGINew_SetReg1( pVBInfo->P3c4 , i , 0 ) ;
+
+    for( i = 0x21 ; i <= 0x27 ; i++ )
+        XGINew_SetReg1( pVBInfo->P3c4 , i , 0 ) ;
+
+    /* for( i = 0x06 ; i <= 0x27 ; i++ ) */
+    /* XGINew_SetReg1( pVBInfo->P3c4 , i , 0 ) ; */
+
+printk("8");
+
+    if(( HwDeviceExtension->jChipType >= XG20 ) || ( HwDeviceExtension->jChipType >= XG40))
+    {
+        for( i = 0x31 ; i <= 0x3B ; i++ )
+            XGINew_SetReg1( pVBInfo->P3c4 , i , 0 ) ;
+    }
+    else
+    {
+        for( i = 0x31 ; i <= 0x3D ; i++ )
+            XGINew_SetReg1( pVBInfo->P3c4 , i , 0 ) ;
+    }
+printk("9");
+
+    if ( HwDeviceExtension->jChipType == XG42 )                        /* [Hsuan] 2004/08/20 Auto over driver for XG42 */
+      XGINew_SetReg1( pVBInfo->P3c4 , 0x3B , 0xC0 ) ;
+
+    /* for( i = 0x30 ; i <= 0x3F ; i++ ) */
+    /* XGINew_SetReg1( pVBInfo->P3d4 , i , 0 ) ; */
+
+    for( i = 0x79 ; i <= 0x7C ; i++ )
+        XGINew_SetReg1( pVBInfo->P3d4 , i , 0 ) ;              /* shampoo 0208 */
+
+printk("10");
+
+    if ( HwDeviceExtension->jChipType >= XG20 )
+        XGINew_SetReg1( pVBInfo->P3d4 , 0x97 , *pVBInfo->pXGINew_CR97 ) ;
+
+    /* 3.SetMemoryClock
+
+    if ( HwDeviceExtension->jChipType >= XG40 )
+        XGINew_RAMType = ( int )XGINew_GetXG20DRAMType( HwDeviceExtension , pVBInfo) ;
+
+    if ( HwDeviceExtension->jChipType < XG40 )
+        XGINew_SetMemoryClock( HwDeviceExtension , pVBInfo ) ;  */
+
+printk("11");
+
+    /* 4.SetDefExt1Regs begin */
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x07 , *pVBInfo->pSR07 ) ;
+    if ( HwDeviceExtension->jChipType == XG27 )
+    {
+        XGINew_SetReg1( pVBInfo->P3c4 , 0x40 , *pVBInfo->pSR40 ) ;
+        XGINew_SetReg1( pVBInfo->P3c4 , 0x41 , *pVBInfo->pSR41 ) ;
+    }
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x11 , 0x0F ) ;
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x1F , *pVBInfo->pSR1F ) ;
+    /* XGINew_SetReg1( pVBInfo->P3c4 , 0x20 , 0x20 ) ; */
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x20 , 0xA0 ) ;    /* alan, 2001/6/26 Frame buffer can read/write SR20 */
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x36 , 0x70 ) ;    /* Hsuan, 2006/01/01 H/W request for slow corner chip */
+    if ( HwDeviceExtension->jChipType == XG27 )         /* Alan 12/07/2006 */
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x36 , *pVBInfo->pSR36 ) ;
+
+    /* SR11 = 0x0F ; */
+    /* XGINew_SetReg1( pVBInfo->P3c4 , 0x11 , SR11 ) ; */
+
+printk("12");
+
+   if ( HwDeviceExtension->jChipType < XG20 )          /* kuku 2004/06/25 */
+    {
+//    /* Set AGP Rate */
+//    temp1 = XGINew_GetReg1( pVBInfo->P3c4 , 0x3B ) ;
+//    temp1 &= 0x02 ;
+//    if ( temp1 == 0x02 )
+//    {
+//        XGINew_SetReg4( 0xcf8 , 0x80000000 ) ;
+//       ChipsetID = XGINew_GetReg3( 0x0cfc ) ;
+//        XGINew_SetReg4( 0xcf8 , 0x8000002C ) ;
+//        VendorID = XGINew_GetReg3( 0x0cfc ) ;
+//        VendorID &= 0x0000FFFF ;
+//        XGINew_SetReg4( 0xcf8 , 0x8001002C ) ;
+//        GraphicVendorID = XGINew_GetReg3( 0x0cfc ) ;
+//        GraphicVendorID &= 0x0000FFFF;
+//
+//        if ( ChipsetID == 0x7301039 )
+///            XGINew_SetReg1( pVBInfo->P3d4 , 0x5F , 0x09 ) ;
+//
+//        ChipsetID &= 0x0000FFFF ;
+///
+//        if ( ( ChipsetID == 0x700E ) || ( ChipsetID == 0x1022 ) || ( ChipsetID == 0x1106 ) || ( ChipsetID == 0x10DE ) )
+//        {
+//            if ( ChipsetID == 0x1106 )
+//            {
+//                if ( ( VendorID == 0x1019 ) && ( GraphicVendorID == 0x1019 ) )
+//                    XGINew_SetReg1( pVBInfo->P3d4 , 0x5F , 0x0D ) ;
+//                else
+//                    XGINew_SetReg1( pVBInfo->P3d4 , 0x5F , 0x0B ) ;
+//            }
+//            else
+//                XGINew_SetReg1( pVBInfo->P3d4 , 0x5F , 0x0B ) ;
+//        }
+//    }
+
+printk("13");
+
+    if ( HwDeviceExtension->jChipType >= XG40 )
+    {
+        /* Set AGP customize registers (in SetDefAGPRegs) Start */
+        for( i = 0x47 ; i <= 0x4C ; i++ )
+            XGINew_SetReg1( pVBInfo->P3d4 , i , pVBInfo->AGPReg[ i - 0x47 ] ) ;
+
+        for( i = 0x70 ; i <= 0x71 ; i++ )
+            XGINew_SetReg1( pVBInfo->P3d4 , i , pVBInfo->AGPReg[ 6 + i - 0x70 ] ) ;
+
+        for( i = 0x74 ; i <= 0x77 ; i++ )
+            XGINew_SetReg1( pVBInfo->P3d4 , i , pVBInfo->AGPReg[ 8 + i - 0x74 ] ) ;
+        /* Set AGP customize registers (in SetDefAGPRegs) End */
+        /*[Hsuan]2004/12/14 AGP Input Delay Adjustment on 850 */
+//        XGINew_SetReg4( 0xcf8 , 0x80000000 ) ;
+//        ChipsetID = XGINew_GetReg3( 0x0cfc ) ;
+//        if ( ChipsetID == 0x25308086 )
+//            XGINew_SetReg1( pVBInfo->P3d4 , 0x77 , 0xF0 ) ;
+
+        HwDeviceExtension->pQueryVGAConfigSpace( HwDeviceExtension , 0x50 , 0 , &Temp ) ;      /* Get */
+        Temp >>= 20 ;
+        Temp &= 0xF ;
+
+        if ( Temp == 1 )
+            XGINew_SetReg1( pVBInfo->P3d4 , 0x48 , 0x20 ) ;    /* CR48 */
+    }
+printk("14");
+
+    if ( HwDeviceExtension->jChipType < XG40 )
+        XGINew_SetReg1( pVBInfo->P3d4 , 0x49 , pVBInfo->CR49[ 0 ] ) ;
+    }  /* != XG20 */
+
+    /* Set PCI */
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x23 , *pVBInfo->pSR23 ) ;
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x24 , *pVBInfo->pSR24 ) ;
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x25 , pVBInfo->SR25[ 0 ] ) ;
+printk("15");
+
+    if ( HwDeviceExtension->jChipType < XG20 )         /* kuku 2004/06/25 */
+    {
+    /* Set VB */
+    XGI_UnLockCRT2( HwDeviceExtension, pVBInfo) ;
+    XGINew_SetRegANDOR( pVBInfo->Part0Port , 0x3F , 0xEF , 0x00 ) ;    /* alan, disable VideoCapture */
+    XGINew_SetReg1( pVBInfo->Part1Port , 0x00 , 0x00 ) ;
+    temp1 = ( UCHAR )XGINew_GetReg1( pVBInfo->P3d4 , 0x7B ) ;          /* chk if BCLK>=100MHz */
+    temp = ( UCHAR )( ( temp1 >> 4 ) & 0x0F ) ;
+
+
+        XGINew_SetReg1( pVBInfo->Part1Port , 0x02 , ( *pVBInfo->pCRT2Data_1_2 ) ) ;
+
+printk("16");
+
+    XGINew_SetReg1( pVBInfo->Part1Port , 0x2E , 0x08 ) ;       /* use VB */
+    } /* != XG20 */
+
+
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x27 , 0x1F ) ;
+
+    if ( ( HwDeviceExtension->jChipType == XG42 ) && XGINew_GetXG20DRAMType( HwDeviceExtension , pVBInfo) != 0 )       /* Not DDR */
+    {
+        XGINew_SetReg1( pVBInfo->P3c4 , 0x31 , ( *pVBInfo->pSR31 & 0x3F ) | 0x40 ) ;
+        XGINew_SetReg1( pVBInfo->P3c4 , 0x32 , ( *pVBInfo->pSR32 & 0xFC ) | 0x01 ) ;
+    }
+    else
+    {
+        XGINew_SetReg1( pVBInfo->P3c4 , 0x31 , *pVBInfo->pSR31 ) ;
+        XGINew_SetReg1( pVBInfo->P3c4 , 0x32 , *pVBInfo->pSR32 ) ;
+    }
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x33 , *pVBInfo->pSR33 ) ;
+printk("17");
+
+/*
+    if ( HwDeviceExtension->jChipType >= XG40 )
+      SetPowerConsume ( HwDeviceExtension , pVBInfo->P3c4);    */
+
+    if ( HwDeviceExtension->jChipType < XG20 )         /* kuku 2004/06/25 */
+    {
+    if ( XGI_BridgeIsOn( pVBInfo ) == 1 )
+    {
+        if ( pVBInfo->IF_DEF_LVDS == 0 )
+        {
+            XGINew_SetReg1( pVBInfo->Part2Port , 0x00 , 0x1C ) ;
+            XGINew_SetReg1( pVBInfo->Part4Port , 0x0D , *pVBInfo->pCRT2Data_4_D ) ;
+            XGINew_SetReg1( pVBInfo->Part4Port , 0x0E , *pVBInfo->pCRT2Data_4_E ) ;
+            XGINew_SetReg1( pVBInfo->Part4Port , 0x10 , *pVBInfo->pCRT2Data_4_10 ) ;
+            XGINew_SetReg1( pVBInfo->Part4Port , 0x0F , 0x3F ) ;
+        }
+
+        XGI_LockCRT2( HwDeviceExtension, pVBInfo ) ;
+    }
+    }  /* != XG20 */
+printk("18");
+
+    if ( HwDeviceExtension->jChipType < XG40 )
+        XGINew_SetReg1( pVBInfo->P3d4 , 0x83 , 0x00 ) ;
+printk("181");
+
+    if ( HwDeviceExtension->bSkipSense == FALSE )
+    {
+printk("182");
+
+        XGI_SenseCRT1(pVBInfo) ;
+
+printk("183");
+        /* XGINew_DetectMonitor( HwDeviceExtension ) ; */
+pVBInfo->IF_DEF_CH7007 = 0;
+        if ( ( HwDeviceExtension->jChipType == XG21 ) && (pVBInfo->IF_DEF_CH7007) )
+        {
+printk("184");
+           XGI_GetSenseStatus( HwDeviceExtension , pVBInfo ) ;         /* sense CRT2 */
+printk("185");
+
+        }
+        if ( HwDeviceExtension->jChipType == XG21 )
+        {
+printk("186");
+
+          XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x32 , ~Monitor1Sense , Monitor1Sense ) ;        /* Z9 default has CRT */
+                 temp = GetXG21FPBits( pVBInfo ) ;
+          XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x37 , ~0x01, temp ) ;
+printk("187");
+
+          }
+        if ( HwDeviceExtension->jChipType == XG27 )
+        {
+          XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x32 , ~Monitor1Sense , Monitor1Sense ) ;        /* Z9 default has CRT */
+                 temp = GetXG27FPBits( pVBInfo ) ;
+          XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x37 , ~0x03, temp ) ;
+        }
+    }
+printk("19");
+
+    if ( HwDeviceExtension->jChipType >= XG40 )
+    {
+        if ( HwDeviceExtension->jChipType >= XG40 )
+        {
+          XGINew_RAMType = ( int )XGINew_GetXG20DRAMType( HwDeviceExtension , pVBInfo ) ;
+         }
+
+        XGINew_SetDRAMDefaultRegister340( HwDeviceExtension ,  pVBInfo->P3d4,  pVBInfo ) ;
+
+        if ( HwDeviceExtension->bSkipDramSizing == TRUE )
+        {
+            pSR = HwDeviceExtension->pSR ;
+            if ( pSR!=NULL )
+            {
+                while( pSR->jIdx != 0xFF )
+                {
+                    XGINew_SetReg1( pVBInfo->P3c4 , pSR->jIdx , pSR->jVal ) ;
+                    pSR++ ;
+                }
+            }
+            /* XGINew_SetDRAMModeRegister340( pVBInfo ) ; */
+        }      /* SkipDramSizing */
+        else
+        {
+#if 0
+           if ( HwDeviceExtension->jChipType == XG20 )
+            {
+               XGINew_SetReg1( pVBInfo->P3c4 , 0x13 , pVBInfo->SR15[0][XGINew_RAMType] ) ;
+                XGINew_SetReg1( pVBInfo->P3c4 , 0x14 , pVBInfo->SR15[1][XGINew_RAMType] ) ;
+                XGINew_SetReg1( pVBInfo->P3c4 , 0x20 , 0x20 ) ;
+            }
+            else
+#endif
+{
+printk("20");
+
+               XGINew_SetDRAMSize_340( HwDeviceExtension , pVBInfo) ;
+}
+printk("21");
+
+        }
+    }          /* XG40 */
+
+printk("22");
+
+
+    /* SetDefExt2Regs begin */
+/*
+    AGP = 1 ;
+    temp =( UCHAR )XGINew_GetReg1( pVBInfo->P3c4 , 0x3A ) ;
+    temp &= 0x30 ;
+    if ( temp == 0x30 )
+        AGP = 0 ;
+
+    if ( AGP == 0 )
+        *pVBInfo->pSR21 &= 0xEF ;
+
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x21 , *pVBInfo->pSR21 ) ;
+    if ( AGP == 1 )
+        *pVBInfo->pSR22 &= 0x20 ;
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x22 , *pVBInfo->pSR22 ) ;
+*/
+
+//    base = 0x80000000 ;
+//    OutPortLong( 0xcf8 , base ) ;
+//    Temp = ( InPortLong( 0xcfc ) & 0xFFFF ) ;
+//    if ( Temp == 0x1039 )
+//    {
+        XGINew_SetReg1( pVBInfo->P3c4 , 0x22 , ( UCHAR )( ( *pVBInfo->pSR22 ) & 0xFE ) ) ;
+//    }
+//    else
+//    {
+//        XGINew_SetReg1( pVBInfo->P3c4 , 0x22 , *pVBInfo->pSR22 ) ;
+//    }
+
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x21 , *pVBInfo->pSR21 ) ;
+
+printk("23");
+
+
+    XGINew_ChkSenseStatus ( HwDeviceExtension , pVBInfo ) ;
+    XGINew_SetModeScratch ( HwDeviceExtension , pVBInfo ) ;
+
+printk("24");
+
+
+XGINew_SetReg1( pVBInfo->P3d4 , 0x8c , 0x87);
+XGINew_SetReg1( pVBInfo->P3c4 , 0x14 , 0x31);
+printk("25");
+
+    return( TRUE ) ;
+} /* end of init */
+
+
+
+
+
+/* ============== alan ====================== */
+
+/* --------------------------------------------------------------------- */
+/* Function : XGINew_GetXG20DRAMType */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+UCHAR XGINew_GetXG20DRAMType( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_INFO pVBInfo)
+{
+    UCHAR data, temp ;
+
+    if ( HwDeviceExtension->jChipType < XG20 )
+    {
+        if ( *pVBInfo->pSoftSetting & SoftDRAMType )
+        {
+            data = *pVBInfo->pSoftSetting & 0x07 ;
+            return( data ) ;
+        }
+        else
+        {
+            data = XGINew_GetReg1( pVBInfo->P3c4 , 0x39 ) & 0x02 ;
+
+            if ( data == 0 )
+                data = ( XGINew_GetReg1( pVBInfo->P3c4 , 0x3A ) & 0x02 ) >> 1 ;
+
+            return( data ) ;
+        }
+    }
+    else if ( HwDeviceExtension->jChipType == XG27 )
+    {
+        if ( *pVBInfo->pSoftSetting & SoftDRAMType )
+        {
+            data = *pVBInfo->pSoftSetting & 0x07 ;
+            return( data ) ;
+        }
+        temp = XGINew_GetReg1( pVBInfo->P3c4 , 0x3B ) ;
+
+       if (( temp & 0x88 )==0x80)              /* SR3B[7][3]MAA15 MAA11 (Power on Trapping) */
+                 data = 0 ;                                    /*DDR*/
+        else
+                 data = 1 ;                                    /*DDRII*/
+               return( data ) ;
+    }
+    else if ( HwDeviceExtension->jChipType == XG21 )
+    {
+        XGINew_SetRegAND( pVBInfo->P3d4 , 0xB4 , ~0x02 ) ;                     /* Independent GPIO control */
+       DelayUS(800);
+        XGINew_SetRegOR( pVBInfo->P3d4 , 0x4A , 0x80 ) ;               /* Enable GPIOH read */
+        temp = XGINew_GetReg1( pVBInfo->P3d4 , 0x48 ) ;                /* GPIOF 0:DVI 1:DVO */
+// HOTPLUG_SUPPORT
+// for current XG20 & XG21, GPIOH is floating, driver will fix DDR temporarily
+       if ( temp & 0x01 )                                              /* DVI read GPIOH */
+                 data = 1 ;                                                    /*DDRII*/
+        else
+                 data = 0 ;                                                    /*DDR*/
+//~HOTPLUG_SUPPORT
+               XGINew_SetRegOR( pVBInfo->P3d4 , 0xB4 , 0x02 ) ;
+               return( data ) ;
+    }
+    else
+    {
+       data = XGINew_GetReg1( pVBInfo->P3d4 , 0x97 ) & 0x01 ;
+
+       if ( data == 1 )
+            data ++ ;
+
+       return( data );
+    }
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGINew_Get310DRAMType */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+UCHAR XGINew_Get310DRAMType(PVB_DEVICE_INFO pVBInfo)
+{
+    UCHAR data ;
+
+  /* index = XGINew_GetReg1( pVBInfo->P3c4 , 0x1A ) ; */
+  /* index &= 07 ; */
+
+    if ( *pVBInfo->pSoftSetting & SoftDRAMType )
+        data = *pVBInfo->pSoftSetting & 0x03 ;
+    else
+        data = XGINew_GetReg1( pVBInfo->P3c4 , 0x3a ) & 0x03 ;
+
+    return( data ) ;
+}
+
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGINew_Delay15us */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+/*
+void XGINew_Delay15us(ULONG ulMicrsoSec)
+{
+}
+*/
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGINew_SDR_MRS */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGINew_SDR_MRS(  PVB_DEVICE_INFO pVBInfo )
+{
+    USHORT data ;
+
+    data = XGINew_GetReg1( pVBInfo->P3c4 , 0x16 ) ;
+    data &= 0x3F ;          /* SR16 D7=0,D6=0 */
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x16 , data ) ;   /* enable mode register set(MRS) low */
+    /* XGINew_Delay15us( 0x100 ) ; */
+    data |= 0x80 ;          /* SR16 D7=1,D6=0 */
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x16 , data ) ;   /* enable mode register set(MRS) high */
+    /* XGINew_Delay15us( 0x100 ) ; */
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGINew_DDR1x_MRS_340 */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGINew_DDR1x_MRS_340( ULONG P3c4 , PVB_DEVICE_INFO pVBInfo)
+{
+    XGINew_SetReg1( P3c4 , 0x18 , 0x01 ) ;
+    XGINew_SetReg1( P3c4 , 0x19 , 0x20 ) ;
+    XGINew_SetReg1( P3c4 , 0x16 , 0x00 ) ;
+    XGINew_SetReg1( P3c4 , 0x16 , 0x80 ) ;
+
+    if ( *pVBInfo->pXGINew_DRAMTypeDefinition != 0x0C )        /* Samsung F Die */
+    {
+        DelayUS( 3000 ) ;      /* Delay 67 x 3 Delay15us */
+        XGINew_SetReg1( P3c4 , 0x18 , 0x00 ) ;
+        XGINew_SetReg1( P3c4 , 0x19 , 0x20 ) ;
+        XGINew_SetReg1( P3c4 , 0x16 , 0x00 ) ;
+        XGINew_SetReg1( P3c4 , 0x16 , 0x80 ) ;
+    }
+
+    DelayUS( 60 ) ;
+    XGINew_SetReg1( P3c4 , 0x18 , pVBInfo->SR15[ 2 ][ XGINew_RAMType ] ) ;     /* SR18 */
+    XGINew_SetReg1( P3c4 , 0x19 , 0x01 ) ;
+    XGINew_SetReg1( P3c4 , 0x16 , pVBInfo->SR16[ 0 ] ) ;
+    XGINew_SetReg1( P3c4 , 0x16 , pVBInfo->SR16[ 1 ] ) ;
+    DelayUS( 1000 ) ;
+    XGINew_SetReg1( P3c4 , 0x1B , 0x03 ) ;
+    DelayUS( 500 ) ;
+    XGINew_SetReg1( P3c4 , 0x18 , pVBInfo->SR15[ 2 ][ XGINew_RAMType ] ) ;     /* SR18 */
+    XGINew_SetReg1( P3c4 , 0x19 , 0x00 ) ;
+    XGINew_SetReg1( P3c4 , 0x16 , pVBInfo->SR16[ 2 ] ) ;
+    XGINew_SetReg1( P3c4 , 0x16 , pVBInfo->SR16[ 3 ] ) ;
+    XGINew_SetReg1( P3c4 , 0x1B , 0x00 ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGINew_DDR2x_MRS_340 */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGINew_DDR2x_MRS_340( ULONG P3c4 , PVB_DEVICE_INFO pVBInfo)
+{
+    XGINew_SetReg1( P3c4 , 0x18 , 0x00 ) ;
+    XGINew_SetReg1( P3c4 , 0x19 , 0x20 ) ;
+    XGINew_SetReg1( P3c4 , 0x16 , 0x00 ) ;
+    XGINew_SetReg1( P3c4 , 0x16 , 0x80 ) ;
+    DelayUS( 60 ) ;
+    XGINew_SetReg1( P3c4 , 0x18 , pVBInfo->SR15[ 2 ][ XGINew_RAMType ] ) ;     /* SR18 */
+    /* XGINew_SetReg1( P3c4 , 0x18 , 0x31 ) ; */
+    XGINew_SetReg1( P3c4 , 0x19 , 0x01 ) ;
+    XGINew_SetReg1( P3c4 , 0x16 , 0x05 ) ;
+    XGINew_SetReg1( P3c4 , 0x16 , 0x85 ) ;
+    DelayUS( 1000 ) ;
+    XGINew_SetReg1( P3c4 , 0x1B , 0x03 ) ;
+    DelayUS( 500 ) ;
+    /* XGINew_SetReg1( P3c4 , 0x18 , 0x31 ) ; */
+    XGINew_SetReg1( P3c4 , 0x18 , pVBInfo->SR15[ 2 ][ XGINew_RAMType ] ) ;     /* SR18 */
+    XGINew_SetReg1( P3c4 , 0x19 , 0x00 ) ;
+    XGINew_SetReg1( P3c4 , 0x16 , 0x05 ) ;
+    XGINew_SetReg1( P3c4 , 0x16 , 0x85 ) ;
+    XGINew_SetReg1( P3c4 , 0x1B , 0x00 ) ;
+}
+
+/* --------------------------------------------------------------------- */
+/* Function : XGINew_DDRII_Bootup_XG27 */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGINew_DDRII_Bootup_XG27( PXGI_HW_DEVICE_INFO HwDeviceExtension ,  ULONG P3c4 , PVB_DEVICE_INFO pVBInfo)
+{
+    ULONG P3d4 = P3c4 + 0x10 ;
+    XGINew_RAMType = ( int )XGINew_GetXG20DRAMType( HwDeviceExtension , pVBInfo ) ;
+    XGINew_SetMemoryClock( HwDeviceExtension , pVBInfo ) ;
+
+   /* Set Double Frequency */
+    /* XGINew_SetReg1( P3d4 , 0x97 , 0x11 ) ; */               /* CR97 */
+    XGINew_SetReg1( P3d4 , 0x97 , *pVBInfo->pXGINew_CR97 ) ;    /* CR97 */
+
+    DelayUS( 200 ) ;
+
+    XGINew_SetReg1( P3c4 , 0x18 , 0x00 ) ;   /* Set SR18 */ //EMRS2
+    XGINew_SetReg1( P3c4 , 0x19 , 0x80 ) ;   /* Set SR19 */
+    XGINew_SetReg1( P3c4 , 0x16 , 0x20 ) ;   /* Set SR16 */
+    DelayUS( 15 ) ;
+    XGINew_SetReg1( P3c4 , 0x16 , 0xA0 ) ;   /* Set SR16 */
+    DelayUS( 15 ) ;
+
+    XGINew_SetReg1( P3c4 , 0x18 , 0x00 ) ;   /* Set SR18 */ //EMRS3
+    XGINew_SetReg1( P3c4 , 0x19 , 0xC0 ) ;   /* Set SR19 */
+    XGINew_SetReg1( P3c4 , 0x16 , 0x20 ) ;   /* Set SR16 */
+    DelayUS( 15 ) ;
+    XGINew_SetReg1( P3c4 , 0x16 , 0xA0 ) ;   /* Set SR16 */
+    DelayUS( 15) ;
+
+    XGINew_SetReg1( P3c4 , 0x18 , 0x00 ) ;   /* Set SR18 */ //EMRS1
+    XGINew_SetReg1( P3c4 , 0x19 , 0x40 ) ;   /* Set SR19 */
+    XGINew_SetReg1( P3c4 , 0x16 , 0x20 ) ;   /* Set SR16 */
+    DelayUS( 30 ) ;
+    XGINew_SetReg1( P3c4 , 0x16 , 0xA0 ) ;   /* Set SR16 */
+    DelayUS( 15 ) ;
+
+    XGINew_SetReg1( P3c4 , 0x18 , 0x42 ) ;   /* Set SR18 */ //MRS, DLL Enable
+    XGINew_SetReg1( P3c4 , 0x19 , 0x0A ) ;   /* Set SR19 */
+    XGINew_SetReg1( P3c4 , 0x16 , 0x00 ) ;   /* Set SR16 */
+    DelayUS( 30 ) ;
+    XGINew_SetReg1( P3c4 , 0x16 , 0x00 ) ;   /* Set SR16 */
+    XGINew_SetReg1( P3c4 , 0x16 , 0x80 ) ;   /* Set SR16 */
+    /* DelayUS( 15 ) ; */
+
+    XGINew_SetReg1( P3c4 , 0x1B , 0x04 ) ;   /* Set SR1B */
+    DelayUS( 60 ) ;
+    XGINew_SetReg1( P3c4 , 0x1B , 0x00 ) ;   /* Set SR1B */
+
+    XGINew_SetReg1( P3c4 , 0x18 , 0x42 ) ;   /* Set SR18 */ //MRS, DLL Reset
+    XGINew_SetReg1( P3c4 , 0x19 , 0x08 ) ;   /* Set SR19 */
+    XGINew_SetReg1( P3c4 , 0x16 , 0x00 ) ;   /* Set SR16 */
+
+    DelayUS( 30 ) ;
+    XGINew_SetReg1( P3c4 , 0x16 , 0x83 ) ;   /* Set SR16 */
+    DelayUS( 15 ) ;
+
+    XGINew_SetReg1( P3c4 , 0x18 , 0x80 ) ;   /* Set SR18 */ //MRS, ODT
+    XGINew_SetReg1( P3c4 , 0x19 , 0x46 ) ;   /* Set SR19 */
+    XGINew_SetReg1( P3c4 , 0x16 , 0x20 ) ;   /* Set SR16 */
+    DelayUS( 30 ) ;
+    XGINew_SetReg1( P3c4 , 0x16 , 0xA0 ) ;   /* Set SR16 */
+    DelayUS( 15 ) ;
+
+    XGINew_SetReg1( P3c4 , 0x18 , 0x00 ) ;   /* Set SR18 */ //EMRS
+    XGINew_SetReg1( P3c4 , 0x19 , 0x40 ) ;   /* Set SR19 */
+    XGINew_SetReg1( P3c4 , 0x16 , 0x20 ) ;   /* Set SR16 */
+    DelayUS( 30 ) ;
+    XGINew_SetReg1( P3c4 , 0x16 , 0xA0 ) ;   /* Set SR16 */
+    DelayUS( 15 ) ;
+
+    XGINew_SetReg1( P3c4 , 0x1B , 0x04 ) ;   /* Set SR1B refresh control 000:close; 010:open */
+    DelayUS( 200 ) ;
+
+
+}
+/* --------------------------------------------------------------------- */
+/* Function : XGINew_DDR2_MRS_XG20 */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGINew_DDR2_MRS_XG20( PXGI_HW_DEVICE_INFO HwDeviceExtension ,  ULONG P3c4 , PVB_DEVICE_INFO pVBInfo)
+{
+    ULONG P3d4 = P3c4 + 0x10 ;
+
+    XGINew_RAMType = ( int )XGINew_GetXG20DRAMType( HwDeviceExtension , pVBInfo ) ;
+    XGINew_SetMemoryClock( HwDeviceExtension , pVBInfo ) ;
+
+    XGINew_SetReg1( P3d4 , 0x97 , 0x11 ) ;                     /* CR97 */
+
+    DelayUS( 200 ) ;
+    XGINew_SetReg1( P3c4 , 0x18 , 0x00 ) ;                     /* EMRS2 */
+    XGINew_SetReg1( P3c4 , 0x19 , 0x80 ) ;
+    XGINew_SetReg1( P3c4 , 0x16 , 0x05 ) ;
+    XGINew_SetReg1( P3c4 , 0x16 , 0x85 ) ;
+
+    XGINew_SetReg1( P3c4 , 0x18 , 0x00 ) ;                     /* EMRS3 */
+    XGINew_SetReg1( P3c4 , 0x19 , 0xC0 ) ;
+    XGINew_SetReg1( P3c4 , 0x16 , 0x05 ) ;
+    XGINew_SetReg1( P3c4 , 0x16 , 0x85 ) ;
+
+    XGINew_SetReg1( P3c4 , 0x18 , 0x00 ) ;                     /* EMRS1 */
+    XGINew_SetReg1( P3c4 , 0x19 , 0x40 ) ;
+    XGINew_SetReg1( P3c4 , 0x16 , 0x05 ) ;
+    XGINew_SetReg1( P3c4 , 0x16 , 0x85 ) ;
+
+   // XGINew_SetReg1( P3c4 , 0x18 , 0x52 ) ;                   /* MRS1 */
+    XGINew_SetReg1( P3c4 , 0x18 , 0x42 ) ;                     /* MRS1 */
+    XGINew_SetReg1( P3c4 , 0x19 , 0x02 ) ;
+    XGINew_SetReg1( P3c4 , 0x16 , 0x05 ) ;
+    XGINew_SetReg1( P3c4 , 0x16 , 0x85 ) ;
+
+    DelayUS( 15 ) ;
+    XGINew_SetReg1( P3c4 , 0x1B , 0x04 ) ;                     /* SR1B */
+    DelayUS( 30 ) ;
+    XGINew_SetReg1( P3c4 , 0x1B , 0x00 ) ;                     /* SR1B */
+    DelayUS( 100 ) ;
+
+    //XGINew_SetReg1( P3c4 , 0x18 , 0x52 ) ;                   /* MRS2 */
+    XGINew_SetReg1( P3c4 , 0x18 , 0x42 ) ;                     /* MRS1 */
+    XGINew_SetReg1( P3c4 , 0x19 , 0x00 ) ;
+    XGINew_SetReg1( P3c4 , 0x16 , 0x05 ) ;
+    XGINew_SetReg1( P3c4 , 0x16 , 0x85 ) ;
+
+    DelayUS( 200 ) ;
+}
+
+/* --------------------------------------------------------------------- */
+/* Function : XGINew_DDR2_MRS_XG20 */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGINew_DDR2_MRS_XG27( PXGI_HW_DEVICE_INFO HwDeviceExtension ,  ULONG P3c4 , PVB_DEVICE_INFO pVBInfo)
+{
+    ULONG P3d4 = P3c4 + 0x10 ;
+
+     XGINew_RAMType = ( int )XGINew_GetXG20DRAMType( HwDeviceExtension , pVBInfo ) ;
+     XGINew_SetMemoryClock( HwDeviceExtension , pVBInfo ) ;
+
+    XGINew_SetReg1( P3d4 , 0x97 , 0x11 ) ;                     /* CR97 */
+    DelayUS( 200 ) ;
+    XGINew_SetReg1( P3c4 , 0x18 , 0x00 ) ;                     /* EMRS2 */
+    XGINew_SetReg1( P3c4 , 0x19 , 0x80 ) ;
+
+    XGINew_SetReg1( P3c4 , 0x16 , 0x10 ) ;
+    DelayUS( 15 ) ;                          ////06/11/23 XG27 A0 for CKE enable
+    XGINew_SetReg1( P3c4 , 0x16 , 0x90 ) ;
+
+    XGINew_SetReg1( P3c4 , 0x18 , 0x00 ) ;                     /* EMRS3 */
+    XGINew_SetReg1( P3c4 , 0x19 , 0xC0 ) ;
+
+    XGINew_SetReg1( P3c4 , 0x16 , 0x00 ) ;
+    DelayUS( 15 ) ;                          ////06/11/22 XG27 A0
+    XGINew_SetReg1( P3c4 , 0x16 , 0x80 ) ;
+
+
+    XGINew_SetReg1( P3c4 , 0x18 , 0x00 ) ;                     /* EMRS1 */
+    XGINew_SetReg1( P3c4 , 0x19 , 0x40 ) ;
+
+    XGINew_SetReg1( P3c4 , 0x16 , 0x00 ) ;
+    DelayUS( 15 ) ;                          ////06/11/22 XG27 A0
+    XGINew_SetReg1( P3c4 , 0x16 , 0x80 ) ;
+
+    XGINew_SetReg1( P3c4 , 0x18 , 0x42 ) ;                     /* MRS1 */
+    XGINew_SetReg1( P3c4 , 0x19 , 0x06 ) ;   ////[Billy]06/11/22 DLL Reset for XG27 Hynix DRAM
+
+    XGINew_SetReg1( P3c4 , 0x16 , 0x00 ) ;
+    DelayUS( 15 ) ;                          ////06/11/23 XG27 A0
+    XGINew_SetReg1( P3c4 , 0x16 , 0x80 ) ;
+
+    DelayUS( 30 ) ;                          ////06/11/23 XG27 A0 Start Auto-PreCharge
+    XGINew_SetReg1( P3c4 , 0x1B , 0x04 ) ;                     /* SR1B */
+    DelayUS( 60 ) ;
+    XGINew_SetReg1( P3c4 , 0x1B , 0x00 ) ;                     /* SR1B */
+
+
+    XGINew_SetReg1( P3c4 , 0x18 , 0x42 ) ;                     /* MRS1 */
+    XGINew_SetReg1( P3c4 , 0x19 , 0x04 ) ;   //// DLL without Reset for XG27 Hynix DRAM
+
+    XGINew_SetReg1( P3c4 , 0x16 , 0x00 ) ;
+    DelayUS( 30 ) ;
+    XGINew_SetReg1( P3c4 , 0x16 , 0x80 ) ;
+
+    XGINew_SetReg1( P3c4 , 0x18 , 0x80 );     ////XG27 OCD ON
+    XGINew_SetReg1( P3c4 , 0x19 , 0x46 );
+
+    XGINew_SetReg1( P3c4 , 0x16 , 0x00 ) ;
+    DelayUS( 30 ) ;
+    XGINew_SetReg1( P3c4 , 0x16 , 0x80 ) ;
+
+    XGINew_SetReg1( P3c4 , 0x18 , 0x00 );
+    XGINew_SetReg1( P3c4 , 0x19 , 0x40 );
+
+    XGINew_SetReg1( P3c4 , 0x16 , 0x00 ) ;
+    DelayUS( 30 ) ;
+    XGINew_SetReg1( P3c4 , 0x16 , 0x80 ) ;
+
+    DelayUS( 15 ) ;                         ////Start Auto-PreCharge
+    XGINew_SetReg1( P3c4 , 0x1B , 0x04 ) ;                     /* SR1B */
+    DelayUS( 200 ) ;
+    XGINew_SetReg1( P3c4 , 0x1B , 0x03 ) ;                     /* SR1B */
+
+}
+
+/* --------------------------------------------------------------------- */
+/* Function : XGINew_DDR1x_DefaultRegister */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGINew_DDR1x_DefaultRegister( PXGI_HW_DEVICE_INFO HwDeviceExtension ,  ULONG Port , PVB_DEVICE_INFO pVBInfo)
+{
+    ULONG P3d4 = Port ,
+           P3c4 = Port - 0x10 ;
+
+    if ( HwDeviceExtension->jChipType >= XG20 )
+    {
+        XGINew_SetMemoryClock( HwDeviceExtension , pVBInfo ) ;
+        XGINew_SetReg1( P3d4 , 0x82 , pVBInfo->CR40[ 11 ][ XGINew_RAMType ] ) ;        /* CR82 */
+        XGINew_SetReg1( P3d4 , 0x85 , pVBInfo->CR40[ 12 ][ XGINew_RAMType ] ) ;        /* CR85 */
+        XGINew_SetReg1( P3d4 , 0x86 , pVBInfo->CR40[ 13 ][ XGINew_RAMType ] ) ;        /* CR86 */
+
+        XGINew_SetReg1( P3d4 , 0x98 , 0x01 ) ;
+        XGINew_SetReg1( P3d4 , 0x9A , 0x02 ) ;
+
+        XGINew_DDR1x_MRS_XG20( P3c4 , pVBInfo) ;
+    }
+    else
+    {
+        XGINew_SetMemoryClock( HwDeviceExtension , pVBInfo ) ;
+
+        switch( HwDeviceExtension->jChipType )
+        {
+            case XG41:
+            case XG42:
+                XGINew_SetReg1( P3d4 , 0x82 , pVBInfo->CR40[ 11 ][ XGINew_RAMType ] ) ;        /* CR82 */
+                XGINew_SetReg1( P3d4 , 0x85 , pVBInfo->CR40[ 12 ][ XGINew_RAMType ] ) ;        /* CR85 */
+                XGINew_SetReg1( P3d4 , 0x86 , pVBInfo->CR40[ 13 ][ XGINew_RAMType ] ) ;        /* CR86 */
+                break ;
+            default:
+                XGINew_SetReg1( P3d4 , 0x82 , 0x88 ) ;
+                XGINew_SetReg1( P3d4 , 0x86 , 0x00 ) ;
+                XGINew_GetReg1( P3d4 , 0x86 ) ;                                /* Insert read command for delay */
+                XGINew_SetReg1( P3d4 , 0x86 , 0x88 ) ;
+                XGINew_GetReg1( P3d4 , 0x86 ) ;
+                XGINew_SetReg1( P3d4 , 0x86 , pVBInfo->CR40[ 13 ][ XGINew_RAMType ] ) ;
+                XGINew_SetReg1( P3d4 , 0x82 , 0x77 ) ;
+                XGINew_SetReg1( P3d4 , 0x85 , 0x00 ) ;
+                XGINew_GetReg1( P3d4 , 0x85 ) ;                                /* Insert read command for delay */
+                XGINew_SetReg1( P3d4 , 0x85 , 0x88 ) ;
+                XGINew_GetReg1( P3d4 , 0x85 ) ;                                /* Insert read command for delay */
+                XGINew_SetReg1( P3d4 , 0x85 , pVBInfo->CR40[ 12 ][ XGINew_RAMType ] ) ;        /* CR85 */
+                XGINew_SetReg1( P3d4 , 0x82 , pVBInfo->CR40[ 11 ][ XGINew_RAMType ] ) ;        /* CR82 */
+                break ;
+        }
+
+        XGINew_SetReg1( P3d4 , 0x97 , 0x00 ) ;
+        XGINew_SetReg1( P3d4 , 0x98 , 0x01 ) ;
+        XGINew_SetReg1( P3d4 , 0x9A , 0x02 ) ;
+        XGINew_DDR1x_MRS_340( P3c4 , pVBInfo ) ;
+    }
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGINew_DDR2x_DefaultRegister */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGINew_DDR2x_DefaultRegister( PXGI_HW_DEVICE_INFO HwDeviceExtension ,  ULONG Port ,PVB_DEVICE_INFO pVBInfo)
+{
+    ULONG P3d4 = Port ,
+           P3c4 = Port - 0x10 ;
+
+    XGINew_SetMemoryClock( HwDeviceExtension , pVBInfo ) ;
+
+    /* 20040906 Hsuan modify CR82, CR85, CR86 for XG42 */
+    switch( HwDeviceExtension->jChipType )
+    {
+       case XG41:
+       case XG42:
+            XGINew_SetReg1( P3d4 , 0x82 , pVBInfo->CR40[ 11 ][ XGINew_RAMType ] ) ;    /* CR82 */
+            XGINew_SetReg1( P3d4 , 0x85 , pVBInfo->CR40[ 12 ][ XGINew_RAMType ] ) ;    /* CR85 */
+            XGINew_SetReg1( P3d4 , 0x86 , pVBInfo->CR40[ 13 ][ XGINew_RAMType ] ) ;    /* CR86 */
+            break ;
+       default:
+         /* keep following setting sequence, each setting in the same reg insert idle */
+         XGINew_SetReg1( P3d4 , 0x82 , 0x88 ) ;
+        XGINew_SetReg1( P3d4 , 0x86 , 0x00 ) ;
+        XGINew_GetReg1( P3d4 , 0x86 ) ;                                /* Insert read command for delay */
+        XGINew_SetReg1( P3d4 , 0x86 , 0x88 ) ;
+        XGINew_SetReg1( P3d4 , 0x82 , 0x77 ) ;
+        XGINew_SetReg1( P3d4 , 0x85 , 0x00 ) ;
+        XGINew_GetReg1( P3d4 , 0x85 ) ;                                /* Insert read command for delay */
+        XGINew_SetReg1( P3d4 , 0x85 , 0x88 ) ;
+        XGINew_GetReg1( P3d4 , 0x85 ) ;                                /* Insert read command for delay */
+        XGINew_SetReg1( P3d4 , 0x85 , pVBInfo->CR40[ 12 ][ XGINew_RAMType ] ) ;        /* CR85 */
+        XGINew_SetReg1( P3d4 , 0x82 , pVBInfo->CR40[ 11 ][ XGINew_RAMType ] ) ;        /* CR82 */
+    }
+    XGINew_SetReg1( P3d4 , 0x97 , 0x11 ) ;
+    if ( HwDeviceExtension->jChipType == XG42 )
+    {
+      XGINew_SetReg1( P3d4 , 0x98 , 0x01 ) ;
+    }
+    else
+    {
+      XGINew_SetReg1( P3d4 , 0x98 , 0x03 ) ;
+    }
+    XGINew_SetReg1( P3d4 , 0x9A , 0x02 ) ;
+
+    XGINew_DDR2x_MRS_340( P3c4 , pVBInfo ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGINew_DDR2_DefaultRegister */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGINew_DDR2_DefaultRegister( PXGI_HW_DEVICE_INFO HwDeviceExtension, ULONG Port , PVB_DEVICE_INFO pVBInfo)
+{
+    ULONG P3d4 = Port ,
+           P3c4 = Port - 0x10 ;
+
+    /* keep following setting sequence, each setting in the same reg insert idle */
+    XGINew_SetReg1( P3d4 , 0x82 , 0x77 ) ;
+    XGINew_SetReg1( P3d4 , 0x86 , 0x00 ) ;
+    XGINew_GetReg1( P3d4 , 0x86 ) ;                            /* Insert read command for delay */
+    XGINew_SetReg1( P3d4 , 0x86 , 0x88 ) ;
+    XGINew_GetReg1( P3d4 , 0x86 ) ;                            /* Insert read command for delay */
+    XGINew_SetReg1( P3d4 , 0x86 , pVBInfo->CR40[ 13 ][ XGINew_RAMType ] ) ;    /* CR86 */
+    XGINew_SetReg1( P3d4 , 0x82 , 0x77 ) ;
+    XGINew_SetReg1( P3d4 , 0x85 , 0x00 ) ;
+    XGINew_GetReg1( P3d4 , 0x85 ) ;                            /* Insert read command for delay */
+    XGINew_SetReg1( P3d4 , 0x85 , 0x88 ) ;
+    XGINew_GetReg1( P3d4 , 0x85 ) ;                            /* Insert read command for delay */
+    XGINew_SetReg1( P3d4 , 0x85 , pVBInfo->CR40[ 12 ][ XGINew_RAMType ] ) ;    /* CR85 */
+    if ( HwDeviceExtension->jChipType == XG27 )
+      XGINew_SetReg1( P3d4 , 0x82 , pVBInfo->CR40[ 11 ][ XGINew_RAMType ] ) ;  /* CR82 */
+    else
+    XGINew_SetReg1( P3d4 , 0x82 , 0xA8 ) ;     /* CR82 */
+
+    XGINew_SetReg1( P3d4 , 0x98 , 0x01 ) ;
+    XGINew_SetReg1( P3d4 , 0x9A , 0x02 ) ;
+    if ( HwDeviceExtension->jChipType == XG27 )
+       XGINew_DDRII_Bootup_XG27( HwDeviceExtension ,  P3c4 , pVBInfo) ;
+    else
+    XGINew_DDR2_MRS_XG20( HwDeviceExtension , P3c4, pVBInfo ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGINew_SetDRAMDefaultRegister340 */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGINew_SetDRAMDefaultRegister340( PXGI_HW_DEVICE_INFO HwDeviceExtension ,  ULONG Port , PVB_DEVICE_INFO pVBInfo)
+{
+    UCHAR temp , temp1 , temp2 , temp3 ,
+          i , j , k ;
+
+    ULONG P3d4 = Port ,
+           P3c4 = Port - 0x10 ;
+
+    XGINew_SetReg1( P3d4 , 0x6D , pVBInfo->CR40[ 8 ][ XGINew_RAMType ] ) ;
+    XGINew_SetReg1( P3d4 , 0x68 , pVBInfo->CR40[ 5 ][ XGINew_RAMType ] ) ;
+    XGINew_SetReg1( P3d4 , 0x69 , pVBInfo->CR40[ 6 ][ XGINew_RAMType ] ) ;
+    XGINew_SetReg1( P3d4 , 0x6A , pVBInfo->CR40[ 7 ][ XGINew_RAMType ] ) ;
+
+    temp2 = 0 ;
+    for( i = 0 ; i < 4 ; i++ )
+    {
+        temp = pVBInfo->CR6B[ XGINew_RAMType ][ i ] ;                  /* CR6B DQS fine tune delay */
+        for( j = 0 ; j < 4 ; j++ )
+        {
+            temp1 = ( ( temp >> ( 2 * j ) ) & 0x03 ) << 2 ;
+            temp2 |= temp1 ;
+            XGINew_SetReg1( P3d4 , 0x6B , temp2 ) ;
+            XGINew_GetReg1( P3d4 , 0x6B ) ;                            /* Insert read command for delay */
+            temp2 &= 0xF0 ;
+            temp2 += 0x10 ;
+        }
+    }
+
+    temp2 = 0 ;
+    for( i = 0 ; i < 4 ; i++ )
+    {
+        temp = pVBInfo->CR6E[ XGINew_RAMType ][ i ] ;                  /* CR6E DQM fine tune delay */
+        for( j = 0 ; j < 4 ; j++ )
+        {
+            temp1 = ( ( temp >> ( 2 * j ) ) & 0x03 ) << 2 ;
+            temp2 |= temp1 ;
+            XGINew_SetReg1( P3d4 , 0x6E , temp2 ) ;
+            XGINew_GetReg1( P3d4 , 0x6E ) ;                            /* Insert read command for delay */
+            temp2 &= 0xF0 ;
+            temp2 += 0x10 ;
+        }
+    }
+
+    temp3 = 0 ;
+    for( k = 0 ; k < 4 ; k++ )
+    {
+        XGINew_SetRegANDOR( P3d4 , 0x6E , 0xFC , temp3 ) ;             /* CR6E_D[1:0] select channel */
+        temp2 = 0 ;
+        for( i = 0 ; i < 8 ; i++ )
+        {
+            temp = pVBInfo->CR6F[ XGINew_RAMType ][ 8 * k + i ] ;      /* CR6F DQ fine tune delay */
+            for( j = 0 ; j < 4 ; j++ )
+            {
+                temp1 = ( temp >> ( 2 * j ) ) & 0x03 ;
+                temp2 |= temp1 ;
+                XGINew_SetReg1( P3d4 , 0x6F , temp2 ) ;
+                XGINew_GetReg1( P3d4 , 0x6F ) ;                                /* Insert read command for delay */
+                temp2 &= 0xF8 ;
+                temp2 += 0x08 ;
+            }
+        }
+        temp3 += 0x01 ;
+    }
+
+    XGINew_SetReg1( P3d4 , 0x80 , pVBInfo->CR40[ 9 ][ XGINew_RAMType ] ) ;     /* CR80 */
+    XGINew_SetReg1( P3d4 , 0x81 , pVBInfo->CR40[ 10 ][ XGINew_RAMType ] ) ;    /* CR81 */
+
+    temp2 = 0x80 ;
+    temp = pVBInfo->CR89[ XGINew_RAMType ][ 0 ] ;                      /* CR89 terminator type select */
+    for( j = 0 ; j < 4 ; j++ )
+    {
+        temp1 = ( temp >> ( 2 * j ) ) & 0x03 ;
+        temp2 |= temp1 ;
+        XGINew_SetReg1( P3d4 , 0x89 , temp2 ) ;
+        XGINew_GetReg1( P3d4 , 0x89 ) ;                                /* Insert read command for delay */
+        temp2 &= 0xF0 ;
+        temp2 += 0x10 ;
+    }
+
+    temp = pVBInfo->CR89[ XGINew_RAMType ][ 1 ] ;
+    temp1 = temp & 0x03 ;
+    temp2 |= temp1 ;
+    XGINew_SetReg1( P3d4 , 0x89 , temp2 ) ;
+
+    temp = pVBInfo->CR40[ 3 ][ XGINew_RAMType ] ;
+    temp1 = temp & 0x0F ;
+    temp2 = ( temp >> 4 ) & 0x07 ;
+    temp3 = temp & 0x80 ;
+    XGINew_SetReg1( P3d4 , 0x45 , temp1 ) ;    /* CR45 */
+    XGINew_SetReg1( P3d4 , 0x99 , temp2 ) ;    /* CR99 */
+    XGINew_SetRegOR( P3d4 , 0x40 , temp3 ) ;   /* CR40_D[7] */
+    XGINew_SetReg1( P3d4 , 0x41 , pVBInfo->CR40[ 0 ][ XGINew_RAMType ] ) ;     /* CR41 */
+
+    if ( HwDeviceExtension->jChipType == XG27 )
+      XGINew_SetReg1( P3d4 , 0x8F , *pVBInfo->pCR8F ) ;        /* CR8F */
+
+    for( j = 0 ; j <= 6 ; j++ )
+        XGINew_SetReg1( P3d4 , ( 0x90 + j ) , pVBInfo->CR40[ 14 + j ][ XGINew_RAMType ] ) ;    /* CR90 - CR96 */
+
+    for( j = 0 ; j <= 2 ; j++ )
+        XGINew_SetReg1( P3d4 , ( 0xC3 + j ) , pVBInfo->CR40[ 21 + j ][ XGINew_RAMType ] ) ;    /* CRC3 - CRC5 */
+
+    for( j = 0 ; j < 2 ; j++ )
+        XGINew_SetReg1( P3d4 , ( 0x8A + j ) , pVBInfo->CR40[ 1 + j ][ XGINew_RAMType ] ) ;     /* CR8A - CR8B */
+
+    if ( ( HwDeviceExtension->jChipType == XG41 ) || ( HwDeviceExtension->jChipType == XG42 ) )
+        XGINew_SetReg1( P3d4 , 0x8C , 0x87 ) ;
+
+    XGINew_SetReg1( P3d4 , 0x59 , pVBInfo->CR40[ 4 ][ XGINew_RAMType ] ) ;     /* CR59 */
+
+    XGINew_SetReg1( P3d4 , 0x83 , 0x09 ) ;     /* CR83 */
+    XGINew_SetReg1( P3d4 , 0x87 , 0x00 ) ;     /* CR87 */
+    XGINew_SetReg1( P3d4 , 0xCF , *pVBInfo->pCRCF ) ;  /* CRCF */
+    if ( XGINew_RAMType )
+    {
+      //XGINew_SetReg1( P3c4 , 0x17 , 0xC0 ) ;         /* SR17 DDRII */
+      XGINew_SetReg1( P3c4 , 0x17 , 0x80 ) ;           /* SR17 DDRII */
+      if ( HwDeviceExtension->jChipType == XG27 )
+        XGINew_SetReg1( P3c4 , 0x17 , 0x02 ) ;         /* SR17 DDRII */
+
+    }
+    else
+      XGINew_SetReg1( P3c4 , 0x17 , 0x00 ) ;           /* SR17 DDR */
+    XGINew_SetReg1( P3c4 , 0x1A , 0x87 ) ;             /* SR1A */
+
+    temp = XGINew_GetXG20DRAMType( HwDeviceExtension, pVBInfo) ;
+    if( temp == 0 )
+      XGINew_DDR1x_DefaultRegister( HwDeviceExtension, P3d4, pVBInfo ) ;
+    else
+    {
+      XGINew_SetReg1( P3d4 , 0xB0 , 0x80 ) ;           /* DDRII Dual frequency mode */
+      XGINew_DDR2_DefaultRegister( HwDeviceExtension, P3d4, pVBInfo ) ;
+    }
+    XGINew_SetReg1( P3c4 , 0x1B , pVBInfo->SR15[ 3 ][ XGINew_RAMType ] ) ;     /* SR1B */
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGINew_DDR_MRS */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGINew_DDR_MRS(PVB_DEVICE_INFO pVBInfo)
+{
+    USHORT data ;
+
+    PUCHAR volatile pVideoMemory = ( PUCHAR )pVBInfo->ROMAddr ;
+
+    /* SR16 <- 1F,DF,2F,AF */
+    /* yriver modified SR16 <- 0F,DF,0F,AF */
+    /* enable DLL of DDR SD/SGRAM , SR16 D4=1 */
+    data = pVideoMemory[ 0xFB ] ;
+    /* data = XGINew_GetReg1( pVBInfo->P3c4 , 0x16 ) ; */
+
+    data &= 0x0F ;
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x16 , data ) ;
+    data |= 0xC0 ;
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x16 , data ) ;
+    data &= 0x0F ;
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x16 , data ) ;
+    data |= 0x80 ;
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x16 , data ) ;
+    data &= 0x0F ;
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x16 , data ) ;
+    data |= 0xD0 ;
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x16 , data ) ;
+    data &= 0x0F ;
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x16 , data ) ;
+    data |= 0xA0 ;
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x16 , data ) ;
+/*
+   else {
+     data &= 0x0F;
+     data |= 0x10;
+     XGINew_SetReg1(pVBInfo->P3c4,0x16,data);
+
+     if (!(pVBInfo->SR15[1][XGINew_RAMType] & 0x10))
+     {
+       data &= 0x0F;
+     }
+
+     data |= 0xC0;
+     XGINew_SetReg1(pVBInfo->P3c4,0x16,data);
+
+
+     data &= 0x0F;
+     data |= 0x20;
+     XGINew_SetReg1(pVBInfo->P3c4,0x16,data);
+     if (!(pVBInfo->SR15[1][XGINew_RAMType] & 0x10))
+     {
+       data &= 0x0F;
+     }
+
+     data |= 0x80;
+     XGINew_SetReg1(pVBInfo->P3c4,0x16,data);
+   }
+*/
+}
+
+
+/* check if read cache pointer is correct */
+
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGINew_VerifyMclk */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGINew_VerifyMclk( PXGI_HW_DEVICE_INFO  HwDeviceExtension , PVB_DEVICE_INFO pVBInfo)
+{
+    PUCHAR pVideoMemory = pVBInfo->FBAddr ;
+    UCHAR i , j ;
+    USHORT Temp , SR21 ;
+
+    pVideoMemory[ 0 ] = 0xaa ;                 /* alan */
+    pVideoMemory[ 16 ] = 0x55 ;        /* note: PCI read cache is off */
+
+    if ( ( pVideoMemory[ 0 ] != 0xaa ) || ( pVideoMemory[ 16 ] != 0x55 ) )
+    {
+        for( i = 0 , j = 16 ; i < 2 ; i++ , j += 16 )
+        {
+            SR21 = XGINew_GetReg1( pVBInfo->P3c4 , 0x21 ) ;
+            Temp = SR21 & 0xFB ;       /* disable PCI post write buffer empty gating */
+            XGINew_SetReg1( pVBInfo->P3c4 , 0x21 , Temp ) ;
+
+            Temp = XGINew_GetReg1( pVBInfo->P3c4 , 0x3C ) ;
+            Temp |= 0x01 ;             /* MCLK reset */
+
+
+            Temp = XGINew_GetReg1( pVBInfo->P3c4 , 0x3C ) ;
+            Temp &= 0xFE ;             /* MCLK normal operation */
+
+            XGINew_SetReg1( pVBInfo->P3c4 , 0x21 , SR21 ) ;
+
+            pVideoMemory[ 16 + j ] = j ;
+            if ( pVideoMemory[ 16 + j ] == j )
+            {
+                pVideoMemory[ j ] = j ;
+                break ;
+            }
+        }
+    }
+}
+
+
+
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGINew_SetDRAMSize_340 */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGINew_SetDRAMSize_340( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_INFO pVBInfo)
+{
+    USHORT  data ;
+
+    pVBInfo->ROMAddr = HwDeviceExtension->pjVirtualRomBase ;
+    pVBInfo->FBAddr = HwDeviceExtension->pjVideoMemoryAddress ;
+
+    XGISetModeNew( HwDeviceExtension , 0x2e ) ;
+
+
+    data = XGINew_GetReg1( pVBInfo->P3c4 , 0x21 ) ;
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x21 , ( USHORT )( data & 0xDF ) ) ;       /* disable read cache */
+    XGI_DisplayOff( HwDeviceExtension, pVBInfo );
+
+    /*data = XGINew_GetReg1( pVBInfo->P3c4 , 0x1 ) ;*/
+    /*data |= 0x20 ;*/
+    /*XGINew_SetReg1( pVBInfo->P3c4 , 0x01 , data ) ;*/                        /* Turn OFF Display */
+    XGINew_DDRSizing340( HwDeviceExtension, pVBInfo ) ;
+    data=XGINew_GetReg1( pVBInfo->P3c4 , 0x21 ) ;
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x21 , ( USHORT )( data | 0x20 ) ) ;       /* enable read cache */
+
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGINew_SetDRAMSize_310( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_INFO pVBInfo)
+{
+    USHORT data ;
+    pVBInfo->ROMAddr  = HwDeviceExtension->pjVirtualRomBase ,
+    pVBInfo->FBAddr = HwDeviceExtension->pjVideoMemoryAddress ;
+#ifdef XGI301
+    /* XGINew_SetReg1( pVBInfo->P3d4 , 0x30 , 0x40 ) ; */
+#endif
+
+#ifdef XGI302  /* alan,should change value */
+    XGINew_SetReg1( pVBInfo->P3d4 , 0x30 , 0x4D ) ;
+    XGINew_SetReg1( pVBInfo->P3d4 , 0x31 , 0xc0 ) ;
+    XGINew_SetReg1( pVBInfo->P3d4 , 0x34 , 0x3F ) ;
+#endif
+
+    XGISetModeNew( HwDeviceExtension , 0x2e ) ;
+
+    data = XGINew_GetReg1( pVBInfo->P3c4 , 0x21 ) ;
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x21 , ( USHORT )( data & 0xDF ) ) ;       /* disable read cache */
+
+    data = XGINew_GetReg1( pVBInfo->P3c4 , 0x1 ) ;
+    data |= 0x20 ;
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x01 , data ) ;            /* Turn OFF Display */
+
+    data = XGINew_GetReg1( pVBInfo->P3c4 , 0x16 ) ;
+
+
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x16 , ( USHORT )( data | 0x0F ) ) ;               /* assume lowest speed DRAM */
+
+    XGINew_SetDRAMModeRegister( pVBInfo ) ;
+    XGINew_DisableRefresh( HwDeviceExtension, pVBInfo ) ;
+    XGINew_CheckBusWidth_310( pVBInfo) ;
+    XGINew_VerifyMclk( HwDeviceExtension, pVBInfo ) ;  /* alan 2000/7/3 */
+
+
+
+    if ( XGINew_Get310DRAMType( pVBInfo ) < 2 )
+    {
+        XGINew_SDRSizing( pVBInfo ) ;
+    }
+    else
+    {
+        XGINew_DDRSizing( pVBInfo) ;
+    }
+
+
+
+
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x16 , pVBInfo->SR15[ 1 ][ XGINew_RAMType ] ) ;    /* restore SR16 */
+
+    XGINew_EnableRefresh(  HwDeviceExtension, pVBInfo ) ;
+    data=XGINew_GetReg1( pVBInfo->P3c4 ,0x21 ) ;
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x21 , ( USHORT )( data | 0x20 ) ) ;       /* enable read cache */
+}
+
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGINew_SetDRAMModeRegister340 */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+
+void XGINew_SetDRAMModeRegister340( PXGI_HW_DEVICE_INFO HwDeviceExtension )
+{
+    UCHAR data ;
+    VB_DEVICE_INFO VBINF;
+    PVB_DEVICE_INFO pVBInfo = &VBINF;
+    pVBInfo->ROMAddr = HwDeviceExtension->pjVirtualRomBase ;
+    pVBInfo->FBAddr = HwDeviceExtension->pjVideoMemoryAddress ;
+    pVBInfo->BaseAddr = (ULONG)HwDeviceExtension->pjIOAddress ;
+    pVBInfo->ISXPDOS = 0 ;
+
+    pVBInfo->P3c4 = pVBInfo->BaseAddr + 0x14 ;
+    pVBInfo->P3d4 = pVBInfo->BaseAddr + 0x24 ;
+    pVBInfo->P3c0 = pVBInfo->BaseAddr + 0x10 ;
+    pVBInfo->P3ce = pVBInfo->BaseAddr + 0x1e ;
+    pVBInfo->P3c2 = pVBInfo->BaseAddr + 0x12 ;
+    pVBInfo->P3ca = pVBInfo->BaseAddr + 0x1a ;
+    pVBInfo->P3c6 = pVBInfo->BaseAddr + 0x16 ;
+    pVBInfo->P3c7 = pVBInfo->BaseAddr + 0x17 ;
+    pVBInfo->P3c8 = pVBInfo->BaseAddr + 0x18 ;
+    pVBInfo->P3c9 = pVBInfo->BaseAddr + 0x19 ;
+    pVBInfo->P3da = pVBInfo->BaseAddr + 0x2A ;
+    pVBInfo->Part0Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_00 ;
+    pVBInfo->Part1Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_04 ;
+    pVBInfo->Part2Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_10 ;
+    pVBInfo->Part3Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_12 ;
+    pVBInfo->Part4Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_14 ;
+    pVBInfo->Part5Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_14 + 2 ;
+    if ( HwDeviceExtension->jChipType < XG20 )                  /* kuku 2004/06/25 */
+    XGI_GetVBType( pVBInfo ) ;         /* Run XGI_GetVBType before InitTo330Pointer */
+
+    InitTo330Pointer(HwDeviceExtension->jChipType,pVBInfo);
+
+    ReadVBIOSTablData( HwDeviceExtension->jChipType , pVBInfo) ;
+
+    if ( XGINew_GetXG20DRAMType( HwDeviceExtension, pVBInfo) == 0 )
+    {
+        data = ( XGINew_GetReg1( pVBInfo->P3c4 , 0x39 ) & 0x02 ) >> 1 ;
+        if ( data == 0x01 )
+            XGINew_DDR2x_MRS_340( pVBInfo->P3c4, pVBInfo ) ;
+        else
+            XGINew_DDR1x_MRS_340( pVBInfo->P3c4, pVBInfo ) ;
+    }
+    else
+        XGINew_DDR2_MRS_XG20( HwDeviceExtension, pVBInfo->P3c4, pVBInfo);
+
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x1B , 0x03 ) ;
+}
+
+/* --------------------------------------------------------------------- */
+/* Function : XGINew_SetDRAMModeRegister */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGINew_SetDRAMModeRegister( PVB_DEVICE_INFO pVBInfo)
+{
+    if ( XGINew_Get310DRAMType( pVBInfo ) < 2 )
+    {
+      XGINew_SDR_MRS(pVBInfo ) ;
+    }
+    else
+    {
+      /* SR16 <- 0F,CF,0F,8F */
+      XGINew_DDR_MRS( pVBInfo ) ;
+    }
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGINew_DisableRefresh */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGINew_DisableRefresh( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_INFO pVBInfo)
+{
+    USHORT  data ;
+
+
+    data = XGINew_GetReg1( pVBInfo->P3c4 , 0x1B ) ;
+    data &= 0xF8 ;
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x1B , data ) ;
+
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGINew_EnableRefresh */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGINew_EnableRefresh( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_INFO pVBInfo)
+{
+
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x1B , pVBInfo->SR15[ 3 ][ XGINew_RAMType ] ) ;    /* SR1B */
+
+
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGINew_DisableChannelInterleaving */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGINew_DisableChannelInterleaving( int index , USHORT XGINew_DDRDRAM_TYPE[][ 5 ] , PVB_DEVICE_INFO pVBInfo)
+{
+    USHORT data ;
+
+    data = XGINew_GetReg1( pVBInfo->P3c4 , 0x15 ) ;
+    data &= 0x1F ;
+
+    switch( XGINew_DDRDRAM_TYPE[ index ][ 3 ] )
+    {
+        case 64:
+            data |= 0 ;
+            break ;
+        case 32:
+            data |= 0x20 ;
+            break ;
+        case 16:
+            data |= 0x40 ;
+            break ;
+        case 4:
+            data |= 0x60 ;
+            break ;
+        default:
+            break ;
+    }
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x15 , data ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGINew_SetDRAMSizingType */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGINew_SetDRAMSizingType( int index , USHORT DRAMTYPE_TABLE[][ 5 ] ,PVB_DEVICE_INFO pVBInfo)
+{
+    USHORT data ;
+
+    data = DRAMTYPE_TABLE[ index ][ 4 ] ;
+    XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x13 , 0x80 , data ) ;
+    DelayUS( 15 ) ;
+   /* should delay 50 ns */
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGINew_CheckBusWidth_310 */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGINew_CheckBusWidth_310(  PVB_DEVICE_INFO pVBInfo)
+{
+    USHORT data ;
+    PULONG volatile pVideoMemory ;
+
+    pVideoMemory = (PULONG) pVBInfo->FBAddr;
+
+    if ( XGINew_Get310DRAMType( pVBInfo ) < 2 )
+    {
+        XGINew_SetReg1( pVBInfo->P3c4 , 0x13 , 0x00 ) ;
+        XGINew_SetReg1( pVBInfo->P3c4 , 0x14 , 0x12 ) ;
+        /* should delay */
+        XGINew_SDR_MRS( pVBInfo ) ;
+
+        XGINew_ChannelAB = 0 ;
+        XGINew_DataBusWidth = 128 ;
+        pVideoMemory[ 0 ] = 0x01234567L ;
+        pVideoMemory[ 1 ] = 0x456789ABL ;
+        pVideoMemory[ 2 ] = 0x89ABCDEFL ;
+        pVideoMemory[ 3 ] = 0xCDEF0123L ;
+        pVideoMemory[ 4 ] = 0x55555555L ;
+        pVideoMemory[ 5 ] = 0x55555555L ;
+        pVideoMemory[ 6 ] = 0xFFFFFFFFL ;
+        pVideoMemory[ 7 ] = 0xFFFFFFFFL ;
+
+        if ( ( pVideoMemory[ 3 ] != 0xCDEF0123L ) || ( pVideoMemory[ 2 ] != 0x89ABCDEFL ) )
+        {
+            /* ChannelA64Bit */
+            XGINew_DataBusWidth = 64 ;
+            XGINew_ChannelAB = 0 ;
+            data=XGINew_GetReg1( pVBInfo->P3c4 , 0x14 ) ;
+            XGINew_SetReg1( pVBInfo->P3c4 , 0x14 , ( USHORT )( data & 0xFD ) ) ;
+        }
+
+        if ( ( pVideoMemory[ 1 ] != 0x456789ABL ) || ( pVideoMemory[ 0 ] != 0x01234567L ) )
+        {
+            /* ChannelB64Bit */
+            XGINew_DataBusWidth = 64 ;
+            XGINew_ChannelAB = 1 ;
+            data=XGINew_GetReg1( pVBInfo->P3c4 , 0x14 ) ;
+            XGINew_SetReg1( pVBInfo->P3c4 , 0x14 , ( USHORT )( ( data & 0xFD ) | 0x01 ) ) ;
+        }
+
+        return ;
+    }
+    else
+    {
+        /* DDR Dual channel */
+        XGINew_SetReg1( pVBInfo->P3c4 , 0x13 , 0x00 ) ;
+        XGINew_SetReg1( pVBInfo->P3c4 , 0x14 , 0x02 ) ;        /* Channel A, 64bit */
+        /* should delay */
+        XGINew_DDR_MRS( pVBInfo ) ;
+
+        XGINew_ChannelAB = 0 ;
+        XGINew_DataBusWidth = 64 ;
+        pVideoMemory[ 0 ] = 0x01234567L ;
+        pVideoMemory[ 1 ] = 0x456789ABL ;
+        pVideoMemory[ 2 ] = 0x89ABCDEFL ;
+        pVideoMemory[ 3 ] = 0xCDEF0123L ;
+        pVideoMemory[ 4 ] = 0x55555555L ;
+        pVideoMemory[ 5 ] = 0x55555555L ;
+        pVideoMemory[ 6 ] = 0xAAAAAAAAL ;
+        pVideoMemory[ 7 ] = 0xAAAAAAAAL ;
+
+        if ( pVideoMemory[ 1 ] == 0x456789ABL )
+        {
+            if ( pVideoMemory[ 0 ] == 0x01234567L )
+            {
+                /* Channel A 64bit */
+                return ;
+            }
+        }
+        else
+        {
+            if ( pVideoMemory[ 0 ] == 0x01234567L )
+            {
+                /* Channel A 32bit */
+                XGINew_DataBusWidth = 32 ;
+                XGINew_SetReg1( pVBInfo->P3c4 , 0x14 , 0x00 ) ;
+                return ;
+            }
+        }
+
+        XGINew_SetReg1( pVBInfo->P3c4 , 0x14 , 0x03 ) ;        /* Channel B, 64bit */
+        XGINew_DDR_MRS( pVBInfo);
+
+        XGINew_ChannelAB = 1 ;
+        XGINew_DataBusWidth = 64 ;
+        pVideoMemory[ 0 ] = 0x01234567L ;
+        pVideoMemory[ 1 ] = 0x456789ABL ;
+        pVideoMemory[ 2 ] = 0x89ABCDEFL ;
+        pVideoMemory[ 3 ] = 0xCDEF0123L ;
+        pVideoMemory[ 4 ] = 0x55555555L ;
+        pVideoMemory[ 5 ] = 0x55555555L ;
+        pVideoMemory[ 6 ] = 0xAAAAAAAAL ;
+        pVideoMemory[ 7 ] = 0xAAAAAAAAL ;
+
+        if ( pVideoMemory[ 1 ] == 0x456789ABL )
+        {
+            /* Channel B 64 */
+            if ( pVideoMemory[ 0 ] == 0x01234567L )
+            {
+                /* Channel B 64bit */
+                return ;
+            }
+            else
+            {
+                /* error */
+            }
+        }
+        else
+        {
+            if ( pVideoMemory[ 0 ] == 0x01234567L )
+            {
+                /* Channel B 32 */
+                XGINew_DataBusWidth = 32 ;
+                XGINew_SetReg1( pVBInfo->P3c4 , 0x14 , 0x01 ) ;
+            }
+            else
+            {
+                /* error */
+            }
+        }
+    }
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGINew_SetRank */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+int XGINew_SetRank( int index , UCHAR RankNo , UCHAR XGINew_ChannelAB , USHORT DRAMTYPE_TABLE[][ 5 ] , PVB_DEVICE_INFO pVBInfo)
+{
+    USHORT data ;
+    int RankSize ;
+
+    if ( ( RankNo == 2 ) && ( DRAMTYPE_TABLE[ index ][ 0 ] == 2 ) )
+        return 0 ;
+
+    RankSize = DRAMTYPE_TABLE[ index ][ 3 ] / 2 * XGINew_DataBusWidth / 32 ;
+
+    if ( ( RankNo * RankSize ) <= 128 )
+    {
+        data = 0 ;
+
+        while( ( RankSize >>= 1 ) > 0 )
+        {
+            data += 0x10 ;
+        }
+        data |= ( RankNo - 1 ) << 2 ;
+        data |= ( XGINew_DataBusWidth / 64 ) & 2 ;
+        data |= XGINew_ChannelAB ;
+        XGINew_SetReg1( pVBInfo->P3c4 , 0x14 , data ) ;
+        /* should delay */
+        XGINew_SDR_MRS( pVBInfo ) ;
+        return( 1 ) ;
+    }
+    else
+        return( 0 ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGINew_SetDDRChannel */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+int XGINew_SetDDRChannel( int index , UCHAR ChannelNo , UCHAR XGINew_ChannelAB , USHORT DRAMTYPE_TABLE[][ 5 ] , PVB_DEVICE_INFO pVBInfo)
+{
+    USHORT  data ;
+    int RankSize ;
+
+    RankSize = DRAMTYPE_TABLE[index][3]/2 * XGINew_DataBusWidth/32;
+    /* RankSize = DRAMTYPE_TABLE[ index ][ 3 ] ; */
+    if ( ChannelNo * RankSize <= 128 )
+    {
+        data = 0 ;
+        while( ( RankSize >>= 1 ) > 0 )
+        {
+            data += 0x10 ;
+        }
+
+        if ( ChannelNo == 2 )
+            data |= 0x0C ;
+
+        data |= ( XGINew_DataBusWidth / 32 ) & 2 ;
+        data |= XGINew_ChannelAB ;
+        XGINew_SetReg1( pVBInfo->P3c4 , 0x14 , data ) ;
+        /* should delay */
+        XGINew_DDR_MRS( pVBInfo ) ;
+        return( 1 ) ;
+    }
+    else
+        return( 0 ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGINew_CheckColumn */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+int XGINew_CheckColumn( int index , USHORT DRAMTYPE_TABLE[][ 5 ], PVB_DEVICE_INFO pVBInfo)
+{
+    int i ;
+    ULONG Increment , Position ;
+
+    /* Increment = 1 << ( DRAMTYPE_TABLE[ index ][ 2 ] + XGINew_DataBusWidth / 64 + 1 ) ; */
+    Increment = 1 << ( 10 + XGINew_DataBusWidth / 64 ) ;
+
+    for( i = 0 , Position = 0 ; i < 2 ; i++ )
+    {
+        *( ( PULONG )( pVBInfo->FBAddr + Position ) ) = Position ;
+        Position += Increment ;
+    }
+
+#ifdef WIN2000  /* chiawen for linux solution */
+    DelayUS( 100 ) ;
+#endif
+
+    for( i = 0 , Position = 0 ; i < 2 ; i++ )
+    {
+        /* if ( pVBInfo->FBAddr[ Position ] != Position ) */
+        if ( ( *( PULONG )( pVBInfo->FBAddr + Position ) ) != Position )
+            return( 0 ) ;
+        Position += Increment ;
+    }
+    return( 1 ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGINew_CheckBanks */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+int XGINew_CheckBanks( int index , USHORT DRAMTYPE_TABLE[][ 5 ], PVB_DEVICE_INFO pVBInfo)
+{
+    int i ;
+    ULONG Increment , Position ;
+
+    Increment = 1 << ( DRAMTYPE_TABLE[ index ][ 2 ] + XGINew_DataBusWidth / 64 + 2 ) ;
+
+    for( i = 0 , Position = 0 ; i < 4 ; i++ )
+    {
+        /* pVBInfo->FBAddr[ Position ] = Position ; */
+        *( ( PULONG )( pVBInfo->FBAddr + Position ) ) = Position ;
+        Position += Increment ;
+    }
+
+    for( i = 0 , Position = 0 ; i < 4 ; i++ )
+    {
+        /* if (pVBInfo->FBAddr[ Position ] != Position ) */
+        if ( ( *( PULONG )( pVBInfo->FBAddr + Position ) ) != Position )
+            return( 0 ) ;
+        Position += Increment ;
+    }
+    return( 1 ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGINew_CheckRank */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+int XGINew_CheckRank( int RankNo , int index , USHORT DRAMTYPE_TABLE[][ 5 ], PVB_DEVICE_INFO pVBInfo)
+{
+    int i ;
+    ULONG Increment , Position ;
+
+    Increment = 1 << ( DRAMTYPE_TABLE[ index ][ 2 ] + DRAMTYPE_TABLE[ index ][ 1 ] +
+                  DRAMTYPE_TABLE[ index ][ 0 ] + XGINew_DataBusWidth / 64 + RankNo ) ;
+
+    for( i = 0 , Position = 0 ; i < 2 ; i++ )
+    {
+        /* pVBInfo->FBAddr[ Position ] = Position ; */
+        /* *( ( PULONG )( pVBInfo->FBAddr ) ) = Position ; */
+        *( ( PULONG )( pVBInfo->FBAddr + Position ) ) = Position ;
+        Position += Increment ;
+    }
+
+    for( i = 0 , Position = 0 ; i < 2 ; i++ )
+    {
+        /* if ( pVBInfo->FBAddr[ Position ] != Position ) */
+        /* if ( ( *( PULONG )( pVBInfo->FBAddr ) ) != Position ) */
+        if ( ( *( PULONG )( pVBInfo->FBAddr + Position ) ) != Position )
+            return( 0 ) ;
+        Position += Increment ;
+    }
+    return( 1 );
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGINew_CheckDDRRank */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+int XGINew_CheckDDRRank( int RankNo , int index , USHORT DRAMTYPE_TABLE[][ 5 ], PVB_DEVICE_INFO pVBInfo)
+{
+    ULONG Increment , Position ;
+    USHORT data ;
+
+    Increment = 1 << ( DRAMTYPE_TABLE[ index ][ 2 ] + DRAMTYPE_TABLE[ index ][ 1 ] +
+                       DRAMTYPE_TABLE[ index ][ 0 ] + XGINew_DataBusWidth / 64 + RankNo ) ;
+
+    Increment += Increment / 2 ;
+
+    Position = 0;
+    *( ( PULONG )( pVBInfo->FBAddr + Position + 0 ) ) = 0x01234567 ;
+    *( ( PULONG )( pVBInfo->FBAddr + Position + 1 ) ) = 0x456789AB ;
+    *( ( PULONG )( pVBInfo->FBAddr + Position + 2 ) ) = 0x55555555 ;
+    *( ( PULONG )( pVBInfo->FBAddr + Position + 3 ) ) = 0x55555555 ;
+    *( ( PULONG )( pVBInfo->FBAddr + Position + 4 ) ) = 0xAAAAAAAA ;
+    *( ( PULONG )( pVBInfo->FBAddr + Position + 5 ) ) = 0xAAAAAAAA ;
+
+    if ( ( *( PULONG )( pVBInfo->FBAddr + 1 ) ) == 0x456789AB )
+        return( 1 ) ;
+
+    if ( ( *( PULONG )( pVBInfo->FBAddr + 0 ) ) == 0x01234567 )
+        return( 0 ) ;
+
+    data = XGINew_GetReg1( pVBInfo->P3c4 , 0x14 ) ;
+    data &= 0xF3 ;
+    data |= 0x0E ;
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x14 , data ) ;
+    data = XGINew_GetReg1( pVBInfo->P3c4 , 0x15 ) ;
+    data += 0x20 ;
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x15 , data ) ;
+
+    return( 1 ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGINew_CheckRanks */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+int XGINew_CheckRanks( int RankNo , int index , USHORT DRAMTYPE_TABLE[][ 5 ], PVB_DEVICE_INFO pVBInfo)
+{
+    int r ;
+
+    for( r = RankNo ; r >= 1 ; r-- )
+    {
+        if ( !XGINew_CheckRank( r , index , DRAMTYPE_TABLE, pVBInfo ) )
+            return( 0 ) ;
+    }
+
+    if ( !XGINew_CheckBanks( index , DRAMTYPE_TABLE, pVBInfo ) )
+        return( 0 ) ;
+
+    if ( !XGINew_CheckColumn( index , DRAMTYPE_TABLE, pVBInfo ) )
+        return( 0 ) ;
+
+    return( 1 ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGINew_CheckDDRRanks */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+int XGINew_CheckDDRRanks( int RankNo , int index , USHORT DRAMTYPE_TABLE[][ 5 ], PVB_DEVICE_INFO pVBInfo)
+{
+    int r ;
+
+    for( r = RankNo ; r >= 1 ; r-- )
+    {
+        if ( !XGINew_CheckDDRRank( r , index , DRAMTYPE_TABLE, pVBInfo ) )
+            return( 0 ) ;
+    }
+
+    if ( !XGINew_CheckBanks( index , DRAMTYPE_TABLE, pVBInfo ) )
+        return( 0 ) ;
+
+    if ( !XGINew_CheckColumn( index , DRAMTYPE_TABLE, pVBInfo ) )
+        return( 0 ) ;
+
+    return( 1 ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+int XGINew_SDRSizing(PVB_DEVICE_INFO pVBInfo)
+{
+    int    i ;
+    UCHAR  j ;
+
+    for( i = 0 ; i < 13 ; i++ )
+    {
+        XGINew_SetDRAMSizingType( i , XGINew_SDRDRAM_TYPE , pVBInfo) ;
+
+        for( j = 2 ; j > 0 ; j-- )
+        {
+            if ( !XGINew_SetRank( i , ( UCHAR )j , XGINew_ChannelAB , XGINew_SDRDRAM_TYPE , pVBInfo) )
+                continue ;
+            else
+            {
+                if ( XGINew_CheckRanks( j , i , XGINew_SDRDRAM_TYPE, pVBInfo) )
+                    return( 1 ) ;
+            }
+        }
+    }
+    return( 0 ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGINew_SetDRAMSizeReg */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+USHORT XGINew_SetDRAMSizeReg( int index , USHORT DRAMTYPE_TABLE[][ 5 ], PVB_DEVICE_INFO pVBInfo)
+{
+    USHORT data = 0 , memsize = 0 ;
+    int RankSize ;
+    UCHAR ChannelNo ;
+
+    RankSize = DRAMTYPE_TABLE[ index ][ 3 ] * XGINew_DataBusWidth / 32 ;
+    data = XGINew_GetReg1( pVBInfo->P3c4 , 0x13 ) ;
+    data &= 0x80 ;
+
+    if ( data == 0x80 )
+        RankSize *= 2 ;
+
+    data = 0 ;
+
+    if( XGINew_ChannelAB == 3 )
+        ChannelNo = 4 ;
+    else
+        ChannelNo = XGINew_ChannelAB ;
+
+    if ( ChannelNo * RankSize <= 256 )
+    {
+        while( ( RankSize >>= 1 ) > 0 )
+        {
+            data += 0x10 ;
+        }
+
+        memsize = data >> 4 ;
+
+        /* [2004/03/25] Vicent, Fix DRAM Sizing Error */
+        XGINew_SetReg1( pVBInfo->P3c4 , 0x14 , ( XGINew_GetReg1( pVBInfo->P3c4 , 0x14 ) & 0x0F ) | ( data & 0xF0 ) ) ;
+
+       /* data |= XGINew_ChannelAB << 2 ; */
+       /* data |= ( XGINew_DataBusWidth / 64 ) << 1 ; */
+       /* XGINew_SetReg1( pVBInfo->P3c4 , 0x14 , data ) ; */
+
+        /* should delay */
+        /* XGINew_SetDRAMModeRegister340( pVBInfo ) ; */
+    }
+    return( memsize ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGINew_SetDRAMSize20Reg */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+USHORT XGINew_SetDRAMSize20Reg( int index , USHORT DRAMTYPE_TABLE[][ 5 ], PVB_DEVICE_INFO pVBInfo)
+{
+    USHORT data = 0 , memsize = 0 ;
+    int RankSize ;
+    UCHAR ChannelNo ;
+
+    RankSize = DRAMTYPE_TABLE[ index ][ 3 ] * XGINew_DataBusWidth / 8 ;
+    data = XGINew_GetReg1( pVBInfo->P3c4 , 0x13 ) ;
+    data &= 0x80 ;
+
+    if ( data == 0x80 )
+        RankSize *= 2 ;
+
+    data = 0 ;
+
+    if( XGINew_ChannelAB == 3 )
+        ChannelNo = 4 ;
+    else
+        ChannelNo = XGINew_ChannelAB ;
+
+    if ( ChannelNo * RankSize <= 256 )
+    {
+        while( ( RankSize >>= 1 ) > 0 )
+        {
+            data += 0x10 ;
+        }
+
+        memsize = data >> 4 ;
+
+        /* [2004/03/25] Vicent, Fix DRAM Sizing Error */
+        XGINew_SetReg1( pVBInfo->P3c4 , 0x14 , ( XGINew_GetReg1( pVBInfo->P3c4 , 0x14 ) & 0x0F ) | ( data & 0xF0 ) ) ;
+       DelayUS( 15 ) ;
+
+       /* data |= XGINew_ChannelAB << 2 ; */
+       /* data |= ( XGINew_DataBusWidth / 64 ) << 1 ; */
+       /* XGINew_SetReg1( pVBInfo->P3c4 , 0x14 , data ) ; */
+
+        /* should delay */
+        /* XGINew_SetDRAMModeRegister340( pVBInfo ) ; */
+    }
+    return( memsize ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGINew_ReadWriteRest */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+int XGINew_ReadWriteRest( USHORT StopAddr , USHORT StartAddr, PVB_DEVICE_INFO pVBInfo)
+{
+    int i ;
+    ULONG Position = 0 ;
+
+   *( ( PULONG )( pVBInfo->FBAddr + Position ) ) = Position ;
+
+    for( i = StartAddr ; i <= StopAddr ; i++ )
+    {
+        Position = 1 << i ;
+        *( ( PULONG )( pVBInfo->FBAddr + Position ) ) = Position ;
+    }
+
+    DelayUS( 500 ) ;   /* [Vicent] 2004/04/16. Fix #1759 Memory Size error in Multi-Adapter. */
+
+    Position = 0 ;
+
+   if ( ( *( PULONG )( pVBInfo->FBAddr + Position ) ) != Position )
+        return( 0 ) ;
+
+    for( i = StartAddr ; i <= StopAddr ; i++ )
+    {
+        Position = 1 << i ;
+        if ( ( *( PULONG )( pVBInfo->FBAddr + Position ) ) != Position )
+            return( 0 ) ;
+    }
+    return( 1 ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGINew_CheckFrequence */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+UCHAR XGINew_CheckFrequence( PVB_DEVICE_INFO pVBInfo )
+{
+    UCHAR data ;
+
+    data = XGINew_GetReg1( pVBInfo->P3d4 , 0x97 ) ;
+
+    if ( ( data & 0x10 ) == 0 )
+    {
+        data = XGINew_GetReg1( pVBInfo->P3c4 , 0x39 ) ;
+        data = ( data & 0x02 ) >> 1 ;
+        return( data ) ;
+    }
+    else
+        return( data & 0x01 ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGINew_CheckChannel */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGINew_CheckChannel( PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo)
+{
+    UCHAR data;
+
+    switch( HwDeviceExtension->jChipType )
+    {
+      case XG20:
+      case XG21:
+          data = XGINew_GetReg1( pVBInfo->P3d4 , 0x97 ) ;
+          data = data & 0x01;
+          XGINew_ChannelAB = 1 ;               /* XG20 "JUST" one channel */
+
+          if ( data == 0 )  /* Single_32_16 */
+          {
+
+             if (( HwDeviceExtension->ulVideoMemorySize - 1 ) > 0x1000000)
+             {
+
+                XGINew_DataBusWidth = 32 ;     /* 32 bits */
+                XGINew_SetReg1( pVBInfo->P3c4 , 0x13 , 0xB1 ) ;  /* 22bit + 2 rank + 32bit */
+                XGINew_SetReg1( pVBInfo->P3c4 , 0x14 , 0x52 ) ;
+               DelayUS( 15 ) ;
+
+                if ( XGINew_ReadWriteRest( 24 , 23 , pVBInfo ) == 1 )
+                    return ;
+
+               if (( HwDeviceExtension->ulVideoMemorySize - 1 ) > 0x800000)
+               {
+                  XGINew_SetReg1( pVBInfo->P3c4 , 0x13 , 0x31 ) ;  /* 22bit + 1 rank + 32bit */
+                  XGINew_SetReg1( pVBInfo->P3c4 , 0x14 , 0x42 ) ;
+                 DelayUS( 15 ) ;
+
+                  if ( XGINew_ReadWriteRest( 23 , 23 , pVBInfo ) == 1 )
+                      return ;
+                }
+             }
+
+             if (( HwDeviceExtension->ulVideoMemorySize - 1 ) > 0x800000)
+             {
+               XGINew_DataBusWidth = 16 ;      /* 16 bits */
+                XGINew_SetReg1( pVBInfo->P3c4 , 0x13 , 0xB1 ) ;  /* 22bit + 2 rank + 16bit */
+                XGINew_SetReg1( pVBInfo->P3c4 , 0x14 , 0x41 ) ;
+               DelayUS( 15 ) ;
+
+                if ( XGINew_ReadWriteRest( 23 , 22 , pVBInfo ) == 1 )
+                    return ;
+                else
+                    XGINew_SetReg1( pVBInfo->P3c4 , 0x13 , 0x31 ) ;
+                    DelayUS( 15 ) ;
+              }
+
+          }
+          else  /* Dual_16_8 */
+          {
+              if (( HwDeviceExtension->ulVideoMemorySize - 1 ) > 0x800000)
+              {
+
+                XGINew_DataBusWidth = 16 ;     /* 16 bits */
+                XGINew_SetReg1( pVBInfo->P3c4 , 0x13 , 0xB1 ) ;  /* (0x31:12x8x2) 22bit + 2 rank */
+                XGINew_SetReg1( pVBInfo->P3c4 , 0x14 , 0x41 ) ;  /* 0x41:16Mx16 bit*/
+                DelayUS( 15 ) ;
+
+                if ( XGINew_ReadWriteRest( 23 , 22 , pVBInfo ) == 1 )
+                    return ;
+
+               if (( HwDeviceExtension->ulVideoMemorySize - 1 ) > 0x400000)
+               {
+                  XGINew_SetReg1( pVBInfo->P3c4 , 0x13 , 0x31 ) ;  /* (0x31:12x8x2) 22bit + 1 rank */
+                  XGINew_SetReg1( pVBInfo->P3c4 , 0x14 , 0x31 ) ;  /* 0x31:8Mx16 bit*/
+                  DelayUS( 15 ) ;
+
+                  if ( XGINew_ReadWriteRest( 22 , 22 , pVBInfo ) == 1 )
+                      return ;
+                }
+             }
+
+
+             if (( HwDeviceExtension->ulVideoMemorySize - 1 ) > 0x400000)
+             {
+               XGINew_DataBusWidth = 8 ;       /* 8 bits */
+                XGINew_SetReg1( pVBInfo->P3c4 , 0x13 , 0xB1 ) ;  /* (0x31:12x8x2) 22bit + 2 rank */
+                XGINew_SetReg1( pVBInfo->P3c4 , 0x14 , 0x30 ) ;  /* 0x30:8Mx8 bit*/
+                DelayUS( 15 ) ;
+
+                if ( XGINew_ReadWriteRest( 22 , 21 , pVBInfo ) == 1 )
+                    return ;
+                else
+                    XGINew_SetReg1( pVBInfo->P3c4 , 0x13 , 0x31 ) ;  /* (0x31:12x8x2) 22bit + 1 rank */
+                    DelayUS( 15 ) ;
+              }
+          }
+          break ;
+
+      case XG27:
+          XGINew_DataBusWidth = 16 ;   /* 16 bits */
+          XGINew_ChannelAB = 1 ;               /* Single channel */
+          XGINew_SetReg1( pVBInfo->P3c4 , 0x14 , 0x51 ) ;  /* 32Mx16 bit*/
+          break ;
+      case XG41:
+          if ( XGINew_CheckFrequence(pVBInfo) == 1 )
+          {
+              XGINew_DataBusWidth = 32 ;       /* 32 bits */
+              XGINew_ChannelAB = 3 ;           /* Quad Channel */
+              XGINew_SetReg1( pVBInfo->P3c4 , 0x13 , 0xA1 ) ;
+              XGINew_SetReg1( pVBInfo->P3c4 , 0x14 , 0x4C ) ;
+
+              if ( XGINew_ReadWriteRest( 25 , 23 , pVBInfo ) == 1 )
+                  return ;
+
+              XGINew_ChannelAB = 2 ;           /* Dual channels */
+              XGINew_SetReg1( pVBInfo->P3c4 , 0x14 , 0x48 ) ;
+
+              if ( XGINew_ReadWriteRest( 24 , 23 , pVBInfo ) == 1 )
+                  return ;
+
+              XGINew_SetReg1( pVBInfo->P3c4 , 0x14 , 0x49 ) ;
+
+              if ( XGINew_ReadWriteRest( 24 , 23 , pVBInfo ) == 1 )
+                  return ;
+
+              XGINew_ChannelAB = 3 ;
+              XGINew_SetReg1( pVBInfo->P3c4 , 0x13 , 0x21 ) ;
+              XGINew_SetReg1( pVBInfo->P3c4 , 0x14 , 0x3C ) ;
+
+              if ( XGINew_ReadWriteRest( 24 , 23 , pVBInfo ) == 1 )
+                  return ;
+
+              XGINew_SetReg1( pVBInfo->P3c4 , 0x14 , 0x38 ) ;
+
+              if ( XGINew_ReadWriteRest( 8 , 4 , pVBInfo ) == 1 )
+                  return ;
+              else
+                  XGINew_SetReg1( pVBInfo->P3c4 , 0x14 , 0x39 ) ;
+          }
+          else
+          {                                    /* DDR */
+              XGINew_DataBusWidth = 64 ;       /* 64 bits */
+              XGINew_ChannelAB = 2 ;           /* Dual channels */
+              XGINew_SetReg1( pVBInfo->P3c4 , 0x13 , 0xA1 ) ;
+              XGINew_SetReg1( pVBInfo->P3c4 , 0x14 , 0x5A ) ;
+
+              if ( XGINew_ReadWriteRest( 25 , 24 , pVBInfo ) == 1 )
+                  return ;
+
+              XGINew_ChannelAB = 1 ;           /* Single channels */
+              XGINew_SetReg1( pVBInfo->P3c4 , 0x14 , 0x52 ) ;
+
+              if ( XGINew_ReadWriteRest( 24 , 23 , pVBInfo ) == 1 )
+                  return ;
+
+              XGINew_SetReg1( pVBInfo->P3c4 , 0x14 , 0x53 ) ;
+
+              if ( XGINew_ReadWriteRest( 24 , 23 , pVBInfo ) == 1 )
+                  return ;
+
+              XGINew_ChannelAB = 2 ;           /* Dual channels */
+              XGINew_SetReg1( pVBInfo->P3c4 , 0x13 , 0x21 ) ;
+              XGINew_SetReg1( pVBInfo->P3c4 , 0x14 , 0x4A ) ;
+
+              if ( XGINew_ReadWriteRest( 24 , 23 , pVBInfo ) == 1 )
+                  return ;
+
+              XGINew_ChannelAB = 1 ;           /* Single channels */
+              XGINew_SetReg1( pVBInfo->P3c4 , 0x14 , 0x42 ) ;
+
+              if ( XGINew_ReadWriteRest( 8 , 4 , pVBInfo ) == 1 )
+                  return ;
+              else
+                  XGINew_SetReg1( pVBInfo->P3c4 , 0x14 , 0x43 ) ;
+          }
+
+          break ;
+
+      case XG42:
+/*
+         XG42 SR14 D[3] Reserve
+                   D[2] = 1, Dual Channel
+                        = 0, Single Channel
+
+         It's Different from Other XG40 Series.
+*/
+          if ( XGINew_CheckFrequence(pVBInfo) == 1 )   /* DDRII, DDR2x */
+          {
+              XGINew_DataBusWidth = 32 ;       /* 32 bits */
+              XGINew_ChannelAB = 2 ;           /* 2 Channel */
+              XGINew_SetReg1( pVBInfo->P3c4 , 0x13 , 0xA1 ) ;
+              XGINew_SetReg1( pVBInfo->P3c4 , 0x14 , 0x44 ) ;
+
+              if ( XGINew_ReadWriteRest( 24 , 23 , pVBInfo ) == 1 )
+                  return ;
+
+              XGINew_SetReg1( pVBInfo->P3c4 , 0x13 , 0x21 ) ;
+              XGINew_SetReg1( pVBInfo->P3c4 , 0x14 , 0x34 ) ;
+              if ( XGINew_ReadWriteRest( 23 , 22 , pVBInfo ) == 1 )
+                  return ;
+
+              XGINew_ChannelAB = 1 ;           /* Single Channel */
+              XGINew_SetReg1( pVBInfo->P3c4 , 0x13 , 0xA1 ) ;
+              XGINew_SetReg1( pVBInfo->P3c4 , 0x14 , 0x40 ) ;
+
+              if ( XGINew_ReadWriteRest( 23 , 22 , pVBInfo ) == 1 )
+                  return ;
+              else
+              {
+                  XGINew_SetReg1( pVBInfo->P3c4 , 0x13 , 0x21 ) ;
+                  XGINew_SetReg1( pVBInfo->P3c4 , 0x14 , 0x30 ) ;
+              }
+          }
+          else
+          {                                    /* DDR */
+              XGINew_DataBusWidth = 64 ;       /* 64 bits */
+              XGINew_ChannelAB = 1 ;           /* 1 channels */
+              XGINew_SetReg1( pVBInfo->P3c4 , 0x13 , 0xA1 ) ;
+              XGINew_SetReg1( pVBInfo->P3c4 , 0x14 , 0x52 ) ;
+
+              if ( XGINew_ReadWriteRest( 24 , 23 , pVBInfo ) == 1 )
+                  return ;
+              else
+              {
+                  XGINew_SetReg1( pVBInfo->P3c4 , 0x13 , 0x21 ) ;
+                  XGINew_SetReg1( pVBInfo->P3c4 , 0x14 , 0x42 ) ;
+              }
+          }
+
+          break ;
+
+      default: /* XG40 */
+
+          if ( XGINew_CheckFrequence(pVBInfo) == 1 )   /* DDRII */
+          {
+              XGINew_DataBusWidth = 32 ;       /* 32 bits */
+              XGINew_ChannelAB = 3 ;
+              XGINew_SetReg1( pVBInfo->P3c4 , 0x13 , 0xA1 ) ;
+              XGINew_SetReg1( pVBInfo->P3c4 , 0x14 , 0x4C ) ;
+
+              if ( XGINew_ReadWriteRest( 25 , 23 , pVBInfo ) == 1 )
+                  return ;
+
+              XGINew_ChannelAB = 2 ;           /* 2 channels */
+              XGINew_SetReg1( pVBInfo->P3c4 , 0x14 , 0x48 ) ;
+
+              if ( XGINew_ReadWriteRest( 24 , 23 , pVBInfo ) == 1 )
+                  return ;
+
+              XGINew_SetReg1( pVBInfo->P3c4 , 0x13 , 0x21 ) ;
+              XGINew_SetReg1( pVBInfo->P3c4 , 0x14 , 0x3C ) ;
+
+              if ( XGINew_ReadWriteRest( 24 , 23 , pVBInfo ) == 1 )
+                  XGINew_ChannelAB = 3 ;       /* 4 channels */
+              else
+              {
+                  XGINew_ChannelAB = 2 ;       /* 2 channels */
+                  XGINew_SetReg1( pVBInfo->P3c4 , 0x14 , 0x38 ) ;
+              }
+          }
+          else
+          {                                    /* DDR */
+              XGINew_DataBusWidth = 64 ;       /* 64 bits */
+              XGINew_ChannelAB = 2 ;           /* 2 channels */
+              XGINew_SetReg1( pVBInfo->P3c4 , 0x13 , 0xA1 ) ;
+              XGINew_SetReg1( pVBInfo->P3c4 , 0x14 , 0x5A ) ;
+
+              if ( XGINew_ReadWriteRest( 25 , 24 , pVBInfo ) == 1 )
+                  return ;
+              else
+              {
+                  XGINew_SetReg1( pVBInfo->P3c4 , 0x13 , 0x21 ) ;
+                  XGINew_SetReg1( pVBInfo->P3c4 , 0x14 , 0x4A ) ;
+              }
+          }
+         break ;
+    }
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGINew_DDRSizing340 */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+int XGINew_DDRSizing340( PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo)
+{
+    int i ;
+    USHORT memsize , addr ;
+
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x15 , 0x00 ) ;    /* noninterleaving */
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x1C , 0x00 ) ;    /* nontiling */
+    XGINew_CheckChannel( HwDeviceExtension, pVBInfo ) ;
+
+
+    if ( HwDeviceExtension->jChipType >= XG20 )
+    {
+      for( i = 0 ; i < 12 ; i++ )
+      {
+        XGINew_SetDRAMSizingType( i , XGINew_DDRDRAM_TYPE20, pVBInfo ) ;
+        memsize = XGINew_SetDRAMSize20Reg( i , XGINew_DDRDRAM_TYPE20, pVBInfo ) ;
+        if ( memsize == 0 )
+            continue ;
+
+        addr = memsize + ( XGINew_ChannelAB - 2 ) + 20 ;
+        if ( ( HwDeviceExtension->ulVideoMemorySize - 1 ) < ( ULONG )( 1 << addr ) )
+            continue ;
+
+        if ( XGINew_ReadWriteRest( addr , 5, pVBInfo ) == 1 )
+            return( 1 ) ;
+      }
+    }
+    else
+    {
+      for( i = 0 ; i < 4 ; i++ )
+      {
+       XGINew_SetDRAMSizingType( i , XGINew_DDRDRAM_TYPE340, pVBInfo ) ;
+        memsize = XGINew_SetDRAMSizeReg( i , XGINew_DDRDRAM_TYPE340, pVBInfo ) ;
+
+        if ( memsize == 0 )
+            continue ;
+
+        addr = memsize + ( XGINew_ChannelAB - 2 ) + 20 ;
+        if ( ( HwDeviceExtension->ulVideoMemorySize - 1 ) < ( ULONG )( 1 << addr ) )
+            continue ;
+
+        if ( XGINew_ReadWriteRest( addr , 9, pVBInfo ) == 1 )
+            return( 1 ) ;
+      }
+    }
+    return( 0 ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGINew_DDRSizing */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+int XGINew_DDRSizing(PVB_DEVICE_INFO pVBInfo)
+{
+    int    i ;
+    UCHAR  j ;
+
+    for( i = 0 ; i < 4 ; i++ )
+    {
+        XGINew_SetDRAMSizingType( i , XGINew_DDRDRAM_TYPE, pVBInfo ) ;
+        XGINew_DisableChannelInterleaving( i , XGINew_DDRDRAM_TYPE , pVBInfo) ;
+        for( j = 2 ; j > 0 ; j-- )
+        {
+            XGINew_SetDDRChannel( i , j , XGINew_ChannelAB , XGINew_DDRDRAM_TYPE , pVBInfo ) ;
+            if ( !XGINew_SetRank( i , ( UCHAR )j , XGINew_ChannelAB , XGINew_DDRDRAM_TYPE, pVBInfo ) )
+                continue ;
+            else
+            {
+                if ( XGINew_CheckDDRRanks( j , i , XGINew_DDRDRAM_TYPE,  pVBInfo ) )
+                return( 1 ) ;
+            }
+        }
+    }
+    return( 0 ) ;
+}
+
+/* --------------------------------------------------------------------- */
+/* Function : XGINew_SetMemoryClock */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGINew_SetMemoryClock( PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo)
+{
+
+
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x28 , pVBInfo->MCLKData[ XGINew_RAMType ].SR28 ) ;
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x29 , pVBInfo->MCLKData[ XGINew_RAMType ].SR29 ) ;
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x2A , pVBInfo->MCLKData[ XGINew_RAMType ].SR2A ) ;
+
+
+
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x2E , pVBInfo->ECLKData[ XGINew_RAMType ].SR2E ) ;
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x2F , pVBInfo->ECLKData[ XGINew_RAMType ].SR2F ) ;
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x30 , pVBInfo->ECLKData[ XGINew_RAMType ].SR30 ) ;
+
+    /* [Vicent] 2004/07/07, When XG42 ECLK = MCLK = 207MHz, Set SR32 D[1:0] = 10b */
+    /* [Hsuan] 2004/08/20, Modify SR32 value, when MCLK=207MHZ, ELCK=250MHz, Set SR32 D[1:0] = 10b */
+    if ( HwDeviceExtension->jChipType == XG42 )
+    {
+      if ( ( pVBInfo->MCLKData[ XGINew_RAMType ].SR28 == 0x1C ) && ( pVBInfo->MCLKData[ XGINew_RAMType ].SR29 == 0x01 )
+        && ( ( ( pVBInfo->ECLKData[ XGINew_RAMType ].SR2E == 0x1C ) && ( pVBInfo->ECLKData[ XGINew_RAMType ].SR2F == 0x01 ) )
+        || ( ( pVBInfo->ECLKData[ XGINew_RAMType ].SR2E == 0x22 ) && ( pVBInfo->ECLKData[ XGINew_RAMType ].SR2F == 0x01 ) ) ) )
+      {
+       XGINew_SetReg1( pVBInfo->P3c4 , 0x32 , ( ( UCHAR )XGINew_GetReg1( pVBInfo->P3c4 , 0x32 ) & 0xFC ) | 0x02 ) ;
+      }
+    }
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : ChkLFB */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+BOOLEAN ChkLFB( PVB_DEVICE_INFO pVBInfo )
+{
+    if ( LFBDRAMTrap & XGINew_GetReg1( pVBInfo->P3d4 , 0x78 ) )
+        return( TRUE ) ;
+    else
+        return( FALSE );
+}
+
+
+/* --------------------------------------------------------------------- */
+/* input : dx ,valid value : CR or second chip's CR */
+/*  */
+/* SetPowerConsume : */
+/* Description: reduce 40/43 power consumption in first chip or */
+/* in second chip, assume CR A1 D[6]="1" in this case */
+/* output : none */
+/* --------------------------------------------------------------------- */
+void SetPowerConsume ( PXGI_HW_DEVICE_INFO HwDeviceExtension , ULONG XGI_P3d4Port )
+{
+    ULONG   lTemp ;
+    UCHAR   bTemp;
+
+    HwDeviceExtension->pQueryVGAConfigSpace( HwDeviceExtension , 0x08 , 0 , &lTemp ) ; /* Get */
+    if ((lTemp&0xFF)==0)
+    {
+        /* set CR58 D[5]=0 D[3]=0 */
+        XGINew_SetRegAND( XGI_P3d4Port , 0x58 , 0xD7 ) ;
+        bTemp = (UCHAR) XGINew_GetReg1( XGI_P3d4Port , 0xCB ) ;
+       if (bTemp&0x20)
+       {
+            if (!(bTemp&0x10))
+            {
+               XGINew_SetRegANDOR( XGI_P3d4Port , 0x58 , 0xD7 , 0x20 ) ; /* CR58 D[5]=1 D[3]=0 */
+            }
+            else
+            {
+               XGINew_SetRegANDOR( XGI_P3d4Port , 0x58 , 0xD7 , 0x08 ) ; /* CR58 D[5]=0 D[3]=1 */
+            }
+
+       }
+
+    }
+}
+
+
+
+#if defined(LINUX_XF86)||defined(LINUX_KERNEL)
+void XGINew_InitVBIOSData(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo)
+{
+
+       /* ULONG ROMAddr = (ULONG)HwDeviceExtension->pjVirtualRomBase; */
+    pVBInfo->ROMAddr = HwDeviceExtension->pjVirtualRomBase ;
+    pVBInfo->FBAddr = HwDeviceExtension->pjVideoMemoryAddress ;
+    pVBInfo->BaseAddr = (ULONG)HwDeviceExtension->pjIOAddress ;
+    pVBInfo->ISXPDOS = 0 ;
+
+    pVBInfo->P3c4 = pVBInfo->BaseAddr + 0x14 ;
+    pVBInfo->P3d4 = pVBInfo->BaseAddr + 0x24 ;
+    pVBInfo->P3c0 = pVBInfo->BaseAddr + 0x10 ;
+    pVBInfo->P3ce = pVBInfo->BaseAddr + 0x1e ;
+    pVBInfo->P3c2 = pVBInfo->BaseAddr + 0x12 ;
+    pVBInfo->P3ca = pVBInfo->BaseAddr + 0x1a ;
+    pVBInfo->P3c6 = pVBInfo->BaseAddr + 0x16 ;
+    pVBInfo->P3c7 = pVBInfo->BaseAddr + 0x17 ;
+    pVBInfo->P3c8 = pVBInfo->BaseAddr + 0x18 ;
+    pVBInfo->P3c9 = pVBInfo->BaseAddr + 0x19 ;
+    pVBInfo->P3da = pVBInfo->BaseAddr + 0x2A ;
+    pVBInfo->Part0Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_00 ;
+    pVBInfo->Part1Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_04 ;
+    pVBInfo->Part2Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_10 ;
+    pVBInfo->Part3Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_12 ;
+    pVBInfo->Part4Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_14 ;
+    pVBInfo->Part5Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_14 + 2 ;
+    if ( HwDeviceExtension->jChipType < XG20 )                  /* kuku 2004/06/25 */
+    XGI_GetVBType( pVBInfo ) ;         /* Run XGI_GetVBType before InitTo330Pointer */
+
+       switch(HwDeviceExtension->jChipType)
+       {
+       case XG40:
+       case XG41:
+       case XG42:
+       case XG20:
+       case XG21:
+       default:
+               InitTo330Pointer(HwDeviceExtension->jChipType,pVBInfo);
+               return ;
+       }
+
+}
+#endif /* For Linux */
+
+/* --------------------------------------------------------------------- */
+/* Function : ReadVBIOSTablData */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void ReadVBIOSTablData( UCHAR ChipType , PVB_DEVICE_INFO pVBInfo)
+{
+    PUCHAR  volatile pVideoMemory = ( PUCHAR )pVBInfo->ROMAddr ;
+    ULONG   i ;
+    UCHAR   j , k ;
+#if 0
+    ULONG   ii , jj ;
+    i = pVideoMemory[ 0x1CF ] | ( pVideoMemory[ 0x1D0 ] << 8 ) ;               /* UniROM */
+    if ( i != 0 )
+        UNIROM = 1 ;
+
+    ii = 0x90 ;
+    for( jj = 0x00 ; jj < 0x08 ; jj++ )
+    {
+        pVBInfo->MCLKData[ jj ].SR28 = pVideoMemory[ ii ] ;
+        pVBInfo->MCLKData[ jj ].SR29 = pVideoMemory[ ii + 1] ;
+        pVBInfo->MCLKData[ jj ].SR2A = pVideoMemory[ ii + 2] ;
+        pVBInfo->MCLKData[ jj ].CLOCK = pVideoMemory[ ii + 3 ] | ( pVideoMemory[ ii + 4 ] << 8 ) ;
+        ii += 0x05 ;
+    }
+
+    ii = 0xB8 ;
+    for( jj = 0x00 ; jj < 0x08 ; jj++ )
+    {
+        pVBInfo->ECLKData[ jj ].SR2E = pVideoMemory[ ii ] ;
+        pVBInfo->ECLKData[ jj ].SR2F=pVideoMemory[ ii + 1 ] ;
+        pVBInfo->ECLKData[ jj ].SR30= pVideoMemory[ ii + 2 ] ;
+        pVBInfo->ECLKData[ jj ].CLOCK= pVideoMemory[ ii + 3 ] | ( pVideoMemory[ ii + 4 ] << 8 ) ;
+        ii += 0x05 ;
+    }
+
+    /* Volari customize data area start */
+    /* if ( ChipType == XG40 ) */
+    if ( ChipType >= XG40 )
+    {
+        ii = 0xE0 ;
+        for( jj = 0x00 ; jj < 0x03 ; jj++ )
+        {
+            pVBInfo->SR15[ jj ][ 0 ] = pVideoMemory[ ii ] ;            /* SR13, SR14, and SR18 */
+            pVBInfo->SR15[ jj ][ 1 ] = pVideoMemory[ ii + 1 ] ;
+            pVBInfo->SR15[ jj ][ 2 ] = pVideoMemory[ ii + 2 ] ;
+            pVBInfo->SR15[ jj ][ 3 ] = pVideoMemory[ ii + 3 ] ;
+            pVBInfo->SR15[ jj ][ 4 ] = pVideoMemory[ ii + 4 ] ;
+            pVBInfo->SR15[ jj ][ 5 ] = pVideoMemory[ ii + 5 ] ;
+            pVBInfo->SR15[ jj ][ 6 ] = pVideoMemory[ ii + 6 ] ;
+            pVBInfo->SR15[ jj ][ 7 ] = pVideoMemory[ ii + 7 ] ;
+            ii += 0x08 ;
+        }
+        ii = 0x110 ;
+        jj = 0x03 ;
+        pVBInfo->SR15[ jj ][ 0 ] = pVideoMemory[ ii ] ;                /* SR1B */
+        pVBInfo->SR15[ jj ][ 1 ] = pVideoMemory[ ii + 1 ] ;
+        pVBInfo->SR15[ jj ][ 2 ] = pVideoMemory[ ii + 2 ] ;
+        pVBInfo->SR15[ jj ][ 3 ] = pVideoMemory[ ii + 3 ] ;
+        pVBInfo->SR15[ jj ][ 4 ] = pVideoMemory[ ii + 4 ] ;
+        pVBInfo->SR15[ jj ][ 5 ] = pVideoMemory[ ii + 5 ] ;
+        pVBInfo->SR15[ jj ][ 6 ] = pVideoMemory[ ii + 6 ] ;
+        pVBInfo->SR15[ jj ][ 7 ] = pVideoMemory[ ii + 7 ] ;
+
+        *pVBInfo->pSR07 = pVideoMemory[ 0x74 ] ;
+        *pVBInfo->pSR1F = pVideoMemory[ 0x75 ] ;
+        *pVBInfo->pSR21 = pVideoMemory[ 0x76 ] ;
+        *pVBInfo->pSR22 = pVideoMemory[ 0x77 ] ;
+        *pVBInfo->pSR23 = pVideoMemory[ 0x78 ] ;
+        *pVBInfo->pSR24 = pVideoMemory[ 0x79 ] ;
+        pVBInfo->SR25[ 0 ] = pVideoMemory[ 0x7A ] ;
+        *pVBInfo->pSR31 = pVideoMemory[ 0x7B ] ;
+        *pVBInfo->pSR32 = pVideoMemory[ 0x7C ] ;
+        *pVBInfo->pSR33 = pVideoMemory[ 0x7D ] ;
+        ii = 0xF8 ;
+
+        for( jj = 0 ; jj < 3 ; jj++ )
+        {
+            pVBInfo->CR40[ jj ][ 0 ] = pVideoMemory[ ii ] ;
+            pVBInfo->CR40[ jj ][ 1 ] = pVideoMemory[ ii + 1 ] ;
+            pVBInfo->CR40[ jj ][ 2 ] = pVideoMemory[ ii + 2 ] ;
+            pVBInfo->CR40[ jj ][ 3 ] = pVideoMemory[ ii + 3 ] ;
+            pVBInfo->CR40[ jj ][ 4 ] = pVideoMemory[ ii + 4 ] ;
+            pVBInfo->CR40[ jj ][ 5 ] = pVideoMemory[ ii + 5 ] ;
+            pVBInfo->CR40[ jj ][ 6 ] = pVideoMemory[ ii + 6 ] ;
+            pVBInfo->CR40[ jj ][ 7 ] = pVideoMemory[ ii + 7 ] ;
+            ii += 0x08 ;
+        }
+
+        ii = 0x118 ;
+        for( j = 3 ; j < 24 ; j++ )
+        {
+            pVBInfo->CR40[ j ][ 0 ] = pVideoMemory[ ii ] ;
+            pVBInfo->CR40[ j ][ 1 ] = pVideoMemory[ ii + 1 ] ;
+            pVBInfo->CR40[ j ][ 2 ] = pVideoMemory[ ii + 2 ] ;
+            pVBInfo->CR40[ j ][ 3 ] = pVideoMemory[ ii + 3 ] ;
+            pVBInfo->CR40[ j ][ 4 ] = pVideoMemory[ ii + 4 ] ;
+            pVBInfo->CR40[ j ][ 5 ] = pVideoMemory[ ii + 5 ] ;
+            pVBInfo->CR40[ j ][ 6 ] = pVideoMemory[ ii + 6 ] ;
+            pVBInfo->CR40[ j ][ 7 ] = pVideoMemory[ ii + 7 ] ;
+            ii += 0x08 ;
+        }
+
+        i = pVideoMemory[ 0x1C0 ] | ( pVideoMemory[ 0x1C1 ] << 8 ) ;
+
+        for( j = 0 ; j < 8 ; j++ )
+        {
+            for( k = 0 ; k < 4 ; k++ )
+                pVBInfo->CR6B[ j ][ k ] = pVideoMemory[ i + 4 * j + k ] ;
+        }
+
+        i = pVideoMemory[ 0x1C2 ] | ( pVideoMemory[ 0x1C3 ] << 8 ) ;
+
+        for( j = 0 ; j < 8 ; j++ )
+        {
+            for( k = 0 ; k < 4 ; k++ )
+                pVBInfo->CR6E[ j ][ k ] = pVideoMemory[ i + 4 * j + k ] ;
+        }
+
+        i = pVideoMemory[ 0x1C4 ] | ( pVideoMemory[ 0x1C5 ] << 8 ) ;
+        for( j = 0 ; j < 8 ; j++ )
+        {
+            for( k = 0 ; k < 32 ; k++ )
+                pVBInfo->CR6F[ j ][ k ] = pVideoMemory[ i + 32 * j + k ] ;
+        }
+
+        i = pVideoMemory[ 0x1C6 ] | ( pVideoMemory[ 0x1C7 ] << 8 ) ;
+
+        for( j = 0 ; j < 8 ; j++ )
+        {
+            for( k = 0 ; k < 2 ; k++ )
+                pVBInfo->CR89[ j ][ k ] = pVideoMemory[ i + 2 * j + k ] ;
+        }
+
+        i = pVideoMemory[ 0x1C8 ] | ( pVideoMemory[ 0x1C9 ] << 8 ) ;
+        for( j = 0 ; j < 12 ; j++ )
+            pVBInfo->AGPReg[ j ] = pVideoMemory[ i + j ] ;
+
+        i = pVideoMemory[ 0x1CF ] | ( pVideoMemory[ 0x1D0 ] << 8 ) ;
+        for( j = 0 ; j < 4 ; j++ )
+            pVBInfo->SR16[ j ] = pVideoMemory[ i + j ] ;
+
+        if ( ChipType == XG21 )
+        {
+            if (pVideoMemory[ 0x67 ] & 0x80)
+            {
+                *pVBInfo->pDVOSetting = pVideoMemory[ 0x67 ];
+            }
+            if ( (pVideoMemory[ 0x67 ] & 0xC0) == 0xC0 )
+            {
+                *pVBInfo->pCR2E = pVideoMemory[ i + 4 ] ;
+                *pVBInfo->pCR2F = pVideoMemory[ i + 5 ] ;
+                *pVBInfo->pCR46 = pVideoMemory[ i + 6 ] ;
+                *pVBInfo->pCR47 = pVideoMemory[ i + 7 ] ;
+            }
+        }
+
+        if ( ChipType == XG27 )
+        {
+            jj = i+j;
+            for( i = 0 ; i <= 0xB ; i++,jj++ )
+              pVBInfo->pCRD0[i] = pVideoMemory[ jj ] ;
+            for( i = 0x0 ; i <= 0x1 ; i++,jj++ )
+              pVBInfo->pCRDE[i] = pVideoMemory[ jj ] ;
+
+            *pVBInfo->pSR40 = pVideoMemory[ jj ] ;
+            jj++;
+            *pVBInfo->pSR41 = pVideoMemory[ jj ] ;
+
+            if (pVideoMemory[ 0x67 ] & 0x80)
+            {
+                *pVBInfo->pDVOSetting = pVideoMemory[ 0x67 ];
+            }
+            if ( (pVideoMemory[ 0x67 ] & 0xC0) == 0xC0 )
+            {
+                jj++;
+                *pVBInfo->pCR2E = pVideoMemory[ jj ] ;
+                *pVBInfo->pCR2F = pVideoMemory[ jj + 1 ] ;
+                *pVBInfo->pCR46 = pVideoMemory[ jj + 2 ] ;
+                *pVBInfo->pCR47 = pVideoMemory[ jj + 3 ] ;
+            }
+
+        }
+
+        *pVBInfo->pCRCF = pVideoMemory[ 0x1CA ] ;
+        *pVBInfo->pXGINew_DRAMTypeDefinition = pVideoMemory[ 0x1CB ] ;
+        *pVBInfo->pXGINew_I2CDefinition = pVideoMemory[ 0x1D1 ] ;
+        if ( ChipType >= XG20 )
+        {
+           *pVBInfo->pXGINew_CR97 = pVideoMemory[ 0x1D2 ] ;
+           if ( ChipType == XG27 )
+           {
+             *pVBInfo->pSR36 = pVideoMemory[ 0x1D3 ] ;
+             *pVBInfo->pCR8F = pVideoMemory[ 0x1D5 ] ;
+           }
+        }
+
+    }
+#endif
+    /* Volari customize data area end */
+
+    if ( ChipType == XG21 )
+    {
+        pVBInfo->IF_DEF_LVDS = 0 ;
+        if (pVideoMemory[ 0x65 ] & 0x1)
+        {
+            pVBInfo->IF_DEF_LVDS = 1 ;
+            i = pVideoMemory[ 0x316 ] | ( pVideoMemory[ 0x317 ] << 8 );
+            j = pVideoMemory[ i-1 ] ;
+            if ( j != 0xff )
+            {
+              k = 0;
+              do
+              {
+                pVBInfo->XG21_LVDSCapList[k].LVDS_Capability = pVideoMemory[ i ] | ( pVideoMemory[ i + 1 ] << 8 );
+                pVBInfo->XG21_LVDSCapList[k].LVDSHT = pVideoMemory[ i + 2 ] | ( pVideoMemory[ i + 3 ] << 8 ) ;
+                pVBInfo->XG21_LVDSCapList[k].LVDSVT = pVideoMemory[ i + 4 ] | ( pVideoMemory[ i + 5 ] << 8 );
+                pVBInfo->XG21_LVDSCapList[k].LVDSHDE = pVideoMemory[ i + 6 ] | ( pVideoMemory[ i + 7 ] << 8 );
+                pVBInfo->XG21_LVDSCapList[k].LVDSVDE = pVideoMemory[ i + 8 ] | ( pVideoMemory[ i + 9 ] << 8 );
+                pVBInfo->XG21_LVDSCapList[k].LVDSHFP = pVideoMemory[ i + 10 ] | ( pVideoMemory[ i + 11 ] << 8 );
+                pVBInfo->XG21_LVDSCapList[k].LVDSVFP = pVideoMemory[ i + 12 ] | ( pVideoMemory[ i + 13 ] << 8 );
+                pVBInfo->XG21_LVDSCapList[k].LVDSHSYNC = pVideoMemory[ i + 14 ] | ( pVideoMemory[ i + 15 ] << 8 );
+                pVBInfo->XG21_LVDSCapList[k].LVDSVSYNC = pVideoMemory[ i + 16 ] | ( pVideoMemory[ i + 17 ] << 8 );
+                pVBInfo->XG21_LVDSCapList[k].VCLKData1 = pVideoMemory[ i + 18 ] ;
+                pVBInfo->XG21_LVDSCapList[k].VCLKData2 = pVideoMemory[ i + 19 ] ;
+                pVBInfo->XG21_LVDSCapList[k].PSC_S1 = pVideoMemory[ i + 20 ] ;
+                pVBInfo->XG21_LVDSCapList[k].PSC_S2 = pVideoMemory[ i + 21 ] ;
+                pVBInfo->XG21_LVDSCapList[k].PSC_S3 = pVideoMemory[ i + 22 ] ;
+                pVBInfo->XG21_LVDSCapList[k].PSC_S4 = pVideoMemory[ i + 23 ] ;
+                pVBInfo->XG21_LVDSCapList[k].PSC_S5 = pVideoMemory[ i + 24 ] ;
+                i += 25;
+                j--;
+                k++;
+              } while ( (j>0) && ( k < (sizeof(XGI21_LCDCapList)/sizeof(XGI21_LVDSCapStruct)) ) );
+            }
+            else
+            {
+            pVBInfo->XG21_LVDSCapList[0].LVDS_Capability = pVideoMemory[ i ] | ( pVideoMemory[ i + 1 ] << 8 );
+            pVBInfo->XG21_LVDSCapList[0].LVDSHT = pVideoMemory[ i + 2 ] | ( pVideoMemory[ i + 3 ] << 8 ) ;
+            pVBInfo->XG21_LVDSCapList[0].LVDSVT = pVideoMemory[ i + 4 ] | ( pVideoMemory[ i + 5 ] << 8 );
+            pVBInfo->XG21_LVDSCapList[0].LVDSHDE = pVideoMemory[ i + 6 ] | ( pVideoMemory[ i + 7 ] << 8 );
+            pVBInfo->XG21_LVDSCapList[0].LVDSVDE = pVideoMemory[ i + 8 ] | ( pVideoMemory[ i + 9 ] << 8 );
+            pVBInfo->XG21_LVDSCapList[0].LVDSHFP = pVideoMemory[ i + 10 ] | ( pVideoMemory[ i + 11 ] << 8 );
+            pVBInfo->XG21_LVDSCapList[0].LVDSVFP = pVideoMemory[ i + 12 ] | ( pVideoMemory[ i + 13 ] << 8 );
+            pVBInfo->XG21_LVDSCapList[0].LVDSHSYNC = pVideoMemory[ i + 14 ] | ( pVideoMemory[ i + 15 ] << 8 );
+            pVBInfo->XG21_LVDSCapList[0].LVDSVSYNC = pVideoMemory[ i + 16 ] | ( pVideoMemory[ i + 17 ] << 8 );
+            pVBInfo->XG21_LVDSCapList[0].VCLKData1 = pVideoMemory[ i + 18 ] ;
+            pVBInfo->XG21_LVDSCapList[0].VCLKData2 = pVideoMemory[ i + 19 ] ;
+            pVBInfo->XG21_LVDSCapList[0].PSC_S1 = pVideoMemory[ i + 20 ] ;
+            pVBInfo->XG21_LVDSCapList[0].PSC_S2 = pVideoMemory[ i + 21 ] ;
+            pVBInfo->XG21_LVDSCapList[0].PSC_S3 = pVideoMemory[ i + 22 ] ;
+            pVBInfo->XG21_LVDSCapList[0].PSC_S4 = pVideoMemory[ i + 23 ] ;
+            pVBInfo->XG21_LVDSCapList[0].PSC_S5 = pVideoMemory[ i + 24 ] ;
+        }
+        }
+    }
+}
+
+/* --------------------------------------------------------------------- */
+/* Function : XGINew_DDR1x_MRS_XG20 */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGINew_DDR1x_MRS_XG20( ULONG P3c4 , PVB_DEVICE_INFO pVBInfo)
+{
+
+    XGINew_SetReg1( P3c4 , 0x18 , 0x01 ) ;
+    XGINew_SetReg1( P3c4 , 0x19 , 0x40 ) ;
+    XGINew_SetReg1( P3c4 , 0x16 , 0x00 ) ;
+    XGINew_SetReg1( P3c4 , 0x16 , 0x80 ) ;
+    DelayUS( 60 ) ;
+
+    XGINew_SetReg1( P3c4 , 0x18 , 0x00 ) ;
+    XGINew_SetReg1( P3c4 , 0x19 , 0x40 ) ;
+    XGINew_SetReg1( P3c4 , 0x16 , 0x00 ) ;
+    XGINew_SetReg1( P3c4 , 0x16 , 0x80 ) ;
+    DelayUS( 60 ) ;
+    XGINew_SetReg1( P3c4 , 0x18 , pVBInfo->SR15[ 2 ][ XGINew_RAMType ] ) ;     /* SR18 */
+    /* XGINew_SetReg1( P3c4 , 0x18 , 0x31 ) ; */
+    XGINew_SetReg1( P3c4 , 0x19 , 0x01 ) ;
+    XGINew_SetReg1( P3c4 , 0x16 , 0x03 ) ;
+    XGINew_SetReg1( P3c4 , 0x16 , 0x83 ) ;
+    DelayUS( 1000 ) ;
+    XGINew_SetReg1( P3c4 , 0x1B , 0x03 ) ;
+    DelayUS( 500 ) ;
+    /* XGINew_SetReg1( P3c4 , 0x18 , 0x31 ) ; */
+    XGINew_SetReg1( P3c4 , 0x18 , pVBInfo->SR15[ 2 ][ XGINew_RAMType ] ) ;     /* SR18 */
+    XGINew_SetReg1( P3c4 , 0x19 , 0x00 ) ;
+    XGINew_SetReg1( P3c4 , 0x16 , 0x03 ) ;
+    XGINew_SetReg1( P3c4 , 0x16 , 0x83 ) ;
+    XGINew_SetReg1( P3c4 , 0x1B , 0x00 ) ;
+}
+
+/* --------------------------------------------------------------------- */
+/* Function : XGINew_SetDRAMModeRegister_XG20 */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGINew_SetDRAMModeRegister_XG20( PXGI_HW_DEVICE_INFO HwDeviceExtension )
+{
+    VB_DEVICE_INFO VBINF;
+    PVB_DEVICE_INFO pVBInfo = &VBINF;
+    pVBInfo->ROMAddr = HwDeviceExtension->pjVirtualRomBase ;
+    pVBInfo->FBAddr = HwDeviceExtension->pjVideoMemoryAddress ;
+    pVBInfo->BaseAddr = (ULONG)HwDeviceExtension->pjIOAddress ;
+    pVBInfo->ISXPDOS = 0 ;
+
+    pVBInfo->P3c4 = pVBInfo->BaseAddr + 0x14 ;
+    pVBInfo->P3d4 = pVBInfo->BaseAddr + 0x24 ;
+    pVBInfo->P3c0 = pVBInfo->BaseAddr + 0x10 ;
+    pVBInfo->P3ce = pVBInfo->BaseAddr + 0x1e ;
+    pVBInfo->P3c2 = pVBInfo->BaseAddr + 0x12 ;
+    pVBInfo->P3ca = pVBInfo->BaseAddr + 0x1a ;
+    pVBInfo->P3c6 = pVBInfo->BaseAddr + 0x16 ;
+    pVBInfo->P3c7 = pVBInfo->BaseAddr + 0x17 ;
+    pVBInfo->P3c8 = pVBInfo->BaseAddr + 0x18 ;
+    pVBInfo->P3c9 = pVBInfo->BaseAddr + 0x19 ;
+    pVBInfo->P3da = pVBInfo->BaseAddr + 0x2A ;
+    pVBInfo->Part0Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_00 ;
+    pVBInfo->Part1Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_04 ;
+    pVBInfo->Part2Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_10 ;
+    pVBInfo->Part3Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_12 ;
+    pVBInfo->Part4Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_14 ;
+    pVBInfo->Part5Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_14 + 2 ;
+
+    InitTo330Pointer(HwDeviceExtension->jChipType,pVBInfo);
+
+    ReadVBIOSTablData( HwDeviceExtension->jChipType , pVBInfo) ;
+
+    if ( XGINew_GetXG20DRAMType( HwDeviceExtension, pVBInfo) == 0 )
+        XGINew_DDR1x_MRS_XG20( pVBInfo->P3c4, pVBInfo ) ;
+    else
+        XGINew_DDR2_MRS_XG20( HwDeviceExtension , pVBInfo->P3c4 , pVBInfo ) ;
+
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x1B , 0x03 ) ;
+}
+
+void XGINew_SetDRAMModeRegister_XG27( PXGI_HW_DEVICE_INFO HwDeviceExtension )
+{
+    VB_DEVICE_INFO VBINF;
+    PVB_DEVICE_INFO pVBInfo = &VBINF;
+    pVBInfo->ROMAddr = HwDeviceExtension->pjVirtualRomBase ;
+    pVBInfo->FBAddr = HwDeviceExtension->pjVideoMemoryAddress ;
+    pVBInfo->BaseAddr = (ULONG)HwDeviceExtension->pjIOAddress ;
+    pVBInfo->ISXPDOS = 0 ;
+
+    pVBInfo->P3c4 = pVBInfo->BaseAddr + 0x14 ;
+    pVBInfo->P3d4 = pVBInfo->BaseAddr + 0x24 ;
+    pVBInfo->P3c0 = pVBInfo->BaseAddr + 0x10 ;
+    pVBInfo->P3ce = pVBInfo->BaseAddr + 0x1e ;
+    pVBInfo->P3c2 = pVBInfo->BaseAddr + 0x12 ;
+    pVBInfo->P3ca = pVBInfo->BaseAddr + 0x1a ;
+    pVBInfo->P3c6 = pVBInfo->BaseAddr + 0x16 ;
+    pVBInfo->P3c7 = pVBInfo->BaseAddr + 0x17 ;
+    pVBInfo->P3c8 = pVBInfo->BaseAddr + 0x18 ;
+    pVBInfo->P3c9 = pVBInfo->BaseAddr + 0x19 ;
+    pVBInfo->P3da = pVBInfo->BaseAddr + 0x2A ;
+    pVBInfo->Part0Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_00 ;
+    pVBInfo->Part1Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_04 ;
+    pVBInfo->Part2Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_10 ;
+    pVBInfo->Part3Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_12 ;
+    pVBInfo->Part4Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_14 ;
+    pVBInfo->Part5Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_14 + 2 ;
+
+    InitTo330Pointer(HwDeviceExtension->jChipType,pVBInfo);
+
+    ReadVBIOSTablData( HwDeviceExtension->jChipType , pVBInfo) ;
+
+    if ( XGINew_GetXG20DRAMType( HwDeviceExtension, pVBInfo) == 0 )
+        XGINew_DDR1x_MRS_XG20( pVBInfo->P3c4, pVBInfo ) ;
+    else
+        //XGINew_DDR2_MRS_XG27( HwDeviceExtension , pVBInfo->P3c4 , pVBInfo ) ;
+        XGINew_DDRII_Bootup_XG27( HwDeviceExtension , pVBInfo->P3c4 , pVBInfo) ;
+
+    //XGINew_SetReg1( pVBInfo->P3c4 , 0x1B , 0x03 ) ;
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x1B , pVBInfo->SR15[ 3 ][ XGINew_RAMType ] ) ;    /* SR1B */
+
+}
+/*
+void XGINew_SetDRAMModeRegister_XG27( PXGI_HW_DEVICE_INFO HwDeviceExtension )
+{
+#ifndef LINUX_XF86
+    UCHAR data ;
+#endif
+    VB_DEVICE_INFO VBINF;
+    PVB_DEVICE_INFO pVBInfo = &VBINF;
+    pVBInfo->ROMAddr = HwDeviceExtension->pjVirtualRomBase ;
+    pVBInfo->FBAddr = HwDeviceExtension->pjVideoMemoryAddress ;
+    pVBInfo->BaseAddr = HwDeviceExtension->pjIOAddress ;
+    pVBInfo->ISXPDOS = 0 ;
+
+    pVBInfo->P3c4 = pVBInfo->BaseAddr + 0x14 ;
+    pVBInfo->P3d4 = pVBInfo->BaseAddr + 0x24 ;
+    pVBInfo->P3c0 = pVBInfo->BaseAddr + 0x10 ;
+    pVBInfo->P3ce = pVBInfo->BaseAddr + 0x1e ;
+    pVBInfo->P3c2 = pVBInfo->BaseAddr + 0x12 ;
+    pVBInfo->P3ca = pVBInfo->BaseAddr + 0x1a ;
+    pVBInfo->P3c6 = pVBInfo->BaseAddr + 0x16 ;
+    pVBInfo->P3c7 = pVBInfo->BaseAddr + 0x17 ;
+    pVBInfo->P3c8 = pVBInfo->BaseAddr + 0x18 ;
+    pVBInfo->P3c9 = pVBInfo->BaseAddr + 0x19 ;
+    pVBInfo->P3da = pVBInfo->BaseAddr + 0x2A ;
+    pVBInfo->Part0Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_00 ;
+    pVBInfo->Part1Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_04 ;
+    pVBInfo->Part2Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_10 ;
+    pVBInfo->Part3Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_12 ;
+    pVBInfo->Part4Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_14 ;
+    pVBInfo->Part5Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_14 + 2 ;
+
+    InitTo330Pointer(HwDeviceExtension->jChipType,pVBInfo);
+
+    ReadVBIOSTablData( HwDeviceExtension->jChipType , pVBInfo) ;
+
+    if ( XGINew_GetXG20DRAMType( HwDeviceExtension, pVBInfo) == 0 )
+        XGINew_DDR1x_MRS_XG20( pVBInfo->P3c4, pVBInfo ) ;
+    else
+        XGINew_DDR2_MRS_XG27( HwDeviceExtension , pVBInfo->P3c4 , pVBInfo ) ;
+
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x1B , 0x03 ) ;
+}
+*/
+/* -------------------------------------------------------- */
+/* Function : XGINew_ChkSenseStatus */
+/* Input : */
+/* Output : */
+/* Description : */
+/* -------------------------------------------------------- */
+void XGINew_ChkSenseStatus ( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_INFO pVBInfo)
+{
+    USHORT tempbx=0 , temp , tempcx , CR3CData;
+
+    temp = XGINew_GetReg1( pVBInfo->P3d4 , 0x32 ) ;
+
+    if ( temp & Monitor1Sense )
+       tempbx |= ActiveCRT1 ;
+    if ( temp & LCDSense )
+       tempbx |= ActiveLCD ;
+    if ( temp & Monitor2Sense )
+       tempbx |= ActiveCRT2 ;
+    if ( temp & TVSense )
+    {
+       tempbx |= ActiveTV ;
+       if ( temp & AVIDEOSense )
+           tempbx |= ( ActiveAVideo << 8 );
+       if ( temp & SVIDEOSense )
+           tempbx |= ( ActiveSVideo << 8 );
+       if ( temp & SCARTSense )
+           tempbx |= ( ActiveSCART << 8 );
+       if ( temp & HiTVSense )
+           tempbx |= ( ActiveHiTV << 8 );
+       if ( temp & YPbPrSense )
+           tempbx |= ( ActiveYPbPr << 8 );
+    }
+
+    tempcx = XGINew_GetReg1( pVBInfo->P3d4 , 0x3d ) ;
+    tempcx |= ( XGINew_GetReg1( pVBInfo->P3d4 , 0x3e ) << 8 ) ;
+
+    if ( tempbx & tempcx )
+    {
+       CR3CData = XGINew_GetReg1( pVBInfo->P3d4 , 0x3c ) ;
+       if ( !( CR3CData & DisplayDeviceFromCMOS ) )
+       {
+           tempcx = 0x1FF0 ;
+           if ( *pVBInfo->pSoftSetting & ModeSoftSetting )
+           {
+               tempbx = 0x1FF0 ;
+           }
+       }
+    }
+    else
+    {
+       tempcx = 0x1FF0 ;
+       if ( *pVBInfo->pSoftSetting & ModeSoftSetting )
+       {
+           tempbx = 0x1FF0 ;
+       }
+    }
+
+    tempbx &= tempcx ;
+    XGINew_SetReg1( pVBInfo->P3d4, 0x3d , ( tempbx & 0x00FF ) ) ;
+    XGINew_SetReg1( pVBInfo->P3d4, 0x3e , ( ( tempbx & 0xFF00 ) >> 8 )) ;
+}
+/* -------------------------------------------------------- */
+/* Function : XGINew_SetModeScratch */
+/* Input : */
+/* Output : */
+/* Description : */
+/* -------------------------------------------------------- */
+void XGINew_SetModeScratch ( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_INFO pVBInfo )
+{
+    USHORT temp , tempcl = 0 , tempch = 0 , CR31Data , CR38Data;
+
+    temp = XGINew_GetReg1( pVBInfo->P3d4 , 0x3d ) ;
+    temp |= XGINew_GetReg1( pVBInfo->P3d4 , 0x3e ) << 8 ;
+    temp |= ( XGINew_GetReg1( pVBInfo->P3d4 , 0x31 ) & ( DriverMode >> 8) ) << 8 ;
+
+    if ( pVBInfo->IF_DEF_CRT2Monitor == 1)
+    {
+       if ( temp & ActiveCRT2 )
+          tempcl = SetCRT2ToRAMDAC ;
+    }
+
+    if ( temp & ActiveLCD )
+    {
+       tempcl |= SetCRT2ToLCD ;
+       if  ( temp & DriverMode )
+       {
+           if ( temp & ActiveTV )
+           {
+               tempch = SetToLCDA | EnableDualEdge ;
+               temp ^= SetCRT2ToLCD ;
+
+               if ( ( temp >> 8 ) & ActiveAVideo )
+                   tempcl |= SetCRT2ToAVIDEO ;
+               if ( ( temp >> 8 ) & ActiveSVideo )
+                   tempcl |= SetCRT2ToSVIDEO ;
+               if ( ( temp >> 8 ) & ActiveSCART )
+                   tempcl |= SetCRT2ToSCART ;
+
+               if ( pVBInfo->IF_DEF_HiVision == 1 )
+               {
+                   if ( ( temp >> 8 ) & ActiveHiTV )
+                   tempcl |= SetCRT2ToHiVisionTV ;
+               }
+
+               if ( pVBInfo->IF_DEF_YPbPr == 1 )
+               {
+                   if ( ( temp >> 8 ) & ActiveYPbPr )
+                   tempch |= SetYPbPr ;
+               }
+           }
+       }
+    }
+    else
+    {
+       if ( ( temp >> 8 ) & ActiveAVideo )
+          tempcl |= SetCRT2ToAVIDEO ;
+       if ( ( temp >> 8 ) & ActiveSVideo )
+          tempcl |= SetCRT2ToSVIDEO ;
+       if ( ( temp >> 8 ) & ActiveSCART )
+          tempcl |= SetCRT2ToSCART ;
+
+       if ( pVBInfo->IF_DEF_HiVision == 1 )
+       {
+          if ( ( temp >> 8 ) & ActiveHiTV )
+          tempcl |= SetCRT2ToHiVisionTV ;
+       }
+
+       if ( pVBInfo->IF_DEF_YPbPr == 1 )
+       {
+          if ( ( temp >> 8 ) & ActiveYPbPr )
+          tempch |= SetYPbPr ;
+       }
+    }
+
+
+    tempcl |= SetSimuScanMode ;
+    if ( (!( temp & ActiveCRT1 )) && ( ( temp & ActiveLCD ) || ( temp & ActiveTV ) || ( temp & ActiveCRT2 ) ) )
+       tempcl ^= ( SetSimuScanMode | SwitchToCRT2 ) ;
+    if ( ( temp & ActiveLCD ) && ( temp & ActiveTV ) )
+       tempcl ^= ( SetSimuScanMode | SwitchToCRT2 ) ;
+    XGINew_SetReg1( pVBInfo->P3d4, 0x30 , tempcl ) ;
+
+    CR31Data = XGINew_GetReg1( pVBInfo->P3d4 , 0x31 ) ;
+    CR31Data &= ~( SetNotSimuMode >> 8 ) ;
+    if ( !( temp & ActiveCRT1 ) )
+        CR31Data |= ( SetNotSimuMode >> 8 ) ;
+    CR31Data &= ~( DisableCRT2Display >> 8 ) ;
+    if  (!( ( temp & ActiveLCD ) || ( temp & ActiveTV ) || ( temp & ActiveCRT2 ) ) )
+        CR31Data |= ( DisableCRT2Display >> 8 ) ;
+    XGINew_SetReg1( pVBInfo->P3d4, 0x31 , CR31Data ) ;
+
+    CR38Data = XGINew_GetReg1( pVBInfo->P3d4 , 0x38 ) ;
+    CR38Data &= ~SetYPbPr ;
+    CR38Data |= tempch ;
+    XGINew_SetReg1( pVBInfo->P3d4, 0x38 , CR38Data ) ;
+
+}
+
+/* -------------------------------------------------------- */
+/* Function : XGINew_GetXG21Sense */
+/* Input : */
+/* Output : */
+/* Description : */
+/* -------------------------------------------------------- */
+void XGINew_GetXG21Sense(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo)
+{
+    UCHAR Temp;
+    PUCHAR  volatile pVideoMemory = ( PUCHAR )pVBInfo->ROMAddr ;
+
+    pVBInfo->IF_DEF_LVDS = 0 ;
+
+#ifdef WIN2000
+   pVBInfo->IF_DEF_CH7007 = 0 ;
+    if ( ( pVideoMemory[ 0x65 ] & 0x02 ) )                     /* For XG21 CH7007 */
+    {
+        /* VideoDebugPrint((0, "ReadVBIOSTablData: pVideoMemory[ 0x65 ] =%x\n",pVideoMemory[ 0x65 ])); */
+        pVBInfo->IF_DEF_CH7007 = 1 ;                            /* [Billy] 07/05/03 */
+        XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x38 , ~0xE0 , 0x60 ) ; /* CH7007 on chip */
+    }
+    else
+#endif
+#if 1
+    if (( pVideoMemory[ 0x65 ] & 0x01 ) )                      /* For XG21 LVDS */
+    {
+        pVBInfo->IF_DEF_LVDS = 1 ;
+        XGINew_SetRegOR( pVBInfo->P3d4 , 0x32 , LCDSense ) ;
+        XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x38 , ~0xE0 , 0xC0 ) ; /* LVDS on chip */
+    }
+    else
+    {
+#endif
+        XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x4A , ~0x03 , 0x03 ) ; /* Enable GPIOA/B read  */
+        Temp = XGINew_GetReg1( pVBInfo->P3d4 , 0x48 ) & 0xC0;
+        if ( Temp == 0xC0 )
+        {                                                              /* DVI & DVO GPIOA/B pull high */
+          XGINew_SenseLCD( HwDeviceExtension, pVBInfo ) ;
+          XGINew_SetRegOR( pVBInfo->P3d4 , 0x32 , LCDSense ) ;
+          XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x4A , ~0x20 , 0x20 ) ;   /* Enable read GPIOF */
+          Temp = XGINew_GetReg1( pVBInfo->P3d4 , 0x48 ) & 0x04 ;
+          if ( !Temp )
+            XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x38 , ~0xE0 , 0x80 ) ; /* TMDS on chip */
+          else
+            XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x38 , ~0xE0 , 0xA0 ) ; /* Only DVO on chip */
+          XGINew_SetRegAND( pVBInfo->P3d4 , 0x4A , ~0x20 ) ;       /* Disable read GPIOF */
+        }
+#if 1
+    }
+#endif
+}
+
+/* -------------------------------------------------------- */
+/* Function : XGINew_GetXG27Sense */
+/* Input : */
+/* Output : */
+/* Description : */
+/* -------------------------------------------------------- */
+void XGINew_GetXG27Sense(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo)
+{
+    UCHAR Temp,bCR4A;
+
+     pVBInfo->IF_DEF_LVDS = 0 ;
+     bCR4A = XGINew_GetReg1( pVBInfo->P3d4 , 0x4A ) ;
+     XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x4A , ~0x07 , 0x07 ) ; /* Enable GPIOA/B/C read  */
+     Temp = XGINew_GetReg1( pVBInfo->P3d4 , 0x48 ) & 0x07;
+     XGINew_SetReg1( pVBInfo->P3d4, 0x4A , bCR4A ) ;
+
+     if ( Temp <= 0x02 )
+     {
+         pVBInfo->IF_DEF_LVDS = 1 ;
+         XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x38 , ~0xE0 , 0xC0 ) ; /* LVDS setting */
+         XGINew_SetReg1( pVBInfo->P3d4, 0x30 , 0x21 ) ;
+     }
+     else
+     {
+       XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x38 , ~0xE0 , 0xA0 ) ; /* TMDS/DVO setting */
+     }
+     XGINew_SetRegOR( pVBInfo->P3d4 , 0x32 , LCDSense ) ;
+
+}
+
+UCHAR GetXG21FPBits(PVB_DEVICE_INFO pVBInfo)
+{
+    UCHAR CR38,CR4A,temp;
+
+    CR4A = XGINew_GetReg1( pVBInfo->P3d4 , 0x4A ) ;
+    XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x4A , ~0x10 , 0x10 ) ; /* enable GPIOE read */
+    CR38 = XGINew_GetReg1( pVBInfo->P3d4 , 0x38 ) ;
+    temp =0;
+    if ( ( CR38 & 0xE0 ) > 0x80 )
+    {
+        temp = XGINew_GetReg1( pVBInfo->P3d4 , 0x48 ) ;
+        temp &= 0x08;
+        temp >>= 3;
+    }
+
+    XGINew_SetReg1( pVBInfo->P3d4, 0x4A , CR4A ) ;
+
+    return temp;
+}
+
+UCHAR GetXG27FPBits(PVB_DEVICE_INFO pVBInfo)
+{
+    UCHAR CR4A,temp;
+
+    CR4A = XGINew_GetReg1( pVBInfo->P3d4 , 0x4A ) ;
+    XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x4A , ~0x03 , 0x03 ) ; /* enable GPIOA/B/C read */
+    temp = XGINew_GetReg1( pVBInfo->P3d4 , 0x48 ) ;
+    if ( temp <= 2 )
+    {
+       temp &= 0x03;
+    }
+    else
+    {
+       temp = ((temp&0x04)>>1) || ((~temp)&0x01);
+    }
+    XGINew_SetReg1( pVBInfo->P3d4, 0x4A , CR4A ) ;
+
+    return temp;
+}
+
diff --git a/drivers/staging/xgifb/vb_init.h b/drivers/staging/xgifb/vb_init.h
new file mode 100644 (file)
index 0000000..1f39d9c
--- /dev/null
@@ -0,0 +1,7 @@
+#ifndef  _VBINIT_
+#define  _VBINIT_
+extern   BOOLEAN    XGIInitNew( PXGI_HW_DEVICE_INFO HwDeviceExtension ) ;
+extern XGI21_LVDSCapStruct  XGI21_LCDCapList[13];
+
+#endif
+
diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c
new file mode 100644 (file)
index 0000000..bd7f738
--- /dev/null
@@ -0,0 +1,10736 @@
+#include "osdef.h"
+
+#ifdef TC
+#include <stdio.h>
+#include <string.h>
+#include <conio.h>
+#include <dos.h>
+#endif
+
+
+#ifdef LINUX_XF86
+#include "xf86.h"
+#include "xf86PciInfo.h"
+#include "xgi.h"
+#include "xgi_regs.h"
+#endif
+
+#ifdef LINUX_KERNEL
+#include <asm/io.h>
+#include <linux/types.h>
+#include <linux/version.h>
+#include "XGIfb.h"
+/*#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+#include <video/XGIfb.h>
+#else
+#include <linux/XGIfb.h>
+#endif*/
+#endif
+
+#ifdef WIN2000
+#include <dderror.h>
+#include <devioctl.h>
+#include <miniport.h>
+#include <ntddvdeo.h>
+#include <video.h>
+
+#include "xgiv.h"
+#include "dd_i2c.h"
+#include "tools.h"
+#endif
+
+#include "vb_def.h"
+#include "vgatypes.h"
+#include "vb_struct.h"
+#include "vb_util.h"
+#include "vb_table.h"
+
+
+
+#define  IndexMask 0xff
+#ifndef XGI_MASK_DUAL_CHIP
+#define XGI_MASK_DUAL_CHIP       0x04  /* SR3A */
+#endif
+
+
+
+BOOLEAN  XGI_IsLCDDualLink(PVB_DEVICE_INFO pVBInfo);
+BOOLEAN  XGI_SetCRT2Group301(USHORT ModeNo, PXGI_HW_DEVICE_INFO HwDeviceExtension,PVB_DEVICE_INFO pVBInfo);
+BOOLEAN  XGI_BacklightByDrv(PVB_DEVICE_INFO pVBInfo);
+
+BOOLEAN  XGI_IsLCDON(PVB_DEVICE_INFO pVBInfo);
+BOOLEAN  XGI_DisableChISLCD(PVB_DEVICE_INFO pVBInfo);
+BOOLEAN  XGI_EnableChISLCD(PVB_DEVICE_INFO pVBInfo);
+BOOLEAN  XGI_AjustCRT2Rate(USHORT ModeNo,USHORT ModeIdIndex,USHORT RefreshRateTableIndex,USHORT *i, PVB_DEVICE_INFO pVBInfo);
+BOOLEAN  XGI_SearchModeID( USHORT ModeNo,USHORT  *ModeIdIndex, PVB_DEVICE_INFO pVBInfo);
+BOOLEAN  XGI_GetLCDInfo(USHORT ModeNo,USHORT ModeIdIndex, PVB_DEVICE_INFO pVBInfo);
+BOOLEAN  XGISetModeNew( PXGI_HW_DEVICE_INFO HwDeviceExtension , USHORT ModeNo ) ;
+BOOLEAN  XGI_BridgeIsOn(PVB_DEVICE_INFO pVBInfo);
+UCHAR    XGI_GetModePtr( USHORT ModeNo,USHORT ModeIdIndex,PVB_DEVICE_INFO pVBInfo);
+USHORT   XGI_GetOffset(USHORT ModeNo,USHORT ModeIdIndex,USHORT RefreshRateTableIndex,PXGI_HW_DEVICE_INFO HwDeviceExtension,PVB_DEVICE_INFO pVBInfo);
+USHORT   XGI_GetRatePtrCRT2( PXGI_HW_DEVICE_INFO pXGIHWDE, USHORT ModeNo,USHORT ModeIdIndex,PVB_DEVICE_INFO pVBInfo );
+USHORT   XGI_GetResInfo(USHORT ModeNo,USHORT ModeIdIndex, PVB_DEVICE_INFO pVBInfo);
+USHORT   XGI_GetColorDepth(USHORT ModeNo,USHORT ModeIdIndex,PVB_DEVICE_INFO pVBInfo);
+USHORT   XGI_GetVGAHT2(PVB_DEVICE_INFO pVBInfo);
+USHORT   XGI_GetVCLK2Ptr(USHORT ModeNo,USHORT ModeIdIndex,USHORT RefreshRateTableIndex,PXGI_HW_DEVICE_INFO HwDeviceExtension,PVB_DEVICE_INFO pVBInfo);
+void     XGI_VBLongWait(PVB_DEVICE_INFO pVBInfo);
+void     XGI_SaveCRT2Info(USHORT ModeNo, PVB_DEVICE_INFO pVBInfo);
+void     XGI_GetCRT2Data(USHORT ModeNo,USHORT ModeIdIndex,USHORT RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo);
+void     XGI_GetCRT2ResInfo(USHORT ModeNo,USHORT ModeIdIndex, PVB_DEVICE_INFO pVBInfo);
+void     XGI_PreSetGroup1(USHORT ModeNo,USHORT ModeIdIndex, PXGI_HW_DEVICE_INFO HwDeviceExtension,USHORT RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo);
+void     XGI_SetGroup1(USHORT ModeNo,USHORT ModeIdIndex, PXGI_HW_DEVICE_INFO HwDeviceExtension,USHORT RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo);
+void     XGI_SetLockRegs(USHORT ModeNo,USHORT ModeIdIndex, PXGI_HW_DEVICE_INFO HwDeviceExtension,USHORT RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo);
+void     XGI_SetLCDRegs(USHORT ModeNo,USHORT ModeIdIndex, PXGI_HW_DEVICE_INFO HwDeviceExtension,USHORT RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo);
+void     XGI_SetGroup2(USHORT ModeNo,USHORT ModeIdIndex,USHORT RefreshRateTableIndex,PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo);
+void     XGI_SetGroup3(USHORT ModeNo,USHORT ModeIdIndex, PVB_DEVICE_INFO pVBInfo);
+void     XGI_SetGroup4(USHORT ModeNo,USHORT ModeIdIndex,USHORT RefreshRateTableIndex,PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo);
+void     XGI_SetGroup5(USHORT ModeNo,USHORT ModeIdIndex, PVB_DEVICE_INFO pVBInfo);
+void*    XGI_GetLcdPtr(USHORT BX,  USHORT ModeNo, USHORT ModeIdIndex, USHORT RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo);
+void*    XGI_GetTVPtr(USHORT BX, USHORT ModeNo,USHORT ModeIdIndex,USHORT RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo);
+void    XGI_FirePWDEnable(PVB_DEVICE_INFO pVBInfo);
+void    XGI_EnableGatingCRT(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo);
+void    XGI_DisableGatingCRT(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo);
+void    XGI_SetPanelDelay(USHORT tempbl, PVB_DEVICE_INFO pVBInfo);
+void    XGI_SetPanelPower(USHORT tempah,USHORT tempbl, PVB_DEVICE_INFO pVBInfo);
+void    XGI_EnablePWD( PVB_DEVICE_INFO pVBInfo);
+void    XGI_DisablePWD( PVB_DEVICE_INFO pVBInfo);
+void     XGI_AutoThreshold( PVB_DEVICE_INFO pVBInfo);
+void     XGI_SetTap4Regs( PVB_DEVICE_INFO pVBInfo);
+
+void     XGI_DisplayOn(PXGI_HW_DEVICE_INFO, PVB_DEVICE_INFO pVBInfo);
+void     XGI_DisplayOff( PXGI_HW_DEVICE_INFO, PVB_DEVICE_INFO pVBInfo );
+void     XGI_SetCRT1Group(PXGI_HW_DEVICE_INFO HwDeviceExtension,USHORT ModeNo,USHORT ModeIdIndex,PVB_DEVICE_INFO pVBInfo);
+void     XGI_SetXG21CRTC(USHORT ModeNo, USHORT ModeIdIndex, USHORT RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo);
+void     XGI_SetXG21LCD(PVB_DEVICE_INFO pVBInfo,USHORT RefreshRateTableIndex,USHORT ModeNo);
+void     XGI_SetXG27CRTC(USHORT ModeNo, USHORT ModeIdIndex, USHORT RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo);
+void     XGI_SetXG27LCD(PVB_DEVICE_INFO pVBInfo,USHORT RefreshRateTableIndex,USHORT ModeNo);
+void    XGI_UpdateXG21CRTC(USHORT ModeNo, PVB_DEVICE_INFO pVBInfo, USHORT RefreshRateTableIndex);
+void     XGI_WaitDisply(PVB_DEVICE_INFO pVBInfo);
+void     XGI_SenseCRT1(PVB_DEVICE_INFO pVBInfo);
+void     XGI_SetSeqRegs(USHORT ModeNo,USHORT StandTableIndex,USHORT ModeIdIndex,PVB_DEVICE_INFO pVBInfo);
+void     XGI_SetMiscRegs(USHORT StandTableIndex, PVB_DEVICE_INFO pVBInfo);
+void     XGI_SetCRTCRegs(PXGI_HW_DEVICE_INFO HwDeviceExtension,USHORT StandTableIndex, PVB_DEVICE_INFO pVBInfo);
+void     XGI_SetATTRegs(USHORT ModeNo,USHORT StandTableIndex,USHORT ModeIdIndex,PVB_DEVICE_INFO pVBInfo );
+void     XGI_SetGRCRegs(USHORT StandTableIndex, PVB_DEVICE_INFO pVBInfo);
+void     XGI_ClearExt1Regs(PVB_DEVICE_INFO pVBInfo);
+
+void     XGI_SetSync(USHORT RefreshRateTableIndex,PVB_DEVICE_INFO pVBInfo);
+void     XGI_SetCRT1CRTC(USHORT ModeNo,USHORT ModeIdIndex,USHORT RefreshRateTableIndex,PVB_DEVICE_INFO pVBInfo,PXGI_HW_DEVICE_INFO HwDeviceExtension);
+void     XGI_SetCRT1Timing_H(PVB_DEVICE_INFO pVBInfo,PXGI_HW_DEVICE_INFO HwDeviceExtension);
+void     XGI_SetCRT1Timing_V(USHORT ModeIdIndex,USHORT ModeNo,PVB_DEVICE_INFO pVBInfo);
+void     XGI_SetCRT1DE(PXGI_HW_DEVICE_INFO HwDeviceExtension,USHORT ModeNo,USHORT ModeIdIndex,USHORT RefreshRateTableIndex,PVB_DEVICE_INFO pVBInfo);
+void     XGI_SetCRT1VCLK(USHORT ModeNo,USHORT ModeIdIndex,PXGI_HW_DEVICE_INFO HwDeviceExtension,USHORT RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo);
+void     XGI_SetCRT1FIFO(USHORT ModeNo,PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo);
+void     XGI_SetCRT1ModeRegs(PXGI_HW_DEVICE_INFO HwDeviceExtension,USHORT ModeNo,USHORT ModeIdIndex,USHORT RefreshRateTableIndex,PVB_DEVICE_INFO pVBInfo);
+void     XGI_SetVCLKState(PXGI_HW_DEVICE_INFO HwDeviceExtension,USHORT ModeNo,USHORT RefreshRateTableIndex,PVB_DEVICE_INFO pVBInfo);
+
+void     XGI_LoadDAC(USHORT ModeNo,USHORT ModeIdIndex,PVB_DEVICE_INFO pVBInfo);
+void     XGI_WriteDAC(USHORT dl, USHORT ah, USHORT al, USHORT dh, PVB_DEVICE_INFO pVBInfo);
+/*void     XGI_ClearBuffer(PXGI_HW_DEVICE_INFO HwDeviceExtension,USHORT ModeNo,PVB_DEVICE_INFO pVBInfo);*/
+void     XGI_SetLCDAGroup(USHORT ModeNo,USHORT ModeIdIndex,PXGI_HW_DEVICE_INFO HwDeviceExtension,PVB_DEVICE_INFO  pVBInfo);
+void     XGI_GetLVDSResInfo( USHORT ModeNo,USHORT ModeIdIndex,PVB_DEVICE_INFO  pVBInfo);
+void     XGI_GetLVDSData(USHORT ModeNo,USHORT ModeIdIndex,USHORT RefreshRateTableIndex,PVB_DEVICE_INFO  pVBInfo);
+void     XGI_ModCRT1Regs(USHORT ModeNo,USHORT ModeIdIndex,USHORT RefreshRateTableIndex,PXGI_HW_DEVICE_INFO HwDeviceExtension,PVB_DEVICE_INFO  pVBInfo);
+void     XGI_SetLVDSRegs(USHORT ModeNo,USHORT ModeIdIndex,USHORT RefreshRateTableIndex,PVB_DEVICE_INFO  pVBInfo);
+void     XGI_UpdateModeInfo(PXGI_HW_DEVICE_INFO HwDeviceExtension,PVB_DEVICE_INFO  pVBInfo);
+void     XGI_GetVGAType(PXGI_HW_DEVICE_INFO HwDeviceExtension,PVB_DEVICE_INFO  pVBInfo);
+void     XGI_GetVBType(PVB_DEVICE_INFO  pVBInfo);
+void     XGI_GetVBInfo(USHORT ModeNo,USHORT ModeIdIndex,PXGI_HW_DEVICE_INFO HwDeviceExtension,PVB_DEVICE_INFO  pVBInfo);
+void     XGI_GetTVInfo(USHORT ModeNo,USHORT ModeIdIndex,PVB_DEVICE_INFO  pVBInfo);
+void     XGI_SetCRT2ECLK( USHORT ModeNo,USHORT ModeIdIndex,USHORT RefreshRateTableIndex,PVB_DEVICE_INFO  pVBInfo);
+void     InitTo330Pointer(UCHAR,PVB_DEVICE_INFO pVBInfo);
+void     XGI_GetLCDSync(USHORT* HSyncWidth, USHORT* VSyncWidth, PVB_DEVICE_INFO pVBInfo);
+void    XGI_DisableBridge(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo);
+void    XGI_EnableBridge(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo);
+void     XGI_SetCRT2VCLK(USHORT ModeNo,USHORT ModeIdIndex,USHORT RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo);
+void     XGI_OEM310Setting(USHORT ModeNo,USHORT ModeIdIndex, PVB_DEVICE_INFO pVBInfo);
+void     XGI_SetDelayComp(PVB_DEVICE_INFO pVBInfo);
+void     XGI_SetLCDCap(PVB_DEVICE_INFO pVBInfo);
+void     XGI_SetLCDCap_A(USHORT tempcx,PVB_DEVICE_INFO pVBInfo);
+void     XGI_SetLCDCap_B(USHORT tempcx,PVB_DEVICE_INFO pVBInfo);
+void     SetSpectrum(PVB_DEVICE_INFO pVBInfo);
+void     XGI_SetAntiFlicker(USHORT ModeNo,USHORT ModeIdIndex, PVB_DEVICE_INFO pVBInfo);
+void     XGI_SetEdgeEnhance(USHORT ModeNo,USHORT ModeIdIndex, PVB_DEVICE_INFO pVBInfo);
+void     XGI_SetPhaseIncr(PVB_DEVICE_INFO pVBInfo);
+void     XGI_SetYFilter(USHORT ModeNo,USHORT ModeIdIndex, PVB_DEVICE_INFO pVBInfo);
+void     XGI_GetTVPtrIndex2(USHORT* tempbx,UCHAR* tempcl,UCHAR* tempch, PVB_DEVICE_INFO pVBInfo);
+USHORT   XGI_GetTVPtrIndex(  PVB_DEVICE_INFO pVBInfo );
+void     XGI_SetCRT2ModeRegs(USHORT ModeNo,PXGI_HW_DEVICE_INFO, PVB_DEVICE_INFO pVBInfo );
+void     XGI_CloseCRTC(PXGI_HW_DEVICE_INFO, PVB_DEVICE_INFO pVBInfo);
+void     XGI_OpenCRTC(PXGI_HW_DEVICE_INFO, PVB_DEVICE_INFO pVBInfo);
+void     XGI_GetRAMDAC2DATA(USHORT ModeNo,USHORT ModeIdIndex,USHORT RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo);
+void     XGI_UnLockCRT2(PXGI_HW_DEVICE_INFO, PVB_DEVICE_INFO pVBInfo);
+void     XGI_LockCRT2(PXGI_HW_DEVICE_INFO, PVB_DEVICE_INFO pVBInfo);
+void     XGINew_EnableCRT2(PVB_DEVICE_INFO pVBInfo);
+void     XGINew_LCD_Wait_Time(UCHAR DelayTime, PVB_DEVICE_INFO pVBInfo);
+void     XGI_LongWait(PVB_DEVICE_INFO pVBInfo);
+void     XGI_SetCRT1Offset( USHORT ModeNo , USHORT ModeIdIndex , USHORT RefreshRateTableIndex , PXGI_HW_DEVICE_INFO HwDeviceExtension,PVB_DEVICE_INFO pVBInfo );
+void     XGI_GetLCDVCLKPtr(UCHAR* di_0,UCHAR *di_1, PVB_DEVICE_INFO pVBInfo);
+UCHAR    XGI_GetVCLKPtr(USHORT RefreshRateTableIndex,USHORT ModeNo,USHORT ModeIdIndex, PVB_DEVICE_INFO pVBInfo);
+void     XGI_GetVCLKLen(UCHAR tempal,UCHAR* di_0,UCHAR* di_1, PVB_DEVICE_INFO pVBInfo);
+USHORT   XGI_GetLCDCapPtr(PVB_DEVICE_INFO pVBInfo);
+USHORT   XGI_GetLCDCapPtr1(PVB_DEVICE_INFO pVBInfo);
+XGI301C_Tap4TimingStruct* XGI_GetTap4Ptr(USHORT tempcx, PVB_DEVICE_INFO pVBInfo);
+void     XGI_SetXG21FPBits(PVB_DEVICE_INFO pVBInfo);
+void     XGI_SetXG27FPBits(PVB_DEVICE_INFO pVBInfo);
+UCHAR    XGI_XG21GetPSCValue(PVB_DEVICE_INFO pVBInfo);
+UCHAR    XGI_XG27GetPSCValue(PVB_DEVICE_INFO pVBInfo);
+void     XGI_XG21BLSignalVDD(USHORT tempbh,USHORT tempbl, PVB_DEVICE_INFO pVBInfo);
+void     XGI_XG27BLSignalVDD(USHORT tempbh,USHORT tempbl, PVB_DEVICE_INFO pVBInfo);
+void     XGI_XG21SetPanelDelay(USHORT tempbl, PVB_DEVICE_INFO pVBInfo);
+BOOLEAN  XGI_XG21CheckLVDSMode(USHORT ModeNo,USHORT ModeIdIndex, PVB_DEVICE_INFO pVBInfo );
+void     XGI_SetXG21LVDSPara(USHORT ModeNo,USHORT ModeIdIndex, PVB_DEVICE_INFO pVBInfo );
+void     XGI_SetXG27LVDSPara(USHORT ModeNo,USHORT ModeIdIndex, PVB_DEVICE_INFO pVBInfo );
+UCHAR    XGI_SetDefaultVCLK( PVB_DEVICE_INFO pVBInfo );
+
+extern   void    ReadVBIOSTablData( UCHAR ChipType , PVB_DEVICE_INFO pVBInfo);
+#ifdef WIN2000
+/* [Billy] 2007/05/17 For CH7007 */
+extern  UCHAR CH7007TVReg_UNTSC[][8],CH7007TVReg_ONTSC[][8],CH7007TVReg_UPAL[][8],CH7007TVReg_OPAL[][8];
+extern  UCHAR CH7007TVCRT1UNTSC_H[][10],CH7007TVCRT1ONTSC_H[][10],CH7007TVCRT1UPAL_H[][10],CH7007TVCRT1OPAL_H[][10] ;
+extern  UCHAR CH7007TVCRT1UNTSC_V[][10],CH7007TVCRT1ONTSC_V[][10],CH7007TVCRT1UPAL_V[][10],CH7007TVCRT1OPAL_V[][10] ;
+extern  UCHAR XGI7007_CHTVVCLKUNTSC[],XGI7007_CHTVVCLKONTSC[],XGI7007_CHTVVCLKUPAL[],XGI7007_CHTVVCLKOPAL[];
+
+extern  BOOLEAN XGI_XG21CheckCH7007TVMode(USHORT ModeNo,USHORT ModeIdIndex, PVB_DEVICE_INFO pVBInfo ) ;
+extern  void SetCH7007Regs(PXGI_HW_DEVICE_INFO HwDeviceExtension, USHORT ModeNo, USHORT ModeIdIndex, USHORT RefreshRateTableIndex, PVB_DEVICE_INFO  pVBInfo ) ;
+extern  VP_STATUS TurnOnCH7007(PHW_DEVICE_EXTENSION pHWDE) ;
+extern  VP_STATUS TurnOffCH7007(PHW_DEVICE_EXTENSION pHWDE) ;
+extern  BOOLEAN IsCH7007TVMode(PVB_DEVICE_INFO pVBInfo) ;
+#endif
+
+/* USHORT XGINew_flag_clearbuffer; 0: no clear frame buffer 1:clear frame buffer */
+
+
+
+
+
+USHORT XGINew_MDA_DAC[]={0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+               0x15,0x15,0x15,0x15,0x15,0x15,0x15,0x15,
+               0x15,0x15,0x15,0x15,0x15,0x15,0x15,0x15,
+               0x3F,0x3F,0x3F,0x3F,0x3F,0x3F,0x3F,0x3F,
+               0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+               0x15,0x15,0x15,0x15,0x15,0x15,0x15,0x15,
+               0x15,0x15,0x15,0x15,0x15,0x15,0x15,0x15,
+               0x3F,0x3F,0x3F,0x3F,0x3F,0x3F,0x3F,0x3F};
+
+USHORT XGINew_CGA_DAC[]={0x00,0x10,0x04,0x14,0x01,0x11,0x09,0x15,
+               0x00,0x10,0x04,0x14,0x01,0x11,0x09,0x15,
+               0x2A,0x3A,0x2E,0x3E,0x2B,0x3B,0x2F,0x3F,
+               0x2A,0x3A,0x2E,0x3E,0x2B,0x3B,0x2F,0x3F,
+               0x00,0x10,0x04,0x14,0x01,0x11,0x09,0x15,
+               0x00,0x10,0x04,0x14,0x01,0x11,0x09,0x15,
+               0x2A,0x3A,0x2E,0x3E,0x2B,0x3B,0x2F,0x3F,
+               0x2A,0x3A,0x2E,0x3E,0x2B,0x3B,0x2F,0x3F};
+
+USHORT XGINew_EGA_DAC[]={0x00,0x10,0x04,0x14,0x01,0x11,0x05,0x15,
+               0x20,0x30,0x24,0x34,0x21,0x31,0x25,0x35,
+               0x08,0x18,0x0C,0x1C,0x09,0x19,0x0D,0x1D,
+               0x28,0x38,0x2C,0x3C,0x29,0x39,0x2D,0x3D,
+               0x02,0x12,0x06,0x16,0x03,0x13,0x07,0x17,
+               0x22,0x32,0x26,0x36,0x23,0x33,0x27,0x37,
+               0x0A,0x1A,0x0E,0x1E,0x0B,0x1B,0x0F,0x1F,
+               0x2A,0x3A,0x2E,0x3E,0x2B,0x3B,0x2F,0x3F};
+
+USHORT XGINew_VGA_DAC[]={0x00,0x10,0x04,0x14,0x01,0x11,0x09,0x15,
+               0x2A,0x3A,0x2E,0x3E,0x2B,0x3B,0x2F,0x3F,
+               0x00,0x05,0x08,0x0B,0x0E,0x11,0x14,0x18,
+               0x1C,0x20,0x24,0x28,0x2D,0x32,0x38,0x3F,
+
+               0x00,0x10,0x1F,0x2F,0x3F,0x1F,0x27,0x2F,
+               0x37,0x3F,0x2D,0x31,0x36,0x3A,0x3F,0x00,
+               0x07,0x0E,0x15,0x1C,0x0E,0x11,0x15,0x18,
+               0x1C,0x14,0x16,0x18,0x1A,0x1C,0x00,0x04,
+               0x08,0x0C,0x10,0x08,0x0A,0x0C,0x0E,0x10,
+               0x0B,0x0C,0x0D,0x0F,0x10};
+
+
+/* --------------------------------------------------------------------- */
+/* Function : InitTo330Pointer */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void InitTo330Pointer( UCHAR ChipType ,PVB_DEVICE_INFO pVBInfo)
+{
+    pVBInfo->SModeIDTable = (XGI_StStruct *) XGI330_SModeIDTable ;
+    pVBInfo->StandTable = (XGI_StandTableStruct *) XGI330_StandTable ;
+    pVBInfo->EModeIDTable = (XGI_ExtStruct *) XGI330_EModeIDTable ;
+    pVBInfo->RefIndex = (XGI_Ext2Struct *) XGI330_RefIndex ;
+    pVBInfo->XGINEWUB_CRT1Table = (XGI_CRT1TableStruct *) XGI_CRT1Table ;
+
+    /* add for new UNIVGABIOS */
+    /* XGINew_UBLCDDataTable = (XGI_LCDDataTablStruct *) XGI_LCDDataTable ; */
+    /* XGINew_UBTVDataTable = (XGI_TVDataTablStruct *) XGI_TVDataTable ; */
+
+
+    if ( ChipType >= XG40 )
+    {
+        pVBInfo->MCLKData = (XGI_MCLKDataStruct *) XGI340New_MCLKData ;
+        pVBInfo->ECLKData = (XGI_ECLKDataStruct *) XGI340_ECLKData ;
+    }
+    else
+    {
+        pVBInfo->MCLKData = (XGI_MCLKDataStruct *) XGI330New_MCLKData ;
+        pVBInfo->ECLKData = (XGI_ECLKDataStruct *) XGI330_ECLKData ;
+    }
+
+    pVBInfo->VCLKData = (XGI_VCLKDataStruct *) XGI_VCLKData ;
+    pVBInfo->VBVCLKData = (XGI_VBVCLKDataStruct *) XGI_VBVCLKData ;
+    pVBInfo->ScreenOffset = XGI330_ScreenOffset ;
+    pVBInfo->StResInfo = (XGI_StResInfoStruct *) XGI330_StResInfo ;
+    pVBInfo->ModeResInfo = (XGI_ModeResInfoStruct *) XGI330_ModeResInfo ;
+
+    pVBInfo->pOutputSelect = &XGI330_OutputSelect ;
+    pVBInfo->pSoftSetting = &XGI330_SoftSetting ;
+    pVBInfo->pSR07 = &XGI330_SR07 ;
+    pVBInfo->LCDResInfo = 0 ;
+    pVBInfo->LCDTypeInfo = 0 ;
+    pVBInfo->LCDInfo = 0 ;
+    pVBInfo->VBInfo = 0 ;
+    pVBInfo->TVInfo = 0;
+
+
+    pVBInfo->SR15 = XGI340_SR13 ;
+    pVBInfo->CR40 = XGI340_cr41 ;
+    pVBInfo->SR25 = XGI330_sr25 ;
+    pVBInfo->pSR31 = &XGI330_sr31 ;
+    pVBInfo->pSR32 = &XGI330_sr32 ;
+    pVBInfo->CR6B = XGI340_CR6B ;
+    pVBInfo->CR6E = XGI340_CR6E ;
+    pVBInfo->CR6F = XGI340_CR6F ;
+    pVBInfo->CR89 = XGI340_CR89 ;
+    pVBInfo->AGPReg = XGI340_AGPReg ;
+    pVBInfo->SR16 = XGI340_SR16 ;
+    pVBInfo->pCRCF = &XG40_CRCF ;
+    pVBInfo->pXGINew_DRAMTypeDefinition = &XG40_DRAMTypeDefinition ;
+
+
+    pVBInfo->CR49 = XGI330_CR49 ;
+    pVBInfo->pSR1F = &XGI330_SR1F ;
+    pVBInfo->pSR21 = &XGI330_SR21 ;
+    pVBInfo->pSR22 = &XGI330_SR22 ;
+    pVBInfo->pSR23 = &XGI330_SR23 ;
+    pVBInfo->pSR24 = &XGI330_SR24 ;
+    pVBInfo->pSR33 = &XGI330_SR33 ;
+
+
+
+    pVBInfo->pCRT2Data_1_2 = &XGI330_CRT2Data_1_2 ;
+    pVBInfo->pCRT2Data_4_D = &XGI330_CRT2Data_4_D ;
+    pVBInfo->pCRT2Data_4_E = &XGI330_CRT2Data_4_E ;
+    pVBInfo->pCRT2Data_4_10 = &XGI330_CRT2Data_4_10 ;
+    pVBInfo->pRGBSenseData = &XGI330_RGBSenseData ;
+    pVBInfo->pVideoSenseData = &XGI330_VideoSenseData ;
+    pVBInfo->pYCSenseData = &XGI330_YCSenseData ;
+    pVBInfo->pRGBSenseData2 = &XGI330_RGBSenseData2 ;
+    pVBInfo->pVideoSenseData2 = &XGI330_VideoSenseData2 ;
+    pVBInfo->pYCSenseData2 = &XGI330_YCSenseData2 ;
+
+    pVBInfo->NTSCTiming = XGI330_NTSCTiming ;
+    pVBInfo->PALTiming = XGI330_PALTiming ;
+    pVBInfo->HiTVExtTiming = XGI330_HiTVExtTiming ;
+    pVBInfo->HiTVSt1Timing = XGI330_HiTVSt1Timing ;
+    pVBInfo->HiTVSt2Timing = XGI330_HiTVSt2Timing ;
+    pVBInfo->HiTVTextTiming = XGI330_HiTVTextTiming ;
+    pVBInfo->YPbPr750pTiming = XGI330_YPbPr750pTiming ;
+    pVBInfo->YPbPr525pTiming = XGI330_YPbPr525pTiming ;
+    pVBInfo->YPbPr525iTiming = XGI330_YPbPr525iTiming ;
+    pVBInfo->HiTVGroup3Data = XGI330_HiTVGroup3Data ;
+    pVBInfo->HiTVGroup3Simu = XGI330_HiTVGroup3Simu ;
+    pVBInfo->HiTVGroup3Text = XGI330_HiTVGroup3Text ;
+    pVBInfo->Ren525pGroup3 = XGI330_Ren525pGroup3 ;
+    pVBInfo->Ren750pGroup3 = XGI330_Ren750pGroup3 ;
+
+
+    pVBInfo->TimingH = (XGI_TimingHStruct *) XGI_TimingH ;
+    pVBInfo->TimingV = (XGI_TimingVStruct *) XGI_TimingV ;
+    pVBInfo->UpdateCRT1 = (XGI_XG21CRT1Struct *) XGI_UpdateCRT1Table ;
+
+    pVBInfo->CHTVVCLKUNTSC = XGI330_CHTVVCLKUNTSC ;
+    pVBInfo->CHTVVCLKONTSC = XGI330_CHTVVCLKONTSC ;
+    pVBInfo->CHTVVCLKUPAL = XGI330_CHTVVCLKUPAL ;
+    pVBInfo->CHTVVCLKOPAL = XGI330_CHTVVCLKOPAL ;
+
+    /* 310 customization related */
+    if ( ( pVBInfo->VBType & VB_XGI301LV ) || ( pVBInfo->VBType & VB_XGI302LV ) )
+        pVBInfo->LCDCapList = XGI_LCDDLCapList ;
+    else
+        pVBInfo->LCDCapList = XGI_LCDCapList ;
+
+    if ( ( ChipType == XG21 ) || ( ChipType == XG27 ) )
+        pVBInfo->XG21_LVDSCapList = XGI21_LCDCapList ;
+
+    pVBInfo->XGI_TVDelayList = XGI301TVDelayList ;
+    pVBInfo->XGI_TVDelayList2 = XGI301TVDelayList2 ;
+
+
+    pVBInfo->pXGINew_I2CDefinition = &XG40_I2CDefinition ;
+
+    if ( ChipType >= XG20 )
+       pVBInfo->pXGINew_CR97 = &XG20_CR97 ;
+
+    if ( ChipType == XG27 )
+    {
+        pVBInfo->MCLKData = (XGI_MCLKDataStruct *) XGI27New_MCLKData ;
+        pVBInfo->CR40 = XGI27_cr41 ;
+       pVBInfo->pXGINew_CR97 = &XG27_CR97 ;
+       pVBInfo->pSR36 = &XG27_SR36 ;
+       pVBInfo->pCR8F = &XG27_CR8F ;
+       pVBInfo->pCRD0 = XG27_CRD0 ;
+       pVBInfo->pCRDE = XG27_CRDE ;
+       pVBInfo->pSR40 = &XG27_SR40 ;
+       pVBInfo->pSR41 = &XG27_SR41 ;
+
+    }
+
+    if ( ChipType >= XG20 )
+    {
+       pVBInfo->pDVOSetting = &XG21_DVOSetting ;
+       pVBInfo->pCR2E = &XG21_CR2E ;
+       pVBInfo->pCR2F = &XG21_CR2F ;
+       pVBInfo->pCR46 = &XG21_CR46 ;
+       pVBInfo->pCR47 = &XG21_CR47 ;
+    }
+
+}
+
+
+
+
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGISetModeNew */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+BOOLEAN XGISetModeNew( PXGI_HW_DEVICE_INFO HwDeviceExtension , USHORT ModeNo )
+{
+    USHORT ModeIdIndex ;
+        /* PUCHAR pVBInfo->FBAddr = HwDeviceExtension->pjVideoMemoryAddress ; */
+    VB_DEVICE_INFO VBINF;
+    PVB_DEVICE_INFO pVBInfo = &VBINF;
+    pVBInfo->ROMAddr = HwDeviceExtension->pjVirtualRomBase ;
+    pVBInfo->BaseAddr = (ULONG)HwDeviceExtension->pjIOAddress ;
+    pVBInfo->IF_DEF_LVDS = 0 ;
+    pVBInfo->IF_DEF_CH7005 = 0 ;
+    pVBInfo->IF_DEF_LCDA = 1 ;
+    pVBInfo->IF_DEF_CH7017 = 0 ;
+    pVBInfo->IF_DEF_CH7007 = 0 ;                                /* [Billy] 2007/05/14 */
+    pVBInfo->IF_DEF_VideoCapture = 0 ;
+    pVBInfo->IF_DEF_ScaleLCD = 0 ;
+    pVBInfo->IF_DEF_OEMUtil = 0 ;
+    pVBInfo->IF_DEF_PWD = 0 ;
+
+
+    if ( HwDeviceExtension->jChipType >= XG20 )                        /* kuku 2004/06/25 */
+    {
+       pVBInfo->IF_DEF_YPbPr = 0 ;
+        pVBInfo->IF_DEF_HiVision = 0 ;
+        pVBInfo->IF_DEF_CRT2Monitor = 0 ;
+        pVBInfo->VBType = 0 ;  /*set VBType default 0*/
+    }
+    else if ( HwDeviceExtension->jChipType >= XG40 )
+    {
+        pVBInfo->IF_DEF_YPbPr = 1 ;
+        pVBInfo->IF_DEF_HiVision = 1 ;
+        pVBInfo->IF_DEF_CRT2Monitor = 1 ;
+    }
+    else
+    {
+        pVBInfo->IF_DEF_YPbPr = 1 ;
+        pVBInfo->IF_DEF_HiVision = 1 ;
+        pVBInfo->IF_DEF_CRT2Monitor = 0 ;
+    }
+
+    pVBInfo->P3c4 = pVBInfo->BaseAddr + 0x14 ;
+    pVBInfo->P3d4 = pVBInfo->BaseAddr + 0x24 ;
+    pVBInfo->P3c0 = pVBInfo->BaseAddr + 0x10 ;
+    pVBInfo->P3ce = pVBInfo->BaseAddr + 0x1e ;
+    pVBInfo->P3c2 = pVBInfo->BaseAddr + 0x12 ;
+    pVBInfo->P3cc = pVBInfo->BaseAddr + 0x1C ;
+    pVBInfo->P3ca = pVBInfo->BaseAddr + 0x1a ;
+    pVBInfo->P3c6 = pVBInfo->BaseAddr + 0x16 ;
+    pVBInfo->P3c7 = pVBInfo->BaseAddr + 0x17 ;
+    pVBInfo->P3c8 = pVBInfo->BaseAddr + 0x18 ;
+    pVBInfo->P3c9 = pVBInfo->BaseAddr + 0x19 ;
+    pVBInfo->P3da = pVBInfo->BaseAddr + 0x2A ;
+    pVBInfo->Part0Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_00 ;
+    pVBInfo->Part1Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_04 ;
+    pVBInfo->Part2Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_10 ;
+    pVBInfo->Part3Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_12 ;
+    pVBInfo->Part4Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_14 ;
+    pVBInfo->Part5Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_14 + 2 ;
+
+    if ( HwDeviceExtension->jChipType == XG21 )  /* for x86 Linux, XG21 LVDS */
+    {
+        if ( ( XGINew_GetReg1( pVBInfo->P3d4 , 0x38 ) & 0xE0 ) == 0xC0 )
+        {
+            pVBInfo->IF_DEF_LVDS = 1 ;
+        }
+    }
+    if ( HwDeviceExtension->jChipType == XG27 )
+    {
+        if ( ( XGINew_GetReg1( pVBInfo->P3d4 , 0x38 ) & 0xE0 ) == 0xC0 )
+        {
+          if ( XGINew_GetReg1( pVBInfo->P3d4 , 0x30 ) & 0x20 )
+          {
+            pVBInfo->IF_DEF_LVDS = 1 ;
+          }
+        }
+    }
+
+    if ( HwDeviceExtension->jChipType < XG20 )                 /* kuku 2004/06/25 */
+    XGI_GetVBType( pVBInfo ) ;
+
+    InitTo330Pointer( HwDeviceExtension->jChipType, pVBInfo ) ;
+#ifdef WIN2000
+    ReadVBIOSTablData( HwDeviceExtension->jChipType , pVBInfo) ;
+#endif
+    if ( ModeNo & 0x80 )
+    {
+        ModeNo = ModeNo & 0x7F ;
+/* XGINew_flag_clearbuffer = 0 ; */
+    }
+/*    else
+    {
+        XGINew_flag_clearbuffer = 1 ;
+    }
+*/
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x05 , 0x86 ) ;
+
+    if ( HwDeviceExtension->jChipType < XG20 )                 /* kuku 2004/06/25 1.Openkey */
+    XGI_UnLockCRT2( HwDeviceExtension , pVBInfo ) ;
+
+    XGI_SearchModeID( ModeNo , &ModeIdIndex, pVBInfo ) ;
+
+    XGI_GetVGAType(HwDeviceExtension,  pVBInfo) ;
+
+    if ( HwDeviceExtension->jChipType < XG20 )                 /* kuku 2004/06/25 */
+    {
+        XGI_GetVBInfo(ModeNo , ModeIdIndex , HwDeviceExtension, pVBInfo ) ;
+        XGI_GetTVInfo(ModeNo , ModeIdIndex, pVBInfo ) ;
+        XGI_GetLCDInfo(ModeNo , ModeIdIndex, pVBInfo ) ;
+        XGI_DisableBridge( HwDeviceExtension,pVBInfo ) ;
+/*        XGI_OpenCRTC( HwDeviceExtension, pVBInfo ) ; */
+
+        if ( pVBInfo->VBInfo & ( SetSimuScanMode | SetCRT2ToLCDA ) )
+        {
+            XGI_SetCRT1Group(HwDeviceExtension , ModeNo , ModeIdIndex, pVBInfo ) ;
+
+            if ( pVBInfo->VBInfo & SetCRT2ToLCDA )
+            {
+                XGI_SetLCDAGroup(ModeNo , ModeIdIndex , HwDeviceExtension, pVBInfo ) ;
+            }
+        }
+        else
+        {
+            if ( !( pVBInfo->VBInfo & SwitchToCRT2) )
+            {
+                XGI_SetCRT1Group( HwDeviceExtension , ModeNo , ModeIdIndex, pVBInfo ) ;
+                if ( pVBInfo->VBInfo & SetCRT2ToLCDA )
+                {
+                    XGI_SetLCDAGroup( ModeNo , ModeIdIndex , HwDeviceExtension, pVBInfo ) ;
+                }
+            }
+        }
+
+        if ( pVBInfo->VBInfo & ( SetSimuScanMode | SwitchToCRT2 ) )
+        {
+            switch( HwDeviceExtension->ujVBChipID )
+            {
+                case VB_CHIP_301:
+                    XGI_SetCRT2Group301( ModeNo , HwDeviceExtension, pVBInfo ) ;               /*add for CRT2 */
+                    break ;
+
+                case VB_CHIP_302:
+                    XGI_SetCRT2Group301(ModeNo , HwDeviceExtension, pVBInfo ) ;                /*add for CRT2 */
+                    break ;
+
+                default:
+                    break ;
+            }
+        }
+
+        XGI_SetCRT2ModeRegs( ModeNo, HwDeviceExtension,pVBInfo ) ;
+        XGI_OEM310Setting( ModeNo, ModeIdIndex,pVBInfo ) ; /*0212*/
+        XGI_CloseCRTC( HwDeviceExtension, pVBInfo ) ;
+        XGI_EnableBridge( HwDeviceExtension ,pVBInfo) ;
+    }  /* !XG20 */
+    else
+    {
+#ifdef WIN2000
+        if ( pVBInfo->IF_DEF_CH7007 == 1 )
+        {
+
+            VideoDebugPrint((0, "XGISetModeNew: pVBIfo->IF_DEF_CH7007==1\n"));
+            pVBInfo->VBType = VB_CH7007 ;
+            XGI_GetVBInfo(ModeNo , ModeIdIndex , HwDeviceExtension, pVBInfo ) ;
+            XGI_GetTVInfo(ModeNo , ModeIdIndex, pVBInfo ) ;
+            XGI_GetLCDInfo(ModeNo , ModeIdIndex, pVBInfo ) ;
+            if( !(XGI_XG21CheckCH7007TVMode(ModeNo, ModeIdIndex, pVBInfo )) )
+            {
+              return FALSE;
+            }
+        }
+#endif
+
+
+        if ( pVBInfo->IF_DEF_LVDS == 1 )
+        {
+            if ( !XGI_XG21CheckLVDSMode(ModeNo , ModeIdIndex, pVBInfo) )
+            {
+              return FALSE;
+            }
+        }
+
+        if ( ModeNo <= 0x13 )
+        {
+            pVBInfo->ModeType = pVBInfo->SModeIDTable[ ModeIdIndex ].St_ModeFlag & ModeInfoFlag;
+        }
+        else
+        {
+            pVBInfo->ModeType = pVBInfo->EModeIDTable[ ModeIdIndex ].Ext_ModeFlag & ModeInfoFlag;
+        }
+
+       pVBInfo->SetFlag = 0 ;
+        if ( pVBInfo->IF_DEF_CH7007 != 1 )
+        {
+           pVBInfo->VBInfo = DisableCRT2Display ;
+        }
+
+
+       XGI_DisplayOff(HwDeviceExtension, pVBInfo) ;
+
+       XGI_SetCRT1Group(HwDeviceExtension , ModeNo , ModeIdIndex, pVBInfo ) ;
+
+       XGI_DisplayOn( HwDeviceExtension, pVBInfo ) ;
+       /*
+       if( HwDeviceExtension->jChipType == XG21 )
+         XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x09 , ~0x80 , 0x80 ) ;
+       */
+    }
+
+
+/*
+    if ( ModeNo <= 0x13 )
+    {
+        modeflag = pVBInfo->SModeIDTable[ ModeIdIndex ].St_ModeFlag ;
+    }
+    else
+    {
+        modeflag = pVBInfo->EModeIDTable[ ModeIdIndex ].Ext_ModeFlag ;
+    }
+    pVBInfo->ModeType = modeflag&ModeInfoFlag ;
+    pVBInfo->SetFlag = 0x00 ;
+    pVBInfo->VBInfo = DisableCRT2Display ;
+    temp = XGINew_CheckMemorySize(  HwDeviceExtension , ModeNo , ModeIdIndex, pVBInfo ) ;
+
+    if ( temp == 0 )
+        return( 0 ) ;
+
+    XGI_DisplayOff( HwDeviceExtension, pVBInfo) ;
+    XGI_SetCRT1Group( HwDeviceExtension , ModeNo , ModeIdIndex, pVBInfo ) ;
+    XGI_DisplayOn( HwDeviceExtension, pVBInfo) ;
+*/
+
+    XGI_UpdateModeInfo( HwDeviceExtension, pVBInfo ) ;
+
+    if ( HwDeviceExtension->jChipType < XG20 )                 /* kuku 2004/06/25 */
+{
+    XGI_LockCRT2( HwDeviceExtension, pVBInfo ) ;
+}
+
+    return( TRUE ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_SetCRT1Group */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_SetCRT1Group( PXGI_HW_DEVICE_INFO HwDeviceExtension , USHORT ModeNo , USHORT ModeIdIndex, PVB_DEVICE_INFO pVBInfo )
+{
+    USHORT StandTableIndex ,
+           RefreshRateTableIndex ,
+           b3CC ,
+           temp ;
+
+    USHORT XGINew_P3cc =  pVBInfo->P3cc;
+
+    /* XGINew_CRT1Mode = ModeNo ; // SaveModeID */
+    StandTableIndex = XGI_GetModePtr( ModeNo , ModeIdIndex, pVBInfo ) ;
+    /* XGI_SetBIOSData(ModeNo , ModeIdIndex ) ; */
+    /* XGI_ClearBankRegs( ModeNo , ModeIdIndex ) ; */
+    XGI_SetSeqRegs( ModeNo , StandTableIndex , ModeIdIndex, pVBInfo ) ;
+    XGI_SetMiscRegs( StandTableIndex,  pVBInfo ) ;
+    XGI_SetCRTCRegs( HwDeviceExtension , StandTableIndex,  pVBInfo) ;
+    XGI_SetATTRegs( ModeNo , StandTableIndex , ModeIdIndex, pVBInfo ) ;
+    XGI_SetGRCRegs(  StandTableIndex, pVBInfo ) ;
+    XGI_ClearExt1Regs(pVBInfo) ;
+
+/* if ( pVBInfo->IF_DEF_ExpLink ) */
+    if ( HwDeviceExtension->jChipType == XG27 )
+    {
+      if ( pVBInfo->IF_DEF_LVDS == 0 )
+      {
+        XGI_SetDefaultVCLK( pVBInfo ) ;
+      }
+    }
+
+    temp = ~ProgrammingCRT2 ;
+    pVBInfo->SetFlag &= temp ;
+    pVBInfo->SelectCRT2Rate = 0 ;
+
+    if ( pVBInfo->VBType & ( VB_XGI301B | VB_XGI302B | VB_XGI301LV | VB_XGI302LV | VB_XGI301C ) )
+    {
+        if ( pVBInfo->VBInfo & ( SetSimuScanMode | SetCRT2ToLCDA | SetInSlaveMode ) )
+        {
+            pVBInfo->SetFlag |= ProgrammingCRT2 ;
+         }
+    }
+
+    RefreshRateTableIndex = XGI_GetRatePtrCRT2( HwDeviceExtension, ModeNo , ModeIdIndex, pVBInfo ) ;
+    if ( RefreshRateTableIndex != 0xFFFF )
+    {
+        XGI_SetSync( RefreshRateTableIndex, pVBInfo ) ;
+        XGI_SetCRT1CRTC( ModeNo , ModeIdIndex , RefreshRateTableIndex, pVBInfo, HwDeviceExtension ) ;
+        XGI_SetCRT1DE( HwDeviceExtension , ModeNo , ModeIdIndex , RefreshRateTableIndex, pVBInfo ) ;
+        XGI_SetCRT1Offset( ModeNo , ModeIdIndex , RefreshRateTableIndex , HwDeviceExtension, pVBInfo ) ;
+        XGI_SetCRT1VCLK( ModeNo , ModeIdIndex , HwDeviceExtension , RefreshRateTableIndex, pVBInfo ) ;
+    }
+
+    if ( ( HwDeviceExtension->jChipType >= XG20 )&&
+         ( HwDeviceExtension->jChipType < XG27 ) ) /* fix H/W DCLK/2 bug */
+    {
+       if ( ( ModeNo == 0x00 ) | (ModeNo == 0x01) )
+       {
+           XGINew_SetReg1( pVBInfo->P3c4 , 0x2B , 0x4E) ;
+           XGINew_SetReg1( pVBInfo->P3c4 , 0x2C , 0xE9) ;
+           b3CC =(UCHAR) XGINew_GetReg2(XGINew_P3cc) ;
+           XGINew_SetReg3(XGINew_P3cc ,  (b3CC |= 0x0C) ) ;
+       }
+       else if ( ( ModeNo == 0x04) | ( ModeNo == 0x05) | ( ModeNo == 0x0D) )
+       {
+           XGINew_SetReg1( pVBInfo->P3c4 , 0x2B , 0x1B) ;
+           XGINew_SetReg1( pVBInfo->P3c4 , 0x2C , 0xE3) ;
+           b3CC = (UCHAR)XGINew_GetReg2(XGINew_P3cc) ;
+           XGINew_SetReg3(XGINew_P3cc ,  (b3CC |= 0x0C) ) ;
+       }
+    }
+
+    if ( HwDeviceExtension->jChipType >= XG21 )
+    {
+      temp = XGINew_GetReg1( pVBInfo->P3d4 , 0x38 ) ;
+      if ( temp & 0xA0 )
+      {
+
+        /*XGINew_SetRegAND( pVBInfo->P3d4 , 0x4A , ~0x20 ) ;*/ /* Enable write GPIOF */
+        /*XGINew_SetRegAND( pVBInfo->P3d4 , 0x48 , ~0x20 ) ;*/         /* P. DWN */
+        /* XG21 CRT1 Timing */
+        if ( HwDeviceExtension->jChipType == XG27 )
+          XGI_SetXG27CRTC( ModeNo, ModeIdIndex, RefreshRateTableIndex, pVBInfo );
+        else
+        XGI_SetXG21CRTC( ModeNo, ModeIdIndex, RefreshRateTableIndex, pVBInfo );
+
+        XGI_UpdateXG21CRTC( ModeNo , pVBInfo , RefreshRateTableIndex) ;
+
+        if ( HwDeviceExtension->jChipType == XG27 )
+          XGI_SetXG27LCD( pVBInfo , RefreshRateTableIndex , ModeNo );
+        else
+          XGI_SetXG21LCD( pVBInfo , RefreshRateTableIndex , ModeNo );
+
+        if ( pVBInfo->IF_DEF_LVDS == 1 )
+        {
+          if ( HwDeviceExtension->jChipType == XG27 )
+            XGI_SetXG27LVDSPara(ModeNo,ModeIdIndex, pVBInfo );
+          else
+            XGI_SetXG21LVDSPara(ModeNo,ModeIdIndex, pVBInfo );
+        }
+        /*XGINew_SetRegOR( pVBInfo->P3d4 , 0x48 , 0x20 ) ;*/   /* P. ON */
+      }
+    }
+
+    pVBInfo->SetFlag &= ( ~ProgrammingCRT2 ) ;
+    XGI_SetCRT1FIFO(  ModeNo , HwDeviceExtension,  pVBInfo ) ;
+    XGI_SetCRT1ModeRegs(  HwDeviceExtension , ModeNo , ModeIdIndex , RefreshRateTableIndex , pVBInfo) ;
+
+
+    /* XGI_LoadCharacter(); //dif ifdef TVFont */
+
+    XGI_LoadDAC( ModeNo , ModeIdIndex, pVBInfo ) ;
+    /* XGI_ClearBuffer( HwDeviceExtension , ModeNo, pVBInfo ) ; */
+#ifdef WIN2000
+   if ( pVBInfo->IF_DEF_CH7007 == 1 )  /* [Billy]  2007/05/14  */
+   {
+       VideoDebugPrint((0, "XGI_SetCRT1Group: VBInfo->IF_DEF_CH7007==1\n"));
+       SetCH7007Regs(HwDeviceExtension, ModeNo, ModeIdIndex, RefreshRateTableIndex, pVBInfo ) ; /* 07/05/28 */
+   }
+#endif
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_GetModePtr */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+UCHAR XGI_GetModePtr( USHORT ModeNo , USHORT ModeIdIndex, PVB_DEVICE_INFO pVBInfo )
+{
+    UCHAR index ;
+
+    if ( ModeNo <= 0x13 )
+        index = pVBInfo->SModeIDTable[ ModeIdIndex ].St_StTableIndex ;
+    else
+    {
+        if ( pVBInfo->ModeType <= 0x02 )
+            index = 0x1B ;     /* 02 -> ModeEGA */
+        else
+            index = 0x0F ;
+    }
+    return( index ) ;          /* Get pVBInfo->StandTable index */
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_SetBIOSData */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+/*UCHAR XGI_SetBIOSData( USHORT ModeNo , USHORT ModeIdIndex )
+{
+    return( 0 ) ;
+}
+*/
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_ClearBankRegs */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+/*UCHAR XGI_ClearBankRegs( USHORT ModeNo , USHORT ModeIdIndex )
+{
+    return( 0 ) ;
+}
+*/
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_SetSeqRegs */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_SetSeqRegs(  USHORT ModeNo , USHORT StandTableIndex , USHORT ModeIdIndex, PVB_DEVICE_INFO pVBInfo )
+{
+    UCHAR tempah ,
+          SRdata ;
+
+    USHORT i ,
+           modeflag ;
+
+    if ( ModeNo <= 0x13 )
+        modeflag = pVBInfo->SModeIDTable[ ModeIdIndex ].St_ModeFlag ;
+    else
+        modeflag = pVBInfo->EModeIDTable[ ModeIdIndex ].Ext_ModeFlag ;
+
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x00 , 0x03 ) ;            /* Set SR0 */
+    tempah=pVBInfo->StandTable[ StandTableIndex ].SR[ 0 ] ;
+
+    i = SetCRT2ToLCDA ;
+    if ( pVBInfo->VBInfo & SetCRT2ToLCDA )
+    {
+        tempah |= 0x01 ;
+    }
+    else
+    {
+        if ( pVBInfo->VBInfo & ( SetCRT2ToTV | SetCRT2ToLCD ) )
+        {
+            if ( pVBInfo->VBInfo & SetInSlaveMode )
+                tempah |= 0x01 ;
+        }
+    }
+
+    tempah |= 0x20 ;           /* screen off */
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x01 , tempah ) ;          /* Set SR1 */
+
+    for( i = 02 ; i <= 04 ; i++ )
+    {
+        SRdata = pVBInfo->StandTable[ StandTableIndex ].SR[ i - 1 ] ;  /* Get SR2,3,4 from file */
+        XGINew_SetReg1( pVBInfo->P3c4 , i , SRdata ) ;                         /* Set SR2 3 4 */
+    }
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_SetMiscRegs */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_SetMiscRegs( USHORT StandTableIndex, PVB_DEVICE_INFO pVBInfo )
+{
+    UCHAR Miscdata ;
+
+    Miscdata = pVBInfo->StandTable[ StandTableIndex ].MISC ;   /* Get Misc from file */
+/*
+    if ( pVBInfo->VBType & ( VB_XGI301B | VB_XGI302B | VB_XGI301LV | VB_XGI302LV | VB_XGI301C ) )
+    {
+        if ( pVBInfo->VBInfo & SetCRT2ToLCDA )
+        {
+            Miscdata |= 0x0C ;
+        }
+    }
+*/
+
+    XGINew_SetReg3( pVBInfo->P3c2 , Miscdata ) ;               /* Set Misc(3c2) */
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_SetCRTCRegs */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_SetCRTCRegs( PXGI_HW_DEVICE_INFO HwDeviceExtension , USHORT StandTableIndex, PVB_DEVICE_INFO pVBInfo )
+{
+    UCHAR CRTCdata ;
+    USHORT i ;
+
+    CRTCdata = ( UCHAR )XGINew_GetReg1( pVBInfo->P3d4 , 0x11 ) ;
+    CRTCdata &= 0x7f ;
+    XGINew_SetReg1( pVBInfo->P3d4 , 0x11 , CRTCdata ) ;                /* Unlock CRTC */
+
+    for( i = 0 ; i <= 0x18 ; i++ )
+    {
+        CRTCdata = pVBInfo->StandTable[ StandTableIndex ].CRTC[ i ] ;  /* Get CRTC from file */
+        XGINew_SetReg1( pVBInfo->P3d4 , i , CRTCdata ) ;                               /* Set CRTC( 3d4 ) */
+    }
+/*
+    if ( ( HwDeviceExtension->jChipType == XGI_630 )&& ( HwDeviceExtension->jChipRevision == 0x30 ) )
+    {
+        if ( pVBInfo->VBInfo & SetInSlaveMode )
+        {
+            if ( pVBInfo->VBInfo & ( SetCRT2ToLCD | SetCRT2ToTV ) )
+            {
+                XGINew_SetReg1( pVBInfo->P3d4 , 0x18 , 0xFE ) ;
+            }
+        }
+    }
+*/
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_SetATTRegs( USHORT ModeNo , USHORT StandTableIndex , USHORT ModeIdIndex, PVB_DEVICE_INFO pVBInfo )
+{
+    UCHAR ARdata ;
+    USHORT i ,
+           modeflag ;
+
+    if ( ModeNo <= 0x13 )
+        modeflag = pVBInfo->SModeIDTable[ ModeIdIndex ].St_ModeFlag ;
+    else
+        modeflag = pVBInfo->EModeIDTable[ ModeIdIndex ].Ext_ModeFlag ;
+
+    for( i = 0 ; i <= 0x13 ; i++ )
+    {
+        ARdata = pVBInfo->StandTable[ StandTableIndex ].ATTR[ i ] ;
+        if ( modeflag & Charx8Dot )    /* ifndef Dot9 */
+        {
+            if ( i == 0x13 )
+            {
+                if ( pVBInfo->VBInfo & SetCRT2ToLCDA )
+                    ARdata = 0 ;
+                else
+                {
+                    if ( pVBInfo->VBInfo & ( SetCRT2ToTV | SetCRT2ToLCD ) )
+                    {
+                        if ( pVBInfo->VBInfo & SetInSlaveMode )
+                            ARdata = 0 ;
+                    }
+                }
+            }
+        }
+
+        XGINew_GetReg2( pVBInfo->P3da ) ;                      /* reset 3da */
+        XGINew_SetReg3( pVBInfo->P3c0 , i ) ;          /* set index */
+        XGINew_SetReg3( pVBInfo->P3c0 , ARdata ) ;     /* set data */
+    }
+
+    XGINew_GetReg2( pVBInfo->P3da ) ;                  /* reset 3da */
+    XGINew_SetReg3( pVBInfo->P3c0 , 0x14 ) ;           /* set index */
+    XGINew_SetReg3( pVBInfo->P3c0 , 0x00 ) ;           /* set data */
+    XGINew_GetReg2( pVBInfo->P3da ) ;                  /* Enable Attribute */
+    XGINew_SetReg3( pVBInfo->P3c0 , 0x20 ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_SetGRCRegs */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_SetGRCRegs( USHORT StandTableIndex, PVB_DEVICE_INFO pVBInfo )
+{
+    UCHAR GRdata ;
+    USHORT i ;
+
+    for( i = 0 ; i <= 0x08 ; i++ )
+    {
+        GRdata = pVBInfo->StandTable[ StandTableIndex ].GRC[ i ] ;     /* Get GR from file */
+        XGINew_SetReg1( pVBInfo->P3ce , i , GRdata ) ;                 /* Set GR(3ce) */
+    }
+
+    if ( pVBInfo->ModeType > ModeVGA )
+    {
+        GRdata = ( UCHAR )XGINew_GetReg1( pVBInfo->P3ce , 0x05 ) ;
+        GRdata &= 0xBF ;                                               /* 256 color disable */
+        XGINew_SetReg1( pVBInfo->P3ce , 0x05 , GRdata ) ;
+    }
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_ClearExt1Regs */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_ClearExt1Regs(PVB_DEVICE_INFO pVBInfo)
+{
+    USHORT i ;
+
+    for( i = 0x0A ; i <= 0x0E ; i++ )
+        XGINew_SetReg1( pVBInfo->P3c4 , i , 0x00 ) ;   /* Clear SR0A-SR0E */
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_SetDefaultVCLK */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+UCHAR XGI_SetDefaultVCLK( PVB_DEVICE_INFO pVBInfo )
+{
+
+    XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x31 , ~0x30 , 0x20 ) ;
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x2B , pVBInfo->VCLKData[ 0 ].SR2B ) ;
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x2C , pVBInfo->VCLKData[ 0 ].SR2C ) ;
+
+    XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x31 , ~0x30 , 0x10 ) ;
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x2B , pVBInfo->VCLKData[ 1 ].SR2B ) ;
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x2C , pVBInfo->VCLKData[ 1 ].SR2C ) ;
+
+    XGINew_SetRegAND( pVBInfo->P3c4 , 0x31 , ~0x30 ) ;
+    return( 0 ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_GetRatePtrCRT2 */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+USHORT XGI_GetRatePtrCRT2( PXGI_HW_DEVICE_INFO pXGIHWDE, USHORT ModeNo , USHORT ModeIdIndex, PVB_DEVICE_INFO pVBInfo )
+{
+    SHORT  LCDRefreshIndex[] = { 0x00 , 0x00 , 0x03 , 0x01 } ,
+           LCDARefreshIndex[] = { 0x00 , 0x00 , 0x03 , 0x01 , 0x01 , 0x01 , 0x01 } ;
+
+    USHORT RefreshRateTableIndex , i ,
+         modeflag , index , temp ;
+
+    if ( ModeNo <= 0x13 )
+    {
+        modeflag = pVBInfo->SModeIDTable[ ModeIdIndex ].St_ModeFlag ;
+    }
+    else
+    {
+        modeflag = pVBInfo->EModeIDTable[ ModeIdIndex ].Ext_ModeFlag ;
+    }
+
+    if ( pVBInfo->IF_DEF_CH7005 == 1 )
+    {
+        if ( pVBInfo->VBInfo & SetCRT2ToTV )
+        {
+            if ( modeflag & HalfDCLK )
+                return( 0 ) ;
+        }
+    }
+
+    if ( ModeNo < 0x14 )
+        return( 0xFFFF ) ;
+
+    index = XGINew_GetReg1( pVBInfo->P3d4 , 0x33 ) ;
+    index = index >> pVBInfo->SelectCRT2Rate ;
+    index &= 0x0F ;
+
+    if ( pVBInfo->LCDInfo & LCDNonExpanding )
+        index = 0 ;
+
+    if ( index > 0 )
+        index-- ;
+
+    if ( pVBInfo->SetFlag & ProgrammingCRT2 )
+    {
+        if ( pVBInfo->IF_DEF_CH7005 == 1 )
+        {
+            if ( pVBInfo->VBInfo & SetCRT2ToTV )
+            {
+                index = 0 ;
+            }
+        }
+
+        if ( pVBInfo->VBInfo & ( SetCRT2ToLCD | SetCRT2ToLCDA ) )
+        {
+            if( pVBInfo->IF_DEF_LVDS == 0 )
+            {
+                if ( pVBInfo->VBType & ( VB_XGI301B | VB_XGI302B | VB_XGI301LV | VB_XGI302LV | VB_XGI301C ) )
+                    temp = LCDARefreshIndex[ pVBInfo->LCDResInfo & 0x0F ] ;     /* 301b */
+                else
+                    temp = LCDRefreshIndex[ pVBInfo->LCDResInfo & 0x0F ] ;
+
+                if ( index > temp )
+                {
+                    index = temp ;
+                }
+            }
+            else
+            {
+                index = 0 ;
+            }
+        }
+    }
+
+    RefreshRateTableIndex = pVBInfo->EModeIDTable[ ModeIdIndex ].REFindex ;
+    ModeNo = pVBInfo->RefIndex[ RefreshRateTableIndex ].ModeID ;
+    if ( pXGIHWDE->jChipType >= XG20 )  /* for XG20, XG21, XG27 */
+    {
+      /*
+      if ( pVBInfo->RefIndex[ RefreshRateTableIndex ].Ext_InfoFlag & XG2xNotSupport )
+      {
+        index++;
+      }
+      */
+      if ( ( pVBInfo->RefIndex[ RefreshRateTableIndex ].XRes == 800 ) &&
+           ( pVBInfo->RefIndex[ RefreshRateTableIndex ].YRes == 600 ) )
+      {
+        index++;
+      }
+/* Alan 10/19/2007; do the similiar adjustment like XGISearchCRT1Rate() */
+      if ( ( pVBInfo->RefIndex[ RefreshRateTableIndex ].XRes == 1024 ) &&
+           ( pVBInfo->RefIndex[ RefreshRateTableIndex ].YRes == 768 ) )
+      {
+        index++;
+      }
+      if ( ( pVBInfo->RefIndex[ RefreshRateTableIndex ].XRes == 1280 ) &&
+           ( pVBInfo->RefIndex[ RefreshRateTableIndex ].YRes == 1024 ) )
+      {
+        index++;
+      }
+    }
+
+    i = 0 ;
+    do
+    {
+        if ( pVBInfo->RefIndex[ RefreshRateTableIndex + i ].ModeID != ModeNo )
+            break ;
+        temp = pVBInfo->RefIndex[ RefreshRateTableIndex + i ].Ext_InfoFlag ;
+        temp &= ModeInfoFlag ;
+        if ( temp < pVBInfo->ModeType )
+            break ;
+        i++ ;
+        index-- ;
+
+    } while( index != 0xFFFF ) ;
+    if ( !( pVBInfo->VBInfo & SetCRT2ToRAMDAC ) )
+    {
+        if ( pVBInfo->VBInfo & SetInSlaveMode )
+        {
+            temp = pVBInfo->RefIndex[ RefreshRateTableIndex + i - 1 ].Ext_InfoFlag ;
+            if ( temp & InterlaceMode )
+            {
+                i++ ;
+            }
+        }
+    }
+    i-- ;
+    if ( ( pVBInfo->SetFlag & ProgrammingCRT2 ) )
+    {
+        temp = XGI_AjustCRT2Rate( ModeNo , ModeIdIndex , RefreshRateTableIndex , &i, pVBInfo) ;
+    }
+    return( RefreshRateTableIndex + i ) ;                /*return(0x01|(temp1<<1));   */
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_AjustCRT2Rate */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+BOOLEAN XGI_AjustCRT2Rate( USHORT ModeNo , USHORT ModeIdIndex , USHORT RefreshRateTableIndex , USHORT *i, PVB_DEVICE_INFO pVBInfo )
+{
+    USHORT tempax ,
+           tempbx ,
+           resinfo ,
+           modeflag ,
+           infoflag ;
+
+    if ( ModeNo <= 0x13 )
+    {
+        modeflag = pVBInfo->SModeIDTable[ ModeIdIndex ].St_ModeFlag ;  /* si+St_ModeFlag */
+    }
+    else
+    {
+        modeflag = pVBInfo->EModeIDTable[ ModeIdIndex ].Ext_ModeFlag ;
+    }
+
+    resinfo = pVBInfo->EModeIDTable[ ModeIdIndex ].Ext_RESINFO ;
+    tempbx = pVBInfo->RefIndex[ RefreshRateTableIndex + ( *i ) ].ModeID ;
+    tempax = 0 ;
+
+    if ( pVBInfo->IF_DEF_LVDS == 0 )
+    {
+        if ( pVBInfo->VBInfo & SetCRT2ToRAMDAC )
+        {
+            tempax |= SupportRAMDAC2 ;
+
+            if ( pVBInfo->VBType & VB_XGI301C )
+                tempax |= SupportCRT2in301C ;
+        }
+
+        if ( pVBInfo->VBInfo & ( SetCRT2ToLCD | SetCRT2ToLCDA ) )      /* 301b */
+        {
+            tempax |= SupportLCD ;
+
+            if ( pVBInfo->LCDResInfo != Panel1280x1024 )
+            {
+                if ( pVBInfo->LCDResInfo != Panel1280x960 )
+                {
+                    if ( pVBInfo->LCDInfo & LCDNonExpanding )
+                    {
+                        if ( resinfo >= 9 )
+                        {
+                            tempax = 0 ;
+                            return( 0 ) ;
+                        }
+                    }
+                }
+            }
+        }
+
+        if ( pVBInfo->VBInfo & SetCRT2ToHiVisionTV )   /* for HiTV */
+        {
+            if ( ( pVBInfo->VBType & VB_XGI301LV ) && ( pVBInfo->VBExtInfo == VB_YPbPr1080i ) )
+            {
+                tempax |= SupportYPbPr ;
+                if ( pVBInfo->VBInfo & SetInSlaveMode )
+                {
+                    if ( resinfo == 4 )
+                        return( 0 ) ;
+
+                    if ( resinfo == 3 )
+                        return( 0 ) ;
+
+                    if ( resinfo > 7 )
+                        return( 0 ) ;
+                }
+            }
+            else
+            {
+                tempax |= SupportHiVisionTV ;
+                if ( pVBInfo->VBInfo & SetInSlaveMode )
+                {
+                    if ( resinfo == 4 )
+                        return( 0 ) ;
+
+                    if ( resinfo == 3 )
+                    {
+                        if ( pVBInfo->SetFlag & TVSimuMode )
+                            return( 0 ) ;
+                    }
+
+                    if ( resinfo > 7 )
+                        return( 0 ) ;
+                }
+            }
+        }
+        else
+        {
+            if ( pVBInfo->VBInfo & ( SetCRT2ToAVIDEO | SetCRT2ToSVIDEO | SetCRT2ToSCART | SetCRT2ToYPbPr | SetCRT2ToHiVisionTV ) )
+            {
+                tempax |= SupportTV ;
+
+                if ( pVBInfo->VBType & ( VB_XGI301B | VB_XGI302B | VB_XGI301LV | VB_XGI302LV | VB_XGI301C ) )
+                {
+                    tempax |= SupportTV1024 ;
+                }
+
+                if ( !( pVBInfo->VBInfo & SetPALTV ) )
+                {
+                    if ( modeflag & NoSupportSimuTV )
+                    {
+                        if ( pVBInfo->VBInfo & SetInSlaveMode )
+                        {
+                            if ( !( pVBInfo->VBInfo & SetNotSimuMode ) )
+                            {
+                               return( 0 ) ;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    else               /* for LVDS */
+    {
+        if ( pVBInfo->IF_DEF_CH7005 == 1 )
+        {
+            if ( pVBInfo->VBInfo & SetCRT2ToTV )
+            {
+                tempax |= SupportCHTV ;
+            }
+        }
+
+        if ( pVBInfo->VBInfo & SetCRT2ToLCD )
+        {
+            tempax |= SupportLCD ;
+
+            if ( resinfo > 0x08 )
+                return( 0 ) ;          /* 1024x768 */
+
+            if ( pVBInfo->LCDResInfo < Panel1024x768 )
+            {
+                if ( resinfo > 0x07 )
+                    return( 0 ) ;      /* 800x600 */
+
+                if ( resinfo == 0x04 )
+                    return( 0 ) ;      /* 512x384 */
+            }
+        }
+    }
+
+    for( ; pVBInfo->RefIndex[ RefreshRateTableIndex + ( *i ) ].ModeID == tempbx ; ( *i )-- )
+    {
+        infoflag = pVBInfo->RefIndex[ RefreshRateTableIndex + ( *i ) ].Ext_InfoFlag ;
+        if ( infoflag & tempax )
+        {
+            return( 1 ) ;
+        }
+        if ( ( *i ) == 0 )
+            break ;
+    }
+
+    for( ( *i ) = 0 ; ; ( *i )++ )
+    {
+        infoflag = pVBInfo->RefIndex[ RefreshRateTableIndex + ( *i ) ].Ext_InfoFlag ;
+        if ( pVBInfo->RefIndex[ RefreshRateTableIndex + ( *i ) ].ModeID != tempbx )
+        {
+            return( 0 ) ;
+        }
+
+        if ( infoflag & tempax )
+        {
+            return( 1 ) ;
+        }
+    }
+    return( 1 ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_SetSync */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_SetSync(USHORT RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo )
+{
+    USHORT sync ,
+           temp ;
+
+    sync = pVBInfo->RefIndex[ RefreshRateTableIndex ].Ext_InfoFlag >> 8 ;      /* di+0x00 */
+    sync &= 0xC0 ;
+    temp = 0x2F ;
+    temp |= sync ;
+    XGINew_SetReg3( pVBInfo->P3c2 , temp ) ;                           /* Set Misc(3c2) */
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_SetCRT1CRTC */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_SetCRT1CRTC( USHORT ModeNo , USHORT ModeIdIndex , USHORT RefreshRateTableIndex,PVB_DEVICE_INFO pVBInfo, PXGI_HW_DEVICE_INFO HwDeviceExtension )
+{
+    UCHAR  index ,
+           data ;
+
+    USHORT i ;
+
+    index = pVBInfo->RefIndex[ RefreshRateTableIndex ].Ext_CRT1CRTC ;  /* Get index */
+    index = index&IndexMask ;
+
+    data =( UCHAR )XGINew_GetReg1( pVBInfo->P3d4 , 0x11 ) ;
+    data &= 0x7F ;
+    XGINew_SetReg1(pVBInfo->P3d4,0x11,data);                           /* Unlock CRTC */
+
+    for( i = 0 ; i < 8 ; i++ )
+        pVBInfo->TimingH[ 0 ].data[ i ] = pVBInfo->XGINEWUB_CRT1Table[ index ].CR[ i ] ;
+
+    for( i = 0 ; i < 7 ; i++ )
+        pVBInfo->TimingV[ 0 ].data[ i ] = pVBInfo->XGINEWUB_CRT1Table[ index ].CR[ i + 8 ] ;
+
+    XGI_SetCRT1Timing_H( pVBInfo, HwDeviceExtension ) ;
+
+
+
+    XGI_SetCRT1Timing_V( ModeIdIndex , ModeNo, pVBInfo ) ;
+
+
+    if( pVBInfo->ModeType > 0x03 )
+        XGINew_SetReg1( pVBInfo->P3d4 , 0x14 , 0x4F ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_SetCRT1Timing_H */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_SetCRT1Timing_H( PVB_DEVICE_INFO pVBInfo, PXGI_HW_DEVICE_INFO HwDeviceExtension )
+{
+    UCHAR data , data1, pushax;
+    USHORT i , j ;
+
+    /* XGINew_SetReg1( pVBInfo->P3d4 , 0x51 , 0 ) ; */
+    /* XGINew_SetReg1( pVBInfo->P3d4 , 0x56 , 0 ) ; */
+    /* XGINew_SetRegANDOR( pVBInfo->P3d4 ,0x11 , 0x7f , 0x00 ) ; */
+
+    data = ( UCHAR )XGINew_GetReg1( pVBInfo->P3d4 , 0x11 ) ;           /* unlock cr0-7 */
+    data &= 0x7F ;
+    XGINew_SetReg1( pVBInfo->P3d4 , 0x11 , data ) ;
+
+    data = pVBInfo->TimingH[ 0 ].data[ 0 ] ;
+    XGINew_SetReg1( pVBInfo->P3d4 , 0 , data ) ;
+
+    for( i = 0x01 ; i <= 0x04 ; i++ )
+    {
+        data = pVBInfo->TimingH[ 0 ].data[ i ] ;
+        XGINew_SetReg1( pVBInfo->P3d4 , ( USHORT )( i + 1 ) , data ) ;
+    }
+
+    for( i = 0x05 ; i <= 0x06 ; i++ )
+    {
+        data = pVBInfo->TimingH[ 0 ].data[ i ];
+        XGINew_SetReg1( pVBInfo->P3c4 ,( USHORT )( i + 6 ) , data ) ;
+    }
+
+    j = ( UCHAR )XGINew_GetReg1( pVBInfo->P3c4 , 0x0e ) ;
+    j &= 0x1F ;
+    data = pVBInfo->TimingH[ 0 ].data[ 7 ] ;
+    data &= 0xE0 ;
+    data |= j ;
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x0e , data ) ;
+
+    if ( HwDeviceExtension->jChipType >= XG20 )
+    {
+       data = ( UCHAR )XGINew_GetReg1( pVBInfo->P3d4 , 0x04 ) ;
+       data = data - 1 ;
+       XGINew_SetReg1( pVBInfo->P3d4 , 0x04 , data ) ;
+       data = ( UCHAR )XGINew_GetReg1( pVBInfo->P3d4 , 0x05 ) ;
+       data1 = data ;
+       data1 &= 0xE0 ;
+       data &= 0x1F ;
+       if ( data == 0 )
+       {
+           pushax = data ;
+           data = ( UCHAR )XGINew_GetReg1( pVBInfo->P3c4 , 0x0c ) ;
+           data &= 0xFB ;
+           XGINew_SetReg1( pVBInfo->P3c4 , 0x0c , data ) ;
+           data = pushax ;
+       }
+       data = data - 1 ;
+       data |= data1 ;
+       XGINew_SetReg1( pVBInfo->P3d4 , 0x05 , data ) ;
+       data = ( UCHAR )XGINew_GetReg1( pVBInfo->P3c4 , 0x0e ) ;
+       data = data >> 5 ;
+       data = data + 3 ;
+       if ( data > 7 )
+           data = data - 7 ;
+       data = data << 5 ;
+       XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x0e , ~0xE0 , data ) ;
+    }
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_SetCRT1Timing_V */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_SetCRT1Timing_V( USHORT ModeIdIndex , USHORT ModeNo,PVB_DEVICE_INFO pVBInfo )
+{
+    UCHAR data ;
+    USHORT i , j ;
+
+    /* XGINew_SetReg1( pVBInfo->P3d4 , 0x51 , 0 ) ; */
+    /* XGINew_SetReg1( pVBInfo->P3d4 , 0x56 , 0 ) ; */
+    /* XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x11 , 0x7f , 0x00 ) ; */
+
+    for( i = 0x00 ; i <= 0x01 ; i++ )
+    {
+        data = pVBInfo->TimingV[ 0 ].data[ i ] ;
+        XGINew_SetReg1( pVBInfo->P3d4 , ( USHORT )( i + 6 ) , data ) ;
+    }
+
+    for( i = 0x02 ; i <= 0x03 ; i++ )
+    {
+        data = pVBInfo->TimingV[ 0 ].data[ i ] ;
+        XGINew_SetReg1( pVBInfo->P3d4 , ( USHORT )( i + 0x0e ) , data ) ;
+    }
+
+    for( i = 0x04 ; i <= 0x05 ; i++ )
+    {
+        data = pVBInfo->TimingV[ 0 ].data[ i ] ;
+        XGINew_SetReg1( pVBInfo->P3d4 , ( USHORT )( i + 0x11 ) , data ) ;
+    }
+
+    j = ( UCHAR )XGINew_GetReg1( pVBInfo->P3c4 , 0x0a ) ;
+    j &= 0xC0 ;
+    data = pVBInfo->TimingV[ 0 ].data[ 6 ] ;
+    data &= 0x3F ;
+    data |= j ;
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x0a , data ) ;
+
+    data = pVBInfo->TimingV[ 0 ].data[ 6 ] ;
+    data &= 0x80 ;
+    data = data >> 2 ;
+
+    if ( ModeNo <= 0x13 )
+        i = pVBInfo->SModeIDTable[ ModeIdIndex ].St_ModeFlag ;
+    else
+        i = pVBInfo->EModeIDTable[ ModeIdIndex ].Ext_ModeFlag ;
+
+    i &= DoubleScanMode ;
+    if ( i )
+        data |= 0x80 ;
+
+    j = ( UCHAR )XGINew_GetReg1( pVBInfo->P3d4 , 0x09 ) ;
+    j &= 0x5F ;
+    data |= j ;
+    XGINew_SetReg1( pVBInfo->P3d4 , 0x09 , data ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_SetXG21CRTC */
+/* Input : Stand or enhance CRTC table */
+/* Output : Fill CRT Hsync/Vsync to SR2E/SR2F/SR30/SR33/SR34/SR3F */
+/* Description : Set LCD timing */
+/* --------------------------------------------------------------------- */
+void XGI_SetXG21CRTC(USHORT ModeNo, USHORT ModeIdIndex, USHORT RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo)
+{
+  UCHAR StandTableIndex, index, Tempax, Tempbx, Tempcx, Tempdx ;
+  USHORT Temp1, Temp2, Temp3 ;
+
+  if ( ModeNo <= 0x13 )
+  {
+    StandTableIndex = XGI_GetModePtr( ModeNo , ModeIdIndex, pVBInfo ) ;
+    Tempax = pVBInfo->StandTable[ StandTableIndex ].CRTC[ 4 ] ;                /* CR04 HRS */
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x2E , Tempax ) ;                  /* SR2E [7:0]->HRS */
+    Tempbx = pVBInfo->StandTable[ StandTableIndex ].CRTC[ 5 ] ;                /* Tempbx: CR05 HRE */
+    Tempbx &= 0x1F ;                                                   /* Tempbx: HRE[4:0] */
+    Tempcx = Tempax ;
+    Tempcx &=  0xE0 ;                                                  /* Tempcx: HRS[7:5] */
+    Tempdx = Tempcx | Tempbx ;                                         /* Tempdx(HRE): HRS[7:5]HRE[4:0] */
+    if ( Tempbx < ( Tempax & 0x1F ) )                                  /* IF HRE < HRS */
+      Tempdx |= 0x20 ;                                                 /* Tempdx: HRE = HRE + 0x20 */
+    Tempdx <<= 2 ;                                                     /* Tempdx << 2 */
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x2F , Tempdx ) ;                  /* SR2F [7:2]->HRE */
+    XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x30 , 0xE3 , 00 ) ;
+
+    Tempax = pVBInfo->StandTable[ StandTableIndex ].CRTC[ 16 ] ;       /* Tempax: CR16 VRS */
+    Tempbx = Tempax ;                                                  /* Tempbx=Tempax */
+    Tempax &= 0x01 ;                                                   /* Tempax: VRS[0] */
+    XGINew_SetRegOR( pVBInfo->P3c4 , 0x33 , Tempax ) ;                 /* SR33[0]->VRS */
+    Tempax = pVBInfo->StandTable[ StandTableIndex ].CRTC[ 7 ] ;                /* Tempax: CR7 VRS */
+    Tempdx = Tempbx >> 1 ;                                             /* Tempdx: VRS[7:1] */
+    Tempcx = Tempax & 0x04 ;                                           /* Tempcx: CR7[2] */
+    Tempcx <<= 5 ;                                                     /* Tempcx[7]: VRS[8] */
+    Tempdx |= Tempcx ;                                                 /* Tempdx: VRS[8:1] */
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x34 , Tempdx ) ;                  /* SR34[7:0]: VRS[8:1] */
+
+    Temp1 = Tempcx << 1 ;                                              /* Temp1[8]: VRS[8] UCHAR -> USHORT */
+    Temp1 |= Tempbx ;                                                  /* Temp1[8:0]: VRS[8:0] */
+    Tempax &= 0x80 ;                                                   /* Tempax[7]: CR7[7] */
+    Temp2 = Tempax << 2 ;                                              /* Temp2[9]: VRS[9] */
+    Temp1 |= Temp2 ;                                                   /* Temp1[9:0]: VRS[9:0] */
+
+    Tempax = pVBInfo->StandTable[ StandTableIndex ].CRTC[ 17 ] ;       /* CR16 VRE */
+    Tempax &= 0x0F ;                                                   /* Tempax[3:0]: VRE[3:0] */
+    Temp2 = Temp1 & 0x3F0 ;                                            /* Temp2[9:4]: VRS[9:4] */
+    Temp2 |= Tempax ;                                                  /* Temp2[9:0]: VRE[9:0] */
+    Temp3 = Temp1 & 0x0F ;                                             /* Temp3[3:0]: VRS[3:0] */
+    if ( Tempax < Temp3 )                                              /* VRE[3:0]<VRS[3:0] */
+      Temp2 |= 0x10 ;                                                  /* Temp2: VRE + 0x10 */
+    Temp2 &= 0xFF ;                                                    /* Temp2[7:0]: VRE[7:0] */
+    Tempax = (UCHAR)Temp2 ;                                            /* Tempax[7:0]: VRE[7:0] */
+    Tempax <<= 2 ;                                                     /* Tempax << 2: VRE[5:0] */
+    Temp1 &= 0x600 ;                                                   /* Temp1[10:9]: VRS[10:9] */
+    Temp1 >>= 9 ;                                                      /* [10:9]->[1:0] */
+    Tempbx = (UCHAR)Temp1 ;                                            /* Tempbx[1:0]: VRS[10:9] */
+    Tempax |= Tempbx ;                                                 /* VRE[5:0]VRS[10:9] */
+    Tempax &= 0x7F ;
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x3F , Tempax ) ;                  /* SR3F D[7:2]->VRE D[1:0]->VRS */
+  }
+  else
+  {
+    index = pVBInfo->RefIndex[ RefreshRateTableIndex ].Ext_CRT1CRTC ;
+    Tempax = pVBInfo->XGINEWUB_CRT1Table[ index ].CR[ 3 ] ;            /* Tempax: CR4 HRS */
+    Tempcx = Tempax ;                                                  /* Tempcx: HRS */
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x2E , Tempax ) ;                          /* SR2E[7:0]->HRS */
+
+    Tempdx = pVBInfo->XGINEWUB_CRT1Table[ index ].CR[ 5 ] ;            /* SRB */
+    Tempdx &= 0xC0 ;                                                   /* Tempdx[7:6]: SRB[7:6] */
+    Temp1 = Tempdx ;                                                   /* Temp1[7:6]: HRS[9:8] */
+    Temp1 <<= 2 ;                                                      /* Temp1[9:8]: HRS[9:8] */
+    Temp1 |= Tempax ;                                                  /* Temp1[9:0]: HRS[9:0] */
+
+    Tempax = pVBInfo->XGINEWUB_CRT1Table[ index ].CR[ 4 ] ;            /* CR5 HRE */
+    Tempax &= 0x1F ;                                                   /* Tempax[4:0]: HRE[4:0] */
+
+    Tempbx = pVBInfo->XGINEWUB_CRT1Table[ index ].CR[ 6 ] ;            /* SRC */
+    Tempbx &= 0x04 ;                                                   /* Tempbx[2]: HRE[5] */
+    Tempbx <<= 3 ;                                                     /* Tempbx[5]: HRE[5] */
+    Tempax |= Tempbx ;                                                 /* Tempax[5:0]: HRE[5:0] */
+
+    Temp2 = Temp1 & 0x3C0 ;                                            /* Temp2[9:6]: HRS[9:6] */
+    Temp2 |= Tempax ;                                                  /* Temp2[9:0]: HRE[9:0] */
+
+    Tempcx &= 0x3F ;                                                   /* Tempcx[5:0]: HRS[5:0] */
+    if( Tempax < Tempcx )                                              /* HRE < HRS */
+      Temp2 |= 0x40 ;                                                   /* Temp2 + 0x40 */
+
+    Temp2 &= 0xFF ;
+    Tempax = (UCHAR)Temp2 ;                                            /* Tempax: HRE[7:0] */
+    Tempax <<= 2 ;                                                     /* Tempax[7:2]: HRE[5:0] */
+    Tempdx >>= 6 ;                                                     /* Tempdx[7:6]->[1:0] HRS[9:8] */
+    Tempax |= Tempdx ;                                                 /* HRE[5:0]HRS[9:8] */
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x2F , Tempax ) ;                  /* SR2F D[7:2]->HRE, D[1:0]->HRS */
+    XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x30 , 0xE3 , 00 ) ;
+
+    Tempax = pVBInfo->XGINEWUB_CRT1Table[ index ].CR[ 10 ] ;           /* CR10 VRS */
+    Tempbx = Tempax ;                                                  /* Tempbx: VRS */
+    Tempax &= 0x01 ;                                                   /* Tempax[0]: VRS[0] */
+    XGINew_SetRegOR( pVBInfo->P3c4 , 0x33 , Tempax ) ;                 /* SR33[0]->VRS[0] */
+    Tempax = pVBInfo->XGINEWUB_CRT1Table[ index ].CR[ 9 ] ;            /* CR7[2][7] VRE */
+    Tempcx = Tempbx >> 1 ;                                             /* Tempcx[6:0]: VRS[7:1] */
+    Tempdx = Tempax & 0x04 ;                                           /* Tempdx[2]: CR7[2] */
+    Tempdx <<= 5 ;                                                     /* Tempdx[7]: VRS[8] */
+    Tempcx |= Tempdx ;                                                 /* Tempcx[7:0]: VRS[8:1] */
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x34 , Tempcx ) ;                  /* SR34[8:1]->VRS */
+
+    Temp1 = Tempdx ;                                                   /* Temp1[7]: Tempdx[7] */
+    Temp1 <<= 1 ;                                                      /* Temp1[8]: VRS[8] */
+    Temp1 |= Tempbx ;                                                  /* Temp1[8:0]: VRS[8:0] */
+    Tempax &= 0x80 ;
+    Temp2 = Tempax << 2 ;                                              /* Temp2[9]: VRS[9] */
+    Temp1 |= Temp2 ;                                                   /* Temp1[9:0]: VRS[9:0] */
+    Tempax = pVBInfo->XGINEWUB_CRT1Table[ index ].CR[ 14 ] ;           /* Tempax: SRA */
+    Tempax &= 0x08 ;                                                   /* Tempax[3]: VRS[3] */
+    Temp2 = Tempax ;
+    Temp2 <<= 7 ;                                                      /* Temp2[10]: VRS[10] */
+    Temp1 |= Temp2 ;                                                   /* Temp1[10:0]: VRS[10:0] */
+
+    Tempax = pVBInfo->XGINEWUB_CRT1Table[ index ].CR[ 11 ] ;           /* Tempax: CR11 VRE */
+    Tempax &= 0x0F ;                                                   /* Tempax[3:0]: VRE[3:0] */
+    Tempbx = pVBInfo->XGINEWUB_CRT1Table[ index ].CR[ 14 ] ;           /* Tempbx: SRA */
+    Tempbx &= 0x20 ;                                                   /* Tempbx[5]: VRE[5] */
+    Tempbx >>= 1 ;                                                     /* Tempbx[4]: VRE[4] */
+    Tempax |= Tempbx ;                                                 /* Tempax[4:0]: VRE[4:0] */
+    Temp2 = Temp1 & 0x7E0 ;                                            /* Temp2[10:5]: VRS[10:5] */
+    Temp2 |= Tempax ;                                                  /* Temp2[10:5]: VRE[10:5] */
+
+    Temp3 = Temp1 & 0x1F ;                                             /* Temp3[4:0]: VRS[4:0] */
+    if ( Tempax < Temp3 )                                              /* VRE < VRS */
+      Temp2 |= 0x20 ;                                                  /* VRE + 0x20 */
+
+    Temp2 &= 0xFF ;
+    Tempax = (UCHAR)Temp2 ;                                            /* Tempax: VRE[7:0] */
+    Tempax <<= 2 ;                                                     /* Tempax[7:0]; VRE[5:0]00 */
+    Temp1 &= 0x600 ;                                                   /* Temp1[10:9]: VRS[10:9] */
+    Temp1 >>= 9 ;                                                      /* Temp1[1:0]: VRS[10:9] */
+    Tempbx = (UCHAR)Temp1 ;
+    Tempax |= Tempbx ;                                                 /* Tempax[7:0]: VRE[5:0]VRS[10:9] */
+    Tempax &= 0x7F ;
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x3F , Tempax ) ;                  /* SR3F D[7:2]->VRE D[1:0]->VRS */
+  }
+}
+
+void XGI_SetXG27CRTC(USHORT ModeNo, USHORT ModeIdIndex, USHORT RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo)
+{
+  USHORT StandTableIndex, index, Tempax, Tempbx, Tempcx, Tempdx ;
+
+  if ( ModeNo <= 0x13 )
+  {
+    StandTableIndex = XGI_GetModePtr( ModeNo , ModeIdIndex, pVBInfo ) ;
+    Tempax = pVBInfo->StandTable[ StandTableIndex ].CRTC[ 4 ] ;                /* CR04 HRS */
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x2E , Tempax ) ;                  /* SR2E [7:0]->HRS */
+    Tempbx = pVBInfo->StandTable[ StandTableIndex ].CRTC[ 5 ] ;                /* Tempbx: CR05 HRE */
+    Tempbx &= 0x1F ;                                                   /* Tempbx: HRE[4:0] */
+    Tempcx = Tempax ;
+    Tempcx &=  0xE0 ;                                                  /* Tempcx: HRS[7:5] */
+    Tempdx = Tempcx | Tempbx ;                                         /* Tempdx(HRE): HRS[7:5]HRE[4:0] */
+    if ( Tempbx < ( Tempax & 0x1F ) )                                  /* IF HRE < HRS */
+      Tempdx |= 0x20 ;                                                 /* Tempdx: HRE = HRE + 0x20 */
+    Tempdx <<= 2 ;                                                     /* Tempdx << 2 */
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x2F , Tempdx ) ;                  /* SR2F [7:2]->HRE */
+    XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x30 , 0xE3 , 00 ) ;
+
+    Tempax = pVBInfo->StandTable[ StandTableIndex ].CRTC[ 16 ] ;       /* Tempax: CR10 VRS */
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x34 , Tempax ) ;                  /* SR34[7:0]->VRS */
+    Tempcx = Tempax ;                                                  /* Tempcx=Tempax=VRS[7:0] */
+    Tempax = pVBInfo->StandTable[ StandTableIndex ].CRTC[ 7 ] ;                /* Tempax[7][2]: CR7[7][2] VRS[9][8] */
+    Tempbx = Tempax ;                                                  /* Tempbx=CR07 */
+    Tempax &= 0x04 ;                                                   /* Tempax[2]: CR07[2] VRS[8] */
+    Tempax >>= 2;
+    XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x35 , ~0x01, Tempax ) ;        /* SR35 D[0]->VRS D[8] */
+    Tempcx |= (Tempax << 8) ;                                          /* Tempcx[8] |= VRS[8] */
+    Tempcx |= (Tempbx & 0x80)<<2;                                      /* Tempcx[9] |= VRS[9] */
+
+
+    Tempax = pVBInfo->StandTable[ StandTableIndex ].CRTC[ 17 ] ;       /* CR11 VRE */
+    Tempax &= 0x0F ;                                                   /* Tempax: VRE[3:0] */
+    Tempbx = Tempcx ;                                                  /* Tempbx=Tempcx=VRS[9:0] */
+    Tempbx &= 0x3F0 ;                                                  /* Tempbx[9:4]: VRS[9:4] */
+    Tempbx |= Tempax ;                                                 /* Tempbx[9:0]: VRE[9:0] */
+    if ( Tempax <= (Tempcx & 0x0F) )                                   /* VRE[3:0]<=VRS[3:0] */
+      Tempbx |= 0x10 ;                                                 /* Tempbx: VRE + 0x10 */
+    Tempax = (UCHAR)Tempbx & 0xFF;                                     /* Tempax[7:0]: VRE[7:0] */
+    Tempax <<= 2 ;                                                     /* Tempax << 2: VRE[5:0] */
+    Tempcx = (Tempcx&0x600)>>8;                                         /* Tempcx VRS[10:9] */
+    XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x3F , ~0xFC, Tempax ) ;        /* SR3F D[7:2]->VRE D[5:0] */
+    XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x35 , ~0x06, Tempcx ) ;       /* SR35 D[2:1]->VRS[10:9] */
+  }
+  else
+  {
+    index = pVBInfo->RefIndex[ RefreshRateTableIndex ].Ext_CRT1CRTC ;
+    Tempax = pVBInfo->XGINEWUB_CRT1Table[ index ].CR[ 3 ] ;            /* Tempax: CR4 HRS */
+    Tempbx = Tempax ;                                                  /* Tempbx: HRS[7:0] */
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x2E , Tempax ) ;                          /* SR2E[7:0]->HRS */
+
+    Tempax = pVBInfo->XGINEWUB_CRT1Table[ index ].CR[ 5 ] ;            /* SR0B */
+    Tempax &= 0xC0 ;                                                   /* Tempax[7:6]: SR0B[7:6]: HRS[9:8]*/
+    Tempbx |= (Tempax << 2);                                   /* Tempbx: HRS[9:0] */
+
+    Tempax = pVBInfo->XGINEWUB_CRT1Table[ index ].CR[ 4 ] ;            /* CR5 HRE */
+    Tempax &= 0x1F ;                                                   /* Tempax[4:0]: HRE[4:0] */
+    Tempcx = Tempax ;                                                  /* Tempcx: HRE[4:0] */
+
+    Tempax = pVBInfo->XGINEWUB_CRT1Table[ index ].CR[ 6 ] ;            /* SRC */
+    Tempax &= 0x04 ;                                                   /* Tempax[2]: HRE[5] */
+    Tempax <<= 3 ;                                                         /* Tempax[5]: HRE[5] */
+    Tempcx |= Tempax ;                                                 /* Tempcx[5:0]: HRE[5:0] */
+
+    Tempbx = Tempbx & 0x3C0 ;                                  /* Tempbx[9:6]: HRS[9:6] */
+    Tempbx |= Tempcx ;                                                 /* Tempbx: HRS[9:6]HRE[5:0] */
+
+    Tempax = pVBInfo->XGINEWUB_CRT1Table[ index ].CR[ 3 ] ;            /* Tempax: CR4 HRS */
+    Tempax &= 0x3F ;                                                   /* Tempax: HRS[5:0] */
+    if( Tempcx <= Tempax )                                             /* HRE[5:0] < HRS[5:0] */
+      Tempbx += 0x40 ;                          /* Tempbx= Tempbx + 0x40 : HRE[9:0]*/
+
+    Tempax = pVBInfo->XGINEWUB_CRT1Table[ index ].CR[ 5 ] ;            /* SR0B */
+    Tempax &= 0xC0 ;                                                   /* Tempax[7:6]: SR0B[7:6]: HRS[9:8]*/
+    Tempax >>= 6;                               /* Tempax[1:0]: HRS[9:8]*/
+    Tempax |= ((Tempbx << 2) & 0xFF);           /* Tempax[7:2]: HRE[5:0] */
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x2F , Tempax ) ;                  /* SR2F [7:2][1:0]: HRE[5:0]HRS[9:8] */
+    XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x30 , 0xE3 , 00 ) ;
+
+    Tempax = pVBInfo->XGINEWUB_CRT1Table[ index ].CR[ 10 ] ;           /* CR10 VRS */
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x34 , Tempax ) ;                  /* SR34[7:0]->VRS[7:0] */
+
+    Tempcx = Tempax ;                                                  /* Tempcx <= VRS[7:0] */
+    Tempax = pVBInfo->XGINEWUB_CRT1Table[ index ].CR[ 9 ] ;            /* CR7[7][2] VRS[9][8] */
+    Tempbx = Tempax ;                                                  /* Tempbx <= CR07[7:0] */
+    Tempax = Tempax & 0x04 ;                                   /* Tempax[2]: CR7[2]: VRS[8] */
+    Tempax >>= 2 ;                                                         /* Tempax[0]: VRS[8] */
+    XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x35 , ~0x01 , Tempax ) ;      /* SR35[0]: VRS[8] */
+    Tempcx |= (Tempax<<8) ;                                            /* Tempcx <= VRS[8:0] */
+    Tempcx |= ((Tempbx&0x80)<<2) ;                             /* Tempcx <= VRS[9:0] */
+    Tempax = pVBInfo->XGINEWUB_CRT1Table[ index ].CR[ 14 ] ;           /* Tempax: SR0A */
+    Tempax &= 0x08;                             /* SR0A[3] VRS[10] */
+    Tempcx |= (Tempax<<7) ;                                    /* Tempcx <= VRS[10:0] */
+
+
+    Tempax = pVBInfo->XGINEWUB_CRT1Table[ index ].CR[ 11 ] ;           /* Tempax: CR11 VRE */
+    Tempax &= 0x0F ;                                                   /* Tempax[3:0]: VRE[3:0] */
+    Tempbx = pVBInfo->XGINEWUB_CRT1Table[ index ].CR[ 14 ] ;           /* Tempbx: SR0A */
+    Tempbx &= 0x20 ;                                                   /* Tempbx[5]: SR0A[5]: VRE[4] */
+    Tempbx >>= 1 ;                                                         /* Tempbx[4]: VRE[4] */
+    Tempax |= Tempbx ;                                                 /* Tempax[4:0]: VRE[4:0] */
+    Tempbx = Tempcx ;                                                  /* Tempbx: VRS[10:0] */
+    Tempbx &= 0x7E0 ;                                              /* Tempbx[10:5]: VRS[10:5] */
+    Tempbx |= Tempax ;                                                 /* Tempbx: VRS[10:5]VRE[4:0] */
+
+    if ( Tempbx <= Tempcx )                                            /* VRE <= VRS */
+      Tempbx |= 0x20 ;                                                 /* VRE + 0x20 */
+
+    Tempax = (Tempbx<<2) & 0xFF ;                                      /* Tempax: Tempax[7:0]; VRE[5:0]00 */
+    XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x3F , ~0xFC , Tempax ) ;      /* SR3F[7:2]:VRE[5:0] */
+    Tempax = Tempcx >> 8;
+    XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x35 , ~0x07 , Tempax ) ;      /* SR35[2:0]:VRS[10:8] */
+  }
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_SetXG21LCD */
+/* Input : */
+/* Output : FCLK duty cycle, FCLK delay compensation */
+/* Description : All values set zero */
+/* --------------------------------------------------------------------- */
+void XGI_SetXG21LCD(PVB_DEVICE_INFO pVBInfo,USHORT RefreshRateTableIndex,USHORT ModeNo)
+{
+  USHORT Data , Temp , b3CC ;
+  USHORT XGI_P3cc ;
+
+  XGI_P3cc = pVBInfo->P3cc ;
+
+  XGINew_SetReg1( pVBInfo->P3d4 , 0x2E , 0x00 ) ;
+  XGINew_SetReg1( pVBInfo->P3d4 , 0x2F , 0x00 ) ;
+  XGINew_SetReg1( pVBInfo->P3d4 , 0x46 , 0x00 ) ;
+  XGINew_SetReg1( pVBInfo->P3d4 , 0x47 , 0x00 ) ;
+  if ( ((*pVBInfo->pDVOSetting)&0xC0) == 0xC0 )
+  {
+    XGINew_SetReg1( pVBInfo->P3d4 , 0x2E , *pVBInfo->pCR2E ) ;
+    XGINew_SetReg1( pVBInfo->P3d4 , 0x2F , *pVBInfo->pCR2F ) ;
+    XGINew_SetReg1( pVBInfo->P3d4 , 0x46 , *pVBInfo->pCR46 ) ;
+    XGINew_SetReg1( pVBInfo->P3d4 , 0x47 , *pVBInfo->pCR47 ) ;
+  }
+
+  Temp = XGINew_GetReg1( pVBInfo->P3d4 , 0x37 ) ;
+
+  if ( Temp & 0x01 )
+  {
+    XGINew_SetRegOR( pVBInfo->P3c4 , 0x06 , 0x40 ) ; /* 18 bits FP */
+    XGINew_SetRegOR( pVBInfo->P3c4 , 0x09 , 0x40 ) ;
+  }
+
+  XGINew_SetRegOR( pVBInfo->P3c4 , 0x1E , 0x01 ) ;   /* Negative blank polarity */
+
+  XGINew_SetRegAND( pVBInfo->P3c4 , 0x30 , ~0x20 ) ;
+  XGINew_SetRegAND( pVBInfo->P3c4 , 0x35 , ~0x80 ) ;
+
+  if ( ModeNo <= 0x13 )
+  {
+    b3CC = (UCHAR) XGINew_GetReg2( XGI_P3cc ) ;
+    if ( b3CC & 0x40 )
+      XGINew_SetRegOR( pVBInfo->P3c4 , 0x30 , 0x20 ) ; /* Hsync polarity */
+    if ( b3CC & 0x80 )
+      XGINew_SetRegOR( pVBInfo->P3c4 , 0x35 , 0x80 ) ; /* Vsync polarity */
+  }
+  else
+  {
+    Data = pVBInfo->RefIndex[ RefreshRateTableIndex ].Ext_InfoFlag ;
+    if ( Data & 0x4000 )
+      XGINew_SetRegOR( pVBInfo->P3c4 , 0x30 , 0x20 ) ; /* Hsync polarity */
+    if ( Data & 0x8000 )
+      XGINew_SetRegOR( pVBInfo->P3c4 , 0x35 , 0x80 ) ; /* Vsync polarity */
+  }
+}
+
+void XGI_SetXG27LCD(PVB_DEVICE_INFO pVBInfo,USHORT RefreshRateTableIndex,USHORT ModeNo)
+{
+  USHORT Data , Temp , b3CC ;
+  USHORT XGI_P3cc ;
+
+  XGI_P3cc = pVBInfo->P3cc ;
+
+  XGINew_SetReg1( pVBInfo->P3d4 , 0x2E , 0x00 ) ;
+  XGINew_SetReg1( pVBInfo->P3d4 , 0x2F , 0x00 ) ;
+  XGINew_SetReg1( pVBInfo->P3d4 , 0x46 , 0x00 ) ;
+  XGINew_SetReg1( pVBInfo->P3d4 , 0x47 , 0x00 ) ;
+
+  Temp = XGINew_GetReg1( pVBInfo->P3d4 , 0x37 ) ;
+  if ( ( Temp & 0x03 ) == 0 )  /* dual 12 */
+  {
+    XGINew_SetReg1( pVBInfo->P3d4 , 0x46 , 0x13 ) ;
+    XGINew_SetReg1( pVBInfo->P3d4 , 0x47 , 0x13 ) ;
+  }
+
+  if ( ((*pVBInfo->pDVOSetting)&0xC0) == 0xC0 )
+  {
+    XGINew_SetReg1( pVBInfo->P3d4 , 0x2E , *pVBInfo->pCR2E ) ;
+    XGINew_SetReg1( pVBInfo->P3d4 , 0x2F , *pVBInfo->pCR2F ) ;
+    XGINew_SetReg1( pVBInfo->P3d4 , 0x46 , *pVBInfo->pCR46 ) ;
+    XGINew_SetReg1( pVBInfo->P3d4 , 0x47 , *pVBInfo->pCR47 ) ;
+  }
+
+  XGI_SetXG27FPBits(pVBInfo);
+
+  XGINew_SetRegOR( pVBInfo->P3c4 , 0x1E , 0x01 ) ;   /* Negative blank polarity */
+
+  XGINew_SetRegAND( pVBInfo->P3c4 , 0x30 , ~0x20 ) ; /* Hsync polarity */
+  XGINew_SetRegAND( pVBInfo->P3c4 , 0x35 , ~0x80 ) ; /* Vsync polarity */
+
+  if ( ModeNo <= 0x13 )
+  {
+    b3CC = (UCHAR) XGINew_GetReg2( XGI_P3cc ) ;
+    if ( b3CC & 0x40 )
+      XGINew_SetRegOR( pVBInfo->P3c4 , 0x30 , 0x20 ) ; /* Hsync polarity */
+    if ( b3CC & 0x80 )
+      XGINew_SetRegOR( pVBInfo->P3c4 , 0x35 , 0x80 ) ; /* Vsync polarity */
+  }
+  else
+  {
+    Data = pVBInfo->RefIndex[ RefreshRateTableIndex ].Ext_InfoFlag ;
+    if ( Data & 0x4000 )
+      XGINew_SetRegOR( pVBInfo->P3c4 , 0x30 , 0x20 ) ; /* Hsync polarity */
+    if ( Data & 0x8000 )
+      XGINew_SetRegOR( pVBInfo->P3c4 , 0x35 , 0x80 ) ; /* Vsync polarity */
+  }
+}
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_UpdateXG21CRTC */
+/* Input : */
+/* Output : CRT1 CRTC */
+/* Description : Modify CRT1 Hsync/Vsync to fix LCD mode timing */
+/* --------------------------------------------------------------------- */
+void XGI_UpdateXG21CRTC( USHORT ModeNo , PVB_DEVICE_INFO pVBInfo , USHORT RefreshRateTableIndex )
+{
+  int i , index = -1;
+
+  XGINew_SetRegAND( pVBInfo->P3d4 , 0x11 , 0x7F ) ;            /* Unlock CR0~7 */
+  if ( ModeNo <= 0x13 )
+  {
+    for( i = 0 ; i < 12 ; i++ )
+    {
+      if ( ModeNo == pVBInfo->UpdateCRT1[ i ].ModeID )
+        index = i ;
+    }
+  }
+  else
+  {
+    if ( ModeNo == 0x2E && ( pVBInfo->RefIndex[ RefreshRateTableIndex ].Ext_CRT1CRTC ==  RES640x480x60 ) )
+      index = 12 ;
+    else if ( ModeNo == 0x2E && ( pVBInfo->RefIndex[ RefreshRateTableIndex ].Ext_CRT1CRTC == RES640x480x72 ) )
+      index = 13 ;
+    else if ( ModeNo == 0x2F )
+      index = 14 ;
+    else if ( ModeNo == 0x50 )
+      index = 15 ;
+    else if ( ModeNo == 0x59 )
+      index = 16 ;
+  }
+
+  if( index != -1 )
+  {
+    XGINew_SetReg1( pVBInfo->P3d4 , 0x02 , pVBInfo->UpdateCRT1[ index ].CR02 ) ;
+    XGINew_SetReg1( pVBInfo->P3d4 , 0x03 , pVBInfo->UpdateCRT1[ index ].CR03 ) ;
+    XGINew_SetReg1( pVBInfo->P3d4 , 0x15 , pVBInfo->UpdateCRT1[ index ].CR15 ) ;
+    XGINew_SetReg1( pVBInfo->P3d4 , 0x16 , pVBInfo->UpdateCRT1[ index ].CR16 ) ;
+  }
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_SetCRT1DE */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_SetCRT1DE( PXGI_HW_DEVICE_INFO HwDeviceExtension , USHORT ModeNo,USHORT ModeIdIndex , USHORT RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo )
+{
+    USHORT resindex ,
+           tempax ,
+           tempbx ,
+           tempcx ,
+           temp ,
+           modeflag ;
+
+    UCHAR data ;
+
+    resindex = XGI_GetResInfo( ModeNo , ModeIdIndex, pVBInfo ) ;
+
+    if ( ModeNo <= 0x13 )
+    {
+        modeflag = pVBInfo->SModeIDTable[ ModeIdIndex ].St_ModeFlag ;
+        tempax = pVBInfo->StResInfo[ resindex ].HTotal ;
+        tempbx = pVBInfo->StResInfo[ resindex ].VTotal ;
+    }
+    else
+    {
+        modeflag = pVBInfo->EModeIDTable[ ModeIdIndex ].Ext_ModeFlag ;
+        tempax = pVBInfo->ModeResInfo[ resindex ].HTotal ;
+        tempbx = pVBInfo->ModeResInfo[ resindex ].VTotal ;
+    }
+
+    if ( modeflag & HalfDCLK )
+        tempax = tempax >> 1 ;
+
+    if ( ModeNo > 0x13 )
+    {
+        if ( modeflag & HalfDCLK )
+            tempax = tempax << 1 ;
+
+        temp = pVBInfo->RefIndex[ RefreshRateTableIndex ].Ext_InfoFlag ;
+
+        if ( temp & InterlaceMode )
+            tempbx = tempbx >> 1 ;
+
+        if ( modeflag & DoubleScanMode )
+            tempbx = tempbx << 1 ;
+    }
+
+    tempcx = 8 ;
+
+    /* if ( !( modeflag & Charx8Dot ) ) */
+    /* tempcx = 9 ; */
+
+    tempax /= tempcx ;
+    tempax -= 1 ;
+    tempbx -= 1 ;
+    tempcx = tempax ;
+    temp = ( UCHAR )XGINew_GetReg1( pVBInfo->P3d4 , 0x11 ) ;
+    data = ( UCHAR )XGINew_GetReg1( pVBInfo->P3d4 , 0x11 ) ;
+    data &= 0x7F ;
+    XGINew_SetReg1( pVBInfo->P3d4 , 0x11 , data ) ;            /* Unlock CRTC */
+    XGINew_SetReg1( pVBInfo->P3d4 , 0x01 , ( USHORT )( tempcx & 0xff ) ) ;
+    XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x0b , ~0x0c , ( USHORT )( ( tempcx & 0x0ff00 ) >> 10 ) ) ;
+    XGINew_SetReg1( pVBInfo->P3d4 , 0x12 , ( USHORT )( tempbx & 0xff ) ) ;
+    tempax = 0 ;
+    tempbx = tempbx >> 8 ;
+
+    if ( tempbx & 0x01 )
+        tempax |= 0x02 ;
+
+    if ( tempbx & 0x02 )
+        tempax |= 0x40 ;
+
+    XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x07 , ~0x42 , tempax ) ;
+    data =( UCHAR )XGINew_GetReg1( pVBInfo->P3d4 , 0x07 ) ;
+    data &= 0xFF ;
+    tempax = 0 ;
+
+    if ( tempbx & 0x04 )
+        tempax |= 0x02 ;
+
+    XGINew_SetRegANDOR( pVBInfo->P3d4 ,0x0a , ~0x02 , tempax ) ;
+    XGINew_SetReg1( pVBInfo->P3d4 , 0x11 , temp ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_GetResInfo */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+USHORT         XGI_GetResInfo(USHORT ModeNo , USHORT ModeIdIndex, PVB_DEVICE_INFO pVBInfo )
+{
+    USHORT resindex ;
+
+    if ( ModeNo <= 0x13 )
+    {
+        resindex = pVBInfo->SModeIDTable[ ModeIdIndex ].St_ResInfo ;   /* si+St_ResInfo */
+    }
+    else
+    {
+        resindex = pVBInfo->EModeIDTable[ ModeIdIndex ].Ext_RESINFO ;  /* si+Ext_ResInfo */
+    }
+    return( resindex ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_SetCRT1Offset */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_SetCRT1Offset(  USHORT ModeNo , USHORT ModeIdIndex , USHORT RefreshRateTableIndex , PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo )
+{
+    USHORT temp ,
+           ah ,
+           al ,
+           temp2 ,
+           i ,
+           DisplayUnit ;
+
+    /* GetOffset */
+    temp = pVBInfo->EModeIDTable[ ModeIdIndex ].Ext_ModeInfo ;
+    temp = temp >> 8 ;
+    temp = pVBInfo->ScreenOffset[ temp ] ;
+
+    temp2 = pVBInfo->RefIndex[ RefreshRateTableIndex ].Ext_InfoFlag ;
+    temp2 &= InterlaceMode ;
+
+    if ( temp2 )
+        temp = temp << 1;
+
+    temp2 = pVBInfo->ModeType - ModeEGA ;
+
+    switch( temp2 )
+    {
+        case 0:
+            temp2 = 1 ;
+            break ;
+        case 1:
+            temp2 = 2 ;
+            break ;
+        case 2:
+            temp2 = 4 ;
+            break ;
+        case 3:
+            temp2 = 4 ;
+            break ;
+        case 4:
+            temp2 = 6 ;
+            break;
+        case 5:
+            temp2 = 8 ;
+            break ;
+        default:
+            break ;
+    }
+
+    if ( ( ModeNo >= 0x26 ) && ( ModeNo <= 0x28 ) )
+        temp = temp * temp2 + temp2 / 2 ;
+    else
+        temp *= temp2 ;
+
+    /* SetOffset */
+    DisplayUnit = temp ;
+    temp2 = temp ;
+    temp = temp >> 8 ;         /* ah */
+    temp &= 0x0F ;
+    i = XGINew_GetReg1( pVBInfo->P3c4 , 0x0E ) ;
+    i &= 0xF0 ;
+    i |= temp ;
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x0E , i ) ;
+
+    temp =( UCHAR )temp2 ;
+    temp &= 0xFF ;             /* al */
+    XGINew_SetReg1( pVBInfo->P3d4 , 0x13 , temp ) ;
+
+    /* SetDisplayUnit */
+    temp2 = pVBInfo->RefIndex[ RefreshRateTableIndex ].Ext_InfoFlag ;
+    temp2 &= InterlaceMode ;
+    if ( temp2 )
+        DisplayUnit >>= 1 ;
+
+    DisplayUnit = DisplayUnit << 5 ;
+    ah = ( DisplayUnit & 0xff00 ) >> 8 ;
+    al = DisplayUnit & 0x00ff ;
+    if ( al == 0 )
+        ah += 1 ;
+    else
+        ah += 2 ;
+
+    if ( HwDeviceExtension->jChipType >= XG20 )
+        if ( ( ModeNo == 0x4A ) | (ModeNo == 0x49 ) )
+            ah -= 1 ;
+
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x10 , ah ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_SetCRT1VCLK */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_SetCRT1VCLK( USHORT ModeNo , USHORT ModeIdIndex ,
+                        PXGI_HW_DEVICE_INFO HwDeviceExtension , USHORT RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo )
+{
+    UCHAR index , data ;
+    USHORT vclkindex ;
+
+    if ( pVBInfo->IF_DEF_LVDS == 1 )
+    {
+        index = pVBInfo->RefIndex[ RefreshRateTableIndex ].Ext_CRTVCLK ;
+        data = XGINew_GetReg1( pVBInfo->P3c4 , 0x31 ) & 0xCF ;
+        XGINew_SetReg1( pVBInfo->P3c4 , 0x31 , data ) ;
+        XGINew_SetReg1( pVBInfo->P3c4 , 0x2B , pVBInfo->VCLKData[ index ].SR2B ) ;
+        XGINew_SetReg1( pVBInfo->P3c4 , 0x2C , pVBInfo->VCLKData[ index ].SR2C ) ;
+        XGINew_SetReg1( pVBInfo->P3c4 , 0x2D , 0x01 ) ;
+    }
+    else if ( ( pVBInfo->VBType & ( VB_XGI301B | VB_XGI302B | VB_XGI301LV | VB_XGI302LV | VB_XGI301C ) ) && ( pVBInfo->VBInfo & SetCRT2ToLCDA ) )
+    {
+        vclkindex = XGI_GetVCLK2Ptr( ModeNo , ModeIdIndex , RefreshRateTableIndex , HwDeviceExtension, pVBInfo ) ;
+        data = XGINew_GetReg1( pVBInfo->P3c4 , 0x31 ) & 0xCF ;
+        XGINew_SetReg1( pVBInfo->P3c4 , 0x31 , data ) ;
+        data = pVBInfo->VBVCLKData[ vclkindex ].Part4_A ;
+        XGINew_SetReg1( pVBInfo->P3c4 , 0x2B , data ) ;
+        data = pVBInfo->VBVCLKData[ vclkindex ].Part4_B ;
+        XGINew_SetReg1( pVBInfo->P3c4 , 0x2C , data ) ;
+        XGINew_SetReg1( pVBInfo->P3c4 , 0x2D , 0x01 ) ;
+    }
+    else
+    {
+        index = pVBInfo->RefIndex[ RefreshRateTableIndex ].Ext_CRTVCLK ;
+        data = XGINew_GetReg1( pVBInfo->P3c4 , 0x31 ) & 0xCF ;
+        XGINew_SetReg1( pVBInfo->P3c4 , 0x31 , data ) ;
+        XGINew_SetReg1( pVBInfo->P3c4 , 0x2B , pVBInfo->VCLKData[ index ].SR2B ) ;
+        XGINew_SetReg1( pVBInfo->P3c4 , 0x2C , pVBInfo->VCLKData[ index ].SR2C ) ;
+        XGINew_SetReg1( pVBInfo->P3c4 , 0x2D , 0x01 ) ;
+    }
+
+    if ( HwDeviceExtension->jChipType >= XG20 )
+    {
+       if ( pVBInfo->EModeIDTable[ ModeIdIndex ].Ext_ModeFlag & HalfDCLK )
+       {
+       data = XGINew_GetReg1( pVBInfo->P3c4 , 0x2B ) ;
+       XGINew_SetReg1( pVBInfo->P3c4 , 0x2B , data ) ;
+       data = XGINew_GetReg1( pVBInfo->P3c4 , 0x2C ) ;
+       index = data ;
+       index &= 0xE0 ;
+       data &= 0x1F ;
+       data = data << 1 ;
+       data += 1 ;
+       data |= index ;
+       XGINew_SetReg1( pVBInfo->P3c4 , 0x2C , data ) ;
+       }
+    }
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_SetCRT1FIFO */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_SetCRT1FIFO( USHORT ModeNo , PXGI_HW_DEVICE_INFO HwDeviceExtension,PVB_DEVICE_INFO pVBInfo )
+{
+    USHORT data ;
+
+    data = XGINew_GetReg1( pVBInfo->P3c4 , 0x3D ) ;
+    data &= 0xfe ;
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x3D , data ) ;    /* diable auto-threshold */
+
+    if ( ModeNo > 0x13 )
+    {
+        XGINew_SetReg1( pVBInfo->P3c4 , 0x08 , 0x34 ) ;
+        data = XGINew_GetReg1( pVBInfo->P3c4 , 0x09 ) ;
+        data &= 0xC0 ;
+        XGINew_SetReg1( pVBInfo->P3c4 , 0x09 , data | 0x30) ;
+        data = XGINew_GetReg1( pVBInfo->P3c4 , 0x3D ) ;
+        data |= 0x01 ;
+        XGINew_SetReg1( pVBInfo->P3c4 , 0x3D , data ) ;
+    }
+    else
+    {
+        if (HwDeviceExtension->jChipType == XG27)
+        {
+          XGINew_SetReg1( pVBInfo->P3c4 , 0x08 , 0x0E ) ;
+          data = XGINew_GetReg1( pVBInfo->P3c4 , 0x09 ) ;
+          data &= 0xC0 ;
+          XGINew_SetReg1( pVBInfo->P3c4 , 0x09 , data | 0x20 ) ;
+        }
+        else
+        {
+          XGINew_SetReg1( pVBInfo->P3c4 , 0x08 , 0xAE ) ;
+          data = XGINew_GetReg1( pVBInfo->P3c4 , 0x09 ) ;
+          data &= 0xF0 ;
+          XGINew_SetReg1( pVBInfo->P3c4 , 0x09 , data ) ;
+        }
+    }
+
+    if (HwDeviceExtension->jChipType == XG21)
+    {
+        XGI_SetXG21FPBits(pVBInfo);                 /* Fix SR9[7:6] can't read back */
+    }
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_SetCRT1ModeRegs */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_SetCRT1ModeRegs( PXGI_HW_DEVICE_INFO HwDeviceExtension ,
+                            USHORT ModeNo , USHORT ModeIdIndex , USHORT RefreshRateTableIndex,PVB_DEVICE_INFO pVBInfo )
+{
+    USHORT data ,
+           data2 ,
+           data3 ,
+           infoflag = 0 ,
+           modeflag ,
+           resindex ,
+           xres ;
+
+    if ( ModeNo > 0x13 )
+    {
+        modeflag = pVBInfo->EModeIDTable[ ModeIdIndex ].Ext_ModeFlag ;
+        infoflag = pVBInfo->RefIndex[ RefreshRateTableIndex ].Ext_InfoFlag ;
+    }
+    else
+        modeflag = pVBInfo->SModeIDTable[ ModeIdIndex ].St_ModeFlag ;    /* si+St_ModeFlag */
+
+    if ( XGINew_GetReg1( pVBInfo->P3d4 , 0x31 ) & 0x01 )
+      XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x1F , 0x3F , 0x00 ) ;
+
+    if ( ModeNo > 0x13 )
+        data = infoflag ;
+    else
+        data = 0 ;
+
+    data2 = 0 ;
+
+    if ( ModeNo > 0x13 )
+    {
+        if ( pVBInfo->ModeType > 0x02 )
+        {
+            data2 |= 0x02 ;
+            data3 = pVBInfo->ModeType - ModeVGA ;
+            data3 = data3 << 2 ;
+            data2 |= data3 ;
+        }
+    }
+
+    data &= InterlaceMode ;
+
+    if ( data )
+        data2 |= 0x20 ;
+
+    XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x06 , ~0x3F , data2 ) ;
+    /* XGINew_SetReg1(pVBInfo->P3c4,0x06,data2); */
+    resindex = XGI_GetResInfo( ModeNo , ModeIdIndex, pVBInfo ) ;
+    if ( ModeNo <= 0x13 )
+        xres = pVBInfo->StResInfo[ resindex ].HTotal ;
+    else
+        xres = pVBInfo->ModeResInfo[ resindex ].HTotal ;                         /* xres->ax */
+
+    data = 0x0000 ;
+    if ( infoflag & InterlaceMode )
+    {
+        if ( xres == 1024 )
+            data = 0x0035 ;
+        else if ( xres == 1280 )
+            data = 0x0048 ;
+    }
+
+    data2 = data & 0x00FF ;
+    XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x19 , 0xFF , data2 ) ;
+    data2 = ( data & 0xFF00 ) >> 8 ;
+    XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x19 , 0xFC , data2 ) ;
+
+    if( modeflag & HalfDCLK )
+        XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x01 , 0xF7 , 0x08 ) ;
+
+    data2 = 0 ;
+
+    if ( modeflag & LineCompareOff )
+        data2 |= 0x08 ;
+
+    if ( ModeNo > 0x13 )
+    {
+        if ( pVBInfo->ModeType == ModeEGA )
+            data2 |= 0x40 ;
+    }
+
+    XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x0F , ~0x48 , data2 ) ;
+    data = 0x60 ;
+    if ( pVBInfo->ModeType != ModeText )
+    {
+        data = data ^ 0x60 ;
+        if ( pVBInfo->ModeType != ModeEGA )
+        {
+            data = data ^ 0xA0 ;
+        }
+    }
+    XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x21 , 0x1F , data ) ;
+
+    XGI_SetVCLKState( HwDeviceExtension , ModeNo , RefreshRateTableIndex, pVBInfo) ;
+
+    /* if(modeflag&HalfDCLK)//030305 fix lowresolution bug */
+    /* if(XGINew_IF_DEF_NEW_LOWRES) */
+    /* XGI_VesaLowResolution(ModeNo,ModeIdIndex);//030305 fix lowresolution bug */
+
+    data=XGINew_GetReg1( pVBInfo->P3d4 , 0x31 ) ;
+
+    if (HwDeviceExtension->jChipType == XG27 )
+    {
+       if ( data & 0x40 )
+           data = 0x2c ;
+       else
+           data = 0x6c ;
+       XGINew_SetReg1( pVBInfo->P3d4 , 0x52 , data ) ;
+       XGINew_SetRegOR( pVBInfo->P3d4 , 0x51 , 0x10 ) ;
+    }
+    else
+    if (HwDeviceExtension->jChipType >= XG20 )
+    {
+       if ( data & 0x40 )
+           data = 0x33 ;
+       else
+           data = 0x73 ;
+       XGINew_SetReg1( pVBInfo->P3d4 , 0x52 , data ) ;
+       XGINew_SetReg1( pVBInfo->P3d4 , 0x51 , 0x02 ) ;
+    }
+    else
+    {
+    if ( data & 0x40 )
+        data = 0x2c ;
+    else
+        data = 0x6c ;
+    XGINew_SetReg1( pVBInfo->P3d4 , 0x52 , data ) ;
+    }
+
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_SetVCLKState */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_SetVCLKState(  PXGI_HW_DEVICE_INFO HwDeviceExtension , USHORT ModeNo , USHORT RefreshRateTableIndex,PVB_DEVICE_INFO pVBInfo )
+{
+    USHORT data ,
+           data2 = 0 ;
+    SHORT  VCLK ;
+
+    UCHAR  index ;
+
+    if ( ModeNo <= 0x13 )
+        VCLK = 0 ;
+    else
+    {
+        index = pVBInfo->RefIndex[ RefreshRateTableIndex ].Ext_CRTVCLK ;
+        index &= IndexMask ;
+        VCLK = pVBInfo->VCLKData[ index ].CLOCK ;
+    }
+
+    data = XGINew_GetReg1( pVBInfo->P3c4 , 0x32 ) ;
+    data &= 0xf3 ;
+    if ( VCLK >= 200 )
+        data |= 0x0c ; /* VCLK > 200 */
+
+    if ( HwDeviceExtension->jChipType >= XG20 )
+        data &= ~0x04 ; /* 2 pixel mode */
+
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x32 , data ) ;
+
+    if ( HwDeviceExtension->jChipType < XG20 )
+    {
+    data = XGINew_GetReg1( pVBInfo->P3c4 , 0x1F ) ;
+    data &= 0xE7 ;
+    if ( VCLK < 200 )
+        data |= 0x10 ;
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x1F , data ) ;
+    }
+
+/*  Jong for Adavantech LCD ripple issue
+    if ( ( VCLK >= 0 ) && ( VCLK < 135 ) )
+        data2 = 0x03 ;
+    else if ( ( VCLK >= 135 ) && ( VCLK < 160 ) )
+        data2 = 0x02 ;
+    else if ( ( VCLK >= 160 ) && ( VCLK < 260 ) )
+        data2 = 0x01 ;
+    else if ( VCLK > 260 )
+          data2 = 0x00 ;
+*/
+    data2 = 0x00 ;
+
+    XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x07 , 0xFC , data2 ) ;
+    if (HwDeviceExtension->jChipType >= XG27 )
+    {
+      XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x40 , 0xFC , data2&0x03 ) ;
+    }
+
+
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_VesaLowResolution */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+/*void XGI_VesaLowResolution( USHORT ModeNo , USHORT ModeIdIndex ,PVB_DEVICE_INFO pVBInfo)
+{
+    USHORT modeflag;
+
+    if ( ModeNo > 0x13 )
+        modeflag = pVBInfo->EModeIDTable[ ModeIdIndex ].Ext_ModeFlag ;
+    else
+        modeflag = pVBInfo->SModeIDTable[ ModeIdIndex ].St_ModeFlag ;
+
+    if ( ModeNo > 0x13 )
+    {
+        if ( modeflag & DoubleScanMode )
+        {
+            if ( modeflag & HalfDCLK )
+            {
+                if ( pVBInfo->VBType & ( VB_XGI301B | VB_XGI302B | VB_XGI301LV | VB_XGI302LV | VB_XGI301C ) )
+                {
+                    if ( !( pVBInfo->VBInfo & SetCRT2ToRAMDAC ) )
+                    {
+                        if ( pVBInfo->VBInfo & SetInSlaveMode )
+                        {
+                            XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x01 , 0xf7 , 0x00 ) ;
+                            XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x0f , 0x7f , 0x00 ) ;
+                            return ;
+                        }
+                    }
+                }
+                XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x0f , 0xff , 0x80 ) ;
+                XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x01 , 0xf7 , 0x00 ) ;
+                return ;
+            }
+        }
+    }
+    XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x0f , 0x7f , 0x00 ) ;
+}
+*/
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_LoadDAC */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_LoadDAC( USHORT ModeNo , USHORT ModeIdIndex,PVB_DEVICE_INFO pVBInfo )
+{
+    USHORT data , data2 , time ,
+           i  , j , k , m , n , o ,
+           si , di , bx , dl , al , ah , dh ,
+           *table = NULL ;
+
+    if ( ModeNo <= 0x13 )
+        data = pVBInfo->SModeIDTable[ ModeIdIndex ].St_ModeFlag ;
+    else
+        data = pVBInfo->EModeIDTable[ ModeIdIndex ].Ext_ModeFlag ;
+
+    data &= DACInfoFlag ;
+    time = 64 ;
+
+    if ( data == 0x00 )
+        table = XGINew_MDA_DAC ;
+    else if ( data == 0x08 )
+        table = XGINew_CGA_DAC ;
+    else if ( data == 0x10 )
+        table = XGINew_EGA_DAC ;
+    else if ( data == 0x18 )
+    {
+        time = 256 ;
+        table = XGINew_VGA_DAC ;
+    }
+
+    if ( time == 256 )
+        j = 16 ;
+    else
+        j = time ;
+
+    XGINew_SetReg3( pVBInfo->P3c6 , 0xFF ) ;
+    XGINew_SetReg3( pVBInfo->P3c8 , 0x00 ) ;
+
+    for( i = 0 ; i < j ; i++ )
+    {
+        data = table[ i ] ;
+
+        for( k = 0 ; k < 3 ; k++ )
+        {
+            data2 = 0 ;
+
+            if ( data & 0x01 )
+                data2 = 0x2A ;
+
+            if ( data & 0x02 )
+                data2 += 0x15 ;
+
+            XGINew_SetReg3( pVBInfo->P3c9 , data2 ) ;
+            data = data >> 2 ;
+        }
+    }
+
+    if ( time == 256 )
+    {
+        for( i = 16 ; i < 32 ; i++ )
+        {
+            data = table[ i ] ;
+
+            for( k = 0 ; k < 3 ; k++ )
+                XGINew_SetReg3( pVBInfo->P3c9 , data ) ;
+        }
+
+        si = 32 ;
+
+        for( m = 0 ; m < 9 ; m++ )
+        {
+            di = si ;
+            bx = si + 0x04 ;
+            dl = 0 ;
+
+            for( n = 0 ; n < 3 ; n++ )
+            {
+                for( o = 0 ; o < 5 ; o++ )
+                {
+                    dh = table[ si ] ;
+                    ah = table[ di ] ;
+                    al = table[ bx ] ;
+                    si++ ;
+                    XGI_WriteDAC( dl , ah , al , dh, pVBInfo ) ;
+                }
+
+                si -= 2 ;
+
+                for( o = 0 ; o < 3 ; o++ )
+                {
+                    dh = table[ bx ] ;
+                    ah = table[ di ] ;
+                    al = table[ si ] ;
+                    si-- ;
+                    XGI_WriteDAC( dl , ah , al , dh, pVBInfo ) ;
+                }
+
+                dl++ ;
+            }
+
+            si += 5 ;
+        }
+    }
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_WriteDAC */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_WriteDAC( USHORT dl , USHORT ah , USHORT al , USHORT dh,PVB_DEVICE_INFO pVBInfo )
+{
+    USHORT temp , bh , bl ;
+
+    bh = ah ;
+    bl = al ;
+
+    if ( dl != 0 )
+    {
+        temp = bh ;
+        bh = dh ;
+        dh = temp ;
+        if ( dl == 1 )
+        {
+            temp = bl ;
+            bl = dh ;
+            dh = temp ;
+        }
+        else
+        {
+            temp = bl ;
+            bl = bh ;
+            bh = temp ;
+        }
+    }
+    XGINew_SetReg3( pVBInfo->P3c9 , ( USHORT )dh ) ;
+    XGINew_SetReg3( pVBInfo->P3c9 , ( USHORT )bh ) ;
+    XGINew_SetReg3( pVBInfo->P3c9 , ( USHORT )bl ) ;
+}
+
+#if 0
+/* --------------------------------------------------------------------- */
+/* Function : XGI_ClearBuffer */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_ClearBuffer( PXGI_HW_DEVICE_INFO HwDeviceExtension , USHORT ModeNo, PVB_DEVICE_INFO  pVBInfo)
+{
+    PVOID VideoMemoryAddress = ( PVOID )HwDeviceExtension->pjVideoMemoryAddress ;
+    ULONG AdapterMemorySize  = ( ULONG )HwDeviceExtension->ulVideoMemorySize ;
+    PUSHORT pBuffer ;
+#ifndef LINUX_XF86
+    int i ;
+#endif
+
+    if ( pVBInfo->ModeType >= ModeEGA )
+    {
+        if ( ModeNo > 0x13 )
+        {
+            AdapterMemorySize = 0x40000 ;      /* clear 256k */
+            /* GetDRAMSize( HwDeviceExtension ) ; */
+            XGI_SetMemory( VideoMemoryAddress , AdapterMemorySize , 0 ) ;
+        }
+        else
+        {
+/*
+            pBuffer = VideoMemoryAddress ;
+            for( i = 0 ; i < 0x4000 ; i++ )
+                pBuffer[ i ] = 0x0000 ;
+*/
+        }
+    }
+    else
+    {
+        pBuffer = VideoMemoryAddress ;
+        if ( pVBInfo->ModeType < ModeCGA )
+        {
+/*
+            for ( i = 0 ; i < 0x4000 ; i++ )
+                pBuffer[ i ] = 0x0720 ;
+*/
+        }
+        else
+            XGI_SetMemory( VideoMemoryAddress , 0x8000 , 0 ) ;
+    }
+}
+
+#endif
+/* --------------------------------------------------------------------- */
+/* Function : XGI_SetLCDAGroup */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_SetLCDAGroup( USHORT ModeNo , USHORT ModeIdIndex , PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO  pVBInfo )
+{
+    USHORT RefreshRateTableIndex ;
+    /* USHORT temp ; */
+
+    /* pVBInfo->SelectCRT2Rate = 0 ; */
+
+    pVBInfo->SetFlag |= ProgrammingCRT2 ;
+    RefreshRateTableIndex = XGI_GetRatePtrCRT2( HwDeviceExtension, ModeNo , ModeIdIndex, pVBInfo ) ;
+    XGI_GetLVDSResInfo(  ModeNo , ModeIdIndex,  pVBInfo ) ;
+    XGI_GetLVDSData( ModeNo , ModeIdIndex , RefreshRateTableIndex,  pVBInfo);
+    XGI_ModCRT1Regs( ModeNo , ModeIdIndex , RefreshRateTableIndex , HwDeviceExtension, pVBInfo ) ;
+    XGI_SetLVDSRegs( ModeNo , ModeIdIndex , RefreshRateTableIndex, pVBInfo ) ;
+    XGI_SetCRT2ECLK( ModeNo , ModeIdIndex , RefreshRateTableIndex, pVBInfo ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_GetLVDSResInfo */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_GetLVDSResInfo( USHORT ModeNo , USHORT ModeIdIndex,PVB_DEVICE_INFO  pVBInfo )
+{
+    USHORT resindex , xres , yres , modeflag ;
+
+    if ( ModeNo <= 0x13 )
+    {
+        modeflag = pVBInfo->SModeIDTable[ ModeIdIndex ].St_ResInfo ;   /* si+St_ResInfo */
+    }
+    else
+    {
+        modeflag = pVBInfo->EModeIDTable[ ModeIdIndex ].Ext_RESINFO ;  /* si+Ext_ResInfo */
+    }
+
+
+    /* if ( ModeNo > 0x13 ) */
+    /* modeflag = pVBInfo->EModeIDTable[ ModeIdIndex ].Ext_ModeFlag ; */
+    /* else */
+    /* modeflag = pVBInfo->SModeIDTable[ ModeIdIndex ].St_ModeFlag ; */
+
+    if ( ModeNo <= 0x13 )
+    {
+        resindex = pVBInfo->SModeIDTable[ ModeIdIndex ].St_ResInfo ;   /* si+St_ResInfo */
+    }
+    else
+    {
+        resindex = pVBInfo->EModeIDTable[ ModeIdIndex ].Ext_RESINFO ;  /* si+Ext_ResInfo */
+    }
+
+    /* resindex = XGI_GetResInfo( ModeNo , ModeIdIndex, pVBInfo ) ; */
+
+    if ( ModeNo <= 0x13 )
+    {
+        xres = pVBInfo->StResInfo[ resindex ].HTotal ;
+        yres = pVBInfo->StResInfo[ resindex ].VTotal ;
+    }
+    else
+    {
+        xres = pVBInfo->ModeResInfo[ resindex ].HTotal ;
+        yres = pVBInfo->ModeResInfo[ resindex ].VTotal ;
+    }
+    if ( ModeNo > 0x13 )
+    {
+        if ( modeflag & HalfDCLK )
+            xres = xres << 1 ;
+
+        if ( modeflag & DoubleScanMode )
+            yres = yres << 1 ;
+    }
+    /* if ( modeflag & Charx8Dot ) */
+    /* { */
+
+    if ( xres == 720 )
+        xres = 640 ;
+
+    /* } */
+    pVBInfo->VGAHDE = xres ;
+    pVBInfo->HDE = xres ;
+    pVBInfo->VGAVDE = yres ;
+    pVBInfo->VDE = yres ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_GetLVDSData */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_GetLVDSData(  USHORT ModeNo , USHORT ModeIdIndex , USHORT RefreshRateTableIndex, PVB_DEVICE_INFO  pVBInfo )
+{
+    USHORT tempbx ;
+    XGI330_LVDSDataStruct *LCDPtr = NULL ;
+    XGI330_CHTVDataStruct  *TVPtr = NULL ;
+
+    tempbx = 2 ;
+
+    if ( pVBInfo->VBInfo & ( SetCRT2ToLCD | SetCRT2ToLCDA ) )
+    {
+        LCDPtr = ( XGI330_LVDSDataStruct * )XGI_GetLcdPtr( tempbx, ModeNo , ModeIdIndex , RefreshRateTableIndex, pVBInfo) ;
+        pVBInfo->VGAHT = LCDPtr->VGAHT ;
+        pVBInfo->VGAVT = LCDPtr->VGAVT ;
+        pVBInfo->HT = LCDPtr->LCDHT ;
+        pVBInfo->VT = LCDPtr->LCDVT ;
+    }
+    if ( pVBInfo->IF_DEF_CH7017 == 1 )
+    {
+        if ( pVBInfo->VBInfo & SetCRT2ToTV )
+        {
+            TVPtr = ( XGI330_CHTVDataStruct * )XGI_GetTVPtr( tempbx , ModeNo , ModeIdIndex , RefreshRateTableIndex, pVBInfo ) ;
+            pVBInfo->VGAHT = TVPtr->VGAHT ;
+            pVBInfo->VGAVT = TVPtr->VGAVT ;
+            pVBInfo->HT = TVPtr->LCDHT ;
+            pVBInfo->VT = TVPtr->LCDVT ;
+        }
+    }
+
+    if ( pVBInfo->VBInfo & ( SetCRT2ToLCD | SetCRT2ToLCDA ) )
+    {
+        if ( !( pVBInfo->LCDInfo & ( SetLCDtoNonExpanding | EnableScalingLCD ) ) )
+        {
+            if ( ( pVBInfo->LCDResInfo == Panel1024x768 ) || ( pVBInfo->LCDResInfo == Panel1024x768x75 ) )
+            {
+                pVBInfo->HDE = 1024 ;
+                pVBInfo->VDE = 768 ;
+            }
+            else if ( ( pVBInfo->LCDResInfo == Panel1280x1024 ) || ( pVBInfo->LCDResInfo == Panel1280x1024x75 ) )
+            {
+                pVBInfo->HDE = 1280 ;
+                pVBInfo->VDE = 1024 ;
+            }
+            else if ( pVBInfo->LCDResInfo == Panel1400x1050 )
+            {
+                pVBInfo->HDE = 1400 ;
+                pVBInfo->VDE = 1050 ;
+            }
+            else
+            {
+                pVBInfo->HDE = 1600 ;
+                pVBInfo->VDE = 1200 ;
+            }
+        }
+    }
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_ModCRT1Regs */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_ModCRT1Regs( USHORT ModeNo , USHORT ModeIdIndex ,
+                        USHORT RefreshRateTableIndex , PXGI_HW_DEVICE_INFO HwDeviceExtension,PVB_DEVICE_INFO  pVBInfo )
+{
+    UCHAR index ;
+    USHORT tempbx , i ;
+    XGI_LVDSCRT1HDataStruct  *LCDPtr = NULL ;
+    XGI_LVDSCRT1VDataStruct  *LCDPtr1 =NULL ;
+    /* XGI330_CHTVDataStruct *TVPtr = NULL ; */
+    XGI_CH7007TV_TimingHStruct *CH7007TV_TimingHPtr = NULL;
+    XGI_CH7007TV_TimingVStruct *CH7007TV_TimingVPtr = NULL;
+
+    if( ModeNo <= 0x13 )
+        index = pVBInfo->SModeIDTable[ ModeIdIndex ].St_CRT2CRTC ;
+    else
+        index = pVBInfo->RefIndex[RefreshRateTableIndex].Ext_CRT2CRTC;
+
+    index= index & IndexMask ;
+
+    if ( ( pVBInfo->IF_DEF_ScaleLCD == 0 ) || ( ( pVBInfo->IF_DEF_ScaleLCD == 1 ) && ( !( pVBInfo->LCDInfo & EnableScalingLCD ) ) ) )
+    {
+        tempbx = 0 ;
+
+        if ( pVBInfo->VBInfo & ( SetCRT2ToLCD | SetCRT2ToLCDA ) )
+        {
+            LCDPtr = ( XGI_LVDSCRT1HDataStruct * )XGI_GetLcdPtr( tempbx , ModeNo , ModeIdIndex , RefreshRateTableIndex, pVBInfo ) ;
+
+            for( i = 0 ; i < 8 ; i++ )
+                pVBInfo->TimingH[ 0 ].data[ i ] = LCDPtr[ 0 ].Reg[ i ] ;
+        }
+
+        if ( pVBInfo->IF_DEF_CH7007 == 1 )
+        {
+            if ( pVBInfo->VBInfo & SetCRT2ToTV )
+            {
+                CH7007TV_TimingHPtr = ( XGI_CH7007TV_TimingHStruct *)XGI_GetTVPtr( tempbx , ModeNo , ModeIdIndex , RefreshRateTableIndex, pVBInfo ) ;
+
+                for( i = 0 ; i < 8 ; i++ )
+                    pVBInfo->TimingH[ 0 ].data[ i ] = CH7007TV_TimingHPtr[ 0 ].data[ i ] ;
+            }
+        }
+
+        /* if ( pVBInfo->IF_DEF_CH7017 == 1 )
+        {
+            if ( pVBInfo->VBInfo & SetCRT2ToTV )
+                TVPtr = ( XGI330_CHTVDataStruct *)XGI_GetTVPtr( tempbx , ModeNo , ModeIdIndex , RefreshRateTableIndex, pVBInfo ) ;
+        } */
+
+        XGI_SetCRT1Timing_H(pVBInfo,HwDeviceExtension) ;
+
+        if ( pVBInfo->IF_DEF_CH7007 == 1 )
+        {
+           XGINew_SetReg1( pVBInfo->P3c4 , 0x2E , CH7007TV_TimingHPtr[ 0 ].data[ 8 ] ) ;
+           XGINew_SetReg1( pVBInfo->P3c4 , 0x2F , CH7007TV_TimingHPtr[ 0 ].data[ 9 ] ) ;
+        }
+
+        tempbx = 1 ;
+
+        if ( pVBInfo->VBInfo & ( SetCRT2ToLCD | SetCRT2ToLCDA ) )
+        {
+            LCDPtr1 = ( XGI_LVDSCRT1VDataStruct * )XGI_GetLcdPtr( tempbx , ModeNo , ModeIdIndex , RefreshRateTableIndex, pVBInfo ) ;
+            for( i = 0 ; i < 7 ; i++ )
+                pVBInfo->TimingV[ 0 ].data[ i ] = LCDPtr1[ 0 ].Reg[ i ] ;
+        }
+
+        if ( pVBInfo->IF_DEF_CH7007 == 1 )
+        {
+            if ( pVBInfo->VBInfo & SetCRT2ToTV )
+            {
+                CH7007TV_TimingVPtr = ( XGI_CH7007TV_TimingVStruct *)XGI_GetTVPtr( tempbx , ModeNo , ModeIdIndex , RefreshRateTableIndex, pVBInfo ) ;
+
+                for( i = 0 ; i < 7 ; i++ )
+                    pVBInfo->TimingV[ 0 ].data[ i ] = CH7007TV_TimingVPtr[ 0 ].data[ i ] ;
+            }
+        }
+        /* if ( pVBInfo->IF_DEF_CH7017 == 1 )
+        {
+            if ( pVBInfo->VBInfo & SetCRT2ToTV )
+                TVPtr = ( XGI330_CHTVDataStruct *)XGI_GetTVPtr( tempbx , ModeNo , ModeIdIndex , RefreshRateTableIndex, pVBInfo ) ;
+        } */
+
+        XGI_SetCRT1Timing_V( ModeIdIndex , ModeNo , pVBInfo) ;
+
+        if ( pVBInfo->IF_DEF_CH7007 == 1 )
+        {
+           XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x33 , ~0x01 , CH7007TV_TimingVPtr[ 0 ].data[ 7 ]&0x01 ) ;
+           XGINew_SetReg1( pVBInfo->P3c4 , 0x34 , CH7007TV_TimingVPtr[ 0 ].data[8 ] ) ;
+           XGINew_SetReg1( pVBInfo->P3c4 , 0x3F , CH7007TV_TimingVPtr[ 0 ].data[9 ] ) ;
+
+        }
+    }
+}
+
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_SetLVDSRegs */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_SetLVDSRegs( USHORT ModeNo , USHORT ModeIdIndex , USHORT RefreshRateTableIndex, PVB_DEVICE_INFO  pVBInfo )
+{
+    USHORT tempbx , tempax , tempcx , tempdx , push1 , push2 , modeflag ;
+    unsigned long temp , temp1 , temp2 , temp3 , push3 ;
+    XGI330_LCDDataDesStruct  *LCDPtr = NULL ;
+    XGI330_LCDDataDesStruct2  *LCDPtr1 = NULL ;
+
+    if ( ModeNo > 0x13 )
+        modeflag = pVBInfo->EModeIDTable[ ModeIdIndex ].Ext_ModeFlag ;
+    else
+        modeflag = pVBInfo->SModeIDTable[ ModeIdIndex ].St_ModeFlag ;
+
+    if ( !( pVBInfo->SetFlag & Win9xDOSMode ) )
+    {
+        if ( ( pVBInfo->IF_DEF_CH7017 == 0 ) || ( pVBInfo->VBInfo & ( SetCRT2ToLCD | SetCRT2ToLCDA ) ) )
+        {
+            if ( pVBInfo->IF_DEF_OEMUtil == 1 )
+            {
+               tempbx = 8 ;
+               LCDPtr = ( XGI330_LCDDataDesStruct * )XGI_GetLcdPtr( tempbx , ModeNo , ModeIdIndex , RefreshRateTableIndex, pVBInfo ) ;
+            }
+
+            if ( ( pVBInfo->IF_DEF_OEMUtil == 0 ) || ( LCDPtr == 0 ) )
+            {
+                tempbx = 3 ;
+                if ( pVBInfo->LCDInfo & EnableScalingLCD )
+                    LCDPtr1 = ( XGI330_LCDDataDesStruct2 * )XGI_GetLcdPtr( tempbx , ModeNo , ModeIdIndex , RefreshRateTableIndex, pVBInfo ) ;
+                else
+                    LCDPtr = ( XGI330_LCDDataDesStruct * )XGI_GetLcdPtr( tempbx , ModeNo , ModeIdIndex , RefreshRateTableIndex, pVBInfo ) ;
+            }
+
+            XGI_GetLCDSync( &tempax , &tempbx ,pVBInfo) ;
+            push1 = tempbx ;
+            push2 = tempax ;
+
+            /* GetLCDResInfo */
+            if ( ( pVBInfo->LCDResInfo == Panel1024x768 ) || ( pVBInfo->LCDResInfo == Panel1024x768x75 ) )
+            {
+                tempax = 1024 ;
+                tempbx = 768 ;
+            }
+            else if ( ( pVBInfo->LCDResInfo == Panel1280x1024 ) || ( pVBInfo->LCDResInfo == Panel1280x1024x75 ) )
+            {
+                tempax = 1280 ;
+                tempbx = 1024 ;
+            }
+            else if ( pVBInfo->LCDResInfo == Panel1400x1050 )
+            {
+                tempax = 1400 ;
+                tempbx = 1050 ;
+            }
+            else
+            {
+                tempax = 1600 ;
+                tempbx = 1200 ;
+            }
+
+            if ( pVBInfo->LCDInfo & SetLCDtoNonExpanding )
+            {
+                pVBInfo->HDE=tempax;
+                pVBInfo->VDE=tempbx;
+                pVBInfo->VGAHDE=tempax;
+                pVBInfo->VGAVDE=tempbx;
+            }
+
+            if ( ( pVBInfo->IF_DEF_ScaleLCD == 1 ) && ( pVBInfo->LCDInfo & EnableScalingLCD ) )
+            {
+                tempax=pVBInfo->HDE;
+                tempbx=pVBInfo->VDE;
+            }
+
+            tempax = pVBInfo->HT ;
+
+            if ( pVBInfo->LCDInfo & EnableScalingLCD )
+                tempbx = LCDPtr1->LCDHDES ;
+            else
+                tempbx = LCDPtr->LCDHDES ;
+
+            tempcx = pVBInfo->HDE ;
+            tempbx = tempbx & 0x0fff ;
+            tempcx += tempbx ;
+
+            if ( tempcx >= tempax )
+                tempcx -= tempax ;
+
+            XGINew_SetReg1( pVBInfo->Part1Port , 0x1A , tempbx & 0x07 ) ;
+
+            tempcx = tempcx >> 3 ;
+            tempbx = tempbx >> 3 ;
+
+            XGINew_SetReg1( pVBInfo->Part1Port , 0x16 , ( USHORT )( tempbx & 0xff ) ) ;
+            XGINew_SetReg1( pVBInfo->Part1Port , 0x17 , ( USHORT )( tempcx & 0xff ) ) ;
+
+            tempax = pVBInfo->HT ;
+
+            if ( pVBInfo->LCDInfo & EnableScalingLCD )
+                tempbx = LCDPtr1->LCDHRS ;
+            else
+                tempbx = LCDPtr->LCDHRS ;
+
+            tempcx = push2 ;
+
+            if ( pVBInfo->LCDInfo & EnableScalingLCD )
+                tempcx = LCDPtr1->LCDHSync ;
+
+            tempcx += tempbx ;
+
+            if ( tempcx >= tempax )
+                tempcx -= tempax ;
+
+            tempax = tempbx & 0x07 ;
+            tempax = tempax >> 5 ;
+            tempcx = tempcx >> 3 ;
+            tempbx = tempbx >> 3 ;
+
+            tempcx &= 0x1f ;
+            tempax |= tempcx ;
+
+            XGINew_SetReg1( pVBInfo->Part1Port , 0x15 , tempax ) ;
+            XGINew_SetReg1( pVBInfo->Part1Port , 0x14 , ( USHORT )( tempbx & 0xff ) ) ;
+
+            tempax = pVBInfo->VT ;
+            if ( pVBInfo->LCDInfo & EnableScalingLCD )
+                tempbx = LCDPtr1->LCDVDES ;
+            else
+                tempbx = LCDPtr->LCDVDES ;
+            tempcx = pVBInfo->VDE ;
+
+            tempbx = tempbx & 0x0fff ;
+            tempcx += tempbx ;
+            if ( tempcx >= tempax )
+                tempcx -= tempax ;
+
+            XGINew_SetReg1( pVBInfo->Part1Port , 0x1b , ( USHORT )( tempbx & 0xff ) ) ;
+            XGINew_SetReg1( pVBInfo->Part1Port , 0x1c , ( USHORT )( tempcx & 0xff ) ) ;
+
+            tempbx = ( tempbx >> 8 ) & 0x07 ;
+            tempcx = ( tempcx >> 8 ) & 0x07 ;
+
+            XGINew_SetReg1( pVBInfo->Part1Port , 0x1d , ( USHORT )( ( tempcx << 3 ) | tempbx ) ) ;
+
+            tempax = pVBInfo->VT ;
+            if ( pVBInfo->LCDInfo & EnableScalingLCD )
+                tempbx = LCDPtr1->LCDVRS ;
+            else
+                tempbx = LCDPtr->LCDVRS ;
+
+            /* tempbx = tempbx >> 4 ; */
+              tempcx = push1 ;
+
+            if ( pVBInfo->LCDInfo & EnableScalingLCD )
+                tempcx = LCDPtr1->LCDVSync ;
+
+            tempcx += tempbx ;
+            if ( tempcx >= tempax )
+                tempcx -= tempax ;
+
+            XGINew_SetReg1( pVBInfo->Part1Port , 0x18 , ( USHORT )( tempbx & 0xff ) ) ;
+            XGINew_SetRegANDOR( pVBInfo->Part1Port , 0x19 , ~0x0f , ( USHORT )( tempcx & 0x0f ) ) ;
+
+            tempax = ( ( tempbx >> 8 ) & 0x07 ) << 3 ;
+
+            tempbx = pVBInfo->VGAVDE ;
+            if ( tempbx != pVBInfo->VDE )
+                tempax |= 0x40 ;
+
+            if ( pVBInfo->LCDInfo & EnableLVDSDDA )
+                tempax |= 0x40 ;
+
+            XGINew_SetRegANDOR( pVBInfo->Part1Port , 0x1a , 0x07 , tempax ) ;
+
+            tempcx = pVBInfo->VGAVT ;
+            tempbx = pVBInfo->VDE ;
+            tempax = pVBInfo->VGAVDE ;
+            tempcx -= tempax ;
+
+            temp = tempax ;            /* 0430 ylshieh */
+            temp1 = ( temp << 18 ) / tempbx ;
+
+            tempdx = ( USHORT )( ( temp << 18 ) % tempbx ) ;
+
+            if ( tempdx != 0 )
+            temp1 += 1 ;
+
+            temp2 = temp1 ;
+            push3 = temp2 ;
+
+            XGINew_SetReg1( pVBInfo->Part1Port , 0x37 , ( USHORT )( temp2 & 0xff ) ) ;
+            XGINew_SetReg1( pVBInfo->Part1Port , 0x36 , ( USHORT )( ( temp2 >> 8 ) & 0xff ) ) ;
+
+            tempbx = ( USHORT )( temp2 >> 16 ) ;
+            tempax = tempbx & 0x03 ;
+
+            tempbx = pVBInfo->VGAVDE ;
+            if ( tempbx == pVBInfo->VDE )
+                tempax |= 0x04 ;
+
+            XGINew_SetReg1( pVBInfo->Part1Port , 0x35 , tempax ) ;
+
+            if ( pVBInfo->VBType & VB_XGI301C )
+            {
+                temp2 = push3 ;
+               XGINew_SetReg1( pVBInfo->Part4Port , 0x3c , ( USHORT )( temp2 & 0xff ) ) ;
+               XGINew_SetReg1( pVBInfo->Part4Port , 0x3b , ( USHORT )( ( temp2 >> 8 ) & 0xff ) ) ;
+               tempbx = ( USHORT )( temp2 >> 16 ) ;
+               XGINew_SetRegANDOR( pVBInfo->Part4Port , 0x3a , ~0xc0 , ( USHORT )( ( tempbx & 0xff ) << 6 ) ) ;
+
+                tempcx = pVBInfo->VGAVDE ;
+                if ( tempcx == pVBInfo->VDE )
+                    XGINew_SetRegANDOR( pVBInfo->Part4Port , 0x30 , ~0x0c , 0x00 ) ;
+                else
+                    XGINew_SetRegANDOR( pVBInfo->Part4Port , 0x30 , ~0x0c , 0x08 ) ;
+            }
+
+            tempcx = pVBInfo->VGAHDE ;
+            tempbx = pVBInfo->HDE ;
+
+            temp1 = tempcx << 16 ;
+
+            tempax = ( USHORT )( temp1 / tempbx ) ;
+
+            if ( ( tempbx & 0xffff ) == ( tempcx & 0xffff ) )
+                tempax = 65535 ;
+
+            temp3 = tempax ;
+            temp1 = pVBInfo->VGAHDE << 16 ;
+
+            temp1 /= temp3 ;
+            temp3 = temp3 << 16 ;
+            temp1 -= 1 ;
+
+            temp3 = ( temp3 & 0xffff0000 ) + ( temp1 & 0xffff ) ;
+
+            tempax = ( USHORT )( temp3 & 0xff ) ;
+            XGINew_SetReg1( pVBInfo->Part1Port , 0x1f , tempax ) ;
+
+            temp1 = pVBInfo->VGAVDE << 18 ;
+            temp1 = temp1 / push3 ;
+            tempbx = ( USHORT )( temp1 & 0xffff ) ;
+
+            if ( pVBInfo->LCDResInfo == Panel1024x768 )
+                tempbx -= 1 ;
+
+            tempax = ( ( tempbx >> 8 ) & 0xff ) << 3 ;
+            tempax |= ( USHORT )( ( temp3 >> 8 ) & 0x07 ) ;
+            XGINew_SetReg1( pVBInfo->Part1Port , 0x20 , ( USHORT )( tempax & 0xff ) ) ;
+            XGINew_SetReg1( pVBInfo->Part1Port , 0x21 , ( USHORT )( tempbx & 0xff ) ) ;
+
+            temp3 = temp3 >> 16 ;
+
+            if ( modeflag & HalfDCLK )
+                temp3 = temp3 >> 1 ;
+
+            XGINew_SetReg1(pVBInfo->Part1Port , 0x22 , ( USHORT )( ( temp3 >> 8 ) & 0xff ) ) ;
+            XGINew_SetReg1(pVBInfo->Part1Port , 0x23 , ( USHORT )( temp3 & 0xff ) ) ;
+        }
+    }
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_SetCRT2ECLK */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_SetCRT2ECLK( USHORT ModeNo , USHORT ModeIdIndex , USHORT RefreshRateTableIndex, PVB_DEVICE_INFO  pVBInfo )
+{
+    UCHAR di_0 , di_1 , tempal ;
+    int i ;
+
+    tempal = XGI_GetVCLKPtr( RefreshRateTableIndex , ModeNo , ModeIdIndex, pVBInfo ) ;
+    XGI_GetVCLKLen( tempal , &di_0 , &di_1, pVBInfo ) ;
+    XGI_GetLCDVCLKPtr( &di_0 , &di_1, pVBInfo ) ;
+
+    for( i = 0 ; i < 4 ; i++ )
+    {
+        XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x31 , ~0x30 , ( USHORT )( 0x10 * i ) ) ;
+        if ( pVBInfo->IF_DEF_CH7007 == 1 )
+        {
+            XGINew_SetReg1( pVBInfo->P3c4 , 0x2b , di_0 ) ;
+            XGINew_SetReg1( pVBInfo->P3c4 , 0x2c , di_1 ) ;
+        }
+        else if ( ( !( pVBInfo->VBInfo & SetCRT2ToLCDA ) ) && ( !( pVBInfo->VBInfo & SetInSlaveMode ) ) )
+        {
+            XGINew_SetReg1( pVBInfo->P3c4 , 0x2e , di_0 ) ;
+            XGINew_SetReg1( pVBInfo->P3c4 , 0x2f , di_1 ) ;
+        }
+        else
+        {
+            XGINew_SetReg1( pVBInfo->P3c4 , 0x2b , di_0 ) ;
+            XGINew_SetReg1( pVBInfo->P3c4 , 0x2c , di_1 ) ;
+        }
+    }
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_UpdateModeInfo */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_UpdateModeInfo( PXGI_HW_DEVICE_INFO HwDeviceExtension,PVB_DEVICE_INFO  pVBInfo )
+{
+    USHORT tempcl ,
+           tempch ,
+           temp ,
+           tempbl ,
+           tempax ;
+
+    if ( pVBInfo->VBType & ( VB_XGI301B | VB_XGI302B | VB_XGI301LV | VB_XGI302LV | VB_XGI301C ) )
+    {
+        tempcl = 0 ;
+        tempch = 0 ;
+        temp = XGINew_GetReg1( pVBInfo->P3c4 , 0x01 ) ;
+
+        if ( !( temp & 0x20 ) )
+        {
+            temp = XGINew_GetReg1( pVBInfo->P3d4 , 0x17 ) ;
+            if ( temp & 0x80 )
+            {
+                if ( ( HwDeviceExtension->jChipType >= XG20 ) || ( HwDeviceExtension->jChipType >= XG40 ) )
+                    temp = XGINew_GetReg1( pVBInfo->P3d4 , 0x53 ) ;
+                else
+                    temp = XGINew_GetReg1( pVBInfo->P3d4 , 0x63 ) ;
+
+                if ( !( temp & 0x40 ) )
+                    tempcl |= ActiveCRT1 ;
+            }
+        }
+
+        temp = XGINew_GetReg1( pVBInfo->Part1Port , 0x2e ) ;
+        temp &= 0x0f ;
+
+        if ( !( temp == 0x08 ) )
+        {
+            tempax = XGINew_GetReg1( pVBInfo->Part1Port , 0x13 ) ;     /* Check ChannelA by Part1_13 [2003/10/03] */
+            if ( tempax & 0x04 )
+                       tempcl = tempcl | ActiveLCD ;
+
+            temp &= 0x05 ;
+
+            if ( !( tempcl & ActiveLCD ) )
+               if ( temp == 0x01 )
+                    tempcl |= ActiveCRT2 ;
+
+            if ( temp == 0x04 )
+                tempcl |= ActiveLCD ;
+
+            if ( temp == 0x05 )
+            {
+                temp = XGINew_GetReg1( pVBInfo->Part2Port , 0x00 ) ;
+
+                if( !( temp & 0x08 ) )
+                    tempch |= ActiveAVideo ;
+
+                if ( !( temp & 0x04 ) )
+                    tempch |= ActiveSVideo ;
+
+                if ( temp & 0x02 )
+                    tempch |= ActiveSCART ;
+
+                if ( pVBInfo->VBInfo & SetCRT2ToHiVisionTV )
+                {
+                    if ( temp & 0x01 )
+                        tempch |= ActiveHiTV ;
+                }
+
+                if ( pVBInfo->VBInfo & SetCRT2ToYPbPr )
+                {
+                    temp = XGINew_GetReg1( pVBInfo->Part2Port , 0x4d ) ;
+
+                    if ( temp & 0x10 )
+                        tempch |= ActiveYPbPr ;
+                }
+
+                if ( tempch != 0 )
+                    tempcl |= ActiveTV ;
+            }
+        }
+
+        temp = XGINew_GetReg1( pVBInfo->P3d4 , 0x3d ) ;
+        if ( tempcl & ActiveLCD )
+        {
+            if ( ( pVBInfo->SetFlag & ReserveTVOption ) )
+            {
+                if ( temp & ActiveTV )
+                    tempcl |= ActiveTV ;
+            }
+        }
+        temp = tempcl ;
+        tempbl = ~ModeSwitchStatus ;
+        XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x3d , tempbl , temp ) ;
+
+        if ( !( pVBInfo->SetFlag & ReserveTVOption ) )
+            XGINew_SetReg1( pVBInfo->P3d4 , 0x3e , tempch ) ;
+    }
+    else
+    {
+        return ;
+    }
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_GetVGAType */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_GetVGAType( PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO  pVBInfo)
+{
+    /*
+    if ( HwDeviceExtension->jChipType >= XG20 )
+    {
+        pVBInfo->Set_VGAType = XG20;
+    }
+    else if ( HwDeviceExtension->jChipType >= XG40 )
+    {
+        pVBInfo->Set_VGAType = VGA_XGI340 ;
+    }
+    */
+    pVBInfo->Set_VGAType = HwDeviceExtension->jChipType;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_GetVBType */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_GetVBType(PVB_DEVICE_INFO  pVBInfo)
+{
+    USHORT flag , tempbx , tempah ;
+
+    if ( pVBInfo->IF_DEF_CH7007 == 1 )
+    {
+        pVBInfo->VBType = VB_CH7007 ;
+        return;
+    }
+    if ( pVBInfo->IF_DEF_LVDS == 0 )
+    {
+        tempbx = VB_XGI302B ;
+        flag = XGINew_GetReg1( pVBInfo->Part4Port , 0x00 ) ;
+        if ( flag != 0x02 )
+        {
+            tempbx = VB_XGI301 ;
+            flag = XGINew_GetReg1( pVBInfo->Part4Port , 0x01 ) ;
+            if ( flag >= 0xB0 )
+            {
+                tempbx = VB_XGI301B ;
+                if ( flag >= 0xC0 )
+                {
+                    tempbx = VB_XGI301C ;
+                    if ( flag >= 0xD0 )
+                    {
+                        tempbx = VB_XGI301LV ;
+                        if ( flag >= 0xE0 )
+                        {
+                            tempbx = VB_XGI302LV ;
+                            tempah = XGINew_GetReg1( pVBInfo->Part4Port , 0x39 ) ;
+                            if ( tempah != 0xFF )
+                                tempbx = VB_XGI301C ;
+                        }
+                    }
+                }
+
+                if ( tempbx & ( VB_XGI301B | VB_XGI302B ) )
+                {
+                    flag = XGINew_GetReg1( pVBInfo->Part4Port , 0x23 ) ;
+
+                    if ( !( flag & 0x02 ) )
+                        tempbx = tempbx | VB_NoLCD ;
+                }
+            }
+        }
+        pVBInfo->VBType = tempbx ;
+    }
+/*
+    else if ( pVBInfo->IF_DEF_CH7017 == 1 )
+        pVBInfo->VBType = VB_CH7017 ;
+    else  //LVDS
+        pVBInfo->VBType = VB_LVDS_NS ;
+*/
+
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_GetVBInfo */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_GetVBInfo( USHORT ModeNo , USHORT ModeIdIndex , PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO  pVBInfo )
+{
+    USHORT tempax ,
+           push ,
+           tempbx ,
+           temp ,
+           modeflag ;
+
+    if ( ModeNo <= 0x13 )
+    {
+        modeflag = pVBInfo->SModeIDTable[ ModeIdIndex ].St_ModeFlag ;
+    }
+    else
+    {
+        modeflag = pVBInfo->EModeIDTable[ ModeIdIndex ].Ext_ModeFlag ;
+    }
+
+    pVBInfo->SetFlag = 0 ;
+    pVBInfo->ModeType = modeflag & ModeInfoFlag ;
+    tempbx = 0 ;
+
+    if ( pVBInfo->VBType & 0xFFFF )
+    {
+        temp = XGINew_GetReg1( pVBInfo->P3d4 , 0x30 ) ;           /* Check Display Device */
+        tempbx = tempbx | temp ;
+        temp = XGINew_GetReg1( pVBInfo->P3d4 , 0x31 ) ;
+        push = temp ;
+        push = push << 8 ;
+        tempax = temp << 8 ;
+        tempbx = tempbx | tempax ;
+        temp = ( SetCRT2ToDualEdge | SetCRT2ToYPbPr | SetCRT2ToLCDA | SetInSlaveMode | DisableCRT2Display ) ;
+        temp = 0xFFFF ^ temp ;
+        tempbx &= temp ;
+
+        temp = XGINew_GetReg1( pVBInfo->P3d4 , 0x38 ) ;
+
+        if ( pVBInfo->IF_DEF_LCDA == 1 )
+        {
+
+            if ( ( pVBInfo->Set_VGAType >= XG20 ) || ( pVBInfo->Set_VGAType >= XG40 ))
+            {
+                if ( pVBInfo->IF_DEF_LVDS == 0 )
+                {
+                    /* if ( ( pVBInfo->VBType & VB_XGI302B ) || ( pVBInfo->VBType & VB_XGI301LV ) || ( pVBInfo->VBType & VB_XGI302LV ) || ( pVBInfo->VBType & VB_XGI301C ) ) */
+                    if ( pVBInfo->VBType & ( VB_XGI302B | VB_XGI301LV | VB_XGI302LV | VB_XGI301C ) )
+                    {
+                        if ( temp & EnableDualEdge )
+                        {
+                            tempbx |= SetCRT2ToDualEdge ;
+
+                            if ( temp & SetToLCDA )
+                                tempbx |= SetCRT2ToLCDA ;
+                        }
+                    }
+                }
+                else if ( pVBInfo->IF_DEF_CH7017 == 1 )
+                {
+                    if ( pVBInfo->VBType & VB_CH7017 )
+                    {
+                        if ( temp & EnableDualEdge )
+                        {
+                            tempbx |= SetCRT2ToDualEdge ;
+
+                            if ( temp & SetToLCDA )
+                                tempbx |= SetCRT2ToLCDA ;
+                        }
+                    }
+                }
+            }
+        }
+
+        if ( pVBInfo->IF_DEF_YPbPr == 1 )
+        {
+            if ( ( ( pVBInfo->IF_DEF_LVDS == 0 ) && ( ( pVBInfo->VBType & VB_XGI301LV ) || ( pVBInfo->VBType & VB_XGI302LV ) || ( pVBInfo->VBType & VB_XGI301C ) ) )
+            || ( ( pVBInfo->IF_DEF_CH7017 == 1 ) && ( pVBInfo->VBType&VB_CH7017 ) ) || ( (pVBInfo->IF_DEF_CH7007 == 1) && (pVBInfo->VBType&VB_CH7007) ) )    /* [Billy] 07/05/04 */
+            {
+                if ( temp & SetYPbPr ) /* temp = CR38 */
+                {
+                    if ( pVBInfo->IF_DEF_HiVision == 1 )
+                    {
+                        temp = XGINew_GetReg1( pVBInfo->P3d4 , 0x35 ) ;  /* shampoo add for new scratch */
+                        temp &= YPbPrMode ;
+                        tempbx |= SetCRT2ToHiVisionTV ;
+
+                        if ( temp != YPbPrMode1080i ) {
+                            tempbx &= ( ~SetCRT2ToHiVisionTV ) ;
+                            tempbx |= SetCRT2ToYPbPr ; }
+                    }
+
+                    /* tempbx |= SetCRT2ToYPbPr ; */
+                }
+            }
+        }
+
+        tempax = push ;  /* restore CR31 */
+
+        if ( pVBInfo->IF_DEF_LVDS == 0 )
+        {
+            if ( pVBInfo->IF_DEF_YPbPr == 1 )
+            {
+                if ( pVBInfo->IF_DEF_HiVision == 1 )
+                    temp = 0x09FC ;
+                else
+                    temp = 0x097C ;
+            }
+            else
+            {
+                if ( pVBInfo->IF_DEF_HiVision == 1 )
+                    temp = 0x01FC ;
+                else
+                    temp = 0x017C ;
+            }
+        }
+        else   /* 3nd party chip */
+        {
+            if ( pVBInfo->IF_DEF_CH7017 == 1 )
+                temp = ( SetCRT2ToTV | SetCRT2ToLCD | SetCRT2ToLCDA ) ;
+            else if ( pVBInfo->IF_DEF_CH7007 == 1 )  /* [Billy] 07/05/03 */
+            {
+                temp = SetCRT2ToTV ;
+            }
+            else
+                temp = SetCRT2ToLCD ;
+        }
+
+        if ( !( tempbx & temp ) )
+        {
+            tempax |= DisableCRT2Display ;
+            tempbx = 0 ;
+        }
+
+        if ( pVBInfo->IF_DEF_LCDA == 1 )       /* Select Display Device */
+        {
+            if ( !( pVBInfo->VBType & VB_NoLCD ) )
+            {
+                if ( tempbx & SetCRT2ToLCDA )
+                {
+                    if ( tempbx & SetSimuScanMode )
+                        tempbx &= ( ~( SetCRT2ToLCD | SetCRT2ToRAMDAC | SwitchToCRT2 ) ) ;
+                    else
+                        tempbx &= ( ~( SetCRT2ToLCD | SetCRT2ToRAMDAC | SetCRT2ToTV | SwitchToCRT2 ) ) ;
+                }
+            }
+        }
+
+        /* shampoo add */
+        if ( !( tempbx & ( SwitchToCRT2 | SetSimuScanMode ) ) )        /* for driver abnormal */
+        {
+            if ( pVBInfo->IF_DEF_CRT2Monitor == 1 )
+            {
+                if ( tempbx & SetCRT2ToRAMDAC )
+                {
+                    tempbx &= ( 0xFF00 | SetCRT2ToRAMDAC | SwitchToCRT2 | SetSimuScanMode ) ;
+                    tempbx &= ( 0x00FF | ( ~SetCRT2ToYPbPr ) ) ;
+                }
+            }
+            else
+                tempbx &= ( ~( SetCRT2ToRAMDAC | SetCRT2ToLCD | SetCRT2ToTV ) ) ;
+        }
+
+        if ( !( pVBInfo->VBType & VB_NoLCD ) )
+        {
+            if ( tempbx & SetCRT2ToLCD )
+            {
+                tempbx &= ( 0xFF00 | SetCRT2ToLCD | SwitchToCRT2 | SetSimuScanMode ) ;
+                tempbx &= ( 0x00FF | ( ~SetCRT2ToYPbPr ) ) ;
+            }
+        }
+
+        if ( tempbx & SetCRT2ToSCART )
+        {
+            tempbx &= ( 0xFF00 | SetCRT2ToSCART | SwitchToCRT2 | SetSimuScanMode ) ;
+            tempbx &= ( 0x00FF | ( ~SetCRT2ToYPbPr ) ) ;
+        }
+
+        if ( pVBInfo->IF_DEF_YPbPr == 1 )
+        {
+            if ( tempbx & SetCRT2ToYPbPr )
+                tempbx &= ( 0xFF00 | SwitchToCRT2 | SetSimuScanMode ) ;
+        }
+
+        if ( pVBInfo->IF_DEF_HiVision == 1 )
+        {
+            if ( tempbx & SetCRT2ToHiVisionTV )
+                tempbx &= ( 0xFF00 | SetCRT2ToHiVisionTV | SwitchToCRT2 | SetSimuScanMode ) ;
+        }
+
+        if ( tempax & DisableCRT2Display )     /* Set Display Device Info */
+        {
+            if ( !( tempbx & ( SwitchToCRT2 | SetSimuScanMode ) ) )
+                tempbx = DisableCRT2Display ;
+        }
+
+        if ( !( tempbx & DisableCRT2Display ) )
+        {
+            if ( ( !( tempbx & DriverMode ) ) || ( !( modeflag & CRT2Mode ) ) )
+            {
+                if ( pVBInfo->IF_DEF_LCDA == 1 )
+               {
+                    if ( !( tempbx & SetCRT2ToLCDA ) )
+                        tempbx |= ( SetInSlaveMode | SetSimuScanMode ) ;
+                }
+
+                if ( pVBInfo->IF_DEF_VideoCapture == 1 )
+                {
+                    if ( ( ( HwDeviceExtension->jChipType == XG40 ) && ( pVBInfo->Set_VGAType == XG40 ) )
+                    || ( ( HwDeviceExtension->jChipType == XG41 ) && ( pVBInfo->Set_VGAType == XG41 ) )
+                    || ( ( HwDeviceExtension->jChipType == XG42 ) && ( pVBInfo->Set_VGAType == XG42 ) )
+                    || ( ( HwDeviceExtension->jChipType == XG45 ) && ( pVBInfo->Set_VGAType == XG45 ) ) )
+                    {
+                        if ( ModeNo <= 13 )
+                        {
+                            if ( !( tempbx & SetCRT2ToRAMDAC ) )       /*CRT2 not need to support*/
+                            {
+                                tempbx &= ( 0x00FF | ( ~SetInSlaveMode ) ) ;
+                                pVBInfo->SetFlag |= EnableVCMode ;
+                            }
+                        }
+                    }
+                }
+            }
+
+            /*LCD+TV can't support in slave mode (Force LCDA+TV->LCDB)*/
+            if ( ( tempbx & SetInSlaveMode ) && ( tempbx & SetCRT2ToLCDA ) )
+            {
+                tempbx ^= ( SetCRT2ToLCD | SetCRT2ToLCDA | SetCRT2ToDualEdge ) ;
+                pVBInfo->SetFlag |= ReserveTVOption ;
+            }
+        }
+    }
+
+    pVBInfo->VBInfo = tempbx ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_GetTVInfo */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_GetTVInfo( USHORT ModeNo , USHORT ModeIdIndex ,PVB_DEVICE_INFO  pVBInfo )
+{
+    USHORT temp ,
+           tempbx = 0 ,
+           resinfo = 0 ,
+           modeflag ,
+           index1 ;
+
+    tempbx = 0 ;
+    resinfo = 0 ;
+
+    if ( pVBInfo->VBInfo & SetCRT2ToTV )
+    {
+        if ( ModeNo <= 0x13 )
+        {
+            modeflag = pVBInfo->SModeIDTable[ ModeIdIndex ].St_ModeFlag ;      /* si+St_ModeFlag */
+            resinfo = pVBInfo->SModeIDTable[ ModeIdIndex ].St_ResInfo ;        /* si+St_ResInfo */
+        }
+        else
+        {
+            modeflag = pVBInfo->EModeIDTable[ ModeIdIndex ].Ext_ModeFlag ;
+            resinfo = pVBInfo->EModeIDTable[ ModeIdIndex ].Ext_RESINFO ; /* si+Ext_ResInfo */
+        }
+
+        if ( pVBInfo->VBInfo & SetCRT2ToTV )
+        {
+            temp = XGINew_GetReg1( pVBInfo->P3d4 , 0x35 ) ;
+            tempbx = temp;
+            if ( tempbx & SetPALTV )
+            {
+                tempbx &= ( SetCHTVOverScan | SetPALMTV | SetPALNTV | SetPALTV ) ;
+                if ( tempbx & SetPALMTV )
+                    tempbx &= ~SetPALTV ; /* set to NTSC if PAL-M */
+            }
+            else
+                tempbx &= ( SetCHTVOverScan | SetNTSCJ | SetPALTV ) ;
+/*
+            if ( pVBInfo->IF_DEF_LVDS == 0 )
+            {
+                index1 = XGINew_GetReg1( pVBInfo->P3d4 , 0x38 ) ; //PAL-M/PAL-N Info
+                temp2 = ( index1 & 0xC0 ) >> 5 ;               //00:PAL, 01:PAL-M, 10:PAL-N
+                tempbx |= temp2 ;
+                if ( temp2 & 0x02 )          //PAL-M
+                    tempbx &= ( ~SetPALTV ) ;
+            }
+*/
+        }
+
+        if ( pVBInfo->IF_DEF_CH7017 == 1 )
+        {
+            tempbx = XGINew_GetReg1( pVBInfo->P3d4 , 0x35 ) ;
+
+            if ( tempbx & TVOverScan )
+                tempbx |= SetCHTVOverScan ;
+        }
+
+        if ( pVBInfo->IF_DEF_CH7007 == 1 ) /* [Billy] 07/05/04 */
+        {
+            tempbx = XGINew_GetReg1( pVBInfo->P3d4 , 0x35 ) ;
+
+            if ( tempbx & TVOverScan )
+            {
+                tempbx |= SetCHTVOverScan ;
+            }
+        }
+
+
+        if ( pVBInfo->IF_DEF_LVDS == 0 )
+        {
+            if ( pVBInfo->VBInfo & SetCRT2ToSCART )
+                tempbx |= SetPALTV ;
+        }
+
+        if ( pVBInfo->IF_DEF_YPbPr == 1 )
+        {
+            if ( pVBInfo->VBInfo & SetCRT2ToYPbPr )
+            {
+                index1 = XGINew_GetReg1( pVBInfo->P3d4 , 0x35 ) ;
+                index1 &= YPbPrMode ;
+
+                if ( index1 == YPbPrMode525i )
+                    tempbx |= SetYPbPrMode525i ;
+
+                if ( index1 == YPbPrMode525p )
+                    tempbx = tempbx | SetYPbPrMode525p;
+                if ( index1 == YPbPrMode750p)
+                    tempbx = tempbx | SetYPbPrMode750p;
+            }
+        }
+
+        if ( pVBInfo->IF_DEF_HiVision == 1 )
+        {
+            if ( pVBInfo->VBInfo & SetCRT2ToHiVisionTV )
+            {
+                tempbx = tempbx | SetYPbPrMode1080i | SetPALTV ;
+            }
+        }
+
+        if ( pVBInfo->IF_DEF_LVDS == 0 )
+        {      /* shampoo */
+            if ( ( pVBInfo->VBInfo & SetInSlaveMode ) && ( !( pVBInfo->VBInfo & SetNotSimuMode ) ) )
+                tempbx |= TVSimuMode ;
+
+            if ( !( tempbx & SetPALTV ) && ( modeflag > 13 ) && ( resinfo == 8 ) ) /* NTSC 1024x768, */
+                tempbx |= NTSC1024x768 ;
+
+            tempbx |= RPLLDIV2XO ;
+
+            if ( pVBInfo->VBInfo & SetCRT2ToHiVisionTV )
+            {
+                if ( pVBInfo->VBInfo & SetInSlaveMode )
+                    tempbx &=( ~RPLLDIV2XO ) ;
+            }
+            else
+            {
+                if ( tempbx & ( SetYPbPrMode525p | SetYPbPrMode750p ) )
+                    tempbx &= ( ~RPLLDIV2XO ) ;
+                else if ( !( pVBInfo->VBType & ( VB_XGI301B | VB_XGI302B | VB_XGI301LV | VB_XGI302LV | VB_XGI301C ) ) )
+                {
+                    if ( tempbx & TVSimuMode )
+                        tempbx &= ( ~RPLLDIV2XO ) ;
+                }
+            }
+        }
+    }
+    pVBInfo->TVInfo = tempbx ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_GetLCDInfo */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+BOOLEAN XGI_GetLCDInfo( USHORT ModeNo , USHORT ModeIdIndex, PVB_DEVICE_INFO pVBInfo)
+{
+    USHORT temp ,
+           tempax ,
+           tempbx ,
+           modeflag ,
+           resinfo = 0 ,
+           LCDIdIndex ;
+
+    pVBInfo->LCDResInfo = 0 ;
+    pVBInfo->LCDTypeInfo = 0 ;
+    pVBInfo->LCDInfo = 0 ;
+
+    if ( ModeNo <= 0x13 )
+    {
+        modeflag = pVBInfo->SModeIDTable[ ModeIdIndex ].St_ModeFlag ;  /* si+St_ModeFlag // */
+    }
+    else
+    {
+        modeflag = pVBInfo->EModeIDTable[ ModeIdIndex ].Ext_ModeFlag ;
+        resinfo = pVBInfo->EModeIDTable[ ModeIdIndex ].Ext_RESINFO ; /* si+Ext_ResInfo// */
+    }
+
+    temp = XGINew_GetReg1( pVBInfo->P3d4 , 0x36 ) ; /* Get LCD Res.Info */
+    tempbx = temp & 0x0F ;
+
+    if ( tempbx == 0 )
+        tempbx = Panel1024x768 ; /* default */
+
+    /* LCD75 [2003/8/22] Vicent */
+    if ( ( tempbx == Panel1024x768 ) || ( tempbx == Panel1280x1024 ) )
+    {
+        if ( pVBInfo->VBInfo & DriverMode )
+        {
+            tempax = XGINew_GetReg1( pVBInfo->P3d4 , 0x33 ) ;
+            if ( pVBInfo->VBInfo & SetCRT2ToLCDA )
+                tempax &= 0x0F ;
+            else
+                tempax = tempax >> 4 ;
+
+            if ( ( resinfo == 6 ) || ( resinfo == 9 ) )
+            {
+                if ( tempax >= 3 )
+                   tempbx |= PanelRef75Hz ;
+            }
+            else if ( ( resinfo == 7 ) || ( resinfo == 8 ) )
+            {
+               if ( tempax >= 4 )
+                   tempbx |= PanelRef75Hz ;
+            }
+        }
+    }
+
+    pVBInfo->LCDResInfo = tempbx ;
+
+    /* End of LCD75 */
+
+    if( pVBInfo->IF_DEF_OEMUtil == 1 )
+    {
+        pVBInfo->LCDTypeInfo = ( temp & 0xf0 ) >> 4 ;
+    }
+
+    if ( !( pVBInfo->VBInfo & ( SetCRT2ToLCD | SetCRT2ToLCDA ) ) )
+    {
+        return 0;
+    }
+
+    tempbx = 0 ;
+
+    temp = XGINew_GetReg1( pVBInfo->P3d4 , 0x37 ) ;
+
+    temp &= ( ScalingLCD | LCDNonExpanding | LCDSyncBit | SetPWDEnable ) ;
+
+    if ( ( pVBInfo->IF_DEF_ScaleLCD == 1 ) && ( temp & LCDNonExpanding ) )
+        temp &= ~EnableScalingLCD ;
+
+    tempbx |= temp ;
+
+    LCDIdIndex = XGI_GetLCDCapPtr1(pVBInfo) ;
+
+    tempax = pVBInfo->LCDCapList[ LCDIdIndex ].LCD_Capability ;
+
+    if ( pVBInfo->IF_DEF_LVDS == 0 )   /* shampoo */
+    {
+        if ( ( ( pVBInfo->VBType & VB_XGI302LV ) || ( pVBInfo->VBType & VB_XGI301C ) ) && ( tempax & LCDDualLink ) )
+        {
+            tempbx |= SetLCDDualLink ;
+        }
+    }
+
+    if ( pVBInfo->IF_DEF_CH7017 == 1 )
+    {
+        if ( tempax & LCDDualLink )
+        {
+            tempbx |= SetLCDDualLink ;
+        }
+    }
+
+    if ( pVBInfo->IF_DEF_LVDS == 0 )
+    {
+        if ( ( pVBInfo->LCDResInfo == Panel1400x1050 ) && ( pVBInfo->VBInfo & SetCRT2ToLCD ) && ( ModeNo > 0x13 ) && ( resinfo == 9 ) && ( !( tempbx & EnableScalingLCD ) ) )
+            tempbx |= SetLCDtoNonExpanding ;   /* set to center in 1280x1024 LCDB for Panel1400x1050 */
+    }
+
+/*
+    if ( tempax & LCDBToA )
+    {
+        tempbx |= SetLCDBToA ;
+    }
+*/
+
+    if ( pVBInfo->IF_DEF_ExpLink == 1 )
+    {
+        if ( modeflag & HalfDCLK )
+        {
+            /* if ( !( pVBInfo->LCDInfo&LCDNonExpanding ) ) */
+            if ( !( tempbx & SetLCDtoNonExpanding ) )
+            {
+                tempbx |= EnableLVDSDDA ;
+            }
+            else
+            {
+                if ( ModeNo > 0x13 )
+                {
+                    if ( pVBInfo->LCDResInfo == Panel1024x768 )
+                    {
+                        if ( resinfo == 4 )
+                        {                                /* 512x384  */
+                            tempbx |= EnableLVDSDDA ;
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    if ( pVBInfo->VBInfo & SetInSlaveMode )
+    {
+        if ( pVBInfo->VBInfo & SetNotSimuMode )
+        {
+            tempbx |= LCDVESATiming ;
+        }
+    }
+    else
+    {
+        tempbx |= LCDVESATiming ;
+    }
+
+    pVBInfo->LCDInfo = tempbx ;
+
+    if ( pVBInfo->IF_DEF_PWD == 1 )
+    {
+        if ( pVBInfo->LCDInfo & SetPWDEnable )
+        {
+            if ( ( pVBInfo->VBType & VB_XGI302LV ) || ( pVBInfo->VBType & VB_XGI301C ) )
+            {
+                if ( !( tempax & PWDEnable ) )
+                {
+                    pVBInfo->LCDInfo &= ~SetPWDEnable ;
+                }
+            }
+        }
+    }
+
+    if ( pVBInfo->IF_DEF_LVDS == 0 )
+    {
+        if ( tempax & ( LockLCDBToA | StLCDBToA ) )
+        {
+            if ( pVBInfo->VBInfo & SetInSlaveMode )
+            {
+                if ( !( tempax & LockLCDBToA ) )
+                {
+                    if ( ModeNo <= 0x13 )
+                    {
+                        pVBInfo->VBInfo &= ~( SetSimuScanMode | SetInSlaveMode | SetCRT2ToLCD ) ;
+                        pVBInfo->VBInfo |= SetCRT2ToLCDA | SetCRT2ToDualEdge ;
+                    }
+                }
+            }
+        }
+    }
+
+/*
+    if ( pVBInfo->IF_DEF_LVDS == 0 )
+    {
+        if ( tempax & ( LockLCDBToA | StLCDBToA ) )
+        {
+            if ( pVBInfo->VBInfo & SetInSlaveMode )
+            {
+                if ( !( ( !( tempax & LockLCDBToA ) ) && ( ModeNo > 0x13 ) ) )
+                {
+                    pVBInfo->VBInfo&=~(SetSimuScanMode|SetInSlaveMode|SetCRT2ToLCD);
+                    pVBInfo->VBInfo|=SetCRT2ToLCDA|SetCRT2ToDualEdge;
+                }
+            }
+        }
+    }
+*/
+
+    return( 1 ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_SearchModeID */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+BOOLEAN XGI_SearchModeID( USHORT ModeNo , USHORT *ModeIdIndex, PVB_DEVICE_INFO pVBInfo )
+{
+
+#ifdef TC
+
+    if ( ModeNo <= 5 )
+        ModeNo |= 1 ;
+
+    if ( ModeNo <= 0x13 )
+    {
+        /* for (*ModeIdIndex=0;*ModeIdIndex<sizeof(pVBInfo->SModeIDTable)/sizeof(XGI_StStruct);(*ModeIdIndex)++) */
+        for( *ModeIdIndex = 0 ; ; ( *ModeIdIndex )++ )
+        {
+            if ( pVBInfo->SModeIDTable[ *ModeIdIndex ].St_ModeID == ModeNo )
+                break ;
+            if ( pVBInfo->SModeIDTable[ *ModeIdIndex ].St_ModeID == 0xFF )
+                return( FALSE ) ;
+        }
+
+        VGA_INFO = ( PUCHAR )MK_FP( 0 , 0x489 ) ;
+
+        if ( ModeNo == 0x07 )
+        {
+            if ( ( *VGA_INFO & 0x10 ) != 0 )
+                ( *ModeIdIndex )++ ; /* 400 lines */
+            /* else 350 lines */
+        }
+
+        if ( ModeNo <= 3 )
+        {
+            if ( ( *VGA_INFO & 0x80 ) == 0 )
+            {
+                ( *ModeIdIndex )++ ;
+                if ( ( *VGA_INFO & 0x10 ) != 0 )
+                    ( *ModeIdIndex )++ ; /* 400 lines */
+                /* else 350 lines */
+            }
+            /* else 200 lines */
+        }
+    }
+    else
+    {
+        /* for (*ModeIdIndex=0;*ModeIdIndex<sizeof(pVBInfo->EModeIDTable)/sizeof(XGI_ExtStruct);(*ModeIdIndex)++) */
+        for( *ModeIdIndex = 0 ; ; ( *ModeIdIndex )++ )
+        {
+            if ( pVBInfo->EModeIDTable[ *ModeIdIndex ].Ext_ModeID == ModeNo )
+                break ;
+            if ( pVBInfo->EModeIDTable[ *ModeIdIndex ].Ext_ModeID == 0xFF )
+                return( FALSE ) ;
+        }
+    }
+
+
+#endif
+
+#ifdef WIN2000
+
+    if ( ModeNo <= 5 )
+        ModeNo |= 1 ;
+    if ( ModeNo <= 0x13 )
+    {
+        /* for (*ModeIdIndex=0;*ModeIdIndex<sizeof(pVBInfo->SModeIDTable)/sizeof(XGI_StStruct);(*ModeIdIndex)++) */
+        for( *ModeIdIndex = 0 ; ; ( *ModeIdIndex )++ )
+        {
+            if ( pVBInfo->SModeIDTable[ *ModeIdIndex ].St_ModeID == ModeNo )
+                break ;
+            if ( pVBInfo->SModeIDTable[ *ModeIdIndex ].St_ModeID == 0xFF )
+                return( FALSE ) ;
+        }
+
+        if ( ModeNo == 0x07 )
+            ( *ModeIdIndex )++ ; /* 400 lines */
+
+        if ( ModeNo <=3 )
+            ( *ModeIdIndex ) += 2 ; /* 400 lines */
+        /* else 350 lines */
+    }
+    else
+    {
+        /* for (*ModeIdIndex=0;*ModeIdIndex<sizeof(pVBInfo->EModeIDTable)/sizeof(XGI_ExtStruct);(*ModeIdIndex)++) */
+        for( *ModeIdIndex = 0 ; ; ( *ModeIdIndex )++ )
+        {
+            if ( pVBInfo->EModeIDTable[ *ModeIdIndex ].Ext_ModeID == ModeNo )
+                break ;
+            if ( pVBInfo->EModeIDTable[ *ModeIdIndex ].Ext_ModeID == 0xFF )
+                return( FALSE ) ;
+        }
+    }
+
+#endif
+
+#ifdef LINUX /* chiawen for linux solution */
+
+    if ( ModeNo <= 5 )
+        ModeNo |= 1 ;
+    if ( ModeNo <= 0x13 )
+    {
+        /* for (*ModeIdIndex=0;*ModeIdIndex<sizeof(pVBInfo->SModeIDTable)/sizeof(XGI_StStruct);(*ModeIdIndex)++) */
+        for( *ModeIdIndex = 0 ; ; ( *ModeIdIndex )++ )
+        {
+            if ( pVBInfo->SModeIDTable[ *ModeIdIndex ].St_ModeID == ModeNo )
+                break ;
+            if ( pVBInfo->SModeIDTable[ *ModeIdIndex ].St_ModeID == 0xFF )
+                return( FALSE ) ;
+        }
+
+        if ( ModeNo == 0x07 )
+            ( *ModeIdIndex )++ ; /* 400 lines */
+
+        if ( ModeNo <= 3 )
+            ( *ModeIdIndex ) += 2 ; /* 400 lines */
+        /* else 350 lines */
+    }
+    else
+    {
+        /* for (*ModeIdIndex=0;*ModeIdIndex<sizeof(pVBInfo->EModeIDTable)/sizeof(XGI_ExtStruct);(*ModeIdIndex)++) */
+        for( *ModeIdIndex = 0 ; ; ( *ModeIdIndex )++ )
+        {
+            if ( pVBInfo->EModeIDTable[ *ModeIdIndex ].Ext_ModeID == ModeNo )
+                break ;
+            if ( pVBInfo->EModeIDTable[ *ModeIdIndex ].Ext_ModeID == 0xFF )
+                return( FALSE ) ;
+        }
+    }
+
+#endif
+
+    return( TRUE ) ;
+}
+
+
+
+
+/* win2000 MM adapter not support standard mode! */
+
+/* --------------------------------------------------------------------- */
+/* Function : */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+BOOLEAN XGINew_CheckMemorySize(PXGI_HW_DEVICE_INFO HwDeviceExtension,USHORT ModeNo,USHORT ModeIdIndex,PVB_DEVICE_INFO pVBInfo)
+{
+    USHORT memorysize ,
+           modeflag ,
+           temp ,
+           temp1 ,
+           tmp ;
+
+/*  if ( ( HwDeviceExtension->jChipType == XGI_650 ) ||
+         ( HwDeviceExtension->jChipType == XGI_650M ) )
+    {
+        return( TRUE ) ;
+    } */
+
+    if ( ModeNo <= 0x13 )
+    {
+        modeflag = pVBInfo->SModeIDTable[ ModeIdIndex ].St_ModeFlag ;
+    }
+    else  {
+        modeflag = pVBInfo->EModeIDTable[ ModeIdIndex ].Ext_ModeFlag ;
+    }
+
+    /* ModeType = modeflag&ModeInfoFlag ; // Get mode type */
+
+    memorysize = modeflag & MemoryInfoFlag ;
+    memorysize = memorysize > MemorySizeShift ;
+    memorysize++ ;                                     /* Get memory size */
+
+    temp = XGINew_GetReg1( pVBInfo->P3c4 , 0x14 ) ;    /* Get DRAM Size */
+    tmp = temp ;
+
+    if ( HwDeviceExtension->jChipType == XG40 )
+    {
+        temp = 1 << ( ( temp & 0x0F0 ) >> 4 ) ;                /* memory size per channel SR14[7:4] */
+        if ( ( tmp & 0x0c ) == 0x0C )                  /* Qual channels */
+        {
+            temp <<= 2 ;
+        }
+        else if ( ( tmp & 0x0c ) == 0x08 )             /* Dual channels */
+        {
+            temp <<= 1 ;
+        }
+    }
+    else if ( HwDeviceExtension->jChipType == XG42 )
+    {
+       temp = 1 << ( ( temp & 0x0F0 ) >> 4 ) ;         /* memory size per channel SR14[7:4] */
+        if ( ( tmp & 0x04 ) == 0x04 )                  /* Dual channels */
+        {
+            temp <<= 1 ;
+        }
+    }
+    else if ( HwDeviceExtension->jChipType == XG45 )
+    {
+       temp = 1 << ( ( temp & 0x0F0 ) >> 4 ) ;         /* memory size per channel SR14[7:4] */
+       if ( ( tmp & 0x0c ) == 0x0C )                   /* Qual channels */
+        {
+            temp <<= 2 ;
+        }
+        else if ( ( tmp & 0x0c ) == 0x08 )             /* triple channels */
+        {
+            temp1 = temp ;
+            temp <<= 1 ;
+            temp += temp1 ;
+        }
+        else if ( ( tmp & 0x0c ) == 0x04 )             /* Dual channels */
+        {
+            temp <<= 1 ;
+        }
+    }
+    if ( temp < memorysize )
+        return( FALSE ) ;
+    else
+        return( TRUE ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGINew_IsLowResolution */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+/*void XGINew_IsLowResolution( USHORT ModeNo , USHORT ModeIdIndex, BOOLEAN XGINew_CheckMemorySize(PXGI_HW_DEVICE_INFO HwDeviceExtension,USHORT ModeNo,USHORT ModeIdIndex,PVB_DEVICE_INFO pVBInfo)
+{
+    USHORT data ;
+    USHORT ModeFlag ;
+
+    data = XGINew_GetReg1( pVBInfo->P3c4 , 0x0F ) ;
+    data &= 0x7F ;
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x0F , data ) ;
+
+    if ( ModeNo > 0x13 )
+    {
+        ModeFlag = pVBInfo->EModeIDTable[ ModeIdIndex ].Ext_ModeFlag ;
+        if ( ( ModeFlag & HalfDCLK ) && ( ModeFlag & DoubleScanMode ) )
+        {
+            data = XGINew_GetReg1( pVBInfo->P3c4 , 0x0F ) ;
+            data |= 0x80 ;
+            XGINew_SetReg1( pVBInfo->P3c4 , 0x0F , data ) ;
+            data = XGINew_GetReg1( pVBInfo->P3c4 , 0x01 ) ;
+            data &= 0xF7 ;
+            XGINew_SetReg1( pVBInfo->P3c4 , 0x01 , data ) ;
+        }
+    }
+}
+
+*/
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_DisplayOn */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_DisplayOn( PXGI_HW_DEVICE_INFO pXGIHWDE , PVB_DEVICE_INFO pVBInfo )
+{
+
+    XGINew_SetRegANDOR(pVBInfo->P3c4,0x01,0xDF,0x00);
+    if ( pXGIHWDE->jChipType == XG21 )
+    {
+       if ( pVBInfo->IF_DEF_LVDS == 1 )
+       {
+         if (!(XGI_XG21GetPSCValue( pVBInfo )&0x1))
+         {
+            XGI_XG21BLSignalVDD( 0x01 , 0x01, pVBInfo ) ; /* LVDS VDD on */
+            XGI_XG21SetPanelDelay( 2,pVBInfo ) ;
+         }
+         if (!(XGI_XG21GetPSCValue( pVBInfo )&0x20))
+         {
+            XGI_XG21BLSignalVDD( 0x20 , 0x20, pVBInfo ) ; /* LVDS signal on */
+         }
+         XGI_XG21SetPanelDelay( 3,pVBInfo ) ;
+         XGI_XG21BLSignalVDD( 0x02 , 0x02, pVBInfo ) ; /* LVDS backlight on */
+       }
+       else
+       {
+            XGI_XG21BLSignalVDD( 0x20 , 0x20, pVBInfo ) ; /* DVO/DVI signal on */
+       }
+
+    }
+
+    if (pVBInfo->IF_DEF_CH7007 == 1) /* [Billy] 07/05/23 For CH7007 */
+    {
+#ifdef WIN2000
+       if ( IsCH7007TVMode( pVBInfo ) )
+       {
+           TurnOnCH7007(pXGIHWDE->pDevice) ; /* 07/05/28 */
+       }
+#endif
+
+    }
+
+
+    if ( pXGIHWDE->jChipType == XG27 )
+    {
+       if ( pVBInfo->IF_DEF_LVDS == 1 )
+       {
+         if (!(XGI_XG27GetPSCValue( pVBInfo )&0x1))
+         {
+            XGI_XG27BLSignalVDD( 0x01 , 0x01, pVBInfo ) ; /* LVDS VDD on */
+            XGI_XG21SetPanelDelay( 2,pVBInfo ) ;
+         }
+         if (!(XGI_XG27GetPSCValue( pVBInfo )&0x20))
+         {
+            XGI_XG27BLSignalVDD( 0x20 , 0x20, pVBInfo ) ; /* LVDS signal on */
+         }
+         XGI_XG21SetPanelDelay( 3,pVBInfo ) ;
+         XGI_XG27BLSignalVDD( 0x02 , 0x02, pVBInfo ) ; /* LVDS backlight on */
+       }
+       else
+       {
+            XGI_XG27BLSignalVDD( 0x20 , 0x20, pVBInfo ) ; /* DVO/DVI signal on */
+       }
+
+    }
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_DisplayOff */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_DisplayOff( PXGI_HW_DEVICE_INFO pXGIHWDE , PVB_DEVICE_INFO pVBInfo )
+{
+
+    if ( pXGIHWDE->jChipType == XG21 )
+    {
+       if ( pVBInfo->IF_DEF_LVDS == 1 )
+       {
+         XGI_XG21BLSignalVDD( 0x02 , 0x00, pVBInfo ) ; /* LVDS backlight off */
+         XGI_XG21SetPanelDelay( 3,pVBInfo ) ;
+       }
+       else
+       {
+            XGI_XG21BLSignalVDD( 0x20 , 0x00, pVBInfo ) ; /* DVO/DVI signal off */
+       }
+    }
+
+    if (pVBInfo->IF_DEF_CH7007 == 1) /*[Billy] 07/05/23 For CH7007 */
+    {
+       /* if( IsCH7007TVMode( pVBInfo ) == 0 ) */
+       {
+#ifdef WIN2000
+         TurnOffCH7007(pXGIHWDE->pDevice) ;  /* 07/05/28 */
+#endif
+       }
+    }
+
+
+    if ( pXGIHWDE->jChipType == XG27 )
+    {
+       if ((XGI_XG27GetPSCValue( pVBInfo )&0x2))
+       {
+         XGI_XG27BLSignalVDD( 0x02 , 0x00, pVBInfo ) ; /* LVDS backlight off */
+         XGI_XG21SetPanelDelay( 3,pVBInfo ) ;
+       }
+
+       if ( pVBInfo->IF_DEF_LVDS == 0 )
+       {
+            XGI_XG27BLSignalVDD( 0x20 , 0x00, pVBInfo ) ; /* DVO/DVI signal off */
+       }
+    }
+
+    XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x01 , 0xDF , 0x20 ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_WaitDisply */
+/* Input : */
+/* Output : */
+/* Description : chiawen for sensecrt1 */
+/* --------------------------------------------------------------------- */
+void XGI_WaitDisply( PVB_DEVICE_INFO pVBInfo )
+{
+    while( ( XGINew_GetReg2( pVBInfo->P3da ) & 0x01 ) )
+        break ;
+
+    while( !( XGINew_GetReg2( pVBInfo->P3da ) & 0x01 ) )
+        break ;
+}
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_SenseCRT1 */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+
+void XGI_SenseCRT1( PVB_DEVICE_INFO pVBInfo )
+{
+    UCHAR CRTCData[ 17 ] = { 0x5F , 0x4F , 0x50 , 0x82 , 0x55 , 0x81 ,
+                             0x0B , 0x3E , 0xE9 , 0x0B , 0xDF , 0xE7 ,
+                             0x04 , 0x00 , 0x00 , 0x05 , 0x00 } ;
+
+    UCHAR SR01 = 0 , SR1F = 0 , SR07 = 0 , SR06 = 0 ;
+
+    UCHAR CR17 , CR63 , SR31 ;
+    USHORT temp ;
+    UCHAR DAC_TEST_PARMS[ 3 ] = { 0x0F , 0x0F , 0x0F } ;
+
+    int i ;
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x05 , 0x86 ) ;
+
+    /* [2004/05/06] Vicent to fix XG42 single LCD sense to CRT+LCD */
+    XGINew_SetReg1( pVBInfo->P3d4 , 0x57 , 0x4A ) ;
+    XGINew_SetReg1( pVBInfo->P3d4 , 0x53 , ( UCHAR )( XGINew_GetReg1( pVBInfo->P3d4 , 0x53 ) | 0x02 ) ) ;
+
+    SR31 = ( UCHAR )XGINew_GetReg1( pVBInfo->P3c4 , 0x31 ) ;
+    CR63 = ( UCHAR )XGINew_GetReg1( pVBInfo->P3d4 , 0x63 ) ;
+    SR01 = ( UCHAR )XGINew_GetReg1( pVBInfo->P3c4 , 0x01 ) ;
+
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x01 , ( UCHAR )( SR01 & 0xDF ) ) ;
+    XGINew_SetReg1( pVBInfo->P3d4 , 0x63 , ( UCHAR )( CR63 & 0xBF ) ) ;
+
+    CR17 = ( UCHAR )XGINew_GetReg1( pVBInfo->P3d4 , 0x17 ) ;
+    XGINew_SetReg1( pVBInfo->P3d4 , 0x17 , ( UCHAR )( CR17 | 0x80 ) ) ;
+
+    SR1F = ( UCHAR )XGINew_GetReg1( pVBInfo->P3c4 , 0x1F ) ;
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x1F , ( UCHAR )( SR1F | 0x04 ) ) ;
+
+    SR07 = ( UCHAR )XGINew_GetReg1( pVBInfo->P3c4 , 0x07 ) ;
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x07 , ( UCHAR )( SR07 & 0xFB ) ) ;
+    SR06 = ( UCHAR )XGINew_GetReg1( pVBInfo->P3c4 , 0x06 ) ;
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x06 , ( UCHAR )( SR06 & 0xC3 ) ) ;
+
+    XGINew_SetReg1( pVBInfo->P3d4 , 0x11 , 0x00 ) ;
+
+    for( i = 0 ; i < 8 ; i++ )
+        XGINew_SetReg1( pVBInfo->P3d4 , ( USHORT )i , CRTCData[ i ] ) ;
+
+    for( i = 8 ; i < 11 ; i++ )
+        XGINew_SetReg1( pVBInfo->P3d4 , ( USHORT )( i + 8 ) , CRTCData[ i ] ) ;
+
+    for( i = 11 ; i < 13 ; i++ )
+        XGINew_SetReg1( pVBInfo->P3d4 , ( USHORT )( i + 4 ) , CRTCData[ i ] ) ;
+
+    for( i = 13 ; i < 16 ; i++ )
+        XGINew_SetReg1( pVBInfo->P3c4 , ( USHORT )( i - 3 ) , CRTCData[ i ] ) ;
+
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x0E , ( UCHAR )( CRTCData[ 16 ] & 0xE0 ) ) ;
+
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x31 , 0x00 ) ;
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x2B , 0x1B ) ;
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x2C , 0xE1 ) ;
+
+    XGINew_SetReg3( pVBInfo->P3c8 , 0x00 ) ;
+
+    for( i = 0 ; i < 256 ; i++ )
+    {
+        XGINew_SetReg3( ( pVBInfo->P3c8 + 1 ) , ( UCHAR )DAC_TEST_PARMS[ 0 ] ) ;
+        XGINew_SetReg3( ( pVBInfo->P3c8 + 1 ) , ( UCHAR )DAC_TEST_PARMS[ 1 ] ) ;
+        XGINew_SetReg3( ( pVBInfo->P3c8 + 1 ) , ( UCHAR )DAC_TEST_PARMS[ 2 ] ) ;
+    }
+
+    XGI_VBLongWait( pVBInfo ) ;
+    XGI_VBLongWait( pVBInfo ) ;
+    XGI_VBLongWait( pVBInfo ) ;
+
+    XGINew_LCD_Wait_Time( 0x01 , pVBInfo ) ;
+
+    XGI_WaitDisply( pVBInfo ) ;
+    temp = XGINew_GetReg2( pVBInfo->P3c2 ) ;
+
+    if( temp & 0x10 )
+    {
+        XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x32 , 0xDF , 0x20 ) ;
+    }
+    else
+    {
+        XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x32 , 0xDF , 0x00 ) ;
+    }
+
+    /* alan, avoid display something, set BLACK DAC if not restore DAC */
+    XGINew_SetReg3( pVBInfo->P3c8 , 0x00 ) ;
+
+    for( i = 0 ; i < 256 ; i++ )
+    {
+      XGINew_SetReg3( ( pVBInfo->P3c8 + 1 ) , 0 ) ;
+      XGINew_SetReg3( ( pVBInfo->P3c8 + 1 ) , 0 ) ;
+      XGINew_SetReg3( ( pVBInfo->P3c8 + 1 ) , 0 ) ;
+    }
+
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x01 , SR01 ) ;
+    XGINew_SetReg1( pVBInfo->P3d4 , 0x63 , CR63 ) ;
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x31 , SR31 ) ;
+
+    /* [2004/05/11] Vicent */
+    XGINew_SetReg1( pVBInfo->P3d4 , 0x53 , ( UCHAR )( XGINew_GetReg1( pVBInfo->P3d4 , 0x53 ) & 0xFD ) ) ;
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x1F , ( UCHAR ) SR1F ) ;
+}
+
+
+
+
+
+#ifdef TC
+/* --------------------------------------------------------------------- */
+/* Function : INT1AReturnCode */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+int INT1AReturnCode( union REGS regs )
+{
+    if ( regs.x.cflag )
+    {
+        /* printf( "Error to find pci device!\n" ) ; */
+        return( 1 ) ;
+    }
+
+    switch(regs.h.ah)
+    {
+        case 0: return 0;
+            break ;
+        case 0x81:
+            printf( "Function not support\n" ) ;
+            break ;
+        case 0x83:
+            printf( "bad vendor id\n" ) ;
+            break ;
+        case 0x86:
+            printf( "device not found\n" ) ;
+            break ;
+        case 0x87:
+            printf( "bad register number\n" ) ;
+            break ;
+        case 0x88:
+            printf( "set failed\n" ) ;
+            break ;
+        case 0x89:
+            printf( "buffer too small" ) ;
+            break ;
+        default:
+            break ;
+    }
+    return( 1 ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : FindPCIIOBase */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+unsigned FindPCIIOBase( unsigned index , unsigned deviceid )
+{
+    union REGS regs ;
+
+    regs.h.ah = 0xb1 ; /* PCI_FUNCTION_ID */
+    regs.h.al = 0x02 ; /* FIND_PCI_DEVICE */
+    regs.x.cx = deviceid ;
+    regs.x.dx = 0x1039 ;
+    regs.x.si = index ;        /* find n-th device */
+
+    int86( 0x1A , &regs , &regs ) ;
+
+    if ( INT1AReturnCode( regs ) != 0 )
+        return( 0 ) ;
+
+    /* regs.h.bh bus number */
+    /* regs.h.bl device number */
+    regs.h.ah = 0xb1 ;  /* PCI_FUNCTION_ID */
+    regs.h.al = 0x09 ;  /* READ_CONFIG_WORD */
+    regs.x.cx = deviceid ;
+    regs.x.dx = 0x1039 ;
+    regs.x.di = 0x18 ;  /* register number */
+    int86( 0x1A , &regs , &regs ) ;
+
+    if ( INT1AReturnCode( regs ) != 0 )
+        return( 0 ) ;
+
+    return( regs.x.cx ) ;
+}
+
+#endif
+
+
+
+#ifdef TC
+/* --------------------------------------------------------------------- */
+/* Function : main */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void main(int argc, char *argv[])
+{
+    XGI_HW_DEVICE_INFO HwDeviceExtension ;
+    USHORT temp ;
+    USHORT ModeNo ;
+
+    /* HwDeviceExtension.pjVirtualRomBase =(PUCHAR) MK_FP(0xC000,0); */
+    /* HwDeviceExtension.pjVideoMemoryAddress = (PUCHAR)MK_FP(0xA000,0); */
+
+
+    HwDeviceExtension.pjIOAddress = ( FindPCIIOBase( 0 ,0x6300 ) & 0xFF80 ) + 0x30 ;
+    HwDeviceExtension.jChipType = XGI_340 ;
+
+
+
+    /* HwDeviceExtension.pjIOAddress = ( FindPCIIOBase( 0 , 0x5315 ) & 0xFF80 ) + 0x30 ; */
+
+    HwDeviceExtension.pjIOAddress = ( FindPCIIOBase( 0 , 0x330 ) & 0xFF80 ) + 0x30 ;
+    HwDeviceExtension.jChipType = XGI_340 ;
+
+
+    HwDeviceExtension.ujVBChipID = VB_CHIP_301 ;
+    StrCpy(HwDeviceExtension.szVBIOSVer , "0.84" ) ;
+    HwDeviceExtension.bSkipDramSizing = FALSE ;
+    HwDeviceExtension.ulVideoMemorySize = 0 ;
+
+    if ( argc == 2 )
+    {
+        ModeNo = atoi( argv[ 1 ] ) ;
+    }
+    else
+    {
+        ModeNo = 0x2e ;
+        /* ModeNo = 0x37 ; 1024x768x 4bpp */
+        /* ModeNo = 0x38 ; 1024x768x 8bpp */
+        /* ModeNo = 0x4A ; 1024x768x 16bpp */
+        /* ModeNo = 0x47 ; 800x600x 16bpp */
+    }
+
+    /* XGIInitNew( &HwDeviceExtension ) ; */
+    XGISetModeNew( &HwDeviceExtension , ModeNo ) ;
+}
+#endif
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_WaitDisplay */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_WaitDisplay( PVB_DEVICE_INFO pVBInfo )
+{
+    while( !( XGINew_GetReg2( pVBInfo->P3da ) & 0x01 ) ) ;
+
+    while( XGINew_GetReg2( pVBInfo->P3da ) & 0x01 ) ;
+}
+
+
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_SetCRT2Group301 */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+BOOLEAN XGI_SetCRT2Group301( USHORT ModeNo , PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo )
+{
+    USHORT tempbx ,
+           ModeIdIndex ,
+           RefreshRateTableIndex ;
+
+    tempbx=pVBInfo->VBInfo ;
+    pVBInfo->SetFlag |= ProgrammingCRT2 ;
+    XGI_SearchModeID( ModeNo , &ModeIdIndex,  pVBInfo ) ;
+    pVBInfo->SelectCRT2Rate = 4 ;
+    RefreshRateTableIndex = XGI_GetRatePtrCRT2( HwDeviceExtension, ModeNo , ModeIdIndex, pVBInfo ) ;
+    XGI_SaveCRT2Info( ModeNo, pVBInfo ) ;
+    XGI_GetCRT2ResInfo( ModeNo , ModeIdIndex, pVBInfo) ;
+    XGI_GetCRT2Data( ModeNo , ModeIdIndex , RefreshRateTableIndex, pVBInfo ) ;
+    XGI_PreSetGroup1( ModeNo , ModeIdIndex , HwDeviceExtension , RefreshRateTableIndex, pVBInfo ) ;
+    XGI_SetGroup1( ModeNo , ModeIdIndex , HwDeviceExtension , RefreshRateTableIndex, pVBInfo ) ;
+    XGI_SetLockRegs( ModeNo , ModeIdIndex , HwDeviceExtension , RefreshRateTableIndex, pVBInfo ) ;
+    XGI_SetGroup2(  ModeNo , ModeIdIndex , RefreshRateTableIndex , HwDeviceExtension, pVBInfo ) ;
+    XGI_SetLCDRegs(ModeNo , ModeIdIndex , HwDeviceExtension , RefreshRateTableIndex, pVBInfo ) ;
+    XGI_SetTap4Regs(pVBInfo) ;
+    XGI_SetGroup3(ModeNo, ModeIdIndex, pVBInfo);
+    XGI_SetGroup4( ModeNo , ModeIdIndex , RefreshRateTableIndex , HwDeviceExtension, pVBInfo ) ;
+    XGI_SetCRT2VCLK( ModeNo , ModeIdIndex , RefreshRateTableIndex, pVBInfo ) ;
+    XGI_SetGroup5( ModeNo , ModeIdIndex, pVBInfo) ;
+    XGI_AutoThreshold( pVBInfo) ;
+    return 1 ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_AutoThreshold */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_AutoThreshold(  PVB_DEVICE_INFO pVBInfo )
+{
+    if ( !( pVBInfo->SetFlag & Win9xDOSMode ) )
+      XGINew_SetRegOR( pVBInfo->Part1Port , 0x01 , 0x40 ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_SaveCRT2Info */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_SaveCRT2Info( USHORT ModeNo , PVB_DEVICE_INFO pVBInfo)
+{
+    USHORT temp1 ,
+           temp2 ;
+
+    XGINew_SetReg1( pVBInfo->P3d4 , 0x34 , ModeNo ) ;  /* reserve CR34 for CRT1 Mode No */
+    temp1 = ( pVBInfo->VBInfo&SetInSlaveMode ) >> 8 ;
+    temp2 = ~( SetInSlaveMode >> 8 ) ;
+    XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x31 , temp2 , temp1 ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_GetCRT2ResInfo */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_GetCRT2ResInfo( USHORT ModeNo , USHORT ModeIdIndex, PVB_DEVICE_INFO pVBInfo )
+{
+    USHORT xres ,
+           yres ,
+           modeflag ,
+           resindex ;
+
+    resindex = XGI_GetResInfo( ModeNo , ModeIdIndex, pVBInfo) ;
+    if ( ModeNo <= 0x13 )
+    {
+        xres = pVBInfo->StResInfo[ resindex ].HTotal ;
+        yres = pVBInfo->StResInfo[ resindex ].VTotal ;
+     /* modeflag = pVBInfo->SModeIDTable[ModeIdIndex].St_ModeFlag; si+St_ResInfo */
+    }
+    else
+    {
+        xres = pVBInfo->ModeResInfo[ resindex ].HTotal ;                       /* xres->ax */
+        yres = pVBInfo->ModeResInfo[ resindex ].VTotal ;                       /* yres->bx */
+        modeflag = pVBInfo->EModeIDTable[ ModeIdIndex].Ext_ModeFlag ;          /* si+St_ModeFlag */
+
+/*        if ( pVBInfo->IF_DEF_FSTN )
+        {
+            xres *= 2 ;
+            yres *= 2 ;
+        }
+        else
+        {
+*/
+            if ( modeflag & HalfDCLK )
+                xres *= 2;
+
+            if ( modeflag & DoubleScanMode )
+                yres *= 2 ;
+/* } */
+    }
+
+    if ( pVBInfo->VBInfo & SetCRT2ToLCD )
+    {
+        if ( pVBInfo->IF_DEF_LVDS == 0 )
+        {
+            if ( pVBInfo->LCDResInfo == Panel1600x1200 )
+            {
+                if ( !( pVBInfo->LCDInfo & LCDVESATiming ) )
+                {
+                    if ( yres == 1024 )
+                        yres = 1056 ;
+               }
+            }
+
+            if ( pVBInfo->LCDResInfo == Panel1280x1024 )
+            {
+               if ( yres == 400 )
+                   yres = 405 ;
+               else if ( yres == 350 )
+                   yres = 360 ;
+
+               if ( pVBInfo->LCDInfo & LCDVESATiming )
+               {
+                   if ( yres == 360 )
+                       yres = 375 ;
+               }
+            }
+
+            if ( pVBInfo->LCDResInfo == Panel1024x768 )
+            {
+               if ( !( pVBInfo->LCDInfo & LCDVESATiming ) )
+               {
+                   if ( !( pVBInfo->LCDInfo & LCDNonExpanding ) )
+                   {
+                       if ( yres == 350 )
+                           yres = 357 ;
+                       else if ( yres == 400 )
+                           yres = 420 ;
+                       else if ( yres == 480 )
+                           yres = 525 ;
+                   }
+                }
+            }
+        }
+
+        if ( xres == 720 )
+            xres = 640 ;
+    }
+
+    pVBInfo->VGAHDE = xres ;
+    pVBInfo->HDE = xres ;
+    pVBInfo->VGAVDE = yres ;
+    pVBInfo->VDE = yres ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_IsLCDDualLink */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+BOOLEAN XGI_IsLCDDualLink( PVB_DEVICE_INFO pVBInfo )
+{
+
+    if ( ( ( ( pVBInfo->VBInfo & SetCRT2ToLCD ) | SetCRT2ToLCDA ) ) && ( pVBInfo->LCDInfo & SetLCDDualLink ) ) /* shampoo0129 */
+        return ( 1 ) ;
+
+    return( 0 ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_GetCRT2Data */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_GetCRT2Data(  USHORT ModeNo , USHORT ModeIdIndex , USHORT RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo )
+{
+    USHORT tempax = 0,
+           tempbx ,
+           modeflag ,
+           resinfo ;
+
+    XGI_LCDDataStruct *LCDPtr = NULL ;
+    XGI_TVDataStruct  *TVPtr = NULL ;
+
+    if ( ModeNo <= 0x13 )
+    {
+        modeflag = pVBInfo->SModeIDTable[ ModeIdIndex ].St_ModeFlag ;      /* si+St_ResInfo */
+        resinfo = pVBInfo->SModeIDTable[ ModeIdIndex ].St_ResInfo ;
+    }
+    else
+    {
+        modeflag = pVBInfo->EModeIDTable[ ModeIdIndex ].Ext_ModeFlag ;     /* si+Ext_ResInfo */
+        resinfo = pVBInfo->EModeIDTable[ ModeIdIndex ].Ext_RESINFO ;
+    }
+
+    pVBInfo->NewFlickerMode = 0 ;
+    pVBInfo->RVBHRS = 50 ;
+
+    if ( pVBInfo->VBInfo & SetCRT2ToRAMDAC )
+    {
+        XGI_GetRAMDAC2DATA( ModeNo , ModeIdIndex , RefreshRateTableIndex,pVBInfo ) ;
+        return ;
+    }
+
+    tempbx = 4 ;
+
+    if ( pVBInfo->VBInfo & ( SetCRT2ToLCD | SetCRT2ToLCDA ) )
+    {
+        LCDPtr = (XGI_LCDDataStruct* )XGI_GetLcdPtr( tempbx, ModeNo , ModeIdIndex , RefreshRateTableIndex, pVBInfo ) ;
+
+        pVBInfo->RVBHCMAX = LCDPtr->RVBHCMAX ;
+        pVBInfo->RVBHCFACT = LCDPtr->RVBHCFACT ;
+        pVBInfo->VGAHT = LCDPtr->VGAHT ;
+        pVBInfo->VGAVT = LCDPtr->VGAVT ;
+        pVBInfo->HT = LCDPtr->LCDHT ;
+        pVBInfo->VT = LCDPtr->LCDVT ;
+
+        if ( pVBInfo->LCDResInfo == Panel1024x768 )
+        {
+            tempax = 1024 ;
+            tempbx = 768 ;
+
+            if ( !( pVBInfo->LCDInfo & LCDVESATiming ) )
+            {
+                if ( pVBInfo->VGAVDE == 357 )
+                    tempbx = 527 ;
+               else if ( pVBInfo->VGAVDE == 420 )
+                   tempbx = 620 ;
+               else if ( pVBInfo->VGAVDE == 525 )
+                   tempbx = 775 ;
+               else if ( pVBInfo->VGAVDE == 600 )
+                   tempbx = 775 ;
+                /* else if(pVBInfo->VGAVDE==350) tempbx=560; */
+                /* else if(pVBInfo->VGAVDE==400) tempbx=640; */
+               else
+                 tempbx = 768 ;
+            }
+            else
+                tempbx = 768 ;
+        }
+        else if ( pVBInfo->LCDResInfo == Panel1024x768x75 )
+        {
+            tempax = 1024 ;
+            tempbx = 768 ;
+        }
+        else if ( pVBInfo->LCDResInfo == Panel1280x1024 )
+        {
+            tempax = 1280 ;
+            if ( pVBInfo->VGAVDE == 360 )
+                tempbx = 768 ;
+            else if ( pVBInfo->VGAVDE == 375 )
+                tempbx = 800 ;
+            else if ( pVBInfo->VGAVDE == 405 )
+                tempbx = 864 ;
+            else
+                tempbx = 1024 ;
+        }
+        else if ( pVBInfo->LCDResInfo == Panel1280x1024x75 )
+        {
+            tempax = 1280 ;
+            tempbx = 1024 ;
+        }
+        else if ( pVBInfo->LCDResInfo == Panel1280x960 )
+        {
+            tempax = 1280 ;
+            if ( pVBInfo->VGAVDE == 350 )
+                tempbx = 700 ;
+            else if ( pVBInfo->VGAVDE == 400 )
+                tempbx = 800 ;
+            else if ( pVBInfo->VGAVDE == 1024 )
+                tempbx = 960 ;
+            else
+                tempbx = 960 ;
+        }
+        else if ( pVBInfo->LCDResInfo == Panel1400x1050 )
+        {
+            tempax = 1400 ;
+            tempbx = 1050 ;
+
+            if ( pVBInfo->VGAVDE == 1024 )
+            {
+                tempax = 1280 ;
+                tempbx = 1024 ;
+            }
+        }
+        else if ( pVBInfo->LCDResInfo == Panel1600x1200 )
+        {
+            tempax = 1600 ;
+            tempbx = 1200 ;  /* alan 10/14/2003 */
+            if ( !( pVBInfo->LCDInfo & LCDVESATiming ) )
+            {
+              if ( pVBInfo->VGAVDE == 350 )
+                tempbx = 875 ;
+              else if ( pVBInfo->VGAVDE == 400 )
+                tempbx = 1000 ;
+            }
+        }
+
+        if ( pVBInfo->LCDInfo & LCDNonExpanding )
+        {
+            tempax = pVBInfo->VGAHDE ;
+            tempbx = pVBInfo->VGAVDE ;
+        }
+
+        pVBInfo->HDE = tempax ;
+        pVBInfo->VDE = tempbx ;
+        return ;
+    }
+
+    if ( pVBInfo->VBInfo & ( SetCRT2ToTV ) )
+    {
+        tempbx = 4 ;
+        TVPtr = ( XGI_TVDataStruct * )XGI_GetTVPtr( tempbx , ModeNo , ModeIdIndex , RefreshRateTableIndex, pVBInfo ) ;
+
+        pVBInfo->RVBHCMAX = TVPtr->RVBHCMAX ;
+        pVBInfo->RVBHCFACT = TVPtr->RVBHCFACT ;
+        pVBInfo->VGAHT = TVPtr->VGAHT ;
+        pVBInfo->VGAVT = TVPtr->VGAVT ;
+        pVBInfo->HDE = TVPtr->TVHDE ;
+        pVBInfo->VDE = TVPtr->TVVDE ;
+        pVBInfo->RVBHRS = TVPtr->RVBHRS ;
+        pVBInfo->NewFlickerMode = TVPtr->FlickerMode ;
+
+        if ( pVBInfo->VBInfo & SetCRT2ToHiVisionTV )
+        {
+            if ( resinfo == 0x08 )
+                pVBInfo->NewFlickerMode = 0x40 ;
+            else if ( resinfo == 0x09 )
+                pVBInfo->NewFlickerMode = 0x40 ;
+            else if ( resinfo == 0x12 )
+                pVBInfo->NewFlickerMode = 0x40 ;
+
+            if ( pVBInfo->VGAVDE == 350 )
+                pVBInfo->TVInfo |= TVSimuMode ;
+
+            tempax = ExtHiTVHT ;
+            tempbx = ExtHiTVVT ;
+
+            if ( pVBInfo->VBInfo & SetInSlaveMode )
+            {
+               if ( pVBInfo->TVInfo & TVSimuMode )
+               {
+                   tempax = StHiTVHT ;
+                   tempbx = StHiTVVT ;
+
+                   if ( !( modeflag & Charx8Dot ) )
+                   {
+                       tempax = StHiTextTVHT ;
+                       tempbx = StHiTextTVVT ;
+                   }
+               }
+            }
+        }
+        else if ( pVBInfo->VBInfo & SetCRT2ToYPbPr )
+        {
+            if ( pVBInfo->TVInfo & SetYPbPrMode750p )
+            {
+                tempax = YPbPrTV750pHT ;       /* Ext750pTVHT */
+                tempbx = YPbPrTV750pVT ;       /* Ext750pTVVT */
+            }
+
+            if ( pVBInfo->TVInfo & SetYPbPrMode525p )
+            {
+                tempax = YPbPrTV525pHT ;       /* Ext525pTVHT */
+                tempbx = YPbPrTV525pVT ;       /* Ext525pTVVT */
+            }
+            else if ( pVBInfo->TVInfo & SetYPbPrMode525i )
+            {
+                tempax = YPbPrTV525iHT ;       /* Ext525iTVHT */
+                tempbx = YPbPrTV525iVT ;       /* Ext525iTVVT */
+                if ( pVBInfo->TVInfo & NTSC1024x768 )
+                    tempax = NTSC1024x768HT ;
+            }
+        }
+        else
+        {
+            tempax = PALHT ;
+            tempbx = PALVT ;
+            if ( !( pVBInfo->TVInfo & SetPALTV ) )
+            {
+                tempax = NTSCHT ;
+               tempbx = NTSCVT ;
+               if ( pVBInfo->TVInfo & NTSC1024x768 )
+                   tempax = NTSC1024x768HT ;
+            }
+        }
+
+        pVBInfo->HT = tempax ;
+        pVBInfo->VT = tempbx ;
+        return ;
+    }
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_SetCRT2VCLK */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_SetCRT2VCLK( USHORT ModeNo , USHORT ModeIdIndex , USHORT RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo )
+{
+    UCHAR di_0 ,
+          di_1 ,
+          tempal ;
+
+    tempal = XGI_GetVCLKPtr( RefreshRateTableIndex , ModeNo , ModeIdIndex, pVBInfo ) ;
+    XGI_GetVCLKLen( tempal, &di_0 , &di_1, pVBInfo ) ;
+    XGI_GetLCDVCLKPtr( &di_0 , &di_1, pVBInfo ) ;
+
+    if ( pVBInfo->VBType & VB_XGI301 ) /* shampoo 0129 */
+    {                          /* 301 */
+        XGINew_SetReg1(pVBInfo->Part4Port , 0x0A , 0x10 ) ;
+        XGINew_SetReg1(pVBInfo->Part4Port , 0x0B , di_1 ) ;
+        XGINew_SetReg1(pVBInfo->Part4Port , 0x0A , di_0 ) ;
+    }
+    else
+    {                          /* 301b/302b/301lv/302lv */
+        XGINew_SetReg1( pVBInfo->Part4Port , 0x0A , di_0 ) ;
+        XGINew_SetReg1( pVBInfo->Part4Port , 0x0B , di_1 ) ;
+    }
+
+    XGINew_SetReg1( pVBInfo->Part4Port , 0x00 , 0x12 ) ;
+
+    if ( pVBInfo->VBInfo & SetCRT2ToRAMDAC )
+        XGINew_SetRegOR( pVBInfo->Part4Port , 0x12 , 0x28 ) ;
+    else
+        XGINew_SetRegOR( pVBInfo->Part4Port , 0x12 , 0x08 ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_GETLCDVCLKPtr */
+/* Input : */
+/* Output : al -> VCLK Index */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_GetLCDVCLKPtr( UCHAR* di_0 , UCHAR *di_1, PVB_DEVICE_INFO pVBInfo )
+{
+    USHORT index ;
+
+    if ( pVBInfo->VBInfo & ( SetCRT2ToLCD | SetCRT2ToLCDA ) )
+    {
+        if ( pVBInfo->IF_DEF_ScaleLCD == 1 )
+        {
+            if ( pVBInfo->LCDInfo & EnableScalingLCD )
+                return ;
+        }
+
+        /* index = XGI_GetLCDCapPtr(pVBInfo) ; */
+        index = XGI_GetLCDCapPtr1( pVBInfo) ;
+
+        if ( pVBInfo->VBInfo & SetCRT2ToLCD )
+        {      /* LCDB */
+            *di_0 = pVBInfo->LCDCapList[ index ].LCUCHAR_VCLKData1 ;
+            *di_1 = pVBInfo->LCDCapList[ index ].LCUCHAR_VCLKData2 ;
+        }
+        else
+        {      /* LCDA */
+            *di_0 = pVBInfo->LCDCapList[ index ].LCDA_VCLKData1 ;
+            *di_1 = pVBInfo->LCDCapList[ index ].LCDA_VCLKData2 ;
+        }
+    }
+    return ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_GetVCLKPtr */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+UCHAR XGI_GetVCLKPtr(USHORT RefreshRateTableIndex,USHORT ModeNo,USHORT ModeIdIndex, PVB_DEVICE_INFO pVBInfo)
+{
+
+    USHORT index ,
+           modeflag ;
+#ifndef LINUX_XF86
+    USHORT tempbx ;
+#endif
+
+    UCHAR tempal ;
+    UCHAR *CHTVVCLKPtr = NULL ;
+
+    if ( ModeNo <= 0x13 )
+        modeflag = pVBInfo->SModeIDTable[ ModeIdIndex ].St_ModeFlag ;      /* si+St_ResInfo */
+    else
+        modeflag = pVBInfo->EModeIDTable[ModeIdIndex].Ext_ModeFlag;    /* si+Ext_ResInfo */
+
+
+    if ( ( pVBInfo->SetFlag & ProgrammingCRT2 ) && ( !( pVBInfo->LCDInfo & EnableScalingLCD ) ) )
+    {   /* {LCDA/LCDB} */
+        index = XGI_GetLCDCapPtr(pVBInfo) ;
+        tempal = pVBInfo->LCDCapList[ index ].LCD_VCLK ;
+
+        if ( pVBInfo->VBInfo & ( SetCRT2ToLCD | SetCRT2ToLCDA ) )
+            return tempal ;
+
+       /* {TV} */
+        if ( pVBInfo->VBType & ( VB_XGI301B | VB_XGI302B | VB_XGI301LV| VB_XGI302LV| VB_XGI301C ) )
+        {
+            if(pVBInfo->VBInfo&SetCRT2ToHiVisionTV)
+           {
+                tempal = HiTVVCLKDIV2;
+                if(!(pVBInfo->TVInfo & RPLLDIV2XO))
+                    tempal = HiTVVCLK;
+               if(pVBInfo->TVInfo & TVSimuMode)
+                {
+                    tempal = HiTVSimuVCLK;
+                    if(!(modeflag & Charx8Dot))
+                       tempal = HiTVTextVCLK;
+
+                 }
+                 return tempal;
+             }
+
+            if ( pVBInfo->TVInfo & SetYPbPrMode750p )
+            {
+                tempal = YPbPr750pVCLK ;
+                return tempal ;
+            }
+
+            if ( pVBInfo->TVInfo & SetYPbPrMode525p )
+            {
+                tempal = YPbPr525pVCLK ;
+                return tempal ;
+            }
+
+            tempal = NTSC1024VCLK ;
+
+            if ( !( pVBInfo->TVInfo & NTSC1024x768 ) )
+            {
+                tempal = TVVCLKDIV2 ;
+                if ( !( pVBInfo->TVInfo & RPLLDIV2XO ) )
+                    tempal = TVVCLK ;
+            }
+
+            if ( pVBInfo->VBInfo & SetCRT2ToTV )
+                return tempal ;
+        }
+        /*else
+        if((pVBInfo->IF_DEF_CH7017==1)&&(pVBInfo->VBType&VB_CH7017))
+        {
+            if(ModeNo<=0x13)
+                *tempal = pVBInfo->SModeIDTable[ModeIdIndex].St_CRT2CRTC;
+            else
+                *tempal = pVBInfo->RefIndex[RefreshRateTableIndex].Ext_CRT2CRTC;
+            *tempal = *tempal & 0x1F;
+
+            tempbx = 0;
+            if(pVBInfo->TVInfo & SetPALTV)
+                tempbx = tempbx + 2;
+            if(pVBInfo->TVInfo & SetCHTVOverScan)
+                tempbx++;
+            tempbx = tempbx << 1;
+        }  */
+    }  /* {End of VB} */
+
+    if((pVBInfo->IF_DEF_CH7007==1)&&(pVBInfo->VBType&VB_CH7007)) /* [Billy] 07/05/08 CH7007 */
+    {
+       /* VideoDebugPrint((0, "XGI_GetVCLKPtr: pVBInfo->IF_DEF_CH7007==1\n")); */
+       if ( (pVBInfo->VBInfo & SetCRT2ToTV) )
+       {
+           if( ModeNo <= 0x13 )
+           {
+              tempal = pVBInfo->SModeIDTable[ ModeIdIndex ].St_CRT2CRTC ;
+           }
+           else
+           {
+              tempal = pVBInfo->RefIndex[RefreshRateTableIndex].Ext_CRT2CRTC;
+           }
+
+           tempal = tempal & 0x0F;
+           tempbx = 0;
+
+           if(pVBInfo->TVInfo & SetPALTV)
+           {
+              tempbx = tempbx + 2;
+           }
+           if(pVBInfo->TVInfo & SetCHTVOverScan)
+           {
+              tempbx++;
+           }
+           /** tempbx = tempbx << 1; CH7007 ? **/
+
+/*[Billy]07/05/29 CH7007*/
+           if ( pVBInfo->IF_DEF_CH7007 == 1 )
+           {
+             switch( tempbx )
+             {
+               case 0:
+                   CHTVVCLKPtr = XGI7007_CHTVVCLKUNTSC ;
+                   break ;
+               case 1:
+                   CHTVVCLKPtr = XGI7007_CHTVVCLKONTSC ;
+                   break ;
+               case 2:
+                   CHTVVCLKPtr = XGI7007_CHTVVCLKUPAL ;
+                   break ;
+               case 3:
+                   CHTVVCLKPtr = XGI7007_CHTVVCLKOPAL ;
+                   break ;
+               default:
+                   break ;
+
+             }
+           }
+           /*else
+           {
+            switch( tempbx )
+            {
+               case 0:
+                   CHTVVCLKPtr = pVBInfo->CHTVVCLKUNTSC ;
+                   break ;
+               case 1:
+                   CHTVVCLKPtr = pVBInfo->CHTVVCLKONTSC ;
+                   break ;
+               case 2:
+                   CHTVVCLKPtr = pVBInfo->CHTVVCLKUPAL ;
+                   break ;
+               case 3:
+                   CHTVVCLKPtr = pVBInfo->CHTVVCLKOPAL ;
+                   break ;
+               default:
+                   break ;
+            }
+           }*/
+
+           tempal = CHTVVCLKPtr[ tempal ] ;
+           return tempal ;
+       }
+
+    }
+
+    tempal = ( UCHAR )XGINew_GetReg2( ( pVBInfo->P3ca + 0x02 ) ) ;
+    tempal = tempal >> 2 ;
+    tempal &= 0x03 ;
+
+    if ( ( pVBInfo->LCDInfo & EnableScalingLCD ) && ( modeflag & Charx8Dot ) )  /* for Dot8 Scaling LCD */
+        tempal = tempal ^ tempal ;                   /* ; set to VCLK25MHz always */
+
+    if ( ModeNo <= 0x13 )
+        return tempal ;
+
+    tempal = pVBInfo->RefIndex[ RefreshRateTableIndex ].Ext_CRTVCLK ;
+    return tempal ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_GetVCLKLen */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_GetVCLKLen(UCHAR tempal,UCHAR* di_0,UCHAR* di_1, PVB_DEVICE_INFO pVBInfo)
+{
+    if ( pVBInfo->IF_DEF_CH7007 == 1 ) /* [Billy] 2007/05/16 */
+    {
+       /* VideoDebugPrint((0, "XGI_GetVCLKLen: pVBInfo->IF_DEF_CH7007==1\n")); */
+        *di_0 = ( UCHAR )XGI_CH7007VCLKData[ tempal ].SR2B ;
+        *di_1 = ( UCHAR )XGI_CH7007VCLKData[ tempal ].SR2C ;
+    }
+    else if ( pVBInfo->VBType & ( VB_XGI301 | VB_XGI301B | VB_XGI302B | VB_XGI301LV | VB_XGI302LV | VB_XGI301C ) )
+    {
+        if ( ( !( pVBInfo->VBInfo & SetCRT2ToLCDA ) ) && ( pVBInfo->SetFlag & ProgrammingCRT2 ) )
+        {
+            *di_0 = ( UCHAR )XGI_VBVCLKData[ tempal ].SR2B ;
+            *di_1 = XGI_VBVCLKData[ tempal ].SR2C ;
+        }
+    }
+    else
+    {
+        *di_0 = XGI_VCLKData[ tempal ].SR2B ;
+        *di_1 = XGI_VCLKData[ tempal ].SR2C ;
+    }
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_SetCRT2Offset */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_SetCRT2Offset( USHORT ModeNo ,
+                                  USHORT ModeIdIndex , USHORT RefreshRateTableIndex , PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo )
+{
+    USHORT offset ;
+    UCHAR temp ;
+
+    if ( pVBInfo->VBInfo & SetInSlaveMode )
+    {
+        return ;
+    }
+
+    offset = XGI_GetOffset(  ModeNo , ModeIdIndex , RefreshRateTableIndex , HwDeviceExtension, pVBInfo ) ;
+    temp = ( UCHAR )( offset & 0xFF ) ;
+    XGINew_SetReg1( pVBInfo->Part1Port , 0x07 , temp ) ;
+    temp =( UCHAR)( ( offset & 0xFF00 ) >> 8 ) ;
+    XGINew_SetReg1( pVBInfo->Part1Port , 0x09 , temp ) ;
+    temp =( UCHAR )( ( ( offset >> 3 ) & 0xFF ) + 1 ) ;
+    XGINew_SetReg1( pVBInfo->Part1Port , 0x03 , temp ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_GetOffset */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+USHORT XGI_GetOffset(USHORT ModeNo,USHORT ModeIdIndex,USHORT RefreshRateTableIndex,PXGI_HW_DEVICE_INFO HwDeviceExtension,PVB_DEVICE_INFO pVBInfo)
+{
+    USHORT temp ,
+           colordepth ,
+           modeinfo ,
+           index ,
+           infoflag ,
+           ColorDepth[] = { 0x01 , 0x02 , 0x04 } ;
+
+    modeinfo = pVBInfo->EModeIDTable[ ModeIdIndex ].Ext_ModeInfo ;
+    if ( ModeNo <= 0x14 )
+        infoflag = 0 ;
+    else
+        infoflag = pVBInfo->RefIndex[ RefreshRateTableIndex ].Ext_InfoFlag ;
+
+
+    index = ( modeinfo >> 8 ) & 0xFF ;
+
+    temp = pVBInfo->ScreenOffset[ index ] ;
+
+    if ( infoflag & InterlaceMode )
+    {
+        temp = temp << 1 ;
+    }
+
+    colordepth = XGI_GetColorDepth( ModeNo , ModeIdIndex, pVBInfo ) ;
+
+    if ( ( ModeNo >= 0x7C ) && ( ModeNo <= 0x7E ) )
+    {
+        temp = ModeNo - 0x7C ;
+       colordepth = ColorDepth[ temp ] ;
+       temp = 0x6B ;
+       if ( infoflag & InterlaceMode )
+       {
+            temp = temp << 1 ;
+       }
+       return( temp * colordepth ) ;
+    }
+    else
+        return( temp * colordepth ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_SetCRT2FIFO */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_SetCRT2FIFO( PVB_DEVICE_INFO pVBInfo)
+{
+    XGINew_SetReg1( pVBInfo->Part1Port , 0x01 , 0x3B ) ;                       /* threshold high ,disable auto threshold */
+    XGINew_SetRegANDOR( pVBInfo->Part1Port , 0x02 , ~( 0x3F ) , 0x04 ) ;       /* threshold low default 04h */
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_PreSetGroup1 */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_PreSetGroup1(USHORT ModeNo , USHORT ModeIdIndex ,PXGI_HW_DEVICE_INFO HwDeviceExtension,
+                       USHORT RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo )
+{
+    USHORT tempcx = 0 ,
+           CRT1Index = 0 ,
+           resinfo = 0 ;
+
+    if ( ModeNo > 0x13 )
+    {
+        CRT1Index = pVBInfo->RefIndex[ RefreshRateTableIndex ].Ext_CRT1CRTC ;
+        CRT1Index &= IndexMask ;
+        resinfo = pVBInfo->EModeIDTable[ ModeIdIndex ].Ext_RESINFO ;
+    }
+
+    XGI_SetCRT2Offset( ModeNo , ModeIdIndex , RefreshRateTableIndex , HwDeviceExtension, pVBInfo ) ;
+    XGI_SetCRT2FIFO(pVBInfo) ;
+    /* XGI_SetCRT2Sync(ModeNo,RefreshRateTableIndex); */
+
+    for( tempcx = 4 ; tempcx < 7 ; tempcx++ )
+    {
+        XGINew_SetReg1( pVBInfo->Part1Port , tempcx , 0x0 ) ;
+    }
+
+    XGINew_SetReg1( pVBInfo->Part1Port , 0x50 , 0x00 ) ;
+    XGINew_SetReg1( pVBInfo->Part1Port , 0x02 , 0x44 ) ;       /* temp 0206 */
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_SetGroup1 */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_SetGroup1( USHORT ModeNo , USHORT ModeIdIndex ,
+                            PXGI_HW_DEVICE_INFO HwDeviceExtension , USHORT RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo )
+{
+    USHORT temp = 0 ,
+           tempax = 0 ,
+           tempbx = 0 ,
+           tempcx = 0 ,
+           pushbx = 0 ,
+           CRT1Index = 0 ,
+           modeflag ,
+           resinfo = 0 ;
+
+    if ( ModeNo > 0x13 )
+    {
+        CRT1Index = pVBInfo->RefIndex[ RefreshRateTableIndex ].Ext_CRT1CRTC ;
+        CRT1Index &= IndexMask ;
+        resinfo = pVBInfo->EModeIDTable[ ModeIdIndex ].Ext_RESINFO ;
+    }
+
+    if ( ModeNo <= 0x13 )
+    {
+        modeflag = pVBInfo->SModeIDTable[ ModeIdIndex ].St_ModeFlag ;
+    }
+    else
+    {
+        modeflag = pVBInfo->EModeIDTable[ ModeIdIndex ].Ext_ModeFlag ;
+    }
+
+    /* bainy change table name */
+    if ( modeflag & HalfDCLK )
+    {
+        temp = ( pVBInfo->VGAHT / 2 - 1 ) & 0x0FF ;                    /* BTVGA2HT 0x08,0x09 */
+        XGINew_SetReg1( pVBInfo->Part1Port , 0x08 , temp ) ;
+        temp = ( ( ( pVBInfo->VGAHT / 2 - 1 ) & 0xFF00 ) >> 8 ) << 4 ;
+        XGINew_SetRegANDOR( pVBInfo->Part1Port , 0x09 , ~0x0F0 , temp ) ;
+        temp = ( pVBInfo->VGAHDE / 2 + 16 ) & 0x0FF ;                  /* BTVGA2HDEE 0x0A,0x0C */
+        XGINew_SetReg1( pVBInfo->Part1Port , 0x0A , temp ) ;
+        tempcx = ( ( pVBInfo->VGAHT - pVBInfo->VGAHDE ) / 2 ) >> 2 ;
+        pushbx = pVBInfo->VGAHDE / 2 + 16 ;
+        tempcx = tempcx >> 1 ;
+        tempbx = pushbx + tempcx ;                                     /* bx BTVGA@HRS 0x0B,0x0C */
+        tempcx += tempbx ;
+
+       if ( pVBInfo->VBInfo & SetCRT2ToRAMDAC )
+       {
+            tempbx = pVBInfo->XGINEWUB_CRT1Table[ CRT1Index ].CR[ 4 ] ;
+            tempbx |= ( ( pVBInfo->XGINEWUB_CRT1Table[ CRT1Index ].CR[ 14 ] & 0xC0 ) << 2 ) ;
+            tempbx = ( tempbx - 3 ) << 3 ;                             /* (VGAHRS-3)*8 */
+            tempcx = pVBInfo->XGINEWUB_CRT1Table[CRT1Index].CR[ 5 ] ;
+            tempcx &= 0x1F ;
+            temp = pVBInfo->XGINEWUB_CRT1Table[ CRT1Index ].CR[ 15 ] ;
+            temp = ( temp & 0x04 ) << ( 5 - 2 ) ;                      /* VGAHRE D[5] */
+            tempcx = ( ( tempcx | temp ) - 3 ) << 3 ;                  /* (VGAHRE-3)*8 */
+        }
+
+        tempbx += 4 ;
+        tempcx += 4 ;
+
+        if ( tempcx > ( pVBInfo->VGAHT / 2 ) )
+            tempcx = pVBInfo->VGAHT / 2 ;
+
+        temp = tempbx & 0x00FF ;
+
+        XGINew_SetReg1( pVBInfo->Part1Port , 0x0B , temp ) ;
+    }
+    else
+    {
+        temp = ( pVBInfo->VGAHT - 1 ) & 0x0FF ;                                /* BTVGA2HT 0x08,0x09 */
+        XGINew_SetReg1( pVBInfo->Part1Port , 0x08 , temp ) ;
+        temp = ( ( ( pVBInfo->VGAHT - 1 ) & 0xFF00 ) >> 8 ) << 4 ;
+        XGINew_SetRegANDOR( pVBInfo->Part1Port , 0x09 , ~0x0F0 , temp ) ;
+        temp = ( pVBInfo->VGAHDE + 16 ) & 0x0FF ;                              /* BTVGA2HDEE 0x0A,0x0C */
+        XGINew_SetReg1( pVBInfo->Part1Port , 0x0A , temp ) ;
+        tempcx = ( pVBInfo->VGAHT - pVBInfo->VGAHDE ) >> 2 ;           /* cx */
+        pushbx = pVBInfo->VGAHDE + 16 ;
+        tempcx = tempcx >> 1 ;
+        tempbx = pushbx + tempcx ;                                     /* bx BTVGA@HRS 0x0B,0x0C */
+        tempcx += tempbx ;
+
+        if ( pVBInfo->VBInfo & SetCRT2ToRAMDAC )
+        {
+            tempbx = pVBInfo->XGINEWUB_CRT1Table[ CRT1Index ].CR[ 3 ] ;
+            tempbx |= ( ( pVBInfo->XGINEWUB_CRT1Table[ CRT1Index ].CR[ 5 ] & 0xC0 ) << 2 ) ;
+            tempbx = ( tempbx - 3 ) << 3 ;                             /* (VGAHRS-3)*8 */
+            tempcx = pVBInfo->XGINEWUB_CRT1Table[ CRT1Index ].CR[ 4 ] ;
+            tempcx &= 0x1F ;
+            temp = pVBInfo->XGINEWUB_CRT1Table[ CRT1Index ].CR[ 6 ] ;
+            temp = ( temp & 0x04 ) << ( 5 - 2 ) ;                      /* VGAHRE D[5] */
+            tempcx = ( ( tempcx | temp ) - 3 ) << 3 ;                  /* (VGAHRE-3)*8 */
+            tempbx += 16 ;
+            tempcx += 16 ;
+        }
+
+        if ( tempcx > pVBInfo->VGAHT )
+            tempcx = pVBInfo->VGAHT ;
+
+        temp = tempbx & 0x00FF ;
+        XGINew_SetReg1( pVBInfo->Part1Port , 0x0B , temp ) ;
+    }
+
+    tempax = ( tempax & 0x00FF ) | ( tempbx & 0xFF00 ) ;
+    tempbx = pushbx ;
+    tempbx = ( tempbx & 0x00FF ) | ( ( tempbx & 0xFF00 ) << 4 ) ;
+    tempax |= ( tempbx & 0xFF00 ) ;
+    temp = ( tempax & 0xFF00 ) >> 8 ;
+    XGINew_SetReg1( pVBInfo->Part1Port , 0x0C , temp ) ;
+    temp = tempcx & 0x00FF ;
+    XGINew_SetReg1( pVBInfo->Part1Port , 0x0D , temp ) ;
+    tempcx = ( pVBInfo->VGAVT - 1 ) ;
+    temp = tempcx & 0x00FF ;
+
+    if ( pVBInfo->IF_DEF_CH7005 == 1 )
+    {
+        if ( pVBInfo->VBInfo & 0x0C )
+        {
+            temp-- ;
+       }
+    }
+
+    XGINew_SetReg1( pVBInfo->Part1Port , 0x0E , temp ) ;
+    tempbx = pVBInfo->VGAVDE - 1 ;
+    temp = tempbx & 0x00FF ;
+    XGINew_SetReg1( pVBInfo->Part1Port , 0x0F , temp ) ;
+    temp = ( ( tempbx & 0xFF00 ) << 3 ) >> 8 ;
+    temp |= ( ( tempcx & 0xFF00 ) >> 8 ) ;
+    XGINew_SetReg1( pVBInfo->Part1Port , 0x12 , temp ) ;
+
+    tempax = pVBInfo->VGAVDE ;
+    tempbx = pVBInfo->VGAVDE ;
+    tempcx = pVBInfo->VGAVT ;
+    tempbx = ( pVBInfo->VGAVT + pVBInfo->VGAVDE ) >> 1 ;                               /* BTVGA2VRS 0x10,0x11 */
+    tempcx = ( ( pVBInfo->VGAVT - pVBInfo->VGAVDE ) >> 4 ) + tempbx + 1 ;              /* BTVGA2VRE 0x11 */
+
+    if ( pVBInfo->VBInfo & SetCRT2ToRAMDAC )
+    {
+        tempbx = pVBInfo->XGINEWUB_CRT1Table[ CRT1Index ].CR[ 10 ] ;
+        temp = pVBInfo->XGINEWUB_CRT1Table[ CRT1Index ].CR[ 9 ] ;
+
+        if ( temp & 0x04 )
+            tempbx |= 0x0100 ;
+
+        if ( temp & 0x080 )
+            tempbx |= 0x0200 ;
+
+        temp = pVBInfo->XGINEWUB_CRT1Table[ CRT1Index ].CR[ 14 ] ;
+
+        if ( temp & 0x08 )
+            tempbx |= 0x0400 ;
+
+        temp = pVBInfo->XGINEWUB_CRT1Table[ CRT1Index ].CR[ 11 ] ;
+        tempcx = ( tempcx & 0xFF00 ) | ( temp & 0x00FF ) ;
+    }
+
+    temp = tempbx & 0x00FF ;
+    XGINew_SetReg1( pVBInfo->Part1Port , 0x10 , temp ) ;
+    temp = ( ( tempbx & 0xFF00 ) >> 8 ) << 4 ;
+    temp = ( ( tempcx & 0x000F ) | ( temp ) ) ;
+    XGINew_SetReg1( pVBInfo->Part1Port , 0x11 , temp ) ;
+    tempax = 0 ;
+
+    if ( modeflag & DoubleScanMode )
+        tempax |= 0x80 ;
+
+    if ( modeflag & HalfDCLK )
+        tempax |= 0x40 ;
+
+    XGINew_SetRegANDOR( pVBInfo->Part1Port , 0x2C , ~0x0C0 , tempax ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_SetLockRegs */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void  XGI_SetLockRegs( USHORT ModeNo , USHORT ModeIdIndex ,
+                                PXGI_HW_DEVICE_INFO HwDeviceExtension , USHORT RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo )
+{
+    USHORT push1 ,
+           push2 ,
+           tempax ,
+           tempbx = 0 ,
+           tempcx ,
+           temp ,
+           resinfo ,
+           modeflag ,
+           CRT1Index ;
+
+    if ( ModeNo <= 0x13 )
+    {
+        modeflag = pVBInfo->SModeIDTable[ ModeIdIndex ].St_ModeFlag ;  /* si+St_ResInfo */
+        resinfo = pVBInfo->SModeIDTable[ ModeIdIndex ].St_ResInfo ;
+    }
+    else
+    {
+        modeflag = pVBInfo->EModeIDTable[ ModeIdIndex ].Ext_ModeFlag ; /* si+Ext_ResInfo */
+        resinfo = pVBInfo->EModeIDTable[ ModeIdIndex ].Ext_RESINFO ;
+        CRT1Index = pVBInfo->RefIndex[ RefreshRateTableIndex ].Ext_CRT1CRTC ;
+        CRT1Index &= IndexMask;
+    }
+
+    if ( !( pVBInfo->VBInfo & SetInSlaveMode ) )
+    {
+        return ;
+    }
+
+    temp = 0xFF ;                                                      /* set MAX HT */
+    XGINew_SetReg1( pVBInfo->Part1Port , 0x03 , temp ) ;
+    /* if ( modeflag & Charx8Dot ) tempcx = 0x08 ; */
+    /* else */
+    tempcx=0x08;
+
+    if ( pVBInfo->VBType & ( VB_XGI301LV | VB_XGI302LV | VB_XGI301C ) )
+        modeflag |= Charx8Dot ;
+
+    tempax = pVBInfo->VGAHDE ;                                         /* 0x04 Horizontal Display End */
+
+    if ( modeflag & HalfDCLK )
+        tempax = tempax >> 1 ;
+
+    tempax = ( tempax / tempcx ) - 1 ;
+    tempbx |= ( ( tempax & 0x00FF ) << 8 ) ;
+    temp = tempax & 0x00FF ;
+    XGINew_SetReg1( pVBInfo->Part1Port , 0x04 , temp ) ;
+
+    temp = ( tempbx & 0xFF00 ) >> 8 ;
+
+    if ( pVBInfo->VBInfo & SetCRT2ToTV )
+    {
+        if ( !( pVBInfo->VBType & ( VB_XGI301B | VB_XGI302B | VB_XGI301LV | VB_XGI302LV | VB_XGI301C ) ) )
+            temp += 2 ;
+
+        if ( pVBInfo->VBInfo & SetCRT2ToHiVisionTV )
+        {
+            if ( pVBInfo->VBType & VB_XGI301LV )
+            {
+                if ( pVBInfo->VBExtInfo == VB_YPbPr1080i )
+                {
+                    if ( resinfo == 7 )
+                        temp -= 2 ;
+                }
+            }
+            else
+                if ( resinfo == 7 )
+                    temp -= 2 ;
+        }
+    }
+
+    XGINew_SetReg1( pVBInfo->Part1Port , 0x05 , temp ) ;                       /* 0x05 Horizontal Display Start */
+    XGINew_SetReg1( pVBInfo->Part1Port , 0x06 , 0x03 ) ;                       /* 0x06 Horizontal Blank end */
+
+    if ( !( pVBInfo->VBInfo & DisableCRT2Display ) )
+    {                                                                  /* 030226 bainy */
+        if ( pVBInfo->VBInfo & SetCRT2ToTV )
+            tempax = pVBInfo->VGAHT ;
+        else
+            tempax = XGI_GetVGAHT2( pVBInfo) ;
+    }
+
+    if ( tempax >= pVBInfo->VGAHT )
+    {
+        tempax = pVBInfo->VGAHT ;
+    }
+
+    if ( modeflag & HalfDCLK )
+    {
+        tempax = tempax >> 1 ;
+    }
+
+    tempax = ( tempax / tempcx ) - 5 ;
+    tempcx = tempax ;                          /* 20030401 0x07 horizontal Retrace Start */
+    if ( pVBInfo->VBInfo & SetCRT2ToHiVisionTV )
+    {
+        temp = ( tempbx & 0x00FF ) - 1 ;
+        if ( !( modeflag & HalfDCLK ) )
+        {
+            temp -= 6 ;
+            if ( pVBInfo->TVInfo & TVSimuMode )
+            {
+                temp -= 4 ;
+                if ( ModeNo > 0x13 )
+                    temp -= 10 ;
+            }
+        }
+    }
+    else
+    {
+        /* tempcx = tempbx & 0x00FF ; */
+        tempbx = ( tempbx & 0xFF00 ) >> 8 ;
+        tempcx = ( tempcx + tempbx ) >> 1 ;
+        temp = ( tempcx & 0x00FF ) + 2 ;
+
+        if ( pVBInfo->VBInfo & SetCRT2ToTV )
+        {
+            temp -= 1 ;
+            if ( !( modeflag & HalfDCLK ) )
+            {
+                if ( ( modeflag & Charx8Dot ) )
+                {
+                    temp += 4 ;
+                    if ( pVBInfo->VGAHDE >= 800 )
+                    {
+                        temp -= 6 ;
+                    }
+                }
+            }
+        }
+        else
+        {
+            if ( !( modeflag & HalfDCLK ) )
+            {
+                temp -= 4 ;
+                if ( pVBInfo->LCDResInfo != Panel1280x960 )
+                {
+                    if( pVBInfo->VGAHDE >= 800 )
+                    {
+                        temp -= 7 ;
+                        if ( pVBInfo->ModeType == ModeEGA )
+                        {
+                            if ( pVBInfo->VGAVDE == 1024 )
+                            {
+                                temp += 15 ;
+                                if ( pVBInfo->LCDResInfo != Panel1280x1024 )
+                                {
+                                    temp += 7 ;
+                                }
+                            }
+                        }
+
+                        if ( pVBInfo->VGAHDE >= 1280 )
+                        {
+                            if ( pVBInfo->LCDResInfo != Panel1280x960 )
+                            {
+                                if ( pVBInfo->LCDInfo & LCDNonExpanding )
+                                {
+                                    temp += 28 ;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    XGINew_SetReg1( pVBInfo->Part1Port , 0x07 , temp ) ;               /* 0x07 Horizontal Retrace Start */
+    XGINew_SetReg1( pVBInfo->Part1Port , 0x08 , 0 ) ;          /* 0x08 Horizontal Retrace End */
+
+    if ( pVBInfo->VBInfo & SetCRT2ToTV )
+    {
+        if ( pVBInfo->TVInfo & TVSimuMode )
+        {
+            if ( ( ModeNo == 0x06 ) || ( ModeNo == 0x10 ) || ( ModeNo == 0x11 ) || ( ModeNo == 0x13 ) || ( ModeNo == 0x0F ) )
+            {
+                XGINew_SetReg1( pVBInfo->Part1Port , 0x07 , 0x5b ) ;
+                XGINew_SetReg1( pVBInfo->Part1Port , 0x08 , 0x03 ) ;
+            }
+
+            if ( ( ModeNo == 0x00 ) || ( ModeNo == 0x01 ) )
+            {
+                if ( pVBInfo->TVInfo & SetNTSCTV )
+                {
+                    XGINew_SetReg1( pVBInfo->Part1Port , 0x07 , 0x2A ) ;
+                    XGINew_SetReg1( pVBInfo->Part1Port , 0x08 , 0x61 ) ;
+                }
+                else
+                {
+                    XGINew_SetReg1( pVBInfo->Part1Port , 0x07 , 0x2A ) ;
+                    XGINew_SetReg1( pVBInfo->Part1Port , 0x08 , 0x41 ) ;
+                    XGINew_SetReg1( pVBInfo->Part1Port , 0x0C , 0xF0 ) ;
+                }
+            }
+
+            if ( ( ModeNo == 0x02 ) || ( ModeNo == 0x03 ) || ( ModeNo == 0x07 ) )
+            {
+                if ( pVBInfo->TVInfo & SetNTSCTV )
+                {
+                    XGINew_SetReg1( pVBInfo->Part1Port , 0x07 , 0x54 ) ;
+                    XGINew_SetReg1( pVBInfo->Part1Port , 0x08 , 0x00 ) ;
+                }
+                else
+                {
+                    XGINew_SetReg1( pVBInfo->Part1Port , 0x07 , 0x55 ) ;
+                    XGINew_SetReg1( pVBInfo->Part1Port , 0x08 , 0x00 ) ;
+                    XGINew_SetReg1( pVBInfo->Part1Port , 0x0C , 0xF0 ) ;
+                }
+            }
+
+            if ( ( ModeNo == 0x04 ) || ( ModeNo == 0x05 ) || ( ModeNo == 0x0D ) || ( ModeNo == 0x50 ) )
+            {
+                if ( pVBInfo->TVInfo & SetNTSCTV )
+                {
+                    XGINew_SetReg1( pVBInfo->Part1Port , 0x07 , 0x30 ) ;
+                    XGINew_SetReg1( pVBInfo->Part1Port , 0x08 , 0x03 ) ;
+                }
+                else
+                {
+                    XGINew_SetReg1( pVBInfo->Part1Port , 0x07 , 0x2f ) ;
+                    XGINew_SetReg1( pVBInfo->Part1Port , 0x08 , 0x02 ) ;
+                }
+            }
+        }
+    }
+
+    XGINew_SetReg1( pVBInfo->Part1Port , 0x18 , 0x03 ) ;                               /* 0x18 SR0B */
+    XGINew_SetRegANDOR( pVBInfo->Part1Port , 0x19 , 0xF0 , 0x00 ) ;
+    XGINew_SetReg1( pVBInfo->Part1Port , 0x09 , 0xFF ) ;                               /* 0x09 Set Max VT */
+
+    tempbx = pVBInfo->VGAVT ;
+    push1 = tempbx ;
+    tempcx = 0x121 ;
+    tempbx = pVBInfo->VGAVDE ;                                                 /* 0x0E Virtical Display End */
+
+    if ( tempbx == 357 )
+        tempbx = 350 ;
+    if ( tempbx == 360 )
+        tempbx =350 ;
+    if ( tempbx == 375 )
+        tempbx = 350 ;
+    if ( tempbx == 405 )
+        tempbx = 400 ;
+    if ( tempbx == 525 )
+        tempbx = 480 ;
+
+    push2 = tempbx ;
+
+    if ( pVBInfo->VBInfo & SetCRT2ToLCD )
+    {
+        if ( pVBInfo->LCDResInfo == Panel1024x768 )
+        {
+            if ( !( pVBInfo->LCDInfo & LCDVESATiming ) )
+            {
+                if ( tempbx == 350 )
+                    tempbx += 5 ;
+               if ( tempbx == 480 )
+                   tempbx += 5 ;
+            }
+        }
+    }
+    tempbx-- ;
+    temp = tempbx & 0x00FF ;
+    tempbx-- ;
+    temp = tempbx & 0x00FF ;
+    XGINew_SetReg1( pVBInfo->Part1Port , 0x10 ,temp ) ;                                /* 0x10 vertical Blank Start */
+    tempbx = push2 ;
+    tempbx-- ;
+    temp = tempbx & 0x00FF ;
+    XGINew_SetReg1( pVBInfo->Part1Port , 0x0E , temp ) ;
+
+    if ( tempbx & 0x0100 )
+    {
+        tempcx |= 0x0002 ;
+    }
+
+    tempax = 0x000B ;
+
+    if ( modeflag & DoubleScanMode )
+    {
+        tempax |= 0x08000 ;
+    }
+
+    if ( tempbx & 0x0200 )
+    {
+        tempcx |= 0x0040 ;
+    }
+
+    temp = ( tempax & 0xFF00 ) >> 8 ;
+    XGINew_SetReg1( pVBInfo->Part1Port , 0x0B , temp ) ;
+
+    if ( tempbx & 0x0400 )
+    {
+        tempcx |= 0x0600 ;
+    }
+
+    XGINew_SetReg1( pVBInfo->Part1Port , 0x11 , 0x00 ) ;                               /* 0x11 Vertival Blank End */
+
+    tempax = push1 ;
+    tempax -= tempbx ;                                                         /* 0x0C Vertical Retrace Start */
+    tempax = tempax >> 2 ;
+    push1 = tempax ;                                                           /* push ax */
+
+    if ( resinfo != 0x09 )
+    {
+        tempax = tempax << 1 ;
+        tempbx += tempax ;
+    }
+
+    if ( pVBInfo->VBInfo & SetCRT2ToHiVisionTV )
+    {
+        if ( pVBInfo->VBType & VB_XGI301LV )
+        {
+            if ( pVBInfo->TVInfo & SetYPbPrMode1080i )
+                tempbx -= 10 ;
+            else
+            {
+                if ( pVBInfo->TVInfo & TVSimuMode )
+                {
+                    if ( pVBInfo->TVInfo & SetPALTV )
+                    {
+                        if ( pVBInfo->VBType & VB_XGI301LV )
+                        {
+                            if ( !( pVBInfo->TVInfo & ( SetYPbPrMode525p | SetYPbPrMode750p | SetYPbPrMode1080i ) ) )
+                                tempbx += 40 ;
+                        }
+                        else
+                            tempbx += 40 ;
+                    }
+                }
+            }
+        }
+        else
+            tempbx -= 10 ;
+    }
+    else
+    {
+        if ( pVBInfo->TVInfo & TVSimuMode )
+        {
+            if ( pVBInfo->TVInfo & SetPALTV )
+            {
+                if ( pVBInfo->VBType & VB_XGI301LV )
+                {
+                    if ( !( pVBInfo->TVInfo & ( SetYPbPrMode525p | SetYPbPrMode750p | SetYPbPrMode1080i ) ) )
+                        tempbx += 40 ;
+                }
+                else
+                    tempbx += 40 ;
+            }
+        }
+    }
+    tempax = push1 ;
+    tempax = tempax >> 2 ;
+    tempax++ ;
+    tempax += tempbx ;
+    push1 = tempax ;                                           /* push ax */
+
+    if ( ( pVBInfo->TVInfo & SetPALTV ) )
+    {
+        if ( tempbx <= 513 )
+        {
+            if ( tempax >= 513 )
+            {
+                tempbx = 513 ;
+            }
+        }
+    }
+
+    temp = tempbx & 0x00FF ;
+    XGINew_SetReg1( pVBInfo->Part1Port , 0x0C , temp ) ;
+    tempbx-- ;
+    temp = tempbx & 0x00FF ;
+    XGINew_SetReg1( pVBInfo->Part1Port , 0x10 , temp ) ;
+
+    if ( tempbx & 0x0100 )
+    {
+        tempcx |= 0x0008 ;
+    }
+
+    if ( tempbx & 0x0200 )
+    {
+        XGINew_SetRegANDOR( pVBInfo->Part1Port , 0x0B , 0x0FF , 0x20 ) ;
+    }
+
+    tempbx++ ;
+
+    if ( tempbx & 0x0100 )
+    {
+        tempcx |= 0x0004 ;
+    }
+
+    if ( tempbx & 0x0200 )
+    {
+        tempcx |= 0x0080 ;
+    }
+
+    if ( tempbx & 0x0400 )
+    {
+        tempcx |= 0x0C00 ;
+    }
+
+    tempbx = push1 ;                                           /* pop ax */
+    temp = tempbx & 0x00FF ;
+    temp &= 0x0F ;
+    XGINew_SetReg1( pVBInfo->Part1Port , 0x0D , temp ) ;               /* 0x0D vertical Retrace End */
+
+    if ( tempbx & 0x0010 )
+    {
+        tempcx |= 0x2000 ;
+    }
+
+    temp = tempcx & 0x00FF ;
+    XGINew_SetReg1( pVBInfo->Part1Port , 0x0A , temp ) ;               /* 0x0A CR07 */
+    temp = ( tempcx & 0x0FF00 ) >> 8 ;
+    XGINew_SetReg1( pVBInfo->Part1Port , 0x17 , temp ) ;               /* 0x17 SR0A */
+    tempax = modeflag ;
+    temp = ( tempax & 0xFF00 ) >> 8 ;
+
+    temp = ( temp >> 1 ) & 0x09 ;
+
+    if ( pVBInfo->VBType & ( VB_XGI301LV | VB_XGI302LV | VB_XGI301C ) )
+        temp |= 0x01 ;
+
+    XGINew_SetReg1( pVBInfo->Part1Port , 0x16 , temp ) ;                       /* 0x16 SR01 */
+    XGINew_SetReg1( pVBInfo->Part1Port , 0x0F , 0 ) ;                  /* 0x0F CR14 */
+    XGINew_SetReg1( pVBInfo->Part1Port , 0x12 , 0 ) ;                  /* 0x12 CR17 */
+
+    if ( pVBInfo->LCDInfo & LCDRGB18Bit )
+        temp = 0x80 ;
+    else
+        temp = 0x00 ;
+
+    XGINew_SetReg1( pVBInfo->Part1Port , 0x1A , temp ) ;                       /* 0x1A SR0E */
+
+    return ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_SetGroup2 */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_SetGroup2( USHORT ModeNo, USHORT ModeIdIndex, USHORT RefreshRateTableIndex,
+                    PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo )
+{
+    USHORT i ,
+           j ,
+           tempax ,
+           tempbx ,
+           tempcx ,
+           temp ,
+           push1 ,
+           push2 ,
+           modeflag ,
+           resinfo ,
+           crt2crtc ;
+    UCHAR *TimingPoint ;
+
+    ULONG longtemp ,
+          tempeax ,
+          tempebx ,
+          temp2 ,
+          tempecx ;
+
+    if ( ModeNo <= 0x13 )
+    {
+        modeflag = pVBInfo->SModeIDTable[ ModeIdIndex ].St_ModeFlag ;          /* si+St_ResInfo */
+        resinfo = pVBInfo->SModeIDTable[ ModeIdIndex ].St_ResInfo ;
+        crt2crtc = pVBInfo->SModeIDTable[ ModeIdIndex ].St_CRT2CRTC ;
+    }
+    else
+    {
+        modeflag = pVBInfo->EModeIDTable[ ModeIdIndex ].Ext_ModeFlag ;         /* si+Ext_ResInfo */
+        resinfo = pVBInfo->EModeIDTable[ ModeIdIndex ].Ext_RESINFO ;
+        crt2crtc = pVBInfo->RefIndex[ RefreshRateTableIndex ].Ext_CRT2CRTC ;
+    }
+
+    tempax = 0 ;
+
+    if ( !( pVBInfo->VBInfo & SetCRT2ToAVIDEO ) )
+        tempax |= 0x0800 ;
+
+    if ( !( pVBInfo->VBInfo & SetCRT2ToSVIDEO ) )
+        tempax |= 0x0400 ;
+
+    if ( pVBInfo->VBInfo & SetCRT2ToSCART )
+        tempax |= 0x0200 ;
+
+    if ( !( pVBInfo->TVInfo & SetPALTV ) )
+        tempax |= 0x1000 ;
+
+    if ( pVBInfo->VBInfo & SetCRT2ToHiVisionTV )
+        tempax |= 0x0100 ;
+
+    if ( pVBInfo->TVInfo & ( SetYPbPrMode525p | SetYPbPrMode750p ) )
+        tempax &= 0xfe00 ;
+
+    tempax = ( tempax & 0xff00 ) >> 8 ;
+
+    XGINew_SetReg1( pVBInfo->Part2Port , 0x0 , tempax ) ;
+    TimingPoint = pVBInfo->NTSCTiming ;
+
+    if ( pVBInfo->TVInfo & SetPALTV )
+    {
+        TimingPoint = pVBInfo->PALTiming ;
+    }
+
+    if ( pVBInfo->VBInfo & SetCRT2ToHiVisionTV )
+    {
+        TimingPoint = pVBInfo->HiTVExtTiming ;
+
+        if ( pVBInfo->VBInfo & SetInSlaveMode )
+            TimingPoint = pVBInfo->HiTVSt2Timing ;
+
+        if ( pVBInfo->SetFlag & TVSimuMode )
+            TimingPoint = pVBInfo->HiTVSt1Timing ;
+
+        if ( !(modeflag & Charx8Dot) )
+            TimingPoint = pVBInfo->HiTVTextTiming ;
+    }
+
+    if ( pVBInfo->VBInfo & SetCRT2ToYPbPr )
+    {
+        if ( pVBInfo->TVInfo & SetYPbPrMode525i )
+            TimingPoint = pVBInfo->YPbPr525iTiming ;
+
+        if ( pVBInfo->TVInfo & SetYPbPrMode525p )
+           TimingPoint = pVBInfo->YPbPr525pTiming ;
+
+        if ( pVBInfo->TVInfo & SetYPbPrMode750p )
+           TimingPoint = pVBInfo->YPbPr750pTiming ;
+    }
+
+    for( i = 0x01 , j = 0 ; i <= 0x2D ; i++ , j++ )
+    {
+        XGINew_SetReg1( pVBInfo->Part2Port , i , TimingPoint[ j ] ) ;
+    }
+
+    for( i = 0x39 ; i <= 0x45 ; i++ , j++ )
+    {
+        XGINew_SetReg1( pVBInfo->Part2Port , i , TimingPoint[ j ] ) ;  /* di->temp2[j] */
+    }
+
+    if ( pVBInfo->VBInfo & SetCRT2ToTV )
+    {
+        XGINew_SetRegANDOR( pVBInfo->Part2Port , 0x3A , 0x1F , 0x00 ) ;
+    }
+
+    temp = pVBInfo->NewFlickerMode ;
+    temp &= 0x80 ;
+    XGINew_SetRegANDOR( pVBInfo->Part2Port , 0x0A , 0xFF , temp ) ;
+
+    if ( pVBInfo->VBInfo & SetCRT2ToHiVisionTV )
+        tempax = 950 ;
+
+    if ( pVBInfo->TVInfo & SetPALTV )
+        tempax = 520 ;
+    else
+        tempax = 440 ;
+
+    if ( pVBInfo->VDE <= tempax )
+    {
+        tempax -= pVBInfo->VDE ;
+        tempax = tempax >> 2 ;
+        tempax = ( tempax & 0x00FF ) | ( ( tempax & 0x00FF ) << 8 ) ;
+        push1 = tempax ;
+        temp = ( tempax & 0xFF00 ) >> 8 ;
+        temp += ( USHORT )TimingPoint[ 0 ] ;
+
+        if ( pVBInfo->VBType & ( VB_XGI301B | VB_XGI302B | VB_XGI301LV | VB_XGI302LV | VB_XGI301C ) )
+        {
+            if ( pVBInfo->VBInfo & ( SetCRT2ToAVIDEO | SetCRT2ToSVIDEO | SetCRT2ToSCART | SetCRT2ToYPbPr ) )
+            {
+                tempcx=pVBInfo->VGAHDE;
+                if ( tempcx >= 1024 )
+                {
+                    temp = 0x17 ;              /* NTSC */
+                    if ( pVBInfo->TVInfo & SetPALTV )
+                        temp = 0x19 ;          /* PAL */
+                }
+            }
+        }
+
+        XGINew_SetReg1( pVBInfo->Part2Port , 0x01 , temp ) ;
+        tempax = push1 ;
+        temp = ( tempax & 0xFF00 ) >> 8 ;
+        temp += TimingPoint[ 1 ] ;
+
+        if ( pVBInfo->VBType & ( VB_XGI301B | VB_XGI302B | VB_XGI301LV | VB_XGI302LV | VB_XGI301C ) )
+        {
+            if ( ( pVBInfo->VBInfo & ( SetCRT2ToAVIDEO | SetCRT2ToSVIDEO | SetCRT2ToSCART | SetCRT2ToYPbPr ) ) )
+            {
+                tempcx = pVBInfo->VGAHDE ;
+                if ( tempcx >= 1024 )
+                {
+                    temp = 0x1D ;              /* NTSC */
+                    if ( pVBInfo->TVInfo & SetPALTV )
+                        temp = 0x52 ;          /* PAL */
+                }
+            }
+        }
+        XGINew_SetReg1( pVBInfo->Part2Port , 0x02 , temp ) ;
+    }
+
+    /* 301b */
+    tempcx = pVBInfo->HT ;
+
+    if ( XGI_IsLCDDualLink( pVBInfo ) )
+        tempcx = tempcx >> 1 ;
+
+    tempcx -= 2 ;
+    temp = tempcx & 0x00FF ;
+    XGINew_SetReg1( pVBInfo->Part2Port , 0x1B , temp ) ;
+
+    temp = ( tempcx & 0xFF00 ) >> 8 ;
+    XGINew_SetRegANDOR( pVBInfo->Part2Port , 0x1D , ~0x0F , temp ) ;
+
+    tempcx = pVBInfo->HT >> 1 ;
+    push1 = tempcx ;                           /* push cx */
+    tempcx += 7 ;
+
+    if ( pVBInfo->VBInfo & SetCRT2ToHiVisionTV )
+    {
+        tempcx -= 4 ;
+    }
+
+    temp = tempcx & 0x00FF ;
+    temp = temp << 4 ;
+    XGINew_SetRegANDOR( pVBInfo->Part2Port , 0x22 , 0x0F , temp ) ;
+
+    tempbx = TimingPoint[ j ] | ( ( TimingPoint[ j + 1 ] ) << 8 ) ;
+    tempbx += tempcx ;
+    push2 = tempbx ;
+    temp = tempbx & 0x00FF ;
+    XGINew_SetReg1( pVBInfo->Part2Port , 0x24 , temp ) ;
+    temp = ( tempbx & 0xFF00 ) >> 8 ;
+    temp = temp << 4 ;
+    XGINew_SetRegANDOR(pVBInfo->Part2Port,0x25,0x0F,temp);
+
+    tempbx=push2;
+    tempbx=tempbx+8;
+    if ( pVBInfo->VBInfo & SetCRT2ToHiVisionTV )
+    {
+        tempbx=tempbx-4;
+        tempcx=tempbx;
+    }
+
+    temp = ( tempbx & 0x00FF ) << 4 ;
+    XGINew_SetRegANDOR( pVBInfo->Part2Port , 0x29 , 0x0F , temp ) ;
+
+    j += 2 ;
+    tempcx += ( TimingPoint[ j ] | ( ( TimingPoint[ j + 1 ] ) << 8 ) ) ;
+    temp = tempcx & 0x00FF ;
+    XGINew_SetReg1( pVBInfo->Part2Port , 0x27 , temp ) ;
+    temp = ( ( tempcx & 0xFF00 ) >> 8 ) << 4 ;
+    XGINew_SetRegANDOR( pVBInfo->Part2Port , 0x28 , 0x0F , temp ) ;
+
+    tempcx += 8 ;
+    if ( pVBInfo->VBInfo & SetCRT2ToHiVisionTV )
+    {
+        tempcx -= 4 ;
+    }
+
+    temp = tempcx & 0xFF ;
+    temp = temp << 4 ;
+    XGINew_SetRegANDOR( pVBInfo->Part2Port , 0x2A , 0x0F , temp ) ;
+
+    tempcx = push1 ;                                   /* pop cx */
+    j += 2 ;
+    temp = TimingPoint[ j ] | ( ( TimingPoint[ j + 1 ] ) << 8 ) ;
+    tempcx -= temp ;
+    temp = tempcx & 0x00FF ;
+    temp = temp << 4 ;
+    XGINew_SetRegANDOR( pVBInfo->Part2Port , 0x2D , 0x0F ,temp ) ;
+
+    tempcx -= 11 ;
+
+    if ( !( pVBInfo->VBInfo & SetCRT2ToTV ) )
+    {
+        tempax = XGI_GetVGAHT2( pVBInfo) ;
+        tempcx = tempax - 1 ;
+    }
+    temp = tempcx & 0x00FF ;
+    XGINew_SetReg1( pVBInfo->Part2Port , 0x2E , temp ) ;
+
+    tempbx = pVBInfo->VDE ;
+
+    if ( pVBInfo->VGAVDE == 360 )
+        tempbx = 746 ;
+    if ( pVBInfo->VGAVDE == 375 )
+        tempbx = 746 ;
+    if ( pVBInfo->VGAVDE == 405 )
+        tempbx = 853 ;
+
+    if ( pVBInfo->VBInfo & SetCRT2ToTV )
+    {
+        if ( pVBInfo->VBType & ( VB_XGI301LV | VB_XGI302LV | VB_XGI301C ) )
+        {
+            if ( !( pVBInfo->TVInfo & ( SetYPbPrMode525p | SetYPbPrMode750p ) ) )
+                tempbx = tempbx >> 1 ;
+        }
+        else
+            tempbx = tempbx >> 1 ;
+    }
+
+    tempbx -= 2 ;
+    temp = tempbx & 0x00FF ;
+
+    if ( pVBInfo->VBInfo & SetCRT2ToHiVisionTV )
+    {
+        if ( pVBInfo->VBType & VB_XGI301LV )
+        {
+            if ( pVBInfo->TVInfo & SetYPbPrMode1080i )
+            {
+                if ( pVBInfo->VBInfo & SetInSlaveMode )
+                {
+                    if ( ModeNo == 0x2f )
+                        temp += 1 ;
+                }
+            }
+        }
+        else
+        {
+            if ( pVBInfo->VBInfo & SetInSlaveMode )
+            {
+                if ( ModeNo == 0x2f )
+                    temp += 1 ;
+            }
+        }
+    }
+
+    XGINew_SetReg1( pVBInfo->Part2Port , 0x2F , temp ) ;
+
+    temp = ( tempcx & 0xFF00 ) >> 8 ;
+    temp |= ( ( tempbx & 0xFF00 ) >> 8 ) << 6 ;
+
+    if ( !( pVBInfo->VBInfo & SetCRT2ToHiVisionTV ) )
+    {
+        if ( pVBInfo->VBType & VB_XGI301LV )
+        {
+            if ( pVBInfo->TVInfo & SetYPbPrMode1080i )
+            {
+                temp |= 0x10 ;
+
+                if ( !( pVBInfo->VBInfo & SetCRT2ToSVIDEO ) )
+                    temp |= 0x20 ;
+            }
+        }
+        else
+        {
+            temp |= 0x10 ;
+            if ( !( pVBInfo->VBInfo & SetCRT2ToSVIDEO ) )
+                temp |= 0x20 ;
+        }
+    }
+
+    XGINew_SetReg1( pVBInfo->Part2Port , 0x30 , temp ) ;
+
+    if ( pVBInfo->VBType & ( VB_XGI301B | VB_XGI302B | VB_XGI301LV | VB_XGI302LV | VB_XGI301C ) )      /* TV gatingno */
+    {
+        tempbx = pVBInfo->VDE ;
+        tempcx = tempbx - 2 ;
+
+        if ( pVBInfo->VBInfo & SetCRT2ToTV )
+        {
+            if ( !( pVBInfo->TVInfo & ( SetYPbPrMode525p | SetYPbPrMode750p ) ) )
+                tempbx = tempbx >> 1 ;
+        }
+
+        if ( pVBInfo->VBType & ( VB_XGI302LV | VB_XGI301C ) )
+        {
+            temp=0;
+            if( tempcx & 0x0400 )
+                temp |= 0x20 ;
+
+            if ( tempbx & 0x0400 )
+                temp |= 0x40 ;
+
+            XGINew_SetReg1( pVBInfo->Part4Port , 0x10 , temp ) ;
+        }
+
+        temp = ( ( ( tempbx - 3 ) & 0x0300 ) >> 8 ) << 5 ;
+        XGINew_SetReg1( pVBInfo->Part2Port , 0x46 , temp ) ;
+        temp = ( tempbx - 3 ) & 0x00FF ;
+        XGINew_SetReg1( pVBInfo->Part2Port , 0x47 , temp ) ;
+    }
+
+    tempbx = tempbx & 0x00FF ;
+
+    if ( !( modeflag & HalfDCLK ) )
+    {
+        tempcx = pVBInfo->VGAHDE ;
+        if ( tempcx >= pVBInfo->HDE )
+        {
+            tempbx |= 0x2000 ;
+            tempax &= 0x00FF ;
+        }
+    }
+
+    tempcx = 0x0101 ;
+
+    if( pVBInfo->VBInfo & SetCRT2ToTV ) { /*301b*/
+        if(pVBInfo->VGAHDE>=1024)
+        {
+           tempcx=0x1920;
+            if(pVBInfo->VGAHDE>=1280)
+            {
+               tempcx=0x1420;
+               tempbx=tempbx&0xDFFF;
+            }
+        }
+    }
+
+    if ( !( tempbx & 0x2000 ) )
+    {
+        if ( modeflag & HalfDCLK )
+        {
+            tempcx = ( tempcx & 0xFF00 ) | ( ( tempcx & 0x00FF ) << 1 ) ;
+       }
+
+        push1 = tempbx ;
+        tempeax = pVBInfo->VGAHDE ;
+        tempebx = ( tempcx & 0xFF00 ) >> 8 ;
+        longtemp = tempeax * tempebx ;
+        tempecx = tempcx & 0x00FF ;
+        longtemp = longtemp / tempecx ;
+
+       /* 301b */
+        tempecx = 8 * 1024 ;
+
+        if ( pVBInfo->VBType & ( VB_XGI301B | VB_XGI302B | VB_XGI301LV | VB_XGI302LV | VB_XGI301C ) )
+        {
+            tempecx = tempecx * 8 ;
+        }
+
+        longtemp = longtemp * tempecx ;
+        tempecx = pVBInfo->HDE ;
+        temp2 = longtemp % tempecx ;
+        tempeax = longtemp / tempecx ;
+        if ( temp2 != 0 )
+        {
+            tempeax += 1 ;
+        }
+
+        tempax = ( USHORT )tempeax ;
+
+       /* 301b */
+        if ( pVBInfo->VBType & ( VB_XGI301B | VB_XGI302B | VB_XGI301LV | VB_XGI302LV | VB_XGI301C ) )
+        {
+            tempcx = ( ( tempax & 0xFF00 ) >> 5 ) >> 8 ;
+        }
+        /* end 301b */
+
+        tempbx = push1 ;
+        tempbx =( USHORT )( ( ( tempeax & 0x0000FF00 ) & 0x1F00 ) | ( tempbx & 0x00FF ) ) ;
+        tempax =( USHORT )( ( ( tempeax & 0x000000FF ) << 8 ) | ( tempax & 0x00FF ) ) ;
+        temp = ( tempax & 0xFF00 ) >> 8 ;
+    }
+    else
+    {
+        temp = ( tempax & 0x00FF ) >> 8 ;
+    }
+
+    XGINew_SetReg1( pVBInfo->Part2Port , 0x44 , temp ) ;
+    temp = ( tempbx & 0xFF00 ) >> 8 ;
+    XGINew_SetRegANDOR( pVBInfo->Part2Port , 0x45 , ~0x03F , temp ) ;
+    temp = tempcx & 0x00FF ;
+
+    if ( tempbx & 0x2000 )
+        temp = 0 ;
+
+    if ( !( pVBInfo->VBInfo & SetCRT2ToLCD ) )
+        temp |= 0x18 ;
+
+    XGINew_SetRegANDOR(pVBInfo->Part2Port,0x46,~0x1F,temp);
+    if ( pVBInfo->TVInfo & SetPALTV )
+    {
+        tempbx = 0x0382 ;
+        tempcx = 0x007e ;
+    }
+    else
+    {
+        tempbx = 0x0369 ;
+        tempcx = 0x0061 ;
+    }
+
+    temp = tempbx & 0x00FF ;
+    XGINew_SetReg1( pVBInfo->Part2Port , 0x4b , temp ) ;
+    temp = tempcx & 0x00FF ;
+    XGINew_SetReg1( pVBInfo->Part2Port , 0x4c , temp ) ;
+
+    temp = ( ( tempcx & 0xFF00 ) >> 8 ) & 0x03 ;
+    temp = temp << 2 ;
+    temp |= ( ( tempbx & 0xFF00 ) >> 8 ) & 0x03 ;
+
+    if ( pVBInfo->VBInfo & SetCRT2ToYPbPr )
+    {
+        temp |= 0x10 ;
+
+        if ( pVBInfo->TVInfo & SetYPbPrMode525p )
+            temp |= 0x20 ;
+
+        if ( pVBInfo->TVInfo & SetYPbPrMode750p )
+            temp |= 0x60 ;
+    }
+
+    XGINew_SetReg1( pVBInfo->Part2Port , 0x4d , temp ) ;
+    temp=XGINew_GetReg1( pVBInfo->Part2Port , 0x43 ) ;         /* 301b change */
+    XGINew_SetReg1( pVBInfo->Part2Port , 0x43 , ( USHORT )( temp - 3 ) ) ;
+
+    if ( !( pVBInfo->TVInfo & ( SetYPbPrMode525p | SetYPbPrMode750p ) ) )
+    {
+        if ( pVBInfo->TVInfo & NTSC1024x768 )
+        {
+            TimingPoint = XGI_NTSC1024AdjTime ;
+            for( i = 0x1c , j = 0 ; i <= 0x30 ; i++ , j++ )
+            {
+                XGINew_SetReg1( pVBInfo->Part2Port , i , TimingPoint[ j ] ) ;
+            }
+            XGINew_SetReg1( pVBInfo->Part2Port , 0x43 , 0x72 ) ;
+        }
+    }
+
+    /* [ycchen] 01/14/03 Modify for 301C PALM Support */
+    if ( pVBInfo->VBType & VB_XGI301C )
+    {
+        if ( pVBInfo->TVInfo & SetPALMTV )
+           XGINew_SetRegANDOR( pVBInfo->Part2Port , 0x4E , ~0x08 , 0x08 ) ;    /* PALM Mode */
+    }
+
+    if ( pVBInfo->TVInfo & SetPALMTV )
+    {
+        tempax = ( UCHAR )XGINew_GetReg1( pVBInfo->Part2Port , 0x01 ) ;
+        tempax-- ;
+        XGINew_SetRegAND( pVBInfo->Part2Port , 0x01 , tempax ) ;
+
+        /* if ( !( pVBInfo->VBType & VB_XGI301C ) ) */
+        XGINew_SetRegAND( pVBInfo->Part2Port , 0x00 , 0xEF ) ;
+    }
+
+    if ( pVBInfo->VBInfo & SetCRT2ToHiVisionTV )
+    {
+        if ( !( pVBInfo->VBInfo & SetInSlaveMode ) )
+        {
+            XGINew_SetReg1( pVBInfo->Part2Port , 0x0B , 0x00 ) ;
+        }
+    }
+
+    if ( pVBInfo->VBInfo & SetCRT2ToTV )
+    {
+        return ;
+    }
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_SetLCDRegs */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void  XGI_SetLCDRegs(USHORT ModeNo,USHORT ModeIdIndex, PXGI_HW_DEVICE_INFO HwDeviceExtension,USHORT RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo)
+{
+    USHORT push1 ,
+           push2 ,
+           pushbx ,
+           tempax ,
+           tempbx ,
+           tempcx ,
+           temp ,
+           tempah ,
+           tempbh ,
+           tempch ,
+           resinfo ,
+           modeflag ,
+           CRT1Index ;
+
+    XGI_LCDDesStruct *LCDBDesPtr = NULL ;
+
+
+    if ( ModeNo <= 0x13 )
+    {
+        modeflag = pVBInfo->SModeIDTable[ ModeIdIndex ].St_ModeFlag ;  /* si+St_ResInfo */
+        resinfo = pVBInfo->SModeIDTable[ ModeIdIndex ].St_ResInfo ;
+    }
+    else
+    {
+        modeflag = pVBInfo->EModeIDTable[ ModeIdIndex ].Ext_ModeFlag ; /* si+Ext_ResInfo */
+        resinfo = pVBInfo->EModeIDTable[ ModeIdIndex ].Ext_RESINFO ;
+        CRT1Index = pVBInfo->RefIndex[ RefreshRateTableIndex ].Ext_CRT1CRTC ;
+        CRT1Index &= IndexMask ;
+    }
+
+    if ( !( pVBInfo->VBInfo & SetCRT2ToLCD ) )
+    {
+        return ;
+    }
+
+    tempbx = pVBInfo->HDE ;                    /* RHACTE=HDE-1 */
+
+    if ( XGI_IsLCDDualLink( pVBInfo ) )
+        tempbx = tempbx >> 1 ;
+
+    tempbx -= 1 ;
+    temp = tempbx & 0x00FF ;
+    XGINew_SetReg1( pVBInfo->Part2Port , 0x2C , temp ) ;
+    temp = ( tempbx & 0xFF00 ) >> 8 ;
+    temp = temp << 4 ;
+    XGINew_SetRegANDOR( pVBInfo->Part2Port , 0x2B , 0x0F , temp ) ;
+    temp = 0x01 ;
+
+    if ( pVBInfo->LCDResInfo == Panel1280x1024 )
+    {
+        if ( pVBInfo->ModeType == ModeEGA )
+        {
+            if ( pVBInfo->VGAHDE >= 1024 )
+            {
+                temp = 0x02 ;
+                if ( pVBInfo->LCDInfo & LCDVESATiming )
+                    temp = 0x01 ;
+            }
+        }
+    }
+
+    XGINew_SetReg1( pVBInfo->Part2Port , 0x0B , temp ) ;
+    tempbx = pVBInfo->VDE ;                    /* RTVACTEO=(VDE-1)&0xFF */
+    push1 = tempbx ;
+    tempbx-- ;
+    temp = tempbx & 0x00FF ;
+    XGINew_SetReg1( pVBInfo->Part2Port , 0x03 , temp ) ;
+    temp = ( ( tempbx & 0xFF00 ) >> 8 ) & 0x07 ;
+    XGINew_SetRegANDOR( pVBInfo->Part2Port , 0x0C , ~0x07 , temp ) ;
+
+    tempcx = pVBInfo->VT - 1 ;
+    push2 = tempcx + 1 ;
+    temp = tempcx & 0x00FF ;                   /* RVTVT=VT-1 */
+    XGINew_SetReg1( pVBInfo->Part2Port , 0x19 , temp ) ;
+    temp = ( tempcx & 0xFF00 ) >> 8 ;
+    temp = temp << 5 ;
+    XGINew_SetReg1( pVBInfo->Part2Port , 0x1A , temp ) ;
+    XGINew_SetRegANDOR( pVBInfo->Part2Port , 0x09 , 0xF0 , 0x00 ) ;
+    XGINew_SetRegANDOR( pVBInfo->Part2Port , 0x0A , 0xF0 , 0x00 ) ;
+    XGINew_SetRegANDOR( pVBInfo->Part2Port , 0x17 , 0xFB , 0x00 ) ;
+    XGINew_SetRegANDOR( pVBInfo->Part2Port , 0x18 , 0xDF , 0x00 ) ;
+
+    /* Customized LCDB Des no add */
+    tempbx = 5 ;
+    LCDBDesPtr = ( XGI_LCDDesStruct * )XGI_GetLcdPtr( tempbx , ModeNo , ModeIdIndex , RefreshRateTableIndex, pVBInfo ) ;
+    tempah = pVBInfo->LCDResInfo ;
+    tempah &= PanelResInfo ;
+
+    if ( ( tempah == Panel1024x768 ) || ( tempah == Panel1024x768x75 ) )
+    {
+        tempbx = 1024 ;
+        tempcx = 768 ;
+    }
+    else if ( ( tempah == Panel1280x1024 ) || ( tempah == Panel1280x1024x75 ) )
+    {
+        tempbx = 1280 ;
+        tempcx = 1024 ;
+    }
+    else if ( tempah == Panel1400x1050 )
+    {
+        tempbx = 1400 ;
+        tempcx = 1050 ;
+    }
+    else
+    {
+        tempbx = 1600 ;
+        tempcx = 1200 ;
+    }
+
+    if ( pVBInfo->LCDInfo & EnableScalingLCD )
+    {
+        tempbx = pVBInfo->HDE ;
+        tempcx = pVBInfo->VDE ;
+    }
+
+    pushbx = tempbx ;
+    tempax = pVBInfo->VT ;
+    pVBInfo->LCDHDES = LCDBDesPtr->LCDHDES ;
+    pVBInfo->LCDHRS = LCDBDesPtr->LCDHRS ;
+    pVBInfo->LCDVDES = LCDBDesPtr->LCDVDES ;
+    pVBInfo->LCDVRS = LCDBDesPtr->LCDVRS ;
+    tempbx = pVBInfo->LCDVDES ;
+    tempcx += tempbx ;
+
+    if ( tempcx >= tempax )
+        tempcx -= tempax ;     /* lcdvdes */
+
+    temp = tempbx & 0x00FF ;   /* RVEQ1EQ=lcdvdes */
+    XGINew_SetReg1( pVBInfo->Part2Port , 0x05 , temp ) ;
+    temp = tempcx & 0x00FF ;
+    XGINew_SetReg1( pVBInfo->Part2Port , 0x06 , temp ) ;
+    tempch = ( ( tempcx & 0xFF00 ) >> 8 ) & 0x07 ;
+    tempbh = ( ( tempbx & 0xFF00 ) >> 8 ) & 0x07 ;
+    tempah = tempch ;
+    tempah = tempah << 3 ;
+    tempah |= tempbh ;
+    XGINew_SetReg1( pVBInfo->Part2Port , 0x02 , tempah ) ;
+
+    /* getlcdsync() */
+    XGI_GetLCDSync( &tempax , &tempbx,pVBInfo ) ;
+    tempcx = tempbx ;
+    tempax = pVBInfo->VT ;
+    tempbx = pVBInfo->LCDVRS ;
+
+    /* if ( SetLCD_Info & EnableScalingLCD ) */
+    tempcx += tempbx ;
+    if ( tempcx >= tempax )
+        tempcx -= tempax ;
+
+    temp = tempbx & 0x00FF ;   /* RTVACTEE=lcdvrs */
+    XGINew_SetReg1( pVBInfo->Part2Port , 0x04 , temp ) ;
+    temp = ( tempbx & 0xFF00 ) >> 8 ;
+    temp = temp << 4 ;
+    temp |= ( tempcx & 0x000F ) ;
+    XGINew_SetReg1( pVBInfo->Part2Port , 0x01 , temp ) ;
+    tempcx = pushbx ;
+    tempax = pVBInfo->HT ;
+    tempbx = pVBInfo->LCDHDES ;
+    tempbx &= 0x0FFF ;
+
+    if ( XGI_IsLCDDualLink(  pVBInfo ) )
+    {
+        tempax = tempax >> 1 ;
+        tempbx = tempbx >> 1 ;
+        tempcx = tempcx >> 1 ;
+    }
+
+    if ( pVBInfo->VBType & VB_XGI302LV )
+        tempbx += 1 ;
+
+    if ( pVBInfo->VBType & VB_XGI301C )  /* tap4 */
+        tempbx += 1 ;
+
+    tempcx += tempbx ;
+
+    if ( tempcx >= tempax )
+        tempcx -= tempax ;
+
+    temp = tempbx & 0x00FF ;
+    XGINew_SetReg1( pVBInfo->Part2Port , 0x1F , temp ) ;       /* RHBLKE=lcdhdes */
+    temp = ( ( tempbx & 0xFF00 ) >> 8 ) << 4 ;
+    XGINew_SetReg1( pVBInfo->Part2Port , 0x20 , temp ) ;
+    temp = tempcx & 0x00FF ;
+    XGINew_SetReg1( pVBInfo->Part2Port , 0x23 , temp ) ;       /* RHEQPLE=lcdhdee */
+    temp = ( tempcx & 0xFF00 ) >> 8 ;
+    XGINew_SetReg1( pVBInfo->Part2Port , 0x25 , temp ) ;
+
+    /* getlcdsync() */
+    XGI_GetLCDSync( &tempax , &tempbx ,pVBInfo) ;
+    tempcx = tempax ;
+    tempax = pVBInfo->HT ;
+    tempbx = pVBInfo->LCDHRS ;
+    /* if ( SetLCD_Info & EnableScalingLCD) */
+    if ( XGI_IsLCDDualLink( pVBInfo) )
+    {
+        tempax = tempax >> 1 ;
+        tempbx = tempbx >> 1 ;
+        tempcx = tempcx >> 1 ;
+    }
+
+    if ( pVBInfo->VBType & VB_XGI302LV )
+        tempbx += 1 ;
+
+    tempcx += tempbx ;
+
+    if ( tempcx >= tempax )
+        tempcx -= tempax ;
+
+    temp = tempbx & 0x00FF ;   /* RHBURSTS=lcdhrs */
+    XGINew_SetReg1( pVBInfo->Part2Port , 0x1C , temp ) ;
+
+    temp = ( tempbx & 0xFF00 ) >> 8 ;
+    temp = temp << 4 ;
+    XGINew_SetRegANDOR( pVBInfo->Part2Port , 0x1D , ~0x0F0 , temp ) ;
+    temp = tempcx & 0x00FF ;   /* RHSYEXP2S=lcdhre */
+    XGINew_SetReg1( pVBInfo->Part2Port , 0x21 , temp ) ;
+
+    if ( !( pVBInfo->LCDInfo & LCDVESATiming ) )
+    {
+        if ( pVBInfo->VGAVDE == 525 )
+        {
+            if ( pVBInfo->VBType & ( VB_XGI301B | VB_XGI302B | VB_XGI301LV | VB_XGI302LV | VB_XGI301C ) )
+            {
+                temp = 0xC6 ;
+            }
+            else
+                temp = 0xC4 ;
+
+            XGINew_SetReg1( pVBInfo->Part2Port , 0x2f , temp ) ;
+            XGINew_SetReg1( pVBInfo->Part2Port , 0x30 , 0xB3 ) ;
+        }
+
+        if ( pVBInfo->VGAVDE == 420 )
+        {
+            if ( pVBInfo->VBType & ( VB_XGI301B | VB_XGI302B | VB_XGI301LV | VB_XGI302LV | VB_XGI301C ) )
+            {
+                temp = 0x4F ;
+            }
+            else
+                temp = 0x4E ;
+            XGINew_SetReg1( pVBInfo->Part2Port , 0x2f , temp ) ;
+        }
+    }
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_GetTap4Ptr */
+/* Input : */
+/* Output : di -> Tap4 Reg. Setting Pointer */
+/* Description : */
+/* --------------------------------------------------------------------- */
+XGI301C_Tap4TimingStruct* XGI_GetTap4Ptr(USHORT tempcx, PVB_DEVICE_INFO pVBInfo)
+{
+    USHORT tempax ,
+           tempbx ,
+           i ;
+
+    XGI301C_Tap4TimingStruct *Tap4TimingPtr ;
+
+    if ( tempcx == 0 )
+    {
+        tempax = pVBInfo->VGAHDE ;
+        tempbx = pVBInfo->HDE ;
+    }
+    else
+    {
+        tempax = pVBInfo->VGAVDE ;
+        tempbx = pVBInfo->VDE ;
+    }
+
+    if ( tempax < tempbx )
+        return &EnlargeTap4Timing[ 0 ] ;
+    else if( tempax == tempbx )
+        return &NoScaleTap4Timing[ 0 ] ;       /* 1:1 */
+    else
+        Tap4TimingPtr = NTSCTap4Timing ;       /* NTSC */
+
+    if ( pVBInfo->TVInfo & SetPALTV )
+        Tap4TimingPtr = PALTap4Timing ;
+
+
+    if ( pVBInfo->VBInfo & SetCRT2ToYPbPr )
+    {
+        if ( pVBInfo->TVInfo & SetYPbPrMode525i )
+            Tap4TimingPtr = YPbPr525iTap4Timing ;
+        if ( pVBInfo->TVInfo & SetYPbPrMode525p )
+            Tap4TimingPtr = YPbPr525pTap4Timing ;
+        if ( pVBInfo->TVInfo & SetYPbPrMode750p )
+            Tap4TimingPtr = YPbPr750pTap4Timing ;
+    }
+
+    if ( pVBInfo->VBInfo & SetCRT2ToHiVisionTV )
+        Tap4TimingPtr = HiTVTap4Timing ;
+
+    i = 0 ;
+    while( Tap4TimingPtr[ i ].DE != 0xFFFF )
+    {
+        if ( Tap4TimingPtr[ i ].DE == tempax )
+            break ;
+        i++ ;
+    }
+    return &Tap4TimingPtr[ i ] ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_SetTap4Regs */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_SetTap4Regs( PVB_DEVICE_INFO pVBInfo)
+{
+    USHORT i ,
+           j ;
+
+    XGI301C_Tap4TimingStruct *Tap4TimingPtr ;
+
+    if ( !( pVBInfo->VBType & VB_XGI301C ) )
+        return ;
+
+#ifndef Tap4
+    XGINew_SetRegAND( pVBInfo->Part2Port , 0x4E , 0xEB ) ;     /* Disable Tap4 */
+#else            /* Tap4 Setting */
+
+    Tap4TimingPtr = XGI_GetTap4Ptr( 0 , pVBInfo) ;  /* Set Horizontal Scaling */
+    for( i = 0x80 , j = 0 ; i <= 0xBF ; i++ , j++ )
+        XGINew_SetReg1( pVBInfo->Part2Port , i , Tap4TimingPtr->Reg[ j ] ) ;
+
+    if ( ( pVBInfo->VBInfo & SetCRT2ToTV ) && ( !( pVBInfo->VBInfo & SetCRT2ToHiVisionTV ) ) )
+    {
+        Tap4TimingPtr = XGI_GetTap4Ptr( 1 , pVBInfo);  /* Set Vertical Scaling */
+        for( i = 0xC0 , j = 0 ; i < 0xFF ; i++ , j++ )
+            XGINew_SetReg1( pVBInfo->Part2Port , i , Tap4TimingPtr->Reg[ j ] ) ;
+    }
+
+    if ( ( pVBInfo->VBInfo & SetCRT2ToTV ) && ( !( pVBInfo->VBInfo & SetCRT2ToHiVisionTV ) ) )
+        XGINew_SetRegANDOR( pVBInfo->Part2Port , 0x4E , ~0x14 , 0x04 ) ;       /* Enable V.Scaling */
+    else
+        XGINew_SetRegANDOR( pVBInfo->Part2Port , 0x4E , ~0x14 , 0x10 ) ;       /* Enable H.Scaling */
+#endif
+}
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_SetGroup3 */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_SetGroup3(USHORT ModeNo,USHORT ModeIdIndex, PVB_DEVICE_INFO pVBInfo)
+{
+    USHORT i;
+    UCHAR *tempdi;
+    USHORT  modeflag;
+
+    if(ModeNo<=0x13)
+    {
+        modeflag = pVBInfo->SModeIDTable[ModeIdIndex].St_ModeFlag;      /* si+St_ResInfo */
+    }
+    else
+    {
+        modeflag = pVBInfo->EModeIDTable[ModeIdIndex].Ext_ModeFlag;     /* si+Ext_ResInfo */
+    }
+
+
+    XGINew_SetReg1(pVBInfo->Part3Port,0x00,0x00);
+    if(pVBInfo->TVInfo&SetPALTV)
+    {
+        XGINew_SetReg1(pVBInfo->Part3Port,0x13,0xFA);
+        XGINew_SetReg1(pVBInfo->Part3Port,0x14,0xC8);
+    }
+    else
+    {
+        XGINew_SetReg1(pVBInfo->Part3Port,0x13,0xF5);
+        XGINew_SetReg1(pVBInfo->Part3Port,0x14,0xB7);
+    }
+
+    if(!(pVBInfo->VBInfo&SetCRT2ToTV))
+    {
+        return;
+    }
+
+    if(pVBInfo->TVInfo&SetPALMTV)
+    {
+        XGINew_SetReg1(pVBInfo->Part3Port,0x13,0xFA);
+        XGINew_SetReg1(pVBInfo->Part3Port,0x14,0xC8);
+        XGINew_SetReg1(pVBInfo->Part3Port,0x3D,0xA8);
+    }
+
+    if((pVBInfo->VBInfo&SetCRT2ToHiVisionTV)|| (pVBInfo->VBInfo&SetCRT2ToYPbPr))
+    {
+        if(pVBInfo->TVInfo & SetYPbPrMode525i)
+        {
+            return;
+        }
+        tempdi=pVBInfo->HiTVGroup3Data;
+        if(pVBInfo->SetFlag&TVSimuMode)
+        {
+            tempdi=pVBInfo->HiTVGroup3Simu;
+            if(!(modeflag&Charx8Dot))
+            {
+                tempdi=pVBInfo->HiTVGroup3Text;
+            }
+        }
+
+        if(pVBInfo->TVInfo & SetYPbPrMode525p)
+        {
+            tempdi=pVBInfo->Ren525pGroup3;
+        }
+        if(pVBInfo->TVInfo & SetYPbPrMode750p)
+        {
+             tempdi=pVBInfo->Ren750pGroup3;
+        }
+
+        for(i=0;i<=0x3E;i++)
+        {
+            XGINew_SetReg1(pVBInfo->Part3Port,i,tempdi[i]);
+        }
+        if(pVBInfo->VBType&VB_XGI301C)  /* Marcovision */
+        {
+            if(pVBInfo->TVInfo & SetYPbPrMode525p)
+            {
+                XGINew_SetReg1(pVBInfo->Part3Port,0x28,0x3f);
+            }
+        }
+    }
+    return;
+}  /* {end of XGI_SetGroup3} */
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_SetGroup4 */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_SetGroup4(USHORT ModeNo,USHORT ModeIdIndex,USHORT RefreshRateTableIndex,PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo)
+{
+    USHORT tempax ,
+           tempcx ,
+           tempbx ,
+           modeflag ,
+           temp ,
+           temp2 ;
+
+    ULONG tempebx ,
+          tempeax ,
+          templong ;
+
+
+    if ( ModeNo <= 0x13 )
+    {
+        modeflag = pVBInfo->SModeIDTable[ ModeIdIndex ].St_ModeFlag ;  /* si+St_ResInfo */
+    }
+    else
+    {
+        modeflag = pVBInfo->EModeIDTable[ ModeIdIndex ].Ext_ModeFlag ; /* si+Ext_ResInfo */
+    }
+
+    temp = pVBInfo->RVBHCFACT ;
+    XGINew_SetReg1( pVBInfo->Part4Port , 0x13 , temp ) ;
+
+    tempbx = pVBInfo->RVBHCMAX ;
+    temp = tempbx & 0x00FF ;
+    XGINew_SetReg1( pVBInfo->Part4Port , 0x14 , temp ) ;
+    temp2 = ( ( tempbx & 0xFF00 ) >> 8 ) << 7 ;
+    tempcx = pVBInfo->VGAHT - 1 ;
+    temp = tempcx & 0x00FF ;
+    XGINew_SetReg1( pVBInfo->Part4Port , 0x16 , temp ) ;
+
+    temp =( ( tempcx & 0xFF00 ) >> 8 ) << 3 ;
+    temp2 |= temp ;
+
+    tempcx = pVBInfo->VGAVT - 1 ;
+    if ( !( pVBInfo->VBInfo & SetCRT2ToTV ) )
+    {
+        tempcx -= 5 ;
+    }
+
+    temp = tempcx & 0x00FF ;
+    XGINew_SetReg1( pVBInfo->Part4Port , 0x17 , temp ) ;
+    temp = temp2 | ( ( tempcx & 0xFF00 ) >> 8 ) ;
+    XGINew_SetReg1( pVBInfo->Part4Port , 0x15 , temp ) ;
+    XGINew_SetRegOR( pVBInfo->Part4Port , 0x0D , 0x08 ) ;
+    tempcx = pVBInfo->VBInfo ;
+    tempbx = pVBInfo->VGAHDE ;
+
+    if ( modeflag & HalfDCLK )
+    {
+        tempbx = tempbx >> 1 ;
+    }
+
+    if ( XGI_IsLCDDualLink( pVBInfo ) )
+        tempbx = tempbx >> 1 ;
+
+    if(tempcx&SetCRT2ToHiVisionTV)
+    {
+        temp=0;
+        if(tempbx<=1024)
+            temp=0xA0;
+       if(tempbx == 1280)
+          temp = 0xC0;
+    }
+    else if(tempcx&SetCRT2ToTV)
+    {
+         temp=0xA0;
+         if(tempbx <= 800)
+             temp=0x80;
+    }
+    else
+    {
+        temp=0x80;
+        if(pVBInfo->VBInfo&SetCRT2ToLCD)
+        {
+            temp=0;
+            if(tempbx>800)
+                temp=0x60;
+        }
+    }
+
+    if ( pVBInfo->TVInfo & ( SetYPbPrMode525p | SetYPbPrMode750p ) )
+    {
+        temp = 0x00 ;
+        if ( pVBInfo->VGAHDE == 1280 )
+            temp = 0x40 ;
+        if ( pVBInfo->VGAHDE == 1024 )
+           temp = 0x20 ;
+    }
+    XGINew_SetRegANDOR( pVBInfo->Part4Port , 0x0E , ~0xEF , temp ) ;
+
+    tempebx = pVBInfo->VDE ;
+
+    if ( tempcx & SetCRT2ToHiVisionTV )
+    {
+        if ( !( temp & 0xE000 ) )
+            tempbx = tempbx >> 1 ;
+    }
+
+    tempcx = pVBInfo->RVBHRS ;
+    temp = tempcx & 0x00FF ;
+    XGINew_SetReg1( pVBInfo->Part4Port , 0x18 , temp );
+
+    tempeax = pVBInfo->VGAVDE ;
+    tempcx |= 0x04000 ;
+
+
+    if ( tempeax <= tempebx )
+    {
+        tempcx=(tempcx&(~0x4000));
+        tempeax = pVBInfo->VGAVDE ;
+    }
+    else
+    {
+        tempeax -= tempebx ;
+    }
+
+
+    templong = ( tempeax * 256 * 1024 ) % tempebx ;
+    tempeax = ( tempeax * 256 * 1024 ) / tempebx ;
+    tempebx = tempeax ;
+
+    if ( templong != 0 )
+    {
+        tempebx++ ;
+    }
+
+
+    temp = ( USHORT )( tempebx & 0x000000FF ) ;
+    XGINew_SetReg1( pVBInfo->Part4Port , 0x1B , temp ) ;
+
+    temp = ( USHORT )( ( tempebx & 0x0000FF00 ) >> 8 ) ;
+    XGINew_SetReg1( pVBInfo->Part4Port , 0x1A , temp ) ;
+    tempbx = ( USHORT )( tempebx >> 16 ) ;
+    temp = tempbx & 0x00FF ;
+    temp = temp << 4 ;
+    temp |= ( ( tempcx & 0xFF00 ) >> 8 ) ;
+    XGINew_SetReg1( pVBInfo->Part4Port , 0x19 , temp ) ;
+
+    /* 301b */
+    if ( pVBInfo->VBType & ( VB_XGI301B | VB_XGI302B | VB_XGI301LV | VB_XGI302LV | VB_XGI301C ) )
+    {
+        temp = 0x0028 ;
+        XGINew_SetReg1( pVBInfo->Part4Port , 0x1C , temp ) ;
+        tempax = pVBInfo->VGAHDE ;
+        if ( modeflag & HalfDCLK )
+        {
+            tempax = tempax >> 1 ;
+        }
+
+        if ( XGI_IsLCDDualLink( pVBInfo ) )
+            tempax = tempax >> 1 ;
+
+        /* if((pVBInfo->VBInfo&(SetCRT2ToLCD))||((pVBInfo->TVInfo&SetYPbPrMode525p)||(pVBInfo->TVInfo&SetYPbPrMode750p))) { */
+        if ( pVBInfo->VBInfo & SetCRT2ToLCD )
+        {
+            if ( tempax > 800 )
+                tempax -= 800 ;
+        }
+        else
+        {
+            if ( pVBInfo->VGAHDE > 800 )
+            {
+                if ( pVBInfo->VGAHDE == 1024 )
+                    tempax = ( tempax * 25 / 32 ) - 1 ;
+                else
+                    tempax = ( tempax * 20 / 32 ) - 1 ;
+            }
+        }
+        tempax -= 1 ;
+
+/*
+        if ( pVBInfo->VBInfo & ( SetCRT2ToTV | SetCRT2ToHiVisionTV ) )
+        {
+            if ( pVBInfo->VBType & VB_XGI301LV )
+            {
+                if ( !( pVBInfo->TVInfo & ( SetYPbPrMode525p | SetYPbPrMode750p | SetYPbPrMode1080i ) ) )
+                {
+                    if ( pVBInfo->VGAHDE > 800 )
+                    {
+                        if ( pVBInfo->VGAHDE == 1024 )
+                            tempax = ( tempax * 25 / 32 ) - 1 ;
+                        else
+                            tempax = ( tempax * 20 / 32 ) - 1 ;
+                    }
+                }
+            }
+            else
+            {
+                if ( pVBInfo->VGAHDE > 800 )
+                {
+                    if ( pVBInfo->VGAHDE == 1024 )
+                        tempax = ( tempax * 25 / 32 ) - 1 ;
+                    else
+                        tempax = ( tempax * 20 / 32 ) - 1 ;
+                }
+            }
+        }
+*/
+
+        temp = ( tempax & 0xFF00 ) >> 8 ;
+        temp = ( ( temp & 0x0003 ) << 4 ) ;
+        XGINew_SetReg1( pVBInfo->Part4Port , 0x1E , temp ) ;
+        temp = ( tempax & 0x00FF ) ;
+        XGINew_SetReg1( pVBInfo->Part4Port , 0x1D , temp ) ;
+
+        if ( pVBInfo->VBInfo & ( SetCRT2ToTV | SetCRT2ToHiVisionTV ) )
+        {
+            if ( pVBInfo->VGAHDE > 800 )
+            {
+                XGINew_SetRegOR( pVBInfo->Part4Port , 0x1E , 0x08 ) ;
+            }
+        }
+        temp = 0x0036 ;
+
+        if ( pVBInfo->VBInfo & SetCRT2ToTV )
+        {
+            if ( !( pVBInfo->TVInfo & ( NTSC1024x768 | SetYPbPrMode525p | SetYPbPrMode750p | SetYPbPrMode1080i ) ) )
+            {
+                temp |= 0x0001 ;
+                if ( ( pVBInfo->VBInfo & SetInSlaveMode ) && ( !( pVBInfo->TVInfo & TVSimuMode ) ) )
+                    temp &= ( ~0x0001 ) ;
+            }
+        }
+
+        XGINew_SetRegANDOR( pVBInfo->Part4Port , 0x1F , 0x00C0 , temp ) ;
+        tempbx = pVBInfo->HT ;
+        if ( XGI_IsLCDDualLink( pVBInfo ) )
+            tempbx = tempbx >> 1 ;
+        tempbx = ( tempbx >> 1 ) - 2 ;
+        temp = ( ( tempbx & 0x0700 ) >> 8 ) << 3 ;
+        XGINew_SetRegANDOR( pVBInfo->Part4Port , 0x21 , 0x00C0 , temp ) ;
+        temp = tempbx & 0x00FF ;
+        XGINew_SetReg1( pVBInfo->Part4Port , 0x22 , temp ) ;
+    }
+    /* end 301b */
+
+    if ( pVBInfo->ISXPDOS == 0 )
+        XGI_SetCRT2VCLK( ModeNo , ModeIdIndex , RefreshRateTableIndex, pVBInfo ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_SetGroup5 */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_SetGroup5( USHORT ModeNo , USHORT ModeIdIndex , PVB_DEVICE_INFO pVBInfo)
+{
+    USHORT Pindex ,
+           Pdata ;
+
+    Pindex = pVBInfo->Part5Port ;
+    Pdata = pVBInfo->Part5Port + 1 ;
+    if ( pVBInfo->ModeType == ModeVGA )
+    {
+        if ( !( pVBInfo->VBInfo & ( SetInSlaveMode | LoadDACFlag | CRT2DisplayFlag ) ) )
+        {
+            XGINew_EnableCRT2(pVBInfo) ;
+            /* LoadDAC2(pVBInfo->Part5Port,ModeNo,ModeIdIndex); */
+        }
+    }
+    return ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_GetLcdPtr */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void* XGI_GetLcdPtr( USHORT BX , USHORT ModeNo , USHORT ModeIdIndex , USHORT RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo )
+{
+    USHORT i ,
+           tempdx ,
+           tempcx ,
+           tempbx ,
+           tempal ,
+           modeflag ,
+           table ;
+
+    XGI330_LCDDataTablStruct *tempdi = 0 ;
+
+
+    tempbx = BX;
+
+    if ( ModeNo <= 0x13 )
+    {
+        modeflag = pVBInfo->SModeIDTable[ ModeIdIndex ].St_ModeFlag ;
+        tempal = pVBInfo->SModeIDTable[ ModeIdIndex ].St_CRT2CRTC ;
+    }
+    else
+    {
+        modeflag = pVBInfo->EModeIDTable[ ModeIdIndex ].Ext_ModeFlag ;
+        tempal = pVBInfo->RefIndex[ RefreshRateTableIndex ].Ext_CRT2CRTC ;
+    }
+
+    tempal = tempal & 0x0f ;
+
+    if ( tempbx <= 1 )         /* ExpLink */
+    {
+        if ( ModeNo <= 0x13 )
+        {
+            tempal = pVBInfo->SModeIDTable[ ModeIdIndex ].St_CRT2CRTC ; /* find no Ext_CRT2CRTC2 */
+        }
+        else
+        {
+            tempal= pVBInfo->RefIndex[ RefreshRateTableIndex ].Ext_CRT2CRTC ;
+        }
+
+        if ( pVBInfo->VBInfo & SetCRT2ToLCDA )
+        {
+            if ( ModeNo <= 0x13 )
+                tempal = pVBInfo->SModeIDTable[ ModeIdIndex ].St_CRT2CRTC2 ;
+            else
+                tempal= pVBInfo->RefIndex[ RefreshRateTableIndex ].Ext_CRT2CRTC2 ;
+        }
+
+        if ( tempbx & 0x01 )
+            tempal = ( tempal >> 4 ) ;
+
+        tempal = ( tempal & 0x0f ) ;
+    }
+
+    tempcx = LCDLenList[ tempbx ] ;    /* mov cl,byte ptr cs:LCDLenList[bx] */
+
+    if ( pVBInfo->LCDInfo & EnableScalingLCD ) /* ScaleLCD */
+    {
+        if ( ( tempbx == 5 ) || ( tempbx ) == 7 )
+            tempcx = LCDDesDataLen2 ;
+        else if ( ( tempbx == 3 ) || ( tempbx == 8 ) )
+            tempcx = LVDSDesDataLen2 ;
+    }
+    /* mov di, word ptr cs:LCDDataList[bx] */
+    /* tempdi=pVideoMemory[LCDDataList+tempbx*2]|(pVideoMemory[LCDDataList+tempbx*2+1]<<8); */
+
+    switch( tempbx )
+    {
+        case 0:
+            tempdi = XGI_EPLLCDCRT1Ptr_H ;
+            break ;
+        case 1:
+            tempdi = XGI_EPLLCDCRT1Ptr_V ;
+             break ;
+        case 2:
+            tempdi = XGI_EPLLCDDataPtr ;
+            break ;
+        case 3:
+            tempdi = XGI_EPLLCDDesDataPtr ;
+            break ;
+        case 4:
+            tempdi = XGI_LCDDataTable ;
+            break ;
+        case 5:
+            tempdi = XGI_LCDDesDataTable ;
+            break ;
+        case 6:
+            tempdi = XGI_EPLCHLCDRegPtr ;
+            break ;
+        case 7:
+        case 8:
+        case 9:
+            tempdi = 0 ;
+            break ;
+        default:
+        break ;
+    }
+
+    if ( tempdi == 0x00 )  /* OEMUtil */
+        return 0 ;
+
+    table = tempbx ;
+    i = 0 ;
+
+    while( tempdi[ i ].PANELID != 0xff )
+    {
+        tempdx = pVBInfo->LCDResInfo ;
+        if ( tempbx & 0x0080 )     /* OEMUtil */
+        {
+            tempbx &= ( ~0x0080 ) ;
+            tempdx = pVBInfo->LCDTypeInfo ;
+        }
+
+        if ( pVBInfo->LCDInfo & EnableScalingLCD )
+        tempdx &= ( ~PanelResInfo ) ;
+
+        if ( tempdi[ i ].PANELID == tempdx )
+        {
+            tempbx = tempdi[ i ].MASK ;
+            tempdx = pVBInfo->LCDInfo ;
+
+            if ( ModeNo <= 0x13 )         /* alan 09/10/2003 */
+                tempdx |= SetLCDStdMode ;
+
+            if ( modeflag & HalfDCLK )
+                tempdx |= SetLCDLowResolution ;
+
+            tempbx &= tempdx;
+            if ( tempbx == tempdi[ i ].CAP )
+                break ;
+        }
+        i++ ;
+    }
+
+    if ( table == 0 )
+    {
+        switch( tempdi[ i ].DATAPTR )
+        {
+            case 0:
+                return &XGI_LVDSCRT11024x768_1_H[ tempal ] ;
+                break ;
+            case 1:
+                return &XGI_LVDSCRT11024x768_2_H[ tempal ] ;
+                break ;
+            case 2:
+                return &XGI_LVDSCRT11280x1024_1_H[ tempal ] ;
+                break ;
+            case 3:
+                return &XGI_LVDSCRT11280x1024_2_H[ tempal ] ;
+                break ;
+            case 4:
+                return &XGI_LVDSCRT11400x1050_1_H[ tempal ] ;
+                break ;
+            case 5:
+                return &XGI_LVDSCRT11400x1050_2_H[ tempal ] ;
+                break ;
+            case 6:
+                return &XGI_LVDSCRT11600x1200_1_H[ tempal ] ;
+                break ;
+            case 7:
+                return &XGI_LVDSCRT11024x768_1_Hx75[ tempal ] ;
+                break ;
+            case 8:
+                return &XGI_LVDSCRT11024x768_2_Hx75[ tempal ] ;
+                break ;
+            case 9:
+                return &XGI_LVDSCRT11280x1024_1_Hx75[ tempal ] ;
+                break ;
+            case 10:
+                return &XGI_LVDSCRT11280x1024_2_Hx75[ tempal ] ;
+                break ;
+            default:
+                break ;
+        }
+    }
+    else if ( table == 1 )
+    {
+        switch( tempdi[ i ].DATAPTR )
+        {
+            case 0:
+                return &XGI_LVDSCRT11024x768_1_V[ tempal ] ;
+                break ;
+            case 1:
+                return &XGI_LVDSCRT11024x768_2_V[ tempal ] ;
+                break ;
+            case 2:
+                return &XGI_LVDSCRT11280x1024_1_V[ tempal ] ;
+                break ;
+            case 3:
+                return &XGI_LVDSCRT11280x1024_2_V[ tempal ] ;
+                break ;
+            case 4:
+                return &XGI_LVDSCRT11400x1050_1_V[ tempal ] ;
+                break ;
+            case 5:
+                return &XGI_LVDSCRT11400x1050_2_V[ tempal ] ;
+                break ;
+            case 6:
+                return &XGI_LVDSCRT11600x1200_1_V[ tempal ] ;
+                break ;
+            case 7:
+                return &XGI_LVDSCRT11024x768_1_Vx75[ tempal ] ;
+                break ;
+            case 8:
+                return &XGI_LVDSCRT11024x768_2_Vx75[ tempal ] ;
+                break ;
+            case 9:
+                return &XGI_LVDSCRT11280x1024_1_Vx75[ tempal ] ;
+                break ;
+            case 10:
+                return &XGI_LVDSCRT11280x1024_2_Vx75[ tempal ] ;
+                break ;
+            default:
+                break ;
+        }
+    }
+    else if ( table == 2 )
+    {
+        switch( tempdi[ i ].DATAPTR )
+        {
+            case 0:
+                return &XGI_LVDS1024x768Data_1[ tempal ] ;
+                break ;
+            case 1:
+                return &XGI_LVDS1024x768Data_2[ tempal ] ;
+                break ;
+            case 2:
+                return &XGI_LVDS1280x1024Data_1[ tempal ] ;
+                break ;
+            case 3:
+                return &XGI_LVDS1280x1024Data_2[ tempal ] ;
+                break ;
+            case 4:
+                return &XGI_LVDS1400x1050Data_1[ tempal ] ;
+                break ;
+            case 5:
+                return &XGI_LVDS1400x1050Data_2[ tempal ] ;
+                break ;
+            case 6:
+                return &XGI_LVDS1600x1200Data_1[ tempal ] ;
+                break ;
+            case 7:
+                return &XGI_LVDSNoScalingData[ tempal ] ;
+                break ;
+            case 8:
+                return &XGI_LVDS1024x768Data_1x75[ tempal ] ;
+                break ;
+            case 9:
+                return &XGI_LVDS1024x768Data_2x75[ tempal ] ;
+                break ;
+            case 10:
+                return &XGI_LVDS1280x1024Data_1x75[ tempal ] ;
+                break ;
+            case 11:
+                return &XGI_LVDS1280x1024Data_2x75[ tempal ] ;
+                break ;
+            case 12:
+                return &XGI_LVDSNoScalingDatax75[ tempal ] ;
+                break ;
+            default:
+                break ;
+        }
+    }
+    else if ( table == 3 )
+    {
+        switch( tempdi[ i ].DATAPTR )
+        {
+            case 0:
+                return &XGI_LVDS1024x768Des_1[ tempal ] ;
+                break ;
+            case 1:
+                return &XGI_LVDS1024x768Des_3[ tempal ] ;
+                break ;
+            case 2:
+                return &XGI_LVDS1024x768Des_2[ tempal ] ;
+                break ;
+            case 3:
+                return &XGI_LVDS1280x1024Des_1[ tempal ] ;
+                break ;
+            case 4:
+                return &XGI_LVDS1280x1024Des_2[ tempal ] ;
+                break ;
+            case 5:
+                return &XGI_LVDS1400x1050Des_1[ tempal ] ;
+                break ;
+            case 6:
+                return &XGI_LVDS1400x1050Des_2[ tempal ] ;
+                break ;
+            case 7:
+                return &XGI_LVDS1600x1200Des_1[ tempal ] ;
+                break ;
+            case 8:
+                return &XGI_LVDSNoScalingDesData[ tempal ] ;
+                break ;
+            case 9:
+                return &XGI_LVDS1024x768Des_1x75[ tempal ] ;
+                break ;
+            case 10:
+                return &XGI_LVDS1024x768Des_3x75[ tempal ] ;
+                break ;
+            case 11:
+                return &XGI_LVDS1024x768Des_2x75[ tempal ] ;
+                break;
+            case 12:
+                return &XGI_LVDS1280x1024Des_1x75[ tempal ] ;
+                break ;
+            case 13:
+                return &XGI_LVDS1280x1024Des_2x75[ tempal ] ;
+                break ;
+            case 14:
+                return &XGI_LVDSNoScalingDesDatax75[ tempal ] ;
+                break ;
+            default:
+                break ;
+        }
+    }
+    else if ( table == 4 )
+    {
+        switch( tempdi[ i ].DATAPTR )
+        {
+            case 0:
+                return &XGI_ExtLCD1024x768Data[ tempal ] ;
+                break ;
+            case 1:
+                return &XGI_StLCD1024x768Data[ tempal ] ;
+                break ;
+            case 2:
+                return &XGI_CetLCD1024x768Data[ tempal ] ;
+                break ;
+            case 3:
+                return &XGI_ExtLCD1280x1024Data[ tempal ] ;
+                break ;
+            case 4:
+                return &XGI_StLCD1280x1024Data[ tempal ] ;
+                break ;
+            case 5:
+                return &XGI_CetLCD1280x1024Data[ tempal ] ;
+                break ;
+            case 6:
+                return &XGI_ExtLCD1400x1050Data[ tempal ] ;
+                break ;
+            case 7:
+                return &XGI_StLCD1400x1050Data[ tempal ] ;
+                break ;
+            case 8:
+                return &XGI_CetLCD1400x1050Data[ tempal ] ;
+                break ;
+            case 9:
+                return &XGI_ExtLCD1600x1200Data[ tempal ] ;
+                break  ;
+            case 10:
+                return &XGI_StLCD1600x1200Data[ tempal ] ;
+                break ;
+            case 11:
+                return &XGI_NoScalingData[ tempal ] ;
+                break ;
+            case 12:
+                return &XGI_ExtLCD1024x768x75Data[ tempal ] ;
+                break ;
+            case 13:
+                return &XGI_ExtLCD1024x768x75Data[ tempal ] ;
+                break ;
+            case 14:
+                return &XGI_CetLCD1024x768x75Data[ tempal ] ;
+                break ;
+            case 15:
+                 return &XGI_ExtLCD1280x1024x75Data[ tempal ] ;
+                break ;
+            case 16:
+                return &XGI_StLCD1280x1024x75Data[ tempal ] ;
+                break;
+            case 17:
+                return &XGI_CetLCD1280x1024x75Data[ tempal ] ;
+                break;
+            case 18:
+                return &XGI_NoScalingDatax75[ tempal ] ;
+                break ;
+            default:
+                break ;
+        }
+    }
+    else if ( table == 5 )
+    {
+        switch( tempdi[ i ].DATAPTR )
+        {
+            case 0:
+                return &XGI_ExtLCDDes1024x768Data[ tempal ] ;
+                break ;
+            case 1:
+                return &XGI_StLCDDes1024x768Data[ tempal ] ;
+                break ;
+            case 2:
+                return &XGI_CetLCDDes1024x768Data[ tempal ] ;
+                break ;
+            case 3:
+                if ( ( pVBInfo->VBType & VB_XGI301LV ) || ( pVBInfo->VBType & VB_XGI302LV ) )
+                    return &XGI_ExtLCDDLDes1280x1024Data[ tempal ] ;
+                else
+                    return &XGI_ExtLCDDes1280x1024Data[ tempal ] ;
+                break ;
+            case 4:
+                if ( ( pVBInfo->VBType & VB_XGI301LV ) || ( pVBInfo->VBType & VB_XGI302LV ) )
+                    return &XGI_StLCDDLDes1280x1024Data[ tempal ] ;
+                else
+                    return &XGI_StLCDDes1280x1024Data[ tempal ] ;
+                break ;
+            case 5:
+                if ( ( pVBInfo->VBType & VB_XGI301LV ) || ( pVBInfo->VBType & VB_XGI302LV ) )
+                    return &XGI_CetLCDDLDes1280x1024Data[ tempal ] ;
+                else
+                    return &XGI_CetLCDDes1280x1024Data[ tempal ] ;
+                break ;
+            case 6:
+                if ( ( pVBInfo->VBType & VB_XGI301LV ) || ( pVBInfo->VBType & VB_XGI302LV ) )
+                    return &XGI_ExtLCDDLDes1400x1050Data[ tempal ] ;
+                else
+                    return &XGI_ExtLCDDes1400x1050Data[ tempal ] ;
+                break ;
+            case 7:
+                if ( ( pVBInfo->VBType & VB_XGI301LV ) || ( pVBInfo->VBType & VB_XGI302LV ) )
+                    return &XGI_StLCDDLDes1400x1050Data[ tempal ] ;
+                else
+                    return &XGI_StLCDDes1400x1050Data[ tempal ] ;
+                break ;
+            case 8:
+                return &XGI_CetLCDDes1400x1050Data[ tempal ] ;
+                break ;
+            case 9:
+                return &XGI_CetLCDDes1400x1050Data2[ tempal ] ;
+                break ;
+            case 10:
+                if ( ( pVBInfo->VBType & VB_XGI301LV ) || ( pVBInfo->VBType & VB_XGI302LV ) )
+                    return &XGI_ExtLCDDLDes1600x1200Data[ tempal ] ;
+                else
+                    return &XGI_ExtLCDDes1600x1200Data[ tempal ] ;
+                break ;
+            case 11:
+                if ( ( pVBInfo->VBType & VB_XGI301LV ) || ( pVBInfo->VBType & VB_XGI302LV ) )
+                    return &XGI_StLCDDLDes1600x1200Data[ tempal ] ;
+                else
+                    return &XGI_StLCDDes1600x1200Data[ tempal ] ;
+                break ;
+            case 12:
+                return &XGI_NoScalingDesData[ tempal ] ;
+                break;
+            case 13:
+                return &XGI_ExtLCDDes1024x768x75Data[ tempal ] ;
+                break ;
+            case 14:
+                return &XGI_StLCDDes1024x768x75Data[ tempal ] ;
+                break ;
+            case 15:
+                return &XGI_CetLCDDes1024x768x75Data[ tempal ] ;
+                break ;
+            case 16:
+                if ( ( pVBInfo->VBType & VB_XGI301LV ) || ( pVBInfo->VBType & VB_XGI302LV ) )
+                    return &XGI_ExtLCDDLDes1280x1024x75Data[ tempal ] ;
+                else
+                    return &XGI_ExtLCDDes1280x1024x75Data[ tempal ] ;
+                break ;
+            case 17:
+                if ( ( pVBInfo->VBType & VB_XGI301LV ) || ( pVBInfo->VBType & VB_XGI302LV ) )
+                    return &XGI_StLCDDLDes1280x1024x75Data[ tempal ] ;
+                else
+                    return &XGI_StLCDDes1280x1024x75Data[ tempal ] ;
+                break ;
+            case 18:
+                if ( ( pVBInfo->VBType & VB_XGI301LV ) || ( pVBInfo->VBType & VB_XGI302LV ) )
+                    return &XGI_CetLCDDLDes1280x1024x75Data[ tempal ] ;
+                else
+                    return &XGI_CetLCDDes1280x1024x75Data[ tempal ] ;
+                break ;
+            case 19:
+                return &XGI_NoScalingDesDatax75[ tempal ] ;
+                break ;
+            default:
+                break ;
+        }
+    }
+    else if ( table == 6 )
+    {
+        switch( tempdi[ i ].DATAPTR )
+        {
+            case 0:
+                return &XGI_CH7017LV1024x768[ tempal ] ;
+                break ;
+            case 1:
+                return &XGI_CH7017LV1400x1050[ tempal ] ;
+                break ;
+            default:
+                break ;
+        }
+    }
+    return 0 ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_GetTVPtr */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void* XGI_GetTVPtr (USHORT BX,USHORT ModeNo,USHORT ModeIdIndex,USHORT RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo )
+{
+    USHORT i , tempdx , tempbx , tempal , modeflag , table ;
+    XGI330_TVDataTablStruct *tempdi = 0 ;
+
+    tempbx = BX ;
+
+    if ( ModeNo <= 0x13 )
+    {
+        modeflag = pVBInfo->SModeIDTable[ ModeIdIndex ].St_ModeFlag ;
+        tempal = pVBInfo->SModeIDTable[ ModeIdIndex ].St_CRT2CRTC ;
+    }
+    else
+    {
+        modeflag = pVBInfo->EModeIDTable[ ModeIdIndex ].Ext_ModeFlag ;
+        tempal = pVBInfo->RefIndex[ RefreshRateTableIndex ].Ext_CRT2CRTC ;
+    }
+
+    tempal = tempal & 0x3f ;
+    table = tempbx ;
+
+    switch( tempbx )
+    {
+        case 0:
+            tempdi = 0 ;       /*EPLCHTVCRT1Ptr_H;*/
+            if ( pVBInfo->IF_DEF_CH7007 == 1 )
+            {
+                tempdi = XGI_EPLCHTVCRT1Ptr;
+            }
+            break ;
+        case 1:
+            tempdi = 0 ;       /*EPLCHTVCRT1Ptr_V;*/
+            if ( pVBInfo->IF_DEF_CH7007 == 1 )
+            {
+                tempdi = XGI_EPLCHTVCRT1Ptr;
+            }
+            break ;
+        case 2:
+            tempdi = XGI_EPLCHTVDataPtr ;
+            break ;
+        case 3:
+            tempdi = 0 ;
+            break ;
+        case 4:
+            tempdi = XGI_TVDataTable ;
+            break ;
+        case 5:
+            tempdi = 0 ;
+            break ;
+        case 6:
+            tempdi = XGI_EPLCHTVRegPtr ;
+            break ;
+        default:
+            break ;
+    }
+
+    if ( tempdi == 0x00 )  /* OEMUtil */
+        return( 0 ) ;
+
+    tempdx = pVBInfo->TVInfo ;
+
+    if ( pVBInfo->VBInfo & SetInSlaveMode )
+        tempdx = tempdx | SetTVLockMode ;
+
+    if ( modeflag & HalfDCLK )
+        tempdx = tempdx | SetTVLowResolution ;
+
+    i = 0 ;
+
+    while( tempdi[ i ].MASK != 0xffff )
+    {
+        if ( ( tempdx & tempdi[ i ].MASK ) == tempdi[ i ].CAP )
+            break ;
+        i++ ;
+    }
+
+    if ( table == 0x00 ) /* 07/05/22 */
+    {
+#ifdef WIN2000
+        if ( pVBInfo->IF_DEF_CH7007 == 1 )
+        {
+          switch( tempdi[ i ].DATAPTR )
+          {
+            case 0:
+                return &CH7007TVCRT1UNTSC_H[ tempal ] ;
+                break ;
+            case 1:
+                return &CH7007TVCRT1ONTSC_H[ tempal ] ;
+                break ;
+            case 2:
+                return &CH7007TVCRT1UPAL_H[ tempal ] ;
+                break ;
+            case 3:
+                return &CH7007TVCRT1OPAL_H[ tempal ] ;
+                break ;
+            default:
+                break ;
+          }
+        }
+#endif
+    }
+    else if ( table == 0x01 )
+    {
+#ifdef WIN2000
+        if ( pVBInfo->IF_DEF_CH7007 == 1 )
+        {
+          switch( tempdi[ i ].DATAPTR )
+          {
+            case 0:
+                return &CH7007TVCRT1UNTSC_V[ tempal ] ;
+                break ;
+            case 1:
+                return &CH7007TVCRT1ONTSC_V[ tempal ] ;
+                break ;
+            case 2:
+                return &CH7007TVCRT1UPAL_V[ tempal ] ;
+                break ;
+            case 3:
+                return &CH7007TVCRT1OPAL_V[ tempal ] ;
+                break ;
+            default:
+                break ;
+          }
+        }
+#endif
+    }
+    else if ( table == 0x04 )
+    {
+        switch( tempdi[ i ].DATAPTR )
+        {
+            case 0:
+                return &XGI_ExtPALData[ tempal ] ;
+               break ;
+            case 1:
+                return &XGI_ExtNTSCData[ tempal ] ;
+               break ;
+           case 2:
+               return &XGI_StPALData[ tempal ] ;
+               break ;
+            case 3:
+               return &XGI_StNTSCData[ tempal ] ;
+               break ;
+           case 4:
+               return &XGI_ExtHiTVData[ tempal ] ;
+               break ;
+           case 5:
+               return &XGI_St2HiTVData[ tempal ] ;
+               break ;
+           case 6:
+               return &XGI_ExtYPbPr525iData[ tempal ] ;
+               break ;
+           case 7:
+               return &XGI_ExtYPbPr525pData[ tempal ] ;
+               break ;
+           case 8:
+               return &XGI_ExtYPbPr750pData[ tempal ] ;
+               break ;
+           case 9:
+               return &XGI_StYPbPr525iData[ tempal ] ;
+               break ;
+           case 10:
+               return &XGI_StYPbPr525pData[ tempal ] ;
+               break ;
+           case 11:
+               return &XGI_StYPbPr750pData[ tempal ] ;
+               break;
+            case 12:   /* avoid system hang */
+               return &XGI_ExtNTSCData[ tempal ] ;
+               break ;
+            case 13:
+               return &XGI_St1HiTVData[ tempal ] ;
+               break ;
+            default:
+                break ;
+        }
+    }
+    else if( table == 0x02 )
+    {
+        switch( tempdi[ i ].DATAPTR )
+        {
+            case 0:
+                return &XGI_CHTVUNTSCData[ tempal ] ;
+                break ;
+            case 1:
+               return &XGI_CHTVONTSCData[ tempal ] ;
+                break ;
+            case 2:
+                return &XGI_CHTVUPALData[ tempal ] ;
+                break ;
+            case 3:
+                return &XGI_CHTVOPALData[ tempal ] ;
+                break ;
+            default:
+                break ;
+        }
+    }
+    else if( table == 0x06 )
+    {
+#ifdef WIN2000
+        if ( pVBInfo->IF_DEF_CH7007 == 1 )
+        {
+          /* VideoDebugPrint((0, "XGI_GetTVPtr: pVBInfo->IF_DEF_CH7007==1\n")); */
+          switch( tempdi[ i ].DATAPTR )
+          {
+            case 0:
+                return &CH7007TVReg_UNTSC[ tempal ] ;
+                break ;
+            case 1:
+                return &CH7007TVReg_ONTSC[ tempal ] ;
+                break ;
+            case 2:
+                return &CH7007TVReg_UPAL[ tempal ] ;
+                break ;
+            case 3:
+                return &CH7007TVReg_OPAL[ tempal ] ;
+                break ;
+            default:
+                break ;
+          }
+        }
+        else
+        {
+            switch( tempdi[ i ].DATAPTR )
+            {
+              case 0:
+                return &XGI_CHTVRegUNTSC[ tempal ] ;
+                break ;
+              case 1:
+                return &XGI_CHTVRegONTSC[ tempal ] ;
+                break ;
+              case 2:
+                return &XGI_CHTVRegUPAL[ tempal ] ;
+                break ;
+              case 3:
+                return &XGI_CHTVRegOPAL[ tempal ] ;
+                break ;
+              default:
+                break ;
+            }
+        }
+#endif
+    }
+    return( 0 ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_BacklightByDrv */
+/* Input : */
+/* Output : TRUE -> Skip backlight control */
+/* Description : */
+/* --------------------------------------------------------------------- */
+BOOLEAN XGI_BacklightByDrv( PVB_DEVICE_INFO pVBInfo )
+{
+    UCHAR tempah ;
+
+    tempah = ( UCHAR )XGINew_GetReg1( pVBInfo->P3d4 , 0x3A ) ;
+    if ( tempah & BacklightControlBit )
+        return TRUE ;
+    else
+        return FALSE ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_FirePWDDisable */
+/* Input : */
+/* Output : */
+/* Description : Turn off VDD & Backlight : Fire disable procedure */
+/* --------------------------------------------------------------------- */
+/*
+void XGI_FirePWDDisable( PVB_DEVICE_INFO pVBInfo )
+{
+    XGINew_SetRegANDOR( pVBInfo->Part1Port , 0x26 , 0x00 , 0xFC ) ;
+}
+*/
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_FirePWDEnable */
+/* Input : */
+/* Output : */
+/* Description : Turn on VDD & Backlight : Fire enable procedure */
+/* --------------------------------------------------------------------- */
+void XGI_FirePWDEnable(PVB_DEVICE_INFO pVBInfo )
+{
+    XGINew_SetRegANDOR( pVBInfo->Part1Port , 0x26 , 0x03 , 0xFC ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_EnableGatingCRT */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_EnableGatingCRT(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo)
+{
+    XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x63 , 0xBF , 0x40 ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_DisableGatingCRT */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_DisableGatingCRT(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo)
+{
+
+    XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x63 , 0xBF , 0x00 ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_SetPanelDelay */
+/* Input : */
+/* Output : */
+/* Description : */
+/* I/P : bl : 1 ; T1 : the duration between CPL on and signal on */
+/* : bl : 2 ; T2 : the duration signal on and Vdd on */
+/* : bl : 3 ; T3 : the duration between CPL off and signal off */
+/* : bl : 4 ; T4 : the duration signal off and Vdd off */
+/* --------------------------------------------------------------------- */
+void XGI_SetPanelDelay(USHORT tempbl, PVB_DEVICE_INFO pVBInfo)
+{
+    USHORT index ;
+
+    index = XGI_GetLCDCapPtr(pVBInfo) ;
+
+    if ( tempbl == 1 )
+        XGINew_LCD_Wait_Time( pVBInfo->LCDCapList[ index ].PSC_S1, pVBInfo ) ;
+
+    if ( tempbl == 2 )
+        XGINew_LCD_Wait_Time( pVBInfo->LCDCapList[ index ].PSC_S2, pVBInfo ) ;
+
+    if ( tempbl == 3 )
+        XGINew_LCD_Wait_Time( pVBInfo->LCDCapList[ index ].PSC_S3, pVBInfo ) ;
+
+    if ( tempbl == 4 )
+        XGINew_LCD_Wait_Time( pVBInfo->LCDCapList[ index ].PSC_S4, pVBInfo ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_SetPanelPower */
+/* Input : */
+/* Output : */
+/* Description : */
+/* I/O : ah = 0011b = 03h ; Backlight on, Power on */
+/* = 0111b = 07h ; Backlight on, Power off */
+/* = 1011b = 0Bh ; Backlight off, Power on */
+/* = 1111b = 0Fh ; Backlight off, Power off */
+/* --------------------------------------------------------------------- */
+void XGI_SetPanelPower(USHORT tempah,USHORT tempbl, PVB_DEVICE_INFO pVBInfo)
+{
+    if ( pVBInfo->VBType & ( VB_XGI301LV | VB_XGI302LV | VB_XGI301C ) )
+        XGINew_SetRegANDOR( pVBInfo->Part4Port , 0x26 , tempbl , tempah ) ;
+    else
+        XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x11 , tempbl , tempah ) ;
+}
+
+UCHAR XG21GPIODataTransfer(UCHAR ujDate)
+{
+    UCHAR  ujRet = 0;
+    UCHAR  i = 0;
+
+    for (i=0; i<8; i++)
+       {
+       ujRet = ujRet << 1;
+       /* ujRet |= GETBITS(ujDate >> i, 0:0); */
+        ujRet |= (ujDate >> i) & 1;
+    }
+
+       return ujRet;
+}
+
+/*----------------------------------------------------------------------------*/
+/* output                                                                     */
+/*      bl[5] : LVDS signal                                                   */
+/*      bl[1] : LVDS backlight                                                */
+/*      bl[0] : LVDS VDD                                                      */
+/*----------------------------------------------------------------------------*/
+UCHAR XGI_XG21GetPSCValue(PVB_DEVICE_INFO pVBInfo)
+{
+    UCHAR CR4A,temp;
+
+    CR4A = XGINew_GetReg1( pVBInfo->P3d4 , 0x4A ) ;
+    XGINew_SetRegAND( pVBInfo->P3d4 , 0x4A , ~0x23 ) ; /* enable GPIO write */
+
+    temp = XGINew_GetReg1( pVBInfo->P3d4 , 0x48 ) ;
+
+    temp = XG21GPIODataTransfer(temp);
+    temp &= 0x23;
+    XGINew_SetReg1( pVBInfo->P3d4 , 0x4A , CR4A ) ;
+    return temp;
+}
+
+/*----------------------------------------------------------------------------*/
+/* output                                                                     */
+/*      bl[5] : LVDS signal                                                   */
+/*      bl[1] : LVDS backlight                                                */
+/*      bl[0] : LVDS VDD                                                      */
+/*----------------------------------------------------------------------------*/
+UCHAR XGI_XG27GetPSCValue(PVB_DEVICE_INFO pVBInfo)
+{
+    UCHAR CR4A,CRB4,temp;
+
+    CR4A = XGINew_GetReg1( pVBInfo->P3d4 , 0x4A ) ;
+    XGINew_SetRegAND( pVBInfo->P3d4 , 0x4A , ~0x0C ) ; /* enable GPIO write */
+
+    temp = XGINew_GetReg1( pVBInfo->P3d4 , 0x48 ) ;
+
+    temp &= 0x0C;
+    temp >>= 2;
+    XGINew_SetReg1( pVBInfo->P3d4 , 0x4A , CR4A ) ;
+    CRB4 = XGINew_GetReg1( pVBInfo->P3d4 , 0xB4 ) ;
+    temp |= ((CRB4&0x04)<<3);
+    return temp;
+}
+/*----------------------------------------------------------------------------*/
+/* input                                                                      */
+/*      bl[5] : 1;LVDS signal on                                              */
+/*      bl[1] : 1;LVDS backlight on                                           */
+/*      bl[0] : 1:LVDS VDD on                                                 */
+/*      bh: 100000b : clear bit 5, to set bit5                                */
+/*          000010b : clear bit 1, to set bit1                                */
+/*          000001b : clear bit 0, to set bit0                                */
+/*----------------------------------------------------------------------------*/
+void XGI_XG21BLSignalVDD(USHORT tempbh,USHORT tempbl, PVB_DEVICE_INFO pVBInfo)
+{
+    UCHAR CR4A,temp;
+
+    CR4A = XGINew_GetReg1( pVBInfo->P3d4 , 0x4A ) ;
+    tempbh &= 0x23;
+    tempbl &= 0x23;
+    XGINew_SetRegAND( pVBInfo->P3d4 , 0x4A , ~tempbh ) ; /* enable GPIO write */
+
+    if (tempbh&0x20)
+    {
+      temp = (tempbl>>4)&0x02;
+
+      XGINew_SetRegANDOR( pVBInfo->P3d4 , 0xB4 , ~0x02 , temp) ; /* CR B4[1] */
+
+    }
+
+    temp = XGINew_GetReg1( pVBInfo->P3d4 , 0x48 ) ;
+
+    temp = XG21GPIODataTransfer(temp);
+    temp &= ~tempbh;
+    temp |= tempbl;
+    XGINew_SetReg1( pVBInfo->P3d4 , 0x48 , temp ) ;
+}
+
+void XGI_XG27BLSignalVDD(USHORT tempbh,USHORT tempbl, PVB_DEVICE_INFO pVBInfo)
+{
+    UCHAR CR4A,temp;
+    USHORT tempbh0,tempbl0;
+
+    tempbh0 = tempbh;
+    tempbl0 = tempbl;
+    tempbh0 &= 0x20;
+    tempbl0 &= 0x20;
+    tempbh0 >>= 3;
+    tempbl0 >>= 3;
+
+    if (tempbh&0x20)
+    {
+      temp = (tempbl>>4)&0x02;
+
+      XGINew_SetRegANDOR( pVBInfo->P3d4 , 0xB4 , ~0x02 , temp) ; /* CR B4[1] */
+
+    }
+    XGINew_SetRegANDOR( pVBInfo->P3d4 , 0xB4 , ~tempbh0 , tempbl0 ) ;
+
+    CR4A = XGINew_GetReg1( pVBInfo->P3d4 , 0x4A ) ;
+    tempbh &= 0x03;
+    tempbl &= 0x03;
+    tempbh <<= 2;
+    tempbl <<= 2;                                       /* GPIOC,GPIOD */
+    XGINew_SetRegAND( pVBInfo->P3d4 , 0x4A , ~tempbh ) ; /* enable GPIO write */
+    XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x48 , ~tempbh , tempbl ) ;
+}
+
+/* --------------------------------------------------------------------- */
+USHORT XGI_GetLVDSOEMTableIndex(PVB_DEVICE_INFO pVBInfo)
+{
+    USHORT index ;
+
+    index = XGINew_GetReg1( pVBInfo->P3d4 , 0x36 ) ;
+    if (index<sizeof(XGI21_LCDCapList)/sizeof(XGI21_LVDSCapStruct))
+    {
+      return index;
+    }
+    return 0;
+}
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_XG21SetPanelDelay */
+/* Input : */
+/* Output : */
+/* Description : */
+/* I/P : bl : 1 ; T1 : the duration between CPL on and signal on */
+/* : bl : 2 ; T2 : the duration signal on and Vdd on */
+/* : bl : 3 ; T3 : the duration between CPL off and signal off */
+/* : bl : 4 ; T4 : the duration signal off and Vdd off */
+/* --------------------------------------------------------------------- */
+void XGI_XG21SetPanelDelay(USHORT tempbl, PVB_DEVICE_INFO pVBInfo)
+{
+    USHORT index ;
+
+    index = XGI_GetLVDSOEMTableIndex( pVBInfo );
+    if ( tempbl == 1 )
+        XGINew_LCD_Wait_Time( pVBInfo->XG21_LVDSCapList[ index ].PSC_S1, pVBInfo ) ;
+
+    if ( tempbl == 2 )
+        XGINew_LCD_Wait_Time( pVBInfo->XG21_LVDSCapList[ index ].PSC_S2, pVBInfo ) ;
+
+    if ( tempbl == 3 )
+        XGINew_LCD_Wait_Time( pVBInfo->XG21_LVDSCapList[ index ].PSC_S3, pVBInfo ) ;
+
+    if ( tempbl == 4 )
+        XGINew_LCD_Wait_Time( pVBInfo->XG21_LVDSCapList[ index ].PSC_S4, pVBInfo ) ;
+}
+
+BOOLEAN XGI_XG21CheckLVDSMode(USHORT ModeNo,USHORT ModeIdIndex, PVB_DEVICE_INFO pVBInfo )
+{
+    USHORT xres ,
+           yres ,
+           colordepth ,
+           modeflag ,
+           resindex ,
+           lvdstableindex;
+
+    resindex = XGI_GetResInfo( ModeNo , ModeIdIndex, pVBInfo ) ;
+    if ( ModeNo <= 0x13 )
+    {
+        xres = pVBInfo->StResInfo[ resindex ].HTotal ;
+        yres = pVBInfo->StResInfo[ resindex ].VTotal ;
+        modeflag = pVBInfo->SModeIDTable[ModeIdIndex].St_ModeFlag;    /* si+St_ResInfo */
+    }
+    else
+    {
+        xres = pVBInfo->ModeResInfo[ resindex ].HTotal ;                         /* xres->ax */
+        yres = pVBInfo->ModeResInfo[ resindex ].VTotal ;                         /* yres->bx */
+        modeflag = pVBInfo->EModeIDTable[ ModeIdIndex].Ext_ModeFlag ; /* si+St_ModeFlag */
+    }
+
+    if ( !( modeflag & Charx8Dot ) )
+    {
+        xres /= 9;
+        xres *= 8;
+    }
+
+    if ( ModeNo > 0x13 )
+    {
+        if ( ( ModeNo>0x13 ) && ( modeflag & HalfDCLK ) )
+        {
+          xres *=  2 ;
+        }
+        if ( ( ModeNo>0x13 ) && ( modeflag & DoubleScanMode ) )
+        {
+          yres *=  2 ;
+        }
+    }
+
+    lvdstableindex = XGI_GetLVDSOEMTableIndex( pVBInfo );
+    if ( xres > (pVBInfo->XG21_LVDSCapList[lvdstableindex].LVDSHDE) )
+      return FALSE;
+
+    if ( yres > (pVBInfo->XG21_LVDSCapList[lvdstableindex].LVDSVDE) )
+      return FALSE;
+
+    if ( ModeNo > 0x13 )
+    {
+      if ( ( xres != (pVBInfo->XG21_LVDSCapList[lvdstableindex].LVDSHDE) ) ||
+           ( yres != (pVBInfo->XG21_LVDSCapList[lvdstableindex].LVDSVDE)) )
+      {
+          colordepth = XGI_GetColorDepth( ModeNo , ModeIdIndex, pVBInfo ) ;
+          if ( colordepth > 2 )
+          {
+            return FALSE;
+          }
+      }
+    }
+    return TRUE;
+}
+
+void XGI_SetXG21FPBits(PVB_DEVICE_INFO pVBInfo)
+{
+    UCHAR temp;
+
+    temp = XGINew_GetReg1( pVBInfo->P3d4  , 0x37 ) ;  /* D[0] 1: 18bit */
+    temp = ( temp & 1 ) << 6;
+    XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x06 , ~0x40 , temp ) ;      /* SR06[6] 18bit Dither */
+    XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x09 , ~0xc0 , temp | 0x80 ) ;  /* SR09[7] enable FP output, SR09[6] 1: sigle 18bits, 0: dual 12bits */
+
+}
+
+void XGI_SetXG27FPBits(PVB_DEVICE_INFO pVBInfo)
+{
+    UCHAR temp;
+
+    temp = XGINew_GetReg1( pVBInfo->P3d4  , 0x37 ) ;  /* D[1:0] 01: 18bit, 00: dual 12, 10: single 24 */
+    temp = ( temp & 3 ) << 6;
+    XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x06 , ~0xc0 , temp & 0x80 ) ;  /* SR06[7]0: dual 12/1: single 24 [6] 18bit Dither <= 0 h/w recommend */
+    XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x09 , ~0xc0 , temp | 0x80 ) ;  /* SR09[7] enable FP output, SR09[6] 1: sigle 18bits, 0: 24bits */
+
+}
+
+void XGI_SetXG21LVDSPara(USHORT ModeNo,USHORT ModeIdIndex, PVB_DEVICE_INFO pVBInfo )
+{
+    UCHAR temp,Miscdata;
+    USHORT xres ,
+           yres ,
+           modeflag ,
+           resindex ,
+           lvdstableindex ;
+    USHORT LVDSHT,LVDSHBS,LVDSHRS,LVDSHRE,LVDSHBE;
+    USHORT LVDSVT,LVDSVBS,LVDSVRS,LVDSVRE,LVDSVBE;
+    USHORT value;
+
+    lvdstableindex = XGI_GetLVDSOEMTableIndex( pVBInfo );
+
+    temp = (UCHAR) ( ( pVBInfo->XG21_LVDSCapList[lvdstableindex].LVDS_Capability & (LCDPolarity << 8 ) ) >> 8 );
+    temp &= LCDPolarity;
+    Miscdata =(UCHAR) XGINew_GetReg2(pVBInfo->P3cc) ;
+
+    XGINew_SetReg3( pVBInfo->P3c2 , (Miscdata & 0x3F) | temp ) ;
+
+    temp = (UCHAR) ( pVBInfo->XG21_LVDSCapList[lvdstableindex].LVDS_Capability & LCDPolarity ) ;
+    XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x35 , ~0x80 , temp&0x80 ) ;      /* SR35[7] FP VSync polarity */
+    XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x30 , ~0x20 , (temp&0x40)>>1 ) ;   /* SR30[5] FP HSync polarity */
+
+    XGI_SetXG21FPBits(pVBInfo);
+    resindex = XGI_GetResInfo( ModeNo , ModeIdIndex, pVBInfo ) ;
+    if ( ModeNo <= 0x13 )
+    {
+        xres = pVBInfo->StResInfo[ resindex ].HTotal ;
+        yres = pVBInfo->StResInfo[ resindex ].VTotal ;
+        modeflag = pVBInfo->SModeIDTable[ModeIdIndex].St_ModeFlag;    /* si+St_ResInfo */
+    }
+    else
+    {
+        xres = pVBInfo->ModeResInfo[ resindex ].HTotal ;                         /* xres->ax */
+        yres = pVBInfo->ModeResInfo[ resindex ].VTotal ;                         /* yres->bx */
+        modeflag = pVBInfo->EModeIDTable[ ModeIdIndex].Ext_ModeFlag ; /* si+St_ModeFlag */
+    }
+
+    if (!( modeflag & Charx8Dot ))
+      xres = xres * 8 / 9;
+
+    LVDSHT = pVBInfo->XG21_LVDSCapList[lvdstableindex].LVDSHT;
+
+    LVDSHBS = xres + ( pVBInfo->XG21_LVDSCapList[lvdstableindex].LVDSHDE - xres ) / 2 ;
+    if ( ( ModeNo<=0x13 ) && ( modeflag & HalfDCLK ) )
+    {
+      LVDSHBS -=  xres/4 ;
+    }
+    if (LVDSHBS > LVDSHT) LVDSHBS -= LVDSHT ;
+
+    LVDSHRS = LVDSHBS + pVBInfo->XG21_LVDSCapList[lvdstableindex].LVDSHFP ;
+    if (LVDSHRS > LVDSHT) LVDSHRS -= LVDSHT ;
+
+    LVDSHRE = LVDSHRS + pVBInfo->XG21_LVDSCapList[lvdstableindex].LVDSHSYNC ;
+    if (LVDSHRE > LVDSHT) LVDSHRE -= LVDSHT ;
+
+    LVDSHBE = LVDSHBS + LVDSHT - pVBInfo->XG21_LVDSCapList[lvdstableindex].LVDSHDE ;
+
+    LVDSVT = pVBInfo->XG21_LVDSCapList[lvdstableindex].LVDSVT;
+
+    LVDSVBS = yres + ( pVBInfo->XG21_LVDSCapList[lvdstableindex].LVDSVDE - yres ) / 2 ;
+    if ( ( ModeNo>0x13 ) && ( modeflag & DoubleScanMode ) )
+    {
+      LVDSVBS +=  yres/2 ;
+    }
+    if (LVDSVBS > LVDSVT) LVDSVBS -= LVDSVT ;
+
+    LVDSVRS = LVDSVBS + pVBInfo->XG21_LVDSCapList[lvdstableindex].LVDSVFP ;
+    if (LVDSVRS > LVDSVT) LVDSVRS -= LVDSVT ;
+
+    LVDSVRE = LVDSVRS + pVBInfo->XG21_LVDSCapList[lvdstableindex].LVDSVSYNC ;
+    if (LVDSVRE > LVDSVT) LVDSVRE -= LVDSVT ;
+
+    LVDSVBE = LVDSVBS + LVDSVT - pVBInfo->XG21_LVDSCapList[lvdstableindex].LVDSVDE ;
+
+    temp = ( UCHAR )XGINew_GetReg1( pVBInfo->P3d4 , 0x11 ) ;
+    XGINew_SetReg1( pVBInfo->P3d4 , 0x11 , temp & 0x7f ) ;             /* Unlock CRTC */
+
+    if (!( modeflag & Charx8Dot ))
+    {
+        XGINew_SetRegOR( pVBInfo->P3c4 , 0x1 , 0x1 ) ;
+    }
+
+    /* HT SR0B[1:0] CR00 */
+    value = ( LVDSHT >> 3 ) - 5;
+    XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x0B , ~0x03 , ( value & 0x300 ) >> 8 ) ;
+    XGINew_SetReg1( pVBInfo->P3d4 , 0x0 , (value & 0xFF) ) ;
+
+    /* HBS SR0B[5:4] CR02 */
+    value = ( LVDSHBS >> 3 ) - 1;
+    XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x0B , ~0x30 , ( value & 0x300 ) >> 4 ) ;
+    XGINew_SetReg1( pVBInfo->P3d4 , 0x2 , (value & 0xFF) ) ;
+
+    /* HBE SR0C[1:0] CR05[7] CR03[4:0] */
+    value = ( LVDSHBE >> 3 ) - 1;
+    XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x0C , ~0x03 , ( value & 0xC0 ) >> 6 ) ;
+    XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x05 , ~0x80 , ( value & 0x20 ) << 2 ) ;
+    XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x03 , ~0x1F , value & 0x1F ) ;
+
+    /* HRS SR0B[7:6] CR04 */
+    value = ( LVDSHRS >> 3 ) + 2;
+    XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x0B , ~0xC0 , ( value & 0x300 ) >> 2 ) ;
+    XGINew_SetReg1( pVBInfo->P3d4 , 0x4 , (value & 0xFF) ) ;
+
+    /* Panel HRS SR2F[1:0] SR2E[7:0]  */
+    value--;
+    XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x2F , ~0x03 , ( value & 0x300 ) >> 8 ) ;
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x2E , (value & 0xFF) ) ;
+
+    /* HRE SR0C[2] CR05[4:0] */
+    value = ( LVDSHRE >> 3 ) + 2;
+    XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x0C , ~0x04 , ( value & 0x20 ) >> 3 ) ;
+    XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x05 , ~0x1F , value & 0x1F ) ;
+
+    /* Panel HRE SR2F[7:2]  */
+    value--;
+    XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x2F , ~0xFC , value << 2 ) ;
+
+    /* VT SR0A[0] CR07[5][0] CR06 */
+    value = LVDSVT - 2 ;
+    XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x0A , ~0x01 , ( value & 0x400 ) >> 10 ) ;
+    XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x07 , ~0x20 , ( value & 0x200 ) >> 4 ) ;
+    XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x07 , ~0x01 , ( value & 0x100 ) >> 8 ) ;
+    XGINew_SetReg1( pVBInfo->P3d4 , 0x06 , (value & 0xFF) ) ;
+
+    /* VBS SR0A[2] CR09[5] CR07[3] CR15 */
+    value = LVDSVBS - 1 ;
+    XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x0A , ~0x04 , ( value & 0x400 ) >> 8 ) ;
+    XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x09 , ~0x20 , ( value & 0x200 ) >> 4 ) ;
+    XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x07 , ~0x08 , ( value & 0x100 ) >> 5 ) ;
+    XGINew_SetReg1( pVBInfo->P3d4 , 0x15 , (value & 0xFF) ) ;
+
+    /* VBE SR0A[4] CR16 */
+    value = LVDSVBE - 1;
+    XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x0A , ~0x10 , ( value & 0x100 ) >> 4 ) ;
+    XGINew_SetReg1( pVBInfo->P3d4 , 0x16 , (value & 0xFF) ) ;
+
+    /* VRS SR0A[3] CR7[7][2] CR10 */
+    value = LVDSVRS - 1 ;
+    XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x0A , ~0x08 , ( value & 0x400 ) >> 7 ) ;
+    XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x07 , ~0x80 , ( value & 0x200 ) >> 2 ) ;
+    XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x07 , ~0x04 , ( value & 0x100 ) >> 6 ) ;
+    XGINew_SetReg1( pVBInfo->P3d4 , 0x10 , (value & 0xFF) ) ;
+
+    /* Panel VRS SR3F[1:0] SR34[7:0] SR33[0] */
+    XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x3F , ~0x03 , ( value & 0x600 ) >> 9 ) ;
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x34 , (value >> 1) & 0xFF ) ;
+    XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x33 , ~0x01 , value & 0x01 ) ;
+
+    /* VRE SR0A[5] CR11[3:0] */
+    value = LVDSVRE - 1;
+    XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x0A , ~0x20 , ( value & 0x10 ) << 1 ) ;
+    XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x11 , ~0x0F , value & 0x0F ) ;
+
+    /* Panel VRE SR3F[7:2] */ /* SR3F[7] has to be 0, h/w bug */
+    XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x3F , ~0xFC , ( value << 2 ) & 0x7C ) ;
+
+    for ( temp=0, value = 0; temp < 3; temp++)
+    {
+
+        XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x31 , ~0x30 , value ) ;
+        XGINew_SetReg1( pVBInfo->P3c4 , 0x2B , pVBInfo->XG21_LVDSCapList[lvdstableindex].VCLKData1) ;
+        XGINew_SetReg1( pVBInfo->P3c4 , 0x2C , pVBInfo->XG21_LVDSCapList[lvdstableindex].VCLKData2) ;
+        value += 0x10;
+    }
+
+    if (!( modeflag & Charx8Dot ))
+    {
+        XGINew_GetReg2( pVBInfo->P3da ) ;           /* reset 3da */
+        XGINew_SetReg3( pVBInfo->P3c0 , 0x13 ) ;    /* set index */
+        XGINew_SetReg3( pVBInfo->P3c0 , 0x00 ) ;    /* set data, panning = 0, shift left 1 dot*/
+
+        XGINew_GetReg2( pVBInfo->P3da ) ;           /* Enable Attribute */
+        XGINew_SetReg3( pVBInfo->P3c0 , 0x20 ) ;
+
+        XGINew_GetReg2( pVBInfo->P3da ) ;           /* reset 3da */
+    }
+
+
+}
+
+/* no shadow case */
+void XGI_SetXG27LVDSPara(USHORT ModeNo,USHORT ModeIdIndex, PVB_DEVICE_INFO pVBInfo )
+{
+    UCHAR temp,Miscdata;
+    USHORT xres ,
+           yres ,
+           modeflag ,
+           resindex ,
+           lvdstableindex ;
+    USHORT LVDSHT,LVDSHBS,LVDSHRS,LVDSHRE,LVDSHBE;
+    USHORT LVDSVT,LVDSVBS,LVDSVRS,LVDSVRE,LVDSVBE;
+    USHORT value;
+
+    lvdstableindex = XGI_GetLVDSOEMTableIndex( pVBInfo );
+    temp = (UCHAR) ( ( pVBInfo->XG21_LVDSCapList[lvdstableindex].LVDS_Capability & (LCDPolarity << 8 ) ) >> 8 );
+    temp &= LCDPolarity;
+    Miscdata =(UCHAR) XGINew_GetReg2(pVBInfo->P3cc) ;
+
+    XGINew_SetReg3( pVBInfo->P3c2 , (Miscdata & 0x3F) | temp ) ;
+
+    temp = (UCHAR) ( pVBInfo->XG21_LVDSCapList[lvdstableindex].LVDS_Capability & LCDPolarity ) ;
+    XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x35 , ~0x80 , temp&0x80 ) ;      /* SR35[7] FP VSync polarity */
+    XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x30 , ~0x20 , (temp&0x40)>>1 ) ;   /* SR30[5] FP HSync polarity */
+
+    XGI_SetXG27FPBits(pVBInfo);
+    resindex = XGI_GetResInfo( ModeNo , ModeIdIndex, pVBInfo ) ;
+    if ( ModeNo <= 0x13 )
+    {
+        xres = pVBInfo->StResInfo[ resindex ].HTotal ;
+        yres = pVBInfo->StResInfo[ resindex ].VTotal ;
+        modeflag = pVBInfo->SModeIDTable[ModeIdIndex].St_ModeFlag;    /* si+St_ResInfo */
+    }
+    else
+    {
+        xres = pVBInfo->ModeResInfo[ resindex ].HTotal ;                         /* xres->ax */
+        yres = pVBInfo->ModeResInfo[ resindex ].VTotal ;                         /* yres->bx */
+        modeflag = pVBInfo->EModeIDTable[ ModeIdIndex].Ext_ModeFlag ; /* si+St_ModeFlag */
+    }
+
+    if (!( modeflag & Charx8Dot ))
+      xres = xres * 8 / 9;
+
+    LVDSHT = pVBInfo->XG21_LVDSCapList[lvdstableindex].LVDSHT;
+
+    LVDSHBS = xres + ( pVBInfo->XG21_LVDSCapList[lvdstableindex].LVDSHDE - xres ) / 2 ;
+    if ( ( ModeNo<=0x13 ) && ( modeflag & HalfDCLK ) )
+    {
+      LVDSHBS -=  xres/4 ;
+    }
+    if (LVDSHBS > LVDSHT) LVDSHBS -= LVDSHT ;
+
+    LVDSHRS = LVDSHBS + pVBInfo->XG21_LVDSCapList[lvdstableindex].LVDSHFP ;
+    if (LVDSHRS > LVDSHT) LVDSHRS -= LVDSHT ;
+
+    LVDSHRE = LVDSHRS + pVBInfo->XG21_LVDSCapList[lvdstableindex].LVDSHSYNC ;
+    if (LVDSHRE > LVDSHT) LVDSHRE -= LVDSHT ;
+
+    LVDSHBE = LVDSHBS + LVDSHT - pVBInfo->XG21_LVDSCapList[lvdstableindex].LVDSHDE ;
+
+    LVDSVT = pVBInfo->XG21_LVDSCapList[lvdstableindex].LVDSVT;
+
+    LVDSVBS = yres + ( pVBInfo->XG21_LVDSCapList[lvdstableindex].LVDSVDE - yres ) / 2 ;
+    if ( ( ModeNo>0x13 ) && ( modeflag & DoubleScanMode ) )
+    {
+      LVDSVBS +=  yres/2 ;
+    }
+    if (LVDSVBS > LVDSVT) LVDSVBS -= LVDSVT ;
+
+    LVDSVRS = LVDSVBS + pVBInfo->XG21_LVDSCapList[lvdstableindex].LVDSVFP ;
+    if (LVDSVRS > LVDSVT) LVDSVRS -= LVDSVT ;
+
+    LVDSVRE = LVDSVRS + pVBInfo->XG21_LVDSCapList[lvdstableindex].LVDSVSYNC ;
+    if (LVDSVRE > LVDSVT) LVDSVRE -= LVDSVT ;
+
+    LVDSVBE = LVDSVBS + LVDSVT - pVBInfo->XG21_LVDSCapList[lvdstableindex].LVDSVDE ;
+
+    temp = ( UCHAR )XGINew_GetReg1( pVBInfo->P3d4 , 0x11 ) ;
+    XGINew_SetReg1( pVBInfo->P3d4 , 0x11 , temp & 0x7f ) ;             /* Unlock CRTC */
+
+    if (!( modeflag & Charx8Dot ))
+    {
+        XGINew_SetRegOR( pVBInfo->P3c4 , 0x1 , 0x1 ) ;
+    }
+
+    /* HT SR0B[1:0] CR00 */
+    value = ( LVDSHT >> 3 ) - 5;
+    XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x0B , ~0x03 , ( value & 0x300 ) >> 8 ) ;
+    XGINew_SetReg1( pVBInfo->P3d4 , 0x0 , (value & 0xFF) ) ;
+
+    /* HBS SR0B[5:4] CR02 */
+    value = ( LVDSHBS >> 3 ) - 1;
+    XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x0B , ~0x30 , ( value & 0x300 ) >> 4 ) ;
+    XGINew_SetReg1( pVBInfo->P3d4 , 0x2 , (value & 0xFF) ) ;
+
+    /* HBE SR0C[1:0] CR05[7] CR03[4:0] */
+    value = ( LVDSHBE >> 3 ) - 1;
+    XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x0C , ~0x03 , ( value & 0xC0 ) >> 6 ) ;
+    XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x05 , ~0x80 , ( value & 0x20 ) << 2 ) ;
+    XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x03 , ~0x1F , value & 0x1F ) ;
+
+    /* HRS SR0B[7:6] CR04 */
+    value = ( LVDSHRS >> 3 ) + 2;
+    XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x0B , ~0xC0 , ( value & 0x300 ) >> 2 ) ;
+    XGINew_SetReg1( pVBInfo->P3d4 , 0x4 , (value & 0xFF) ) ;
+
+    /* Panel HRS SR2F[1:0] SR2E[7:0]  */
+    value--;
+    XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x2F , ~0x03 , ( value & 0x300 ) >> 8 ) ;
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x2E , (value & 0xFF) ) ;
+
+    /* HRE SR0C[2] CR05[4:0] */
+    value = ( LVDSHRE >> 3 ) + 2;
+    XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x0C , ~0x04 , ( value & 0x20 ) >> 3 ) ;
+    XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x05 , ~0x1F , value & 0x1F ) ;
+
+    /* Panel HRE SR2F[7:2]  */
+    value--;
+    XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x2F , ~0xFC , value << 2 ) ;
+
+    /* VT SR0A[0] CR07[5][0] CR06 */
+    value = LVDSVT - 2 ;
+    XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x0A , ~0x01 , ( value & 0x400 ) >> 10 ) ;
+    XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x07 , ~0x20 , ( value & 0x200 ) >> 4 ) ;
+    XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x07 , ~0x01 , ( value & 0x100 ) >> 8 ) ;
+    XGINew_SetReg1( pVBInfo->P3d4 , 0x06 , (value & 0xFF) ) ;
+
+    /* VBS SR0A[2] CR09[5] CR07[3] CR15 */
+    value = LVDSVBS - 1 ;
+    XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x0A , ~0x04 , ( value & 0x400 ) >> 8 ) ;
+    XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x09 , ~0x20 , ( value & 0x200 ) >> 4 ) ;
+    XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x07 , ~0x08 , ( value & 0x100 ) >> 5 ) ;
+    XGINew_SetReg1( pVBInfo->P3d4 , 0x15 , (value & 0xFF) ) ;
+
+    /* VBE SR0A[4] CR16 */
+    value = LVDSVBE - 1;
+    XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x0A , ~0x10 , ( value & 0x100 ) >> 4 ) ;
+    XGINew_SetReg1( pVBInfo->P3d4 , 0x16 , (value & 0xFF) ) ;
+
+    /* VRS SR0A[3] CR7[7][2] CR10 */
+    value = LVDSVRS - 1 ;
+    XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x0A , ~0x08 , ( value & 0x400 ) >> 7 ) ;
+    XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x07 , ~0x80 , ( value & 0x200 ) >> 2 ) ;
+    XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x07 , ~0x04 , ( value & 0x100 ) >> 6 ) ;
+    XGINew_SetReg1( pVBInfo->P3d4 , 0x10 , (value & 0xFF) ) ;
+
+    /* Panel VRS SR35[2:0] SR34[7:0] */
+    XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x35 , ~0x07 , ( value & 0x700 ) >> 8 ) ;
+    XGINew_SetReg1( pVBInfo->P3c4 , 0x34 , value & 0xFF ) ;
+
+    /* VRE SR0A[5] CR11[3:0] */
+    value = LVDSVRE - 1;
+    XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x0A , ~0x20 , ( value & 0x10 ) << 1 ) ;
+    XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x11 , ~0x0F , value & 0x0F ) ;
+
+    /* Panel VRE SR3F[7:2] */
+    XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x3F , ~0xFC , ( value << 2 ) & 0xFC ) ;
+
+    for ( temp=0, value = 0; temp < 3; temp++)
+    {
+
+        XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x31 , ~0x30 , value ) ;
+        XGINew_SetReg1( pVBInfo->P3c4 , 0x2B , pVBInfo->XG21_LVDSCapList[lvdstableindex].VCLKData1) ;
+        XGINew_SetReg1( pVBInfo->P3c4 , 0x2C , pVBInfo->XG21_LVDSCapList[lvdstableindex].VCLKData2) ;
+        value += 0x10;
+    }
+
+    if (!( modeflag & Charx8Dot ))
+    {
+        XGINew_GetReg2( pVBInfo->P3da ) ;           /* reset 3da */
+        XGINew_SetReg3( pVBInfo->P3c0 , 0x13 ) ;    /* set index */
+        XGINew_SetReg3( pVBInfo->P3c0 , 0x00 ) ;    /* set data, panning = 0, shift left 1 dot*/
+
+        XGINew_GetReg2( pVBInfo->P3da ) ;           /* Enable Attribute */
+        XGINew_SetReg3( pVBInfo->P3c0 , 0x20 ) ;
+
+        XGINew_GetReg2( pVBInfo->P3da ) ;           /* reset 3da */
+    }
+
+
+}
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_IsLCDON */
+/* Input : */
+/* Output : FALSE : Skip PSC Control */
+/* TRUE: Disable PSC */
+/* Description : */
+/* --------------------------------------------------------------------- */
+BOOLEAN XGI_IsLCDON(PVB_DEVICE_INFO pVBInfo)
+{
+    USHORT tempax ;
+
+    tempax = pVBInfo->VBInfo ;
+    if ( tempax & SetCRT2ToDualEdge )
+        return FALSE ;
+    else if ( tempax & ( DisableCRT2Display | SwitchToCRT2 | SetSimuScanMode ) )
+        return TRUE ;
+
+    return FALSE ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_EnablePWD */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_EnablePWD(  PVB_DEVICE_INFO pVBInfo )
+{
+    USHORT index ,
+           temp ;
+
+    index = XGI_GetLCDCapPtr(pVBInfo) ;
+    temp = pVBInfo->LCDCapList[ index ].PWD_2B ;
+    XGINew_SetReg1( pVBInfo->Part4Port , 0x2B , temp ) ;
+    XGINew_SetReg1( pVBInfo->Part4Port , 0x2C , pVBInfo->LCDCapList[ index ].PWD_2C ) ;
+    XGINew_SetReg1( pVBInfo->Part4Port , 0x2D , pVBInfo->LCDCapList[ index ].PWD_2D ) ;
+    XGINew_SetReg1( pVBInfo->Part4Port , 0x2E , pVBInfo->LCDCapList[ index ].PWD_2E ) ;
+    XGINew_SetReg1( pVBInfo->Part4Port , 0x2F , pVBInfo->LCDCapList[ index ].PWD_2F ) ;
+    XGINew_SetRegOR( pVBInfo->Part4Port , 0x27 , 0x80 ) ;      /* enable PWD */
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_DisablePWD */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_DisablePWD( PVB_DEVICE_INFO pVBInfo )
+{
+    XGINew_SetRegAND( pVBInfo->Part4Port , 0x27 , 0x7F ) ;     /* disable PWD */
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_DisableChISLCD */
+/* Input : */
+/* Output : FALSE -> Not LCD Mode */
+/* Description : */
+/* --------------------------------------------------------------------- */
+BOOLEAN XGI_DisableChISLCD(PVB_DEVICE_INFO pVBInfo)
+{
+    USHORT tempbx ,
+           tempah ;
+
+    tempbx = pVBInfo->SetFlag & ( DisableChA | DisableChB ) ;
+    tempah = ~( ( USHORT )XGINew_GetReg1( pVBInfo->Part1Port  , 0x2E ) ) ;
+
+    if ( tempbx & ( EnableChA | DisableChA ) )
+    {
+        if ( !( tempah & 0x08 ) )              /* Chk LCDA Mode */
+            return FALSE ;
+    }
+
+    if ( !( tempbx & ( EnableChB | DisableChB ) ) )
+        return FALSE ;
+
+    if ( tempah & 0x01 )       /* Chk LCDB Mode */
+        return TRUE ;
+
+    return FALSE ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_EnableChISLCD */
+/* Input : */
+/* Output : 0 -> Not LCD mode */
+/* Description : */
+/* --------------------------------------------------------------------- */
+BOOLEAN XGI_EnableChISLCD(PVB_DEVICE_INFO pVBInfo)
+{
+    USHORT tempbx ,
+           tempah ;
+
+
+    tempbx = pVBInfo->SetFlag & ( EnableChA | EnableChB ) ;
+    tempah = ~( ( USHORT )XGINew_GetReg1( pVBInfo->Part1Port , 0x2E ) ) ;
+
+    if ( tempbx & ( EnableChA | DisableChA ) )
+    {
+        if ( !( tempah & 0x08 ) )              /* Chk LCDA Mode */
+            return FALSE ;
+    }
+
+    if ( !( tempbx & ( EnableChB | DisableChB ) ) )
+        return FALSE ;
+
+    if ( tempah & 0x01 )       /* Chk LCDB Mode */
+        return TRUE ;
+
+    return FALSE ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_GetLCDCapPtr */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+USHORT XGI_GetLCDCapPtr(  PVB_DEVICE_INFO pVBInfo )
+{
+    UCHAR tempal ,
+          tempah ,
+          tempbl ,
+          i ;
+
+    tempah = XGINew_GetReg1( pVBInfo->P3d4 , 0x36 ) ;
+    tempal = tempah & 0x0F ;
+    tempah = tempah & 0xF0 ;
+    i = 0 ;
+    tempbl =  pVBInfo->LCDCapList[ i ].LCD_ID ;
+
+    while( tempbl != 0xFF )
+    {
+        if ( tempbl & 0x80 )   /* OEMUtil */
+        {
+            tempal = tempah ;
+            tempbl = tempbl & ~( 0x80 ) ;
+        }
+
+        if ( tempal == tempbl )
+            break ;
+
+        i++ ;
+
+        tempbl = pVBInfo->LCDCapList[ i ].LCD_ID ;
+    }
+
+    return i ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_GetLCDCapPtr1 */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+USHORT XGI_GetLCDCapPtr1( PVB_DEVICE_INFO pVBInfo )
+{
+    USHORT tempah ,
+           tempal ,
+           tempbl ,
+           i ;
+
+    tempal = pVBInfo->LCDResInfo ;
+    tempah = pVBInfo->LCDTypeInfo ;
+
+    i = 0 ;
+    tempbl =  pVBInfo->LCDCapList[ i ].LCD_ID;
+
+    while( tempbl != 0xFF )
+    {
+        if ( ( tempbl & 0x80 ) && ( tempbl != 0x80 ) )
+        {
+            tempal = tempah ;
+            tempbl &= ~0x80 ;
+        }
+
+        if ( tempal == tempbl )
+            break ;
+
+        i++ ;
+        tempbl = pVBInfo->LCDCapList[ i ].LCD_ID ;
+    }
+
+    if ( tempbl == 0xFF )
+    {
+        pVBInfo->LCDResInfo = Panel1024x768 ;
+        pVBInfo->LCDTypeInfo = 0 ;
+        i = 0 ;
+    }
+
+    return i ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_GetLCDSync */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_GetLCDSync( USHORT* HSyncWidth , USHORT* VSyncWidth, PVB_DEVICE_INFO pVBInfo )
+{
+    USHORT Index ;
+
+    Index = XGI_GetLCDCapPtr(pVBInfo) ;
+    *HSyncWidth = pVBInfo->LCDCapList[ Index ].LCD_HSyncWidth ;
+    *VSyncWidth = pVBInfo->LCDCapList[ Index ].LCD_VSyncWidth ;
+
+    return ;
+}
+
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_EnableBridge */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_EnableBridge( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_INFO pVBInfo)
+{
+    USHORT tempbl ,
+           tempah ;
+
+    if ( pVBInfo->SetFlag == Win9xDOSMode )
+    {
+        if ( pVBInfo->VBType & ( VB_XGI301B | VB_XGI302B | VB_XGI301LV | VB_XGI302LV | VB_XGI301C ) )
+        {
+            XGI_DisplayOn( HwDeviceExtension, pVBInfo) ;
+            return ;
+        }
+        else  /* LVDS or CH7017 */
+            return ;
+    }
+
+
+    if ( HwDeviceExtension->jChipType < XG40 )
+    {
+        if ( !XGI_DisableChISLCD(pVBInfo) )
+        {
+            if ( ( XGI_EnableChISLCD(pVBInfo) ) || ( pVBInfo->VBInfo & ( SetCRT2ToLCD | SetCRT2ToLCDA ) ) )
+            {
+                if ( pVBInfo->LCDInfo & SetPWDEnable )
+                {
+                    XGI_EnablePWD( pVBInfo);
+                }
+                else
+                {
+                    pVBInfo->LCDInfo &= ( ~SetPWDEnable ) ;
+                    if ( pVBInfo->VBType & ( VB_XGI301LV | VB_XGI302LV | VB_XGI301C ) )
+                    {
+                        tempbl = 0xFD ;
+                        tempah = 0x02 ;
+                    }
+                    else
+                    {
+                        tempbl = 0xFB ;
+                        tempah = 0x00 ;
+                    }
+
+                    XGI_SetPanelPower( tempah , tempbl, pVBInfo ) ;
+                    XGI_SetPanelDelay( 1,pVBInfo ) ;
+                }
+            }
+        }
+    }  /* Not 340 */
+
+
+
+    if ( pVBInfo->VBType & ( VB_XGI301B | VB_XGI302B | VB_XGI301LV | VB_XGI302LV | VB_XGI301C ) )
+    {
+        if ( !( pVBInfo->SetFlag & DisableChA ) )
+        {
+            if ( pVBInfo->SetFlag & EnableChA )
+            {
+                XGINew_SetReg1( pVBInfo->Part1Port , 0x1E , 0x20 ) ;  /* Power on */
+            }
+            else
+            {
+                if ( pVBInfo->VBInfo & SetCRT2ToDualEdge ) /* SetCRT2ToLCDA ) */
+                {
+                    XGINew_SetReg1(pVBInfo->Part1Port,0x1E,0x20);  /* Power on */
+                }
+            }
+        }
+
+        if ( !( pVBInfo->SetFlag & DisableChB ) )
+        {
+            if ( ( pVBInfo->SetFlag & EnableChB ) || ( pVBInfo->VBInfo & ( SetCRT2ToLCD | SetCRT2ToTV | SetCRT2ToRAMDAC ) ) )
+            {
+                tempah = ( UCHAR )XGINew_GetReg1( pVBInfo->P3c4 , 0x32 ) ;
+                tempah &= 0xDF;
+                if ( pVBInfo->VBInfo & SetInSlaveMode )
+                {
+                    if ( !( pVBInfo->VBInfo & SetCRT2ToRAMDAC ) )
+                        tempah |= 0x20 ;
+                }
+                XGINew_SetReg1( pVBInfo->P3c4 , 0x32 , tempah ) ;
+                XGINew_SetRegOR( pVBInfo->P3c4 , 0x1E , 0x20 ) ;
+
+
+                tempah = ( UCHAR )XGINew_GetReg1( pVBInfo->Part1Port , 0x2E ) ;
+
+                if ( !( tempah & 0x80 ) )
+                    XGINew_SetRegOR( pVBInfo->Part1Port , 0x2E , 0x80 ) ;      /* BVBDOENABLE = 1 */
+
+                XGINew_SetRegAND( pVBInfo->Part1Port , 0x00 , 0x7F ) ;         /* BScreenOFF = 0 */
+            }
+        }
+
+        if ( ( pVBInfo->SetFlag & ( EnableChA | EnableChB ) ) || ( !( pVBInfo->VBInfo & DisableCRT2Display ) ) )
+        {
+            XGINew_SetRegANDOR( pVBInfo->Part2Port , 0x00 , ~0xE0 , 0x20 ) ;   /* shampoo 0129 */
+            if ( pVBInfo->VBType & ( VB_XGI302LV | VB_XGI301C ) )
+            {
+                if ( !XGI_DisableChISLCD(pVBInfo) )
+                {
+                    if ( XGI_EnableChISLCD( pVBInfo) || ( pVBInfo->VBInfo & ( SetCRT2ToLCD | SetCRT2ToLCDA ) ) )
+                        XGINew_SetRegAND( pVBInfo->Part4Port ,0x2A , 0x7F ) ;          /* LVDS PLL power on */
+                }
+                XGINew_SetRegAND( pVBInfo->Part4Port , 0x30 , 0x7F ) ;         /* LVDS Driver power on */
+            }
+        }
+
+        tempah = 0x00 ;
+
+        if ( !( pVBInfo->VBInfo & DisableCRT2Display ) )
+        {
+            tempah = 0xc0 ;
+
+            if ( !( pVBInfo->VBInfo & SetSimuScanMode ) )
+            {
+                if ( pVBInfo->VBInfo & SetCRT2ToLCDA )
+                {
+                    if ( pVBInfo->VBInfo & SetCRT2ToDualEdge )
+                    {
+                        tempah = tempah & 0x40;
+                        if ( pVBInfo->VBInfo & SetCRT2ToLCDA )
+                            tempah = tempah ^ 0xC0 ;
+
+                        if ( pVBInfo->SetFlag & DisableChB )
+                            tempah &= 0xBF ;
+
+                        if ( pVBInfo->SetFlag & DisableChA )
+                            tempah &= 0x7F ;
+
+                        if ( pVBInfo->SetFlag & EnableChB )
+                            tempah |= 0x40 ;
+
+                        if ( pVBInfo->SetFlag & EnableChA )
+                            tempah |= 0x80 ;
+                    }
+                }
+            }
+        }
+
+        XGINew_SetRegOR( pVBInfo->Part4Port , 0x1F , tempah ) ;          /* EnablePart4_1F */
+
+        if ( pVBInfo->SetFlag & Win9xDOSMode )
+        {
+            XGI_DisplayOn( HwDeviceExtension, pVBInfo) ;
+            return ;
+        }
+
+        if ( !( pVBInfo->SetFlag & DisableChA ) )
+        {
+            XGI_VBLongWait( pVBInfo) ;
+            if ( !( pVBInfo->SetFlag & GatingCRT ) )
+            {
+                XGI_DisableGatingCRT( HwDeviceExtension, pVBInfo ) ;
+                XGI_DisplayOn( HwDeviceExtension, pVBInfo) ;
+                XGI_VBLongWait( pVBInfo) ;
+            }
+        }
+    }  /* 301 */
+    else       /* LVDS */
+    {
+        if ( pVBInfo->VBInfo & ( SetCRT2ToTV | SetCRT2ToLCD | SetCRT2ToLCDA ) )
+            XGINew_SetRegOR( pVBInfo->Part1Port , 0x1E , 0x20 ) ;              /* enable CRT2 */
+
+
+
+        tempah = ( UCHAR )XGINew_GetReg1( pVBInfo->Part1Port , 0x2E ) ;
+        if ( !( tempah & 0x80 ) )
+            XGINew_SetRegOR( pVBInfo->Part1Port , 0x2E , 0x80 ) ;      /* BVBDOENABLE = 1 */
+
+        XGINew_SetRegAND(pVBInfo->Part1Port,0x00,0x7F);
+        XGI_DisplayOn( HwDeviceExtension, pVBInfo);
+    } /* End of VB */
+
+
+    if ( HwDeviceExtension->jChipType < XG40 )
+    {
+        if ( !XGI_EnableChISLCD(pVBInfo) )
+        {
+            if ( pVBInfo->VBInfo & ( SetCRT2ToLCD | SetCRT2ToLCDA ) )
+            {
+                if ( XGI_BacklightByDrv(pVBInfo) )
+                    return ;
+            }
+            else
+                return ;
+        }
+
+        if ( pVBInfo->LCDInfo & SetPWDEnable )
+        {
+            XGI_FirePWDEnable(pVBInfo) ;
+            return ;
+        }
+
+        XGI_SetPanelDelay( 2,pVBInfo ) ;
+
+        if ( pVBInfo->VBType & ( VB_XGI301LV | VB_XGI302LV | VB_XGI301C ) )
+        {
+            tempah = 0x01 ;
+            tempbl = 0xFE ;            /* turn on backlght */
+        }
+        else
+        {
+            tempbl = 0xF7 ;
+            tempah = 0x00 ;
+        }
+        XGI_SetPanelPower( tempah , tempbl , pVBInfo) ;
+    }
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_DisableBridge */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_DisableBridge(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo)
+{
+    USHORT tempax ,
+           tempbx ,
+           tempah = 0 ,
+           tempbl = 0 ;
+
+    if ( pVBInfo->SetFlag == Win9xDOSMode )
+        return ;
+
+
+    if ( HwDeviceExtension->jChipType < XG40 )
+    {
+        if ( ( !( pVBInfo->VBInfo & ( SetCRT2ToLCD | SetCRT2ToLCDA ) ) ) || ( XGI_DisableChISLCD(pVBInfo) ) )
+        {
+            if ( !XGI_IsLCDON(pVBInfo) )
+            {
+                if ( pVBInfo->LCDInfo & SetPWDEnable )
+                    XGI_EnablePWD( pVBInfo) ;
+                else
+                {
+                    pVBInfo->LCDInfo &= ~SetPWDEnable ;
+                    XGI_DisablePWD(pVBInfo) ;
+                    if ( pVBInfo->VBType & ( VB_XGI301LV | VB_XGI302LV | VB_XGI301C ) )
+                    {
+                        tempbx = 0xFE ;  /* not 01h */
+                        tempax = 0 ;
+                    }
+                    else
+                    {
+                        tempbx = 0xF7 ;  /* not 08h */
+                        tempax = 0x08 ;
+                    }
+                    XGI_SetPanelPower( tempax , tempbx , pVBInfo) ;
+                    XGI_SetPanelDelay( 3,pVBInfo ) ;
+                }
+            }  /* end if(!XGI_IsLCDON(pVBInfo)) */
+        }
+    }
+
+/*  if ( CH7017 )
+    {
+        if ( !( pVBInfo->VBInfo & ( SetCRT2ToLCD | SetCRT2toLCDA ) ) || ( XGI_DisableChISLCD(pVBInfo) ) )
+        {
+            if ( !XGI_IsLCDON(pVBInfo) )
+            {
+                if ( DISCHARGE )
+                {
+                    tempbx = XGINew_GetCH7005( 0x61 ) ;
+                    if ( tempbx < 0x01 )   //first time we power up
+                        XGINew_SetCH7005( 0x0066 ) ;   //and disable power sequence
+                    else
+                        XGINew_SetCH7005( 0x5f66 ) ; //leave VDD on - disable power
+                }
+            }
+        }
+    }        */
+
+    if ( pVBInfo->VBType & ( VB_XGI301B | VB_XGI302B| VB_XGI301LV | VB_XGI302LV | VB_XGI301C ) )
+    {
+        tempah = 0x3F ;
+        if ( !( pVBInfo->VBInfo & ( DisableCRT2Display | SetSimuScanMode ) ) )
+        {
+            if ( pVBInfo->VBInfo & SetCRT2ToLCDA )
+            {
+                if ( pVBInfo->VBInfo & SetCRT2ToDualEdge )
+                {
+                    tempah = 0x7F;                     /* Disable Channel A */
+                    if ( !( pVBInfo->VBInfo & SetCRT2ToLCDA ) )
+                        tempah = 0xBF ;                /* Disable Channel B */
+
+                    if ( pVBInfo->SetFlag & DisableChB )
+                        tempah &= 0xBF ;               /* force to disable Cahnnel */
+
+                    if ( pVBInfo->SetFlag & DisableChA )
+                        tempah &= 0x7F ;               /* Force to disable Channel B */
+                }
+            }
+        }
+
+        XGINew_SetRegAND( pVBInfo->Part4Port , 0x1F , tempah ) ;   /* disable part4_1f */
+
+        if ( pVBInfo->VBType & ( VB_XGI302LV | VB_XGI301C ) )
+        {
+            if ( ( ( pVBInfo->VBInfo & ( SetCRT2ToLCD | SetCRT2ToLCDA ) ) ) || ( XGI_DisableChISLCD(pVBInfo) ) || ( XGI_IsLCDON(pVBInfo) ) )
+                XGINew_SetRegOR( pVBInfo->Part4Port , 0x30 , 0x80 ) ;  /* LVDS Driver power down */
+        }
+
+        if ( ( pVBInfo->SetFlag & DisableChA ) || ( pVBInfo->VBInfo & ( DisableCRT2Display | SetCRT2ToLCDA | SetSimuScanMode ) ) )
+        {
+            if ( pVBInfo->SetFlag & GatingCRT )
+                XGI_EnableGatingCRT( HwDeviceExtension, pVBInfo ) ;
+            XGI_DisplayOff( HwDeviceExtension, pVBInfo) ;
+        }
+
+        if ( pVBInfo->VBInfo & SetCRT2ToLCDA )
+        {
+            if ( ( pVBInfo->SetFlag & DisableChA ) || ( pVBInfo->VBInfo & SetCRT2ToLCDA ) )
+                XGINew_SetRegAND( pVBInfo->Part1Port , 0x1e , 0xdf ) ;         /* Power down */
+        }
+
+        XGINew_SetRegAND( pVBInfo->P3c4 , 0x32 , 0xdf ) ;              /* disable TV as primary VGA swap */
+
+        if ( ( pVBInfo->VBInfo & ( SetSimuScanMode | SetCRT2ToDualEdge  ) ) )
+            XGINew_SetRegAND(pVBInfo->Part2Port,0x00,0xdf);
+
+        if ( ( pVBInfo->SetFlag & DisableChB ) || ( pVBInfo->VBInfo & ( DisableCRT2Display | SetSimuScanMode ) )
+        || ( ( !( pVBInfo->VBInfo & SetCRT2ToLCDA ) ) && ( pVBInfo->VBInfo & ( SetCRT2ToRAMDAC | SetCRT2ToLCD | SetCRT2ToTV ) ) ) )
+            XGINew_SetRegOR( pVBInfo->Part1Port , 0x00 , 0x80 ) ;      /* BScreenOff=1 */
+
+        if ( ( pVBInfo->SetFlag & DisableChB ) || ( pVBInfo->VBInfo & ( DisableCRT2Display | SetSimuScanMode ) )
+        || ( !( pVBInfo->VBInfo & SetCRT2ToLCDA ) ) || ( pVBInfo->VBInfo & ( SetCRT2ToRAMDAC | SetCRT2ToLCD | SetCRT2ToTV ) ) )
+        {
+            tempah= XGINew_GetReg1( pVBInfo->Part1Port , 0x00 ) ;      /* save Part1 index 0 */
+            XGINew_SetRegOR( pVBInfo->Part1Port , 0x00 , 0x10 ) ;      /* BTDAC = 1, avoid VB reset */
+            XGINew_SetRegAND( pVBInfo->Part1Port , 0x1E , 0xDF ) ;     /* disable CRT2 */
+            XGINew_SetReg1( pVBInfo->Part1Port , 0x00 , tempah ) ;     /* restore Part1 index 0 */
+        }
+    }
+    else /* {301} */
+    {
+        if ( pVBInfo->VBInfo & ( SetCRT2ToLCD | SetCRT2ToTV ) )
+        {
+            XGINew_SetRegOR( pVBInfo->Part1Port , 0x00 , 0x80 ) ;      /* BScreenOff=1 */
+            XGINew_SetRegAND( pVBInfo->Part1Port , 0x1E , 0xDF ) ;     /* Disable CRT2 */
+            XGINew_SetRegAND( pVBInfo->P3c4 , 0x32 , 0xDF ) ;  /* Disable TV asPrimary VGA swap */
+        }
+
+        if ( pVBInfo->VBInfo & ( DisableCRT2Display | SetCRT2ToLCDA | SetSimuScanMode ) )
+            XGI_DisplayOff( HwDeviceExtension, pVBInfo) ;
+    }
+
+
+
+
+    if ( HwDeviceExtension->jChipType < XG40 )
+    {
+        if ( !( pVBInfo->VBInfo & ( SetCRT2ToLCD | SetCRT2ToLCDA ) ) || ( XGI_DisableChISLCD(pVBInfo) ) || ( XGI_IsLCDON(pVBInfo) ) )
+        {
+            if ( pVBInfo->LCDInfo & SetPWDEnable )
+            {
+                if ( pVBInfo->LCDInfo & SetPWDEnable )
+                    XGI_BacklightByDrv(pVBInfo) ;
+                else
+                {
+                    XGI_SetPanelDelay( 4 ,pVBInfo) ;
+                    if ( pVBInfo->VBType & VB_XGI301LV )
+                    {
+                        tempbl = 0xFD ;
+                        tempah = 0x00 ;
+                    }
+                    else
+                    {
+                        tempbl = 0xFB ;
+                        tempah = 0x04 ;
+                    }
+                }
+            }
+            XGI_SetPanelPower( tempah , tempbl , pVBInfo) ;
+        }
+    }
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_GetTVPtrIndex */
+/* Input : */
+/* Output : */
+/* Description : bx 0 : ExtNTSC */
+/* 1 : StNTSC */
+/* 2 : ExtPAL */
+/* 3 : StPAL */
+/* 4 : ExtHiTV */
+/* 5 : StHiTV */
+/* 6 : Ext525i */
+/* 7 : St525i */
+/* 8 : Ext525p */
+/* 9 : St525p */
+/* A : Ext750p */
+/* B : St750p */
+/* --------------------------------------------------------------------- */
+USHORT XGI_GetTVPtrIndex(  PVB_DEVICE_INFO pVBInfo )
+{
+    USHORT tempbx = 0 ;
+
+    if ( pVBInfo->TVInfo & SetPALTV )
+        tempbx = 2 ;
+    if ( pVBInfo->TVInfo & SetYPbPrMode1080i )
+        tempbx = 4 ;
+    if ( pVBInfo->TVInfo & SetYPbPrMode525i )
+        tempbx = 6 ;
+    if ( pVBInfo->TVInfo & SetYPbPrMode525p )
+        tempbx = 8 ;
+    if ( pVBInfo->TVInfo & SetYPbPrMode750p )
+        tempbx = 10 ;
+    if ( pVBInfo->TVInfo & TVSimuMode )
+        tempbx++ ;
+
+    return tempbx ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_OEM310Setting */
+/* Input : */
+/* Output : */
+/* Description : Customized Param. for 301 */
+/* --------------------------------------------------------------------- */
+void XGI_OEM310Setting( USHORT ModeNo , USHORT ModeIdIndex, PVB_DEVICE_INFO pVBInfo)
+{
+    if ( pVBInfo->SetFlag & Win9xDOSMode )
+        return ;
+
+    /* GetPart1IO(); */
+    XGI_SetDelayComp(pVBInfo) ;
+
+    if ( pVBInfo->VBInfo & ( SetCRT2ToLCD | SetCRT2ToLCDA ) )
+        XGI_SetLCDCap(pVBInfo) ;
+
+    if ( pVBInfo->VBInfo & SetCRT2ToTV )
+    {
+        /* GetPart2IO() */
+        XGI_SetPhaseIncr(pVBInfo) ;
+        XGI_SetYFilter( ModeNo , ModeIdIndex,pVBInfo ) ;
+        XGI_SetAntiFlicker( ModeNo , ModeIdIndex,pVBInfo ) ;
+
+        if ( pVBInfo->VBType&VB_XGI301)
+            XGI_SetEdgeEnhance( ModeNo , ModeIdIndex ,pVBInfo) ;
+    }
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_SetDelayComp */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_SetDelayComp( PVB_DEVICE_INFO pVBInfo )
+{
+    USHORT index ;
+
+    UCHAR  tempah ,
+           tempbl ,
+           tempbh ;
+
+    if ( pVBInfo->VBType & ( VB_XGI301B | VB_XGI302B | VB_XGI301LV | VB_XGI302LV | VB_XGI301C ) )
+    {
+        if ( pVBInfo->VBInfo & ( SetCRT2ToLCD | SetCRT2ToLCDA | SetCRT2ToTV | SetCRT2ToRAMDAC ) )
+        {
+            tempbl = 0;
+            tempbh = 0;
+
+            index = XGI_GetTVPtrIndex(pVBInfo ) ;           /* Get TV Delay */
+            tempbl = pVBInfo->XGI_TVDelayList[ index ] ;
+
+            if ( pVBInfo->VBType & ( VB_XGI301B | VB_XGI302B | VB_XGI301LV | VB_XGI302LV | VB_XGI301C ) )
+                tempbl = pVBInfo->XGI_TVDelayList2[ index ] ;
+
+            if ( pVBInfo->VBInfo & SetCRT2ToDualEdge )
+                tempbl = tempbl >> 4 ;
+/*
+            if ( pVBInfo->VBInfo & SetCRT2ToRAMDAC )
+                tempbl = CRT2Delay1 ;                  // Get CRT2 Delay
+
+            if ( pVBInfo->VBType & ( VB_XGI301B | VB_XGI302B | VB_XGI301LV | VB_XGI302LV | VB_XGI301C ) )
+                tempbl = CRT2Delay2 ;
+*/
+            if ( pVBInfo->VBInfo & ( SetCRT2ToLCD | SetCRT2ToLCDA ) )
+            {
+                index = XGI_GetLCDCapPtr(pVBInfo) ;            /* Get LCD Delay */
+                tempbh=pVBInfo->LCDCapList[ index ].LCD_DelayCompensation ;
+
+                if ( !( pVBInfo->VBInfo & SetCRT2ToLCDA ) )
+                     tempbl = tempbh ;
+            }
+
+            tempbl  &= 0x0F ;
+            tempbh  &= 0xF0 ;
+            tempah = XGINew_GetReg1( pVBInfo->Part1Port , 0x2D ) ;
+
+            if ( pVBInfo->VBInfo & ( SetCRT2ToRAMDAC | SetCRT2ToLCD | SetCRT2ToTV ) )  /* Channel B */
+            {
+                tempah &= 0xF0 ;
+                tempah |= tempbl ;
+            }
+
+            if ( pVBInfo->VBInfo & SetCRT2ToLCDA )             /* Channel A */
+            {
+                tempah &= 0x0F ;
+                tempah |= tempbh ;
+            }
+            XGINew_SetReg1(pVBInfo->Part1Port,0x2D,tempah);
+        }
+    }
+    else if ( pVBInfo->IF_DEF_LVDS == 1 )
+    {
+        tempbl = 0;
+        tempbh = 0;
+        if ( pVBInfo->VBInfo & SetCRT2ToLCD )
+        {
+            tempah = pVBInfo->LCDCapList[ XGI_GetLCDCapPtr(pVBInfo) ].LCD_DelayCompensation ;          /* / Get LCD Delay */
+            tempah &= 0x0f ;
+            tempah = tempah << 4 ;
+            XGINew_SetRegANDOR( pVBInfo->Part1Port , 0x2D , 0x0f , tempah ) ;
+        }
+    }
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_SetLCDCap */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_SetLCDCap( PVB_DEVICE_INFO pVBInfo )
+{
+    USHORT tempcx ;
+
+    tempcx = pVBInfo->LCDCapList[ XGI_GetLCDCapPtr(pVBInfo) ].LCD_Capability ;
+
+    if ( pVBInfo->VBType & ( VB_XGI301B | VB_XGI302B | VB_XGI301LV | VB_XGI302LV | VB_XGI301C ) )
+    {
+        if ( pVBInfo->VBType & ( VB_XGI301LV | VB_XGI302LV | VB_XGI301C ) )
+        {                                      /* 301LV/302LV only */
+            /* Set 301LV Capability */
+            XGINew_SetReg1( pVBInfo->Part4Port , 0x24 , ( UCHAR )( tempcx & 0x1F ) ) ;
+       }
+        /* VB Driving */
+        XGINew_SetRegANDOR( pVBInfo->Part4Port , 0x0D , ~( ( EnableVBCLKDRVLOW | EnablePLLSPLOW ) >> 8 ) , ( USHORT )( ( tempcx & ( EnableVBCLKDRVLOW | EnablePLLSPLOW ) ) >> 8 ) ) ;
+    }
+
+    if ( pVBInfo->VBType & ( VB_XGI301B | VB_XGI302B | VB_XGI301LV | VB_XGI302LV | VB_XGI301C ) )
+    {
+        if ( pVBInfo->VBInfo & SetCRT2ToLCD )
+            XGI_SetLCDCap_B( tempcx,pVBInfo ) ;
+        else if ( pVBInfo->VBInfo & SetCRT2ToLCDA )
+            XGI_SetLCDCap_A( tempcx,pVBInfo ) ;
+
+        if ( pVBInfo->VBType & ( VB_XGI302LV | VB_XGI301C ) )
+        {
+            if ( tempcx & EnableSpectrum )
+                SetSpectrum( pVBInfo) ;
+        }
+    }
+    else      /* LVDS,CH7017 */
+        XGI_SetLCDCap_A( tempcx, pVBInfo ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_SetLCDCap_A */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_SetLCDCap_A(USHORT tempcx,PVB_DEVICE_INFO pVBInfo)
+{
+    USHORT temp ;
+
+    temp = XGINew_GetReg1( pVBInfo->P3d4 , 0x37 ) ;
+
+    if ( temp & LCDRGB18Bit )
+    {
+        XGINew_SetRegANDOR( pVBInfo->Part1Port , 0x19 , 0x0F , ( USHORT )( 0x20 | ( tempcx & 0x00C0 ) ) ) ; /* Enable Dither */
+        XGINew_SetRegANDOR( pVBInfo->Part1Port , 0x1A , 0x7F , 0x80 ) ;
+    }
+    else
+    {
+        XGINew_SetRegANDOR( pVBInfo->Part1Port , 0x19 , 0x0F , ( USHORT )( 0x30 | ( tempcx & 0x00C0 ) ) ) ;
+        XGINew_SetRegANDOR( pVBInfo->Part1Port , 0x1A , 0x7F , 0x00 ) ;
+    }
+
+/*
+    if ( tempcx & EnableLCD24bpp )     // 24bits
+    {
+        XGINew_SetRegANDOR(pVBInfo->Part1Port,0x19, 0x0F,(USHORT)(0x30|(tempcx&0x00C0)) );
+        XGINew_SetRegANDOR(pVBInfo->Part1Port,0x1A,0x7F,0x00);
+    }
+    else
+    {
+        XGINew_SetRegANDOR(pVBInfo->Part1Port,0x19, 0x0F,(USHORT)(0x20|(tempcx&0x00C0)) );//Enable Dither
+        XGINew_SetRegANDOR(pVBInfo->Part1Port,0x1A,0x7F,0x80);
+    }
+*/
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_SetLCDCap_B */
+/* Input : cx -> LCD Capability */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_SetLCDCap_B(USHORT tempcx,PVB_DEVICE_INFO pVBInfo)
+{
+    if ( tempcx & EnableLCD24bpp )     /* 24bits */
+        XGINew_SetRegANDOR( pVBInfo->Part2Port , 0x1A , 0xE0 , ( USHORT )( ( ( tempcx & 0x00ff ) >> 6 ) | 0x0c ) ) ;
+    else
+        XGINew_SetRegANDOR( pVBInfo->Part2Port , 0x1A , 0xE0 , ( USHORT )( ( ( tempcx & 0x00ff ) >> 6 ) | 0x18 ) ) ; /* Enable Dither */
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : SetSpectrum */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void SetSpectrum( PVB_DEVICE_INFO pVBInfo )
+{
+    USHORT index ;
+
+    index = XGI_GetLCDCapPtr(pVBInfo) ;
+
+    XGINew_SetRegAND( pVBInfo->Part4Port , 0x30 , 0x8F ) ;   /* disable down spectrum D[4] */
+    XGI_LongWait(pVBInfo) ;
+    XGINew_SetRegOR( pVBInfo->Part4Port , 0x30 , 0x20 ) ;       /* reset spectrum */
+    XGI_LongWait(pVBInfo) ;
+
+    XGINew_SetReg1( pVBInfo->Part4Port , 0x31 , pVBInfo->LCDCapList[ index ].Spectrum_31 ) ;
+    XGINew_SetReg1( pVBInfo->Part4Port , 0x32 , pVBInfo->LCDCapList[ index ].Spectrum_32 ) ;
+    XGINew_SetReg1( pVBInfo->Part4Port , 0x33 , pVBInfo->LCDCapList[ index ].Spectrum_33 ) ;
+    XGINew_SetReg1( pVBInfo->Part4Port , 0x34 , pVBInfo->LCDCapList[ index ].Spectrum_34 ) ;
+    XGI_LongWait(pVBInfo) ;
+    XGINew_SetRegOR( pVBInfo->Part4Port , 0x30 , 0x40 ) ; /* enable spectrum */
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_SetAntiFlicker */
+/* Input : */
+/* Output : */
+/* Description : Set TV Customized Param. */
+/* --------------------------------------------------------------------- */
+void XGI_SetAntiFlicker( USHORT ModeNo , USHORT ModeIdIndex, PVB_DEVICE_INFO pVBInfo )
+{
+    USHORT tempbx ,
+           index ;
+
+    UCHAR tempah ;
+
+    if (pVBInfo->TVInfo & ( SetYPbPrMode525p | SetYPbPrMode750p ) )
+        return ;
+
+    tempbx = XGI_GetTVPtrIndex(pVBInfo ) ;
+    tempbx &= 0xFE ;
+
+    if ( ModeNo <= 0x13 )
+    {
+        index = pVBInfo->SModeIDTable[ ModeIdIndex ].VB_StTVFlickerIndex ;
+    }
+    else
+    {
+        index = pVBInfo->EModeIDTable[ ModeIdIndex ].VB_ExtTVFlickerIndex ;
+    }
+
+    tempbx += index ;
+    tempah = TVAntiFlickList[ tempbx ] ;
+    tempah = tempah << 4 ;
+
+    XGINew_SetRegANDOR( pVBInfo->Part2Port , 0x0A , 0x8F , tempah ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_SetEdgeEnhance */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_SetEdgeEnhance( USHORT ModeNo , USHORT ModeIdIndex , PVB_DEVICE_INFO pVBInfo)
+{
+    USHORT tempbx ,
+           index ;
+
+    UCHAR tempah ;
+
+
+    tempbx = XGI_GetTVPtrIndex(pVBInfo ) ;
+    tempbx &= 0xFE ;
+
+    if ( ModeNo <= 0x13 )
+    {
+        index = pVBInfo->SModeIDTable[ ModeIdIndex ].VB_StTVEdgeIndex ;
+    }
+    else
+    {
+        index = pVBInfo->EModeIDTable[ ModeIdIndex ].VB_ExtTVEdgeIndex ;
+    }
+
+    tempbx += index ;
+    tempah = TVEdgeList[ tempbx ] ;
+    tempah = tempah << 5 ;
+
+    XGINew_SetRegANDOR( pVBInfo->Part2Port , 0x3A , 0x1F , tempah ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_SetPhaseIncr */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_SetPhaseIncr( PVB_DEVICE_INFO pVBInfo )
+{
+    USHORT tempbx ;
+
+    UCHAR tempcl ,
+          tempch ;
+
+    ULONG tempData ;
+
+    XGI_GetTVPtrIndex2( &tempbx , &tempcl , &tempch, pVBInfo ) ; /* bx, cl, ch */
+    tempData = TVPhaseList[ tempbx ] ;
+
+    XGINew_SetReg1( pVBInfo->Part2Port , 0x31 , ( USHORT )( tempData & 0x000000FF ) ) ;
+    XGINew_SetReg1( pVBInfo->Part2Port , 0x32 , ( USHORT )( ( tempData & 0x0000FF00 ) >> 8 ) ) ;
+    XGINew_SetReg1( pVBInfo->Part2Port , 0x33 , ( USHORT )( ( tempData & 0x00FF0000 ) >> 16 ) ) ;
+    XGINew_SetReg1( pVBInfo->Part2Port , 0x34 , ( USHORT )( ( tempData & 0xFF000000 ) >> 24 ) ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_SetYFilter */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_SetYFilter( USHORT ModeNo , USHORT ModeIdIndex, PVB_DEVICE_INFO pVBInfo)
+{
+    USHORT tempbx ,
+           index ;
+
+    UCHAR tempcl ,
+          tempch ,
+          tempal ,
+          *filterPtr ;
+
+    XGI_GetTVPtrIndex2( &tempbx , &tempcl , &tempch, pVBInfo ) ; /* bx, cl, ch */
+
+    switch( tempbx )
+    {
+        case 0x00:
+        case 0x04:
+            filterPtr = NTSCYFilter1 ;
+            break ;
+
+        case 0x01:
+            filterPtr = PALYFilter1 ;
+            break ;
+
+        case 0x02:
+        case 0x05:
+        case 0x0D:
+            filterPtr = PALMYFilter1 ;
+            break ;
+
+        case 0x03:
+            filterPtr = PALNYFilter1 ;
+            break ;
+
+        case 0x08:
+        case 0x0C:
+            filterPtr = NTSCYFilter2 ;
+            break ;
+
+        case 0x0A:
+            filterPtr = PALMYFilter2 ;
+            break ;
+
+        case 0x0B:
+            filterPtr = PALNYFilter2 ;
+            break ;
+
+        case 0x09:
+            filterPtr = PALYFilter2 ;
+            break ;
+
+        default:
+            return ;
+    }
+
+    if ( ModeNo <= 0x13 )
+        tempal = pVBInfo->SModeIDTable[ ModeIdIndex ].VB_StTVYFilterIndex ;
+    else
+        tempal = pVBInfo->EModeIDTable[ ModeIdIndex ].VB_ExtTVYFilterIndex ;
+
+    if ( tempcl == 0 )
+        index = tempal * 4;
+    else
+        index = tempal * 7;
+
+    if ( ( tempcl == 0 ) && ( tempch == 1 ) )
+    {
+        XGINew_SetReg1( pVBInfo->Part2Port , 0x35 , 0 ) ;
+        XGINew_SetReg1( pVBInfo->Part2Port , 0x36 , 0 ) ;
+        XGINew_SetReg1( pVBInfo->Part2Port , 0x37 , 0 ) ;
+        XGINew_SetReg1( pVBInfo->Part2Port , 0x38 , filterPtr[ index++ ] ) ;
+    }
+    else
+    {
+        XGINew_SetReg1( pVBInfo->Part2Port , 0x35 , filterPtr[ index++ ] ) ;
+        XGINew_SetReg1( pVBInfo->Part2Port , 0x36 , filterPtr[ index++ ] ) ;
+        XGINew_SetReg1( pVBInfo->Part2Port , 0x37 , filterPtr[ index++ ] ) ;
+        XGINew_SetReg1( pVBInfo->Part2Port , 0x38 , filterPtr[ index++ ] ) ;
+    }
+
+    if ( pVBInfo->VBType & ( VB_XGI301B | VB_XGI302B | VB_XGI301LV | VB_XGI302LV | VB_XGI301C ) )
+    {
+        XGINew_SetReg1( pVBInfo->Part2Port , 0x48 , filterPtr[ index++ ] ) ;
+        XGINew_SetReg1( pVBInfo->Part2Port , 0x49 , filterPtr[ index++ ] ) ;
+        XGINew_SetReg1( pVBInfo->Part2Port , 0x4A , filterPtr[ index++ ] ) ;
+    }
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_GetTVPtrIndex2 */
+/* Input : */
+/* Output : bx 0 : NTSC */
+/* 1 : PAL */
+/* 2 : PALM */
+/* 3 : PALN */
+/* 4 : NTSC1024x768 */
+/* 5 : PAL-M 1024x768 */
+/* 6-7: reserved */
+/* cl 0 : YFilter1 */
+/* 1 : YFilter2 */
+/* ch 0 : 301A */
+/* 1 : 301B/302B/301LV/302LV */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_GetTVPtrIndex2(USHORT* tempbx,UCHAR* tempcl,UCHAR* tempch, PVB_DEVICE_INFO pVBInfo)
+{
+    *tempbx = 0 ;
+    *tempcl = 0 ;
+    *tempch = 0 ;
+
+    if ( pVBInfo->TVInfo & SetPALTV )
+        *tempbx = 1 ;
+
+    if ( pVBInfo->TVInfo & SetPALMTV )
+        *tempbx = 2 ;
+
+    if ( pVBInfo->TVInfo & SetPALNTV )
+        *tempbx = 3 ;
+
+    if ( pVBInfo->TVInfo & NTSC1024x768 )
+    {
+        *tempbx = 4 ;
+        if ( pVBInfo->TVInfo & SetPALMTV )
+            *tempbx = 5 ;
+    }
+
+    if ( pVBInfo->VBType & ( VB_XGI301B | VB_XGI302B | VB_XGI301LV | VB_XGI302LV | VB_XGI301C ) )
+    {
+        if ( ( !( pVBInfo->VBInfo & SetInSlaveMode ) ) || ( pVBInfo->TVInfo & TVSimuMode ) )
+        {
+            *tempbx += 8 ;
+            *tempcl += 1 ;
+        }
+    }
+
+    if ( pVBInfo->VBType & ( VB_XGI301B | VB_XGI302B | VB_XGI301LV | VB_XGI302LV | VB_XGI301C ) )
+        (*tempch)++ ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_SetCRT2ModeRegs */
+/* Input : */
+/* Output : */
+/* Description : Origin code for crt2group */
+/* --------------------------------------------------------------------- */
+void XGI_SetCRT2ModeRegs(USHORT ModeNo,PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo)
+{
+    USHORT tempbl ;
+    SHORT  tempcl ;
+
+    UCHAR  tempah ;
+
+    /* XGINew_SetReg1( pVBInfo->Part1Port , 0x03 , 0x00 ) ; // fix write part1 index 0 BTDRAM bit Bug */
+    tempah=0;
+    if ( !( pVBInfo->VBInfo & DisableCRT2Display ) )
+    {
+        tempah=XGINew_GetReg1( pVBInfo->Part1Port , 0x00 ) ;
+        tempah &= ~0x10 ;      /* BTRAMDAC */
+        tempah |=  0x40 ;      /* BTRAM */
+
+        if ( pVBInfo->VBInfo & ( SetCRT2ToRAMDAC | SetCRT2ToTV | SetCRT2ToLCD ) )
+        {
+            tempah=0x40;       /* BTDRAM */
+            if ( ModeNo > 0x13 )
+            {
+                tempcl = pVBInfo->ModeType ;
+                tempcl -= ModeVGA ;
+                if ( tempcl >= 0 )
+                {
+                    tempah = ( 0x008 >> tempcl ) ;     /* BT Color */
+                    if ( tempah == 0 )
+                        tempah = 1 ;
+                    tempah |= 0x040 ;
+                }
+            }
+            if ( pVBInfo->VBInfo & SetInSlaveMode )
+                tempah ^= 0x50 ;       /* BTDAC */
+        }
+    }
+
+/*     0210 shampoo
+    if ( pVBInfo->VBInfo & DisableCRT2Display )
+    {
+        tempah = 0 ;
+    }
+
+    XGINew_SetReg1( pVBInfo->Part1Port , 0x00 , tempah ) ;
+    if ( pVBInfo->VBInfo & ( SetCRT2ToRAMDAC | SetCRT2ToTV | SetCRT2ToLCD ) )
+    {
+        tempcl = pVBInfo->ModeType ;
+        if ( ModeNo > 0x13 )
+        {
+            tempcl -= ModeVGA ;
+            if ( ( tempcl > 0 ) || ( tempcl == 0 ) )
+            {
+                tempah=(0x008>>tempcl) ;
+                if ( tempah == 0 )
+                    tempah = 1 ;
+                tempah |= 0x040;
+            }
+        }
+        else
+        {
+            tempah = 0x040 ;
+        }
+
+        if ( pVBInfo->VBInfo & SetInSlaveMode )
+        {
+            tempah = ( tempah ^ 0x050 ) ;
+        }
+    }
+*/
+
+    XGINew_SetReg1( pVBInfo->Part1Port , 0x00 , tempah ) ;
+    tempah = 0x08 ;
+    tempbl = 0xf0 ;
+
+    if ( pVBInfo->VBInfo & DisableCRT2Display )
+        XGINew_SetRegANDOR( pVBInfo->Part1Port , 0x2e , tempbl , tempah ) ;
+    else
+    {
+        tempah = 0x00 ;
+        tempbl = 0xff ;
+
+        if ( pVBInfo->VBInfo & ( SetCRT2ToRAMDAC | SetCRT2ToTV | SetCRT2ToLCD | SetCRT2ToLCDA ) )
+        {
+            if ( ( pVBInfo->VBInfo & SetCRT2ToLCDA ) && ( !( pVBInfo->VBInfo & SetSimuScanMode ) ) )
+            {
+                tempbl &= 0xf7 ;
+                tempah |= 0x01 ;
+                XGINew_SetRegANDOR( pVBInfo->Part1Port , 0x2e , tempbl , tempah ) ;
+            }
+            else
+            {
+                if ( pVBInfo->VBInfo & SetCRT2ToLCDA )
+                {
+                    tempbl &= 0xf7 ;
+                    tempah |= 0x01 ;
+                }
+
+                if ( pVBInfo->VBInfo & ( SetCRT2ToRAMDAC | SetCRT2ToTV | SetCRT2ToLCD ) )
+                {
+                    tempbl &= 0xf8 ;
+                    tempah = 0x01 ;
+
+                    if ( !( pVBInfo->VBInfo & SetInSlaveMode ) )
+                        tempah |= 0x02 ;
+
+                    if ( !( pVBInfo->VBInfo & SetCRT2ToRAMDAC ) )
+                    {
+                        tempah = tempah ^ 0x05 ;
+                        if ( !( pVBInfo->VBInfo & SetCRT2ToLCD ) )
+                            tempah = tempah ^ 0x01 ;
+                    }
+
+                    if ( !( pVBInfo->VBInfo & SetCRT2ToDualEdge ) )
+                        tempah |= 0x08 ;
+                    XGINew_SetRegANDOR( pVBInfo->Part1Port , 0x2e , tempbl , tempah ) ;
+                }
+                else
+                    XGINew_SetRegANDOR( pVBInfo->Part1Port , 0x2e , tempbl , tempah ) ;
+            }
+        }
+        else
+            XGINew_SetRegANDOR( pVBInfo->Part1Port , 0x2e , tempbl , tempah ) ;
+    }
+
+    if ( pVBInfo->VBInfo & ( SetCRT2ToRAMDAC | SetCRT2ToTV | SetCRT2ToLCD | SetCRT2ToLCDA ) )
+    {
+        tempah &= ( ~0x08 ) ;
+        if ( ( pVBInfo->ModeType == ModeVGA ) && ( !( pVBInfo->VBInfo & SetInSlaveMode ) ) )
+        {
+            tempah |= 0x010 ;
+        }
+        tempah |= 0x080 ;
+
+        if ( pVBInfo->VBInfo & SetCRT2ToTV )
+        {
+            /* if ( !( pVBInfo->TVInfo & ( SetYPbPrMode525p | SetYPbPrMode750p ) ) ) */
+            /* { */
+            tempah |= 0x020 ;
+            if ( ModeNo > 0x13 )
+            {
+                if ( pVBInfo->VBInfo & DriverMode )
+                    tempah = tempah ^ 0x20 ;
+            }
+        /* } */
+        }
+
+        XGINew_SetRegANDOR( pVBInfo->Part4Port , 0x0D , ~0x0BF , tempah ) ;
+        tempah = 0 ;
+
+        if ( pVBInfo->LCDInfo & SetLCDDualLink )
+            tempah |= 0x40 ;
+
+        if ( pVBInfo->VBInfo & SetCRT2ToTV )
+        {
+            /* if ( ( !( pVBInfo->VBInfo & SetCRT2ToHiVisionTV ) ) && ( !( pVBInfo->TVInfo & ( SetYPbPrMode525p | SetYPbPrMode750p ) ) ) ) */
+            /* { */
+                if ( pVBInfo->TVInfo & RPLLDIV2XO )
+                    tempah |= 0x40 ;
+            /* } */
+        }
+
+        if ( ( pVBInfo->LCDResInfo == Panel1280x1024 ) || ( pVBInfo->LCDResInfo == Panel1280x1024x75 ) )
+            tempah |= 0x80 ;
+
+        if ( pVBInfo->LCDResInfo == Panel1280x960 )
+            tempah |= 0x80 ;
+
+        XGINew_SetReg1( pVBInfo->Part4Port , 0x0C , tempah ) ;
+    }
+
+    if ( pVBInfo->VBType & ( VB_XGI301B | VB_XGI302B | VB_XGI301LV | VB_XGI302LV | VB_XGI301C ) )
+    {
+        tempah = 0 ;
+        tempbl = 0xfb ;
+
+        if ( pVBInfo->VBInfo & SetCRT2ToDualEdge )
+        {
+            tempbl=0xff;
+            if ( pVBInfo->VBInfo & SetCRT2ToLCDA )
+                tempah |= 0x04 ; /* shampoo 0129 */
+        }
+
+        XGINew_SetRegANDOR( pVBInfo->Part1Port , 0x13 , tempbl , tempah ) ;
+        tempah = 0x00 ;
+        tempbl = 0xcf ;
+        if ( !( pVBInfo->VBInfo & DisableCRT2Display ) )
+        {
+            if ( pVBInfo->VBInfo & SetCRT2ToDualEdge )
+                tempah |= 0x30 ;
+        }
+
+        XGINew_SetRegANDOR( pVBInfo->Part1Port , 0x2c , tempbl , tempah ) ;
+        tempah = 0 ;
+        tempbl = 0x3f ;
+
+        if ( !( pVBInfo->VBInfo & DisableCRT2Display ) )
+        {
+            if ( pVBInfo->VBInfo & SetCRT2ToDualEdge )
+                tempah |= 0xc0 ;
+        }
+        XGINew_SetRegANDOR( pVBInfo->Part4Port , 0x21 , tempbl , tempah ) ;
+    }
+
+    tempah = 0 ;
+    tempbl = 0x7f ;
+    if ( !( pVBInfo->VBInfo & SetCRT2ToLCDA ) )
+    {
+        tempbl = 0xff ;
+        if ( !( pVBInfo->VBInfo & SetCRT2ToDualEdge ) )
+            tempah |= 0x80 ;
+    }
+
+    XGINew_SetRegANDOR( pVBInfo->Part4Port , 0x23 , tempbl , tempah ) ;
+
+    if ( pVBInfo->VBType & ( VB_XGI302LV | VB_XGI301C ) )
+    {
+        if ( pVBInfo->LCDInfo & SetLCDDualLink )
+        {
+            XGINew_SetRegOR( pVBInfo->Part4Port , 0x27 , 0x20 ) ;
+            XGINew_SetRegOR( pVBInfo->Part4Port , 0x34 , 0x10 ) ;
+        }
+    }
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_CloseCRTC */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_CloseCRTC( PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo )
+{
+    USHORT tempbx ;
+
+    tempbx = 0 ;
+
+    if ( pVBInfo->VBInfo & SetCRT2ToLCDA )
+        tempbx = 0x08A0 ;
+
+
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_OpenCRTC */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_OpenCRTC( PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo )
+{
+    USHORT tempbx ;
+
+    tempbx = 0 ;
+
+
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_GetRAMDAC2DATA */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_GetRAMDAC2DATA(USHORT ModeNo , USHORT ModeIdIndex , USHORT RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo )
+{
+    USHORT tempax ,
+           tempbx ,
+           temp1 ,
+           temp2 ,
+           modeflag = 0 ,
+           tempcx ,
+           StandTableIndex ,
+           CRT1Index ;
+
+    pVBInfo->RVBHCMAX = 1 ;
+    pVBInfo->RVBHCFACT = 1 ;
+
+    if ( ModeNo <= 0x13 )
+    {
+        modeflag = pVBInfo->SModeIDTable[ ModeIdIndex ].St_ModeFlag ;
+        StandTableIndex = XGI_GetModePtr( ModeNo , ModeIdIndex, pVBInfo ) ;
+        tempax = pVBInfo->StandTable[ StandTableIndex ].CRTC[ 0 ] ;
+        tempbx = pVBInfo->StandTable[StandTableIndex ].CRTC[ 6 ] ;
+        temp1 = pVBInfo->StandTable[ StandTableIndex ].CRTC[ 7 ] ;
+    }
+    else
+    {
+        modeflag = pVBInfo->EModeIDTable[ ModeIdIndex ].Ext_ModeFlag ;
+        CRT1Index = pVBInfo->RefIndex[ RefreshRateTableIndex ].Ext_CRT1CRTC ;
+        CRT1Index &= IndexMask ;
+        temp1 = ( USHORT )pVBInfo->XGINEWUB_CRT1Table[ CRT1Index ].CR[ 0 ] ;
+        temp2 = ( USHORT )pVBInfo->XGINEWUB_CRT1Table[ CRT1Index ].CR[ 5 ] ;
+       tempax = ( temp1 & 0xFF ) | ( ( temp2 & 0x03 ) << 8 ) ;
+        tempbx = ( USHORT )pVBInfo->XGINEWUB_CRT1Table[ CRT1Index ].CR[ 8 ] ;
+        tempcx = ( USHORT )pVBInfo->XGINEWUB_CRT1Table[ CRT1Index ].CR[ 14 ] << 8 ;
+       tempcx &= 0x0100 ;
+       tempcx = tempcx << 2 ;
+       tempbx |= tempcx;
+        temp1 = ( USHORT )pVBInfo->XGINEWUB_CRT1Table[ CRT1Index ].CR[ 9 ] ;
+    }
+
+    if ( temp1 & 0x01 )
+        tempbx |= 0x0100 ;
+
+    if ( temp1 & 0x20 )
+        tempbx |= 0x0200 ;
+    tempax += 5 ;
+
+    if ( modeflag & Charx8Dot )
+        tempax *= 8 ;
+    else
+        tempax *= 9 ;
+
+    pVBInfo->VGAHT = tempax ;
+    pVBInfo->HT = tempax ;
+    tempbx++ ;
+    pVBInfo->VGAVT = tempbx ;
+    pVBInfo->VT = tempbx ;
+}
+
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_GetColorDepth */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+USHORT XGI_GetColorDepth(USHORT ModeNo , USHORT ModeIdIndex, PVB_DEVICE_INFO pVBInfo)
+{
+    USHORT ColorDepth[ 6 ] = { 1 , 2 , 4 , 4 , 6 , 8 } ;
+    SHORT  index ;
+    USHORT modeflag ;
+
+    if ( ModeNo <= 0x13 )
+    {
+        modeflag = pVBInfo->SModeIDTable[ ModeIdIndex ].St_ModeFlag ;
+    }
+    else
+    {
+        modeflag = pVBInfo->EModeIDTable[ ModeIdIndex ].Ext_ModeFlag ;
+    }
+
+    index=(modeflag&ModeInfoFlag)-ModeEGA;
+
+    if ( index < 0 )
+        index = 0 ;
+
+    return( ColorDepth[ index ] ) ;
+}
+
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_UnLockCRT2 */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_UnLockCRT2( PXGI_HW_DEVICE_INFO HwDeviceExtension,  PVB_DEVICE_INFO pVBInfo )
+{
+
+    XGINew_SetRegANDOR( pVBInfo->Part1Port , 0x2f , 0xFF , 0x01 ) ;
+
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_LockCRT2 */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_LockCRT2( PXGI_HW_DEVICE_INFO HwDeviceExtension,  PVB_DEVICE_INFO pVBInfo )
+{
+
+    XGINew_SetRegANDOR( pVBInfo->Part1Port , 0x2F , 0xFE , 0x00 ) ;
+
+
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGINew_EnableCRT2 */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGINew_EnableCRT2( PVB_DEVICE_INFO pVBInfo)
+{
+    XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x1E , 0xFF , 0x20 ) ;
+}
+
+
+
+/* --------------------------------------------------------------------- */
+/* Function : */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGINew_LCD_Wait_Time(UCHAR DelayTime, PVB_DEVICE_INFO pVBInfo)
+{
+    USHORT i ,
+           j ;
+
+    ULONG temp ,
+          flag ;
+
+    flag = 0 ;
+//printk("XGINew_LCD_Wait_Time");
+//return;
+    for( i = 0 ; i < DelayTime ; i++ )
+    {
+        for( j = 0 ; j < 66 ; j++ )
+        {
+
+            temp =  XGINew_GetReg3( 0x61 ) ;
+
+            //temp &= 0x10000000;
+            temp &= 0x10;
+            if ( temp == flag )
+                continue ;
+
+            flag = temp ;
+        }
+    }
+}
+
+
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_BridgeIsOn */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+BOOLEAN XGI_BridgeIsOn( PVB_DEVICE_INFO pVBInfo )
+{
+    USHORT flag ;
+
+    if ( pVBInfo->IF_DEF_LVDS == 1 )
+    {
+        return( 1 ) ;
+    }
+    else
+    {
+        flag = XGINew_GetReg1( pVBInfo->Part4Port , 0x00 ) ;
+        if ( ( flag == 1 ) || ( flag == 2 ) )
+            return( 1 ) ;      /* 301b */
+        else
+            return( 0 ) ;
+    }
+}
+
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_LongWait */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_LongWait(PVB_DEVICE_INFO pVBInfo)
+{
+    USHORT i ;
+
+    i = XGINew_GetReg1( pVBInfo->P3c4 , 0x1F ) ;
+
+    if ( !( i & 0xC0 ) )
+    {
+        for( i = 0 ; i < 0xFFFF ; i++ )
+        {
+            if ( !( XGINew_GetReg2( pVBInfo->P3da ) & 0x08 ) )
+                break ;
+        }
+
+        for( i = 0 ; i < 0xFFFF ; i++ )
+        {
+            if ( ( XGINew_GetReg2( pVBInfo->P3da ) & 0x08 ) )
+                break ;
+       }
+    }
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_VBLongWait */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGI_VBLongWait( PVB_DEVICE_INFO pVBInfo )
+{
+    USHORT tempal ,
+           temp ,
+           i ,
+           j ;
+return ;
+    if ( !( pVBInfo->VBInfo & SetCRT2ToTV ) )
+    {
+        temp = 0 ;
+        for( i = 0 ; i < 3 ; i++ )
+        {
+            for( j = 0 ; j < 100 ; j++ )
+            {
+                tempal = XGINew_GetReg2( pVBInfo->P3da ) ;
+                if ( temp & 0x01 )
+                {                      /* VBWaitMode2 */
+                    if ( ( tempal & 0x08 ) )
+                    {
+                        continue ;
+                    }
+
+                    if ( !( tempal & 0x08 ) )
+                    {
+                        break ;
+                    }
+                }
+                else
+                {                      /* VBWaitMode1 */
+                    if ( !( tempal & 0x08 ) )
+                    {
+                        continue ;
+                    }
+
+                    if ( ( tempal & 0x08 ) )
+                    {
+                        break ;
+                    }
+                }
+            }
+            temp = temp ^ 0x01 ;
+        }
+    }
+    else
+    {
+        XGI_LongWait(pVBInfo) ;
+    }
+    return ;
+}
+
+
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_GetVGAHT2 */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+USHORT XGI_GetVGAHT2( PVB_DEVICE_INFO pVBInfo )
+{
+    ULONG tempax ,
+          tempbx ;
+
+    tempbx = ( ( pVBInfo->VGAVT - pVBInfo->VGAVDE ) * pVBInfo->RVBHCMAX ) & 0xFFFF ;
+    tempax = ( pVBInfo->VT - pVBInfo->VDE ) * pVBInfo->RVBHCFACT ;
+    tempax = ( tempax * pVBInfo->HT ) /tempbx ;
+
+    return( ( USHORT )tempax ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_GetVCLK2Ptr */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+USHORT XGI_GetVCLK2Ptr( USHORT ModeNo , USHORT ModeIdIndex , USHORT RefreshRateTableIndex , PXGI_HW_DEVICE_INFO HwDeviceExtension ,PVB_DEVICE_INFO pVBInfo)
+{
+    USHORT tempbx ;
+
+    USHORT LCDXlat1VCLK[ 4 ] = { VCLK65 + 2 , VCLK65 + 2 , VCLK65 + 2 , VCLK65 + 2 } ;
+    USHORT LCDXlat2VCLK[ 4 ] = { VCLK108_2 + 5 , VCLK108_2 + 5 , VCLK108_2 + 5 , VCLK108_2 + 5 } ;
+    USHORT LVDSXlat1VCLK[ 4 ] = { VCLK40 , VCLK40 , VCLK40 , VCLK40 } ;
+    USHORT LVDSXlat2VCLK[ 4 ] = { VCLK65 + 2 , VCLK65 + 2 , VCLK65 + 2 , VCLK65 + 2 } ;
+    USHORT LVDSXlat3VCLK[ 4 ] = { VCLK65 + 2 , VCLK65 + 2 , VCLK65 + 2 , VCLK65 + 2 } ;
+
+    USHORT CRT2Index , VCLKIndex ;
+    USHORT modeflag , resinfo ;
+    UCHAR *CHTVVCLKPtr = NULL ;
+
+    if ( ModeNo <= 0x13 )
+    {
+        modeflag = pVBInfo->SModeIDTable[ ModeIdIndex ].St_ModeFlag ;      /* si+St_ResInfo */
+        resinfo = pVBInfo->SModeIDTable[ ModeIdIndex ].St_ResInfo ;
+        CRT2Index = pVBInfo->SModeIDTable[ ModeIdIndex ].St_CRT2CRTC ;
+    }
+    else
+    {
+        modeflag = pVBInfo->EModeIDTable[ ModeIdIndex ].Ext_ModeFlag ;     /* si+Ext_ResInfo */
+        resinfo = pVBInfo->EModeIDTable[ ModeIdIndex ].Ext_RESINFO ;
+        CRT2Index = pVBInfo->RefIndex[ RefreshRateTableIndex ].Ext_CRT2CRTC ;
+    }
+
+    if ( pVBInfo->IF_DEF_LVDS == 0 )
+    {
+        CRT2Index = CRT2Index >> 6 ;        /*  for LCD */
+        if ( ( ( pVBInfo->VBInfo & SetCRT2ToLCD ) | SetCRT2ToLCDA ) )   /*301b*/
+        {
+            if ( pVBInfo->LCDResInfo != Panel1024x768 )
+            {
+                VCLKIndex = LCDXlat2VCLK[ CRT2Index ] ;
+            }
+            else
+            {
+                 VCLKIndex = LCDXlat1VCLK[ CRT2Index ] ;
+            }
+        }
+        else   /* for TV */
+        {
+            if ( pVBInfo->VBInfo & SetCRT2ToTV )
+            {
+                if ( pVBInfo->VBInfo & SetCRT2ToHiVisionTV )
+                {
+                    if ( pVBInfo->SetFlag & RPLLDIV2XO )
+                    {
+                        VCLKIndex = HiTVVCLKDIV2 ;
+
+
+                            VCLKIndex += 25 ;
+
+                    }
+                    else
+                    {
+                        VCLKIndex = HiTVVCLK ;
+
+
+                            VCLKIndex += 25 ;
+
+                    }
+
+                    if ( pVBInfo->SetFlag & TVSimuMode )
+                    {
+                        if( modeflag & Charx8Dot )
+                        {
+                            VCLKIndex = HiTVSimuVCLK ;
+
+
+                                VCLKIndex += 25 ;
+
+                        }
+                        else
+                        {
+                            VCLKIndex = HiTVTextVCLK ;
+
+
+                                VCLKIndex += 25 ;
+
+                        }
+                    }
+
+                    if ( pVBInfo->VBType & VB_XGI301LV )       /* 301lv */
+                    {
+                        if ( !( pVBInfo->VBExtInfo == VB_YPbPr1080i ) )
+                        {
+                            VCLKIndex = YPbPr750pVCLK ;
+                            if ( !( pVBInfo->VBExtInfo == VB_YPbPr750p ) )
+                            {
+                                VCLKIndex = YPbPr525pVCLK ;
+                                if ( !( pVBInfo->VBExtInfo == VB_YPbPr525p ) )
+                                {
+                                    VCLKIndex = YPbPr525iVCLK_2 ;
+                                    if ( !( pVBInfo->SetFlag & RPLLDIV2XO ) )
+                                        VCLKIndex = YPbPr525iVCLK ;
+                                }
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    if ( pVBInfo->VBInfo & SetCRT2ToTV )
+                    {
+                        if ( pVBInfo->SetFlag & RPLLDIV2XO )
+                       {
+                            VCLKIndex = TVVCLKDIV2 ;
+
+
+                            VCLKIndex += 25 ;
+
+                        }
+                        else
+                        {
+                            VCLKIndex = TVVCLK ;
+
+
+                            VCLKIndex += 25 ;
+
+                        }
+                    }
+                }
+            }
+            else
+            {  /* for CRT2 */
+                VCLKIndex = ( UCHAR )XGINew_GetReg2( ( pVBInfo->P3ca + 0x02 ) ) ;      /* Port 3cch */
+               VCLKIndex = ( ( VCLKIndex >> 2 ) & 0x03 ) ;
+                if ( ModeNo > 0x13 )
+                {
+                    VCLKIndex = pVBInfo->RefIndex[ RefreshRateTableIndex ].Ext_CRTVCLK ;       /* di+Ext_CRTVCLK */
+                    VCLKIndex &= IndexMask ;
+                }
+            }
+        }
+    }
+    else
+    {          /* LVDS */
+        if ( ModeNo <= 0x13 )
+            VCLKIndex = CRT2Index ;
+       else
+           VCLKIndex = CRT2Index ;
+
+        if ( pVBInfo->IF_DEF_CH7005 == 1 )
+        {
+            if ( !( pVBInfo->VBInfo & SetCRT2ToLCD ) )
+            {
+                VCLKIndex &= 0x1f ;
+               tempbx = 0 ;
+
+                if ( pVBInfo->VBInfo & SetPALTV )
+                    tempbx += 2 ;
+
+                if ( pVBInfo->VBInfo & SetCHTVOverScan )
+                    tempbx += 1 ;
+
+                switch( tempbx )
+                {
+                    case 0:
+                        CHTVVCLKPtr = pVBInfo->CHTVVCLKUNTSC ;
+                        break ;
+                    case 1:
+                        CHTVVCLKPtr = pVBInfo->CHTVVCLKONTSC ;
+                        break;
+                    case 2:
+                        CHTVVCLKPtr = pVBInfo->CHTVVCLKUPAL ;
+                        break ;
+                    case 3:
+                        CHTVVCLKPtr = pVBInfo->CHTVVCLKOPAL ;
+                        break ;
+                    default:
+                        break ;
+                }
+
+                VCLKIndex = CHTVVCLKPtr[ VCLKIndex ] ;
+            }
+        }
+        else
+        {
+            VCLKIndex = VCLKIndex >> 6 ;
+            if ( ( pVBInfo->LCDResInfo == Panel800x600 ) || ( pVBInfo->LCDResInfo == Panel320x480 ) )
+                VCLKIndex = LVDSXlat1VCLK[ VCLKIndex ] ;
+            else if ( ( pVBInfo->LCDResInfo == Panel1024x768 ) || ( pVBInfo->LCDResInfo == Panel1024x768x75 ) )
+                VCLKIndex = LVDSXlat2VCLK[ VCLKIndex ] ;
+            else
+                VCLKIndex = LVDSXlat3VCLK[ VCLKIndex ] ;
+        }
+    }
+    /* VCLKIndex = VCLKIndex&IndexMask ; */
+
+
+
+    return( VCLKIndex ) ;
+}
+
diff --git a/drivers/staging/xgifb/vb_setmode.h b/drivers/staging/xgifb/vb_setmode.h
new file mode 100644 (file)
index 0000000..09753d7
--- /dev/null
@@ -0,0 +1,40 @@
+#ifndef  _VBSETMODE_
+#define  _VBSETMODE_
+
+extern   void     InitTo330Pointer(UCHAR,PVB_DEVICE_INFO);
+extern   void     XGI_UnLockCRT2(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO );
+extern   void     XGI_LockCRT2(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO );
+extern   void     XGI_LongWait( PVB_DEVICE_INFO );
+extern   void     XGI_SetCRT2ModeRegs(USHORT ModeNo,PXGI_HW_DEVICE_INFO,  PVB_DEVICE_INFO  );
+extern   void     XGI_DisableBridge(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO );
+extern   void            XGI_EnableBridge(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO );
+extern   void     XGI_DisplayOff( PXGI_HW_DEVICE_INFO, PVB_DEVICE_INFO );
+extern   void     XGI_DisplayOn( PXGI_HW_DEVICE_INFO, PVB_DEVICE_INFO );
+extern   void     XGI_GetVBType(PVB_DEVICE_INFO);
+extern   void     XGI_SenseCRT1(PVB_DEVICE_INFO );
+extern   void     XGI_GetVGAType(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO );
+extern   void     XGI_GetVBInfo(USHORT ModeNo,USHORT ModeIdIndex,PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO );
+extern   void     XGI_GetTVInfo(USHORT ModeNo,USHORT ModeIdIndex, PVB_DEVICE_INFO );
+extern   void     XGI_SetCRT1Offset(USHORT ModeNo,USHORT ModeIdIndex,USHORT RefreshRateTableIndex,PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO );
+extern   void     XGI_SetLCDAGroup(USHORT ModeNo,USHORT ModeIdIndex,PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO );
+extern   void     XGI_WaitDisply( PVB_DEVICE_INFO );
+extern   USHORT   XGI_GetResInfo(USHORT ModeNo,USHORT ModeIdIndex, PVB_DEVICE_INFO pVBInfo);
+
+extern   BOOLEAN  XGISetModeNew( PXGI_HW_DEVICE_INFO HwDeviceExtension , USHORT ModeNo ) ;
+
+extern   BOOLEAN  XGI_SearchModeID( USHORT ModeNo,USHORT  *ModeIdIndex, PVB_DEVICE_INFO );
+extern   BOOLEAN  XGI_GetLCDInfo(USHORT ModeNo,USHORT ModeIdIndex,PVB_DEVICE_INFO );
+extern   BOOLEAN  XGI_BridgeIsOn( PVB_DEVICE_INFO );
+extern   BOOLEAN  XGI_SetCRT2Group301(USHORT ModeNo, PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO);
+extern   USHORT   XGI_GetRatePtrCRT2( PXGI_HW_DEVICE_INFO pXGIHWDE, USHORT ModeNo,USHORT ModeIdIndex, PVB_DEVICE_INFO );
+
+extern   void     XGI_SetXG21FPBits(PVB_DEVICE_INFO pVBInfo);
+extern   void     XGI_SetXG27FPBits(PVB_DEVICE_INFO pVBInfo);
+extern   void     XGI_XG21BLSignalVDD(USHORT tempbh,USHORT tempbl, PVB_DEVICE_INFO pVBInfo);
+extern   void     XGI_XG27BLSignalVDD(USHORT tempbh,USHORT tempbl, PVB_DEVICE_INFO pVBInfo);
+extern   void     XGI_XG21SetPanelDelay(USHORT tempbl, PVB_DEVICE_INFO pVBInfo);
+extern   BOOLEAN  XGI_XG21CheckLVDSMode(USHORT ModeNo,USHORT ModeIdIndex, PVB_DEVICE_INFO pVBInfo );
+extern   void     XGI_SetXG21LVDSPara(USHORT ModeNo,USHORT ModeIdIndex, PVB_DEVICE_INFO pVBInfo );
+extern   USHORT XGI_GetLVDSOEMTableIndex(PVB_DEVICE_INFO pVBInfo);
+
+#endif
diff --git a/drivers/staging/xgifb/vb_struct.h b/drivers/staging/xgifb/vb_struct.h
new file mode 100644 (file)
index 0000000..bb25c0e
--- /dev/null
@@ -0,0 +1,534 @@
+#ifndef _VB_STRUCT_
+#define _VB_STRUCT_
+
+#ifdef _INITNEW_
+#define EXTERN
+#else
+#define EXTERN extern
+#endif
+
+
+
+
+typedef struct _XGI_PanelDelayTblStruct
+{
+ UCHAR timer[2];
+} XGI_PanelDelayTblStruct;
+
+typedef struct _XGI_LCDDataStruct
+{
+ USHORT RVBHCMAX;
+ USHORT RVBHCFACT;
+ USHORT VGAHT;
+ USHORT VGAVT;
+ USHORT LCDHT;
+ USHORT LCDVT;
+} XGI_LCDDataStruct;
+
+
+typedef struct _XGI_LVDSCRT1HDataStruct
+{
+ UCHAR Reg[8];
+} XGI_LVDSCRT1HDataStruct;
+typedef struct _XGI_LVDSCRT1VDataStruct
+{
+ UCHAR Reg[7];
+} XGI_LVDSCRT1VDataStruct;
+
+
+typedef struct _XGI_TVDataStruct
+{
+ USHORT RVBHCMAX;
+ USHORT RVBHCFACT;
+ USHORT VGAHT;
+ USHORT VGAVT;
+ USHORT TVHDE;
+ USHORT TVVDE;
+ USHORT RVBHRS;
+ UCHAR FlickerMode;
+ USHORT HALFRVBHRS;
+ UCHAR RY1COE;
+ UCHAR RY2COE;
+ UCHAR RY3COE;
+ UCHAR RY4COE;
+} XGI_TVDataStruct;
+
+typedef struct _XGI_LVDSDataStruct
+{
+ USHORT VGAHT;
+ USHORT VGAVT;
+ USHORT LCDHT;
+ USHORT LCDVT;
+} XGI_LVDSDataStruct;
+
+typedef struct _XGI_LVDSDesStruct
+{
+ USHORT LCDHDES;
+ USHORT LCDVDES;
+} XGI_LVDSDesStruct;
+
+typedef struct _XGI_LVDSCRT1DataStruct
+{
+ UCHAR CR[15];
+} XGI_LVDSCRT1DataStruct;
+
+/*add for LCDA*/
+
+
+typedef struct _XGI_StStruct
+{
+ UCHAR St_ModeID;
+ USHORT St_ModeFlag;
+ UCHAR St_StTableIndex;
+ UCHAR St_CRT2CRTC;
+ UCHAR St_CRT2CRTC2;
+ UCHAR St_ResInfo;
+ UCHAR VB_StTVFlickerIndex;
+ UCHAR VB_StTVEdgeIndex;
+ UCHAR VB_StTVYFilterIndex;
+} XGI_StStruct;
+
+typedef struct _XGI_StandTableStruct
+{
+ UCHAR CRT_COLS;
+ UCHAR ROWS;
+ UCHAR CHAR_HEIGHT;
+ USHORT CRT_LEN;
+ UCHAR SR[4];
+ UCHAR MISC;
+ UCHAR CRTC[0x19];
+ UCHAR ATTR[0x14];
+ UCHAR GRC[9];
+} XGI_StandTableStruct;
+
+typedef struct _XGI_ExtStruct
+{
+ UCHAR Ext_ModeID;
+ USHORT Ext_ModeFlag;
+ USHORT Ext_ModeInfo;
+ USHORT Ext_Point;
+ USHORT Ext_VESAID;
+ UCHAR Ext_VESAMEMSize;
+ UCHAR Ext_RESINFO;
+ UCHAR VB_ExtTVFlickerIndex;
+ UCHAR VB_ExtTVEdgeIndex;
+ UCHAR VB_ExtTVYFilterIndex;
+ UCHAR REFindex;
+} XGI_ExtStruct;
+
+typedef struct _XGI_Ext2Struct
+{
+ USHORT Ext_InfoFlag;
+ UCHAR Ext_CRT1CRTC;
+ UCHAR Ext_CRTVCLK;
+ UCHAR Ext_CRT2CRTC;
+ UCHAR Ext_CRT2CRTC2;
+ UCHAR  ModeID;
+ USHORT XRes;
+ USHORT YRes;
+ /* USHORT ROM_OFFSET; */
+} XGI_Ext2Struct;
+
+
+typedef struct _XGI_MCLKDataStruct
+{
+ UCHAR SR28,SR29,SR2A;
+ USHORT CLOCK;
+} XGI_MCLKDataStruct;
+
+typedef struct _XGI_ECLKDataStruct
+{
+ UCHAR SR2E,SR2F,SR30;
+ USHORT CLOCK;
+} XGI_ECLKDataStruct;
+
+typedef struct _XGI_VCLKDataStruct
+{
+ UCHAR SR2B,SR2C;
+ USHORT CLOCK;
+} XGI_VCLKDataStruct;
+
+typedef struct _XGI_VBVCLKDataStruct
+{
+ UCHAR Part4_A,Part4_B;
+ USHORT CLOCK;
+} XGI_VBVCLKDataStruct;
+
+typedef struct _XGI_StResInfoStruct
+{
+ USHORT HTotal;
+ USHORT VTotal;
+} XGI_StResInfoStruct;
+
+typedef struct _XGI_ModeResInfoStruct
+{
+ USHORT HTotal;
+ USHORT VTotal;
+ UCHAR  XChar;
+ UCHAR  YChar;
+} XGI_ModeResInfoStruct;
+
+typedef struct _XGI_LCDNBDesStruct
+{
+  UCHAR NB[12];
+} XGI_LCDNBDesStruct;
+ /*add for new UNIVGABIOS*/
+typedef struct _XGI_LCDDesStruct
+{
+ USHORT LCDHDES;
+ USHORT LCDHRS;
+ USHORT LCDVDES;
+ USHORT LCDVRS;
+} XGI_LCDDesStruct;
+
+typedef struct _XGI_LCDDataTablStruct
+{
+ UCHAR  PANELID;
+ USHORT MASK;
+ USHORT CAP;
+ USHORT DATAPTR;
+} XGI_LCDDataTablStruct;
+
+typedef struct _XGI_TVTablDataStruct
+{
+ USHORT MASK;
+ USHORT CAP;
+ USHORT DATAPTR;
+} XGI_TVDataTablStruct;
+
+typedef struct _XGI330_LCDDesDataStruct
+{
+ USHORT LCDHDES;
+ USHORT LCDHRS;
+ USHORT LCDVDES;
+ USHORT LCDVRS;
+} XGI330_LCDDataDesStruct;
+
+
+typedef struct _XGI330_LVDSDataStruct
+{
+ USHORT VGAHT;
+ USHORT VGAVT;
+ USHORT LCDHT;
+ USHORT LCDVT;
+} XGI330_LVDSDataStruct;
+
+typedef struct _XGI330_LCDDesDataStruct2
+{
+ USHORT LCDHDES;
+ USHORT LCDHRS;
+ USHORT LCDVDES;
+ USHORT LCDVRS;
+ USHORT LCDHSync;
+ USHORT LCDVSync;
+} XGI330_LCDDataDesStruct2;
+
+typedef struct _XGI330_LCDDataStruct
+{
+ USHORT RVBHCMAX;
+ USHORT RVBHCFACT;
+ USHORT VGAHT;
+ USHORT VGAVT;
+ USHORT LCDHT;
+ USHORT LCDVT;
+} XGI330_LCDDataStruct;
+
+
+typedef struct _XGI330_TVDataStruct
+{
+ USHORT RVBHCMAX;
+ USHORT RVBHCFACT;
+ USHORT VGAHT;
+ USHORT VGAVT;
+ USHORT TVHDE;
+ USHORT TVVDE;
+ USHORT RVBHRS;
+ UCHAR FlickerMode;
+ USHORT HALFRVBHRS;
+} XGI330_TVDataStruct;
+
+typedef struct _XGI330_LCDDataTablStruct
+{
+ UCHAR  PANELID;
+ USHORT MASK;
+ USHORT CAP;
+ USHORT DATAPTR;
+} XGI330_LCDDataTablStruct;
+
+typedef struct _XGI330_TVDataTablStruct
+{
+ USHORT MASK;
+ USHORT CAP;
+ USHORT DATAPTR;
+} XGI330_TVDataTablStruct;
+
+
+typedef struct _XGI330_CHTVDataStruct
+{
+ USHORT VGAHT;
+ USHORT VGAVT;
+ USHORT LCDHT;
+ USHORT LCDVT;
+} XGI330_CHTVDataStruct;
+
+typedef struct _XGI_TimingHStruct
+{
+  UCHAR data[8];
+} XGI_TimingHStruct;
+
+typedef struct _XGI_TimingVStruct
+{
+  UCHAR data[7];
+} XGI_TimingVStruct;
+
+typedef struct _XGI_CH7007TV_TimingHStruct
+{
+  UCHAR data[10];
+} XGI_CH7007TV_TimingHStruct;
+
+typedef struct _XGI_CH7007TV_TimingVStruct
+{
+  UCHAR data[10];
+} XGI_CH7007TV_TimingVStruct;
+
+typedef struct _XGI_XG21CRT1Struct
+{
+ UCHAR ModeID,CR02,CR03,CR15,CR16;
+} XGI_XG21CRT1Struct;
+
+typedef struct _XGI330_CHTVRegDataStruct
+{
+ UCHAR Reg[16];
+} XGI330_CHTVRegDataStruct;
+
+typedef struct _XGI330_LCDCapStruct
+{
+               UCHAR      LCD_ID;
+                USHORT     LCD_Capability;
+                UCHAR      LCD_SetFlag;
+                UCHAR      LCD_DelayCompensation;
+                UCHAR      LCD_HSyncWidth;
+                UCHAR      LCD_VSyncWidth;
+                UCHAR      LCD_VCLK;
+                UCHAR      LCDA_VCLKData1;
+                UCHAR      LCDA_VCLKData2;
+                UCHAR      LCUCHAR_VCLKData1;
+                UCHAR      LCUCHAR_VCLKData2;
+                UCHAR      PSC_S1;
+                UCHAR      PSC_S2;
+                UCHAR      PSC_S3;
+                UCHAR      PSC_S4;
+                UCHAR      PSC_S5;
+                UCHAR      PWD_2B;
+                UCHAR      PWD_2C;
+                UCHAR      PWD_2D;
+                UCHAR      PWD_2E;
+                UCHAR      PWD_2F;
+                UCHAR      Spectrum_31;
+                UCHAR      Spectrum_32;
+                UCHAR      Spectrum_33;
+                UCHAR      Spectrum_34;
+} XGI330_LCDCapStruct;
+
+typedef struct _XGI21_LVDSCapStruct
+{
+                USHORT     LVDS_Capability;
+                USHORT     LVDSHT;
+                USHORT     LVDSVT;
+                USHORT     LVDSHDE;
+                USHORT     LVDSVDE;
+                USHORT     LVDSHFP;
+                USHORT     LVDSVFP;
+                USHORT     LVDSHSYNC;
+                USHORT     LVDSVSYNC;
+                UCHAR      VCLKData1;
+                UCHAR      VCLKData2;
+                UCHAR      PSC_S1;
+                UCHAR      PSC_S2;
+                UCHAR      PSC_S3;
+                UCHAR      PSC_S4;
+                UCHAR      PSC_S5;
+} XGI21_LVDSCapStruct;
+
+typedef struct _XGI_CRT1TableStruct
+{
+  UCHAR CR[16];
+} XGI_CRT1TableStruct;
+
+
+typedef struct _XGI330_VCLKDataStruct
+{
+    UCHAR SR2B,SR2C;
+    USHORT CLOCK;
+} XGI330_VCLKDataStruct;
+
+typedef struct _XGI301C_Tap4TimingStruct
+{
+    USHORT DE;
+    UCHAR  Reg[64];   /* C0-FF */
+} XGI301C_Tap4TimingStruct;
+
+typedef struct _XGI_New_StandTableStruct
+{
+       UCHAR  CRT_COLS;
+       UCHAR  ROWS;
+       UCHAR  CHAR_HEIGHT;
+       USHORT CRT_LEN;
+       UCHAR  SR[4];
+       UCHAR  MISC;
+       UCHAR  CRTC[0x19];
+       UCHAR  ATTR[0x14];
+       UCHAR  GRC[9];
+} XGI_New_StandTableStruct;
+
+typedef UCHAR DRAM8Type[8];
+typedef UCHAR DRAM4Type[4];
+typedef UCHAR DRAM32Type[32];
+typedef UCHAR DRAM2Type[2];
+
+typedef struct _VB_DEVICE_INFO  VB_DEVICE_INFO;
+typedef VB_DEVICE_INFO *       PVB_DEVICE_INFO;
+
+struct _VB_DEVICE_INFO
+{
+    BOOLEAN  ISXPDOS;
+    ULONG   P3c4,P3d4,P3c0,P3ce,P3c2,P3cc;
+    ULONG   P3ca,P3c6,P3c7,P3c8,P3c9,P3da;
+    ULONG   Part0Port,Part1Port,Part2Port;
+    ULONG   Part3Port,Part4Port,Part5Port;
+    USHORT   RVBHCFACT,RVBHCMAX,RVBHRS;
+    USHORT   VGAVT,VGAHT,VGAVDE,VGAHDE;
+    USHORT   VT,HT,VDE,HDE;
+    USHORT   LCDHRS,LCDVRS,LCDHDES,LCDVDES;
+
+    USHORT   ModeType;
+    USHORT   IF_DEF_LVDS,IF_DEF_TRUMPION,IF_DEF_DSTN;/* ,IF_DEF_FSTN; add for dstn */
+    USHORT   IF_DEF_CRT2Monitor,IF_DEF_VideoCapture;
+    USHORT   IF_DEF_LCDA,IF_DEF_CH7017,IF_DEF_YPbPr,IF_DEF_ScaleLCD,IF_DEF_OEMUtil,IF_DEF_PWD;
+    USHORT   IF_DEF_ExpLink;
+    USHORT   IF_DEF_CH7005,IF_DEF_HiVision;
+    USHORT   IF_DEF_CH7007; /* Billy 2007/05/03 */
+    USHORT   LCDResInfo,LCDTypeInfo, VBType;/*301b*/
+    USHORT   VBInfo,TVInfo,LCDInfo, Set_VGAType;
+    USHORT   VBExtInfo;/*301lv*/
+    USHORT   SetFlag;
+    USHORT   NewFlickerMode;
+    USHORT   SelectCRT2Rate;
+
+    PUCHAR ROMAddr;
+    PUCHAR FBAddr;
+    ULONG BaseAddr;
+    ULONG RelIO;
+
+    DRAM4Type  *CR6B;
+    DRAM4Type  *CR6E;
+    DRAM32Type *CR6F;
+    DRAM2Type  *CR89;
+
+    DRAM8Type  *SR15; /* pointer : point to array */
+    DRAM8Type  *CR40;
+    UCHAR  *pSoftSetting;
+    UCHAR  *pOutputSelect;
+
+    USHORT *pRGBSenseData;
+    USHORT *pRGBSenseData2; /*301b*/
+    USHORT *pVideoSenseData;
+    USHORT *pVideoSenseData2;
+    USHORT *pYCSenseData;
+    USHORT *pYCSenseData2;
+
+    UCHAR  *pSR07;
+    UCHAR  *CR49;
+    UCHAR  *pSR1F;
+    UCHAR  *AGPReg;
+    UCHAR  *SR16;
+    UCHAR  *pSR21;
+    UCHAR  *pSR22;
+    UCHAR  *pSR23;
+    UCHAR  *pSR24;
+    UCHAR  *SR25;
+    UCHAR  *pSR31;
+    UCHAR  *pSR32;
+    UCHAR  *pSR33;
+    UCHAR  *pSR36;      /* alan 12/07/2006 */
+    UCHAR  *pCRCF;
+    UCHAR  *pCRD0;      /* alan 12/07/2006 */
+    UCHAR  *pCRDE;      /* alan 12/07/2006 */
+    UCHAR  *pCR8F;      /* alan 12/07/2006 */
+    UCHAR  *pSR40;      /* alan 12/07/2006 */
+    UCHAR  *pSR41;      /* alan 12/07/2006 */
+    UCHAR  *pDVOSetting;
+    UCHAR  *pCR2E;
+    UCHAR  *pCR2F;
+    UCHAR  *pCR46;
+    UCHAR  *pCR47;
+    UCHAR  *pCRT2Data_1_2;
+    UCHAR  *pCRT2Data_4_D;
+    UCHAR  *pCRT2Data_4_E;
+    UCHAR  *pCRT2Data_4_10;
+    XGI_MCLKDataStruct  *MCLKData;
+    XGI_ECLKDataStruct  *ECLKData;
+
+    UCHAR   *XGI_TVDelayList;
+    UCHAR   *XGI_TVDelayList2;
+    UCHAR   *CHTVVCLKUNTSC;
+    UCHAR   *CHTVVCLKONTSC;
+    UCHAR   *CHTVVCLKUPAL;
+    UCHAR   *CHTVVCLKOPAL;
+    UCHAR   *NTSCTiming;
+    UCHAR   *PALTiming;
+    UCHAR   *HiTVExtTiming;
+    UCHAR   *HiTVSt1Timing;
+    UCHAR   *HiTVSt2Timing;
+    UCHAR   *HiTVTextTiming;
+    UCHAR   *YPbPr750pTiming;
+    UCHAR   *YPbPr525pTiming;
+    UCHAR   *YPbPr525iTiming;
+    UCHAR   *HiTVGroup3Data;
+    UCHAR   *HiTVGroup3Simu;
+    UCHAR   *HiTVGroup3Text;
+    UCHAR   *Ren525pGroup3;
+    UCHAR   *Ren750pGroup3;
+    UCHAR   *ScreenOffset;
+    UCHAR   *pXGINew_DRAMTypeDefinition;
+    UCHAR   *pXGINew_I2CDefinition ;
+    UCHAR   *pXGINew_CR97 ;
+
+    XGI330_LCDCapStruct  *LCDCapList;
+    XGI21_LVDSCapStruct  *XG21_LVDSCapList;
+
+    XGI_TimingHStruct  *TimingH;
+    XGI_TimingVStruct  *TimingV;
+
+    XGI_StStruct          *SModeIDTable;
+    XGI_StandTableStruct  *StandTable;
+    XGI_ExtStruct         *EModeIDTable;
+    XGI_Ext2Struct        *RefIndex;
+    /* XGINew_CRT1TableStruct *CRT1Table; */
+    XGI_CRT1TableStruct    *XGINEWUB_CRT1Table;
+    XGI_VCLKDataStruct    *VCLKData;
+    XGI_VBVCLKDataStruct  *VBVCLKData;
+    XGI_StResInfoStruct   *StResInfo;
+    XGI_ModeResInfoStruct *ModeResInfo;
+    XGI_XG21CRT1Struct   *UpdateCRT1;
+};  /* _VB_DEVICE_INFO */
+
+
+typedef struct
+{
+    USHORT    Horizontal_ACTIVE;
+    USHORT    Horizontal_FP;
+    USHORT    Horizontal_SYNC;
+    USHORT    Horizontal_BP;
+    USHORT    Vertical_ACTIVE;
+    USHORT    Vertical_FP;
+    USHORT    Vertical_SYNC;
+    USHORT    Vertical_BP;
+    double    DCLK;
+    UCHAR     FrameRate;
+    UCHAR     Interlace;
+    USHORT    Margin;
+} TimingInfo;
+
+#define _VB_STRUCT_
+#endif /* _VB_STRUCT_ */
diff --git a/drivers/staging/xgifb/vb_table.h b/drivers/staging/xgifb/vb_table.h
new file mode 100644 (file)
index 0000000..781caef
--- /dev/null
@@ -0,0 +1,4406 @@
+#define  Tap4
+
+
+XGI_MCLKDataStruct XGI330New_MCLKData[]=
+{
+ { 0x5c,0x23,0x01,166},
+ { 0x5c,0x23,0x01,166},
+ { 0x7C,0x08,0x80,200},
+ { 0x79,0x06,0x80,250},
+ { 0x29,0x01,0x81,300},
+ { 0x29,0x01,0x81,300},
+ { 0x29,0x01,0x81,300},
+ { 0x29,0x01,0x81,300}
+};
+//yilin modify for xgi20
+XGI_MCLKDataStruct XGI340New_MCLKData[]=
+{
+ { 0x16,0x01,0x01,166},
+ { 0x19,0x02,0x01,124},
+ { 0x7C,0x08,0x01,200},
+ { 0x79,0x06,0x01,250},
+ { 0x29,0x01,0x81,301},
+ { 0x5c,0x23,0x01,166},
+ { 0x5c,0x23,0x01,166},
+ { 0x5c,0x23,0x01,166}
+};
+
+XGI_MCLKDataStruct XGI27New_MCLKData[]=
+{
+ { 0x5c,0x23,0x01,166},
+ { 0x19,0x02,0x01,124},
+ { 0x7C,0x08,0x80,200},
+ { 0x79,0x06,0x80,250},
+ { 0x29,0x01,0x81,300},
+ { 0x5c,0x23,0x01,166},
+ { 0x5c,0x23,0x01,166},
+ { 0x5c,0x23,0x01,166}
+};
+
+XGI_ECLKDataStruct XGI330_ECLKData[]=
+{
+ { 0x7c,0x08,0x01,200},
+ { 0x7c,0x08,0x01,200},
+ { 0x7C,0x08,0x80,200},
+ { 0x79,0x06,0x80,250},
+ { 0x29,0x01,0x81,300},
+ { 0x29,0x01,0x81,300},
+ { 0x29,0x01,0x81,300},
+ { 0x29,0x01,0x81,300}
+};
+//yilin modify for xgi20
+XGI_ECLKDataStruct XGI340_ECLKData[]=
+{
+ { 0x5c,0x23,0x01,166},
+ { 0x55,0x84,0x01,123},
+ { 0x7C,0x08,0x01,200},
+ { 0x79,0x06,0x01,250},
+ { 0x29,0x01,0x81,301},
+ { 0x5c,0x23,0x01,166},
+ { 0x5c,0x23,0x01,166},
+ { 0x5c,0x23,0x01,166}
+};
+
+
+
+UCHAR XGI340_SR13[4][8]={
+{0x35,0x45,0xb1,0x00,0x00,0x00,0x00,0x00},/* SR13 */
+{0x41,0x51,0x5c,0x00,0x00,0x00,0x00,0x00},/* SR14 */
+{0x31,0x42,0x42,0x00,0x00,0x00,0x00,0x00},/* SR18 */
+{0x03,0x03,0x03,0x00,0x00,0x00,0x00,0x00}/* SR1B */
+};
+
+UCHAR XGI340_cr41[24][8]=
+{{0x20,0x50,0x60,0x00,0x00,0x00,0x00,0x00},/* 0 CR41 */
+{0xc4,0x40,0x84,0x00,0x00,0x00,0x00,0x00},/* 1 CR8A */
+{0xc4,0x40,0x84,0x00,0x00,0x00,0x00,0x00},/* 2 CR8B */
+{0xb5,0xa4,0xa4,0x00,0x00,0x00,0x00,0x00},
+{0xf0,0xf0,0xf0,0x00,0x00,0x00,0x00,0x00},
+{0x90,0x90,0x24,0x00,0x00,0x00,0x00,0x00},/* 5 CR68 */
+{0x77,0x77,0x44,0x00,0x00,0x00,0x00,0x00},/* 6 CR69 */
+{0x77,0x77,0x44,0x00,0x00,0x00,0x00,0x00},/* 7 CR6A */
+{0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00},/* 8 CR6D */
+{0x55,0x55,0x55,0x00,0x00,0x00,0x00,0x00},/* 9 CR80 */
+{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/* 10 CR81 */
+{0x88,0xa8,0x48,0x00,0x00,0x00,0x00,0x00},/* 11 CR82 */
+{0x44,0x44,0x77,0x00,0x00,0x00,0x00,0x00},/* 12 CR85 */
+{0x48,0x48,0x88,0x00,0x00,0x00,0x00,0x00},/* 13 CR86 */
+{0x54,0x54,0x44,0x00,0x00,0x00,0x00,0x00},/* 14 CR90 */
+{0x54,0x54,0x44,0x00,0x00,0x00,0x00,0x00},/* 15 CR91 */
+{0x0a,0x0a,0x07,0x00,0x00,0x00,0x00,0x00},/* 16 CR92 */
+{0x44,0x44,0x44,0x00,0x00,0x00,0x00,0x00},/* 17 CR93 */
+{0x10,0x10,0x0A,0x00,0x00,0x00,0x00,0x00},/* 18 CR94 */
+{0x11,0x11,0x0a,0x00,0x00,0x00,0x00,0x00},/* 19 CR95 */
+{0x05,0x05,0x05,0x00,0x00,0x00,0x00,0x00},/* 20 CR96 */
+{0xf0,0xf0,0xf0,0x00,0x00,0x00,0x00,0x00},/* 21 CRC3 */
+{0x05,0x00,0x02,0x00,0x00,0x00,0x00,0x00},/* 22 CRC4 */
+{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}/* 23 CRC5 */
+};
+
+
+UCHAR XGI27_cr41[24][8]=
+{
+{0x20,0x40,0x60,0x00,0x00,0x00,0x00,0x00},/* 0 CR41 */
+{0xC4,0x40,0x84,0x00,0x00,0x00,0x00,0x00},/* 1 CR8A */
+{0xC4,0x40,0x84,0x00,0x00,0x00,0x00,0x00},/* 2 CR8B */
+{0xB5,0x13,0xa4,0x00,0x00,0x00,0x00,0x00},/* 3 CR40[7],CR99[2:0],CR45[3:0]*/
+{0xf0,0xf5,0xf0,0x00,0x00,0x00,0x00,0x00},/* 4 CR59 */
+{0x90,0x90,0x24,0x00,0x00,0x00,0x00,0x00},/* 5 CR68 */
+{0x77,0x67,0x44,0x00,0x00,0x00,0x00,0x00},/* 6 CR69 */
+{0x77,0x77,0x44,0x00,0x00,0x00,0x00,0x00},/* 7 CR6A */
+{0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00},/* 8 CR6D */
+{0x55,0x55,0x55,0x00,0x00,0x00,0x00,0x00},/* 9 CR80 */
+{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/* 10 CR81 */
+{0x88,0xcc,0x48,0x00,0x00,0x00,0x00,0x00},/* 11 CR82 */
+{0x44,0x88,0x77,0x00,0x00,0x00,0x00,0x00},/* 12 CR85 */
+{0x48,0x88,0x88,0x00,0x00,0x00,0x00,0x00},/* 13 CR86 */
+{0x54,0x32,0x44,0x00,0x00,0x00,0x00,0x00},/* 14 CR90 */
+{0x54,0x33,0x44,0x00,0x00,0x00,0x00,0x00},/* 15 CR91 */
+{0x0a,0x07,0x07,0x00,0x00,0x00,0x00,0x00},/* 16 CR92 */
+{0x44,0x63,0x44,0x00,0x00,0x00,0x00,0x00},/* 17 CR93 */
+{0x10,0x14,0x0A,0x00,0x00,0x00,0x00,0x00},/* 18 CR94 */
+{0x11,0x0B,0x0C,0x00,0x00,0x00,0x00,0x00},/* 19 CR95 */
+{0x05,0x22,0x05,0x00,0x00,0x00,0x00,0x00},/* 20 CR96 */
+{0xf0,0xf0,0x00,0x00,0x00,0x00,0x00,0x00},/* 21 CRC3 */
+{0x05,0x00,0x02,0x00,0x00,0x00,0x00,0x00},/* 22 CRC4 */
+{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}/* 23 CRC5 */
+};
+
+
+#if 0
+UCHAR XGI27_cr41[24][8]=
+{
+{0x20,0x60,0x60,0x00,0x00,0x00,0x00,0x00},/* 0 CR41 */
+{0x04,0x44,0x84,0x00,0x00,0x00,0x00,0x00},/* 1 CR8A */
+{0x04,0x40,0x84,0x00,0x00,0x00,0x00,0x00},/* 2 CR8B */
+{0xb5,0x03,0xa4,0x00,0x00,0x00,0x00,0x00},/* 3 CR40[7],CR99[2:0],CR45[3:0]*/
+{0xf0,0xf5,0xf0,0x00,0x00,0x00,0x00,0x00},/* 4 CR59 */
+{0xa4,0x1C,0x24,0x00,0x00,0x00,0x00,0x00},/* 5 CR68 */
+{0x77,0x77,0x44,0x00,0x00,0x00,0x00,0x00},/* 6 CR69 */
+{0x77,0x77,0x44,0x00,0x00,0x00,0x00,0x00},/* 7 CR6A */
+{0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00},/* 8 CR6D */
+{0x55,0x55,0x55,0x00,0x00,0x00,0x00,0x00},/* 9 CR80 */
+{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/* 10 CR81 */
+{0x48,0xa8,0x48,0x00,0x00,0x00,0x00,0x00},/* 11 CR82 */
+{0x77,0x88,0x77,0x00,0x00,0x00,0x00,0x00},/* 12 CR85 */
+{0x88,0x88,0x88,0x00,0x00,0x00,0x00,0x00},/* 13 CR86 */
+{0x44,0x32,0x44,0x00,0x00,0x00,0x00,0x00},/* 14 CR90 */
+{0x44,0x33,0x44,0x00,0x00,0x00,0x00,0x00},/* 15 CR91 */
+{0x07,0x07,0x07,0x00,0x00,0x00,0x00,0x00},/* 16 CR92 */
+{0x44,0x63,0x44,0x00,0x00,0x00,0x00,0x00},/* 17 CR93 */
+{0x0A,0x14,0x0A,0x00,0x00,0x00,0x00,0x00},/* 18 CR94 */
+{0x0C,0x0B,0x0C,0x00,0x00,0x00,0x00,0x00},/* 19 CR95 */
+{0x05,0x22,0x05,0x00,0x00,0x00,0x00,0x00},/* 20 CR96 */
+{0xf0,0xf0,0xf0,0x00,0x00,0x00,0x00,0x00},/* 21 CRC3 */
+{0x03,0x00,0x02,0x00,0x00,0x00,0x00,0x00},/* 22 CRC4 */
+{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}/* 23 CRC5 */
+};
+#endif
+UCHAR XGI340_CR6B[8][4]={
+{0xaa,0xaa,0xaa,0xaa},
+{0xaa,0xaa,0xaa,0xaa},
+{0xaa,0xaa,0xaa,0xaa},
+{0x00,0x00,0x00,0x00},
+{0x00,0x00,0x00,0x00},
+{0x00,0x00,0x00,0x00},
+{0x00,0x00,0x00,0x00},
+{0x00,0x00,0x00,0x00}
+};
+
+UCHAR XGI340_CR6E[8][4]={
+{0x00,0x00,0x00,0x00},
+{0x00,0x00,0x00,0x00},
+{0x00,0x00,0x00,0x00},
+{0x00,0x00,0x00,0x00},
+{0x00,0x00,0x00,0x00},
+{0x00,0x00,0x00,0x00},
+{0x00,0x00,0x00,0x00},
+{0x00,0x00,0x00,0x00}
+};
+
+UCHAR XGI340_CR6F[8][32]={
+{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}
+};
+
+UCHAR XGI340_CR89[8][2]={
+{0x00,0x00},
+{0x00,0x00},
+{0x00,0x00},
+{0x00,0x00},
+{0x00,0x00},
+{0x00,0x00},
+{0x00,0x00},
+{0x00,0x00}
+};
+                        /* CR47,CR48,CR49,CR4A,CR4B,CR4C,CR70,CR71,CR74,CR75,CR76,CR77 */
+UCHAR XGI340_AGPReg[12]={0x28,0x23,0x00,0x20,0x00,0x20,0x00,0x05,0xd0,0x10,0x10,0x00};
+
+UCHAR XGI340_SR16[4]={0x03,0x83,0x03,0x83};
+
+UCHAR XGI330_SR15_1[8][8]={
+{0x0,0x0,0x00,0x00,0x20,0x20,0x00,0x00},
+{0x5,0x15,0x15,0x15,0x15,0x15,0x00,0x00},
+{0xba,0xba,0xba,0xba,0xBA,0xBA,0x00,0x00},
+{0x55,0x57,0x57,0xAB,0xAB,0xAB,0x00,0x00},
+{0x60,0x34,0x34,0x34,0x34,0x34,0x00,0x00},
+{0x0,0x80,0x80,0x80,0x83,0x83,0x00,0x00},
+{0x50,0x50,0x50,0x3C,0x3C,0x3C,0x00,0x00},
+{0x0,0xa5,0xfb,0xf6,0xF6,0xF6,0x00,0x00}
+};
+
+UCHAR XGI330_cr40_1[15][8]={
+{0x66,0x40,0x40,0x28,0x24,0x24,0x00,0x00},
+{0x66,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+{0x00,0x00,0x00,0x00,0x0F,0x0F,0x00,0x00},
+{0x00,0xf0,0xf0,0xf0,0xF0,0xF0,0x00,0x00},
+{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+{0x10,0x10,0x10,0x10,0x20,0x20,0x00,0x00},
+{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+{0x88,0x88,0x88,0xAA,0xAC,0xAC,0x00,0x00},
+{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+{0x00,0x00,0x00,0x00,0x77,0x77,0x00,0x00},
+{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+{0x00,0xA2,0x00,0x00,0xA2,0xA2,0x00,0x00},
+};
+
+UCHAR XGI330_sr25[]={0x00,0x0};
+UCHAR XGI330_sr31=0xc0;
+UCHAR XGI330_sr32=0x11;
+UCHAR XGI330_SR33=0x00;
+UCHAR XG40_CRCF=0x13;
+UCHAR XG40_DRAMTypeDefinition=0xFF ;
+
+XGI_StStruct XGI330_SModeIDTable[]=
+{
+ {0x01,0x9208,0x01,0x00,0x10,0x00,0x00,0x01,0x00},
+ {0x01,0x1210,0x14,0x01,0x00,0x01,0x00,0x01,0x00},
+ {0x01,0x1010,0x17,0x02,0x11,0x00,0x00,0x01,0x01},
+ {0x03,0x8208,0x03,0x00,0x14,0x00,0x00,0x01,0x02},
+ {0x03,0x0210,0x16,0x01,0x04,0x01,0x00,0x01,0x02},
+ {0x03,0x0010,0x18,0x02,0x15,0x00,0x00,0x01,0x03},
+ {0x05,0x9209,0x05,0x00,0x10,0x00,0x00,0x00,0x04},
+ {0x06,0x8209,0x06,0x00,0x14,0x00,0x00,0x00,0x05},
+ {0x07,0x0000,0x07,0x03,0x05,0x03,0x00,0x01,0x03},
+ {0x07,0x0000,0x19,0x02,0x15,0x02,0x00,0x01,0x03},
+ {0x0d,0x920a,0x0d,0x00,0x10,0x00,0x00,0x00,0x04},
+ {0x0e,0x820a,0x0e,0x00,0x14,0x00,0x00,0x00,0x05},
+ {0x0f,0x0202,0x11,0x01,0x04,0x01,0x00,0x00,0x05},
+ {0x10,0x0212,0x12,0x01,0x04,0x01,0x00,0x00,0x05},
+ {0x11,0x0212,0x1a,0x04,0x24,0x04,0x00,0x00,0x05},
+ {0x12,0x0212,0x1b,0x04,0x24,0x04,0x00,0x00,0x05},
+ {0x13,0x021b,0x1c,0x00,0x14,0x00,0x00,0x00,0x04},
+ {0x12,0x0010,0x18,0x02,0x24,0x02,0x00,0x00,0x05},/* St_CRT2CRTC2 not sure */
+ {0x12,0x0210,0x18,0x01,0x24,0x01,0x00,0x00,0x05},/* St_CRT2CRTC2 not sure */
+ {0xff,0x0000,0x00,0x00,0x00,0x00,0x00,0x00,0x00}
+};
+
+
+XGI_ExtStruct  XGI330_EModeIDTable[]=
+{
+ {0x6a,0x2212,0x0407,0x3a81,0x0102,0x08,0x07,0x00,0x00,0x07,0x0e},
+ {0x2e,0x0a1b,0x0306,0x3a57,0x0101,0x08,0x06,0x00,0x00,0x05,0x06},
+ {0x2f,0x0a1b,0x0305,0x3a50,0x0100,0x08,0x05,0x00,0x00,0x05,0x05},
+ {0x30,0x2a1b,0x0407,0x3a81,0x0103,0x08,0x07,0x00,0x00,0x07,0x0e},
+ {0x31,0x0a1b,0x030d,0x3b85,0x0000,0x08,0x0d,0x00,0x00,0x06,0x3d},
+ {0x32,0x0a1b,0x0a0e,0x3b8c,0x0000,0x08,0x0e,0x00,0x00,0x06,0x3e},
+ {0x33,0x0a1d,0x0a0d,0x3b85,0x0000,0x08,0x0d,0x00,0x00,0x06,0x3d},
+ {0x34,0x2a1d,0x0a0e,0x3b8c,0x0000,0x08,0x0e,0x00,0x00,0x06,0x3e},
+ {0x35,0x0a1f,0x0a0d,0x3b85,0x0000,0x08,0x0d,0x00,0x00,0x06,0x3d},
+ {0x36,0x2a1f,0x0a0e,0x3b8c,0x0000,0x08,0x0e,0x00,0x00,0x06,0x3e},
+ {0x37,0x0212,0x0508,0x3aab,0x0104,0x08,0x08,0x00,0x00,0x00,0x16},
+ {0x38,0x0a1b,0x0508,0x3aab,0x0105,0x08,0x08,0x00,0x00,0x00,0x16},
+ {0x3a,0x0e3b,0x0609,0x3adc,0x0107,0x08,0x09,0x00,0x00,0x00,0x1e},
+ {0x3c,0x0e3b,0x070a,0x3af2,0x0130,0x08,0x0a,0x00,0x00,0x00,0x22},     /* mode 1600x1200 add CRT2MODE [2003/10/07] */
+ {0x3d,0x0e7d,0x070a,0x3af2,0x0131,0x08,0x0a,0x00,0x00,0x00,0x22},     /* mode 1600x1200 add CRT2MODE */
+ {0x40,0x9a1c,0x0000,0x3a34,0x010d,0x08,0x00,0x00,0x00,0x04,0x00},
+ {0x41,0x9a1d,0x0000,0x3a34,0x010e,0x08,0x00,0x00,0x00,0x04,0x00},     /* ModeIdIndex = 0x10 */
+ {0x43,0x0a1c,0x0306,0x3a57,0x0110,0x08,0x06,0x00,0x00,0x05,0x06},
+ {0x44,0x0a1d,0x0306,0x3a57,0x0111,0x08,0x06,0x00,0x00,0x05,0x06},
+ {0x46,0x2a1c,0x0407,0x3a81,0x0113,0x08,0x07,0x00,0x00,0x07,0x0e},
+ {0x47,0x2a1d,0x0407,0x3a81,0x0114,0x08,0x07,0x00,0x00,0x07,0x0e},
+ {0x49,0x0a3c,0x0508,0x3aab,0x0116,0x08,0x08,0x00,0x00,0x00,0x16},
+ {0x4a,0x0a3d,0x0508,0x3aab,0x0117,0x08,0x08,0x00,0x00,0x00,0x16},
+ {0x4c,0x0e7c,0x0609,0x3adc,0x0119,0x08,0x09,0x00,0x00,0x00,0x1e},
+ {0x4d,0x0e7d,0x0609,0x3adc,0x011a,0x08,0x09,0x00,0x00,0x00,0x1e},
+ {0x50,0x9a1b,0x0001,0x3a3b,0x0132,0x08,0x01,0x00,0x00,0x04,0x02},
+ {0x51,0xba1b,0x0103,0x3a42,0x0133,0x08,0x03,0x00,0x00,0x07,0x03},
+ {0x52,0x9a1b,0x0204,0x3a49,0x0134,0x08,0x04,0x00,0x00,0x00,0x04},
+ {0x56,0x9a1d,0x0001,0x3a3b,0x0135,0x08,0x01,0x00,0x00,0x04,0x02},
+ {0x57,0xba1d,0x0103,0x3a42,0x0136,0x08,0x03,0x00,0x00,0x07,0x03},
+ {0x58,0x9a1d,0x0204,0x3a49,0x0137,0x08,0x04,0x00,0x00,0x00,0x04},
+ {0x59,0x9a1b,0x0000,0x3a34,0x0138,0x08,0x00,0x00,0x00,0x04,0x00},
+ {0x5A,0x021b,0x0014,0x3b83,0x0138,0x08,0x01,0x00,0x00,0x04,0x3f},     /* ModeIdIndex = 0x20 */
+ {0x5B,0x0a1d,0x0014,0x3b83,0x0135,0x08,0x01,0x00,0x00,0x04,0x3f},
+ {0x5d,0x0a1d,0x0305,0x3a50,0x0139,0x08,0x05,0x00,0x00,0x07,0x05},
+ {0x62,0x0a3f,0x0306,0x3a57,0x013a,0x08,0x06,0x00,0x00,0x05,0x06},
+ {0x63,0x2a3f,0x0407,0x3a81,0x013b,0x08,0x07,0x00,0x00,0x07,0x0e},
+ {0x64,0x0a7f,0x0508,0x3aab,0x013c,0x08,0x08,0x00,0x00,0x00,0x16},
+ {0x65,0x0eff,0x0609,0x3adc,0x013d,0x08,0x09,0x00,0x00,0x00,0x1e},
+ {0x66,0x0eff,0x070a,0x3af2,0x013e,0x08,0x0a,0x00,0x00,0x00,0x22},     /* mode 1600x1200 add CRT2MODE */
+ {0x68,0x067b,0x080b,0x3b17,0x013f,0x08,0x0b,0x00,0x00,0x00,0x29},
+ {0x69,0x06fd,0x080b,0x3b17,0x0140,0x08,0x0b,0x00,0x00,0x00,0x29},
+ {0x6b,0x07ff,0x080b,0x3b17,0x0141,0x10,0x0b,0x00,0x00,0x00,0x29},
+ {0x6c,0x067b,0x090c,0x3b37,0x0000,0x08,0x0c,0x00,0x00,0x00,0x2f},
+ {0x6d,0x06fd,0x090c,0x3b37,0x0000,0x10,0x0c,0x00,0x00,0x00,0x2f},
+ {0x6e,0x07ff,0x090c,0x3b37,0x0000,0x10,0x0c,0x00,0x00,0x00,0x2f},
+ {0x70,0x2a1b,0x0410,0x3b52,0x0000,0x08,0x10,0x00,0x00,0x07,0x34},
+ {0x71,0x0a1b,0x0511,0x3b63,0x0000,0x08,0x11,0x00,0x00,0x00,0x37},
+ {0x74,0x0a1d,0x0511,0x3b63,0x0000,0x08,0x11,0x00,0x00,0x00,0x37},     /* ModeIdIndex = 0x30 */
+ {0x75,0x0a3d,0x0612,0x3b74,0x0000,0x08,0x12,0x00,0x00,0x00,0x3a},
+ {0x76,0x2a1f,0x0410,0x3b52,0x0000,0x08,0x10,0x00,0x00,0x07,0x34},
+ {0x77,0x0a1f,0x0511,0x3b63,0x0000,0x08,0x11,0x00,0x00,0x00,0x37},
+ {0x78,0x0a3f,0x0612,0x3b74,0x0000,0x08,0x12,0x00,0x00,0x00,0x3a},
+ {0x79,0x0a3b,0x0612,0x3b74,0x0000,0x08,0x12,0x00,0x00,0x00,0x3a},
+ {0x7a,0x2a1d,0x0410,0x3b52,0x0000,0x08,0x10,0x00,0x00,0x07,0x34},
+ {0x7b,0x0e3b,0x060f,0x3ad0,0x0000,0x08,0x0f,0x00,0x00,0x00,0x1d},
+ {0x7c,0x0e7d,0x060f,0x3ad0,0x0000,0x08,0x0f,0x00,0x00,0x00,0x1d},
+ {0x7d,0x0eff,0x060f,0x3ad0,0x0000,0x08,0x0f,0x00,0x00,0x00,0x1d},
+ {0x20,0x0e3b,0x0D16,0x49e0,0x0000,0x08,0x16,0x00,0x00,0x00,0x43},
+ {0x21,0x0e7d,0x0D16,0x49e0,0x0000,0x08,0x16,0x00,0x00,0x00,0x43},
+ {0x22,0x0eff,0x0D16,0x49e0,0x0000,0x08,0x16,0x00,0x00,0x00,0x43},
+ {0x23,0x0e3b,0x0614,0x49d5,0x0000,0x08,0x14,0x00,0x00,0x00,0x41},
+ {0x24,0x0e7d,0x0614,0x49d5,0x0000,0x08,0x14,0x00,0x00,0x00,0x41},
+ {0x25,0x0eff,0x0614,0x49d5,0x0000,0x08,0x14,0x00,0x00,0x00,0x41},
+ {0x26,0x063b,0x0c15,0x49dc,0x0000,0x08,0x15,0x00,0x00,0x00,0x42},     /* ModeIdIndex = 0x40 */
+ {0x27,0x067d,0x0c15,0x49dc,0x0000,0x08,0x15,0x00,0x00,0x00,0x42},
+ {0x28,0x06ff,0x0c15,0x49dc,0x0000,0x08,0x15,0x00,0x00,0x00,0x42},
+ {0xff,0x0000,0x0000,0x0000,0x0000,0x00,0x00,0x00,0x00,0x00,0x00}
+};
+
+XGI_StandTableStruct XGI330_StandTable[]=
+{
+/* MD_0_200 */
+ {
+  0x28,0x18,0x08,0x0800,
+  {0x09,0x03,0x00,0x02},
+  0x63,
+  {0x2d,0x27,0x28,0x90,0x2b,0xa0,0xbf,0x1f,
+   0x00,0xc7,0x06,0x07,0x00,0x00,0x00,0x00,
+   0x9c,0x8e,0x8f,0x14,0x1f,0x96,0xb9,0xa3,
+   0xff},
+  {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
+   0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
+   0x08,0x00,0x0f,0x00},
+  {0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
+   0xff}
+ },
+/* MD_1_200 */
+ {
+  0x28,0x18,0x08,0x0800,
+  {0x09,0x03,0x00,0x02},
+  0x63,
+  {0x2d,0x27,0x28,0x90,0x2b,0xa0,0xbf,0x1f,
+   0x00,0xc7,0x06,0x07,0x00,0x00,0x00,0x00,
+   0x9c,0x8e,0x8f,0x14,0x1f,0x96,0xb9,0xa3,
+   0xff},
+  {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
+   0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
+   0x08,0x00,0x0f,0x00},
+  {0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
+   0xff}
+ },
+/* MD_2_200 */
+ {
+  0x50,0x18,0x08,0x1000,
+  {0x01,0x03,0x00,0x02},
+  0x63,
+  {0x5f,0x4f,0x50,0x82,0x55,0x81,0xbf,0x1f,
+   0x00,0xc7,0x06,0x07,0x00,0x00,0x00,0x00,
+   0x9c,0x8e,0x8f,0x28,0x1f,0x96,0xb9,0xa3,
+   0xff},
+  {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
+   0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
+   0x08,0x00,0x0f,0x00},
+  {0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
+   0xff}
+ },
+/* MD_3_200 */
+ {
+  0x50,0x18,0x08,0x1000,
+  {0x01,0x03,0x00,0x02},
+  0x63,
+  {0x5f,0x4f,0x50,0x82,0x55,0x81,0xbf,0x1f,
+   0x00,0xc7,0x06,0x07,0x00,0x00,0x00,0x00,
+   0x9c,0x8e,0x8f,0x28,0x1f,0x96,0xb9,0xa3,
+   0xff},
+  {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
+   0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
+   0x08,0x00,0x0f,0x00},
+  {0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
+   0xff}
+ },
+/* MD_4 */
+ {
+  0x28,0x18,0x08,0x4000,
+  {0x09,0x03,0x00,0x02},
+  0x63,
+  {0x2d,0x27,0x28,0x90,0x2c,0x80,0xbf,0x1f,
+   0x00,0xc1,0x00,0x00,0x00,0x00,0x00,0x00,
+   0x9c,0x8e,0x8f,0x14,0x00,0x96,0xb9,0xa2,
+   0xff},
+  {0x00,0x13,0x15,0x17,0x02,0x04,0x06,0x07,
+   0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
+   0x01,0x00,0x03,0x00},
+  {0x00,0x00,0x00,0x00,0x00,0x30,0x0f,0x00,
+   0xff}
+ },
+/* MD_5 */
+ {
+  0x28,0x18,0x08,0x4000,
+  {0x09,0x03,0x00,0x02},
+  0x63,
+  {0x2d,0x27,0x28,0x90,0x2c,0x80,0xbf,0x1f,
+   0x00,0xc1,0x00,0x00,0x00,0x00,0x00,0x00,
+   0x9c,0x8e,0x8f,0x14,0x00,0x96,0xb9,0xa2,
+   0xff},
+  {0x00,0x13,0x15,0x17,0x02,0x04,0x06,0x07,
+   0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
+   0x01,0x00,0x03,0x00},
+  {0x00,0x00,0x00,0x00,0x00,0x30,0x0f,0x00,
+   0xff}
+ },
+/* MD_6 */
+ {
+  0x50,0x18,0x08,0x4000,
+  {0x01,0x01,0x00,0x06},
+  0x63,
+  {0x5f,0x4f,0x50,0x82,0x55,0x81,0xbf,0x1f,
+   0x00,0xc1,0x00,0x00,0x00,0x00,0x00,0x00,
+   0x9c,0x8e,0x8f,0x28,0x00,0x96,0xb9,0xc2,
+   0xff},
+  {0x00,0x17,0x17,0x17,0x17,0x17,0x17,0x17,
+   0x17,0x17,0x17,0x17,0x17,0x17,0x17,0x17,
+   0x01,0x00,0x01,0x00},
+  {0x00,0x00,0x00,0x00,0x00,0x00,0x0d,0x00,
+   0xff}
+ },
+/* MD_7 */
+ {
+  0x50,0x18,0x0e,0x1000,
+  {0x00,0x03,0x00,0x03},
+  0xa6,
+  {0x5f,0x4f,0x50,0x82,0x55,0x81,0xbf,0x1f,
+   0x00,0x4d,0x0b,0x0c,0x00,0x00,0x00,0x00,
+   0x83,0x85,0x5d,0x28,0x0d,0x63,0xba,0xa3,
+   0xff},
+  {0x00,0x08,0x08,0x08,0x08,0x08,0x08,0x08,
+   0x10,0x18,0x18,0x18,0x18,0x18,0x18,0x18,
+   0x0e,0x00,0x0f,0x08},
+  {0x00,0x00,0x00,0x00,0x00,0x10,0x0a,0x00,
+   0xff}
+ },
+/* MDA_DAC */
+ {
+  0x00,0x00,0x00,0x0000,
+  {0x00,0x00,0x00,0x15},
+  0x15,
+  {0x15,0x15,0x15,0x15,0x15,0x15,0x15,0x15,
+   0x15,0x15,0x15,0x15,0x15,0x15,0x3f,0x3f,
+   0x3f,0x3f,0x3f,0x3f,0x3f,0x3f,0x00,0x00,
+   0x00},
+  {0x00,0x00,0x00,0x00,0x00,0x15,0x15,0x15,
+   0x15,0x15,0x15,0x15,0x15,0x15,0x15,0x15,
+   0x15,0x15,0x15,0x15},
+  {0x15,0x3f,0x3f,0x3f,0x3f,0x3f,0x3f,0x3f,
+   0x3f}
+ },
+/* CGA_DAC */
+ {
+  0x00,0x10,0x04,0x0114,
+  {0x11,0x09,0x15,0x00},
+  0x10,
+  {0x04,0x14,0x01,0x11,0x09,0x15,0x2a,0x3a,
+   0x2e,0x3e,0x2b,0x3b,0x2f,0x3f,0x2a,0x3a,
+   0x2e,0x3e,0x2b,0x3b,0x2f,0x3f,0x00,0x10,
+   0x04},
+  {0x14,0x01,0x11,0x09,0x15,0x00,0x10,0x04,
+   0x14,0x01,0x11,0x09,0x15,0x2a,0x3a,0x2e,
+   0x3e,0x2b,0x3b,0x2f},
+  {0x3f,0x2a,0x3a,0x2e,0x3e,0x2b,0x3b,0x2f,
+   0x3f}
+ },
+/* EGA_DAC */
+ {
+  0x00,0x10,0x04,0x0114,
+  {0x11,0x05,0x15,0x20},
+  0x30,
+  {0x24,0x34,0x21,0x31,0x25,0x35,0x08,0x18,
+   0x0c,0x1c,0x09,0x19,0x0d,0x1d,0x28,0x38,
+   0x2c,0x3c,0x29,0x39,0x2d,0x3d,0x02,0x12,
+   0x06},
+  {0x16,0x03,0x13,0x07,0x17,0x22,0x32,0x26,
+   0x36,0x23,0x33,0x27,0x37,0x0a,0x1a,0x0e,
+   0x1e,0x0b,0x1b,0x0f},
+  {0x1f,0x2a,0x3a,0x2e,0x3e,0x2b,0x3b,0x2f,
+   0x3f}
+ },
+/* VGA_DAC */
+ {
+  0x00,0x10,0x04,0x0114,
+  {0x11,0x09,0x15,0x2a},
+  0x3a,
+  {0x2e,0x3e,0x2b,0x3b,0x2f,0x3f,0x00,0x05,
+   0x08,0x0b,0x0e,0x11,0x14,0x18,0x1c,0x20,
+   0x24,0x28,0x2d,0x32,0x38,0x3f,0x00,0x10,
+   0x1f},
+  {0x2f,0x3f,0x1f,0x27,0x2f,0x37,0x3f,0x2d,
+   0x31,0x36,0x3a,0x3f,0x00,0x07,0x0e,0x15,
+   0x1c,0x0e,0x11,0x15},
+  {0x18,0x1c,0x14,0x16,0x18,0x1a,0x1c,0x00,
+   0x04}
+ },
+ {
+  0x08,0x0c,0x10,0x0a08,
+  {0x0c,0x0e,0x10,0x0b},
+  0x0c,
+  {0x0d,0x0f,0x10,0x10,0x01,0x08,0x00,0x00,
+   0x00,0x00,0x01,0x00,0x02,0x02,0x01,0x00,
+   0x04,0x04,0x01,0x00,0x05,0x02,0x05,0x00,
+   0x06},
+  {0x01,0x06,0x05,0x06,0x00,0x08,0x01,0x08,
+   0x00,0x07,0x02,0x07,0x06,0x07,0x00,0x00,
+   0x00,0x00,0x00,0x00},
+  {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+   0x00}
+ },
+/* MD_D */
+ {
+  0x28,0x18,0x08,0x2000,
+  {0x09,0x0f,0x00,0x06},
+  0x63,
+  {0x2d,0x27,0x28,0x90,0x2c,0x80,0xbf,0x1f,
+   0x00,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,
+   0x9c,0x8e,0x8f,0x14,0x00,0x96,0xb9,0xe3,
+   0xff},
+  {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
+   0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
+   0x01,0x00,0x0f,0x00},
+  {0x00,0x00,0x00,0x00,0x00,0x00,0x05,0x0f,
+   0xff}
+ },
+/* MD_E */
+ {
+  0x50,0x18,0x08,0x4000,
+  {0x01,0x0f,0x00,0x06},
+  0x63,
+  {0x5f,0x4f,0x50,0x82,0x55,0x81,0xbf,0x1f,
+   0x00,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,
+   0x9c,0x8e,0x8f,0x28,0x00,0x96,0xb9,0xe3,
+   0xff},
+  {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
+   0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
+   0x01,0x00,0x0f,0x00},
+  {0x00,0x00,0x00,0x00,0x00,0x00,0x05,0x0f,
+   0xff}
+ },
+/* ExtVGATable */
+ {
+  0x00,0x00,0x00,0x0000,
+  {0x01,0x0f,0x00,0x0e},
+  0x23,
+  {0x5f,0x4f,0x50,0x82,0x54,0x80,0x0b,0x3e,
+   0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,
+   0xea,0x8c,0xdf,0x28,0x40,0xe7,0x04,0xa3,
+   0xff},
+  {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
+   0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,
+   0x01,0x00,0x00,0x00},
+  {0x00,0x00,0x00,0x00,0x00,0x40,0x05,0x0f,
+   0xff}
+ },
+/* ROM_SAVEPTR */
+ {
+  0x9f,0x3b,0x00,0x00c0,
+  {0x00,0x00,0x00,0x00},
+  0x00,
+  {0x00,0x00,0x00,0x00,0x00,0x00,0xbb,0x3f,
+   0x00,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,
+   0x00,0x00,0x1a,0x00,0xac,0x3e,0x00,0xc0,
+   0x00},
+  {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+   0x00,0x00,0x00,0x00},
+  {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+   0x00}
+ },
+/* MD_F */
+ {
+  0x50,0x18,0x0e,0x8000,
+  {0x01,0x0f,0x00,0x06},
+  0xa2,
+  {0x5f,0x4f,0x50,0x82,0x55,0x81,0xbf,0x1f,
+   0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,
+   0x82,0x84,0x5d,0x28,0x0f,0x63,0xba,0xe3,
+   0xff},
+  {0x00,0x08,0x00,0x00,0x18,0x18,0x00,0x00,
+   0x00,0x08,0x00,0x00,0x00,0x18,0x00,0x00,
+   0x0b,0x00,0x05,0x00},
+  {0x00,0x00,0x00,0x00,0x00,0x00,0x05,0x05,
+   0xff}
+ },
+/* MD_10 */
+ {
+  0x50,0x18,0x0e,0x8000,
+  {0x01,0x0f,0x00,0x06},
+  0xa3,
+  {0x5f,0x4f,0x50,0x82,0x55,0x81,0xbf,0x1f,
+   0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,
+   0x82,0x84,0x5d,0x28,0x0f,0x63,0xba,0xe3,
+   0xff},
+  {0x00,0x01,0x02,0x03,0x04,0x05,0x14,0x07,
+   0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,
+   0x01,0x00,0x0f,0x00},
+  {0x00,0x00,0x00,0x00,0x00,0x00,0x05,0x0f,
+   0xff}
+ },
+/* MD_0_350 */
+ {
+  0x28,0x18,0x0e,0x0800,
+  {0x09,0x03,0x00,0x02},
+  0xa3,
+  {0x2d,0x27,0x28,0x90,0x2b,0xb1,0xbf,0x1f,
+   0x00,0x4d,0x0b,0x0c,0x00,0x00,0x00,0x00,
+   0x83,0x85,0x5d,0x14,0x1f,0x63,0xba,0xa3,
+   0xff},
+  {0x00,0x01,0x02,0x03,0x04,0x05,0x14,0x07,
+   0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,
+   0x08,0x00,0x0f,0x00},
+  {0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
+   0xff}
+ },
+/* MD_1_350 */
+ {
+  0x28,0x18,0x0e,0x0800,
+  {0x09,0x03,0x00,0x02},
+  0xa3,
+  {0x2d,0x27,0x28,0x90,0x2b,0xa0,0xbf,0x1f,
+   0x00,0x4d,0x0b,0x0c,0x00,0x00,0x00,0x00,
+   0x83,0x85,0x5d,0x14,0x1f,0x63,0xba,0xa3,
+   0xff},
+  {0x00,0x01,0x02,0x03,0x04,0x05,0x14,0x07,
+   0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,
+   0x08,0x00,0x0f,0x00},
+  {0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
+   0xff}
+ },
+/* MD_2_350 */
+ {
+  0x50,0x18,0x0e,0x1000,
+  {0x01,0x03,0x00,0x02},
+  0xa3,
+  {0x5f,0x4f,0x50,0x82,0x55,0x81,0xbf,0x1f,
+   0x00,0x4d,0x0b,0x0c,0x00,0x00,0x00,0x00,
+   0x83,0x85,0x5d,0x28,0x1f,0x63,0xba,0xa3,
+   0xff},
+  {0x00,0x01,0x02,0x03,0x04,0x05,0x14,0x07,
+   0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,
+   0x08,0x00,0x0f,0x00},
+  {0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
+   0xff}
+ },
+/* MD_3_350 */
+ {
+  0x50,0x18,0x0e,0x1000,
+  {0x01,0x03,0x00,0x02},
+  0xa3,
+  {0x5f,0x4f,0x50,0x82,0x55,0x81,0xbf,0x1f,
+   0x00,0x4d,0x0b,0x0c,0x00,0x00,0x00,0x00,
+   0x83,0x85,0x5d,0x28,0x1f,0x63,0xba,0xa3,
+   0xff},
+  {0x00,0x01,0x02,0x03,0x04,0x05,0x14,0x07,
+   0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,
+   0x08,0x00,0x0f,0x00},
+  {0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
+   0xff}
+ },
+/* MD_0_1_400 */
+ {
+  0x28,0x18,0x10,0x0800,
+  {0x08,0x03,0x00,0x02},
+  0x67,
+  {0x2d,0x27,0x28,0x90,0x2b,0xb1,0xbf,0x1f,
+   0x00,0x4f,0x0d,0x0e,0x00,0x00,0x00,0x00,
+   0x9c,0x8e,0x8f,0x14,0x1f,0x96,0xb9,0xa3,
+   0xff},
+  {0x00,0x01,0x02,0x03,0x04,0x05,0x14,0x07,
+   0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,
+   0x0c,0x00,0x0f,0x08},
+  {0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
+   0xff}
+ },
+/* MD_2_3_400 */
+ {
+  0x50,0x18,0x10,0x1000,
+  {0x00,0x03,0x00,0x02},
+  0x67,
+  {0x5f,0x4f,0x50,0x82,0x55,0x81,0xbf,0x1f,
+   0x00,0x4f,0x0d,0x0e,0x00,0x00,0x00,0x00,
+   0x9c,0x8e,0x8f,0x28,0x1f,0x96,0xb9,0xa3,
+   0xff},
+  {0x00,0x01,0x02,0x03,0x04,0x05,0x14,0x07,
+   0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,
+   0x0c,0x00,0x0f,0x08},
+  {0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
+   0xff}
+ },
+/* MD_7_400 */
+ {
+  0x50,0x18,0x10,0x1000,
+  {0x00,0x03,0x00,0x02},
+  0x66,
+  {0x5f,0x4f,0x50,0x82,0x55,0x81,0xbf,0x1f,
+   0x00,0x4f,0x0d,0x0e,0x00,0x00,0x00,0x00,
+   0x9c,0x8e,0x8f,0x28,0x0f,0x96,0xb9,0xa3,
+   0xff},
+  {0x00,0x08,0x08,0x08,0x08,0x08,0x08,0x08,
+   0x10,0x18,0x18,0x18,0x18,0x18,0x18,0x18,
+   0x0e,0x00,0x0f,0x08},
+  {0x00,0x00,0x00,0x00,0x00,0x10,0x0a,0x00,
+   0xff}
+ },
+/* MD_11 */
+ {
+  0x50,0x1d,0x10,0xa000,
+  {0x01,0x0f,0x00,0x06},
+  0xe3,
+  {0x5f,0x4f,0x50,0x82,0x55,0x81,0x0b,0x3e,
+   0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,
+   0xe9,0x8b,0xdf,0x28,0x00,0xe7,0x04,0xc3,
+   0xff},
+  {0x00,0x3f,0x3f,0x3f,0x3f,0x3f,0x3f,0x3f,
+   0x3f,0x3f,0x3f,0x3f,0x3f,0x3f,0x3f,0x3f,
+   0x01,0x00,0x0f,0x00},
+  {0x00,0x00,0x00,0x00,0x00,0x00,0x05,0x01,
+   0xff}
+ },
+/* ExtEGATable */
+ {
+  0x50,0x1d,0x10,0xa000,
+  {0x01,0x0f,0x00,0x06},
+  0xe3,
+  {0x5f,0x4f,0x50,0x82,0x55,0x81,0x0b,0x3e,
+   0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,
+   0xe9,0x8b,0xdf,0x28,0x00,0xe7,0x04,0xe3,
+   0xff},
+  {0x00,0x01,0x02,0x03,0x04,0x05,0x14,0x07,
+   0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,
+   0x01,0x00,0x0f,0x00},
+  {0x00,0x00,0x00,0x00,0x00,0x00,0x05,0x0f,
+   0xff}
+ },
+/* MD_13 */
+ {
+  0x28,0x18,0x08,0x2000,
+  {0x01,0x0f,0x00,0x0e},
+  0x63,
+  {0x5f,0x4f,0x50,0x82,0x55,0x81,0xbf,0x1f,
+   0x00,0x41,0x00,0x00,0x00,0x00,0x00,0x00,
+   0x9c,0x8e,0x8f,0x28,0x40,0x96,0xb9,0xa3,
+   0xff},
+  {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
+   0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,
+   0x41,0x00,0x0f,0x00},
+  {0x00,0x00,0x00,0x00,0x00,0x40,0x05,0x0f,
+   0xff}
+ }
+};
+
+XGI_TimingHStruct XGI_TimingH[]=
+{{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}}};
+
+XGI_TimingVStruct XGI_TimingV[]=
+{{{0x00,0x00,0x00,0x00,0x00,0x00,0x00}}};
+
+XGI_XG21CRT1Struct XGI_UpdateCRT1Table[]=
+{
+ {0x01,0x27,0x91,0x8f,0xc0},   /* 00 */
+ {0x03,0x4f,0x83,0x8f,0xc0},   /* 01 */
+ {0x05,0x27,0x91,0x8f,0xc0},   /* 02 */
+ {0x06,0x4f,0x83,0x8f,0xc0},   /* 03 */
+ {0x07,0x4f,0x83,0x8f,0xc0},   /* 04 */
+ {0x0d,0x27,0x91,0x8f,0xc0},   /* 05 */
+ {0x0e,0x4f,0x83,0x8f,0xc0},   /* 06 */
+ {0x0f,0x4f,0x83,0x5d,0xc0},   /* 07 */
+ {0x10,0x4f,0x83,0x5d,0xc0},   /* 08 */
+ {0x11,0x4f,0x83,0xdf,0x0c},   /* 09 */
+ {0x12,0x4f,0x83,0xdf,0x0c},   /* 10 */
+ {0x13,0x4f,0x83,0x8f,0xc0},   /* 11 */
+ {0x2e,0x4f,0x83,0xdf,0x0c},   /* 12 */
+ {0x2e,0x4f,0x87,0xdf,0xc0},   /* 13 */
+ {0x2f,0x4f,0x83,0x8f,0xc0},   /* 14 */
+ {0x50,0x27,0x91,0xdf,0x0c},   /* 15 */
+ {0x59,0x27,0x91,0x8f,0xc0}    /* 16 */
+};
+
+XGI_CRT1TableStruct XGI_CRT1Table[]=
+{
+ {{0x2d,0x28,0x90,0x2c,0x90,0x00,0x04,0x00,
+    0xbf,0x1f,0x9c,0x8e,0x96,0xb9,0x30}}, /* 0x0 */
+ {{0x2d,0x28,0x90,0x2c,0x90,0x00,0x04,0x00,
+    0x0b,0x3e,0xe9,0x8b,0xe7,0x04,0x00}}, /* 0x1 */
+ {{0x3D,0x31,0x81,0x37,0x1F,0x00,0x05,0x00,
+    0x72,0xF0,0x58,0x8C,0x57,0x73,0xA0}}, /* 0x2 */
+ {{0x4F,0x3F,0x93,0x45,0x0D,0x00,0x01,0x00,
+    0x24,0xF5,0x02,0x88,0xFF,0x25,0x90}}, /* 0x3 */
+ {{0x5F,0x50,0x82,0x55,0x81,0x00,0x05,0x00,
+    0xBF,0x1F,0x9C,0x8E,0x96,0xB9,0x30}}, /* 0x4 */
+ {{0x5F,0x50,0x82,0x55,0x81,0x00,0x05,0x00,
+    0x0B,0x3E,0xE9,0x8B,0xE7,0x04,0x00}}, /* 0x5 */
+ {{0x63,0x50,0x86,0x56,0x9B,0x00,0x01,0x00,
+    0x06,0x3E,0xE8,0x8B,0xE7,0xFF,0x10}}, /* 0x6 */
+ {{0x64,0x4F,0x88,0x55,0x9D,0x00,0x01,0x00,
+    0xF2,0x1F,0xE0,0x83,0xDF,0xF3,0x10}}, /* 0x7 */
+ {{0x63,0x4F,0x87,0x5A,0x81,0x00,0x05,0x00,
+    0xFB,0x1F,0xE0,0x83,0xDF,0xFC,0x10}}, /* 0x8 */
+ {{0x65,0x4F,0x89,0x58,0x80,0x00,0x05,0x60,
+    0xFB,0x1F,0xE0,0x83,0xDF,0xFC,0x80}}, /* 0x9 */
+ {{0x65,0x4F,0x89,0x58,0x80,0x00,0x05,0x60,
+    0x01,0x3E,0xE0,0x83,0xDF,0x02,0x80}}, /* 0xa */
+ {{0x67,0x4F,0x8B,0x58,0x81,0x00,0x05,0x60,
+    0x0D,0x3E,0xE0,0x83,0xDF,0x0E,0x90}}, /* 0xb */
+ {{0x65,0x4F,0x89,0x57,0x9F,0x00,0x01,0x00,
+   0xFB,0x1F,0xE6,0x8A,0xDF,0xFC,0x10}}, /* 0xc */
+ {{0x7B,0x63,0x9F,0x6A,0x93,0x00,0x05,0x00,    /* ; 0D (800x600,56Hz) */
+    0x6F,0xF0,0x58,0x8A,0x57,0x70,0xA0}},         /* ; (VCLK 36.0MHz) */
+ {{0x7F,0x63,0x83,0x6C,0x1C,0x00,0x06,0x00,    /* ; 0E (800x600,60Hz) */
+    0x72,0xF0,0x58,0x8C,0x57,0x73,0xA0}},         /* ; (VCLK 40.0MHz) */
+ {{0x7D,0x63,0x81,0x6E,0x1D,0x00,0x06,0x00,    /* ; 0F (800x600,72Hz) */
+    0x98,0xF0,0x7C,0x82,0x57,0x99,0x80}},         /* ; (VCLK 50.0MHz) */
+ {{0x7F,0x63,0x83,0x69,0x13,0x00,0x06,0x00,    /* ; 10 (800x600,75Hz) */
+    0x6F,0xF0,0x58,0x8B,0x57,0x70,0xA0}},         /* ; (VCLK 49.5MHz) */
+ {{0x7E,0x63,0x82,0x6B,0x13,0x00,0x06,0x00,    /* ; 11 (800x600,85Hz) */
+    0x75,0xF0,0x58,0x8B,0x57,0x76,0xA0}},         /* ; (VCLK 56.25MHz) */
+ {{0x81,0x63,0x85,0x6D,0x18,0x00,0x06,0x60,    /* ; 12 (800x600,100Hz) */
+    0x7A,0xF0,0x58,0x8B,0x57,0x7B,0xA0}},         /* ; (VCLK 75.8MHz) */
+ {{0x83,0x63,0x87,0x6E,0x19,0x00,0x06,0x60,    /* ; 13 (800x600,120Hz) */
+    0x81,0xF0,0x58,0x8B,0x57,0x82,0xA0}},         /* ; (VCLK 79.411MHz) */
+ {{0x85,0x63,0x89,0x6F,0x1A,0x00,0x06,0x60,    /* ; 14 (800x600,160Hz) */
+   0x91,0xF0,0x58,0x8B,0x57,0x92,0xA0}},         /* ; (VCLK 105.822MHz) */
+ {{0x99,0x7F,0x9D,0x84,0x1A,0x00,0x02,0x00,
+    0x96,0x1F,0x7F,0x83,0x7F,0x97,0x10}}, /* 0x15 */
+ {{0xA3,0x7F,0x87,0x86,0x97,0x00,0x02,0x00,
+    0x24,0xF5,0x02,0x88,0xFF,0x25,0x90}}, /* 0x16 */
+ {{0xA1,0x7F,0x85,0x86,0x97,0x00,0x02,0x00,
+    0x24,0xF5,0x02,0x88,0xFF,0x25,0x90}}, /* 0x17 */
+ {{0x9F,0x7F,0x83,0x85,0x91,0x00,0x02,0x00,
+    0x1E,0xF5,0x00,0x83,0xFF,0x1F,0x90}}, /* 0x18 */
+ {{0xA7,0x7F,0x8B,0x89,0x95,0x00,0x02,0x00,
+    0x26,0xF5,0x00,0x83,0xFF,0x27,0x90}}, /* 0x19 */
+ {{0xA9,0x7F,0x8D,0x8C,0x9A,0x00,0x02,0x62,
+    0x2C,0xF5,0x00,0x83,0xFF,0x2D,0x14}}, /* 0x1a */
+ {{0xAB,0x7F,0x8F,0x8D,0x9B,0x00,0x02,0x62,
+    0x35,0xF5,0x00,0x83,0xFF,0x36,0x14}}, /* 0x1b */
+ {{0xCF,0x9F,0x93,0xB2,0x01,0x00,0x03,0x00,
+    0x14,0xBA,0x00,0x83,0xFF,0x15,0x00}}, /* 0x1c */
+ {{0xCE,0x9F,0x92,0xA9,0x17,0x00,0x07,0x00,
+    0x28,0x5A,0x00,0x83,0xFF,0x29,0x89}}, /* 0x1d */
+ {{0xCE,0x9F,0x92,0xA5,0x17,0x00,0x07,0x00,
+    0x28,0x5A,0x00,0x83,0xFF,0x29,0x89}}, /* 0x1e */
+ {{0xD3,0x9F,0x97,0xAB,0x1F,0x00,0x07,0x00,
+    0x2E,0x5A,0x00,0x83,0xFF,0x2F,0x89}}, /* 0x1f */
+ {{0x09,0xC7,0x8D,0xD3,0x0B,0x01,0x04,0x00,
+    0xE0,0x10,0xB0,0x83,0xAF,0xE1,0x2F}}, /* 0x20 */
+ {{0x09,0xC7,0x8D,0xD3,0x0B,0x01,0x04,0x00,
+    0xE0,0x10,0xB0,0x83,0xAF,0xE1,0x2F}}, /* 0x21 */
+ {{0x09,0xC7,0x8D,0xD3,0x0B,0x01,0x04,0x00,
+    0xE0,0x10,0xB0,0x83,0xAF,0xE1,0x2F}}, /* 0x22 */
+ {{0x09,0xC7,0x8D,0xD3,0x0B,0x01,0x04,0x00,
+    0xE0,0x10,0xB0,0x83,0xAF,0xE1,0x2F}}, /* 0x23 */
+ {{0x09,0xC7,0x8D,0xD3,0x0B,0x01,0x04,0x00,
+    0xE0,0x10,0xB0,0x83,0xAF,0xE1,0x2F}}, /* 0x24 */
+ {{0x09,0xC7,0x8D,0xD3,0x0B,0x01,0x04,0x00,
+    0xE0,0x10,0xB0,0x83,0xAF,0xE1,0x2F}}, /* 0x25 */
+ {{0x09,0xC7,0x8D,0xD3,0x0B,0x01,0x04,0x00,
+    0xE0,0x10,0xB0,0x83,0xAF,0xE1,0x2F}}, /* 0x26 */
+ {{0x40,0xEF,0x84,0x03,0x1D,0x41,0x01,0x00,
+    0xDA,0x1F,0xA0,0x83,0x9F,0xDB,0x1F}}, /* 0x27 */
+ {{0x43,0xEF,0x87,0x06,0x00,0x41,0x05,0x62,
+    0xD4,0x1F,0xA0,0x83,0x9F,0xD5,0x9F}}, /* 0x28 */
+ {{0x45,0xEF,0x89,0x07,0x01,0x41,0x05,0x62,
+    0xD9,0x1F,0xA0,0x83,0x9F,0xDA,0x9F}}, /* 0x29 */
+ {{0x40,0xEF,0x84,0x03,0x1D,0x41,0x01,0x00,
+    0xDA,0x1F,0xA0,0x83,0x9F,0xDB,0x1F}}, /* 0x2a */
+ {{0x40,0xEF,0x84,0x03,0x1D,0x41,0x01,0x00,
+    0xDA,0x1F,0xA0,0x83,0x9F,0xDB,0x1F}}, /* 0x2b */
+ {{0x40,0xEF,0x84,0x03,0x1D,0x41,0x01,0x00,
+    0xDA,0x1F,0xA0,0x83,0x9F,0xDB,0x1F}}, /* 0x2c */
+ {{0x59,0xFF,0x9D,0x17,0x13,0x41,0x05,0x44,
+    0x33,0xBA,0x00,0x83,0xFF,0x34,0x0F}}, /* 0x2d */
+ {{0x5B,0xFF,0x9F,0x18,0x14,0x41,0x05,0x44,
+    0x38,0xBA,0x00,0x83,0xFF,0x39,0x0F}}, /* 0x2e */
+ {{0x5B,0xFF,0x9F,0x18,0x14,0x41,0x05,0x44,
+    0x3D,0xBA,0x00,0x83,0xFF,0x3E,0x0F}}, /* 0x2f */
+ {{0x5D,0xFF,0x81,0x19,0x95,0x41,0x05,0x44,
+    0x41,0xBA,0x00,0x84,0xFF,0x42,0x0F}}, /* 0x30 */
+ {{0x55,0xFF,0x99,0x0D,0x0C,0x41,0x05,0x00,
+    0x3E,0xBA,0x00,0x84,0xFF,0x3F,0x0F}}, /* 0x31 */
+ {{0x7F,0x63,0x83,0x6C,0x1C,0x00,0x06,0x00,
+    0x72,0xBA,0x27,0x8B,0xDF,0x73,0x80}}, /* 0x32 */
+ {{0x7F,0x63,0x83,0x69,0x13,0x00,0x06,0x00,
+    0x6F,0xBA,0x26,0x89,0xDF,0x6F,0x80}}, /* 0x33 */
+ {{0x7F,0x63,0x82,0x6B,0x13,0x00,0x06,0x00,
+    0x75,0xBA,0x29,0x8C,0xDF,0x75,0x80}}, /* 0x34 */
+ {{0xA3,0x7F,0x87,0x86,0x97,0x00,0x02,0x00,
+    0x24,0xF1,0xAF,0x85,0x3F,0x25,0xB0}}, /* 0x35 */
+ {{0x9F,0x7F,0x83,0x85,0x91,0x00,0x02,0x00,
+    0x1E,0xF1,0xAD,0x81,0x3F,0x1F,0xB0}}, /* 0x36 */
+ {{0xA7,0x7F,0x88,0x89,0x15,0x00,0x02,0x00,
+    0x26,0xF1,0xB1,0x85,0x3F,0x27,0xB0}}, /* 0x37 */
+ {{0xCE,0x9F,0x92,0xA9,0x17,0x00,0x07,0x00,
+    0x28,0xC4,0x7A,0x8E,0xCF,0x29,0xA1}}, /* 0x38 */
+ {{0xCE,0x9F,0x92,0xA5,0x17,0x00,0x07,0x00,
+    0x28,0xD4,0x7A,0x8E,0xCF,0x29,0xA1}}, /* 0x39 */
+ {{0xD3,0x9F,0x97,0xAB,0x1F,0x00,0x07,0x00,
+    0x2E,0xD4,0x7D,0x81,0xCF,0x2F,0xA1}}, /* 0x3a */
+ {{0xDC,0x9F,0x00,0xAB,0x19,0x00,0x07,0x00,
+    0xE6,0xEF,0xC0,0xC3,0xBF,0xE7,0x90}}, /* 0x3b */
+ {{0x6B,0x59,0x8F,0x5E,0x8C,0x00,0x05,0x00,
+    0x0B,0x3E,0xE9,0x8B,0xE7,0x04,0x00}}, /* 0x3c */
+ {{0x7B,0x63,0x9F,0x6A,0x93,0x00,0x05,0x00,
+    0x6F,0xF0,0x58,0x8A,0x57,0x70,0xA0}}, /* 0x3d */
+ {{0x86,0x6A,0x8a,0x74,0x06,0x00,0x02,0x00,
+    0x8c,0x15,0x4f,0x83,0xef,0x8d,0x30}}, /* 0x3e */
+ {{0x81,0x6A,0x85,0x70,0x00,0x00,0x02,0x00,
+    0x0f,0x3e,0xeb,0x8e,0xdf,0x10,0x00}}, /* 0x3f */
+ {{0xCE,0x9F,0x92,0xA9,0x17,0x00,0x07,0x00,
+    0x20,0xF5,0x03,0x88,0xFF,0x21,0x90}}, /* 0x40 */
+ {{0xE6,0xAE,0x8A,0xBD,0x90,0x00,0x03,0x00,
+    0x3D,0x10,0x1A,0x8D,0x19,0x3E,0x2F}}, /* 0x41 */
+ {{0xB9,0x8F,0x9D,0x9B,0x8A,0x00,0x06,0x00,
+    0x7D,0xFF,0x60,0x83,0x5F,0x7E,0x90}}, /* 0x42 */
+ {{0xC3,0x8F,0x87,0x9B,0x0B,0x00,0x07,0x00,
+    0x82,0xFF,0x60,0x83,0x5F,0x83,0x90}},  /* 0x43 */
+ {{0xAD,0x7F,0x91,0x8E,0x9C,0x00,0x02,0x82,
+    0x49,0xF5,0x00,0x83,0xFF,0x4A,0x90}},  /* 0x44 */
+ {{0xCD,0x9F,0x91,0xA7,0x19,0x00,0x07,0x60,
+    0xE6,0xFF,0xC0,0x83,0xBF,0xE7,0x90}},  /* 0x45 */
+ {{0xD3,0x9F,0x97,0xAB,0x1F,0x00,0x07,0x60,
+    0xF1,0xFF,0xC0,0x83,0xBF,0xF2,0x90}},  /* 0x46 */
+ {{0xD7,0x9F,0x9B,0xAC,0x1E,0x00,0x07,0x00,
+    0x03,0xDE,0xC0,0x84,0xBF,0x04,0x90}}  /* 0x47 */
+};
+
+XGI330_CHTVRegDataStruct XGI_CHTVRegUNTSC[] = {
+                /* Index:000h,001h,002h,004h,003h,005h,006h,007h,008h,015h,01Fh,00Ch,00Dh,00Eh,00Fh,010h */
+                {{      0x4A,0x77,0xBB,0x94,0x84,0x48,0xFE,0x50,0x04,0x00,0x80,0x00,0x00,0x00,0x00,0x01  }},/* 00 (640x200,640x400) */
+                {{      0x4A,0x77,0xBB,0x94,0x84,0x48,0xFE,0x50,0x04,0x00,0x80,0x00,0x00,0x00,0x00,0x01  }},/* 01 (640x350) */
+                {{      0x4A,0x77,0xBB,0x94,0x84,0x48,0xFE,0x50,0x04,0x00,0x80,0x00,0x00,0x00,0x00,0x01  }},/* 02 (720x400) */
+                {{      0x4A,0x77,0xBB,0x94,0x84,0x48,0xFE,0x50,0x04,0x00,0x80,0x00,0x00,0x00,0x00,0x01  }},/* 03 (720x350) */
+                {{      0x6A,0x77,0xBB,0x6E,0x84,0x2E,0x02,0x5A,0x04,0x00,0x80,0x20,0x7E,0x80,0x97,0x00  }},/* 04 (640x480) ;;5/6/02 */
+                {{      0xCF,0x77,0xB7,0xC8,0x84,0x3B,0x02,0x5A,0x04,0x00,0x80,0x19,0x88,0xAE,0xA3,0x00  }},/* 05 (800x600) ;;1/12/02 */
+                {{      0xEE,0x77,0xBB,0x66,0x87,0x32,0x01,0x5A,0x04,0x00,0x80,0x1B,0xD4,0x2F,0x6F,0x00  }}/* 06 (1024x768) ;;5/6/02 */
+          };
+
+XGI330_CHTVRegDataStruct XGI_CHTVRegONTSC[]= {
+                /* Index:000h,001h,002h,004h,003h,005h,006h,007h,008h,015h,01Fh,00Ch,00Dh,00Eh,00Fh,010h */
+                {{      0x49,0x77,0xBB,0x7B,0x84,0x34,0x00,0x50,0x04,0x00,0x80,0x00,0x00,0x00,0x00,0x01  }},/* 00 (640x200,640x400) */
+                {{      0x49,0x77,0xBB,0x7B,0x84,0x34,0x00,0x50,0x04,0x00,0x80,0x00,0x00,0x00,0x00,0x01  }},/* 01 (640x350) */
+                {{      0x49,0x77,0xBB,0x7B,0x84,0x34,0x00,0x50,0x04,0x00,0x80,0x00,0x00,0x00,0x00,0x01  }},/* 02 (720x400) */
+                {{      0x49,0x77,0xBB,0x7B,0x84,0x34,0x00,0x50,0x04,0x00,0x80,0x00,0x00,0x00,0x00,0x01  }},/* 03 (720x350) */
+                {{      0x69,0x77,0xBB,0x6E,0x84,0x1E,0x00,0x5A,0x04,0x00,0x80,0x25,0x1A,0x80,0x26,0x00  }},/* 04 (640x480) ;;5/6/02 */
+                {{      0xCE,0x77,0xB7,0xB6,0x83,0x2C,0x02,0x5A,0x04,0x00,0x80,0x1C,0x00,0x82,0x97,0x00  }},/* 05 (800x600) ;;5/6/02 */
+                {{      0xED,0x77,0xBB,0x66,0x8C,0x21,0x02,0x5A,0x04,0x00,0x80,0x1F,0xA0,0x7E,0x73,0x00  }}/* 06 (1024x768) ;;5/6/02 */
+          };
+
+XGI330_CHTVRegDataStruct XGI_CHTVRegUPAL[]=  {
+                /* Index:000h,001h,002h,004h,003h,005h,006h,007h,008h,015h,01Fh,00Ch,00Dh,00Eh,00Fh,010h */
+                {{      0x41,0x7F,0xB7,0x34,0xAD,0x50,0x34,0x83,0x05,0x00,0x80,0x00,0x00,0x00,0x00,0x01  }},/* ; 00 (640x200,640x400) */
+                {{      0x41,0x7F,0xB7,0x80,0x85,0x50,0x00,0x83,0x05,0x00,0x80,0x00,0x00,0x00,0x00,0x01  }},/* ; 01 (640x350) */
+                {{      0x41,0x7F,0xB7,0x34,0xAD,0x50,0x34,0x83,0x05,0x00,0x80,0x00,0x00,0x00,0x00,0x01  }},/* ; 02 (720x400) */
+                {{      0x41,0x7F,0xB7,0x12,0x85,0x50,0x00,0x83,0x05,0x00,0x80,0x00,0x00,0x00,0x00,0x01  }},/* ; 03 (720x350) */
+                {{      0x61,0x7F,0xB7,0x99,0x84,0x35,0x04,0x5A,0x05,0x00,0x80,0x26,0x2A,0x55,0x5D,0x00  }},/* ; 04 (640x480) */
+                {{      0xC3,0x7F,0xB7,0x7A,0x84,0x40,0x02,0x5A,0x05,0x00,0x80,0x1F,0x84,0x3D,0x28,0x00  }},/* ; 05 (800x600) ;;1/12/02 */
+                {{      0xE5,0x7F,0xB7,0x1D,0xA7,0x3E,0x04,0x5A,0x05,0x00,0x80,0x20,0x3E,0xE4,0x22,0x00  }}/* ; 06 (1024x768) ;;1/12/02 */
+         };
+
+XGI330_CHTVRegDataStruct XGI_CHTVRegOPAL[]={
+                /* Index:000,0x01,0x02,0x04,0x03,0x05,0x06,0x07,0x08,0x15,0x1F,0x0C,0x0D,0x0E,0x0F,0x10h */
+                {{      0x41,0x7F,0xB7,0x36,0xAD,0x50,0x34,0x83,0x05,0x00,0x80,0x00,0x00,0x00,0x00,0x01 }},/* 00 (640x200,640x400) */
+                {{      0x41,0x7F,0xB7,0x86,0x85,0x50,0x00,0x83,0x05,0x00,0x80,0x00,0x00,0x00,0x00,0x01 }},/* 01 (640x350) */
+                {{      0x41,0x7F,0xB7,0x36,0xAD,0x50,0x34,0x83,0x05,0x00,0x80,0x00,0x00,0x00,0x00,0x01 }},/* 02 (720x400) */
+                {{      0x41,0x7F,0xB7,0x86,0x85,0x50,0x00,0x83,0x05,0x00,0x80,0x00,0x00,0x00,0x00,0x01 }},/* 03 (720x350) */
+                {{      0x61,0x7F,0xB7,0x99,0x84,0x35,0x04,0x5A,0x05,0x00,0x80,0x26,0x2A,0x55,0x5D,0x00 }},/* 04 (640x480) */
+                {{      0xC1,0x7F,0xB7,0x4D,0x8C,0x1E,0x31,0x5A,0x05,0x00,0x80,0x26,0x78,0x19,0x34,0x00 }},/* 05 (800x600) ;;1/12/02 */
+                {{      0xE4,0x7F,0xB7,0x1E,0xAF,0x29,0x37,0x5A,0x05,0x00,0x80,0x25,0x8C,0xB2,0x2A,0x00 }}/* 06 (1024x768) ;;1/12/02 */
+            };
+
+UCHAR XGI_CH7017LV1024x768[]={0x60,0x02,0x00,0x07,0x40,0xED,0xA3,
+                                       0xC8,0xC7,0xAC,0xE0,0x02};
+UCHAR XGI_CH7017LV1400x1050[]={0x60,0x03,0x11,0x00,0x40,0xE3,0xAD,
+                                       0xDB,0xF6,0xAC,0xE0,0x02};
+
+
+/*add for new UNIVGABIOS*/
+XGI330_LCDDataStruct  XGI_StLCD1024x768Data[]=
+{
+ {   62,  25, 800, 546,1344, 806},
+ {   32,  15, 930, 546,1344, 806},
+ {   62,  25, 800, 546,1344, 806}, /* chiawen for dot9 -> dot8 */
+ {  104,  45, 945, 496,1344, 806},
+ {   62,  25, 800, 546,1344, 806},
+ {   31,  18,1008, 624,1344, 806},
+ {    1,   1,1344, 806,1344, 806}
+};
+
+XGI330_LCDDataStruct  XGI_ExtLCD1024x768Data[]=
+{
+ {   42,  25,1536, 419,1344, 806}, /* { 12, 5, 896, 512,1344, 806}, // alan 09/12/2003 */
+ {   48,  25,1536, 369,1344, 806}, /* { 12, 5, 896, 510,1344, 806}, // alan 09/12/2003 */
+ {   42,  25,1536, 419,1344, 806}, /* { 32, 15,1008, 505,1344, 806}, // alan 09/12/2003 */
+ {   48,  25,1536, 369,1344, 806}, /* { 32, 15,1008, 514,1344, 806}, // alan 09/12/2003 */
+ {   12,   5, 896, 500,1344, 806},
+ {   42,  25,1024, 625,1344, 806},
+ {    1,   1,1344, 806,1344, 806},
+ {   12,   5, 896, 500,1344, 806},
+ {   42,  25,1024, 625,1344, 806},
+ {    1,   1,1344, 806,1344, 806},
+ {   12,   5, 896, 500,1344, 806},
+ {   42,  25,1024, 625,1344, 806},
+ {    1,   1,1344, 806,1344, 806}
+};
+
+/*XGI330_LCDDataStruct  XGI_St2LCD1024x768Data[]=
+{
+ {   62,  25, 800, 546,1344, 806},
+ {   32,  15, 930, 546,1344, 806},
+ {   62,  25, 800, 546,1344, 806},
+ {  104,  45, 945, 496,1344, 806},
+ {   62,  25, 800, 546,1344, 806},
+ {   31,  18,1008, 624,1344, 806},
+ {    1,   1,1344, 806,1344, 806}
+};*/
+
+XGI330_LCDDataStruct  XGI_CetLCD1024x768Data[]=
+{
+       {         1,1,1344,806,1344,806           }, /* ; 00 (320x200,320x400,640x200,640x400) */
+        {         1,1,1344,806,1344,806           }, /* 01 (320x350,640x350) */
+        {         1,1,1344,806,1344,806           }, /* 02 (360x400,720x400) */
+        {         1,1,1344,806,1344,806           }, /* 03 (720x350) */
+        {         1,1,1344,806,1344,806           }, /* 04 (640x480x60Hz) */
+        {         1,1,1344,806,1344,806           }, /* 05 (800x600x60Hz) */
+        {         1,1,1344,806,1344,806           }  /* 06 (1024x768x60Hz) */
+};
+
+XGI330_LCDDataStruct  XGI_StLCD1280x1024Data[]=
+{
+ {   22,   5, 800, 510,1650,1088},
+ {   22,   5, 800, 510,1650,1088},
+ {  176,  45, 900, 510,1650,1088},
+ {  176,  45, 900, 510,1650,1088},
+ {   22,   5, 800, 510,1650,1088},
+ {   13,   5,1024, 675,1560,1152},
+ {   16,   9,1266, 804,1688,1072},
+ {    1,   1,1688,1066,1688,1066}
+};
+
+XGI330_LCDDataStruct  XGI_ExtLCD1280x1024Data[]=
+{
+ {  211,  60,1024, 501,1688,1066},
+ {  211,  60,1024, 508,1688,1066},
+ {  211,  60,1024, 501,1688,1066},
+ {  211,  60,1024, 508,1688,1066},
+ {  211,  60,1024, 500,1688,1066},
+ {  211,  75,1024, 625,1688,1066},
+ {  211, 120,1280, 798,1688,1066},
+ {    1,   1,1688,1066,1688,1066}
+};
+
+XGI330_LCDDataStruct  XGI_St2LCD1280x1024Data[]=
+{
+ {   22,   5, 800, 510,1650,1088},
+ {   22,   5, 800, 510,1650,1088},
+ {  176,  45, 900, 510,1650,1088},
+ {  176,  45, 900, 510,1650,1088},
+ {   22,   5, 800, 510,1650,1088},
+ {   13,   5,1024, 675,1560,1152},
+ {   16,   9,1266, 804,1688,1072},
+ {    1,   1,1688,1066,1688,1066}
+};
+
+XGI330_LCDDataStruct  XGI_CetLCD1280x1024Data[]=
+{
+       {         1,1,1688,1066,1688,1066         }, /* 00 (320x200,320x400,640x200,640x400) */
+        {         1,1,1688,1066,1688,1066         }, /* 01 (320x350,640x350) */
+        {         1,1,1688,1066,1688,1066         }, /* 02 (360x400,720x400) */
+        {         1,1,1688,1066,1688,1066         }, /* 03 (720x350) */
+        {         1,1,1688,1066,1688,1066         }, /* 04 (640x480x60Hz) */
+        {         1,1,1688,1066,1688,1066         }, /* 05 (800x600x60Hz) */
+        {         1,1,1688,1066,1688,1066         }, /* 06 (1024x768x60Hz) */
+        {         1,1,1688,1066,1688,1066         }, /* 07 (1280x1024x60Hz) */
+        {         1,1,1688,1066,1688,1066         } /* 08 (1400x1050x60Hz) */
+};
+
+XGI330_LCDDataStruct  XGI_StLCD1400x1050Data[]=
+{
+       {         211,100,2100,408,1688,1066      }, /* 00 (320x200,320x400,640x200,640x400) */
+        {         211,64,1536,358,1688,1066       }, /* 01 (320x350,640x350) */
+        {         211,100,2100,408,1688,1066      }, /* 02 (360x400,720x400) */
+        {         211,64,1536,358,1688,1066       }, /* 03 (720x350) */
+        {         211,48,840,488,1688,1066        }, /* 04 (640x480x60Hz) */
+        {         211,72,1008,609,1688,1066       }, /* 05 (800x600x60Hz) */
+        {         211,128,1400,776,1688,1066      }, /* 06 (1024x768x60Hz) */
+        {         1,1,1688,1066,1688,1066         }, /* 07 (1280x1024x60Hz w/o Scaling) */
+        {         1,1,1688,1066,1688,1066         }  /* 08 (1400x1050x60Hz) */
+};
+
+XGI330_LCDDataStruct  XGI_ExtLCD1400x1050Data[]=
+{
+       {         211,100,2100,408,1688,1066      }, /* 00 (320x200,320x400,640x200,640x400) */
+        {         211,64,1536,358,1688,1066       }, /* 01 (320x350,640x350) */
+        {         211,100,2100,408,1688,1066      }, /* 02 (360x400,720x400) */
+        {         211,64,1536,358,1688,1066       }, /* 03 (720x350) */
+        {         211,48,840,488,1688,1066        }, /* 04 (640x480x60Hz) */
+        {         211,72,1008,609,1688,1066       }, /* 05 (800x600x60Hz) */
+        {         211,128,1400,776,1688,1066      }, /* 06 (1024x768x60Hz) */
+        {         1,1,1688,1066,1688,1066         }, /* 07 (1280x1024x60Hz w/o Scaling) */
+        {         1,1,1688,1066,1688,1066         }  /* 08 (1400x1050x60Hz) */
+};
+
+XGI330_LCDDataStruct  XGI_ExtLCD1600x1200Data[]=
+{
+        {         4,1,1620,420,2160,1250          }, /* { 3,1,2160,425,2160,1250 }, // 00 (320x200,320x400,640x200,640x400) // alan 10/14/2003 */
+        {         27,7,1920,375,2160,1250         }, /* 01 (320x350,640x350) */
+        {         4,1,1620,420,2160,1250          }, /* { 3,1,2160,425,2160,1250 }, // 02 (360x400,720x400) // alan 10/14/2003 */
+        {         27,7,1920,375,2160,1250         }, /* 03 (720x350) */
+        {         27,4,800,500,2160,1250          }, /* 04 (640x480x60Hz) */
+        {         4,1,1080,625,2160,1250          }, /* 05 (800x600x60Hz) */
+        {         5,2,1350,800,2160,1250          }, /* 06 (1024x768x60Hz) */
+        {         27,16,1500,1064,2160,1250       }, /* 07 (1280x1024x60Hz) */
+        {         9,7,1920,1106,2160,1250         }, /* 08 (1400x1050x60Hz) */
+        {         1,1,2160,1250,2160,1250         }  /* 09 (1600x1200x60Hz) ;302lv */
+};
+
+XGI330_LCDDataStruct  XGI_StLCD1600x1200Data[]=
+{
+        {         27,4,800,500,2160,1250          },/* 00 (320x200,320x400,640x200,640x400) */
+        {         27,4,800,500,2160,1250          },/* 01 (320x350,640x350) */
+        {         27,4,800,500,2160,1250          },/* 02 (360x400,720x400) */
+        {         27,4,800,500,2160,1250          },/* 03 (720x350) */
+        {         27,4,800,500,2160,1250          },/* 04 (320x240,640x480) */
+        {         4,1,1080,625,2160,1250          },/* 05 (400x300,800x600) */
+        {         5,2,1350,800,2160,1250          },/* 06 (512x384,1024x768) */
+        {         135,88,1600,1100,2160,1250      },/* 07 (1280x1024) */
+        {         1,1,1800,1500,2160,1250         },/* 08 (1400x1050) */
+        {         1,1,2160,1250,2160,1250         } /* 09 (1600x1200) */
+};
+
+XGI330_LCDDataStruct  XGI_CetLCD1400x1050Data[]=
+{
+       {         1,1,1688,1066,1688,1066         }, /* 00 (320x200,320x400,640x200,640x400) */
+        {         1,1,1688,1066,1688,1066         }, /* 01 (320x350,640x350) */
+        {         1,1,1688,1066,1688,1066         }, /* 02 (360x400,720x400) */
+        {         1,1,1688,1066,1688,1066         }, /* 03 (720x350) */
+        {         1,1,1688,1066,1688,1066         }, /* 04 (640x480x60Hz) */
+        {         1,1,1688,1066,1688,1066         }, /* 05 (800x600x60Hz) */
+        {         1,1,1688,1066,1688,1066         }, /* 06 (1024x768x60Hz) */
+        {         1,1,1688,1066,1688,1066         }, /* 07 (1280x1024x60Hz) */
+        {         1,1,1688,1066,1688,1066         }  /* 08 (1400x1050x60Hz) */
+};
+
+XGI330_LCDDataStruct  XGI_NoScalingData[]=
+{
+ {    1,   1, 800, 449, 800, 449},
+ {    1,   1, 800, 449, 800, 449},
+ {    1,   1, 900, 449, 900, 449},
+ {    1,   1, 900, 449, 900, 449},
+ {    1,   1, 800, 525, 800, 525},
+ {    1,   1,1056, 628,1056, 628},
+ {    1,   1,1344, 806,1344, 806},
+ {    1,   1,1688,1066,1688,1066}
+};
+
+XGI330_LCDDataStruct  XGI_ExtLCD1024x768x75Data[]=
+{
+        {42,25,1536,419,1344,806 }, /* ; 00 (320x200,320x400,640x200,640x400) */
+        {48,25,1536,369,1344,806 }, /* ; 01 (320x350,640x350) */
+        {42,25,1536,419,1344,806 }, /* ; 02 (360x400,720x400) */
+        {48,25,1536,369,1344,806 }, /* ; 03 (720x350) */
+        {8,5,1312,500,1312,800   }, /* ; 04 (640x480x75Hz) */
+        {41,25,1024,625,1312,800 }, /* ; 05 (800x600x75Hz) */
+        {1,1,1312,800,1312,800   }  /* ; 06 (1024x768x75Hz) */
+};
+
+XGI330_LCDDataStruct  XGI_StLCD1024x768x75Data[]=
+{
+        {42,25,1536,419,1344,806 }, /* ; 00 (320x200,320x400,640x200,640x400) */
+        {48,25,1536,369,1344,806 }, /* ; 01 (320x350,640x350) */
+        {42,25,1536,419,1344,806 }, /* ; 02 (360x400,720x400) */
+        {48,25,1536,369,1344,806 }, /* ; 03 (720x350) */
+        {8,5,1312,500,1312,800   }, /* ; 04 (640x480x75Hz) */
+        {41,25,1024,625,1312,800 }, /* ; 05 (800x600x75Hz) */
+        {1,1,1312,800,1312,800   }  /* ; 06 (1024x768x75Hz) */
+};
+
+XGI330_LCDDataStruct  XGI_CetLCD1024x768x75Data[]=
+{
+        {1,1,1312,800,1312,800}, /* ; 00 (320x200,320x400,640x200,640x400) */
+        {1,1,1312,800,1312,800}, /* ; 01 (320x350,640x350) */
+        {1,1,1312,800,1312,800}, /* ; 02 (360x400,720x400) */
+        {1,1,1312,800,1312,800}, /* ; 03 (720x350) */
+        {1,1,1312,800,1312,800}, /* ; 04 (640x480x75Hz) */
+        {1,1,1312,800,1312,800}, /* ; 05 (800x600x75Hz) */
+        {1,1,1312,800,1312,800} /* ; 06 (1024x768x75Hz) */
+};
+
+XGI330_LCDDataStruct  XGI_ExtLCD1280x1024x75Data[]=
+{
+        {211,60,1024,501,1688,1066   }, /* ; 00 (320x200,320x400,640x200,640x400) */
+        {211,60,1024,508,1688,1066   }, /* ; 01 (320x350,640x350) */
+        {211,60,1024,501,1688,1066   }, /* ; 02 (360x400,720x400) */
+        {211,60,1024,508,1688,1066   }, /* ; 03 (720x350) */
+        {211,45,768,498,1688,1066    }, /* ; 04 (640x480x75Hz) */
+        {211,75,1024,625,1688,1066   }, /* ; 05 (800x600x75Hz) */
+        {211,120,1280,798,1688,1066  }, /* ; 06 (1024x768x75Hz) */
+        {1,1,1688,1066,1688,1066     }  /* ; 07 (1280x1024x75Hz) */
+};
+
+XGI330_LCDDataStruct  XGI_StLCD1280x1024x75Data[]=
+{
+        {211,60,1024,501,1688,1066 }, /* ; 00 (320x200,320x400,640x200,640x400) */
+        {211,60,1024,508,1688,1066 }, /* ; 01 (320x350,640x350) */
+        {211,60,1024,501,1688,1066 }, /* ; 02 (360x400,720x400) */
+        {211,60,1024,508,1688,1066 }, /* ; 03 (720x350) */
+        {211,45,768,498,1688,1066  }, /* ; 04 (640x480x75Hz) */
+        {211,75,1024,625,1688,1066 }, /* ; 05 (800x600x75Hz) */
+        {211,120,1280,798,1688,1066}, /* ; 06 (1024x768x75Hz) */
+        {1,1,1688,1066,1688,1066   }  /* ; 07 (1280x1024x75Hz) */
+};
+
+XGI330_LCDDataStruct  XGI_CetLCD1280x1024x75Data[]=
+{
+        {1,1,1688,1066,1688,1066}, /* ; 00 (320x200,320x400,640x200,640x400) */
+        {1,1,1688,1066,1688,1066}, /* ; 01 (320x350,640x350) */
+        {1,1,1688,1066,1688,1066}, /* ; 02 (360x400,720x400) */
+        {1,1,1688,1066,1688,1066}, /* ; 03 (720x350) */
+        {1,1,1688,1066,1688,1066}, /* ; 04 (640x480x75Hz) */
+        {1,1,1688,1066,1688,1066}, /* ; 05 (800x600x75Hz) */
+        {1,1,1688,1066,1688,1066}, /* ; 06 (1024x768x75Hz) */
+        {1,1,1688,1066,1688,1066}  /* ; 07 (1280x1024x75Hz) */
+};
+
+XGI330_LCDDataStruct  XGI_NoScalingDatax75[]=
+{
+        {1,1,800,449,800,449    }, /* ; 00 (320x200,320x400,640x200,640x400) */
+        {1,1,800,449,800,449    }, /* ; 01 (320x350,640x350) */
+        {1,1,900,449,900,449    }, /* ; 02 (360x400,720x400) */
+        {1,1,900,449,900,449    }, /* ; 03 (720x350) */
+        {1,1,840,500,840,500    }, /* ; 04 (640x480x75Hz) */
+        {1,1,1056,625,1056,625  }, /* ; 05 (800x600x75Hz) */
+        {1,1,1312,800,1312,800  }, /* ; 06 (1024x768x75Hz) */
+        {1,1,1688,1066,1688,1066}, /* ; 07 (1280x1024x75Hz) */
+        {1,1,1688,1066,1688,1066}, /* ; 08 (1400x1050x75Hz) ;;[ycchen] 12/19/02 */
+        {1,1,2160,1250,2160,1250}, /* ; 09 (1600x1200x75Hz) */
+        {1,1,1688,806,1688,806  }  /* ; 0A (1280x768x75Hz) */
+};
+
+XGI330_LCDDataDesStruct  XGI_ExtLCDDes1024x768Data[]=
+{
+   {  9,1057,0, 771  }, /* ; 00 (320x200,320x400,640x200,640x400) */
+   {  9,1057,0, 771  }, /* ; 01 (320x350,640x350) */
+   {  9,1057,0, 771  }, /* ; 02 (360x400,720x400) */
+   {  9,1057,0, 771  }, /* ; 03 (720x350) */
+   {  9,1057,0, 771  }, /* ; 04 (640x480x60Hz) */
+   {  9,1057,0, 771  }, /* ; 05 (800x600x60Hz) */
+   {  9,1057,805, 770  }  /* ; 06 (1024x768x60Hz) */
+};
+
+XGI330_LCDDataDesStruct  XGI_StLCDDes1024x768Data[]=
+{
+        { 9,1057,737,703   }, /* ; 00 (320x200,320x400,640x200,640x400) */
+        { 9,1057,686,651   }, /* ; 01 (320x350,640x350) */
+        { 9,1057,737,703   }, /* ; 02 (360x400,720x400) */
+        { 9,1057,686,651   }, /* ; 03 (720x350) */
+        { 9,1057,776,741   }, /* ; 04 (640x480x60Hz) */
+        { 9,1057, 0 ,771   }, /* ; 05 (800x600x60Hz) */
+        { 9,1057,805,770   }  /* ; 06 (1024x768x60Hz) */
+};
+
+XGI330_LCDDataDesStruct  XGI_CetLCDDes1024x768Data[]=
+{
+               {      1152,856,622,587   }, /* ; 00 (320x200,320x400,640x200,640x400) */
+        {      1152,856,597,562   }, /* ; 01 (320x350,640x350) */
+        {      1152,856,622,587   }, /* ; 02 (360x400,720x400) */
+        {      1152,856,597,562   }, /* ; 03 (720x350) */
+        {      1152,856,662,627   }, /* ; 04 (640x480x60Hz) */
+        {      1232,936,722,687   }, /* ; 05 (800x600x60Hz) */
+        {      0,1048,805,770   }  /* ; 06 (1024x768x60Hz) */
+};
+
+XGI330_LCDDataDesStruct XGI_ExtLCDDLDes1280x1024Data[]=
+{
+        {      18,1346,981,940     },/* 00 (320x200,320x400,640x200,640x400) */
+        {      18,1346,926,865     },/* 01 (320x350,640x350) */
+        {      18,1346,981,940     },/* 02 (360x400,720x400) */
+        {      18,1346,926,865     },/* 03 (720x350) */
+        {      18,1346,0,1025     },/* 04 (640x480x60Hz) */
+        {      18,1346,0,1025     },/* 05 (800x600x60Hz) */
+        {      18,1346,1065,1024     },/* 06 (1024x768x60Hz) */
+        {      18,1346,1065,1024     }/* 07 (1280x1024x60Hz) */
+};
+
+XGI330_LCDDataDesStruct XGI_StLCDDLDes1280x1024Data[]=
+{
+        {      18,1346,970,907     },/* 00 (320x200,320x400,640x200,640x400) */
+        {      18,1346,917,854     },/* 01 (320x350,640x350) */
+        {      18,1346,970,907     },/* 02 (360x400,720x400) */
+        {      18,1346,917,854     },/* 03 (720x350) */
+        {      18,1346,0,1025     },/* 04 (640x480x60Hz) */
+        {      18,1346,0,1025     },/* 05 (800x600x60Hz) */
+        {      18,1346,1065,1024     },/* 06 (1024x768x60Hz) */
+        {      18,1346,1065,1024     }/* 07 (1280x1024x60Hz) */
+};
+
+XGI330_LCDDataDesStruct  XGI_CetLCDDLDes1280x1024Data[]=
+{
+        {      1368,1008,752,711    }, /* 00 (320x200,320x400,640x200,640x400) */
+        {      1368,1008,729,688    }, /* 01 (320x350,640x350) */
+        {      1368,1008,752,711    }, /* 02 (360x400,720x400) */
+       {      1368,1008,729,688    }, /* 03 (720x350) */
+        {      1368,1008,794,753    }, /* 04 (640x480x60Hz) */
+        {      1448,1068,854,813    }, /* 05 (800x600x60Hz) */
+        {      1560,1200,938,897    }, /* 06 (1024x768x60Hz) */
+        {      18,1346,1065,1024    }  /* 07 (1280x1024x60Hz) */
+};
+
+XGI330_LCDDataDesStruct  XGI_ExtLCDDes1280x1024Data[]=
+{
+        {      9,1337,981,940    }, /* ; 00 (320x200,320x400,640x200,640x400) */
+        {      9,1337,926,884    }, /* ; 01 (320x350,640x350) alan, 2003/09/30 */
+        {      9,1337,981,940    }, /* ; 02 (360x400,720x400) */
+        {      9,1337,926,884    }, /* ; 03 (720x350) alan, 2003/09/30 */
+        {      9,1337,0,1025    }, /* ; 04 (640x480x60Hz) */
+        {      9,1337,0,1025    }, /* ; 05 (800x600x60Hz) */
+        {      9,1337,1065,1024    }, /* ; 06 (1024x768x60Hz) */
+        {      9,1337,1065,1024    }  /* ; 07 (1280x1024x60Hz) */
+};
+
+XGI330_LCDDataDesStruct  XGI_StLCDDes1280x1024Data[]=
+{
+        {      9,1337,970,907    }, /* ; 00 (320x200,320x400,640x200,640x400) */
+        {      9,1337,917,854    }, /* ; 01 (320x350,640x350) */
+        {      9,1337,970,907    }, /* ; 02 (360x400,720x400) */
+        {      9,1337,917,854    }, /* ; 03 (720x350) */
+        {      9,1337,0,1025    }, /* ; 04 (640x480x60Hz) */
+        {      9,1337,0,1025    }, /* ; 05 (800x600x60Hz) */
+        {      9,1337,1065,1024    }, /* ; 06 (1024x768x60Hz) */
+        {      9,1337,1065,1024    }  /* ; 07 (1280x1024x60Hz) */
+};
+
+XGI330_LCDDataDesStruct  XGI_CetLCDDes1280x1024Data[]=
+{
+        {      1368,1008,752,711    }, /* 00 (320x200,320x400,640x200,640x400) */
+        {      1368,1008,729,688    }, /* 01 (320x350,640x350) */
+        {      1368,1008,752,711    }, /* 02 (360x400,720x400) */
+       {      1368,1008,729,688    }, /* 03 (720x350) */
+        {      1368,1008,794,753    }, /* 04 (640x480x60Hz) */
+        {      1448,1068,854,813    }, /* 05 (800x600x60Hz) */
+        {      1560,1200,938,897    }, /* 06 (1024x768x60Hz) */
+        {      9,1337,1065,1024    }  /* 07 (1280x1024x60Hz) */
+};
+
+XGI330_LCDDataDesStruct  XGI_StLCDDLDes1400x1050Data[]=
+{
+        {      18,1464,0,1051    }, /* 00 (320x200,320x400,640x200,640x400) */
+        {      18,1464,0,1051    }, /* 01 (320x350,640x350) */
+        {      18,1464,0,1051    }, /* 02 (360x400,720x400) */
+        {      18,1464,0,1051    }, /* 03 (720x350) */
+        {      18,1464,0,1051    }, /* 04 (640x480x60Hz) */
+        {      18,1464,0,1051    }, /* 05 (800x600x60Hz) */
+        {      18,1464,0,1051    }, /* 06 (1024x768x60Hz) */
+        {      1646,1406,1053,1038    }, /* 07 (1280x1024x60Hz) */
+        {      18,1464,0,1051    }  /* 08 (1400x1050x60Hz) */
+};
+
+XGI330_LCDDataDesStruct  XGI_ExtLCDDLDes1400x1050Data[]=
+{
+        {      18,1464,0,1051    }, /* 00 (320x200,320x400,640x200,640x400) */
+        {      18,1464,0,1051    }, /* 01 (320x350,640x350) */
+        {      18,1464,0,1051    }, /* 02 (360x400,720x400) */
+        {      18,1464,0,1051    }, /* 03 (720x350) */
+        {      18,1464,0,1051    }, /* 04 (640x480x60Hz) */
+        {      18,1464,0,1051    }, /* 05 (800x600x60Hz) */
+        {      18,1464,0,1051    }, /* 06 (1024x768x60Hz) */
+        {      1646,1406,1053,1038    }, /* 07 (1280x1024x60Hz) */
+        {      18,1464,0,1051    }  /* 08 (1400x1050x60Hz) */
+};
+
+XGI330_LCDDataDesStruct  XGI_StLCDDes1400x1050Data[]=
+{
+        {      9,1455,0,1051     },/* 00 (320x200,320x400,640x200,640x400) */
+        {      9,1455,0,1051     },/* 01 (320x350,640x350) */
+        {      9,1455,0,1051     },/* 02 (360x400,720x400) */
+        {      9,1455,0,1051     },/* 03 (720x350) */
+        {      9,1455,0,1051     },/* 04 (640x480x60Hz) */
+        {      9,1455,0,1051     },/* 05 (800x600x60Hz) */
+        {      9,1455,0,1051     },/* 06 (1024x768x60Hz) */
+        {      1637,1397,1053,1038     },/* 07 (1280x1024x60Hz) */
+        {      9,1455,0,1051     } /* 08 (1400x1050x60Hz) */
+};
+
+XGI330_LCDDataDesStruct  XGI_ExtLCDDes1400x1050Data[]=
+{
+        {      9,1455,0,1051     },/* 00 (320x200,320x400,640x200,640x400) */
+        {      9,1455,0,1051     },/* 01 (320x350,640x350) */
+        {      9,1455,0,1051     },/* 02 (360x400,720x400) */
+        {      9,1455,0,1051     },/* 03 (720x350) */
+        {      9,1455,0,1051     },/* 04 (640x480x60Hz) */
+        {      9,1455,0,1051     },/* 05 (800x600x60Hz) */
+        {      9,1455,0,1051     },/* 06 (1024x768x60Hz) */
+        {      1637,1397,1053,1038     },/* 07 (1280x1024x60Hz) */
+        {      9,1455,0,1051     } /* 08 (1400x1050x60Hz) */
+};
+
+XGI330_LCDDataDesStruct  XGI_CetLCDDes1400x1050Data[]=
+{
+        {      1308,1068,781,766    }, /* 00 (320x200,320x400,640x200,640x400) */
+        {      1308,1068,781,766    }, /* 01 (320x350,640x350) */
+        {      1308,1068,781,766    }, /* 02 (360x400,720x400) */
+        {      1308,1068,781,766    }, /* 03 (720x350) */
+        {      1308,1068,781,766    }, /* 04 (640x480x60Hz) */
+        {      1388,1148,841,826    }, /* 05 (800x600x60Hz) */
+        {      1490,1250,925,910    }, /* 06 (1024x768x60Hz) */
+        {      1646,1406,1053,1038    }, /* 07 (1280x1024x60Hz) */
+        {      18,1464,0,1051    } /* 08 (1400x1050x60Hz) */
+};
+
+XGI330_LCDDataDesStruct  XGI_CetLCDDes1400x1050Data2[]=
+{
+        {      0,1448,0,1051    }, /* 00 (320x200,320x400,640x200,640x400) */
+        {      0,1448,0,1051    }, /* 01 (320x350,640x350) */
+        {      0,1448,0,1051    }, /* 02 (360x400,720x400) */
+        {      0,1448,0,1051    }, /* 03 (720x350) */
+        {      0,1448,0,1051    }  /* 04 (640x480x60Hz) */
+};
+
+
+
+XGI330_LCDDataDesStruct  XGI_ExtLCDDLDes1600x1200Data[]=
+{
+       {      18,1682,0,1201    }, /* 00 (320x200,320x400,640x200,640x400) */
+        {      18,1682,0,1201    }, /* 01 (320x350,640x350) */
+        {      18,1682,0,1201    }, /* 02 (360x400,720x400) */
+        {      18,1682,0,1201    }, /* 03 (720x350) */
+        {      18,1682,0,1201    }, /* 04 (640x480x60Hz) */
+        {      18,1682,0,1201    }, /* 05 (800x600x60Hz) */
+        {      18,1682,0,1201    }, /* 06 (1024x768x60Hz) */
+        {      18,1682,0,1201    }, /* 07 (1280x1024x60Hz) */
+        {      18,1682,0,1201    }, /* 08 (1400x1050x60Hz) */
+        {      18,1682,0,1201    }  /* 09 (1600x1200x60Hz) */
+};
+
+XGI330_LCDDataDesStruct  XGI_StLCDDLDes1600x1200Data[]=
+{
+        {      18,1682,1150,1101    }, /* 00 (320x200,320x400,640x200,640x400) */
+        {      18,1682,1083,1034    }, /* 01 (320x350,640x350) */
+        {      18,1682,1150,1101    }, /* 02 (360x400,720x400) */
+        {      18,1682,1083,1034    }, /* 03 (720x350) */
+        {      18,1682,0,1201    }, /* 04 (640x480x60Hz) */
+        {      18,1682,0,1201    }, /* 05 (800x600x60Hz) */
+        {      18,1682,0,1201    }, /* 06 (1024x768x60Hz) */
+        {      18,1682,1232,1183    }, /* 07 (1280x1024x60Hz) */
+        {      18,1682,0,1201    }, /* 08 (1400x1050x60Hz) */
+        {      18,1682,0,1201    } /* 09 (1600x1200x60Hz) */
+};
+
+XGI330_LCDDataDesStruct  XGI_ExtLCDDes1600x1200Data[]=
+{
+        {      9,1673,0,1201     },/* 00 (320x200,320x400,640x200,640x400) */
+        {      9,1673,0,1201     },/* 01 (320x350,640x350) */
+        {      9,1673,0,1201     },/* 02 (360x400,720x400) */
+        {      9,1673,0,1201     },/* 03 (720x350) */
+        {      9,1673,0,1201     },/* 04 (640x480x60Hz) */
+        {      9,1673,0,1201     },/* 05 (800x600x60Hz) */
+        {      9,1673,0,1201     },/* 06 (1024x768x60Hz) */
+        {      9,1673,0,1201     },/* 07 (1280x1024x60Hz) */
+        {      9,1673,0,1201     },/* 08 (1400x1050x60Hz) */
+        {      9,1673,0,1201     } /* 09 (1600x1200x60Hz) */
+};
+
+XGI330_LCDDataDesStruct  XGI_StLCDDes1600x1200Data[]=
+{
+       {      9,1673,1150,1101     },/* 00 (320x200,320x400,640x200,640x400) */
+        {      9,1673,1083,1034     },/* 01 (320x350,640x350) */
+        {      9,1673,1150,1101     },/* 02 (360x400,720x400) */
+        {      9,1673,1083,1034     },/* 03 (720x350) */
+        {      9,1673,0,1201     },/* 04 (640x480x60Hz) */
+        {      9,1673,0,1201     },/* 05 (800x600x60Hz) */
+        {      9,1673,0,1201     },/* 06 (1024x768x60Hz) */
+        {      9,1673,1232,1183     },/* 07 (1280x1024x60Hz) */
+        {      9,1673,0,1201     },/* 08 (1400x1050x60Hz) */
+        {      9,1673,0,1201     } /* 09 (1600x1200x60Hz) */
+};
+
+XGI330_LCDDataDesStruct2  XGI_NoScalingDesData[]=
+{
+        {     9,657,448,405,96,2  }, /* 00 (320x200,320x400,640x200,640x400) */
+        {     9,657,448,355,96,2  }, /* 01 (320x350,640x350) */
+        {     9,657,448,405,96,2  }, /* 02 (360x400,720x400) */
+        {     9,657,448,355,96,2  }, /* 03 (720x350) */
+        {     9,657,1,483,96,2  }, /* 04 (640x480x60Hz) */
+        {     9,849,627,600,128,4  }, /* 05 (800x600x60Hz) */
+        {     9,1057,805,770,0136,6  }, /* 06 (1024x768x60Hz) */
+        {     9,1337,0,1025,112,3  }, /* 07 (1280x1024x60Hz) */
+        {     9,1457,0,1051,112,3  }, /* 08 (1400x1050x60Hz) }, //;[ycchen] 12/19/02 */
+        {     9,1673,0,1201,192,3  }, /* 09 (1600x1200x60Hz) */
+        {     9,1337,0,771,112,6  }  /* 0A (1280x768x60Hz) */
+};
+
+XGI330_LCDDataDesStruct  XGI_ExtLCDDes1024x768x75Data[]=               /* ;;1024x768x75Hz */
+{
+        {9,1049,0,769},    /* ; 00 (320x200,320x400,640x200,640x400) */
+        {9,1049,0,769},    /* ; 01 (320x350,640x350) */
+        {9,1049,0,769},    /* ; 02 (360x400,720x400) */
+        {9,1049,0,769},    /* ; 03 (720x350) */
+        {9,1049,0,769},    /* ; 04 (640x480x75Hz) */
+        {9,1049,0,769},    /* ; 05 (800x600x75Hz) */
+        {9,1049,0,769}     /* ; 06 (1024x768x75Hz) */
+};
+
+XGI330_LCDDataDesStruct  XGI_StLCDDes1024x768x75Data[]=
+{
+        {9,1049,0,769},    /* ; 00 (320x200,320x400,640x200,640x400) */
+        {9,1049,0,769},    /* ; 01 (320x350,640x350) */
+        {9,1049,0,769},    /* ; 02 (360x400,720x400) */
+        {9,1049,0,769},    /* ; 03 (720x350) */
+        {9,1049,0,769},    /* ; 04 (640x480x75Hz) */
+        {9,1049,0,769},    /* ; 05 (800x600x75Hz) */
+        {9,1049,0,769}     /* ; 06 (1024x768x75Hz) */
+};
+
+XGI330_LCDDataDesStruct  XGI_CetLCDDes1024x768x75Data[]=       /* ;;1024x768x75Hz */
+{
+        {1152,856,622,587},     /* ; 00 (320x200,320x400,640x200,640x400) */
+        {1152,856,597,562},     /* ; 01 (320x350,640x350) */
+        {1192,896,622,587},     /* ; 02 (360x400,720x400) */
+        {1192,896,597,562},     /* ; 03 (720x350) */
+        {1129,857,656,625},     /* ; 04 (640x480x75Hz) */
+        {1209,937,716,685},     /* ; 05 (800x600x75Hz) */
+        {9,1049,0,769}                 /* ; 06 (1024x768x75Hz) */
+};
+
+XGI330_LCDDataDesStruct  XGI_ExtLCDDLDes1280x1024x75Data[]=         /* ;;1280x1024x75Hz */
+{
+        {18,1314,0,1025     },/* ; 00 (320x200,320x400,640x200,640x400) */
+        {18,1314,0,1025     },/* ; 01 (320x350,640x350) */
+        {18,1314,0,1025     },/* ; 02 (360x400,720x400) */
+        {18,1314,0,1025     },/* ; 03 (720x350) */
+        {18,1314,0,1025     },/* ; 04 (640x480x60Hz) */
+        {18,1314,0,1025     },/* ; 05 (800x600x60Hz) */
+        {18,1314,0,1025     },/* ; 06 (1024x768x60Hz) */
+        {18,1314,0,1025     }/* ; 07 (1280x1024x60Hz) */
+};
+
+XGI330_LCDDataDesStruct  XGI_StLCDDLDes1280x1024x75Data[]=
+{
+        {18,1314,0,1025     },/* ; 00 (320x200,320x400,640x200,640x400) */
+        {18,1314,0,1025     },/* ; 01 (320x350,640x350) */
+        {18,1314,0,1025     },/* ; 02 (360x400,720x400) */
+        {18,1314,0,1025     },/* ; 03 (720x350) */
+        {18,1314,0,1025     },/* ; 04 (640x480x60Hz) */
+        {18,1314,0,1025     },/* ; 05 (800x600x60Hz) */
+        {18,1314,0,1025     },/* ; 06 (1024x768x60Hz) */
+        {18,1314,0,1025     }/* ; 07 (1280x1024x60Hz) */
+};
+
+XGI330_LCDDataDesStruct  XGI_CetLCDDLDes1280x1024x75Data[]=    /* 1280x1024x75Hz */
+{
+        {1368,1008,752,711},    /* ; 00 (320x200,320x400,640x200,640x400) */
+        {1368,1008,729,688},    /* ; 01 (320x350,640x350) */
+        {1408,1048,752,711},    /* ; 02 (360x400,720x400) */
+        {1408,1048,729,688},    /* ; 03 (720x350) */
+        {1377,985,794,753},    /* ; 04 (640x480x75Hz) */
+        {1457,1065,854,813},    /* ; 05 (800x600x75Hz) */
+        {1569,1177,938,897},    /* ; 06 (1024x768x75Hz) */
+        {18,1314,0,1025}         /* ; 07 (1280x1024x75Hz) */
+};
+
+XGI330_LCDDataDesStruct  XGI_ExtLCDDes1280x1024x75Data[]=         /* ;;1280x1024x75Hz */
+{
+       {9,1305,0,1025},/* ; 00 (320x200,320x400,640x200,640x400) */
+        {9,1305,0,1025},/* ; 01 (320x350,640x350) */
+        {9,1305,0,1025},/* ; 02 (360x400,720x400) */
+        {9,1305,0,1025},/* ; 03 (720x350) */
+        {9,1305,0,1025},/* ; 04 (640x480x60Hz) */
+        {9,1305,0,1025},/* ; 05 (800x600x60Hz) */
+        {9,1305,0,1025},/* ; 06 (1024x768x60Hz) */
+        {9,1305,0,1025} /* ; 07 (1280x1024x60Hz) */
+};
+
+XGI330_LCDDataDesStruct  XGI_StLCDDes1280x1024x75Data[]=
+{
+       {9,1305,0,1025},/* ; 00 (320x200,320x400,640x200,640x400) */
+        {9,1305,0,1025},/* ; 01 (320x350,640x350) */
+        {9,1305,0,1025},/* ; 02 (360x400,720x400) */
+        {9,1305,0,1025},/* ; 03 (720x350) */
+        {9,1305,0,1025},/* ; 04 (640x480x60Hz) */
+        {9,1305,0,1025},/* ; 05 (800x600x60Hz) */
+        {9,1305,0,1025},/* ; 06 (1024x768x60Hz) */
+        {9,1305,0,1025} /* ; 07 (1280x1024x60Hz) */
+};
+
+XGI330_LCDDataDesStruct  XGI_CetLCDDes1280x1024x75Data[]=      /* 1280x1024x75Hz */
+{
+        {1368,1008,752,711},    /* ; 00 (320x200,320x400,640x200,640x400) */
+        {1368,1008,729,688},    /* ; 01 (320x350,640x350) */
+        {1408,1048,752,711},    /* ; 02 (360x400,720x400) */
+        {1408,1048,729,688},    /* ; 03 (720x350) */
+        {1377,985,794,753},    /* ; 04 (640x480x75Hz) */
+        {1457,1065,854,813},    /* ; 05 (800x600x75Hz) */
+        {1569,1177,938,897},    /* ; 06 (1024x768x75Hz) */
+        {9,1305,0,1025}          /* ; 07 (1280x1024x75Hz) */
+};
+
+XGI330_LCDDataDesStruct2 XGI_NoScalingDesDatax75[]= /* Scaling LCD 75Hz */
+{
+       {9,657,448,405,96,2},   /* ; 00 (320x200,320x400,640x200,640x400) */
+        {9,657,448,355,96,2},   /* ; 01 (320x350,640x350) */
+        {9,738,448,405,108,2},   /* ; 02 (360x400,720x400) */
+        {9,738,448,355,108,2},   /* ; 03 (720x350) */
+        {9,665,0,481,64,3},   /* ; 04 (640x480x75Hz) */
+        {9,825,0,601,80,3},   /* ; 05 (800x600x75Hz) */
+        {9,1049,0,769,96,3},   /* ; 06 (1024x768x75Hz) */
+        {9,1305,0,1025,144,3},   /* ; 07 (1280x1024x75Hz) */
+        {9,1457,0,1051,112,3},   /* ; 08 (1400x1050x60Hz) ;;[ycchen] 12/19/02 */
+        {9,1673,0,1201,192,3},   /* ; 09 (1600x1200x75Hz) */
+        {9,1337,0,771,112,6}    /* ; 0A (1280x768x60Hz) */
+};
+
+XGI330_TVDataStruct  XGI_StPALData[]=
+{
+ {    1,   1, 864, 525,1270, 400, 100,   0, 760},
+ {    1,   1, 864, 525,1270, 350, 100,   0, 760},
+ {    1,   1, 864, 525,1270, 400,   0,   0, 720},
+ {    1,   1, 864, 525,1270, 350,   0,   0, 720},
+ {    1,   1, 864, 525,1270, 480,  50,   0, 760},
+ {    1,   1, 864, 525,1270, 600,  50,   0,   0}
+};
+
+XGI330_TVDataStruct  XGI_ExtPALData[]=
+{
+ {    2,   1,1080, 463,1270, 500,  50,   0,  50},
+ {   15,   7,1152, 413,1270, 500,  50,   0,  50},
+ {    2,   1,1080, 463,1270, 500,  50,   0,  50},
+ {   15,   7,1152, 413,1270, 500,  50,   0,  50},
+ {    2,   1, 900, 543,1270, 500,   0,   0,  50},
+ {    4,   3,1080, 663,1270, 500, 438,   0, 438},
+ {    1,   1,1125, 831,1270, 500, 686,   0, 686},     /*301b*/
+ {    3,   2,1080, 619,1270, 540, 438,   0, 438}
+};
+
+XGI330_TVDataStruct  XGI_StNTSCData[]=
+{
+ {    1,   1, 858, 525,1270, 400,  50,   0, 760},
+ {    1,   1, 858, 525,1270, 350,  50,   0, 640},
+ {    1,   1, 858, 525,1270, 400,   0,   0, 720},
+ {    1,   1, 858, 525,1270, 350,   0,   0, 720},
+ {    1,   1, 858, 525,1270, 480,   0,   0, 760}
+};
+
+XGI330_TVDataStruct  XGI_ExtNTSCData[]=
+{
+ {    9,  5, 1001, 453,1270, 420, 171,   0, 171},
+ {   12,  5,  858, 403,1270, 420, 171,   0, 171},
+ {    9,  5, 1001, 453,1270, 420, 171,   0, 171},
+ {   12,  5,  858, 403,1270, 420, 171,   0, 171},
+ {  143,  80, 836, 523,1270, 420, 224,   0,   0},
+ {  143, 120,1008, 643,1270, 420,   0,   1,   0},
+ {   1,    1,1120, 821,1516, 420,   0,   1,   0}, /*301b*/
+ {    2,   1, 858, 503,1584, 480,   0,   1,   0},
+ {    3,   2,1001, 533,1270, 420,   0,   0,   0}
+};
+
+XGI330_TVDataStruct  XGI_St1HiTVData[]=
+{
+       {        1,1,892,563,690,800,0,0,0               }, /* 00 (320x200,320x400,640x200,640x400) */
+        {        1,1,892,563,690,700,0,0,0               }, /* 01 (320x350,640x350) */
+        {        1,1,1000,563,785,800,0,0,0              }, /* 02 (360x400,720x400) */
+        {        1,1,1000,563,785,700,0,0,0              }, /* 03 (720x350) */
+        {        1,1,892,563,690,960,0,0,0               }, /* 04 (320x240,640x480) */
+        {        8,5,1050,683,1648,960,0x150,1,0         }  /* 05 (400x300,800x600) */
+};
+
+XGI330_TVDataStruct  XGI_St2HiTVData[]=
+{
+        {        3,1,840,483,1648,960,0x032,0,0          }, /* 00 (320x200,320x400,640x200,640x400) */
+        {        1,1,892,563,690,700,0,0,0               }, /* 01 (320x350,640x350) */
+        {        3,1,840,483,1648,960,0x032,0,0          }, /* 02 (360x400,720x400) */
+        {        1,1,1000,563,785,700,0,0,0              }, /* 03 (720x350) */
+        {        5,2,840,563,1648,960,0x08D,1,0          }, /* 04 (320x240,640x480) */
+        {        8,5,1050,683,1648,960,0x17C,1,0         }  /* 05 (400x300,800x600) */
+
+};
+
+XGI330_TVDataStruct  XGI_ExtHiTVData[]=
+{
+        {        6,1,840,563,1632,960,0,0,0              }, /* 00 (320x200,320x400,640x200,640x400) */
+        {        3,1,960,563,1632,960,0,0,0              }, /* 01 (320x350,640x350) */
+        {        3,1,840,483,1632,960,0,0,0              }, /* 02 (360x400,720x400) */
+        {        3,1,960,563,1632,960,0,0,0              }, /* 03 (720x350) */
+        {        5,1,840,563,1648,960,0x166,1,0          }, /* 04 (320x240,640x480) */
+        {        16,5,1050,683,1648,960,0x143,1,0        }, /* 05 (400x300,800x600) */
+        {        25,12,1260,851,1648,960,0x032,0,0       }, /* 06 (512x384,1024x768) */
+        {        5,4,1575,1124,1648,960,0x128,0,0        }, /* 07 (1280x1024) */
+        {        4,1,1050,563,1548,960,0x143,1,0         }, /* 08 (800x480) */
+        {        5,2,1400,659,1648,960,0x032,0,0         }, /* 09 (1024x576) */
+        {        8,5,1750,803,1648,960,0x128,0,0         }  /* 0A (1280x720) */
+
+};
+
+XGI330_TVDataStruct  XGI_ExtYPbPr525iData[]=
+{
+ {    9,  5, 1001, 453,1270, 420, 171,   0, 171},
+ {   12,  5,  858, 403,1270, 420, 171,   0, 171},
+ {    9,  5, 1001, 453,1270, 420, 171,   0, 171},
+ {   12,  5,  858, 403,1270, 420, 171,   0, 171},
+ {  143,  80, 836, 523,1250, 420, 224,   0,   0},
+ {  143, 120,1008, 643,1250, 420,   0,   1,   0},
+ {   1,    1,1120, 821,1516, 420,   0,   1,   0}, /*301b*/
+ {    2,   1, 858, 503,1584, 480,   0,   1,   0},
+ {    3,   2,1001, 533,1250, 420,   0,   0,   0}
+};
+
+XGI330_TVDataStruct  XGI_StYPbPr525iData[]=
+{
+ {    1,   1, 858, 525,1270, 400,  50,   0, 760},
+ {    1,   1, 858, 525,1270, 350,  50,   0, 640},
+ {    1,   1, 858, 525,1270, 400,   0,   0, 720},
+ {    1,   1, 858, 525,1270, 350,   0,   0, 720},
+ {    1,   1, 858, 525,1270, 480,   0,   0, 760},
+};
+
+XGI330_TVDataStruct  XGI_ExtYPbPr525pData[]=
+{
+ {    9,  5, 1001, 453,1270, 420, 171,   0, 171},
+ {   12,  5,  858, 403,1270, 420, 171,   0, 171},
+ {    9,  5, 1001, 453,1270, 420, 171,   0, 171},
+ {   12,  5,  858, 403,1270, 420, 171,   0, 171},
+ {  143,  80, 836, 523,1270, 420, 224,   0,   0},
+ {  143, 120,1008, 643,1270, 420,   0,   1,   0},
+ {   1,    1,1120, 821,1516, 420,   0,   1,   0}, /*301b*/
+ {    2,   1, 858, 503,1584, 480,   0,   1,   0},
+ {    3,   2,1001, 533,1270, 420,   0,   0,   0}
+ };
+
+XGI330_TVDataStruct  XGI_StYPbPr525pData[]=
+{
+ {    1,   1,1716, 525,1270, 400,  50,   0, 760},
+ {    1,   1,1716, 525,1270, 350,  50,   0, 640},
+ {    1,   1,1716, 525,1270, 400,   0,   0, 720},
+ {    1,   1,1716, 525,1270, 350,   0,   0, 720},
+ {    1,   1,1716, 525,1270, 480,   0,   0, 760},
+};
+
+XGI330_TVDataStruct  XGI_ExtYPbPr750pData[]=
+{
+ {    3,   1, 935, 470,1130, 680,  50,   0,   0},       /* 00 (320x200,320x400,640x200,640x400) */
+ {   24,   7, 935, 420,1130, 680,  50,   0,   0},       /* 01 (320x350,640x350) */
+ {    3,   1, 935, 470,1130, 680,  50,   0,   0},       /* 02 (360x400,720x400) */
+ {   24,   7, 935, 420,1130, 680,  50,   0,   0},       /* 03 (720x350) */
+ {    2,   1,1100, 590,1130, 640,  50,   0,   0},       /* 04 (320x240,640x480) */
+ {    3,   2,1210, 690,1130, 660,  50,   0,   0},       /* 05 (400x300,800x600) */
+ {    1,   1,1375, 878,1130, 640, 638,   0,   0},       /* 06 (1024x768) */
+ {    2,   1, 858, 503,1130, 480,   0,   1,   0},        /* 07 (720x480) */
+ {    5,   4,1815, 570,1130, 660,  50,   0,   0},
+ {    5,   3,1100, 686,1130, 640,  50,   1,   0},
+ {   10,   9,1320, 830,1130, 640,  50,   0,   0}
+};
+
+XGI330_TVDataStruct  XGI_StYPbPr750pData[]=
+{
+ {    1,   1,1650, 750,1280, 400,  50,   0, 760},
+ {    1,   1,1650, 750,1280, 350,  50,   0, 640},
+ {    1,   1,1650, 750,1280, 400,   0,   0, 720},
+ {    1,   1,1650, 750,1280, 350,   0,   0, 720},
+ {    1,   1,1650, 750,1280, 480,   0,   0, 760},
+};
+
+UCHAR XGI330_NTSCTiming[] = {
+  0x17,0x1d,0x03,0x09,0x05,0x06,0x0c,0x0c,
+  0x94,0x49,0x01,0x0a,0x06,0x0d,0x04,0x0a,
+  0x06,0x14,0x0d,0x04,0x0a,0x00,0x85,0x1b,
+  0x0c,0x50,0x00,0x97,0x00,0xda,0x4a,0x17,
+  0x7d,0x05,0x4b,0x00,0x00,0xe2,0x00,0x02,
+  0x03,0x0a,0x65,0x9d,0x08,0x92,0x8f,0x40,
+  0x60,0x80,0x14,0x90,0x8c,0x60,0x14,0x50,
+  0x00,0x40,0x44,0x00,0xdb,0x02,0x3b,0x00};
+
+UCHAR XGI330_PALTiming[] = {
+  0x21,0x5A,0x35,0x6e,0x04,0x38,0x3d,0x70,
+  0x94,0x49,0x01,0x12,0x06,0x3e,0x35,0x6d,
+  0x06,0x14,0x3e,0x35,0x6d,0x00,0x45,0x2b,
+  0x70,0x50,0x00,0x9b,0x00,0xd9,0x5d,0x17,
+  0x7d,0x05,0x45,0x00,0x00,0xe8,0x00,0x02,
+  0x0d,0x00,0x68,0xb0,0x0b,0x92,0x8f,0x40,
+  0x60,0x80,0x14,0x90,0x8c,0x60,0x14,0x63,
+  0x00,0x40,0x3e,0x00,0xe1,0x02,0x28,0x00};
+
+UCHAR XGI330_HiTVExtTiming[] =
+{
+      0x2D,0x60,0x2C,0x5F,0x08,0x31,0x3A,0x64,
+      0x28,0x02,0x01,0x3D,0x06,0x3E,0x35,0x6D,
+      0x06,0x14,0x3E,0x35,0x6D,0x00,0xC5,0x3F,
+      0x64,0x90,0x33,0x8C,0x18,0x36,0x3E,0x13,
+      0x2A,0xDE,0x2A,0x44,0x40,0x2A,0x44,0x40,
+      0x8E,0x8E,0x82,0x07,0x0B,
+      0x92,0x0F,0x40,0x60,0x80,0x14,0x90,0x8C,
+      0x60,0x14,0x3D,0x63,0x4F,
+      0x27,0x00,0xfc,0xff,0x6a,0x00
+
+};
+
+UCHAR XGI330_HiTVSt1Timing[] =
+{
+      0x32,0x65,0x2C,0x5F,0x08,0x31,0x3A,0x65,
+      0x28,0x02,0x01,0x3D,0x06,0x3E,0x35,0x6D,
+      0x06,0x14,0x3E,0x35,0x6D,0x00,0xC5,0x3F,
+      0x65,0x90,0x7B,0xA8,0x03,0xF0,0x87,0x03,
+      0x11,0x15,0x11,0xCF,0x10,0x11,0xCF,0x10,
+      0x35,0x35,0x3B,0x69,0x1D,
+      0x92,0x0F,0x40,0x60,0x80,0x14,0x90,0x8C,
+      0x60,0x04,0x86,0xAF,0x5D,
+      0x0E,0x00,0xfc,0xff,0x2d,0x00
+};
+
+UCHAR XGI330_HiTVSt2Timing[] =
+{
+      0x32,0x65,0x2C,0x5F,0x08,0x31,0x3A,0x64,
+      0x28,0x02,0x01,0x3D,0x06,0x3E,0x35,0x6D,
+      0x06,0x14,0x3E,0x35,0x6D,0x00,0xC5,0x3F,
+      0x64,0x90,0x33,0x8C,0x18,0x36,0x3E,0x13,
+      0x2A,0xDE,0x2A,0x44,0x40,0x2A,0x44,0x40,
+      0x8E,0x8E,0x82,0x07,0x0B,
+      0x92,0x0F,0x40,0x60,0x80,0x14,0x90,0x8C,
+      0x60,0x14,0x3D,0x63,0x4F,
+      0x27,0x00,0xFC,0xff,0x6a,0x00
+};
+
+UCHAR XGI330_HiTVTextTiming[] =
+{
+      0x32,0x65,0x2C,0x5F,0x08,0x31,0x3A,0x65,
+      0x28,0x02,0x01,0x3D,0x06,0x3E,0x35,0x6D,
+      0x06,0x14,0x3E,0x35,0x6D,0x00,0xC5,0x3F,
+      0x65,0x90,0xE7,0xBC,0x03,0x0C,0x97,0x03,
+      0x14,0x78,0x14,0x08,0x20,0x14,0x08,0x20,
+      0xC8,0xC8,0x3B,0xD2,0x26,
+      0x92,0x0F,0x40,0x60,0x80,0x14,0x90,0x8C,
+      0x60,0x04,0x96,0x72,0x5C,
+      0x11,0x00,0xFC,0xFF,0x32,0x00
+};
+
+UCHAR XGI330_YPbPr750pTiming[] =
+{
+      0x30,0x1d,0xe8,0x09,0x09,0xed,0x0c,0x0c,
+      0x98,0x0a,0x01,0x0c,0x06,0x0d,0x04,0x0a,
+      0x06,0x14,0x0d,0x04,0x0a,0x00,0x85,0x3f,
+      0xed,0x50,0x70,0x9f,0x16,0x59,0x60,0x13,
+      0x27,0x0b,0x27,0xfc,0x30,0x27,0x1c,0xb0,
+      0x4b,0x4b,0x6f,0x2f,0x63,
+      0x92,0x0F,0x40,0x60,0x80,0x14,0x90,0x8C,
+      0x60,0x14,0x73,0x00,0x40,
+      0x11,0x00,0xfc,0xff,0x32,0x00
+};
+
+UCHAR XGI330_YPbPr525pTiming[] =
+{
+      0x3E,0x11,0x06,0x09,0x0b,0x0c,0x0c,0x0c,
+      0x98,0x0a,0x01,0x0d,0x06,0x0d,0x04,0x0a,
+      0x06,0x14,0x0d,0x04,0x0a,0x00,0x85,0x3f,
+      0x0c,0x50,0xb2,0x9f,0x16,0x59,0x4f,0x13,
+      0xad,0x11,0xad,0x1d,0x40,0x8a,0x3d,0xb8,
+      0x51,0x5e,0x60,0x49,0x7d,
+      0x92,0x0F,0x40,0x60,0x80,0x14,0x90,0x8C,
+      0x60,0x14,0x4B,0x43,0x41,
+      0x11,0x00,0xFC,0xFF,0x32,0x00
+};
+
+UCHAR XGI330_YPbPr525iTiming[] =
+{
+      0x1B,0x21,0x03,0x09,0x05,0x06,0x0C,0x0C,
+      0x94,0x49,0x01,0x0A,0x06,0x0D,0x04,0x0A,
+      0x06,0x14,0x0D,0x04,0x0A,0x00,0x85,0x1B,
+      0x0C,0x50,0x00,0x97,0x00,0xDA,0x4A,0x17,
+      0x7D,0x05,0x4B,0x00,0x00,0xE2,0x00,0x02,
+      0x03,0x0A,0x65,0x9D,0x08,
+      0x92,0x8F,0x40,0x60,0x80,0x14,0x90,0x8C,
+      0x60,0x14,0x4B,0x00,0x40,
+      0x44,0x00,0xDB,0x02,0x3B,0x00
+
+};
+
+UCHAR XGI330_HiTVGroup3Data[] =
+{
+      0x00,0x1A,0x22,0x63,0x62,0x22,0x08,0x5F,
+      0x05,0x21,0xB2,0xB2,0x55,0x77,0x2A,0xA6,
+      0x25,0x2F,0x47,0xFA,0xC8,0xFF,0x8E,0x20,
+      0x8C,0x6E,0x60,0x2E,0x58,0x48,0x72,0x44,
+      0x56,0x36,0x4F,0x6E,0x3F,0x80,0x00,0x80,
+      0x4F,0x7F,0x03,0xA8,0x7D,0x20,0x1A,0xA9,
+      0x14,0x05,0x03,0x7E,0x64,0x31,0x14,0x75,
+      0x18,0x05,0x18,0x05,0x4C,0xA8,0x01
+};
+
+UCHAR XGI330_HiTVGroup3Simu[] =
+{
+      0x00,0x1A,0x22,0x63,0x62,0x22,0x08,0x95,
+      0xDB,0x20,0xB8,0xB8,0x55,0x47,0x2A,0xA6,
+      0x25,0x2F,0x47,0xFA,0xC8,0xFF,0x8E,0x20,
+      0x8C,0x6E,0x60,0x15,0x26,0xD3,0xE4,0x11,
+      0x56,0x36,0x4F,0x6E,0x3F,0x80,0x00,0x80,
+      0x67,0x36,0x01,0x47,0x0E,0x10,0xBE,0xB4,
+      0x01,0x05,0x03,0x7E,0x65,0x31,0x14,0x75,
+      0x18,0x05,0x18,0x05,0x4C,0xA8,0x01
+};
+
+UCHAR XGI330_HiTVGroup3Text[] =
+{
+      0x00,0x1A,0x22,0x63,0x62,0x22,0x08,0xA7,
+      0xF5,0x20,0xCE,0xCE,0x55,0x47,0x2A,0xA6,
+      0x25,0x2F,0x47,0xFA,0xC8,0xFF,0x8E,0x20,
+      0x8C,0x6E,0x60,0x18,0x2C,0x0C,0x20,0x22,
+      0x56,0x36,0x4F,0x6E,0x3F,0x80,0x00,0x80,
+      0x93,0x3C,0x01,0x50,0x2F,0x10,0xF4,0xCA,
+      0x01,0x05,0x03,0x7E,0x65,0x31,0x14,0x75,
+      0x18,0x05,0x18,0x05,0x4C,0xA8,0x01
+};
+
+UCHAR XGI330_Ren525pGroup3[] =
+{
+  0x00,0x14,0x15,0x25,0x55,0x15,0x0b,0x13,
+  0xB1,0x41,0x62,0x62,0xFF,0xF4,0x45,0xa6,
+  0x25,0x2F,0x67,0xF6,0xbf,0xFF,0x8E,0x20,
+  0xAC,0xDA,0x60,0xFe,0x6A,0x9A,0x06,0x10,
+  0xd1,0x04,0x18,0x0a,0xFF,0x80,0x00,0x80,
+  0x3c,0x77,0x00,0xEF,0xE0,0x10,0xB0,0xE0,
+  0x10,0x4F,0x0F,0x0F,0x05,0x0F,0x08,0x6E,
+  0x1a,0x1F,0x25,0x2a,0x4C,0xAA,0x01
+};
+
+UCHAR XGI330_Ren750pGroup3[] =
+{
+  0x00,0x14,0x15,0x25,0x55,0x15,0x0b,0x7a,
+  0x54,0x41,0xE7,0xE7,0xFF,0xF4,0x45,0xa6,
+  0x25,0x2F,0x67,0xF6,0xbf,0xFF,0x8E,0x20,
+  0xAC,0x6A,0x60,0x2b,0x52,0xCD,0x61,0x10,
+  0x51,0x04,0x18,0x0a,0x1F,0x80,0x00,0x80,
+  0xFF,0xA4,0x04,0x2B,0x94,0x21,0x72,0x94,
+  0x26,0x05,0x01,0x0F,0xed,0x0F,0x0A,0x64,
+  0x18,0x1D,0x23,0x28,0x4C,0xAA,0x01
+};
+
+XGI_PanelDelayTblStruct XGI330_PanelDelayTbl[]=
+{
+{{0x00,0x00}},
+{{0x00,0x00}},
+{{0x00,0x00}},
+{{0x00,0x00}},
+{{0x00,0x00}},
+{{0x00,0x00}},
+{{0x00,0x00}},
+{{0x00,0x00}},
+{{0x00,0x00}},
+{{0x00,0x00}},
+{{0x00,0x00}},
+{{0x00,0x00}},
+{{0x00,0x00}},
+{{0x00,0x00}},
+{{0x00,0x00}},
+{{0x00,0x00}}
+};
+
+XGI330_LVDSDataStruct  XGI330_LVDS320x480Data_1[]=
+{
+ {848, 433,400,525},
+ {848, 389,400,525},
+ {848, 433,400,525},
+ {848, 389,400,525},
+ {848, 518,400, 525},
+ {1056, 628,400,525},
+ {400, 525,400,525},
+ {800, 449,1000, 644},
+ {800, 525,1000, 635}
+};
+
+XGI330_LVDSDataStruct  XGI330_LVDS800x600Data_1[]=
+{
+ {848, 433,1060, 629},
+ {848, 389,1060, 629},
+ {848, 433,1060, 629},
+ {848, 389,1060, 629},
+ {848, 518,1060, 629},
+ {1056, 628,1056, 628},
+ {1056, 628,1056, 628},
+ {800, 449,1000, 644},
+ {800, 525,1000, 635}
+};
+
+XGI330_LVDSDataStruct  XGI330_LVDS800x600Data_2[]=
+{
+ {1056, 628,1056, 628},
+ {1056, 628,1056, 628},
+ {1056, 628,1056, 628},
+ {1056, 628,1056, 628},
+ {1056, 628,1056, 628},
+ {1056, 628,1056, 628},
+ {1056, 628,1056, 628},
+ {800, 449,1000, 644},
+ {800, 525,1000, 635}
+};
+
+XGI330_LVDSDataStruct  XGI_LVDS1024x768Data_1[]=
+{
+ { 960 , 438 , 1344 , 806 } ,  /* 00 (320x200,320x400,640x200,640x400) */
+ { 960 , 388 , 1344 , 806 } ,  /* 01 (320x350,640x350) */
+ { 1040, 438 , 1344 , 806 } ,  /* 02 (360x400,720x400) */
+ { 1040, 388 , 1344 , 806 } ,  /* 03 (720x350) */
+ { 960 , 518 , 1344 , 806 } ,  /* 04 (320x240,640x480) */
+ {1120 , 638 , 1344 , 806 } ,  /* 05 (400x300,800x600) */
+ {1344 , 806 , 1344 , 806 }    /* 06 (512x384,1024x768) */
+};
+
+
+XGI330_LVDSDataStruct  XGI_LVDS1024x768Data_2[]=
+{
+ {1344, 806,1344, 806},
+ {1344, 806,1344, 806},
+ {1344, 806,1344, 806},
+ {1344, 806,1344, 806},
+ {1344, 806,1344, 806},
+ {1344, 806,1344, 806},
+ {1344, 806,1344, 806},
+ {800, 449,1280, 801},
+ {800, 525,1280, 813}
+};
+
+XGI330_LVDSDataStruct  XGI_LVDS1280x1024Data_1[]=
+{
+ {1048, 442,1688, 1066},
+ {1048, 392,1688, 1066},
+ {1048, 442,1688, 1066},
+ {1048, 392,1688, 1066},
+ {1048, 522,1688, 1066},
+ {1208, 642,1688, 1066},
+ {1432, 810,1688, 1066},
+ {1688, 1066,1688, 1066}
+};
+
+XGI330_LVDSDataStruct  XGI_LVDS1280x1024Data_2[]=
+{
+ {1344, 806,1344, 806},
+ {1344, 806,1344, 806},
+ {1344, 806,1344, 806},
+ {1344, 806,1344, 806},
+ {1344, 806,1344, 806},
+ {1344, 806,1344, 806},
+ {1344, 806,1344, 806},
+ {800, 449,1280, 801},
+ {800, 525,1280, 813}
+};
+/*
+XGI330_LVDSDataStruct  XGI_LVDS1280x768Data_1[]=
+{
+ {768,438,1408,806},
+ {768,388,1408,806},
+ {768,438,1408,806},
+ {768,388,1408,806},
+ {768,518,1408,806},
+ {928,638,1408,806},
+ {1408,806,1408,806},
+ {1408,806,1408,806},
+ {1408,806,1408,806}
+};
+
+XGI330_LVDSDataStruct  XGI_LVDS1280x768Data_2[]=
+{
+ {1408, 806,1408, 806},
+ {1408, 806,1408, 806},
+ {1408, 806,1408, 806},
+ {1408, 806,1408, 806},
+ {1408, 806,1408, 806},
+ {1408, 806,1408, 806},
+ {1408, 806,1408, 806},
+ {1408, 806,1408, 806},
+ {1408, 806,1408, 806}
+};
+
+XGI330_LVDSDataStruct  XGI_LVDS1280x768NData_1[]=
+{
+ {704, 438,1344, 806},
+ {704, 388,1344, 806},
+ {704, 438,1344, 806},
+ {704, 388,1344, 806},
+ {704, 518,1344, 806},
+ {864, 638,1344, 806},
+ {1088, 806,1344, 806},
+ {1344, 806,1344, 806},
+ {1344, 806,1344, 806}
+};
+
+XGI330_LVDSDataStruct  XGI_LVDS1280x768NData_2[]=
+{
+ {1344, 806,1344, 806},
+ {1344, 806,1344, 806},
+ {1344, 806,1344, 806},
+ {1344, 806,1344, 806},
+ {1344, 806,1344, 806},
+ {1344, 806,1344, 806},
+ {1344, 806,1344, 806},
+ {1344, 806,1344, 806},
+ {1344, 806,1344, 806}
+};
+
+XGI330_LVDSDataStruct  XGI_LVDS1280x768SData_1[]=
+{
+ {1048,438,1688,806},
+ {1048,388,1688,806},
+ {1148,438,1688,806},
+ {1148,388,1688,806},
+ {1048,518,1688,806},
+ {1208,638,1688,806},
+ {1432,806,1688,806},
+ {1688,806,1688,806},
+ {1688,806,1688,806}
+};
+
+XGI330_LVDSDataStruct  XGI_LVDS1280x768SData_2[]=
+{
+ {1688,806,1688,806},
+ {1688,806,1688,806},
+ {1688,806,1688,806},
+ {1688,806,1688,806},
+ {1688,806,1688,806},
+ {1688,806,1688,806},
+ {1688,806,1688,806},
+ {1688,806,1688,806},
+ {1688,806,1688,806}
+};
+*/
+XGI330_LVDSDataStruct  XGI_LVDS1400x1050Data_1[]=
+{
+ {928,416,1688,1066},
+ {928,366,1688,1066},
+ {928,416,1688,1066},
+ {928,366,1688,1066},
+ {928,496,1688,1066},
+ {1088,616,1688,1066},
+ {1312,784,1688,1066},
+ {1568,1040,1688,1066},
+ {1688,1066,1688,1066}
+};
+
+XGI330_LVDSDataStruct  XGI_LVDS1400x1050Data_2[]=
+{
+ {1688,1066,1688,1066},
+ {1688,1066,1688,1066},
+ {1688,1066,1688,1066},
+ {1688,1066,1688,1066},
+ {1688,1066,1688,1066},
+ {1688,1066,1688,1066},
+ {1688,1066,1688,1066},
+ {1688,1066,1688,1066},
+ {1688,1066,1688,1066}
+};
+
+XGI330_LVDSDataStruct XGI_LVDS1600x1200Data_1[]=
+{      /* ;;[ycchen] 12/05/02 LCDHTxLCDVT=2048x1320 */
+        {        1088,520,2048,1320      },/* 00 (320x200,320x400,640x200,640x400) */
+        {        1088,470,2048,1320      },/* 01 (320x350,640x350) */
+        {        1088,520,2048,1320      },/* 02 (360x400,720x400) */
+        {        1088,470,2048,1320      },/* 03 (720x350) */
+        {        1088,600,2048,1320      },/* 04 (320x240,640x480) */
+        {        1248,720,2048,1320      },/* 05 (400x300,800x600) */
+        {        1472,888,2048,1320      },/* 06 (512x384,1024x768) */
+        {        1728,1144,2048,1320     },/* 07 (640x512,1280x1024) */
+        {        1848,1170,2048,1320     },/* 08 (1400x1050) */
+        {        2048,1320,2048,1320     } /* 09 (1600x1200) */
+};
+
+XGI330_LVDSDataStruct XGI_LVDSNoScalingData[]=
+{
+        {        800,449,800,449             }, /* 00 (320x200,320x400,640x200,640x400) */
+        {        800,449,800,449             }, /* 01 (320x350,640x350) */
+        {        800,449,800,449             }, /* 02 (360x400,720x400) */
+        {        800,449,800,449             }, /* 03 (720x350) */
+        {        800,525,800,525             }, /* 04 (640x480x60Hz) */
+        {        1056,628,1056,628           }, /* 05 (800x600x60Hz) */
+        {        1344,806,1344,806           }, /* 06 (1024x768x60Hz) */
+        {        1688,1066,1688,1066         }, /* 07 (1280x1024x60Hz) */
+        {        1688,1066,1688,1066         }, /* 08 (1400x1050x60Hz) ;;[ycchen] 12/19/02 */
+        {        2160,1250,2160,1250         }, /* 09 (1600x1200x60Hz) */
+        {        1688,806,1688,806           }  /* 0A (1280x768x60Hz) */
+};
+
+XGI330_LVDSDataStruct XGI_LVDS1024x768Data_1x75[]=
+{
+       {960,438,1312,800  }, /* 00 (320x200,320x400,640x200,640x400) */
+        {960,388,1312,800  }, /* 01 (320x350,640x350) */
+        {1040,438,1312,800 }, /* 02 (360x400,720x400) */
+        {1040,388,1312,800 }, /* 03 (720x350) */
+        {928,512,1312,800  }, /* 04 (320x240,640x480) */
+        {1088,632,1312,800 }, /* 05 (400x300,800x600) */
+        {1312,800,1312,800 }, /* 06 (512x384,1024x768) */
+};
+
+
+XGI330_LVDSDataStruct XGI_LVDS1024x768Data_2x75[]=
+{
+        {1312,800,1312,800}, /* ; 00 (320x200,320x400,640x200,640x400) */
+        {1312,800,1312,800}, /* ; 01 (320x350,640x350) */
+        {1312,800,1312,800}, /* ; 02 (360x400,720x400) */
+        {1312,800,1312,800}, /* ; 03 (720x350) */
+        {1312,800,1312,800}, /* ; 04 (320x240,640x480) */
+        {1312,800,1312,800}, /* ; 05 (400x300,800x600) */
+        {1312,800,1312,800}, /* ; 06 (512x384,1024x768) */
+};
+
+XGI330_LVDSDataStruct XGI_LVDS1280x1024Data_1x75[]=
+{
+        {1048,442,1688,1066  }, /* ; 00 (320x200,320x400,640x200,640x400) */
+        {1048,392,1688,1066  }, /* ; 01 (320x350,640x350) */
+        {1128,442,1688,1066  }, /* ; 02 (360x400,720x400) */
+        {1128,392,1688,1066  }, /* ; 03 (720x350) */
+        {1048,522,1688,1066  }, /* ; 04 (320x240,640x480) */
+        {1208,642,1688,1066  }, /* ; 05 (400x300,800x600) */
+        {1432,810,1688,1066  }, /* ; 06 (512x384,1024x768) */
+        {1688,1066,1688,1066 }, /* ; 06; 07 (640x512,1280x1024) */
+};
+
+XGI330_LVDSDataStruct XGI_LVDS1280x1024Data_2x75[]=
+{
+        {1688,1066,1688,1066 }, /* ; 00 (320x200,320x400,640x200,640x400) */
+        {1688,1066,1688,1066 }, /* ; 01 (320x350,640x350) */
+        {1688,1066,1688,1066 }, /* ; 02 (360x400,720x400) */
+        {1688,1066,1688,1066 }, /* ; 03 (720x350) */
+        {1688,1066,1688,1066 }, /* ; 04 (320x240,640x480) */
+        {1688,1066,1688,1066 }, /* ; 05 (400x300,800x600) */
+        {1688,1066,1688,1066 }, /* ; 06 (512x384,1024x768) */
+        {1688,1066,1688,1066 }, /* ; 06; 07 (640x512,1280x1024) */
+};
+
+XGI330_LVDSDataStruct XGI_LVDSNoScalingDatax75[]=
+{
+        {800,449,800,449     }, /* ; 00 (320x200,320x400,640x200,640x400) */
+        {800,449,800,449     }, /* ; 01 (320x350,640x350) */
+        {900,449,900,449     }, /* ; 02 (360x400,720x400) */
+        {900,449,900,449     }, /* ; 03 (720x350) */
+        {800,500,800,500     }, /* ; 04 (640x480x75Hz) */
+        {1056,625,1056,625   }, /* ; 05 (800x600x75Hz) */
+        {1312,800,1312,800   }, /* ; 06 (1024x768x75Hz) */
+        {1688,1066,1688,1066 }, /* ; 07 (1280x1024x75Hz) */
+        {1688,1066,1688,1066 }, /* ; 08 (1400x1050x75Hz) ;;[ycchen] 12/19/02 */
+        {2160,1250,2160,1250 }, /* ; 09 (1600x1200x75Hz) */
+        {1688,806,1688,806   }, /* ; 0A (1280x768x75Hz) */
+};
+
+XGI330_LVDSDataStruct XGI_LVDS1024x768Des_1[]=
+{
+       {      0,1048,   0, 771     }, /* 00 (320x200,320x400,640x200,640x400) */
+        {      0,1048,   0, 771     }, /* 01 (320x350,640x350) */
+        {      0,1048,   0, 771     }, /* 02 (360x400,720x400) */
+        {      0,1048,   0, 771     }, /* 03 (720x350) */
+        {      0,1048,   0, 771     }, /* 04 (640x480x60Hz) */
+        {      0,1048,   0, 771     }, /* 05 (800x600x60Hz) */
+        {      0,1048, 805, 770     }  /* 06 (1024x768x60Hz) */
+} ;
+
+XGI330_LVDSDataStruct XGI_LVDS1024x768Des_2[]=
+{
+       {      1142, 856, 622, 587     }, /* 00 (320x200,320x400,640x200,640x400) */
+        {      1142, 856, 597, 562     }, /* 01 (320x350,640x350) */
+        {      1142, 856, 622, 587     }, /* 02 (360x400,720x400) */
+        {      1142, 856, 597, 562     }, /* 03 (720x350) */
+        {      1142,1048, 722, 687     }, /* 04 (640x480x60Hz) */
+        {      1232, 936, 722, 687     }, /* 05 (800x600x60Hz) */
+        {         0,1048, 805, 771     }  /* 06 (1024x768x60Hz) */
+};
+
+XGI330_LVDSDataStruct XGI_LVDS1024x768Des_3[]=
+{
+       {       320,  24, 622, 587     }, /* 00 (320x200,320x400,640x200,640x400) */
+        {       320,  24, 597, 562     }, /* 01 (320x350,640x350) */
+        {       320,  24, 622, 587     }, /* 02 (360x400,720x400) */
+        {       320,  24, 597, 562     }, /* 03 (720x350) */
+        {       320,  24, 722, 687     }  /* 04 (640x480x60Hz) */
+};
+
+XGI330_LVDSDataStruct XGI_LVDS1280x1024Des_1[]=
+{
+       {      0,1328,    0, 1025     }, /* 00 (320x200,320x400,640x200,640x400) */
+        {      0,1328,    0, 1025     }, /* 01 (320x350,640x350) */
+        {      0,1328,    0, 1025     }, /* 02 (360x400,720x400) */
+        {      0,1328,    0, 1025     }, /* 03 (720x350) */
+        {      0,1328,    0, 1025     }, /* 04 (640x480x60Hz) */
+        {      0,1328,    0, 1025     }, /* 05 (800x600x60Hz) */
+        {      0,1328,    0, 1025     }, /* 06 (1024x768x60Hz) */
+        {      0,1328, 1065, 1024     }  /* 07 (1280x1024x60Hz) */
+};
+
+ /* The Display setting for DE Mode Panel */
+XGI330_LVDSDataStruct XGI_LVDS1280x1024Des_2[]=
+{
+       {      1368,1008,752,711     }, /* 00 (320x200,320x400,640x200,640x400) */
+        {      1368,1008,729,688     }, /* 01 (320x350,640x350) */
+        {      1408,1048,752,711     }, /* 02 (360x400,720x400) */
+        {      1408,1048,729,688     }, /* 03 (720x350) */
+        {      1368,1008,794,753     }, /* 04 (640x480x60Hz) */
+        {      1448,1068,854,813     }, /* 05 (800x600x60Hz) */
+        {      1560,1200,938,897     }, /* 06 (1024x768x60Hz) */
+        {      0000,1328,0,1025     }  /* 07 (1280x1024x60Hz) */
+};
+
+XGI330_LVDSDataStruct XGI_LVDS1400x1050Des_1[]=
+{
+       {      0,1448,0,1051     }, /* 00 (320x200,320x400,640x200,640x400) */
+        {      0,1448,0,1051     }, /* 01 (320x350,640x350) */
+        {      0,1448,0,1051     }, /* 02 (360x400,720x400) */
+        {      0,1448,0,1051     }, /* 03 (720x350) */
+        {      0,1448,0,1051     }, /* 04 (640x480x60Hz) */
+        {      0,1448,0,1051     }, /* 05 (800x600x60Hz) */
+        {      0,1448,0,1051     }, /* 06 (1024x768x60Hz) */
+        {      0,1448,0,1051     }, /* 07 (1280x1024x60Hz) */
+        {      0,1448,0,1051     }  /* 08 (1400x1050x60Hz) */
+};
+
+XGI330_LVDSDataStruct XGI_LVDS1400x1050Des_2[]=
+{
+       {      1308,1068, 781, 766     }, /* 00 (320x200,320x400,640x200,640x400) */
+        {      1308,1068, 781, 766     }, /* 01 (320x350,640x350) */
+        {      1308,1068, 781, 766     }, /* 02 (360x400,720x400) */
+        {      1308,1068, 781, 766     }, /* 03 (720x350) */
+        {      1308,1068, 781, 766     }, /* 04 (640x480x60Hz) */
+        {      1388,1148, 841, 826     }, /* 05 (800x600x60Hz) */
+        {      1490,1250, 925, 910     }, /* 06 (1024x768x60Hz) */
+        {      1608,1368,1053,1038     }, /* 07 (1280x1024x60Hz) */
+        {      0,1448,0,1051     }  /* 08 (1400x1050x60Hz) */
+};
+
+XGI330_LVDSDataStruct XGI_LVDS1600x1200Des_1[]=
+{
+       {      0,1664,0,1201     }, /* 00 (320x200,320x400,640x200,640x400) */
+        {      0,1664,0,1201     }, /* 01 (320x350,640x350) */
+        {      0,1664,0,1201     }, /* 02 (360x400,720x400) */
+        {      0,1664,0,1201     }, /* 03 (720x350) */
+        {      0,1664,0,1201     }, /* 04 (640x480x60Hz) */
+        {      0,1664,0,1201     }, /* 05 (800x600x60Hz) */
+        {      0,1664,0,1201     }, /* 06 (1024x768x60Hz) */
+        {      0,1664,0,1201     }, /* 07 (1280x1024x60Hz) */
+        {      0,1664,0,1201     }, /* 08 (1400x1050x60Hz) */
+        {      0,1664,0,1201     }  /* 09 (1600x1200x60Hz) */
+};
+
+
+
+XGI330_LCDDataDesStruct2  XGI_LVDSNoScalingDesData[]=
+{
+       {     0, 648, 448, 405,  96,   2   }, /* 00 (320x200,320x400,640x200,640x400) */
+        {     0, 648, 448, 355,  96,   2   }, /* 01 (320x350,640x350) */
+        {     0, 648, 448, 405,  96,   2   }, /* 02 (360x400,720x400) */
+        {     0, 648, 448, 355,  96,   2   }, /* 03 (720x350) */
+        {     0, 648,  1, 483,  96,   2   }, /* 04 (640x480x60Hz) */
+        {     0, 840, 627, 600, 128,   4   }, /* 05 (800x600x60Hz) */
+        {     0,1048, 805, 770, 136,   6   }, /* 06 (1024x768x60Hz) */
+        {     0,1328,0,1025, 112,   3   }, /* 07 (1280x1024x60Hz) */
+        {     0,1438,0,1051, 112,   3   }, /* 08 (1400x1050x60Hz) ;;[ycchen] 12/19/02 */
+        {     0,1664,0,1201, 192,   3   }, /* 09 (1600x1200x60Hz) */
+        {     0,1328,0,0771, 112,   6   }  /* 0A (1280x768x60Hz) */
+};
+
+XGI330_LVDSDataStruct XGI_LVDS1024x768Des_1x75[]=                      /* ; 1024x768 Full-screen */
+{
+        {0,1040,0,769}, /* ; 00 (320x200,320x400,640x200,640x400) */
+        {0,1040,0,769}, /* ; 01 (320x350,640x350) */
+        {0,1040,0,769}, /* ; 02 (360x400,720x400) */
+        {0,1040,0,769}, /* ; 03 (720x350) */
+        {0,1040,0,769}, /* ; 04 (640x480x75Hz) */
+        {0,1040,0,769}, /* ; 05 (800x600x75Hz) */
+        {0,1040,0,769} /* ; 06 (1024x768x75Hz) */
+};
+
+XGI330_LVDSDataStruct XGI_LVDS1024x768Des_2x75[]= /* ; 1024x768 center-screen (Enh. Mode) */
+{
+        {1142, 856,622,587 }, /* 00 (320x200,320x400,640x200,640x400) */
+        {1142, 856,597,562 }, /* 01 (320x350,640x350) */
+        {1142, 856,622,587 }, /* 02 (360x400,720x400) */
+        {1142, 856,597,562 }, /* 03 (720x350) */
+        {1142,1048,722,687 }, /* 04 (640x480x60Hz) */
+        {1232, 936,722,687 }, /* 05 (800x600x60Hz) */
+        {   0,1048,805,771 }  /* 06 (1024x768x60Hz) */
+};
+
+XGI330_LVDSDataStruct XGI_LVDS1024x768Des_3x75[]= /* ; 1024x768 center-screen (St.Mode) */
+{
+        {320,24,622,587  }, /* ; 00 (320x200,320x400,640x200,640x400) */
+        {320,24,597,562  }, /* ; 01 (320x350,640x350) */
+        {320,24,622,587  }, /* ; 02 (360x400,720x400) */
+        {320,24,597,562  }, /* ; 03 (720x350) */
+        {320,24,722,687  } /* ; 04 (640x480x60Hz) */
+};
+
+XGI330_LVDSDataStruct XGI_LVDS1280x1024Des_1x75[]=
+{
+        {0,1296,0,1025}, /* ; 00 (320x200,320x400,640x200,640x400) */
+        {0,1296,0,1025}, /* ; 01 (320x350,640x350) */
+        {0,1296,0,1025}, /* ; 02 (360x400,720x400) */
+        {0,1296,0,1025}, /* ; 03 (720x350) */
+        {0,1296,0,1025}, /* ; 04 (640x480x75Hz) */
+        {0,1296,0,1025}, /* ; 05 (800x600x75Hz) */
+        {0,1296,0,1025}, /* ; 06 (1024x768x75Hz) */
+        {0,1296,0,1025} /* ; 07 (1280x1024x75Hz) */
+};
+
+/* The Display setting for DE Mode Panel */
+XGI330_LVDSDataStruct XGI_LVDS1280x1024Des_2x75[]=   /* [ycchen] 02/18/03 Set DE as default */
+{
+        {1368,976,752,711 }, /* ; 00 (320x200,320x400,640x200,640x400) */
+        {1368,976,729,688 }, /* ; 01 (320x350,640x350) */
+        {1408,976,752,711 }, /* ; 02 (360x400,720x400) */
+        {1408,976,729,688 }, /* ; 03 (720x350) */
+        {1368,976,794,753 }, /* ; 04 (640x480x75Hz) */
+        {1448,1036,854,813}, /* ; 05 (800x600x75Hz) */
+        {1560,1168,938,897}, /* ; 06 (1024x768x75Hz) */
+        {0,1296,0,1025    } /* ; 07 (1280x1024x75Hz) */
+};
+
+XGI330_LCDDataDesStruct2 XGI_LVDSNoScalingDesDatax75[]=  /* Scaling LCD 75Hz */
+{
+       { 0,648,448,405,96,2  }, /* ; 00 (320x200,320x400,640x200,640x400) */
+       { 0,648,448,355,96,2  }, /* ; 01 (320x350,640x350) */
+       { 0,729,448,405,108,2 }, /* ; 02 (360x400,720x400) */
+       { 0,729,448,355,108,2 }, /* ; 03 (720x350) */
+       { 0,656,0,481,64,3    }, /* ; 04 (640x480x75Hz) */
+       { 0,816,0,601,80,3    }, /* ; 05 (800x600x75Hz) */
+       { 0,1040,0,769,96,3   }, /* ; 06 (1024x768x75Hz) */
+       { 0,1296,0,1025,144,3 }, /* ; 07 (1280x1024x75Hz) */
+       { 0,1448,0,1051,112,3 }, /* ; 08 (1400x1050x75Hz) ;;[ycchen] 12/19/02 */
+       { 0,1664,0,1201,192,3 }, /* ; 09 (1600x1200x75Hz) */
+       { 0,1328,0,771,112,6  }  /* ; 0A (1280x768x75Hz) */
+};
+
+XGI330_LVDSDataStruct  XGI330_LVDS640x480Data_1[]=
+{
+ {800, 449, 800, 449},
+ {800, 449, 800, 449},
+ {800, 449, 800, 449},
+ {800, 449, 800, 449},
+ {800, 525, 800, 525},
+ {1056, 628,1056, 628},
+ {1056, 628,1056, 628},
+ {1056, 628,1056, 628},
+ {1056, 628,1056, 628}
+};
+
+XGI330_CHTVDataStruct  XGI_CHTVUNTSCData[]=
+{
+ {840, 600, 840, 600},
+ {840, 600, 840, 600},
+ {840, 600, 840, 600},
+ {840, 600, 840, 600},
+ {784, 600, 784, 600},
+ {1064, 750,1064, 750}
+};
+
+XGI330_CHTVDataStruct  XGI_CHTVONTSCData[]=
+{
+ {840, 525, 840, 525},
+ {840, 525, 840, 525},
+ {840, 525, 840, 525},
+ {840, 525, 840, 525},
+ {784, 525, 784, 525},
+ {1040, 700,1040, 700}
+};
+
+XGI330_CHTVDataStruct  XGI_CHTVUPALData[]=
+{
+ {1008, 625,1008, 625},
+ {1008, 625,1008, 625},
+ {1008, 625,1008, 625},
+ {1008, 625,1008, 625},
+ {840, 750, 840, 750},
+ {936, 836, 936, 836}
+};
+
+XGI330_CHTVDataStruct  XGI_CHTVOPALData[]=
+{
+ {1008, 625,1008, 625},
+ {1008, 625,1008, 625},
+ {1008, 625,1008, 625},
+ {1008, 625,1008, 625},
+ {840, 625, 840, 625},
+ {960, 750, 960, 750}
+};
+
+XGI_LVDSCRT1HDataStruct  XGI_LVDSCRT11024x768_1_H[]=
+{
+               /* CR00,CR02,CR03,CR04,CR05,SR0B,SR0C,SR0E */
+                {{      0x4B,0x27,0x8F,0x32,0x1B,0x00,0x45,0x00 }}, /* 00 (320x) */
+                {{      0x4B,0x27,0x8F,0x2B,0x03,0x00,0x44,0x00 }}, /* 01 (360x) */
+                {{      0x55,0x31,0x99,0x46,0x1D,0x00,0x55,0x00 }}, /* 02 (400x) */
+                {{      0x63,0x3F,0x87,0x4A,0x93,0x00,0x01,0x00 }}, /* 03 (512x) */
+                {{      0x73,0x4F,0x97,0x55,0x86,0x00,0x05,0x00 }}, /* 04 (640x) */
+                {{      0x73,0x4F,0x97,0x55,0x86,0x00,0x05,0x00 }}, /* 05 (720x) */
+                {{      0x87,0x63,0x8B,0x69,0x1A,0x00,0x26,0x00 }}, /* 06 (800x) */
+                {{      0xA3,0x7F,0x87,0x86,0x97,0x00,0x02,0x00 }} /* 07 (1024x) */
+};
+
+XGI_LVDSCRT1HDataStruct  XGI_LVDSCRT11280x1024_1_H[]=
+{
+               /* CR00,CR02,CR03,CR04,CR05,SR0B,SR0C,SR0E */
+                {{      0x56,0x27,0x9A,0x30,0x1E,0x00,0x05,0x00 }}, /* 00 (320x) */
+                {{      0x56,0x27,0x9A,0x30,0x1E,0x00,0x05,0x00 }}, /* 01 (360x) */
+                {{      0x60,0x31,0x84,0x3A,0x88,0x00,0x01,0x00 }}, /* 02 (400x) */
+                {{      0x6E,0x3F,0x92,0x48,0x96,0x00,0x01,0x00 }}, /* 03 (512x) */
+                {{      0x7E,0x4F,0x82,0x58,0x06,0x00,0x06,0x00 }}, /* 04 (640x) */
+                {{      0x7E,0x4F,0x82,0x58,0x06,0x00,0x06,0x00 }}, /* 05 (720x) */
+                {{      0x92,0x63,0x96,0x6C,0x1A,0x00,0x06,0x00 }}, /* 06 (800x) */
+                {{      0xAE,0x7F,0x92,0x88,0x96,0x00,0x02,0x00 }}, /* 07 (1024x) */
+                {{      0xCE,0x9F,0x92,0xA8,0x16,0x00,0x07,0x00 }} /* 08 (1280x) */
+};
+
+XGI_LVDSCRT1HDataStruct  XGI_LVDSCRT11024x768_2_H[]=
+{
+               /* CR00,CR02,CR03,CR04,CR05,SR0B,SR0C,SR0E */
+                {{      0x63,0x27,0x87,0x3B,0x8C,0x00,0x01,0x00 }}, /* 00 (320x) */
+                {{      0x63,0x27,0x87,0x3B,0x8C,0x00,0x01,0x00 }}, /* 01 (360x) */
+                {{      0x63,0x31,0x87,0x3D,0x8E,0x00,0x01,0x00 }}, /* 02 (400x) */
+                {{      0x63,0x3F,0x87,0x45,0x96,0x00,0x01,0x00 }}, /* 03 (512x) */
+                {{      0xA3,0x4F,0x87,0x6E,0x9F,0x00,0x06,0x00 }}, /* 04 (640x) */
+                {{      0xA3,0x4F,0x87,0x6E,0x9F,0x00,0x06,0x00 }}, /* 05 (720x) */
+                {{      0xA3,0x63,0x87,0x78,0x89,0x00,0x02,0x00 }}, /* 06 (800x) */
+                {{      0xA3,0x7F,0x87,0x86,0x97,0x00,0x02,0x00 }} /* 07 (1024x) */
+};
+
+XGI_LVDSCRT1HDataStruct  XGI_LVDSCRT11280x1024_2_H[]=
+{
+                /* CR00,CR02,CR03,CR04,CR05,SR0B,SR0C,SR0E */
+                {{      0x7E,0x3B,0x9A,0x44,0x12,0x00,0x01,0x00 }}, /* 00 (320x) */
+                {{      0x7E,0x3B,0x9A,0x44,0x12,0x00,0x01,0x00 }}, /* 01 (360x) */
+                {{      0x7E,0x40,0x84,0x49,0x91,0x00,0x01,0x00 }}, /* 02 (400x) */
+                {{      0x7E,0x47,0x93,0x50,0x9E,0x00,0x01,0x00 }}, /* 03 (512x) */
+                {{      0xCE,0x77,0x8A,0x80,0x8E,0x00,0x02,0x00 }}, /* 04 (640x) */
+                {{      0xCE,0x77,0x8A,0x80,0x8E,0x00,0x02,0x00 }}, /* 05 (720x) */
+                {{      0xCE,0x81,0x94,0x8A,0x98,0x00,0x02,0x00 }}, /* 06 (800x) */
+                {{      0xCE,0x8F,0x82,0x98,0x06,0x00,0x07,0x00 }}, /* 07 (1024x) */
+                {{      0xCE,0x9F,0x92,0xA8,0x16,0x00,0x07,0x00 }} /* 08 (1280x) */
+};
+
+XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11400x1050_1_H[]=
+{               /* CR00,CR02,CR03,CR04,CR05,SR0B,SR0C,SR0E */
+                {{      0x47,0x27,0x8B,0x2C,0x1A,0x00,0x05,0x00 }}, /* 00 (320x) */
+                {{      0x47,0x27,0x8B,0x30,0x1E,0x00,0x05,0x00 }}, /* 01 (360x) */
+                {{      0x51,0x31,0x95,0x36,0x04,0x00,0x01,0x00 }}, /* 02 (400x) */
+                {{      0x5F,0x3F,0x83,0x44,0x92,0x00,0x01,0x00 }}, /* 03 (512x) */
+                {{      0x6F,0x4F,0x93,0x54,0x82,0x00,0x05,0x00 }}, /* 04 (640x) */
+                {{      0x6F,0x4F,0x93,0x54,0x82,0x00,0x05,0x00 }}, /* 05 (720x) */
+                {{      0x83,0x63,0x87,0x68,0x16,0x00,0x06,0x00 }}, /* 06 (800x) */
+                {{      0x9F,0x7F,0x83,0x84,0x92,0x00,0x02,0x00 }}, /* 07 (1024x) */
+                {{      0xBF,0x9F,0x83,0xA4,0x12,0x00,0x07,0x00 }}, /* 08 (1280x) */
+                {{      0xCE,0xAE,0x92,0xB3,0x01,0x00,0x03,0x00 }} /* 09 (1400x) */
+};
+
+XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11400x1050_2_H[]=
+{               /* CR00,CR02,CR03,CR04,CR05,SR0B,SR0C,SR0E */
+                {{      0x76,0x3F,0x83,0x45,0x8C,0x00,0x41,0x00 }}, /* 00 (320x) */
+                {{      0x76,0x3F,0x83,0x45,0x8C,0x00,0x41,0x00 }}, /* 01 (360x) */
+                {{      0x76,0x31,0x9A,0x48,0x9F,0x00,0x41,0x00 }}, /* 02 (400x) */
+                {{      0x76,0x3F,0x9A,0x4F,0x96,0x00,0x41,0x00 }}, /* 03 (512x) */
+                {{      0xCE,0x7E,0x82,0x87,0x9E,0x00,0x02,0x00 }}, /* 04 (640x) */
+                {{      0xCE,0x7E,0x82,0x87,0x9E,0x00,0x02,0x00 }}, /* 05 (720x) */
+                {{      0xCE,0x63,0x92,0x96,0x04,0x00,0x07,0x00 }}, /* 06 (800x) */
+                {{      0xCE,0x7F,0x92,0xA4,0x12,0x00,0x07,0x00 }}, /* 07 (1024x) */
+                {{      0xCE,0x9F,0x92,0xB4,0x02,0x00,0x03,0x00 }}, /* 08 (1280x) */
+                {{      0xCE,0xAE,0x92,0xBC,0x0A,0x00,0x03,0x00 }} /* 09 (1400x) */
+};
+
+XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11600x1200_1_H[]=
+/* ;302lv channelA [ycchen] 12/05/02 LCDHT=2048 */
+{   /* ; CR00,CR02,CR03,CR04,CR05,SR0B,SR0C,SR0E */
+                {{      0x5B,0x27,0x9F,0x32,0x0A,0x00,0x01,0x00 }},/* 00 (320x) */
+                {{      0x5B,0x27,0x9F,0x32,0x0A,0x00,0x01,0x00 }},/* 01 (360x) */
+                {{      0x65,0x31,0x89,0x3C,0x94,0x00,0x01,0x00 }},/* 02 (400x) */
+                {{      0x73,0x3F,0x97,0x4A,0x82,0x00,0x05,0x00 }},/* 03 (512x) */
+                {{      0x83,0x4F,0x87,0x51,0x09,0x00,0x06,0x00 }},/* 04 (640x) */
+               {{      0x83,0x4F,0x87,0x51,0x09,0x00,0x06,0x00 }},/* 05 (720x) */
+               {{      0x97,0x63,0x9B,0x65,0x1D,0x00,0x06,0xF0 }},/* 06 (800x) */
+               {{      0xB3,0x7F,0x97,0x81,0x99,0x00,0x02,0x00 }},/* 07 (1024x) */
+               {{      0xD3,0x9F,0x97,0xA1,0x19,0x00,0x07,0x00 }},/* 08 (1280x) */
+               {{      0xE2,0xAE,0x86,0xB9,0x91,0x00,0x03,0x00 }},/* 09 (1400x) */
+               {{      0xFB,0xC7,0x9F,0xC9,0x81,0x00,0x07,0x00 }} /* 0A (1600x) */
+};
+
+XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11024x768_1_V[]=
+{               /* CR06,CR07,CR10,CR11,CR15,CR16,SR0A+CR09(5->7) */
+                {{      0x97,0x1F,0x60,0x87,0x5D,0x83,0x10      }}, /* 00 (x350) */
+                {{      0xB4,0x1F,0x92,0x89,0x8F,0xB5,0x30      }}, /* 01 (x400) */
+                {{      0x04,0x3E,0xE2,0x89,0xDF,0x05,0x00      }}, /* 02 (x480) */
+                {{      0x7C,0xF0,0x5A,0x8F,0x57,0x7D,0xA0      }}, /* 03 (x600) */
+                {{      0x24,0xF5,0x02,0x88,0xFF,0x25,0x90      }} /* 04 (x768) */
+};
+
+XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11024x768_2_V[]=
+{               /* CR06,CR07,CR10,CR11,CR15,CR16,SR0A */
+                {{      0x24,0xBB,0x31,0x87,0x5D,0x25,0x30      }}, /* 00 (x350) */
+                {{      0x24,0xBB,0x4A,0x80,0x8F,0x25,0x30      }}, /* 01 (x400) */
+                {{      0x24,0xBB,0x72,0x88,0xDF,0x25,0x30      }}, /* 02 (x480) */
+                {{      0x24,0xF1,0xAE,0x84,0x57,0x25,0xB0      }}, /* 03 (x600) */
+                {{      0x24,0xF5,0x02,0x88,0xFF,0x25,0x90      }} /* 04 (x768) */
+};
+
+XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11280x1024_1_V[]=
+{               /* CR06,CR07,CR10,CR11,CR15,CR16,SR0A */
+                {{       0x86,0x1F,0x5E,0x82,0x5D,0x87,0x00     }}, /* 00 (x350) */
+                {{       0xB8,0x1F,0x90,0x84,0x8F,0xB9,0x30     }}, /* 01 (x400) */
+                {{       0x08,0x3E,0xE0,0x84,0xDF,0x09,0x00     }}, /* 02 (x480) */
+                {{       0x80,0xF0,0x58,0x8C,0x57,0x81,0xA0     }}, /* 03 (x600) */
+                {{       0x28,0xF5,0x00,0x84,0xFF,0x29,0x90     }}, /* 04 (x768) */
+                {{       0x28,0x5A,0x13,0x87,0xFF,0x29,0xA9     }} /* 05 (x1024) */
+};
+
+XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11280x1024_2_V[]=
+{               /* CR06,CR07,CR10,CR11,CR15,CR16,SR0A */
+                {{      0x28,0xD2,0xAF,0x83,0xAE,0xD8,0xA1      }}, /* 00 (x350) */
+                {{      0x28,0xD2,0xC8,0x8C,0xC7,0xF2,0x81      }}, /* 01 (x400) */
+                {{      0x28,0xD2,0xF0,0x84,0xEF,0x1A,0xB1      }}, /* 02 (x480) */
+                {{      0x28,0xDE,0x2C,0x8F,0x2B,0x56,0x91      }}, /* 03 (x600) */
+                {{      0x28,0xDE,0x80,0x83,0x7F,0xAA,0x91      }}, /* 04 (x768) */
+                {{      0x28,0x5A,0x13,0x87,0xFF,0x29,0xA9      }} /* 05 (x1024) */
+};
+
+XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11400x1050_1_V[]=
+{               /* CR06,CR07,CR10,CR11,CR15,CR16,SR0A */
+                {{      0x6C,0x1F,0x60,0x84,0x5D,0x6D,0x10      }}, /* 00 (x350) */
+                {{      0x9E,0x1F,0x93,0x86,0x8F,0x9F,0x30      }}, /* 01 (x400) */
+                {{      0xEE,0x1F,0xE2,0x86,0xDF,0xEF,0x10      }}, /* 02 (x480) */
+                {{      0x66,0xF0,0x5A,0x8e,0x57,0x67,0xA0      }}, /* 03 (x600) */
+                {{      0x0E,0xF5,0x02,0x86,0xFF,0x0F,0x90      }}, /* 04 (x768) */
+                {{      0x0E,0x5A,0x02,0x86,0xFF,0x0F,0x89      }}, /* 05 (x1024) */
+                {{      0x28,0x10,0x1A,0x80,0x19,0x29,0x0F      }} /* 06 (x1050) */
+};
+
+XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11400x1050_2_V[]=
+{              /* CR06,CR07,CR10,CR11,CR15,CR16,SR0A */
+                {{      0x28,0x92,0xB6,0x83,0xB5,0xCF,0x81      }}, /* 00 (x350) */
+                {{      0x28,0x92,0xD5,0x82,0xD4,0xEE,0x81      }}, /* 01 (x400) */
+                {{      0x28,0x92,0xFD,0x8A,0xFC,0x16,0xB1      }}, /* 02 (x480) */
+                {{      0x28,0xD4,0x39,0x86,0x57,0x29,0x81      }}, /* 03 (x600) */
+                {{      0x28,0xD4,0x8D,0x9A,0xFF,0x29,0xA1      }}, /* 04 (x768) */
+                {{      0x28,0x5A,0x0D,0x9A,0xFF,0x29,0xA9      }}, /* 05 (x1024) */
+                {{      0x28,0x10,0x1A,0x87,0x19,0x29,0x8F      }} /* 06 (x1050) */
+};
+
+XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11600x1200_1_V[]=
+{
+               /* CR06,CR07,CR10,CR11,CR15,CR16,SR0A+CR09(5->7) */
+                {{      0xd4,0x1F,0x81,0x84,0x5D,0xd5,0x10      }}, /* 00 (x350) */
+                {{      0x06,0x3e,0xb3,0x86,0x8F,0x07,0x20      }}, /* 01 (x400) */
+                {{      0x56,0xba,0x03,0x86,0xDF,0x57,0x00      }}, /* 02 (x480) */
+                {{      0xce,0xF0,0x7b,0x8e,0x57,0xcf,0xa0      }}, /* 03 (x600) */
+                {{      0x76,0xF5,0x23,0x86,0xFF,0x77,0x90      }}, /* 04 (x768) */
+                {{      0x76,0x5A,0x23,0x86,0xFF,0x77,0x89      }}, /* 05 (x1024) */
+                {{      0x90,0x10,0x1A,0x8E,0x19,0x91,0x2F      }}, /* 06 (x1050) */
+                {{      0x26,0x11,0xd3,0x86,0xaF,0x27,0x3f      }} /* 07 (x1200) */
+};
+
+XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11024x768_1_Hx75[]=
+{      /* CR00,CR02,CR03,CR04,CR05,SR0B,SR0C,SR0E */
+    {{      0x4B,0x27,0x8F,0x32,0x1B,0x00,0x45,0x00 }},/* ; 00 (320x) */
+    {{      0x4B,0x27,0x8F,0x2B,0x03,0x00,0x44,0x00 }},/* ; 01 (360x) */
+    {{      0x55,0x31,0x99,0x46,0x1D,0x00,0x55,0x00 }},/* ; 02 (400x) */
+    {{      0x63,0x3F,0x87,0x4A,0x93,0x00,0x01,0x00 }},/* ; 03 (512x) */
+    {{      0x6F,0x4F,0x93,0x54,0x80,0x00,0x05,0x00 }},/* ; 04 (640x) */
+    {{      0x6F,0x4F,0x93,0x54,0x80,0x00,0x05,0x00 }},/* ; 05 (720x) */
+    {{      0x83,0x63,0x87,0x68,0x14,0x00,0x26,0x00 }},/* ; 06 (800x) */
+    {{      0x9F,0x7F,0x83,0x85,0x91,0x00,0x02,0x00 }} /* ; 07 (1024x) */
+};
+
+XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11024x768_1_Vx75[]=
+{      /* CR06,CR07,CR10,CR11,CR15,CR16,SR0A+CR09(5->7) */
+    {{      0x97,0x1F,0x60,0x87,0x5D,0x83,0x10      }},/* ; 00 (x350) */
+    {{      0xB4,0x1F,0x92,0x89,0x8F,0xB5,0x30      }},/* ; 01 (x400) */
+    {{      0xFE,0x1F,0xE0,0x84,0xDF,0xFF,0x10      }},/* ; 02 (x480) */
+    {{      0x76,0xF0,0x58,0x8C,0x57,0x77,0xA0      }},/* ; 03 (x600) */
+    {{      0x1E,0xF5,0x00,0x83,0xFF,0x1F,0x90      }} /* ; 04 (x768) */
+};
+
+XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11024x768_2_Hx75[]=
+{       /* CR00,CR02,CR03,CR04,CR05,SR0B,SR0C,SR0E */
+    {{      0x63,0x27,0x87,0x3B,0x8C,0x00,0x01,0x00 }},/* ; 00 (320x) */
+    {{      0x63,0x27,0x87,0x3B,0x8C,0x00,0x01,0x00 }},/* ; 01 (360x) */
+    {{      0x63,0x31,0x87,0x3D,0x8E,0x00,0x01,0x00 }},/* ; 02 (400x) */
+    {{      0x63,0x3F,0x87,0x45,0x96,0x00,0x01,0x00 }},/* ; 03 (512x) */
+    {{      0xA3,0x4F,0x87,0x6E,0x9F,0x00,0x06,0x00 }},/* ; 04 (640x) */
+    {{      0xA3,0x4F,0x87,0x6E,0x9F,0x00,0x06,0x00 }},/* ; 05 (720x) */
+    {{      0xA3,0x63,0x87,0x78,0x89,0x00,0x02,0x00 }},/* ; 06 (800x) */
+    {{      0xA3,0x7F,0x87,0x86,0x97,0x00,0x02,0x00 }} /* ; 07 (1024x) */
+};
+
+XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11024x768_2_Vx75[]=
+{       /* CR06,CR07,CR10,CR11,CR15,CR16,SR0A */
+    {{      0x24,0xBB,0x31,0x87,0x5D,0x25,0x30      }},/* ; 00 (x350) */
+    {{      0x24,0xBB,0x4A,0x80,0x8F,0x25,0x30      }},/* ; 01 (x400) */
+    {{      0x24,0xBB,0x72,0x88,0xDF,0x25,0x30      }},/* ; 02 (x480) */
+    {{      0x24,0xF1,0xAE,0x84,0x57,0x25,0xB0      }},/* ; 03 (x600) */
+    {{      0x24,0xF5,0x02,0x88,0xFF,0x25,0x90      }} /* ; 04 (x768) */
+};
+
+XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11280x1024_1_Hx75[]=
+{      /* CR00,CR02,CR03,CR04,CR05,SR0B,SR0C,SR0E */
+    {{      0x56,0x27,0x9A,0x30,0x1E,0x00,0x05,0x00 }},/* ; 00 (320x) */
+    {{      0x56,0x27,0x9A,0x30,0x1E,0x00,0x05,0x00 }},/* ; 01 (360x) */
+    {{      0x60,0x31,0x84,0x3A,0x88,0x00,0x01,0x00 }},/* ; 02 (400x) */
+    {{      0x6E,0x3F,0x92,0x48,0x96,0x00,0x01,0x00 }},/* ; 03 (512x) */
+    {{      0x7E,0x4F,0x82,0x54,0x06,0x00,0x06,0x00 }},/* ; 04 (640x) */
+    {{      0x7E,0x4F,0x82,0x54,0x06,0x00,0x06,0x00 }},/* ; 05 (720x) */
+    {{      0x92,0x63,0x96,0x68,0x1A,0x00,0x06,0x00 }},/* ; 06 (800x) */
+    {{      0xAE,0x7F,0x92,0x84,0x96,0x00,0x02,0x00 }},/* ; 07 (1024x) */
+    {{      0xCE,0x9F,0x92,0xA5,0x17,0x00,0x07,0x00 }} /* ; 08 (1280x) */
+};
+
+XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11280x1024_1_Vx75[]=
+{      /* CR06,CR07,CR10,CR11,CR15,CR16,SR0A */
+    {{      0x86,0xD1,0xBC,0x80,0xBB,0xE5,0x00      }},/* ; 00 (x350) */
+    {{      0xB8,0x1F,0x90,0x84,0x8F,0xB9,0x30      }},/* ; 01 (x400) */
+    {{      0x08,0x3E,0xE0,0x84,0xDF,0x09,0x00      }},/* ; 02 (x480) */
+    {{      0x80,0xF0,0x58,0x8C,0x57,0x81,0xA0      }},/* ; 03 (x600) */
+    {{      0x28,0xF5,0x00,0x84,0xFF,0x29,0x90      }},/* ; 04 (x768) */
+    {{      0x28,0x5A,0x13,0x87,0xFF,0x29,0xA9      }} /* ; 05 (x1024) */
+};
+
+XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11280x1024_2_Hx75[]=
+{
+       /* CR00,CR02,CR03,CR04,CR05,SR0B,SR0C,SR0E */
+    {{      0x7E,0x3B,0x9A,0x44,0x12,0x00,0x01,0x00 }},/* ; 00 (320x) */
+    {{      0x7E,0x3B,0x9A,0x44,0x12,0x00,0x01,0x00 }},/* ; 01 (360x) */
+    {{      0x7E,0x40,0x84,0x49,0x91,0x00,0x01,0x00 }},/* ; 02 (400x) */
+    {{      0x7E,0x47,0x93,0x50,0x9E,0x00,0x01,0x00 }},/* ; 03 (512x) */
+    {{      0xCE,0x77,0x8A,0x80,0x8E,0x00,0x02,0x00 }},/* ; 04 (640x) */
+    {{      0xCE,0x77,0x8A,0x80,0x8E,0x00,0x02,0x00 }},/* ; 05 (720x) */
+    {{      0xCE,0x81,0x94,0x8A,0x98,0x00,0x02,0x00 }},/* ; 06 (800x) */
+    {{      0xCE,0x8F,0x82,0x98,0x06,0x00,0x07,0x00 }},/* ; 07 (1024x) */
+    {{      0xCE,0x9F,0x92,0xA8,0x16,0x00,0x07,0x00 }} /* ; 08 (1280x) */
+};
+
+XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11280x1024_2_Vx75[]=
+{
+        /* CR06,CR07,CR10,CR11,CR15,CR16,SR0A */
+     {{     0x28,0xD2,0xAF,0x83,0xAE,0xD8,0xA1     }},/* ; 00 (x350) */
+     {{     0x28,0xD2,0xC8,0x8C,0xC7,0xF2,0x81     }},/* ; 01 (x400) */
+     {{     0x28,0xD2,0xF0,0x84,0xEF,0x1A,0xB1     }},/* ; 02 (x480) */
+     {{     0x28,0xDE,0x2C,0x8F,0x2B,0x56,0x91     }},/* ; 03 (x600) */
+     {{     0x28,0xDE,0x80,0x83,0x7F,0xAA,0x91     }},/* ; 04 (x768) */
+     {{     0x28,0x5A,0x13,0x87,0xFF,0x29,0xA9     }} /* ; 05 (x1024) */
+};
+
+XGI_LVDSCRT1DataStruct  XGI_CHTVCRT1UNTSC[]=
+{
+ {{0x64,0x4f,0x88,0x56,0x9f,0x56,0x3e,
+    0xe8,0x84,0x8f,0x57,0x20,0x00,0x01,0x00 }},
+ {{0x64,0x4f,0x88,0x56,0x9f,0x56,0x3e,
+    0xd0,0x82,0x5d,0x57,0x00,0x00,0x01,0x00 }},
+ {{0x64,0x4f,0x88,0x56,0x9f,0x56,0x3e,
+    0xe8,0x84,0x8f,0x57,0x20,0x00,0x01,0x00 }},
+ {{0x64,0x4f,0x88,0x56,0x9f,0x56,0x3e,
+    0xd0,0x82,0x5d,0x57,0x00,0x00,0x01,0x00 }},
+ {{0x5d,0x4f,0x81,0x53,0x9c,0x56,0xba,
+    0x18,0x84,0xdf,0x57,0x00,0x00,0x01,0x00 }},
+ {{0x80,0x63,0x84,0x6c,0x17,0xec,0xf0,
+   0x90,0x8c,0x57,0xed,0x20,0x00,0x06,0x01 }}
+};
+
+XGI_LVDSCRT1DataStruct  XGI_CHTVCRT1ONTSC[]=
+{
+ {{0x64,0x4f,0x88,0x5a,0x9f,0x0b,0x3e,
+    0xc0,0x84,0x8f,0x0c,0x20,0x00,0x01,0x00 }},
+ {{0x64,0x4f,0x88,0x5a,0x9f,0x0b,0x3e,
+    0xb0,0x8d,0x5d,0x0c,0x00,0x00,0x01,0x00 }},
+ {{0x64,0x4f,0x88,0x5a,0x9f,0x0b,0x3e,
+    0xc0,0x84,0x8f,0x0c,0x20,0x00,0x01,0x00 }},
+ {{0x64,0x4f,0x88,0x5a,0x9f,0x0b,0x3e,
+    0xb0,0x8d,0x5d,0x0c,0x00,0x00,0x01,0x00 }},
+ {{0x5d,0x4f,0x81,0x56,0x9c,0x0b,0x3e,
+    0xe8,0x84,0xdf,0x0c,0x00,0x00,0x01,0x00 }},
+ {{0x7d,0x63,0x81,0x6a,0x16,0xba,0xf0,
+   0x7f,0x86,0x57,0xbb,0x00,0x00,0x06,0x01 }}
+};
+
+XGI_LVDSCRT1DataStruct  XGI_CHTVCRT1UPAL[]=
+{
+ {{0x79,0x4f,0x9d,0x5a,0x90,0x6f,0x3e,
+    0xf8,0x83,0x8f,0x70,0x20,0x00,0x05,0x00 }},
+ {{0x79,0x4f,0x9d,0x5a,0x90,0x6f,0x3e,
+    0xde,0x81,0x5d,0x70,0x00,0x00,0x05,0x00 }},
+ {{0x79,0x4f,0x9d,0x5a,0x90,0x6f,0x3e,
+    0xf8,0x83,0x8f,0x70,0x20,0x00,0x05,0x00 }},
+ {{0x79,0x4f,0x9d,0x5a,0x90,0x6f,0x3e,
+    0xde,0x81,0x5d,0x70,0x00,0x00,0x05,0x00 }},
+ {{0x64,0x4f,0x88,0x55,0x80,0xec,0xba,
+    0x50,0x84,0xdf,0xed,0x00,0x00,0x05,0x00 }},
+ {{0x70,0x63,0x94,0x68,0x8d,0x42,0xf1,
+   0xc8,0x8c,0x57,0xe9,0x20,0x00,0x05,0x01 }}
+};
+
+XGI_LVDSCRT1DataStruct  XGI_CHTVCRT1OPAL[]=
+{
+ {{0x79,0x4f,0x9d,0x5a,0x90,0x6f,0x3e,
+    0xf0,0x83,0x8f,0x70,0x20,0x00,0x05,0x00 }},
+ {{0x79,0x4f,0x9d,0x5a,0x90,0x6f,0x3e,
+    0xde,0x81,0x5d,0x70,0x00,0x00,0x05,0x00 }},
+ {{0x79,0x4f,0x9d,0x5a,0x90,0x6f,0x3e,
+    0xf0,0x83,0x8f,0x70,0x20,0x00,0x05,0x00 }},
+ {{0x79,0x4f,0x9d,0x5a,0x90,0x6f,0x3e,
+    0xde,0x81,0x5d,0x70,0x00,0x00,0x05,0x00 }},
+ {{0x64,0x4f,0x88,0x55,0x80,0x6f,0xba,
+    0x20,0x83,0xdf,0x70,0x00,0x00,0x05,0x00 }},
+ {{0x73,0x63,0x97,0x69,0x8e,0xec,0xf0,
+   0x90,0x8c,0x57,0xed,0x20,0x00,0x05,0x01 }}
+};
+
+/*add for new UNIVGABIOS*/
+XGI330_LCDDataTablStruct XGI_LCDDataTable[]=
+{
+  {Panel1024x768,0x0019,0x0001,0},  /* XGI_ExtLCD1024x768Data */
+  {Panel1024x768,0x0019,0x0000,1},  /* XGI_StLCD1024x768Data */
+  {Panel1024x768,0x0018,0x0010,2},  /* XGI_CetLCD1024x768Data */
+  {Panel1280x1024,0x0019,0x0001,3},  /* XGI_ExtLCD1280x1024Data */
+  {Panel1280x1024,0x0019,0x0000,4},  /* XGI_StLCD1280x1024Data */
+  {Panel1280x1024,0x0018,0x0010,5},  /* XGI_CetLCD1280x1024Data */
+  {Panel1400x1050,0x0019,0x0001,6},  /* XGI_ExtLCD1400x1050Data */
+  {Panel1400x1050,0x0019,0x0000,7},  /* XGI_StLCD1400x1050Data */
+  {Panel1400x1050,0x0018,0x0010,8},  /* XGI_CetLCD1400x1050Data */
+  {Panel1600x1200,0x0019,0x0001,9},   /* XGI_ExtLCD1600x1200Data */
+  {Panel1600x1200,0x0019,0x0000,10},  /* XGI_StLCD1600x1200Data */
+  {PanelRef60Hz,0x0008,0x0008,11},     /* XGI_NoScalingData */
+  {Panel1024x768x75,0x0019,0x0001,12},         /* XGI_ExtLCD1024x768x75Data */
+  {Panel1024x768x75,0x0019,0x0000,13},         /* XGI_StLCD1024x768x75Data */
+  {Panel1024x768x75,0x0018,0x0010,14},         /* XGI_CetLCD1024x768x75Data */
+  {Panel1280x1024x75,0x0019,0x0001,15}, /* XGI_ExtLCD1280x1024x75Data */
+  {Panel1280x1024x75,0x0019,0x0000,16}, /* XGI_StLCD1280x1024x75Data */
+  {Panel1280x1024x75,0x0018,0x0010,17}, /* XGI_CetLCD1280x1024x75Data */
+  {PanelRef75Hz,0x0008,0x0008,18},     /* XGI_NoScalingDatax75 */
+  {0xFF,0x0000,0x0000,0}               /* End of table */
+};
+
+XGI330_LCDDataTablStruct XGI_LCDDesDataTable[]=
+{
+  {Panel1024x768,0x0019,0x0001,0}, /* XGI_ExtLCDDes1024x768Data */
+  {Panel1024x768,0x0019,0x0000,1}, /* XGI_StLCDDes1024x768Data */
+  {Panel1024x768,0x0018,0x0010,2}, /* XGI_CetLCDDes1024x768Data */
+  {Panel1280x1024,0x0019,0x0001,3}, /* XGI_ExtLCDDes1280x1024Data */
+  {Panel1280x1024,0x0019,0x0000,4}, /* XGI_StLCDDes1280x1024Data */
+  {Panel1280x1024,0x0018,0x0010,5}, /* XGI_CetLCDDes1280x1024Data */
+  {Panel1400x1050,0x0019,0x0001,6}, /* XGI_ExtLCDDes1400x1050Data */
+  {Panel1400x1050,0x0019,0x0000,7}, /* XGI_StLCDDes1400x1050Data */
+  {Panel1400x1050,0x0418,0x0010,8}, /* XGI_CetLCDDes1400x1050Data */
+  {Panel1400x1050,0x0418,0x0410,9}, /* XGI_CetLCDDes1400x1050Data2 */
+  {Panel1600x1200,0x0019,0x0001,10}, /* XGI_ExtLCDDes1600x1200Data */
+  {Panel1600x1200,0x0019,0x0000,11}, /* XGI_StLCDDes1600x1200Data */
+  {PanelRef60Hz,0x0008,0x0008,12},     /* XGI_NoScalingDesData */
+  {Panel1024x768x75,0x0019,0x0001,13},         /* XGI_ExtLCDDes1024x768x75Data */
+  {Panel1024x768x75,0x0019,0x0000,14}, /* XGI_StLCDDes1024x768x75Data */
+  {Panel1024x768x75,0x0018,0x0010,15},  /* XGI_CetLCDDes1024x768x75Data */
+  {Panel1280x1024x75,0x0019,0x0001,16},        /* XGI_ExtLCDDes1280x1024x75Data */
+  {Panel1280x1024x75,0x0019,0x0000,17}, /* XGI_StLCDDes1280x1024x75Data */
+  {Panel1280x1024x75,0x0018,0x0010,18},        /* XGI_CetLCDDes1280x1024x75Data */
+  {PanelRef75Hz,0x0008,0x0008,19},     /* XGI_NoScalingDesDatax75 */
+  {0xFF,0x0000,0x0000,0}
+};
+
+XGI330_LCDDataTablStruct XGI_EPLLCDCRT1Ptr_H[]=
+{
+  {Panel1024x768,0x0018,0x0000,0}, /* XGI_LVDSCRT11024x768_1_H */
+  {Panel1024x768,0x0018,0x0010,1}, /* XGI_LVDSCRT11024x768_2_H */
+  {Panel1280x1024,0x0018,0x0000,2}, /* XGI_LVDSCRT11280x1024_1_H */
+  {Panel1280x1024,0x0018,0x0010,3}, /* XGI_LVDSCRT11280x1024_2_H */
+  {Panel1400x1050,0x0018,0x0000,4}, /* XGI_LVDSCRT11400x1050_1_H */
+  {Panel1400x1050,0x0018,0x0010,5}, /* XGI_LVDSCRT11400x1050_2_H */
+  {Panel1600x1200,0x0018,0x0000,6},  /* XGI_LVDSCRT11600x1200_1_H */
+  {Panel1024x768x75,0x0018,0x0000,7},  /* XGI_LVDSCRT11024x768_1_Hx75 */
+  {Panel1024x768x75,0x0018,0x0010,8},  /* XGI_LVDSCRT11024x768_2_Hx75 */
+  {Panel1280x1024x75,0x0018,0x0000,9}, /* XGI_LVDSCRT11280x1024_1_Hx75 */
+  {Panel1280x1024x75,0x0018,0x0010,10},        /* XGI_LVDSCRT11280x1024_2_Hx75 */
+  {0xFF,0x0000,0x0000,0}
+};
+
+XGI330_LCDDataTablStruct XGI_EPLLCDCRT1Ptr_V[]=
+{
+  {Panel1024x768,0x0018,0x0000,0}, /* XGI_LVDSCRT11024x768_1_V */
+  {Panel1024x768,0x0018,0x0010,1}, /* XGI_LVDSCRT11024x768_2_V */
+  {Panel1280x1024,0x0018,0x0000,2}, /* XGI_LVDSCRT11280x1024_1_V */
+  {Panel1280x1024,0x0018,0x0010,3}, /* XGI_LVDSCRT11280x1024_2_V */
+  {Panel1400x1050,0x0018,0x0000,4}, /* XGI_LVDSCRT11400x1050_1_V */
+  {Panel1400x1050,0x0018,0x0010,5}, /* XGI_LVDSCRT11400x1050_2_V */
+  {Panel1600x1200,0x0018,0x0000,6}, /* XGI_LVDSCRT11600x1200_1_V */
+  {Panel1024x768x75,0x0018,0x0000,7},  /* XGI_LVDSCRT11024x768_1_Vx75 */
+  {Panel1024x768x75,0x0018,0x0010,8},  /* XGI_LVDSCRT11024x768_2_Vx75 */
+  {Panel1280x1024x75,0x0018,0x0000,9}, /* XGI_LVDSCRT11280x1024_1_Vx75 */
+  {Panel1280x1024x75,0x0018,0x0010,10},        /* XGI_LVDSCRT11280x1024_2_Vx75 */
+  {0xFF,0x0000,0x0000,0}
+};
+
+XGI330_LCDDataTablStruct XGI_EPLLCDDataPtr[]=
+{
+  {Panel1024x768,0x0018,0x0000,0}, /* XGI_LVDS1024x768Data_1 */
+  {Panel1024x768,0x0018,0x0010,1}, /* XGI_LVDS1024x768Data_2 */
+  {Panel1280x1024,0x0018,0x0000,2}, /* XGI_LVDS1280x1024Data_1 */
+  {Panel1280x1024,0x0018,0x0010,3}, /* XGI_LVDS1280x1024Data_2 */
+  {Panel1400x1050,0x0018,0x0000,4}, /* XGI_LVDS1400x1050Data_1 */
+  {Panel1400x1050,0x0018,0x0010,5}, /* XGI_LVDS1400x1050Data_2 */
+  {Panel1600x1200,0x0018,0x0000,6}, /* XGI_LVDS1600x1200Data_1 */
+  {PanelRef60Hz,0x0008,0x0008,7}, /* XGI_LVDSNoScalingData */
+  {Panel1024x768x75,0x0018,0x0000,8},  /* XGI_LVDS1024x768Data_1x75 */
+  {Panel1024x768x75,0x0018,0x0010,9},  /* XGI_LVDS1024x768Data_2x75 */
+  {Panel1280x1024x75,0x0018,0x0000,10},        /* XGI_LVDS1280x1024Data_1x75 */
+  {Panel1280x1024x75,0x0018,0x0010,11}, /* XGI_LVDS1280x1024Data_2x75 */
+  {PanelRef75Hz,0x0008,0x0008,12},     /* XGI_LVDSNoScalingDatax75 */
+  {0xFF,0x0000,0x0000,0}
+};
+
+XGI330_LCDDataTablStruct XGI_EPLLCDDesDataPtr[]=
+{
+  {Panel1024x768,0x0018,0x0000,0}, /* XGI_LVDS1024x768Des_1 */
+  {Panel1024x768,0x0618,0x0410,1}, /* XGI_LVDS1024x768Des_3 */
+  {Panel1024x768,0x0018,0x0010,2}, /* XGI_LVDS1024x768Des_2 */
+  {Panel1280x1024,0x0018,0x0000,3}, /* XGI_LVDS1280x1024Des_1 */
+  {Panel1280x1024,0x0018,0x0010,4}, /* XGI_LVDS1280x1024Des_2 */
+  {Panel1400x1050,0x0018,0x0000,5}, /* XGI_LVDS1400x1050Des_1 */
+  {Panel1400x1050,0x0018,0x0010,6}, /* XGI_LVDS1400x1050Des_2 */
+  {Panel1600x1200,0x0018,0x0000,7}, /* XGI_LVDS1600x1200Des_1 */
+  {PanelRef60Hz,0x0008,0x0008,8},      /* XGI_LVDSNoScalingDesData */
+  {Panel1024x768x75,0x0018,0x0000,9},  /* XGI_LVDS1024x768Des_1x75 */
+  {Panel1024x768x75,0x0618,0x0410,10}, /* XGI_LVDS1024x768Des_3x75 */
+  {Panel1024x768x75,0x0018,0x0010,11}, /* XGI_LVDS1024x768Des_2x75 */
+  {Panel1280x1024x75,0x0018,0x0000,12},        /* XGI_LVDS1280x1024Des_1x75 */
+  {Panel1280x1024x75,0x0018,0x0010,13},        /* XGI_LVDS1280x1024Des_2x75 */
+  {PanelRef75Hz,0x0008,0x0008,14},     /* XGI_LVDSNoScalingDesDatax75 */
+  {0xFF,0x0000,0x0000,0}
+};
+
+XGI330_LCDDataTablStruct XGI_EPLCHLCDRegPtr[]=
+{
+  {Panel1024x768,0x0000,0x0000,0}, /* XGI_CH7017LV1024x768 */
+  {Panel1400x1050,0x0000,0x0000,1}, /* XGI_CH7017LV1400x1050 */
+  {0xFF,0x0000,0x0000,0}
+};
+
+XGI330_TVDataTablStruct XGI_TVDataTable[]=
+{
+ {0x09E1,0x0001,0},    /* XGI_ExtPALData */
+ {0x09E1,0x0000,1},    /* XGI_ExtNTSCData */
+ {0x09E1,0x0801,2},    /* XGI_StPALData */
+ {0x09E1,0x0800,3},    /* XGI_StNTSCData */
+ {0x49E0,0x0100,4},    /* XGI_ExtHiTVData */
+ {0x49E0,0x4100,5},    /* XGI_St2HiTVData */
+ {0x49E0,0x4900,13},   /* XGI_St1HiTVData */
+ {0x09E0,0x0020,6},    /* XGI_ExtYPbPr525iData */
+ {0x09E0,0x0040,7},    /* XGI_ExtYPbPr525pData */
+ {0x09E0,0x0080,8},    /* XGI_ExtYPbPr750pData */
+ {0x09E0,0x0820,9},    /* XGI_StYPbPr525iData */
+ {0x09E0,0x0840,10},   /* XGI_StYPbPr525pData */
+ {0x09E0,0x0880,11},   /* XGI_StYPbPr750pData */
+ {0xffff,0x0000,12}    /* END */
+};
+
+USHORT TVLenList[]=
+{
+   LVDSCRT1Len_H,
+   LVDSCRT1Len_V,
+   LVDSDataLen,
+   0,
+   TVDataLen,
+   0,
+   0,
+   CHTVRegLen
+} ;
+
+/* Chrontel 7017 TV CRT1 Timing List */
+XGI330_TVDataTablStruct XGI_EPLCHTVCRT1Ptr[]=
+{
+  {0x0011,0x0000,0}, /* XGI_CHTVCRT1UNTSC */
+  {0x0011,0x0010,1}, /* XGI_CHTVCRT1ONTSC */
+  {0x0011,0x0001,2}, /* XGI_CHTVCRT1UPAL */
+  {0x0011,0x0011,3}, /* XGI_CHTVCRT1OPAL */
+  {0xFFFF,0x0000,4}
+};
+
+/* ;;Chrontel 7017 TV Timing List */
+XGI330_TVDataTablStruct XGI_EPLCHTVDataPtr[]=
+{
+  {0x0011,0x0000,0}, /* XGI_CHTVUNTSCData */
+  {0x0011,0x0010,1}, /* XGI_CHTVONTSCData */
+  {0x0011,0x0001,2}, /* XGI_CHTVUPALData */
+  {0x0011,0x0011,3}, /* XGI_CHTVOPALData */
+  {0xFFFF,0x0000,4}
+};
+
+/* ;;Chrontel 7017 TV Reg. List */
+XGI330_TVDataTablStruct XGI_EPLCHTVRegPtr[]=
+{
+  {0x0011,0x0000,0}, /* XGI_CHTVRegUNTSC */
+  {0x0011,0x0010,1}, /* XGI_CHTVRegONTSC */
+  {0x0011,0x0001,2}, /* XGI_CHTVRegUPAL */
+  {0x0011,0x0011,3}, /* XGI_CHTVRegOPAL */
+  {0xFFFF,0x0000,4}
+};
+
+USHORT LCDLenList[]=
+{
+   LVDSCRT1Len_H,
+   LVDSCRT1Len_V,
+   LVDSDataLen,
+   LCDDesDataLen,
+   LCDDataLen,
+   LCDDesDataLen,
+   0,
+   LCDDesDataLen,
+   LCDDesDataLen,
+   0
+} ;
+
+XGI330_LCDCapStruct  XGI660_LCDDLCapList[]=  /* 660, Dual link */
+{
+/* LCDCap1024x768 */
+               {Panel1024x768, DefaultLCDCap, 0, 0x014, 0x88, 0x06, VCLK65,
+                0x6C, 0xC3, 0x35, 0x62, 0x02, 0x14, 0x0A, 0x02, 0x00,
+                0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x28, 0x10},
+/* LCDCap1280x1024 */
+                {Panel1280x1024, LCDDualLink+DefaultLCDCap, StLCDBToA, 0x053, 0x70, 0x03, VCLK108_2,
+                0x70, 0x44, 0xF8, 0x2F, 0x02, 0x14, 0x0A, 0x02, 0x00,
+                0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x30, 0x10},
+/* LCDCap1400x1050 */
+                {Panel1400x1050, LCDDualLink+DefaultLCDCap, StLCDBToA, 0x053, 0x70, 0x03, VCLK108_2,
+                0x70, 0x44, 0xF8, 0x2F, 0x02, 0x14, 0x0A, 0x02, 0x00,
+                0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x30, 0x10},
+/* LCDCap1600x1200 */
+                {Panel1600x1200, LCDDualLink+DefaultLCDCap, LCDToFull, 0x053, 0xC0, 0x03, VCLK162,
+                0x43, 0x22, 0x70, 0x24, 0x02, 0x14, 0x0A, 0x02, 0x00,
+                0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x30, 0x10},
+/* LCDCap1024x768x75 */
+               {Panel1024x768x75, DefaultLCDCap, 0, 0x014, 0x60, 0, VCLK78_75,
+                0x2B, 0x61, 0x2B, 0x61, 0x02, 0x14, 0x0A, 0x02, 0x00,
+                0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x28, 0x10},
+/* LCDCap1280x1024x75 */
+                {Panel1280x1024x75, LCDDualLink+DefaultLCDCap, StLCDBToA, 0x053, 0x90, 0x03, VCLK135_5,
+                0x54, 0x42, 0x4A, 0x61, 0x02, 0x14, 0x0A, 0x02, 0x00,
+                0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x30, 0x10},
+/* LCDCapDefault */
+                {0xFF, DefaultLCDCap, 0, 0x053, 0x88, 0x06, VCLK65,
+               0x6C, 0xC3, 0x35, 0x62, 0x02, 0x14, 0x0A, 0x02, 0x00,
+               0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x28, 0x10}
+};
+
+XGI330_LCDCapStruct  XGI_LCDDLCapList[]=  /* Dual link only */
+{
+/* LCDCap1024x768 */
+               {Panel1024x768, DefaultLCDCap, 0, 0x012, 0x88, 0x06, VCLK65,
+               0x6C, 0xC3, 0x35, 0x62, 0x02, 0x14, 0x0A, 0x02, 0x00,
+               0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x28, 0x10},
+/* LCDCap1280x1024 */
+               {Panel1280x1024, LCDDualLink+DefaultLCDCap, StLCDBToA, 0x012, 0x70, 0x03, VCLK108_2,
+               0x70, 0x44, 0xF8, 0x2F, 0x02, 0x14, 0x0A, 0x02, 0x00,
+               0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x30, 0x10},
+/* LCDCap1400x1050 */
+               {Panel1400x1050, LCDDualLink+DefaultLCDCap, StLCDBToA, 0x012, 0x70, 0x03, VCLK108_2,
+                0x70, 0x44, 0xF8, 0x2F, 0x02, 0x14, 0x0A, 0x02, 0x00,
+                0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x30, 0x10},
+/* LCDCap1600x1200 */
+               {Panel1600x1200, LCDDualLink+DefaultLCDCap, LCDToFull, 0x012, 0xC0, 0x03, VCLK162,
+                0x43, 0x22, 0x70, 0x24, 0x02, 0x14, 0x0A, 0x02, 0x00,
+                0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x30, 0x10},
+/* LCDCap1024x768x75 */
+               {Panel1024x768x75, DefaultLCDCap, 0, 0x012, 0x60, 0, VCLK78_75,
+                0x2B, 0x61, 0x2B, 0x61, 0x02, 0x14, 0x0A, 0x02, 0x00,
+                0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x28, 0x10},
+/* LCDCap1280x1024x75 */
+               {Panel1280x1024x75, LCDDualLink+DefaultLCDCap, StLCDBToA, 0x012, 0x90, 0x03, VCLK135_5,
+                0x54, 0x42, 0x4A, 0x61, 0x02, 0x14, 0x0A, 0x02, 0x00,
+                0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x30, 0x10},
+/* LCDCapDefault */
+               {0xFF, DefaultLCDCap, 0, 0x012, 0x88, 0x06, VCLK65,
+               0x6C, 0xC3, 0x35, 0x62, 0x02, 0x14, 0x0A, 0x02, 0x00,
+               0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x28, 0x10}
+};
+
+XGI330_LCDCapStruct  XGI660_LCDCapList[]=
+{
+/* LCDCap1024x768 */
+                {Panel1024x768, DefaultLCDCap, 0, 0x014, 0x88, 0x06, VCLK65,
+               0x6C, 0xC3, 0x35, 0x62, 0x02, 0x14, 0x0A, 0x02, 0x00,
+               0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x28, 0x10},
+/* LCDCap1280x1024 */
+                {Panel1280x1024, DefaultLCDCap, StLCDBToA, 0x053, 0x70, 0x03, VCLK108_2,
+               0x70, 0x44, 0xF8, 0x2F, 0x02, 0x14, 0x0A, 0x02, 0x00,
+               0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x30, 0x10},
+/* LCDCap1400x1050 */
+                {Panel1400x1050, DefaultLCDCap, StLCDBToA, 0x053, 0x70, 0x03, VCLK108_2,
+                0x70, 0x44, 0xF8, 0x2F, 0x02, 0x14, 0x0A, 0x02, 0x00,
+                0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x30, 0x10},
+/* LCDCap1600x1200 */
+                {Panel1600x1200, DefaultLCDCap, LCDToFull, 0x053, 0xC0, 0x03, VCLK162,
+                0x5A, 0x23, 0x5A, 0x23, 0x02, 0x14, 0x0A, 0x02, 0x00,
+                0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x30, 0x10},
+/* LCDCap1024x768x75 */
+               {Panel1024x768x75, DefaultLCDCap, 0, 0x014, 0x60, 0, VCLK78_75,
+                0x2B, 0x61, 0x2B, 0x61, 0x02, 0x14, 0x0A, 0x02, 0x00,
+                0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x28, 0x10},
+/* LCDCap1280x1024x75 */
+                {Panel1280x1024x75,+DefaultLCDCap, StLCDBToA, 0x053, 0x90, 0x03, VCLK135_5,
+                0x54, 0x42, 0x4A, 0x61, 0x02, 0x14, 0x0A, 0x02, 0x00,
+                0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x30, 0x10},
+/* LCDCapDefault */
+                {0xFF, DefaultLCDCap, 0, 0x053, 0x88, 0x06, VCLK65,
+               0x6C, 0xC3, 0x35, 0x62, 0x02, 0x14, 0x0A, 0x02, 0x00,
+               0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x28, 0x10}
+};
+
+XGI330_LCDCapStruct  XGI_LCDCapList[]=
+{
+/* LCDCap1024x768 */
+               {Panel1024x768, DefaultLCDCap, 0, 0x012, 0x88, 0x06, VCLK65,
+               0x6C, 0xC3, 0x35, 0x62, 0x02, 0x14, 0x0A, 0x02, 0x00,
+               0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x28, 0x10},
+/* LCDCap1280x1024 */
+               {Panel1280x1024, DefaultLCDCap, StLCDBToA, 0x012, 0x70, 0x03, VCLK108_2,
+               0x70, 0x44, 0xF8, 0x2F, 0x02, 0x14, 0x0A, 0x02, 0x00,
+               0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x30, 0x10},
+/* LCDCap1400x1050 */
+               {Panel1400x1050, DefaultLCDCap, StLCDBToA, 0x012, 0x70, 0x03, VCLK108_2,
+                0x70, 0x44, 0xF8, 0x2F, 0x02, 0x14, 0x0A, 0x02, 0x00,
+                0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x30, 0x10},
+/* LCDCap1600x1200 */
+               {Panel1600x1200, DefaultLCDCap, LCDToFull, 0x012, 0xC0, 0x03, VCLK162,
+                0x5A, 0x23, 0x5A, 0x23, 0x02, 0x14, 0x0A, 0x02, 0x00,
+                0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x30, 0x10},
+/* LCDCap1024x768x75 */
+               {Panel1024x768x75, DefaultLCDCap, 0, 0x012, 0x60, 0, VCLK78_75,
+                0x2B, 0x61, 0x2B, 0x61, 0x02, 0x14, 0x0A, 0x02, 0x00,
+                0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x28, 0x10},
+/* LCDCap1280x1024x75 */
+               {Panel1280x1024x75, DefaultLCDCap, StLCDBToA, 0x012, 0x90, 0x03, VCLK135_5,
+                0x54, 0x42, 0x4A, 0x61, 0x02, 0x14, 0x0A, 0x02, 0x00,
+                0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x30, 0x10},
+/* LCDCapDefault */
+               {0xFF, DefaultLCDCap, 0, 0x012, 0x88, 0x06, VCLK65,
+               0x6C, 0xC3, 0x35, 0x62, 0x02, 0x14, 0x0A, 0x02, 0x00,
+               0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x28, 0x10}
+};
+
+XGI21_LVDSCapStruct XGI21_LCDCapList[]=
+{
+    {DisableLCD24bpp + LCDPolarity,
+     2160,1250,1600,1200,  64,  1,  192,   3,
+     0x70,0x24,0x20,0x04,0x0A,0x02,0xC8
+    },
+    {DisableLCD24bpp + LCDPolarity,
+     1688,1066,1280,1024,  48,  1,  112,   3,
+     0x70,0x44,0x20,0x04,0x0A,0x02,0xC8
+    },
+    {DisableLCD24bpp + LCDPolarity + (LCDPolarity << 8),
+     1344, 806,1024, 768,  24,  3,  136,   6,
+     0x6C,0x65,0x20,0x04,0x0A,0x02,0xC8
+    },
+    {DisableLCD24bpp + LCDPolarity,
+     1056, 628, 800, 600,  40,   1, 128,   4,
+     0x42,0xE2,0x20,0x14,0x0A,0x02,0x00
+    },
+    {DisableLCD24bpp + LCDPolarity,
+      928, 525, 800, 480,  40,  13,  48,   3,
+     0x52,0xC5,0x20,0x14,0x0A,0x02,0x00
+    },
+    {DisableLCD24bpp + LCDPolarity + (LCDPolarity << 8),
+      800, 525, 640, 480,  16,  10,  96,   2,
+     0x1B,0xE1,0x20,0x04,0x0A,0x02,0xC8
+    }
+
+};
+
+XGI_Ext2Struct XGI330_RefIndex[]=
+{
+{Support32Bpp + SupportAllCRT2 + SyncPN,                       RES320x200,      VCLK25_175, 0x00,0x10,0x59, 320, 200},/* 00 */
+{Support32Bpp + SupportAllCRT2 + SyncPN,                       RES320x200,      VCLK25_175, 0x00,0x10,0x00, 320, 400},/* 01 */
+{Support32Bpp + SupportAllCRT2 + SyncNN,                       RES320x240,      VCLK25_175, 0x04,0x20,0x50, 320, 240},/* 02 */
+{Support32Bpp + SupportAllCRT2 + SyncPP,                       RES400x300,      VCLK40,     0x05,0x32,0x51, 400, 300},/* 03 */
+{Support32Bpp + NoSupportTV + SyncNN + SupportTV1024,          RES512x384,      VCLK65,     0x06,0x43,0x52, 512, 384},/* 04 */
+{Support32Bpp + SupportAllCRT2 + SyncPN,                       RES640x400,      VCLK25_175, 0x00,0x14,0x2f, 640, 400},/* 05 */
+{Support32Bpp + SupportAllCRT2 + SyncNN,                       RES640x480x60,   VCLK25_175, 0x04,0x24,0x2e, 640, 480},/* 06 640x480x60Hz (LCD 640x480x60z) */
+{Support32Bpp + NoSupportHiVisionTV + SyncNN,                  RES640x480x72,   VCLK31_5,   0x04,0x24,0x2e, 640, 480},/* 07 640x480x72Hz (LCD 640x480x70Hz) */
+{Support32Bpp + NoSupportHiVisionTV + SyncNN,                  RES640x480x75,   VCLK31_5,   0x47,0x24,0x2e, 640, 480},/* 08 640x480x75Hz (LCD 640x480x75Hz) */
+{Support32Bpp + SupportRAMDAC2 + SyncNN,                       RES640x480x85,   VCLK36,     0x8A,0x24,0x2e, 640, 480},/* 09 640x480x85Hz */
+{Support32Bpp + SupportRAMDAC2 + SyncPN,                       RES640x480x100,  VCLK43_163, 0x00,0x24,0x2e, 640, 480},/* 0a 640x480x100Hz */
+{Support32Bpp + SupportRAMDAC2 + SyncPN,                       RES640x480x120,  VCLK52_406, 0x00,0x24,0x2e, 640, 480},/* 0b 640x480x120Hz */
+{Support32Bpp + SupportRAMDAC2 + SyncPN,                       RES640x480x160,  VCLK72_852, 0x00,0x24,0x2e, 640, 480},/* 0c 640x480x160Hz */
+{Support32Bpp + SupportRAMDAC2 + SyncNN,                       RES640x480x200,  VCLK86_6,   0x00,0x24,0x2e, 640, 480},/* 0d 640x480x200Hz */
+{Support32Bpp + NoSupportLCD + SyncPP,                         RES800x600x56,   VCLK36,     0x05,0x36,0x6a, 800, 600},/* 0e 800x600x56Hz */
+{Support32Bpp + NoSupportTV + SyncPP,                          RES800x600x60,   VCLK40,     0x05,0x36,0x6a, 800, 600},/* 0f 800x600x60Hz (LCD 800x600x60Hz) */
+{Support32Bpp + NoSupportHiVisionTV + SyncPP,                  RES800x600x72,   VCLK50,     0x48,0x36,0x6a, 800, 600},/* 10 800x600x72Hz (LCD 800x600x70Hz) */
+{Support32Bpp + NoSupportHiVisionTV + SyncPP,                  RES800x600x75,   VCLK49_5,   0x8B,0x36,0x6a, 800, 600},/* 11 800x600x75Hz (LCD 800x600x75Hz) */
+{Support32Bpp + SupportRAMDAC2 + SyncPP,                       RES800x600x85,   VCLK56_25,  0x00,0x36,0x6a, 800, 600},/* 12 800x600x85Hz */
+{Support32Bpp + SupportRAMDAC2 + SyncPN,                       RES800x600x100,  VCLK68_179, 0x00,0x36,0x6a, 800, 600},/* 13 800x600x100Hz */
+{Support32Bpp + SupportRAMDAC2 + SyncPN,                       RES800x600x120,  VCLK83_95,  0x00,0x36,0x6a, 800, 600},/* 14 800x600x120Hz */
+{Support32Bpp + SupportRAMDAC2 + SyncPN,                       RES800x600x160,  VCLK116_406,0x00,0x36,0x6a, 800, 600},/* 15 800x600x160Hz */
+{Support32Bpp + InterlaceMode + SyncPP,                                RES1024x768x43,  VCLK44_9,   0x00,0x47,0x37,1024, 768},/* 16 1024x768x43Hz */
+{Support32Bpp + NoSupportTV + SyncNN + SupportTV1024,          RES1024x768x60,  VCLK65,     0x06,0x47,0x37,1024, 768},/* 17 1024x768x60Hz (LCD 1024x768x60Hz) */
+{Support32Bpp + NoSupportHiVisionTV + SyncNN,                  RES1024x768x70,  VCLK75,     0x49,0x47,0x37,1024, 768},/* 18 1024x768x70Hz (LCD 1024x768x70Hz) */
+{Support32Bpp + NoSupportHiVisionTV + SyncPP,                  RES1024x768x75,  VCLK78_75,  0x00,0x47,0x37,1024, 768},/* 19 1024x768x75Hz (LCD 1024x768x75Hz) */
+{Support32Bpp + SupportRAMDAC2 + SyncPP,                       RES1024x768x85,  VCLK94_5,   0x8C,0x47,0x37,1024, 768},/* 1a 1024x768x85Hz */
+{Support32Bpp + SupportRAMDAC2 + SyncPN,                       RES1024x768x100, VCLK113_309,0x00,0x47,0x37,1024, 768},/* 1b 1024x768x100Hz */
+{Support32Bpp + SupportRAMDAC2 + SyncPN,                       RES1024x768x120, VCLK139_054,0x00,0x47,0x37,1024, 768},/* 1c 1024x768x120Hz */
+{Support32Bpp + SupportLCD + SyncPP,                           RES1280x960x60,  VCLK108_2,  0x08,0x58,0x7b,1280, 960},/* 1d 1280x960x60Hz */
+{Support32Bpp + InterlaceMode + SyncPP,                                RES1280x1024x43, VCLK78_75,  0x00,0x58,0x3a,1280,1024},/* 1e 1280x1024x43Hz */
+{Support32Bpp + NoSupportTV + SyncPP,                          RES1280x1024x60, VCLK108_2,  0x07,0x58,0x3a,1280,1024},/* 1f 1280x1024x60Hz (LCD 1280x1024x60Hz) */
+{Support32Bpp + NoSupportTV + SyncPP,                          RES1280x1024x75, VCLK135_5,  0x00,0x58,0x3a,1280,1024},/* 20 1280x1024x75Hz (LCD 1280x1024x75Hz) */
+{Support32Bpp + SyncPP,                                                RES1280x1024x85, VCLK157_5,  0x00,0x58,0x3a,1280,1024},/* 21 1280x1024x85Hz */
+{Support32Bpp + SupportLCD + SyncPP + SupportCRT2in301C,       RES1600x1200x60, VCLK162,    0x09,0x7A,0x3c,1600,1200},/* 22 1600x1200x60Hz */
+{Support32Bpp + SyncPP + SupportCRT2in301C,                    RES1600x1200x65, VCLK175,    0x00,0x69,0x3c,1600,1200},/* 23 1600x1200x65Hz */
+{Support32Bpp + SyncPP + SupportCRT2in301C,                    RES1600x1200x70, VCLK189,    0x00,0x69,0x3c,1600,1200},/* 24 1600x1200x70Hz */
+{Support32Bpp + SyncPP + SupportCRT2in301C,                    RES1600x1200x75, VCLK202_5,  0x00,0x69,0x3c,1600,1200},/* 25 1600x1200x75Hz */
+{Support32Bpp + SyncPP,                                                RES1600x1200x85, VCLK229_5,  0x00,0x69,0x3c,1600,1200},/* 26 1600x1200x85Hz */
+{Support32Bpp + SyncPP,                                                RES1600x1200x100,VCLK269_655,0x00,0x69,0x3c,1600,1200},/* 27 1600x1200x100Hz */
+{Support32Bpp + SyncPP,                                                RES1600x1200x120,VCLK323_586,0x00,0x69,0x3c,1600,1200},/* 28 1600x1200x120Hz */
+{Support32Bpp + SupportLCD + SyncNP,                           RES1920x1440x60, VCLK234,    0x00,0x00,0x68,1920,1440},/* 29 1920x1440x60Hz */
+{Support32Bpp + SyncPN,                                                RES1920x1440x65, VCLK254_817,0x00,0x00,0x68,1920,1440},/* 2a 1920x1440x65Hz */
+{Support32Bpp + SyncPN,                                                RES1920x1440x70, VCLK277_015,0x00,0x00,0x68,1920,1440},/* 2b 1920x1440x70Hz */
+{Support32Bpp + SyncPN,                                                RES1920x1440x75, VCLK291_132,0x00,0x00,0x68,1920,1440},/* 2c 1920x1440x75Hz */
+{Support32Bpp + SyncPN,                                                RES1920x1440x85, VCLK330_615,0x00,0x00,0x68,1920,1440},/* 2d 1920x1440x85Hz */
+{Support16Bpp + SyncPN,                                                RES1920x1440x100,VCLK388_631,0x00,0x00,0x68,1920,1440},/* 2e 1920x1440x100Hz */
+{Support32Bpp + SupportLCD + SyncPN,                           RES2048x1536x60, VCLK266_952,0x00,0x00,0x6c,2048,1536},/* 2f 2048x1536x60Hz */
+{Support32Bpp + SyncPN,                                                RES2048x1536x65, VCLK291_766,0x00,0x00,0x6c,2048,1536},/* 30 2048x1536x65Hz */
+{Support32Bpp + SyncPN,                                                RES2048x1536x70, VCLK315_195,0x00,0x00,0x6c,2048,1536},/* 31 2048x1536x70Hz */
+{Support32Bpp + SyncPN,                                                RES2048x1536x75, VCLK340_477,0x00,0x00,0x6c,2048,1536},/* 32 2048x1536x75Hz */
+{Support16Bpp + SyncPN,                                                RES2048x1536x85, VCLK375_847,0x00,0x00,0x6c,2048,1536},/* 33 2048x1536x85Hz */
+{Support32Bpp + SupportHiVisionTV + SupportRAMDAC2 + SyncPP + SupportYPbPr,    RES800x480x60,   VCLK39_77,  0x08,0x00,0x70, 800, 480},/* 34 800x480x60Hz */
+{Support32Bpp + SupportRAMDAC2 + SyncPP,                       RES800x480x75,   VCLK49_5,   0x08,0x00,0x70, 800, 480},/* 35 800x480x75Hz */
+{Support32Bpp + SupportRAMDAC2 + SyncPP,                       RES800x480x85,   VCLK56_25,  0x08,0x00,0x70, 800, 480},/* 36 800x480x85Hz */
+{Support32Bpp + SupportHiVisionTV + SupportRAMDAC2 + SyncPP + SupportYPbPr,    RES1024x576x60,  VCLK65,     0x09,0x00,0x71,1024, 576},/* 37 1024x576x60Hz */
+{Support32Bpp + SupportRAMDAC2 + SyncPP,                       RES1024x576x75,  VCLK78_75,  0x09,0x00,0x71,1024, 576},/* 38 1024x576x75Hz */
+{Support32Bpp + SupportRAMDAC2 + SyncPP,                       RES1024x576x85,  VCLK94_5,   0x09,0x00,0x71,1024, 576},/* 39 1024x576x85Hz */
+{Support32Bpp + SupportHiVisionTV + SupportRAMDAC2 + SyncPP + SupportYPbPr,    RES1280x720x60,  VCLK108_2,  0x0A,0x00,0x75,1280, 720},/* 3a 1280x720x60Hz */
+{Support32Bpp + SupportRAMDAC2 + SyncPP,                       RES1280x720x75,  VCLK135_5,  0x0A,0x00,0x75,1280, 720},/* 3b 1280x720x75Hz */
+{Support32Bpp + SupportRAMDAC2 + SyncPP,                       RES1280x720x85,  VCLK157_5,  0x0A,0x00,0x75,1280, 720},/* 3c 1280x720x85Hz */
+{Support32Bpp + SupportTV + SyncNN,                            RES720x480x60,   VCLK28_322, 0x06,0x00,0x31, 720, 480},/* 3d 720x480x60Hz */
+{Support32Bpp + SupportTV + SyncPP,                            RES720x576x56,   VCLK36,     0x06,0x00,0x32, 720, 576},/* 3e 720x576x56Hz */
+{Support32Bpp + InterlaceMode + NoSupportLCD + SyncPP,         RES856x480x79I,  VCLK35_2,   0x00,0x00,0x00, 856, 480},/* 3f 856x480x79I */
+{Support32Bpp + NoSupportLCD + SyncNN,                         RES856x480x60,   VCLK35_2,   0x00,0x00,0x00, 856, 480},/* 40 856x480x60Hz */
+{Support32Bpp + NoSupportHiVisionTV + SyncPP,                  RES1280x768x60,  VCLK79_411, 0x08,0x48,0x23,1280, 768},/* 41 1280x768x60Hz */
+{Support32Bpp + NoSupportHiVisionTV + SyncPP,                  RES1400x1050x60, VCLK122_61, 0x08,0x69,0x26,1400,1050},/* 42 1400x1050x60Hz */
+{Support32Bpp + SupportRAMDAC2 + SyncPP,                       RES1152x864x60,  VCLK80_350, 0x37,0x00,0x20,1152, 864},/* 43 1152x864x60Hz */
+{Support32Bpp + SupportRAMDAC2 + SyncPP,                       RES1152x864x75,  VCLK107_385,0x37,0x00,0x20,1152, 864},/* 44 1152x864x75Hz */
+{Support32Bpp + SupportLCD + SupportRAMDAC2 + SyncPP,          RES1280x960x75,  VCLK125_999,0x3A,0x88,0x7b,1280, 960},/* 45 1280x960x75Hz */
+{Support32Bpp + SupportLCD + SupportRAMDAC2 + SyncPP,          RES1280x960x85,  VCLK148_5,  0x0A,0x88,0x7b,1280, 960},/* 46 1280x960x85Hz */
+{Support32Bpp + SupportLCD + SupportRAMDAC2 + SyncPP,          RES1280x960x120, VCLK217_325,0x3A,0x88,0x7b,1280, 960},/* 47 1280x960x120Hz */
+{Support32Bpp + SupportRAMDAC2 + SyncPN,                       RES1024x768x160, VCLK139_054,0x30,0x47,0x37,1024, 768},/* 48 1024x768x160Hz */
+};
+
+
+
+XGI330_VCLKDataStruct XGI330_VCLKData[]=
+{
+ { 0x1b,0xe1, 25}, /* 0x0 */
+ { 0x4e,0xe4, 28}, /* 0x1 */
+ { 0x57,0xe4, 31}, /* 0x2 */
+ { 0xc3,0xc8, 36}, /* 0x3 */
+ { 0x42,0xe2, 40}, /* 0x4 */
+ { 0xfe,0xcd, 43}, /* 0x5 */
+ { 0x5d,0xc4, 44}, /* 0x6 */
+ { 0x52,0xe2, 49}, /* 0x7 */
+ { 0x53,0xe2, 50}, /* 0x8 */
+ { 0x74,0x67, 52}, /* 0x9 */
+ { 0x6d,0x66, 56}, /* 0xa */
+ { 0x6c,0xc3, 65}, /* 0xb */
+ { 0x46,0x44, 67}, /* 0xc */
+ { 0xb1,0x46, 68}, /* 0xd */
+ { 0xd3,0x4a, 72}, /* 0xe */
+ { 0x29,0x61, 75}, /* 0xf */
+ { 0x6e,0x46, 76}, /* 0x10 */
+ { 0x2b,0x61, 78}, /* 0x11 */
+ { 0x31,0x42, 79}, /* 0x12 */
+ { 0xab,0x44, 83}, /* 0x13 */
+ { 0x46,0x25, 84}, /* 0x14 */
+ { 0x78,0x29, 86}, /* 0x15 */
+ { 0x62,0x44, 94}, /* 0x16 */
+ { 0x2b,0x41,104}, /* 0x17 */
+ { 0x3a,0x23,105}, /* 0x18 */
+ { 0x70,0x44,108}, /* 0x19 */
+ { 0x3c,0x23,109}, /* 0x1a */
+ { 0x5e,0x43,113}, /* 0x1b */
+ { 0xbc,0x44,116}, /* 0x1c */
+ { 0xe0,0x46,132}, /* 0x1d */
+ { 0x54,0x42,135}, /* 0x1e */
+ { 0xea,0x2a,139}, /* 0x1f */
+ { 0x41,0x22,157}, /* 0x20 */
+ { 0x70,0x24,162}, /* 0x21 */
+ { 0x30,0x21,175}, /* 0x22 */
+ { 0x4e,0x22,189}, /* 0x23 */
+ { 0xde,0x26,194}, /* 0x24 */
+ { 0x62,0x06,202}, /* 0x25 */
+ { 0x3f,0x03,229}, /* 0x26 */
+ { 0xb8,0x06,234}, /* 0x27 */
+ { 0x34,0x02,253}, /* 0x28 */
+ { 0x58,0x04,255}, /* 0x29 */
+ { 0x24,0x01,265}, /* 0x2a */
+ { 0x9b,0x02,267}, /* 0x2b */
+ { 0x70,0x05,270}, /* 0x2c */
+ { 0x25,0x01,272}, /* 0x2d */
+ { 0x9c,0x02,277}, /* 0x2e */
+ { 0x27,0x01,286}, /* 0x2f */
+ { 0x3c,0x02,291}, /* 0x30 */
+ { 0xef,0x0a,292}, /* 0x31 */
+ { 0xf6,0x0a,310}, /* 0x32 */
+ { 0x95,0x01,315}, /* 0x33 */
+ { 0xf0,0x09,324}, /* 0x34 */
+ { 0xfe,0x0a,331}, /* 0x35 */
+ { 0xf3,0x09,332}, /* 0x36 */
+ { 0xea,0x08,340}, /* 0x37 */
+ { 0xe8,0x07,376}, /* 0x38 */
+ { 0xde,0x06,389}, /* 0x39 */
+ { 0x52,0x2a, 54}, /* 0x3a */
+ { 0x52,0x6a, 27}, /* 0x3b */
+ { 0x62,0x24, 70}, /* 0x3c */
+ { 0x62,0x64, 70}, /* 0x3d */
+ { 0xa8,0x4c, 30}, /* 0x3e */
+ { 0x20,0x26, 33}, /* 0x3f */
+ { 0x31,0xc2, 39}, /* 0x40 */
+ { 0x60,0x36, 30}, /* 0x41 */
+ { 0x40,0x4A, 28}, /* 0x42 */
+ { 0x9F,0x46, 44}, /* 0x43 */
+ { 0x97,0x2C, 26}, /* 0x44 */
+ { 0x44,0xE4, 25}, /* 0x45 */
+ { 0x7E,0x32, 47}, /* 0x46 */
+ { 0x08,0x24, 31}, /* 0x47 */
+ { 0x97,0x2c, 26}, /* 0x48 */
+ { 0xCE,0x3c, 39}, /* 0x49 */
+ { 0x52,0x4A, 36}, /* 0x4a */
+ { 0x2C,0x61, 95}, /* 0x4b */
+ { 0x78,0x27,108}, /* 0x4c */
+ { 0x66,0x43,123},  /* 0x4d */
+ { 0x2c,0x61, 80},  /* 0x4e */
+ { 0x3b,0x61,108}  /* 0x4f */
+};
+
+XGI_VBVCLKDataStruct XGI330_VBVCLKData[]=
+{
+ { 0x1b,0xe1, 25}, /* 0x0 */
+ { 0x4e,0xe4, 28}, /* 0x1 */
+ { 0x57,0xe4, 31}, /* 0x2 */
+ { 0xc3,0xc8, 36}, /* 0x3 */
+ { 0x42,0x47, 40}, /* 0x4 */
+ { 0xfe,0xcd, 43}, /* 0x5 */
+ { 0x5d,0xc4, 44}, /* 0x6 */
+ { 0x52,0x47, 49}, /* 0x7 */
+ { 0x53,0x47, 50}, /* 0x8 */
+ { 0x74,0x67, 52}, /* 0x9 */
+ { 0x6d,0x66, 56}, /* 0xa */
+ { 0x5a,0x64, 65}, /* 0xb */
+ { 0x46,0x44, 67}, /* 0xc */
+ { 0xb1,0x46, 68}, /* 0xd */
+ { 0xd3,0x4a, 72}, /* 0xe */
+ { 0x29,0x61, 75}, /* 0xf */
+ { 0x6d,0x46, 75}, /* 0x10 */
+ { 0x41,0x43, 78}, /* 0x11 */
+ { 0x31,0x42, 79}, /* 0x12 */
+ { 0xab,0x44, 83}, /* 0x13 */
+ { 0x46,0x25, 84}, /* 0x14 */
+ { 0x78,0x29, 86}, /* 0x15 */
+ { 0x62,0x44, 94}, /* 0x16 */
+ { 0x2b,0x22,104}, /* 0x17 */
+ { 0x49,0x24,105}, /* 0x18 */
+ { 0xf8,0x2f,108}, /* 0x19 */
+ { 0x3c,0x23,109}, /* 0x1a */
+ { 0x5e,0x43,113}, /* 0x1b */
+ { 0xbc,0x44,116}, /* 0x1c */
+ { 0xe0,0x46,132}, /* 0x1d */
+ { 0xd4,0x28,135}, /* 0x1e */
+ { 0xea,0x2a,139}, /* 0x1f */
+ { 0x41,0x22,157}, /* 0x20 */
+ { 0x70,0x24,162}, /* 0x21 */
+ { 0x30,0x21,175}, /* 0x22 */
+ { 0x4e,0x22,189}, /* 0x23 */
+ { 0xde,0x26,194}, /* 0x24 */
+ { 0x70,0x07,202}, /* 0x25 */
+ { 0x3f,0x03,229}, /* 0x26 */
+ { 0xb8,0x06,234}, /* 0x27 */
+ { 0x34,0x02,253}, /* 0x28 */
+ { 0x58,0x04,255}, /* 0x29 */
+ { 0x24,0x01,265}, /* 0x2a */
+ { 0x9b,0x02,267}, /* 0x2b */
+ { 0x70,0x05,270}, /* 0x2c */
+ { 0x25,0x01,272}, /* 0x2d */
+ { 0x9c,0x02,277}, /* 0x2e */
+ { 0x27,0x01,286}, /* 0x2f */
+ { 0x3c,0x02,291}, /* 0x30 */
+ { 0xef,0x0a,292}, /* 0x31 */
+ { 0xf6,0x0a,310}, /* 0x32 */
+ { 0x95,0x01,315}, /* 0x33 */
+ { 0xf0,0x09,324}, /* 0x34 */
+ { 0xfe,0x0a,331}, /* 0x35 */
+ { 0xf3,0x09,332}, /* 0x36 */
+ { 0xea,0x08,340}, /* 0x37 */
+ { 0xe8,0x07,376}, /* 0x38 */
+ { 0xde,0x06,389}, /* 0x39 */
+ { 0x52,0x2a, 54}, /* 0x3a */
+ { 0x52,0x6a, 27}, /* 0x3b */
+ { 0x62,0x24, 70}, /* 0x3c */
+ { 0x62,0x64, 70}, /* 0x3d */
+ { 0xa8,0x4c, 30}, /* 0x3e */
+ { 0x20,0x26, 33}, /* 0x3f */
+ { 0x31,0xc2, 39}, /* 0x40 */
+ { 0x2e,0x48, 25}, /* 0x41 */
+ { 0x24,0x46, 25}, /* 0x42 */
+ { 0x26,0x64, 28}, /* 0x43 */
+ { 0x37,0x64, 40}, /* 0x44 */
+ { 0xa1,0x42,108}, /* 0x45 */
+ { 0x37,0x61,100}, /* 0x46 */
+ { 0x78,0x27,108}, /* 0x47 */
+ { 0x5e,0x64,68},  /* 0x48 chiawen for fuj1280x768*/
+ { 0x70,0x44,108}, /* 0x49 chiawen for 1400x1050*/
+};
+
+UCHAR XGI330_ScreenOffset[]={ 0x14,0x19,0x20,0x28,0x32,0x40,0x50,0x64,0x78,0x80,0x2d,0x35,0x57,0x48 };
+
+XGI_StResInfoStruct XGI330_StResInfo[]=
+{
+ { 640,400},
+ { 640,350},
+ { 720,400},
+ { 720,350},
+ { 640,480}
+};
+
+XGI_ModeResInfoStruct XGI330_ModeResInfo[]=
+{
+ {  320, 200, 8, 8},
+ {  320, 240, 8, 8},
+ {  320, 400, 8, 8},
+ {  400, 300, 8, 8},
+ {  512, 384, 8, 8},
+ {  640, 400, 8,16},
+ {  640, 480, 8,16},
+ {  800, 600, 8,16},
+ { 1024, 768, 8,16},
+ { 1280,1024, 8,16},
+ { 1600,1200, 8,16},
+ { 1920,1440, 8,16},
+ { 2048,1536, 8,16},
+ {  720, 480, 8,16},
+ {  720, 576, 8,16},
+ { 1280, 960, 8,16},
+ {  800, 480, 8,16},
+ { 1024, 576, 8,16},
+ { 1280, 720, 8,16},
+ {  856, 480, 8,16},
+ { 1280, 768, 8,16},
+ { 1400,1050, 8,16},
+ { 1152, 864, 8,16}
+};
+
+UCHAR XGI330_OutputSelect =0x40;
+UCHAR XGI330_SoftSetting = 0x30;
+UCHAR XGI330_SR07=0x18;
+UCHAR XGI330New_SR15[8][8]={
+{0x0,0x4,0x60,0x60},
+{0xf,0xf,0xf,0xf},
+{0xba,0xba,0xba,0xba},
+{0xa9,0xa9,0xac,0xac},
+{0xa0,0xa0,0xa0,0xa8},
+{0x0,0x0,0x2,0x2},
+{0x30,0x30,0x40,0x40},
+{0x0,0xa5,0xfb,0xf6}
+};
+
+UCHAR XGI330New_CR40[5][8]={
+{0x77,0x77,0x44,0x44},
+{0x77,0x77,0x44,0x44},
+{0x0,0x0,0x0,0x0},
+{0x5b,0x5b,0xab,0xab},
+{0x0,0x0,0xf0,0xf8}
+};
+
+UCHAR XGI330_CR49[]={0xaa,0x88};
+UCHAR XGI330_SR1F=0x0;
+UCHAR XGI330_SR21=0xa3;
+UCHAR XGI330_650_SR21=0xa7;
+UCHAR XGI330_SR22=0xfb;
+UCHAR XGI330_SR23=0xf6;
+UCHAR XGI330_SR24=0xd;
+
+UCHAR XGI660_SR21=0xa3;/* 2003.0312 */
+UCHAR XGI660_SR22=0xf3;/* 2003.0312 */
+
+UCHAR XGI330_LVDS_SR32=0x00;   /* ynlai for 650 LVDS */
+UCHAR XGI330_LVDS_SR33=0x00;   /* chiawen for 650 LVDS */
+UCHAR XGI330_650_SR31=0x40;
+UCHAR XGI330_650_SR33=0x04;
+UCHAR XGI330_CRT2Data_1_2 = 0x0;
+UCHAR XGI330_CRT2Data_4_D = 0x0;
+UCHAR XGI330_CRT2Data_4_E = 0x0;
+UCHAR XGI330_CRT2Data_4_10 = 0x80;
+USHORT XGI330_RGBSenseData = 0xd1;
+USHORT XGI330_VideoSenseData = 0xb9;
+USHORT XGI330_YCSenseData = 0xb3;
+USHORT XGI330_RGBSenseData2 = 0x0190;     /*301b*/
+USHORT XGI330_VideoSenseData2 = 0x0110;
+USHORT XGI330_YCSenseData2 = 0x016B;
+UCHAR XGI330_NTSCPhase[] = {0x21,0xed,0x8a,0x8};
+UCHAR XGI330_PALPhase[] = {0x2a,0x5,0xd3,0x0};
+UCHAR XGI330_NTSCPhase2[] = {0x21,0xF0,0x7B,0xD6};/*301b*/
+UCHAR XGI330_PALPhase2[] = {0x2a,0x09,0x86,0xe9};
+UCHAR XGI330_PALMPhase[] = {0x21,0xE4,0x2E,0x9B};   /*palmn*/
+UCHAR XGI330_PALNPhase[] = {0x21,0xF4,0x3E,0xBA};
+UCHAR XG40_I2CDefinition = 0x00 ;
+UCHAR XG20_CR97 = 0x10 ;
+
+UCHAR XG21_DVOSetting = 0x00 ;
+UCHAR XG21_CR2E = 0x00 ;
+UCHAR XG21_CR2F = 0x00 ;
+UCHAR XG21_CR46 = 0x00 ;
+UCHAR XG21_CR47 = 0x00 ;
+
+UCHAR XG27_CR97 = 0xC1 ;
+UCHAR XG27_SR36 = 0x30 ;
+UCHAR XG27_CR8F = 0x0C ;
+UCHAR XG27_CRD0[] = {0,0,0,0,0,0,0,0x82,0x00,0x66,0x01,0x00} ;
+UCHAR XG27_CRDE[] = {0,0} ;
+UCHAR XG27_SR40 = 0x04 ;
+UCHAR XG27_SR41 = 0x00 ;
+
+UCHAR XGI330_CHTVVCLKUNTSC[]={0x00 };
+
+UCHAR XGI330_CHTVVCLKONTSC[]={0x00 };
+
+UCHAR XGI330_CHTVVCLKUPAL[]={0x00 };
+
+UCHAR XGI330_CHTVVCLKOPAL[]={0x00 };
+
+UCHAR XGI7007_CHTVVCLKUNTSC[]={CH7007TVVCLK30_2,
+                               CH7007TVVCLK30_2,
+                               CH7007TVVCLK30_2,
+                               CH7007TVVCLK30_2,
+                               CH7007TVVCLK28_1,
+                               CH7007TVVCLK47_8
+                              };
+
+UCHAR XGI7007_CHTVVCLKONTSC[]={CH7007TVVCLK26_4,
+                               CH7007TVVCLK26_4,
+                               CH7007TVVCLK26_4,
+                               CH7007TVVCLK26_4,
+                               CH7007TVVCLK24_6,
+                               CH7007TVVCLK43_6
+                              };
+
+UCHAR XGI7007_CHTVVCLKUPAL[]={CH7007TVVCLK31_5,
+                              CH7007TVVCLK31_5,
+                              CH7007TVVCLK31_5,
+                              CH7007TVVCLK31_5,
+                              CH7007TVVCLK26_2,
+                              CH7007TVVCLK39
+                             };
+
+UCHAR XGI7007_CHTVVCLKOPAL[]={CH7007TVVCLK31_5,
+                              CH7007TVVCLK31_5,
+                              CH7007TVVCLK31_5,
+                              CH7007TVVCLK31_5,
+                              CH7007TVVCLK26_2,
+                              CH7007TVVCLK36
+                             };
+
+XGI330_VCLKDataStruct XGI_CH7007VCLKData[]=
+{
+ { 0x60,0x36,30},  /* 0 30.2 MHZ */
+ { 0x40,0x4A,28},  /* 1 28.19 MHZ */
+ { 0x9F,0x46,44},  /* 2 43.6 MHZ */
+ { 0x97,0x2C,26},  /* 3 26.4 MHZ */
+ { 0x44,0xE4,25},  /* 4 24.6 MHZ */
+ { 0x7E,0x32,47},  /* 5 47.832 MHZ */
+ { 0x8A,0x24,31},  /* 6 31.5 MHZ */
+ { 0x97,0x2C,26},  /* 7 26.2 MHZ */
+ { 0xCE,0x3C,39},  /* 8 39 MHZ   */
+ { 0x52,0x4A,36},  /* 9 36 MHZ   */
+ { 0xFF,0x00,0 }   /* End mark      */
+};
+
+XGI330_VCLKDataStruct XGI_VCLKData[]=
+{
+                       /* SR2B,SR2C,SR2D */
+               {      0x1B,0xE1,25               },/* 00 (25.175MHz) */
+
+               {      0x4E,0xE4,28               },/* 01 (28.322MHz) */
+
+                {      0x57,0xE4,31               },/* 02 (31.500MHz) */
+
+                {      0xC3,0xC8,36               },/* 03 (36.000MHz) */
+
+                {      0x42,0xE2,40               },/* 04 (40.000MHz) */
+
+                {      0xFE,0xCD,43               },/* 05 (43.163MHz) */
+
+                {      0x5D,0xC4,44               },/* 06 (44.900MHz) */
+
+                {      0x52,0xE2,49               },/* 07 (49.500MHz) */
+
+                {      0x53,0xE2,50               },/* 08 (50.000MHz) */
+
+                {      0x74,0x67,52               },/* 09 (52.406MHz) */
+
+                {      0x6D,0x66,56               },/* 0A (56.250MHz) */
+
+                {      0x6C,0xC3,65               },/* 0B (65.000MHz) */
+
+                {      0x46,0x44,67               },/* 0C (67.765MHz) */
+
+                {      0xB1,0x46,68               },/* 0D (68.179MHz) */
+
+                {      0xD3,0x4A,72               },/* 0E (72.852MHz) */
+
+                {      0x29,0x61,75              },/* 0F (75.000MHz) */
+
+                {      0x6E,0x46,76               },/* 10 (75.800MHz) */
+
+                {      0x2B,0x61,78               },/* 11 (78.750MHz) */
+
+                {      0x31,0x42,79               },/* 12 (79.411MHz) */
+
+                {      0xAB,0x44,83               },/* 13 (83.950MHz) */
+
+                {      0x46,0x25,84               },/* 14 (84.800MHz) */
+
+                {      0x78,0x29,86               },/* 15 (86.600MHz) */
+
+                {      0x62,0x44,94               },/* 16 (94.500MHz) */
+
+                {      0x2B,0x41,104               },/* 17 (104.998MHz) */
+
+                {      0x3A,0x23,105               },/* 18 (105.882MHz) */
+
+                {      0x70,0x44,108               },/* 19 (107.862MHz) */
+
+                {      0x3C,0x23,109               },/* 1A (109.175MHz) */
+
+                {      0x5E,0x43,113              },/* 1B (113.309MHz) */
+
+                {      0xBC,0x44,116              },/* 1C (116.406MHz) */
+
+                {      0xE0,0x46,132              },/* 1D (132.258MHz) */
+
+                {      0x54,0x42,135               },/* 1E (135.500MHz) */
+
+                {      0x9C,0x22,139               },/* 1F (139.275MHz) */
+
+                {      0x41,0x22,157               },/* 20 (157.500MHz) */
+
+                {      0x70,0x24,162               },/* 21 (161.793MHz) */
+
+                {      0x30,0x21,175               },/* 22 (175.000MHz) */
+
+                {      0x4E,0x22,189              },/* 23 (188.520MHz) */
+
+                {      0xDE,0x26,194              },/* 24 (194.400MHz) */
+
+                {      0x62,0x06,202               },/* 25 (202.500MHz) */
+
+                {      0x3F,0x03,229               },/* 26 (229.500MHz) */
+
+                {      0xB8,0x06,234               },/* 27 (233.178MHz) */
+
+                {      0x34,0x02,253               },/* 28 (252.699MHz) */
+
+                {      0x58,0x04,255               },/* 29 (254.817MHz) */
+
+                {      0x24,0x01,265              },/* 2A (265.728MHz) */
+
+                {      0x9B,0x02,267               },/* 2B (266.952MHz) */
+
+                {      0x70,0x05,270               },/* 2C (269.65567MHz) */
+
+                {      0x25,0x01,272               },/* 2D (272.04199MHz) */
+
+                {      0x9C,0x02,277               },/* 2E (277.015MHz) */
+
+                {      0x27,0x01,286               },/* 2F (286.359985MHz) */
+
+                {      0xB3,0x04,291               },/* 30 (291.13266MHz) */
+
+                {      0xBC,0x05,292               },/* 31 (291.766MHz) */
+
+                {      0xF6,0x0A,310               },/* 32 (309.789459MHz) */
+
+                {      0x95,0x01,315               },/* 33 (315.195MHz) */
+
+                {      0xF0,0x09,324               },/* 34 (323.586792MHz) */
+
+                {      0xFE,0x0A,331               },/* 35 (330.615631MHz) */
+
+                {      0xF3,0x09,332              },/* 36 (332.177612MHz) */
+
+                {      0x5E,0x03,340              },/* 37 (340.477MHz) */
+
+                {      0xE8,0x07,376              },/* 38 (375.847504MHz) */
+
+                {      0xDE, 0x06,389             },/* 39 (388.631439MHz) */
+
+                {      0x52,0x2A,54               },/* 3A (54.000MHz) */
+
+                {      0x52,0x6A,27              },/* 3B (27.000MHz) */
+
+                {      0x62,0x24,70               },/* 3C (70.874991MHz) */
+
+                {      0x62,0x64,70               },/* 3D (70.1048912MHz) */
+
+                {      0xA8,0x4C,30               },/* 3E (30.1048912MHz) */
+
+                {      0x20,0x26,33               },/* 3F (33.7499957MHz) */
+
+                {      0x31,0xc2,39               },/* 40 (39.77MHz) */
+
+                {      0x11,0x21,30               },/* 41 (30MHz) }// NTSC 1024X768 */
+
+                {      0x2E,0x48,25               },/* 42 (25.175MHz) }// ScaleLCD */
+
+                {      0x24,0x46,25               },/* 43 (25.175MHz) */
+
+                {      0x26,0x64,28               },/* 44 (28.322MHz) */
+
+                {      0x37,0x64,40               },/* 45 (40.000MHz) */
+
+                {      0xA1,0x42,108               },/* 46 (95.000MHz) }// QVGA */
+
+                {      0x37,0x61,100               },/* 47 (100.00MHz) */
+
+                {      0x78,0x27,108               },/* 48 (108.200MHz) */
+
+                {      0xBF,0xC8,35               },/* 49 (35.2MHz) */
+
+                {      0x66,0x43,123               },/* 4A (122.61Mhz) */
+
+                {      0x2C,0x61,80               },/* 4B (80.350Mhz) */
+
+                {      0x3B,0x61,108               },/* 4C (107.385Mhz) */
+
+
+/*                {      0x60,0x36,30               },// 4D (30.200MHz)   }// No use
+
+                {      0x60,0x36,30               },// 4E (30.200MHz)   }// No use
+
+                {      0x60,0x36,30               },// 4F (30.200MHz)   }// No use
+
+                {      0x60,0x36,30               },// 50 (30.200MHz)   }// CHTV
+
+                {      0x40,0x4A,28               },// 51 (28.190MHz)
+
+                {      0x9F,0x46,44               },// 52 (43.600MHz)
+
+                {      0x97,0x2C,26               },// 53 (26.400MHz)
+
+                {      0x44,0xE4,25               },// 54 (24.600MHz)
+
+                {      0x7E,0x32,47               },// 55 (47.832MHz)
+
+                {      0x8A,0x24,31               },// 56 (31.500MHz)
+
+                {      0x97,0x2C,26               },// 57 (26.200MHz)
+
+                {      0xCE,0x3C,39               },// 58 (39.000MHz)
+
+                {      0x52,0x4A,36               },// 59 (36.000MHz)
+
+*/
+               {      0x69,0x61,191              }, /* 4D (190.96MHz ) */
+               {      0x4F,0x22,192              }, /* 4E (192.069MHz) */
+               {      0x28,0x26,322              }, /* 4F (322.273MHz) */
+               {      0x5C,0x6B,27               }, /* 50 (27.74HMz) */
+               {      0x57,0x24,126              }, /* 51 (125.999MHz) */
+               {      0x5C,0x42,148              }, /* 52 (148.5MHz) */
+               {      0x42,0x61,120              }, /* 53 (120.839MHz) */
+               {      0x62,0x61,178              }, /* 54 (178.992MHz) */
+               {      0x59,0x22,217              }, /* 55 (217.325MHz) */
+               {      0x29,0x01,300              }, /* 56 (299.505Mhz) */
+               {      0x52,0x63,74               }, /* 57 (74.25MHz) */
+
+
+                {      0xFF,0x00,0                }/* End mark */
+ }  ;
+
+XGI330_VCLKDataStruct XGI_VBVCLKData[]=
+{
+                {      0x1B,0xE1,25               },/* 00 (25.175MHz) */
+
+                {      0x4E,0xE4,28               },/* 01 (28.322MHz) */
+
+                {      0x57,0xE4,31               },/* 02 (31.500MHz) */
+
+                {      0xC3,0xC8,36               },/* 03 (36.000MHz) */
+
+                {      0x42,0x47,40               },/* 04 (40.000MHz) */
+
+                {      0xFE,0xCD,43               },/* 05 (43.163MHz) */
+
+                {      0x5D,0xC4,44               },/* 06 (44.900MHz) */
+
+                {      0x52,0x47,49               },/* 07 (49.500MHz) */
+
+                {      0x53,0x47,50               },/* 08 (50.000MHz) */
+
+                {      0x74,0x67,52               },/* 09 (52.406MHz) */
+
+                {      0x6D,0x66,56               },/* 0A (56.250MHz) */
+
+                {      0x35,0x62,65               },/* 0B (65.000MHz) */
+
+                {      0x46,0x44,67               },/* 0C (67.765MHz) */
+
+                {      0xB1,0x46,68               },/* 0D (68.179MHz) */
+
+                {      0xD3,0x4A,72               },/* 0E (72.852MHz) */
+
+                {      0x29,0x61,75               },/* 0F (75.000MHz) */
+
+                {      0x6D,0x46,75               },/* 10 (75.800MHz) */
+
+                {      0x41,0x43,78               },/* 11 (78.750MHz) */
+
+                {      0x31,0x42,79               },/* 12 (79.411MHz) */
+
+                {      0xAB,0x44,83               },/* 13 (83.950MHz) */
+
+                {      0x46,0x25,84               },/* 14 (84.800MHz) */
+
+                {      0x78,0x29,86               },/* 15 (86.600MHz) */
+
+                {      0x62,0x44,94               },/* 16 (94.500MHz) */
+
+                {      0x2B,0x22,104               },/* 17 (104.998MHz) */
+
+                {      0x49,0x24,105               },/* 18 (105.882MHz) */
+
+                {      0xF8,0x2F,108               },/* 19 (108.279MHz) */
+
+                {      0x3C,0x23,109               },/* 1A (109.175MHz) */
+
+                {      0x5E,0x43,113               },/* 1B (113.309MHz) */
+
+                {      0xBC,0x44,116               },/* 1C (116.406MHz) */
+
+                {      0xE0,0x46,132               },/* 1D (132.258MHz) */
+
+                {      0xD4,0x28,135               },/* 1E (135.220MHz) */
+
+                {      0xEA,0x2A,139               },/* 1F (139.275MHz) */
+
+                {      0x41,0x22,157               },/* 20 (157.500MHz) */
+
+                {      0x70,0x24,162               },/* 21 (161.793MHz) */
+
+                {      0x30,0x21,175               },/* 22 (175.000MHz) */
+
+                {      0x4E,0x22,189               },/* 23 (188.520MHz) */
+
+                {      0xDE,0x26,194               },/* 24 (194.400MHz) */
+
+                {      0x70,0x07,202               },/* 25 (202.500MHz) */
+
+                {      0x3F,0x03,229               },/* 26 (229.500MHz) */
+
+                {      0xB8,0x06,234               },/* 27 (233.178MHz) */
+
+                {      0x34,0x02,253               },/* 28 (252.699997 MHz) */
+
+                {      0x58,0x04,255               },/* 29 (254.817MHz) */
+
+                {      0x24,0x01,265               },/* 2A (265.728MHz) */
+
+                {      0x9B,0x02,267               },/* 2B (266.952MHz) */
+
+                {      0x70,0x05,270               },/* 2C (269.65567 MHz) */
+
+                {      0x25,0x01,272               },/* 2D (272.041992 MHz) */
+
+                {      0x9C,0x02,277               },/* 2E (277.015MHz) */
+
+                {      0x27,0x01,286               },/* 2F (286.359985 MHz) */
+
+                {      0x3C,0x02,291               },/* 30 (291.132660 MHz) */
+
+                {      0xEF,0x0A,292               },/* 31 (291.766MHz) */
+
+                {      0xF6,0x0A,310               },/* 32 (309.789459 MHz) */
+
+                {      0x95,0x01,315               },/* 33 (315.195MHz) */
+
+                {      0xF0,0x09,324               },/* 34 (323.586792 MHz) */
+
+                {      0xFE,0x0A,331               },/* 35 (330.615631 MHz) */
+
+                {      0xF3,0x09,332               },/* 36 (332.177612 MHz) */
+
+                {      0xEA,0x08,340               },/* 37 (340.477MHz) */
+
+                {      0xE8,0x07,376               },/* 38 (375.847504 MHz) */
+
+                {      0xDE,0x06,389               },/* 39 (388.631439 MHz) */
+
+                {      0x52,0x2A,54                },/* 3A (54.000MHz) */
+
+                {      0x52,0x6A,27                },/* 3B (27.000MHz) */
+
+
+                {      0x62,0x24,70                },/* 3C (70.874991MHz) */
+
+
+                {      0x62,0x64,70                },/* 3D (70.1048912MHz) */
+
+                {      0xA8,0x4C,30                },/* 3E (30.1048912MHz) */
+
+                {      0x20,0x26,33                },/* 3F (33.7499957MHz) */
+
+                {      0x31,0xc2,39                },/* 40 (39.77MHz) */
+
+                {      0x11,0x21,30                },/* 41 (30MHz) }// NTSC 1024X768 */
+
+                {      0x2E,0x48,25                },/* 42 (25.175MHz) }// ScaleLCD */
+
+                {      0x24,0x46,25                },/* 43 (25.175MHz) */
+
+                {      0x26,0x64,28                },/* 44 (28.322MHz) */
+
+                {      0x37,0x64,40                },/* 45 (40.000MHz) */
+
+                {      0xA1,0x42,108               },/* 46 (95.000MHz) }// QVGA */
+
+                {      0x37,0x61,100               },/* 47 (100.00MHz) */
+
+                {      0x78,0x27,108               },/* 48 (108.200MHz) */
+
+                {      0xBF,0xC8,35                },/* 49 (35.2MHz) */
+
+                {      0x66,0x43,123               },/* 4A (122.61Mhz) */
+
+                {      0x2C,0x61,80                },/* 4B (80.350Mhz) */
+
+                {      0x3B,0x61,108               },/* 4C (107.385Mhz) */
+
+/*
+                {      0x60,0x36,30               },// 4D (30.200MHz)   }// No use
+
+                {      0x60,0x36,30               },// 4E (30.200MHz)   }// No use
+
+                {      0x60,0x36,30               },// 4F (30.200MHz)   }// No use
+
+                {      0x60,0x36,30               },// 50 (30.200MHz)   }// CHTV
+
+                {      0x40,0x4A,28               },// 51 (28.190MHz)
+
+                {      0x9F,0x46,44               },// 52 (43.600MHz)
+
+                {      0x97,0x2C,26               },// 53 (26.400MHz)
+
+                {      0x44,0xE4,25               },// 54 (24.600MHz)
+
+                {      0x7E,0x32,47               },// 55 (47.832MHz)
+
+                {      0x8A,0x24,31               },// 56 (31.500MHz)
+
+                {      0x97,0x2C,26               },// 57 (26.200MHz)
+
+                {      0xCE,0x3C,39               },// 58 (39.000MHz)
+
+                {      0x52,0x4A,36               },// 59 (36.000MHz)
+*/
+               {      0x69,0x61,191              }, /* 4D (190.96MHz ) */
+               {      0x4F,0x22,192              }, /* 4E (192.069MHz) */
+               {      0x28,0x26,322              }, /* 4F (322.273MHz) */
+               {      0x5C,0x6B,27               }, /* 50 (27.74HMz) */
+               {      0x57,0x24,126              }, /* 51 (125.999MHz) */
+               {      0x5C,0x42,148              }, /* 52 (148.5MHz) */
+               {      0x42,0x61,120              }, /* 53 (120.839MHz) */
+               {      0x62,0x61,178              }, /* 54 (178.992MHz) */
+               {      0x59,0x22,217              }, /* 55 (217.325MHz) */
+               {      0x29,0x01,300              }, /* 56 (299.505Mhz) */
+               {      0x52,0x63,74               }, /* 57 (74.25MHz) */
+
+
+                {      0xFF,0x00,0                }      /* End mark */
+};
+
+UCHAR XGI660_TVDelayList[]=
+{
+          0x44,            /* ; 0 ExtNTSCDelay */
+          0x44,            /* ; 1 StNTSCDelay */
+          0x44,            /* ; 2 ExtPALDelay */
+          0x44,            /* ; 3 StPALDelay */
+          0x44,            /* ; 4 ExtHiTVDelay(1080i) */
+          0x44,            /* ; 5 StHiTVDelay(1080i) */
+          0x44,            /* ; 6 ExtYPbPrDelay(525i) */
+          0x44,            /* ; 7 StYPbPrDealy(525i) */
+          0x44,            /* ; 8 ExtYPbPrDelay(525p) */
+          0x44,            /* ; 9 StYPbPrDealy(525p) */
+          0x44,            /* ; A ExtYPbPrDelay(750p) */
+          0x44             /* ; B StYPbPrDealy(750p) */
+};
+
+UCHAR XGI660_TVDelayList2[]=
+{
+          0x44,           /* ; 0 ExtNTSCDelay */
+          0x44,           /* ; 1 StNTSCDelay */
+          0x44,           /* ; 2 ExtPALDelay */
+          0x44,           /* ; 3 StPALDelay */
+          0x44,           /* ; 4 ExtHiTVDelay */
+          0x44,           /* ; 5 StHiTVDelay */
+          0x44,           /* ; 6 ExtYPbPrDelay(525i) */
+          0x44,           /* ; 7 StYPbPrDealy(525i) */
+          0x44,           /* ; 8 ExtYPbPrDelay(525p) */
+          0x44,           /* ; 9 StYPbPrDealy(525p) */
+          0x44,           /* ; A ExtYPbPrDelay(750p) */
+          0x44            /* ; B StYPbPrDealy(750p) */
+};
+
+UCHAR XGI301TVDelayList[]=
+{
+       0x22,            /* ; 0 ExtNTSCDelay */
+       0x22,            /* ; 1 StNTSCDelay */
+       0x22,            /* ; 2 ExtPALDelay */
+       0x22,            /* ; 3 StPALDelay */
+       0x88,            /* ; 4 ExtHiTVDelay(1080i) */
+       0xBB,            /* ; 5 StHiTVDelay(1080i) */
+       0x22,            /* ; 6 ExtYPbPrDelay(525i) */
+       0x22,            /* ; 7 StYPbPrDealy(525i) */
+       0x22,            /* ; 8 ExtYPbPrDelay(525p) */
+       0x22,            /* ; 9 StYPbPrDealy(525p) */
+       0x22,            /* ; A ExtYPbPrDelay(750p) */
+       0x22            /* B StYPbPrDealy(750p) */
+};
+
+UCHAR XGI301TVDelayList2[]=
+{
+       0x22,           /* ; 0 ExtNTSCDelay */
+       0x22,           /* ; 1 StNTSCDelay */
+       0x22,           /* ; 2 ExtPALDelay */
+       0x22,           /* ; 3 StPALDelay */
+       0x22,           /* ; 4 ExtHiTVDelay */
+       0x22,           /* ; 5 StHiTVDelay */
+       0x22,           /* ; 6 ExtYPbPrDelay(525i) */
+       0x22,           /* ; 7 StYPbPrDealy(525i) */
+       0x22,           /* ; 8 ExtYPbPrDelay(525p) */
+       0x22,           /* ; 9 StYPbPrDealy(525p) */
+       0x22,           /* ; A ExtYPbPrDelay(750p) */
+       0x22            /* ; B StYPbPrDealy(750p) */
+};
+
+
+UCHAR TVAntiFlickList[]=
+{/* NTSCAntiFlicker */
+                      0x04,           /* ; 0 Adaptive */
+                      0x00,           /* ; 1 new anti-flicker ? */
+/* PALAntiFlicker */
+                      0x04,           /* ; 0 Adaptive */
+                      0x08,           /* ; 1 new anti-flicker ? */
+/* HiTVAntiFlicker */
+                      0x04,           /* ; 0 ? */
+                      0x00            /* ; 1 new anti-flicker ? */
+};
+
+
+UCHAR TVEdgeList[]=
+{
+      0x00,            /* ; 0 NTSC No Edge enhance */
+      0x04,            /* ; 1 NTSC Adaptive Edge enhance */
+      0x00,            /* ; 0 PAL No Edge enhance */
+      0x04,            /* ; 1 PAL Adaptive Edge enhance */
+      0x00,            /* ; 0 HiTV */
+      0x00             /* ; 1 HiTV */
+};
+
+ULONG TVPhaseList[]=
+{      0x08BAED21, /* ; 0 NTSC phase */
+       0x00E3052A, /* ; 1 PAL phase */
+       0x9B2EE421, /* ; 2 PAL-M phase */
+       0xBA3EF421, /* ; 3 PAL-N phase */
+       0xA7A28B1E, /* ; 4 NTSC 1024x768 */
+       0xE00A831E, /* ; 5 PAL-M 1024x768 */
+       0x00000000, /* ; 6 reserved */
+       0x00000000, /* ; 7 reserved */
+       0xD67BF021, /* ; 8 NTSC phase */
+       0xE986092A, /* ; 9 PAL phase */
+       0xA4EFE621, /* ; A PAL-M phase */
+       0x4694F621, /* ; B PAL-N phase */
+       0x8BDE711C, /* ; C NTSC 1024x768 */
+       0xE00A831E  /* ; D PAL-M 1024x768 */
+};
+
+UCHAR NTSCYFilter1[]=
+{
+                     0x00,0xF4,0x10,0x38     ,/* 0 : 320x text mode */
+                      0x00,0xF4,0x10,0x38     ,/* 1 : 360x text mode */
+                      0xEB,0x04,0x25,0x18     ,/* 2 : 640x text mode */
+                      0xF1,0x04,0x1F,0x18     ,/* 3 : 720x text mode */
+                      0x00,0xF4,0x10,0x38     ,/* 4 : 320x gra. mode */
+                      0xEB,0x04,0x25,0x18     ,/* 5 : 640x gra. mode */
+                      0xEB,0x15,0x25,0xF6     /* 6 : 800x gra. mode */
+};
+
+UCHAR PALYFilter1[]=
+{
+                     0x00,0xF4,0x10,0x38, /* 0 : 320x text mode */
+                      0x00,0xF4,0x10,0x38     ,/* 1 : 360x text mode */
+                      0xF1,0xF7,0x1F,0x32     ,/* 2 : 640x text mode */
+                      0xF3,0x00,0x1D,0x20     ,/* 3 : 720x text mode */
+                      0x00,0xF4,0x10,0x38     ,/* 4 : 320x gra. mode */
+                      0xF1,0xF7,0x1F,0x32     ,/* 5 : 640x gra. mode */
+                      0xFC,0xFB,0x14,0x2A     /* 6 : 800x gra. mode */
+};
+
+UCHAR PALMYFilter1[]=
+{
+                     0x00,0xF4,0x10,0x38, /* 0 : 320x text mode */
+                      0x00,0xF4,0x10,0x38, /* 1 : 360x text mode */
+                      0xEB,0x04,0x10,0x18, /* 2 : 640x text mode */
+                      0xF7,0x06,0x19,0x14, /* 3 : 720x text mode */
+                      0x00,0xF4,0x10,0x38, /* 4 : 320x gra. mode */
+                      0xEB,0x04,0x25,0x18, /* 5 : 640x gra. mode */
+                      0xEB,0x15,0x25,0xF6, /* 6 : 800x gra. mode */
+                      0xFF,0xFF,0xFF,0xFF  /* End of Table */
+};
+
+UCHAR PALNYFilter1[]=
+{
+                     0x00,0xF4,0x10,0x38, /* 0 : 320x text mode */
+                      0x00,0xF4,0x10,0x38, /* 1 : 360x text mode */
+                      0xEB,0x04,0x10,0x18, /* 2 : 640x text mode */
+                      0xF7,0x06,0x19,0x14, /* 3 : 720x text mode */
+                      0x00,0xF4,0x10,0x38, /* 4 : 320x gra. mode */
+                      0xEB,0x04,0x25,0x18, /* 5 : 640x gra. mode */
+                      0xEB,0x15,0x25,0xF6, /* 6 : 800x gra. mode */
+                      0xFF,0xFF,0xFF,0xFF  /* End of Table */
+};
+
+UCHAR NTSCYFilter2[]=
+{
+                     0xFF,0x03,0x02,0xF6,0xFC,0x27,0x46, /* 0 : 320x text mode */
+                      0x01,0x02,0xFE,0xF7,0x03,0x27,0x3C, /* 1 : 360x text mode */
+                      0xFF,0x03,0x02,0xF6,0xFC,0x27,0x46, /* 2 : 640x text mode */
+                      0x01,0x02,0xFE,0xF7,0x03,0x27,0x3C, /* 3 : 720x text mode */
+                      0xFF,0x03,0x02,0xF6,0xFC,0x27,0x46, /* 4 : 320x gra. mode */
+                      0xFF,0x03,0x02,0xF6,0xFC,0x27,0x46, /* 5 : 640x gra. mode */
+                      0x01,0x01,0xFC,0xF8,0x08,0x26,0x38, /* 6 : 800x gra. mode */
+                      0xFF,0xFF,0xFC,0x00,0x0F,0x22,0x28  /* 7 : 1024xgra. mode */
+};
+
+UCHAR PALYFilter2[]=
+{
+                     0xFF,0x03,0x02,0xF6,0xFC,0x27,0x46, /* 0 : 320x text mode */
+                      0x01,0x02,0xFE,0xF7,0x03,0x27,0x3C, /* 1 : 360x text mode */
+                      0xFF,0x03,0x02,0xF6,0xFC,0x27,0x46, /* 2 : 640x text mode */
+                      0x01,0x02,0xFE,0xF7,0x03,0x27,0x3C, /* 3 : 720x text mode */
+                      0xFF,0x03,0x02,0xF6,0xFC,0x27,0x46, /* 4 : 320x gra. mode */
+                      0xFF,0x03,0x02,0xF6,0xFC,0x27,0x46, /* 5 : 640x gra. mode */
+                      0x01,0x01,0xFC,0xF8,0x08,0x26,0x38, /* 6 : 800x gra. mode */
+                      0xFF,0xFF,0xFC,0x00,0x0F,0x22,0x28  /* 7 : 1024xgra. mode */
+};
+
+UCHAR PALMYFilter2[]=
+{
+                     0xFF,0x03,0x02,0xF6,0xFC,0x27,0x46, /* 0 : 320x text mode */
+                      0x01,0x02,0xFE,0xF7,0x03,0x27,0x3C, /* 1 : 360x text mode */
+                      0xFF,0x03,0x02,0xF6,0xFC,0x27,0x46, /* 2 : 640x text mode */
+                      0x01,0x02,0xFE,0xF7,0x03,0x27,0x3C, /* 3 : 720x text mode */
+                      0xFF,0x03,0x02,0xF6,0xFC,0x27,0x46, /* 4 : 320x gra. mode */
+                      0xFF,0x03,0x02,0xF6,0xFC,0x27,0x46, /* 5 : 640x gra. mode */
+                      0x01,0x01,0xFC,0xF8,0x08,0x26,0x38, /* 6 : 800x gra. mode */
+                      0xFF,0xFF,0xFC,0x00,0x0F,0x22,0x28  /* 7 : 1024xgra. mode */
+};
+
+UCHAR PALNYFilter2[]=
+{
+                     0xFF,0x03,0x02,0xF6,0xFC,0x27,0x46, /* 0 : 320x text mode */
+                      0x01,0x02,0xFE,0xF7,0x03,0x27,0x3C, /* 1 : 360x text mode */
+                      0xFF,0x03,0x02,0xF6,0xFC,0x27,0x46, /* 2 : 640x text mode */
+                      0x01,0x02,0xFE,0xF7,0x03,0x27,0x3C, /* 3 : 720x text mode */
+                      0xFF,0x03,0x02,0xF6,0xFC,0x27,0x46, /* 4 : 320x gra. mode */
+                      0xFF,0x03,0x02,0xF6,0xFC,0x27,0x46, /* 5 : 640x gra. mode */
+                      0x01,0x01,0xFC,0xF8,0x08,0x26,0x38, /* 6 : 800x gra. mode */
+                      0xFF,0xFF,0xFC,0x00,0x0F,0x22,0x28  /* 7 : 1024xgra. mode */
+};
+
+UCHAR XGI_NTSC1024AdjTime[]=
+{
+      0xa7,0x07,0xf2,0x6e,0x17,0x8b,0x73,0x53,
+      0x13,0x40,0x34,0xF4,0x63,0xBB,0xCC,0x7A,
+      0x58,0xe4,0x73,0xd0,0x13
+};
+
+XGI301C_Tap4TimingStruct HiTVTap4Timing[]=
+{
+       {0,{
+       0x00,0x20,0x00,0x00,0x7F,0x20,0x02,0x7F, /* ; C0-C7 */
+       0x7D,0x20,0x04,0x7F,0x7D,0x1F,0x06,0x7E, /* ; C8-CF */
+       0x7C,0x1D,0x09,0x7E,0x7C,0x1B,0x0B,0x7E, /* ; D0-D7 */
+       0x7C,0x19,0x0E,0x7D,0x7C,0x17,0x11,0x7C, /* ; D8-DF */
+       0x7C,0x14,0x14,0x7C,0x7C,0x11,0x17,0x7C, /* ; E0-E7 */
+       0x7D,0x0E,0x19,0x7C,0x7E,0x0B,0x1B,0x7C, /* ; EA-EF */
+       0x7E,0x09,0x1D,0x7C,0x7F,0x06,0x1F,0x7C, /* ; F0-F7 */
+       0x7F,0x04,0x20,0x7D,0x00,0x02,0x20,0x7E  /* ; F8-FF */
+       }
+       }
+};
+
+XGI301C_Tap4TimingStruct EnlargeTap4Timing[]=
+{
+       {0,{
+       0x00,0x20,0x00,0x00,0x7F,0x20,0x02,0x7F, /* ; C0-C7 */
+       0x7D,0x20,0x04,0x7F,0x7D,0x1F,0x06,0x7E, /* ; C8-CF */
+       0x7C,0x1D,0x09,0x7E,0x7C,0x1B,0x0B,0x7E, /* ; D0-D7 */
+       0x7C,0x19,0x0E,0x7D,0x7C,0x17,0x11,0x7C, /* ; D8-DF */
+       0x7C,0x14,0x14,0x7C,0x7C,0x11,0x17,0x7C, /* ; E0-E7 */
+       0x7D,0x0E,0x19,0x7C,0x7E,0x0B,0x1B,0x7C, /* ; EA-EF */
+       0x7E,0x09,0x1D,0x7C,0x7F,0x06,0x1F,0x7C, /* ; F0-F7 */
+       0x7F,0x04,0x20,0x7D,0x00,0x02,0x20,0x7E   /* ; F8-FF */
+       }
+       }
+};
+
+XGI301C_Tap4TimingStruct NoScaleTap4Timing[]=
+{
+       {0,{
+       0x00,0x20,0x00,0x00,0x7F,0x20,0x02,0x7F, /* ; C0-C7 */
+       0x7D,0x20,0x04,0x7F,0x7D,0x1F,0x06,0x7E, /* ; C8-CF */
+       0x7C,0x1D,0x09,0x7E,0x7C,0x1B,0x0B,0x7E, /* ; D0-D7 */
+       0x7C,0x19,0x0E,0x7D,0x7C,0x17,0x11,0x7C, /* ; D8-DF */
+       0x7C,0x14,0x14,0x7C,0x7C,0x11,0x17,0x7C, /* ; E0-E7 */
+       0x7D,0x0E,0x19,0x7C,0x7E,0x0B,0x1B,0x7C, /* ; EA-EF */
+       0x7E,0x09,0x1D,0x7C,0x7F,0x06,0x1F,0x7C, /* ; F0-F7 */
+       0x7F,0x04,0x20,0x7D,0x00,0x02,0x20,0x7E  /* ; F8-FF */
+       }
+       }
+};
+
+XGI301C_Tap4TimingStruct PALTap4Timing[]=
+{
+       {600,  {
+                0x05,0x19,0x05,0x7D,0x03,0x19,0x06,0x7E, /* ; C0-C7 */
+                0x02,0x19,0x08,0x7D,0x01,0x18,0x0A,0x7D, /* ; C8-CF */
+                0x00,0x18,0x0C,0x7C,0x7F,0x17,0x0E,0x7C, /* ; D0-D7 */
+                0x7E,0x16,0x0F,0x7D,0x7E,0x14,0x11,0x7D, /* ; D8-DF */
+                0x7D,0x13,0x13,0x7D,0x7D,0x11,0x14,0x7E, /* ; E0-E7 */
+                0x7D,0x0F,0x16,0x7E,0x7D,0x0E,0x17,0x7E, /* ; EA-EF */
+                0x7D,0x0C,0x18,0x7F,0x7D,0x0A,0x18,0x01, /* ; F0-F7 */
+                0x7D,0x08,0x19,0x02,0x7D,0x06,0x19,0x04  /* ; F8-FF */
+                }
+       },
+        {768,  {
+                0x08,0x12,0x08,0x7E,0x07,0x12,0x09,0x7E, /* ; C0-C7 */
+                0x06,0x12,0x0A,0x7E,0x05,0x11,0x0B,0x7F, /* ; C8-CF */
+                0x04,0x11,0x0C,0x7F,0x03,0x11,0x0C,0x00, /* ; D0-D7 */
+                0x03,0x10,0x0D,0x00,0x02,0x0F,0x0E,0x01, /* ; D8-DF */
+                0x01,0x0F,0x0F,0x01,0x01,0x0E,0x0F,0x02, /* ; E0-E7 */
+                0x00,0x0D,0x10,0x03,0x7F,0x0C,0x11,0x04, /* ; EA-EF */
+                0x7F,0x0C,0x11,0x04,0x7F,0x0B,0x11,0x05, /* ; F0-F7 */
+                0x7E,0x0A,0x12,0x06,0x7E,0x09,0x12,0x07  /* ; F8-FF */
+                }
+        },
+        {0xFFFF,
+               {
+                0x04,0x1A,0x04,0x7E,0x02,0x1B,0x05,0x7E, /* ; C0-C7 */
+                0x01,0x1A,0x07,0x7E,0x00,0x1A,0x09,0x7D, /* ; C8-CF */
+                0x7F,0x19,0x0B,0x7D,0x7E,0x18,0x0D,0x7D, /* ; D0-D7 */
+                0x7D,0x17,0x10,0x7C,0x7D,0x15,0x12,0x7C, /* ; D8-DF */
+                0x7C,0x14,0x14,0x7C,0x7C,0x12,0x15,0x7D, /* ; E0-E7 */
+                0x7C,0x10,0x17,0x7D,0x7C,0x0D,0x18,0x7F, /* ; EA-EF */
+                0x7D,0x0B,0x19,0x7F,0x7D,0x09,0x1A,0x00, /* ; F0-F7 */
+                0x7D,0x07,0x1A,0x02,0x7E,0x05,0x1B,0x02  /* ; F8-FF */
+                }
+        }
+};
+
+XGI301C_Tap4TimingStruct NTSCTap4Timing[]=
+{
+       {480,   {
+               0x04,0x1A,0x04,0x7E,0x03,0x1A,0x06,0x7D, /* ; C0-C7 */
+               0x01,0x1A,0x08,0x7D,0x00,0x19,0x0A,0x7D, /* ; C8-CF */
+               0x7F,0x19,0x0C,0x7C,0x7E,0x18,0x0E,0x7C, /* ; D0-D7 */
+               0x7E,0x17,0x10,0x7B,0x7D,0x15,0x12,0x7C, /* ; D8-DF */
+               0x7D,0x13,0x13,0x7D,0x7C,0x12,0x15,0x7D, /* ; E0-E7 */
+               0x7C,0x10,0x17,0x7D,0x7C,0x0E,0x18,0x7E, /* ; EA-EF */
+               0x7D,0x0C,0x19,0x7E,0x7D,0x0A,0x19,0x00, /* ; F0-F7 */
+               0x7D,0x08,0x1A,0x01,0x7E,0x06,0x1A,0x02  /* ; F8-FF */
+               }
+        },
+        {600,  {
+               0x07,0x14,0x07,0x7E,0x06,0x14,0x09,0x7D, /* ; C0-C7 */
+               0x05,0x14,0x0A,0x7D,0x04,0x13,0x0B,0x7E, /* ; C8-CF */
+               0x03,0x13,0x0C,0x7E,0x02,0x12,0x0D,0x7F, /* ; D0-D7 */
+               0x01,0x12,0x0E,0x7F,0x01,0x11,0x0F,0x7F, /* ; D8-DF */
+               0x01,0x10,0x10,0x00,0x7F,0x0F,0x11,0x01, /* ; E0-E7 */
+               0x7F,0x0E,0x12,0x01,0x7E,0x0D,0x12,0x03, /* ; EA-EF */
+               0x7E,0x0C,0x13,0x03,0x7E,0x0B,0x13,0x04, /* ; F0-F7 */
+               0x7E,0x0A,0x14,0x04,0x7D,0x09,0x14,0x06  /* ; F8-FF */
+               }
+        },
+        {0xFFFF,
+               {
+               0x09,0x0F,0x09,0x7F,0x08,0x0F,0x09,0x00, /* ; C0-C7 */
+               0x07,0x0F,0x0A,0x00,0x06,0x0F,0x0A,0x01, /* ; C8-CF */
+               0x06,0x0E,0x0B,0x01,0x05,0x0E,0x0B,0x02, /* ; D0-D7 */
+               0x04,0x0E,0x0C,0x02,0x04,0x0D,0x0C,0x03, /* ; D8-DF */
+               0x03,0x0D,0x0D,0x03,0x02,0x0C,0x0D,0x05, /* ; E0-E7 */
+               0x02,0x0C,0x0E,0x04,0x01,0x0B,0x0E,0x06, /* ; EA-EF */
+               0x01,0x0B,0x0E,0x06,0x00,0x0A,0x0F,0x07, /* ; F0-F7 */
+               0x00,0x0A,0x0F,0x07,0x00,0x09,0x0F,0x08  /* ; F8-FF */
+               }
+        }
+};
+
+XGI301C_Tap4TimingStruct YPbPr525pTap4Timing[]=
+{
+       {480,   {
+               0x04,0x1A,0x04,0x7E,0x03,0x1A,0x06,0x7D, /* ; C0-C7 */
+               0x01,0x1A,0x08,0x7D,0x00,0x19,0x0A,0x7D, /* ; C8-CF */
+               0x7F,0x19,0x0C,0x7C,0x7E,0x18,0x0E,0x7C, /* ; D0-D7 */
+               0x7E,0x17,0x10,0x7B,0x7D,0x15,0x12,0x7C, /* ; D8-DF */
+               0x7D,0x13,0x13,0x7D,0x7C,0x12,0x15,0x7D, /* ; E0-E7 */
+               0x7C,0x10,0x17,0x7D,0x7C,0x0E,0x18,0x7E, /* ; EA-EF */
+               0x7D,0x0C,0x19,0x7E,0x7D,0x0A,0x19,0x00, /* ; F0-F7 */
+               0x7D,0x08,0x1A,0x01,0x7E,0x06,0x1A,0x02  /* ; F8-FF */
+               }
+        },
+        {600,  {
+               0x07,0x14,0x07,0x7E,0x06,0x14,0x09,0x7D, /* ; C0-C7 */
+               0x05,0x14,0x0A,0x7D,0x04,0x13,0x0B,0x7E, /* ; C8-CF */
+               0x03,0x13,0x0C,0x7E,0x02,0x12,0x0D,0x7F, /* ; D0-D7 */
+               0x01,0x12,0x0E,0x7F,0x01,0x11,0x0F,0x7F, /* ; D8-DF */
+               0x01,0x10,0x10,0x00,0x7F,0x0F,0x11,0x01, /* ; E0-E7 */
+               0x7F,0x0E,0x12,0x01,0x7E,0x0D,0x12,0x03, /* ; EA-EF */
+               0x7E,0x0C,0x13,0x03,0x7E,0x0B,0x13,0x04, /* ; F0-F7 */
+               0x7E,0x0A,0x14,0x04,0x7D,0x09,0x14,0x06  /* ; F8-FF */
+               }
+        },
+        {0xFFFF,
+               {
+               0x09,0x0F,0x09,0x7F,0x08,0x0F,0x09,0x00, /* ; C0-C7 */
+               0x07,0x0F,0x0A,0x00,0x06,0x0F,0x0A,0x01, /* ; C8-CF */
+               0x06,0x0E,0x0B,0x01,0x05,0x0E,0x0B,0x02, /* ; D0-D7 */
+               0x04,0x0E,0x0C,0x02,0x04,0x0D,0x0C,0x03, /* ; D8-DF */
+               0x03,0x0D,0x0D,0x03,0x02,0x0C,0x0D,0x05, /* ; E0-E7 */
+               0x02,0x0C,0x0E,0x04,0x01,0x0B,0x0E,0x06, /* ; EA-EF */
+               0x01,0x0B,0x0E,0x06,0x00,0x0A,0x0F,0x07, /* ; F0-F7 */
+               0x00,0x0A,0x0F,0x07,0x00,0x09,0x0F,0x08  /* ; F8-FF */
+               }
+        }
+};
+
+XGI301C_Tap4TimingStruct YPbPr525iTap4Timing[]=
+{
+       {480,   {
+               0x04,0x1A,0x04,0x7E,0x03,0x1A,0x06,0x7D, /* ; C0-C7 */
+               0x01,0x1A,0x08,0x7D,0x00,0x19,0x0A,0x7D, /* ; C8-CF */
+               0x7F,0x19,0x0C,0x7C,0x7E,0x18,0x0E,0x7C, /* ; D0-D7 */
+               0x7E,0x17,0x10,0x7B,0x7D,0x15,0x12,0x7C, /* ; D8-DF */
+               0x7D,0x13,0x13,0x7D,0x7C,0x12,0x15,0x7D, /* ; E0-E7 */
+               0x7C,0x10,0x17,0x7D,0x7C,0x0E,0x18,0x7E, /* ; EA-EF */
+               0x7D,0x0C,0x19,0x7E,0x7D,0x0A,0x19,0x00, /* ; F0-F7 */
+               0x7D,0x08,0x1A,0x01,0x7E,0x06,0x1A,0x02  /* ; F8-FF */
+               }
+        },
+        {600,  {
+               0x07,0x14,0x07,0x7E,0x06,0x14,0x09,0x7D, /* ; C0-C7 */
+               0x05,0x14,0x0A,0x7D,0x04,0x13,0x0B,0x7E, /* ; C8-CF */
+               0x03,0x13,0x0C,0x7E,0x02,0x12,0x0D,0x7F, /* ; D0-D7 */
+               0x01,0x12,0x0E,0x7F,0x01,0x11,0x0F,0x7F, /* ; D8-DF */
+               0x01,0x10,0x10,0x00,0x7F,0x0F,0x11,0x01, /* ; E0-E7 */
+               0x7F,0x0E,0x12,0x01,0x7E,0x0D,0x12,0x03, /* ; EA-EF */
+               0x7E,0x0C,0x13,0x03,0x7E,0x0B,0x13,0x04, /* ; F0-F7 */
+               0x7E,0x0A,0x14,0x04,0x7D,0x09,0x14,0x06  /* ; F8-FF */
+               }
+        },
+        {0xFFFF,
+               {
+               0x09,0x0F,0x09,0x7F,0x08,0x0F,0x09,0x00, /* ; C0-C7 */
+               0x07,0x0F,0x0A,0x00,0x06,0x0F,0x0A,0x01, /* ; C8-CF */
+               0x06,0x0E,0x0B,0x01,0x05,0x0E,0x0B,0x02, /* ; D0-D7 */
+               0x04,0x0E,0x0C,0x02,0x04,0x0D,0x0C,0x03, /* ; D8-DF */
+               0x03,0x0D,0x0D,0x03,0x02,0x0C,0x0D,0x05, /* ; E0-E7 */
+               0x02,0x0C,0x0E,0x04,0x01,0x0B,0x0E,0x06, /* ; EA-EF */
+               0x01,0x0B,0x0E,0x06,0x00,0x0A,0x0F,0x07, /* ; F0-F7 */
+               0x00,0x0A,0x0F,0x07,0x00,0x09,0x0F,0x08  /* ; F8-FF */
+               }
+        }
+};
+
+XGI301C_Tap4TimingStruct YPbPr750pTap4Timing[]=
+{        {0xFFFF,
+               {
+               0x05,0x19,0x05,0x7D,0x03,0x19,0x06,0x7E, /* ; C0-C7 */
+               0x02,0x19,0x08,0x7D,0x01,0x18,0x0A,0x7D, /* ; C8-CF */
+               0x00,0x18,0x0C,0x7C,0x7F,0x17,0x0E,0x7C, /* ; D0-D7 */
+               0x7E,0x16,0x0F,0x7D,0x7E,0x14,0x11,0x7D, /* ; D8-DF */
+               0x7D,0x13,0x13,0x7D,0x7D,0x11,0x14,0x7E, /* ; E0-E7 */
+               0x7D,0x0F,0x16,0x7E,0x7D,0x0E,0x17,0x7E, /* ; EA-EF */
+               0x7D,0x0C,0x18,0x7F,0x7D,0x0A,0x18,0x01, /* ; F0-F7 */
+               0x7D,0x08,0x19,0x02,0x7D,0x06,0x19,0x04 /* F8-FF */
+               }
+        }
+};
diff --git a/drivers/staging/xgifb/vb_util.c b/drivers/staging/xgifb/vb_util.c
new file mode 100644 (file)
index 0000000..87531b4
--- /dev/null
@@ -0,0 +1,263 @@
+#include "osdef.h"
+#include "vb_def.h"
+#include "vgatypes.h"
+#include "vb_struct.h"
+
+#ifdef LINUX_KERNEL
+#include "XGIfb.h"
+#include <asm/io.h>
+#include <linux/types.h>
+#endif
+
+#ifdef TC
+#include <stdio.h>
+#include <string.h>
+#include <conio.h>
+#include <dos.h>
+#endif
+
+#ifdef WIN2000
+#include <dderror.h>
+#include <devioctl.h>
+#include <miniport.h>
+#include <ntddvdeo.h>
+#include <video.h>
+
+#include "xgiv.h"
+#include "dd_i2c.h"
+#include "tools.h"
+#endif
+
+#ifdef LINUX_XF86
+#include "xf86.h"
+#include "xf86PciInfo.h"
+#include "xgi.h"
+#include "xgi_regs.h"
+#endif
+
+
+
+
+void XGINew_SetReg1( ULONG , USHORT , USHORT ) ;
+void XGINew_SetReg2( ULONG , USHORT , USHORT ) ;
+void XGINew_SetReg3( ULONG , USHORT ) ;
+void XGINew_SetReg4( ULONG , ULONG ) ;
+UCHAR XGINew_GetReg1( ULONG , USHORT) ;
+UCHAR XGINew_GetReg2( ULONG ) ;
+ULONG XGINew_GetReg3( ULONG ) ;
+void XGINew_ClearDAC( PUCHAR ) ;
+void     XGINew_SetRegANDOR(ULONG Port,USHORT Index,USHORT DataAND,USHORT DataOR);
+void     XGINew_SetRegOR(ULONG Port,USHORT Index,USHORT DataOR);
+void     XGINew_SetRegAND(ULONG Port,USHORT Index,USHORT DataAND);
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGINew_SetReg1 */
+/* Input : */
+/* Output : */
+/* Description : SR CRTC GR */
+/* --------------------------------------------------------------------- */
+void XGINew_SetReg1( ULONG port , USHORT index , USHORT data )
+{
+#ifdef LINUX_XF86
+    OutPortByte( ( PUCHAR )(ULONG)port , index ) ;
+    OutPortByte( ( PUCHAR )(ULONG)port + 1 , data ) ;
+#else
+    OutPortByte( port , index ) ;
+    OutPortByte( port + 1 , data ) ;
+#endif
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGINew_SetReg2 */
+/* Input : */
+/* Output : */
+/* Description : AR( 3C0 ) */
+/* --------------------------------------------------------------------- */
+/*void XGINew_SetReg2( ULONG port , USHORT index , USHORT data )
+{
+    InPortByte( ( PUCHAR )port + 0x3da - 0x3c0 ) ;
+    OutPortByte( XGINew_P3c0 , index ) ;
+    OutPortByte( XGINew_P3c0 , data ) ;
+    OutPortByte( XGINew_P3c0 , 0x20 ) ;
+}*/
+
+
+/* --------------------------------------------------------------------- */
+/* Function : */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGINew_SetReg3( ULONG port , USHORT data )
+{
+    OutPortByte( port , data ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGINew_SetReg4 */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGINew_SetReg4( ULONG port , ULONG data )
+{
+    OutPortLong( port , data ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGINew_GetReg1 */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+UCHAR XGINew_GetReg1( ULONG port , USHORT index )
+{
+    UCHAR data ;
+
+#ifdef LINUX_XF86
+    OutPortByte( ( PUCHAR )(ULONG)port , index ) ;
+    data = InPortByte( ( PUCHAR )(ULONG)port + 1 ) ;
+#else
+    OutPortByte( port , index ) ;
+    data = InPortByte( port + 1 ) ;
+#endif
+
+    return( data ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGINew_GetReg2 */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+UCHAR XGINew_GetReg2( ULONG port )
+{
+    UCHAR data ;
+
+    data = InPortByte( port ) ;
+
+    return( data ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGINew_GetReg3 */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+ULONG XGINew_GetReg3( ULONG port )
+{
+    ULONG data ;
+
+    data = InPortLong( port ) ;
+
+    return( data ) ;
+}
+
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGINew_SetRegANDOR */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGINew_SetRegANDOR( ULONG Port , USHORT Index , USHORT DataAND , USHORT DataOR )
+{
+    USHORT temp ;
+
+    temp = XGINew_GetReg1( Port , Index ) ;            /* XGINew_Part1Port index 02 */
+    temp = ( temp & ( DataAND ) ) | DataOR ;
+    XGINew_SetReg1( Port , Index , temp ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGINew_SetRegAND */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGINew_SetRegAND(ULONG Port,USHORT Index,USHORT DataAND)
+{
+    USHORT temp ;
+
+    temp = XGINew_GetReg1( Port , Index ) ;    /* XGINew_Part1Port index 02 */
+    temp &= DataAND ;
+    XGINew_SetReg1( Port , Index , temp ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : XGINew_SetRegOR */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void XGINew_SetRegOR( ULONG Port , USHORT Index , USHORT DataOR )
+{
+    USHORT temp ;
+
+    temp = XGINew_GetReg1( Port , Index ) ;    /* XGINew_Part1Port index 02 */
+    temp |= DataOR ;
+    XGINew_SetReg1( Port , Index , temp ) ;
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : NewDelaySecond */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void NewDelaySeconds( int seconds )
+{
+#ifdef WIN2000
+    int j ;
+#endif
+    int i ;
+
+
+    for( i = 0 ; i < seconds ; i++ )
+    {
+#ifdef TC
+        delay( 1000 ) ;
+#endif
+
+#ifdef WIN2000
+
+        for ( j = 0 ; j < 20000 ; j++ )
+            VideoPortStallExecution( 50 ) ;
+#endif
+
+#ifdef WINCE_HEADER
+#endif
+
+#ifdef LINUX_KERNEL
+#endif
+    }
+}
+
+
+/* --------------------------------------------------------------------- */
+/* Function : Newdebugcode */
+/* Input : */
+/* Output : */
+/* Description : */
+/* --------------------------------------------------------------------- */
+void Newdebugcode( UCHAR code )
+{
+//    OutPortByte ( 0x80 , code ) ;
+    /* OutPortByte ( 0x300 , code ) ; */
+    /* NewDelaySeconds( 0x3 ) ; */
+}
+
+
+
diff --git a/drivers/staging/xgifb/vb_util.h b/drivers/staging/xgifb/vb_util.h
new file mode 100644 (file)
index 0000000..91779d8
--- /dev/null
@@ -0,0 +1,15 @@
+#ifndef _VBUTIL_
+#define _VBUTIL_
+extern   void     NewDelaySeconds( int );
+extern   void     Newdebugcode( UCHAR );
+extern   void     XGINew_SetReg1(ULONG, USHORT, USHORT);
+extern   void     XGINew_SetReg3(ULONG, USHORT);
+extern   UCHAR    XGINew_GetReg1(ULONG, USHORT);
+extern   UCHAR    XGINew_GetReg2(ULONG);
+extern   void     XGINew_SetReg4(ULONG, ULONG);
+extern   ULONG    XGINew_GetReg3(ULONG);
+extern   void     XGINew_SetRegOR(ULONG Port,USHORT Index,USHORT DataOR);
+extern   void     XGINew_SetRegAND(ULONG Port,USHORT Index,USHORT DataAND);
+extern   void     XGINew_SetRegANDOR(ULONG Port,USHORT Index,USHORT DataAND,USHORT DataOR);
+#endif
+
diff --git a/drivers/staging/xgifb/vgatypes.h b/drivers/staging/xgifb/vgatypes.h
new file mode 100644 (file)
index 0000000..295ea86
--- /dev/null
@@ -0,0 +1,325 @@
+
+#ifndef _VGATYPES_
+#define _VGATYPES_
+
+#include "osdef.h"
+
+#ifdef LINUX_XF86
+#include "xf86Version.h"
+#include "xf86Pci.h"
+#endif
+
+#ifdef LINUX_KERNEL  /* We don't want the X driver to depend on kernel source */
+#include <linux/ioctl.h>
+#endif
+
+#ifndef FALSE
+#define FALSE   0
+#endif
+
+#ifndef TRUE
+#define TRUE    1
+#endif
+
+#ifndef NULL
+#define NULL    0
+#endif
+
+#ifndef CHAR
+typedef char CHAR;
+#endif
+
+#ifndef SHORT
+typedef short SHORT;
+#endif
+
+#ifndef LONG
+typedef long  LONG;
+#endif
+
+#ifndef UCHAR
+typedef unsigned char UCHAR;
+#endif
+
+#ifndef USHORT
+typedef unsigned short USHORT;
+#endif
+
+#ifndef ULONG
+typedef unsigned long ULONG;
+#endif
+
+#ifndef PUCHAR
+typedef UCHAR *PUCHAR;
+#endif
+
+#ifndef PUSHORT
+typedef USHORT *PUSHORT;
+#endif
+
+#ifndef PLONGU
+typedef ULONG *PULONG;
+#endif
+
+#ifndef VOID
+typedef void VOID;
+#endif
+
+#ifndef PVOID
+typedef void *PVOID;
+#endif
+
+#ifndef BOOLEAN
+typedef UCHAR BOOLEAN;
+#endif
+/*
+#ifndef bool
+typedef UCHAR bool;
+#endif
+*/
+#ifdef LINUX_KERNEL
+typedef unsigned long XGIIOADDRESS;
+#endif
+
+#ifdef LINUX_XF86
+#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,0,0,0)
+typedef unsigned char IOADDRESS;
+typedef unsigned char XGIIOADDRESS;
+#else
+typedef IOADDRESS XGIIOADDRESS;
+#endif
+#endif
+
+#ifndef VBIOS_VER_MAX_LENGTH
+#define VBIOS_VER_MAX_LENGTH    4
+#endif
+
+#ifndef WIN2000
+
+#ifndef LINUX_KERNEL   /* For the linux kernel, this is defined in xgifb.h */
+#ifndef XGI_CHIP_TYPE
+typedef enum _XGI_CHIP_TYPE {
+    XGI_VGALegacy = 0,
+#ifdef LINUX_XF86
+    XGI_530,
+    XGI_OLD,
+#endif
+    XGI_300,
+    XGI_630,
+    XGI_640,
+    XGI_315H,
+    XGI_315,
+    XGI_315PRO,
+    XGI_550,
+    XGI_650,
+    XGI_650M,
+    XGI_740,
+    XGI_330,
+    XGI_661,
+    XGI_660,
+    XGI_760,
+    XG40 = 32,
+    XG41,
+    XG42,
+    XG45,
+    XG20 = 48,
+    XG21,
+    XG27,
+    MAX_XGI_CHIP
+} XGI_CHIP_TYPE;
+#endif
+#endif
+
+#ifndef XGI_VB_CHIP_TYPE
+typedef enum _XGI_VB_CHIP_TYPE {
+    VB_CHIP_Legacy = 0,
+    VB_CHIP_301,
+    VB_CHIP_301B,
+    VB_CHIP_301LV,
+    VB_CHIP_302,
+    VB_CHIP_302B,
+    VB_CHIP_302LV,
+    VB_CHIP_301C,
+    VB_CHIP_302ELV,
+    VB_CHIP_UNKNOWN, /* other video bridge or no video bridge */
+    MAX_VB_CHIP
+} XGI_VB_CHIP_TYPE;
+#endif
+
+#ifndef XGI_LCD_TYPE
+typedef enum _XGI_LCD_TYPE {
+    LCD_INVALID = 0,
+    LCD_320x480,       /* FSTN, DSTN */
+    LCD_640x480,
+    LCD_640x480_2,     /* FSTN, DSTN */
+    LCD_640x480_3,     /* FSTN, DSTN */
+    LCD_800x600,
+    LCD_848x480,
+    LCD_1024x600,
+    LCD_1024x768,
+    LCD_1152x768,
+    LCD_1152x864,
+    LCD_1280x720,
+    LCD_1280x768,
+    LCD_1280x800,
+    LCD_1280x960,
+    LCD_1280x1024,
+    LCD_1400x1050,
+    LCD_1600x1200,
+    LCD_1680x1050,
+    LCD_1920x1440,
+    LCD_2048x1536,
+    LCD_CUSTOM,
+    LCD_UNKNOWN
+} XGI_LCD_TYPE;
+#endif
+
+#endif   /* not WIN2000 */
+
+#ifndef PXGI_DSReg
+typedef struct _XGI_DSReg
+{
+  UCHAR  jIdx;
+  UCHAR  jVal;
+} XGI_DSReg, *PXGI_DSReg;
+#endif
+
+#ifndef XGI_HW_DEVICE_INFO
+
+typedef struct _XGI_HW_DEVICE_INFO  XGI_HW_DEVICE_INFO, *PXGI_HW_DEVICE_INFO;
+
+typedef BOOLEAN (*PXGI_QUERYSPACE)   (PXGI_HW_DEVICE_INFO, ULONG, ULONG, ULONG *);
+
+struct _XGI_HW_DEVICE_INFO
+{
+    ULONG  ulExternalChip;       /* NO VB or other video bridge*/
+                                 /* if ujVBChipID = VB_CHIP_UNKNOWN, */
+#ifdef LINUX_XF86
+    PCITAG PciTag;              /* PCI Tag */
+#endif
+
+    PUCHAR  pjVirtualRomBase;    /* ROM image */
+
+    BOOLEAN UseROM;             /* Use the ROM image if provided */
+
+    PVOID   pDevice;
+
+    PUCHAR  pjVideoMemoryAddress;/* base virtual memory address */
+                                 /* of Linear VGA memory */
+
+    ULONG  ulVideoMemorySize;    /* size, in bytes, of the memory on the board */
+
+    PUCHAR pjIOAddress;          /* base I/O address of VGA ports (0x3B0) */
+
+    PUCHAR pjCustomizedROMImage;
+
+    PUCHAR pj2ndVideoMemoryAddress;
+    ULONG  ul2ndVideoMemorySize;
+
+    PUCHAR pj2ndIOAddress;
+/*#ifndef WIN2000
+    XGIIOADDRESS pjIOAddress;   //  base I/O address of VGA ports (0x3B0)
+#endif */
+    UCHAR  jChipType;            /* Used to Identify Graphics Chip */
+                                 /* defined in the data structure type  */
+                                 /* "XGI_CHIP_TYPE" */
+
+    UCHAR  jChipRevision;        /* Used to Identify Graphics Chip Revision */
+
+    UCHAR  ujVBChipID;           /* the ID of video bridge */
+                                 /* defined in the data structure type */
+                                 /* "XGI_VB_CHIP_TYPE" */
+
+    BOOLEAN    bNewScratch;
+
+    ULONG  ulCRT2LCDType;        /* defined in the data structure type */
+
+    ULONG usExternalChip;       /* NO VB or other video bridge (other than  */
+                                 /*  video bridge) */
+
+    BOOLEAN bIntegratedMMEnabled;/* supporting integration MM enable */
+
+    BOOLEAN bSkipDramSizing;     /* True: Skip video memory sizing. */
+
+    BOOLEAN bSkipSense;
+
+    BOOLEAN bIsPowerSaving;     /* True: XGIInit() is invoked by power management,
+                                   otherwise by 2nd adapter's initialzation */
+
+    PXGI_DSReg  pSR;             /* restore SR registers in initial function. */
+                                 /* end data :(idx, val) =  (FF, FF). */
+                                 /* Note : restore SR registers if  */
+                                 /* bSkipDramSizing = TRUE */
+
+    PXGI_DSReg  pCR;             /* restore CR registers in initial function. */
+                                 /* end data :(idx, val) =  (FF, FF) */
+                                 /* Note : restore cR registers if  */
+                                 /* bSkipDramSizing = TRUE */
+/*
+#endif
+*/
+
+    PXGI_QUERYSPACE  pQueryVGAConfigSpace;
+
+    PXGI_QUERYSPACE  pQueryNorthBridgeSpace;
+
+    UCHAR  szVBIOSVer[VBIOS_VER_MAX_LENGTH];
+
+};
+#endif
+
+/* Addtional IOCTL for communication xgifb <> X driver        */
+/* If changing this, xgifb.h must also be changed (for xgifb) */
+
+#ifdef LINUX_XF86  /* We don't want the X driver to depend on the kernel source */
+
+/* ioctl for identifying and giving some info (esp. memory heap start) */
+#define XGIFB_GET_INFO    0x80046ef8  /* Wow, what a terrible hack... */
+
+/* Structure argument for XGIFB_GET_INFO ioctl  */
+typedef struct _XGIFB_INFO xgifb_info, *pxgifb_info;
+
+struct _XGIFB_INFO {
+       CARD32  xgifb_id;               /* for identifying xgifb */
+#ifndef XGIFB_ID
+#define XGIFB_ID         0x53495346    /* Identify myself with 'XGIF' */
+#endif
+       CARD32  chip_id;                /* PCI ID of detected chip */
+       CARD32  memory;                 /* video memory in KB which xgifb manages */
+       CARD32  heapstart;              /* heap start (= xgifb "mem" argument) in KB */
+       CARD8   fbvidmode;              /* current xgifb mode */
+
+       CARD8   xgifb_version;
+       CARD8   xgifb_revision;
+       CARD8   xgifb_patchlevel;
+
+       CARD8   xgifb_caps;             /* xgifb's capabilities */
+
+       CARD32  xgifb_tqlen;            /* turbo queue length (in KB) */
+
+       CARD32  xgifb_pcibus;           /* The card's PCI ID */
+       CARD32  xgifb_pcislot;
+       CARD32  xgifb_pcifunc;
+
+       CARD8   xgifb_lcdpdc;
+
+       CARD8   xgifb_lcda;
+
+       CARD32  xgifb_vbflags;
+       CARD32  xgifb_currentvbflags;
+
+       CARD32  xgifb_scalelcd;
+       CARD32  xgifb_specialtiming;
+
+       CARD8   xgifb_haveemi;
+       CARD8   xgifb_emi30,xgifb_emi31,xgifb_emi32,xgifb_emi33;
+       CARD8   xgifb_haveemilcd;
+
+       CARD8   xgifb_lcdpdca;
+
+       CARD8 reserved[212];            /* for future use */
+};
+#endif
+
+#endif
+
index 0c2f14ff96968e9e910d353662932727177d9367..61d75507d5d0e8f385019f0917ef8f4f6b726ecb 100644 (file)
@@ -1201,7 +1201,7 @@ made_compressed_probe:
                if (rcv->urb == NULL) {
                        dev_dbg(&intf->dev,
                                "out of memory (read urbs usb_alloc_urb)\n");
-                       goto alloc_fail7;
+                       goto alloc_fail6;
                }
 
                rcv->urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
@@ -1225,7 +1225,7 @@ made_compressed_probe:
                if (snd->urb == NULL) {
                        dev_dbg(&intf->dev,
                                "out of memory (write urbs usb_alloc_urb)");
-                       goto alloc_fail7;
+                       goto alloc_fail8;
                }
 
                if (usb_endpoint_xfer_int(epwrite))
@@ -1264,6 +1264,7 @@ made_compressed_probe:
                i = device_create_file(&intf->dev,
                                                &dev_attr_iCountryCodeRelDate);
                if (i < 0) {
+                       device_remove_file(&intf->dev, &dev_attr_wCountryCodes);
                        kfree(acm->country_codes);
                        goto skip_countries;
                }
@@ -1300,6 +1301,7 @@ alloc_fail8:
                usb_free_urb(acm->wb[i].urb);
 alloc_fail7:
        acm_read_buffers_free(acm);
+alloc_fail6:
        for (i = 0; i < num_rx_buf; i++)
                usb_free_urb(acm->ru[i].urb);
        usb_free_urb(acm->ctrlurb);
index ded550eda5d967fbd2f91f34fab08458cf964d89..de98a94d18537835fafad621fe213c78bba00a61 100644 (file)
@@ -1328,6 +1328,7 @@ int usb_resume(struct device *dev, pm_message_t msg)
 
        /* For all other calls, take the device back to full power and
         * tell the PM core in case it was autosuspended previously.
+        * Unbind the interfaces that will need rebinding later.
         */
        } else {
                status = usb_resume_both(udev, msg);
@@ -1336,6 +1337,7 @@ int usb_resume(struct device *dev, pm_message_t msg)
                        pm_runtime_set_active(dev);
                        pm_runtime_enable(dev);
                        udev->last_busy = jiffies;
+                       do_unbind_rebind(udev, DO_REBIND);
                }
        }
 
index 649c0c5f7158d57cf1bdc3d7c382a10330cc4f63..591ae9fde1993db406d32626cf1aac3df9c36b57 100644 (file)
@@ -295,6 +295,7 @@ config USB_GADGET_S3C_HSOTG
        boolean "S3C HS/OtG USB Device controller"
        depends on S3C_DEV_USB_HSOTG
        select USB_GADGET_S3C_HSOTG_PIO
+       select USB_GADGET_DUALSPEED
        help
          The Samsung S3C64XX USB2.0 high-speed gadget controller
          integrated into the S3C64XX series SoC.
index 43bf44514c417d0431b52604569bef796871248b..b91115f84b137e69b539b6c09a6f76de2afc3dc0 100644 (file)
@@ -101,7 +101,7 @@ static struct uac_feature_unit_descriptor_0 feature_unit_desc = {
 static struct usb_audio_control mute_control = {
        .list = LIST_HEAD_INIT(mute_control.list),
        .name = "Mute Control",
-       .type = UAC_MUTE_CONTROL,
+       .type = UAC_FU_MUTE,
        /* Todo: add real Mute control code */
        .set = generic_set_cmd,
        .get = generic_get_cmd,
@@ -110,7 +110,7 @@ static struct usb_audio_control mute_control = {
 static struct usb_audio_control volume_control = {
        .list = LIST_HEAD_INIT(volume_control.list),
        .name = "Volume Control",
-       .type = UAC_VOLUME_CONTROL,
+       .type = UAC_FU_VOLUME,
        /* Todo: add real Volume control code */
        .set = generic_set_cmd,
        .get = generic_get_cmd,
index 8b960deed68069baf74cbfce86415450373ca001..c3caf1ac73ce4fc794ca7e47820ecf461bbcac70 100644 (file)
@@ -537,35 +537,35 @@ struct m66592 {
 /*-------------------------------------------------------------------------*/
 static inline u16 m66592_read(struct m66592 *m66592, unsigned long offset)
 {
-       return inw((unsigned long)m66592->reg + offset);
+       return ioread16(m66592->reg + offset);
 }
 
 static inline void m66592_read_fifo(struct m66592 *m66592,
                unsigned long offset,
                void *buf, unsigned long len)
 {
-       unsigned long fifoaddr = (unsigned long)m66592->reg + offset;
+       void __iomem *fifoaddr = m66592->reg + offset;
 
        if (m66592->pdata->on_chip) {
                len = (len + 3) / 4;
-               insl(fifoaddr, buf, len);
+               ioread32_rep(fifoaddr, buf, len);
        } else {
                len = (len + 1) / 2;
-               insw(fifoaddr, buf, len);
+               ioread16_rep(fifoaddr, buf, len);
        }
 }
 
 static inline void m66592_write(struct m66592 *m66592, u16 val,
                                unsigned long offset)
 {
-       outw(val, (unsigned long)m66592->reg + offset);
+       iowrite16(val, m66592->reg + offset);
 }
 
 static inline void m66592_write_fifo(struct m66592 *m66592,
                unsigned long offset,
                void *buf, unsigned long len)
 {
-       unsigned long fifoaddr = (unsigned long)m66592->reg + offset;
+       void __iomem *fifoaddr = m66592->reg + offset;
 
        if (m66592->pdata->on_chip) {
                unsigned long count;
@@ -573,25 +573,25 @@ static inline void m66592_write_fifo(struct m66592 *m66592,
                int i;
 
                count = len / 4;
-               outsl(fifoaddr, buf, count);
+               iowrite32_rep(fifoaddr, buf, count);
 
                if (len & 0x00000003) {
                        pb = buf + count * 4;
                        for (i = 0; i < (len & 0x00000003); i++) {
                                if (m66592_read(m66592, M66592_CFBCFG)) /* le */
-                                       outb(pb[i], fifoaddr + (3 - i));
+                                       iowrite8(pb[i], fifoaddr + (3 - i));
                                else
-                                       outb(pb[i], fifoaddr + i);
+                                       iowrite8(pb[i], fifoaddr + i);
                        }
                }
        } else {
                unsigned long odd = len & 0x0001;
 
                len = len / 2;
-               outsw(fifoaddr, buf, len);
+               iowrite16_rep(fifoaddr, buf, len);
                if (odd) {
                        unsigned char *p = buf + len*2;
-                       outb(*p, fifoaddr);
+                       iowrite8(*p, fifoaddr);
                }
        }
 }
index 888d8f166c0b1c9d4ddcac3fbf364935041458be..70a817842755484f5ee0b19e51db505b32532bf5 100644 (file)
@@ -1500,7 +1500,7 @@ static int __exit r8a66597_remove(struct platform_device *pdev)
        struct r8a66597         *r8a66597 = dev_get_drvdata(&pdev->dev);
 
        del_timer_sync(&r8a66597->timer);
-       iounmap((void *)r8a66597->reg);
+       iounmap(r8a66597->reg);
        free_irq(platform_get_irq(pdev, 0), r8a66597);
        r8a66597_free_request(&r8a66597->ep[0].ep, r8a66597->ep0_req);
 #ifdef CONFIG_HAVE_CLK
@@ -1578,7 +1578,7 @@ static int __init r8a66597_probe(struct platform_device *pdev)
        init_timer(&r8a66597->timer);
        r8a66597->timer.function = r8a66597_timer;
        r8a66597->timer.data = (unsigned long)r8a66597;
-       r8a66597->reg = (unsigned long)reg;
+       r8a66597->reg = reg;
 
 #ifdef CONFIG_HAVE_CLK
        if (r8a66597->pdata->on_chip) {
index 9a537aa07968d7b449972ba048a7d99d74f44d99..f763b5190afa2dfafb65c9b98da0ff9e62fcd7a4 100644 (file)
@@ -91,7 +91,7 @@ struct r8a66597_ep {
 
 struct r8a66597 {
        spinlock_t              lock;
-       unsigned long           reg;
+       void __iomem            *reg;
 
 #ifdef CONFIG_HAVE_CLK
        struct clk *clk;
@@ -127,7 +127,7 @@ struct r8a66597 {
 
 static inline u16 r8a66597_read(struct r8a66597 *r8a66597, unsigned long offset)
 {
-       return inw(r8a66597->reg + offset);
+       return ioread16(r8a66597->reg + offset);
 }
 
 static inline void r8a66597_read_fifo(struct r8a66597 *r8a66597,
@@ -135,7 +135,7 @@ static inline void r8a66597_read_fifo(struct r8a66597 *r8a66597,
                                      unsigned char *buf,
                                      int len)
 {
-       unsigned long fifoaddr = r8a66597->reg + offset;
+       void __iomem *fifoaddr = r8a66597->reg + offset;
        unsigned int data;
        int i;
 
@@ -144,7 +144,7 @@ static inline void r8a66597_read_fifo(struct r8a66597 *r8a66597,
 
                /* aligned buf case */
                if (len >= 4 && !((unsigned long)buf & 0x03)) {
-                       insl(fifoaddr, buf, len / 4);
+                       ioread32_rep(fifoaddr, buf, len / 4);
                        buf += len & ~0x03;
                        len &= 0x03;
                }
@@ -152,7 +152,7 @@ static inline void r8a66597_read_fifo(struct r8a66597 *r8a66597,
                /* unaligned buf case */
                for (i = 0; i < len; i++) {
                        if (!(i & 0x03))
-                               data = inl(fifoaddr);
+                               data = ioread32(fifoaddr);
 
                        buf[i] = (data >> ((i & 0x03) * 8)) & 0xff;
                }
@@ -161,7 +161,7 @@ static inline void r8a66597_read_fifo(struct r8a66597 *r8a66597,
 
                /* aligned buf case */
                if (len >= 2 && !((unsigned long)buf & 0x01)) {
-                       insw(fifoaddr, buf, len / 2);
+                       ioread16_rep(fifoaddr, buf, len / 2);
                        buf += len & ~0x01;
                        len &= 0x01;
                }
@@ -169,7 +169,7 @@ static inline void r8a66597_read_fifo(struct r8a66597 *r8a66597,
                /* unaligned buf case */
                for (i = 0; i < len; i++) {
                        if (!(i & 0x01))
-                               data = inw(fifoaddr);
+                               data = ioread16(fifoaddr);
 
                        buf[i] = (data >> ((i & 0x01) * 8)) & 0xff;
                }
@@ -179,7 +179,7 @@ static inline void r8a66597_read_fifo(struct r8a66597 *r8a66597,
 static inline void r8a66597_write(struct r8a66597 *r8a66597, u16 val,
                                  unsigned long offset)
 {
-       outw(val, r8a66597->reg + offset);
+       iowrite16(val, r8a66597->reg + offset);
 }
 
 static inline void r8a66597_write_fifo(struct r8a66597 *r8a66597,
@@ -187,21 +187,21 @@ static inline void r8a66597_write_fifo(struct r8a66597 *r8a66597,
                                       unsigned char *buf,
                                       int len)
 {
-       unsigned long fifoaddr = r8a66597->reg + offset;
+       void __iomem *fifoaddr = r8a66597->reg + offset;
        int adj = 0;
        int i;
 
        if (r8a66597->pdata->on_chip) {
                /* 32-bit access only if buf is 32-bit aligned */
                if (len >= 4 && !((unsigned long)buf & 0x03)) {
-                       outsl(fifoaddr, buf, len / 4);
+                       iowrite32_rep(fifoaddr, buf, len / 4);
                        buf += len & ~0x03;
                        len &= 0x03;
                }
        } else {
                /* 16-bit access only if buf is 16-bit aligned */
                if (len >= 2 && !((unsigned long)buf & 0x01)) {
-                       outsw(fifoaddr, buf, len / 2);
+                       iowrite16_rep(fifoaddr, buf, len / 2);
                        buf += len & ~0x01;
                        len &= 0x01;
                }
@@ -216,7 +216,7 @@ static inline void r8a66597_write_fifo(struct r8a66597 *r8a66597,
        }
 
        for (i = 0; i < len; i++)
-               outb(buf[i], fifoaddr + adj - (i & adj));
+               iowrite8(buf[i], fifoaddr + adj - (i & adj));
 }
 
 static inline void r8a66597_mdfy(struct r8a66597 *r8a66597,
index 1f73b485732d1b74028064e37193ce6f56021718..26193eceb3231d48c06e98b29a09cf9849b319f5 100644 (file)
@@ -297,6 +297,12 @@ static void s3c_hsotg_ctrl_epint(struct s3c_hsotg *hsotg,
  */
 static void s3c_hsotg_init_fifo(struct s3c_hsotg *hsotg)
 {
+       unsigned int ep;
+       unsigned int addr;
+       unsigned int size;
+       int timeout;
+       u32 val;
+
        /* the ryu 2.6.24 release ahs
           writel(0x1C0, hsotg->regs + S3C_GRXFSIZ);
           writel(S3C_GNPTXFSIZ_NPTxFStAddr(0x200) |
@@ -310,6 +316,51 @@ static void s3c_hsotg_init_fifo(struct s3c_hsotg *hsotg)
        writel(S3C_GNPTXFSIZ_NPTxFStAddr(2048) |
               S3C_GNPTXFSIZ_NPTxFDep(0x1C0),
               hsotg->regs + S3C_GNPTXFSIZ);
+
+       /* arange all the rest of the TX FIFOs, as some versions of this
+        * block have overlapping default addresses. This also ensures
+        * that if the settings have been changed, then they are set to
+        * known values. */
+
+       /* start at the end of the GNPTXFSIZ, rounded up */
+       addr = 2048 + 1024;
+       size = 768;
+
+       /* currently we allocate TX FIFOs for all possible endpoints,
+        * and assume that they are all the same size. */
+
+       for (ep = 0; ep <= 15; ep++) {
+               val = addr;
+               val |= size << S3C_DPTXFSIZn_DPTxFSize_SHIFT;
+               addr += size;
+
+               writel(val, hsotg->regs + S3C_DPTXFSIZn(ep));
+       }
+
+       /* according to p428 of the design guide, we need to ensure that
+        * all fifos are flushed before continuing */
+
+       writel(S3C_GRSTCTL_TxFNum(0x10) | S3C_GRSTCTL_TxFFlsh |
+              S3C_GRSTCTL_RxFFlsh, hsotg->regs + S3C_GRSTCTL);
+
+       /* wait until the fifos are both flushed */
+       timeout = 100;
+       while (1) {
+               val = readl(hsotg->regs + S3C_GRSTCTL);
+
+               if ((val & (S3C_GRSTCTL_TxFFlsh | S3C_GRSTCTL_RxFFlsh)) == 0)
+                       break;
+
+               if (--timeout == 0) {
+                       dev_err(hsotg->dev,
+                               "%s: timeout flushing fifos (GRSTCTL=%08x)\n",
+                               __func__, val);
+               }
+
+               udelay(1);
+       }
+
+       dev_dbg(hsotg->dev, "FIFOs reset, timeout at %d\n", timeout);
 }
 
 /**
@@ -2574,6 +2625,9 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver)
        writel(S3C_DCTL_CGOUTNak | S3C_DCTL_CGNPInNAK,
               hsotg->regs + S3C_DCTL);
 
+       /* must be at-least 3ms to allow bus to see disconnect */
+       msleep(3);
+
        /* remove the soft-disconnect and let's go */
        __bic32(hsotg->regs + S3C_DCTL, S3C_DCTL_SftDiscon);
 
@@ -2730,6 +2784,9 @@ static void s3c_hsotg_init(struct s3c_hsotg *hsotg)
 
        writel(0, hsotg->regs + S3C_DAINTMSK);
 
+       /* Be in disconnected state until gadget is registered */
+       __orr32(hsotg->regs + S3C_DCTL, S3C_DCTL_SftDiscon);
+
        if (0) {
                /* post global nak until we're ready */
                writel(S3C_DCTL_SGNPInNAK | S3C_DCTL_SGOUTNak,
index ef3e88f0b3c307c0d605ad6f77b70407e90ae829..a3ef2a9d9dc2793c127994838abdd13eb8248b3f 100644 (file)
@@ -1135,7 +1135,7 @@ MODULE_LICENSE ("GPL");
 
 #ifdef CONFIG_XPS_USB_HCD_XILINX
 #include "ehci-xilinx-of.c"
-#define OF_PLATFORM_DRIVER     ehci_hcd_xilinx_of_driver
+#define XILINX_OF_PLATFORM_DRIVER      ehci_hcd_xilinx_of_driver
 #endif
 
 #ifdef CONFIG_PLAT_ORION
@@ -1159,7 +1159,8 @@ MODULE_LICENSE ("GPL");
 #endif
 
 #if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER) && \
-    !defined(PS3_SYSTEM_BUS_DRIVER) && !defined(OF_PLATFORM_DRIVER)
+    !defined(PS3_SYSTEM_BUS_DRIVER) && !defined(OF_PLATFORM_DRIVER) && \
+    !defined(XILINX_OF_PLATFORM_DRIVER)
 #error "missing bus glue for ehci-hcd"
 #endif
 
@@ -1213,10 +1214,20 @@ static int __init ehci_hcd_init(void)
        if (retval < 0)
                goto clean3;
 #endif
+
+#ifdef XILINX_OF_PLATFORM_DRIVER
+       retval = of_register_platform_driver(&XILINX_OF_PLATFORM_DRIVER);
+       if (retval < 0)
+               goto clean4;
+#endif
        return retval;
 
+#ifdef XILINX_OF_PLATFORM_DRIVER
+       /* of_unregister_platform_driver(&XILINX_OF_PLATFORM_DRIVER); */
+clean4:
+#endif
 #ifdef OF_PLATFORM_DRIVER
-       /* of_unregister_platform_driver(&OF_PLATFORM_DRIVER); */
+       of_unregister_platform_driver(&OF_PLATFORM_DRIVER);
 clean3:
 #endif
 #ifdef PS3_SYSTEM_BUS_DRIVER
@@ -1243,6 +1254,9 @@ module_init(ehci_hcd_init);
 
 static void __exit ehci_hcd_cleanup(void)
 {
+#ifdef XILINX_OF_PLATFORM_DRIVER
+       of_unregister_platform_driver(&XILINX_OF_PLATFORM_DRIVER);
+#endif
 #ifdef OF_PLATFORM_DRIVER
        of_unregister_platform_driver(&OF_PLATFORM_DRIVER);
 #endif
index 5151516ea1dee98a093b35cee1b89f4bca3cd457..d995351f9bed8cf31d07fb9163a328f22cf88aa6 100644 (file)
@@ -65,7 +65,7 @@ static inline void delayed_insw(unsigned int addr, void *buf, int len)
        unsigned short *bp = (unsigned short *)buf;
        while (len--) {
                DUMMY_DELAY_ACCESS;
-               *bp++ = inw((void *)addr);
+               *bp++ = inw(addr);
        }
 }
 
index 6db57ab6079d31a7a6a2d107834ba42eeeec9839..1a2bb4ce638fefe0c1fa6ff2151c32f5fe685528 100644 (file)
@@ -2404,7 +2404,7 @@ static int __init_or_module r8a66597_remove(struct platform_device *pdev)
 
        del_timer_sync(&r8a66597->rh_timer);
        usb_remove_hcd(hcd);
-       iounmap((void *)r8a66597->reg);
+       iounmap(r8a66597->reg);
 #ifdef CONFIG_HAVE_CLK
        if (r8a66597->pdata->on_chip)
                clk_put(r8a66597->clk);
@@ -2496,7 +2496,7 @@ static int __devinit r8a66597_probe(struct platform_device *pdev)
        init_timer(&r8a66597->rh_timer);
        r8a66597->rh_timer.function = r8a66597_timer;
        r8a66597->rh_timer.data = (unsigned long)r8a66597;
-       r8a66597->reg = (unsigned long)reg;
+       r8a66597->reg = reg;
 
        /* make sure no interrupts are pending */
        ret = r8a66597_clock_enable(r8a66597);
index 228e3fb23854e7b3fe0f403c360f1fdb0bdf7414..95d0f5adfdcff9d2c67dcb327507dd192d5903f1 100644 (file)
@@ -112,7 +112,7 @@ struct r8a66597_root_hub {
 
 struct r8a66597 {
        spinlock_t lock;
-       unsigned long reg;
+       void __iomem *reg;
 #ifdef CONFIG_HAVE_CLK
        struct clk *clk;
 #endif
@@ -170,67 +170,67 @@ static inline struct urb *r8a66597_get_urb(struct r8a66597 *r8a66597,
 
 static inline u16 r8a66597_read(struct r8a66597 *r8a66597, unsigned long offset)
 {
-       return inw(r8a66597->reg + offset);
+       return ioread16(r8a66597->reg + offset);
 }
 
 static inline void r8a66597_read_fifo(struct r8a66597 *r8a66597,
                                      unsigned long offset, u16 *buf,
                                      int len)
 {
-       unsigned long fifoaddr = r8a66597->reg + offset;
+       void __iomem *fifoaddr = r8a66597->reg + offset;
        unsigned long count;
 
        if (r8a66597->pdata->on_chip) {
                count = len / 4;
-               insl(fifoaddr, buf, count);
+               ioread32_rep(fifoaddr, buf, count);
 
                if (len & 0x00000003) {
-                       unsigned long tmp = inl(fifoaddr);
+                       unsigned long tmp = ioread32(fifoaddr);
                        memcpy((unsigned char *)buf + count * 4, &tmp,
                               len & 0x03);
                }
        } else {
                len = (len + 1) / 2;
-               insw(fifoaddr, buf, len);
+               ioread16_rep(fifoaddr, buf, len);
        }
 }
 
 static inline void r8a66597_write(struct r8a66597 *r8a66597, u16 val,
                                  unsigned long offset)
 {
-       outw(val, r8a66597->reg + offset);
+       iowrite16(val, r8a66597->reg + offset);
 }
 
 static inline void r8a66597_write_fifo(struct r8a66597 *r8a66597,
                                       unsigned long offset, u16 *buf,
                                       int len)
 {
-       unsigned long fifoaddr = r8a66597->reg + offset;
+       void __iomem *fifoaddr = r8a66597->reg + offset;
        unsigned long count;
        unsigned char *pb;
        int i;
 
        if (r8a66597->pdata->on_chip) {
                count = len / 4;
-               outsl(fifoaddr, buf, count);
+               iowrite32_rep(fifoaddr, buf, count);
 
                if (len & 0x00000003) {
                        pb = (unsigned char *)buf + count * 4;
                        for (i = 0; i < (len & 0x00000003); i++) {
                                if (r8a66597_read(r8a66597, CFIFOSEL) & BIGEND)
-                                       outb(pb[i], fifoaddr + i);
+                                       iowrite8(pb[i], fifoaddr + i);
                                else
-                                       outb(pb[i], fifoaddr + 3 - i);
+                                       iowrite8(pb[i], fifoaddr + 3 - i);
                        }
                }
        } else {
                int odd = len & 0x0001;
 
                len = len / 2;
-               outsw(fifoaddr, buf, len);
+               ioread16_rep(fifoaddr, buf, len);
                if (unlikely(odd)) {
                        buf = &buf[len];
-                       outb((unsigned char)*buf, fifoaddr);
+                       iowrite8((unsigned char)*buf, fifoaddr);
                }
        }
 }
index edffd81fc253f390e8bf3b42e1fab702bb2baae1..11482b6b938152bcb4ff1b752f031dce1cc71ba3 100644 (file)
@@ -78,6 +78,8 @@ static int xhci_pci_setup(struct usb_hcd *hcd)
                        xhci_dbg(xhci, "QUIRK: Fresco Logic xHC needs configure"
                                        " endpoint cmd after reset endpoint\n");
        }
+       if (pdev->vendor == PCI_VENDOR_ID_NEC)
+               xhci->quirks |= XHCI_NEC_HOST;
 
        /* Make sure the HC is halted. */
        retval = xhci_halt(xhci);
index 36c858e5b529136d8ec76af58454f466a10de793..9012098add6baefada9cd6155d57be8f9708afd7 100644 (file)
@@ -1071,6 +1071,15 @@ bandwidth_change:
                        xhci_warn(xhci, "Reset device command completion "
                                        "for disabled slot %u\n", slot_id);
                break;
+       case TRB_TYPE(TRB_NEC_GET_FW):
+               if (!(xhci->quirks & XHCI_NEC_HOST)) {
+                       xhci->error_bitmask |= 1 << 6;
+                       break;
+               }
+               xhci_dbg(xhci, "NEC firmware version %2x.%02x\n",
+                               NEC_FW_MAJOR(event->status),
+                               NEC_FW_MINOR(event->status));
+               break;
        default:
                /* Skip over unknown commands on the event ring */
                xhci->error_bitmask |= 1 << 6;
@@ -1079,6 +1088,17 @@ bandwidth_change:
        inc_deq(xhci, xhci->cmd_ring, false);
 }
 
+static void handle_vendor_event(struct xhci_hcd *xhci,
+               union xhci_trb *event)
+{
+       u32 trb_type;
+
+       trb_type = TRB_FIELD_TO_TYPE(event->generic.field[3]);
+       xhci_dbg(xhci, "Vendor specific event TRB type = %u\n", trb_type);
+       if (trb_type == TRB_NEC_CMD_COMP && (xhci->quirks & XHCI_NEC_HOST))
+               handle_cmd_completion(xhci, &event->event_cmd);
+}
+
 static void handle_port_status(struct xhci_hcd *xhci,
                union xhci_trb *event)
 {
@@ -1659,7 +1679,10 @@ void xhci_handle_event(struct xhci_hcd *xhci)
                        update_ptrs = 0;
                break;
        default:
-               xhci->error_bitmask |= 1 << 3;
+               if ((event->event_cmd.flags & TRB_TYPE_BITMASK) >= TRB_TYPE(48))
+                       handle_vendor_event(xhci, event);
+               else
+                       xhci->error_bitmask |= 1 << 3;
        }
        /* Any of the above functions may drop and re-acquire the lock, so check
         * to make sure a watchdog timer didn't mark the host as non-responsive.
@@ -2378,6 +2401,12 @@ int xhci_queue_address_device(struct xhci_hcd *xhci, dma_addr_t in_ctx_ptr,
                        false);
 }
 
+int xhci_queue_vendor_command(struct xhci_hcd *xhci,
+               u32 field1, u32 field2, u32 field3, u32 field4)
+{
+       return queue_command(xhci, field1, field2, field3, field4, false);
+}
+
 /* Queue a reset device command TRB */
 int xhci_queue_reset_device(struct xhci_hcd *xhci, u32 slot_id)
 {
index 40e0a0c221b82cddfbcb6875f87cdaafcf390c16..27345cd04da0ccf99335064e2f37ad0950fb511f 100644 (file)
@@ -105,6 +105,33 @@ int xhci_halt(struct xhci_hcd *xhci)
                        STS_HALT, STS_HALT, XHCI_MAX_HALT_USEC);
 }
 
+/*
+ * Set the run bit and wait for the host to be running.
+ */
+int xhci_start(struct xhci_hcd *xhci)
+{
+       u32 temp;
+       int ret;
+
+       temp = xhci_readl(xhci, &xhci->op_regs->command);
+       temp |= (CMD_RUN);
+       xhci_dbg(xhci, "// Turn on HC, cmd = 0x%x.\n",
+                       temp);
+       xhci_writel(xhci, temp, &xhci->op_regs->command);
+
+       /*
+        * Wait for the HCHalted Status bit to be 0 to indicate the host is
+        * running.
+        */
+       ret = handshake(xhci, &xhci->op_regs->status,
+                       STS_HALT, 0, XHCI_MAX_HALT_USEC);
+       if (ret == -ETIMEDOUT)
+               xhci_err(xhci, "Host took too long to start, "
+                               "waited %u microseconds.\n",
+                               XHCI_MAX_HALT_USEC);
+       return ret;
+}
+
 /*
  * Reset a halted HC, and set the internal HC state to HC_STATE_HALT.
  *
@@ -116,6 +143,7 @@ int xhci_reset(struct xhci_hcd *xhci)
 {
        u32 command;
        u32 state;
+       int ret;
 
        state = xhci_readl(xhci, &xhci->op_regs->status);
        if ((state & STS_HALT) == 0) {
@@ -130,7 +158,17 @@ int xhci_reset(struct xhci_hcd *xhci)
        /* XXX: Why does EHCI set this here?  Shouldn't other code do this? */
        xhci_to_hcd(xhci)->state = HC_STATE_HALT;
 
-       return handshake(xhci, &xhci->op_regs->command, CMD_RESET, 0, 250 * 1000);
+       ret = handshake(xhci, &xhci->op_regs->command,
+                       CMD_RESET, 0, 250 * 1000);
+       if (ret)
+               return ret;
+
+       xhci_dbg(xhci, "Wait for controller to be ready for doorbell rings\n");
+       /*
+        * xHCI cannot write to any doorbells or operational registers other
+        * than status until the "Controller Not Ready" flag is cleared.
+        */
+       return handshake(xhci, &xhci->op_regs->status, STS_CNR, 0, 250 * 1000);
 }
 
 
@@ -448,17 +486,20 @@ int xhci_run(struct usb_hcd *hcd)
 
        if (NUM_TEST_NOOPS > 0)
                doorbell = xhci_setup_one_noop(xhci);
+       if (xhci->quirks & XHCI_NEC_HOST)
+               xhci_queue_vendor_command(xhci, 0, 0, 0,
+                               TRB_TYPE(TRB_NEC_GET_FW));
+
+       if (xhci_start(xhci)) {
+               xhci_halt(xhci);
+               return -ENODEV;
+       }
 
-       temp = xhci_readl(xhci, &xhci->op_regs->command);
-       temp |= (CMD_RUN);
-       xhci_dbg(xhci, "// Turn on HC, cmd = 0x%x.\n",
-                       temp);
-       xhci_writel(xhci, temp, &xhci->op_regs->command);
-       /* Flush PCI posted writes */
-       temp = xhci_readl(xhci, &xhci->op_regs->command);
        xhci_dbg(xhci, "// @%p = 0x%x\n", &xhci->op_regs->command, temp);
        if (doorbell)
                (*doorbell)(xhci);
+       if (xhci->quirks & XHCI_NEC_HOST)
+               xhci_ring_cmd_db(xhci);
 
        xhci_dbg(xhci, "Finished xhci_run\n");
        return 0;
index dada2fb592616f770c0c01845438a07257d6cf7b..8b4b7d39f79cafb927523e94d95a93f59dd1b9cf 100644 (file)
@@ -925,6 +925,7 @@ union xhci_trb {
 /* TRB bit mask */
 #define        TRB_TYPE_BITMASK        (0xfc00)
 #define TRB_TYPE(p)            ((p) << 10)
+#define TRB_FIELD_TO_TYPE(p)   (((p) & TRB_TYPE_BITMASK) >> 10)
 /* TRB type IDs */
 /* bulk, interrupt, isoc scatter/gather, and control data stage */
 #define TRB_NORMAL             1
@@ -992,6 +993,14 @@ union xhci_trb {
 #define TRB_MFINDEX_WRAP       39
 /* TRB IDs 40-47 reserved, 48-63 is vendor-defined */
 
+/* Nec vendor-specific command completion event. */
+#define        TRB_NEC_CMD_COMP        48
+/* Get NEC firmware revision. */
+#define        TRB_NEC_GET_FW          49
+
+#define NEC_FW_MINOR(p)                (((p) >> 0) & 0xff)
+#define NEC_FW_MAJOR(p)                (((p) >> 8) & 0xff)
+
 /*
  * TRBS_PER_SEGMENT must be a multiple of 4,
  * since the command ring is 64-byte aligned.
@@ -1172,6 +1181,7 @@ struct xhci_hcd {
        unsigned int            quirks;
 #define        XHCI_LINK_TRB_QUIRK     (1 << 0)
 #define XHCI_RESET_EP_QUIRK    (1 << 1)
+#define XHCI_NEC_HOST          (1 << 2)
 };
 
 /* For testing purposes */
@@ -1379,6 +1389,8 @@ void xhci_set_hc_event_deq(struct xhci_hcd *xhci);
 int xhci_queue_slot_control(struct xhci_hcd *xhci, u32 trb_type, u32 slot_id);
 int xhci_queue_address_device(struct xhci_hcd *xhci, dma_addr_t in_ctx_ptr,
                u32 slot_id);
+int xhci_queue_vendor_command(struct xhci_hcd *xhci,
+               u32 field1, u32 field2, u32 field3, u32 field4);
 int xhci_queue_stop_endpoint(struct xhci_hcd *xhci, int slot_id,
                unsigned int ep_index);
 int xhci_queue_ctrl_tx(struct xhci_hcd *xhci, gfp_t mem_flags, struct urb *urb,
index 3edda3ed822a5326e1072e3f49bc163af2878dae..fd35f73b572154b33b60d6415cf59ea4edde054f 100644 (file)
@@ -1239,8 +1239,7 @@ static void digi_write_bulk_callback(struct urb *urb)
 
        /* port and serial sanity check */
        if (port == NULL || (priv = usb_get_serial_port_data(port)) == NULL) {
-               dev_err(&port->dev,
-                       "%s: port or port->private is NULL, status=%d\n",
+               pr_err("%s: port or port->private is NULL, status=%d\n",
                        __func__, status);
                return;
        }
index 050211afc07ede3ded137a28b46aba79dcb01ebe..79dd1ae195e56263610c63c1d3da6e7bb71b1de5 100644 (file)
@@ -2005,6 +2005,8 @@ static void ftdi_set_termios(struct tty_struct *tty,
                                "urb failed to set to rts/cts flow control\n");
                }
 
+               /* raise DTR/RTS */
+               set_mctrl(port, TIOCM_DTR | TIOCM_RTS);
        } else {
                /*
                 * Xon/Xoff code
@@ -2052,6 +2054,8 @@ static void ftdi_set_termios(struct tty_struct *tty,
                        }
                }
 
+               /* lower DTR/RTS */
+               clear_mctrl(port, TIOCM_DTR | TIOCM_RTS);
        }
        return;
 }
index f8424d1bfc1b279a5e4a51fc4453fb3e3f847ffb..585b7e6637405981e5019790bbdb0700109f87d0 100644 (file)
@@ -730,7 +730,6 @@ static void mos7840_bulk_in_callback(struct urb *urb)
        mos7840_port = urb->context;
        if (!mos7840_port) {
                dbg("%s", "NULL mos7840_port pointer");
-               mos7840_port->read_urb_busy = false;
                return;
        }
 
index 1e6fec487973c45a0407326f09a62f6015c39589..3d94a1471724ff620ba580808be1ceec0d868b15 100644 (file)
@@ -8,6 +8,9 @@ menu "Graphics support"
 config HAVE_FB_ATMEL
        bool
 
+config HAVE_FB_IMX
+       bool
+
 source "drivers/char/agp/Kconfig"
 
 source "drivers/gpu/vga/Kconfig"
@@ -400,9 +403,6 @@ config FB_SA1100
          If you plan to use the LCD display with your SA-1100 system, say
          Y here.
 
-config HAVE_FB_IMX
-       bool
-
 config FB_IMX
        tristate "Motorola i.MX LCD support"
        depends on FB && (HAVE_FB_IMX || ARCH_MX1 || ARCH_MX2)
index 073c9b408cf7ce1ceff2b5eb52c6f49510273291..6b93ef93cb12c08179c973e31bf97ff27eb4d56b 100644 (file)
@@ -100,6 +100,16 @@ static int fb_deferred_io_mkwrite(struct vm_area_struct *vma,
        /* protect against the workqueue changing the page list */
        mutex_lock(&fbdefio->lock);
 
+       /*
+        * We want the page to remain locked from ->page_mkwrite until
+        * the PTE is marked dirty to avoid page_mkclean() being called
+        * before the PTE is updated, which would leave the page ignored
+        * by defio.
+        * Do this by locking the page here and informing the caller
+        * about it with VM_FAULT_LOCKED.
+        */
+       lock_page(page);
+
        /* we loop through the pagelist before adding in order
        to keep the pagelist sorted */
        list_for_each_entry(cur, &fbdefio->pagelist, lru) {
@@ -121,7 +131,7 @@ page_already_added:
 
        /* come back after delay to process the deferred IO */
        schedule_delayed_work(&info->deferred_work, fbdefio->delay);
-       return 0;
+       return VM_FAULT_LOCKED;
 }
 
 static const struct vm_operations_struct fb_deferred_io_vm_ops = {
@@ -155,41 +165,25 @@ static void fb_deferred_io_work(struct work_struct *work)
 {
        struct fb_info *info = container_of(work, struct fb_info,
                                                deferred_work.work);
+       struct list_head *node, *next;
+       struct page *cur;
        struct fb_deferred_io *fbdefio = info->fbdefio;
-       struct page *page, *tmp_page;
-       struct list_head *node, *tmp_node;
-       struct list_head non_dirty;
-
-       INIT_LIST_HEAD(&non_dirty);
 
        /* here we mkclean the pages, then do all deferred IO */
        mutex_lock(&fbdefio->lock);
-       list_for_each_entry_safe(page, tmp_page, &fbdefio->pagelist, lru) {
-               lock_page(page);
-               /*
-                * The workqueue callback can be triggered after a
-                * ->page_mkwrite() call but before the PTE has been marked
-                * dirty. In this case page_mkclean() won't "rearm" the page.
-                *
-                * To avoid this, remove those "non-dirty" pages from the
-                * pagelist before calling the driver's callback, then add
-                * them back to get processed on the next work iteration.
-                * At that time, their PTEs will hopefully be dirty for real.
-                */
-               if (!page_mkclean(page))
-                       list_move_tail(&page->lru, &non_dirty);
-               unlock_page(page);
+       list_for_each_entry(cur, &fbdefio->pagelist, lru) {
+               lock_page(cur);
+               page_mkclean(cur);
+               unlock_page(cur);
        }
 
        /* driver's callback with pagelist */
        fbdefio->deferred_io(info, &fbdefio->pagelist);
 
-       /* clear the list... */
-       list_for_each_safe(node, tmp_node, &fbdefio->pagelist) {
+       /* clear the list */
+       list_for_each_safe(node, next, &fbdefio->pagelist) {
                list_del(node);
        }
-       /* ... and add back the "non-dirty" pages to the list */
-       list_splice_tail(&non_dirty, &fbdefio->pagelist);
        mutex_unlock(&fbdefio->lock);
 }
 
@@ -218,7 +212,6 @@ EXPORT_SYMBOL_GPL(fb_deferred_io_open);
 void fb_deferred_io_cleanup(struct fb_info *info)
 {
        struct fb_deferred_io *fbdefio = info->fbdefio;
-       struct list_head *node, *tmp_node;
        struct page *page;
        int i;
 
@@ -226,13 +219,6 @@ void fb_deferred_io_cleanup(struct fb_info *info)
        cancel_delayed_work(&info->deferred_work);
        flush_scheduled_work();
 
-       /*  the list may have still some non-dirty pages at this point */
-       mutex_lock(&fbdefio->lock);
-       list_for_each_safe(node, tmp_node, &fbdefio->pagelist) {
-               list_del(node);
-       }
-       mutex_unlock(&fbdefio->lock);
-
        /* clear out the mapping that we setup */
        for (i = 0 ; i < info->fix.smem_len; i += PAGE_SIZE) {
                page = fb_deferred_io_page(info, i);
index e8c769944812e90a81b7d0cf8bdbe5d3f5525fc8..12c451a711e935d767d74677923b1202f0ed629f 100644 (file)
@@ -991,13 +991,13 @@ static int __devinit sh_mobile_lcdc_probe(struct platform_device *pdev)
                priv->ch[j].lcdc = priv;
                memcpy(&priv->ch[j].cfg, &pdata->ch[i], sizeof(pdata->ch[i]));
 
-               error = sh_mobile_lcdc_check_interface(&priv->ch[i]);
+               error = sh_mobile_lcdc_check_interface(&priv->ch[j]);
                if (error) {
                        dev_err(&pdev->dev, "unsupported interface type\n");
                        goto err1;
                }
-               init_waitqueue_head(&priv->ch[i].frame_end_wait);
-               init_completion(&priv->ch[i].vsync_completion);
+               init_waitqueue_head(&priv->ch[j].frame_end_wait);
+               init_completion(&priv->ch[j].vsync_completion);
                priv->ch[j].pan_offset = 0;
 
                switch (pdata->ch[i].chan) {
index 49566c1687d84943d9187a12ff2d1490c8ec6ad2..b6ab27ccf214fc8c406a9ef70e91d7930af0eaec 100644 (file)
 #endif
 
 /*
- * User data (stack, data section and bss) needs to be aligned
- * for the same reasons as SLAB memory is, and to the same amount.
- * Avoid duplicating architecture specific code by using the same
- * macro as with SLAB allocation:
+ * User data (data section and bss) needs to be aligned.
+ * We pick 0x20 here because it is the max value elf2flt has always
+ * used in producing FLAT files, and because it seems to be large
+ * enough to make all the gcc alignment related tests happy.
+ */
+#define FLAT_DATA_ALIGN        (0x20)
+
+/*
+ * User data (stack) also needs to be aligned.
+ * Here we can be a bit looser than the data sections since this
+ * needs to only meet arch ABI requirements.
  */
 #ifdef ARCH_SLAB_MINALIGN
-#define FLAT_DATA_ALIGN        (ARCH_SLAB_MINALIGN)
+#define FLAT_STACK_ALIGN       (ARCH_SLAB_MINALIGN)
 #else
-#define FLAT_DATA_ALIGN        (sizeof(void *))
+#define FLAT_STACK_ALIGN       (sizeof(void *))
 #endif
 
 #define RELOC_FAILED 0xff00ff01                /* Relocation incorrect somewhere */
@@ -129,7 +136,7 @@ static unsigned long create_flat_tables(
 
        sp = (unsigned long *)p;
        sp -= (envc + argc + 2) + 1 + (flat_argvp_envp_on_stack() ? 2 : 0);
-       sp = (unsigned long *) ((unsigned long)sp & -FLAT_DATA_ALIGN);
+       sp = (unsigned long *) ((unsigned long)sp & -FLAT_STACK_ALIGN);
        argv = sp + 1 + (flat_argvp_envp_on_stack() ? 2 : 0);
        envp = argv + (argc + 1);
 
@@ -589,7 +596,7 @@ static int load_flat_file(struct linux_binprm * bprm,
                if (IS_ERR_VALUE(result)) {
                        printk("Unable to read data+bss, errno %d\n", (int)-result);
                        do_munmap(current->mm, textpos, text_len);
-                       do_munmap(current->mm, realdatastart, data_len + extra);
+                       do_munmap(current->mm, realdatastart, len);
                        ret = result;
                        goto err;
                }
@@ -876,7 +883,7 @@ static int load_flat_binary(struct linux_binprm * bprm, struct pt_regs * regs)
        stack_len = TOP_OF_ARGS - bprm->p;             /* the strings */
        stack_len += (bprm->argc + 1) * sizeof(char *); /* the argv array */
        stack_len += (bprm->envc + 1) * sizeof(char *); /* the envp array */
-       stack_len += FLAT_DATA_ALIGN - 1;  /* reserve for upcoming alignment */
+       stack_len += FLAT_STACK_ALIGN - 1;  /* reserve for upcoming alignment */
        
        res = load_flat_file(bprm, &libinfo, 0, &stack_len);
        if (IS_ERR_VALUE(res))
index f0b391c50552dc986f93afe1e4c56ce3b777a600..6490d2134ff3e73656b29b6ad5473e339870ae8d 100644 (file)
@@ -626,7 +626,7 @@ ssize_t compat_rw_copy_check_uvector(int type,
                tot_len += len;
                if (tot_len < tmp) /* maths overflow on the compat_ssize_t */
                        goto out;
-               if (!access_ok(vrfy_dir(type), buf, len)) {
+               if (!access_ok(vrfy_dir(type), compat_ptr(buf), len)) {
                        ret = -EFAULT;
                        goto out;
                }
index 41645142b88b4698300cc89bbad15c613e10d6fd..cf78d44a8d6a8bcff1a546e3606058de97e90722 100644 (file)
@@ -72,10 +72,6 @@ int configfs_setattr(struct dentry * dentry, struct iattr * iattr)
        if (!sd)
                return -EINVAL;
 
-       error = simple_setattr(dentry, iattr);
-       if (error)
-               return error;
-
        sd_iattr = sd->s_iattr;
        if (!sd_iattr) {
                /* setting attributes for the first time, allocate now */
@@ -89,9 +85,12 @@ int configfs_setattr(struct dentry * dentry, struct iattr * iattr)
                sd_iattr->ia_atime = sd_iattr->ia_mtime = sd_iattr->ia_ctime = CURRENT_TIME;
                sd->s_iattr = sd_iattr;
        }
-
        /* attributes were changed atleast once in past */
 
+       error = simple_setattr(dentry, iattr);
+       if (error)
+               return error;
+
        if (ia_valid & ATTR_UID)
                sd_iattr->ia_uid = iattr->ia_uid;
        if (ia_valid & ATTR_GID)
index ea8592b906968913499b9847f35389a31e5dc1a3..1d1088f48bc2dfe713d53a9af0fa4d51e1161428 100644 (file)
@@ -45,7 +45,6 @@ struct wb_writeback_args {
        unsigned int for_kupdate:1;
        unsigned int range_cyclic:1;
        unsigned int for_background:1;
-       unsigned int sb_pinned:1;
 };
 
 /*
@@ -193,8 +192,7 @@ static void bdi_wait_on_work_clear(struct bdi_work *work)
 }
 
 static void bdi_alloc_queue_work(struct backing_dev_info *bdi,
-                                struct wb_writeback_args *args,
-                                int wait)
+                                struct wb_writeback_args *args)
 {
        struct bdi_work *work;
 
@@ -206,8 +204,6 @@ static void bdi_alloc_queue_work(struct backing_dev_info *bdi,
        if (work) {
                bdi_work_init(work, args);
                bdi_queue_work(bdi, work);
-               if (wait)
-                       bdi_wait_on_work_clear(work);
        } else {
                struct bdi_writeback *wb = &bdi->wb;
 
@@ -234,11 +230,6 @@ static void bdi_sync_writeback(struct backing_dev_info *bdi,
                .sync_mode      = WB_SYNC_ALL,
                .nr_pages       = LONG_MAX,
                .range_cyclic   = 0,
-               /*
-                * Setting sb_pinned is not necessary for WB_SYNC_ALL, but
-                * lets make it explicitly clear.
-                */
-               .sb_pinned      = 1,
        };
        struct bdi_work work;
 
@@ -254,23 +245,21 @@ static void bdi_sync_writeback(struct backing_dev_info *bdi,
  * @bdi: the backing device to write from
  * @sb: write inodes from this super_block
  * @nr_pages: the number of pages to write
- * @sb_locked: caller already holds sb umount sem.
  *
  * Description:
  *   This does WB_SYNC_NONE opportunistic writeback. The IO is only
  *   started when this function returns, we make no guarentees on
- *   completion. Caller specifies whether sb umount sem is held already or not.
+ *   completion. Caller need not hold sb s_umount semaphore.
  *
  */
 void bdi_start_writeback(struct backing_dev_info *bdi, struct super_block *sb,
-                        long nr_pages, int sb_locked)
+                        long nr_pages)
 {
        struct wb_writeback_args args = {
                .sb             = sb,
                .sync_mode      = WB_SYNC_NONE,
                .nr_pages       = nr_pages,
                .range_cyclic   = 1,
-               .sb_pinned      = sb_locked,
        };
 
        /*
@@ -282,7 +271,7 @@ void bdi_start_writeback(struct backing_dev_info *bdi, struct super_block *sb,
                args.for_background = 1;
        }
 
-       bdi_alloc_queue_work(bdi, &args, sb_locked);
+       bdi_alloc_queue_work(bdi, &args);
 }
 
 /*
@@ -595,7 +584,7 @@ static enum sb_pin_state pin_sb_for_writeback(struct writeback_control *wbc,
        /*
         * Caller must already hold the ref for this
         */
-       if (wbc->sync_mode == WB_SYNC_ALL || wbc->sb_pinned) {
+       if (wbc->sync_mode == WB_SYNC_ALL) {
                WARN_ON(!rwsem_is_locked(&sb->s_umount));
                return SB_NOT_PINNED;
        }
@@ -769,7 +758,6 @@ static long wb_writeback(struct bdi_writeback *wb,
                .for_kupdate            = args->for_kupdate,
                .for_background         = args->for_background,
                .range_cyclic           = args->range_cyclic,
-               .sb_pinned              = args->sb_pinned,
        };
        unsigned long oldest_jif;
        long wrote = 0;
@@ -912,7 +900,6 @@ long wb_do_writeback(struct bdi_writeback *wb, int force_wait)
 
        while ((work = get_next_work_item(bdi, wb)) != NULL) {
                struct wb_writeback_args args = work->args;
-               int post_clear;
 
                /*
                 * Override sync mode, in case we must wait for completion
@@ -920,13 +907,11 @@ long wb_do_writeback(struct bdi_writeback *wb, int force_wait)
                if (force_wait)
                        work->args.sync_mode = args.sync_mode = WB_SYNC_ALL;
 
-               post_clear = WB_SYNC_ALL || args.sb_pinned;
-
                /*
                 * If this isn't a data integrity operation, just notify
                 * that we have seen this work and we are now starting it.
                 */
-               if (!post_clear)
+               if (args.sync_mode == WB_SYNC_NONE)
                        wb_clear_pending(wb, work);
 
                wrote += wb_writeback(wb, &args);
@@ -935,7 +920,7 @@ long wb_do_writeback(struct bdi_writeback *wb, int force_wait)
                 * This is a data integrity writeback, so only do the
                 * notification when we have completed the work.
                 */
-               if (post_clear)
+               if (args.sync_mode == WB_SYNC_ALL)
                        wb_clear_pending(wb, work);
        }
 
@@ -1011,7 +996,7 @@ static void bdi_writeback_all(struct super_block *sb, long nr_pages)
                if (!bdi_has_dirty_io(bdi))
                        continue;
 
-               bdi_alloc_queue_work(bdi, &args, 0);
+               bdi_alloc_queue_work(bdi, &args);
        }
 
        rcu_read_unlock();
@@ -1220,18 +1205,6 @@ static void wait_sb_inodes(struct super_block *sb)
        iput(old_inode);
 }
 
-static void __writeback_inodes_sb(struct super_block *sb, int sb_locked)
-{
-       unsigned long nr_dirty = global_page_state(NR_FILE_DIRTY);
-       unsigned long nr_unstable = global_page_state(NR_UNSTABLE_NFS);
-       long nr_to_write;
-
-       nr_to_write = nr_dirty + nr_unstable +
-                       (inodes_stat.nr_inodes - inodes_stat.nr_unused);
-
-       bdi_start_writeback(sb->s_bdi, sb, nr_to_write, sb_locked);
-}
-
 /**
  * writeback_inodes_sb -       writeback dirty inodes from given super_block
  * @sb: the superblock
@@ -1243,21 +1216,16 @@ static void __writeback_inodes_sb(struct super_block *sb, int sb_locked)
  */
 void writeback_inodes_sb(struct super_block *sb)
 {
-       __writeback_inodes_sb(sb, 0);
-}
-EXPORT_SYMBOL(writeback_inodes_sb);
+       unsigned long nr_dirty = global_page_state(NR_FILE_DIRTY);
+       unsigned long nr_unstable = global_page_state(NR_UNSTABLE_NFS);
+       long nr_to_write;
 
-/**
- * writeback_inodes_sb_locked  - writeback dirty inodes from given super_block
- * @sb: the superblock
- *
- * Like writeback_inodes_sb(), except the caller already holds the
- * sb umount sem.
- */
-void writeback_inodes_sb_locked(struct super_block *sb)
-{
-       __writeback_inodes_sb(sb, 1);
+       nr_to_write = nr_dirty + nr_unstable +
+                       (inodes_stat.nr_inodes - inodes_stat.nr_unused);
+
+       bdi_start_writeback(sb->s_bdi, sb, nr_to_write);
 }
+EXPORT_SYMBOL(writeback_inodes_sb);
 
 /**
  * writeback_inodes_sb_if_idle -       start writeback if none underway
index db6eaaba0dd81fb777f2b64f1e385d40eb3f1819..69c4c7c13ea910db965d68a1c892a91791303119 100644 (file)
--- a/fs/pipe.c
+++ b/fs/pipe.c
 
 /*
  * The max size that a non-root user is allowed to grow the pipe. Can
- * be set by root in /proc/sys/fs/pipe-max-pages
+ * be set by root in /proc/sys/fs/pipe-max-size
  */
-unsigned int pipe_max_pages = PIPE_DEF_BUFFERS * 16;
+unsigned int pipe_max_size = 1048576;
+
+/*
+ * Minimum pipe size, as required by POSIX
+ */
+unsigned int pipe_min_size = PAGE_SIZE;
 
 /*
  * We use a start+len construction, which provides full use of the 
@@ -1118,26 +1123,20 @@ SYSCALL_DEFINE1(pipe, int __user *, fildes)
  * Allocate a new array of pipe buffers and copy the info over. Returns the
  * pipe size if successful, or return -ERROR on error.
  */
-static long pipe_set_size(struct pipe_inode_info *pipe, unsigned long arg)
+static long pipe_set_size(struct pipe_inode_info *pipe, unsigned long nr_pages)
 {
        struct pipe_buffer *bufs;
 
-       /*
-        * Must be a power-of-2 currently
-        */
-       if (!is_power_of_2(arg))
-               return -EINVAL;
-
        /*
         * We can shrink the pipe, if arg >= pipe->nrbufs. Since we don't
         * expect a lot of shrink+grow operations, just free and allocate
         * again like we would do for growing. If the pipe currently
         * contains more buffers than arg, then return busy.
         */
-       if (arg < pipe->nrbufs)
+       if (nr_pages < pipe->nrbufs)
                return -EBUSY;
 
-       bufs = kcalloc(arg, sizeof(struct pipe_buffer), GFP_KERNEL);
+       bufs = kcalloc(nr_pages, sizeof(struct pipe_buffer), GFP_KERNEL);
        if (unlikely(!bufs))
                return -ENOMEM;
 
@@ -1158,8 +1157,37 @@ static long pipe_set_size(struct pipe_inode_info *pipe, unsigned long arg)
        pipe->curbuf = 0;
        kfree(pipe->bufs);
        pipe->bufs = bufs;
-       pipe->buffers = arg;
-       return arg;
+       pipe->buffers = nr_pages;
+       return nr_pages * PAGE_SIZE;
+}
+
+/*
+ * Currently we rely on the pipe array holding a power-of-2 number
+ * of pages.
+ */
+static inline unsigned int round_pipe_size(unsigned int size)
+{
+       unsigned long nr_pages;
+
+       nr_pages = (size + PAGE_SIZE - 1) >> PAGE_SHIFT;
+       return roundup_pow_of_two(nr_pages) << PAGE_SHIFT;
+}
+
+/*
+ * This should work even if CONFIG_PROC_FS isn't set, as proc_dointvec_minmax
+ * will return an error.
+ */
+int pipe_proc_fn(struct ctl_table *table, int write, void __user *buf,
+                size_t *lenp, loff_t *ppos)
+{
+       int ret;
+
+       ret = proc_dointvec_minmax(table, write, buf, lenp, ppos);
+       if (ret < 0 || !write)
+               return ret;
+
+       pipe_max_size = round_pipe_size(pipe_max_size);
+       return ret;
 }
 
 long pipe_fcntl(struct file *file, unsigned int cmd, unsigned long arg)
@@ -1174,23 +1202,24 @@ long pipe_fcntl(struct file *file, unsigned int cmd, unsigned long arg)
        mutex_lock(&pipe->inode->i_mutex);
 
        switch (cmd) {
-       case F_SETPIPE_SZ:
-               if (!capable(CAP_SYS_ADMIN) && arg > pipe_max_pages) {
-                       ret = -EINVAL;
+       case F_SETPIPE_SZ: {
+               unsigned int size, nr_pages;
+
+               size = round_pipe_size(arg);
+               nr_pages = size >> PAGE_SHIFT;
+
+               if (!capable(CAP_SYS_RESOURCE) && size > pipe_max_size) {
+                       ret = -EPERM;
                        goto out;
-               }
-               /*
-                * The pipe needs to be at least 2 pages large to
-                * guarantee POSIX behaviour.
-                */
-               if (arg < 2) {
+               } else if (nr_pages < PAGE_SIZE) {
                        ret = -EINVAL;
                        goto out;
                }
-               ret = pipe_set_size(pipe, arg);
+               ret = pipe_set_size(pipe, nr_pages);
                break;
+               }
        case F_GETPIPE_SZ:
-               ret = pipe->buffers;
+               ret = pipe->buffers * PAGE_SIZE;
                break;
        default:
                ret = -EINVAL;
index ac22b00d86c3fab51fe3f39cc6cb50a8e7bbcc59..740e6b9faf7ab2e10e0ebfc68725d0d05e0b547f 100644 (file)
@@ -354,7 +354,7 @@ __generic_file_splice_read(struct file *in, loff_t *ppos,
                                break;
 
                        error = add_to_page_cache_lru(page, mapping, index,
-                                               mapping_gfp_mask(mapping));
+                                               GFP_KERNEL);
                        if (unlikely(error)) {
                                page_cache_release(page);
                                if (error == -EEXIST)
index c9f83f480ec55ec751d41021c73c9b3aa8c0b99a..15aa6f03b2da11e5282c564d8d674374d4882a49 100644 (file)
--- a/fs/sync.c
+++ b/fs/sync.c
@@ -42,7 +42,7 @@ static int __sync_filesystem(struct super_block *sb, int wait)
        if (wait)
                sync_inodes_sb(sb);
        else
-               writeback_inodes_sb_locked(sb);
+               writeback_inodes_sb(sb);
 
        if (sb->s_op->sync_fs)
                sb->s_op->sync_fs(sb, wait);
index bde1a4c3679a3c38bb5005a473fce4c8e3037e54..0835a3b70e03b01738a8ef18493e1c6180432acd 100644 (file)
@@ -117,11 +117,13 @@ int sysfs_setattr(struct dentry *dentry, struct iattr *iattr)
        if (error)
                goto out;
 
+       error = sysfs_sd_setattr(sd, iattr);
+       if (error)
+               goto out;
+
        /* this ignores size changes */
        generic_setattr(inode, iattr);
 
-       error = sysfs_sd_setattr(sd, iattr);
-
 out:
        mutex_unlock(&sysfs_mutex);
        return error;
index e6e0cb5437e6ce6d00a7fcebe7756b9fdac92480..aee5f6ce166e9cc1f186e5e76cab77bb536edfd5 100644 (file)
@@ -106,7 +106,7 @@ int bdi_register_dev(struct backing_dev_info *bdi, dev_t dev);
 void bdi_unregister(struct backing_dev_info *bdi);
 int bdi_setup_and_register(struct backing_dev_info *, char *, unsigned int);
 void bdi_start_writeback(struct backing_dev_info *bdi, struct super_block *sb,
-                               long nr_pages, int sb_locked);
+                               long nr_pages);
 int bdi_writeback_task(struct bdi_writeback *wb);
 int bdi_has_dirty_io(struct backing_dev_info *bdi);
 void bdi_arm_supers_timer(void);
index 8b7f5e0914add2b751346224270a9e297d89f5c9..09a840264d6fdf54b0170970eb9c3c49acc9def6 100644 (file)
@@ -1211,14 +1211,23 @@ struct work_struct;
 int kblockd_schedule_work(struct request_queue *q, struct work_struct *work);
 
 #ifdef CONFIG_BLK_CGROUP
+/*
+ * This should not be using sched_clock(). A real patch is in progress
+ * to fix this up, until that is in place we need to disable preemption
+ * around sched_clock() in this function and set_io_start_time_ns().
+ */
 static inline void set_start_time_ns(struct request *req)
 {
+       preempt_disable();
        req->start_time_ns = sched_clock();
+       preempt_enable();
 }
 
 static inline void set_io_start_time_ns(struct request *req)
 {
+       preempt_disable();
        req->io_start_time_ns = sched_clock();
+       preempt_enable();
 }
 
 static inline uint64_t rq_start_time_ns(struct request *req)
index 68530521ad0056edcda138183f8246b625b24c3f..30da4ae489724197a220a83a6e39d1cba0a264c4 100644 (file)
@@ -53,7 +53,7 @@
 
 
 extern const char *drbd_buildtag(void);
-#define REL_VERSION "8.3.8rc1"
+#define REL_VERSION "8.3.8rc2"
 #define API_VERSION 88
 #define PRO_VERSION_MIN 86
 #define PRO_VERSION_MAX 94
diff --git a/include/linux/edac_mce.h b/include/linux/edac_mce.h
new file mode 100644 (file)
index 0000000..f974fc0
--- /dev/null
@@ -0,0 +1,31 @@
+/* Provides edac interface to mcelog events
+ *
+ * This file may be distributed under the terms of the
+ * GNU General Public License version 2.
+ *
+ * Copyright (c) 2009 by:
+ *      Mauro Carvalho Chehab <mchehab@redhat.com>
+ *
+ * Red Hat Inc. http://www.redhat.com
+ */
+
+#if defined(CONFIG_EDAC_MCE) || \
+                       (defined(CONFIG_EDAC_MCE_MODULE) && defined(MODULE))
+
+#include <asm/mce.h>
+#include <linux/list.h>
+
+struct edac_mce {
+       struct list_head list;
+
+       void *priv;
+       int (*check_error)(void *priv, struct mce *mce);
+};
+
+int edac_mce_register(struct edac_mce *edac_mce);
+void edac_mce_unregister(struct edac_mce *edac_mce);
+int edac_mce_parse(struct mce *mce);
+
+#else
+#define edac_mce_parse(mce) (0)
+#endif
index a0bb301afac0812998370e6af2a778b08f14dc1c..64d5291330312ac718ba7f649e3d428063127f39 100644 (file)
@@ -7,7 +7,6 @@
 struct cfq_queue;
 struct cfq_io_context {
        void *key;
-       unsigned long dead_key;
 
        struct cfq_queue *cfqq[2];
 
index aafe832f18aa276f6fc45019ed4ec3f7cc22caf8..d4a2ebbdab4b2ad3f8adb4bec89aada45e0ff7fc 100644 (file)
@@ -14,6 +14,9 @@
 #ifndef __SH_MMCIF_H__
 #define __SH_MMCIF_H__
 
+#include <linux/platform_device.h>
+#include <linux/io.h>
+
 /*
  * MMCIF : CE_CLK_CTRL [19:16]
  * 1000 : Peripheral clock / 512
@@ -36,4 +39,162 @@ struct sh_mmcif_plat_data {
        u32     ocr;
 };
 
+#define MMCIF_CE_CMD_SET       0x00000000
+#define MMCIF_CE_ARG           0x00000008
+#define MMCIF_CE_ARG_CMD12     0x0000000C
+#define MMCIF_CE_CMD_CTRL      0x00000010
+#define MMCIF_CE_BLOCK_SET     0x00000014
+#define MMCIF_CE_CLK_CTRL      0x00000018
+#define MMCIF_CE_BUF_ACC       0x0000001C
+#define MMCIF_CE_RESP3         0x00000020
+#define MMCIF_CE_RESP2         0x00000024
+#define MMCIF_CE_RESP1         0x00000028
+#define MMCIF_CE_RESP0         0x0000002C
+#define MMCIF_CE_RESP_CMD12    0x00000030
+#define MMCIF_CE_DATA          0x00000034
+#define MMCIF_CE_INT           0x00000040
+#define MMCIF_CE_INT_MASK      0x00000044
+#define MMCIF_CE_HOST_STS1     0x00000048
+#define MMCIF_CE_HOST_STS2     0x0000004C
+#define MMCIF_CE_VERSION       0x0000007C
+
+extern inline u32 sh_mmcif_readl(void __iomem *addr, int reg)
+{
+       return readl(addr + reg);
+}
+
+extern inline void sh_mmcif_writel(void __iomem *addr, int reg, u32 val)
+{
+       writel(val, addr + reg);
+}
+
+#define SH_MMCIF_BBS 512 /* boot block size */
+
+extern inline void sh_mmcif_boot_cmd_send(void __iomem *base,
+                                         unsigned long cmd, unsigned long arg)
+{
+       sh_mmcif_writel(base, MMCIF_CE_INT, 0);
+       sh_mmcif_writel(base, MMCIF_CE_ARG, arg);
+       sh_mmcif_writel(base, MMCIF_CE_CMD_SET, cmd);
+}
+
+extern inline int sh_mmcif_boot_cmd_poll(void __iomem *base, unsigned long mask)
+{
+       unsigned long tmp;
+       int cnt;
+
+       for (cnt = 0; cnt < 1000000; cnt++) {
+               tmp = sh_mmcif_readl(base, MMCIF_CE_INT);
+               if (tmp & mask) {
+                       sh_mmcif_writel(base, MMCIF_CE_INT, tmp & ~mask);
+                       return 0;
+               }
+       }
+
+       return -1;
+}
+
+extern inline int sh_mmcif_boot_cmd(void __iomem *base,
+                                   unsigned long cmd, unsigned long arg)
+{
+       sh_mmcif_boot_cmd_send(base, cmd, arg);
+       return sh_mmcif_boot_cmd_poll(base, 0x00010000);
+}
+
+extern inline int sh_mmcif_boot_do_read_single(void __iomem *base,
+                                              unsigned int block_nr,
+                                              unsigned long *buf)
+{
+       int k;
+
+       /* CMD13 - Status */
+       sh_mmcif_boot_cmd(base, 0x0d400000, 0x00010000);
+
+       if (sh_mmcif_readl(base, MMCIF_CE_RESP0) != 0x0900)
+               return -1;
+
+       /* CMD17 - Read */
+       sh_mmcif_boot_cmd(base, 0x11480000, block_nr * SH_MMCIF_BBS);
+       if (sh_mmcif_boot_cmd_poll(base, 0x00100000) < 0)
+               return -1;
+
+       for (k = 0; k < (SH_MMCIF_BBS / 4); k++)
+               buf[k] = sh_mmcif_readl(base, MMCIF_CE_DATA);
+
+       return 0;
+}
+
+extern inline int sh_mmcif_boot_do_read(void __iomem *base,
+                                       unsigned long first_block,
+                                       unsigned long nr_blocks,
+                                       void *buf)
+{
+       unsigned long k;
+       int ret = 0;
+
+       /* CMD16 - Set the block size */
+       sh_mmcif_boot_cmd(base, 0x10400000, SH_MMCIF_BBS);
+
+       for (k = 0; !ret && k < nr_blocks; k++)
+               ret = sh_mmcif_boot_do_read_single(base, first_block + k,
+                                                  buf + (k * SH_MMCIF_BBS));
+
+       return ret;
+}
+
+extern inline void sh_mmcif_boot_init(void __iomem *base)
+{
+       unsigned long tmp;
+
+       /* reset */
+       tmp = sh_mmcif_readl(base, MMCIF_CE_VERSION);
+       sh_mmcif_writel(base, MMCIF_CE_VERSION, tmp | 0x80000000);
+       sh_mmcif_writel(base, MMCIF_CE_VERSION, tmp & ~0x80000000);
+
+       /* byte swap */
+       sh_mmcif_writel(base, MMCIF_CE_BUF_ACC, 0x00010000);
+
+       /* Set block size in MMCIF hardware */
+       sh_mmcif_writel(base, MMCIF_CE_BLOCK_SET, SH_MMCIF_BBS);
+
+       /* Enable the clock, set it to Bus clock/256 (about 325Khz)*/
+       sh_mmcif_writel(base, MMCIF_CE_CLK_CTRL, 0x01072fff);
+
+       /* CMD0 */
+       sh_mmcif_boot_cmd(base, 0x00000040, 0);
+
+       /* CMD1 - Get OCR */
+       do {
+               sh_mmcif_boot_cmd(base, 0x01405040, 0x40300000); /* CMD1 */
+       } while ((sh_mmcif_readl(base, MMCIF_CE_RESP0) & 0x80000000)
+                != 0x80000000);
+
+       /* CMD2 - Get CID */
+       sh_mmcif_boot_cmd(base, 0x02806040, 0);
+
+       /* CMD3 - Set card relative address */
+       sh_mmcif_boot_cmd(base, 0x03400040, 0x00010000);
+}
+
+extern inline void sh_mmcif_boot_slurp(void __iomem *base,
+                                      unsigned char *buf,
+                                      unsigned long no_bytes)
+{
+       unsigned long tmp;
+
+       /* In data transfer mode: Set clock to Bus clock/4 (about 20Mhz) */
+       sh_mmcif_writel(base, MMCIF_CE_CLK_CTRL, 0x01012fff);
+
+       /* CMD9 - Get CSD */
+       sh_mmcif_boot_cmd(base, 0x09806000, 0x00010000);
+
+       /* CMD7 - Select the card */
+       sh_mmcif_boot_cmd(base, 0x07400000, 0x00010000);
+
+       tmp = no_bytes / SH_MMCIF_BBS;
+       tmp += (no_bytes % SH_MMCIF_BBS) ? 1 : 0;
+
+       sh_mmcif_boot_do_read(base, 512, tmp, buf);
+}
+
 #endif /* __SH_MMCIF_H__ */
index 6a471aba3b07aced498219d4e39498e6d577bfc0..7cb00845f150ca185b73a47931c6a1fbcd4c1cef 100644 (file)
@@ -632,6 +632,7 @@ void pci_fixup_cardbus(struct pci_bus *);
 
 /* Generic PCI functions used internally */
 
+void pcibios_scan_specific_bus(int busn);
 extern struct pci_bus *pci_find_bus(int domain, int busnr);
 void pci_bus_add_devices(const struct pci_bus *bus);
 struct pci_bus *pci_scan_bus_parented(struct device *parent, int bus,
index ae66851870becb2e496d7994f7a11a548aac16d8..f149dd10908ba3a5d38df5a6252ef1100aa4243e 100644 (file)
 #define PCI_DEVICE_ID_INTEL_ICH9_6     0x2930
 #define PCI_DEVICE_ID_INTEL_ICH9_7     0x2916
 #define PCI_DEVICE_ID_INTEL_ICH9_8     0x2918
+#define PCI_DEVICE_ID_INTEL_I7_MCR     0x2c18
+#define PCI_DEVICE_ID_INTEL_I7_MC_TAD  0x2c19
+#define PCI_DEVICE_ID_INTEL_I7_MC_RAS  0x2c1a
+#define PCI_DEVICE_ID_INTEL_I7_MC_TEST 0x2c1c
+#define PCI_DEVICE_ID_INTEL_I7_MC_CH0_CTRL  0x2c20
+#define PCI_DEVICE_ID_INTEL_I7_MC_CH0_ADDR  0x2c21
+#define PCI_DEVICE_ID_INTEL_I7_MC_CH0_RANK  0x2c22
+#define PCI_DEVICE_ID_INTEL_I7_MC_CH0_TC    0x2c23
+#define PCI_DEVICE_ID_INTEL_I7_MC_CH1_CTRL  0x2c28
+#define PCI_DEVICE_ID_INTEL_I7_MC_CH1_ADDR  0x2c29
+#define PCI_DEVICE_ID_INTEL_I7_MC_CH1_RANK  0x2c2a
+#define PCI_DEVICE_ID_INTEL_I7_MC_CH1_TC    0x2c2b
+#define PCI_DEVICE_ID_INTEL_I7_MC_CH2_CTRL  0x2c30
+#define PCI_DEVICE_ID_INTEL_I7_MC_CH2_ADDR  0x2c31
+#define PCI_DEVICE_ID_INTEL_I7_MC_CH2_RANK  0x2c32
+#define PCI_DEVICE_ID_INTEL_I7_MC_CH2_TC    0x2c33
+#define PCI_DEVICE_ID_INTEL_I7_NONCORE 0x2c41
+#define PCI_DEVICE_ID_INTEL_I7_NONCORE_ALT 0x2c40
+#define PCI_DEVICE_ID_INTEL_LYNNFIELD_NONCORE     0x2c50
+#define PCI_DEVICE_ID_INTEL_LYNNFIELD_NONCORE_ALT 0x2c51
+#define PCI_DEVICE_ID_INTEL_LYNNFIELD_NONCORE_REV2 0x2c70
+#define PCI_DEVICE_ID_INTEL_LYNNFIELD_SAD         0x2c81
+#define PCI_DEVICE_ID_INTEL_LYNNFIELD_QPI_LINK0   0x2c90
+#define PCI_DEVICE_ID_INTEL_LYNNFIELD_QPI_PHY0    0x2c91
+#define PCI_DEVICE_ID_INTEL_LYNNFIELD_MCR         0x2c98
+#define PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_TAD      0x2c99
+#define PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_TEST     0x2c9C
+#define PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_CH0_CTRL 0x2ca0
+#define PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_CH0_ADDR 0x2ca1
+#define PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_CH0_RANK 0x2ca2
+#define PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_CH0_TC   0x2ca3
+#define PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_CH1_CTRL 0x2ca8
+#define PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_CH1_ADDR 0x2ca9
+#define PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_CH1_RANK 0x2caa
+#define PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_CH1_TC   0x2cab
+#define PCI_DEVICE_ID_INTEL_LYNNFIELD_MCR_REV2          0x2d98
+#define PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_TAD_REV2       0x2d99
+#define PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_RAS_REV2       0x2d9a
+#define PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_TEST_REV2      0x2d9c
+#define PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_CH0_CTRL_REV2  0x2da0
+#define PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_CH0_ADDR_REV2  0x2da1
+#define PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_CH0_RANK_REV2  0x2da2
+#define PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_CH0_TC_REV2    0x2da3
+#define PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_CH1_CTRL_REV2  0x2da8
+#define PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_CH1_ADDR_REV2  0x2da9
+#define PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_CH1_RANK_REV2  0x2daa
+#define PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_CH1_TC_REV2    0x2dab
+#define PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_CH2_CTRL_REV2  0x2db0
+#define PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_CH2_ADDR_REV2  0x2db1
+#define PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_CH2_RANK_REV2  0x2db2
+#define PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_CH2_TC_REV2    0x2db3
 #define PCI_DEVICE_ID_INTEL_82855PM_HB 0x3340
 #define PCI_DEVICE_ID_INTEL_IOAT_TBG4  0x3429
 #define PCI_DEVICE_ID_INTEL_IOAT_TBG5  0x342a
 #define PCI_DEVICE_ID_INTEL_IOAT_TBG6  0x342b
 #define PCI_DEVICE_ID_INTEL_IOAT_TBG7  0x342c
+#define PCI_DEVICE_ID_INTEL_X58_HUB_MGMT 0x342e
 #define PCI_DEVICE_ID_INTEL_IOAT_TBG0  0x3430
 #define PCI_DEVICE_ID_INTEL_IOAT_TBG1  0x3431
 #define PCI_DEVICE_ID_INTEL_IOAT_TBG2  0x3432
index 126120819a0dba4aeb931094094c27d3d80f9aa0..eec3bae164d451a38b23906a283af54965074ec0 100644 (file)
@@ -12,7 +12,7 @@ struct pt_regs;
 
 extern int             register_exec_domain(struct exec_domain *);
 extern int             unregister_exec_domain(struct exec_domain *);
-extern int             __set_personality(unsigned long);
+extern int             __set_personality(unsigned int);
 
 #endif /* __KERNEL__ */
 
index 16de3933c45ed32b6c4e51a00514f00fe1667d97..445796945ac9d1c491c1d740f0f2ca7bfa1ae22b 100644 (file)
@@ -139,7 +139,9 @@ void pipe_lock(struct pipe_inode_info *);
 void pipe_unlock(struct pipe_inode_info *);
 void pipe_double_lock(struct pipe_inode_info *, struct pipe_inode_info *);
 
-extern unsigned int pipe_max_pages;
+extern unsigned int pipe_max_size, pipe_min_size;
+int pipe_proc_fn(struct ctl_table *, int, void __user *, size_t *, loff_t *);
+
 
 /* Drop the inode semaphore and wait for a pipe event, atomically */
 void pipe_wait(struct pipe_inode_info *pipe);
index f5364a1de68b105dac76e0125e93e767c21c2836..baed2122c5a608b209cf68f398cf6875ca2f6224 100644 (file)
@@ -2,9 +2,7 @@
 #define __LINUX_SERIAL_SCI_H
 
 #include <linux/serial_core.h>
-#ifdef CONFIG_SERIAL_SH_SCI_DMA
-#include <asm/dmaengine.h>
-#endif
+#include <linux/sh_dma.h>
 
 /*
  * Generic header for SuperH SCI(F) (used by sh/sh64/h8300 and related parts)
index a1a86a53bc735c13cdda531309aa6c8158231909..7f614ce274a9198e969d573834d8782f95b8e6a3 100644 (file)
@@ -289,7 +289,7 @@ asmlinkage long sys_capget(cap_user_header_t header,
                                cap_user_data_t dataptr);
 asmlinkage long sys_capset(cap_user_header_t header,
                                const cap_user_data_t data);
-asmlinkage long sys_personality(u_long personality);
+asmlinkage long sys_personality(unsigned int personality);
 
 asmlinkage long sys_sigpending(old_sigset_t __user *set);
 asmlinkage long sys_sigprocmask(int how, old_sigset_t __user *set,
index 92f1d99f0f172c377dee4a33a7c6587d7e562bba..383b94ba8c2002f4f07e73eedbf8adb92a6211e1 100644 (file)
 /* v1.0 and v2.0 of this standard have many things in common. For the rest
  * of the definitions, please refer to audio.h */
 
+static inline bool uac2_control_is_readable(u32 bmControls, u8 control)
+{
+       return (bmControls >> (control * 2)) & 0x1;
+}
+
+static inline bool uac2_control_is_writeable(u32 bmControls, u8 control)
+{
+       return (bmControls >> (control * 2)) & 0x2;
+}
+
 /* 4.7.2.1 Clock Source Descriptor */
 
 struct uac_clock_source_descriptor {
@@ -31,6 +41,13 @@ struct uac_clock_source_descriptor {
        __u8 iClockSource;
 } __attribute__((packed));
 
+/* bmAttribute fields */
+#define UAC_CLOCK_SOURCE_TYPE_EXT      0x0
+#define UAC_CLOCK_SOURCE_TYPE_INT_FIXED        0x1
+#define UAC_CLOCK_SOURCE_TYPE_INT_VAR  0x2
+#define UAC_CLOCK_SOURCE_TYPE_INT_PROG 0x3
+#define UAC_CLOCK_SOURCE_SYNCED_TO_SOF (1 << 2)
+
 /* 4.7.2.2 Clock Source Descriptor */
 
 struct uac_clock_selector_descriptor {
@@ -39,8 +56,20 @@ struct uac_clock_selector_descriptor {
        __u8 bDescriptorSubtype;
        __u8 bClockID;
        __u8 bNrInPins;
-       __u8 bmControls;
        __u8 baCSourceID[];
+       /* bmControls, bAssocTerminal and iClockSource omitted */
+} __attribute__((packed));
+
+/* 4.7.2.3 Clock Multiplier Descriptor */
+
+struct uac_clock_multiplier_descriptor {
+       __u8 bLength;
+       __u8 bDescriptorType;
+       __u8 bDescriptorSubtype;
+       __u8 bClockID;
+       __u8 bCSourceID;
+       __u8 bmControls;
+       __u8 iClockMultiplier;
 } __attribute__((packed));
 
 /* 4.7.2.4 Input terminal descriptor */
index 5d646c3887524febf0d39f81d2e7c4a832f875fe..c51200c715e504a951a5b18a74a599abbede08a1 100644 (file)
 #define UAC_FORMAT_TYPE                        0x02
 #define UAC_FORMAT_SPECIFIC            0x03
 
+/* A.7 Processing Unit Process Types */
+#define UAC_PROCESS_UNDEFINED          0x00
+#define UAC_PROCESS_UP_DOWNMIX         0x01
+#define UAC_PROCESS_DOLBY_PROLOGIC     0x02
+#define UAC_PROCESS_STEREO_EXTENDER    0x03
+#define UAC_PROCESS_REVERB             0x04
+#define UAC_PROCESS_CHORUS             0x05
+#define UAC_PROCESS_DYN_RANGE_COMP     0x06
+
 /* A.8 Audio Class-Specific Endpoint Descriptor Subtypes */
 #define UAC_EP_GENERAL                 0x01
 
 
 #define UAC_GET_STAT                   0xff
 
+/* A.10 Control Selector Codes */
+
+/* A.10.1 Terminal Control Selectors */
+#define UAC_TERM_COPY_PROTECT          0x01
+
+/* A.10.2 Feature Unit Control Selectors */
+#define UAC_FU_MUTE                    0x01
+#define UAC_FU_VOLUME                  0x02
+#define UAC_FU_BASS                    0x03
+#define UAC_FU_MID                     0x04
+#define UAC_FU_TREBLE                  0x05
+#define UAC_FU_GRAPHIC_EQUALIZER       0x06
+#define UAC_FU_AUTOMATIC_GAIN          0x07
+#define UAC_FU_DELAY                   0x08
+#define UAC_FU_BASS_BOOST              0x09
+#define UAC_FU_LOUDNESS                        0x0a
+
+#define UAC_CONTROL_BIT(CS)    (1 << ((CS) - 1))
+
+/* A.10.3.1 Up/Down-mix Processing Unit Controls Selectors */
+#define UAC_UD_ENABLE                  0x01
+#define UAC_UD_MODE_SELECT             0x02
+
+/* A.10.3.2 Dolby Prologic (tm) Processing Unit Controls Selectors */
+#define UAC_DP_ENABLE                  0x01
+#define UAC_DP_MODE_SELECT             0x02
+
+/* A.10.3.3 3D Stereo Extender Processing Unit Control Selectors */
+#define UAC_3D_ENABLE                  0x01
+#define UAC_3D_SPACE                   0x02
+
+/* A.10.3.4 Reverberation Processing Unit Control Selectors */
+#define UAC_REVERB_ENABLE              0x01
+#define UAC_REVERB_LEVEL               0x02
+#define UAC_REVERB_TIME                        0x03
+#define UAC_REVERB_FEEDBACK            0x04
+
+/* A.10.3.5 Chorus Processing Unit Control Selectors */
+#define UAC_CHORUS_ENABLE              0x01
+#define UAC_CHORUS_LEVEL               0x02
+#define UAC_CHORUS_RATE                        0x03
+#define UAC_CHORUS_DEPTH               0x04
+
+/* A.10.3.6 Dynamic Range Compressor Unit Control Selectors */
+#define UAC_DCR_ENABLE                 0x01
+#define UAC_DCR_RATE                   0x02
+#define UAC_DCR_MAXAMPL                        0x03
+#define UAC_DCR_THRESHOLD              0x04
+#define UAC_DCR_ATTACK_TIME            0x05
+#define UAC_DCR_RELEASE_TIME           0x06
+
+/* A.10.4 Extension Unit Control Selectors */
+#define UAC_XU_ENABLE                  0x01
+
 /* MIDI - A.1 MS Class-Specific Interface Descriptor Subtypes */
 #define UAC_MS_HEADER                  0x01
 #define UAC_MIDI_IN_JACK               0x02
@@ -244,7 +307,7 @@ struct uac_selector_unit_descriptor {
 static inline __u8 uac_selector_unit_iSelector(struct uac_selector_unit_descriptor *desc)
 {
        __u8 *raw = (__u8 *) desc;
-       return raw[9 + desc->bLength - 1];
+       return raw[desc->bLength - 1];
 }
 
 /* 4.3.2.5 Feature Unit Descriptor */
@@ -463,31 +526,6 @@ struct uac_iso_endpoint_descriptor {
 #define UAC_EP_CS_ATTR_PITCH_CONTROL   0x02
 #define UAC_EP_CS_ATTR_FILL_MAX                0x80
 
-/* A.10.2 Feature Unit Control Selectors */
-
-#define UAC_FU_CONTROL_UNDEFINED       0x00
-#define UAC_MUTE_CONTROL               0x01
-#define UAC_VOLUME_CONTROL             0x02
-#define UAC_BASS_CONTROL               0x03
-#define UAC_MID_CONTROL                        0x04
-#define UAC_TREBLE_CONTROL             0x05
-#define UAC_GRAPHIC_EQUALIZER_CONTROL  0x06
-#define UAC_AUTOMATIC_GAIN_CONTROL     0x07
-#define UAC_DELAY_CONTROL              0x08
-#define UAC_BASS_BOOST_CONTROL         0x09
-#define UAC_LOUDNESS_CONTROL           0x0a
-
-#define UAC_FU_MUTE            (1 << (UAC_MUTE_CONTROL - 1))
-#define UAC_FU_VOLUME          (1 << (UAC_VOLUME_CONTROL - 1))
-#define UAC_FU_BASS            (1 << (UAC_BASS_CONTROL - 1))
-#define UAC_FU_MID             (1 << (UAC_MID_CONTROL - 1))
-#define UAC_FU_TREBLE          (1 << (UAC_TREBLE_CONTROL - 1))
-#define UAC_FU_GRAPHIC_EQ      (1 << (UAC_GRAPHIC_EQUALIZER_CONTROL - 1))
-#define UAC_FU_AUTO_GAIN       (1 << (UAC_AUTOMATIC_GAIN_CONTROL - 1))
-#define UAC_FU_DELAY           (1 << (UAC_DELAY_CONTROL - 1))
-#define UAC_FU_BASS_BOOST      (1 << (UAC_BASS_BOOST_CONTROL - 1))
-#define UAC_FU_LOUDNESS                (1 << (UAC_LOUDNESS_CONTROL - 1))
-
 /* status word format (3.7.1.1) */
 
 #define UAC1_STATUS_TYPE_ORIG_MASK             0x0f
index cc97d6caf2b32af24505ebbc73d7f98265efbde1..f64134653a8c782caf9211c88a784d818b4c1e5b 100644 (file)
@@ -65,15 +65,6 @@ struct writeback_control {
         * so we use a single control to update them
         */
        unsigned no_nrwrite_index_update:1;
-
-       /*
-        * For WB_SYNC_ALL, the sb must always be pinned. For WB_SYNC_NONE,
-        * the writeback code will pin the sb for the caller. However,
-        * for eg umount, the caller does WB_SYNC_NONE but already has
-        * the sb pinned. If the below is set, caller already has the
-        * sb pinned.
-        */
-       unsigned sb_pinned:1;
 };
 
 /*
@@ -82,7 +73,6 @@ struct writeback_control {
 struct bdi_writeback;
 int inode_wait(void *);
 void writeback_inodes_sb(struct super_block *);
-void writeback_inodes_sb_locked(struct super_block *);
 int writeback_inodes_sb_if_idle(struct super_block *);
 void sync_inodes_sb(struct super_block *);
 void writeback_inodes_wbc(struct writeback_control *wbc);
index 5833966a710036ce02f9ca88f81502154b3446bd..c78e99a435b6c019438059e84d72a67e55fc2bd8 100644 (file)
@@ -55,7 +55,8 @@ void rc_map_init(void);
 #define RC_MAP_AVERMEDIA_A16D            "rc-avermedia-a16d"
 #define RC_MAP_AVERMEDIA_CARDBUS         "rc-avermedia-cardbus"
 #define RC_MAP_AVERMEDIA_DVBT            "rc-avermedia-dvbt"
-#define RC_MAP_AVERMEDIA_M135A_RM_JX     "rc-avermedia-m135a-rm-jx"
+#define RC_MAP_AVERMEDIA_M135A           "rc-avermedia-m135a"
+#define RC_MAP_AVERMEDIA_M733A_RM_K6     "rc-avermedia-m733a-rm-k6"
 #define RC_MAP_AVERMEDIA                 "rc-avermedia"
 #define RC_MAP_AVERTV_303                "rc-avertv-303"
 #define RC_MAP_BEHOLD_COLUMBUS           "rc-behold-columbus"
index c9a5bbfa6ab5f91cdab0e90e548fea322bd47f0a..b8289c2f609b431cf6da04388bdfd679a2db65c8 100644 (file)
@@ -66,7 +66,7 @@ struct soc_camera_host_ops {
         * .get_formats() fail, .put_formats() will not be called at all, the
         * failing .get_formats() must then clean up internally.
         */
-       int (*get_formats)(struct soc_camera_device *, int,
+       int (*get_formats)(struct soc_camera_device *, unsigned int,
                           struct soc_camera_format_xlate *);
        void (*put_formats)(struct soc_camera_device *);
        int (*cropcap)(struct soc_camera_device *, struct v4l2_cropcap *);
index 0dbe02ada259cecc22e8625f2deed8aef03fb793..865cda7cd611d729f634a231ee6ba54194dd0101 100644 (file)
@@ -40,6 +40,7 @@ enum v4l2_mbus_pixelcode {
        V4L2_MBUS_FMT_SBGGR10_2X8_PADLO_LE,
        V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_BE,
        V4L2_MBUS_FMT_SBGGR10_2X8_PADLO_BE,
+       V4L2_MBUS_FMT_SGRBG8_1X8,
 };
 
 /**
@@ -58,4 +59,24 @@ struct v4l2_mbus_framefmt {
        enum v4l2_colorspace            colorspace;
 };
 
+static inline void v4l2_fill_pix_format(struct v4l2_pix_format *pix_fmt,
+                               const struct v4l2_mbus_framefmt *mbus_fmt)
+{
+       pix_fmt->width = mbus_fmt->width;
+       pix_fmt->height = mbus_fmt->height;
+       pix_fmt->field = mbus_fmt->field;
+       pix_fmt->colorspace = mbus_fmt->colorspace;
+}
+
+static inline void v4l2_fill_mbus_format(struct v4l2_mbus_framefmt *mbus_fmt,
+                          const struct v4l2_pix_format *pix_fmt,
+                          enum v4l2_mbus_pixelcode code)
+{
+       mbus_fmt->width = pix_fmt->width;
+       mbus_fmt->height = pix_fmt->height;
+       mbus_fmt->field = pix_fmt->field;
+       mbus_fmt->colorspace = pix_fmt->colorspace;
+       mbus_fmt->code = code;
+}
+
 #endif
index a88889355ae0a4bb6edb6e4fc05893eab551d029..02c6f4d11ed3654d76e2908983b26353361d2b1a 100644 (file)
@@ -246,7 +246,7 @@ struct v4l2_subdev_video_ops {
                        struct v4l2_dv_timings *timings);
        int (*g_dv_timings)(struct v4l2_subdev *sd,
                        struct v4l2_dv_timings *timings);
-       int (*enum_mbus_fmt)(struct v4l2_subdev *sd, int index,
+       int (*enum_mbus_fmt)(struct v4l2_subdev *sd, unsigned int index,
                             enum v4l2_mbus_pixelcode *code);
        int (*g_mbus_fmt)(struct v4l2_subdev *sd,
                          struct v4l2_mbus_framefmt *fmt);
index 422cb19f156ef9b7a6f5ab8968ade8a618ea5d88..3ac6f5b0a64b7448aceac7407c04cf7109f7ef5d 100644 (file)
@@ -4598,7 +4598,7 @@ static int alloc_css_id(struct cgroup_subsys *ss, struct cgroup *parent,
        parent_css = parent->subsys[subsys_id];
        child_css = child->subsys[subsys_id];
        parent_id = parent_css->id;
-       depth = parent_id->depth;
+       depth = parent_id->depth + 1;
 
        child_id = get_new_cssid(ss, depth);
        if (IS_ERR(child_id))
index c35452cadded85de8e4505def877b3c5561c991f..dd62f8e714ca52d2fed7a7b14b03a6ee9a53d2f1 100644 (file)
@@ -27,7 +27,7 @@ static struct exec_domain *exec_domains = &default_exec_domain;
 static DEFINE_RWLOCK(exec_domains_lock);
 
 
-static u_long ident_map[32] = {
+static unsigned long ident_map[32] = {
        0,      1,      2,      3,      4,      5,      6,      7,
        8,      9,      10,     11,     12,     13,     14,     15,
        16,     17,     18,     19,     20,     21,     22,     23,
@@ -56,10 +56,10 @@ default_handler(int segment, struct pt_regs *regp)
 }
 
 static struct exec_domain *
-lookup_exec_domain(u_long personality)
+lookup_exec_domain(unsigned int personality)
 {
-       struct exec_domain *    ep;
-       u_long                  pers = personality(personality);
+       unsigned int pers = personality(personality);
+       struct exec_domain *ep;
 
        read_lock(&exec_domains_lock);
        for (ep = exec_domains; ep; ep = ep->next) {
@@ -70,7 +70,7 @@ lookup_exec_domain(u_long personality)
 
 #ifdef CONFIG_MODULES
        read_unlock(&exec_domains_lock);
-       request_module("personality-%ld", pers);
+       request_module("personality-%d", pers);
        read_lock(&exec_domains_lock);
 
        for (ep = exec_domains; ep; ep = ep->next) {
@@ -135,7 +135,7 @@ unregister:
 }
 
 int
-__set_personality(u_long personality)
+__set_personality(unsigned int personality)
 {
        struct exec_domain      *ep, *oep;
 
@@ -188,9 +188,9 @@ static int __init proc_execdomains_init(void)
 module_init(proc_execdomains_init);
 #endif
 
-SYSCALL_DEFINE1(personality, u_long, personality)
+SYSCALL_DEFINE1(personality, unsigned int, personality)
 {
-       u_long old = current->personality;
+       unsigned int old = current->personality;
 
        if (personality != 0xffffffff) {
                set_personality(personality);
@@ -198,7 +198,7 @@ SYSCALL_DEFINE1(personality, u_long, personality)
                        return -EINVAL;
        }
 
-       return (long)old;
+       return old;
 }
 
 
index 825e1126008f374e5d9d2650a5bb29fe2106424d..07b4f1b1a73a9b6a309a3e7fe249c813007b5d17 100644 (file)
@@ -850,7 +850,7 @@ static __init int spawn_ksoftirqd(void)
        void *cpu = (void *)(long)smp_processor_id();
        int err = cpu_callback(&cpu_nfb, CPU_UP_PREPARE, cpu);
 
-       BUG_ON(err == NOTIFY_BAD);
+       BUG_ON(err != NOTIFY_OK);
        cpu_callback(&cpu_nfb, CPU_ONLINE, cpu);
        register_cpu_notifier(&cpu_nfb);
        return 0;
index 997080f00e0bcbfca3669af93a97eb5951c17811..d24f761f48769d925692efcbb233a276dad01905 100644 (file)
@@ -1471,12 +1471,12 @@ static struct ctl_table fs_table[] = {
        },
 #endif
        {
-               .procname       = "pipe-max-pages",
-               .data           = &pipe_max_pages,
+               .procname       = "pipe-max-size",
+               .data           = &pipe_max_size,
                .maxlen         = sizeof(int),
                .mode           = 0644,
-               .proc_handler   = &proc_dointvec_minmax,
-               .extra1         = &two,
+               .proc_handler   = &pipe_proc_fn,
+               .extra1         = &pipe_min_size,
        },
 /*
  * NOTE: do not add new entries to this table unless you have read
index 2454172a80d3c6131313007d08f91f12eb85c107..ee305c8d4e18eb038a54f0f9aea8eb2f353b1f44 100644 (file)
@@ -1717,7 +1717,7 @@ void __init init_timers(void)
 
        init_timer_stats();
 
-       BUG_ON(err == NOTIFY_BAD);
+       BUG_ON(err != NOTIFY_OK);
        register_cpu_notifier(&timers_nb);
        open_softirq(TIMER_SOFTIRQ, run_timer_softirq);
 }
index 9087d71537ddef84c011b86988e17202b007a291..250ed11d3ed2b83b8e2a87845fe97a7db096b33c 100644 (file)
@@ -113,7 +113,8 @@ static __init int test_atomic64(void)
        r += one;
        BUG_ON(v.counter != r);
 
-#if defined(CONFIG_X86) || defined(CONFIG_MIPS) || defined(CONFIG_PPC) || defined(_ASM_GENERIC_ATOMIC64_H)
+#if defined(CONFIG_X86) || defined(CONFIG_MIPS) || defined(CONFIG_PPC) || \
+    defined(CONFIG_S390) || defined(_ASM_GENERIC_ATOMIC64_H)
        INIT(onestwos);
        BUG_ON(atomic64_dec_if_positive(&v) != (onestwos - 1));
        r -= one;
index 59c15511d58ab9da74ed6d77fed198b666235c6b..b93579504dfaaafee092156c113b36130b0758a7 100644 (file)
@@ -83,6 +83,7 @@ out:
        return ret;
 }
 
+#ifdef CONFIG_NET
 static int kobj_bcast_filter(struct sock *dsk, struct sk_buff *skb, void *data)
 {
        struct kobject *kobj = data;
@@ -98,6 +99,7 @@ static int kobj_bcast_filter(struct sock *dsk, struct sk_buff *skb, void *data)
 
        return 0;
 }
+#endif
 
 static int kobj_usermode_filter(struct kobject *kobj)
 {
@@ -378,6 +380,7 @@ static int uevent_net_init(struct net *net)
        if (!ue_sk->sk) {
                printk(KERN_ERR
                       "kobject_uevent: unable to create netlink socket!\n");
+               kfree(ue_sk);
                return -ENODEV;
        }
        mutex_lock(&uevent_sock_mutex);
index b289310e2c899ba472ea1f7a92a01b908f549f18..5fa63bdf52e491990dd89f0ec4348fb0b0d0ca00 100644 (file)
@@ -597,7 +597,7 @@ static void balance_dirty_pages(struct address_space *mapping,
            (!laptop_mode && ((global_page_state(NR_FILE_DIRTY)
                               + global_page_state(NR_UNSTABLE_NFS))
                                          > background_thresh)))
-               bdi_start_writeback(bdi, NULL, 0, 0);
+               bdi_start_writeback(bdi, NULL, 0);
 }
 
 void set_page_dirty_balance(struct page *page, int page_mkwrite)
@@ -707,7 +707,7 @@ void laptop_mode_timer_fn(unsigned long data)
         */
 
        if (bdi_has_dirty_io(&q->backing_dev_info))
-               bdi_start_writeback(&q->backing_dev_info, NULL, nr_pages, 0);
+               bdi_start_writeback(&q->backing_dev_info, NULL, nr_pages);
 }
 
 /*
index 915dceb487c11b1f1783df86908ba5e6e7317769..9c7e57cc63a34f7231b77a7d8b395d3157a34ba6 100644 (file)
@@ -1724,13 +1724,13 @@ static void shrink_zone(int priority, struct zone *zone,
  * If a zone is deemed to be full of pinned pages then just give it a light
  * scan then give up on it.
  */
-static int shrink_zones(int priority, struct zonelist *zonelist,
+static bool shrink_zones(int priority, struct zonelist *zonelist,
                                        struct scan_control *sc)
 {
        enum zone_type high_zoneidx = gfp_zone(sc->gfp_mask);
        struct zoneref *z;
        struct zone *zone;
-       int progress = 0;
+       bool all_unreclaimable = true;
 
        for_each_zone_zonelist_nodemask(zone, z, zonelist, high_zoneidx,
                                        sc->nodemask) {
@@ -1757,9 +1757,9 @@ static int shrink_zones(int priority, struct zonelist *zonelist,
                }
 
                shrink_zone(priority, zone, sc);
-               progress = 1;
+               all_unreclaimable = false;
        }
-       return progress;
+       return all_unreclaimable;
 }
 
 /*
@@ -1782,7 +1782,7 @@ static unsigned long do_try_to_free_pages(struct zonelist *zonelist,
                                        struct scan_control *sc)
 {
        int priority;
-       unsigned long ret = 0;
+       bool all_unreclaimable;
        unsigned long total_scanned = 0;
        struct reclaim_state *reclaim_state = current->reclaim_state;
        unsigned long lru_pages = 0;
@@ -1813,7 +1813,7 @@ static unsigned long do_try_to_free_pages(struct zonelist *zonelist,
                sc->nr_scanned = 0;
                if (!priority)
                        disable_swap_token();
-               ret = shrink_zones(priority, zonelist, sc);
+               all_unreclaimable = shrink_zones(priority, zonelist, sc);
                /*
                 * Don't shrink slabs when reclaiming memory from
                 * over limit cgroups
@@ -1826,10 +1826,8 @@ static unsigned long do_try_to_free_pages(struct zonelist *zonelist,
                        }
                }
                total_scanned += sc->nr_scanned;
-               if (sc->nr_reclaimed >= sc->nr_to_reclaim) {
-                       ret = sc->nr_reclaimed;
+               if (sc->nr_reclaimed >= sc->nr_to_reclaim)
                        goto out;
-               }
 
                /*
                 * Try to write back as many pages as we just scanned.  This
@@ -1849,9 +1847,7 @@ static unsigned long do_try_to_free_pages(struct zonelist *zonelist,
                    priority < DEF_PRIORITY - 2)
                        congestion_wait(BLK_RW_ASYNC, HZ/10);
        }
-       /* top priority shrink_zones still had more to do? don't OOM, then */
-       if (ret && scanning_global_lru(sc))
-               ret = sc->nr_reclaimed;
+
 out:
        /*
         * Now that we've scanned all the zones at this priority level, note
@@ -1877,7 +1873,14 @@ out:
        delayacct_freepages_end();
        put_mems_allowed();
 
-       return ret;
+       if (sc->nr_reclaimed)
+               return sc->nr_reclaimed;
+
+       /* top priority shrink_zones still had more to do? don't OOM, then */
+       if (scanning_global_lru(sc) && !all_unreclaimable)
+               return 1;
+
+       return 0;
 }
 
 unsigned long try_to_free_pages(struct zonelist *zonelist, int order,
index 7cdae39b8f09fbb05c73c39424d7bb2f344a8360..7ea649da19400252ba751bfdb8bea5e7a5dba426 100644 (file)
@@ -219,7 +219,7 @@ HOSTCFLAGS_zconf.tab.o      := -I$(src)
 HOSTLOADLIBES_qconf    = $(KC_QT_LIBS) -ldl
 HOSTCXXFLAGS_qconf.o   = $(KC_QT_CFLAGS) -D LKC_DIRECT_LINK
 
-HOSTLOADLIBES_gconf    = `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0`
+HOSTLOADLIBES_gconf    = `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0` -ldl
 HOSTCFLAGS_gconf.o     = `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \
                           -D LKC_DIRECT_LINK
 
index f74c7372b3d14d3ba553cc8b904dd75585b28bd3..1db586af4f9c8189fda494d2aead7f9c6c22f954 100644 (file)
@@ -2578,6 +2578,9 @@ static int __devinit snd_card_asihpi_mixer_new(struct snd_card_asihpi *asihpi)
        if (err)
                return -err;
 
+       memset(&prev_ctl, 0, sizeof(prev_ctl));
+       prev_ctl.control_type = -1;
+
        for (idx = 0; idx < 2000; idx++) {
                err = hpi_mixer_get_control_by_index(
                                ss, asihpi->h_mixer,
index dc79564fea30d2e17fef0b9abfc51b0ec636c73f..1df25cf5ce38c35f0d04fdddd43be9ea1d23c3f4 100644 (file)
@@ -1913,11 +1913,11 @@ static int azx_position_ok(struct azx *chip, struct azx_dev *azx_dev)
        if (WARN_ONCE(!azx_dev->period_bytes,
                      "hda-intel: zero azx_dev->period_bytes"))
                return -1; /* this shouldn't happen! */
-       if (wallclk <= azx_dev->period_wallclk &&
+       if (wallclk < (azx_dev->period_wallclk * 5) / 4 &&
            pos % azx_dev->period_bytes > azx_dev->period_bytes / 2)
                /* NG - it's below the first next period boundary */
                return bdl_pos_adj[chip->dev_index] ? 0 : -1;
-       azx_dev->start_wallclk = wallclk;
+       azx_dev->start_wallclk += wallclk;
        return 1; /* OK, it's fine */
 }
 
@@ -2288,6 +2288,8 @@ static struct snd_pci_quirk position_fix_list[] __devinitdata = {
        SND_PCI_QUIRK(0x1028, 0x01f6, "Dell Latitude 131L", POS_FIX_LPIB),
        SND_PCI_QUIRK(0x103c, 0x306d, "HP dv3", POS_FIX_LPIB),
        SND_PCI_QUIRK(0x1043, 0x813d, "ASUS P5AD2", POS_FIX_LPIB),
+       SND_PCI_QUIRK(0x1043, 0x81b3, "ASUS", POS_FIX_LPIB),
+       SND_PCI_QUIRK(0x1043, 0x81e7, "ASUS M2V", POS_FIX_LPIB),
        SND_PCI_QUIRK(0x104d, 0x9069, "Sony VPCS11V9E", POS_FIX_LPIB),
        SND_PCI_QUIRK(0x1106, 0x3288, "ASUS M2V-MX SE", POS_FIX_LPIB),
        SND_PCI_QUIRK(0x1179, 0xff10, "Toshiba A100-259", POS_FIX_LPIB),
@@ -2296,6 +2298,7 @@ static struct snd_pci_quirk position_fix_list[] __devinitdata = {
        SND_PCI_QUIRK(0x1462, 0x1002, "MSI Wind U115", POS_FIX_LPIB),
        SND_PCI_QUIRK(0x1565, 0x820f, "Biostar Microtech", POS_FIX_LPIB),
        SND_PCI_QUIRK(0x1565, 0x8218, "Biostar Microtech", POS_FIX_LPIB),
+       SND_PCI_QUIRK(0x1849, 0x0888, "775Dual-VSTA", POS_FIX_LPIB),
        SND_PCI_QUIRK(0x8086, 0x2503, "DG965OT AAD63733-203", POS_FIX_LPIB),
        SND_PCI_QUIRK(0x8086, 0xd601, "eMachines T5212", POS_FIX_LPIB),
        {}
index 17d4548cc353f72402693b0b39461226467a00d9..d792cddbf4c2eeb87e7e18ec812ce2c217a84b7b 100644 (file)
@@ -9476,6 +9476,7 @@ static struct snd_pci_quirk alc882_ssid_cfg_tbl[] = {
        SND_PCI_QUIRK(0x106b, 0x1000, "iMac 24", ALC885_IMAC24),
        SND_PCI_QUIRK(0x106b, 0x2800, "AppleTV", ALC885_IMAC24),
        SND_PCI_QUIRK(0x106b, 0x2c00, "MacbookPro rev3", ALC885_MBP3),
+       SND_PCI_QUIRK(0x106b, 0x3000, "iMac", ALC889A_MB31),
        SND_PCI_QUIRK(0x106b, 0x3600, "Macbook 3,1", ALC889A_MB31),
        SND_PCI_QUIRK(0x106b, 0x3800, "MacbookPro 4,1", ALC885_MBP3),
        SND_PCI_QUIRK(0x106b, 0x3e00, "iMac 24 Aluminum", ALC885_IMAC24),
index eba9b9d257a109b3e4554581cc97f9d6fe839035..252defea93b5f2fdc4e64ad9ae4c484e2b8d9eca 100644 (file)
@@ -13,9 +13,18 @@ config SND_MXC_SOC_SSI
 
 config SND_MXC_SOC_WM1133_EV1
        tristate "Audio on the the i.MX31ADS with WM1133-EV1 fitted"
-       depends on SND_IMX_SOC && EXPERIMENTAL
+       depends on SND_IMX_SOC && MACH_MX31ADS_WM1133_EV1 && EXPERIMENTAL
        select SND_SOC_WM8350
        select SND_MXC_SOC_SSI
        help
          Enable support for audio on the i.MX31ADS with the WM1133-EV1
          PMIC board with WM8835x fitted.
+
+config SND_SOC_PHYCORE_AC97
+       tristate "SoC Audio support for Phytec phyCORE (and phyCARD) boards"
+       depends on MACH_PCM043 || MACH_PCA100
+       select SND_MXC_SOC_SSI
+       select SND_SOC_WM9712
+       help
+         Say Y if you want to add support for SoC audio on Phytec phyCORE
+         and phyCARD boards in AC97 mode
index e7ac7f493a8fa1d0874ca9992ee180679390ec69..1e362bf8834f4e5fdfc6da32cf33a96f53ef7c85 100644 (file)
@@ -11,7 +11,8 @@ snd-usb-audio-objs :=         card.o \
                        endpoint.o \
                        urb.o \
                        pcm.o \
-                       helper.o
+                       helper.o \
+                       clock.o
 
 snd-usbmidi-lib-objs := midi.o
 
index da1346bd4856893a5e2449abfe0d6cd1e6293ea5..7a8ac1d81be7fc7e1a176ad432cd43a841a9e74d 100644 (file)
@@ -236,7 +236,6 @@ static int snd_usb_create_streams(struct snd_usb_audio *chip, int ctrlif)
        }
 
        case UAC_VERSION_2: {
-               struct uac_clock_source_descriptor *cs;
                struct usb_interface_assoc_descriptor *assoc =
                        usb_ifnum_to_if(dev, ctrlif)->intf_assoc;
 
@@ -245,21 +244,6 @@ static int snd_usb_create_streams(struct snd_usb_audio *chip, int ctrlif)
                        return -EINVAL;
                }
 
-               /* FIXME: for now, we expect there is at least one clock source
-                * descriptor and we always take the first one.
-                * We should properly support devices with multiple clock sources,
-                * clock selectors and sample rate conversion units. */
-
-               cs = snd_usb_find_csint_desc(host_iface->extra, host_iface->extralen,
-                                               NULL, UAC2_CLOCK_SOURCE);
-
-               if (!cs) {
-                       snd_printk(KERN_ERR "CLOCK_SOURCE descriptor not found\n");
-                       return -EINVAL;
-               }
-
-               chip->clock_id = cs->bClockID;
-
                for (i = 0; i < assoc->bInterfaceCount; i++) {
                        int intf = assoc->bFirstInterface + i;
 
@@ -481,6 +465,8 @@ static void *snd_usb_audio_probe(struct usb_device *dev,
                        goto __error;
        }
 
+       chip->ctrl_intf = alts;
+
        if (err > 0) {
                /* create normal USB audio interfaces */
                if (snd_usb_create_streams(chip, ifnum) < 0 ||
index ed92420c10957150f30db2891191ffe60bf4b0c3..1febf2f23754afc63eb5469450ac8da6a97f23b3 100644 (file)
@@ -25,6 +25,7 @@ struct audioformat {
        unsigned int rate_min, rate_max;        /* min/max rates */
        unsigned int nr_rates;          /* number of rate table entries */
        unsigned int *rate_table;       /* rate table */
+       unsigned char clock;            /* associated clock */
 };
 
 struct snd_usb_substream;
diff --git a/sound/usb/clock.c b/sound/usb/clock.c
new file mode 100644 (file)
index 0000000..b7aadd6
--- /dev/null
@@ -0,0 +1,311 @@
+/*
+ *   Clock domain and sample rate management functions
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ *
+ */
+
+#include <linux/bitops.h>
+#include <linux/init.h>
+#include <linux/list.h>
+#include <linux/slab.h>
+#include <linux/string.h>
+#include <linux/usb.h>
+#include <linux/moduleparam.h>
+#include <linux/mutex.h>
+#include <linux/usb/audio.h>
+#include <linux/usb/audio-v2.h>
+
+#include <sound/core.h>
+#include <sound/info.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/initval.h>
+
+#include "usbaudio.h"
+#include "card.h"
+#include "midi.h"
+#include "mixer.h"
+#include "proc.h"
+#include "quirks.h"
+#include "endpoint.h"
+#include "helper.h"
+#include "debug.h"
+#include "pcm.h"
+#include "urb.h"
+#include "format.h"
+
+static struct uac_clock_source_descriptor *
+       snd_usb_find_clock_source(struct usb_host_interface *ctrl_iface,
+                                 int clock_id)
+{
+       struct uac_clock_source_descriptor *cs = NULL;
+
+       while ((cs = snd_usb_find_csint_desc(ctrl_iface->extra,
+                                            ctrl_iface->extralen,
+                                            cs, UAC2_CLOCK_SOURCE))) {
+               if (cs->bClockID == clock_id)
+                       return cs;
+       }
+
+       return NULL;
+}
+
+static struct uac_clock_selector_descriptor *
+       snd_usb_find_clock_selector(struct usb_host_interface *ctrl_iface,
+                                   int clock_id)
+{
+       struct uac_clock_selector_descriptor *cs = NULL;
+
+       while ((cs = snd_usb_find_csint_desc(ctrl_iface->extra,
+                                            ctrl_iface->extralen,
+                                            cs, UAC2_CLOCK_SELECTOR))) {
+               if (cs->bClockID == clock_id)
+                       return cs;
+       }
+
+       return NULL;
+}
+
+static struct uac_clock_multiplier_descriptor *
+       snd_usb_find_clock_multiplier(struct usb_host_interface *ctrl_iface,
+                                     int clock_id)
+{
+       struct uac_clock_multiplier_descriptor *cs = NULL;
+
+       while ((cs = snd_usb_find_csint_desc(ctrl_iface->extra,
+                                            ctrl_iface->extralen,
+                                            cs, UAC2_CLOCK_MULTIPLIER))) {
+               if (cs->bClockID == clock_id)
+                       return cs;
+       }
+
+       return NULL;
+}
+
+static int uac_clock_selector_get_val(struct snd_usb_audio *chip, int selector_id)
+{
+       unsigned char buf;
+       int ret;
+
+       ret = snd_usb_ctl_msg(chip->dev, usb_rcvctrlpipe(chip->dev, 0),
+                             UAC2_CS_CUR,
+                             USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_IN,
+                             UAC2_CX_CLOCK_SELECTOR << 8, selector_id << 8,
+                             &buf, sizeof(buf), 1000);
+
+       if (ret < 0)
+               return ret;
+
+       return buf;
+}
+
+static bool uac_clock_source_is_valid(struct snd_usb_audio *chip, int source_id)
+{
+       int err;
+       unsigned char data;
+       struct usb_device *dev = chip->dev;
+
+       err = snd_usb_ctl_msg(dev, usb_rcvctrlpipe(dev, 0), UAC2_CS_CUR,
+                             USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_IN,
+                             UAC2_CS_CONTROL_CLOCK_VALID << 8, source_id << 8,
+                             &data, sizeof(data), 1000);
+
+       if (err < 0) {
+               snd_printk(KERN_WARNING "%s(): cannot get clock validity for id %d\n",
+                          __func__, source_id);
+               return err;
+       }
+
+       return !!data;
+}
+
+/* Try to find the clock source ID of a given clock entity */
+
+static int __uac_clock_find_source(struct snd_usb_audio *chip,
+                                  struct usb_host_interface *host_iface,
+                                  int entity_id, unsigned long *visited)
+{
+       struct uac_clock_source_descriptor *source;
+       struct uac_clock_selector_descriptor *selector;
+       struct uac_clock_multiplier_descriptor *multiplier;
+
+       entity_id &= 0xff;
+
+       if (test_and_set_bit(entity_id, visited)) {
+               snd_printk(KERN_WARNING
+                       "%s(): recursive clock topology detected, id %d.\n",
+                       __func__, entity_id);
+               return -EINVAL;
+       }
+
+       /* first, see if the ID we're looking for is a clock source already */
+       source = snd_usb_find_clock_source(host_iface, entity_id);
+       if (source)
+               return source->bClockID;
+
+       selector = snd_usb_find_clock_selector(host_iface, entity_id);
+       if (selector) {
+               int ret;
+
+               /* the entity ID we are looking for is a selector.
+                * find out what it currently selects */
+               ret = uac_clock_selector_get_val(chip, selector->bClockID);
+               if (ret < 0)
+                       return ret;
+
+               if (ret > selector->bNrInPins || ret < 1) {
+                       printk(KERN_ERR
+                               "%s(): selector reported illegal value, id %d, ret %d\n",
+                               __func__, selector->bClockID, ret);
+
+                       return -EINVAL;
+               }
+
+               return __uac_clock_find_source(chip, host_iface,
+                                              selector->baCSourceID[ret-1],
+                                              visited);
+       }
+
+       /* FIXME: multipliers only act as pass-thru element for now */
+       multiplier = snd_usb_find_clock_multiplier(host_iface, entity_id);
+       if (multiplier)
+               return __uac_clock_find_source(chip, host_iface,
+                                              multiplier->bCSourceID, visited);
+
+       return -EINVAL;
+}
+
+int snd_usb_clock_find_source(struct snd_usb_audio *chip,
+                             struct usb_host_interface *host_iface,
+                             int entity_id)
+{
+       DECLARE_BITMAP(visited, 256);
+       memset(visited, 0, sizeof(visited));
+       return __uac_clock_find_source(chip, host_iface, entity_id, visited);
+}
+
+static int set_sample_rate_v1(struct snd_usb_audio *chip, int iface,
+                             struct usb_host_interface *alts,
+                             struct audioformat *fmt, int rate)
+{
+       struct usb_device *dev = chip->dev;
+       unsigned int ep;
+       unsigned char data[3];
+       int err, crate;
+
+       ep = get_endpoint(alts, 0)->bEndpointAddress;
+
+       /* if endpoint doesn't have sampling rate control, bail out */
+       if (!(fmt->attributes & UAC_EP_CS_ATTR_SAMPLE_RATE)) {
+               snd_printk(KERN_WARNING "%d:%d:%d: endpoint lacks sample rate attribute bit, cannot set.\n",
+                                  dev->devnum, iface, fmt->altsetting);
+               return 0;
+       }
+
+       data[0] = rate;
+       data[1] = rate >> 8;
+       data[2] = rate >> 16;
+       if ((err = snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), UAC_SET_CUR,
+                                  USB_TYPE_CLASS | USB_RECIP_ENDPOINT | USB_DIR_OUT,
+                                  UAC_EP_CS_ATTR_SAMPLE_RATE << 8, ep,
+                                  data, sizeof(data), 1000)) < 0) {
+               snd_printk(KERN_ERR "%d:%d:%d: cannot set freq %d to ep %#x\n",
+                          dev->devnum, iface, fmt->altsetting, rate, ep);
+               return err;
+       }
+
+       if ((err = snd_usb_ctl_msg(dev, usb_rcvctrlpipe(dev, 0), UAC_GET_CUR,
+                                  USB_TYPE_CLASS | USB_RECIP_ENDPOINT | USB_DIR_IN,
+                                  UAC_EP_CS_ATTR_SAMPLE_RATE << 8, ep,
+                                  data, sizeof(data), 1000)) < 0) {
+               snd_printk(KERN_WARNING "%d:%d:%d: cannot get freq at ep %#x\n",
+                          dev->devnum, iface, fmt->altsetting, ep);
+               return 0; /* some devices don't support reading */
+       }
+
+       crate = data[0] | (data[1] << 8) | (data[2] << 16);
+       if (crate != rate) {
+               snd_printd(KERN_WARNING "current rate %d is different from the runtime rate %d\n", crate, rate);
+               // runtime->rate = crate;
+       }
+
+       return 0;
+}
+
+static int set_sample_rate_v2(struct snd_usb_audio *chip, int iface,
+                             struct usb_host_interface *alts,
+                             struct audioformat *fmt, int rate)
+{
+       struct usb_device *dev = chip->dev;
+       unsigned char data[4];
+       int err, crate;
+       int clock = snd_usb_clock_find_source(chip, chip->ctrl_intf, fmt->clock);
+
+       if (clock < 0)
+               return clock;
+
+       if (!uac_clock_source_is_valid(chip, clock)) {
+               snd_printk(KERN_ERR "%d:%d:%d: clock source %d is not valid, cannot use\n",
+                          dev->devnum, iface, fmt->altsetting, clock);
+               return -ENXIO;
+       }
+
+       data[0] = rate;
+       data[1] = rate >> 8;
+       data[2] = rate >> 16;
+       data[3] = rate >> 24;
+       if ((err = snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), UAC2_CS_CUR,
+                                  USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_OUT,
+                                  UAC2_CS_CONTROL_SAM_FREQ << 8, clock << 8,
+                                  data, sizeof(data), 1000)) < 0) {
+               snd_printk(KERN_ERR "%d:%d:%d: cannot set freq %d (v2)\n",
+                          dev->devnum, iface, fmt->altsetting, rate);
+               return err;
+       }
+
+       if ((err = snd_usb_ctl_msg(dev, usb_rcvctrlpipe(dev, 0), UAC2_CS_CUR,
+                                  USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_IN,
+                                  UAC2_CS_CONTROL_SAM_FREQ << 8, clock << 8,
+                                  data, sizeof(data), 1000)) < 0) {
+               snd_printk(KERN_WARNING "%d:%d:%d: cannot get freq (v2)\n",
+                          dev->devnum, iface, fmt->altsetting);
+               return err;
+       }
+
+       crate = data[0] | (data[1] << 8) | (data[2] << 16) | (data[3] << 24);
+       if (crate != rate)
+               snd_printd(KERN_WARNING "current rate %d is different from the runtime rate %d\n", crate, rate);
+
+       return 0;
+}
+
+int snd_usb_init_sample_rate(struct snd_usb_audio *chip, int iface,
+                            struct usb_host_interface *alts,
+                            struct audioformat *fmt, int rate)
+{
+       struct usb_interface_descriptor *altsd = get_iface_desc(alts);
+
+       switch (altsd->bInterfaceProtocol) {
+       case UAC_VERSION_1:
+               return set_sample_rate_v1(chip, iface, alts, fmt, rate);
+
+       case UAC_VERSION_2:
+               return set_sample_rate_v2(chip, iface, alts, fmt, rate);
+       }
+
+       return -EINVAL;
+}
+
diff --git a/sound/usb/clock.h b/sound/usb/clock.h
new file mode 100644 (file)
index 0000000..beb2536
--- /dev/null
@@ -0,0 +1,12 @@
+#ifndef __USBAUDIO_CLOCK_H
+#define __USBAUDIO_CLOCK_H
+
+int snd_usb_init_sample_rate(struct snd_usb_audio *chip, int iface,
+                            struct usb_host_interface *alts,
+                            struct audioformat *fmt, int rate);
+
+int snd_usb_clock_find_source(struct snd_usb_audio *chip,
+                             struct usb_host_interface *host_iface,
+                             int entity_id);
+
+#endif /* __USBAUDIO_CLOCK_H */
index 28ee1ce3971a7fd063fdfc0f80a8f73696bb9b4b..9593b91452b97f9564989d4ab1df7a32905b4e64 100644 (file)
@@ -190,6 +190,38 @@ static int parse_uac_endpoint_attributes(struct snd_usb_audio *chip,
        return attributes;
 }
 
+static struct uac2_input_terminal_descriptor *
+       snd_usb_find_input_terminal_descriptor(struct usb_host_interface *ctrl_iface,
+                                              int terminal_id)
+{
+       struct uac2_input_terminal_descriptor *term = NULL;
+
+       while ((term = snd_usb_find_csint_desc(ctrl_iface->extra,
+                                              ctrl_iface->extralen,
+                                              term, UAC_INPUT_TERMINAL))) {
+               if (term->bTerminalID == terminal_id)
+                       return term;
+       }
+
+       return NULL;
+}
+
+static struct uac2_output_terminal_descriptor *
+       snd_usb_find_output_terminal_descriptor(struct usb_host_interface *ctrl_iface,
+                                               int terminal_id)
+{
+       struct uac2_output_terminal_descriptor *term = NULL;
+
+       while ((term = snd_usb_find_csint_desc(ctrl_iface->extra,
+                                              ctrl_iface->extralen,
+                                              term, UAC_OUTPUT_TERMINAL))) {
+               if (term->bTerminalID == terminal_id)
+                       return term;
+       }
+
+       return NULL;
+}
+
 int snd_usb_parse_audio_endpoints(struct snd_usb_audio *chip, int iface_no)
 {
        struct usb_device *dev;
@@ -199,7 +231,7 @@ int snd_usb_parse_audio_endpoints(struct snd_usb_audio *chip, int iface_no)
        int i, altno, err, stream;
        int format = 0, num_channels = 0;
        struct audioformat *fp = NULL;
-       int num, protocol;
+       int num, protocol, clock = 0;
        struct uac_format_type_i_continuous_descriptor *fmt;
 
        dev = chip->dev;
@@ -263,6 +295,8 @@ int snd_usb_parse_audio_endpoints(struct snd_usb_audio *chip, int iface_no)
                }
 
                case UAC_VERSION_2: {
+                       struct uac2_input_terminal_descriptor *input_term;
+                       struct uac2_output_terminal_descriptor *output_term;
                        struct uac_as_header_descriptor_v2 *as =
                                snd_usb_find_csint_desc(alts->extra, alts->extralen, NULL, UAC_AS_GENERAL);
 
@@ -281,7 +315,25 @@ int snd_usb_parse_audio_endpoints(struct snd_usb_audio *chip, int iface_no)
                        num_channels = as->bNrChannels;
                        format = le32_to_cpu(as->bmFormats);
 
-                       break;
+                       /* lookup the terminal associated to this interface
+                        * to extract the clock */
+                       input_term = snd_usb_find_input_terminal_descriptor(chip->ctrl_intf,
+                                                                           as->bTerminalLink);
+                       if (input_term) {
+                               clock = input_term->bCSourceID;
+                               break;
+                       }
+
+                       output_term = snd_usb_find_output_terminal_descriptor(chip->ctrl_intf,
+                                                                             as->bTerminalLink);
+                       if (output_term) {
+                               clock = output_term->bCSourceID;
+                               break;
+                       }
+
+                       snd_printk(KERN_ERR "%d:%u:%d : bogus bTerminalLink %d\n",
+                                  dev->devnum, iface_no, altno, as->bTerminalLink);
+                       continue;
                }
 
                default:
@@ -338,6 +390,7 @@ int snd_usb_parse_audio_endpoints(struct snd_usb_audio *chip, int iface_no)
                        fp->maxpacksize = (((fp->maxpacksize >> 11) & 3) + 1)
                                        * (fp->maxpacksize & 0x7ff);
                fp->attributes = parse_uac_endpoint_attributes(chip, alts, protocol, iface_no);
+               fp->clock = clock;
 
                /* some quirks for attributes here */
 
index fe29d61de19bc80bdc0dbdc2fe209fd3fd71b21e..5367cd1e52d9dac9231077e829ca3e0869175de4 100644 (file)
@@ -29,6 +29,7 @@
 #include "quirks.h"
 #include "helper.h"
 #include "debug.h"
+#include "clock.h"
 
 /*
  * parse the audio format type I descriptor
@@ -215,15 +216,17 @@ static int parse_audio_format_rates_v2(struct snd_usb_audio *chip,
        struct usb_device *dev = chip->dev;
        unsigned char tmp[2], *data;
        int i, nr_rates, data_size, ret = 0;
+       int clock = snd_usb_clock_find_source(chip, chip->ctrl_intf, fp->clock);
 
        /* get the number of sample rates first by only fetching 2 bytes */
        ret = snd_usb_ctl_msg(dev, usb_rcvctrlpipe(dev, 0), UAC2_CS_RANGE,
                              USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_IN,
-                             UAC2_CS_CONTROL_SAM_FREQ << 8, chip->clock_id << 8,
+                             UAC2_CS_CONTROL_SAM_FREQ << 8, clock << 8,
                              tmp, sizeof(tmp), 1000);
 
        if (ret < 0) {
-               snd_printk(KERN_ERR "unable to retrieve number of sample rates\n");
+               snd_printk(KERN_ERR "%s(): unable to retrieve number of sample rates (clock %d)\n",
+                               __func__, clock);
                goto err;
        }
 
@@ -237,12 +240,13 @@ static int parse_audio_format_rates_v2(struct snd_usb_audio *chip,
 
        /* now get the full information */
        ret = snd_usb_ctl_msg(dev, usb_rcvctrlpipe(dev, 0), UAC2_CS_RANGE,
-                              USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_IN,
-                              UAC2_CS_CONTROL_SAM_FREQ << 8, chip->clock_id << 8,
-                              data, data_size, 1000);
+                             USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_IN,
+                             UAC2_CS_CONTROL_SAM_FREQ << 8, clock << 8,
+                             data, data_size, 1000);
 
        if (ret < 0) {
-               snd_printk(KERN_ERR "unable to retrieve sample rate range\n");
+               snd_printk(KERN_ERR "%s(): unable to retrieve sample rate range (clock %d)\n",
+                               __func__, clock);
                ret = -EINVAL;
                goto err_free;
        }
index 03ce971e002760e84b2d36565ee0cbfa56bebd50..a060d005e20921089309569a9e8ebb9c9115b455 100644 (file)
@@ -78,39 +78,6 @@ enum {
        USB_MIXER_U16,
 };
 
-enum {
-       USB_PROC_UPDOWN = 1,
-       USB_PROC_UPDOWN_SWITCH = 1,
-       USB_PROC_UPDOWN_MODE_SEL = 2,
-
-       USB_PROC_PROLOGIC = 2,
-       USB_PROC_PROLOGIC_SWITCH = 1,
-       USB_PROC_PROLOGIC_MODE_SEL = 2,
-
-       USB_PROC_3DENH = 3,
-       USB_PROC_3DENH_SWITCH = 1,
-       USB_PROC_3DENH_SPACE = 2,
-
-       USB_PROC_REVERB = 4,
-       USB_PROC_REVERB_SWITCH = 1,
-       USB_PROC_REVERB_LEVEL = 2,
-       USB_PROC_REVERB_TIME = 3,
-       USB_PROC_REVERB_DELAY = 4,
-
-       USB_PROC_CHORUS = 5,
-       USB_PROC_CHORUS_SWITCH = 1,
-       USB_PROC_CHORUS_LEVEL = 2,
-       USB_PROC_CHORUS_RATE = 3,
-       USB_PROC_CHORUS_DEPTH = 4,
-
-       USB_PROC_DCR = 6,
-       USB_PROC_DCR_SWITCH = 1,
-       USB_PROC_DCR_RATIO = 2,
-       USB_PROC_DCR_MAX_AMP = 3,
-       USB_PROC_DCR_THRESHOLD = 4,
-       USB_PROC_DCR_ATTACK = 5,
-       USB_PROC_DCR_RELEASE = 6,
-};
 
 /*E-mu 0202(0404) eXtension Unit(XU) control*/
 enum {
@@ -198,22 +165,24 @@ static int check_mapped_selector_name(struct mixer_build *state, int unitid,
 
 /*
  * find an audio control unit with the given unit id
- * this doesn't return any clock related units, so they need to be handled elsewhere
  */
 static void *find_audio_control_unit(struct mixer_build *state, unsigned char unit)
 {
-       unsigned char *p;
+       /* we just parse the header */
+       struct uac_feature_unit_descriptor *hdr = NULL;
 
-       p = NULL;
-       while ((p = snd_usb_find_desc(state->buffer, state->buflen, p,
-                                     USB_DT_CS_INTERFACE)) != NULL) {
-               if (p[0] >= 4 && p[2] >= UAC_INPUT_TERMINAL && p[2] <= UAC2_EXTENSION_UNIT_V2 && p[3] == unit)
-                       return p;
+       while ((hdr = snd_usb_find_desc(state->buffer, state->buflen, hdr,
+                                       USB_DT_CS_INTERFACE)) != NULL) {
+               if (hdr->bLength >= 4 &&
+                   hdr->bDescriptorSubtype >= UAC_INPUT_TERMINAL &&
+                   hdr->bDescriptorSubtype <= UAC2_SAMPLE_RATE_CONVERTER &&
+                   hdr->bUnitID == unit)
+                       return hdr;
        }
+
        return NULL;
 }
 
-
 /*
  * copy a string with the given id
  */
@@ -344,8 +313,8 @@ static int get_ctl_value_v2(struct usb_mixer_elem_info *cval, int request, int v
                              buf, sizeof(buf), 1000);
 
        if (ret < 0) {
-               snd_printdd(KERN_ERR "cannot get ctl value: req = %#x, wValue = %#x, wIndex = %#x, type = %d\n",
-                           request, validx, cval->mixer->ctrlif | (cval->id << 8), cval->val_type);
+               snd_printk(KERN_ERR "cannot get ctl value: req = %#x, wValue = %#x, wIndex = %#x, type = %d\n",
+                          request, validx, cval->mixer->ctrlif | (cval->id << 8), cval->val_type);
                return ret;
        }
 
@@ -462,6 +431,16 @@ static int set_cur_mix_value(struct usb_mixer_elem_info *cval, int channel,
                             int index, int value)
 {
        int err;
+       unsigned int read_only = (channel == 0) ?
+               cval->master_readonly :
+               cval->ch_readonly & (1 << (channel - 1));
+
+       if (read_only) {
+               snd_printdd(KERN_INFO "%s(): channel %d of control %d is read_only\n",
+                           __func__, channel, cval->control);
+               return 0;
+       }
+
        err = snd_usb_mixer_set_ctl_value(cval, UAC_SET_CUR, (cval->control << 8) | channel,
                            value);
        if (err < 0)
@@ -631,6 +610,7 @@ static int get_term_name(struct mixer_build *state, struct usb_audio_term *iterm
  */
 static int check_input_term(struct mixer_build *state, int id, struct usb_audio_term *term)
 {
+       int err;
        void *p1;
 
        memset(term, 0, sizeof(*term));
@@ -651,6 +631,11 @@ static int check_input_term(struct mixer_build *state, int id, struct usb_audio_
                                term->channels = d->bNrChannels;
                                term->chconfig = le32_to_cpu(d->bmChannelConfig);
                                term->name = d->iTerminal;
+
+                               /* call recursively to get the clock selectors */
+                               err = check_input_term(state, d->bCSourceID, term);
+                               if (err < 0)
+                                       return err;
                        }
                        return 0;
                case UAC_FEATURE_UNIT: {
@@ -667,7 +652,8 @@ static int check_input_term(struct mixer_build *state, int id, struct usb_audio_
                        term->name = uac_mixer_unit_iMixer(d);
                        return 0;
                }
-               case UAC_SELECTOR_UNIT: {
+               case UAC_SELECTOR_UNIT:
+               case UAC2_CLOCK_SELECTOR: {
                        struct uac_selector_unit_descriptor *d = p1;
                        /* call recursively to retrieve the channel info */
                        if (check_input_term(state, d->baSourceID[0], term) < 0)
@@ -690,6 +676,13 @@ static int check_input_term(struct mixer_build *state, int id, struct usb_audio_
                        term->name = uac_processing_unit_iProcessing(d, state->mixer->protocol);
                        return 0;
                }
+               case UAC2_CLOCK_SOURCE: {
+                       struct uac_clock_source_descriptor *d = p1;
+                       term->type = d->bDescriptorSubtype << 16; /* virtual type */
+                       term->id = id;
+                       term->name = d->iClockSource;
+                       return 0;
+               }
                default:
                        return -ENODEV;
                }
@@ -709,16 +702,20 @@ struct usb_feature_control_info {
 };
 
 static struct usb_feature_control_info audio_feature_info[] = {
-       { "Mute",               USB_MIXER_INV_BOOLEAN },
-       { "Volume",             USB_MIXER_S16 },
+       { "Mute",                       USB_MIXER_INV_BOOLEAN },
+       { "Volume",                     USB_MIXER_S16 },
        { "Tone Control - Bass",        USB_MIXER_S8 },
        { "Tone Control - Mid",         USB_MIXER_S8 },
        { "Tone Control - Treble",      USB_MIXER_S8 },
        { "Graphic Equalizer",          USB_MIXER_S8 }, /* FIXME: not implemeted yet */
-       { "Auto Gain Control",  USB_MIXER_BOOLEAN },
-       { "Delay Control",      USB_MIXER_U16 },
-       { "Bass Boost",         USB_MIXER_BOOLEAN },
-       { "Loudness",           USB_MIXER_BOOLEAN },
+       { "Auto Gain Control",          USB_MIXER_BOOLEAN },
+       { "Delay Control",              USB_MIXER_U16 },
+       { "Bass Boost",                 USB_MIXER_BOOLEAN },
+       { "Loudness",                   USB_MIXER_BOOLEAN },
+       /* UAC2 specific */
+       { "Input Gain Control",         USB_MIXER_U16 },
+       { "Input Gain Pad Control",     USB_MIXER_BOOLEAN },
+       { "Phase Inverter Control",     USB_MIXER_BOOLEAN },
 };
 
 
@@ -958,7 +955,7 @@ static size_t append_ctl_name(struct snd_kcontrol *kctl, const char *str)
 static void build_feature_ctl(struct mixer_build *state, void *raw_desc,
                              unsigned int ctl_mask, int control,
                              struct usb_audio_term *iterm, int unitid,
-                             int read_only)
+                             int readonly_mask)
 {
        struct uac_feature_unit_descriptor *desc = raw_desc;
        unsigned int len = 0;
@@ -970,7 +967,7 @@ static void build_feature_ctl(struct mixer_build *state, void *raw_desc,
 
        control++; /* change from zero-based to 1-based value */
 
-       if (control == UAC_GRAPHIC_EQUALIZER_CONTROL) {
+       if (control == UAC_FU_GRAPHIC_EQUALIZER) {
                /* FIXME: not supported yet */
                return;
        }
@@ -989,20 +986,25 @@ static void build_feature_ctl(struct mixer_build *state, void *raw_desc,
        cval->control = control;
        cval->cmask = ctl_mask;
        cval->val_type = audio_feature_info[control-1].type;
-       if (ctl_mask == 0)
+       if (ctl_mask == 0) {
                cval->channels = 1;     /* master channel */
-       else {
+               cval->master_readonly = readonly_mask;
+       } else {
                int i, c = 0;
                for (i = 0; i < 16; i++)
                        if (ctl_mask & (1 << i))
                                c++;
                cval->channels = c;
+               cval->ch_readonly = readonly_mask;
        }
 
        /* get min/max values */
        get_min_max(cval, 0);
 
-       if (read_only)
+       /* if all channels in the mask are marked read-only, make the control
+        * read-only. set_cur_mix_value() will check the mask again and won't
+        * issue write commands to read-only channels. */
+       if (cval->channels == readonly_mask)
                kctl = snd_ctl_new1(&usb_feature_unit_ctl_ro, cval);
        else
                kctl = snd_ctl_new1(&usb_feature_unit_ctl, cval);
@@ -1021,8 +1023,8 @@ static void build_feature_ctl(struct mixer_build *state, void *raw_desc,
                                kctl->id.name, sizeof(kctl->id.name));
 
        switch (control) {
-       case UAC_MUTE_CONTROL:
-       case UAC_VOLUME_CONTROL:
+       case UAC_FU_MUTE:
+       case UAC_FU_VOLUME:
                /* determine the control name.  the rule is:
                 * - if a name id is given in descriptor, use it.
                 * - if the connected input can be determined, then use the name
@@ -1049,9 +1051,9 @@ static void build_feature_ctl(struct mixer_build *state, void *raw_desc,
                                len = append_ctl_name(kctl, " Playback");
                        }
                }
-               append_ctl_name(kctl, control == UAC_MUTE_CONTROL ?
+               append_ctl_name(kctl, control == UAC_FU_MUTE ?
                                " Switch" : " Volume");
-               if (control == UAC_VOLUME_CONTROL) {
+               if (control == UAC_FU_VOLUME) {
                        kctl->tlv.c = mixer_vol_tlv;
                        kctl->vd[0].access |= 
                                SNDRV_CTL_ELEM_ACCESS_TLV_READ |
@@ -1150,7 +1152,7 @@ static int parse_audio_feature_unit(struct mixer_build *state, int unitid, void
                snd_printk(KERN_INFO
                           "usbmixer: master volume quirk for PCM2702 chip\n");
                /* disable non-functional volume control */
-               master_bits &= ~UAC_FU_VOLUME;
+               master_bits &= ~UAC_CONTROL_BIT(UAC_FU_VOLUME);
                break;
        }
        if (channels > 0)
@@ -1188,19 +1190,22 @@ static int parse_audio_feature_unit(struct mixer_build *state, int unitid, void
 
                        for (j = 0; j < channels; j++) {
                                unsigned int mask = snd_usb_combine_bytes(bmaControls + csize * (j+1), csize);
-                               if (mask & (1 << (i * 2))) {
+                               if (uac2_control_is_readable(mask, i)) {
                                        ch_bits |= (1 << j);
-                                       if (~mask & (1 << ((i * 2) + 1)))
+                                       if (!uac2_control_is_writeable(mask, i))
                                                ch_read_only |= (1 << j);
                                }
                        }
 
-                       /* FIXME: the whole unit is read-only if any of the channels is marked read-only */
+                       /* NOTE: build_feature_ctl() will mark the control read-only if all channels
+                        * are marked read-only in the descriptors. Otherwise, the control will be
+                        * reported as writeable, but the driver will not actually issue a write
+                        * command for read-only channels */
                        if (ch_bits & 1) /* the first channel must be set (for ease of programming) */
-                               build_feature_ctl(state, _ftr, ch_bits, i, &iterm, unitid, !!ch_read_only);
-                       if (master_bits & (1 << i * 2))
+                               build_feature_ctl(state, _ftr, ch_bits, i, &iterm, unitid, ch_read_only);
+                       if (uac2_control_is_readable(master_bits, i))
                                build_feature_ctl(state, _ftr, 0, i, &iterm, unitid,
-                                                 ~master_bits & (1 << ((i * 2) + 1)));
+                                                 !uac2_control_is_writeable(master_bits, i));
                }
        }
 
@@ -1392,51 +1397,51 @@ struct procunit_info {
 };
 
 static struct procunit_value_info updown_proc_info[] = {
-       { USB_PROC_UPDOWN_SWITCH, "Switch", USB_MIXER_BOOLEAN },
-       { USB_PROC_UPDOWN_MODE_SEL, "Mode Select", USB_MIXER_U8, 1 },
+       { UAC_UD_ENABLE, "Switch", USB_MIXER_BOOLEAN },
+       { UAC_UD_MODE_SELECT, "Mode Select", USB_MIXER_U8, 1 },
        { 0 }
 };
 static struct procunit_value_info prologic_proc_info[] = {
-       { USB_PROC_PROLOGIC_SWITCH, "Switch", USB_MIXER_BOOLEAN },
-       { USB_PROC_PROLOGIC_MODE_SEL, "Mode Select", USB_MIXER_U8, 1 },
+       { UAC_DP_ENABLE, "Switch", USB_MIXER_BOOLEAN },
+       { UAC_DP_MODE_SELECT, "Mode Select", USB_MIXER_U8, 1 },
        { 0 }
 };
 static struct procunit_value_info threed_enh_proc_info[] = {
-       { USB_PROC_3DENH_SWITCH, "Switch", USB_MIXER_BOOLEAN },
-       { USB_PROC_3DENH_SPACE, "Spaciousness", USB_MIXER_U8 },
+       { UAC_3D_ENABLE, "Switch", USB_MIXER_BOOLEAN },
+       { UAC_3D_SPACE, "Spaciousness", USB_MIXER_U8 },
        { 0 }
 };
 static struct procunit_value_info reverb_proc_info[] = {
-       { USB_PROC_REVERB_SWITCH, "Switch", USB_MIXER_BOOLEAN },
-       { USB_PROC_REVERB_LEVEL, "Level", USB_MIXER_U8 },
-       { USB_PROC_REVERB_TIME, "Time", USB_MIXER_U16 },
-       { USB_PROC_REVERB_DELAY, "Delay", USB_MIXER_U8 },
+       { UAC_REVERB_ENABLE, "Switch", USB_MIXER_BOOLEAN },
+       { UAC_REVERB_LEVEL, "Level", USB_MIXER_U8 },
+       { UAC_REVERB_TIME, "Time", USB_MIXER_U16 },
+       { UAC_REVERB_FEEDBACK, "Feedback", USB_MIXER_U8 },
        { 0 }
 };
 static struct procunit_value_info chorus_proc_info[] = {
-       { USB_PROC_CHORUS_SWITCH, "Switch", USB_MIXER_BOOLEAN },
-       { USB_PROC_CHORUS_LEVEL, "Level", USB_MIXER_U8 },
-       { USB_PROC_CHORUS_RATE, "Rate", USB_MIXER_U16 },
-       { USB_PROC_CHORUS_DEPTH, "Depth", USB_MIXER_U16 },
+       { UAC_CHORUS_ENABLE, "Switch", USB_MIXER_BOOLEAN },
+       { UAC_CHORUS_LEVEL, "Level", USB_MIXER_U8 },
+       { UAC_CHORUS_RATE, "Rate", USB_MIXER_U16 },
+       { UAC_CHORUS_DEPTH, "Depth", USB_MIXER_U16 },
        { 0 }
 };
 static struct procunit_value_info dcr_proc_info[] = {
-       { USB_PROC_DCR_SWITCH, "Switch", USB_MIXER_BOOLEAN },
-       { USB_PROC_DCR_RATIO, "Ratio", USB_MIXER_U16 },
-       { USB_PROC_DCR_MAX_AMP, "Max Amp", USB_MIXER_S16 },
-       { USB_PROC_DCR_THRESHOLD, "Threshold", USB_MIXER_S16 },
-       { USB_PROC_DCR_ATTACK, "Attack Time", USB_MIXER_U16 },
-       { USB_PROC_DCR_RELEASE, "Release Time", USB_MIXER_U16 },
+       { UAC_DCR_ENABLE, "Switch", USB_MIXER_BOOLEAN },
+       { UAC_DCR_RATE, "Ratio", USB_MIXER_U16 },
+       { UAC_DCR_MAXAMPL, "Max Amp", USB_MIXER_S16 },
+       { UAC_DCR_THRESHOLD, "Threshold", USB_MIXER_S16 },
+       { UAC_DCR_ATTACK_TIME, "Attack Time", USB_MIXER_U16 },
+       { UAC_DCR_RELEASE_TIME, "Release Time", USB_MIXER_U16 },
        { 0 }
 };
 
 static struct procunit_info procunits[] = {
-       { USB_PROC_UPDOWN, "Up Down", updown_proc_info },
-       { USB_PROC_PROLOGIC, "Dolby Prologic", prologic_proc_info },
-       { USB_PROC_3DENH, "3D Stereo Extender", threed_enh_proc_info },
-       { USB_PROC_REVERB, "Reverb", reverb_proc_info },
-       { USB_PROC_CHORUS, "Chorus", chorus_proc_info },
-       { USB_PROC_DCR, "DCR", dcr_proc_info },
+       { UAC_PROCESS_UP_DOWNMIX, "Up Down", updown_proc_info },
+       { UAC_PROCESS_DOLBY_PROLOGIC, "Dolby Prologic", prologic_proc_info },
+       { UAC_PROCESS_STEREO_EXTENDER, "3D Stereo Extender", threed_enh_proc_info },
+       { UAC_PROCESS_REVERB, "Reverb", reverb_proc_info },
+       { UAC_PROCESS_CHORUS, "Chorus", chorus_proc_info },
+       { UAC_PROCESS_DYN_RANGE_COMP, "DCR", dcr_proc_info },
        { 0 },
 };
 /*
@@ -1524,7 +1529,7 @@ static int build_audio_procunit(struct mixer_build *state, int unitid, void *raw
                cval->channels = 1;
 
                /* get min/max values */
-               if (type == USB_PROC_UPDOWN && cval->control == USB_PROC_UPDOWN_MODE_SEL) {
+               if (type == UAC_PROCESS_UP_DOWNMIX && cval->control == UAC_UD_MODE_SELECT) {
                        __u8 *control_spec = uac_processing_unit_specific(desc, state->mixer->protocol);
                        /* FIXME: hard-coded */
                        cval->min = 1;
@@ -1619,7 +1624,7 @@ static int mixer_ctl_selector_get(struct snd_kcontrol *kcontrol, struct snd_ctl_
        struct usb_mixer_elem_info *cval = kcontrol->private_data;
        int val, err;
 
-       err = get_cur_ctl_value(cval, 0, &val);
+       err = get_cur_ctl_value(cval, cval->control << 8, &val);
        if (err < 0) {
                if (cval->mixer->ignore_ctl_error) {
                        ucontrol->value.enumerated.item[0] = 0;
@@ -1638,7 +1643,7 @@ static int mixer_ctl_selector_put(struct snd_kcontrol *kcontrol, struct snd_ctl_
        struct usb_mixer_elem_info *cval = kcontrol->private_data;
        int val, oval, err;
 
-       err = get_cur_ctl_value(cval, 0, &oval);
+       err = get_cur_ctl_value(cval, cval->control << 8, &oval);
        if (err < 0) {
                if (cval->mixer->ignore_ctl_error)
                        return 0;
@@ -1647,7 +1652,7 @@ static int mixer_ctl_selector_put(struct snd_kcontrol *kcontrol, struct snd_ctl_
        val = ucontrol->value.enumerated.item[0];
        val = get_abs_value(cval, val);
        if (val != oval) {
-               set_cur_ctl_value(cval, 0, val);
+               set_cur_ctl_value(cval, cval->control << 8, val);
                return 1;
        }
        return 0;
@@ -1729,6 +1734,11 @@ static int parse_audio_selector_unit(struct mixer_build *state, int unitid, void
        cval->res = 1;
        cval->initialized = 1;
 
+       if (desc->bDescriptorSubtype == UAC2_CLOCK_SELECTOR)
+               cval->control = UAC2_CX_CLOCK_SELECTOR;
+       else
+               cval->control = 0;
+
        namelist = kmalloc(sizeof(char *) * desc->bNrInPins, GFP_KERNEL);
        if (! namelist) {
                snd_printk(KERN_ERR "cannot malloc\n");
@@ -1778,7 +1788,9 @@ static int parse_audio_selector_unit(struct mixer_build *state, int unitid, void
                if (! len)
                        strlcpy(kctl->id.name, "USB", sizeof(kctl->id.name));
 
-               if ((state->oterm.type & 0xff00) == 0x0100)
+               if (desc->bDescriptorSubtype == UAC2_CLOCK_SELECTOR)
+                       append_ctl_name(kctl, " Clock Source");
+               else if ((state->oterm.type & 0xff00) == 0x0100)
                        append_ctl_name(kctl, " Capture Source");
                else
                        append_ctl_name(kctl, " Playback Source");
@@ -1812,10 +1824,12 @@ static int parse_audio_unit(struct mixer_build *state, int unitid)
 
        switch (p1[2]) {
        case UAC_INPUT_TERMINAL:
+       case UAC2_CLOCK_SOURCE:
                return 0; /* NOP */
        case UAC_MIXER_UNIT:
                return parse_audio_mixer_unit(state, unitid, p1);
        case UAC_SELECTOR_UNIT:
+       case UAC2_CLOCK_SELECTOR:
                return parse_audio_selector_unit(state, unitid, p1);
        case UAC_FEATURE_UNIT:
                return parse_audio_feature_unit(state, unitid, p1);
@@ -1912,6 +1926,11 @@ static int snd_usb_mixer_controls(struct usb_mixer_interface *mixer)
                        err = parse_audio_unit(&state, desc->bSourceID);
                        if (err < 0)
                                return err;
+
+                       /* for UAC2, use the same approach to also add the clock selectors */
+                       err = parse_audio_unit(&state, desc->bCSourceID);
+                       if (err < 0)
+                               return err;
                }
        }
 
index 130123854a6cfc37dc2c16cd88281222fa021300..a7cf1007fbb07478fa6a81280174aa919ac8ec4e 100644 (file)
@@ -34,6 +34,8 @@ struct usb_mixer_elem_info {
        unsigned int id;
        unsigned int control;   /* CS or ICN (high byte) */
        unsigned int cmask; /* channel mask bitmap: 0 = master */
+       unsigned int ch_readonly;
+       unsigned int master_readonly;
        int channels;
        int val_type;
        int min, max, res;
index d93fc89beba8aee1040164bccff3935f0a78524d..f1324c423835c8ade54cdb30730e7999b3cec853 100644 (file)
@@ -85,8 +85,8 @@ static struct usbmix_name_map extigy_map[] = {
        /* 16: MU (w/o controls) */
        { 17, NULL, 1 }, /* DISABLED: PU-switch (any effect?) */
        { 17, "Channel Routing", 2 },   /* PU: mode select */
-       { 18, "Tone Control - Bass", UAC_BASS_CONTROL }, /* FU */
-       { 18, "Tone Control - Treble", UAC_TREBLE_CONTROL }, /* FU */
+       { 18, "Tone Control - Bass", UAC_FU_BASS }, /* FU */
+       { 18, "Tone Control - Treble", UAC_FU_TREBLE }, /* FU */
        { 18, "Master Playback" }, /* FU; others */
        /* 19: OT speaker */
        /* 20: OT headphone */
index 056587de7be41876047296cba15a8ea96bd384a9..456829882f4061aca8e97f9d53d07f29d309bd1e 100644 (file)
@@ -31,6 +31,7 @@
 #include "urb.h"
 #include "helper.h"
 #include "pcm.h"
+#include "clock.h"
 
 /*
  * return the current pcm pointer.  just based on the hwptr_done value.
@@ -181,103 +182,6 @@ int snd_usb_init_pitch(struct snd_usb_audio *chip, int iface,
        return -EINVAL;
 }
 
-static int set_sample_rate_v1(struct snd_usb_audio *chip, int iface,
-                             struct usb_host_interface *alts,
-                             struct audioformat *fmt, int rate)
-{
-       struct usb_device *dev = chip->dev;
-       unsigned int ep;
-       unsigned char data[3];
-       int err, crate;
-
-       ep = get_endpoint(alts, 0)->bEndpointAddress;
-       /* if endpoint doesn't have sampling rate control, bail out */
-       if (!(fmt->attributes & UAC_EP_CS_ATTR_SAMPLE_RATE)) {
-               snd_printk(KERN_WARNING "%d:%d:%d: endpoint lacks sample rate attribute bit, cannot set.\n",
-                                  dev->devnum, iface, fmt->altsetting);
-               return 0;
-       }
-
-       data[0] = rate;
-       data[1] = rate >> 8;
-       data[2] = rate >> 16;
-       if ((err = snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), UAC_SET_CUR,
-                                  USB_TYPE_CLASS|USB_RECIP_ENDPOINT|USB_DIR_OUT,
-                                  UAC_EP_CS_ATTR_SAMPLE_RATE << 8, ep,
-                                  data, sizeof(data), 1000)) < 0) {
-               snd_printk(KERN_ERR "%d:%d:%d: cannot set freq %d to ep %#x\n",
-                          dev->devnum, iface, fmt->altsetting, rate, ep);
-               return err;
-       }
-       if ((err = snd_usb_ctl_msg(dev, usb_rcvctrlpipe(dev, 0), UAC_GET_CUR,
-                                  USB_TYPE_CLASS|USB_RECIP_ENDPOINT|USB_DIR_IN,
-                                  UAC_EP_CS_ATTR_SAMPLE_RATE << 8, ep,
-                                  data, sizeof(data), 1000)) < 0) {
-               snd_printk(KERN_WARNING "%d:%d:%d: cannot get freq at ep %#x\n",
-                          dev->devnum, iface, fmt->altsetting, ep);
-               return 0; /* some devices don't support reading */
-       }
-       crate = data[0] | (data[1] << 8) | (data[2] << 16);
-       if (crate != rate) {
-               snd_printd(KERN_WARNING "current rate %d is different from the runtime rate %d\n", crate, rate);
-               // runtime->rate = crate;
-       }
-
-       return 0;
-}
-
-static int set_sample_rate_v2(struct snd_usb_audio *chip, int iface,
-                             struct usb_host_interface *alts,
-                             struct audioformat *fmt, int rate)
-{
-       struct usb_device *dev = chip->dev;
-       unsigned char data[4];
-       int err, crate;
-
-       data[0] = rate;
-       data[1] = rate >> 8;
-       data[2] = rate >> 16;
-       data[3] = rate >> 24;
-       if ((err = snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), UAC2_CS_CUR,
-                                  USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_OUT,
-                                  UAC2_CS_CONTROL_SAM_FREQ << 8, chip->clock_id << 8,
-                                  data, sizeof(data), 1000)) < 0) {
-               snd_printk(KERN_ERR "%d:%d:%d: cannot set freq %d (v2)\n",
-                          dev->devnum, iface, fmt->altsetting, rate);
-               return err;
-       }
-       if ((err = snd_usb_ctl_msg(dev, usb_rcvctrlpipe(dev, 0), UAC2_CS_CUR,
-                                  USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_IN,
-                                  UAC2_CS_CONTROL_SAM_FREQ << 8, chip->clock_id << 8,
-                                  data, sizeof(data), 1000)) < 0) {
-               snd_printk(KERN_WARNING "%d:%d:%d: cannot get freq (v2)\n",
-                          dev->devnum, iface, fmt->altsetting);
-               return err;
-       }
-       crate = data[0] | (data[1] << 8) | (data[2] << 16) | (data[3] << 24);
-       if (crate != rate)
-               snd_printd(KERN_WARNING "current rate %d is different from the runtime rate %d\n", crate, rate);
-
-       return 0;
-}
-
-int snd_usb_init_sample_rate(struct snd_usb_audio *chip, int iface,
-                            struct usb_host_interface *alts,
-                            struct audioformat *fmt, int rate)
-{
-       struct usb_interface_descriptor *altsd = get_iface_desc(alts);
-
-       switch (altsd->bInterfaceProtocol) {
-       case UAC_VERSION_1:
-               return set_sample_rate_v1(chip, iface, alts, fmt, rate);
-
-       case UAC_VERSION_2:
-               return set_sample_rate_v2(chip, iface, alts, fmt, rate);
-       }
-
-       return -EINVAL;
-}
-
 /*
  * find a matching format and set up the interface
  */
index 06ebf24d3a4d504e61840f5abca7a30a87b5d5e1..24d3319cc34d0985ace0270be5b7894a3b086c21 100644 (file)
@@ -40,9 +40,6 @@ struct snd_usb_audio {
        int num_interfaces;
        int num_suspended_intf;
 
-       /* for audio class v2 */
-       int clock_id;
-
        struct list_head pcm_list;      /* list of pcm streams */
        int pcm_devs;
 
@@ -53,6 +50,8 @@ struct snd_usb_audio {
        int setup;                      /* from the 'device_setup' module param */
        int nrpacks;                    /* from the 'nrpacks' module param */
        int async_unlink;               /* from the 'async_unlink' module param */
+
+       struct usb_host_interface *ctrl_intf;   /* the audio control interface */
 };
 
 /*