Merge branch 'next/drivers' into HEAD

[deliverable/linux.git] / drivers / staging / omapdrm / omap_dmm_tiler.h

diff --git a/drivers/staging/omapdrm/omap_dmm_tiler.h b/drivers/staging/omapdrm/omap_dmm_tiler.h
index 7b1052a329e46126f82292a6f50fae23e1a00223..740911df5fc3d9842de401aec53d6dae1482bf09 100644 (file)
--- a/drivers/staging/omapdrm/omap_dmm_tiler.h
+++ b/drivers/staging/omapdrm/omap_dmm_tiler.h
@@ -54,7 +54,18 @@ struct tiler_block {
 #define TILER_WIDTH             (1 << (CONT_WIDTH_BITS - SLOT_WIDTH_BITS))
 #define TILER_HEIGHT            (1 << (CONT_HEIGHT_BITS - SLOT_HEIGHT_BITS))
 
-/* tiler space addressing bitfields */
+/*
+Table 15-11. Coding and Description of TILER Orientations
+S Y X  Description                             Alternate description
+0 0 0  0-degree view                           Natural view
+0 0 1  0-degree view with vertical mirror      180-degree view with horizontal mirror
+0 1 0  0-degree view with horizontal mirror    180-degree view with vertical mirror
+0 1 1  180-degree view
+1 0 0  90-degree view with vertical mirror     270-degree view with horizontal mirror
+1 0 1  270-degree view
+1 1 0  90-degree view
+1 1 1  90-degree view with horizontal mirror   270-degree view with vertical mirror
+ */
 #define MASK_XY_FLIP           (1 << 31)
 #define MASK_Y_INVERT          (1 << 30)
 #define MASK_X_INVERT          (1 << 29)
@@ -90,7 +101,9 @@ int tiler_release(struct tiler_block *block);
 
 /* utilities */
 dma_addr_t tiler_ssptr(struct tiler_block *block);
-uint32_t tiler_stride(enum tiler_fmt fmt);
+dma_addr_t tiler_tsptr(struct tiler_block *block, uint32_t orient,
+               uint32_t x, uint32_t y);
+uint32_t tiler_stride(enum tiler_fmt fmt, uint32_t orient);
 size_t tiler_size(enum tiler_fmt fmt, uint16_t w, uint16_t h);
 size_t tiler_vsize(enum tiler_fmt fmt, uint16_t w, uint16_t h);
 void tiler_align(enum tiler_fmt fmt, uint16_t *w, uint16_t *h);