Merge "msm: vidc: Free VMEM if core goes in to bad state" (c48ecc94) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/media/platform/msm/vidc/venus_hfi.c

+6 −11

Original line number	Diff line number	Diff line
		@@ -1208,10 +1208,8 @@ static int __unset_free_imem(struct venus_hfi_device *device)
		return 0;

		rc = __unset_imem(device);
		if (rc) {
		if (rc)
		dprintk(VIDC_WARN, "Failed to unset imem: %d\n", rc);
		goto unset_failed;
		}

		rc = __free_imem(device);
		if (rc) {
		@@ -1219,7 +1217,6 @@ static int __unset_free_imem(struct venus_hfi_device *device)
		goto free_failed;
		}

		unset_failed:
		free_failed:
		return rc;
		}
		@@ -2328,13 +2325,11 @@ static int __core_release(struct venus_hfi_device *device)
		return -EIO;
		}

		if (device->state != VENUS_STATE_DEINIT) {
		rc = __unset_free_imem(device);
		if (rc)
		dprintk(VIDC_ERR,
		"Failed to unset and free imem in core release: %d\n",
		rc);
		}

		if (!(device->intr_status & VIDC_WRAPPER_INTR_STATUS_A2HWD_BMSK))
		disable_irq_nosync(device->hal_data->irq);