From d8fb3fd1983067961520befad49b6072a23951e5 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Fri, 7 Feb 2020 13:50:48 +0000 Subject: [PATCH] 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: 501ed4b07b31 ("drm/i915/pci: conversion to drm_device based logging macros.") Signed-off-by: Chris Wilson Cc: Wambui Karuga Cc: Jani Nikula Reviewed-by: Jani Nikula Link: https://patchwork.freedesktop.org/patch/msgid/20200207135048.2788199-1-chris@chris-wilson.co.uk --- 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 da337aee632e8..24b1f0ce87435 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" -- 2.39.5