And then follows fixes for all tests.
From 1cd7a914be3fc5ee8aabdd2297710f5c781b555f Mon Sep 17 00:00:00 2001
From: Pauli Nieminen <suok...@gmail.com>
Date: Mon, 20 Jul 2009 21:36:57 +0300
Subject: [PATCH 1/4] libdrm/tests: Fix compiler warnings in dristat.c.
---
tests/dristat.c | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/tests/dristat.c b/tests/dristat.c
index 48c3b51..2551f82 100644
--- a/tests/dristat.c
+++ b/tests/dristat.c
@@ -26,7 +26,9 @@
* Authors: Rickard E. (Rik) Faith <fa...@valinux.com>
*
*/
-
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@@ -96,6 +98,7 @@ static void getvm(int fd)
case DRM_SHM: typename = "SHM"; break;
case DRM_AGP: typename = "AGP"; break;
case DRM_SCATTER_GATHER: typename = "SG"; break;
+ case DRM_CONSISTENT: typename = "CON"; break;
default: typename = "???"; break;
}
@@ -108,7 +111,7 @@ static void getvm(int fd)
flagname[6] = '\0';
printf(" %4d 0x%08lx 0x%08lx %3.3s %6.6s 0x%08lx ",
- i, offset, (unsigned long)size, typename, flagname, handle);
+ i, (unsigned long)offset, (unsigned long)size, typename, flagname, (unsigned long)handle);
if (mtrr < 0) printf("none\n");
else printf("%4d\n", mtrr);
}
@@ -133,7 +136,8 @@ static void getclients(int fd)
sprintf(buf, "/proc/%d/cmdline", pid);
memset(cmd, 0, sizeof(cmd));
if ((procfd = open(buf, O_RDONLY, 0)) >= 0) {
- read(procfd, cmd, sizeof(cmd)-1);
+ while (read(procfd, cmd, sizeof(cmd)-1) == -1 && errno == EINTR)
+ {}
close(procfd);
}
if (*cmd) {
@@ -184,7 +188,7 @@ static void printhuman(unsigned long value, const char *name, int mult)
static void getstats(int fd, int i)
{
drmStatsT prev, curr;
- int j;
+ unsigned int j;
double rate;
printf(" System statistics:\n");
--
1.6.3.3
From c7926a7f1e738bf8dbafc7e5fb8e25e1f0b3f6a8 Mon Sep 17 00:00:00 2001
From: Pauli Nieminen <suok...@gmail.com>
Date: Mon, 20 Jul 2009 21:37:54 +0300
Subject: [PATCH 2/4] libdrm/tests: Fix compiler warnings in drmstat.c.
---
tests/drmstat.c | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/tests/drmstat.c b/tests/drmstat.c
index ed2aeb6..cea97db 100644
--- a/tests/drmstat.c
+++ b/tests/drmstat.c
@@ -28,6 +28,7 @@
*
*/
+#include <alloca.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@@ -69,13 +70,15 @@ static void getversion(int fd)
printf( "No driver available\n" );
}
}
-
-void handler(int fd, void *oldctx, void *newctx)
+
+#if 0
+static void handler(int fd, void *oldctx, void *newctx)
{
printf("Got fd %d\n", fd);
}
+#endif
-void process_sigio(char *device)
+static void process_sigio(char *device)
{
int fd;
@@ -89,6 +92,13 @@ void process_sigio(char *device)
for (;;) sleep(60);
}
+#define system(command) \
+ do { \
+ int rv = system(command); \
+ if (rv == 0) \
+ exit(1); \
+ } while(0);
+
int main(int argc, char **argv)
{
int c;
@@ -104,6 +114,7 @@ int main(int argc, char **argv)
int loops;
char buf[1024];
int i;
+ unsigned int j;
drmBufInfoPtr info;
drmBufMapPtr bufs;
drmLockPtr lock;
@@ -115,7 +126,10 @@ int main(int argc, char **argv)
case 'F':
count = strtoul(optarg, NULL, 0);
if (!fork()) {
- dup(fd);
+ if (dup(fd) != -1)
+ {
+ exit(1);
+ }
sleep(count);
}
close(fd);
@@ -278,7 +292,7 @@ int main(int argc, char **argv)
drmError(r, argv[0]);
return 1;
}
- printf("0x%04lx byte shm added at 0x%08lx\n", size, handle);
+ printf("0x%04lx byte shm added at 0x%08lx\n", size, (unsigned long)handle);
sprintf(buf, "cat /proc/dri/0/vm");
system(buf);
break;
@@ -326,9 +340,9 @@ int main(int argc, char **argv)
printf("\n");
if (c == 'w') {
printf("===== WRITING =====\n");
- for (i = 0; i < size; i+=2) {
- ((char *)address)[i] = i & 0xff;
- ((char *)address)[i+1] = i & 0xff;
+ for (j = 0; j < size; j+=2) {
+ ((char *)address)[j] = j & 0xff;
+ ((char *)address)[j+1] = j & 0xff;
}
}
printf("===== READING =====\n");
@@ -414,6 +428,9 @@ int main(int argc, char **argv)
return r;
}
+void
+xf86VDrvMsgVerb(int scrnIndex, int type, int verb, const char *format,
+ va_list args) __attribute__((format(printf, 4, 0)));
void
xf86VDrvMsgVerb(int scrnIndex, int type, int verb, const char *format,
--
1.6.3.3
From 654356f6625bac34003313a3d7c54cb7b21df706 Mon Sep 17 00:00:00 2001
From: Pauli Nieminen <suok...@gmail.com>
Date: Mon, 20 Jul 2009 21:39:02 +0300
Subject: [PATCH 3/4] libdrm/tests: Fix compiler warnings in modeprint.c.
---
tests/modeprint/modeprint.c | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/tests/modeprint/modeprint.c b/tests/modeprint/modeprint.c
index 595d444..9cde77d 100644
--- a/tests/modeprint/modeprint.c
+++ b/tests/modeprint/modeprint.c
@@ -50,20 +50,20 @@ int crtcs;
int fbs;
char *module_name;
-const char* getConnectionText(drmModeConnection conn)
+static const char* getConnectionText(drmModeConnection conn)
{
switch (conn) {
case DRM_MODE_CONNECTED:
return "connected";
case DRM_MODE_DISCONNECTED:
return "disconnected";
- default:
+ case DRM_MODE_UNKNOWNCONNECTION:
return "unknown";
}
-
+ return 0;
}
-int printMode(struct drm_mode_modeinfo *mode)
+static int printMode(drmModeModeInfoPtr mode)
{
if (full_modes) {
printf("Mode: %s\n", mode->name);
@@ -87,9 +87,9 @@ int printMode(struct drm_mode_modeinfo *mode)
return 0;
}
-int printProperty(int fd, drmModeResPtr res, drmModePropertyPtr props, uint64_t value)
+static int printProperty(int fd, drmModeResPtr res, drmModePropertyPtr props, uint64_t value)
{
- const unsigned char *name = NULL;
+ const char *name = NULL;
int j;
printf("Property: %s\n", props->name);
@@ -120,8 +120,11 @@ int printProperty(int fd, drmModeResPtr res, drmModePropertyPtr props, uint64_t
}
} else {
+#if 0
+ /* FIXME: Why here was this if statment? */
if (!strncmp(props->name, "DPMS", 4))
;
+#endif
for (j = 0; j < props->count_enums; j++) {
printf("\t\t%lld = %s\n", props->enums[j].value, props->enums[j].name);
@@ -139,10 +142,10 @@ int printProperty(int fd, drmModeResPtr res, drmModePropertyPtr props, uint64_t
return 0;
}
-int printConnector(int fd, drmModeResPtr res, drmModeConnectorPtr connector, uint32_t id)
+static int printConnector(int fd, drmModeResPtr res, drmModeConnectorPtr connector, uint32_t id)
{
int i = 0;
- struct drm_mode_modeinfo *mode = NULL;
+ drmModeModeInfoPtr mode = NULL;
drmModePropertyPtr props;
printf("Connector: %d-%d\n", connector->connector_type, connector->connector_type_id);
@@ -187,7 +190,7 @@ int printConnector(int fd, drmModeResPtr res, drmModeConnectorPtr connector, uin
return 0;
}
-int printEncoder(int fd, drmModeResPtr res, drmModeEncoderPtr encoder, uint32_t id)
+static int printEncoder(int fd, drmModeResPtr res, drmModeEncoderPtr encoder, uint32_t id)
{
printf("Encoder\n");
printf("\tid :%i\n", id);
@@ -198,7 +201,7 @@ int printEncoder(int fd, drmModeResPtr res, drmModeEncoderPtr encoder, uint32_t
return 0;
}
-int printCrtc(int fd, drmModeResPtr res, drmModeCrtcPtr crtc, uint32_t id)
+static int printCrtc(int fd, drmModeResPtr res, drmModeCrtcPtr crtc, uint32_t id)
{
printf("Crtc\n");
printf("\tid : %i\n", id);
@@ -206,13 +209,13 @@ int printCrtc(int fd, drmModeResPtr res, drmModeCrtcPtr crtc, uint32_t id)
printf("\ty : %i\n", crtc->y);
printf("\twidth : %i\n", crtc->width);
printf("\theight : %i\n", crtc->height);
- printf("\tmode : %p\n", &crtc->mode);
+ printf("\tmode : %p\n", (void*)&crtc->mode);
printf("\tgamma size : %d\n", crtc->gamma_size);
return 0;
}
-int printFrameBuffer(int fd, drmModeResPtr res, drmModeFBPtr fb)
+static int printFrameBuffer(int fd, drmModeResPtr res, drmModeFBPtr fb)
{
printf("Framebuffer\n");
printf("\thandle : %i\n", fb->handle);
@@ -226,7 +229,7 @@ int printFrameBuffer(int fd, drmModeResPtr res, drmModeFBPtr fb)
return 0;
}
-int printRes(int fd, drmModeResPtr res)
+static int printRes(int fd, drmModeResPtr res)
{
int i;
drmModeFBPtr fb;
@@ -302,7 +305,7 @@ int printRes(int fd, drmModeResPtr res)
return 0;
}
-void args(int argc, char **argv)
+static void args(int argc, char **argv)
{
int i;
--
1.6.3.3
From 7d07667d09bc4500374387483e8a2e75ca158424 Mon Sep 17 00:00:00 2001
From: Pauli Nieminen <suok...@gmail.com>
Date: Mon, 20 Jul 2009 21:39:43 +0300
Subject: [PATCH 4/4] libdrm/tests: Fix compiler warnings in modetest.c.
---
tests/modetest/modetest.c | 48 +++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 25 deletions(-)
diff --git a/tests/modetest/modetest.c b/tests/modetest/modetest.c
index 6c69a57..7b1bb1b 100644
--- a/tests/modetest/modetest.c
+++ b/tests/modetest/modetest.c
@@ -63,12 +63,12 @@ int fd, modes;
struct type_name {
int type;
- char *name;
+ const char *name;
};
#define type_name_fn(res) \
-char * res##_str(int type) { \
- int i; \
+static const char * res##_str(int type) { \
+ unsigned int i; \
for (i = 0; i < ARRAY_SIZE(res##_names); i++) { \
if (res##_names[i].type == type) \
return res##_names[i].name; \
@@ -112,7 +112,7 @@ struct type_name connector_type_names[] = {
type_name_fn(connector_type)
-void dump_encoders(void)
+static void dump_encoders(void)
{
drmModeEncoder *encoder;
int i;
@@ -138,7 +138,7 @@ void dump_encoders(void)
printf("\n");
}
-void dump_mode(drmModeModeInfo *mode)
+static void dump_mode(drmModeModeInfo *mode)
{
printf(" %s %.02f %d %d %d %d %d %d %d %d\n",
mode->name,
@@ -166,7 +166,7 @@ dump_props(drmModeConnector *connector)
}
}
-void dump_connectors(void)
+static void dump_connectors(void)
{
drmModeConnector *connector;
int i, j;
@@ -207,7 +207,7 @@ void dump_connectors(void)
printf("\n");
}
-void dump_crtcs(void)
+static void dump_crtcs(void)
{
drmModeCrtc *crtc;
int i;
@@ -234,7 +234,7 @@ void dump_crtcs(void)
printf("\n");
}
-void dump_framebuffers(void)
+static void dump_framebuffers(void)
{
drmModeFB *fb;
int i;
@@ -251,7 +251,8 @@ void dump_framebuffers(void)
}
printf("%d\t(%dx%d)\t%d\n",
fb->fb_id,
- fb->width, fb->height);
+ fb->width, fb->height,
+ fb->bpp);
drmModeFreeFB(fb);
}
@@ -266,7 +267,7 @@ void dump_framebuffers(void)
* can bind it with a free crtc.
*/
struct connector {
- int id;
+ unsigned int id;
char mode_str[64];
drmModeModeInfo *mode;
drmModeEncoder *encoder;
@@ -277,7 +278,7 @@ static void
connector_find_mode(struct connector *c)
{
drmModeConnector *connector;
- int i, j, size, ret, width, height;
+ int i, j;
/* First, find the connector & mode */
c->mode = NULL;
@@ -348,7 +349,7 @@ create_test_buffer(drm_intel_bufmgr *bufmgr,
{
drm_intel_bo *bo;
unsigned int *fb_ptr;
- int size, ret, i, stride;
+ int size, i, stride;
div_t d;
cairo_surface_t *surface;
cairo_t *cr;
@@ -460,13 +461,10 @@ create_test_buffer(drm_intel_bufmgr *bufmgr,
static void
set_mode(struct connector *c, int count)
{
- drmModeConnector *connector;
- drmModeEncoder *encoder = NULL;
- struct drm_mode_modeinfo *mode = NULL;
drm_intel_bufmgr *bufmgr;
drm_intel_bo *bo;
unsigned int fb_id;
- int i, j, ret, width, height, x, stride;
+ int i, ret, width, height, x, stride;
width = 0;
height = 0;
@@ -497,7 +495,6 @@ set_mode(struct connector *c, int count)
x = 0;
for (i = 0; i < count; i++) {
- int crtc_id;
if (c[i].mode == NULL)
continue;
@@ -519,7 +516,7 @@ extern char *optarg;
extern int optind, opterr, optopt;
static char optstr[] = "ecpmfs:";
-void usage(char *name)
+static void usage(char *name)
{
fprintf(stderr, "usage: %s [-ecpmf]\n", name);
fprintf(stderr, "\t-e\tlist encoders\n");
@@ -539,9 +536,10 @@ int main(int argc, char **argv)
{
int c;
int encoders = 0, connectors = 0, crtcs = 0, framebuffers = 0;
- char *modules[] = { "i915", "radeon" };
- char *modeset = NULL, *mode, *connector;
- int i, connector_id, count = 0;
+ const char *modules[] = { "i915", "radeon" };
+ char *modeset = NULL;
+ unsigned int i;
+ int count = 0;
struct connector con_args[2];
opterr = 0;
@@ -565,13 +563,13 @@ int main(int argc, char **argv)
case 's':
modeset = strdup(optarg);
con_args[count].crtc = -1;
- if (sscanf(optarg, "%d:%64s",
+ if (sscanf(optarg, "%u:%64s",
&con_args[count].id,
- &con_args[count].mode_str) != 2 &&
- sscanf(optarg, "%...@%d:%64s",
+ con_args[count].mode_str) != 2 &&
+ sscanf(optarg, "%...@%d:%64s",
&con_args[count].id,
&con_args[count].crtc,
- &con_args[count].mode_str) != 3)
+ con_args[count].mode_str) != 3)
usage(argv[0]);
count++;
break;
--
1.6.3.3
------------------------------------------------------------------------------
Enter the BlackBerry Developer Challenge
This is your chance to win up to $100,000 in prizes! For a limited time,
vendors submitting new applications to BlackBerry App World(TM) will have
the opportunity to enter the BlackBerry Developer Challenge. See full prize
details at: http://p.sf.net/sfu/Challenge
--
_______________________________________________
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel
