From ae0bfb79aa0ac411a433433af4d74f1f08255608 Mon Sep 17 00:00:00 2001
From: Blue Swirl <blauwirbel@gmail.com>
Date: Wed, 13 Oct 2010 18:38:07 +0000
Subject: [PATCH] ppc: remove video.x

Only Mac-on-Linux stuff used video.x, OpenBIOS does not need it.

Remove video.x MoL hacks.

Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
---
 Makefile            |   3 +-
 configure           |   2 +-
 hw/ppc_mac.h        |   1 -
 hw/ppc_newworld.c   |  41 ++---------------
 hw/ppc_oldworld.c   | 110 ++------------------------------------------
 pc-bios/README      |   4 --
 pc-bios/video.x     | Bin 12192 -> 0 bytes
 target-ppc/cpu.h    |   3 --
 target-ppc/helper.c |  11 -----
 9 files changed, 9 insertions(+), 166 deletions(-)
 delete mode 100644 pc-bios/video.x

diff --git a/Makefile b/Makefile
index d9971c33f3..252c817d27 100644
--- a/Makefile
+++ b/Makefile
@@ -176,7 +176,7 @@ common  de-ch  es     fo  fr-ca  hu     ja  mk  nl-be      pt  sl     tr
 
 ifdef INSTALL_BLOBS
 BLOBS=bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \
-video.x openbios-sparc32 openbios-sparc64 openbios-ppc \
+openbios-sparc32 openbios-sparc64 openbios-ppc \
 gpxe-eepro100-80861209.rom \
 gpxe-eepro100-80861229.rom \
 pxe-e1000.bin \
@@ -323,7 +323,6 @@ tarbin:
 	$(datadir)/vgabios.bin \
 	$(datadir)/vgabios-cirrus.bin \
 	$(datadir)/ppc_rom.bin \
-	$(datadir)/video.x \
 	$(datadir)/openbios-sparc32 \
 	$(datadir)/openbios-sparc64 \
 	$(datadir)/openbios-ppc \
diff --git a/configure b/configure
index d30306195d..a079a494a4 100755
--- a/configure
+++ b/configure
@@ -3084,7 +3084,7 @@ if test "$source_path_used" = "yes" ; then
     FILES="Makefile tests/Makefile"
     FILES="$FILES tests/cris/Makefile tests/cris/.gdbinit"
     FILES="$FILES tests/test-mmap.c"
-    FILES="$FILES pc-bios/optionrom/Makefile pc-bios/keymaps pc-bios/video.x"
+    FILES="$FILES pc-bios/optionrom/Makefile pc-bios/keymaps"
     FILES="$FILES roms/seabios/Makefile roms/vgabios/Makefile"
     for bios_file in $source_path/pc-bios/*.bin $source_path/pc-bios/*.dtb $source_path/pc-bios/openbios-*; do
         FILES="$FILES pc-bios/`basename $bios_file`"
diff --git a/hw/ppc_mac.h b/hw/ppc_mac.h
index 89f96bbc34..ea8759324c 100644
--- a/hw/ppc_mac.h
+++ b/hw/ppc_mac.h
@@ -30,7 +30,6 @@
 
 #define BIOS_SIZE     (1024 * 1024)
 #define BIOS_FILENAME "ppc_rom.bin"
-#define VGABIOS_FILENAME "video.x"
 #define NVRAM_SIZE        0x2000
 #define PROM_FILENAME    "openbios-ppc"
 #define PROM_ADDR         0xfff00000
diff --git a/hw/ppc_newworld.c b/hw/ppc_newworld.c
index fb07c8316f..9b20dc5c7c 100644
--- a/hw/ppc_newworld.c
+++ b/hw/ppc_newworld.c
@@ -69,7 +69,6 @@
 #include "blockdev.h"
 
 #define MAX_IDE_BUS 2
-#define VGA_BIOS_SIZE 65536
 #define CFG_ADDR 0xf0000510
 
 /* debug UniNorth */
