]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drm/i915: Fix force-probe failure message
authorChris Wilson <chris@chris-wilson.co.uk>
Fri, 7 Feb 2020 13:50:48 +0000 (13:50 +0000)
committerChris 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

index da337aee632e82f756f3c1008d4fef45507d41db..24b1f0ce8743583626f7df5e78aeb2899e7f730c 100644 (file)
@@ -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"