Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dba83a4b authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: Change kona vpu_ver to iris2"

parents 7daae67b d75e8550

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

+1 −1
Original line number Diff line number Diff line
@@ -543,7 +543,7 @@ static struct msm_vidc_platform_data kona_data = { 
	.sku_version = 0,

	.gcc_register_base = 0x10B024,//GCC_VIDEO_AXI0_CBCR,

	.gcc_register_size = 0x8,//GCC_VIDEO_AXI0_CBCR + GCC_VIDEO_AXI1_CBCR,

	.vpu_ver = VPU_VERSION_IRIS1,

	.vpu_ver = VPU_VERSION_IRIS2,

};



static struct msm_vidc_platform_data sm6150_data = {

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

+1 −2
Original line number Diff line number Diff line
@@ -656,7 +656,6 @@ static int msm_vidc_load_clock_table( 
		if (clock_props[c] & CLOCK_PROP_HAS_SCALING) {

			vc->has_scaling = true;

		} else {

			vc->count = 0;

			vc->has_scaling = false;

		}
@@ -666,7 +665,7 @@ static int msm_vidc_load_clock_table( 
			vc->has_mem_retention = false;



		dprintk(VIDC_DBG, "Found clock %s: scale-able = %s\n", vc->name,

			vc->count ? "yes" : "no");

			vc->has_scaling ? "yes" : "no");

	}

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

+4 −3
Original line number Diff line number Diff line
@@ -877,7 +877,7 @@ static void __write_register(struct venus_hfi_device *device, 
	}



	base_addr = device->hal_data->register_base;

	dprintk(VIDC_DBG, "Base addr: %pK, written to: %#x, Value: %#x...\n",

	dprintk(VIDC_DBG, "Base addr: %pK, writing to: %#x, Value: %#x...\n",

		base_addr, hwiosymaddr, value);

	base_addr += hwiosymaddr;

	writel_relaxed(value, base_addr);
@@ -904,7 +904,7 @@ static void __write_gcc_register(struct venus_hfi_device *device, 
	}



	base_addr = device->hal_data->gcc_reg_base;

	dprintk(VIDC_DBG, "GCC Base addr: %pK, written to: %#x, Value: %#x.\n",

	dprintk(VIDC_DBG, "GCC Base addr: %pK, writing to: %#x, Value: %#x.\n",

		base_addr, hwiosymaddr, value);

	base_addr += hwiosymaddr;

	writel_relaxed(value, base_addr);
@@ -4013,6 +4013,7 @@ static int __init_bus(struct venus_hfi_device *device) 
			.target = __devfreq_target,

			.get_dev_status = __devfreq_get_status,

			.exit = NULL,

			/*.get_cur_greq = NULL,*/

		};



		if (!strcmp(bus->governor, "msm-vidc-llcc")) {
@@ -4025,7 +4026,7 @@ static int __init_bus(struct venus_hfi_device *device) 
		}



		/*

		 * This is stupid, but there's no other easy way to ahold

		 * This is stupid, but there's no other easy way to get a hold

		 * of struct bus_info in venus_hfi_devfreq_*()

		 */

		WARN(dev_get_drvdata(bus->dev), "%s's drvdata already set\n",