openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i915/gen9: Simplify csr loading failure printing. 

If we really want to we can be more verbose here, but we really don't
need an entire function for this.

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>
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-7-git-send-email-imre.deak@intel.com
This commit is contained in:
Daniel Vetter 2015-10-28 23:59:00 +02:00 committed by Jani Nikula
parent f98f70d90e
commit c729ed88af
3 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/gpu/drm/i915/i915_drv.c
View File

@ -604,26 +604,6 @@ bool i915_semaphore_is_enabled(struct drm_device *dev)
return true; return true;
} }
void i915_firmware_load_error_print(const char *fw_path, int err)
{
DRM_ERROR("failed to load firmware %s (%d)\n", fw_path, err);
/*
* If the reason is not known assume -ENOENT since that's the most
* usual failure mode.
*/
if (!err)
err = -ENOENT;
if (!(IS_BUILTIN(CONFIG_DRM_I915) && err == -ENOENT))
return;
DRM_ERROR(
"The driver is built-in, so to load the firmware you need to\n"
"include it either in the kernel (see CONFIG_EXTRA_FIRMWARE) or\n"
"in your initrd/initramfs image.\n");
}
static void intel_suspend_encoders(struct drm_i915_private *dev_priv) static void intel_suspend_encoders(struct drm_i915_private *dev_priv)
{ {
struct drm_device *dev = dev_priv->dev; struct drm_device *dev = dev_priv->dev;

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

@ -2688,7 +2688,6 @@ extern unsigned long i915_mch_val(struct drm_i915_private *dev_priv);
extern unsigned long i915_gfx_val(struct drm_i915_private *dev_priv); extern unsigned long i915_gfx_val(struct drm_i915_private *dev_priv);
extern void i915_update_gfx_val(struct drm_i915_private *dev_priv); extern void i915_update_gfx_val(struct drm_i915_private *dev_priv);
int vlv_force_gfx_clock(struct drm_i915_private *dev_priv, bool on); int vlv_force_gfx_clock(struct drm_i915_private *dev_priv, bool on);
void i915_firmware_load_error_print(const char *fw_path, int err);
/* intel_hotplug.c */ /* intel_hotplug.c */
void intel_hpd_irq_handler(struct drm_device *dev, u32 pin_mask, u32 long_mask); void intel_hpd_irq_handler(struct drm_device *dev, u32 pin_mask, u32 long_mask);

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

@ -374,7 +374,7 @@ static void finish_csr_load(const struct firmware *fw, void *context)
CSR_VERSION_MAJOR(csr->version), CSR_VERSION_MAJOR(csr->version),
CSR_VERSION_MINOR(csr->version)); CSR_VERSION_MINOR(csr->version));
} else { } else {
i915_firmware_load_error_print(csr->fw_path, 0); DRM_ERROR("Failed to load DMC firmware, disabling rpm\n");
} }
release_firmware(fw); release_firmware(fw);
@ -418,8 +418,10 @@ void intel_csr_ucode_init(struct drm_device *dev)
&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); DRM_ERROR("Failed to load DMC firmware, disabling rpm (%d)\n",
ret);
} }
/** /**