drm/msm: rework the ties between KMS and GPU parts of the driver
Subsystems (4)
v4 cover drm/msm: rework the ties between KMS and GPU parts of the driver
Currently the KMS and GPU parts of the msm driver are pretty much intertwined. It is impossible to register a KMS-only device and registering a GPU-only DRM device requires modifying the DT. Not to mention that binding the GPU-only device creates an interim platform devices, which complicates IOMMU setup.
Rework the driver:
- Make it possible to disable KMS parts (if MDP4, MDP5 and DPU drivers are disabled).
- Register GPU-only devices without an interim platform device.
- Add module param that makes msm driver register GPU and KMS devices separately.
---
Changes in v4:
- Rebased on msm-next(-robclark)
- Temporarily dropped the "no-GPU" patch, it will be reposted later
(Rob)
- Link to v3: https://lore.kernel.org/r/[email protected]
Changes in v3:
- Disabled SYNCOBJ / SYNCOBJ_TIMELINE for KMS-only driver (Rob Clark)
- Further refine Kconfig dependencies
- Link to v2: https://lore.kernel.org/r/[email protected]
Changes in v2:
- Got rid of mdp4_crtc.id and msm_drm_private.num_crtcs
- Moved msm_drm_private.wq and msm_drm_private.event_thread to struct
msm_kms (Rob Clark)
- Moved HDMI / DSI / DP pointers to msm_kms (Abhinav)
- Link to v1: https://lore.kernel.org/r/[email protected]
---
Dmitry Baryshkov (10):
drm/msm: move wq handling to KMS code
drm/msm: move helper calls to msm_kms.c drm/msm/mdp4: get rid of mdp4_crtc.id
drm/msm: get rid of msm_drm_private::num_crtcs drm/msm: move KMS driver data to msm_kms
drm/msm: make it possible to disable KMS-related code. drm/msm: bail out late_init_minor() if it is not a GPU device drm/msm: rearrange symbol selection
drm/msm: rework binding of Imageon GPUs
drm/msm: enable separate binding of GPU and display devices
drivers/gpu/drm/msm/Kconfig | 34 +++-- drivers/gpu/drm/msm/Makefile | 19 +-- drivers/gpu/drm/msm/adreno/adreno_device.c | 39 ++--- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 4 +- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 13 +- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 35 +++-- drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c | 9 +- drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 13 +- drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.h | 2 +- drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 2 +- drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 17 ++- drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c | 12 +- drivers/gpu/drm/msm/dp/dp_debug.c | 4 + drivers/gpu/drm/msm/dp/dp_display.c | 6 +- drivers/gpu/drm/msm/dsi/dsi.c | 4 +- drivers/gpu/drm/msm/hdmi/hdmi.c | 9 +- drivers/gpu/drm/msm/msm_debugfs.c | 97 ++++++++----- drivers/gpu/drm/msm/msm_drv.c | 166 ++++++++++++++-------- drivers/gpu/drm/msm/msm_drv.h | 31 ++-- drivers/gpu/drm/msm/msm_kms.c | 41 +++++- drivers/gpu/drm/msm/msm_kms.h | 46 ++++++ 21 files changed, 360 insertions(+), 243 deletions(-)
---
base-commit: 7df7b18268eb5c75e3978da5d183d8cc24d4e201
change-id: 20250411-msm-gpu-split-2701e49e40f0
Best regards,
Signature · 2 lines
With best wishes Dmitry
PATCH v4 1/10 drm/msm: move wq handling to KMS code
The global workqueue is only used for vblanks inside KMS code. Move allocation / flushing / deallcation of it to msm_kms.c
--- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 2 +- drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c | 2 +- drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 2 +- drivers/gpu/drm/msm/msm_drv.c | 21 ++------------------- drivers/gpu/drm/msm/msm_drv.h | 2 -- drivers/gpu/drm/msm/msm_kms.c | 11 +++++++++-- drivers/gpu/drm/msm/msm_kms.h | 8 ++++++++ 7 files changed, 22 insertions(+), 26 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +1 -1
@@ -980,7 +980,7 @@ static int dpu_encoder_resource_control(struct drm_encoder *drm_enc,return 0 ; } -queue_delayed_work (priv->wq, &dpu_enc->delayed_off_work, +queue_delayed_work (priv->kms->wq, &dpu_enc->delayed_off_work,msecs_to_jiffies (dpu_enc->idle_timeout)); trace_dpu_enc_rc(DRMID(drm_enc), sw_event,
drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c +1 -1
@@ -511,7 +511,7 @@ static void mdp4_crtc_vblank_irq(struct mdp_irq *irq, uint32_t irqstatus)if (pending &PENDING_CURSOR ) {update_cursor (crtc); -drm_flip_work_commit (&mdp4_crtc->unref_cursor_work, priv->wq); +drm_flip_work_commit (&mdp4_crtc->unref_cursor_work, priv->kms->wq); } }
drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c +1 -1
@@ -1196,7 +1196,7 @@ static void mdp5_crtc_vblank_irq(struct mdp_irq *irq, uint32_t irqstatus) }if (pending &PENDING_CURSOR ) -drm_flip_work_commit (&mdp5_crtc->unref_cursor_work, priv->wq); +drm_flip_work_commit (&mdp5_crtc->unref_cursor_work, priv->kms->wq); }static void mdp5_crtc_err_irq (struct mdp_irq *irq,uint32_t irqstatus)
drivers/gpu/drm/msm/msm_drv.c +2 -19
@@ -77,13 +77,6 @@ static int msm_drm_uninit(struct device *dev)drm_atomic_helper_shutdown (ddev); } -/* We must cancel and cleanup any pending vblank enable/disable -* work before msm_irq_uninstall() to avoid work re-enabling an -* irq after uninstall has disabled it. -*/ - -flush_workqueue (priv->wq); -msm_gem_shrinker_cleanup (ddev);msm_perf_debugfs_cleanup (priv);
@@ -97,8 +90,6 @@ static int msm_drm_uninit(struct device *dev) ddev->dev_private =NULL ;drm_dev_put (ddev); -destroy_workqueue (priv->wq); -return 0 ; }
@@ -119,12 +110,6 @@ static int msm_drm_init(struct device *dev, const struct drm_driver *drv) ddev->dev_private = priv; priv->dev = ddev; - priv->wq =alloc_ordered_workqueue ("msm" ,0 ); -if (!priv->wq) { - ret = -ENOMEM ; - goto err_put_dev; - } -INIT_LIST_HEAD (&priv->objects);mutex_init (&priv->obj_lock);
@@ -149,7 +134,7 @@ static int msm_drm_init(struct device *dev, const struct drm_driver *drv)if (priv->kms_init) { ret =drmm_mode_config_init (ddev);if (ret) - goto err_destroy_wq; + goto err_put_dev; }dma_set_max_seg_size (dev,UINT_MAX );
@@ -157,7 +142,7 @@ static int msm_drm_init(struct device *dev, const struct drm_driver *drv)/* Bind all our sub-components: */ ret =component_bind_all (dev, ddev);if (ret) - goto err_destroy_wq; + goto err_put_dev; ret =msm_gem_shrinker_init (ddev);if (ret)
@@ -194,8 +179,6 @@ static int msm_drm_init(struct device *dev, const struct drm_driver *drv)return ret; -err_destroy_wq: -destroy_workqueue (priv->wq); err_put_dev:drm_dev_put (ddev);
drivers/gpu/drm/msm/msm_drv.h +0 -2
@@ -175,8 +175,6 @@ struct msm_drm_private {struct mutex lock; } lru; -struct workqueue_struct *wq; -unsigned int num_crtcs;struct msm_drm_thread event_thread[MAX_CRTCS ];
drivers/gpu/drm/msm/msm_kms.c +9 -2
@@ -137,7 +137,7 @@ static int vblank_ctrl_queue_work(struct msm_drm_private *priv, vbl_work->enable = enable; vbl_work->priv = priv; -queue_work (priv->wq, &vbl_work->work); +queue_work (priv->kms->wq, &vbl_work->work);return 0 ; }
@@ -227,6 +227,13 @@ void msm_drm_kms_uninit(struct device *dev)BUG_ON (!kms); +/* We must cancel and cleanup any pending vblank enable/disable +* work before msm_irq_uninstall() to avoid work re-enabling an +* irq after uninstall has disabled it. +*/ + +flush_workqueue (kms->wq); +/* clean up event worker threads */ for (i =0 ; i < priv->num_crtcs; i++) {if (priv->event_thread[i].worker)
@@ -261,7 +268,7 @@ int msm_drm_kms_init(struct device *dev, const struct drm_driver *drv) ret = priv->kms_init (ddev);if (ret) {DRM_DEV_ERROR (dev,"failed to load kms\n" ); -return ret; + goto err_msm_uninit; }/* Enable normalization of plane zpos */
drivers/gpu/drm/msm/msm_kms.h +8 -0
@@ -153,6 +153,8 @@ struct msm_kms {struct mutex commit_lock[MAX_CRTCS ];unsigned pending_crtc_mask;struct msm_pending_timer pending_timers[MAX_CRTCS ]; + +struct workqueue_struct *wq; }; static inline int msm_kms_init(struct msm_kms *kms,
@@ -165,6 +167,10 @@ static inline int msm_kms_init(struct msm_kms *kms, kms->funcs = funcs; + kms->wq =alloc_ordered_workqueue ("msm" ,0 ); +if (!kms->wq) +return -ENOMEM ; +for (i =0 ; i <ARRAY_SIZE (kms->pending_timers); i++) { ret =msm_atomic_init_pending_timer (&kms->pending_timers[i], kms, i);if (ret) {
@@ -181,6 +187,8 @@ static inline void msm_kms_destroy(struct msm_kms *kms)for (i =0 ; i <ARRAY_SIZE (kms->pending_timers); i++)msm_atomic_destroy_pending_timer (&kms->pending_timers[i]); + +destroy_workqueue (kms->wq); }#define for_each_crtc_mask (dev, crtc, crtc_mask) \
Signature · 1 line
2.39.5
PATCH v4 2/10 drm/msm: move helper calls to msm_kms.c
In reply to Dmitry BaryshkovExtract two more KMS-related codepieces to msm_kms.c, removing last pieces of KMS code from msm_drv.c.
--- drivers/gpu/drm/msm/msm_drv.c | 9 +++------ drivers/gpu/drm/msm/msm_kms.c | 20 ++++++++++++++++++++ drivers/gpu/drm/msm/msm_kms.h | 2 ++ 3 files changed, 25 insertions(+), 6 deletions(-)
drivers/gpu/drm/msm/msm_drv.c +3 -6
@@ -11,7 +11,6 @@#include <linux/of_address.h> #include <linux/uaccess.h> -#include <drm/clients/drm_client_setup.h> #include <drm/drm_drv.h> #include <drm/drm_file.h> #include <drm/drm_ioctl.h>
@@ -74,7 +73,7 @@ static int msm_drm_uninit(struct device *dev)if (ddev->registered) {drm_dev_unregister (ddev);if (priv->kms) -drm_atomic_helper_shutdown (ddev); +msm_drm_kms_unregister (dev); }msm_gem_shrinker_cleanup (ddev);
@@ -167,10 +166,8 @@ static int msm_drm_init(struct device *dev, const struct drm_driver *drv)if (ret) goto err_msm_uninit; -if (priv->kms_init) { -drm_kms_helper_poll_init (ddev); -drm_client_setup (ddev,NULL ); - } +if (priv->kms_init) +msm_drm_kms_post_init (dev);return 0 ;
drivers/gpu/drm/msm/msm_kms.c +20 -0
@@ -13,6 +13,7 @@#include <drm/drm_drv.h> #include <drm/drm_mode_config.h> #include <drm/drm_vblank.h> +#include <drm/clients/drm_client_setup.h> #include "disp/msm_disp_snapshot.h" #include "msm_drv.h"
@@ -217,6 +218,15 @@ struct drm_gpuvm *msm_kms_init_vm(struct drm_device *dev)return vm; } +void msm_drm_kms_unregister (struct device *dev) +{ +struct platform_device *pdev =to_platform_device (dev); +struct msm_drm_private *priv =platform_get_drvdata (pdev); +struct drm_device *ddev = priv->dev; + +drm_atomic_helper_shutdown (ddev); +} +void msm_drm_kms_uninit (struct device *dev) {struct platform_device *pdev =to_platform_device (dev);
@@ -366,3 +376,13 @@ void msm_kms_shutdown(struct platform_device *pdev)if (drm && drm->registered && priv->kms)drm_atomic_helper_shutdown (drm); } + +void msm_drm_kms_post_init (struct device *dev) +{ +struct platform_device *pdev =to_platform_device (dev); +struct msm_drm_private *priv =platform_get_drvdata (pdev); +struct drm_device *ddev = priv->dev; + +drm_kms_helper_poll_init (ddev); +drm_client_setup (ddev,NULL ); +}
drivers/gpu/drm/msm/msm_kms.h +2 -0
@@ -200,6 +200,8 @@ static inline void msm_kms_destroy(struct msm_kms *kms) for_each_if (drm_crtc_mask(crtc) & (crtc_mask))int msm_drm_kms_init (struct device *dev,const struct drm_driver *drv); +void msm_drm_kms_post_init (struct device *dev); +void msm_drm_kms_unregister (struct device *dev);void msm_drm_kms_uninit (struct device *dev);#endif /* __MSM_KMS_H__ */
Signature · 1 line
2.39.5
PATCH v4 3/10 drm/msm/mdp4: get rid of mdp4_crtc.id
In reply to Dmitry BaryshkovThere is no reason to store CRTC id, it's a part of the drm_crtc. Drop this member and use drm_crtc.name for the warning message.
--- drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c | 7 ++----- drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 2 +- drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.h | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-)
drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c +2 -5
@@ -17,7 +17,6 @@struct mdp4_crtc {struct drm_crtc base;char name[8 ]; -int id;int ovlp;enum mdp4_dma dma;bool enabled;
@@ -539,7 +538,7 @@ static void mdp4_crtc_wait_for_flush_done(struct drm_crtc *crtc) mdp4_crtc->flushed_mask), msecs_to_jiffies(50));if (ret <=0 ) -dev_warn (dev->dev,"vblank time out, crtc=%d\n" , mdp4_crtc->id); +dev_warn (dev->dev,"vblank time out, crtc=%s\n" , mdp4_crtc->base.name); mdp4_crtc->flushed_mask =0 ;
@@ -624,7 +623,7 @@ static void mdp4_crtc_flip_cleanup(struct drm_device *dev, void *ptr)/* initialize crtc */ struct drm_crtc *mdp4_crtc_init (struct drm_device *dev, -struct drm_plane *plane,int id,int ovlp_id, +struct drm_plane *plane,int ovlp_id,enum mdp4_dma dma_id) {struct drm_crtc *crtc =NULL ;
@@ -639,8 +638,6 @@ struct drm_crtc *mdp4_crtc_init(struct drm_device *dev, crtc = &mdp4_crtc->base; - mdp4_crtc->id = id; - mdp4_crtc->ovlp = ovlp_id; mdp4_crtc->dma = dma_id;
drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c +1 -1
@@ -339,7 +339,7 @@ static int modeset_init(struct mdp4_kms *mdp4_kms) goto fail; } - crtc =mdp4_crtc_init (dev, plane, priv->num_crtcs, i, + crtc =mdp4_crtc_init (dev, plane, i, mdp4_crtcs[i]);if (IS_ERR (crtc)) { DRM_DEV_ERROR(dev->dev, "failed to construct crtc for %s\n",
drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.h +1 -1
@@ -185,7 +185,7 @@ void mdp4_crtc_set_config(struct drm_crtc *crtc, uint32_t config);void mdp4_crtc_set_intf (struct drm_crtc *crtc,enum mdp4_intf intf,int mixer);void mdp4_crtc_wait_for_commit_done (struct drm_crtc *crtc);struct drm_crtc *mdp4_crtc_init (struct drm_device *dev, -struct drm_plane *plane,int id,int ovlp_id, +struct drm_plane *plane,int ovlp_id,enum mdp4_dma dma_id);long mdp4_dtv_round_pixclk (struct drm_encoder *encoder,unsigned long rate);
Signature · 1 line
2.39.5
PATCH v4 4/10 drm/msm: get rid of msm_drm_private::num_crtcs
In reply to Dmitry BaryshkovDrop superfluous msm_drm_private::num_crtcs in favour of using drm_mode_config::num_crtc or MAX_CRCS as appropriate.
--- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 3 +-- drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 3 --- drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 4 +--- drivers/gpu/drm/msm/msm_drv.h | 2 -- drivers/gpu/drm/msm/msm_kms.c | 4 ++-- 5 files changed, 4 insertions(+), 12 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +1 -2
@@ -875,12 +875,11 @@ static int _dpu_kms_drm_obj_init(struct dpu_kms *dpu_kms) ret =PTR_ERR (crtc);return ret; } - priv->num_crtcs++; }/* All CRTCs are compatible with all encoders */ drm_for_each_encoder (encoder, dev) - encoder->possible_crtcs = (1 << priv->num_crtcs) -1 ; + encoder->possible_crtcs = (1 << dev->mode_config.num_crtc) -1 ;return 0 ; }
drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c +0 -3
@@ -297,7 +297,6 @@ static int mdp4_modeset_init_intf(struct mdp4_kms *mdp4_kms,static int modeset_init (struct mdp4_kms *mdp4_kms) {struct drm_device *dev = mdp4_kms->dev; -struct msm_drm_private *priv = dev->dev_private;struct drm_plane *plane;struct drm_crtc *crtc;int i, ret;
@@ -347,8 +346,6 @@ static int modeset_init(struct mdp4_kms *mdp4_kms) ret =PTR_ERR (crtc); goto fail; } - - priv->num_crtcs++; }/*
drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c +1 -3
@@ -375,7 +375,6 @@ static int modeset_init_intf(struct mdp5_kms *mdp5_kms,static int modeset_init (struct mdp5_kms *mdp5_kms) {struct drm_device *dev = mdp5_kms->dev; -struct msm_drm_private *priv = dev->dev_private;unsigned int num_crtcs;int i, ret, pi =0 , ci =0 ;struct drm_plane *primary[MAX_BASES ] = {NULL };
@@ -443,7 +442,6 @@ static int modeset_init(struct mdp5_kms *mdp5_kms)DRM_DEV_ERROR (dev->dev,"failed to construct crtc %d (%d)\n" , i, ret); goto fail; } - priv->num_crtcs++; }/*
@@ -451,7 +449,7 @@ static int modeset_init(struct mdp5_kms *mdp5_kms)* crtcs for the encoders */ drm_for_each_encoder (encoder, dev) - encoder->possible_crtcs = (1 << priv->num_crtcs) -1 ; + encoder->possible_crtcs = (1 << dev->mode_config.num_crtc) -1 ;return 0 ;
drivers/gpu/drm/msm/msm_drv.h +0 -2
@@ -175,8 +175,6 @@ struct msm_drm_private {struct mutex lock; } lru; -unsigned int num_crtcs; -struct msm_drm_thread event_thread[MAX_CRTCS ];struct notifier_block vmap_notifier;
drivers/gpu/drm/msm/msm_kms.c +2 -2
@@ -245,7 +245,7 @@ void msm_drm_kms_uninit(struct device *dev)flush_workqueue (kms->wq);/* clean up event worker threads */ -for (i =0 ; i < priv->num_crtcs; i++) { +for (i =0 ; i <MAX_CRTCS ; i++) {if (priv->event_thread[i].worker)kthread_destroy_worker (priv->event_thread[i].worker); }
@@ -313,7 +313,7 @@ int msm_drm_kms_init(struct device *dev, const struct drm_driver *drv)sched_set_fifo (ev_thread->worker->task); } - ret =drm_vblank_init (ddev, priv->num_crtcs); + ret =drm_vblank_init (ddev, ddev->mode_config.num_crtc);if (ret <0 ) {DRM_DEV_ERROR (dev,"failed to initialize vblank\n" ); goto err_msm_uninit;
Signature · 1 line
2.39.5
PATCH v4 5/10 drm/msm: move KMS driver data to msm_kms
In reply to Dmitry BaryshkovData for HDMI, DSI and DP blocks only makes sense for the KMS parts of the driver. Move corresponding data pointers from struct msm_drm_private to struct msm_kms.
--- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 11 ++++---- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 32 +++++++++++------------ drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 8 +++--- drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 13 ++++----- drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c | 12 ++++----- drivers/gpu/drm/msm/dp/dp_display.c | 6 ++--- drivers/gpu/drm/msm/dsi/dsi.c | 4 +-- drivers/gpu/drm/msm/hdmi/hdmi.c | 9 ++++--- drivers/gpu/drm/msm/msm_drv.h | 11 +------- drivers/gpu/drm/msm/msm_kms.h | 6 +++++ 10 files changed, 55 insertions(+), 57 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +6 -5
@@ -264,7 +264,7 @@ bool dpu_encoder_needs_periph_flush(struct dpu_encoder_phys *phys_enc) mode = &phys_enc->cached_mode;return phys_enc->hw_intf->cap->type ==INTF_DP && -msm_dp_needs_periph_flush (priv->dp[disp_info->h_tile_instance[0 ]], mode); +msm_dp_needs_periph_flush (priv->kms->dp[disp_info->h_tile_instance[0 ]], mode); }/**
@@ -283,9 +283,9 @@ bool dpu_encoder_is_widebus_enabled(const struct drm_encoder *drm_enc) index = disp_info->h_tile_instance[0 ];if (disp_info->intf_type ==INTF_DP ) -return msm_dp_wide_bus_available (priv->dp[index]); +return msm_dp_wide_bus_available (priv->kms->dp[index]);else if (disp_info->intf_type ==INTF_DSI ) -return msm_dsi_wide_bus_enabled (priv->dsi[index]); +return msm_dsi_wide_bus_enabled (priv->kms->dsi[index]);return false; }
@@ -647,7 +647,7 @@ struct drm_dsc_config *dpu_encoder_get_dsc_config(struct drm_encoder *drm_enc)int index = dpu_enc->disp_info.h_tile_instance[0 ];if (dpu_enc->disp_info.intf_type ==INTF_DSI ) -return msm_dsi_get_dsc_config (priv->dsi[index]); +return msm_dsi_get_dsc_config (priv->kms->dsi[index]);return NULL ; }
@@ -709,7 +709,8 @@ void dpu_encoder_update_topology(struct drm_encoder *drm_enc,if (fb &&MSM_FORMAT_IS_YUV (msm_framebuffer_format (fb))) topology->num_cdm++; }else if (disp_info->intf_type ==INTF_DP ) { -if (msm_dp_is_yuv_420_enabled (priv->dp[disp_info->h_tile_instance[0 ]], adj_mode)) +if (msm_dp_is_yuv_420_enabled (priv->kms->dp[disp_info->h_tile_instance[0 ]], + adj_mode)) topology->num_cdm++; } }
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +16 -16
@@ -583,7 +583,7 @@ static int _dpu_kms_initialize_dsi(struct drm_device *dev,struct msm_display_info info;int i, rc =0 ; -if (!(priv->dsi[0 ] || priv->dsi[1 ])) +if (!(priv->kms->dsi[0 ] || priv->kms->dsi[1 ]))return rc;/*
@@ -594,26 +594,26 @@ static int _dpu_kms_initialize_dsi(struct drm_device *dev,* * TODO: Support swapping DSI0 and DSI1 in the bonded setup. */ -for (i =0 ; i <ARRAY_SIZE (priv->dsi); i++) { +for (i =0 ; i <ARRAY_SIZE (priv->kms->dsi); i++) {int other = (i +1 ) %2 ; -if (!priv->dsi[i]) +if (!priv->kms->dsi[i])continue ; -if (msm_dsi_is_bonded_dsi (priv->dsi[i]) && - !msm_dsi_is_master_dsi (priv->dsi[i])) +if (msm_dsi_is_bonded_dsi (priv->kms->dsi[i]) && + !msm_dsi_is_master_dsi (priv->kms->dsi[i]))continue ;memset (&info,0 ,sizeof (info)); info.intf_type =INTF_DSI ; info.h_tile_instance[info.num_of_h_tiles++] = i; -if (msm_dsi_is_bonded_dsi (priv->dsi[i])) +if (msm_dsi_is_bonded_dsi (priv->kms->dsi[i])) info.h_tile_instance[info.num_of_h_tiles++] = other; - info.is_cmd_mode =msm_dsi_is_cmd_mode (priv->dsi[i]); + info.is_cmd_mode =msm_dsi_is_cmd_mode (priv->kms->dsi[i]); - rc =dpu_kms_dsi_set_te_source (&info, priv->dsi[i]); + rc =dpu_kms_dsi_set_te_source (&info, priv->kms->dsi[i]);if (rc) {DPU_ERROR ("failed to identify TE source for dsi display\n" );return rc;
@@ -625,15 +625,15 @@ static int _dpu_kms_initialize_dsi(struct drm_device *dev,return PTR_ERR (encoder); } - rc =msm_dsi_modeset_init (priv->dsi[i], dev, encoder); + rc =msm_dsi_modeset_init (priv->kms->dsi[i], dev, encoder);if (rc) {DPU_ERROR ("modeset_init failed for dsi[%d], rc = %d\n" , i, rc);break ; } -if (msm_dsi_is_bonded_dsi (priv->dsi[i]) && priv->dsi[other]) { - rc =msm_dsi_modeset_init (priv->dsi[other], dev, encoder); +if (msm_dsi_is_bonded_dsi (priv->kms->dsi[i]) && priv->kms->dsi[other]) { + rc =msm_dsi_modeset_init (priv->kms->dsi[other], dev, encoder);if (rc) {DPU_ERROR ("modeset_init failed for dsi[%d], rc = %d\n" , other, rc);
@@ -655,8 +655,8 @@ static int _dpu_kms_initialize_displayport(struct drm_device *dev,int rc;int i; -for (i =0 ; i <ARRAY_SIZE (priv->dp); i++) { -if (!priv->dp[i]) +for (i =0 ; i <ARRAY_SIZE (priv->kms->dp); i++) { +if (!priv->kms->dp[i])continue ;memset (&info,0 ,sizeof (info));
@@ -671,7 +671,7 @@ static int _dpu_kms_initialize_displayport(struct drm_device *dev, } yuv_supported = !!dpu_kms->catalog->cdm; - rc =msm_dp_modeset_init (priv->dp[i], dev, encoder, yuv_supported); + rc =msm_dp_modeset_init (priv->kms->dp[i], dev, encoder, yuv_supported);if (rc) {DPU_ERROR ("modeset_init failed for DP, rc = %d\n" , rc);return rc;
@@ -689,7 +689,7 @@ static int _dpu_kms_initialize_hdmi(struct drm_device *dev,struct msm_display_info info;int rc; -if (!priv->hdmi) +if (!priv->kms->hdmi)return 0 ;memset (&info,0 ,sizeof (info));
@@ -703,7 +703,7 @@ static int _dpu_kms_initialize_hdmi(struct drm_device *dev,return PTR_ERR (encoder); } - rc =msm_hdmi_modeset_init (priv->hdmi, dev, encoder); + rc =msm_hdmi_modeset_init (priv->kms->hdmi, dev, encoder);if (rc) {DPU_ERROR ("modeset_init failed for DP, rc = %d\n" , rc);return rc;
drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c +4 -4
@@ -250,9 +250,9 @@ static int mdp4_modeset_init_intf(struct mdp4_kms *mdp4_kms,/* DTV can be hooked to DMA_E: */ encoder->possible_crtcs =1 <<1 ; -if (priv->hdmi) { +if (priv->kms->hdmi) {/* Construct bridge/connector for HDMI: */ - ret =msm_hdmi_modeset_init (priv->hdmi, dev, encoder); + ret =msm_hdmi_modeset_init (priv->kms->hdmi, dev, encoder);if (ret) {DRM_DEV_ERROR (dev->dev,"failed to initialize HDMI: %d\n" , ret);return ret;
@@ -264,7 +264,7 @@ static int mdp4_modeset_init_intf(struct mdp4_kms *mdp4_kms,/* only DSI1 supported for now */ dsi_id =0 ; -if (!priv->dsi[dsi_id]) +if (!priv->kms->dsi[dsi_id])break ; encoder =mdp4_dsi_encoder_init (dev);
@@ -278,7 +278,7 @@ static int mdp4_modeset_init_intf(struct mdp4_kms *mdp4_kms,/* TODO: Add DMA_S later? */ encoder->possible_crtcs =1 <<DMA_P ; - ret =msm_dsi_modeset_init (priv->dsi[dsi_id], dev, encoder); + ret =msm_dsi_modeset_init (priv->kms->dsi[dsi_id], dev, encoder);if (ret) {DRM_DEV_ERROR (dev->dev,"failed to initialize DSI: %d\n" , ret);
drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c +7 -6
@@ -312,7 +312,7 @@ static int modeset_init_intf(struct mdp5_kms *mdp5_kms,DRM_DEV_INFO (dev->dev,"Skipping eDP interface %d\n" , intf->num);break ;case INTF_HDMI : -if (!priv->hdmi) +if (!priv->kms->hdmi)break ; ctl =mdp5_ctlm_request (ctlm, intf->num);
@@ -327,7 +327,7 @@ static int modeset_init_intf(struct mdp5_kms *mdp5_kms,break ; } - ret =msm_hdmi_modeset_init (priv->hdmi, dev, encoder); + ret =msm_hdmi_modeset_init (priv->kms->hdmi, dev, encoder);break ;case INTF_DSI : {
@@ -335,14 +335,14 @@ static int modeset_init_intf(struct mdp5_kms *mdp5_kms,mdp5_cfg_get_hw_config (mdp5_kms->cfg);int dsi_id =get_dsi_id_from_intf (hw_cfg, intf->num); -if ((dsi_id >=ARRAY_SIZE (priv->dsi)) || (dsi_id <0 )) { +if ((dsi_id >=ARRAY_SIZE (priv->kms->dsi)) || (dsi_id <0 )) {DRM_DEV_ERROR (dev->dev,"failed to find dsi from intf %d\n" , intf->num); ret = -EINVAL ;break ; } -if (!priv->dsi[dsi_id]) +if (!priv->kms->dsi[dsi_id])break ; ctl =mdp5_ctlm_request (ctlm, intf->num);
@@ -357,9 +357,10 @@ static int modeset_init_intf(struct mdp5_kms *mdp5_kms,break ; } - ret =msm_dsi_modeset_init (priv->dsi[dsi_id], dev, encoder); + ret =msm_dsi_modeset_init (priv->kms->dsi[dsi_id], dev, encoder);if (!ret) -mdp5_encoder_set_intf_mode (encoder,msm_dsi_is_cmd_mode (priv->dsi[dsi_id])); +mdp5_encoder_set_intf_mode (encoder, +msm_dsi_is_cmd_mode (priv->kms->dsi[dsi_id]));break ; }
drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c +6 -6
@@ -127,18 +127,18 @@ void msm_disp_snapshot_capture_state(struct msm_disp_state *disp_state) priv = drm_dev->dev_private; kms = priv->kms; -for (i =0 ; i <ARRAY_SIZE (priv->dp); i++) { -if (!priv->dp[i]) +for (i =0 ; i <ARRAY_SIZE (kms->dp); i++) { +if (!kms->dp[i])continue ; -msm_dp_snapshot (disp_state, priv->dp[i]); +msm_dp_snapshot (disp_state, kms->dp[i]); } -for (i =0 ; i <ARRAY_SIZE (priv->dsi); i++) { -if (!priv->dsi[i]) +for (i =0 ; i <ARRAY_SIZE (kms->dsi); i++) { +if (!kms->dsi[i])continue ; -msm_dsi_snapshot (disp_state, priv->dsi[i]); +msm_dsi_snapshot (disp_state, kms->dsi[i]); }if (kms->funcs->snapshot)
drivers/gpu/drm/msm/dp/dp_display.c +2 -4
@@ -292,9 +292,7 @@ static int msm_dp_display_bind(struct device *dev, struct device *master,struct drm_device *drm = priv->dev; dp->msm_dp_display.drm_dev = drm; - priv->dp[dp->id] = &dp->msm_dp_display; - - + priv->kms->dp[dp->id] = &dp->msm_dp_display; dp->drm_dev = drm; dp->aux->drm_dev = drm;
@@ -328,7 +326,7 @@ static void msm_dp_display_unbind(struct device *dev, struct device *master,msm_dp_aux_unregister (dp->aux); dp->drm_dev =NULL ; dp->aux->drm_dev =NULL ; - priv->dp[dp->id] =NULL ; + priv->kms->dp[dp->id] =NULL ; }static const struct component_ops msm_dp_display_comp_ops = {
drivers/gpu/drm/msm/dsi/dsi.c +2 -2
@@ -136,7 +136,7 @@ static int dsi_bind(struct device *dev, struct device *master, void *data) msm_dsi->next_bridge = ext_bridge; } - priv->dsi[msm_dsi->id] = msm_dsi; + priv->kms->dsi[msm_dsi->id] = msm_dsi;return 0 ; }
@@ -148,7 +148,7 @@ static void dsi_unbind(struct device *dev, struct device *master,struct msm_dsi *msm_dsi =dev_get_drvdata (dev);msm_dsi_tx_buf_free (msm_dsi->host); - priv->dsi[msm_dsi->id] =NULL ; + priv->kms->dsi[msm_dsi->id] =NULL ; }static const struct component_ops dsi_ops = {
drivers/gpu/drm/msm/hdmi/hdmi.c +5 -4
@@ -15,6 +15,7 @@#include <drm/drm_of.h> #include <drm/display/drm_hdmi_state_helper.h> +#include "msm_kms.h" #include "hdmi.h" void msm_hdmi_set_mode (struct hdmi *hdmi,bool power_on)
@@ -244,7 +245,7 @@ static int msm_hdmi_bind(struct device *dev, struct device *master, void *data) err =msm_hdmi_init (hdmi);if (err)return err; - priv->hdmi = hdmi; + priv->kms->hdmi = hdmi;return 0 ; }
@@ -254,9 +255,9 @@ static void msm_hdmi_unbind(struct device *dev, struct device *master, {struct msm_drm_private *priv =dev_get_drvdata (master); -if (priv->hdmi) { -msm_hdmi_destroy (priv->hdmi); - priv->hdmi =NULL ; +if (priv->kms->hdmi) { +msm_hdmi_destroy (priv->kms->hdmi); + priv->kms->hdmi =NULL ; } }
drivers/gpu/drm/msm/msm_drv.h +1 -10
@@ -86,16 +86,6 @@ struct msm_drm_private {/* subordinate devices, if present: */ struct platform_device *gpu_pdev; -/* possibly this should be in the kms component, but it is -* shared by both mdp4 and mdp5.. -*/ -struct hdmi *hdmi; - -/* DSI is shared by mdp4 and mdp5 */ -struct msm_dsi *dsi[MSM_DSI_CONTROLLER_COUNT ]; - -struct msm_dp *dp[MSM_DP_CONTROLLER_COUNT ]; -/* when we have more than one 'msm_gpu' these need to be an array: */ struct msm_gpu *gpu;
@@ -367,6 +357,7 @@ static inline const char *msm_dsi_get_te_source(struct msm_dsi *msm_dsi) }#endif +struct msm_dp ;#ifdef CONFIG_DRM_MSM_DP int __init msm_dp_register (void ); void __exit msm_dp_unregister(void);
drivers/gpu/drm/msm/msm_kms.h +6 -0
@@ -131,6 +131,12 @@ struct msm_kms {const struct msm_kms_funcs *funcs;struct drm_device *dev; +struct hdmi *hdmi; + +struct msm_dsi *dsi[MSM_DSI_CONTROLLER_COUNT ]; + +struct msm_dp *dp[MSM_DP_CONTROLLER_COUNT ]; +/* irq number to be passed on to msm_irq_install */ int irq;bool irq_requested;
Signature · 1 line
2.39.5
PATCH v4 6/10 drm/msm: make it possible to disable KMS-related code.
In reply to Dmitry BaryshkovIf the Adreno device is used in a headless mode, there is no need to build all KMS components. Build corresponding parts conditionally, only selecting them if modeset support is actually required.
--- drivers/gpu/drm/msm/Kconfig | 14 +++++ drivers/gpu/drm/msm/Makefile | 19 +++---- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 4 +- drivers/gpu/drm/msm/dp/dp_debug.c | 4 ++ drivers/gpu/drm/msm/msm_debugfs.c | 92 ++++++++++++++++++-------------- drivers/gpu/drm/msm/msm_drv.h | 10 +--- drivers/gpu/drm/msm/msm_kms.c | 6 +-- drivers/gpu/drm/msm/msm_kms.h | 30 +++++++++++ 8 files changed, 117 insertions(+), 62 deletions(-)
drivers/gpu/drm/msm/Kconfig +14 -0
@@ -68,6 +68,14 @@ config DRM_MSM_VALIDATE_XML Validate XML files with register definitions against rules-fd schema. This option is mostly targeting DRM MSM developers. If unsure, say N. +config DRM_MSM_KMS + def_bool n + depends on DRM_MSM + +config DRM_MSM_KMS_FBDEV + def_bool DRM_FBDEV_EMULATION + depends on DRM_MSM_KMS + config DRM_MSM_MDSS bool depends on DRM_MSM
@@ -76,6 +84,7 @@ config DRM_MSM_MDSS config DRM_MSM_MDP4 bool "Enable MDP4 support in MSM DRM driver" depends on DRM_MSM + select DRM_MSM_KMS default y help Compile in support for the Mobile Display Processor v4 (MDP4) in
@@ -86,6 +95,7 @@ config DRM_MSM_MDP5 bool "Enable MDP5 support in MSM DRM driver" depends on DRM_MSM select DRM_MSM_MDSS + select DRM_MSM_KMS default y help Compile in support for the Mobile Display Processor v5 (MDP5) in
@@ -96,6 +106,7 @@ config DRM_MSM_DPU bool "Enable DPU support in MSM DRM driver" depends on DRM_MSM select DRM_MSM_MDSS + select DRM_MSM_KMS select DRM_DISPLAY_DSC_HELPER default y help
@@ -106,6 +117,7 @@ config DRM_MSM_DPU config DRM_MSM_DP bool "Enable DisplayPort support in MSM DRM driver" depends on DRM_MSM + depends on DRM_MSM_KMS select DRM_DISPLAY_HDMI_AUDIO_HELPER select RATIONAL default y
@@ -117,6 +129,7 @@ config DRM_MSM_DP config DRM_MSM_DSI bool "Enable DSI support in MSM DRM driver" depends on DRM_MSM + depends on DRM_MSM_KMS select DRM_PANEL select DRM_MIPI_DSI select DRM_DISPLAY_DSC_HELPER
@@ -172,6 +185,7 @@ config DRM_MSM_DSI_7NM_PHY config DRM_MSM_HDMI bool "Enable HDMI support in MSM DRM driver" depends on DRM_MSM + depends on DRM_MSM_KMS default y select DRM_DISPLAY_HDMI_HELPER select DRM_DISPLAY_HDMI_STATE_HELPER
drivers/gpu/drm/msm/Makefile +10 -9
@@ -100,18 +100,15 @@ msm-display-$(CONFIG_DRM_MSM_DPU) += \ msm-display-$(CONFIG_DRM_MSM_MDSS) += \ msm_mdss.o \ -msm-display-y += \ +msm-display-$(CONFIG_DRM_MSM_KMS) += \ disp/mdp_format.o \ disp/mdp_kms.o \ disp/msm_disp_snapshot.o \ disp/msm_disp_snapshot_util.o \ msm-y += \ - msm_atomic.o \ - msm_atomic_tracepoints.o \ msm_debugfs.o \ msm_drv.o \ - msm_fb.o \ msm_fence.o \ msm_gem.o \ msm_gem_prime.o \
@@ -122,7 +119,6 @@ msm-y += \ msm_gpu_devfreq.o \ msm_io_utils.o \ msm_iommu.o \ - msm_kms.o \ msm_perf.o \ msm_rd.o \ msm_ringbuffer.o \
@@ -130,13 +126,17 @@ msm-y += \ msm_syncobj.o \ msm_gpu_tracepoints.o \ -msm-$(CONFIG_DRM_FBDEV_EMULATION) += msm_fbdev.o +msm-$(CONFIG_DRM_MSM_KMS) += \ + msm_atomic.o \ + msm_atomic_tracepoints.o \ + msm_fb.o \ + msm_kms.o \ -msm-display-$(CONFIG_DEBUG_FS) += \ - dp/dp_debug.o +msm-$(CONFIG_DRM_MSM_KMS_FBDEV) += msm_fbdev.o msm-display-$(CONFIG_DRM_MSM_DP)+= dp/dp_aux.o \ dp/dp_ctrl.o \ + dp/dp_debug.o \ dp/dp_display.o \ dp/dp_drm.o \ dp/dp_link.o \
@@ -159,7 +159,8 @@ msm-display-$(CONFIG_DRM_MSM_DSI_14NM_PHY) += dsi/phy/dsi_phy_14nm.o msm-display-$(CONFIG_DRM_MSM_DSI_10NM_PHY) += dsi/phy/dsi_phy_10nm.o msm-display-$(CONFIG_DRM_MSM_DSI_7NM_PHY) += dsi/phy/dsi_phy_7nm.o -msm-y += $(adreno-y) $(msm-display-y) +msm-y += $(adreno-y) +msm-$(CONFIG_DRM_MSM_KMS) += $(msm-display-y) obj-$(CONFIG_DRM_MSM) += msm.o
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +2 -2
@@ -742,7 +742,7 @@ void dpu_crtc_frame_event_cb(struct drm_crtc *crtc, u32 event) fevent->event = event; fevent->crtc = crtc; fevent->ts =ktime_get (); -kthread_queue_work (priv->event_thread[crtc_id].worker, &fevent->work); +kthread_queue_work (priv->kms->event_thread[crtc_id].worker, &fevent->work); }/**
@@ -911,7 +911,7 @@ static void dpu_crtc_atomic_flush(struct drm_crtc *crtc, dev = crtc->dev; priv = dev->dev_private; -if (crtc->index >=ARRAY_SIZE (priv->event_thread)) { +if (crtc->index >=ARRAY_SIZE (priv->kms->event_thread)) {DPU_ERROR ("invalid crtc index[%d]\n" , crtc->index);return ; }
drivers/gpu/drm/msm/dp/dp_debug.c +4 -0
@@ -5,6 +5,8 @@#define pr_fmt (fmt)"[drm-dp] %s: " fmt, __func__ +#ifdef CONFIG_DEBUG_FS +#include <linux/debugfs.h> #include <drm/drm_connector.h> #include <drm/drm_file.h>
@@ -234,3 +236,5 @@ int msm_dp_debug_init(struct device *dev, struct msm_dp_panel *panel, return 0; } + +#endif
drivers/gpu/drm/msm/msm_debugfs.c +53 -39
125 lines not on this page · raw message
drivers/gpu/drm/msm/msm_drv.h +1 -9
@@ -70,12 +70,6 @@ enum msm_dsi_controller {#define MSM_GPU_MAX_RINGS 4 -/* Commit/Event thread specific structure */ -struct msm_drm_thread { -struct drm_device *dev; -struct kthread_worker *worker; -}; -struct msm_drm_private {struct drm_device *dev;
@@ -165,8 +159,6 @@ struct msm_drm_private {struct mutex lock; } lru; -struct msm_drm_thread event_thread[MAX_CRTCS ]; -struct notifier_block vmap_notifier;struct shrinker *shrinker;
@@ -272,7 +264,7 @@ struct drm_framebuffer *msm_framebuffer_create(struct drm_device *dev,struct drm_framebuffer *msm_alloc_stolen_fb (struct drm_device *dev,int w,int h,int p,uint32_t format); -#ifdef CONFIG_DRM_FBDEV_EMULATION +#ifdef CONFIG_DRM_MSM_KMS_FBDEV int msm_fbdev_driver_fbdev_probe (struct drm_fb_helper *helper,struct drm_fb_helper_surface_size *sizes);#define MSM_FBDEV_DRIVER_OPS \
drivers/gpu/drm/msm/msm_kms.c +3 -3
@@ -246,8 +246,8 @@ void msm_drm_kms_uninit(struct device *dev)/* clean up event worker threads */ for (i =0 ; i <MAX_CRTCS ; i++) { -if (priv->event_thread[i].worker) -kthread_destroy_worker (priv->event_thread[i].worker); +if (kms->event_thread[i].worker) +kthread_destroy_worker (kms->event_thread[i].worker); }drm_kms_helper_poll_fini (ddev);
@@ -300,7 +300,7 @@ int msm_drm_kms_init(struct device *dev, const struct drm_driver *drv)struct msm_drm_thread *ev_thread;/* initialize event thread */ - ev_thread = &priv->event_thread[drm_crtc_index (crtc)]; + ev_thread = &kms->event_thread[drm_crtc_index (crtc)]; ev_thread->dev = ddev; ev_thread->worker =kthread_run_worker (0 ,"crtc_event:%d" , crtc->base.id);if (IS_ERR (ev_thread->worker)) {
drivers/gpu/drm/msm/msm_kms.h +30 -0
@@ -13,6 +13,8 @@#include "msm_drv.h" +#ifdef CONFIG_DRM_MSM_KMS +#define MAX_PLANE 4/* As there are different display controller blocks depending on the
@@ -127,6 +129,12 @@ struct msm_pending_timer {unsigned crtc_idx; }; +/* Commit/Event thread specific structure */ +struct msm_drm_thread { +struct drm_device *dev; +struct kthread_worker *worker; +}; +struct msm_kms {const struct msm_kms_funcs *funcs;struct drm_device *dev;
@@ -161,6 +169,7 @@ struct msm_kms {struct msm_pending_timer pending_timers[MAX_CRTCS ];struct workqueue_struct *wq; +struct msm_drm_thread event_thread[MAX_CRTCS ]; }; static inline int msm_kms_init(struct msm_kms *kms,
@@ -210,4 +219,25 @@ void msm_drm_kms_post_init(struct device *dev);void msm_drm_kms_unregister (struct device *dev);void msm_drm_kms_uninit (struct device *dev); +#else /* ! CONFIG_DRM_MSM_KMS */ + +static inline int msm_drm_kms_init (struct device *dev,const struct drm_driver *drv) +{ +return -ENODEV ; +} + +static inline void msm_drm_kms_post_init (struct device *dev) +{ +} + +static inline void msm_drm_kms_unregister (struct device *dev) +{ +} + +static inline void msm_drm_kms_uninit (struct device *dev) +{ +} + +#endif +#endif /* __MSM_KMS_H__ */
Signature · 1 line
2.39.5
PATCH v4 7/10 drm/msm: bail out late_init_minor() if it is not a GPU device
In reply to Dmitry BaryshkovBoth perf and hangrd make sense only for GPU devices. Bail out if we are registering a KMS-only device.
--- drivers/gpu/drm/msm/msm_debugfs.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/gpu/drm/msm/msm_debugfs.c +5 -0
@@ -325,11 +325,16 @@ static struct drm_info_list msm_debugfs_list[] = {static int late_init_minor (struct drm_minor *minor) { +struct drm_device *dev = minor->dev; +struct msm_drm_private *priv = dev->dev_private;int ret;if (!minor)return 0 ; +if (!priv->gpu_pdev) +return 0 ; + ret =msm_rd_debugfs_init (minor);if (ret) {DRM_DEV_ERROR (minor->dev->dev,"could not install rd debugfs\n" );
Signature · 1 line
2.39.5
PATCH v4 8/10 drm/msm: rearrange symbol selection
In reply to Dmitry BaryshkovMove symbol selection to be more fine grained: select DP helpers only if DP driver is also enabled, move KMS and display helpers to the newly introduced DRM_MSM_KMS.
--- drivers/gpu/drm/msm/Kconfig | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/gpu/drm/msm/Kconfig +10 -10
@@ -15,19 +15,9 @@ config DRM_MSM select IOMMU_IO_PGTABLE select QCOM_MDT_LOADER if ARCH_QCOM select REGULATOR - select DRM_CLIENT_SELECTION - select DRM_DISPLAY_DP_AUX_BUS - select DRM_DISPLAY_DP_HELPER - select DRM_DISPLAY_HELPER - select DRM_BRIDGE_CONNECTOR select DRM_EXEC select DRM_GPUVM - select DRM_KMS_HELPER - select DRM_PANEL - select DRM_BRIDGE - select DRM_PANEL_BRIDGE select DRM_SCHED - select FB_SYSMEM_HELPERS if DRM_FBDEV_EMULATION select SHMEM select TMPFS select QCOM_SCM
@@ -71,10 +61,18 @@ config DRM_MSM_VALIDATE_XML config DRM_MSM_KMS def_bool n depends on DRM_MSM + select DRM_BRIDGE + select DRM_BRIDGE_CONNECTOR + select DRM_CLIENT_SELECTION + select DRM_DISPLAY_HELPER + select DRM_KMS_HELPER + select DRM_PANEL + select DRM_PANEL_BRIDGE config DRM_MSM_KMS_FBDEV def_bool DRM_FBDEV_EMULATION depends on DRM_MSM_KMS + select FB_SYSMEM_HELPERS config DRM_MSM_MDSS bool
@@ -120,6 +118,8 @@ config DRM_MSM_DP depends on DRM_MSM_KMS select DRM_DISPLAY_HDMI_AUDIO_HELPER select RATIONAL + select DRM_DISPLAY_DP_AUX_BUS + select DRM_DISPLAY_DP_HELPER default y help Compile in support for DP driver in MSM DRM driver. DP external
Signature · 1 line
2.39.5
PATCH v4 9/10 drm/msm: rework binding of Imageon GPUs
In reply to Dmitry BaryshkovCurrently the msm driver creates an extra interim platform device for Imageon GPUs. This is not ideal, as the device doesn't have corresponding OF node. If the headless mode is used for newer GPUs, then the msm_use_mmu() function can not detect corresponding IOMMU devices. Also the DRM device (although it's headless) is created with modesetting flags being set.
To solve all these issues, rework the way the Imageon devices are bound. Remove the interim device, don't register a component and instead use a cut-down version of the normal functions to probe or remove the driver.
--- drivers/gpu/drm/msm/adreno/adreno_device.c | 36 +++--------- drivers/gpu/drm/msm/msm_drv.c | 91 ++++++++++++++++++++---------- drivers/gpu/drm/msm/msm_drv.h | 4 ++ 3 files changed, 72 insertions(+), 59 deletions(-)
drivers/gpu/drm/msm/adreno/adreno_device.c +8 -28
@@ -260,42 +260,22 @@ static const struct component_ops a3xx_ops = { .unbind = adreno_unbind, }; -static void adreno_device_register_headless (void ) -{ -/* on imx5, we don't have a top-level mdp/dpu node -* this creates a dummy node for the driver for that case -*/ -struct platform_device_info dummy_info = { - .parent =NULL , - .name ="msm" , - .id =-1 , - .res =NULL , - .num_res =0 , - .data =NULL , - .size_data =0 , - .dma_mask = ~0 , - }; -platform_device_register_full (&dummy_info); -} -static int adreno_probe (struct platform_device *pdev) { - -int ret; - - ret =component_add (&pdev->dev, &a3xx_ops); -if (ret) -return ret; -if (of_device_is_compatible (pdev->dev.of_node,"amd,imageon" )) -adreno_device_register_headless (); +return msm_gpu_probe (pdev, &a3xx_ops); -return 0 ; +return component_add (&pdev->dev, &a3xx_ops); }static void adreno_remove (struct platform_device *pdev) { -component_del (&pdev->dev, &a3xx_ops); +struct msm_drm_private *priv =platform_get_drvdata (pdev); + +if (priv->kms_init) +component_del (&pdev->dev, &a3xx_ops); +else +msm_gpu_remove (pdev, &a3xx_ops); }static void adreno_shutdown (struct platform_device *pdev)
drivers/gpu/drm/msm/msm_drv.c +60 -31
166 lines not on this page · raw message
drivers/gpu/drm/msm/msm_drv.h +4 -0
@@ -543,6 +543,10 @@ extern const struct component_master_ops msm_drm_ops;int msm_kms_pm_prepare (struct device *dev);void msm_kms_pm_complete (struct device *dev); +int msm_gpu_probe (struct platform_device *pdev, +const struct component_ops *ops); +void msm_gpu_remove (struct platform_device *pdev, +const struct component_ops *ops);int msm_drv_probe (struct device *dev,int (*kms_init)(struct drm_device *dev),struct msm_kms *kms);
Signature · 1 line
2.39.5
PATCH v4 10/10 drm/msm: enable separate binding of GPU and display devices
In reply to Dmitry BaryshkovThere are cases when we want to have separate DRM devices for GPU and display pipelines.
One example is development, when it is beneficial to be able to bind the GPU driver separately, without the display pipeline (and without the hacks adding "amd,imageon" to the compatible string). Another example is some of Qualcomm platforms, which have two MDSS units, but only one GPU. With current approach it is next to impossible to support this usecase properly, while separate binding allows users to have three DRM devices: two for MDSS units and a single headless GPU.
Add kernel param msm.separate_gpu_drm, which if set to true forces creation of separate display and GPU DRM devices. Mesa supports this setup by using the kmsro wrapper.
The param is disabled by default, in order to be able to test userspace for the compatibility issues. Simple clients are able to handle this setup automatically.
--- drivers/gpu/drm/msm/adreno/adreno_device.c | 3 +- drivers/gpu/drm/msm/msm_drv.c | 47 +++++++++++++++++++++++++++--- drivers/gpu/drm/msm/msm_drv.h | 2 ++ 3 files changed, 47 insertions(+), 5 deletions(-)
drivers/gpu/drm/msm/adreno/adreno_device.c +2 -1
@@ -262,7 +262,8 @@ static const struct component_ops a3xx_ops = {static int adreno_probe (struct platform_device *pdev) { -if (of_device_is_compatible (pdev->dev.of_node,"amd,imageon" )) +if (of_device_is_compatible (pdev->dev.of_node,"amd,imageon" ) || +msm_gpu_no_components ())return msm_gpu_probe (pdev, &a3xx_ops);return component_add (&pdev->dev, &a3xx_ops);
drivers/gpu/drm/msm/msm_drv.c +43 -4
74 lines not on this page · raw message
drivers/gpu/drm/msm/msm_drv.h +2 -0
@@ -554,4 +554,6 @@ void msm_kms_shutdown(struct platform_device *pdev);bool msm_disp_drv_should_bind (struct device *dev,bool dpu_driver); +bool msm_gpu_no_components (void ); +#endif /* __MSM_DRV_H__ */
Signature · 1 line
2.39.5