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

Commit 970104fa authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: Remove intel_modeset_suspend_hw 



Another layer of indirection for just an lpt-only w/a is a bit
excessive. Reduce it.

This was added in

commit 7d708ee4
Author: Imre Deak <imre.deak@intel.com>
Date:   Wed Apr 17 14:04:50 2013 +0300

    drm/i915: HSW: allow PCH clock gating for suspend

Cc: Imre Deak <imre.deak@intel.com>
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Reviewed-by: default avatarImre Deak <imre.deak@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 5c323b2a

drivers/gpu/drm/i915/i915_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -606,7 +606,7 @@ static int i915_drm_freeze(struct drm_device *dev) 


		intel_suspend_gt_powersave(dev);



		intel_modeset_suspend_hw(dev);

		intel_suspend_hw(dev);

	}



	i915_gem_suspend_gtt_mappings(dev);

drivers/gpu/drm/i915/i915_drv.h

+0 −1
Original line number Diff line number Diff line
@@ -2840,7 +2840,6 @@ static inline void intel_unregister_dsm_handler(void) { return; } 


/* modesetting */

extern void intel_modeset_init_hw(struct drm_device *dev);

extern void intel_modeset_suspend_hw(struct drm_device *dev);

extern void intel_modeset_init(struct drm_device *dev);

extern void intel_modeset_gem_init(struct drm_device *dev);

extern void intel_modeset_cleanup(struct drm_device *dev);

drivers/gpu/drm/i915/intel_display.c

+0 −5
Original line number Diff line number Diff line
@@ -12830,11 +12830,6 @@ void intel_modeset_init_hw(struct drm_device *dev) 
	intel_enable_gt_powersave(dev);

}



void intel_modeset_suspend_hw(struct drm_device *dev)

{

	intel_suspend_hw(dev);

}



void intel_modeset_init(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;