diff options
| author | Dave Airlie <airlied@linux.ie> | 2007-01-01 11:30:38 +1100 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2007-01-01 11:30:38 +1100 |
| commit | 2dcbf6a59918761cffb27e027b1235c551ed03dd (patch) | |
| tree | c7e61174697f1430af6bd2871200cbbd9e5f467c /linux-core/via_dmablit.c | |
| parent | 87faf62fae711c8337793abaf0f529f2660245db (diff) | |
make build against 2.6.20 hopefully
Diffstat (limited to 'linux-core/via_dmablit.c')
| -rw-r--r-- | linux-core/via_dmablit.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/linux-core/via_dmablit.c b/linux-core/via_dmablit.c index 1fb902cb..2f508374 100644 --- a/linux-core/via_dmablit.c +++ b/linux-core/via_dmablit.c @@ -498,10 +498,18 @@ via_dmablit_timer(unsigned long data) static void +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) via_dmablit_workqueue(void *data) +#else +via_dmablit_workqueue(struct work_struct *work) +#endif { +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) drm_via_blitq_t *blitq = (drm_via_blitq_t *) data; - drm_device_t *dev = blitq->dev; +#else + drm_via_blitq_t *blitq = container_of(work, drm_via_blitq_t, wq); +#endif + drm_device_t *dev = blitq->dev; unsigned long irqsave; drm_via_sg_info_t *cur_sg; int cur_released; @@ -569,7 +577,11 @@ via_init_dmablit(drm_device_t *dev) DRM_INIT_WAITQUEUE(blitq->blit_queue + j); } DRM_INIT_WAITQUEUE(&blitq->busy_queue); +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) INIT_WORK(&blitq->wq, via_dmablit_workqueue, blitq); +#else + INIT_WORK(&blitq->wq, via_dmablit_workqueue); +#endif init_timer(&blitq->poll_timer); blitq->poll_timer.function = &via_dmablit_timer; blitq->poll_timer.data = (unsigned long) blitq; |