drm/i915/dmc: s/DRM_ERROR/drm_err

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.

v2: use container_of() (Jani)
v3: Indentation fixes. (Jani)

Cc: Jani Nikula <jani.nikula@linux.intel.com>
Suggested-by: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210526220256.4097-2-anusha.srivatsa@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c b/drivers/gpu/drm/i915/display/intel_dmc.c
index 560574dd929acf4a0d2a79739ae07416f86f6196..5e9c0b509034753a735ea7e5761a581c91ee09ca 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dmc.c
+++ b/drivers/gpu/drm/i915/display/intel_dmc.c
@@ -395,6 +395,7 @@ static u32 parse_dmc_fw_header(struct intel_dmc *dmc,
                               const struct intel_dmc_header_base *dmc_header,
                               size_t rem_size)
 {
+       struct drm_i915_private *i915 = container_of(dmc, typeof(*i915), dmc);
        unsigned int header_len_bytes, dmc_header_size, payload_size, i;
        const u32 *mmioaddr, *mmiodata;
        u32 mmio_count, mmio_count_max;
@@ -439,28 +440,28 @@ static u32 parse_dmc_fw_header(struct intel_dmc *dmc,
                header_len_bytes = dmc_header->header_len;
                dmc_header_size = sizeof(*v1);
        } else {
-               DRM_ERROR("Unknown DMC fw header version: %u\n",
-                         dmc_header->header_ver);
+               drm_err(&i915->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 "
-                         "(%u bytes)\n", header_len_bytes);
+               drm_err(&i915->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(&i915->drm, "DMC firmware has wrong mmio count %u\n", mmio_count);
                return 0;
        }
 
        for (i = 0; i < mmio_count; i++) {
                if (mmioaddr[i] < DMC_MMIO_START_RANGE ||
                    mmioaddr[i] > DMC_MMIO_END_RANGE) {
-                       DRM_ERROR("DMC firmware has wrong mmio address 0x%x\n",
-                                 mmioaddr[i]);
+                       drm_err(&i915->drm, "DMC firmware has wrong mmio address 0x%x\n",
+                               mmioaddr[i]);
                        return 0;
                }
                dmc->mmioaddr[i] = _MMIO(mmioaddr[i]);
@@ -476,16 +477,14 @@ static u32 parse_dmc_fw_header(struct intel_dmc *dmc,
                goto error_truncated;
 
        if (payload_size > dmc->max_fw_size) {
-               DRM_ERROR("DMC FW too big (%u bytes)\n", payload_size);
+               drm_err(&i915->drm, "DMC FW too big (%u bytes)\n", payload_size);
                return 0;
        }
        dmc->dmc_fw_size = dmc_header->fw_size;
 
        dmc->dmc_payload = kmalloc(payload_size, GFP_KERNEL);
-       if (!dmc->dmc_payload) {
-               DRM_ERROR("Memory allocation failed for dmc payload\n");
+       if (!dmc->dmc_payload)
                return 0;
-       }
 
        payload = (u8 *)(dmc_header) + header_len_bytes;
        memcpy(dmc->dmc_payload, payload, payload_size);
@@ -493,7 +492,7 @@ static u32 parse_dmc_fw_header(struct intel_dmc *dmc,
        return header_len_bytes + payload_size;
 
 error_truncated:
-       DRM_ERROR("Truncated DMC firmware, refusing.\n");
+       drm_err(&i915->drm, "Truncated DMC firmware, refusing.\n");
        return 0;
 }
 
@@ -503,6 +502,7 @@ parse_dmc_fw_package(struct intel_dmc *dmc,
                     const struct stepping_info *si,
                     size_t rem_size)
 {
+       struct drm_i915_private *i915 = container_of(dmc, typeof(*i915), dmc);
        u32 package_size = sizeof(struct intel_package_header);
        u32 num_entries, max_entries, dmc_offset;
        const struct intel_fw_info *fw_info;
@@ -515,8 +515,8 @@ parse_dmc_fw_package(struct intel_dmc *dmc,
        } 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",
-                         package_header->header_ver);
+               drm_err(&i915->drm, "DMC firmware has unknown header version %u\n",
+                       package_header->header_ver);
                return 0;
        }
 
@@ -529,8 +529,8 @@ parse_dmc_fw_package(struct intel_dmc *dmc,
                goto error_truncated;
 
        if (package_header->header_len * 4 != package_size) {
-               DRM_ERROR("DMC firmware has wrong package header length "
-                         "(%u bytes)\n", package_size);
+               drm_err(&i915->drm, "DMC firmware has wrong package header length "
+                       "(%u bytes)\n", package_size);
                return 0;
        }
 
@@ -543,8 +543,8 @@ parse_dmc_fw_package(struct intel_dmc *dmc,
        dmc_offset = find_dmc_fw_offset(fw_info, num_entries, si,
                                        package_header->header_ver);
        if (dmc_offset == DMC_DEFAULT_FW_OFFSET) {
-               DRM_ERROR("DMC firmware not supported for %c stepping\n",
-                         si->stepping);
+               drm_err(&i915->drm, "DMC firmware not supported for %c stepping\n",
+                       si->stepping);
                return 0;
        }
 
@@ -552,7 +552,7 @@ parse_dmc_fw_package(struct intel_dmc *dmc,
        return package_size + dmc_offset * 4;
 
 error_truncated:
-       DRM_ERROR("Truncated DMC firmware, refusing.\n");
+       drm_err(&i915->drm, "Truncated DMC firmware, refusing.\n");
        return 0;
 }
 
@@ -561,22 +561,24 @@ static u32 parse_dmc_fw_css(struct intel_dmc *dmc,
                            struct intel_css_header *css_header,
                            size_t rem_size)
 {
+       struct drm_i915_private *i915 = container_of(dmc, typeof(*i915), dmc);
+
        if (rem_size < sizeof(struct intel_css_header)) {
-               DRM_ERROR("Truncated DMC firmware, refusing.\n");
+               drm_err(&i915->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 "
-                         "(%u bytes)\n",
-                         (css_header->header_len * 4));
+               drm_err(&i915->drm, "DMC firmware has wrong CSS header length "
+                       "(%u bytes)\n",
+                       (css_header->header_len * 4));
                return 0;
        }
 
        if (dmc->required_version &&
            css_header->version != dmc->required_version) {
-               DRM_INFO("Refusing to load DMC firmware v%u.%u,"
+               drm_info(&i915->drm, "Refusing to load DMC firmware v%u.%u,"
                         " please use v%u.%u\n",
                         DMC_VERSION_MAJOR(css_header->version),
                         DMC_VERSION_MINOR(css_header->version),