From patchwork Wed Apr 28 21:12:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Srivatsa, Anusha" X-Patchwork-Id: 12230045 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=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 CA3EBC433B4 for ; Wed, 28 Apr 2021 21:13:24 +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 7312B61408 for ; Wed, 28 Apr 2021 21:13:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7312B61408 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 AE1F36EC4B; Wed, 28 Apr 2021 21:13:23 +0000 (UTC) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 425196EC42 for ; Wed, 28 Apr 2021 21:13:02 +0000 (UTC) IronPort-SDR: LOktrSDH3CH/censu8PatsFXIYYF24nAfSGNgIsQodJngUFvj9fQOIeMfAEEwGtlBH8X0wpJ+8 teNA6DL9RVcg== X-IronPort-AV: E=McAfee;i="6200,9189,9968"; a="193665207" X-IronPort-AV: E=Sophos;i="5.82,258,1613462400"; d="scan'208";a="193665207" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Apr 2021 14:13:01 -0700 IronPort-SDR: AijcvxTAyMCWAEZYnSHccDnACRoUql9U4y7svFMPsFCmx0TJgi80t72TRaJ1F1uIep6Z8yjYrZ GgKB6MOZu71g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,258,1613462400"; d="scan'208";a="423716011" Received: from anushasr-mobl6.jf.intel.com ([10.165.21.155]) by fmsmga008.fm.intel.com with ESMTP; 28 Apr 2021 14:13:01 -0700 From: Anusha Srivatsa To: intel-gfx@lists.freedesktop.org Date: Wed, 28 Apr 2021 14:12:47 -0700 Message-Id: <20210428211249.11037-2-anusha.srivatsa@intel.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20210428211249.11037-1-anusha.srivatsa@intel.com> References: <20210428211249.11037-1-anusha.srivatsa@intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 1/3] drm/i915/csr: s/DRM_ERROR/drm_err 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: Lucas De Marchi Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Use new format of debug messages across intel_csr. While at it, change some function definitions which now need dev_priv for drm_err and drm_info etc. Cc: Lucas De Marchi Suggested-by: Lucas De Marchi Signed-off-by: Anusha Srivatsa --- drivers/gpu/drm/i915/display/intel_csr.c | 44 +++++++++++++----------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_csr.c b/drivers/gpu/drm/i915/display/intel_csr.c index 26a922d34263..bf60c3ffdf5d 100644 --- a/drivers/gpu/drm/i915/display/intel_csr.c +++ b/drivers/gpu/drm/i915/display/intel_csr.c @@ -392,10 +392,11 @@ static u32 find_dmc_fw_offset(const struct intel_fw_info *fw_info, return dmc_offset; } -static u32 parse_csr_fw_dmc(struct intel_csr *csr, +static u32 parse_csr_fw_dmc(struct drm_i915_private *dev_priv, const struct intel_dmc_header_base *dmc_header, size_t rem_size) { + struct intel_csr *csr = &dev_priv->csr; unsigned int header_len_bytes, dmc_header_size, payload_size, i; const u32 *mmioaddr, *mmiodata; u32 mmio_count, mmio_count_max; @@ -440,27 +441,27 @@ static u32 parse_csr_fw_dmc(struct intel_csr *csr, header_len_bytes = dmc_header->header_len; dmc_header_size = sizeof(*v1); } else { - DRM_ERROR("Unknown DMC fw header version: %u\n", + drm_err(&dev_priv->drm, "Unknown DMC fw header version: %u\n", dmc_header->header_ver); return 0; } if (header_len_bytes != dmc_header_size) { - DRM_ERROR("DMC firmware has wrong dmc header length " + drm_err(&dev_priv->drm, "DMC firmware has wrong dmc header length " "(%u bytes)\n", header_len_bytes); return 0; } /* Cache the dmc header info. */ if (mmio_count > mmio_count_max) { - DRM_ERROR("DMC firmware has wrong mmio count %u\n", mmio_count); + drm_err(&dev_priv->drm, "DMC firmware has wrong mmio count %u\n", mmio_count); return 0; } for (i = 0; i < mmio_count; i++) { if (mmioaddr[i] < CSR_MMIO_START_RANGE || mmioaddr[i] > CSR_MMIO_END_RANGE) { - DRM_ERROR("DMC firmware has wrong mmio address 0x%x\n", + drm_err(&dev_priv->drm, "DMC firmware has wrong mmio address 0x%x\n", mmioaddr[i]); return 0; } @@ -477,14 +478,14 @@ static u32 parse_csr_fw_dmc(struct intel_csr *csr, goto error_truncated; if (payload_size > csr->max_fw_size) { - DRM_ERROR("DMC FW too big (%u bytes)\n", payload_size); + drm_err(&dev_priv->drm, "DMC FW too big (%u bytes)\n", payload_size); return 0; } csr->dmc_fw_size = dmc_header->fw_size; csr->dmc_payload = kmalloc(payload_size, GFP_KERNEL); if (!csr->dmc_payload) { - DRM_ERROR("Memory allocation failed for dmc payload\n"); + drm_err(&dev_priv->drm, "Memory allocation failed for dmc payload\n"); return 0; } @@ -494,12 +495,12 @@ static u32 parse_csr_fw_dmc(struct intel_csr *csr, return header_len_bytes + payload_size; error_truncated: - DRM_ERROR("Truncated DMC firmware, refusing.\n"); + drm_err(&dev_priv->drm, "Truncated DMC firmware, refusing.\n"); return 0; } static u32 -parse_csr_fw_package(struct intel_csr *csr, +parse_csr_fw_package(struct drm_i915_private *dev_priv, const struct intel_package_header *package_header, const struct stepping_info *si, size_t rem_size) @@ -516,7 +517,7 @@ parse_csr_fw_package(struct intel_csr *csr, } else if (package_header->header_ver == 2) { max_entries = PACKAGE_V2_MAX_FW_INFO_ENTRIES; } else { - DRM_ERROR("DMC firmware has unknown header version %u\n", + drm_err(&dev_priv->drm, "DMC firmware has unknown header version %u\n", package_header->header_ver); return 0; } @@ -530,7 +531,7 @@ parse_csr_fw_package(struct intel_csr *csr, goto error_truncated; if (package_header->header_len * 4 != package_size) { - DRM_ERROR("DMC firmware has wrong package header length " + drm_err(&dev_priv->drm, "DMC firmware has wrong package header length " "(%u bytes)\n", package_size); return 0; } @@ -544,7 +545,7 @@ parse_csr_fw_package(struct intel_csr *csr, dmc_offset = find_dmc_fw_offset(fw_info, num_entries, si, package_header->header_ver); if (dmc_offset == CSR_DEFAULT_FW_OFFSET) { - DRM_ERROR("DMC firmware not supported for %c stepping\n", + drm_err(&dev_priv->drm, "DMC firmware not supported for %c stepping\n", si->stepping); return 0; } @@ -553,23 +554,25 @@ parse_csr_fw_package(struct intel_csr *csr, return package_size + dmc_offset * 4; error_truncated: - DRM_ERROR("Truncated DMC firmware, refusing.\n"); + drm_err(&dev_priv->drm, "Truncated DMC firmware, refusing.\n"); return 0; } /* Return number of bytes parsed or 0 on error */ -static u32 parse_csr_fw_css(struct intel_csr *csr, +static u32 parse_csr_fw_css(struct drm_i915_private *dev_priv, struct intel_css_header *css_header, size_t rem_size) { + struct intel_csr *csr = &dev_priv->csr; + if (rem_size < sizeof(struct intel_css_header)) { - DRM_ERROR("Truncated DMC firmware, refusing.\n"); + drm_err(&dev_priv->drm, "Truncated DMC firmware, refusing.\n"); return 0; } if (sizeof(struct intel_css_header) != (css_header->header_len * 4)) { - DRM_ERROR("DMC firmware has wrong CSS header length " + drm_err(&dev_priv->drm, "DMC firmware has wrong CSS header length " "(%u bytes)\n", (css_header->header_len * 4)); return 0; @@ -577,7 +580,7 @@ static u32 parse_csr_fw_css(struct intel_csr *csr, if (csr->required_version && css_header->version != csr->required_version) { - DRM_INFO("Refusing to load DMC firmware v%u.%u," + drm_info(&dev_priv->drm, "Refusing to load DMC firmware v%u.%u," " please use v%u.%u\n", CSR_VERSION_MAJOR(css_header->version), CSR_VERSION_MINOR(css_header->version), @@ -597,7 +600,6 @@ static void parse_csr_fw(struct drm_i915_private *dev_priv, struct intel_css_header *css_header; struct intel_package_header *package_header; struct intel_dmc_header_base *dmc_header; - struct intel_csr *csr = &dev_priv->csr; const struct stepping_info *si = intel_get_stepping_info(dev_priv); u32 readcount = 0; u32 r; @@ -607,7 +609,7 @@ static void parse_csr_fw(struct drm_i915_private *dev_priv, /* Extract CSS Header information */ css_header = (struct intel_css_header *)fw->data; - r = parse_csr_fw_css(csr, css_header, fw->size); + r = parse_csr_fw_css(dev_priv, css_header, fw->size); if (!r) return; @@ -615,7 +617,7 @@ static void parse_csr_fw(struct drm_i915_private *dev_priv, /* Extract Package Header information */ package_header = (struct intel_package_header *)&fw->data[readcount]; - r = parse_csr_fw_package(csr, package_header, si, fw->size - readcount); + r = parse_csr_fw_package(dev_priv, package_header, si, fw->size - readcount); if (!r) return; @@ -623,7 +625,7 @@ static void parse_csr_fw(struct drm_i915_private *dev_priv, /* Extract dmc_header information */ dmc_header = (struct intel_dmc_header_base *)&fw->data[readcount]; - parse_csr_fw_dmc(csr, dmc_header, fw->size - readcount); + parse_csr_fw_dmc(dev_priv, dmc_header, fw->size - readcount); } static void intel_csr_runtime_pm_get(struct drm_i915_private *dev_priv)