From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753098AbeCMNvq (ORCPT ); Tue, 13 Mar 2018 09:51:46 -0400 Received: from mx07-00178001.pphosted.com ([62.209.51.94]:65371 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752607AbeCMNvo (ORCPT ); Tue, 13 Mar 2018 09:51:44 -0400 From: yannick fertre To: Vikas Manocha , Tom Rini , Benjamin Gaignard , Yannick Fertre , Philippe Cornu , "Patrice Chotard" , Patrick DELAUNAY , Christophe KERELLO , Archit Taneja , Andrzej Hajda , "Laurent Pinchart" , David Airlie , Brian Norris , Bhumika Goyal , Gustavo Padovan , "Maarten Lankhorst" , Sean Paul , Albert Aribaud , "Simon Glass" , Anatolij Gustschin , Thierry Reding CC: , , Subject: [PATCH v3 02/10] video: stm32: stm32_ltdc: update debug log Date: Tue, 13 Mar 2018 14:50:03 +0100 Message-ID: <1520949014-21468-5-git-send-email-yannick.fertre@st.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1520949014-21468-1-git-send-email-yannick.fertre@st.com> References: <1520949014-21468-1-git-send-email-yannick.fertre@st.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.201.23.68] X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2018-03-13_07:,, signatures=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Replace macro debug by pr_error, pr_warn or pr_info. Signed-off-by: yannick fertre --- drivers/video/stm32/stm32_ltdc.c | 67 ++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 37 deletions(-) diff --git a/drivers/video/stm32/stm32_ltdc.c b/drivers/video/stm32/stm32_ltdc.c index bd9c0de..3e12c71 100644 --- a/drivers/video/stm32/stm32_ltdc.c +++ b/drivers/video/stm32/stm32_ltdc.c @@ -5,7 +5,6 @@ * * SPDX-License-Identifier: GPL-2.0+ */ - #include #include #include @@ -13,12 +12,10 @@ #include #include #include +#include #include #include #include -#include - -DECLARE_GLOBAL_DATA_PTR; struct stm32_ltdc_priv { void __iomem *regs; @@ -176,13 +173,13 @@ static u32 stm32_ltdc_get_pixel_format(enum video_log2_bpp l2bpp) case VIDEO_BPP2: case VIDEO_BPP4: default: - debug("%s: warning %dbpp not supported yet, %dbpp instead\n", - __func__, VNBITS(l2bpp), VNBITS(VIDEO_BPP16)); + pr_warn("warning %dbpp not supported yet, %dbpp instead\n", + VNBITS(l2bpp), VNBITS(VIDEO_BPP16)); pf = PF_RGB565; break; } - debug("%s: %d bpp -> ltdc pf %d\n", __func__, VNBITS(l2bpp), pf); + pr_info("%d bpp -> ltdc pf %d\n", VNBITS(l2bpp), pf); return (u32)pf; } @@ -249,7 +246,7 @@ static void stm32_ltdc_set_mode(struct stm32_ltdc_priv *priv, /* Signal polarities */ val = 0; - debug("%s: timing->flags 0x%08x\n", __func__, timings->flags); + dev_info(dev, "timing->flags 0x%08x\n", timings->flags); if (timings->flags & DISPLAY_FLAGS_HSYNC_HIGH) val |= GCR_HSPOL; if (timings->flags & DISPLAY_FLAGS_VSYNC_HIGH) @@ -343,26 +340,25 @@ static int stm32_ltdc_probe(struct udevice *dev) priv->regs = (void *)dev_read_addr(dev); if ((fdt_addr_t)priv->regs == FDT_ADDR_T_NONE) { - debug("%s: ltdc dt register address error\n", __func__); + dev_err(dev, "ltdc dt register address error\n"); return -EINVAL; } ret = clk_get_by_index(dev, 0, &pclk); if (ret) { - debug("%s: peripheral clock get error %d\n", __func__, ret); + dev_err(dev, "peripheral clock get error %d\n", ret); return ret; } ret = clk_enable(&pclk); if (ret) { - debug("%s: peripheral clock enable error %d\n", - __func__, ret); + dev_err(dev, "peripheral clock enable error %d\n", ret); return ret; } ret = reset_get_by_index(dev, 0, &rst); if (ret) { - debug("%s: missing ltdc hardware reset\n", __func__); + dev_err(dev, "missing ltdc hardware reset\n"); return -ENODEV; } @@ -371,42 +367,39 @@ static int stm32_ltdc_probe(struct udevice *dev) #ifdef CONFIG_VIDEO_BRIDGE ret = uclass_get_device(UCLASS_VIDEO_BRIDGE, 0, &bridge); - if (ret) { - debug("%s: No video bridge, or no backlight on bridge\n", - __func__); - } + if (ret) + dev_info(dev, "No video bridge, or no backlight on bridge\n"); if (bridge) { ret = video_bridge_attach(bridge); if (ret) { - debug("%s: fail to attach bridge\n", __func__); + dev_err(dev, "fail to attach bridge\n"); return ret; } } #endif ret = uclass_first_device(UCLASS_PANEL, &panel); if (ret) { - debug("%s: panel device error %d\n", __func__, ret); + dev_err(dev, "panel device error %d\n", ret); return ret; } ret = fdtdec_decode_display_timing(gd->fdt_blob, dev_of_offset(panel), 0, &timings); if (ret) { - debug("%s: decode display timing error %d\n", - __func__, ret); + dev_err(dev, "decode display timing error %d\n", ret); return ret; } rate = clk_set_rate(&pclk, timings.pixelclock.typ); if (rate < 0) { - debug("%s: fail to set pixel clock %d hz %d hz\n", - __func__, timings.pixelclock.typ, rate); + dev_err(dev, "fail to set pixel clock %d hz %d hz\n", + timings.pixelclock.typ, rate); return rate; } - debug("%s: Set pixel clock req %d hz get %d hz\n", __func__, - timings.pixelclock.typ, rate); + dev_info(dev, "set pixel clock req %d hz get %d hz\n", + timings.pixelclock.typ, rate); /* TODO Below parameters are hard-coded for the moment... */ priv->l2bpp = VIDEO_BPP16; @@ -417,12 +410,12 @@ static int stm32_ltdc_probe(struct udevice *dev) priv->crop_h = timings.vactive.typ; priv->alpha = 0xFF; - debug("%s: %dx%d %dbpp frame buffer at 0x%lx\n", __func__, - timings.hactive.typ, timings.vactive.typ, - VNBITS(priv->l2bpp), uc_plat->base); - debug("%s: crop %d,%d %dx%d bg 0x%08x alpha %d\n", __func__, - priv->crop_x, priv->crop_y, priv->crop_w, priv->crop_h, - priv->bg_col_argb, priv->alpha); + dev_info(dev, "%dx%d %dbpp frame buffer at 0x%lx\n", + timings.hactive.typ, timings.vactive.typ, + VNBITS(priv->l2bpp), uc_plat->base); + dev_info(dev, "crop %d,%d %dx%d bg 0x%08x alpha %d\n", + priv->crop_x, priv->crop_y, priv->crop_w, priv->crop_h, + priv->bg_col_argb, priv->alpha); /* Configure & start LTDC */ stm32_ltdc_set_mode(priv, &timings); @@ -437,22 +430,22 @@ static int stm32_ltdc_probe(struct udevice *dev) if (bridge) { ret = video_bridge_set_backlight(bridge, 80); if (ret) { - debug("%s: fail to set backlight\n", __func__); + dev_err(dev, "fail to set backlight\n"); return ret; } } else { ret = panel_enable_backlight(panel); if (ret) { - debug("%s: panel %s enable backlight error %d\n", - __func__, panel->name, ret); + dev_err(dev, "panel %s enable backlight error %d\n", + panel->name, ret); return ret; } } #else ret = panel_enable_backlight(panel); if (ret) { - debug("%s: panel %s enable backlight error %d\n", - __func__, panel->name, ret); + dev_err(dev, "panel %s enable backlight error %d\n", + panel->name, ret); return ret; } #endif @@ -468,7 +461,7 @@ static int stm32_ltdc_bind(struct udevice *dev) uc_plat->size = CONFIG_VIDEO_STM32_MAX_XRES * CONFIG_VIDEO_STM32_MAX_YRES * (CONFIG_VIDEO_STM32_MAX_BPP >> 3); - debug("%s: frame buffer max size %d bytes\n", __func__, uc_plat->size); + dev_info(dev, "frame buffer max size %d bytes\n", uc_plat->size); return 0; } -- 1.9.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: yannick fertre Subject: [PATCH v3 02/10] video: stm32: stm32_ltdc: update debug log Date: Tue, 13 Mar 2018 14:50:03 +0100 Message-ID: <1520949014-21468-5-git-send-email-yannick.fertre@st.com> References: <1520949014-21468-1-git-send-email-yannick.fertre@st.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mx07-00178001.pphosted.com (mx07-00178001.pphosted.com [62.209.51.94]) by gabe.freedesktop.org (Postfix) with ESMTPS id 537FF6E50C for ; Tue, 13 Mar 2018 13:51:38 +0000 (UTC) In-Reply-To: <1520949014-21468-1-git-send-email-yannick.fertre@st.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Vikas Manocha , Tom Rini , Benjamin Gaignard , Yannick Fertre , Philippe Cornu , Patrice Chotard , Patrick DELAUNAY , Christophe KERELLO , Archit Taneja , Andrzej Hajda , Laurent Pinchart , David Airlie , Brian Norris , Bhumika Goyal , Gustavo Padovan , Maarten Lankhorst , Sean Paul , Albert Aribaud , Simon Glass , Anatolij Gustschin , Thierry Reding Cc: u-boot@lists.denx.de, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org UmVwbGFjZSAgbWFjcm8gZGVidWcgYnkgcHJfZXJyb3IsIHByX3dhcm4gb3IgcHJfaW5mby4KClNp Z25lZC1vZmYtYnk6IHlhbm5pY2sgZmVydHJlIDx5YW5uaWNrLmZlcnRyZUBzdC5jb20+Ci0tLQog ZHJpdmVycy92aWRlby9zdG0zMi9zdG0zMl9sdGRjLmMgfCA2NyArKysrKysrKysrKysrKysrKyst LS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMzAgaW5zZXJ0aW9ucygrKSwg MzcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy92aWRlby9zdG0zMi9zdG0zMl9s dGRjLmMgYi9kcml2ZXJzL3ZpZGVvL3N0bTMyL3N0bTMyX2x0ZGMuYwppbmRleCBiZDljMGRlLi4z ZTEyYzcxIDEwMDY0NAotLS0gYS9kcml2ZXJzL3ZpZGVvL3N0bTMyL3N0bTMyX2x0ZGMuYworKysg Yi9kcml2ZXJzL3ZpZGVvL3N0bTMyL3N0bTMyX2x0ZGMuYwpAQCAtNSw3ICs1LDYgQEAKICAqCiAg KiBTUERYLUxpY2Vuc2UtSWRlbnRpZmllcjogR1BMLTIuMCsKICAqLwotCiAjaW5jbHVkZSA8Y29t bW9uLmg+CiAjaW5jbHVkZSA8Y2xrLmg+CiAjaW5jbHVkZSA8ZGlzcGxheS5oPgpAQCAtMTMsMTIg KzEyLDEwIEBACiAjaW5jbHVkZSA8cGFuZWwuaD4KICNpbmNsdWRlIDxyZXNldC5oPgogI2luY2x1 ZGUgPHZpZGVvLmg+CisjaW5jbHVkZSA8dmlkZW9fYnJpZGdlLmg+CiAjaW5jbHVkZSA8YXNtL2lv Lmg+CiAjaW5jbHVkZSA8YXNtL2FyY2gvZ3Bpby5oPgogI2luY2x1ZGUgPGRtL2RldmljZS1pbnRl cm5hbC5oPgotI2luY2x1ZGUgPHZpZGVvX2JyaWRnZS5oPgotCi1ERUNMQVJFX0dMT0JBTF9EQVRB X1BUUjsKIAogc3RydWN0IHN0bTMyX2x0ZGNfcHJpdiB7CiAJdm9pZCBfX2lvbWVtICpyZWdzOwpA QCAtMTc2LDEzICsxNzMsMTMgQEAgc3RhdGljIHUzMiBzdG0zMl9sdGRjX2dldF9waXhlbF9mb3Jt YXQoZW51bSB2aWRlb19sb2cyX2JwcCBsMmJwcCkKIAljYXNlIFZJREVPX0JQUDI6CiAJY2FzZSBW SURFT19CUFA0OgogCWRlZmF1bHQ6Ci0JCWRlYnVnKCIlczogd2FybmluZyAlZGJwcCBub3Qgc3Vw cG9ydGVkIHlldCwgJWRicHAgaW5zdGVhZFxuIiwKLQkJICAgICAgX19mdW5jX18sIFZOQklUUyhs MmJwcCksIFZOQklUUyhWSURFT19CUFAxNikpOworCQlwcl93YXJuKCJ3YXJuaW5nICVkYnBwIG5v dCBzdXBwb3J0ZWQgeWV0LCAlZGJwcCBpbnN0ZWFkXG4iLAorCQkJVk5CSVRTKGwyYnBwKSwgVk5C SVRTKFZJREVPX0JQUDE2KSk7CiAJCXBmID0gUEZfUkdCNTY1OwogCQlicmVhazsKIAl9CiAKLQlk ZWJ1ZygiJXM6ICVkIGJwcCAtPiBsdGRjIHBmICVkXG4iLCBfX2Z1bmNfXywgVk5CSVRTKGwyYnBw KSwgcGYpOworCXByX2luZm8oIiVkIGJwcCAtPiBsdGRjIHBmICVkXG4iLCBWTkJJVFMobDJicHAp LCBwZik7CiAKIAlyZXR1cm4gKHUzMilwZjsKIH0KQEAgLTI0OSw3ICsyNDYsNyBAQCBzdGF0aWMg dm9pZCBzdG0zMl9sdGRjX3NldF9tb2RlKHN0cnVjdCBzdG0zMl9sdGRjX3ByaXYgKnByaXYsCiAK IAkvKiBTaWduYWwgcG9sYXJpdGllcyAqLwogCXZhbCA9IDA7Ci0JZGVidWcoIiVzOiB0aW1pbmct PmZsYWdzIDB4JTA4eFxuIiwgX19mdW5jX18sIHRpbWluZ3MtPmZsYWdzKTsKKwlkZXZfaW5mbyhk ZXYsICJ0aW1pbmctPmZsYWdzIDB4JTA4eFxuIiwgdGltaW5ncy0+ZmxhZ3MpOwogCWlmICh0aW1p bmdzLT5mbGFncyAmIERJU1BMQVlfRkxBR1NfSFNZTkNfSElHSCkKIAkJdmFsIHw9IEdDUl9IU1BP TDsKIAlpZiAodGltaW5ncy0+ZmxhZ3MgJiBESVNQTEFZX0ZMQUdTX1ZTWU5DX0hJR0gpCkBAIC0z NDMsMjYgKzM0MCwyNSBAQCBzdGF0aWMgaW50IHN0bTMyX2x0ZGNfcHJvYmUoc3RydWN0IHVkZXZp Y2UgKmRldikKIAogCXByaXYtPnJlZ3MgPSAodm9pZCAqKWRldl9yZWFkX2FkZHIoZGV2KTsKIAlp ZiAoKGZkdF9hZGRyX3QpcHJpdi0+cmVncyA9PSBGRFRfQUREUl9UX05PTkUpIHsKLQkJZGVidWco IiVzOiBsdGRjIGR0IHJlZ2lzdGVyIGFkZHJlc3MgZXJyb3JcbiIsIF9fZnVuY19fKTsKKwkJZGV2 X2VycihkZXYsICJsdGRjIGR0IHJlZ2lzdGVyIGFkZHJlc3MgZXJyb3JcbiIpOwogCQlyZXR1cm4g LUVJTlZBTDsKIAl9CiAKIAlyZXQgPSBjbGtfZ2V0X2J5X2luZGV4KGRldiwgMCwgJnBjbGspOwog CWlmIChyZXQpIHsKLQkJZGVidWcoIiVzOiBwZXJpcGhlcmFsIGNsb2NrIGdldCBlcnJvciAlZFxu IiwgX19mdW5jX18sIHJldCk7CisJCWRldl9lcnIoZGV2LCAicGVyaXBoZXJhbCBjbG9jayBnZXQg ZXJyb3IgJWRcbiIsIHJldCk7CiAJCXJldHVybiByZXQ7CiAJfQogCiAJcmV0ID0gY2xrX2VuYWJs ZSgmcGNsayk7CiAJaWYgKHJldCkgewotCQlkZWJ1ZygiJXM6IHBlcmlwaGVyYWwgY2xvY2sgZW5h YmxlIGVycm9yICVkXG4iLAotCQkgICAgICBfX2Z1bmNfXywgcmV0KTsKKwkJZGV2X2VycihkZXYs ICJwZXJpcGhlcmFsIGNsb2NrIGVuYWJsZSBlcnJvciAlZFxuIiwgcmV0KTsKIAkJcmV0dXJuIHJl dDsKIAl9CiAKIAlyZXQgPSByZXNldF9nZXRfYnlfaW5kZXgoZGV2LCAwLCAmcnN0KTsKIAlpZiAo cmV0KSB7Ci0JCWRlYnVnKCIlczogbWlzc2luZyBsdGRjIGhhcmR3YXJlIHJlc2V0XG4iLCBfX2Z1 bmNfXyk7CisJCWRldl9lcnIoZGV2LCAibWlzc2luZyBsdGRjIGhhcmR3YXJlIHJlc2V0XG4iKTsK IAkJcmV0dXJuIC1FTk9ERVY7CiAJfQogCkBAIC0zNzEsNDIgKzM2NywzOSBAQCBzdGF0aWMgaW50 IHN0bTMyX2x0ZGNfcHJvYmUoc3RydWN0IHVkZXZpY2UgKmRldikKIAogI2lmZGVmIENPTkZJR19W SURFT19CUklER0UKIAlyZXQgPSB1Y2xhc3NfZ2V0X2RldmljZShVQ0xBU1NfVklERU9fQlJJREdF LCAwLCAmYnJpZGdlKTsKLQlpZiAocmV0KSB7Ci0JCWRlYnVnKCIlczogTm8gdmlkZW8gYnJpZGdl LCBvciBubyBiYWNrbGlnaHQgb24gYnJpZGdlXG4iLAotCQkgICAgICBfX2Z1bmNfXyk7Ci0JfQor CWlmIChyZXQpCisJCWRldl9pbmZvKGRldiwgIk5vIHZpZGVvIGJyaWRnZSwgb3Igbm8gYmFja2xp Z2h0IG9uIGJyaWRnZVxuIik7CiAKIAlpZiAoYnJpZGdlKSB7CiAJCXJldCA9IHZpZGVvX2JyaWRn ZV9hdHRhY2goYnJpZGdlKTsKIAkJaWYgKHJldCkgewotCQkJZGVidWcoIiVzOiBmYWlsIHRvIGF0 dGFjaCBicmlkZ2VcbiIsIF9fZnVuY19fKTsKKwkJCWRldl9lcnIoZGV2LCAiZmFpbCB0byBhdHRh Y2ggYnJpZGdlXG4iKTsKIAkJCXJldHVybiByZXQ7CiAJCX0KIAl9CiAjZW5kaWYKIAlyZXQgPSB1 Y2xhc3NfZmlyc3RfZGV2aWNlKFVDTEFTU19QQU5FTCwgJnBhbmVsKTsKIAlpZiAocmV0KSB7Ci0J CWRlYnVnKCIlczogcGFuZWwgZGV2aWNlIGVycm9yICVkXG4iLCBfX2Z1bmNfXywgcmV0KTsKKwkJ ZGV2X2VycihkZXYsICJwYW5lbCBkZXZpY2UgZXJyb3IgJWRcbiIsIHJldCk7CiAJCXJldHVybiBy ZXQ7CiAJfQogCiAJcmV0ID0gZmR0ZGVjX2RlY29kZV9kaXNwbGF5X3RpbWluZyhnZC0+ZmR0X2Js b2IsIGRldl9vZl9vZmZzZXQocGFuZWwpLAogCQkJCQkgICAwLCAmdGltaW5ncyk7CiAJaWYgKHJl dCkgewotCQlkZWJ1ZygiJXM6IGRlY29kZSBkaXNwbGF5IHRpbWluZyBlcnJvciAlZFxuIiwKLQkJ ICAgICAgX19mdW5jX18sIHJldCk7CisJCWRldl9lcnIoZGV2LCAiZGVjb2RlIGRpc3BsYXkgdGlt aW5nIGVycm9yICVkXG4iLCByZXQpOwogCQlyZXR1cm4gcmV0OwogCX0KIAogCXJhdGUgPSBjbGtf c2V0X3JhdGUoJnBjbGssIHRpbWluZ3MucGl4ZWxjbG9jay50eXApOwogCWlmIChyYXRlIDwgMCkg ewotCQlkZWJ1ZygiJXM6IGZhaWwgdG8gc2V0IHBpeGVsIGNsb2NrICVkIGh6ICVkIGh6XG4iLAot CQkgICAgICBfX2Z1bmNfXywgdGltaW5ncy5waXhlbGNsb2NrLnR5cCwgcmF0ZSk7CisJCWRldl9l cnIoZGV2LCAiZmFpbCB0byBzZXQgcGl4ZWwgY2xvY2sgJWQgaHogJWQgaHpcbiIsCisJCQl0aW1p bmdzLnBpeGVsY2xvY2sudHlwLCByYXRlKTsKIAkJcmV0dXJuIHJhdGU7CiAJfQogCi0JZGVidWco IiVzOiBTZXQgcGl4ZWwgY2xvY2sgcmVxICVkIGh6IGdldCAlZCBoelxuIiwgX19mdW5jX18sCi0J ICAgICAgdGltaW5ncy5waXhlbGNsb2NrLnR5cCwgcmF0ZSk7CisJZGV2X2luZm8oZGV2LCAic2V0 IHBpeGVsIGNsb2NrIHJlcSAlZCBoeiBnZXQgJWQgaHpcbiIsCisJCSB0aW1pbmdzLnBpeGVsY2xv Y2sudHlwLCByYXRlKTsKIAogCS8qIFRPRE8gQmVsb3cgcGFyYW1ldGVycyBhcmUgaGFyZC1jb2Rl ZCBmb3IgdGhlIG1vbWVudC4uLiAqLwogCXByaXYtPmwyYnBwID0gVklERU9fQlBQMTY7CkBAIC00 MTcsMTIgKzQxMCwxMiBAQCBzdGF0aWMgaW50IHN0bTMyX2x0ZGNfcHJvYmUoc3RydWN0IHVkZXZp Y2UgKmRldikKIAlwcml2LT5jcm9wX2ggPSB0aW1pbmdzLnZhY3RpdmUudHlwOwogCXByaXYtPmFs cGhhID0gMHhGRjsKIAotCWRlYnVnKCIlczogJWR4JWQgJWRicHAgZnJhbWUgYnVmZmVyIGF0IDB4 JWx4XG4iLCBfX2Z1bmNfXywKLQkgICAgICB0aW1pbmdzLmhhY3RpdmUudHlwLCB0aW1pbmdzLnZh Y3RpdmUudHlwLAotCSAgICAgIFZOQklUUyhwcml2LT5sMmJwcCksIHVjX3BsYXQtPmJhc2UpOwot CWRlYnVnKCIlczogY3JvcCAlZCwlZCAlZHglZCBiZyAweCUwOHggYWxwaGEgJWRcbiIsIF9fZnVu Y19fLAotCSAgICAgIHByaXYtPmNyb3BfeCwgcHJpdi0+Y3JvcF95LCBwcml2LT5jcm9wX3csIHBy aXYtPmNyb3BfaCwKLQkgICAgICBwcml2LT5iZ19jb2xfYXJnYiwgcHJpdi0+YWxwaGEpOworCWRl dl9pbmZvKGRldiwgIiVkeCVkICVkYnBwIGZyYW1lIGJ1ZmZlciBhdCAweCVseFxuIiwKKwkJIHRp bWluZ3MuaGFjdGl2ZS50eXAsIHRpbWluZ3MudmFjdGl2ZS50eXAsCisJCSBWTkJJVFMocHJpdi0+ bDJicHApLCB1Y19wbGF0LT5iYXNlKTsKKwlkZXZfaW5mbyhkZXYsICJjcm9wICVkLCVkICVkeCVk IGJnIDB4JTA4eCBhbHBoYSAlZFxuIiwKKwkJIHByaXYtPmNyb3BfeCwgcHJpdi0+Y3JvcF95LCBw cml2LT5jcm9wX3csIHByaXYtPmNyb3BfaCwKKwkJIHByaXYtPmJnX2NvbF9hcmdiLCBwcml2LT5h bHBoYSk7CiAKIAkvKiBDb25maWd1cmUgJiBzdGFydCBMVERDICovCiAJc3RtMzJfbHRkY19zZXRf bW9kZShwcml2LCAmdGltaW5ncyk7CkBAIC00MzcsMjIgKzQzMCwyMiBAQCBzdGF0aWMgaW50IHN0 bTMyX2x0ZGNfcHJvYmUoc3RydWN0IHVkZXZpY2UgKmRldikKIAlpZiAoYnJpZGdlKSB7CiAJCXJl dCA9IHZpZGVvX2JyaWRnZV9zZXRfYmFja2xpZ2h0KGJyaWRnZSwgODApOwogCQlpZiAocmV0KSB7 Ci0JCQlkZWJ1ZygiJXM6IGZhaWwgdG8gc2V0IGJhY2tsaWdodFxuIiwgX19mdW5jX18pOworCQkJ ZGV2X2VycihkZXYsICJmYWlsIHRvIHNldCBiYWNrbGlnaHRcbiIpOwogCQkJcmV0dXJuIHJldDsK IAkJfQogCX0gZWxzZSB7CiAJCXJldCA9IHBhbmVsX2VuYWJsZV9iYWNrbGlnaHQocGFuZWwpOwog CQlpZiAocmV0KSB7Ci0JCQlkZWJ1ZygiJXM6IHBhbmVsICVzIGVuYWJsZSBiYWNrbGlnaHQgZXJy b3IgJWRcbiIsCi0JCQkgICAgICBfX2Z1bmNfXywgcGFuZWwtPm5hbWUsIHJldCk7CisJCQlkZXZf ZXJyKGRldiwgInBhbmVsICVzIGVuYWJsZSBiYWNrbGlnaHQgZXJyb3IgJWRcbiIsCisJCQkJcGFu ZWwtPm5hbWUsIHJldCk7CiAJCQlyZXR1cm4gcmV0OwogCQl9CiAJfQogI2Vsc2UKIAlyZXQgPSBw YW5lbF9lbmFibGVfYmFja2xpZ2h0KHBhbmVsKTsKIAlpZiAocmV0KSB7Ci0JCWRlYnVnKCIlczog cGFuZWwgJXMgZW5hYmxlIGJhY2tsaWdodCBlcnJvciAlZFxuIiwKLQkJICAgICAgX19mdW5jX18s IHBhbmVsLT5uYW1lLCByZXQpOworCQlkZXZfZXJyKGRldiwgInBhbmVsICVzIGVuYWJsZSBiYWNr bGlnaHQgZXJyb3IgJWRcbiIsCisJCQlwYW5lbC0+bmFtZSwgcmV0KTsKIAkJcmV0dXJuIHJldDsK IAl9CiAjZW5kaWYKQEAgLTQ2OCw3ICs0NjEsNyBAQCBzdGF0aWMgaW50IHN0bTMyX2x0ZGNfYmlu ZChzdHJ1Y3QgdWRldmljZSAqZGV2KQogCXVjX3BsYXQtPnNpemUgPSBDT05GSUdfVklERU9fU1RN MzJfTUFYX1hSRVMgKgogCQkJQ09ORklHX1ZJREVPX1NUTTMyX01BWF9ZUkVTICoKIAkJCShDT05G SUdfVklERU9fU1RNMzJfTUFYX0JQUCA+PiAzKTsKLQlkZWJ1ZygiJXM6IGZyYW1lIGJ1ZmZlciBt YXggc2l6ZSAlZCBieXRlc1xuIiwgX19mdW5jX18sIHVjX3BsYXQtPnNpemUpOworCWRldl9pbmZv KGRldiwgImZyYW1lIGJ1ZmZlciBtYXggc2l6ZSAlZCBieXRlc1xuIiwgdWNfcGxhdC0+c2l6ZSk7 CiAKIAlyZXR1cm4gMDsKIH0KLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 From: yannick fertre Date: Tue, 13 Mar 2018 14:50:03 +0100 Subject: [U-Boot] [PATCH v3 02/10] video: stm32: stm32_ltdc: update debug log In-Reply-To: <1520949014-21468-1-git-send-email-yannick.fertre@st.com> References: <1520949014-21468-1-git-send-email-yannick.fertre@st.com> Message-ID: <1520949014-21468-5-git-send-email-yannick.fertre@st.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Replace macro debug by pr_error, pr_warn or pr_info. Signed-off-by: yannick fertre --- drivers/video/stm32/stm32_ltdc.c | 67 ++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 37 deletions(-) diff --git a/drivers/video/stm32/stm32_ltdc.c b/drivers/video/stm32/stm32_ltdc.c index bd9c0de..3e12c71 100644 --- a/drivers/video/stm32/stm32_ltdc.c +++ b/drivers/video/stm32/stm32_ltdc.c @@ -5,7 +5,6 @@ * * SPDX-License-Identifier: GPL-2.0+ */ - #include #include #include @@ -13,12 +12,10 @@ #include #include #include +#include #include #include #include -#include - -DECLARE_GLOBAL_DATA_PTR; struct stm32_ltdc_priv { void __iomem *regs; @@ -176,13 +173,13 @@ static u32 stm32_ltdc_get_pixel_format(enum video_log2_bpp l2bpp) case VIDEO_BPP2: case VIDEO_BPP4: default: - debug("%s: warning %dbpp not supported yet, %dbpp instead\n", - __func__, VNBITS(l2bpp), VNBITS(VIDEO_BPP16)); + pr_warn("warning %dbpp not supported yet, %dbpp instead\n", + VNBITS(l2bpp), VNBITS(VIDEO_BPP16)); pf = PF_RGB565; break; } - debug("%s: %d bpp -> ltdc pf %d\n", __func__, VNBITS(l2bpp), pf); + pr_info("%d bpp -> ltdc pf %d\n", VNBITS(l2bpp), pf); return (u32)pf; } @@ -249,7 +246,7 @@ static void stm32_ltdc_set_mode(struct stm32_ltdc_priv *priv, /* Signal polarities */ val = 0; - debug("%s: timing->flags 0x%08x\n", __func__, timings->flags); + dev_info(dev, "timing->flags 0x%08x\n", timings->flags); if (timings->flags & DISPLAY_FLAGS_HSYNC_HIGH) val |= GCR_HSPOL; if (timings->flags & DISPLAY_FLAGS_VSYNC_HIGH) @@ -343,26 +340,25 @@ static int stm32_ltdc_probe(struct udevice *dev) priv->regs = (void *)dev_read_addr(dev); if ((fdt_addr_t)priv->regs == FDT_ADDR_T_NONE) { - debug("%s: ltdc dt register address error\n", __func__); + dev_err(dev, "ltdc dt register address error\n"); return -EINVAL; } ret = clk_get_by_index(dev, 0, &pclk); if (ret) { - debug("%s: peripheral clock get error %d\n", __func__, ret); + dev_err(dev, "peripheral clock get error %d\n", ret); return ret; } ret = clk_enable(&pclk); if (ret) { - debug("%s: peripheral clock enable error %d\n", - __func__, ret); + dev_err(dev, "peripheral clock enable error %d\n", ret); return ret; } ret = reset_get_by_index(dev, 0, &rst); if (ret) { - debug("%s: missing ltdc hardware reset\n", __func__); + dev_err(dev, "missing ltdc hardware reset\n"); return -ENODEV; } @@ -371,42 +367,39 @@ static int stm32_ltdc_probe(struct udevice *dev) #ifdef CONFIG_VIDEO_BRIDGE ret = uclass_get_device(UCLASS_VIDEO_BRIDGE, 0, &bridge); - if (ret) { - debug("%s: No video bridge, or no backlight on bridge\n", - __func__); - } + if (ret) + dev_info(dev, "No video bridge, or no backlight on bridge\n"); if (bridge) { ret = video_bridge_attach(bridge); if (ret) { - debug("%s: fail to attach bridge\n", __func__); + dev_err(dev, "fail to attach bridge\n"); return ret; } } #endif ret = uclass_first_device(UCLASS_PANEL, &panel); if (ret) { - debug("%s: panel device error %d\n", __func__, ret); + dev_err(dev, "panel device error %d\n", ret); return ret; } ret = fdtdec_decode_display_timing(gd->fdt_blob, dev_of_offset(panel), 0, &timings); if (ret) { - debug("%s: decode display timing error %d\n", - __func__, ret); + dev_err(dev, "decode display timing error %d\n", ret); return ret; } rate = clk_set_rate(&pclk, timings.pixelclock.typ); if (rate < 0) { - debug("%s: fail to set pixel clock %d hz %d hz\n", - __func__, timings.pixelclock.typ, rate); + dev_err(dev, "fail to set pixel clock %d hz %d hz\n", + timings.pixelclock.typ, rate); return rate; } - debug("%s: Set pixel clock req %d hz get %d hz\n", __func__, - timings.pixelclock.typ, rate); + dev_info(dev, "set pixel clock req %d hz get %d hz\n", + timings.pixelclock.typ, rate); /* TODO Below parameters are hard-coded for the moment... */ priv->l2bpp = VIDEO_BPP16; @@ -417,12 +410,12 @@ static int stm32_ltdc_probe(struct udevice *dev) priv->crop_h = timings.vactive.typ; priv->alpha = 0xFF; - debug("%s: %dx%d %dbpp frame buffer at 0x%lx\n", __func__, - timings.hactive.typ, timings.vactive.typ, - VNBITS(priv->l2bpp), uc_plat->base); - debug("%s: crop %d,%d %dx%d bg 0x%08x alpha %d\n", __func__, - priv->crop_x, priv->crop_y, priv->crop_w, priv->crop_h, - priv->bg_col_argb, priv->alpha); + dev_info(dev, "%dx%d %dbpp frame buffer at 0x%lx\n", + timings.hactive.typ, timings.vactive.typ, + VNBITS(priv->l2bpp), uc_plat->base); + dev_info(dev, "crop %d,%d %dx%d bg 0x%08x alpha %d\n", + priv->crop_x, priv->crop_y, priv->crop_w, priv->crop_h, + priv->bg_col_argb, priv->alpha); /* Configure & start LTDC */ stm32_ltdc_set_mode(priv, &timings); @@ -437,22 +430,22 @@ static int stm32_ltdc_probe(struct udevice *dev) if (bridge) { ret = video_bridge_set_backlight(bridge, 80); if (ret) { - debug("%s: fail to set backlight\n", __func__); + dev_err(dev, "fail to set backlight\n"); return ret; } } else { ret = panel_enable_backlight(panel); if (ret) { - debug("%s: panel %s enable backlight error %d\n", - __func__, panel->name, ret); + dev_err(dev, "panel %s enable backlight error %d\n", + panel->name, ret); return ret; } } #else ret = panel_enable_backlight(panel); if (ret) { - debug("%s: panel %s enable backlight error %d\n", - __func__, panel->name, ret); + dev_err(dev, "panel %s enable backlight error %d\n", + panel->name, ret); return ret; } #endif @@ -468,7 +461,7 @@ static int stm32_ltdc_bind(struct udevice *dev) uc_plat->size = CONFIG_VIDEO_STM32_MAX_XRES * CONFIG_VIDEO_STM32_MAX_YRES * (CONFIG_VIDEO_STM32_MAX_BPP >> 3); - debug("%s: frame buffer max size %d bytes\n", __func__, uc_plat->size); + dev_info(dev, "frame buffer max size %d bytes\n", uc_plat->size); return 0; } -- 1.9.1