drm/msm: Remove drm_driver load/unload ops
cover drm/msm: Remove drm_driver load/unload ops
Registering the drm_device using the drm_driver load/unload ops is deprecated since it is prone to race conditions.
The second and third patches removes the usage of these ops. The first patch prevents warnings when we try to remove the drm/msm kernel module.
Archit Taneja (3):
drm/msm/hdmi: Prevent gpio_free related kernel warnings drm/msm: Centralize connector registration/unregistration drm/msm: Drop load/unload drm_driver ops
drivers/gpu/drm/msm/dsi/dsi_manager.c | 27 ++--- drivers/gpu/drm/msm/edp/edp_connector.c | 20 +-- drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 36 +++--- drivers/gpu/drm/msm/mdp/mdp4/mdp4_lvds_connector.c | 16 +-- drivers/gpu/drm/msm/msm_drv.c | 134 +++++++++++++-------- 5 files changed, 113 insertions(+), 120 deletions(-)
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
PATCH 1/3 drm/msm/hdmi: Prevent gpio_free related kernel warnings
Calling the legacy gpio_free on an invalid GPIO (a GPIO numbered -1) results in kernel warnings. This causes a lot of backtraces when we try to unload the drm/msm module.
Call gpio_free only on valid GPIOs.
--- drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)
drivers/gpu/drm/msm/hdmi/hdmi_connector.c +12 -7
@@ -112,13 +112,16 @@ static int gpio_config(struct hdmi *hdmi, bool on)for (i =0 ; i <HDMI_MAX_NUM_GPIO ; i++) {struct hdmi_gpio_data gpio = config->gpios[i]; -if (gpio.output) { -int value = gpio.value ?0 :1 ; +if (gpio.num !=-1 ) { +if (gpio.output) { +int value = gpio.value ?0 :1 ; -gpio_set_value_cansleep (gpio.num, value); - } +gpio_set_value_cansleep (gpio.num, + value); + } -gpio_free (gpio.num); +gpio_free (gpio.num); + } };DBG ("gpio off" );
@@ -126,8 +129,10 @@ static int gpio_config(struct hdmi *hdmi, bool on)return 0 ; err: -while (i--) -gpio_free (config->gpios[i].num); +while (i--) { +if (config->gpios[i].num !=-1 ) +gpio_free (config->gpios[i].num); + }return ret; }
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
PATCH 2/3 drm/msm: Centralize connector registration/unregistration
In reply to Archit TanejaMove the drm_connector registration from the encoder(HDMI/DSI etc) drivers to the msm platform driver. This will simplify the task of ensuring that the connectors are registered only after the drm_device itself is registered.
The connectors' destroy ops are made to use kzalloc instead of devm_kzalloc to ensure that that the connectors can be successfully unregistered when the msm driver module is removed. The memory for the connectors is unallocated when drm_mode_config_cleanup() is called during either during an error or during driver remove.
--- drivers/gpu/drm/msm/dsi/dsi_manager.c | 27 ++++++++-------------- drivers/gpu/drm/msm/edp/edp_connector.c | 20 ++++------------ drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 17 +++----------- drivers/gpu/drm/msm/mdp/mdp4/mdp4_lvds_connector.c | 16 ++----------- drivers/gpu/drm/msm/msm_drv.c | 15 ++++++++++++ 5 files changed, 33 insertions(+), 62 deletions(-)
drivers/gpu/drm/msm/dsi/dsi_manager.c +9 -18
@@ -198,9 +198,13 @@ static enum drm_connector_status dsi_mgr_connector_detect(static void dsi_mgr_connector_destroy (struct drm_connector *connector) { +struct dsi_connector *dsi_connector =to_dsi_connector (connector); +DBG ("" ); -drm_connector_unregister (connector); +drm_connector_cleanup (connector); + +kfree (dsi_connector); }static void dsi_dual_connector_fix_modes (struct drm_connector *connector)
@@ -538,12 +542,9 @@ struct drm_connector *msm_dsi_manager_connector_init(u8 id)struct dsi_connector *dsi_connector;int ret, i; - dsi_connector =devm_kzalloc (msm_dsi->dev->dev, -sizeof (*dsi_connector),GFP_KERNEL ); -if (!dsi_connector) { - ret = -ENOMEM ; - goto fail; - } + dsi_connector =kzalloc (sizeof (*dsi_connector),GFP_KERNEL ); +if (!dsi_connector) +return ERR_PTR (-ENOMEM ); dsi_connector->id = id;
@@ -552,7 +553,7 @@ struct drm_connector *msm_dsi_manager_connector_init(u8 id) ret =drm_connector_init (msm_dsi->dev, connector, &dsi_mgr_connector_funcs,DRM_MODE_CONNECTOR_DSI );if (ret) - goto fail; +return ERR_PTR (ret);drm_connector_helper_add (connector, &dsi_mgr_conn_helper_funcs);
@@ -565,21 +566,11 @@ struct drm_connector *msm_dsi_manager_connector_init(u8 id) connector->interlace_allowed =0 ; connector->doublescan_allowed =0 ; - ret =drm_connector_register (connector); -if (ret) - goto fail; -for (i =0 ; i <MSM_DSI_ENCODER_NUM ; i++)drm_mode_connector_attach_encoder (connector, msm_dsi->encoders[i]);return connector; - -fail: -if (connector) -dsi_mgr_connector_destroy (connector); - -return ERR_PTR (ret); }/* initialize bridge */
drivers/gpu/drm/msm/edp/edp_connector.c +4 -16
@@ -37,7 +37,7 @@ static void edp_connector_destroy(struct drm_connector *connector)struct edp_connector *edp_connector =to_edp_connector (connector);DBG ("" ); -drm_connector_unregister (connector); +drm_connector_cleanup (connector);kfree (edp_connector);
@@ -124,10 +124,8 @@ struct drm_connector *msm_edp_connector_init(struct msm_edp *edp)int ret; edp_connector =kzalloc (sizeof (*edp_connector),GFP_KERNEL ); -if (!edp_connector) { - ret = -ENOMEM ; - goto fail; - } +if (!edp_connector) +return ERR_PTR (-ENOMEM ); edp_connector->edp = edp;
@@ -136,7 +134,7 @@ struct drm_connector *msm_edp_connector_init(struct msm_edp *edp) ret =drm_connector_init (edp->dev, connector, &edp_connector_funcs, DRM_MODE_CONNECTOR_eDP);if (ret) - goto fail; +return ERR_PTR (ret);drm_connector_helper_add (connector, &edp_connector_helper_funcs);
@@ -147,17 +145,7 @@ struct drm_connector *msm_edp_connector_init(struct msm_edp *edp) connector->interlace_allowed = false; connector->doublescan_allowed = false; - ret =drm_connector_register (connector); -if (ret) - goto fail; -drm_mode_connector_attach_encoder (connector, edp->encoder);return connector; - -fail: -if (connector) -edp_connector_destroy (connector); - -return ERR_PTR (ret); }
drivers/gpu/drm/msm/hdmi/hdmi_connector.c +3 -14
@@ -346,7 +346,6 @@ static void hdmi_connector_destroy(struct drm_connector *connector)hdp_disable (hdmi_connector); -drm_connector_unregister (connector);drm_connector_cleanup (connector);kfree (hdmi_connector);
@@ -438,10 +437,8 @@ struct drm_connector *msm_hdmi_connector_init(struct hdmi *hdmi)int ret; hdmi_connector =kzalloc (sizeof (*hdmi_connector),GFP_KERNEL ); -if (!hdmi_connector) { - ret = -ENOMEM ; - goto fail; - } +if (!hdmi_connector) +return ERR_PTR (-ENOMEM ); hdmi_connector->hdmi = hdmi;INIT_WORK (&hdmi_connector->hpd_work, msm_hdmi_hotplug_work);
@@ -458,21 +455,13 @@ struct drm_connector *msm_hdmi_connector_init(struct hdmi *hdmi) connector->interlace_allowed =0 ; connector->doublescan_allowed =0 ; -drm_connector_register (connector); - ret =hpd_enable (hdmi_connector);if (ret) {dev_err (&hdmi->pdev->dev,"failed to enable HPD: %d\n" , ret); - goto fail; +return ERR_PTR (ret); }drm_mode_connector_attach_encoder (connector, hdmi->encoder);return connector; - -fail: -if (connector) -hdmi_connector_destroy (connector); - -return ERR_PTR (ret); }
drivers/gpu/drm/msm/mdp/mdp4/mdp4_lvds_connector.c +2 -14
@@ -48,7 +48,6 @@ static void mdp4_lvds_connector_destroy(struct drm_connector *connector)struct mdp4_lvds_connector *mdp4_lvds_connector =to_mdp4_lvds_connector (connector); -drm_connector_unregister (connector);drm_connector_cleanup (connector);kfree (mdp4_lvds_connector);
@@ -121,13 +120,10 @@ struct drm_connector *mdp4_lvds_connector_init(struct drm_device *dev, {struct drm_connector *connector =NULL ;struct mdp4_lvds_connector *mdp4_lvds_connector; -int ret; mdp4_lvds_connector =kzalloc (sizeof (*mdp4_lvds_connector),GFP_KERNEL ); -if (!mdp4_lvds_connector) { - ret = -ENOMEM ; - goto fail; - } +if (!mdp4_lvds_connector) +return ERR_PTR (-ENOMEM ); mdp4_lvds_connector->encoder = encoder; mdp4_lvds_connector->panel_node = panel_node;
@@ -143,15 +139,7 @@ struct drm_connector *mdp4_lvds_connector_init(struct drm_device *dev, connector->interlace_allowed =0 ; connector->doublescan_allowed =0 ; -drm_connector_register (connector); -drm_mode_connector_attach_encoder (connector, encoder);return connector; - -fail: -if (connector) -mdp4_lvds_connector_destroy (connector); - -return ERR_PTR (ret); }
drivers/gpu/drm/msm/msm_drv.c +15 -0
@@ -197,6 +197,8 @@ static int msm_unload(struct drm_device *dev)drm_kms_helper_poll_fini (dev); +drm_connector_unregister_all (dev); +#ifdef CONFIG_DRM_FBDEV_EMULATION if (fbdev && priv->fbdev)msm_fbdev_free (dev);
@@ -326,6 +328,7 @@ static int msm_load(struct drm_device *dev, unsigned long flags)struct platform_device *pdev = dev->platformdev;struct msm_drm_private *priv;struct msm_kms *kms; +struct drm_connector *connector;int ret; priv =kzalloc (sizeof (*priv),GFP_KERNEL );
@@ -410,6 +413,18 @@ static int msm_load(struct drm_device *dev, unsigned long flags) goto fail; } +mutex_lock (&dev->mode_config.mutex); + +drm_for_each_connector (connector, dev) { + ret =drm_connector_register (connector); +if (ret) { +mutex_unlock (&dev->mode_config.mutex); + goto fail; + } + } + +mutex_unlock (&dev->mode_config.mutex); +drm_mode_config_reset (dev);#ifdef CONFIG_DRM_FBDEV_EMULATION
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
PATCH 3/3 drm/msm: Drop load/unload drm_driver ops
In reply to Archit TanejaThe load/unload drm_driver ops are deprecated. They should be removed as they result in creation of devices visible to userspace even before the drm_device is registered.
Drop these ops and use drm_dev_alloc/register and drm_dev_unregister/unref to explicitly create and destroy the drm device in the msm platform driver's bind and unbind ops. With this in use, the drm connectors are only registered once the drm_device is registered.
It also fixes the issue of stray debugfs files after the msm module is removed. With this, all the debugfs files are removed, and allows successive module insertions/removals.
--- drivers/gpu/drm/msm/msm_drv.c | 129 ++++++++++++++++++++++++------------------ 1 file changed, 73 insertions(+), 56 deletions(-)
drivers/gpu/drm/msm/msm_drv.c +73 -56
@@ -173,13 +173,11 @@ static int vblank_ctrl_queue_work(struct msm_drm_private *priv,return 0 ; } -/* -* DRM operations: -*/ - -static int msm_unload (struct drm_device *dev) +static int msm_drm_uninit (struct device *dev) { -struct msm_drm_private *priv = dev->dev_private; +struct platform_device *pdev =to_platform_device (dev); +struct drm_device *ddev =platform_get_drvdata (pdev); +struct msm_drm_private *priv = ddev->dev_private;struct msm_kms *kms = priv->kms;struct msm_gpu *gpu = priv->gpu;struct msm_vblank_ctrl *vbl_ctrl = &priv->vblank_ctrl;
@@ -195,33 +193,34 @@ static int msm_unload(struct drm_device *dev)kfree (vbl_ev); } -drm_kms_helper_poll_fini (dev); +drm_kms_helper_poll_fini (ddev); + +drm_connector_unregister_all (ddev); -drm_connector_unregister_all (dev); +drm_dev_unregister (ddev);#ifdef CONFIG_DRM_FBDEV_EMULATION if (fbdev && priv->fbdev) -msm_fbdev_free (dev); +msm_fbdev_free (ddev);#endif -drm_mode_config_cleanup (dev); -drm_vblank_cleanup (dev); +drm_mode_config_cleanup (ddev); -pm_runtime_get_sync (dev->dev); -drm_irq_uninstall (dev); -pm_runtime_put_sync (dev->dev); +pm_runtime_get_sync (dev); +drm_irq_uninstall (ddev); +pm_runtime_put_sync (dev);flush_workqueue (priv->wq);destroy_workqueue (priv->wq);if (kms) { -pm_runtime_disable (dev->dev); +pm_runtime_disable (dev); kms->funcs->destroy (kms); }if (gpu) { -mutex_lock (&dev->struct_mutex); +mutex_lock (&ddev->struct_mutex); gpu->funcs->pm_suspend (gpu); -mutex_unlock (&dev->struct_mutex); +mutex_unlock (&ddev->struct_mutex); gpu->funcs->destroy (gpu); }
@@ -229,13 +228,14 @@ static int msm_unload(struct drm_device *dev)DEFINE_DMA_ATTRS (attrs);dma_set_attr (DMA_ATTR_NO_KERNEL_MAPPING , &attrs);drm_mm_takedown (&priv->vram.mm); -dma_free_attrs (dev->dev, priv->vram.size,NULL , - priv->vram.paddr, &attrs); +dma_free_attrs (dev, priv->vram.size,NULL , + priv->vram.paddr, &attrs); } -component_unbind_all (dev->dev, dev); +component_unbind_all (dev, ddev); - dev->dev_private =NULL ; + ddev->dev_private =NULL ; +drm_dev_unref (ddev);kfree (priv);
@@ -323,21 +323,31 @@ static int msm_init_vram(struct drm_device *dev)return ret; } -static int msm_load (struct drm_device *dev,unsigned long flags) +static int msm_drm_init (struct device *dev,struct drm_driver *drv) { -struct platform_device *pdev = dev->platformdev; +struct platform_device *pdev =to_platform_device (dev); +struct drm_device *ddev;struct msm_drm_private *priv;struct msm_kms *kms;struct drm_connector *connector;int ret; + ddev =drm_dev_alloc (drv, dev); +if (!ddev) { +dev_err (dev,"failed to allocate drm_device\n" ); +return -ENOMEM ; + } + +platform_set_drvdata (pdev, ddev); + ddev->platformdev = pdev; + priv =kzalloc (sizeof (*priv),GFP_KERNEL );if (!priv) { -dev_err (dev->dev,"failed to allocate private data\n" ); +drm_dev_unref (ddev);return -ENOMEM ; } - dev->dev_private = priv; + ddev->dev_private = priv; priv->wq =alloc_ordered_workqueue ("msm" ,0 );init_waitqueue_head (&priv->fence_event);
@@ -349,25 +359,26 @@ static int msm_load(struct drm_device *dev, unsigned long flags)INIT_WORK (&priv->vblank_ctrl.work, vblank_ctrl_worker);spin_lock_init (&priv->vblank_ctrl.lock); -drm_mode_config_init (dev); - -platform_set_drvdata (pdev, dev); +drm_mode_config_init (ddev);/* Bind all our sub-components: */ - ret =component_bind_all (dev->dev, dev); -if (ret) + ret =component_bind_all (dev, ddev); +if (ret) { +kfree (priv); +drm_dev_unref (ddev);return ret; + } - ret =msm_init_vram (dev); + ret =msm_init_vram (ddev);if (ret) goto fail;switch (get_mdp_ver (pdev)) {case 4 : - kms =mdp4_kms_init (dev); + kms =mdp4_kms_init (ddev);break ;case 5 : - kms =mdp5_kms_init (dev); + kms =mdp5_kms_init (ddev);break ;default : kms =ERR_PTR (-ENODEV );
@@ -381,7 +392,7 @@ static int msm_load(struct drm_device *dev, unsigned long flags)* and (for example) use dmabuf/prime to share buffers with * imx drm driver on iMX5 */ -dev_err (dev->dev,"failed to load kms\n" ); +dev_err (dev,"failed to load kms\n" ); ret =PTR_ERR (kms); goto fail; }
@@ -389,62 +400,70 @@ static int msm_load(struct drm_device *dev, unsigned long flags) priv->kms = kms;if (kms) { -pm_runtime_enable (dev->dev); +pm_runtime_enable (dev); ret = kms->funcs->hw_init (kms);if (ret) { -dev_err (dev->dev,"kms hw init failed: %d\n" , ret); +dev_err (dev,"kms hw init failed: %d\n" , ret); goto fail; } } - dev->mode_config.funcs = &mode_config_funcs; + ddev->mode_config.funcs = &mode_config_funcs; - ret =drm_vblank_init (dev, priv->num_crtcs); + ret =drm_vblank_init (ddev, priv->num_crtcs);if (ret <0 ) { -dev_err (dev->dev,"failed to initialize vblank\n" ); +dev_err (dev,"failed to initialize vblank\n" ); goto fail; } -pm_runtime_get_sync (dev->dev); - ret =drm_irq_install (dev,platform_get_irq (dev->platformdev,0 )); -pm_runtime_put_sync (dev->dev); +pm_runtime_get_sync (dev); + ret =drm_irq_install (ddev,platform_get_irq (pdev,0 )); +pm_runtime_put_sync (dev);if (ret <0 ) { -dev_err (dev->dev,"failed to install IRQ handler\n" ); +dev_err (dev,"failed to install IRQ handler\n" ); goto fail; } -mutex_lock (&dev->mode_config.mutex); + ret =drm_dev_register (ddev,0 ); +if (ret) + goto fail; + +mutex_lock (&ddev->mode_config.mutex); -drm_for_each_connector (connector, dev) { +drm_for_each_connector (connector, ddev) { ret =drm_connector_register (connector);if (ret) { -mutex_unlock (&dev->mode_config.mutex); +mutex_unlock (&ddev->mode_config.mutex); goto fail; } } -mutex_unlock (&dev->mode_config.mutex); +mutex_unlock (&ddev->mode_config.mutex); -drm_mode_config_reset (dev); +drm_mode_config_reset (ddev);#ifdef CONFIG_DRM_FBDEV_EMULATION if (fbdev) - priv->fbdev =msm_fbdev_init (dev); + priv->fbdev =msm_fbdev_init (ddev);#endif - ret =msm_debugfs_late_init (dev); + ret =msm_debugfs_late_init (ddev);if (ret) goto fail; -drm_kms_helper_poll_init (dev); +drm_kms_helper_poll_init (ddev);return 0 ; fail: -msm_unload (dev); +msm_drm_uninit (dev);return ret; } +/* +* DRM operations: +*/ +static void load_gpu (struct drm_device *dev) {static DEFINE_MUTEX (init_lock);
@@ -967,8 +986,6 @@ static struct drm_driver msm_driver = {DRIVER_RENDER |DRIVER_ATOMIC | DRIVER_MODESET, - .load = msm_load, - .unload = msm_unload, .open = msm_open, .preclose = msm_preclose, .lastclose = msm_lastclose,
@@ -1068,12 +1085,12 @@ static int add_components(struct device *dev, struct component_match **matchptr,static int msm_drm_bind (struct device *dev) { -return drm_platform_init (&msm_driver,to_platform_device (dev)); +return msm_drm_init (dev, &msm_driver); }static void msm_drm_unbind (struct device *dev) { -drm_put_dev (platform_get_drvdata (to_platform_device (dev))); +msm_drm_uninit (dev); }static const struct component_master_ops msm_drm_ops = {
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH 2/3] drm/msm: Centralize connector registration/unregistration
In reply to Archit TanejaQuoted 5 lines · Archit Taneja
Move the
drm_connectorregistration from the encoder(HDMI/DSI etc) drivers to the msm platform driver. This will simplify the task of ensuring that the connectors are registered only after thedrm_deviceitself is registered.
Quoted 7 lines
The connectors' destroy ops are made to use kzalloc instead of
devm_kzallocto ensure that that the connectors can be successfully unregistered when the msm driver module is removed. The memory for the connectors is unallocated whendrm_mode_config_cleanup()is called during either during an error or during driver remove.Signed-off-by Archit Taneja <[email protected]>
There's an in-flight patch series to add a common connector_(un)register_all(). Would be good to pick that up and rebase on top.
The patch series is from Alexey Brodkin <[email protected]>. -Daniel
Quoted 267 lines
--- drivers/gpu/drm/msm/dsi/dsi_manager.c | 27 ++++++++-------------- drivers/gpu/drm/msm/edp/edp_connector.c | 20 ++++------------ drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 17 +++----------- drivers/gpu/drm/msm/mdp/mdp4/mdp4_lvds_connector.c | 16 ++----------- drivers/gpu/drm/msm/msm_drv.c | 15 ++++++++++++ 5 files changed, 33 insertions(+), 62 deletions(-)drivers/gpu/drm/msm/dsi/dsi_manager.c +9
-18@@ -198,9 +198,13 @@ static enum drm_connector_status dsi_mgr_connector_detect(static void dsi_mgr_connector_destroy (struct drm_connector *connector) { +struct dsi_connector *dsi_connector =to_dsi_connector (connector); +DBG ("" ); -drm_connector_unregister (connector); +drm_connector_cleanup (connector); + +kfree (dsi_connector); }static void dsi_dual_connector_fix_modes (struct drm_connector *connector)@@ -538,12 +542,9 @@ struct drm_connector *msm_dsi_manager_connector_init(u8 id)struct dsi_connector *dsi_connector;int ret, i; - dsi_connector =devm_kzalloc (msm_dsi->dev->dev, -sizeof (*dsi_connector),GFP_KERNEL ); -if (!dsi_connector) { - ret = -ENOMEM ; - goto fail; - } + dsi_connector =kzalloc (sizeof (*dsi_connector),GFP_KERNEL ); +if (!dsi_connector) +return ERR_PTR (-ENOMEM ); dsi_connector->id = id;@@ -552,7 +553,7 @@ struct drm_connector *msm_dsi_manager_connector_init(u8 id) ret =drm_connector_init (msm_dsi->dev, connector, &dsi_mgr_connector_funcs,DRM_MODE_CONNECTOR_DSI );if (ret) - goto fail; +return ERR_PTR (ret);drm_connector_helper_add (connector, &dsi_mgr_conn_helper_funcs);@@ -565,21 +566,11 @@ struct drm_connector *msm_dsi_manager_connector_init(u8 id) connector->interlace_allowed =0 ; connector->doublescan_allowed =0 ; - ret =drm_connector_register (connector); -if (ret) - goto fail; -for (i =0 ; i <MSM_DSI_ENCODER_NUM ; i++)drm_mode_connector_attach_encoder (connector, msm_dsi->encoders[i]);return connector; - -fail: -if (connector) -dsi_mgr_connector_destroy (connector); - -return ERR_PTR (ret); }/* initialize bridge */ drivers/gpu/drm/msm/edp/edp_connector.c +4
-16@@ -37,7 +37,7 @@ static void edp_connector_destroy(struct drm_connector *connector)struct edp_connector *edp_connector =to_edp_connector (connector);DBG ("" ); -drm_connector_unregister (connector); +drm_connector_cleanup (connector);kfree (edp_connector);@@ -124,10 +124,8 @@ struct drm_connector *msm_edp_connector_init(struct msm_edp *edp)int ret; edp_connector =kzalloc (sizeof (*edp_connector),GFP_KERNEL ); -if (!edp_connector) { - ret = -ENOMEM ; - goto fail; - } +if (!edp_connector) +return ERR_PTR (-ENOMEM ); edp_connector->edp = edp;@@ -136,7 +134,7 @@ struct drm_connector *msm_edp_connector_init(struct msm_edp *edp) ret =drm_connector_init (edp->dev, connector, &edp_connector_funcs, DRM_MODE_CONNECTOR_eDP);if (ret) - goto fail; +return ERR_PTR (ret);drm_connector_helper_add (connector, &edp_connector_helper_funcs);@@ -147,17 +145,7 @@ struct drm_connector *msm_edp_connector_init(struct msm_edp *edp) connector->interlace_allowed = false; connector->doublescan_allowed = false; - ret =drm_connector_register (connector); -if (ret) - goto fail; -drm_mode_connector_attach_encoder (connector, edp->encoder);return connector; - -fail: -if (connector) -edp_connector_destroy (connector); - -return ERR_PTR (ret); }drivers/gpu/drm/msm/hdmi/hdmi_connector.c +3
-14@@ -346,7 +346,6 @@ static void hdmi_connector_destroy(struct drm_connector *connector)hdp_disable (hdmi_connector); -drm_connector_unregister (connector);drm_connector_cleanup (connector);kfree (hdmi_connector);@@ -438,10 +437,8 @@ struct drm_connector *msm_hdmi_connector_init(struct hdmi *hdmi)int ret; hdmi_connector =kzalloc (sizeof (*hdmi_connector),GFP_KERNEL ); -if (!hdmi_connector) { - ret = -ENOMEM ; - goto fail; - } +if (!hdmi_connector) +return ERR_PTR (-ENOMEM ); hdmi_connector->hdmi = hdmi;INIT_WORK (&hdmi_connector->hpd_work, msm_hdmi_hotplug_work);@@ -458,21 +455,13 @@ struct drm_connector *msm_hdmi_connector_init(struct hdmi *hdmi) connector->interlace_allowed =0 ; connector->doublescan_allowed =0 ; -drm_connector_register (connector); - ret =hpd_enable (hdmi_connector);if (ret) {dev_err (&hdmi->pdev->dev,"failed to enable HPD: %d\n" , ret); - goto fail; +return ERR_PTR (ret); }drm_mode_connector_attach_encoder (connector, hdmi->encoder);return connector; - -fail: -if (connector) -hdmi_connector_destroy (connector); - -return ERR_PTR (ret); }drivers/gpu/drm/msm/mdp/mdp4/mdp4_lvds_connector.c +2
-14@@ -48,7 +48,6 @@ static void mdp4_lvds_connector_destroy(struct drm_connector *connector)struct mdp4_lvds_connector *mdp4_lvds_connector =to_mdp4_lvds_connector (connector); -drm_connector_unregister (connector);drm_connector_cleanup (connector);kfree (mdp4_lvds_connector);@@ -121,13 +120,10 @@ struct drm_connector *mdp4_lvds_connector_init(struct drm_device *dev, {struct drm_connector *connector =NULL ;struct mdp4_lvds_connector *mdp4_lvds_connector; -int ret; mdp4_lvds_connector =kzalloc (sizeof (*mdp4_lvds_connector),GFP_KERNEL ); -if (!mdp4_lvds_connector) { - ret = -ENOMEM ; - goto fail; - } +if (!mdp4_lvds_connector) +return ERR_PTR (-ENOMEM ); mdp4_lvds_connector->encoder = encoder; mdp4_lvds_connector->panel_node = panel_node;@@ -143,15 +139,7 @@ struct drm_connector *mdp4_lvds_connector_init(struct drm_device *dev, connector->interlace_allowed =0 ; connector->doublescan_allowed =0 ; -drm_connector_register (connector); -drm_mode_connector_attach_encoder (connector, encoder);return connector; - -fail: -if (connector) -mdp4_lvds_connector_destroy (connector); - -return ERR_PTR (ret); }drivers/gpu/drm/msm/msm_drv.c +15
-0@@ -197,6 +197,8 @@ static int msm_unload(struct drm_device *dev)drm_kms_helper_poll_fini (dev); +drm_connector_unregister_all (dev); +#ifdef CONFIG_DRM_FBDEV_EMULATION if (fbdev && priv->fbdev)msm_fbdev_free (dev);@@ -326,6 +328,7 @@ static int msm_load(struct drm_device *dev, unsigned long flags)struct platform_device *pdev = dev->platformdev;struct msm_drm_private *priv;struct msm_kms *kms; +struct drm_connector *connector;int ret; priv =kzalloc (sizeof (*priv),GFP_KERNEL );@@ -410,6 +413,18 @@ static int msm_load(struct drm_device *dev, unsigned long flags) goto fail; } +mutex_lock (&dev->mode_config.mutex); + +drm_for_each_connector (connector, dev) { + ret =drm_connector_register (connector); +if (ret) { +mutex_unlock (&dev->mode_config.mutex); + goto fail; + } + } + +mutex_unlock (&dev->mode_config.mutex); +drm_mode_config_reset (dev);#ifdef CONFIG_DRM_FBDEV_EMULATION Signature · 7 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 1/3] drm/msm/hdmi: Prevent gpio_free related kernel warnings
In reply to Archit TanejaQuoted 40 lines · Archit Taneja
Calling the legacy
gpio_freeon an invalid GPIO (a GPIO numbered -1) results in kernel warnings. This causes a lot of backtraces when we try to unload the drm/msm module.Call
gpio_freeonly on valid GPIOs.Signed-off-by Archit Taneja <[email protected]>--- drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)drivers/gpu/drm/msm/hdmi/hdmi_connector.c +8
-5@@ -112,13 +112,16 @@ static int gpio_config(struct hdmi *hdmi, bool on)for (i =0 ; i <HDMI_MAX_NUM_GPIO ; i++) {struct hdmi_gpio_data gpio = config->gpios[i]; -if (gpio.output) { -int value = gpio.value ?0 :1 ; +if (gpio.num !=-1 ) { +if (gpio.output) { +int value = gpio.value ?0 :1 ; -gpio_set_value_cansleep (gpio.num, value); - } +gpio_set_value_cansleep (gpio.num, + value); + } -gpio_free (gpio.num); +gpio_free (gpio.num); + } };DBG ("gpio off" );@@ -126,8 +129,10 @@ static int gpio_config(struct hdmi *hdmi, bool on)return 0 ;
drivers/gpu/drm/msm/hdmi/hdmi_connector.c static int gpio_config(struct hdmi *hdmi, bool on) · line 138
Quoted 10 lines
drivers/gpu/drm/msm/hdmi/hdmi_connector.c +4
-2err: -while (i--) -gpio_free (config->gpios[i].num); +while (i--) { +if (config->gpios[i].num !=-1 ) +gpio_free (config->gpios[i].num); + }return ret; }
The patch in itself looks good, but the bigger picture does not.
The ddc and hdp should be muxed to the hdmi block, so they should not operated as gpios.
The mux seems more of a gpio so it should be made more explicit - i.e. actually support muxing (if that's needed) rather than just setting hard coded values.
And you should not gpio_request/free the gpio upon every usage, request it during "probe time" and release it during "remove".
Regards,
Bjorn
Re: [PATCH 1/3] drm/msm/hdmi: Prevent gpio_free related kernel warnings
In reply to a message not in the archiveQuoted 7 lines · Bjorn Andersson
Quoted 4 lines · Archit Taneja
Calling the legacy
gpio_freeon an invalid GPIO (a GPIO numbered -1) results in kernel warnings. This causes a lot of backtraces when we try to unload the drm/msm module.
Quoted 8 lines
Review
Quoted 8 lines
Call
gpio_freeonly on valid GPIOs.Signed-off-by Archit Taneja <[email protected]>--- drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)(quoted diff) +0
-0
b/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
Quoted 41 lines
Quoted 28 lines
index 26129bf..ce86117 100644
drivers/gpu/drm/msm/hdmi/hdmi_connector.c +8
-5@@ -112,13 +112,16 @@ static int gpio_config(struct hdmi *hdmi, bool on)for (i =0 ; i <HDMI_MAX_NUM_GPIO ; i++) {struct hdmi_gpio_data gpio = config->gpios[i]; -if (gpio.output) { -int value = gpio.value ?0 :1 ; +if (gpio.num !=-1 ) { +if (gpio.output) { +int value = gpio.value ?0 :1 ; -gpio_set_value_cansleep (gpio.num, value); - } +gpio_set_value_cansleep (gpio.num, + value); + } -gpio_free (gpio.num); +gpio_free (gpio.num); + } };DBG ("gpio off" );@@ -126,8 +129,10 @@ static int gpio_config(struct hdmi *hdmi, bool on)return 0 ;drivers/gpu/drm/msm/hdmi/hdmi_connector.c static int gpio_config(struct hdmi *hdmi, bool on) · line 138
Quoted 10 lines
drivers/gpu/drm/msm/hdmi/hdmi_connector.c +4
-2err: -while (i--) -gpio_free (config->gpios[i].num); +while (i--) { +if (config->gpios[i].num !=-1 ) +gpio_free (config->gpios[i].num); + }return ret; }The patch in itself looks good, but the bigger picture does not.
Quoted 6 lines
The ddc and hdp should be muxed to the hdmi block, so they should not operated as gpios.
The mux seems more of a gpio so it should be made more explicit - i.e. actually support muxing (if that's needed) rather than just setting hard coded values.
Note that at least on some devices, hpd was unreliable without using a combination of gpio and denounced hpd signal from HDMI block...
Not sure what sort of MUX it is but it seemed possible (and necessary) to use both at same time..
Please be sure to test lots of devices and monitors if you are going to change this ;-)
BR,
-R
Quoted 7 lines
And you should not gpio_request/free the gpio upon every usage, request it during "probe time" and release it during "remove".
Regards,
Bjorn
--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm"
in
Quoted 2 lines
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 1/3] drm/msm/hdmi: Prevent gpio_free related kernel warnings
Quoted 5 lines · Rob Clark
On Apr 19, 2016 11:50, "Bjorn Andersson" <[email protected]> wrote: > > On Tue 19 Apr 03:56 PDT 2016, Archit Taneja wrote: >
[..]
Quoted 6 lines
Quoted 6 lines
The patch in itself looks good, but the bigger picture does not.
The ddc and hdp should be muxed to the hdmi block, so they should not operated as gpios.
Quoted 7 lines
Quoted 3 lines
The mux seems more of a gpio so it should be made more explicit - i.e. actually support muxing (if that's needed) rather than just setting hard coded values.
Note that at least on some devices, hpd was unreliable without using a combination of gpio and denounced hpd signal from HDMI block...
Right, I do think it makes sense to keep the detect-gpio.
Quoted 3 lines
Not sure what sort of MUX it is but it seemed possible (and necessary) to use both at same time..
The "liquid" devices seems to use it, but I haven't managed to figure out for what.
Quoted 3 lines
Please be sure to test lots of devices and monitors if you are going to change this ;-)
Scary...
But I do believe that we should stop requesting/freeing the gpios every time we try to enable/disable them and in the longer run we should drop the ddc pins, make the hpd an explicit standalone gpiod handle and figure out what the muxing is all about (and make that standalone as well).
The patch solves the immediate symptom, but I think we should give it an overhaul later. If nothing else just to not to carry the downstream legacy of always gpio_requesting non-gpio pins.
Regards,
Bjorn
Re: [PATCH 2/3] drm/msm: Centralize connector registration/unregistration
In reply to Daniel VetterQuoted 12 lines · Daniel Vetter
Quoted 11 lines · Archit Taneja
Move the
drm_connectorregistration from the encoder(HDMI/DSI etc) drivers to the msm platform driver. This will simplify the task of ensuring that the connectors are registered only after thedrm_deviceitself is registered.The connectors' destroy ops are made to use kzalloc instead of
devm_kzallocto ensure that that the connectors can be successfully unregistered when the msm driver module is removed. The memory for the connectors is unallocated whendrm_mode_config_cleanup()is called during either during an error or during driver remove.
Quoted 7 lines
Quoted 1 line
Signed-off-by Archit Taneja <[email protected]>There's an in-flight patch series to add a common connector_(un)register_all(). Would be good to pick that up and rebase on top.
The patch series is from Alexey Brodkin <[email protected]>.
Cool. I'll do that. Thanks for the tip.
Archit
Quoted 270 lines
-Daniel
Quoted 267 lines
--- drivers/gpu/drm/msm/dsi/dsi_manager.c | 27 ++++++++-------------- drivers/gpu/drm/msm/edp/edp_connector.c | 20 ++++------------ drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 17 +++----------- drivers/gpu/drm/msm/mdp/mdp4/mdp4_lvds_connector.c | 16 ++----------- drivers/gpu/drm/msm/msm_drv.c | 15 ++++++++++++ 5 files changed, 33 insertions(+), 62 deletions(-)drivers/gpu/drm/msm/dsi/dsi_manager.c +9
-18@@ -198,9 +198,13 @@ static enum drm_connector_status dsi_mgr_connector_detect(static void dsi_mgr_connector_destroy (struct drm_connector *connector) { +struct dsi_connector *dsi_connector =to_dsi_connector (connector); +DBG ("" ); -drm_connector_unregister (connector); +drm_connector_cleanup (connector); + +kfree (dsi_connector); }static void dsi_dual_connector_fix_modes (struct drm_connector *connector)@@ -538,12 +542,9 @@ struct drm_connector *msm_dsi_manager_connector_init(u8 id)struct dsi_connector *dsi_connector;int ret, i; - dsi_connector =devm_kzalloc (msm_dsi->dev->dev, -sizeof (*dsi_connector),GFP_KERNEL ); -if (!dsi_connector) { - ret = -ENOMEM ; - goto fail; - } + dsi_connector =kzalloc (sizeof (*dsi_connector),GFP_KERNEL ); +if (!dsi_connector) +return ERR_PTR (-ENOMEM ); dsi_connector->id = id;@@ -552,7 +553,7 @@ struct drm_connector *msm_dsi_manager_connector_init(u8 id) ret =drm_connector_init (msm_dsi->dev, connector, &dsi_mgr_connector_funcs,DRM_MODE_CONNECTOR_DSI );if (ret) - goto fail; +return ERR_PTR (ret);drm_connector_helper_add (connector, &dsi_mgr_conn_helper_funcs);@@ -565,21 +566,11 @@ struct drm_connector *msm_dsi_manager_connector_init(u8 id) connector->interlace_allowed =0 ; connector->doublescan_allowed =0 ; - ret =drm_connector_register (connector); -if (ret) - goto fail; -for (i =0 ; i <MSM_DSI_ENCODER_NUM ; i++)drm_mode_connector_attach_encoder (connector, msm_dsi->encoders[i]);return connector; - -fail: -if (connector) -dsi_mgr_connector_destroy (connector); - -return ERR_PTR (ret); }/* initialize bridge */ drivers/gpu/drm/msm/edp/edp_connector.c +4
-16@@ -37,7 +37,7 @@ static void edp_connector_destroy(struct drm_connector *connector)struct edp_connector *edp_connector =to_edp_connector (connector);DBG ("" ); -drm_connector_unregister (connector); +drm_connector_cleanup (connector);kfree (edp_connector);@@ -124,10 +124,8 @@ struct drm_connector *msm_edp_connector_init(struct msm_edp *edp)int ret; edp_connector =kzalloc (sizeof (*edp_connector),GFP_KERNEL ); -if (!edp_connector) { - ret = -ENOMEM ; - goto fail; - } +if (!edp_connector) +return ERR_PTR (-ENOMEM ); edp_connector->edp = edp;@@ -136,7 +134,7 @@ struct drm_connector *msm_edp_connector_init(struct msm_edp *edp) ret =drm_connector_init (edp->dev, connector, &edp_connector_funcs, DRM_MODE_CONNECTOR_eDP);if (ret) - goto fail; +return ERR_PTR (ret);drm_connector_helper_add (connector, &edp_connector_helper_funcs);@@ -147,17 +145,7 @@ struct drm_connector *msm_edp_connector_init(struct msm_edp *edp) connector->interlace_allowed = false; connector->doublescan_allowed = false; - ret =drm_connector_register (connector); -if (ret) - goto fail; -drm_mode_connector_attach_encoder (connector, edp->encoder);return connector; - -fail: -if (connector) -edp_connector_destroy (connector); - -return ERR_PTR (ret); }drivers/gpu/drm/msm/hdmi/hdmi_connector.c +3
-14@@ -346,7 +346,6 @@ static void hdmi_connector_destroy(struct drm_connector *connector)hdp_disable (hdmi_connector); -drm_connector_unregister (connector);drm_connector_cleanup (connector);kfree (hdmi_connector);@@ -438,10 +437,8 @@ struct drm_connector *msm_hdmi_connector_init(struct hdmi *hdmi)int ret; hdmi_connector =kzalloc (sizeof (*hdmi_connector),GFP_KERNEL ); -if (!hdmi_connector) { - ret = -ENOMEM ; - goto fail; - } +if (!hdmi_connector) +return ERR_PTR (-ENOMEM ); hdmi_connector->hdmi = hdmi;INIT_WORK (&hdmi_connector->hpd_work, msm_hdmi_hotplug_work);@@ -458,21 +455,13 @@ struct drm_connector *msm_hdmi_connector_init(struct hdmi *hdmi) connector->interlace_allowed =0 ; connector->doublescan_allowed =0 ; -drm_connector_register (connector); - ret =hpd_enable (hdmi_connector);if (ret) {dev_err (&hdmi->pdev->dev,"failed to enable HPD: %d\n" , ret); - goto fail; +return ERR_PTR (ret); }drm_mode_connector_attach_encoder (connector, hdmi->encoder);return connector; - -fail: -if (connector) -hdmi_connector_destroy (connector); - -return ERR_PTR (ret); }drivers/gpu/drm/msm/mdp/mdp4/mdp4_lvds_connector.c +2
-14@@ -48,7 +48,6 @@ static void mdp4_lvds_connector_destroy(struct drm_connector *connector)struct mdp4_lvds_connector *mdp4_lvds_connector =to_mdp4_lvds_connector (connector); -drm_connector_unregister (connector);drm_connector_cleanup (connector);kfree (mdp4_lvds_connector);@@ -121,13 +120,10 @@ struct drm_connector *mdp4_lvds_connector_init(struct drm_device *dev, {struct drm_connector *connector =NULL ;struct mdp4_lvds_connector *mdp4_lvds_connector; -int ret; mdp4_lvds_connector =kzalloc (sizeof (*mdp4_lvds_connector),GFP_KERNEL ); -if (!mdp4_lvds_connector) { - ret = -ENOMEM ; - goto fail; - } +if (!mdp4_lvds_connector) +return ERR_PTR (-ENOMEM ); mdp4_lvds_connector->encoder = encoder; mdp4_lvds_connector->panel_node = panel_node;@@ -143,15 +139,7 @@ struct drm_connector *mdp4_lvds_connector_init(struct drm_device *dev, connector->interlace_allowed =0 ; connector->doublescan_allowed =0 ; -drm_connector_register (connector); -drm_mode_connector_attach_encoder (connector, encoder);return connector; - -fail: -if (connector) -mdp4_lvds_connector_destroy (connector); - -return ERR_PTR (ret); }drivers/gpu/drm/msm/msm_drv.c +15
-1@@ -197,6 +197,8 @@ static int msm_unload(struct drm_device *dev)drm_kms_helper_poll_fini (dev); +drm_connector_unregister_all (dev); +#ifdef CONFIG_DRM_FBDEV_EMULATION if (fbdev && priv->fbdev)msm_fbdev_free (dev);@@ -326,6 +328,7 @@ static int msm_load(struct drm_device *dev, unsigned long flags)struct platform_device *pdev = dev->platformdev;struct msm_drm_private *priv;struct msm_kms *kms; +struct drm_connector *connector;int ret; priv =kzalloc (sizeof (*priv),GFP_KERNEL );@@ -410,6 +413,18 @@ static int msm_load(struct drm_device *dev, unsigned long flags) goto fail; } +mutex_lock (&dev->mode_config.mutex); + +drm_for_each_connector (connector, dev) { + ret =drm_connector_register (connector); +if (ret) { +mutex_unlock (&dev->mode_config.mutex); + goto fail; + } + } + +mutex_unlock (&dev->mode_config.mutex); +drm_mode_config_reset (dev);#ifdef CONFIG_DRM_FBDEV_EMULATION --The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 1 line
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH 1/3] drm/msm/hdmi: Prevent gpio_free related kernel warnings
In reply to Rob ClarkHi Bjorn, Rob,
Quoted 18 lines · Rob Clark
Quoted 10 lines · On Apr 19, 2016 11:50, "Bjorn Andersson" <[email protected]…
Quoted 7 lines · Archit Taneja
Calling the legacy
gpio_freeon an invalid GPIO (a GPIO numbered -1) results in kernel warnings. This causes a lot of backtraces when we try to unload the drm/msm module.Call
gpio_freeonly on valid GPIOs.Signed-off-by Archit Taneja <[email protected]<mailto:[email protected]>>
Quoted 4 lines
Quoted 4 lines
--- drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)
Quoted 46 lines
Quoted 1 line
Review
Quoted 1 line
(quoted diff) +0
-0
b/drivers/gpu/drm/msm/hdmi/hdmi_connector.cQuoted 4 lines
drivers/gpu/drm/msm/hdmi/hdmi_connector.c static int gpio_config(struct hdmi *hdmi,
Quoted 4 lines
index 26129bf..ce86117 100644
drivers/gpu/drm/msm/hdmi/hdmi_connector.c +0
-0@@ -112,13 +112,16 @@ static int gpio_config(struct hdmi *hdmi,bool on)
Quoted 39 lines
Quoted 24 lines
drivers/gpu/drm/msm/hdmi/hdmi_connector.c +8
-5for (i =0 ; i <HDMI_MAX_NUM_GPIO ; i++) {struct hdmi_gpio_data gpio = config->gpios[i]; -if (gpio.output) { -int value = gpio.value ?0 :1 ; +if (gpio.num !=-1 ) { +if (gpio.output) { +int value = gpio.value ?0 :1 ; -gpio_set_value_cansleep (gpio.num, value); - } +gpio_set_value_cansleep (gpio.num, + value); + } -gpio_free (gpio.num); +gpio_free (gpio.num); + } };DBG ("gpio off" );@@ -126,8 +129,10 @@ static int gpio_config(struct hdmi *hdmi, bool on)return 0 ;drivers/gpu/drm/msm/hdmi/hdmi_connector.c static int gpio_config(struct hdmi *hdmi, bool on) · line 138
Quoted 10 lines
drivers/gpu/drm/msm/hdmi/hdmi_connector.c +4
-2err: -while (i--) -gpio_free (config->gpios[i].num); +while (i--) { +if (config->gpios[i].num !=-1 ) +gpio_free (config->gpios[i].num); + }return ret; }The patch in itself looks good, but the bigger picture does not.
The ddc and hdp should be muxed to the hdmi block, so they should not operated as gpios.
I agree on the DDC part. I am not sure why they are passed as GPIOs to the driver. For boards that do this (i.e, 1fc6410), the pinctrl tlmm node sets the GPIOs function as "hdmi". Does that mean the the gpio_set_value() in the driver are simply ignored?
I'll test and drop these if things work fine without them.
Quoted 4 lines
Quoted 4 lines
The mux seems more of a gpio so it should be made more explicit - i.e. actually support muxing (if that's needed) rather than just setting hard coded values.
I have to study the schematics a bit on what the MUX actually does.
Quoted 3 lines
Note that at least on some devices, hpd was unreliable without using a combination of gpio and denounced hpd signal from HDMI block...
Hmm, one thing I don't get is that the pinctrl DT node for the HPD pin explicitly assigns its function as "hdmi". If that's the case, how does it even work as a gpio?
Quoted 6 lines
Not sure what sort of MUX it is but it seemed possible (and necessary) to use both at same time..
Please be sure to test lots of devices and monitors if you are going to change this ;-)
For sure!
Quoted 6 lines
BR,
-RQuoted 2 lines
And you should not gpio_request/free the gpio upon every usage, request it during "probe time" and release it during "remove".
The hpd_enable/disable functions actually get called only during probe and remove. We don't enable/disable HPD sensing at other points in the driver. So, I guess it should be okay for now.
Thanks,
Archit
Signature · 5 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
v2 cover drm/msm: Remove drm_driver load/unload ops
In reply to Archit TanejaRegistering the drm_device using the drm_driver load/unload ops is deprecated since it is prone to race conditions.
The second and third patches removes the usage of these ops. The first patch prevents warnings when we try to remove the drm/msm kernel module.
Changes in v2:
- Use the recently created drm_connector_register_all and drm_connector_unregister_all helpers instead of writing it ourselves
Archit Taneja (3):
drm/msm/hdmi: Prevent gpio_free related kernel warnings drm/msm: Centralize connector registration/unregistration drm/msm: Drop load/unload drm_driver ops
drivers/gpu/drm/msm/dsi/dsi_manager.c | 27 ++--- drivers/gpu/drm/msm/edp/edp_connector.c | 20 +--- drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 36 +++--- drivers/gpu/drm/msm/mdp/mdp4/mdp4_lvds_connector.c | 16 +-- drivers/gpu/drm/msm/msm_drv.c | 127 ++++++++++++--------- 5 files changed, 106 insertions(+), 120 deletions(-)
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
PATCH v2 1/3 drm/msm/hdmi: Prevent gpio_free related kernel warnings
Calling the legacy gpio_free on an invalid GPIO (a GPIO numbered -1) results in kernel warnings. This causes a lot of backtraces when we try to unload the drm/msm module.
Call gpio_free only on valid GPIOs.
--- drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)
drivers/gpu/drm/msm/hdmi/hdmi_connector.c +12 -7
@@ -112,13 +112,16 @@ static int gpio_config(struct hdmi *hdmi, bool on)for (i =0 ; i <HDMI_MAX_NUM_GPIO ; i++) {struct hdmi_gpio_data gpio = config->gpios[i]; -if (gpio.output) { -int value = gpio.value ?0 :1 ; +if (gpio.num !=-1 ) { +if (gpio.output) { +int value = gpio.value ?0 :1 ; -gpio_set_value_cansleep (gpio.num, value); - } +gpio_set_value_cansleep (gpio.num, + value); + } -gpio_free (gpio.num); +gpio_free (gpio.num); + } };DBG ("gpio off" );
@@ -126,8 +129,10 @@ static int gpio_config(struct hdmi *hdmi, bool on)return 0 ; err: -while (i--) -gpio_free (config->gpios[i].num); +while (i--) { +if (config->gpios[i].num !=-1 ) +gpio_free (config->gpios[i].num); + }return ret; }
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
PATCH v2 2/3 drm/msm: Centralize connector registration/unregistration
In reply to Archit TanejaMove the drm_connector registration from the encoder(HDMI/DSI etc) drivers to the msm platform driver. This will simplify the task of ensuring that the connectors are registered only after the drm_device itself is registered.
The connectors' destroy ops are made to use kzalloc instead of devm_kzalloc to ensure that that the connectors can be successfully unregistered when the msm driver module is removed. The memory for the connectors is unallocated when drm_mode_config_cleanup() is called during either during an error or during driver remove.
--- drivers/gpu/drm/msm/dsi/dsi_manager.c | 27 ++++++++-------------- drivers/gpu/drm/msm/edp/edp_connector.c | 20 ++++------------ drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 17 +++----------- drivers/gpu/drm/msm/mdp/mdp4/mdp4_lvds_connector.c | 16 ++----------- drivers/gpu/drm/msm/msm_drv.c | 8 +++++++ 5 files changed, 26 insertions(+), 62 deletions(-)
drivers/gpu/drm/msm/dsi/dsi_manager.c +9 -18
@@ -198,9 +198,13 @@ static enum drm_connector_status dsi_mgr_connector_detect(static void dsi_mgr_connector_destroy (struct drm_connector *connector) { +struct dsi_connector *dsi_connector =to_dsi_connector (connector); +DBG ("" ); -drm_connector_unregister (connector); +drm_connector_cleanup (connector); + +kfree (dsi_connector); }static void dsi_dual_connector_fix_modes (struct drm_connector *connector)
@@ -538,12 +542,9 @@ struct drm_connector *msm_dsi_manager_connector_init(u8 id)struct dsi_connector *dsi_connector;int ret, i; - dsi_connector =devm_kzalloc (msm_dsi->dev->dev, -sizeof (*dsi_connector),GFP_KERNEL ); -if (!dsi_connector) { - ret = -ENOMEM ; - goto fail; - } + dsi_connector =kzalloc (sizeof (*dsi_connector),GFP_KERNEL ); +if (!dsi_connector) +return ERR_PTR (-ENOMEM ); dsi_connector->id = id;
@@ -552,7 +553,7 @@ struct drm_connector *msm_dsi_manager_connector_init(u8 id) ret =drm_connector_init (msm_dsi->dev, connector, &dsi_mgr_connector_funcs,DRM_MODE_CONNECTOR_DSI );if (ret) - goto fail; +return ERR_PTR (ret);drm_connector_helper_add (connector, &dsi_mgr_conn_helper_funcs);
@@ -565,21 +566,11 @@ struct drm_connector *msm_dsi_manager_connector_init(u8 id) connector->interlace_allowed =0 ; connector->doublescan_allowed =0 ; - ret =drm_connector_register (connector); -if (ret) - goto fail; -for (i =0 ; i <MSM_DSI_ENCODER_NUM ; i++)drm_mode_connector_attach_encoder (connector, msm_dsi->encoders[i]);return connector; - -fail: -if (connector) -dsi_mgr_connector_destroy (connector); - -return ERR_PTR (ret); }/* initialize bridge */
drivers/gpu/drm/msm/edp/edp_connector.c +4 -16
@@ -37,7 +37,7 @@ static void edp_connector_destroy(struct drm_connector *connector)struct edp_connector *edp_connector =to_edp_connector (connector);DBG ("" ); -drm_connector_unregister (connector); +drm_connector_cleanup (connector);kfree (edp_connector);
@@ -124,10 +124,8 @@ struct drm_connector *msm_edp_connector_init(struct msm_edp *edp)int ret; edp_connector =kzalloc (sizeof (*edp_connector),GFP_KERNEL ); -if (!edp_connector) { - ret = -ENOMEM ; - goto fail; - } +if (!edp_connector) +return ERR_PTR (-ENOMEM ); edp_connector->edp = edp;
@@ -136,7 +134,7 @@ struct drm_connector *msm_edp_connector_init(struct msm_edp *edp) ret =drm_connector_init (edp->dev, connector, &edp_connector_funcs, DRM_MODE_CONNECTOR_eDP);if (ret) - goto fail; +return ERR_PTR (ret);drm_connector_helper_add (connector, &edp_connector_helper_funcs);
@@ -147,17 +145,7 @@ struct drm_connector *msm_edp_connector_init(struct msm_edp *edp) connector->interlace_allowed = false; connector->doublescan_allowed = false; - ret =drm_connector_register (connector); -if (ret) - goto fail; -drm_mode_connector_attach_encoder (connector, edp->encoder);return connector; - -fail: -if (connector) -edp_connector_destroy (connector); - -return ERR_PTR (ret); }
drivers/gpu/drm/msm/hdmi/hdmi_connector.c +3 -14
@@ -346,7 +346,6 @@ static void hdmi_connector_destroy(struct drm_connector *connector)hdp_disable (hdmi_connector); -drm_connector_unregister (connector);drm_connector_cleanup (connector);kfree (hdmi_connector);
@@ -438,10 +437,8 @@ struct drm_connector *msm_hdmi_connector_init(struct hdmi *hdmi)int ret; hdmi_connector =kzalloc (sizeof (*hdmi_connector),GFP_KERNEL ); -if (!hdmi_connector) { - ret = -ENOMEM ; - goto fail; - } +if (!hdmi_connector) +return ERR_PTR (-ENOMEM ); hdmi_connector->hdmi = hdmi;INIT_WORK (&hdmi_connector->hpd_work, msm_hdmi_hotplug_work);
@@ -458,21 +455,13 @@ struct drm_connector *msm_hdmi_connector_init(struct hdmi *hdmi) connector->interlace_allowed =0 ; connector->doublescan_allowed =0 ; -drm_connector_register (connector); - ret =hpd_enable (hdmi_connector);if (ret) {dev_err (&hdmi->pdev->dev,"failed to enable HPD: %d\n" , ret); - goto fail; +return ERR_PTR (ret); }drm_mode_connector_attach_encoder (connector, hdmi->encoder);return connector; - -fail: -if (connector) -hdmi_connector_destroy (connector); - -return ERR_PTR (ret); }
drivers/gpu/drm/msm/mdp/mdp4/mdp4_lvds_connector.c +2 -14
@@ -48,7 +48,6 @@ static void mdp4_lvds_connector_destroy(struct drm_connector *connector)struct mdp4_lvds_connector *mdp4_lvds_connector =to_mdp4_lvds_connector (connector); -drm_connector_unregister (connector);drm_connector_cleanup (connector);kfree (mdp4_lvds_connector);
@@ -121,13 +120,10 @@ struct drm_connector *mdp4_lvds_connector_init(struct drm_device *dev, {struct drm_connector *connector =NULL ;struct mdp4_lvds_connector *mdp4_lvds_connector; -int ret; mdp4_lvds_connector =kzalloc (sizeof (*mdp4_lvds_connector),GFP_KERNEL ); -if (!mdp4_lvds_connector) { - ret = -ENOMEM ; - goto fail; - } +if (!mdp4_lvds_connector) +return ERR_PTR (-ENOMEM ); mdp4_lvds_connector->encoder = encoder; mdp4_lvds_connector->panel_node = panel_node;
@@ -143,15 +139,7 @@ struct drm_connector *mdp4_lvds_connector_init(struct drm_device *dev, connector->interlace_allowed =0 ; connector->doublescan_allowed =0 ; -drm_connector_register (connector); -drm_mode_connector_attach_encoder (connector, encoder);return connector; - -fail: -if (connector) -mdp4_lvds_connector_destroy (connector); - -return ERR_PTR (ret); }
drivers/gpu/drm/msm/msm_drv.c +8 -0
@@ -197,6 +197,8 @@ static int msm_unload(struct drm_device *dev)drm_kms_helper_poll_fini (dev); +drm_connector_unregister_all (dev); +#ifdef CONFIG_DRM_FBDEV_EMULATION if (fbdev && priv->fbdev)msm_fbdev_free (dev);
@@ -410,6 +412,12 @@ static int msm_load(struct drm_device *dev, unsigned long flags) goto fail; } + ret =drm_connector_register_all (dev); +if (ret) { +dev_err (dev->dev,"failed to register connectors\n" ); + goto fail; + } +drm_mode_config_reset (dev);#ifdef CONFIG_DRM_FBDEV_EMULATION
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
PATCH v2 3/3 drm/msm: Drop load/unload drm_driver ops
In reply to Archit TanejaThe load/unload drm_driver ops are deprecated. They should be removed as they result in creation of devices visible to userspace even before the drm_device is registered.
Drop these ops and use drm_dev_alloc/register and drm_dev_unregister/unref to explicitly create and destroy the drm device in the msm platform driver's bind and unbind ops. With this in use, the drm connectors are only registered once the drm_device is registered.
It also fixes the issue of stray debugfs files after the msm module is removed. With this, all the debugfs files are removed, and allows successive module insertions/removals.
--- drivers/gpu/drm/msm/msm_drv.c | 125 ++++++++++++++++++++++++------------------ 1 file changed, 71 insertions(+), 54 deletions(-)
drivers/gpu/drm/msm/msm_drv.c +71 -54
@@ -173,13 +173,11 @@ static int vblank_ctrl_queue_work(struct msm_drm_private *priv,return 0 ; } -/* -* DRM operations: -*/ - -static int msm_unload (struct drm_device *dev) +static int msm_drm_uninit (struct device *dev) { -struct msm_drm_private *priv = dev->dev_private; +struct platform_device *pdev =to_platform_device (dev); +struct drm_device *ddev =platform_get_drvdata (pdev); +struct msm_drm_private *priv = ddev->dev_private;struct msm_kms *kms = priv->kms;struct msm_gpu *gpu = priv->gpu;struct msm_vblank_ctrl *vbl_ctrl = &priv->vblank_ctrl;
@@ -195,33 +193,34 @@ static int msm_unload(struct drm_device *dev)kfree (vbl_ev); } -drm_kms_helper_poll_fini (dev); +drm_kms_helper_poll_fini (ddev); + +drm_connector_unregister_all (ddev); -drm_connector_unregister_all (dev); +drm_dev_unregister (ddev);#ifdef CONFIG_DRM_FBDEV_EMULATION if (fbdev && priv->fbdev) -msm_fbdev_free (dev); +msm_fbdev_free (ddev);#endif -drm_mode_config_cleanup (dev); -drm_vblank_cleanup (dev); +drm_mode_config_cleanup (ddev); -pm_runtime_get_sync (dev->dev); -drm_irq_uninstall (dev); -pm_runtime_put_sync (dev->dev); +pm_runtime_get_sync (dev); +drm_irq_uninstall (ddev); +pm_runtime_put_sync (dev);flush_workqueue (priv->wq);destroy_workqueue (priv->wq);if (kms) { -pm_runtime_disable (dev->dev); +pm_runtime_disable (dev); kms->funcs->destroy (kms); }if (gpu) { -mutex_lock (&dev->struct_mutex); +mutex_lock (&ddev->struct_mutex); gpu->funcs->pm_suspend (gpu); -mutex_unlock (&dev->struct_mutex); +mutex_unlock (&ddev->struct_mutex); gpu->funcs->destroy (gpu); }
@@ -229,13 +228,14 @@ static int msm_unload(struct drm_device *dev)DEFINE_DMA_ATTRS (attrs);dma_set_attr (DMA_ATTR_NO_KERNEL_MAPPING , &attrs);drm_mm_takedown (&priv->vram.mm); -dma_free_attrs (dev->dev, priv->vram.size,NULL , - priv->vram.paddr, &attrs); +dma_free_attrs (dev, priv->vram.size,NULL , + priv->vram.paddr, &attrs); } -component_unbind_all (dev->dev, dev); +component_unbind_all (dev, ddev); - dev->dev_private =NULL ; + ddev->dev_private =NULL ; +drm_dev_unref (ddev);kfree (priv);
@@ -323,20 +323,30 @@ static int msm_init_vram(struct drm_device *dev)return ret; } -static int msm_load (struct drm_device *dev,unsigned long flags) +static int msm_drm_init (struct device *dev,struct drm_driver *drv) { -struct platform_device *pdev = dev->platformdev; +struct platform_device *pdev =to_platform_device (dev); +struct drm_device *ddev;struct msm_drm_private *priv;struct msm_kms *kms;int ret; + ddev =drm_dev_alloc (drv, dev); +if (!ddev) { +dev_err (dev,"failed to allocate drm_device\n" ); +return -ENOMEM ; + } + +platform_set_drvdata (pdev, ddev); + ddev->platformdev = pdev; + priv =kzalloc (sizeof (*priv),GFP_KERNEL );if (!priv) { -dev_err (dev->dev,"failed to allocate private data\n" ); +drm_dev_unref (ddev);return -ENOMEM ; } - dev->dev_private = priv; + ddev->dev_private = priv; priv->wq =alloc_ordered_workqueue ("msm" ,0 );init_waitqueue_head (&priv->fence_event);
@@ -348,25 +358,26 @@ static int msm_load(struct drm_device *dev, unsigned long flags)INIT_WORK (&priv->vblank_ctrl.work, vblank_ctrl_worker);spin_lock_init (&priv->vblank_ctrl.lock); -drm_mode_config_init (dev); - -platform_set_drvdata (pdev, dev); +drm_mode_config_init (ddev);/* Bind all our sub-components: */ - ret =component_bind_all (dev->dev, dev); -if (ret) + ret =component_bind_all (dev, ddev); +if (ret) { +kfree (priv); +drm_dev_unref (ddev);return ret; + } - ret =msm_init_vram (dev); + ret =msm_init_vram (ddev);if (ret) goto fail;switch (get_mdp_ver (pdev)) {case 4 : - kms =mdp4_kms_init (dev); + kms =mdp4_kms_init (ddev);break ;case 5 : - kms =mdp5_kms_init (dev); + kms =mdp5_kms_init (ddev);break ;default : kms =ERR_PTR (-ENODEV );
@@ -380,7 +391,7 @@ static int msm_load(struct drm_device *dev, unsigned long flags)* and (for example) use dmabuf/prime to share buffers with * imx drm driver on iMX5 */ -dev_err (dev->dev,"failed to load kms\n" ); +dev_err (dev,"failed to load kms\n" ); ret =PTR_ERR (kms); goto fail; }
@@ -388,56 +399,64 @@ static int msm_load(struct drm_device *dev, unsigned long flags) priv->kms = kms;if (kms) { -pm_runtime_enable (dev->dev); +pm_runtime_enable (dev); ret = kms->funcs->hw_init (kms);if (ret) { -dev_err (dev->dev,"kms hw init failed: %d\n" , ret); +dev_err (dev,"kms hw init failed: %d\n" , ret); goto fail; } } - dev->mode_config.funcs = &mode_config_funcs; + ddev->mode_config.funcs = &mode_config_funcs; - ret =drm_vblank_init (dev, priv->num_crtcs); + ret =drm_vblank_init (ddev, priv->num_crtcs);if (ret <0 ) { -dev_err (dev->dev,"failed to initialize vblank\n" ); +dev_err (dev,"failed to initialize vblank\n" ); goto fail; } -pm_runtime_get_sync (dev->dev); - ret =drm_irq_install (dev,platform_get_irq (dev->platformdev,0 )); -pm_runtime_put_sync (dev->dev); +pm_runtime_get_sync (dev); + ret =drm_irq_install (ddev,platform_get_irq (pdev,0 )); +pm_runtime_put_sync (dev);if (ret <0 ) { -dev_err (dev->dev,"failed to install IRQ handler\n" ); +dev_err (dev,"failed to install IRQ handler\n" ); goto fail; } - ret =drm_connector_register_all (dev); + ret =drm_dev_register (ddev,0 ); +if (ret) + goto fail; + + ret =drm_connector_register_all (ddev);if (ret) { -dev_err (dev->dev,"failed to register connectors\n" ); +dev_err (dev,"failed to register connectors\n" ); goto fail; } -drm_mode_config_reset (dev); +drm_mode_config_reset (ddev);#ifdef CONFIG_DRM_FBDEV_EMULATION if (fbdev) - priv->fbdev =msm_fbdev_init (dev); + priv->fbdev =msm_fbdev_init (ddev);#endif - ret =msm_debugfs_late_init (dev); + ret =msm_debugfs_late_init (ddev);if (ret) goto fail; -drm_kms_helper_poll_init (dev); +drm_kms_helper_poll_init (ddev);return 0 ; fail: -msm_unload (dev); +msm_drm_uninit (dev);return ret; } +/* +* DRM operations: +*/ +static void load_gpu (struct drm_device *dev) {static DEFINE_MUTEX (init_lock);
@@ -960,8 +979,6 @@ static struct drm_driver msm_driver = {DRIVER_RENDER |DRIVER_ATOMIC | DRIVER_MODESET, - .load = msm_load, - .unload = msm_unload, .open = msm_open, .preclose = msm_preclose, .lastclose = msm_lastclose,
@@ -1061,12 +1078,12 @@ static int add_components(struct device *dev, struct component_match **matchptr,static int msm_drm_bind (struct device *dev) { -return drm_platform_init (&msm_driver,to_platform_device (dev)); +return msm_drm_init (dev, &msm_driver); }static void msm_drm_unbind (struct device *dev) { -drm_put_dev (platform_get_drvdata (to_platform_device (dev))); +msm_drm_uninit (dev); }static const struct component_master_ops msm_drm_ops = {
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH v2 1/3] drm/msm/hdmi: Prevent gpio_free related kernel warnings
In reply to Archit TanejaQuoted 26 lines · Archit Taneja
Calling the legacy
gpio_freeon an invalid GPIO (a GPIO numbered -1) results in kernel warnings. This causes a lot of backtraces when we try to unload the drm/msm module.Call
gpio_freeonly on valid GPIOs.Signed-off-by Archit Taneja <[email protected]>--- drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)drivers/gpu/drm/msm/hdmi/hdmi_connector.c +3
-2@@ -112,13 +112,16 @@ static int gpio_config(struct hdmi *hdmi, bool on)for (i =0 ; i <HDMI_MAX_NUM_GPIO ; i++) {struct hdmi_gpio_data gpio = config->gpios[i]; -if (gpio.output) { -int value = gpio.value ?0 :1 ; +if (gpio.num !=-1 ) { +if (gpio.output) { +int value = gpio.value ?0 :1 ;
drivers/gpu/drm/msm/hdmi/hdmi_connector.c static int gpio_config(struct hdmi *hdmi, bool · line 125
Quoted 10 lines
drivers/gpu/drm/msm/hdmi/hdmi_connector.c +5
-3-gpio_set_value_cansleep (gpio.num, value); - } +gpio_set_value_cansleep (gpio.num, + value); + } -gpio_free (gpio.num); +gpio_free (gpio.num); + }
Can you do something like:
if (gpio.num == -1)
continue;
instead? That would avoid the additional indentation (and increase readability).
Thomas
Re: [PATCH v2 1/3] drm/msm/hdmi: Prevent gpio_free related kernel warnings
Quoted 39 lines · On 04/25/2016 11:18 PM, [email protected] wrote:
Quoted 25 lines · Archit Taneja
Calling the legacy
gpio_freeon an invalid GPIO (a GPIO numbered -1) results in kernel warnings. This causes a lot of backtraces when we try to unload the drm/msm module.Call
gpio_freeonly on valid GPIOs.Signed-off-by Archit Taneja <[email protected]>--- drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)drivers/gpu/drm/msm/hdmi/hdmi_connector.c +3
-2@@ -112,13 +112,16 @@ static int gpio_config(struct hdmi *hdmi, bool on)for (i =0 ; i <HDMI_MAX_NUM_GPIO ; i++) {struct hdmi_gpio_data gpio = config->gpios[i]; -if (gpio.output) { -int value = gpio.value ?0 :1 ; +if (gpio.num !=-1 ) { +if (gpio.output) { +int value = gpio.value ?0 :1 ;drivers/gpu/drm/msm/hdmi/hdmi_connector.c static int gpio_config(struct hdmi *hdmi, bool on) · line 124
Quoted 10 lines
drivers/gpu/drm/msm/hdmi/hdmi_connector.c +5
-3-gpio_set_value_cansleep (gpio.num, value); - } +gpio_set_value_cansleep (gpio.num, + value); + } -gpio_free (gpio.num); +gpio_free (gpio.num); + }Can you do something like:
Quoted 5 lines
if (gpio.num == -1)
continue;instead? That would avoid the additional indentation (and increase readability).
Yes, that should make things cleaner. I'll make this change.
Thanks,
Archit
Signature · 1 line
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
v3 cover drm/msm: Remove drm_driver load/unload ops
In reply to Archit TanejaRegistering the drm_device using the drm_driver load/unload ops is deprecated since it is prone to race conditions.
The second and third patches removes the usage of these ops. The first patch prevents warnings when we try to remove the drm/msm kernel module.
Changes in v3:
- Minor change in the gpio_free warning removal patch to improve indentation
Changes in v2:
- Use the recently created drm_connector_register_all and drm_connector_unregister_all helpers instead of writing it ourselves
Archit Taneja (3):
drm/msm/hdmi: Prevent gpio_free related kernel warnings drm/msm: Centralize connector registration/unregistration drm/msm: Drop load/unload drm_driver ops
drivers/gpu/drm/msm/dsi/dsi_manager.c | 27 ++--- drivers/gpu/drm/msm/edp/edp_connector.c | 20 +--- drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 26 ++--- drivers/gpu/drm/msm/mdp/mdp4/mdp4_lvds_connector.c | 16 +-- drivers/gpu/drm/msm/msm_drv.c | 127 ++++++++++++--------- 5 files changed, 101 insertions(+), 115 deletions(-)
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
PATCH v3 1/3 drm/msm/hdmi: Prevent gpio_free related kernel warnings
Calling the legacy gpio_free on an invalid GPIO (a GPIO numbered -1) results in kernel warnings. This causes a lot of backtraces when we try to unload the drm/msm module.
Call gpio_free only on valid GPIOs.
--- drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/gpu/drm/msm/hdmi/hdmi_connector.c +7 -2
@@ -112,6 +112,9 @@ static int gpio_config(struct hdmi *hdmi, bool on)for (i =0 ; i <HDMI_MAX_NUM_GPIO ; i++) {struct hdmi_gpio_data gpio = config->gpios[i]; +if (gpio.num ==-1 ) +continue ; +if (gpio.output) {int value = gpio.value ?0 :1 ;
@@ -126,8 +129,10 @@ static int gpio_config(struct hdmi *hdmi, bool on)return 0 ; err: -while (i--) -gpio_free (config->gpios[i].num); +while (i--) { +if (config->gpios[i].num !=-1 ) +gpio_free (config->gpios[i].num); + }return ret; }
Signature · 7 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 2/3 drm/msm: Centralize connector registration/unregistration
In reply to Archit TanejaMove the drm_connector registration from the encoder(HDMI/DSI etc) drivers to the msm platform driver. This will simplify the task of ensuring that the connectors are registered only after the drm_device itself is registered.
The connectors' destroy ops are made to use kzalloc instead of devm_kzalloc to ensure that that the connectors can be successfully unregistered when the msm driver module is removed. The memory for the connectors is unallocated when drm_mode_config_cleanup() is called during either during an error or during driver remove.
--- drivers/gpu/drm/msm/dsi/dsi_manager.c | 27 ++++++++-------------- drivers/gpu/drm/msm/edp/edp_connector.c | 20 ++++------------ drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 17 +++----------- drivers/gpu/drm/msm/mdp/mdp4/mdp4_lvds_connector.c | 16 ++----------- drivers/gpu/drm/msm/msm_drv.c | 8 +++++++ 5 files changed, 26 insertions(+), 62 deletions(-)
drivers/gpu/drm/msm/dsi/dsi_manager.c +9 -18
@@ -198,9 +198,13 @@ static enum drm_connector_status dsi_mgr_connector_detect(static void dsi_mgr_connector_destroy (struct drm_connector *connector) { +struct dsi_connector *dsi_connector =to_dsi_connector (connector); +DBG ("" ); -drm_connector_unregister (connector); +drm_connector_cleanup (connector); + +kfree (dsi_connector); }static void dsi_dual_connector_fix_modes (struct drm_connector *connector)
@@ -538,12 +542,9 @@ struct drm_connector *msm_dsi_manager_connector_init(u8 id)struct dsi_connector *dsi_connector;int ret, i; - dsi_connector =devm_kzalloc (msm_dsi->dev->dev, -sizeof (*dsi_connector),GFP_KERNEL ); -if (!dsi_connector) { - ret = -ENOMEM ; - goto fail; - } + dsi_connector =kzalloc (sizeof (*dsi_connector),GFP_KERNEL ); +if (!dsi_connector) +return ERR_PTR (-ENOMEM ); dsi_connector->id = id;
@@ -552,7 +553,7 @@ struct drm_connector *msm_dsi_manager_connector_init(u8 id) ret =drm_connector_init (msm_dsi->dev, connector, &dsi_mgr_connector_funcs,DRM_MODE_CONNECTOR_DSI );if (ret) - goto fail; +return ERR_PTR (ret);drm_connector_helper_add (connector, &dsi_mgr_conn_helper_funcs);
@@ -565,21 +566,11 @@ struct drm_connector *msm_dsi_manager_connector_init(u8 id) connector->interlace_allowed =0 ; connector->doublescan_allowed =0 ; - ret =drm_connector_register (connector); -if (ret) - goto fail; -for (i =0 ; i <MSM_DSI_ENCODER_NUM ; i++)drm_mode_connector_attach_encoder (connector, msm_dsi->encoders[i]);return connector; - -fail: -if (connector) -dsi_mgr_connector_destroy (connector); - -return ERR_PTR (ret); }/* initialize bridge */
drivers/gpu/drm/msm/edp/edp_connector.c +4 -16
@@ -37,7 +37,7 @@ static void edp_connector_destroy(struct drm_connector *connector)struct edp_connector *edp_connector =to_edp_connector (connector);DBG ("" ); -drm_connector_unregister (connector); +drm_connector_cleanup (connector);kfree (edp_connector);
@@ -124,10 +124,8 @@ struct drm_connector *msm_edp_connector_init(struct msm_edp *edp)int ret; edp_connector =kzalloc (sizeof (*edp_connector),GFP_KERNEL ); -if (!edp_connector) { - ret = -ENOMEM ; - goto fail; - } +if (!edp_connector) +return ERR_PTR (-ENOMEM ); edp_connector->edp = edp;
@@ -136,7 +134,7 @@ struct drm_connector *msm_edp_connector_init(struct msm_edp *edp) ret =drm_connector_init (edp->dev, connector, &edp_connector_funcs, DRM_MODE_CONNECTOR_eDP);if (ret) - goto fail; +return ERR_PTR (ret);drm_connector_helper_add (connector, &edp_connector_helper_funcs);
@@ -147,17 +145,7 @@ struct drm_connector *msm_edp_connector_init(struct msm_edp *edp) connector->interlace_allowed = false; connector->doublescan_allowed = false; - ret =drm_connector_register (connector); -if (ret) - goto fail; -drm_mode_connector_attach_encoder (connector, edp->encoder);return connector; - -fail: -if (connector) -edp_connector_destroy (connector); - -return ERR_PTR (ret); }
drivers/gpu/drm/msm/hdmi/hdmi_connector.c +3 -14
@@ -346,7 +346,6 @@ static void hdmi_connector_destroy(struct drm_connector *connector)hdp_disable (hdmi_connector); -drm_connector_unregister (connector);drm_connector_cleanup (connector);kfree (hdmi_connector);
@@ -438,10 +437,8 @@ struct drm_connector *msm_hdmi_connector_init(struct hdmi *hdmi)int ret; hdmi_connector =kzalloc (sizeof (*hdmi_connector),GFP_KERNEL ); -if (!hdmi_connector) { - ret = -ENOMEM ; - goto fail; - } +if (!hdmi_connector) +return ERR_PTR (-ENOMEM ); hdmi_connector->hdmi = hdmi;INIT_WORK (&hdmi_connector->hpd_work, msm_hdmi_hotplug_work);
@@ -458,21 +455,13 @@ struct drm_connector *msm_hdmi_connector_init(struct hdmi *hdmi) connector->interlace_allowed =0 ; connector->doublescan_allowed =0 ; -drm_connector_register (connector); - ret =hpd_enable (hdmi_connector);if (ret) {dev_err (&hdmi->pdev->dev,"failed to enable HPD: %d\n" , ret); - goto fail; +return ERR_PTR (ret); }drm_mode_connector_attach_encoder (connector, hdmi->encoder);return connector; - -fail: -if (connector) -hdmi_connector_destroy (connector); - -return ERR_PTR (ret); }
drivers/gpu/drm/msm/mdp/mdp4/mdp4_lvds_connector.c +2 -14
@@ -48,7 +48,6 @@ static void mdp4_lvds_connector_destroy(struct drm_connector *connector)struct mdp4_lvds_connector *mdp4_lvds_connector =to_mdp4_lvds_connector (connector); -drm_connector_unregister (connector);drm_connector_cleanup (connector);kfree (mdp4_lvds_connector);
@@ -121,13 +120,10 @@ struct drm_connector *mdp4_lvds_connector_init(struct drm_device *dev, {struct drm_connector *connector =NULL ;struct mdp4_lvds_connector *mdp4_lvds_connector; -int ret; mdp4_lvds_connector =kzalloc (sizeof (*mdp4_lvds_connector),GFP_KERNEL ); -if (!mdp4_lvds_connector) { - ret = -ENOMEM ; - goto fail; - } +if (!mdp4_lvds_connector) +return ERR_PTR (-ENOMEM ); mdp4_lvds_connector->encoder = encoder; mdp4_lvds_connector->panel_node = panel_node;
@@ -143,15 +139,7 @@ struct drm_connector *mdp4_lvds_connector_init(struct drm_device *dev, connector->interlace_allowed =0 ; connector->doublescan_allowed =0 ; -drm_connector_register (connector); -drm_mode_connector_attach_encoder (connector, encoder);return connector; - -fail: -if (connector) -mdp4_lvds_connector_destroy (connector); - -return ERR_PTR (ret); }
drivers/gpu/drm/msm/msm_drv.c +8 -0
@@ -197,6 +197,8 @@ static int msm_unload(struct drm_device *dev)drm_kms_helper_poll_fini (dev); +drm_connector_unregister_all (dev); +#ifdef CONFIG_DRM_FBDEV_EMULATION if (fbdev && priv->fbdev)msm_fbdev_free (dev);
@@ -410,6 +412,12 @@ static int msm_load(struct drm_device *dev, unsigned long flags) goto fail; } + ret =drm_connector_register_all (dev); +if (ret) { +dev_err (dev->dev,"failed to register connectors\n" ); + goto fail; + } +drm_mode_config_reset (dev);#ifdef CONFIG_DRM_FBDEV_EMULATION
Signature · 7 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 3/3 drm/msm: Drop load/unload drm_driver ops
In reply to Archit TanejaThe load/unload drm_driver ops are deprecated. They should be removed as they result in creation of devices visible to userspace even before the drm_device is registered.
Drop these ops and use drm_dev_alloc/register and drm_dev_unregister/unref to explicitly create and destroy the drm device in the msm platform driver's bind and unbind ops. With this in use, the drm connectors are only registered once the drm_device is registered.
It also fixes the issue of stray debugfs files after the msm module is removed. With this, all the debugfs files are removed, and allows successive module insertions/removals.
--- drivers/gpu/drm/msm/msm_drv.c | 125 ++++++++++++++++++++++++------------------ 1 file changed, 71 insertions(+), 54 deletions(-)
drivers/gpu/drm/msm/msm_drv.c +71 -54
@@ -173,13 +173,11 @@ static int vblank_ctrl_queue_work(struct msm_drm_private *priv,return 0 ; } -/* -* DRM operations: -*/ - -static int msm_unload (struct drm_device *dev) +static int msm_drm_uninit (struct device *dev) { -struct msm_drm_private *priv = dev->dev_private; +struct platform_device *pdev =to_platform_device (dev); +struct drm_device *ddev =platform_get_drvdata (pdev); +struct msm_drm_private *priv = ddev->dev_private;struct msm_kms *kms = priv->kms;struct msm_gpu *gpu = priv->gpu;struct msm_vblank_ctrl *vbl_ctrl = &priv->vblank_ctrl;
@@ -195,33 +193,34 @@ static int msm_unload(struct drm_device *dev)kfree (vbl_ev); } -drm_kms_helper_poll_fini (dev); +drm_kms_helper_poll_fini (ddev); + +drm_connector_unregister_all (ddev); -drm_connector_unregister_all (dev); +drm_dev_unregister (ddev);#ifdef CONFIG_DRM_FBDEV_EMULATION if (fbdev && priv->fbdev) -msm_fbdev_free (dev); +msm_fbdev_free (ddev);#endif -drm_mode_config_cleanup (dev); -drm_vblank_cleanup (dev); +drm_mode_config_cleanup (ddev); -pm_runtime_get_sync (dev->dev); -drm_irq_uninstall (dev); -pm_runtime_put_sync (dev->dev); +pm_runtime_get_sync (dev); +drm_irq_uninstall (ddev); +pm_runtime_put_sync (dev);flush_workqueue (priv->wq);destroy_workqueue (priv->wq);if (kms) { -pm_runtime_disable (dev->dev); +pm_runtime_disable (dev); kms->funcs->destroy (kms); }if (gpu) { -mutex_lock (&dev->struct_mutex); +mutex_lock (&ddev->struct_mutex); gpu->funcs->pm_suspend (gpu); -mutex_unlock (&dev->struct_mutex); +mutex_unlock (&ddev->struct_mutex); gpu->funcs->destroy (gpu); }
@@ -229,13 +228,14 @@ static int msm_unload(struct drm_device *dev)DEFINE_DMA_ATTRS (attrs);dma_set_attr (DMA_ATTR_NO_KERNEL_MAPPING , &attrs);drm_mm_takedown (&priv->vram.mm); -dma_free_attrs (dev->dev, priv->vram.size,NULL , - priv->vram.paddr, &attrs); +dma_free_attrs (dev, priv->vram.size,NULL , + priv->vram.paddr, &attrs); } -component_unbind_all (dev->dev, dev); +component_unbind_all (dev, ddev); - dev->dev_private =NULL ; + ddev->dev_private =NULL ; +drm_dev_unref (ddev);kfree (priv);
@@ -323,20 +323,30 @@ static int msm_init_vram(struct drm_device *dev)return ret; } -static int msm_load (struct drm_device *dev,unsigned long flags) +static int msm_drm_init (struct device *dev,struct drm_driver *drv) { -struct platform_device *pdev = dev->platformdev; +struct platform_device *pdev =to_platform_device (dev); +struct drm_device *ddev;struct msm_drm_private *priv;struct msm_kms *kms;int ret; + ddev =drm_dev_alloc (drv, dev); +if (!ddev) { +dev_err (dev,"failed to allocate drm_device\n" ); +return -ENOMEM ; + } + +platform_set_drvdata (pdev, ddev); + ddev->platformdev = pdev; + priv =kzalloc (sizeof (*priv),GFP_KERNEL );if (!priv) { -dev_err (dev->dev,"failed to allocate private data\n" ); +drm_dev_unref (ddev);return -ENOMEM ; } - dev->dev_private = priv; + ddev->dev_private = priv; priv->wq =alloc_ordered_workqueue ("msm" ,0 );init_waitqueue_head (&priv->fence_event);
@@ -348,25 +358,26 @@ static int msm_load(struct drm_device *dev, unsigned long flags)INIT_WORK (&priv->vblank_ctrl.work, vblank_ctrl_worker);spin_lock_init (&priv->vblank_ctrl.lock); -drm_mode_config_init (dev); - -platform_set_drvdata (pdev, dev); +drm_mode_config_init (ddev);/* Bind all our sub-components: */ - ret =component_bind_all (dev->dev, dev); -if (ret) + ret =component_bind_all (dev, ddev); +if (ret) { +kfree (priv); +drm_dev_unref (ddev);return ret; + } - ret =msm_init_vram (dev); + ret =msm_init_vram (ddev);if (ret) goto fail;switch (get_mdp_ver (pdev)) {case 4 : - kms =mdp4_kms_init (dev); + kms =mdp4_kms_init (ddev);break ;case 5 : - kms =mdp5_kms_init (dev); + kms =mdp5_kms_init (ddev);break ;default : kms =ERR_PTR (-ENODEV );
@@ -380,7 +391,7 @@ static int msm_load(struct drm_device *dev, unsigned long flags)* and (for example) use dmabuf/prime to share buffers with * imx drm driver on iMX5 */ -dev_err (dev->dev,"failed to load kms\n" ); +dev_err (dev,"failed to load kms\n" ); ret =PTR_ERR (kms); goto fail; }
@@ -388,56 +399,64 @@ static int msm_load(struct drm_device *dev, unsigned long flags) priv->kms = kms;if (kms) { -pm_runtime_enable (dev->dev); +pm_runtime_enable (dev); ret = kms->funcs->hw_init (kms);if (ret) { -dev_err (dev->dev,"kms hw init failed: %d\n" , ret); +dev_err (dev,"kms hw init failed: %d\n" , ret); goto fail; } } - dev->mode_config.funcs = &mode_config_funcs; + ddev->mode_config.funcs = &mode_config_funcs; - ret =drm_vblank_init (dev, priv->num_crtcs); + ret =drm_vblank_init (ddev, priv->num_crtcs);if (ret <0 ) { -dev_err (dev->dev,"failed to initialize vblank\n" ); +dev_err (dev,"failed to initialize vblank\n" ); goto fail; } -pm_runtime_get_sync (dev->dev); - ret =drm_irq_install (dev,platform_get_irq (dev->platformdev,0 )); -pm_runtime_put_sync (dev->dev); +pm_runtime_get_sync (dev); + ret =drm_irq_install (ddev,platform_get_irq (pdev,0 )); +pm_runtime_put_sync (dev);if (ret <0 ) { -dev_err (dev->dev,"failed to install IRQ handler\n" ); +dev_err (dev,"failed to install IRQ handler\n" ); goto fail; } - ret =drm_connector_register_all (dev); + ret =drm_dev_register (ddev,0 ); +if (ret) + goto fail; + + ret =drm_connector_register_all (ddev);if (ret) { -dev_err (dev->dev,"failed to register connectors\n" ); +dev_err (dev,"failed to register connectors\n" ); goto fail; } -drm_mode_config_reset (dev); +drm_mode_config_reset (ddev);#ifdef CONFIG_DRM_FBDEV_EMULATION if (fbdev) - priv->fbdev =msm_fbdev_init (dev); + priv->fbdev =msm_fbdev_init (ddev);#endif - ret =msm_debugfs_late_init (dev); + ret =msm_debugfs_late_init (ddev);if (ret) goto fail; -drm_kms_helper_poll_init (dev); +drm_kms_helper_poll_init (ddev);return 0 ; fail: -msm_unload (dev); +msm_drm_uninit (dev);return ret; } +/* +* DRM operations: +*/ +static void load_gpu (struct drm_device *dev) {static DEFINE_MUTEX (init_lock);
@@ -960,8 +979,6 @@ static struct drm_driver msm_driver = {DRIVER_RENDER |DRIVER_ATOMIC | DRIVER_MODESET, - .load = msm_load, - .unload = msm_unload, .open = msm_open, .preclose = msm_preclose, .lastclose = msm_lastclose,
@@ -1061,12 +1078,12 @@ static int add_components(struct device *dev, struct component_match **matchptr,static int msm_drm_bind (struct device *dev) { -return drm_platform_init (&msm_driver,to_platform_device (dev)); +return msm_drm_init (dev, &msm_driver); }static void msm_drm_unbind (struct device *dev) { -drm_put_dev (platform_get_drvdata (to_platform_device (dev))); +msm_drm_uninit (dev); }static const struct component_master_ops msm_drm_ops = {
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation