diff options
Diffstat (limited to 'drivers/gpu/drm/mga/mga_dma.c')
-rw-r--r-- | drivers/gpu/drm/mga/mga_dma.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/drivers/gpu/drm/mga/mga_dma.c b/drivers/gpu/drm/mga/mga_dma.c index b49c5ff2958..7a6bf9ffc5a 100644 --- a/drivers/gpu/drm/mga/mga_dma.c +++ b/drivers/gpu/drm/mga/mga_dma.c | |||
@@ -148,8 +148,8 @@ void mga_do_dma_flush(drm_mga_private_t * dev_priv) | |||
148 | primary->space = head - tail; | 148 | primary->space = head - tail; |
149 | } | 149 | } |
150 | 150 | ||
151 | DRM_DEBUG(" head = 0x%06lx\n", head - dev_priv->primary->offset); | 151 | DRM_DEBUG(" head = 0x%06lx\n", (unsigned long)(head - dev_priv->primary->offset)); |
152 | DRM_DEBUG(" tail = 0x%06lx\n", tail - dev_priv->primary->offset); | 152 | DRM_DEBUG(" tail = 0x%06lx\n", (unsigned long)(tail - dev_priv->primary->offset)); |
153 | DRM_DEBUG(" space = 0x%06x\n", primary->space); | 153 | DRM_DEBUG(" space = 0x%06x\n", primary->space); |
154 | 154 | ||
155 | mga_flush_write_combine(); | 155 | mga_flush_write_combine(); |
@@ -187,7 +187,7 @@ void mga_do_dma_wrap_start(drm_mga_private_t * dev_priv) | |||
187 | primary->space = head - dev_priv->primary->offset; | 187 | primary->space = head - dev_priv->primary->offset; |
188 | } | 188 | } |
189 | 189 | ||
190 | DRM_DEBUG(" head = 0x%06lx\n", head - dev_priv->primary->offset); | 190 | DRM_DEBUG(" head = 0x%06lx\n", (unsigned long)(head - dev_priv->primary->offset)); |
191 | DRM_DEBUG(" tail = 0x%06x\n", primary->tail); | 191 | DRM_DEBUG(" tail = 0x%06x\n", primary->tail); |
192 | DRM_DEBUG(" wrap = %d\n", primary->last_wrap); | 192 | DRM_DEBUG(" wrap = %d\n", primary->last_wrap); |
193 | DRM_DEBUG(" space = 0x%06x\n", primary->space); | 193 | DRM_DEBUG(" space = 0x%06x\n", primary->space); |
@@ -239,7 +239,7 @@ static void mga_freelist_print(struct drm_device * dev) | |||
239 | for (entry = dev_priv->head->next; entry; entry = entry->next) { | 239 | for (entry = dev_priv->head->next; entry; entry = entry->next) { |
240 | DRM_INFO(" %p idx=%2d age=0x%x 0x%06lx\n", | 240 | DRM_INFO(" %p idx=%2d age=0x%x 0x%06lx\n", |
241 | entry, entry->buf->idx, entry->age.head, | 241 | entry, entry->buf->idx, entry->age.head, |
242 | entry->age.head - dev_priv->primary->offset); | 242 | (unsigned long)(entry->age.head - dev_priv->primary->offset)); |
243 | } | 243 | } |
244 | DRM_INFO("\n"); | 244 | DRM_INFO("\n"); |
245 | } | 245 | } |
@@ -340,10 +340,10 @@ static struct drm_buf *mga_freelist_get(struct drm_device * dev) | |||
340 | 340 | ||
341 | DRM_DEBUG(" tail=0x%06lx %d\n", | 341 | DRM_DEBUG(" tail=0x%06lx %d\n", |
342 | tail->age.head ? | 342 | tail->age.head ? |
343 | tail->age.head - dev_priv->primary->offset : 0, | 343 | (unsigned long)(tail->age.head - dev_priv->primary->offset) : 0, |
344 | tail->age.wrap); | 344 | tail->age.wrap); |
345 | DRM_DEBUG(" head=0x%06lx %d\n", | 345 | DRM_DEBUG(" head=0x%06lx %d\n", |
346 | head - dev_priv->primary->offset, wrap); | 346 | (unsigned long)(head - dev_priv->primary->offset), wrap); |
347 | 347 | ||
348 | if (TEST_AGE(&tail->age, head, wrap)) { | 348 | if (TEST_AGE(&tail->age, head, wrap)) { |
349 | prev = dev_priv->tail->prev; | 349 | prev = dev_priv->tail->prev; |
@@ -366,8 +366,9 @@ int mga_freelist_put(struct drm_device * dev, struct drm_buf * buf) | |||
366 | drm_mga_freelist_t *head, *entry, *prev; | 366 | drm_mga_freelist_t *head, *entry, *prev; |
367 | 367 | ||
368 | DRM_DEBUG("age=0x%06lx wrap=%d\n", | 368 | DRM_DEBUG("age=0x%06lx wrap=%d\n", |
369 | buf_priv->list_entry->age.head - | 369 | (unsigned long)(buf_priv->list_entry->age.head - |
370 | dev_priv->primary->offset, buf_priv->list_entry->age.wrap); | 370 | dev_priv->primary->offset), |
371 | buf_priv->list_entry->age.wrap); | ||
371 | 372 | ||
372 | entry = buf_priv->list_entry; | 373 | entry = buf_priv->list_entry; |
373 | head = dev_priv->head; | 374 | head = dev_priv->head; |