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

Commit d56f57ac authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/gma500: Move to private save/restore hooks 



I want to remove the core ones since with atomic drivers system
suspend/resume is solved much differently. And there's only 2 drivers
(nouveau besides gma500) really using them.

v2: Fixup build noise 0day reported.

Cc: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1449218769-16577-13-git-send-email-daniel.vetter@ffwll.ch
Reviewed-by: Thierry Reding <treding@nvidia.com> (v1)
parent 458091b5

drivers/gpu/drm/gma500/cdv_device.c

+2 −0
Original line number Diff line number Diff line
@@ -619,6 +619,8 @@ const struct psb_ops cdv_chip_ops = { 
	.init_pm = cdv_init_pm,

	.save_regs = cdv_save_display_registers,

	.restore_regs = cdv_restore_display_registers,

	.save_crtc = gma_crtc_save,

	.restore_crtc = gma_crtc_restore,

	.power_down = cdv_power_down,

	.power_up = cdv_power_up,

	.update_wm = cdv_update_wm,

drivers/gpu/drm/gma500/cdv_intel_display.c

+0 −2
Original line number Diff line number Diff line
@@ -983,8 +983,6 @@ const struct drm_crtc_helper_funcs cdv_intel_helper_funcs = { 
};



const struct drm_crtc_funcs cdv_intel_crtc_funcs = {

	.save = gma_crtc_save,

	.restore = gma_crtc_restore,

	.cursor_set = gma_crtc_cursor_set,

	.cursor_move = gma_crtc_cursor_move,

	.gamma_set = gma_crtc_gamma_set,

drivers/gpu/drm/gma500/cdv_intel_hdmi.c

+3 −2
Original line number Diff line number Diff line
@@ -270,8 +270,6 @@ static const struct drm_connector_helper_funcs 


static const struct drm_connector_funcs cdv_hdmi_connector_funcs = {

	.dpms = drm_helper_connector_dpms,

	.save = cdv_hdmi_save,

	.restore = cdv_hdmi_restore,

	.detect = cdv_hdmi_detect,

	.fill_modes = drm_helper_probe_single_connector_modes,

	.set_property = cdv_hdmi_set_property,
@@ -306,6 +304,9 @@ void cdv_hdmi_init(struct drm_device *dev, 


	connector = &gma_connector->base;

	connector->polled = DRM_CONNECTOR_POLL_HPD;

	gma_connector->save = cdv_hdmi_save;

	gma_connector->restore = cdv_hdmi_restore;



	encoder = &gma_encoder->base;

	drm_connector_init(dev, connector,

			   &cdv_hdmi_connector_funcs,

drivers/gpu/drm/gma500/cdv_intel_lvds.c

+2 −2
Original line number Diff line number Diff line
@@ -530,8 +530,6 @@ static const struct drm_connector_helper_funcs 


static const struct drm_connector_funcs cdv_intel_lvds_connector_funcs = {

	.dpms = drm_helper_connector_dpms,

	.save = cdv_intel_lvds_save,

	.restore = cdv_intel_lvds_restore,

	.detect = cdv_intel_lvds_detect,

	.fill_modes = drm_helper_probe_single_connector_modes,

	.set_property = cdv_intel_lvds_set_property,
@@ -643,6 +641,8 @@ void cdv_intel_lvds_init(struct drm_device *dev, 
	gma_encoder->dev_priv = lvds_priv;



	connector = &gma_connector->base;

	gma_connector->save = cdv_intel_lvds_save;

	gma_connector->restore = cdv_intel_lvds_restore;

	encoder = &gma_encoder->base;

drivers/gpu/drm/gma500/mdfld_device.c

+2 −0
Original line number Diff line number Diff line
@@ -546,6 +546,8 @@ const struct psb_ops mdfld_chip_ops = { 


	.save_regs = mdfld_save_registers,

	.restore_regs = mdfld_restore_registers,

	.save_crtc = gma_crtc_save,

	.restore_crtc = gma_crtc_restore,

	.power_down = mdfld_power_down,

	.power_up = mdfld_power_up,

};