diff options
Diffstat (limited to 'drivers/media/video/tiler/tiler-nv12.c')
| -rw-r--r-- | drivers/media/video/tiler/tiler-nv12.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/tiler/tiler-nv12.c b/drivers/media/video/tiler/tiler-nv12.c index f208275..2142b3a 100644 --- a/drivers/media/video/tiler/tiler-nv12.c +++ b/drivers/media/video/tiler/tiler-nv12.c @@ -336,7 +336,7 @@ static u16 nv12_together(u16 o, u16 a, u16 w, u16 n, u16 *area, u8 *packing) static void reserve_nv12(u32 n, u32 width, u32 height, u32 gid, struct security_info *si) { - u16 w, h, band, a, o = 0; + u16 w, h, band, a, o = 0, r = 0; struct gid_info *gi; int res = 0, res2, i; u16 n_t, n_s, area_t, area_s; @@ -349,7 +349,7 @@ static void reserve_nv12(u32 n, u32 width, u32 height, return; /* calculate dimensions, band, and alignment in slots */ - if (ops->analize(TILFMT_8BIT, width, height, &w, &h, &band, &a)) + if (ops->analize(TILFMT_8BIT, width, height, &w, &h, &band, &a, &o, &r)) return; /* get group context */ @@ -378,10 +378,10 @@ static void reserve_nv12(u32 n, u32 width, u32 height, * able to reserve both 8- and 16-bit blocks as the * offsets of them must match. */ - res = ops->lay_2d(TILFMT_8BIT, n_s, w, h, band_8, a, + res = ops->lay_2d(TILFMT_8BIT, n_s, w, h, band_8, a, o, gi, &reserved); res2 = ops->lay_2d(TILFMT_16BIT, n_s, (w + 1) >> 1, h, - band_16, a >> 1, gi, &reserved); + band_16, a >> 1, o >> 1, gi, &reserved); if (res2 < 0 || res < 0 || res != res2) { /* clean up */ |