diff options
Diffstat (limited to 'drivers/gpu/drm/i810')
-rw-r--r-- | drivers/gpu/drm/i810/i810_dma.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c index e5de8ea4154..7d1d88cdf2d 100644 --- a/drivers/gpu/drm/i810/i810_dma.c +++ b/drivers/gpu/drm/i810/i810_dma.c | |||
@@ -227,8 +227,7 @@ static int i810_dma_cleanup(struct drm_device * dev) | |||
227 | /* Need to rewrite hardware status page */ | 227 | /* Need to rewrite hardware status page */ |
228 | I810_WRITE(0x02080, 0x1ffff000); | 228 | I810_WRITE(0x02080, 0x1ffff000); |
229 | } | 229 | } |
230 | drm_free(dev->dev_private, sizeof(drm_i810_private_t), | 230 | kfree(dev->dev_private); |
231 | DRM_MEM_DRIVER); | ||
232 | dev->dev_private = NULL; | 231 | dev->dev_private = NULL; |
233 | 232 | ||
234 | for (i = 0; i < dma->buf_count; i++) { | 233 | for (i = 0; i < dma->buf_count; i++) { |
@@ -439,8 +438,7 @@ static int i810_dma_init(struct drm_device *dev, void *data, | |||
439 | switch (init->func) { | 438 | switch (init->func) { |
440 | case I810_INIT_DMA_1_4: | 439 | case I810_INIT_DMA_1_4: |
441 | DRM_INFO("Using v1.4 init.\n"); | 440 | DRM_INFO("Using v1.4 init.\n"); |
442 | dev_priv = drm_alloc(sizeof(drm_i810_private_t), | 441 | dev_priv = kmalloc(sizeof(drm_i810_private_t), GFP_KERNEL); |
443 | DRM_MEM_DRIVER); | ||
444 | if (dev_priv == NULL) | 442 | if (dev_priv == NULL) |
445 | return -ENOMEM; | 443 | return -ENOMEM; |
446 | retcode = i810_dma_initialize(dev, dev_priv, init); | 444 | retcode = i810_dma_initialize(dev, dev_priv, init); |