xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/i915/dmc: remove redundant return in parse_csr_fw()

Browse Source 
parse_csr_fw() is responsible to set up several fields in struct intel_csr,
including the payload. We don't need to assign it again.

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190607091230.1489-9-lucas.demarchi@intel.com
This commit is contained in:
Lucas De Marchi
2019-06-07 02:12:29 -07:00
parent 0703a53b81
commit 8132b8d182
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -557,7 +557,7 @@ static u32 parse_csr_fw_css(struct intel_csr *csr,
return sizeof(struct intel_css_header); return sizeof(struct intel_css_header);
} }
static u32 *parse_csr_fw(struct drm_i915_private *dev_priv, static void parse_csr_fw(struct drm_i915_private *dev_priv,
const struct firmware *fw) const struct firmware *fw)
{ {
struct intel_css_header *css_header; struct intel_css_header *css_header;
@@ -569,13 +569,13 @@ static u32 *parse_csr_fw(struct drm_i915_private *dev_priv,
u32 r; u32 r;
if (!fw) if (!fw)
return NULL; return;
/* Extract CSS Header information */ /* Extract CSS Header information */
css_header = (struct intel_css_header *)fw->data; css_header = (struct intel_css_header *)fw->data;
r = parse_csr_fw_css(csr, css_header, fw->size); r = parse_csr_fw_css(csr, css_header, fw->size);
if (!r) if (!r)
return NULL; return;
readcount += r; readcount += r;
@@ -583,17 +583,13 @@ static u32 *parse_csr_fw(struct drm_i915_private *dev_priv,
package_header = (struct intel_package_header *)&fw->data[readcount]; 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(csr, package_header, si, fw->size - readcount);
if (!r) if (!r)
return NULL; return;
readcount += r; readcount += r;
/* Extract dmc_header information */ /* Extract dmc_header information */
dmc_header = (struct intel_dmc_header_base *)&fw->data[readcount]; dmc_header = (struct intel_dmc_header_base *)&fw->data[readcount];
r = parse_csr_fw_dmc(csr, dmc_header, fw->size - readcount); parse_csr_fw_dmc(csr, dmc_header, fw->size - readcount);
if (!r)
return NULL;
return csr->dmc_payload;
} }
static void intel_csr_runtime_pm_get(struct drm_i915_private *dev_priv) static void intel_csr_runtime_pm_get(struct drm_i915_private *dev_priv)
@@ -621,8 +617,7 @@ static void csr_load_work_fn(struct work_struct *work)
csr = &dev_priv->csr; csr = &dev_priv->csr;
request_firmware(&fw, dev_priv->csr.fw_path, &dev_priv->drm.pdev->dev); request_firmware(&fw, dev_priv->csr.fw_path, &dev_priv->drm.pdev->dev);
if (fw) parse_csr_fw(dev_priv, fw);
dev_priv->csr.dmc_payload = parse_csr_fw(dev_priv, fw);
if (dev_priv->csr.dmc_payload) { if (dev_priv->csr.dmc_payload) {
intel_csr_load_program(dev_priv); intel_csr_load_program(dev_priv);