aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/omapdrm/omap_fb.c
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2018-02-11 08:07:33 -0500
committerTomi Valkeinen <tomi.valkeinen@ti.com>2018-03-01 02:09:10 -0500
commitdfe9cfccb264889b025e443ca20e2fbb401295c2 (patch)
tree8b42d748309d634b25e9310e36456799bf05ca76 /drivers/gpu/drm/omapdrm/omap_fb.c
parentf073d78eeb8efd85718e611c15f9a78647751dea (diff)
drm: omapdrm: Use kernel integer types
The standard kernel integer types are [us]{8,16,32}. Use them instead of the u?int{8,16,32}_t types. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_fb.c')
-rw-r--r--drivers/gpu/drm/omapdrm/omap_fb.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_fb.c b/drivers/gpu/drm/omapdrm/omap_fb.c
index b2539a90e1a4..5fd22ca73913 100644
--- a/drivers/gpu/drm/omapdrm/omap_fb.c
+++ b/drivers/gpu/drm/omapdrm/omap_fb.c
@@ -52,8 +52,8 @@ static const u32 formats[] = {
52/* per-plane info for the fb: */ 52/* per-plane info for the fb: */
53struct plane { 53struct plane {
54 struct drm_gem_object *bo; 54 struct drm_gem_object *bo;
55 uint32_t pitch; 55 u32 pitch;
56 uint32_t offset; 56 u32 offset;
57 dma_addr_t dma_addr; 57 dma_addr_t dma_addr;
58}; 58};
59 59
@@ -100,10 +100,10 @@ static const struct drm_framebuffer_funcs omap_framebuffer_funcs = {
100 .destroy = omap_framebuffer_destroy, 100 .destroy = omap_framebuffer_destroy,
101}; 101};
102 102
103static uint32_t get_linear_addr(struct plane *plane, 103static u32 get_linear_addr(struct plane *plane,
104 const struct drm_format_info *format, int n, int x, int y) 104 const struct drm_format_info *format, int n, int x, int y)
105{ 105{
106 uint32_t offset; 106 u32 offset;
107 107
108 offset = plane->offset 108 offset = plane->offset
109 + (x * format->cpp[n] / (n == 0 ? 1 : format->hsub)) 109 + (x * format->cpp[n] / (n == 0 ? 1 : format->hsub))
@@ -121,9 +121,9 @@ bool omap_framebuffer_supports_rotation(struct drm_framebuffer *fb)
121} 121}
122 122
123/* Note: DRM rotates counter-clockwise, TILER & DSS rotates clockwise */ 123/* Note: DRM rotates counter-clockwise, TILER & DSS rotates clockwise */
124static uint32_t drm_rotation_to_tiler(unsigned int drm_rot) 124static u32 drm_rotation_to_tiler(unsigned int drm_rot)
125{ 125{
126 uint32_t orient; 126 u32 orient;
127 127
128 switch (drm_rot & DRM_MODE_ROTATE_MASK) { 128 switch (drm_rot & DRM_MODE_ROTATE_MASK) {
129 default: 129 default:
@@ -158,7 +158,7 @@ void omap_framebuffer_update_scanout(struct drm_framebuffer *fb,
158 struct omap_framebuffer *omap_fb = to_omap_framebuffer(fb); 158 struct omap_framebuffer *omap_fb = to_omap_framebuffer(fb);
159 const struct drm_format_info *format = omap_fb->format; 159 const struct drm_format_info *format = omap_fb->format;
160 struct plane *plane = &omap_fb->planes[0]; 160 struct plane *plane = &omap_fb->planes[0];
161 uint32_t x, y, orient = 0; 161 u32 x, y, orient = 0;
162 162
163 info->fourcc = fb->format->format; 163 info->fourcc = fb->format->format;
164 164
@@ -177,8 +177,8 @@ void omap_framebuffer_update_scanout(struct drm_framebuffer *fb,
177 y = state->src_y >> 16; 177 y = state->src_y >> 16;
178 178
179 if (omap_gem_flags(plane->bo) & OMAP_BO_TILED) { 179 if (omap_gem_flags(plane->bo) & OMAP_BO_TILED) {
180 uint32_t w = state->src_w >> 16; 180 u32 w = state->src_w >> 16;
181 uint32_t h = state->src_h >> 16; 181 u32 h = state->src_h >> 16;
182 182
183 orient = drm_rotation_to_tiler(state->rotation); 183 orient = drm_rotation_to_tiler(state->rotation);
184 184