drm/i915: Move FBC init and cleanup calls to modeset functions (acde44b5) · Commits · 戴 / test

Although FBC helps save power it do not belongs to power management also the cleanup was placed in i915_driver_unload() also not a good place. intel_modeset_init()/intel_modeset_cleanup() are better places also this will help make easy disable features that depends in display being enabled in driver. Cc: Jani Nikula <jani.nikula@intel.com> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by:

José Roberto de Souza <jose.souza@intel.com> Reviewed-by:

Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20181108001647.11276-2-jose.souza@intel.com

drivers/gpu/drm/i915/i915_drv.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -1778,7 +1778,6 @@ void i915_driver_unload(struct drm_device *dev)
		i915_reset_error_state(dev_priv);

		i915_gem_fini(dev_priv);
		intel_fbc_cleanup_cfb(dev_priv);

		intel_power_domains_fini_hw(dev_priv);

drivers/gpu/drm/i915/intel_display.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -15016,6 +15016,8 @@ int intel_modeset_init(struct drm_device *dev)

		intel_init_quirks(dev_priv);

		intel_fbc_init(dev_priv);

		intel_init_pm(dev_priv);

		/*
		@@ -15829,6 +15831,8 @@ void intel_modeset_cleanup(struct drm_device *dev)
		intel_teardown_gmbus(dev_priv);

		destroy_workqueue(dev_priv->modeset_wq);

		intel_fbc_cleanup_cfb(dev_priv);
		}

		/*

drivers/gpu/drm/i915/intel_pm.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -9435,8 +9435,6 @@ void intel_init_clock_gating_hooks(struct drm_i915_private *dev_priv)
		/* Set up chip specific power management-related functions */
		void intel_init_pm(struct drm_i915_private *dev_priv)
		{
		intel_fbc_init(dev_priv);

		/* For cxsr */
		if (IS_PINEVIEW(dev_priv))
		i915_pineview_get_mem_freq(dev_priv);

Admin message