Commit 15e4f0b5 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/display: rename intel_modeset_probe_defer() -> intel_display_driver_probe_defer() 



Follow the usual naming conventions.

Reviewed-by: default avatarGustavo Sousa <gustavo.sousa@intel.com>
Reviewed-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ab5023570d8ae55c0d9c98c78f588e51c0790b6c.1681465222.git.jani.nikula@intel.com
parent ff2c80be

drivers/gpu/drm/i915/display/intel_display_driver.c

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#include "intel_fbdev.h"

#include "intel_opregion.h"



bool intel_modeset_probe_defer(struct pci_dev *pdev)

bool intel_display_driver_probe_defer(struct pci_dev *pdev)

{

	struct drm_privacy_screen *privacy_screen;

drivers/gpu/drm/i915/display/intel_display_driver.h

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
struct drm_i915_private;

struct pci_dev;



bool intel_modeset_probe_defer(struct pci_dev *pdev);

bool intel_display_driver_probe_defer(struct pci_dev *pdev);

void intel_display_driver_register(struct drm_i915_private *i915);

void intel_display_driver_unregister(struct drm_i915_private *i915);

drivers/gpu/drm/i915/i915_pci.c

+1 −1
Original line number Diff line number Diff line
@@ -1354,7 +1354,7 @@ static int i915_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		return -ENXIO;



	/* Detect if we need to wait for other drivers early on */

	if (intel_modeset_probe_defer(pdev))

	if (intel_display_driver_probe_defer(pdev))

		return -EPROBE_DEFER;



	err = i915_driver_probe(pdev, ent);