summaryrefslogtreecommitdiffstats
path: root/drivers/staging/omapdrm/omap_drv.h
diff options
context:
space:
mode:
authorRob Clark2012-01-16 19:51:18 +0100
committerGreg Kroah-Hartman2012-02-08 23:14:11 +0100
commit2f53700df17bf52332056c1e85b23bcf64c77e57 (patch)
tree9c87832f29fb0129cb803a79359ca48c8d546847 /drivers/staging/omapdrm/omap_drv.h
parentstaging: drm/omap: multiplanar and YUV support (diff)
downloadkernel-qcow2-linux-2f53700df17bf52332056c1e85b23bcf64c77e57.tar.gz
kernel-qcow2-linux-2f53700df17bf52332056c1e85b23bcf64c77e57.tar.xz
kernel-qcow2-linux-2f53700df17bf52332056c1e85b23bcf64c77e57.zip
staging: drm/omap: updates for DSS fifomerge API changes
Signed-off-by: Rob Clark <rob@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/omapdrm/omap_drv.h')
-rw-r--r--drivers/staging/omapdrm/omap_drv.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/staging/omapdrm/omap_drv.h b/drivers/staging/omapdrm/omap_drv.h
index 48f6fce614b6..61fe022dda5b 100644
--- a/drivers/staging/omapdrm/omap_drv.h
+++ b/drivers/staging/omapdrm/omap_drv.h
@@ -69,6 +69,12 @@ struct drm_plane *omap_plane_init(struct drm_device *dev,
struct omap_overlay *ovl, unsigned int possible_crtcs,
bool priv);
int omap_plane_dpms(struct drm_plane *plane, int mode);
+int omap_plane_mode_set(struct drm_plane *plane,
+ struct drm_crtc *crtc, struct drm_framebuffer *fb,
+ int crtc_x, int crtc_y,
+ unsigned int crtc_w, unsigned int crtc_h,
+ uint32_t src_x, uint32_t src_y,
+ uint32_t src_w, uint32_t src_h);
struct drm_encoder *omap_encoder_init(struct drm_device *dev,
struct omap_overlay_manager *mgr);