Merge "msm: vidc: Remove session property for use sys cache" into msm-4.9 (05accea0) · Commits · e / devices / android_kernel_fairphone_FP3

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

+0 −8

Original line number	Diff line number	Diff line
		@@ -1863,14 +1863,6 @@ int create_pkt_cmd_session_set_property(
		pkt->size += sizeof(u32) + sizeof(*work_mode);
		break;
		}
		case HAL_PARAM_USE_SYS_CACHE:
		{
		create_pkt_enable(pkt->rg_property_data,
		HFI_PROPERTY_PARAM_USE_SYS_CACHE,
		(((struct hal_enable *) pdata)->enable));
		pkt->size += sizeof(u32) * 2;
		break;
		}
		/* FOLLOWING PROPERTIES ARE NOT IMPLEMENTED IN CORE YET */
		case HAL_CONFIG_BUFFER_REQUIREMENTS:
		case HAL_CONFIG_PRIORITY:

+11 −4

Original line number	Diff line number	Diff line
		@@ -94,10 +94,17 @@ static int get_device_address(struct smem_client *smem_client,
		trace_msm_smem_buffer_iommu_op_start("MAP", 0, 0,
		align, iova, buffer_size);

		/* Map a scatterlist into an SMMU with system cacheability */
		/* Map a scatterlist into SMMU */
		if (smem_client->res->sys_cache_present) {
		/* with sys cache attribute & delayed unmap */
		rc = msm_dma_map_sg_attrs(cb->dev, table->sgl,
		table->nents, DMA_BIDIRECTIONAL,
		buf, DMA_ATTR_IOMMU_USE_UPSTREAM_HINT);
		} else {
		/* with delayed unmap */
		rc = msm_dma_map_sg_lazy(cb->dev, table->sgl,
		table->nents, DMA_BIDIRECTIONAL, buf);
		}

		if (rc != table->nents) {
		dprintk(VIDC_ERR,

+0 −2

Original line number	Diff line number	Diff line
		@@ -1447,8 +1447,6 @@ static inline int start_streaming(struct msm_vidc_inst *inst)
		}
		}

		msm_comm_set_use_sys_cache(inst);

		/*
		* For seq_changed_insufficient, driver should set session_continue
		* to firmware after the following sequence

+0 −37

Original line number	Diff line number	Diff line
		@@ -5636,40 +5636,3 @@ u32 get_frame_size_tp10_ubwc(int plane, u32 height, u32 width)
		return VENUS_BUFFER_SIZE(COLOR_FMT_NV12_BPP10_UBWC, width, height);
		}

		void msm_comm_set_use_sys_cache(struct msm_vidc_inst *inst)
		{
		struct hal_enable syscache_use;
		int rc = 0;


		if (!inst->core->resources.sys_cache_enabled)
		goto exit;

		syscache_use.enable = false;
		inst->clk_data.use_sys_cache = false;

		if (inst->flags & VIDC_REALTIME)
		syscache_use.enable = true;

		if (inst->flags & VIDC_THUMBNAIL)
		syscache_use.enable = false;

		dprintk(VIDC_DBG,
		"set_use_sys_cache: enable = %d inst = %pK flags =%d\n",
		syscache_use.enable, inst, inst->flags);
		rc = msm_comm_try_set_prop(inst, HAL_PARAM_USE_SYS_CACHE,
		&syscache_use);
		if (rc) {
		dprintk(VIDC_ERR, "set_use_sys_cache: failed!!\n");
		inst->clk_data.use_sys_cache = false;
		goto exit;
		}

		inst->clk_data.use_sys_cache = syscache_use.enable;

		return;

		exit:
		return;
		}

+0 −1