| Message ID | 20200207135048.2788199-1-chris@chris-wilson.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915: Fix force-probe failure message | expand |
On Fri, 07 Feb 2020, Chris Wilson <chris@chris-wilson.co.uk> wrote: > Do not try and deference 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> Whoops! Reviewed-by: Jani Nikula <jani.nikula@intel.com> > --- > drivers/gpu/drm/i915/i915_pci.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c > index da337aee632e..24b1f0ce8743 100644 > --- 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)) { > - drm_info(&pdev_to_i915(pdev)->drm, > + dev_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"
diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c index da337aee632e..24b1f0ce8743 100644 --- 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)) { - drm_info(&pdev_to_i915(pdev)->drm, + dev_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"
Do not try and deference 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> --- drivers/gpu/drm/i915/i915_pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)