aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_wb_m2m.c')
-rw-r--r--drivers/gpu/drm/omapdrm/omap_wb_m2m.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_wb_m2m.c b/drivers/gpu/drm/omapdrm/omap_wb_m2m.c
index 784c4247ade6..4a3291f699e6 100644
--- a/drivers/gpu/drm/omapdrm/omap_wb_m2m.c
+++ b/drivers/gpu/drm/omapdrm/omap_wb_m2m.c
@@ -202,11 +202,11 @@ static void device_run(void *priv)
202 src_info.out_width = spix->width; 202 src_info.out_width = spix->width;
203 src_info.out_height = spix->height; 203 src_info.out_height = spix->height;
204 204
205 src_info.color_mode = fourcc_to_dss(spix->pixelformat); 205 src_info.color_mode = spix->pixelformat;
206 src_info.global_alpha = 0xff; 206 src_info.global_alpha = 0xff;
207 207
208 src_info.rotation = OMAP_DSS_ROT_0; 208 src_info.rotation = BIT(DRM_ROTATE_0);
209 src_info.rotation_type = OMAP_DSS_ROT_DMA; 209 src_info.rotation_type = OMAP_DSS_ROT_NONE;
210 210
211 log_dbg(dev, "SRC: ctx %pa buf_index %d %dx%d, sw %d\n", 211 log_dbg(dev, "SRC: ctx %pa buf_index %d %dx%d, sw %d\n",
212 &ctx, s_vb->index, 212 &ctx, s_vb->index,
@@ -221,11 +221,11 @@ static void device_run(void *priv)
221 221
222 wb_info.width = dpix->width; 222 wb_info.width = dpix->width;
223 wb_info.height = dpix->height; 223 wb_info.height = dpix->height;
224 wb_info.color_mode = fourcc_to_dss(dpix->pixelformat); 224 wb_info.color_mode = dpix->pixelformat;
225 wb_info.pre_mult_alpha = 1; 225 wb_info.pre_mult_alpha = 1;
226 226
227 wb_info.rotation = OMAP_DSS_ROT_0; 227 wb_info.rotation = DRM_ROTATE_0;
228 wb_info.rotation_type = OMAP_DSS_ROT_DMA; 228 wb_info.rotation_type = OMAP_DSS_ROT_NONE;
229 229
230 log_dbg(dev, "DST: ctx %pa buf_index %d %dx%d, sw %d\n", 230 log_dbg(dev, "DST: ctx %pa buf_index %d %dx%d, sw %d\n",
231 &ctx, d_vb->index, 231 &ctx, d_vb->index,