From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3F2ADC2D0E5 for ; Wed, 25 Mar 2020 17:53:19 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1F1C1206F6 for ; Wed, 25 Mar 2020 17:53:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1F1C1206F6 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 971EA6E1A3; Wed, 25 Mar 2020 17:53:18 +0000 (UTC) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id 551356E1A3 for ; Wed, 25 Mar 2020 17:53:17 +0000 (UTC) IronPort-SDR: v/ZrViwVNYnnpguHn8VcuPCe0celBQlPI5cQnAFT5oEXfNew3t45Ai1xfGJ7BQgGath7ibOoUw 873P9qLUqt4w== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Mar 2020 10:53:16 -0700 IronPort-SDR: c7+mbDVR5PyGCfCNiueXR88bs64c1pJYh9+V35xbiiGPoDnMRbG+MQTzRpmB2PcvREWsNWXqRR 7voHKThieEvw== X-IronPort-AV: E=Sophos;i="5.72,305,1580803200"; d="scan'208";a="265593242" Received: from yrahamim-mobl.ger.corp.intel.com (HELO localhost) ([10.255.194.58]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Mar 2020 10:53:14 -0700 From: Jani Nikula To: Daniel Vetter In-Reply-To: <20200325085122.GS2363188@phenom.ffwll.local> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <436b6dde60dcba235085c8bb216c841267519fa6.1584714939.git.jani.nikula@intel.com> <20200325085122.GS2363188@phenom.ffwll.local> Date: Wed, 25 Mar 2020 19:53:10 +0200 Message-ID: <87wo78iant.fsf@intel.com> MIME-Version: 1.0 Subject: Re: [Intel-gfx] [PATCH 07/13] drm/i915/dsi: use struct drm_device based logging X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: intel-gfx@lists.freedesktop.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Wed, 25 Mar 2020, Daniel Vetter wrote: > 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. Hmm, I wonder what crack the cocci part fell into. Added while applying. Pushed the entire pile, thanks a lot for the reviews. BR, Jani. > >> >> Signed-off-by: Jani Nikula >> --- >> 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 > >> -- >> 2.20.1 >> >> _______________________________________________ >> Intel-gfx mailing list >> Intel-gfx@lists.freedesktop.org >> https://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx