media: hantro: Simplify macroblock macros

[sfrench/cifs-2.6.git] / drivers / staging / media / hantro / rk3399_vpu_hw_mpeg2_dec.c

diff --git a/drivers/staging/media/hantro/rk3399_vpu_hw_mpeg2_dec.c b/drivers/staging/media/hantro/rk3399_vpu_hw_mpeg2_dec.c
index e7ba5c0441cc6ae3cfa9933d865db2253c4b7e17..263ec81f209bfbb68430c30e7cff73ceb8dfbf86 100644 (file)
--- a/drivers/staging/media/hantro/rk3399_vpu_hw_mpeg2_dec.c
+++ b/drivers/staging/media/hantro/rk3399_vpu_hw_mpeg2_dec.c
@@ -223,8 +223,8 @@ void rk3399_vpu_mpeg2_dec_run(struct hantro_ctx *ctx)
              VDPU_REG_DEC_CLK_GATE_E(1);
        vdpu_write_relaxed(vpu, reg, VDPU_SWREG(57));
 
-       reg = VDPU_REG_PIC_MB_WIDTH(MPEG2_MB_WIDTH(ctx->dst_fmt.width)) |
-             VDPU_REG_PIC_MB_HEIGHT_P(MPEG2_MB_HEIGHT(ctx->dst_fmt.height)) |
+       reg = VDPU_REG_PIC_MB_WIDTH(MB_WIDTH(ctx->dst_fmt.width)) |
+             VDPU_REG_PIC_MB_HEIGHT_P(MB_HEIGHT(ctx->dst_fmt.height)) |
              VDPU_REG_ALT_SCAN_E(picture->alternate_scan) |
              VDPU_REG_TOPFIELDFIRST_E(picture->top_field_first);
        vdpu_write_relaxed(vpu, reg, VDPU_SWREG(120));