@@ -134,20 +133,19 @@ static void ppc_core99_init (ram_addr_t ram_size,
     qemu_irq *pic, **openpic_irqs;
     int unin_memory;
     int linux_boot, i;
-    ram_addr_t ram_offset, bios_offset, vga_bios_offset;
+    ram_addr_t ram_offset, bios_offset;
     uint32_t kernel_base, initrd_base;
     long kernel_size, initrd_size;
     PCIBus *pci_bus;
     MacIONVRAMState *nvr;
     int nvram_mem_index;
-    int vga_bios_size, bios_size;
+    int bios_size;
     int pic_mem_index, dbdma_mem_index, cuda_mem_index, escc_mem_index;
     int ide_mem_index[3];
     int ppc_boot_device;
     DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS];
     void *fw_cfg;
     void *dbdma;
-    uint8_t *vga_bios_ptr;
     int machine_arch;
 
     linux_boot = (kernel_filename != NULL);
@@ -167,9 +165,6 @@ static void ppc_core99_init (ram_addr_t ram_size,
         }
         /* Set time-base frequency to 100 Mhz */
         cpu_ppc_tb_init(env, 100UL * 1000UL * 1000UL);
-#if 0
-        env->osi_call = vga_osi_call;
-#endif
         qemu_register_reset((QEMUResetHandler*)&cpu_reset, env);
         envs[i] = env;
     }
@@ -199,36 +194,6 @@ static void ppc_core99_init (ram_addr_t ram_size,
         exit(1);
     }
 
