Like parse_csr_fw_css() this parses the package_header from firmware and
saves the relevant fields in the csr struct. In this function we also
lookup the fw_info we are interested in.
Signed-off-by: Lucas De Marchi <lucas.demar...@intel.com>
---
drivers/gpu/drm/i915/intel_csr.c | 94 +++++++++++++++++++-------------
1 file changed, 55 insertions(+), 39 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c
index 7e53bf576892..b19742becb98 100644
--- a/drivers/gpu/drm/i915/intel_csr.c
+++ b/drivers/gpu/drm/i915/intel_csr.c
@@ -332,6 +332,56 @@ static u32 find_dmc_fw_offset(const struct intel_fw_info
*fw_info,
return dmc_offset;
}
+static u32
+parse_csr_fw_package(struct intel_csr *csr,
+ const struct intel_package_header *package_header,
+ const struct stepping_info *si)
+{
+ u32 num_entries, max_entries, dmc_offset, r;
+ const struct intel_fw_info *fw_info;
+
+ if (package_header->header_ver == 1) {
+ max_entries = PACKAGE_MAX_FW_INFO_ENTRIES;
+ } 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);
+ return 0;
+ }
+
+ if (package_header->header_len * 4 !=
+ sizeof(struct intel_package_header) +
+ max_entries * sizeof(struct intel_fw_info)) {
+ DRM_ERROR("DMC firmware has wrong package header length "
+ "(%u bytes)\n", package_header->header_len * 4);
+ return 0;
+ }
+
+ num_entries = package_header->num_entries;
+ if (WARN_ON(package_header->num_entries > max_entries))
+ num_entries = max_entries;
+
+ fw_info = (const struct intel_fw_info *)
+ ((u8 *)package_header + sizeof(*package_header));
+ dmc_offset = find_dmc_fw_offset(fw_info, num_entries, si);
+ if (dmc_offset == CSR_DEFAULT_FW_OFFSET) {
+ DRM_ERROR("DMC firmware not supported for %c stepping\n",
+ si->stepping);
+ return 0;
+ }
+
+ r = sizeof(struct intel_package_header);
+
+ /* we always have space for max_entries, even if not all are used */
+ r += max_entries * sizeof(struct intel_fw_info);
+
+ /* dmc_offset is in dwords */
+ r += dmc_offset * 4;
+
+ return r;
+}
+
/* Return number of bytes parsed or 0 on error */
static u32 parse_csr_fw_css(struct intel_csr *csr,
struct intel_css_header *css_header)
@@ -368,7 +418,7 @@ static u32 *parse_csr_fw(struct drm_i915_private *dev_priv,
struct intel_dmc_header *dmc_header;
struct intel_csr *csr = &dev_priv->csr;
const struct stepping_info *si = intel_get_stepping_info(dev_priv);
- u32 dmc_offset, num_entries, max_entries, readcount = 0, nbytes;
+ u32 readcount = 0, nbytes;
u32 i, r;
u32 *dmc_payload;
@@ -384,46 +434,12 @@ static u32 *parse_csr_fw(struct drm_i915_private
*dev_priv,
readcount += r;
/* Extract Package Header information*/
- package_header = (struct intel_package_header *)
- &fw->data[readcount];
-
- readcount += sizeof(struct intel_package_header);
-
- if (package_header->header_ver == 1) {
- max_entries = PACKAGE_MAX_FW_INFO_ENTRIES;
- } 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);
- return NULL;
- }
-
- if (package_header->header_len * 4 !=
- sizeof(struct intel_package_header) +
- max_entries * sizeof(struct intel_fw_info)) {
- DRM_ERROR("DMC firmware has wrong package header length "
- "(%u bytes)\n", package_header->header_len * 4);
- return NULL;
- }
-
- num_entries = package_header->num_entries;
- if (WARN_ON(package_header->num_entries > max_entries))
- num_entries = max_entries;
-
- dmc_offset = find_dmc_fw_offset((struct intel_fw_info *)
- &fw->data[readcount], num_entries, si);
- if (dmc_offset == CSR_DEFAULT_FW_OFFSET) {
- DRM_ERROR("DMC firmware not supported for %c stepping\n",
- si->stepping);
+ package_header = (struct intel_package_header *)&fw->data[readcount];
+ r = parse_csr_fw_package(csr, package_header, si);
+ if (!r)
return NULL;
- }
- /* we always have space for max_entries, even if not all are used */
- readcount += max_entries * sizeof(struct intel_fw_info);
- /* Convert dmc_offset into number of bytes. By default it is in dwords*/
- dmc_offset *= 4;
- readcount += dmc_offset;
+ readcount += r;
/* Extract dmc_header information. */
dmc_header = (struct intel_dmc_header *)&fw->data[readcount];
--
2.21.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
