summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2015-05-08 12:32:31 +0200
committerTomi Valkeinen <tomi.valkeinen@ti.com>2015-07-02 14:58:06 +0200
commitd642d3acd89454006fd6ca9cc4dd57f26959f9d1 (patch)
tree0c0f7238f48796678d3c7203e4073d949c8bdefa /drivers/gpu
parentdrm/omap: fix omap_gem_put_paddr() error handling (diff)
downloadlinux-d642d3acd89454006fd6ca9cc4dd57f26959f9d1.tar.xz
linux-d642d3acd89454006fd6ca9cc4dd57f26959f9d1.zip
drm/omap: fix align_pitch() for 24 bits per pixel
align_pitch() uses ALIGN() to ensure the pitch is aligned to SGX's requirement of 8 pixels. However, ALIGN() expects the alignment value to be a power of two, which is not the case for 24 bits per pixels. Use roundup() instead, which works for all alignments. This fixes the error seen with 24 bits per pixel modes: "buffer pitch (2176 bytes) is not a multiple of pixel size (3 bytes)" Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/omapdrm/omap_drv.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.h b/drivers/gpu/drm/omapdrm/omap_drv.h
index 1ae8477e4289..12081e61d45a 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.h
+++ b/drivers/gpu/drm/omapdrm/omap_drv.h
@@ -236,7 +236,7 @@ static inline int align_pitch(int pitch, int width, int bpp)
/* PVR needs alignment to 8 pixels.. right now that is the most
* restrictive stride requirement..
*/
- return ALIGN(pitch, 8 * bytespp);
+ return roundup(pitch, 8 * bytespp);
}
/* map crtc to vblank mask */