WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-devel

Re: [Xen-devel] Re: [XenPPC] [PATCH] [POWERPC] fix vga.c compilation

To: Keir Fraser <Keir.Fraser@xxxxxxxxxxxx>
Subject: Re: [Xen-devel] Re: [XenPPC] [PATCH] [POWERPC] fix vga.c compilation
From: Alex Williamson <alex.williamson@xxxxxx>
Date: Wed, 16 Aug 2006 08:48:43 -0600
Cc: xen-ia64-devel@xxxxxxxxxxxxxxxxxxx, xen-devel@xxxxxxxxxxxxxxxxxxx, Hollis Blanchard <hollisb@xxxxxxxxxx>, xen-ppc-devel@xxxxxxxxxxxxxxxxxxx
Delivery-date: Wed, 16 Aug 2006 07:49:17 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxx
In-reply-to: <C108E936.F50%Keir.Fraser@xxxxxxxxxxxx>
List-help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-id: Xen developer discussion <xen-devel.lists.xensource.com>
List-post: <mailto:xen-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
Organization: OSLO R&D
References: <C108E936.F50%Keir.Fraser@xxxxxxxxxxxx>
Sender: xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
On Wed, 2006-08-16 at 15:24 +0100, Keir Fraser wrote:

> Actually I'm not sure this is particularly necessary for headless x86
> either. I could move the test to the end of setup_vga(), and only probe
> 0xb8000?

Hi Keir,

   Yeah, I think something like the below change to your previous patch
would be fine.  Thanks!

        Alex

Signed-off-by: Alex Williamson <alex.williamson@xxxxxx>
---

diff -r aa9ed07f34a5 xen/drivers/video/vga.c
--- a/xen/drivers/video/vga.c   Wed Aug 16 08:38:18 2006 -0600
+++ b/xen/drivers/video/vga.c   Wed Aug 16 08:46:30 2006 -0600
@@ -321,45 +321,6 @@ static int detect_video(void *video_base
     return video_found;
 }
 
-static int detect_vga(void)
-{
-    int detected;
-    void *p;
-
-    if ( memory_is_conventional_ram(0xA0000) )
-        return 0;
-
-    /*
-     * Look at a number of well-known locations. Even if video is not at
-     * 0xB8000 right now, it will appear there when we set up text mode 3.
-     * 
-     * We assume if there is any sign of a video adaptor then it is at least
-     * VGA-compatible (surely noone runs CGA, EGA, .... these days?).
-     * 
-     * These checks are basically to detect headless server boxes.
-     */
-
-    p = ioremap(0xA0000, 0x1000);
-    detected = detect_video(p);
-    iounmap(p);
-    if ( detected )
-        return 1;
-
-    p = ioremap(0xB0000, 0x1000);
-    detected = detect_video(p);
-    iounmap(p);
-    if ( detected )
-        return 1;
-
-    p = ioremap(0xB8000, 0x1000);
-    detected = detect_video(p);
-    iounmap(p);
-    if ( detected )
-        return 1;
-
-    return 0;
-}
-
 /* This is actually code from vgaHWRestore in an old version of XFree86 :-) */
 void *setup_vga(void)
 {
@@ -378,9 +339,10 @@ void *setup_vga(void)
         0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0x0c, 0x00, 0x0f, 0x08, 0x00
     };
 
-    int i, j;
-
-    if ( !detect_vga() )
+    int i, j, detected;
+    void *p;
+
+    if ( memory_is_conventional_ram(0xA0000) )
     {
         printk("No VGA adaptor detected!\n");
         return NULL;
@@ -407,6 +369,12 @@ void *setup_vga(void)
     
     inb(VGA_IS1_RC);
     outb(0x20, VGA_ATT_IW);
+
+    p = ioremap(0xB8000, 0x1000);
+    detected = detect_video(p);
+    iounmap(p);
+    if ( !detected )
+        return NULL;
 
     return ioremap(0xB8000, 0x8000);
 }



_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel