disable FB

hc

2024-01-04 1543e317f1da31b75942316931e8f491a8920811

 kernel/drivers/media/platform/qcom/venus/pm_helpers.c
..
..
@@ -304,9 +304,9 @@
304
304
 	void __iomem *ctrl;
305
305
 
306
306
 	if (session_type == VIDC_SESSION_TYPE_DEC)
307
-		ctrl = core->base + WRAPPER_VDEC_VCODEC_POWER_CONTROL;
307
+		ctrl = core->wrapper_base + WRAPPER_VDEC_VCODEC_POWER_CONTROL;
308
308
 	else
309
-		ctrl = core->base + WRAPPER_VENC_VCODEC_POWER_CONTROL;
309
+		ctrl = core->wrapper_base + WRAPPER_VENC_VCODEC_POWER_CONTROL;
310
310
 
311
311
 	if (enable)
312
312
 		writel(0, ctrl);
..
..
@@ -381,11 +381,11 @@
381
381
 	int ret;
382
382
 
383
383
 	if (coreid == VIDC_CORE_ID_1) {
384
-		ctrl = core->base + WRAPPER_VCODEC0_MMCC_POWER_CONTROL;
385
-		stat = core->base + WRAPPER_VCODEC0_MMCC_POWER_STATUS;
384
+		ctrl = core->wrapper_base + WRAPPER_VCODEC0_MMCC_POWER_CONTROL;
385
+		stat = core->wrapper_base + WRAPPER_VCODEC0_MMCC_POWER_STATUS;
386
386
 	} else {
387
-		ctrl = core->base + WRAPPER_VCODEC1_MMCC_POWER_CONTROL;
388
-		stat = core->base + WRAPPER_VCODEC1_MMCC_POWER_STATUS;
387
+		ctrl = core->wrapper_base + WRAPPER_VCODEC1_MMCC_POWER_CONTROL;
388
+		stat = core->wrapper_base + WRAPPER_VCODEC1_MMCC_POWER_STATUS;
389
389
 	}
390
390
 
391
391
 	if (enable) {
..
..
@@ -764,8 +764,8 @@
764
764
 	for (i = 0; i < res->vcodec_pmdomains_num; i++) {
765
765
 		pd = dev_pm_domain_attach_by_name(dev,
766
766
 						  res->vcodec_pmdomains[i]);
767
-		if (IS_ERR(pd))
768
-			return PTR_ERR(pd);
767
+		if (IS_ERR_OR_NULL(pd))
768
+			return PTR_ERR(pd) ? : -ENODATA;
769
769
 		core->pmdomains[i] = pd;
770
770
 	}
771
771