xorg-server: Changes to 'ubuntu'
debian/changelog | 10 -
debian/patches/151_x86emu_handle_cpuid.patch | 230 +++++++++++++++++++++++++++
debian/patches/series | 1
3 files changed, 238 insertions(+), 3 deletions(-)
New commits:
commit fdcafc134cc8ae1dc518438f37909f16fd78fb76
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Tue Feb 19 17:50:10 2008 +0200
Add 151_x86emu_handle_cpuid.patch to fix X86EMU CPUID handling.
LP: #180742
diff --git a/debian/changelog b/debian/changelog
index ba75ffc..5f52084 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,17 @@
-xorg-server (2:1.4.1~git20080131-1ubuntu3) UNRELEASED; urgency=low
+xorg-server (2:1.4.1~git20080131-1ubuntu3) hardy; urgency=low
- [Bryce Harrington]
+ [ Bryce Harrington ]
* Add 150_edid_quirk_lp154w01.patch to fix font size on LGPhilipsLCD
LP154W01-TLAE (LP: #127827)
* Add 149_add_quirks_for_physical_screen_size_issues.patch to help
address various common EDID issues (like monitors that report in
centimeters instead of millimeters, etc.) (LP: #151311)
- -- Bryce Harrington <bryce@ubuntu.com> Thu, 14 Feb 2008 17:37:01 -0800
+ [ Timo Aaltonen ]
+ * Add 151_x86emu_handle_cpuid.patch to fix X86EMU CPUID handling.
+ (LP: #180742)
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com> Tue, 19 Feb 2008 17:48:05 +0200
xorg-server (2:1.4.1~git20080131-1ubuntu2) hardy; urgency=low
diff --git a/debian/patches/151_x86emu_handle_cpuid.patch b/debian/patches/151_x86emu_handle_cpuid.patch
new file mode 100644
index 0000000..1a69fb6
--- /dev/null
+++ b/debian/patches/151_x86emu_handle_cpuid.patch
@@ -0,0 +1,230 @@
+From e76dd7d7991b32cfc0f64bddcdcee201f34a85c5 Mon Sep 17 00:00:00 2001
+From: Bart Trojanowski <bart@symbio-technologies.com>
+Date: Sat, 2 Feb 2008 12:21:57 -0500
+Subject: [PATCH] X86EMU: handle CPUID instruction
+
+This bug is tracked here:
+https://bugs.launchpad.net/ubuntu/+source/xserver-xorg-video-amd/+bug/180742
+
+After trying to switch from X to VT (or just quit) the video-amd driver
+attempts to issue INT 10/0 to go to mode 3 (VGA). The emulator, running
+the BIOS code, would then spit out:
+
+ c000:0282: A2 ILLEGAL EXTENDED X86 OPCODE!
+
+The opcode was 0F A2, or CPUID; it was not implemented in the emulator.
+This simple patch, against 1.3.0.0, handles the CPUID instruction in one of
+two ways:
+ 1) if ran on __i386__ or __x86_64__ then it calls the CPUID instruction
+ directly.
+ 2) if ran elsewhere it returns a canned 486dx4 set of values for
+ function 1.
+
+This fix allows the video-amd driver to switch back to console mode,
+with the GSW BIOS.
+
+Thanks to Symbio Technologies for funding my work, and ThinCan for
+providing hardware :)
+
+Signed-off-by: Bart Trojanowski <bart@jukie.net>
+---
+ hw/xfree86/x86emu/ops2.c | 16 ++++++-
+ hw/xfree86/x86emu/prim_ops.c | 44 +++++++++++++++++
+ hw/xfree86/x86emu/x86emu/prim_ops.h | 1 +
+ hw/xfree86/x86emu/x86emu/prim_x86_gcc.h | 79 +++++++++++++++++++++++++++++++
+ 4 files changed, 139 insertions(+), 1 deletions(-)
+ create mode 100644 hw/xfree86/x86emu/x86emu/prim_x86_gcc.h
+
+diff --git a/hw/xfree86/x86emu/ops2.c b/hw/xfree86/x86emu/ops2.c
+index 8c6c535..324de8a 100644
+--- a/hw/xfree86/x86emu/ops2.c
++++ b/hw/xfree86/x86emu/ops2.c
+@@ -328,6 +328,20 @@ static void x86emuOp2_pop_FS(u8 X86EMU_UNUSED(op2))
+ }
+
+ /****************************************************************************
++REMARKS: CPUID takes EAX/ECX as inputs, writes EAX/EBX/ECX/EDX as output
++Handles opcode 0x0f,0xa2
++****************************************************************************/
++static void x86emuOp2_cpuid(u8 X86EMU_UNUSED(op2))
++{
++ START_OF_INSTR();
++ DECODE_PRINTF("CPUID\n");
++ TRACE_AND_STEP();
++ cpuid();
++ DECODE_CLEAR_SEGOVR();
++ END_OF_INSTR();
++}
++
++/****************************************************************************
+ REMARKS:
+ Handles opcode 0x0f,0xa3
+ ****************************************************************************/
+@@ -2734,7 +2748,7 @@ void (*x86emu_optab2[256])(u8) =
+
+ /* 0xa0 */ x86emuOp2_push_FS,
+ /* 0xa1 */ x86emuOp2_pop_FS,
+-/* 0xa2 */ x86emuOp2_illegal_op,
++/* 0xa2 */ x86emuOp2_cpuid,
+ /* 0xa3 */ x86emuOp2_bt_R,
+ /* 0xa4 */ x86emuOp2_shld_IMM,
+ /* 0xa5 */ x86emuOp2_shld_CL,
+diff --git a/hw/xfree86/x86emu/prim_ops.c b/hw/xfree86/x86emu/prim_ops.c
+index 461e09e..07ccfe5 100644
+--- a/hw/xfree86/x86emu/prim_ops.c
++++ b/hw/xfree86/x86emu/prim_ops.c
+@@ -102,6 +102,12 @@
+ #define PRIM_OPS_NO_REDEFINE_ASM
+ #include "x86emu/x86emui.h"
+
++#if defined(__GNUC__)
++# if defined (__i386__) || defined(__i386) || defined(__AMD64__) || defined(__x86_64__) || defined(__amd64__)
++# include "x86emu/prim_x86_gcc.h"
++# endif
++#endif
++
+ /*------------------------- Global Variables ------------------------------*/
+
+ static u32 x86emu_parity_tab[8] =
+@@ -2654,3 +2660,41 @@ DB( if (CHECK_SP_ACCESS())
+ return res;
+ }
+
++/****************************************************************************
++REMARKS:
++CPUID takes EAX/ECX as inputs, writes EAX/EBX/ECX/EDX as output
++****************************************************************************/
++void cpuid (void)
++{
++ u32 feature = M.x86.R_EAX;
++#ifdef X86EMU_HAS_HW_CPUID
++ hw_cpuid(&M.x86.R_EAX, &M.x86.R_EBX, &M.x86.R_ECX, &M.x86.R_EDX);
++#endif
++ switch (feature) {
++ case 0:
++ M.x86.R_EAX = 1; // maximum function number we support
++#ifndef X86EMU_HAS_PRIM_CPUID
++ M.x86.R_EBX = 0x756e6547;
++ M.x86.R_ECX = 0x6c65746e;
++ M.x86.R_EDX = 0x49656e69;
++#endif
++ break;
++ case 1:
++#ifndef X86EMU_HAS_PRIM_CPUID
++ M.x86.R_EAX = 0x00000480; // 486dx4
++ M.x86.R_EBX = 0x00000000;
++ M.x86.R_ECX = 0x00000000;
++ M.x86.R_EDX = 0x00000002; // VME
++#else
++ M.x86.R_EDX &= 0x00000012; // TSC and VME
++#endif
++ break;
++ default:
++ M.x86.R_EAX = 0; // don't support extended features
++ M.x86.R_EBX = 0;
++ M.x86.R_ECX = 0;
++ M.x86.R_EDX = 0;
++ break;
++ }
++}
++
+diff --git a/hw/xfree86/x86emu/x86emu/prim_ops.h b/hw/xfree86/x86emu/x86emu/prim_ops.h
+index bea8357..6ac2a29 100644
+--- a/hw/xfree86/x86emu/x86emu/prim_ops.h
++++ b/hw/xfree86/x86emu/x86emu/prim_ops.h
+@@ -133,6 +133,7 @@ void push_word (u16 w);
+ void push_long (u32 w);
+ u16 pop_word (void);
+ u32 pop_long (void);
++void cpuid (void);
+
+ #ifdef __cplusplus
+ } /* End of "C" linkage for C++ */
+diff --git a/hw/xfree86/x86emu/x86emu/prim_x86_gcc.h b/hw/xfree86/x86emu/x86emu/prim_x86_gcc.h
+new file mode 100644
+index 0000000..c085ddc
+--- /dev/null
++++ b/hw/xfree86/x86emu/x86emu/prim_x86_gcc.h
+@@ -0,0 +1,79 @@
++/****************************************************************************
++*
++* Inline helpers for x86emu
++*
++* Copyright (C) 2008 Bart Trojanowski, Symbio Technologies, LLC
++*
++* ========================================================================
++*
++* Permission to use, copy, modify, distribute, and sell this software and
++* its documentation for any purpose is hereby granted without fee,
++* provided that the above copyright notice appear in all copies and that
++* both that copyright notice and this permission notice appear in
++* supporting documentation, and that the name of the authors not be used
++* in advertising or publicity pertaining to distribution of the software
++* without specific, written prior permission. The authors makes no
++* representations about the suitability of this software for any purpose.
++* It is provided "as is" without express or implied warranty.
++*
++* THE AUTHORS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++* EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
++* USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
++* OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++* PERFORMANCE OF THIS SOFTWARE.
++*
++* ========================================================================
++*
++* Language: GNU C
++* Environment: GCC on i386 or x86-64
++* Developer: Bart Trojanowski
++*
++* Description: This file defines a few x86 macros that can be used by the
++* emulator to execute native instructions.
++*
++* For PIC vs non-PIC code refer to:
++* http://sam.zoy.org/blog/2007-04-13-shlib-with-non-pic-code-have-inline-assembly-and-pic-mix-well
++*
++****************************************************************************/
++#ifndef __X86EMU_PRIM_X86_GCC_H
++#define __X86EMU_PRIM_X86_GCC_H
++
++#include "x86emu/types.h"
++
++#if !defined(__GNUC__) || !(defined (__i386__) || defined(__i386) || defined(__AMD64__) || defined(__x86_64__) || defined(__amd64__))
++#error This file is intended to be used by gcc on i386 or x86-64 system
++#endif
++
++#if defined(__PIC__) && defined(__i386__)
++
++#define X86EMU_HAS_HW_CPUID 1
++static inline void hw_cpuid (u32 *a, u32 *b, u32 *c, u32 *d)
++{
++ __asm__ __volatile__ ("pushl %%ebx \n\t"
++ "cpuid \n\t"
++ "movl %%ebx, %1 \n\t"
++ "popl %%ebx \n\t"
++ : "=a" (*a), "=r" (*b),
++ "=c" (*c), "=d" (*d)
++ : "a" (*a), "c" (*c)
++ : "cc");
++}
++
++#else // ! (__PIC__ && __i386__)
++
++#define X86EMU_HAS_HW_CPUID 1
++static inline void hw_cpuid (u32 *a, u32 *b, u32 *c, u32 *d)
++{
++ __asm__ __volatile__ ("cpuid"
++ : "=a" (*a), "=b" (*b),
++ "=c" (*c), "=d" (*d)
++ : "a" (*a), "c" (*c)
++ : "cc");
++}
++
++#endif // __PIC__ && __i386__
++
++
++#endif // __X86EMU_PRIM_X86_GCC_H
+--
+1.5.3.7.1150.g149d432
+
diff --git a/debian/patches/series b/debian/patches/series
index c5cf93f..6355289 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -44,3 +44,4 @@
148_dix_touchscreen_fixes.diff
149_add_quirks_for_physical_screen_size_issues.patch
150_edid_quirk_lp154w01.patch
+151_x86emu_handle_cpuid.patch
Reply to: