git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge v5.2-rc5 into drm-next
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
i915
/
intel_csr.c
diff --git
a/drivers/gpu/drm/i915/intel_csr.c
b/drivers/gpu/drm/i915/intel_csr.c
index 96618af470887d18ba93be9cfd848a212331e1b4..bf0eebd385b9dd8ab281a7cb4066fc518f740fbf 100644
(file)
--- a/
drivers/gpu/drm/i915/intel_csr.c
+++ b/
drivers/gpu/drm/i915/intel_csr.c
@@
-547,8
+547,6
@@
void intel_csr_ucode_init(struct drm_i915_private *dev_priv)
if (csr->fw_path == NULL) {
DRM_DEBUG_KMS("No known CSR firmware for platform, disabling runtime PM\n");
- WARN_ON(!IS_ALPHA_SUPPORT(INTEL_INFO(dev_priv)));
-
return;
}