Merge "msm: vidc: Amend DCVS condition"

diff --cc drivers/media/platform/msm/vidc/msm_vdec.c
Simple merge

diff --cc drivers/media/platform/msm/vidc/msm_venc.c
Simple merge

diff --cc drivers/media/platform/msm/vidc/msm_vidc_common.c
index 10dcc30,595a2ae..566441e
--- 1/drivers/media/platform/msm/vidc/msm_vidc_common.c
--- 2/drivers/media/platform/msm/vidc/msm_vidc_common.c
+++ b/drivers/media/platform/msm/vidc/msm_vidc_common.c
@@@ -1231,16 -1227,16 +1231,14 @@@ static void handle_event_change(enum ha
                inst->in_reconfig = true;
        } else {
                dprintk(VIDC_DBG, "V4L2_EVENT_SEQ_CHANGED_SUFFICIENT\n");
 -                      dprintk(VIDC_DBG,
 -                                      "event_notify->height = %d event_notify->width = %d\n",
 -                                      event_notify->height,
 -                                      event_notify->width);
 -                      inst->prop.height[CAPTURE_PORT] = event_notify->height;
 -                      inst->prop.width[CAPTURE_PORT] = event_notify->width;
 -                      inst->prop.height[OUTPUT_PORT] = event_notify->height;
 -                      inst->prop.width[OUTPUT_PORT] = event_notify->width;
 +              dprintk(VIDC_DBG,
 +                      "event_notify->height = %d event_notify->width = %d\n",
 +                      event_notify->height,
 +                      event_notify->width);
 +              inst->prop.height[OUTPUT_PORT] = event_notify->height;
 +              inst->prop.width[OUTPUT_PORT] = event_notify->width;
        }
  
-       inst->seqchanged_count++;
- 
        if (inst->session_type == MSM_VIDC_DECODER)
                msm_dcvs_init_load(inst);