Commit 71b7cc60 authored by Chris Wilson's avatar Chris Wilson

drm/i915: Fix force-probe failure message

Do not try and dereference the i915 private before it has been allocated
and attached to the drvdata!

Fixes: 7daac72e ("drm/i915/pci: conversion to drm_device based logging macros.")
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200207135048.2788199-1-chris@chris-wilson.co.uk
parent 9adcf0db
...@@ -963,7 +963,7 @@ static int i915_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -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 && if (intel_info->require_force_probe &&
!force_probe(pdev->device, i915_modparams.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" "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" "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" "module parameter or CONFIG_DRM_I915_FORCE_PROBE=%04x configuration option,\n"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment