From 16c4ba061f4268105f835d60695ad1ef79919bcc Mon Sep 17 00:00:00 2001
From: Jean Guyader <jean.guyader@eu.citrix.com>
Date: Mon, 31 Aug 2009 16:51:45 +0100
Subject: [PATCH] surfaenabled was returning a big value that cycle in a
 char...

---
 master/intel | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/master/intel b/master/intel
index 750c631..4ccb27c 100644
--- a/master/intel
+++ b/master/intel
@@ -215,10 +215,10 @@ index 90bd544..a2b8744 100644
      vga_update_display(s);
 diff --git a/intel.c b/intel.c
 new file mode 100644
-index 0000000..f205dfa
+index 0000000..4ad22a8
 --- /dev/null
 +++ b/intel.c
-@@ -0,0 +1,487 @@
+@@ -0,0 +1,489 @@
 +#include <stdio.h>
 +#include <stdlib.h>
 +#include <stdint.h>
@@ -282,7 +282,7 @@ index 0000000..f205dfa
 +
 +static char surfaenabled(void)
 +{
-+    return intel_get_reg(REG_DR_DSPACNTR) & (1 << 31);
++    return !!(intel_get_reg(REG_DR_DSPACNTR) & (1 << 31));
 +}
 +
 +static inline unsigned int intel_get_surface(void)
@@ -308,12 +308,14 @@ index 0000000..f205dfa
 +{
 +    if (surfaenabled())
 +    {
++        INTEL_DEBUG("Get resolution from PIPEA\n")
 +        *pitch = intel_get_reg(REG_DR_DSPASTRIDE);
 +        *x = ((intel_get_reg(REG_DE_PIPEASRC) >> 16) & 0xfff) + 1;
 +        *y = (intel_get_reg(REG_DE_PIPEASRC) & 0xfff) + 1;
 +    }
 +    else
 +    {
++        INTEL_DEBUG("Get resolution from PIPEB\n")
 +        *pitch = intel_get_reg(REG_DR_DSPBSTRIDE);
 +        *x = ((intel_get_reg(REG_DE_PIPEBSRC) >> 16) & 0xfff) + 1;
 +        *y = (intel_get_reg(REG_DE_PIPEBSRC) & 0xfff) + 1;
@@ -707,7 +709,7 @@ index 0000000..f205dfa
 +    lds = ds;
 +}
 diff --git a/vl.c b/vl.c
-index 45e03c1..fdab62f 100644
+index adfa4f6..a040403 100644
 --- a/vl.c
 +++ b/vl.c
 @@ -235,6 +235,7 @@ int win2k_install_hack = 0;
@@ -744,7 +746,7 @@ index 45e03c1..fdab62f 100644
              case QEMU_OPTION_direct_pci:
                 direct_pci = optarg;
                  break;
-@@ -5921,26 +5927,26 @@ int main(int argc, char **argv, char **envp)
+@@ -5923,26 +5929,26 @@ int main(int argc, char **argv, char **envp)
                  curses_display_init(ds, full_screen);
              } else
  #endif
@@ -789,7 +791,7 @@ index 45e03c1..fdab62f 100644
      dpy_resize(ds);
  
 diff --git a/xen-hooks.mak b/xen-hooks.mak
-index 15ba4d1..528bb7a 100644
+index c0212a2..b90967d 100644
 --- a/xen-hooks.mak
 +++ b/xen-hooks.mak
 @@ -39,6 +39,7 @@ OBJS += xen_acpi_wmi.o
-- 
2.39.5