Prechádzať zdrojové kódy

driver: video: disable dynamic fps detection logic for image session

Image session should run as fast as possible mode and dynamic
framerate detection is not applicable for image session. So
added change to disable that feature for image decode session.

Change-Id: Ifcfeb24d1f70009ba48e9ade77bd765c1b0e8fd7
Signed-off-by: Govindaraj Rajagopal <[email protected]>
Govindaraj Rajagopal 4 rokov pred
rodič
commit
48dff0980d

+ 6 - 10
driver/variant/iris2/src/msm_vidc_iris2.c

@@ -471,8 +471,7 @@ static int __power_off_iris2_hardware(struct msm_vidc_core *core)
 		} while (count < max_count);
 
 		if (count == max_count)
-			d_vpr_e(
-				"%s: VCODEC_SS_IDLE_STATUSn (%d) is not idle (%#x)\n",
+			d_vpr_h("%s: VCODEC_SS_IDLE_STATUSn (%d) is not idle (%#x)\n",
 				__func__, i, value);
 	}
 
@@ -490,8 +489,7 @@ static int __power_off_iris2_hardware(struct msm_vidc_core *core)
 		count++;
 	} while (count < max_count);
 	if (count == max_count)
-		d_vpr_e("%s: AON_WRAPPER_MVP_NOC_RESET assert failed\n",
-			__func__);
+		d_vpr_h("%s: AON_WRAPPER_MVP_NOC_RESET assert failed\n", __func__);
 
 	/* De-assert partial reset on MSF interface and wait for ACK */
 	rc = __write_register(core, AON_WRAPPER_MVP_NOC_RESET_REQ, 0x0);
@@ -507,8 +505,7 @@ static int __power_off_iris2_hardware(struct msm_vidc_core *core)
 		count++;
 	} while (count < max_count);
 	if (count == max_count)
-		d_vpr_e("%s: AON_WRAPPER_MVP_NOC_RESET de-assert failed\n",
-			__func__);
+		d_vpr_h("%s: AON_WRAPPER_MVP_NOC_RESET de-assert failed\n", __func__);
 
 	/*
 	 * Reset both sides of 2 ahb2ahb_bridges (TZ and non-TZ)
@@ -569,8 +566,7 @@ static int __power_off_iris2_controller(struct msm_vidc_core *core)
 		count++;
 	} while (count < max_count);
 	if (count == max_count)
-		d_vpr_e("%s: AON_WRAPPER_MVP_NOC_LPI_CONTROL failed\n",
-			__func__);
+		d_vpr_h("%s: AON_WRAPPER_MVP_NOC_LPI_CONTROL failed\n", __func__);
 
 	/* Set Debug bridge Low power */
 	rc = __write_register(core, WRAPPER_DEBUG_BRIDGE_LPI_CONTROL_IRIS2, 0x7);
@@ -587,7 +583,7 @@ static int __power_off_iris2_controller(struct msm_vidc_core *core)
 		count++;
 	} while (count < max_count);
 	if (count == max_count)
-		d_vpr_e("%s: debug bridge low power failed\n", __func__);
+		d_vpr_h("%s: debug bridge low power failed\n", __func__);
 
 	/* Debug bridge LPI release */
 	rc = __write_register(core, WRAPPER_DEBUG_BRIDGE_LPI_CONTROL_IRIS2, 0x0);
@@ -605,7 +601,7 @@ static int __power_off_iris2_controller(struct msm_vidc_core *core)
 		count++;
 	} while (count < max_count);
 	if (count == max_count)
-		d_vpr_e("%s: debug bridge release failed\n", __func__);
+		d_vpr_h("%s: debug bridge release failed\n", __func__);
 
 	/* power down process */
 	rc = __disable_regulator_iris2(core, "iris-ctl");

+ 1 - 1
driver/vidc/src/venus_hfi_response.c

@@ -842,7 +842,7 @@ static int handle_output_buffer(struct msm_vidc_inst *inst,
 		inst->power.fw_cr = inst->hfi_frame_info.cr;
 	}
 
-	if (is_decode_session(inst) && buf->data_size)
+	if (!is_image_session(inst) && is_decode_session(inst) && buf->data_size)
 		msm_vidc_update_timestamp(inst, buf->timestamp);
 
 	print_vidc_buffer(VIDC_HIGH, "high", "dqbuf", inst, buf);