diff options
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_fb.c')
-rw-r--r-- | drivers/gpu/drm/omapdrm/omap_fb.c | 18 |
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 29dc677dd4d3..5ca0537bb427 100644 --- a/drivers/gpu/drm/omapdrm/omap_fb.c +++ b/drivers/gpu/drm/omapdrm/omap_fb.c | |||
@@ -167,30 +167,30 @@ void omap_framebuffer_update_scanout(struct drm_framebuffer *fb, | |||
167 | uint32_t w = win->src_w; | 167 | uint32_t w = win->src_w; |
168 | uint32_t h = win->src_h; | 168 | uint32_t h = win->src_h; |
169 | 169 | ||
170 | switch (win->rotation & DRM_ROTATE_MASK) { | 170 | switch (win->rotation & DRM_MODE_ROTATE_MASK) { |
171 | default: | 171 | default: |
172 | dev_err(fb->dev->dev, "invalid rotation: %02x", | 172 | dev_err(fb->dev->dev, "invalid rotation: %02x", |
173 | (uint32_t)win->rotation); | 173 | (uint32_t)win->rotation); |
174 | /* fallthru to default to no rotation */ | 174 | /* fallthru to default to no rotation */ |
175 | case 0: | 175 | case 0: |
176 | case DRM_ROTATE_0: | 176 | case DRM_MODE_ROTATE_0: |
177 | orient = 0; | 177 | orient = 0; |
178 | break; | 178 | break; |
179 | case DRM_ROTATE_90: | 179 | case DRM_MODE_ROTATE_90: |
180 | orient = MASK_XY_FLIP | MASK_X_INVERT; | 180 | orient = MASK_XY_FLIP | MASK_X_INVERT; |
181 | break; | 181 | break; |
182 | case DRM_ROTATE_180: | 182 | case DRM_MODE_ROTATE_180: |
183 | orient = MASK_X_INVERT | MASK_Y_INVERT; | 183 | orient = MASK_X_INVERT | MASK_Y_INVERT; |
184 | break; | 184 | break; |
185 | case DRM_ROTATE_270: | 185 | case DRM_MODE_ROTATE_270: |
186 | orient = MASK_XY_FLIP | MASK_Y_INVERT; | 186 | orient = MASK_XY_FLIP | MASK_Y_INVERT; |
187 | break; | 187 | break; |
188 | } | 188 | } |
189 | 189 | ||
190 | if (win->rotation & DRM_REFLECT_X) | 190 | if (win->rotation & DRM_MODE_REFLECT_X) |
191 | orient ^= MASK_X_INVERT; | 191 | orient ^= MASK_X_INVERT; |
192 | 192 | ||
193 | if (win->rotation & DRM_REFLECT_Y) | 193 | if (win->rotation & DRM_MODE_REFLECT_Y) |
194 | orient ^= MASK_Y_INVERT; | 194 | orient ^= MASK_Y_INVERT; |
195 | 195 | ||
196 | /* adjust x,y offset for flip/invert: */ | 196 | /* adjust x,y offset for flip/invert: */ |
@@ -205,9 +205,9 @@ void omap_framebuffer_update_scanout(struct drm_framebuffer *fb, | |||
205 | info->rotation_type = OMAP_DSS_ROT_TILER; | 205 | info->rotation_type = OMAP_DSS_ROT_TILER; |
206 | info->screen_width = omap_gem_tiled_stride(plane->bo, orient); | 206 | info->screen_width = omap_gem_tiled_stride(plane->bo, orient); |
207 | } else { | 207 | } else { |
208 | switch (win->rotation & DRM_ROTATE_MASK) { | 208 | switch (win->rotation & DRM_MODE_ROTATE_MASK) { |
209 | case 0: | 209 | case 0: |
210 | case DRM_ROTATE_0: | 210 | case DRM_MODE_ROTATE_0: |
211 | /* OK */ | 211 | /* OK */ |
212 | break; | 212 | break; |
213 | 213 | ||