projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9adcf0d
)
drm/i915: Fix force-probe failure message
author
Chris Wilson
<chris@chris-wilson.co.uk>
Fri, 7 Feb 2020 13:50:48 +0000
(13:50 +0000)
committer
Chris Wilson
<chris@chris-wilson.co.uk>
Fri, 7 Feb 2020 17:12:21 +0000
(17:12 +0000)
Do not try and dereference the i915 private before it has been allocated
and attached to the drvdata!
Fixes:
7daac72e9a3f
("drm/i915/pci: conversion to drm_device based logging macros.")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Link:
https://patchwork.freedesktop.org/patch/msgid/20200207135048.2788199-1-chris@chris-wilson.co.uk
drivers/gpu/drm/i915/i915_pci.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/i915/i915_pci.c
b/drivers/gpu/drm/i915/i915_pci.c
index
da337ae
..
24b1f0c
100644
(file)
--- a/
drivers/gpu/drm/i915/i915_pci.c
+++ b/
drivers/gpu/drm/i915/i915_pci.c
@@
-963,7
+963,7
@@
static int i915_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
if (intel_info->require_force_probe &&
!force_probe(pdev->device, i915_modparams.force_probe)) {
- d
rm_info(&pdev_to_i915(pdev)->drm
,
+ d
ev_info(&pdev->dev
,
"Your graphics device %04x is not properly supported by the driver in this\n"
"kernel version. To force driver probe anyway, use i915.force_probe=%04x\n"
"module parameter or CONFIG_DRM_I915_FORCE_PROBE=%04x configuration option,\n"