diff options
Diffstat (limited to 'drivers/staging/omapdrm/omap_drv.h')
-rw-r--r-- | drivers/staging/omapdrm/omap_drv.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/staging/omapdrm/omap_drv.h b/drivers/staging/omapdrm/omap_drv.h index 9dc72d143ff3..1d4aea53b75d 100644 --- a/drivers/staging/omapdrm/omap_drv.h +++ b/drivers/staging/omapdrm/omap_drv.h @@ -40,6 +40,8 @@ #define MAX_MAPPERS 2 struct omap_drm_private { + uint32_t omaprev; + unsigned int num_crtcs; struct drm_crtc *crtcs[8]; @@ -189,9 +191,9 @@ size_t omap_gem_mmap_size(struct drm_gem_object *obj); int omap_gem_tiled_size(struct drm_gem_object *obj, uint16_t *w, uint16_t *h); int omap_gem_tiled_stride(struct drm_gem_object *obj, uint32_t orient); -struct dma_buf * omap_gem_prime_export(struct drm_device *dev, +struct dma_buf *omap_gem_prime_export(struct drm_device *dev, struct drm_gem_object *obj, int flags); -struct drm_gem_object * omap_gem_prime_import(struct drm_device *dev, +struct drm_gem_object *omap_gem_prime_import(struct drm_device *dev, struct dma_buf *buffer); static inline int align_pitch(int pitch, int width, int bpp) @@ -216,17 +218,17 @@ static inline int objects_lookup(struct drm_device *dev, for (i = 0; i < n; i++) { bos[i] = drm_gem_object_lookup(dev, filp, handles[i]); - if (!bos[i]) { + if (!bos[i]) goto fail; - } + } return 0; fail: - while (--i > 0) { + while (--i > 0) drm_gem_object_unreference_unlocked(bos[i]); - } + return -ENOENT; } |