xf86-video-intel: Branch 'xf86-video-intel-2.4-branch' - 3 commits - src/i830_bios.h src/xvmc/intel_xvmc.c

[Zhenyu Wang]

 src/i830_bios.h       |   12 +-----------
 src/xvmc/intel_xvmc.c |    4 ++--
 2 files changed, 3 insertions(+), 13 deletions(-)

New commits:
commit dc295d2b3cbdc5b4ca1f46b1c5a8e5f83faeb878
Author: Zou Nan hai <nanhai.zou at intel.com>
Date:   Tue Aug 19 16:27:12 2008 +0800

      Fix from He Shuang(shuang.he at intel.com),
      XvMCDestroyContext to check pointer valid
    (cherry picked from commit 385dc85881c56e218e7d17d7e1d022568aa29cfb)

diff --git a/src/xvmc/intel_xvmc.c b/src/xvmc/intel_xvmc.c
index 8fabb35..ea39069 100644
--- a/src/xvmc/intel_xvmc.c
+++ b/src/xvmc/intel_xvmc.c
@@ -458,11 +458,11 @@ Status XvMCCreateContext(Display *display, XvPortID port,
 Status XvMCDestroyContext(Display *display, XvMCContext *context)
 {
     Status ret;
-    int screen = DefaultScreen(display);
+    int screen;
 
     if (!display || !context)
         return XvMCBadContext;
-
+    screen = DefaultScreen(display);
     ret = (xvmc_driver->destroy_context)(display, context);
     if (ret) {
 	XVMC_ERR("destroy context fail\n");
commit 70e85e6ce4cd53ab4685440605fcfe65995cb2e4
Author: Jesse Barnes <jbarnes at virtuousgeek.org>
Date:   Mon Aug 18 12:53:33 2008 -0700

    Remove unused VBIOS flag defines
    
    We just use the structure definitions now.
    (cherry picked from commit 078a59dd48ed00a6512d155883956c18752da9ce)

diff --git a/src/i830_bios.h b/src/i830_bios.h
index 817ac2d..85729f7 100644
--- a/src/i830_bios.h
+++ b/src/i830_bios.h
@@ -140,14 +140,6 @@ struct bdb_general_definitions {
 	/* may be another device block here on some platforms */
 } __attribute__((packed));
 
-#define LVDS_CAP_EDID			(1 << 6)
-#define LVDS_CAP_DITHER			(1 << 5)
-#define LVDS_CAP_PFIT_AUTO_RATIO	(1 << 4)
-#define LVDS_CAP_PFIT_GRAPHICS_MODE	(1 << 3)
-#define LVDS_CAP_PFIT_TEXT_MODE		(1 << 2)
-#define LVDS_CAP_PFIT_GRAPHICS		(1 << 1)
-#define LVDS_CAP_PFIT_TEXT		(1 << 0)
-
 struct bdb_lvds_options {
     uint8_t panel_type;
     uint8_t rsvd1;
@@ -196,8 +188,6 @@ struct lvds_dvo_timing {
     uint8_t h_border;
     uint8_t v_border;
     uint8_t flags;
-#define FP_EDID_FLAG_VSYNC_POSITIVE	(1 << 2)
-#define FP_EDID_FLAG_HSYNC_POSITIVE	(1 << 1)
 } __attribute__((packed));
 
 struct lvds_pnp_id {
commit 76b19eaaf591f7f55aaa00cf0fd90d9574c500d2
Author: Jesse Barnes <jbarnes at virtuousgeek.org>
Date:   Mon Aug 18 12:51:31 2008 -0700

    Pack bdb_general_definitions block
    
    More correct & consistent with other definitions.
    (cherry picked from commit 7048141254b7c1948fe77b1742b463f8723610d8)

diff --git a/src/i830_bios.h b/src/i830_bios.h
index 2b073f3..817ac2d 100644
--- a/src/i830_bios.h
+++ b/src/i830_bios.h
@@ -138,7 +138,7 @@ struct bdb_general_definitions {
 	unsigned char dev3[33];
 	unsigned char dev4[33];
 	/* may be another device block here on some platforms */
-};
+} __attribute__((packed));
 
 #define LVDS_CAP_EDID			(1 << 6)
 #define LVDS_CAP_DITHER			(1 << 5)