Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b8e1a89 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/bios: rename intel_parse_bios to intel_bios_init 



While at it, move the declaration to where everything else is declared.

Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/7d9d879603038889f0128cf7cbbd9f591edc11dd.1450089383.git.jani.nikula@intel.com
parent e2051c44

drivers/gpu/drm/i915/i915_dma.c

+1 −1
Original line number Diff line number Diff line
@@ -370,7 +370,7 @@ static int i915_load_modeset_init(struct drm_device *dev) 
	struct drm_i915_private *dev_priv = dev->dev_private;

	int ret;



	ret = intel_parse_bios(dev);

	ret = intel_bios_init(dev);

	if (ret)

		DRM_INFO("failed to find VBIOS tables\n");

drivers/gpu/drm/i915/i915_drv.h

+3 −0
Original line number Diff line number Diff line
@@ -3352,6 +3352,9 @@ static inline bool intel_gmbus_is_forced_bit(struct i2c_adapter *adapter) 
}

extern void intel_i2c_reset(struct drm_device *dev);



/* intel_bios.c */

int intel_bios_init(struct drm_device *dev);



/* intel_opregion.c */

#ifdef CONFIG_ACPI

extern int intel_opregion_setup(struct drm_device *dev);

drivers/gpu/drm/i915/intel_bios.c

+2 −2
Original line number Diff line number Diff line
@@ -1282,7 +1282,7 @@ static const struct vbt_header *find_vbt(void __iomem *bios, size_t size) 
}



/**

 * intel_parse_bios - find VBT and initialize settings from the BIOS

 * intel_bios_init - find VBT and initialize settings from the BIOS

 * @dev: DRM device

 *

 * Loads the Video BIOS and checks that the VBT exists.  Sets scratch registers
@@ -1291,7 +1291,7 @@ static const struct vbt_header *find_vbt(void __iomem *bios, size_t size) 
 * Returns 0 on success, nonzero on failure.

 */

int

intel_parse_bios(struct drm_device *dev)

intel_bios_init(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct pci_dev *pdev = dev->pdev;

drivers/gpu/drm/i915/intel_bios.h

+0 −2
Original line number Diff line number Diff line
@@ -588,8 +588,6 @@ struct bdb_psr { 
	struct psr_table psr_table[16];

} __packed;



int intel_parse_bios(struct drm_device *dev);



/*

 * Driver<->VBIOS interaction occurs through scratch bits in

 * GR18 & SWF*.