Commit dd10a80f authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/dsi: use struct drm_device based logging 



Convert all the DRM_* logging macros to the struct drm_device based
macros to provide device specific logging.

No functional changes.

Generated using the following semantic patch, originally written by
Wambui Karuga <wambui.karugax@gmail.com>, with manual fixups on top:

@@
identifier fn, T;
@@

fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}

@@
identifier fn, T;
@@

fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}

Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436b6dde60dcba235085c8bb216c841267519fa6.1584714939.git.jani.nikula@intel.com
parent 41919042

drivers/gpu/drm/i915/display/icl_dsi.c

+7 −3
Original line number Diff line number Diff line
@@ -186,16 +186,19 @@ static int dsi_send_pkt_hdr(struct intel_dsi_host *host, 
static int dsi_send_pkt_payld(struct intel_dsi_host *host,

			      struct mipi_dsi_packet pkt)

{

	struct intel_dsi *intel_dsi = host->intel_dsi;

	struct drm_i915_private *i915 = to_i915(intel_dsi->base.base.dev);



	/* payload queue can accept *256 bytes*, check limit */

	if (pkt.payload_length > MAX_PLOAD_CREDIT * 4) {

		DRM_ERROR("payload size exceeds max queue limit\n");

		drm_err(&i915->drm, "payload size exceeds max queue limit\n");

		return -1;

	}



	/* load data into command payload queue */

	if (!add_payld_to_queue(host, pkt.payload,

				pkt.payload_length)) {

		DRM_ERROR("adding payload to queue failed\n");

		drm_err(&i915->drm, "adding payload to queue failed\n");

		return -1;

	}
@@ -1513,6 +1516,7 @@ static int gen11_dsi_compute_config(struct intel_encoder *encoder, 
				    struct intel_crtc_state *pipe_config,

				    struct drm_connector_state *conn_state)

{

	struct drm_i915_private *i915 = to_i915(encoder->base.dev);

	struct intel_dsi *intel_dsi = container_of(encoder, struct intel_dsi,

						   base);

	struct intel_connector *intel_connector = intel_dsi->attached_connector;
@@ -1542,7 +1546,7 @@ static int gen11_dsi_compute_config(struct intel_encoder *encoder, 
	pipe_config->clock_set = true;



	if (gen11_dsi_dsc_compute_config(encoder, pipe_config))

		DRM_DEBUG_KMS("Attempting to use DSC failed\n");

		drm_dbg_kms(&i915->drm, "Attempting to use DSC failed\n");



	pipe_config->port_clock = afe_clk(encoder, pipe_config) / 5;

drivers/gpu/drm/i915/display/intel_dsi_vbt.c

+5 −6
Original line number Diff line number Diff line
@@ -453,8 +453,7 @@ static inline void i2c_acpi_find_adapter(struct intel_dsi *intel_dsi, 


static const u8 *mipi_exec_i2c(struct intel_dsi *intel_dsi, const u8 *data)

{

	struct drm_device *drm_dev = intel_dsi->base.base.dev;

	struct device *dev = &drm_dev->pdev->dev;

	struct drm_i915_private *i915 = to_i915(intel_dsi->base.base.dev);

	struct i2c_adapter *adapter;

	struct i2c_msg msg;

	int ret;
@@ -471,7 +470,7 @@ static const u8 *mipi_exec_i2c(struct intel_dsi *intel_dsi, const u8 *data) 


	adapter = i2c_get_adapter(intel_dsi->i2c_bus_num);

	if (!adapter) {

		DRM_DEV_ERROR(dev, "Cannot find a valid i2c bus for xfer\n");

		drm_err(&i915->drm, "Cannot find a valid i2c bus for xfer\n");

		goto err_bus;

	}
@@ -489,7 +488,7 @@ static const u8 *mipi_exec_i2c(struct intel_dsi *intel_dsi, const u8 *data) 


	ret = i2c_transfer(adapter, &msg, 1);

	if (ret < 0)

		DRM_DEV_ERROR(dev,

		drm_err(&i915->drm,

			"Failed to xfer payload of size (%u) to reg (%u)\n",

			payload_size, reg_offset);

drivers/gpu/drm/i915/display/vlv_dsi.c

+2 −1
Original line number Diff line number Diff line
@@ -875,10 +875,11 @@ static void intel_dsi_disable(struct intel_encoder *encoder, 
			      const struct intel_crtc_state *old_crtc_state,

			      const struct drm_connector_state *old_conn_state)

{

	struct drm_i915_private *i915 = to_i915(encoder->base.dev);

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);

	enum port port;



	DRM_DEBUG_KMS("\n");

	drm_dbg_kms(&i915->drm, "\n");



	intel_dsi_vbt_exec_sequence(intel_dsi, MIPI_SEQ_BACKLIGHT_OFF);

	intel_panel_disable_backlight(old_conn_state);

CRA Git | Maintained and supported by SUSTech CRA and CCSE