xf86-video-intel: 3 commits - src/i830_debug.c src/i830_memory.c
Jesse Barnes
jbarnes at kemper.freedesktop.org
Fri Nov 9 13:58:04 PST 2007
src/i830_debug.c | 2 +-
src/i830_memory.c | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
New commits:
commit ab2055ebb20aa6de121fa377e488ce91913035ae
Author: Jesse Barnes <jbarnes at nietzche.virtuousgeek.org>
Date: Fri Nov 9 13:55:46 2007 -0800
Add 'ret' variable to i830_allocator_init
Needed in the XF86DRI_MM case.
diff --git a/src/i830_memory.c b/src/i830_memory.c
index 7e9fb4f..1ad4438 100644
--- a/src/i830_memory.c
+++ b/src/i830_memory.c
@@ -476,6 +476,8 @@ i830_allocator_init(ScrnInfoPtr pScrn, unsigned long offset, unsigned long size)
ALIGN_BOTH_ENDS | NEED_NON_STOLEN);
if (pI830->memory_manager != NULL) {
+ int ret;
+
/* Tell the kernel to manage it */
ret = drmMMInit(pI830->drmSubFD,
pI830->memory_manager->offset / GTT_PAGE_SIZE,
commit 24280edbdf54e9559b26ea27c1b005eea73f51bc
Author: Jesse Barnes <jbarnes at nietzche.virtuousgeek.org>
Date: Fri Nov 9 13:53:58 2007 -0800
Fixup warnings
Remove unused 'ret' variable, move pI830 under #ifdef XF86DRI_MM in
i830_allocate_memory.
diff --git a/src/i830_memory.c b/src/i830_memory.c
index 7b89c40..7e9fb4f 100644
--- a/src/i830_memory.c
+++ b/src/i830_memory.c
@@ -389,7 +389,6 @@ i830_allocator_init(ScrnInfoPtr pScrn, unsigned long offset, unsigned long size)
{
I830Ptr pI830 = I830PTR(pScrn);
i830_memory *start, *end;
- int ret;
#ifdef XF86DRI_MM
int dri_major, dri_minor, dri_patch;
#endif
@@ -824,10 +823,11 @@ i830_memory *
i830_allocate_memory(ScrnInfoPtr pScrn, const char *name,
unsigned long size, unsigned long alignment, int flags)
{
- I830Ptr pI830 = I830PTR(pScrn);
i830_memory *mem;
#ifdef XF86DRI_MM
+ I830Ptr pI830 = I830PTR(pScrn);
+
if (pI830->memory_manager && !(flags & NEED_PHYSICAL_ADDR) &&
!(flags & NEED_LIFETIME_FIXED))
{
commit 4fe507957bf826d81a71cd63af17c5547d1023a1
Author: Jesse Barnes <jbarnes at nietzche.virtuousgeek.org>
Date: Fri Nov 9 13:51:11 2007 -0800
Remove unused 'palette_enable' variable
diff --git a/src/i830_debug.c b/src/i830_debug.c
index 54dff29..0237182 100644
--- a/src/i830_debug.c
+++ b/src/i830_debug.c
@@ -564,7 +564,7 @@ static void i830DumpAR(ScrnInfoPtr pScrn)
{
I830Ptr pI830 = I830PTR(pScrn);
int i;
- uint16_t st01, palette_enable = 0;
+ uint16_t st01;
unsigned char orig_arx, msr;
msr = INREG8(0x3cc);
More information about the xorg-commit
mailing list