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

Commit d8a23099 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: Lower priority of log messages"

parents d3b82700 7bdee1c1

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

+4 −4
Original line number Diff line number Diff line
@@ -858,8 +858,8 @@ static void hfi_process_session_prop_info(msm_vidc_callback callback, 
		callback(SESSION_PROPERTY_INFO, &cmd_done);

		break;

	default:

		dprintk(VIDC_ERR,

				"hal_process_session_prop_info: unknown_prop_id: %d\n",

		dprintk(VIDC_DBG,

				"hal_process_session_prop_info: unknown_prop_id: %x\n",

				pkt->rg_property_data[0]);

		break;

	}
@@ -1320,8 +1320,8 @@ static void hfi_process_sys_property_info( 
		hfi_process_sys_get_prop_image_version(pkt);

		break;

	default:

		dprintk(VIDC_ERR,

				"hfi_process_sys_property_info: unknown_prop_id: %d\n",

		dprintk(VIDC_DBG,

				"hfi_process_sys_property_info: unknown_prop_id: %x\n",

				pkt->rg_property_data[0]);

	}

}

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

+3 −3
Original line number Diff line number Diff line
@@ -1060,12 +1060,12 @@ static inline int venus_hfi_power_off(struct venus_hfi_device *device) 
	/*Temporarily enable clocks to make TZ call.*/

	rc = venus_hfi_clk_enable(device);

	if (rc) {

		dprintk(VIDC_ERR, "Failed to enable clocks before TZ call\n");

		dprintk(VIDC_WARN, "Failed to enable clocks before TZ call\n");

		return rc;

	}

	rc = venus_hfi_tzbsp_set_video_state(TZBSP_VIDEO_STATE_SUSPEND);

	if (rc) {

		dprintk(VIDC_ERR, "Failed to suspend video core %d\n", rc);

		dprintk(VIDC_WARN, "Failed to suspend video core %d\n", rc);

		venus_hfi_clk_disable(device);

		return rc;

	}
@@ -1073,7 +1073,7 @@ static inline int venus_hfi_power_off(struct venus_hfi_device *device) 
	venus_hfi_iommu_detach(device);

	rc = regulator_disable(venus_hfi_get_regulator(device, "venus"));

	if (rc) {

		dprintk(VIDC_ERR, "Failed to disable GDSC, %d\n", rc);

		dprintk(VIDC_WARN, "Failed to disable GDSC, %d\n", rc);

		return rc;

	}