Skip to content

Commit

Permalink
drm/i915: Fix force-probe failure message
Browse files Browse the repository at this point in the history
Do not try and dereference the i915 private before it has been allocated
and attached to the drvdata!

Fixes: 7daac72 ("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
  • Loading branch information
Chris Wilson committed Feb 7, 2020
1 parent 9adcf0d commit 71b7cc6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/gpu/drm/i915/i915_pci.c
Original file line number Diff line number Diff line change
@@ -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"

0 comments on commit 71b7cc6

Please sign in to comment.