samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Vork 0
Code Kwesties Pull-aanvragen Actions Packages Projecten Publicaties Wiki Activiteit

disp: msm: dp: adding prefix for logs

Bladeren bron 
Adding prefixes for error, debug and info
messages in dp files. To enable debug logs
run "echo 0x100 > /sys/module/drm/parameters/debug"

CRs-Fixed: 2493739
Change-Id: Ibf509e837f527be6bff6b7a1c34b0cde2921b388
Signed-off-by: Satya Rama Aditya Pinapala <psraditya30@codeaurora.org>
This commit is contained in:
Satya Rama Aditya Pinapala
2019-07-15 19:28:57 -07:00
bovenliggende a6bfb7fc1e
commit aacd9e9585
20 gewijzigde bestanden met toevoegingen van 961 en 971 verwijderingen
Download Patch-bestand Download Diff-bestand Expand all files Collapse all files

92
msm/dp/dp_drm.c
Bestand weergeven

@@ -3,8 +3,6 @@
* Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.
*/
#define pr_fmt(fmt) "[drm-dp]: %s: " fmt, __func__
#include <drm/drm_atomic_helper.h>
#include <drm/drm_atomic.h>
#include <drm/drm_crtc.h>
@@ -15,7 +13,7 @@
#include "dp_drm.h"
#include "dp_debug.h"
#define DP_MST_DEBUG(fmt, ...) pr_debug(fmt, ##__VA_ARGS__)
#define DP_MST_DEBUG(fmt, ...) DP_DEBUG(fmt, ##__VA_ARGS__)
#define to_dp_bridge(x) container_of((x), struct dp_bridge, base)
@@ -65,11 +63,11 @@ static int dp_bridge_attach(struct drm_bridge *dp_bridge)
struct dp_bridge *bridge = to_dp_bridge(dp_bridge);
if (!dp_bridge) {
pr_err("Invalid params\n");
DP_ERR("Invalid params\n");
return -EINVAL;
}
pr_debug("[%d] attached\n", bridge->id);
DP_DEBUG("[%d] attached\n", bridge->id);
return 0;
}
@@ -81,7 +79,7 @@ static void dp_bridge_pre_enable(struct drm_bridge *drm_bridge)
struct dp_display *dp;
if (!drm_bridge) {
pr_err("Invalid params\n");
DP_ERR("Invalid params\n");
return;
}
@@ -89,26 +87,26 @@ static void dp_bridge_pre_enable(struct drm_bridge *drm_bridge)
dp = bridge->display;
if (!bridge->connector) {
pr_err("Invalid connector\n");
DP_ERR("Invalid connector\n");
return;
}
if (!bridge->dp_panel) {
pr_err("Invalid dp_panel\n");
DP_ERR("Invalid dp_panel\n");
return;
}
/* By this point mode should have been validated through mode_fixup */
rc = dp->set_mode(dp, bridge->dp_panel, &bridge->dp_mode);
if (rc) {
pr_err("[%d] failed to perform a mode set, rc=%d\n",
DP_ERR("[%d] failed to perform a mode set, rc=%d\n",
bridge->id, rc);
return;
}
rc = dp->prepare(dp, bridge->dp_panel);
if (rc) {
pr_err("[%d] DP display prepare failed, rc=%d\n",
DP_ERR("[%d] DP display prepare failed, rc=%d\n",
bridge->id, rc);
return;
}
@@ -118,7 +116,7 @@ static void dp_bridge_pre_enable(struct drm_bridge *drm_bridge)
rc = dp->enable(dp, bridge->dp_panel);
if (rc) {
pr_err("[%d] DP display enable failed, rc=%d\n",
DP_ERR("[%d] DP display enable failed, rc=%d\n",
bridge->id, rc);
dp->unprepare(dp, bridge->dp_panel);
}
@@ -131,18 +129,18 @@ static void dp_bridge_enable(struct drm_bridge *drm_bridge)
struct dp_display *dp;
if (!drm_bridge) {
pr_err("Invalid params\n");
DP_ERR("Invalid params\n");
return;
}
bridge = to_dp_bridge(drm_bridge);
if (!bridge->connector) {
pr_err("Invalid connector\n");
DP_ERR("Invalid connector\n");
return;
}
if (!bridge->dp_panel) {
pr_err("Invalid dp_panel\n");
DP_ERR("Invalid dp_panel\n");
return;
}
@@ -150,7 +148,7 @@ static void dp_bridge_enable(struct drm_bridge *drm_bridge)
rc = dp->post_enable(dp, bridge->dp_panel);
if (rc)
pr_err("[%d] DP display post enable failed, rc=%d\n",
DP_ERR("[%d] DP display post enable failed, rc=%d\n",
bridge->id, rc);
}
@@ -161,25 +159,25 @@ static void dp_bridge_disable(struct drm_bridge *drm_bridge)
struct dp_display *dp;
if (!drm_bridge) {
pr_err("Invalid params\n");
DP_ERR("Invalid params\n");
return;
}
bridge = to_dp_bridge(drm_bridge);
if (!bridge->connector) {
pr_err("Invalid connector\n");
DP_ERR("Invalid connector\n");
return;
}
if (!bridge->dp_panel) {
pr_err("Invalid dp_panel\n");
DP_ERR("Invalid dp_panel\n");
return;
}
dp = bridge->display;
if (!dp) {
pr_err("dp is null\n");
DP_ERR("dp is null\n");
return;
}
@@ -188,7 +186,7 @@ static void dp_bridge_disable(struct drm_bridge *drm_bridge)
rc = dp->pre_disable(dp, bridge->dp_panel);
if (rc) {
pr_err("[%d] DP display pre disable failed, rc=%d\n",
DP_ERR("[%d] DP display pre disable failed, rc=%d\n",
bridge->id, rc);
}
}
@@ -200,18 +198,18 @@ static void dp_bridge_post_disable(struct drm_bridge *drm_bridge)
struct dp_display *dp;
if (!drm_bridge) {
pr_err("Invalid params\n");
DP_ERR("Invalid params\n");
return;
}
bridge = to_dp_bridge(drm_bridge);
if (!bridge->connector) {
pr_err("Invalid connector\n");
DP_ERR("Invalid connector\n");
return;
}
if (!bridge->dp_panel) {
pr_err("Invalid dp_panel\n");
DP_ERR("Invalid dp_panel\n");
return;
}
@@ -219,14 +217,14 @@ static void dp_bridge_post_disable(struct drm_bridge *drm_bridge)
rc = dp->disable(dp, bridge->dp_panel);
if (rc) {
pr_err("[%d] DP display disable failed, rc=%d\n",
DP_ERR("[%d] DP display disable failed, rc=%d\n",
bridge->id, rc);
return;
}
rc = dp->unprepare(dp, bridge->dp_panel);
if (rc) {
pr_err("[%d] DP display unprepare failed, rc=%d\n",
DP_ERR("[%d] DP display unprepare failed, rc=%d\n",
bridge->id, rc);
return;
}
@@ -240,18 +238,18 @@ static void dp_bridge_mode_set(struct drm_bridge *drm_bridge,
struct dp_display *dp;
if (!drm_bridge || !mode || !adjusted_mode) {
pr_err("Invalid params\n");
DP_ERR("Invalid params\n");
return;
}
bridge = to_dp_bridge(drm_bridge);
if (!bridge->connector) {
pr_err("Invalid connector\n");
DP_ERR("Invalid connector\n");
return;
}
if (!bridge->dp_panel) {
pr_err("Invalid dp_panel\n");
DP_ERR("Invalid dp_panel\n");
return;
}
@@ -271,20 +269,20 @@ static bool dp_bridge_mode_fixup(struct drm_bridge *drm_bridge,
struct dp_display *dp;
if (!drm_bridge || !mode || !adjusted_mode) {
pr_err("Invalid params\n");
DP_ERR("Invalid params\n");
ret = false;
goto end;
}
bridge = to_dp_bridge(drm_bridge);
if (!bridge->connector) {
pr_err("Invalid connector\n");
DP_ERR("Invalid connector\n");
ret = false;
goto end;
}
if (!bridge->dp_panel) {
pr_err("Invalid dp_panel\n");
DP_ERR("Invalid dp_panel\n");
ret = false;
goto end;
}
@@ -314,13 +312,13 @@ int dp_connector_config_hdr(struct drm_connector *connector, void *display,
struct sde_connector *sde_conn;
if (!display || !c_state || !connector) {
pr_err("invalid params\n");
DP_ERR("invalid params\n");
return -EINVAL;
}
sde_conn = to_sde_connector(connector);
if (!sde_conn->drv_panel) {
pr_err("invalid dp panel\n");
DP_ERR("invalid dp panel\n");
return -EINVAL;
}
@@ -371,7 +369,7 @@ int dp_connector_get_mode_info(struct drm_connector *connector,
if (!drm_mode || !mode_info || !avail_res ||
!avail_res->max_mixer_width || !connector || !display) {
pr_err("invalid params\n");
DP_ERR("invalid params\n");
return -EINVAL;
}
@@ -410,7 +408,7 @@ int dp_connector_get_info(struct drm_connector *connector,
struct dp_display *display = data;
if (!info || !display || !display->drm_dev) {
pr_err("invalid params\n");
DP_ERR("invalid params\n");
return -EINVAL;
}
@@ -440,7 +438,7 @@ enum drm_connector_status dp_connector_detect(struct drm_connector *conn,
memset(&info, 0x0, sizeof(info));
rc = dp_connector_get_info(conn, &info, display);
if (rc) {
pr_err("failed to get display info, rc=%d\n", rc);
DP_ERR("failed to get display info, rc=%d\n", rc);
return connector_status_disconnected;
}
@@ -461,7 +459,7 @@ void dp_connector_post_open(struct drm_connector *connector, void *display)
struct dp_display *dp;
if (!display) {
pr_err("invalid input\n");
DP_ERR("invalid input\n");
return;
}
@@ -485,7 +483,7 @@ int dp_connector_get_modes(struct drm_connector *connector,
sde_conn = to_sde_connector(connector);
if (!sde_conn->drv_panel) {
pr_err("invalid dp panel\n");
DP_ERR("invalid dp panel\n");
return 0;
}
@@ -499,14 +497,14 @@ int dp_connector_get_modes(struct drm_connector *connector,
if (dp->is_sst_connected) {
rc = dp->get_modes(dp, sde_conn->drv_panel, dp_mode);
if (!rc)
pr_err("failed to get DP sink modes, rc=%d\n", rc);
DP_ERR("failed to get DP sink modes, rc=%d\n", rc);
if (dp_mode->timing.pixel_clk_khz) { /* valid DP mode */
memset(&drm_mode, 0x0, sizeof(drm_mode));
convert_to_drm_mode(dp_mode, &drm_mode);
m = drm_mode_duplicate(connector->dev, &drm_mode);
if (!m) {
pr_err("failed to add mode %ux%u\n",
DP_ERR("failed to add mode %ux%u\n",
drm_mode.hdisplay,
drm_mode.vdisplay);
kfree(dp_mode);
@@ -517,7 +515,7 @@ int dp_connector_get_modes(struct drm_connector *connector,
drm_mode_probed_add(connector, m);
}
} else {
pr_err("No sink connected\n");
DP_ERR("No sink connected\n");
}
kfree(dp_mode);
@@ -547,13 +545,13 @@ int dp_drm_bridge_init(void *data, struct drm_encoder *encoder)
rc = drm_bridge_attach(encoder, &bridge->base, NULL);
if (rc) {
pr_err("failed to attach bridge, rc=%d\n", rc);
DP_ERR("failed to attach bridge, rc=%d\n", rc);
goto error_free_bridge;
}
rc = display->request_irq(display);
if (rc) {
pr_err("request_irq failed, rc=%d\n", rc);
DP_ERR("request_irq failed, rc=%d\n", rc);
goto error_free_bridge;
}
@@ -587,13 +585,13 @@ enum drm_mode_status dp_connector_mode_valid(struct drm_connector *connector,
struct sde_connector *sde_conn;
if (!mode || !display || !connector) {
pr_err("invalid params\n");
DP_ERR("invalid params\n");
return MODE_ERROR;
}
sde_conn = to_sde_connector(connector);
if (!sde_conn->drv_panel) {
pr_err("invalid dp panel\n");
DP_ERR("invalid dp panel\n");
return MODE_ERROR;
}
@@ -611,13 +609,13 @@ int dp_connector_update_pps(struct drm_connector *connector,
struct sde_connector *sde_conn;
if (!display || !connector) {
pr_err("invalid params\n");
DP_ERR("invalid params\n");
return -EINVAL;
}
sde_conn = to_sde_connector(connector);
if (!sde_conn->drv_panel) {
pr_err("invalid dp panel\n");
DP_ERR("invalid dp panel\n");
return MODE_ERROR;
}