projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
[linux-2.6-block.git]
/
drivers
/
gpu
/
drm
/
sti
/
sti_hqvdp.c
diff --git
a/drivers/gpu/drm/sti/sti_hqvdp.c
b/drivers/gpu/drm/sti/sti_hqvdp.c
index d7c1f427811d919d32c92b520a7967f6748d07c4..e05b0dc523ff93f3309c2aea9c2de032e7971636 100644
(file)
--- a/
drivers/gpu/drm/sti/sti_hqvdp.c
+++ b/
drivers/gpu/drm/sti/sti_hqvdp.c
@@
-852,9
+852,9
@@
static void sti_hqvdp_init(struct sti_hqvdp *hqvdp)
/* Allocate memory for the VDP commands */
size = NB_VDP_CMD * sizeof(struct sti_hqvdp_cmd);
/* Allocate memory for the VDP commands */
size = NB_VDP_CMD * sizeof(struct sti_hqvdp_cmd);
- hqvdp->hqvdp_cmd = dma_alloc_w
ritecombine
(hqvdp->dev, size,
-
&dma_addr,
-
GFP_KERNEL | GFP_DMA);
+ hqvdp->hqvdp_cmd = dma_alloc_w
c
(hqvdp->dev, size,
+ &dma_addr,
+ GFP_KERNEL | GFP_DMA);
if (!hqvdp->hqvdp_cmd) {
DRM_ERROR("Failed to allocate memory for VDP cmd\n");
return;
if (!hqvdp->hqvdp_cmd) {
DRM_ERROR("Failed to allocate memory for VDP cmd\n");
return;