OSDN Git Service

drm/i915: Fix oops on platforms w/o hpd support
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Thu, 14 Oct 2021 09:09:41 +0000 (12:09 +0300)
committerVille Syrjälä <ville.syrjala@linux.intel.com>
Thu, 14 Oct 2021 20:23:55 +0000 (23:23 +0300)
We don't have hpd support on i8xx/i915 which means hotplug_funcs==NULL.
Let's not oops when loading the driver on one those machines.

v2: Drop the redundant function pointer check (Jani)

Cc: Dave Airlie <airlied@redhat.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Fixes: cd030c7c11a4 ("drm/i915: constify hotplug function vtable.")
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211014090941.12159-5-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/display/intel_hotplug.c

index 3c1cec9..955f6d0 100644 (file)
@@ -215,7 +215,7 @@ intel_hpd_irq_storm_switch_to_polling(struct drm_i915_private *dev_priv)
 
 static void intel_hpd_irq_setup(struct drm_i915_private *i915)
 {
-       if (i915->display_irqs_enabled && i915->hotplug_funcs->hpd_irq_setup)
+       if (i915->display_irqs_enabled && i915->hotplug_funcs)
                i915->hotplug_funcs->hpd_irq_setup(i915);
 }