mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-18 00:56:49 +07:00
tilcdc pull request for Linux v4.22
-----BEGIN PGP SIGNATURE----- iQJCBAABCgAsFiEEMuwitgUoIEsi53ohkDazUNfWGUEFAlwyGtwOHGpzYXJoYUB0 aS5jb20ACgkQkDazUNfWGUG3TA/8C8t9LMnTr7NtTev+msRgKAMtPxv08VkW1c/N h9UpNrC1SmfTugNTgXJAvfK2/KOwZBDcZuHgEAahLnoWech0aO+Oxu3D8D55ZroW 4ybXH5fhKtUnJ/Ea3ygm3YJES7ogJy8TYEkawYVYJYXN3H6VNJnaE0Ojo0DFit1H mlS6F9P0ewjGG0UBZDRlDmdPhpxXcTZvvmlUzcJJc8gS5joEOqCUV9oo69B7vrYy G638e4djzc5jMV0IvOg1oR2/3NfejxY5z5GEd5ei9gsCp4JQP3+djjYzvmmJWRwC L0XIlN5cM3ZsRFFO//jalmM27QMeaEEzqPlcTJhXqKvXZPXKwEWJMpnJYZdS6pVc PYMP6zsA+hyAefwfyxzf3bJRHrABzcmv7/osCkxmcYng5gjFy76vZ54JqvCxJ+v7 zEI8lUDy/6Qj8di7W2OQKMvRlpJuxbzrgbMXP0ZufVlDZhNlSGMmS1uiE32nxd5w TUJqiY4ebfo3qs1RhYPkMt0PApnPGI90t7jAuwwvklH76pgAMSVJyNTvdWeFNvbK /A2fWPeidrNetyJ8yT3jlQSckvwDEV/t8bB4daIdEn7Ft8ZczsQXG1421O8sWsHh BzgFLaJVkIgcnkj/tZhzm+AY9v0fbAg4OL/zr279/tAERDdQ4Bf/JRaIgD/759CI YhGNOKg= =9A8w -----END PGP SIGNATURE----- Merge tag 'tilcdc-4.22' of https://github.com/jsarha/linux into drm-next tilcdc pull request for Linux v4.22 Signed-off-by: Dave Airlie <airlied@redhat.com> From: Jyri Sarha <jsarha@ti.com> Link: https://patchwork.freedesktop.org/patch/msgid/cdf82a00-4e40-20a6-cc7d-3278dc23473e@ti.com
This commit is contained in:
commit
e3d093070e
@ -183,6 +183,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);
|
||||
|
||||
@ -194,12 +200,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);
|
||||
|
||||
@ -270,17 +270,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;
|
||||
|
||||
@ -357,6 +346,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)
|
||||
|
Loading…
Reference in New Issue
Block a user