Merge "video: msm: wfd: Enable logs useful for debugging" into msm-3.0
diff --git a/drivers/media/video/msm/wfd/wfd-ioctl.c b/drivers/media/video/msm/wfd/wfd-ioctl.c
index e38bb80..fd6e6e7 100644
--- a/drivers/media/video/msm/wfd/wfd-ioctl.c
+++ b/drivers/media/video/msm/wfd/wfd-ioctl.c
@@ -388,6 +388,8 @@
struct wfd_inst *inst = (struct wfd_inst *)priv_data->private_data;
int rc = 0;
+ WFD_MSG_ERR("Stream on called\n");
+ WFD_MSG_DBG("enc start\n");
rc = v4l2_subdev_call(&wfd_dev->enc_sdev, core, ioctl,
ENCODE_START, (void *)inst->venc_inst);
if (rc) {
@@ -395,6 +397,7 @@
goto subdev_start_fail;
}
+ WFD_MSG_DBG("vsg start\n");
rc = v4l2_subdev_call(&wfd_dev->vsg_sdev, core, ioctl,
VSG_START, NULL);
if (rc) {
@@ -408,6 +411,7 @@
rc = PTR_ERR(inst->mdp_task);
goto subdev_start_fail;
}
+ WFD_MSG_DBG("mdp start\n");
rc = v4l2_subdev_call(&wfd_dev->mdp_sdev, core, ioctl,
MDP_START, (void *)inst->mdp_inst);
if (rc)
@@ -423,17 +427,20 @@
(struct wfd_device *)video_drvdata(priv_data);
struct wfd_inst *inst = (struct wfd_inst *)priv_data->private_data;
int rc = 0;
+ WFD_MSG_DBG("mdp stop\n");
rc = v4l2_subdev_call(&wfd_dev->mdp_sdev, core, ioctl,
MDP_STOP, (void *)inst->mdp_inst);
if (rc)
WFD_MSG_ERR("Failed to stop MDP\n");
+ WFD_MSG_DBG("vsg stop\n");
rc = v4l2_subdev_call(&wfd_dev->vsg_sdev, core, ioctl,
VSG_STOP, NULL);
if (rc)
WFD_MSG_ERR("Failed to stop VSG\n");
kthread_stop(inst->mdp_task);
+ WFD_MSG_DBG("enc stop\n");
rc = v4l2_subdev_call(&wfd_dev->enc_sdev, core, ioctl,
ENCODE_STOP, (void *)inst->venc_inst);
if (rc)
diff --git a/drivers/media/video/msm/wfd/wfd-util.h b/drivers/media/video/msm/wfd/wfd-util.h
index 3fe03e6..06dbffa 100644
--- a/drivers/media/video/msm/wfd/wfd-util.h
+++ b/drivers/media/video/msm/wfd/wfd-util.h
@@ -20,12 +20,11 @@
#ifdef DEBUG_WFD
#define WFD_MSG_INFO(fmt...) pr_info(WFD_TAG fmt)
#define WFD_MSG_WARN(fmt...) pr_warning(WFD_TAG fmt)
- #define WFD_MSG_DBG(fmt...) pr_debug(WFD_TAG fmt)
#else
#define WFD_MSG_INFO(fmt...)
#define WFD_MSG_WARN(fmt...)
- #define WFD_MSG_DBG(fmt...)
#endif
#define WFD_MSG_ERR(fmt...) pr_err(KERN_ERR WFD_TAG fmt)
#define WFD_MSG_CRIT(fmt...) pr_crit(KERN_CRIT WFD_TAG fmt)
+ #define WFD_MSG_DBG(fmt...) pr_debug(WFD_TAG fmt)
#endif