leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/i915/csr: keep firmware name and required version together

Browse Source 
Having two separate if ladders gets increasingly hard to maintain. Put
them together.

v2: Rebase

Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180926133414.22073-1-jani.nikula@intel.com
This commit is contained in:
Jani Nikula 2018-09-26 16:34:12 +03:00
parent 029c33add9
commit 180e9d230e
2 changed files with 25 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/i915/i915_drv.h
View File

@ -465,6 +465,7 @@ struct drm_i915_display_funcs {
struct intel_csr { struct intel_csr {
struct work_struct work; struct work_struct work;
const char *fw_path; const char *fw_path;
uint32_t required_version;
uint32_t *dmc_payload; uint32_t *dmc_payload;
uint32_t dmc_fw_size; uint32_t dmc_fw_size;
uint32_t version; uint32_t version;

59
drivers/gpu/drm/i915/intel_csr.c
View File

@ -287,7 +287,6 @@ static uint32_t *parse_csr_fw(struct drm_i915_private *dev_priv,
uint32_t max_fw_size = 0; uint32_t max_fw_size = 0;
uint32_t i; uint32_t i;
uint32_t *dmc_payload; uint32_t *dmc_payload;
uint32_t required_version;
if (!fw) if (!fw)
return NULL; return NULL;
@ -302,38 +301,19 @@ static uint32_t *parse_csr_fw(struct drm_i915_private *dev_priv,
return NULL; return NULL;
} }
csr->version = css_header->version; if (csr->required_version &&
css_header->version != csr->required_version) {
if (csr->fw_path == i915_modparams.dmc_firmware_path) {
/* Bypass version check for firmware override. */
required_version = csr->version;
} else if (IS_ICELAKE(dev_priv)) {
required_version = ICL_CSR_VERSION_REQUIRED;
} else if (IS_CANNONLAKE(dev_priv)) {
required_version = CNL_CSR_VERSION_REQUIRED;
} else if (IS_GEMINILAKE(dev_priv)) {
required_version = GLK_CSR_VERSION_REQUIRED;
} else if (IS_KABYLAKE(dev_priv) || IS_COFFEELAKE(dev_priv)) {
required_version = KBL_CSR_VERSION_REQUIRED;
} else if (IS_SKYLAKE(dev_priv)) {
required_version = SKL_CSR_VERSION_REQUIRED;
} else if (IS_BROXTON(dev_priv)) {
required_version = BXT_CSR_VERSION_REQUIRED;
} else {
MISSING_CASE(INTEL_REVID(dev_priv));
required_version = 0;
}
if (csr->version != required_version) {
DRM_INFO("Refusing to load DMC firmware v%u.%u," DRM_INFO("Refusing to load DMC firmware v%u.%u,"
" please use v%u.%u\n", " please use v%u.%u\n",
CSR_VERSION_MAJOR(csr->version), CSR_VERSION_MAJOR(css_header->version),
CSR_VERSION_MINOR(csr->version), CSR_VERSION_MINOR(css_header->version),
CSR_VERSION_MAJOR(required_version), CSR_VERSION_MAJOR(csr->required_version),
CSR_VERSION_MINOR(required_version)); CSR_VERSION_MINOR(csr->required_version));
return NULL; return NULL;
} }
csr->version = css_header->version;
readcount += sizeof(struct intel_css_header); readcount += sizeof(struct intel_css_header);
/* Extract Package Header information*/ /* Extract Package Header information*/
@ -474,20 +454,29 @@ void intel_csr_ucode_init(struct drm_i915_private *dev_priv)
if (!HAS_CSR(dev_priv)) if (!HAS_CSR(dev_priv))
return; return;
if (i915_modparams.dmc_firmware_path) if (i915_modparams.dmc_firmware_path) {
csr->fw_path = i915_modparams.dmc_firmware_path; csr->fw_path = i915_modparams.dmc_firmware_path;
else if (IS_ICELAKE(dev_priv)) /* Bypass version check for firmware override. */
csr->required_version = 0;
} else if (IS_ICELAKE(dev_priv)) {
csr->fw_path = I915_CSR_ICL; csr->fw_path = I915_CSR_ICL;
else if (IS_CANNONLAKE(dev_priv)) csr->required_version = ICL_CSR_VERSION_REQUIRED;
} else if (IS_CANNONLAKE(dev_priv)) {
csr->fw_path = I915_CSR_CNL; csr->fw_path = I915_CSR_CNL;
else if (IS_GEMINILAKE(dev_priv)) csr->required_version = CNL_CSR_VERSION_REQUIRED;
} else if (IS_GEMINILAKE(dev_priv)) {
csr->fw_path = I915_CSR_GLK; csr->fw_path = I915_CSR_GLK;
else if (IS_KABYLAKE(dev_priv) || IS_COFFEELAKE(dev_priv)) csr->required_version = GLK_CSR_VERSION_REQUIRED;
} else if (IS_KABYLAKE(dev_priv) || IS_COFFEELAKE(dev_priv)) {
csr->fw_path = I915_CSR_KBL; csr->fw_path = I915_CSR_KBL;
else if (IS_SKYLAKE(dev_priv)) csr->required_version = KBL_CSR_VERSION_REQUIRED;
} else if (IS_SKYLAKE(dev_priv)) {
csr->fw_path = I915_CSR_SKL; csr->fw_path = I915_CSR_SKL;
else if (IS_BROXTON(dev_priv)) csr->required_version = SKL_CSR_VERSION_REQUIRED;
} else if (IS_BROXTON(dev_priv)) {
csr->fw_path = I915_CSR_BXT; csr->fw_path = I915_CSR_BXT;
csr->required_version = BXT_CSR_VERSION_REQUIRED;
}
/* /*
* Obtain a runtime pm reference, until CSR is loaded, * Obtain a runtime pm reference, until CSR is loaded,