summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Widawsky <ben@bwidawsk.net>2012-02-22 17:50:28 +0100
committerBen Widawsky <ben@bwidawsk.net>2012-03-04 16:30:02 +0100
commitcd2be72a22baa86d8d97c8b35b334da92fc412c2 (patch)
tree1c0f785d0f93eb6a19a078515e273131830f97d9
parentccba215754a99c1bc1d216429454252b3343360f (diff)
drm: actually enable PRIME
Enable prime in both Kconfig and vgem. Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
-rw-r--r--drivers/gpu/drm/Kconfig1
-rw-r--r--drivers/gpu/drm/vgem/vgem_drv.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 566c468e9eff..c893f1ee4fae 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -9,6 +9,7 @@ menuconfig DRM
depends on (AGP || AGP=n) && !EMULATED_CMPXCHG && MMU
select I2C
select I2C_ALGOBIT
+ select DMA_SHARED_BUFFER
help
Kernel-level support for the Direct Rendering Infrastructure (DRI)
introduced in XFree86 4.0. If you say Y here, you need to select
diff --git a/drivers/gpu/drm/vgem/vgem_drv.c b/drivers/gpu/drm/vgem/vgem_drv.c
index e854cf6b4431..faa61927e4e0 100644
--- a/drivers/gpu/drm/vgem/vgem_drv.c
+++ b/drivers/gpu/drm/vgem/vgem_drv.c
@@ -313,7 +313,8 @@ static const struct file_operations vgem_driver_fops = {
};
static struct drm_driver vgem_driver = {
- .driver_features = DRIVER_BUS_PLATFORM | DRIVER_GEM,
+ .driver_features =
+ DRIVER_BUS_PLATFORM | DRIVER_GEM | DRIVER_PRIME,
.load = vgem_load,
.unload = vgem_unload,
.open = vgem_open,