summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/i965_hwmc.c1
-rw-r--r--src/xvmc/xvmc_vld.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/i965_hwmc.c b/src/i965_hwmc.c
index 7a5e6523..68d908df 100644
--- a/src/i965_hwmc.c
+++ b/src/i965_hwmc.c
@@ -148,6 +148,7 @@ static void destroy_context(ScrnInfoPtr pScrn, XvMCContextPtr context)
I830Ptr pI830 = I830PTR(pScrn);
private_context = context->driver_priv;
free_drm_memory(pScrn, &private_context->static_buffer);
+ free_drm_memory(pScrn, &private_context->blocks);
if (IS_G4X(pI830))
free_drm_memory(pScrn, &private_context->slice);
Xfree(private_context);
diff --git a/src/xvmc/xvmc_vld.c b/src/xvmc/xvmc_vld.c
index 4f958422..204cfb7c 100644
--- a/src/xvmc/xvmc_vld.c
+++ b/src/xvmc/xvmc_vld.c
@@ -439,7 +439,7 @@ static void state_base_address()
OUT_BATCH(0 | BASE_ADDRESS_MODIFY);
OUT_BATCH(0 | BASE_ADDRESS_MODIFY);
OUT_BATCH(0 | BASE_ADDRESS_MODIFY);
- OUT_BATCH((0xFFFFF<<12) | BASE_ADDRESS_MODIFY);
+ OUT_BATCH(0 | BASE_ADDRESS_MODIFY);
ADVANCE_BATCH();
}