Unverified Commit 8985cb7a authored by Rodrigo Vivi's avatar Rodrigo Vivi
Browse files

drm/i915: Remove vga and gmbus seq out of i915_restore_display 



Restrict this function to only save and restore registers
functionality. Then, that can be moved out later to under
display with a proper name.

Cc: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarJonathan Cavitt <jonathan.cavitt@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241113225016.208673-1-rodrigo.vivi@intel.com


Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 90b63bd4

drivers/gpu/drm/i915/i915_driver.c

+6 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ 
#include "display/intel_pch_refclk.h"

#include "display/intel_pps.h"

#include "display/intel_sprite_uapi.h"

#include "display/intel_vga.h"

#include "display/skl_watermark.h"



#include "gem/i915_gem_context.h"
@@ -1173,6 +1174,11 @@ static int i915_drm_resume(struct drm_device *dev) 
	intel_dmc_resume(display);



	i915_restore_display(dev_priv);



	intel_vga_redisable(display);



	intel_gmbus_reset(display);



	intel_pps_unlock_regs_wa(display);



	intel_init_pch_refclk(dev_priv);

drivers/gpu/drm/i915/i915_suspend.c

+0 −6
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 


#include "display/intel_de.h"

#include "display/intel_gmbus.h"

#include "display/intel_vga.h"



#include "i915_drv.h"

#include "i915_reg.h"
@@ -118,7 +117,6 @@ void i915_save_display(struct drm_i915_private *dev_priv) 


void i915_restore_display(struct drm_i915_private *dev_priv)

{

	struct intel_display *display = &dev_priv->display;

	struct pci_dev *pdev = to_pci_dev(dev_priv->drm.dev);



	if (!HAS_DISPLAY(dev_priv))
@@ -134,8 +132,4 @@ void i915_restore_display(struct drm_i915_private *dev_priv) 
	if (GRAPHICS_VER(dev_priv) <= 4)

		intel_de_write(dev_priv, DSPARB(dev_priv),

			       dev_priv->regfile.saveDSPARB);



	intel_vga_redisable(display);



	intel_gmbus_reset(display);

}