Merge "msm: vidc: Print secure info for a session"

This commit is contained in:
Linux Build Service Account 2016-11-08 11:18:27 -08:00 committed by Gerrit - the friendly Code Review server
commit 7ae255717a

View file

@ -5286,24 +5286,28 @@ void msm_comm_print_inst_info(struct msm_vidc_inst *inst)
int i = 0;
bool is_decode = false;
enum vidc_ports port;
bool is_secure = false;
if (!inst) {
dprintk(VIDC_ERR, "%s - invalid param %p\n",
dprintk(VIDC_ERR, "%s - invalid param %pK\n",
__func__, inst);
return;
}
is_decode = inst->session_type == MSM_VIDC_DECODER;
port = is_decode ? OUTPUT_PORT : CAPTURE_PORT;
is_secure = inst->flags & VIDC_SECURE;
dprintk(VIDC_ERR,
"%s session, Codec type: %s HxW: %d x %d fps: %d bitrate: %d bit-depth: %s\n",
is_decode ? "Decode" : "Encode", inst->fmts[port].name,
"%s session, %s, Codec type: %s HxW: %d x %d fps: %d bitrate: %d bit-depth: %s\n",
is_decode ? "Decode" : "Encode",
is_secure ? "Secure" : "Non-Secure",
inst->fmts[port].name,
inst->prop.height[port], inst->prop.width[port],
inst->prop.fps, inst->prop.bitrate,
!inst->bit_depth ? "8" : "10");
dprintk(VIDC_ERR,
"---Buffer details for inst: %p of type: %d---\n",
"---Buffer details for inst: %pK of type: %d---\n",
inst, inst->session_type);
mutex_lock(&inst->registeredbufs.lock);
dprintk(VIDC_ERR, "registered buffer list:\n");
@ -5347,7 +5351,7 @@ static void msm_comm_print_debug_info(struct msm_vidc_inst *inst)
struct msm_vidc_inst *temp = NULL;
if (!inst || !inst->core) {
dprintk(VIDC_ERR, "%s - invalid param %p %p\n",
dprintk(VIDC_ERR, "%s - invalid param %pK %pK\n",
__func__, inst, core);
return;
}