diff options
| author |   Daniel Vetter <daniel.vetter@intel.com> | 2015-10-28 23:59:00 +0200 |
|---|---|---|
| committer |   Jani Nikula <jani.nikula@intel.com> | 2015-11-12 17:20:48 +0200 |
| commit | c729ed88af7b5266325d324672c4fdf8debd70a9 (patch) | |
| tree | 5af243b3175c21034218dd1cab270af4b86a0af0 /drivers/gpu/drm/i915/intel_csr.c | |
| parent | drm/i915/gen9: Align line continuations in intel_csr.c. (diff) | |
| download | linux-dev-c729ed88af7b5266325d324672c4fdf8debd70a9.tar.xz linux-dev-c729ed88af7b5266325d324672c4fdf8debd70a9.zip | |
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
Diffstat (limited to 'drivers/gpu/drm/i915/intel_csr.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_csr.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c index c52b2a46bb6f..4bd2747d9c92 100644 --- a/drivers/gpu/drm/i915/intel_csr.c +++ b/drivers/gpu/drm/i915/intel_csr.c @@ -374,7 +374,7 @@ out: CSR_VERSION_MAJOR(csr->version), CSR_VERSION_MINOR(csr->version)); } else { - i915_firmware_load_error_print(csr->fw_path, 0); + DRM_ERROR("Failed to load DMC firmware, disabling rpm\n"); } release_firmware(fw); @@ -418,8 +418,10 @@ void intel_csr_ucode_init(struct drm_device *dev) &dev_priv->dev->pdev->dev, GFP_KERNEL, dev_priv, finish_csr_load); + if (ret) - i915_firmware_load_error_print(csr->fw_path, ret); + DRM_ERROR("Failed to load DMC firmware, disabling rpm (%d)\n", + ret); } /** |