diff options
| author | Dhaval Patel <pdhaval@codeaurora.org> | 2014-07-11 15:09:12 -0700 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-23 20:31:51 -0700 |
| commit | 5f1c60463e9ebe458eb100a7b8f0b129c524bc59 (patch) | |
| tree | f34ec9f5eff367a9d53ae1b1551fe5c899242fb9 /drivers | |
| parent | 3aa9b00988173d2b9a40e734404e90bb114165a6 (diff) | |
msm: mdss: add new line character at the end of log message
Add new line character at the ned of the log message
to avoid printing multiple messages on same line.
Change-Id: I7f7127d28c089ae0add172e42295a9d4cfce9297
Signed-off-by: Dhaval Patel <pdhaval@codeaurora.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_dsi.c | 18 | ||||
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_dsi_panel.c | 6 | ||||
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_fb.c | 24 | ||||
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_mdp.c | 2 | ||||
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_mdp_ctl.c | 2 | ||||
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_mdp_intf_cmd.c | 2 | ||||
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_mdp_overlay.c | 6 | ||||
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_mdp_pipe.c | 8 | ||||
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_mdp_pp.c | 157 |
9 files changed, 113 insertions, 112 deletions
diff --git a/drivers/video/fbdev/msm/mdss_dsi.c b/drivers/video/fbdev/msm/mdss_dsi.c index 0617b6d3000e..cc0a5acd0371 100644 --- a/drivers/video/fbdev/msm/mdss_dsi.c +++ b/drivers/video/fbdev/msm/mdss_dsi.c @@ -1424,25 +1424,25 @@ int mdss_dsi_retrieve_ctrl_resources(struct platform_device *pdev, int mode, if (index == 0) { if (mode != DISPLAY_1) { - pr_err("%s:%d Panel->Ctrl mapping is wrong", + pr_err("%s:%d Panel->Ctrl mapping is wrong\n", __func__, __LINE__); return -EPERM; } } else if (index == 1) { if (mode != DISPLAY_2) { - pr_err("%s:%d Panel->Ctrl mapping is wrong", + pr_err("%s:%d Panel->Ctrl mapping is wrong\n", __func__, __LINE__); return -EPERM; } } else { - pr_err("%s:%d Unknown Ctrl mapped to panel", + pr_err("%s:%d Unknown Ctrl mapped to panel\n", __func__, __LINE__); return -EPERM; } rc = msm_dss_ioremap_byname(pdev, &ctrl->ctrl_io, "dsi_ctrl"); if (rc) { - pr_err("%s:%d unable to remap dsi ctrl resources", + pr_err("%s:%d unable to remap dsi ctrl resources\n", __func__, __LINE__); return rc; } @@ -1452,7 +1452,7 @@ int mdss_dsi_retrieve_ctrl_resources(struct platform_device *pdev, int mode, rc = msm_dss_ioremap_byname(pdev, &ctrl->phy_io, "dsi_phy"); if (rc) { - pr_err("%s:%d unable to remap dsi phy resources", + pr_err("%s:%d unable to remap dsi phy resources\n", __func__, __LINE__); return rc; } @@ -1513,7 +1513,7 @@ int dsi_panel_device_register(struct device_node *pan_node, data = of_get_property(ctrl_pdev->dev.of_node, "qcom,platform-strength-ctrl", &len); if ((!data) || (len != 2)) { - pr_err("%s:%d, Unable to read Phy Strength ctrl settings", + pr_err("%s:%d, Unable to read Phy Strength ctrl settings\n", __func__, __LINE__); return -EINVAL; } @@ -1526,7 +1526,7 @@ int dsi_panel_device_register(struct device_node *pan_node, data = of_get_property(ctrl_pdev->dev.of_node, "qcom,platform-regulator-settings", &len); if ((!data) || (len != 7)) { - pr_err("%s:%d, Unable to read Phy regulator settings", + pr_err("%s:%d, Unable to read Phy regulator settings\n", __func__, __LINE__); return -EINVAL; } @@ -1538,7 +1538,7 @@ int dsi_panel_device_register(struct device_node *pan_node, data = of_get_property(ctrl_pdev->dev.of_node, "qcom,platform-bist-ctrl", &len); if ((!data) || (len != 6)) { - pr_err("%s:%d, Unable to read Phy Bist Ctrl settings", + pr_err("%s:%d, Unable to read Phy Bist Ctrl settings\n", __func__, __LINE__); return -EINVAL; } @@ -1550,7 +1550,7 @@ int dsi_panel_device_register(struct device_node *pan_node, data = of_get_property(ctrl_pdev->dev.of_node, "qcom,platform-lane-config", &len); if ((!data) || (len != 45)) { - pr_err("%s:%d, Unable to read Phy lane configure settings", + pr_err("%s:%d, Unable to read Phy lane configure settings\n", __func__, __LINE__); return -EINVAL; } diff --git a/drivers/video/fbdev/msm/mdss_dsi_panel.c b/drivers/video/fbdev/msm/mdss_dsi_panel.c index 2a3d7646d315..5aea4accef56 100644 --- a/drivers/video/fbdev/msm/mdss_dsi_panel.c +++ b/drivers/video/fbdev/msm/mdss_dsi_panel.c @@ -992,7 +992,7 @@ static int mdss_dsi_parse_panel_features(struct device_node *np, pinfo->ulps_feature_enabled = of_property_read_bool(np, "qcom,ulps-enabled"); - pr_info("%s: ulps feature %s", __func__, + pr_info("%s: ulps feature %s\n", __func__, (pinfo->ulps_feature_enabled ? "enabled" : "disabled")); pinfo->esd_check_enabled = of_property_read_bool(np, "qcom,esd-check-enabled"); @@ -1013,7 +1013,7 @@ static int mdss_dsi_parse_panel_features(struct device_node *np, } } - pr_info("%s: dynamic switch feature enabled: %d", __func__, + pr_info("%s: dynamic switch feature enabled: %d\n", __func__, pinfo->mipi.dynamic_switch_enabled); return 0; @@ -1414,7 +1414,7 @@ int mdss_dsi_panel_init(struct device_node *node, if (!cmd_cfg_cont_splash) pinfo->cont_splash_enabled = false; - pr_info("%s: Continuous splash %s", __func__, + pr_info("%s: Continuous splash %s\n", __func__, pinfo->cont_splash_enabled ? "enabled" : "disabled"); pinfo->dynamic_switch_pending = false; diff --git a/drivers/video/fbdev/msm/mdss_fb.c b/drivers/video/fbdev/msm/mdss_fb.c index 7d0466f7118b..f6fe99c82de6 100644 --- a/drivers/video/fbdev/msm/mdss_fb.c +++ b/drivers/video/fbdev/msm/mdss_fb.c @@ -919,7 +919,7 @@ static void mdss_fb_scale_bl(struct msm_fb_data_type *mfd, u32 *bl_lvl) { u32 temp = *bl_lvl; - pr_debug("input = %d, scale = %d", temp, mfd->bl_scale); + pr_debug("input = %d, scale = %d\n", temp, mfd->bl_scale); if (temp >= mfd->bl_min_lvl) { if (temp > mfd->panel_info->bl_max) { pr_warn("%s: invalid bl level\n", @@ -941,7 +941,7 @@ static void mdss_fb_scale_bl(struct msm_fb_data_type *mfd, u32 *bl_lvl) if (temp < mfd->bl_min_lvl) temp = mfd->bl_min_lvl; } - pr_debug("output = %d", temp); + pr_debug("output = %d\n", temp); (*bl_lvl) = temp; } @@ -1189,7 +1189,7 @@ int mdss_fb_alloc_fb_ion_memory(struct msm_fb_data_type *mfd, size_t fb_size) void *vaddr; if (!mfd) { - pr_err("Invalid input param - no mfd"); + pr_err("Invalid input param - no mfd\n"); return -EINVAL; } @@ -1201,7 +1201,7 @@ int mdss_fb_alloc_fb_ion_memory(struct msm_fb_data_type *mfd, size_t fb_size) } } - pr_debug("size for mmap = %zu", fb_size); + pr_debug("size for mmap = %zu\n", fb_size); mfd->fb_ion_handle = ion_alloc(mfd->fb_ion_client, fb_size, SZ_4K, ION_HEAP(ION_SYSTEM_HEAP_ID), 0); if (IS_ERR_OR_NULL(mfd->fb_ion_handle)) { @@ -1219,7 +1219,7 @@ int mdss_fb_alloc_fb_ion_memory(struct msm_fb_data_type *mfd, size_t fb_size) goto fb_mmap_failed; } } else { - pr_err("No IOMMU Domain"); + pr_err("No IOMMU Domain\n"); goto fb_mmap_failed; } @@ -1284,14 +1284,14 @@ static int mdss_fb_fbmem_ion_mmap(struct fb_info *info, req_size = vma->vm_end - vma->vm_start; fb_size = mfd->fbi->fix.smem_len; if (req_size > fb_size) { - pr_warn("requested map is greater than framebuffer"); + pr_warn("requested map is greater than framebuffer\n"); return -EOVERFLOW; } if (!mfd->fbi->screen_base) { rc = mdss_fb_alloc_fb_ion_memory(mfd, fb_size); if (rc < 0) { - pr_err("fb mmap failed!!!!"); + pr_err("fb mmap failed!!!!\n"); return rc; } } @@ -1414,7 +1414,7 @@ static int mdss_fb_mmap(struct fb_info *info, struct vm_area_struct *vma) rc = mdss_fb_physical_mmap(info, vma); if (rc < 0) - pr_err("fb mmap failed with rc = %d", rc); + pr_err("fb mmap failed with rc = %d\n", rc); return rc; } @@ -2642,7 +2642,7 @@ int mdss_fb_dcm(struct msm_fb_data_type *mfd, int req_state) int ret = 0; if (req_state == mfd->dcm_state) { - pr_warn("Already in correct DCM/DTM state"); + pr_warn("Already in correct DCM/DTM state\n"); return ret; } @@ -2783,7 +2783,7 @@ static int mdss_fb_handle_buf_sync_ioctl(struct msm_sync_pt_data *sync_pt_data, ret = copy_from_user(acq_fen_fd, buf_sync->acq_fen_fd, buf_sync->acq_fen_fd_cnt * sizeof(int)); if (ret) { - pr_err("%s: copy_from_user failed", sync_pt_data->fence_name); + pr_err("%s: copy_from_user failed\n", sync_pt_data->fence_name); return ret; } @@ -2906,7 +2906,7 @@ static int mdss_fb_display_commit(struct fb_info *info, ret = copy_from_user(&disp_commit, argp, sizeof(disp_commit)); if (ret) { - pr_err("%s:copy_from_user failed", __func__); + pr_err("%s:copy_from_user failed\n", __func__); return ret; } ret = mdss_fb_pan_display_ex(info, &disp_commit); @@ -3150,7 +3150,7 @@ EXPORT_SYMBOL(mdss_register_panel); int mdss_fb_register_mdp_instance(struct msm_mdp_interface *mdp) { if (mdp_instance) { - pr_err("multiple MDP instance registration"); + pr_err("multiple MDP instance registration\n"); return -EINVAL; } diff --git a/drivers/video/fbdev/msm/mdss_mdp.c b/drivers/video/fbdev/msm/mdss_mdp.c index 8ccc8ad8f749..56473b29f41a 100644 --- a/drivers/video/fbdev/msm/mdss_mdp.c +++ b/drivers/video/fbdev/msm/mdss_mdp.c @@ -1836,7 +1836,7 @@ static int mdss_mdp_parse_dt_pipe(struct platform_device *pdev) nxids += mdss_mdp_parse_dt_prop_len(pdev, "qcom,mdss-pipe-rgb-xin-id"); nxids += mdss_mdp_parse_dt_prop_len(pdev, "qcom,mdss-pipe-dma-xin-id"); if (npipes != nxids) { - pr_err("device tree err: unequal number of pipes and xin ids"); + pr_err("device tree err: unequal number of pipes and xin ids\n"); return -EINVAL; } diff --git a/drivers/video/fbdev/msm/mdss_mdp_ctl.c b/drivers/video/fbdev/msm/mdss_mdp_ctl.c index 9b0d05a17df8..2165de85f376 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_ctl.c +++ b/drivers/video/fbdev/msm/mdss_mdp_ctl.c @@ -1764,7 +1764,7 @@ struct mdss_mdp_ctl *mdss_mdp_ctl_init(struct mdss_panel_data *pdata, ctl->start_fnc = mdss_mdp_video_start; ret = mdss_mdp_limited_lut_igc_config(ctl); if (ret) - pr_err("Unable to config IGC LUT data"); + pr_err("Unable to config IGC LUT data\n"); break; case WRITEBACK_PANEL: ctl->intf_num = MDSS_MDP_NO_INTF; diff --git a/drivers/video/fbdev/msm/mdss_mdp_intf_cmd.c b/drivers/video/fbdev/msm/mdss_mdp_intf_cmd.c index cf8d72cd6ef0..87a552590224 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_intf_cmd.c +++ b/drivers/video/fbdev/msm/mdss_mdp_intf_cmd.c @@ -145,7 +145,7 @@ static int mdss_mdp_cmd_tearcheck_cfg(struct mdss_mdp_ctl *ctl, cfg |= vclks_line; - pr_debug("%s: yres=%d vclks=%x height=%d init=%d rd=%d start=%d ", + pr_debug("%s: yres=%d vclks=%x height=%d init=%d rd=%d start=%d\n", __func__, pinfo->yres, vclks_line, te->sync_cfg_height, te->vsync_init_val, te->rd_ptr_irq, te->start_pos); pr_debug("thrd_start =%d thrd_cont=%d\n", diff --git a/drivers/video/fbdev/msm/mdss_mdp_overlay.c b/drivers/video/fbdev/msm/mdss_mdp_overlay.c index a0a4bd53e9f9..6ca459c0341d 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_overlay.c +++ b/drivers/video/fbdev/msm/mdss_mdp_overlay.c @@ -947,7 +947,7 @@ int mdss_mdp_overlay_get_buf(struct msm_fb_data_type *mfd, rc = mdss_iommu_ctrl(1); if (IS_ERR_VALUE(rc)) { - pr_err("Iommu attach failed"); + pr_err("Iommu attach failed\n"); goto end; } @@ -977,7 +977,7 @@ int mdss_mdp_overlay_free_buf(struct mdss_mdp_data *data) rc = mdss_iommu_ctrl(1); if (IS_ERR_VALUE(rc)) { - pr_err("Iommu attach failed"); + pr_err("Iommu attach failed\n"); return rc; } @@ -2129,7 +2129,7 @@ static ssize_t mdss_mdp_vsync_show_event(struct device *dev, vsync_ticks = ktime_to_ns(mdp5_data->vsync_time); - pr_debug("fb%d vsync=%llu", mfd->index, vsync_ticks); + pr_debug("fb%d vsync=%llu\n", mfd->index, vsync_ticks); ret = scnprintf(buf, PAGE_SIZE, "VSYNC=%llu\n", vsync_ticks); return ret; diff --git a/drivers/video/fbdev/msm/mdss_mdp_pipe.c b/drivers/video/fbdev/msm/mdss_mdp_pipe.c index 83b4da5bb39a..8a16e1983e80 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_pipe.c +++ b/drivers/video/fbdev/msm/mdss_mdp_pipe.c @@ -492,7 +492,7 @@ int mdss_mdp_smp_handoff(struct mdss_data_type *mdata) * such cases, we do not need to do anything * here. */ - pr_debug("smp mmb %d already assigned to pipe %d (client_id %d)" + pr_debug("smp mmb %d already assigned to pipe %d (client_id %d)\n" , i, pipe->num, client_id); continue; } @@ -511,7 +511,7 @@ int mdss_mdp_smp_handoff(struct mdss_data_type *mdata) } if (!pipe->is_handed_off) { - pr_warn("SMP MMB %d assigned to a pipe not marked for handoff (client id %d)" + pr_warn("SMP MMB %d assigned to a pipe not marked for handoff (client id %d)\n" , i, client_id); continue; } @@ -534,7 +534,7 @@ void mdss_mdp_pipe_unmap(struct mdss_mdp_pipe *pipe) { if (kref_put_mutex(&pipe->kref, mdss_mdp_pipe_free, &mdss_mdp_sspp_lock)) { - WARN(1, "Unexpected free pipe during unmap"); + WARN(1, "Unexpected free pipe during unmap\n"); mutex_unlock(&mdss_mdp_sspp_lock); } } @@ -1483,7 +1483,7 @@ int mdss_mdp_pipe_queue_data(struct mdss_mdp_pipe *pipe, } if (src_data == NULL || !pipe->has_buf) { - pr_debug("src_data=%p has_buf=%d pipe num=%dx", + pr_debug("src_data=%p has_buf=%d pipe num=%dx\n", src_data, pipe->has_buf, pipe->num); goto update_nobuf; } diff --git a/drivers/video/fbdev/msm/mdss_mdp_pp.c b/drivers/video/fbdev/msm/mdss_mdp_pp.c index bb27186219df..23310e0d2dc4 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_pp.c +++ b/drivers/video/fbdev/msm/mdss_mdp_pp.c @@ -1072,7 +1072,7 @@ static int mdss_mdp_scale_setup(struct mdss_mdp_pipe *pipe) pr_debug("scale y - src_h=%d dst_h=%d\n", src_h, pipe->dst.h); if ((src_h / MAX_DOWNSCALE_RATIO) > pipe->dst.h) { - pr_err("too much downscaling height=%d->%d", + pr_err("too much downscaling height=%d->%d\n", src_h, pipe->dst.h); return -EINVAL; } @@ -1128,7 +1128,7 @@ static int mdss_mdp_scale_setup(struct mdss_mdp_pipe *pipe) pr_debug("scale x - src_w=%d dst_w=%d\n", src_w, pipe->dst.w); if ((src_w / MAX_DOWNSCALE_RATIO) > pipe->dst.w) { - pr_err("too much downscaling width=%d->%d", + pr_err("too much downscaling width=%d->%d\n", src_w, pipe->dst.w); return -EINVAL; } @@ -1384,7 +1384,7 @@ static char __iomem *mdss_mdp_get_mixer_addr_off(u32 dspp_num) mdata = mdss_mdp_get_mdata(); if (mdata->nmixers_intf <= dspp_num) { - pr_err("Invalid dspp_num=%d", dspp_num); + pr_err("Invalid dspp_num=%d\n", dspp_num); return ERR_PTR(-EINVAL); } mixer = mdata->mixer_intf + dspp_num; @@ -1398,7 +1398,7 @@ static char __iomem *mdss_mdp_get_dspp_addr_off(u32 dspp_num) mdata = mdss_mdp_get_mdata(); if (mdata->nmixers_intf <= dspp_num) { - pr_err("Invalid dspp_num=%d", dspp_num); + pr_err("Invalid dspp_num=%d\n", dspp_num); return ERR_PTR(-EINVAL); } mixer = mdata->mixer_intf + dspp_num; @@ -1432,7 +1432,8 @@ static int pp_hist_setup(u32 *op, u32 block, struct mdss_mdp_mixer *mix) } else if (PP_LOCAT(block) == MDSS_PP_SSPP_CFG && is_hist_v1) { pipe = mdss_mdp_pipe_get(mdata, BIT(PP_BLOCK(block))); if (IS_ERR_OR_NULL(pipe)) { - pr_debug("pipe DNE (%d)", (u32) BIT(PP_BLOCK(block))); + pr_debug("pipe DNE (%d)\n", + (u32) BIT(PP_BLOCK(block))); ret = -ENODEV; goto error; } @@ -1730,7 +1731,7 @@ int mdss_mdp_pp_setup_locked(struct mdss_mdp_ctl *ctl) if (!mixer_cnt) { valid_mixers = false; ret = -EINVAL; - pr_warn("Configuring post processing without mixers, err = %d", + pr_warn("Configuring post processing without mixers, err = %d\n", ret); goto exit; } @@ -1749,7 +1750,7 @@ int mdss_mdp_pp_setup_locked(struct mdss_mdp_ctl *ctl) valid_ad_panel) { ret = mdss_mdp_ad_setup(ctl->mfd); if (ret < 0) - pr_warn("ad_setup(disp%d) returns %d", disp_num, ret); + pr_warn("ad_setup(disp%d) returns %d\n", disp_num, ret); } mutex_lock(&mdss_pp_mutex); @@ -1787,7 +1788,7 @@ int mdss_mdp_pp_resume(struct mdss_mdp_ctl *ctl, u32 dspp_num) return -EPERM; if (dspp_num >= mdata->nmixers_intf) { - pr_warn("invalid dspp_num"); + pr_warn("invalid dspp_num\n"); return -EINVAL; } disp_num = ctl->mfd->index; @@ -1906,7 +1907,7 @@ int mdss_mdp_pp_init(struct device *dev) mdss_pp_res = devm_kzalloc(dev, sizeof(*mdss_pp_res), GFP_KERNEL); if (mdss_pp_res == NULL) { - pr_err("%s mdss_pp_res allocation failed!", __func__); + pr_err("%s mdss_pp_res allocation failed!\n", __func__); ret = -ENOMEM; } else { hist = devm_kzalloc(dev, @@ -2004,7 +2005,7 @@ int mdss_mdp_pa_config(struct mdp_pa_cfg_data *config, if (config->pa_data.flags & MDP_PP_OPS_READ) { ret = pp_get_dspp_num(disp_num, &dspp_num); if (ret) { - pr_err("no dspp connects to disp %d", + pr_err("no dspp connects to disp %d\n", disp_num); goto pa_config_exit; } @@ -2057,7 +2058,7 @@ int mdss_mdp_pa_v2_config(struct mdp_pa_v2_cfg_data *config, if (config->pa_v2_data.flags & MDP_PP_OPS_READ) { ret = pp_get_dspp_num(disp_num, &dspp_num); if (ret) { - pr_err("no dspp connects to disp %d", + pr_err("no dspp connects to disp %d\n", disp_num); goto pa_config_exit; } @@ -2351,7 +2352,7 @@ int mdss_mdp_pcc_config(struct mdp_pcc_cfg_data *config, if (config->ops & MDP_PP_OPS_READ) { ret = pp_get_dspp_num(disp_num, &dspp_num); if (ret) { - pr_err("%s, no dspp connects to disp %d", + pr_err("%s, no dspp connects to disp %d\n", __func__, disp_num); goto pcc_config_exit; } @@ -2503,7 +2504,7 @@ int mdss_mdp_igc_lut_config(struct mdp_igc_lut_data *config, if (config->ops & MDP_PP_OPS_READ) { ret = pp_get_dspp_num(disp_num, &dspp_num); if (ret) { - pr_err("%s, no dspp connects to disp %d", + pr_err("%s, no dspp connects to disp %d\n", __func__, disp_num); goto igc_config_exit; } @@ -2745,7 +2746,7 @@ int mdss_mdp_argc_config(struct mdp_pgc_lut_data *config, disp_num = PP_BLOCK(config->block) - MDP_LOGICAL_BLOCK_DISP_0; ret = pp_get_dspp_num(disp_num, &dspp_num); if (ret) { - pr_err("%s, no dspp connects to disp %d", __func__, disp_num); + pr_err("%s, no dspp connects to disp %d\n", __func__, disp_num); goto argc_config_exit; } @@ -2820,7 +2821,7 @@ int mdss_mdp_argc_config(struct mdp_pgc_lut_data *config, g_size == 0 || b_size == 0) { ret = -EINVAL; - pr_warn("%s, number of rgb stages invalid", + pr_warn("%s, number of rgb stages invalid\n", __func__); goto argc_config_exit; } @@ -2869,7 +2870,7 @@ int mdss_mdp_hist_lut_config(struct mdp_hist_lut_data *config, if (config->ops & MDP_PP_OPS_READ) { ret = pp_get_dspp_num(disp_num, &dspp_num); if (ret) { - pr_err("%s, no dspp connects to disp %d", + pr_err("%s, no dspp connects to disp %d\n", __func__, disp_num); goto enhist_config_exit; } @@ -2983,7 +2984,7 @@ int mdss_mdp_gamut_config(struct mdp_gamut_cfg_data *config, if (config->flags & MDP_PP_OPS_READ) { ret = pp_get_dspp_num(disp_num, &dspp_num); if (ret) { - pr_err("%s, no dspp connects to disp %d", + pr_err("%s, no dspp connects to disp %d\n", __func__, disp_num); goto gamut_config_exit; } @@ -3134,7 +3135,7 @@ static int pp_hist_enable(struct pp_hist_col_info *hist_info, spin_lock_irqsave(&hist_info->hist_lock, flag); if (hist_info->col_en) { spin_unlock_irqrestore(&hist_info->hist_lock, flag); - pr_info("%s Hist collection has already been enabled %p", + pr_info("%s Hist collection has already been enabled %p\n", __func__, hist_info->base); ret = -EINVAL; goto exit; @@ -3191,13 +3192,13 @@ int mdss_mdp_hist_start(struct mdp_histogram_start_req *req) mixer_cnt = mdss_mdp_get_ctl_mixers(disp_num, mixer_id); if (!mixer_cnt) { - pr_err("%s, no dspp connects to disp %d", + pr_err("%s, no dspp connects to disp %d\n", __func__, disp_num); ret = -EPERM; goto hist_exit; } if (mixer_cnt > mdata->nmixers_intf) { - pr_err("%s, Too many dspp connects to disp %d", + pr_err("%s, Too many dspp connects to disp %d\n", __func__, mixer_cnt); ret = -EPERM; goto hist_exit; @@ -3208,7 +3209,7 @@ int mdss_mdp_hist_start(struct mdp_histogram_start_req *req) if (!frame_size || ((MDSS_MAX_HIST_BIN_SIZE / frame_size) < req->frame_cnt)) { - pr_err("%s, too many frames for given display size, %d", + pr_err("%s, too many frames for given display size, %d\n", __func__, req->frame_cnt); ret = -EINVAL; goto hist_exit; @@ -3225,7 +3226,7 @@ int mdss_mdp_hist_start(struct mdp_histogram_start_req *req) i = MDSS_PP_ARG_MASK & req->block; if (!i) { ret = -EINVAL; - pr_warn("Must pass pipe arguments, %d", i); + pr_warn("Must pass pipe arguments, %d\n", i); goto hist_stop_clk; } @@ -3237,7 +3238,7 @@ int mdss_mdp_hist_start(struct mdp_histogram_start_req *req) continue; if (pipe->num > MDSS_MDP_SSPP_VIG2) { ret = -EINVAL; - pr_warn("Invalid Hist pipe (%d)", i); + pr_warn("Invalid Hist pipe (%d)\n", i); mdss_mdp_pipe_unmap(pipe); goto hist_stop_clk; } @@ -3272,7 +3273,7 @@ static int pp_hist_disable(struct pp_hist_col_info *hist_info) spin_lock_irqsave(&hist_info->hist_lock, flag); if (hist_info->col_en == false) { spin_unlock_irqrestore(&hist_info->hist_lock, flag); - pr_debug("Histogram already disabled (%p)", hist_info->base); + pr_debug("Histogram already disabled (%p)\n", hist_info->base); ret = -EINVAL; goto exit; } @@ -3314,13 +3315,13 @@ int mdss_mdp_hist_stop(u32 block) mixer_cnt = mdss_mdp_get_ctl_mixers(disp_num, mixer_id); if (!mixer_cnt) { - pr_err("%s, no dspp connects to disp %d", + pr_err("%s, no dspp connects to disp %d\n", __func__, disp_num); ret = -EPERM; goto hist_stop_exit; } if (mixer_cnt > mdata->nmixers_intf) { - pr_err("%s, Too many dspp connects to disp %d", + pr_err("%s, Too many dspp connects to disp %d\n", __func__, mixer_cnt); ret = -EPERM; goto hist_stop_exit; @@ -3329,7 +3330,7 @@ int mdss_mdp_hist_stop(u32 block) if (PP_LOCAT(block) == MDSS_PP_SSPP_CFG) { i = MDSS_PP_ARG_MASK & block; if (!i) { - pr_warn("Must pass pipe arguments, %d", i); + pr_warn("Must pass pipe arguments, %d\n", i); goto hist_stop_clk; } @@ -3338,11 +3339,11 @@ int mdss_mdp_hist_stop(u32 block) continue; pipe = mdss_mdp_pipe_get(mdata, BIT(i)); if (IS_ERR_OR_NULL(pipe)) { - pr_warn("Invalid Hist pipe (%d)", i); + pr_warn("Invalid Hist pipe (%d)\n", i); continue; } else if (pipe->num > MDSS_MDP_SSPP_VIG2) { mdss_mdp_pipe_unmap(pipe); - pr_warn("Invalid Hist pipe (%d)", i); + pr_warn("Invalid Hist pipe (%d)\n", i); continue; } hist_info = &pipe->pp_res.hist; @@ -3386,7 +3387,7 @@ int mdss_mdp_hist_intr_req(struct mdss_intr *intr, u32 bits, bool en) unsigned long flag; int ret = 0; if (!intr) { - pr_err("NULL addr passed, %p", intr); + pr_err("NULL addr passed, %p\n", intr); return -EINVAL; } @@ -3448,7 +3449,7 @@ int mdss_mdp_hist_intr_setup(struct mdss_intr *intr, int type) u32 diff, init_curr; int init_state; if (!intr) { - WARN(1, "NULL intr pointer"); + WARN(1, "NULL intr pointer\n"); return -EINVAL; } @@ -3559,17 +3560,17 @@ static int pp_hist_collect(struct mdp_histogram_data *hist, spin_lock_irqsave(&hist_info->hist_lock, flag); if (kick_ret == 0) { ret = -ENODATA; - pr_debug("histogram kickoff not done yet"); + pr_debug("histogram kickoff not done yet\n"); spin_unlock_irqrestore(&hist_info->hist_lock, flag); goto hist_collect_exit; } else if (kick_ret < 0) { ret = -EINTR; - pr_debug("histogram first kickoff interrupted"); + pr_debug("histogram first kickoff interrupted\n"); spin_unlock_irqrestore(&hist_info->hist_lock, flag); goto hist_collect_exit; } else if (wait_ret == 0) { ret = -ETIMEDOUT; - pr_debug("bin collection timedout, state %d", + pr_debug("bin collection timedout, state %d\n", hist_info->col_state); /* * When the histogram has timed out (usually @@ -3585,7 +3586,7 @@ static int pp_hist_collect(struct mdp_histogram_data *hist, hist_info->col_state = HIST_READY; } else if (wait_ret < 0) { ret = -EINTR; - pr_debug("%s: bin collection interrupted", + pr_debug("%s: bin collection interrupted\n", __func__); spin_unlock_irqrestore(&hist_info->hist_lock, flag); goto hist_collect_exit; @@ -3594,7 +3595,7 @@ static int pp_hist_collect(struct mdp_histogram_data *hist, hist_info->col_state != HIST_UNKNOWN) { ret = -ENODATA; hist_info->col_state = HIST_READY; - pr_debug("%s: state is not ready: %d", + pr_debug("%s: state is not ready: %d\n", __func__, hist_info->col_state); } } @@ -3646,13 +3647,13 @@ int mdss_mdp_hist_collect(struct mdp_histogram_data *hist) hist_cnt = mdss_mdp_get_ctl_mixers(disp_num, mixer_id); if (!hist_cnt) { - pr_err("%s, no dspp connects to disp %d", + pr_err("%s, no dspp connects to disp %d\n", __func__, disp_num); ret = -EPERM; goto hist_collect_exit; } if (hist_cnt > mdata->nmixers_intf) { - pr_err("%s, Too many dspp connects to disp %d", + pr_err("%s, Too many dspp connects to disp %d\n", __func__, hist_cnt); ret = -EPERM; goto hist_collect_exit; @@ -3696,7 +3697,7 @@ int mdss_mdp_hist_collect(struct mdp_histogram_data *hist) } if (hist->bin_cnt != HIST_V_SIZE) { - pr_err("User not expecting size %d output", + pr_err("User not expecting size %d output\n", HIST_V_SIZE); ret = -EINVAL; goto hist_collect_exit; @@ -3726,7 +3727,7 @@ int mdss_mdp_hist_collect(struct mdp_histogram_data *hist) hist_cnt = MDSS_PP_ARG_MASK & hist->block; if (!hist_cnt) { - pr_warn("Must pass pipe arguments, %d", hist_cnt); + pr_warn("Must pass pipe arguments, %d\n", hist_cnt); goto hist_collect_exit; } @@ -3740,7 +3741,7 @@ int mdss_mdp_hist_collect(struct mdp_histogram_data *hist) pipe = mdss_mdp_pipe_get(mdata, BIT(pipe_num)); if (IS_ERR_OR_NULL(pipe)) { - pr_warn("Invalid starting hist pipe, %d", pipe_num); + pr_warn("Invalid starting hist pipe, %d\n", pipe_num); ret = -ENODEV; goto hist_collect_exit; } @@ -3752,11 +3753,11 @@ int mdss_mdp_hist_collect(struct mdp_histogram_data *hist) pipe_cnt++; pipe = mdss_mdp_pipe_get(mdata, BIT(i)); if (IS_ERR_OR_NULL(pipe)) { - pr_warn("Invalid Hist pipe (%d)", i); + pr_warn("Invalid Hist pipe (%d)\n", i); continue; } else if (pipe->num > MDSS_MDP_SSPP_VIG2) { mdss_mdp_pipe_unmap(pipe); - pr_warn("Invalid Hist pipe (%d)", i); + pr_warn("Invalid Hist pipe (%d)\n", i); continue; } hist_info = &pipe->pp_res.hist; @@ -3771,11 +3772,11 @@ int mdss_mdp_hist_collect(struct mdp_histogram_data *hist) pipe_cnt++; pipe = mdss_mdp_pipe_get(mdata, BIT(i)); if (IS_ERR_OR_NULL(pipe)) { - pr_warn("Invalid Hist pipe (%d)", i); + pr_warn("Invalid Hist pipe (%d)\n", i); continue; } else if (pipe->num > MDSS_MDP_SSPP_VIG2) { mdss_mdp_pipe_unmap(pipe); - pr_warn("Invalid Hist pipe (%d)", i); + pr_warn("Invalid Hist pipe (%d)\n", i); continue; } hist_info = &pipe->pp_res.hist; @@ -3797,11 +3798,11 @@ int mdss_mdp_hist_collect(struct mdp_histogram_data *hist) pipe_cnt++; pipe = mdss_mdp_pipe_get(mdata, BIT(i)); if (IS_ERR_OR_NULL(pipe)) { - pr_warn("Invalid Hist pipe (%d)", i); + pr_warn("Invalid Hist pipe (%d)\n", i); continue; } else if (pipe->num > MDSS_MDP_SSPP_VIG2) { mdss_mdp_pipe_unmap(pipe); - pr_warn("Invalid Hist pipe (%d)", i); + pr_warn("Invalid Hist pipe (%d)\n", i); continue; } hist_info = &pipe->pp_res.hist; @@ -3818,7 +3819,7 @@ int mdss_mdp_hist_collect(struct mdp_histogram_data *hist) if (pipe_cnt != 0 && (hist->bin_cnt != (HIST_V_SIZE * pipe_cnt))) { - pr_err("User not expecting size %d output", + pr_err("User not expecting size %d output\n", pipe_cnt * HIST_V_SIZE); ret = -EINVAL; goto hist_collect_exit; @@ -3836,7 +3837,7 @@ int mdss_mdp_hist_collect(struct mdp_histogram_data *hist) continue; pipe = mdss_mdp_pipe_get(mdata, BIT(i)); if (IS_ERR_OR_NULL(pipe)) { - pr_warn("Invalid Hist pipe (%d)", i); + pr_warn("Invalid Hist pipe (%d)\n", i); continue; } hist_info = &pipe->pp_res.hist; @@ -3855,7 +3856,7 @@ int mdss_mdp_hist_collect(struct mdp_histogram_data *hist) hist_data_addr = hist_info->data; } } else { - pr_info("No Histogram at location %d", PP_LOCAT(hist->block)); + pr_info("No Histogram at location %d\n", PP_LOCAT(hist->block)); goto hist_collect_exit; } ret = copy_to_user(hist->c0, hist_data_addr, sizeof(u32) * @@ -3912,7 +3913,7 @@ static inline struct pp_hist_col_info *get_hist_info_from_isr(u32 *isr) } pipe = mdss_mdp_pipe_search(mdata, BIT(blk_idx)); if (IS_ERR_OR_NULL(pipe)) { - pr_debug("pipe DNE, %d", blk_idx); + pr_debug("pipe DNE, %d\n", blk_idx); return NULL; } hist_info = &pipe->pp_res.hist; @@ -4018,7 +4019,7 @@ static int pp_num_to_side(struct mdss_mdp_ctl *ctl, u32 num) else if (mixer_id[0] == num) return MDSS_SIDE_LEFT; else - pr_err("invalid, not on any side"); + pr_err("invalid, not on any side\n"); return -EINVAL; } @@ -4066,7 +4067,7 @@ static int mdss_ad_init_checks(struct msm_fb_data_type *mfd) return ret; if (mdata->nad_cfgs == 0) { - pr_debug("Assertive Display not supported by device"); + pr_debug("Assertive Display not supported by device\n"); return -ENODEV; } @@ -4077,18 +4078,18 @@ static int mdss_ad_init_checks(struct msm_fb_data_type *mfd) mixer_num = mdss_mdp_get_ctl_mixers(ad_mfd->index, mixer_id); if (!mixer_num) { - pr_debug("no mixers connected, %d", mixer_num); + pr_debug("no mixers connected, %d\n", mixer_num); return -EHOSTDOWN; } if (mixer_num > mdata->nmax_concurrent_ad_hw) { - pr_debug("too many mixers, not supported, %d > %d", mixer_num, + pr_debug("too many mixers, not supported, %d > %d\n", mixer_num, mdata->nmax_concurrent_ad_hw); return ret; } do { if (mixer_id[i] >= mdata->nad_cfgs) { - pr_err("invalid mixer input, %d", mixer_id[i]); + pr_err("invalid mixer input, %d\n", mixer_id[i]); return ret; } i++; @@ -4133,7 +4134,7 @@ static int pp_update_ad_input(struct msm_fb_data_type *mfd) if (!ad || ad->cfg.mode == MDSS_AD_MODE_AUTO_BL) return -EINVAL; - pr_debug("backlight level changed (%d), trigger update to AD", + pr_debug("backlight level changed (%d), trigger update to AD\n", mfd->bl_level); input.mode = ad->cfg.mode; if (MDSS_AD_MODE_DATA_MATCH(ad->cfg.mode, MDSS_AD_INPUT_AMBIENT)) @@ -4270,7 +4271,7 @@ int mdss_mdp_ad_input(struct msm_fb_data_type *mfd, if ((!PP_AD_STATE_IS_INITCFG(ad->state) && !PP_AD_STS_IS_DIRTY(ad->sts)) && !input->mode == MDSS_AD_MODE_CALIB) { - pr_warn("AD not initialized or configured."); + pr_warn("AD not initialized or configured.\n"); ret = -EPERM; goto error; } @@ -4283,7 +4284,7 @@ int mdss_mdp_ad_input(struct msm_fb_data_type *mfd, goto error; } if (input->in.amb_light > MDSS_MDP_MAX_AD_AL) { - pr_warn("invalid input ambient light"); + pr_warn("invalid input ambient light\n"); ret = -EINVAL; goto error; } @@ -4302,7 +4303,7 @@ int mdss_mdp_ad_input(struct msm_fb_data_type *mfd, goto error; } if (input->in.strength > MDSS_MDP_MAX_AD_STR) { - pr_warn("invalid input strength"); + pr_warn("invalid input strength\n"); ret = -EINVAL; goto error; } @@ -4318,7 +4319,7 @@ int mdss_mdp_ad_input(struct msm_fb_data_type *mfd, if (mfd->calib_mode) { bl = input->in.calib_bl; if (bl >= AD_BL_LIN_LEN) { - pr_warn("calib_bl 255 max!"); + pr_warn("calib_bl 255 max!\n"); break; } mutex_unlock(&ad->lock); @@ -4329,11 +4330,11 @@ int mdss_mdp_ad_input(struct msm_fb_data_type *mfd, mutex_unlock(&mfd->bl_lock); mutex_lock(&ad->lock); } else { - pr_warn("should be in calib mode"); + pr_warn("should be in calib mode\n"); } break; default: - pr_warn("invalid default %d", input->mode); + pr_warn("invalid default %d\n", input->mode); ret = -EINVAL; goto error; } @@ -4380,7 +4381,7 @@ static void pp_ad_input_write(struct mdss_mdp_ad *ad_hw, writel_relaxed(ad->ad_data, base + MDSS_MDP_REG_AD_STR_MAN); break; default: - pr_warn("Invalid mode! %d", ad->cfg.mode); + pr_warn("Invalid mode! %d\n", ad->cfg.mode); break; } } @@ -4455,7 +4456,7 @@ static void pp_ad_init_write(struct mdss_mdp_ad *ad_hw, struct mdss_ad_info *ad, tile_ctrl |= 0x10; if (side <= MDSS_SIDE_NONE) { - WARN(1, "error finding sides, %d", side); + WARN(1, "error finding sides, %d\n", side); frame_start = 0; procs_start = frame_start; frame_end = 0; @@ -4529,7 +4530,7 @@ static void pp_ad_cfg_write(struct mdss_mdp_ad *ad_hw, struct mdss_ad_info *ad) writel_relaxed(ad->cfg.backlight_scale, base + MDSS_MDP_REG_AD_BL_MAX); writel_relaxed(ad->cfg.mode, base + MDSS_MDP_REG_AD_MODE_SEL); - pr_debug("stab_itr = %d", ad->cfg.stab_itr); + pr_debug("stab_itr = %d\n", ad->cfg.stab_itr); break; default: break; @@ -4590,14 +4591,14 @@ static int mdss_mdp_ad_setup(struct msm_fb_data_type *mfd) ret = mdss_mdp_get_ad(mfd, &ad); if (ret) { ret = -EINVAL; - pr_debug("failed to get ad_info, err = %d", ret); + pr_debug("failed to get ad_info, err = %d\n", ret); goto exit; } if (mfd->panel_info->type == WRITEBACK_PANEL) { bl_mfd = mdss_get_mfd_from_index(0); if (!bl_mfd) { ret = -EINVAL; - pr_warn("failed to get primary FB bl handle, err = %d", + pr_warn("failed to get primary FB bl handle, err = %d\n", ret); goto exit; } @@ -4611,8 +4612,8 @@ static int mdss_mdp_ad_setup(struct msm_fb_data_type *mfd) if (ad->sts != last_sts || ad->state != last_state) { last_sts = ad->sts; last_state = ad->state; - pr_debug("begining: ad->sts = 0x%08x, state = 0x%08x", ad->sts, - ad->state); + pr_debug("begining: ad->sts = 0x%08x, state = 0x%08x\n", + ad->sts, ad->state); } if (!PP_AD_STS_IS_DIRTY(ad->sts) && (ad->sts & PP_AD_STS_DIRTY_DATA)) { @@ -4625,7 +4626,7 @@ static int mdss_mdp_ad_setup(struct msm_fb_data_type *mfd) ad->state |= PP_AD_STATE_DATA; mutex_lock(&bl_mfd->bl_lock); bl = bl_mfd->bl_level; - pr_debug("dirty data, last_bl = %d ", ad->last_bl); + pr_debug("dirty data, last_bl = %d\n", ad->last_bl); if ((ad->cfg.mode == MDSS_AD_MODE_AUTO_STR) && (ad->last_bl != bl)) { ad->last_bl = bl; @@ -4655,13 +4656,13 @@ static int mdss_mdp_ad_setup(struct msm_fb_data_type *mfd) if (!MDSS_AD_MODE_DATA_MATCH(ad->cfg.mode, ad->ad_data_mode)) { ad->sts &= ~PP_AD_STS_DIRTY_DATA; ad->state &= ~PP_AD_STATE_DATA; - pr_debug("Mode switched, data invalidated!"); + pr_debug("Mode switched, data invalidated!\n"); } } if (ad->sts & PP_AD_STS_DIRTY_INIT) { ad->sts &= ~PP_AD_STS_DIRTY_INIT; if (pp_ad_setup_hw_nums(mfd, ad)) { - pr_warn("failed to setup ad master"); + pr_warn("failed to setup ad master\n"); ad->calc_hw_num = PP_AD_BAD_HW_NUM; } else { ad->state |= PP_AD_STATE_INIT; @@ -4673,7 +4674,7 @@ static int mdss_mdp_ad_setup(struct msm_fb_data_type *mfd) if (mfd->panel_info->type == WRITEBACK_PANEL && (ad->init.frame_w != ctl->width || ad->init.frame_h != ctl->height)) { - pr_debug("changing from %dx%d to %dx%d", ad->init.frame_w, + pr_debug("changing from %dx%d to %dx%d\n", ad->init.frame_w, ad->init.frame_h, ctl->width, ctl->height); @@ -4733,7 +4734,7 @@ static int mdss_mdp_ad_setup(struct msm_fb_data_type *mfd) ad->reg_sts &= ~PP_STS_ENABLE; if (PP_AD_STS_DIRTY_VSYNC & ad->sts) { - pr_debug("dirty vsync, calc_itr = %d", ad->calc_itr); + pr_debug("dirty vsync, calc_itr = %d\n", ad->calc_itr); ad->sts &= ~PP_AD_STS_DIRTY_VSYNC; if (!(PP_AD_STATE_VSYNC & ad->state) && ad->calc_itr && (ad->state & PP_AD_STATE_RUN)) { @@ -4749,7 +4750,7 @@ static int mdss_mdp_ad_setup(struct msm_fb_data_type *mfd) if (ad->sts != last_sts || ad->state != last_state) { last_sts = ad->sts; last_state = ad->state; - pr_debug("end: ad->sts = 0x%08x, state = 0x%08x", ad->sts, + pr_debug("end: ad->sts = 0x%08x, state = 0x%08x\n", ad->sts, ad->state); } mutex_unlock(&ad->lock); @@ -4816,14 +4817,14 @@ static void pp_ad_calc_worker(struct work_struct *work) bl = ad->bl_lin_inv[bl]; bl = bl << ad->bl_bright_shift; } - pr_debug("calc bl = %d", bl); + pr_debug("calc bl = %d\n", bl); ad->last_str |= bl << 16; mutex_lock(&ad->bl_mfd->bl_lock); if (ad->bl_mfd->bl_level) mdss_fb_set_backlight(ad->bl_mfd, bl); mutex_unlock(&ad->bl_mfd->bl_lock); } - pr_debug("calc_str = %d, calc_itr %d", + pr_debug("calc_str = %d, calc_itr %d\n", ad->last_str & 0xFF, ad->calc_itr); } else { |
