geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nouveau: fix type warnings: void* arith, un/signed 

nouveau_notifier.c had two places where void* was used in arithmetic,
fixed by using char*.

nouveau_dma_wait(), nouveau_notifier_wait_status() and
nouveau_resource_alloc() had signed/unsigned comparison warnings, fixed
by changing the function parameter into an unsigned type.

Signed-off-by: Pekka Paalanen <pq@iki.fi>
main
Pekka Paalanen 2009-02-04 21:44:50 +02:00
parent bc92c0edf3
commit 2d2f105f79
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libdrm/nouveau/nouveau_dma.c
View File

@ -87,7 +87,7 @@ nouveau_dma_channel_init(struct nouveau_channel *chan)
} while(0)
int
nouveau_dma_wait(struct nouveau_channel *chan, int size)
nouveau_dma_wait(struct nouveau_channel *chan, unsigned size)
{
struct nouveau_channel_priv *nvchan = nouveau_channel(chan);
struct nouveau_dma_priv *dma = nvchan->dma;

2
libdrm/nouveau/nouveau_dma.h
View File

@ -40,7 +40,7 @@
#define NOUVEAU_TIME_MSEC() 0
#define RING_SKIPS 8
extern int nouveau_dma_wait(struct nouveau_channel *chan, int size);
extern int nouveau_dma_wait(struct nouveau_channel *chan, unsigned size);
extern void nouveau_dma_subc_bind(struct nouveau_grobj *);
extern void nouveau_dma_channel_init(struct nouveau_channel *);
extern void nouveau_dma_kickoff(struct nouveau_channel *);

6
libdrm/nouveau/nouveau_notifier.c
View File

@ -28,7 +28,7 @@
#define NOTIFIER(__v) \
struct nouveau_notifier_priv *nvnotify = nouveau_notifier(notifier); \
volatile uint32_t *__v = (void*)nvnotify->map + (id * 32)
volatile uint32_t *__v = (uint32_t *)((char *)nvnotify->map + (id * 32))
int
nouveau_notifier_alloc(struct nouveau_channel *chan, uint32_t handle,
@ -57,7 +57,7 @@ nouveau_notifier_alloc(struct nouveau_channel *chan, uint32_t handle,
return ret;
}
nvnotify->map = (void *)nouveau_channel(chan)->notifier_block +
nvnotify->map = (char *)nouveau_channel(chan)->notifier_block +
nvnotify->drm.offset;
*notifier = &nvnotify->base;
return 0;
@ -125,7 +125,7 @@ gettime(void)
int
nouveau_notifier_wait_status(struct nouveau_notifier *notifier, int id,
int status, double timeout)
uint32_t status, double timeout)
{
NOTIFIER(n);
double time = 0, t_start = gettime();

2
libdrm/nouveau/nouveau_notifier.h
View File

@ -57,7 +57,7 @@ uint32_t
nouveau_notifier_return_val(struct nouveau_notifier *, int id);
int
nouveau_notifier_wait_status(struct nouveau_notifier *, int id, int status,
nouveau_notifier_wait_status(struct nouveau_notifier *, int id, uint32_t status,
double timeout);
#endif

2
libdrm/nouveau/nouveau_resource.c
View File

@ -42,7 +42,7 @@ nouveau_resource_init(struct nouveau_resource **heap,
}
int
nouveau_resource_alloc(struct nouveau_resource *heap, int size, void *priv,
nouveau_resource_alloc(struct nouveau_resource *heap, unsigned size, void *priv,
struct nouveau_resource **res)
{
struct nouveau_resource *r;

2
libdrm/nouveau/nouveau_resource.h
View File

@ -39,7 +39,7 @@ nouveau_resource_init(struct nouveau_resource **heap, unsigned start,
unsigned size);
int
nouveau_resource_alloc(struct nouveau_resource *heap, int size, void *priv,
nouveau_resource_alloc(struct nouveau_resource *heap, unsigned size, void *priv,
struct nouveau_resource **);
void