-    /* allocate and load VGA BIOS */
-    vga_bios_offset = qemu_ram_alloc(NULL, "ppc_core99.vbios", VGA_BIOS_SIZE);
-    vga_bios_ptr = qemu_get_ram_ptr(vga_bios_offset);
-    filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, VGABIOS_FILENAME);
-    if (filename) {
-        vga_bios_size = load_image(filename, vga_bios_ptr + 8);
-        qemu_free(filename);
-    } else {
-        vga_bios_size = -1;
-    }
-    if (vga_bios_size < 0) {
-        /* if no bios is present, we can still work */
-        fprintf(stderr, "qemu: warning: could not load VGA bios '%s'\n",
-                VGABIOS_FILENAME);
-        vga_bios_size = 0;
-    } else {
-        /* set a specific header (XXX: find real Apple format for NDRV
-           drivers) */
-        vga_bios_ptr[0] = 'N';
-        vga_bios_ptr[1] = 'D';
-        vga_bios_ptr[2] = 'R';
-        vga_bios_ptr[3] = 'V';
-        cpu_to_be32w((uint32_t *)(vga_bios_ptr + 4), vga_bios_size);
-        vga_bios_size += 8;
-
-        /* Round to page boundary */
-        vga_bios_size = (vga_bios_size + TARGET_PAGE_SIZE - 1) &
-            TARGET_PAGE_MASK;
-    }
-
     if (linux_boot) {
         uint64_t lowaddr = 0;
         int bswap_needed;
@@ -352,7 +317,7 @@ static void ppc_core99_init (ram_addr_t ram_size,
         machine_arch = ARCH_MAC99;
     }
     /* init basic PC hardware */
-    pci_vga_init(pci_bus, vga_bios_offset, vga_bios_size);
+    pci_vga_init(pci_bus, 0, 0);
 
     escc_mem_index = escc_init(0x80013000, pic[0x25], pic[0x24],
                                serial_hds[0], serial_hds[1], ESCC_CLOCK, 4);
diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c
index a12a812970..ff0b51d374 100644
--- a/hw/ppc_oldworld.c
+++ b/hw/ppc_oldworld.c
@@ -1,3 +1,4 @@
+
 /*
  * QEMU OldWorld PowerMac (currently ~G3 Beige) hardware System Emulator
  *
@@ -44,79 +45,8 @@
 #include "blockdev.h"
 
 #define MAX_IDE_BUS 2
-#define VGA_BIOS_SIZE 65536
 #define CFG_ADDR 0xf0000510
 
-/* temporary frame buffer OSI calls for the video.x driver. The right
-   solution is to modify the driver to use VGA PCI I/Os */
-/* XXX: to be removed. This is no way related to emulation */
-static int vga_osi_call (CPUState *env)
-{
-    static int vga_vbl_enabled;
-    int linesize;
-
-#if 0
-    printf("osi_call R5=%016" PRIx64 "\n", ppc_dump_gpr(env, 5));
-#endif
-
-    /* same handler as PearPC, coming from the original MOL video
-       driver. */
-    switch(env->gpr[5]) {
-    case 4:
-        break;
-    case 28: /* set_vmode */
-        if (env->gpr[6] != 1 || env->gpr[7] != 0)
-            env->gpr[3] = 1;
-        else
-            env->gpr[3] = 0;
-        break;
-    case 29: /* get_vmode_info */
-        if (env->gpr[6] != 0) {
-            if (env->gpr[6] != 1 || env->gpr[7] != 0) {
-                env->gpr[3] = 1;
-                break;
-            }
-        }
-        env->gpr[3] = 0;
-        env->gpr[4] = (1 << 16) | 1; /* num_vmodes, cur_vmode */
-        env->gpr[5] = (1 << 16) | 0; /* num_depths, cur_depth_mode */
-        env->gpr[6] = (graphic_width << 16) | graphic_height; /* w, h */
-        env->gpr[7] = 85 << 16; /* refresh rate */
-        env->gpr[8] = (graphic_depth + 7) & ~7; /* depth (round to byte) */
-        linesize = ((graphic_depth + 7) >> 3) * graphic_width;
-        linesize = (linesize + 3) & ~3;
-        env->gpr[9] = (linesize << 16) | 0; /* row_bytes, offset */
-        break;
-    case 31: /* set_video power */
-        env->gpr[3] = 0;
-        break;
-    case 39: /* video_ctrl */
-        if (env->gpr[6] == 0 || env->gpr[6] == 1)
-            vga_vbl_enabled = env->gpr[6];
-        env->gpr[3] = 0;
-        break;
-    case 47:
-        break;
-    case 59: /* set_color */
-        /* R6 = index, R7 = RGB */
-        env->gpr[3] = 0;
-        break;
-    case 64: /* get color */
-        /* R6 = index */
-        env->gpr[3] = 0;
-        break;
-    case 116: /* set hwcursor */
-        /* R6 = x, R7 = y, R8 = visible, R9 = data */
-        break;
-    default:
-        fprintf(stderr, "unsupported OSI call R5=%016" PRIx64 "\n",
-                ppc_dump_gpr(env, 5));
-        break;
-    }
-
-    return 1; /* osi_call handled */
-}
-
 static int fw_cfg_boot_set(void *opaque, const char *boot_device)
 {
     fw_cfg_add_i16(opaque, FW_CFG_BOOT_DEVICE, boot_device[0]);
@@ -140,19 +70,18 @@ static void ppc_heathrow_init (ram_addr_t ram_size,
     char *filename;
     qemu_irq *pic, **heathrow_irqs;
     int linux_boot, i;
-    ram_addr_t ram_offset, bios_offset, vga_bios_offset;
+    ram_addr_t ram_offset, bios_offset;
     uint32_t kernel_base, initrd_base;
     int32_t kernel_size, initrd_size;
     PCIBus *pci_bus;
     MacIONVRAMState *nvr;
-    int vga_bios_size, bios_size;
+    int bios_size;
     int pic_mem_index, nvram_mem_index, dbdma_mem_index, cuda_mem_index;
     int escc_mem_index, ide_mem_index[2];
     uint16_t ppc_boot_device;
     DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS];
     void *fw_cfg;
     void *dbdma;
-    uint8_t *vga_bios_ptr;
 
     linux_boot = (kernel_filename != NULL);
 
@@ -167,7 +96,6 @@ static void ppc_heathrow_init (ram_addr_t ram_size,
         }
         /* Set time-base frequency to 16.6 Mhz */
         cpu_ppc_tb_init(env,  16600000UL);
-        env->osi_call = vga_osi_call;
         qemu_register_reset((QEMUResetHandler*)&cpu_reset, env);
         envs[i] = env;
     }
@@ -203,36 +131,6 @@ static void ppc_heathrow_init (ram_addr_t ram_size,
         exit(1);
     }
 
-    /* allocate and load VGA BIOS */
-    vga_bios_offset = qemu_ram_alloc(NULL, "ppc_heathrow.vbios", VGA_BIOS_SIZE);
-    vga_bios_ptr = qemu_get_ram_ptr(vga_bios_offset);
-    filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, VGABIOS_FILENAME);
-    if (filename) {
-        vga_bios_size = load_image(filename, vga_bios_ptr + 8);
-        qemu_free(filename);
-    } else {
-        vga_bios_size = -1;
-    }
-    if (vga_bios_size < 0) {
-        /* if no bios is present, we can still work */
-        fprintf(stderr, "qemu: warning: could not load VGA bios '%s'\n",
-                VGABIOS_FILENAME);
-        vga_bios_size = 0;
-    } else {
-        /* set a specific header (XXX: find real Apple format for NDRV
-           drivers) */
-        vga_bios_ptr[0] = 'N';
-        vga_bios_ptr[1] = 'D';
-        vga_bios_ptr[2] = 'R';
-        vga_bios_ptr[3] = 'V';
-        cpu_to_be32w((uint32_t *)(vga_bios_ptr + 4), vga_bios_size);
-        vga_bios_size += 8;
-
-        /* Round to page boundary */
-        vga_bios_size = (vga_bios_size + TARGET_PAGE_SIZE - 1) &
-            TARGET_PAGE_MASK;
-    }
-
     if (linux_boot) {
         uint64_t lowaddr = 0;
         int bswap_needed;
@@ -330,7 +228,7 @@ static void ppc_heathrow_init (ram_addr_t ram_size,
     }
     pic = heathrow_pic_init(&pic_mem_index, 1, heathrow_irqs);
     pci_bus = pci_grackle_init(0xfec00000, pic);
-    pci_vga_init(pci_bus, vga_bios_offset, vga_bios_size);
+    pci_vga_init(pci_bus, 0, 0);
 
     escc_mem_index = escc_init(0x80013000, pic[0x0f], pic[0x10], serial_hds[0],
                                serial_hds[1], ESCC_CLOCK, 4);
diff --git a/pc-bios/README b/pc-bios/README
index ec5e2e1c8c..3172cf7896 100644
--- a/pc-bios/README
+++ b/pc-bios/README
@@ -7,10 +7,6 @@
 - The PowerPC Open Hack'Ware Open Firmware Compatible BIOS is
   available at http://perso.magic.fr/l_indien/OpenHackWare/index.htm.
 
-- video.x is a PowerMac NDRV compatible driver for a VGA frame
-  buffer. It comes from the Mac-on-Linux project
-  (http://www.maconlinux.org/).
-
 - OpenBIOS (http://www.openbios.org/) is a free (GPL v2) portable
   firmware implementation. The goal is to implement a 100% IEEE
   1275-1994 (referred to as Open Firmware) compliant firmware.
diff --git a/pc-bios/video.x b/pc-bios/video.x
deleted file mode 100644
index 761aa0c9d47fc3648a64ccfe9b9747b2a3af9572..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12192
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
A)c^nh

diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h
index bf81941221..1334dd1b46 100644
--- a/target-ppc/cpu.h
+++ b/target-ppc/cpu.h
@@ -700,9 +700,6 @@ struct CPUPPCState {
     int power_mode;
     int (*check_pow)(CPUPPCState *env);
 
-    /* temporary hack to handle OSI calls (only used if non NULL) */
-    int (*osi_call)(struct CPUPPCState *env);
-
 #if !defined(CONFIG_USER_ONLY)
     void *load_info;    /* Holds boot loading state.  */
 #endif
diff --git a/target-ppc/helper.c b/target-ppc/helper.c
index edbdd80945..4b491012d7 100644
--- a/target-ppc/helper.c
+++ b/target-ppc/helper.c
@@ -2226,17 +2226,6 @@ static inline void powerpc_excp(CPUState *env, int excp_model, int excp)
             new_msr |= (target_ulong)MSR_HVB;
         goto store_current;
     case POWERPC_EXCP_SYSCALL:   /* System call exception                    */
-        /* NOTE: this is a temporary hack to support graphics OSI
-           calls from the MOL driver */
-        /* XXX: To be removed */
-        if (env->gpr[3] == 0x113724fa && env->gpr[4] == 0x77810f9b &&
-            env->osi_call) {
-            if (env->osi_call(env) != 0) {
-                env->exception_index = POWERPC_EXCP_NONE;
-                env->error_code = 0;
-                return;
-            }
-        }
         dump_syscall(env);
         lev = env->error_code;
         if (lev == 1 || (lpes0 == 0 && lpes1 == 0))
-- 
2.50.1