diff options
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_drv.h')
| -rw-r--r-- | drivers/gpu/drm/omapdrm/omap_drv.h | 7 | 
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.h b/drivers/gpu/drm/omapdrm/omap_drv.h index 30b95b73665..284b80fc3c5 100644 --- a/drivers/gpu/drm/omapdrm/omap_drv.h +++ b/drivers/gpu/drm/omapdrm/omap_drv.h @@ -141,10 +141,12 @@ int omap_gem_resume(struct device *dev);  int omap_irq_enable_vblank(struct drm_device *dev, int crtc_id);  void omap_irq_disable_vblank(struct drm_device *dev, int crtc_id); -irqreturn_t omap_irq_handler(DRM_IRQ_ARGS); +irqreturn_t omap_irq_handler(int irq, void *arg);  void omap_irq_preinstall(struct drm_device *dev);  int omap_irq_postinstall(struct drm_device *dev);  void omap_irq_uninstall(struct drm_device *dev); +void __omap_irq_register(struct drm_device *dev, struct omap_drm_irq *irq); +void __omap_irq_unregister(struct drm_device *dev, struct omap_drm_irq *irq);  void omap_irq_register(struct drm_device *dev, struct omap_drm_irq *irq);  void omap_irq_unregister(struct drm_device *dev, struct omap_drm_irq *irq);  int omap_drm_irq_uninstall(struct drm_device *dev); @@ -158,8 +160,10 @@ enum omap_channel omap_crtc_channel(struct drm_crtc *crtc);  int omap_crtc_apply(struct drm_crtc *crtc,  		struct omap_drm_apply *apply);  void omap_crtc_pre_init(void); +void omap_crtc_pre_uninit(void);  struct drm_crtc *omap_crtc_init(struct drm_device *dev,  		struct drm_plane *plane, enum omap_channel channel, int id); +void omap_crtc_flush(struct drm_crtc *crtc);  struct drm_plane *omap_plane_init(struct drm_device *dev,  		int plane_id, bool private_plane); @@ -220,7 +224,6 @@ struct drm_gem_object *omap_gem_new(struct drm_device *dev,  int omap_gem_new_handle(struct drm_device *dev, struct drm_file *file,  		union omap_gem_size gsize, uint32_t flags, uint32_t *handle);  void omap_gem_free_object(struct drm_gem_object *obj); -int omap_gem_init_object(struct drm_gem_object *obj);  void *omap_gem_vaddr(struct drm_gem_object *obj);  int omap_gem_dumb_map_offset(struct drm_file *file, struct drm_device *dev,  		uint32_t handle, uint64_t *offset);  | 
