redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

drm/i915/gen9: Align line continuations in intel_csr.c.

Browse source 
Standard is to align continuations of parameter lists and if
conditions to the opening ( in i915 and drm code.

Apply this across the entire file since it was sticking out a bit too
much.

Cc: Damien Lespiau <damien.lespiau@intel.com>
Cc: Imre Deak <imre.deak@intel.com>
Cc: Sunil Kamath <sunil.kamath@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Signed-off-by: Animesh Manna <animesh.manna@intel.com>
[imre: removed note about reg definitions from the commit message, it's
 not relevant any more]
Signed-off-by: Imre Deak <imre.deak@intel.com>
Tested-by: Daniel Stone <daniels@collabora.com> # SKL
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1446069547-24760-6-git-send-email-imre.deak@intel.com
This commit is contained in:
Daniel Vetter 2015-10-28 23:58:59 +02:00 committed by Jani Nikula
parent 414b7999b8
commit f98f70d90e
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
drivers/gpu/drm/i915/intel_csr.c
View file

@ -232,7 +232,7 @@ void intel_csr_load_program(struct drm_device *dev)
for (i = 0; i < dev_priv->csr.mmio_count; i++) { for (i = 0; i < dev_priv->csr.mmio_count; i++) {
I915_WRITE(dev_priv->csr.mmioaddr[i], I915_WRITE(dev_priv->csr.mmioaddr[i],
dev_priv->csr.mmiodata[i]); dev_priv->csr.mmiodata[i]);
} }
} }
@ -265,9 +265,9 @@ static void finish_csr_load(const struct firmware *fw, void *context)
/* Extract CSS Header information*/ /* Extract CSS Header information*/
css_header = (struct intel_css_header *)fw->data; css_header = (struct intel_css_header *)fw->data;
if (sizeof(struct intel_css_header) != if (sizeof(struct intel_css_header) !=
(css_header->header_len * 4)) { (css_header->header_len * 4)) {
DRM_ERROR("Firmware has wrong CSS header length %u bytes\n", DRM_ERROR("Firmware has wrong CSS header length %u bytes\n",
(css_header->header_len * 4)); (css_header->header_len * 4));
goto out; goto out;
} }
@ -288,11 +288,11 @@ static void finish_csr_load(const struct firmware *fw, void *context)
/* Extract Package Header information*/ /* Extract Package Header information*/
package_header = (struct intel_package_header *) package_header = (struct intel_package_header *)
&fw->data[readcount]; &fw->data[readcount];
if (sizeof(struct intel_package_header) != if (sizeof(struct intel_package_header) !=
(package_header->header_len * 4)) { (package_header->header_len * 4)) {
DRM_ERROR("Firmware has wrong package header length %u bytes\n", DRM_ERROR("Firmware has wrong package header length %u bytes\n",
(package_header->header_len * 4)); (package_header->header_len * 4));
goto out; goto out;
} }
readcount += sizeof(struct intel_package_header); readcount += sizeof(struct intel_package_header);
@ -300,7 +300,7 @@ static void finish_csr_load(const struct firmware *fw, void *context)
/* Search for dmc_offset to find firware binary. */ /* Search for dmc_offset to find firware binary. */
for (i = 0; i < package_header->num_entries; i++) { for (i = 0; i < package_header->num_entries; i++) {
if (package_header->fw_info[i].substepping == '*' && if (package_header->fw_info[i].substepping == '*' &&
stepping == package_header->fw_info[i].stepping) { stepping == package_header->fw_info[i].stepping) {
dmc_offset = package_header->fw_info[i].offset; dmc_offset = package_header->fw_info[i].offset;
break; break;
} else if (stepping == package_header->fw_info[i].stepping && } else if (stepping == package_header->fw_info[i].stepping &&
@ -308,7 +308,7 @@ static void finish_csr_load(const struct firmware *fw, void *context)
dmc_offset = package_header->fw_info[i].offset; dmc_offset = package_header->fw_info[i].offset;
break; break;
} else if (package_header->fw_info[i].stepping == '*' && } else if (package_header->fw_info[i].stepping == '*' &&
package_header->fw_info[i].substepping == '*') package_header->fw_info[i].substepping == '*')
dmc_offset = package_header->fw_info[i].offset; dmc_offset = package_header->fw_info[i].offset;
} }
if (dmc_offset == CSR_DEFAULT_FW_OFFSET) { if (dmc_offset == CSR_DEFAULT_FW_OFFSET) {
@ -321,7 +321,7 @@ static void finish_csr_load(const struct firmware *fw, void *context)
dmc_header = (struct intel_dmc_header *)&fw->data[readcount]; dmc_header = (struct intel_dmc_header *)&fw->data[readcount];
if (sizeof(struct intel_dmc_header) != (dmc_header->header_len)) { if (sizeof(struct intel_dmc_header) != (dmc_header->header_len)) {
DRM_ERROR("Firmware has wrong dmc header length %u bytes\n", DRM_ERROR("Firmware has wrong dmc header length %u bytes\n",
(dmc_header->header_len)); (dmc_header->header_len));
goto out; goto out;
} }
readcount += sizeof(struct intel_dmc_header); readcount += sizeof(struct intel_dmc_header);
@ -329,15 +329,15 @@ static void finish_csr_load(const struct firmware *fw, void *context)
/* Cache the dmc header info. */ /* Cache the dmc header info. */
if (dmc_header->mmio_count > ARRAY_SIZE(csr->mmioaddr)) { if (dmc_header->mmio_count > ARRAY_SIZE(csr->mmioaddr)) {
DRM_ERROR("Firmware has wrong mmio count %u\n", DRM_ERROR("Firmware has wrong mmio count %u\n",
dmc_header->mmio_count); dmc_header->mmio_count);
goto out; goto out;
} }
csr->mmio_count = dmc_header->mmio_count; csr->mmio_count = dmc_header->mmio_count;
for (i = 0; i < dmc_header->mmio_count; i++) { for (i = 0; i < dmc_header->mmio_count; i++) {
if (dmc_header->mmioaddr[i] < CSR_MMIO_START_RANGE || if (dmc_header->mmioaddr[i] < CSR_MMIO_START_RANGE ||
dmc_header->mmioaddr[i] > CSR_MMIO_END_RANGE) { dmc_header->mmioaddr[i] > CSR_MMIO_END_RANGE) {
DRM_ERROR(" Firmware has wrong mmio address 0x%x\n", DRM_ERROR(" Firmware has wrong mmio address 0x%x\n",
dmc_header->mmioaddr[i]); dmc_header->mmioaddr[i]);
goto out; goto out;
} }
csr->mmioaddr[i] = dmc_header->mmioaddr[i]; csr->mmioaddr[i] = dmc_header->mmioaddr[i];
@ -415,9 +415,9 @@ void intel_csr_ucode_init(struct drm_device *dev)
/* CSR supported for platform, load firmware */ /* CSR supported for platform, load firmware */
ret = request_firmware_nowait(THIS_MODULE, true, csr->fw_path, ret = request_firmware_nowait(THIS_MODULE, true, csr->fw_path,
&dev_priv->dev->pdev->dev, &dev_priv->dev->pdev->dev,
GFP_KERNEL, dev_priv, GFP_KERNEL, dev_priv,
finish_csr_load); finish_csr_load);
if (ret) if (ret)
i915_firmware_load_error_print(csr->fw_path, ret); i915_firmware_load_error_print(csr->fw_path, ret);
} }