diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2015-12-14 23:39:30 +0300 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2015-12-31 12:25:42 +0300 |
| commit | e1c1174f8d5602b497bd237b7a937b58b58e6b95 (patch) | |
| tree | 5c5c7ae91538593e4c1376c1f533e4779cddb1ae /drivers/gpu/drm/omapdrm/omap_gem.c | |
| parent | f8ef29ee45664e86805d4359e352a0a9acbd1d13 (diff) | |
| download | linux-e1c1174f8d5602b497bd237b7a937b58b58e6b95.tar.xz | |
drm: omapdrm: Make fbdev emulation optional
Don't compile the fbdev emulation code when fbdev emulation support is
disabled.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_gem.c')
| -rw-r--r-- | drivers/gpu/drm/omapdrm/omap_gem.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_gem.c b/drivers/gpu/drm/omapdrm/omap_gem.c index 7ed08fdc4c42..374ce2adc811 100644 --- a/drivers/gpu/drm/omapdrm/omap_gem.c +++ b/drivers/gpu/drm/omapdrm/omap_gem.c @@ -653,6 +653,7 @@ fail: return ret; } +#ifdef CONFIG_DRM_FBDEV_EMULATION /* Set scrolling position. This allows us to implement fast scrolling * for console. * @@ -689,6 +690,7 @@ fail: return ret; } +#endif /* Sync the buffer for CPU access.. note pages should already be * attached, ie. omap_gem_get_pages() @@ -924,6 +926,7 @@ int omap_gem_put_pages(struct drm_gem_object *obj) return 0; } +#ifdef CONFIG_DRM_FBDEV_EMULATION /* Get kernel virtual address for CPU access.. this more or less only * exists for omap_fbdev. This should be called with struct_mutex * held. @@ -942,6 +945,7 @@ void *omap_gem_vaddr(struct drm_gem_object *obj) } return omap_obj->vaddr; } +#endif #ifdef CONFIG_PM /* re-pin objects in DMM in resume path: */ |