aboutsummaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorGravatar Mansur Alisha Shaik <mansur@codeaurora.org> 2021-07-06 18:21:22 +0200
committerGravatar Mauro Carvalho Chehab <mchehab+huawei@kernel.org> 2021-08-04 14:43:52 +0200
commit1ac61faf6ebbce59fccbb53d7faf25576e9897ab (patch)
tree9cdcf5f5c2d9dd91bc6f217cce7b6455b4c5e5a9 /drivers/media
parentmedia: venus: venc: Fix potential null pointer dereference on pointer fmt (diff)
downloadlinux-1ac61faf6ebbce59fccbb53d7faf25576e9897ab.tar.gz
linux-1ac61faf6ebbce59fccbb53d7faf25576e9897ab.tar.bz2
linux-1ac61faf6ebbce59fccbb53d7faf25576e9897ab.zip
media: venus: helper: do not set constrained parameters for UBWC
Plane constraints firmware interface is to override the default alignment for a given color format. By default venus hardware has alignments as 128x32, but NV12 was defined differently to meet various usecases. Compressed NV12 has always been aligned as 128x32, hence not needed to override the default alignment. Fixes: bc28936bbba9 ("media: venus: helpers, hfi, vdec: Set actual plane constraints to FW") Signed-off-by: Mansur Alisha Shaik <mansur@codeaurora.org> Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/platform/qcom/venus/helpers.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/platform/qcom/venus/helpers.c b/drivers/media/platform/qcom/venus/helpers.c
index 1fe6d463dc99..8012f5c7bf34 100644
--- a/drivers/media/platform/qcom/venus/helpers.c
+++ b/drivers/media/platform/qcom/venus/helpers.c
@@ -1137,6 +1137,9 @@ int venus_helper_set_format_constraints(struct venus_inst *inst)
if (!IS_V6(inst->core))
return 0;
+ if (inst->opb_fmt == HFI_COLOR_FORMAT_NV12_UBWC)
+ return 0;
+
pconstraint.buffer_type = HFI_BUFFER_OUTPUT2;
pconstraint.num_planes = 2;
pconstraint.plane_format[0].stride_multiples = 128;