Commit b8d65b8a authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/driver: add i915_driver_ prefix to functions 



Add the i915_driver_ prefix to the switcheroo functions in
i915_driver.[ch].

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20211111101304.13094-3-jani.nikula@intel.com
parent 4588d7eb

drivers/gpu/drm/i915/i915_driver.c

+3 −2
Original line number Diff line number Diff line
@@ -1220,7 +1220,8 @@ static int i915_drm_suspend_late(struct drm_device *dev, bool hibernation) 
	return ret;

}



int i915_suspend_switcheroo(struct drm_i915_private *i915, pm_message_t state)

int i915_driver_suspend_switcheroo(struct drm_i915_private *i915,

				   pm_message_t state)

{

	int error;
@@ -1381,7 +1382,7 @@ static int i915_drm_resume_early(struct drm_device *dev) 
	return ret;

}



int i915_resume_switcheroo(struct drm_i915_private *i915)

int i915_driver_resume_switcheroo(struct drm_i915_private *i915)

{

	int ret;

drivers/gpu/drm/i915/i915_driver.h

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent); 
void i915_driver_remove(struct drm_i915_private *i915);

void i915_driver_shutdown(struct drm_i915_private *i915);



int i915_resume_switcheroo(struct drm_i915_private *i915);

int i915_suspend_switcheroo(struct drm_i915_private *i915, pm_message_t state);

int i915_driver_resume_switcheroo(struct drm_i915_private *i915);

int i915_driver_suspend_switcheroo(struct drm_i915_private *i915, pm_message_t state);



#endif /* __I915_DRIVER_H__ */

drivers/gpu/drm/i915/i915_switcheroo.c

+2 −2
Original line number Diff line number Diff line
@@ -25,12 +25,12 @@ static void i915_switcheroo_set_state(struct pci_dev *pdev, 
		i915->drm.switch_power_state = DRM_SWITCH_POWER_CHANGING;

		/* i915 resume handler doesn't set to D0 */

		pci_set_power_state(pdev, PCI_D0);

		i915_resume_switcheroo(i915);

		i915_driver_resume_switcheroo(i915);

		i915->drm.switch_power_state = DRM_SWITCH_POWER_ON;

	} else {

		drm_info(&i915->drm, "switched off\n");

		i915->drm.switch_power_state = DRM_SWITCH_POWER_CHANGING;

		i915_suspend_switcheroo(i915, pmm);

		i915_driver_suspend_switcheroo(i915, pmm);

		i915->drm.switch_power_state = DRM_SWITCH_POWER_OFF;

	}

}