xf86-video-intel: 6 commits - configure.ac src/xvmc/i915_xvmc.c src/xvmc/intel_batchbuffer.c src/xvmc/intel_batchbuffer.h src/xvmc/intel_xvmc.c src/xvmc/intel_xvmc_dump.c src/xvmc/xvmc_vld.c
Chris Wilson
ickle at kemper.freedesktop.org
Mon Jan 31 02:04:47 PST 2011
configure.ac | 14 ++++++++++++--
src/xvmc/i915_xvmc.c | 3 +--
src/xvmc/intel_batchbuffer.c | 2 --
src/xvmc/intel_batchbuffer.h | 2 +-
src/xvmc/intel_xvmc.c | 21 +++------------------
src/xvmc/intel_xvmc_dump.c | 2 +-
src/xvmc/xvmc_vld.c | 1 -
7 files changed, 18 insertions(+), 27 deletions(-)
New commits:
commit 80f59c8a4f51ccc27653a2de2dee2563b1e911f1
Author: Cyril Brulebois <kibi at debian.org>
Date: Mon Jan 31 06:22:39 2011 +0100
xvmc: Stop using uninitialized variable.
The actual code was removed in 5f64122551, where the get_surface_status
driver callback was dropped. Just return Success if there were no issues
with the parameter.
Get rid of the following with CFLAGS="-Wall -Werror":
| CC intel_xvmc.lo
| cc1: warnings being treated as errors
| intel_xvmc.c: In function ‘XvMCSyncSurface’:
| intel_xvmc.c:677: error: ‘ret’ may be used uninitialized in this function
| intel_xvmc.c:672: note: ‘ret’ was declared here
Signed-off-by: Cyril Brulebois <kibi at debian.org>
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/xvmc/intel_xvmc.c b/src/xvmc/intel_xvmc.c
index d89cda2..1b96945 100644
--- a/src/xvmc/intel_xvmc.c
+++ b/src/xvmc/intel_xvmc.c
@@ -669,12 +669,10 @@ _X_EXPORT Status XvMCPutSurface(Display * display, XvMCSurface * surface,
*/
_X_EXPORT Status XvMCSyncSurface(Display * display, XvMCSurface * surface)
{
- Status ret;
-
if (!display || !surface)
return XvMCBadSurface;
- return ret;
+ return Success;
}
/*
commit 86284abafbe1364f82509d2656c82ba11cdce6cc
Author: Cyril Brulebois <kibi at debian.org>
Date: Mon Jan 31 06:22:38 2011 +0100
xvmc: Silence gcc, adding a cast to work around signedness issues.
Both exported XvMCPutSlice/XvMCPutSlice2 functions have a prototype with a
parameter whose signedness differs from the one in the put_slice/put_slice2
functions they call. Make it unsigned through a cast.
Get rid of this accordingly with CFLAGS="-Wall -Werror":
| CC intel_xvmc.lo
| cc1: warnings being treated as errors
| intel_xvmc.c: In function ‘XvMCSyncSurface’:
| intel_xvmc.c:677: error: ‘ret’ may be used uninitialized in this function
| intel_xvmc.c:672: note: ‘ret’ was declared here
Signed-off-by: Cyril Brulebois <kibi at debian.org>
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/xvmc/intel_xvmc.c b/src/xvmc/intel_xvmc.c
index 339c133..d89cda2 100644
--- a/src/xvmc/intel_xvmc.c
+++ b/src/xvmc/intel_xvmc.c
@@ -1058,7 +1058,7 @@ _X_EXPORT Status XvMCLoadQMatrix(Display * display, XvMCContext * context,
_X_EXPORT Status XvMCPutSlice(Display * display, XvMCContext * context,
char *slice, int nbytes)
{
- if (xvmc_driver->put_slice(display, context, slice, nbytes)) {
+ if (xvmc_driver->put_slice(display, context, (unsigned char *) slice, nbytes)) {
XVMC_ERR("PutSlice fail\n");
return BadValue;
}
@@ -1069,7 +1069,7 @@ _X_EXPORT Status XvMCPutSlice2(Display * display, XvMCContext * context,
char *slice, int nbytes, int slice_code)
{
if (xvmc_driver->put_slice2
- (display, context, slice, nbytes, slice_code)) {
+ (display, context, (unsigned char *) slice, nbytes, slice_code)) {
XVMC_ERR("PutSlice2 fail\n");
return BadValue;
}
commit fc2eb64d7a184770ccd708a5b2337a538ca2b9db
Author: Cyril Brulebois <kibi at debian.org>
Date: Mon Jan 31 09:59:04 2011 +0000
xvmc: Silence gcc, add parentheses around arithmetic.
Get rid of those accordingly with CFLAGS="-Wall -Werror":
| CC i915_xvmc.lo
| cc1: warnings being treated as errors
| i915_xvmc.c: In function ‘i915_mc_one_time_state_emit’:
| i915_xvmc.c:369: error: suggest parentheses around arithmetic in operand of ‘|’
| i915_xvmc.c:374: error: suggest parentheses around arithmetic in operand of ‘|’
| i915_xvmc.c:379: error: suggest parentheses around arithmetic in operand of ‘|’
| i915_xvmc.c: In function ‘i915_mc_load_indirect_render_emit’:
| i915_xvmc.c:708: error: suggest parentheses around arithmetic in operand of ‘|’
| i915_xvmc.c:713: error: suggest parentheses around arithmetic in operand of ‘|’
Signed-off-by: Cyril Brulebois <kibi at debian.org>
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/xvmc/intel_batchbuffer.h b/src/xvmc/intel_batchbuffer.h
index 6fa1c05..888abeb 100644
--- a/src/xvmc/intel_batchbuffer.h
+++ b/src/xvmc/intel_batchbuffer.h
@@ -24,7 +24,7 @@ extern int VERBOSE;
#define OUT_RELOC(bo,read_domains,write_domains,delta) \
do { \
- *(unsigned int *)batch_ptr = delta + bo->offset; \
+ *(unsigned int *)batch_ptr = (delta) + bo->offset; \
intel_batch_emit_reloc(bo, read_domains, write_domains, delta, batch_ptr); \
batch_ptr += 4; \
} while (0)
commit 1b9349bceb9172d9bf01638b2df10b9b79e883b4
Author: Cyril Brulebois <kibi at debian.org>
Date: Mon Jan 31 06:22:36 2011 +0100
xvmc: Silence gcc, add parentheses around assignment.
Get rid of the following with CFLAGS="-Wall -Werror":
| CC intel_xvmc_dump.lo
| cc1: warnings being treated as errors
| intel_xvmc_dump.c: In function ‘intel_xvmc_dump_open’:
| intel_xvmc_dump.c:41: error: suggest parentheses around assignment used as truth value
Signed-off-by: Cyril Brulebois <kibi at debian.org>
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/xvmc/intel_xvmc_dump.c b/src/xvmc/intel_xvmc_dump.c
index 974bcbb..d22d311 100644
--- a/src/xvmc/intel_xvmc_dump.c
+++ b/src/xvmc/intel_xvmc_dump.c
@@ -38,7 +38,7 @@ void intel_xvmc_dump_open(void)
if (xvmc_dump)
return;
- if (d = getenv("INTEL_XVMC_DUMP"))
+ if ((d = getenv("INTEL_XVMC_DUMP")))
xvmc_dump = 1;
if (xvmc_dump) {
commit ae8877e30707cae586565b4deee4c7fd9ac7d3ed
Author: Cyril Brulebois <kibi at debian.org>
Date: Mon Jan 31 06:22:35 2011 +0100
xvmc: Get rid of unused variables.
Signed-off-by: Cyril Brulebois <kibi at debian.org>
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/xvmc/i915_xvmc.c b/src/xvmc/i915_xvmc.c
index 21a1149..fbd4555 100644
--- a/src/xvmc/i915_xvmc.c
+++ b/src/xvmc/i915_xvmc.c
@@ -391,7 +391,6 @@ static void i915_mc_static_indirect_state_set(XvMCContext * context,
i915XvMCContext *pI915XvMC = (i915XvMCContext *) context->privData;
struct intel_xvmc_surface *intel_surf = dest->privData;
struct i915_mc_static_indirect_state_buffer *buffer_info;
- unsigned int w = dest->width;
drm_intel_gem_bo_map_gtt(pI915XvMC->sis_bo);
buffer_info = pI915XvMC->sis_bo->virtual;
@@ -688,7 +687,7 @@ static void i915_mc_load_indirect_render_emit(XvMCContext * context)
{
i915XvMCContext *pI915XvMC = (i915XvMCContext *) context->privData;
int mem_select;
- uint32_t load_indirect, buffer_address;
+ uint32_t load_indirect;
BATCH_LOCALS;
BEGIN_BATCH(5);
diff --git a/src/xvmc/intel_batchbuffer.c b/src/xvmc/intel_batchbuffer.c
index 337b2ce..2b5526c 100644
--- a/src/xvmc/intel_batchbuffer.c
+++ b/src/xvmc/intel_batchbuffer.c
@@ -64,8 +64,6 @@ static void i965_end_batch(void)
Bool intelInitBatchBuffer(void)
{
- int i;
-
if ((xvmc_driver->batch.buf =
drm_intel_bo_alloc(xvmc_driver->bufmgr,
"batch buffer", BATCH_SIZE, 0x1000)) == NULL) {
diff --git a/src/xvmc/intel_xvmc.c b/src/xvmc/intel_xvmc.c
index 6cbec80..339c133 100644
--- a/src/xvmc/intel_xvmc.c
+++ b/src/xvmc/intel_xvmc.c
@@ -105,8 +105,6 @@ unsigned int mb_bytes_420[] = {
void LOCK_HARDWARE(drm_context_t ctx)
{
- char __ret = 0;
-
PPTHREAD_MUTEX_LOCK();
assert(!xvmc_driver->locked);
@@ -218,11 +216,6 @@ _X_EXPORT Status XvMCCreateContext(Display * display, XvPortID port,
int error_base;
int event_base;
int priv_count;
- int isCapable;
- int screen = DefaultScreen(display);
- intel_xvmc_context_ptr intel_ctx;
- int fd;
- char *driverName = NULL, *deviceName = NULL;
/* Verify Obvious things first */
if (!display || !context)
@@ -482,7 +475,6 @@ _X_EXPORT Status XvMCCreateBlocks(Display * display, XvMCContext * context,
unsigned int num_blocks,
XvMCBlockArray * block)
{
- Status ret;
if (!display || !context || !num_blocks || !block)
return BadValue;
@@ -505,7 +497,6 @@ _X_EXPORT Status XvMCCreateBlocks(Display * display, XvMCContext * context,
*/
_X_EXPORT Status XvMCDestroyBlocks(Display * display, XvMCBlockArray * block)
{
- Status ret;
if (!display || !block)
return BadValue;
@@ -679,7 +670,6 @@ _X_EXPORT Status XvMCPutSurface(Display * display, XvMCSurface * surface,
_X_EXPORT Status XvMCSyncSurface(Display * display, XvMCSurface * surface)
{
Status ret;
- int stat = 0;
if (!display || !surface)
return XvMCBadSurface;
@@ -739,9 +729,6 @@ _X_EXPORT Status XvMCGetSurfaceStatus(Display * display, XvMCSurface * surface,
*/
_X_EXPORT Status XvMCHideSurface(Display * display, XvMCSurface * surface)
{
- int stat = 0;
- Status ret;
-
if (!display || !surface)
return XvMCBadSurface;
diff --git a/src/xvmc/xvmc_vld.c b/src/xvmc/xvmc_vld.c
index addc7c9..d72e105 100644
--- a/src/xvmc/xvmc_vld.c
+++ b/src/xvmc/xvmc_vld.c
@@ -785,7 +785,6 @@ static Status begin_surface(Display * display, XvMCContext * context,
XvMCSurface * future,
const XvMCMpegControl * control)
{
- struct i965_xvmc_contex *i965_ctx;
struct intel_xvmc_surface *priv_target, *priv_past, *priv_future;
intel_xvmc_context_ptr intel_ctx = context->privData;
Status ret;
commit 8bd6a7149fcb5f9ed6580dc2aa0180874938a1ea
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Sat Jan 29 12:04:09 2011 +0000
Enable conditional compilation of asserts
With '--disable-debug' we define NDEBUG and so disable the asserts, that
is we continue to default to compiling asserts into the code.
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/configure.ac b/configure.ac
index 529a294..13a801a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -85,6 +85,12 @@ AC_ARG_ENABLE(kms-only, AS_HELP_STRING([--enable-kms-only],
[KMS_ONLY="$enableval"],
[KMS_ONLY=no])
+AC_ARG_ENABLE(debug,
+ AS_HELP_STRING([--enable-debug],
+ [Enables internal debugging [[default=yes]]]),
+ [DEBUG="$enableval"],
+ [DEBUG=yes])
+
# Store the list of server defined optional extensions in REQUIRED_MODULES
XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
@@ -138,15 +144,19 @@ fi
AC_MSG_CHECKING([whether to include XvMC support])
AC_MSG_RESULT([$XVMC])
AM_CONDITIONAL(XVMC, test x$XVMC = xyes)
-if test "$XVMC" = yes; then
+if test "x$XVMC" = xyes; then
AC_DEFINE(ENABLE_XVMC,1,[Enable XvMC support])
fi
AM_CONDITIONAL(KMS_ONLY, test x$KMS_ONLY = xyes)
-if test "$KMS_ONLY" = yes; then
+if test "x$KMS_ONLY" = xyes; then
AC_DEFINE(KMS_ONLY,1,[Assume KMS support])
fi
+if test "x$DEBUG" = xno; then
+ AC_DEFINE(NDEBUG,1,[Disable internal debugging])
+fi
+
DRIVER_NAME=intel
AC_SUBST([DRIVER_NAME])
AC_SUBST([moduledir])
More information about the xorg-commit
mailing list