On Fri, Mar 20, 2020 at 04:36:32PM +0200, Jani Nikula wrote:
> Convert all the DRM_* logging macros to the struct drm_device based
> macros to provide device specific logging.
>
> No functional changes.
Not done with the cocci from Wambui? Please add usual blurb if done with
cocci's help.
>
> Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/icl_dsi.c | 10 +++++++---
> drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 11 +++++------
> drivers/gpu/drm/i915/display/vlv_dsi.c | 3 ++-
> 3 files changed, 14 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/icl_dsi.c b/drivers/gpu/drm/i915/display/icl_dsi.c
> index 17cee6f80d8b..1ca1f377419c 100644
> --- a/drivers/gpu/drm/i915/display/icl_dsi.c
> +++ b/drivers/gpu/drm/i915/display/icl_dsi.c
> @@ -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;
> }
>
> @@ -1417,6 +1420,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;
> @@ -1446,7 +1450,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;
>
> diff --git a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c
> index 574dcfec9577..3c9c05478a03 100644
> --- a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c
> +++ b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c
> @@ -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,9 +488,9 @@ 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,
> - "Failed to xfer payload of size (%u) to reg (%u)\n",
> - payload_size, reg_offset);
One left to fix in i915 per my count, unfortunately tons more of
DRM_DEV_ERROR all over drm :-/
> + drm_err(&i915->drm,
> + "Failed to xfer payload of size (%u) to reg (%u)\n",
> + payload_size, reg_offset);
>
> kfree(payload_data);
> err_alloc:
> diff --git a/drivers/gpu/drm/i915/display/vlv_dsi.c b/drivers/gpu/drm/i915/display/vlv_dsi.c
> index f4c362dc6e15..456909ee37a7 100644
> --- a/drivers/gpu/drm/i915/display/vlv_dsi.c
> +++ b/drivers/gpu/drm/i915/display/vlv_dsi.c
> @@ -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);
Reviewed-by: Daniel Vetter <daniel.vetter@xxxxxxxx>
> --
> 2.20.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
