Merge "msm: vidc: Fix bus unvoting issue" (97ba284a) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/media/platform/msm/vidc/governors/msm_vidc_dyn_gov.c

+1 −5

Original line number	Diff line number	Diff line
		@@ -846,10 +846,6 @@ static int __get_target_freq(struct devfreq dev, unsigned long freq)
		if (!dev \|\| !freq)
		return -EINVAL;

		/* Start with highest frequecy and decide correct one later*/

		ab_kbps = INT_MAX;

		gov = container_of(dev->governor,
		struct governor, devfreq_gov);
		dev->profile->get_dev_status(dev->dev.parent, &stats);
		@@ -860,11 +856,11 @@ static int __get_target_freq(struct devfreq dev, unsigned long freq)

		for (c = 0; c < vidc_data->data_count; ++c) {
		if (vidc_data->data->power_mode == VIDC_POWER_TURBO) {
		ab_kbps = INT_MAX;
		goto exit;
		}
		}

		ab_kbps = 0;
		for (c = 0; c < vidc_data->data_count; ++c)
		ab_kbps += __calculate(&vidc_data->data[c], gov->mode);

+8 −1

Original line number	Diff line number	Diff line
		@@ -1681,9 +1681,16 @@ static int venus_hfi_core_init(void *device)
		}

		dev = device;
		mutex_lock(&dev->lock);

		dprintk(VIDC_DBG, "Core initializing\n");

		mutex_lock(&dev->lock);

		dev->bus_vote.data =
		kzalloc(sizeof(struct vidc_bus_vote_data), GFP_KERNEL);
		dev->bus_vote.data_count = 1;
		dev->bus_vote.data->power_mode = VIDC_POWER_TURBO;

		rc = __load_fw(dev);
		if (rc) {
		dprintk(VIDC_ERR, "Failed to load Venus FW\n");