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

Commit dc066fd0 authored by Jyri Sarha's avatar Jyri Sarha Committed by Greg Kroah-Hartman
Browse files

drm/tilcdc: Register cpufreq notifier after we have initialized crtc 



[ Upstream commit 432973fd3a20102840d5f7e61af9f1a03c217a4c ]

Register cpufreq notifier after we have initialized the crtc and
unregister it before we remove the ctrc. Receiving a cpufreq notify
without crtc causes a crash.

Reported-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: default avatarJyri Sarha <jsarha@ti.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent eba86f0a

drivers/gpu/drm/tilcdc/tilcdc_drv.c

+17 −17
Original line number Diff line number Diff line
@@ -184,6 +184,12 @@ static void tilcdc_fini(struct drm_device *dev) 
{

	struct tilcdc_drm_private *priv = dev->dev_private;



#ifdef CONFIG_CPU_FREQ

	if (priv->freq_transition.notifier_call)

		cpufreq_unregister_notifier(&priv->freq_transition,

					    CPUFREQ_TRANSITION_NOTIFIER);

#endif



	if (priv->crtc)

		tilcdc_crtc_shutdown(priv->crtc);
@@ -198,12 +204,6 @@ static void tilcdc_fini(struct drm_device *dev) 
	drm_mode_config_cleanup(dev);

	tilcdc_remove_external_device(dev);



#ifdef CONFIG_CPU_FREQ

	if (priv->freq_transition.notifier_call)

		cpufreq_unregister_notifier(&priv->freq_transition,

					    CPUFREQ_TRANSITION_NOTIFIER);

#endif



	if (priv->clk)

		clk_put(priv->clk);
@@ -274,17 +274,6 @@ static int tilcdc_init(struct drm_driver *ddrv, struct device *dev) 
		goto init_failed;

	}



#ifdef CONFIG_CPU_FREQ

	priv->freq_transition.notifier_call = cpufreq_transition;

	ret = cpufreq_register_notifier(&priv->freq_transition,

			CPUFREQ_TRANSITION_NOTIFIER);

	if (ret) {

		dev_err(dev, "failed to register cpufreq notifier\n");

		priv->freq_transition.notifier_call = NULL;

		goto init_failed;

	}

#endif



	if (of_property_read_u32(node, "max-bandwidth", &priv->max_bandwidth))

		priv->max_bandwidth = TILCDC_DEFAULT_MAX_BANDWIDTH;
@@ -361,6 +350,17 @@ static int tilcdc_init(struct drm_driver *ddrv, struct device *dev) 
	}

	modeset_init(ddev);



#ifdef CONFIG_CPU_FREQ

	priv->freq_transition.notifier_call = cpufreq_transition;

	ret = cpufreq_register_notifier(&priv->freq_transition,

			CPUFREQ_TRANSITION_NOTIFIER);

	if (ret) {

		dev_err(dev, "failed to register cpufreq notifier\n");

		priv->freq_transition.notifier_call = NULL;

		goto init_failed;

	}

#endif



	if (priv->is_componentized) {

		ret = component_bind_all(dev, ddev);

		if (ret < 0)