Atomic resource management
cover Atomic resource management
This patchset introduces drm private object in KMS to manage HW resource management. It modifies the resource manager by introducing API's to do per DRM object resource allocation/cleanups.
The patchset is based on: https://patchwork.kernel.org/patch/10461375/
Jeykumar Sankaran (4):
drm/msm/dpu: add atomic private object to dpu kms drm/msm/dpu: remove scalar config definitions drm/msm/dpu: remove resource pool manager drm/msm/dpu: use private obj to track hw resources
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 704 +++--------------- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 144 ++-- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 223 ++---- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 4 - drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h | 9 +- .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 32 +- .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 86 +-- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h | 10 - drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 85 ++- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 23 +- drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 805 ++++++--------------- drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h | 149 ++-- 12 files changed, 615 insertions(+), 1659 deletions(-)
Signature · 7 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
A message that is not in the archive (sent off-list or not yet received): 1528852667-14833-1-git-send-email-jsanka-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org
PATCH 1/4 drm/msm/dpu: add atomic private object to dpu kms
Subclass drm private state for DPU for handling driver specific data. Adds atomic private object and private object lock to dpu kms. Provides helper function to retrieve DPU private data from current atomic state.
--- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 66 +++++++++++++++++++++++++++++++++ drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 15 ++++++++ 2 files changed, 81 insertions(+)
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +66 -0
@@ -1076,6 +1076,10 @@ static void dpu_kms_destroy(struct msm_kms *kms) dpu_kms =to_dpu_kms (kms);_dpu_kms_hw_destroy (dpu_kms); + +drm_atomic_private_obj_fini (&dpu_kms->priv_obj); +drm_modeset_lock_fini (&dpu_kms->priv_obj_lock); + }static void dpu_kms_preclose (struct msm_kms *kms,struct drm_file *file)
@@ -1618,10 +1622,59 @@ static int dpu_kms_hw_init(struct msm_kms *kms)return rc; } +struct dpu_private_state *dpu_get_private_state (struct drm_atomic_state *state) +{ +struct msm_drm_private *priv = state->dev->dev_private; +struct dpu_kms *dpu_kms =to_dpu_kms (priv->kms); +struct drm_private_state *priv_state; +int rc =0 ; + + rc =drm_modeset_lock (&dpu_kms->priv_obj_lock, state->acquire_ctx); +if (rc) +return ERR_PTR (rc); + + priv_state =drm_atomic_get_private_obj_state (state, + &dpu_kms->priv_obj); +if (!priv_state) +return NULL ; + +return to_dpu_private_state (priv_state); +} + +static struct drm_private_state * +dpu_private_obj_duplicate_state (struct drm_private_obj *obj) +{ +struct dpu_private_state *dpu_priv_state; + + dpu_priv_state =kmemdup (obj->state, +sizeof (*dpu_priv_state),GFP_KERNEL ); +if (!dpu_priv_state) +return NULL ; + +__drm_atomic_helper_private_obj_duplicate_state (obj, + &dpu_priv_state->base); + +return &dpu_priv_state->base; +} + +static void dpu_private_obj_destroy_state (struct drm_private_obj *obj, +struct drm_private_state *state) +{ +struct dpu_private_state *dpu_priv_state =to_dpu_private_state (state); + +kfree (dpu_priv_state); +} + +static const struct drm_private_state_funcs priv_obj_funcs = { + .atomic_duplicate_state = dpu_private_obj_duplicate_state, + .atomic_destroy_state = dpu_private_obj_destroy_state, +}; +struct msm_kms *dpu_kms_init (struct drm_device *dev) {struct msm_drm_private *priv;struct dpu_kms *dpu_kms; +struct dpu_private_state *dpu_priv_state;int irq;if (!dev || !dev->dev_private) {
@@ -1639,6 +1692,19 @@ struct msm_kms *dpu_kms_init(struct drm_device *dev) } dpu_kms->base.irq = irq; +/* Initialize private obj's */ +drm_modeset_lock_init (&dpu_kms->priv_obj_lock); + + dpu_priv_state =kzalloc (sizeof (*dpu_priv_state),GFP_KERNEL ); +if (!dpu_priv_state) { +DPU_ERROR ("failed to allocate dpu priv obj\n" ); +return ERR_PTR (-ENOMEM ); + } + +drm_atomic_private_obj_init (&dpu_kms->priv_obj, + &dpu_priv_state->base, + &priv_obj_funcs); +return &dpu_kms->base; }
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h +15 -0
@@ -190,6 +190,9 @@ struct dpu_kms {struct dpu_hw_vbif *hw_vbif[VBIF_MAX ];struct dpu_hw_mdp *hw_mdp; +struct drm_modeset_lock priv_obj_lock; +struct drm_private_obj priv_obj; +bool has_danger_ctrl;struct platform_device *pdev;
@@ -197,12 +200,24 @@ struct dpu_kms {struct dss_module_power mp; }; +struct dpu_private_state { +struct drm_private_state base; +}; +struct vsync_info {u32 frame_count;u32 line_count; };#define to_dpu_kms (x) container_of(x, struct dpu_kms, base) +#define to_dpu_private_state (x) container_of(x, struct dpu_private_state, base) + +/** +* dpu_get_private_state - get dpu private state from atomic state +* @state: drm atomic state +* Return: pointer to dpu private state object +*/ +struct dpu_private_state *dpu_get_private_state (struct drm_atomic_state *state);/** * dpu_is_custom_client - whether or not to enable non-standard customizations
Signature · 7 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
A message that is not in the archive (sent off-list or not yet received): 1528852667-14833-2-git-send-email-jsanka-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org
Re: [DPU PATCH 1/4] drm/msm/dpu: add atomic private object to dpu kms
Quoted 35 lines · Jeykumar Sankaran
Subclass drm private state for DPU for handling driver specific data. Adds atomic private object and private object lock to dpu kms. Provides helper function to retrieve DPU private data from current atomic state.
Signed-off-by Jeykumar Sankaran <[email protected]>--- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 66 +++++++++++++++++++++++++++++++++ drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 15 ++++++++ 2 files changed, 81 insertions(+)drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +9
-0@@ -1076,6 +1076,10 @@ static void dpu_kms_destroy(struct msm_kms *kms) dpu_kms =to_dpu_kms (kms);_dpu_kms_hw_destroy (dpu_kms); + +drm_atomic_private_obj_fini (&dpu_kms->priv_obj); +drm_modeset_lock_fini (&dpu_kms->priv_obj_lock); + }static void dpu_kms_preclose (struct msm_kms *kms,struct drm_file *file)@@ -1618,10 +1622,59 @@ static int dpu_kms_hw_init(struct msm_kms *kms)return rc; } +struct dpu_private_state *dpu_get_private_state (struct drm_atomic_state *state) +{ +struct msm_drm_private *priv = state->dev->dev_private; +struct dpu_kms *dpu_kms =to_dpu_kms (priv->kms); +struct drm_private_state *priv_state;
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c static int dpu_kms_hw_init(struct msm_kms *kms) · line 1639
Quoted 10 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +10
-0+int rc =0 ; + + rc =drm_modeset_lock (&dpu_kms->priv_obj_lock, state->acquire_ctx); +if (rc) +return ERR_PTR (rc); + + priv_state =drm_atomic_get_private_obj_state (state, + &dpu_kms->priv_obj); +if (!priv_state) +return NULL ;
I'll have to see later when this function is used, but I generally don't like it when functions return both ERR_PTR and NULL on error but I'm leaving open the possibility that this could NULL for legitimate reasons. If not, please convert to a ERR_PTR.
Quoted 41 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +33
-0+return to_dpu_private_state (priv_state); +} + +static struct drm_private_state * +dpu_private_obj_duplicate_state (struct drm_private_obj *obj) +{ +struct dpu_private_state *dpu_priv_state; + + dpu_priv_state =kmemdup (obj->state, +sizeof (*dpu_priv_state),GFP_KERNEL ); +if (!dpu_priv_state) +return NULL ; + +__drm_atomic_helper_private_obj_duplicate_state (obj, + &dpu_priv_state->base); + +return &dpu_priv_state->base; +} + +static void dpu_private_obj_destroy_state (struct drm_private_obj *obj, +struct drm_private_state *state) +{ +struct dpu_private_state *dpu_priv_state =to_dpu_private_state (state); + +kfree (dpu_priv_state); +} + +static const struct drm_private_state_funcs priv_obj_funcs = { + .atomic_duplicate_state = dpu_private_obj_duplicate_state, + .atomic_destroy_state = dpu_private_obj_destroy_state, +}; +struct msm_kms *dpu_kms_init (struct drm_device *dev) {struct msm_drm_private *priv;struct dpu_kms *dpu_kms; +struct dpu_private_state *dpu_priv_state;int irq;if (!dev || !dev->dev_private) {
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c struct msm_kms *dpu_kms_init(struct drm_device *dev) · line 1700
Quoted 9 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +6
-0@@ -1639,6 +1692,19 @@ struct msm_kms *dpu_kms_init(struct drm_device *dev) } dpu_kms->base.irq = irq; +/* Initialize private obj's */ +drm_modeset_lock_init (&dpu_kms->priv_obj_lock); + + dpu_priv_state =kzalloc (sizeof (*dpu_priv_state),GFP_KERNEL ); +if (!dpu_priv_state) { +DPU_ERROR ("failed to allocate dpu priv obj\n" );
We don't need an error message on memory failure - you will have no problem identifying when this went boom if it goes boom.
Quoted 50 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +7
-0+return ERR_PTR (-ENOMEM ); + } + +drm_atomic_private_obj_init (&dpu_kms->priv_obj, + &dpu_priv_state->base, + &priv_obj_funcs); +return &dpu_kms->base; }drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h +15
-0@@ -190,6 +190,9 @@ struct dpu_kms {struct dpu_hw_vbif *hw_vbif[VBIF_MAX ];struct dpu_hw_mdp *hw_mdp; +struct drm_modeset_lock priv_obj_lock; +struct drm_private_obj priv_obj; +bool has_danger_ctrl;struct platform_device *pdev;@@ -197,12 +200,24 @@ struct dpu_kms {struct dss_module_power mp; }; +struct dpu_private_state { +struct drm_private_state base; +}; +struct vsync_info {u32 frame_count;u32 line_count; };#define to_dpu_kms (x) container_of(x, struct dpu_kms, base) +#define to_dpu_private_state (x) container_of(x, struct dpu_private_state, base) + +/** +* dpu_get_private_state - get dpu private state from atomic state +* @state: drm atomic state +* Return: pointer to dpu private state object +*/ +struct dpu_private_state *dpu_get_private_state (struct drm_atomic_state *state);/** * dpu_is_custom_client - whether or not to enable non-standard customizations
Signature · 6 lines
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
Re: [Freedreno] [DPU PATCH 1/4] drm/msm/dpu: add atomic private object to dpu kms
Quoted 47 lines · Jordan Crouse
Quoted 8 lines · Jeykumar Sankaran
Subclass drm private state for DPU for handling driver specific data. Adds atomic private object and private object lock to dpu kms. Provides helper function to retrieve DPU private data from current atomic state.
Signed-off-by Jeykumar Sankaran <[email protected]>--- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 66+++++++++++++++++++++++++++++++++
Review
Quoted 4 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 15 ++++++++ 2 files changed, 81 insertions(+)(quoted diff) +0
-0
b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.cQuoted 14 lines
index fe614c0..a4ab783 100644
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +4
-0@@ -1076,6 +1076,10 @@ static void dpu_kms_destroy(struct msm_kms *kms) dpu_kms =to_dpu_kms (kms);_dpu_kms_hw_destroy (dpu_kms); + +drm_atomic_private_obj_fini (&dpu_kms->priv_obj); +drm_modeset_lock_fini (&dpu_kms->priv_obj_lock); + }Quoted 1 line
static void dpu_kms_preclose(struct
msm_kms*kms, structdrm_file*file)
Quoted 7 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +1
-0@@ -1618,10 +1622,59 @@ static int dpu_kms_hw_init(struct msm_kms *kms)return rc; } +struct dpu_private_state *dpu_get_private_state(struct
drm_atomic_state*state)
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c static int dpu_kms_hw_init(struct msm_kms *kms)
Quoted 7 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +7
-0+{ +struct msm_drm_private *priv = state->dev->dev_private; +struct dpu_kms *dpu_kms =to_dpu_kms (priv->kms); +struct drm_private_state *priv_state; +int rc =0 ; + + rc = drm_modeset_lock(&dpu_kms->priv_obj_lock,
state->acquire_ctx);
Quoted 16 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c static int dpu_kms_hw_init(struct msm_kms *kms) · line 1639
Quoted 7 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +7
-0+if (rc) +return ERR_PTR (rc); + + priv_state =drm_atomic_get_private_obj_state (state, + &dpu_kms->priv_obj); +if (!priv_state) +return NULL ;I'll have to see later when this function is used, but I generally don't like it
when functions return bothERR_PTRand NULL on error but I'm leaving open the
possibility that this could NULL for legitimate reasons. If not, please convert
to aERR_PTR.
I see drm_atomic_get_private_obj_state returns ERR_PTR(-ENOMEM) on error cases. So I should be good with IS_ERR/ERR_PTR.
Quoted 47 lines
Quoted 21 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +20
-0+return to_dpu_private_state (priv_state); +} + +static struct drm_private_state * +dpu_private_obj_duplicate_state (struct drm_private_obj *obj) +{ +struct dpu_private_state *dpu_priv_state; + + dpu_priv_state =kmemdup (obj->state, +sizeof (*dpu_priv_state),GFP_KERNEL ); +if (!dpu_priv_state) +return NULL ; + +__drm_atomic_helper_private_obj_duplicate_state (obj, + &dpu_priv_state->base); + +return &dpu_priv_state->base; +} + +static void dpu_private_obj_destroy_state(struct drm_private_obj*obj,
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c static int dpu_kms_hw_init(struct msm_kms *kms)
Quoted 3 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +3
-0+ struct drm_private_state *state) +{ + struct dpu_private_state *dpu_priv_state =
to_dpu_private_state(state);drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c struct msm_kms *dpu_kms_init(struct drm_device
Quoted 18 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +10
-0+ +kfree (dpu_priv_state); +} + +static const struct drm_private_state_funcs priv_obj_funcs = { + .atomic_duplicate_state = dpu_private_obj_duplicate_state, + .atomic_destroy_state = dpu_private_obj_destroy_state, +}; +struct msm_kms *dpu_kms_init (struct drm_device *dev) {struct msm_drm_private *priv;struct dpu_kms *dpu_kms; +struct dpu_private_state *dpu_priv_state;int irq;if (!dev || !dev->dev_private) {@@ -1639,6 +1692,19 @@ struct msm_kms *dpu_kms_init(struct drm_device*dev)
Quoted 3 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +0
-0} dpu_kms->base.irq = irq;
Quoted 11 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c struct msm_kms *dpu_kms_init(struct drm_device *dev) · line 1700
Quoted 6 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +6
-0+/* Initialize private obj's */ +drm_modeset_lock_init (&dpu_kms->priv_obj_lock); + + dpu_priv_state =kzalloc (sizeof (*dpu_priv_state),GFP_KERNEL ); +if (!dpu_priv_state) { +DPU_ERROR ("failed to allocate dpu priv obj\n" );We don't need an error message on memory failure - you will have no problem
identifying when this went boom if it goes boom.
Will remove
Quoted 55 lines
Review
Quoted 11 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +7
-0+return ERR_PTR (-ENOMEM ); + } + +drm_atomic_private_obj_init (&dpu_kms->priv_obj, + &dpu_priv_state->base, + &priv_obj_funcs); +return &dpu_kms->base; }(quoted diff) +0
-0
b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.hQuoted 18 lines
index 046e6f7..924d8967 100644
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h +4
-0@@ -190,6 +190,9 @@ struct dpu_kms {struct dpu_hw_vbif *hw_vbif[VBIF_MAX ];struct dpu_hw_mdp *hw_mdp; +struct drm_modeset_lock priv_obj_lock; +struct drm_private_obj priv_obj; +bool has_danger_ctrl;struct platform_device *pdev;@@ -197,12 +200,24 @@ struct dpu_kms {struct dss_module_power mp; }; +struct dpu_private_state {drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h struct dpu_kms { · line 213
Quoted 10 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h +4
-0+struct drm_private_state base; +}; +struct vsync_info {u32 frame_count;u32 line_count; };#define to_dpu_kms (x) container_of(x, struct dpu_kms, base) +#define to_dpu_private_state (x) container_of(x, struct
dpu_private_state, base)Quoted 8 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h +7
-0+ +/** +* dpu_get_private_state - get dpu private state from atomic state +* @state: drm atomic state +* Return: pointer to dpu private state object +*/ +struct dpu_private_state *dpu_get_private_state(struct
drm_atomic_state*state);
Quoted 3 lines
/**
*dpu_is_custom_client- whether or not to enable non-standardcustomizations
Quoted 1 line
--
Signature · 5 lines
Jeykumar S _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 2/4 drm/msm/dpu: remove scalar config definitions
In reply to a message not in the archivecleans up left out scalar config definitions from headers
--- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 1 - drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h | 10 ---------- 2 files changed, 11 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h +0 -1
@@ -194,7 +194,6 @@ struct dpu_crtc {u32 num_mixers;bool mixers_swapped;struct dpu_crtc_mixer mixers[CRTC_DUAL_MIXERS ]; -struct dpu_hw_scaler3_lut_cfg *scl3_lut_cfg;struct drm_pending_vblank_event *event;u32 vsync_count;
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h +0 -10
@@ -148,16 +148,6 @@ struct dpu_hw_scaler3_cfg {struct dpu_hw_scaler3_de_cfg de; }; -struct dpu_hw_scaler3_lut_cfg { -bool is_configured; -u32 *dir_lut; -size_t dir_len; -u32 *cir_lut; -size_t cir_len; -u32 *sep_lut; -size_t sep_len; -}; -/** * struct dpu_drm_pix_ext_v1 - version 1 of pixel ext structure * @num_ext_pxls_lr: Number of total horizontal pixels
Signature · 7 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
PATCH 3/4 drm/msm/dpu: remove resource pool manager
In reply to a message not in the archiveresource pool manager utility was introduced to manage rotator sessions. Removing the support as the rotator feature doesn't exist.
--- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 494 ------------------------------- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 84 ------ 2 files changed, 578 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +0 -494
@@ -98,476 +98,6 @@ static inline int _dpu_crtc_power_enable(struct dpu_crtc *dpu_crtc, bool enable)return 0 ; } -/** -* _dpu_crtc_rp_to_crtc - get crtc from resource pool object -* @rp: Pointer to resource pool -* return: Pointer to drm crtc if success; null otherwise -*/ -static struct drm_crtc *_dpu_crtc_rp_to_crtc (struct dpu_crtc_respool *rp) -{ -if (!rp) -return NULL ; - - return container_of(rp, struct dpu_crtc_state, rp)->base.crtc; -} - -/** -* _dpu_crtc_rp_reclaim - reclaim unused, or all if forced, resources in pool -* @rp: Pointer to resource pool -* @force: True to reclaim all resources; otherwise, reclaim only unused ones -* return: None -*/ -static void _dpu_crtc_rp_reclaim (struct dpu_crtc_respool *rp,bool force) -{ -struct dpu_crtc_res *res, *next; -struct drm_crtc *crtc; - - crtc =_dpu_crtc_rp_to_crtc (rp); -if (!crtc) { -DPU_ERROR ("invalid crtc\n" ); -return ; - } - -DPU_DEBUG ("crtc%d.%u %s\n" , crtc->base.id, rp->sequence_id, - force ?"destroy" :"free_unused" ); - -list_for_each_entry_safe (res, next, &rp->res_list, list) { -if (!force && !(res->flags &DPU_CRTC_RES_FLAG_FREE )) -continue ; -DPU_DEBUG ("crtc%d.%u reclaim res:0x%x/0x%llx/%pK/%d\n" , - crtc->base.id, rp->sequence_id, - res->type, res->tag, res->val, -atomic_read (&res->refcount)); -list_del (&res->list); -if (res->ops.put) - res->ops.put (res->val); -kfree (res); - } -} - -/** -* _dpu_crtc_rp_free_unused - free unused resource in pool -* @rp: Pointer to resource pool -* return: none -*/ -static void _dpu_crtc_rp_free_unused (struct dpu_crtc_respool *rp) -{ -mutex_lock (rp->rp_lock); -_dpu_crtc_rp_reclaim (rp, false); -mutex_unlock (rp->rp_lock); -} - -/** -* _dpu_crtc_rp_destroy - destroy resource pool -* @rp: Pointer to resource pool -* return: None -*/ -static void _dpu_crtc_rp_destroy (struct dpu_crtc_respool *rp) -{ -mutex_lock (rp->rp_lock); -list_del_init (&rp->rp_list); -_dpu_crtc_rp_reclaim (rp, true); -mutex_unlock (rp->rp_lock); -} - -/** -* _dpu_crtc_hw_blk_get - get callback for hardware block -* @val: Resource handle -* @type: Resource type -* @tag: Search tag for given resource -* return: Resource handle -*/ -static void *_dpu_crtc_hw_blk_get (void *val,u32 type,u64 tag) -{ -DPU_DEBUG ("res:%d/0x%llx/%pK\n" , type, tag, val); -return dpu_hw_blk_get (val, type, tag); -} - -/** -* _dpu_crtc_hw_blk_put - put callback for hardware block -* @val: Resource handle -* return: None -*/ -static void _dpu_crtc_hw_blk_put (void *val) -{ -DPU_DEBUG ("res://%pK\n" , val); -dpu_hw_blk_put (val); -} - -/** -* _dpu_crtc_rp_duplicate - duplicate resource pool and reset reference count -* @rp: Pointer to original resource pool -* @dup_rp: Pointer to duplicated resource pool -* return: None -*/ -static void _dpu_crtc_rp_duplicate (struct dpu_crtc_respool *rp, -struct dpu_crtc_respool *dup_rp) -{ -struct dpu_crtc_res *res, *dup_res; -struct drm_crtc *crtc; - -if (!rp || !dup_rp || !rp->rp_head) { -DPU_ERROR ("invalid resource pool\n" ); -return ; - } - - crtc =_dpu_crtc_rp_to_crtc (rp); -if (!crtc) { -DPU_ERROR ("invalid crtc\n" ); -return ; - } - -DPU_DEBUG ("crtc%d.%u duplicate\n" , crtc->base.id, rp->sequence_id); - -mutex_lock (rp->rp_lock); - dup_rp->sequence_id = rp->sequence_id +1 ; -INIT_LIST_HEAD (&dup_rp->res_list); - dup_rp->ops = rp->ops; -list_for_each_entry (res, &rp->res_list, list) { - dup_res =kzalloc (sizeof (struct dpu_crtc_res ),GFP_KERNEL ); -if (!dup_res) { -mutex_unlock (rp->rp_lock); -return ; - } -INIT_LIST_HEAD (&dup_res->list); -atomic_set (&dup_res->refcount,0 ); - dup_res->type = res->type; - dup_res->tag = res->tag; - dup_res->val = res->val; - dup_res->ops = res->ops; - dup_res->flags =DPU_CRTC_RES_FLAG_FREE ; -DPU_DEBUG ("crtc%d.%u dup res:0x%x/0x%llx/%pK/%d\n" , - crtc->base.id, dup_rp->sequence_id, - dup_res->type, dup_res->tag, dup_res->val, -atomic_read (&dup_res->refcount)); -list_add_tail (&dup_res->list, &dup_rp->res_list); -if (dup_res->ops.get) - dup_res->ops.get (dup_res->val,0 ,-1 ); - } - - dup_rp->rp_lock = rp->rp_lock; - dup_rp->rp_head = rp->rp_head; -INIT_LIST_HEAD (&dup_rp->rp_list); -list_add_tail (&dup_rp->rp_list, rp->rp_head); -mutex_unlock (rp->rp_lock); -} - -/** -* _dpu_crtc_rp_reset - reset resource pool after allocation -* @rp: Pointer to original resource pool -* @rp_lock: Pointer to serialization resource pool lock -* @rp_head: Pointer to crtc resource pool head -* return: None -*/ -static void _dpu_crtc_rp_reset (struct dpu_crtc_respool *rp, -struct mutex *rp_lock,struct list_head *rp_head) -{ -if (!rp || !rp_lock || !rp_head) { -DPU_ERROR ("invalid resource pool\n" ); -return ; - } - -mutex_lock (rp_lock); - rp->rp_lock = rp_lock; - rp->rp_head = rp_head; -INIT_LIST_HEAD (&rp->rp_list); - rp->sequence_id =0 ; -INIT_LIST_HEAD (&rp->res_list); - rp->ops.get = _dpu_crtc_hw_blk_get; - rp->ops.put = _dpu_crtc_hw_blk_put; -list_add_tail (&rp->rp_list, rp->rp_head); -mutex_unlock (rp_lock); -} - -/** -* _dpu_crtc_rp_add_no_lock - add given resource to resource pool without lock -* @rp: Pointer to original resource pool -* @type: Resource type -* @tag: Search tag for given resource -* @val: Resource handle -* @ops: Resource callback operations -* return: 0 if success; error code otherwise -*/ -static int _dpu_crtc_rp_add_no_lock (struct dpu_crtc_respool *rp,u32 type, -u64 tag,void *val,struct dpu_crtc_res_ops *ops) -{ -struct dpu_crtc_res *res; -struct drm_crtc *crtc; - -if (!rp || !ops) { -DPU_ERROR ("invalid resource pool/ops\n" ); -return -EINVAL ; - } - - crtc =_dpu_crtc_rp_to_crtc (rp); -if (!crtc) { -DPU_ERROR ("invalid crtc\n" ); -return -EINVAL ; - } - -list_for_each_entry (res, &rp->res_list, list) { -if (res->type != type || res->tag != tag) -continue ; -DPU_ERROR ("crtc%d.%u already exist res:0x%x/0x%llx/%pK/%d\n" , - crtc->base.id, rp->sequence_id, - res->type, res->tag, res->val, -atomic_read (&res->refcount)); -return -EEXIST ; - } - res =kzalloc (sizeof (struct dpu_crtc_res ),GFP_KERNEL ); -if (!res) -return -ENOMEM ; -INIT_LIST_HEAD (&res->list); -atomic_set (&res->refcount,1 ); - res->type = type; - res->tag = tag; - res->val = val; - res->ops = *ops; -list_add_tail (&res->list, &rp->res_list); -DPU_DEBUG ("crtc%d.%u added res:0x%x/0x%llx\n" , - crtc->base.id, rp->sequence_id, type, tag); -return 0 ; -} - -/** -* _dpu_crtc_rp_add - add given resource to resource pool -* @rp: Pointer to original resource pool -* @type: Resource type -* @tag: Search tag for given resource -* @val: Resource handle -* @ops: Resource callback operations -* return: 0 if success; error code otherwise -*/ -static int _dpu_crtc_rp_add (struct dpu_crtc_respool *rp,u32 type,u64 tag, -void *val,struct dpu_crtc_res_ops *ops) -{ -int rc; - -if (!rp) { -DPU_ERROR ("invalid resource pool\n" ); -return -EINVAL ; - } - -mutex_lock (rp->rp_lock); - rc =_dpu_crtc_rp_add_no_lock (rp, type, tag, val, ops); -mutex_unlock (rp->rp_lock); -return rc; -} - -/** -* _dpu_crtc_rp_get - lookup the resource from given resource pool and obtain -* if available; otherwise, obtain resource from global pool -* @rp: Pointer to original resource pool -* @type: Resource type -* @tag: Search tag for given resource -* return: Resource handle if success; pointer error or null otherwise -*/ -static void *_dpu_crtc_rp_get (struct dpu_crtc_respool *rp,u32 type,u64 tag) -{ -struct dpu_crtc_respool *old_rp; -struct dpu_crtc_res *res; -void *val =NULL ; -int rc; -struct drm_crtc *crtc; - -if (!rp) { -DPU_ERROR ("invalid resource pool\n" ); -return NULL ; - } - - crtc =_dpu_crtc_rp_to_crtc (rp); -if (!crtc) { -DPU_ERROR ("invalid crtc\n" ); -return NULL ; - } - -mutex_lock (rp->rp_lock); -list_for_each_entry (res, &rp->res_list, list) { -if (res->type != type || res->tag != tag) -continue ; -DPU_DEBUG ("crtc%d.%u found res:0x%x/0x%llx/%pK/%d\n" , - crtc->base.id, rp->sequence_id, - res->type, res->tag, res->val, -atomic_read (&res->refcount)); -atomic_inc (&res->refcount); - res->flags &= ~DPU_CRTC_RES_FLAG_FREE ; -mutex_unlock (rp->rp_lock); -return res->val; - } -list_for_each_entry (res, &rp->res_list, list) { -if (res->type != type || !(res->flags &DPU_CRTC_RES_FLAG_FREE )) -continue ; -DPU_DEBUG ("crtc%d.%u retag res:0x%x/0x%llx/%pK/%d\n" , - crtc->base.id, rp->sequence_id, - res->type, res->tag, res->val, -atomic_read (&res->refcount)); -atomic_inc (&res->refcount); - res->tag = tag; - res->flags &= ~DPU_CRTC_RES_FLAG_FREE ; -mutex_unlock (rp->rp_lock); -return res->val; - } -/* not in this rp, try to grab from global pool */ -if (rp->ops.get) - val = rp->ops.get (NULL , type,-1 ); -if (!IS_ERR_OR_NULL (val)) - goto add_res; -/* -* Search older resource pools for hw blk with matching type, -* necessary when resource is being used by this object, -* but in previous states not yet cleaned up. -* -* This enables searching of all resources currently owned -* by this crtc even though the resource might not be used -* in the current atomic state. This allows those resources -* to be re-acquired by the new atomic state immediately -* without waiting for the resources to be fully released. -*/ -else if (IS_ERR_OR_NULL (val) && (type <DPU_HW_BLK_MAX )) { -list_for_each_entry (old_rp, rp->rp_head, rp_list) { -if (old_rp == rp) -continue ; - -list_for_each_entry (res, &old_rp->res_list, list) { -if (res->type != type) -continue ; -DPU_DEBUG ( -"crtc%d.%u found res:0x%x//%pK/ in crtc%d.%d\n" , - crtc->base.id, - rp->sequence_id, - res->type, res->val, - crtc->base.id, - old_rp->sequence_id); -DPU_EVT32_VERBOSE (crtc->base.id, - rp->sequence_id, - res->type, res->val, - crtc->base.id, - old_rp->sequence_id); -if (res->ops.get) - res->ops.get (res->val,0 ,-1 ); - val = res->val; -break ; - } - -if (!IS_ERR_OR_NULL (val)) -break ; - } - } -if (IS_ERR_OR_NULL (val)) { -DPU_DEBUG ("crtc%d.%u failed to get res:0x%x//\n" , - crtc->base.id, rp->sequence_id, type); -mutex_unlock (rp->rp_lock); -return NULL ; - } -add_res: - rc =_dpu_crtc_rp_add_no_lock (rp, type, tag, val, &rp->ops); -if (rc) { -DPU_ERROR ("crtc%d.%u failed to add res:0x%x/0x%llx\n" , - crtc->base.id, rp->sequence_id, type, tag); -if (rp->ops.put) - rp->ops.put (val); - val =NULL ; - } -mutex_unlock (rp->rp_lock); -return val; -} - -/** -* _dpu_crtc_rp_put - return given resource to resource pool -* @rp: Pointer to original resource pool -* @type: Resource type -* @tag: Search tag for given resource -* return: None -*/ -static void _dpu_crtc_rp_put (struct dpu_crtc_respool *rp,u32 type,u64 tag) -{ -struct dpu_crtc_res *res, *next; -struct drm_crtc *crtc; - -if (!rp) { -DPU_ERROR ("invalid resource pool\n" ); -return ; - } - - crtc =_dpu_crtc_rp_to_crtc (rp); -if (!crtc) { -DPU_ERROR ("invalid crtc\n" ); -return ; - } - -mutex_lock (rp->rp_lock); -list_for_each_entry_safe (res, next, &rp->res_list, list) { -if (res->type != type || res->tag != tag) -continue ; -DPU_DEBUG ("crtc%d.%u found res:0x%x/0x%llx/%pK/%d\n" , - crtc->base.id, rp->sequence_id, - res->type, res->tag, res->val, -atomic_read (&res->refcount)); -if (res->flags &DPU_CRTC_RES_FLAG_FREE ) -DPU_ERROR ( -"crtc%d.%u already free res:0x%x/0x%llx/%pK/%d\n" , - crtc->base.id, rp->sequence_id, - res->type, res->tag, res->val, -atomic_read (&res->refcount)); -else if (atomic_dec_return (&res->refcount) ==0 ) - res->flags |=DPU_CRTC_RES_FLAG_FREE ; - -mutex_unlock (rp->rp_lock); -return ; - } -DPU_ERROR ("crtc%d.%u not found res:0x%x/0x%llx\n" , - crtc->base.id, rp->sequence_id, type, tag); -mutex_unlock (rp->rp_lock); -} - -int dpu_crtc_res_add (struct drm_crtc_state *state,u32 type,u64 tag, -void *val,struct dpu_crtc_res_ops *ops) -{ -struct dpu_crtc_respool *rp; - -if (!state) { -DPU_ERROR ("invalid parameters\n" ); -return -EINVAL ; - } - - rp = &to_dpu_crtc_state (state)->rp; -return _dpu_crtc_rp_add (rp, type, tag, val, ops); -} - -void *dpu_crtc_res_get (struct drm_crtc_state *state,u32 type,u64 tag) -{ -struct dpu_crtc_respool *rp; -void *val; - -if (!state) { -DPU_ERROR ("invalid parameters\n" ); -return NULL ; - } - - rp = &to_dpu_crtc_state (state)->rp; - val =_dpu_crtc_rp_get (rp, type, tag); -if (IS_ERR (val)) { -DPU_ERROR ("failed to get res type:0x%x:0x%llx\n" , - type, tag); -return NULL ; - } - -return val; -} - -void dpu_crtc_res_put (struct drm_crtc_state *state,u32 type,u64 tag) -{ -struct dpu_crtc_respool *rp; - -if (!state) { -DPU_ERROR ("invalid parameters\n" ); -return ; - } - - rp = &to_dpu_crtc_state (state)->rp; -_dpu_crtc_rp_put (rp, type, tag); -} -static void _dpu_crtc_deinit_events (struct dpu_crtc *dpu_crtc) {if (!dpu_crtc)
@@ -1322,8 +852,6 @@ static void dpu_crtc_destroy_state(struct drm_crtc *crtc,DPU_DEBUG ("crtc%d\n" , crtc->base.id); -_dpu_crtc_rp_destroy (&cstate->rp); -__drm_atomic_helper_crtc_destroy_state (state);kfree (cstate);
@@ -1583,8 +1111,6 @@ static struct drm_crtc_state *dpu_crtc_duplicate_state(struct drm_crtc *crtc)/* duplicate base helper */ __drm_atomic_helper_crtc_duplicate_state (crtc, &cstate->base); -_dpu_crtc_rp_duplicate (&old_cstate->rp, &cstate->rp); -return &cstate->base; }
@@ -1621,9 +1147,6 @@ static void dpu_crtc_reset(struct drm_crtc *crtc)return ; } -_dpu_crtc_rp_reset (&cstate->rp, &dpu_crtc->rp_lock, - &dpu_crtc->rp_head); - cstate->base.crtc = crtc; crtc->state = &cstate->base; }
@@ -2062,7 +1585,6 @@ static int dpu_crtc_atomic_check(struct drm_crtc *crtc, } end: -_dpu_crtc_rp_free_unused (&cstate->rp);return rc; }
@@ -2347,8 +1869,6 @@ static int dpu_crtc_debugfs_state_show(struct seq_file *s, void *v)struct drm_crtc *crtc = (struct drm_crtc *) s->private;struct dpu_crtc *dpu_crtc =to_dpu_crtc (crtc);struct dpu_crtc_state *cstate =to_dpu_crtc_state (crtc->state); -struct dpu_crtc_res *res; -struct dpu_crtc_respool *rp;int i;seq_printf (s,"num_connectors: %d\n" , cstate->num_connectors);
@@ -2366,17 +1886,6 @@ static int dpu_crtc_debugfs_state_show(struct seq_file *s, void *v) dpu_crtc->cur_perf.max_per_pipe_ib[i]); } -mutex_lock (&dpu_crtc->rp_lock); -list_for_each_entry (rp, &dpu_crtc->rp_head, rp_list) { -seq_printf (s,"rp.%d: " , rp->sequence_id); -list_for_each_entry (res, &rp->res_list, list) -seq_printf (s,"0x%x/0x%llx/%pK/%d " , - res->type, res->tag, res->val, -atomic_read (&res->refcount)); -seq_puts (s,"\n" ); - } -mutex_unlock (&dpu_crtc->rp_lock); -return 0 ; }DEFINE_DPU_DEBUGFS_SEQ_FOPS (dpu_crtc_debugfs_state);
@@ -2588,9 +2097,6 @@ struct drm_crtc *dpu_crtc_init(struct drm_device *dev, struct drm_plane *plane)spin_lock_init (&dpu_crtc->spin_lock);atomic_set (&dpu_crtc->frame_pending,0 ); -mutex_init (&dpu_crtc->rp_lock); -INIT_LIST_HEAD (&dpu_crtc->rp_head); -init_completion (&dpu_crtc->frame_done_comp);INIT_LIST_HEAD (&dpu_crtc->frame_event_list);
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h +0 -84
106 lines not on this page · raw message
Signature · 7 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
PATCH 4/4 drm/msm/dpu: use private obj to track hw resources
In reply to a message not in the archiveSwitch to state based resource management. This patch overhauls the resource manager and HW allocation methods by maintaining the global resource pool and allocated hw blocks in respective drm component states.
Global resource manager(RM) is tracked in private object. Allocation strategy is switched from single point allocation of HW resources for the display pipeline to per component based allocation, where each drm component allocates HW blocks mapped to it's domain and tracks them in their respective state objects.
Fixes resource contention due to race conditions between user space and display thread by reserving resources only in atomic check.
--- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 210 +++--- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 59 +- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 223 ++---- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 4 - drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h | 9 +- .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 32 +- .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 86 +-- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 19 +- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 8 +- drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 805 ++++++--------------- drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h | 149 ++-- 11 files changed, 534 insertions(+), 1070 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +113 -97
@@ -47,6 +47,8 @@#define RIGHT_MIXER 1#define MISR_BUFF_SIZE 256 +#define MAX_VDISPLAY_SPLIT 1080 +static inline struct dpu_kms *_dpu_crtc_get_kms (struct drm_crtc *crtc) {
@@ -142,9 +144,9 @@ static void _dpu_crtc_program_lm_output_roi(struct drm_crtc *crtc) crtc_state =to_dpu_crtc_state (crtc->state); lm_horiz_position =0 ; -for (lm_idx =0 ; lm_idx < dpu_crtc->num_mixers; lm_idx++) { +for (lm_idx =0 ; lm_idx < crtc_state->num_mixers; lm_idx++) {const struct dpu_rect *lm_roi = &crtc_state->lm_bounds[lm_idx]; -struct dpu_hw_mixer *hw_lm = dpu_crtc->mixers[lm_idx].hw_lm; +struct dpu_hw_mixer *hw_lm = crtc_state->mixers[lm_idx].hw_lm;struct dpu_hw_mixer_cfg cfg;if (dpu_kms_rect_is_null (lm_roi))
@@ -182,7 +184,7 @@ static void _dpu_crtc_blend_setup_mixer(struct drm_crtc *crtc,return ; } - ctl = mixer->hw_ctl; + ctl = mixer->lm_ctl; lm = mixer->hw_lm; stage_cfg = &dpu_crtc->stage_cfg; cstate =to_dpu_crtc_state (crtc->state);
@@ -237,7 +239,7 @@ static void _dpu_crtc_blend_setup_mixer(struct drm_crtc *crtc, format->base.pixel_format, fb ? fb->modifier : 0);/* blend config update */ -for (lm_idx =0 ; lm_idx < dpu_crtc->num_mixers; lm_idx++) { +for (lm_idx =0 ; lm_idx < cstate->num_mixers; lm_idx++) {_dpu_crtc_setup_blend_cfg (mixer + lm_idx, pstate); mixer[lm_idx].flush_mask |= flush_mask;
@@ -260,7 +262,7 @@ static void _dpu_crtc_blend_setup_mixer(struct drm_crtc *crtc,static void _dpu_crtc_blend_setup (struct drm_crtc *crtc) {struct dpu_crtc *dpu_crtc; -struct dpu_crtc_state *dpu_crtc_state; +struct dpu_crtc_state *cstate;struct dpu_crtc_mixer *mixer;struct dpu_hw_ctl *ctl;struct dpu_hw_mixer *lm;
@@ -271,26 +273,26 @@ static void _dpu_crtc_blend_setup(struct drm_crtc *crtc)return ; dpu_crtc =to_dpu_crtc (crtc); - dpu_crtc_state =to_dpu_crtc_state (crtc->state); - mixer = dpu_crtc->mixers; + cstate =to_dpu_crtc_state (crtc->state); + mixer = cstate->mixers;DPU_DEBUG ("%s\n" , dpu_crtc->name); -if (dpu_crtc->num_mixers >CRTC_DUAL_MIXERS ) { -DPU_ERROR ("invalid number mixers: %d\n" , dpu_crtc->num_mixers); +if (cstate->num_mixers >CRTC_DUAL_MIXERS ) { +DPU_ERROR ("invalid number mixers: %d\n" , cstate->num_mixers);return ; } -for (i =0 ; i < dpu_crtc->num_mixers; i++) { -if (!mixer[i].hw_lm || !mixer[i].hw_ctl) { +for (i =0 ; i < cstate->num_mixers; i++) { +if (!mixer[i].hw_lm || !mixer[i].lm_ctl) {DPU_ERROR ("invalid lm or ctl assigned to mixer\n" );return ; } mixer[i].mixer_op_mode =0 ; mixer[i].flush_mask =0 ; -if (mixer[i].hw_ctl->ops.clear_all_blendstages) - mixer[i].hw_ctl->ops.clear_all_blendstages ( - mixer[i].hw_ctl); +if (mixer[i].lm_ctl->ops.clear_all_blendstages) + mixer[i].lm_ctl->ops.clear_all_blendstages ( + mixer[i].lm_ctl); }/* initialize stage cfg */
@@ -298,8 +300,8 @@ static void _dpu_crtc_blend_setup(struct drm_crtc *crtc)_dpu_crtc_blend_setup_mixer (crtc, dpu_crtc, mixer); -for (i =0 ; i < dpu_crtc->num_mixers; i++) { - ctl = mixer[i].hw_ctl; +for (i =0 ; i < cstate->num_mixers; i++) { + ctl = mixer[i].lm_ctl; lm = mixer[i].hw_lm; lm->ops.setup_alpha_out (lm, mixer[i].mixer_op_mode);
@@ -579,77 +581,35 @@ void dpu_crtc_complete_commit(struct drm_crtc *crtc,DPU_EVT32_VERBOSE (DRMID (crtc)); } -static void _dpu_crtc_setup_mixer_for_encoder ( -struct drm_crtc *crtc, -struct drm_encoder *enc) +static void _dpu_crtc_setup_mixers (struct drm_crtc_state *crtc_state) { -struct dpu_crtc *dpu_crtc =to_dpu_crtc (crtc); -struct dpu_kms *dpu_kms =_dpu_crtc_get_kms (crtc); -struct dpu_rm *rm = &dpu_kms->rm; +struct dpu_crtc_state *cstate =to_dpu_crtc_state (crtc_state);struct dpu_crtc_mixer *mixer; -struct dpu_hw_ctl *last_valid_ctl =NULL ;int i; -struct dpu_rm_hw_iter lm_iter, ctl_iter; -dpu_rm_init_hw_iter (&lm_iter, enc->base.id,DPU_HW_BLK_LM ); -dpu_rm_init_hw_iter (&ctl_iter, enc->base.id,DPU_HW_BLK_CTL ); +if (!cstate->num_mixers || !cstate->num_ctls) { +DPU_ERROR ("invalid hw count-lm's:%d ctl's:%d\n" , + cstate->num_mixers, cstate->num_ctls); +return ; + }/* Set up all the mixers and ctls reserved by this encoder */ -for (i = dpu_crtc->num_mixers; i <ARRAY_SIZE (dpu_crtc->mixers); i++) { - mixer = &dpu_crtc->mixers[i]; - -if (!dpu_rm_get_hw (rm, &lm_iter)) -break ; - mixer->hw_lm = (struct dpu_hw_mixer *)lm_iter.hw; +for (i =0 ; i < cstate->num_mixers; i++) { + mixer = &cstate->mixers[i];/* CTL may be <= LMs, if <, multiple LMs controlled by 1 CTL */ -if (!dpu_rm_get_hw (rm, &ctl_iter)) { -DPU_DEBUG ("no ctl assigned to lm %d, using previous\n" , - mixer->hw_lm->idx -LM_0 ); - mixer->hw_ctl = last_valid_ctl; - }else { - mixer->hw_ctl = (struct dpu_hw_ctl *)ctl_iter.hw; - last_valid_ctl = mixer->hw_ctl; - } - -/* Shouldn't happen, mixers are always >= ctls */ -if (!mixer->hw_ctl) { -DPU_ERROR ("no valid ctls found for lm %d\n" , - mixer->hw_lm->idx -LM_0 ); -return ; - } - - mixer->encoder = enc; +if (i < cstate->num_ctls) + mixer->lm_ctl = cstate->hw_ctls[i]; +else + mixer->lm_ctl = cstate->mixers[i-1 ].lm_ctl; - dpu_crtc->num_mixers++;DPU_DEBUG ("setup mixer %d: lm %d\n" , i, mixer->hw_lm->idx -LM_0 );DPU_DEBUG ("setup mixer %d: ctl %d\n" , - i, mixer->hw_ctl->idx -CTL_0 ); + i, mixer->lm_ctl->idx -CTL_0 ); } } -static void _dpu_crtc_setup_mixers (struct drm_crtc *crtc) -{ -struct dpu_crtc *dpu_crtc =to_dpu_crtc (crtc); -struct drm_encoder *enc; - - dpu_crtc->num_mixers =0 ; - dpu_crtc->mixers_swapped = false; -memset (dpu_crtc->mixers,0 ,sizeof (dpu_crtc->mixers)); - -mutex_lock (&dpu_crtc->crtc_lock); -/* Check for mixers on all encoders attached to this crtc */ -list_for_each_entry (enc, &crtc->dev->mode_config.encoder_list, head) { -if (enc->crtc != crtc) -continue ; - -_dpu_crtc_setup_mixer_for_encoder (crtc, enc); - } - -mutex_unlock (&dpu_crtc->crtc_lock); -} -static void _dpu_crtc_setup_lm_bounds (struct drm_crtc *crtc,struct drm_crtc_state *state) {
@@ -670,7 +630,7 @@ static void _dpu_crtc_setup_lm_bounds(struct drm_crtc *crtc, adj_mode = &state->adjusted_mode; crtc_split_width =dpu_crtc_get_mixer_width (dpu_crtc, cstate, adj_mode); -for (i =0 ; i < dpu_crtc->num_mixers; i++) { +for (i =0 ; i < cstate->num_mixers; i++) { cstate->lm_bounds[i].x = crtc_split_width * i; cstate->lm_bounds[i].y =0 ; cstate->lm_bounds[i].w = crtc_split_width;
@@ -688,6 +648,7 @@ static void dpu_crtc_atomic_begin(struct drm_crtc *crtc, struct drm_crtc_state *old_state) {struct dpu_crtc *dpu_crtc; +struct dpu_crtc_state *new_cstate;struct drm_encoder *encoder;struct drm_device *dev;unsigned long flags;
@@ -707,13 +668,11 @@ static void dpu_crtc_atomic_begin(struct drm_crtc *crtc,DPU_DEBUG ("crtc%d\n" , crtc->base.id); dpu_crtc =to_dpu_crtc (crtc); + new_cstate =to_dpu_crtc_state (crtc->state); dev = crtc->dev; smmu_state = &dpu_crtc->smmu_state; -if (!dpu_crtc->num_mixers) { -_dpu_crtc_setup_mixers (crtc); -_dpu_crtc_setup_lm_bounds (crtc, crtc->state); - } +_dpu_crtc_setup_lm_bounds (crtc, crtc->state);if (dpu_crtc->event) {WARN_ON (dpu_crtc->event);
@@ -737,7 +696,7 @@ static void dpu_crtc_atomic_begin(struct drm_crtc *crtc,* it means we are trying to flush a CRTC whose state is disabled: * nothing else needs to be done. */ -if (unlikely (!dpu_crtc->num_mixers)) +if (unlikely (!new_cstate->num_mixers))return ;_dpu_crtc_blend_setup (crtc);
@@ -801,7 +760,7 @@ static void dpu_crtc_atomic_flush(struct drm_crtc *crtc,* it means we are trying to flush a CRTC whose state is disabled: * nothing else needs to be done. */ -if (unlikely (!dpu_crtc->num_mixers)) +if (unlikely (!cstate->num_mixers))return ;/*
@@ -918,7 +877,7 @@ void dpu_crtc_commit_kickoff(struct drm_crtc *crtc)* it means we are trying to start a CRTC whose state is disabled: * nothing else needs to be done. */ -if (unlikely (!dpu_crtc->num_mixers)) +if (unlikely (!cstate->num_mixers))return ;DPU_ATRACE_BEGIN ("crtc_commit" );
@@ -1155,6 +1114,7 @@ static void dpu_crtc_handle_power_event(u32 event_type, void *arg) {struct drm_crtc *crtc = arg;struct dpu_crtc *dpu_crtc; +struct dpu_crtc_state *cstate;struct drm_encoder *encoder;struct dpu_crtc_mixer *m;u32 i, misr_status;
@@ -1163,7 +1123,9 @@ static void dpu_crtc_handle_power_event(u32 event_type, void *arg)DPU_ERROR ("invalid crtc\n" );return ; } + dpu_crtc =to_dpu_crtc (crtc); + cstate =to_dpu_crtc_state (crtc->state);mutex_lock (&dpu_crtc->crtc_lock);
@@ -1179,8 +1141,8 @@ static void dpu_crtc_handle_power_event(u32 event_type, void *arg)dpu_encoder_virt_restore (encoder); } -for (i =0 ; i < dpu_crtc->num_mixers; ++i) { - m = &dpu_crtc->mixers[i]; +for (i =0 ; i < cstate->num_mixers; ++i) { + m = &cstate->mixers[i];if (!m->hw_lm || !m->hw_lm->ops.setup_misr || !dpu_crtc->misr_enable)continue ;
@@ -1190,8 +1152,8 @@ static void dpu_crtc_handle_power_event(u32 event_type, void *arg) }break ;case DPU_POWER_EVENT_PRE_DISABLE : -for (i =0 ; i < dpu_crtc->num_mixers; ++i) { - m = &dpu_crtc->mixers[i]; +for (i =0 ; i < cstate->num_mixers; ++i) { + m = &cstate->mixers[i];if (!m->hw_lm || !m->hw_lm->ops.collect_misr || !dpu_crtc->misr_enable)continue ;
@@ -1223,6 +1185,8 @@ static void dpu_crtc_disable(struct drm_crtc *crtc)struct drm_encoder *encoder;struct msm_drm_private *priv;struct drm_event event; +struct dpu_private_state *dpu_priv_state; +struct dpu_kms *dpu_kms;u32 power_on;int ret;
@@ -1230,10 +1194,15 @@ static void dpu_crtc_disable(struct drm_crtc *crtc)DPU_ERROR ("invalid crtc\n" );return ; } + dpu_crtc =to_dpu_crtc (crtc); cstate =to_dpu_crtc_state (crtc->state); mode = &cstate->base.adjusted_mode; priv = crtc->dev->dev_private; + dpu_kms =to_dpu_kms (priv->kms); + +/* accessing after swap state. piv_obj.state is the current state */ + dpu_priv_state =to_dpu_private_state (dpu_kms->priv_obj.state);DPU_DEBUG ("crtc%d\n" , crtc->base.id);
@@ -1286,15 +1255,14 @@ static void dpu_crtc_disable(struct drm_crtc *crtc)dpu_power_handle_unregister_event (dpu_crtc->phandle, dpu_crtc->power_event); - -memset (dpu_crtc->mixers,0 ,sizeof (dpu_crtc->mixers)); - dpu_crtc->num_mixers =0 ; - dpu_crtc->mixers_swapped = false; -/* disable clk & bw control until clk & bw properties are set */ cstate->bw_control = false; cstate->bw_split_vote = false; + ret =dpu_rm_release_crtc_res (&dpu_priv_state->rm, cstate); +if (ret) +DPU_ERROR ("error in releasing crtc resources\n" ); +mutex_unlock (&dpu_crtc->crtc_lock); }
@@ -1354,6 +1322,31 @@ static void dpu_crtc_enable(struct drm_crtc *crtc, } +static struct dpu_crtc_topology +dpu_crtc_get_topology (struct dpu_crtc_state *cstate, +struct drm_display_mode *mode) +{ +struct dpu_crtc_topology topology; + +memset (&topology,0 ,sizeof (topology)); + +/* Use split topology for width > 1080 */ + topology.num_lms = (mode->vdisplay >MAX_VDISPLAY_SPLIT ) ?2 :1 ; + topology.num_ctls = topology.num_lms; + + topology.needs_realloc = (topology.num_lms != cstate->num_mixers) || + (topology.num_ctls != cstate->num_ctls); + +if (topology.needs_realloc) +DPU_DEBUG ( +"crtc %d needs hw reallocation. lm (%d - %d) ctl(%d - %d)\n" , +get_crtc_id (cstate), + cstate->num_mixers, topology.num_lms, + cstate->num_ctls, topology.num_ctls); + +return topology; +} +struct plane_state {struct dpu_plane_state *dpu_pstate;const struct drm_plane_state *drm_pstate;
@@ -1371,6 +1364,8 @@ static int dpu_crtc_atomic_check(struct drm_crtc *crtc,const struct drm_plane_state *pstate;struct drm_plane *plane;struct drm_display_mode *mode; +struct dpu_crtc_topology topology; +struct dpu_private_state *dpu_priv_state;int cnt =0 , rc =0 , mixer_width, i, z_pos;
@@ -1584,6 +1579,23 @@ static int dpu_crtc_atomic_check(struct drm_crtc *crtc, } } +/* Resource allocation */ + dpu_priv_state =dpu_get_private_state (state->state); + + topology =dpu_crtc_get_topology (cstate, &state->adjusted_mode); +if (!topology.needs_realloc) + goto end; + +dpu_rm_release_crtc_res (&dpu_priv_state->rm, cstate); + rc =dpu_rm_reserve_crtc_res (&dpu_priv_state->rm, cstate, &topology); +if (rc) { +DPU_ERROR ("failed to allocate resources for crtc: %d\n" , + crtc->base.id); + goto end; + } + +_dpu_crtc_setup_mixers (state); + end:return rc; }
@@ -1654,15 +1666,15 @@ static int _dpu_debugfs_status_show(struct seq_file *s, void *data)seq_puts (s,"\n" ); -for (i =0 ; i < dpu_crtc->num_mixers; ++i) { - m = &dpu_crtc->mixers[i]; +for (i =0 ; i < cstate->num_mixers; ++i) { + m = &cstate->mixers[i];if (!m->hw_lm)seq_printf (s,"\tmixer[%d] has no lm\n" , i); -else if (!m->hw_ctl) +else if (!m->lm_ctl)seq_printf (s,"\tmixer[%d] has no ctl\n" , i);else seq_printf (s,"\tmixer:%d ctl:%d width:%d height:%d\n" , - m->hw_lm->idx -LM_0 , m->hw_ctl->idx -CTL_0 , + m->hw_lm->idx -LM_0 , m->lm_ctl->idx -CTL_0 , out_width, mode->vdisplay); }
@@ -1748,6 +1760,7 @@ static ssize_t _dpu_crtc_misr_setup(struct file *file, const char __user *user_buf, size_t count, loff_t *ppos) { struct dpu_crtc *dpu_crtc; +struct dpu_crtc_state *cstate;struct dpu_crtc_mixer *m;int i =0 , rc;char buf[MISR_BUFF_SIZE +1 ];
@@ -1758,6 +1771,7 @@ static ssize_t _dpu_crtc_misr_setup(struct file *file,return -EINVAL ; dpu_crtc = file->private_data; + cstate =to_dpu_crtc_state (dpu_crtc->base.state); buff_copy =min_t (size_t, count,MISR_BUFF_SIZE );if (copy_from_user (buf, user_buf, buff_copy)) {DPU_ERROR ("buffer copy failed\n" );
@@ -1776,9 +1790,9 @@ static ssize_t _dpu_crtc_misr_setup(struct file *file,mutex_lock (&dpu_crtc->crtc_lock); dpu_crtc->misr_enable = enable; dpu_crtc->misr_frame_count = frame_count; -for (i =0 ; i < dpu_crtc->num_mixers; ++i) { +for (i =0 ; i < cstate->num_mixers; ++i) { dpu_crtc->misr_data[i] =0 ; - m = &dpu_crtc->mixers[i]; + m = &cstate->mixers[i];if (!m->hw_lm || !m->hw_lm->ops.setup_misr)continue ;
@@ -1794,6 +1808,7 @@ static ssize_t _dpu_crtc_misr_read(struct file *file, char __user *user_buff, size_t count, loff_t *ppos) { struct dpu_crtc *dpu_crtc; +struct dpu_crtc_state *cstate;struct dpu_crtc_mixer *m;int i =0 , rc;u32 misr_status;
@@ -1807,6 +1822,7 @@ static ssize_t _dpu_crtc_misr_read(struct file *file,return -EINVAL ; dpu_crtc = file->private_data; + cstate =to_dpu_crtc_state (dpu_crtc->base.state); rc =_dpu_crtc_power_enable (dpu_crtc, true);if (rc)return rc;
@@ -1818,8 +1834,8 @@ static ssize_t _dpu_crtc_misr_read(struct file *file, goto buff_check; } -for (i =0 ; i < dpu_crtc->num_mixers; ++i) { - m = &dpu_crtc->mixers[i]; +for (i =0 ; i < cstate->num_mixers; ++i) { + m = &cstate->mixers[i];if (!m->hw_lm || !m->hw_lm->ops.collect_misr)continue ;
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h +42 -17
125 lines not on this page · raw message
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +80 -143
372 lines not on this page · raw message
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h +0 -4
@@ -33,14 +33,10 @@* Encoder functions and data types * @intfs: Interfaces this encoder is using, INTF_MODE_NONE if unused * @needs_cdm: Encoder requests a CDM based on pixel format conversion needs -* @display_num_of_h_tiles: Number of horizontal tiles in case of split -* interface -* @topology: Topology of the display */ struct dpu_encoder_hw_resources {enum dpu_intf_mode intfs[INTF_MAX ];bool needs_cdm; -u32 display_num_of_h_tiles; };/**
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h +6 -3
@@ -24,6 +24,7 @@#include "dpu_hw_top.h" #include "dpu_hw_cdm.h" #include "dpu_encoder.h" +#include "dpu_crtc.h" #define DPU_ENCODER_NAME_MAX 16
@@ -219,7 +220,6 @@ struct dpu_encoder_irq {* @split_role: Role to play in a split-panel configuration * @intf_mode: Interface mode * @intf_idx: Interface index on dpu hardware -* @topology_name: topology selected for the display * @enc_spinlock: Virtual-Encoder-Wide Spin Lock for IRQ purposes * @enable_state: Enable state tracking * @vblank_refcount: Reference count of vblank request
@@ -249,7 +249,6 @@ struct dpu_encoder_phys {enum dpu_enc_split_role split_role;enum dpu_intf_mode intf_mode;enum dpu_intf intf_idx; -enum dpu_rm_topology_name topology_name;spinlock_t *enc_spinlock;enum dpu_enc_enable_state enable_state;atomic_t vblank_refcount;
@@ -381,11 +380,15 @@ int dpu_encoder_helper_wait_event_timeout(static inline enum dpu_3d_blend_mode dpu_encoder_helper_get_3d_blend_mode (struct dpu_encoder_phys *phys_enc) { +struct dpu_crtc_state *dpu_cstate; +if (!phys_enc || phys_enc->enable_state ==DPU_ENC_DISABLING )return BLEND_3D_NONE ; + dpu_cstate =to_dpu_crtc_state (phys_enc->parent->crtc->state); +if (phys_enc->split_role ==ENC_ROLE_SOLO && - phys_enc->topology_name ==DPU_RM_TOPOLOGY_DUALPIPE_3DMERGE ) + (dpu_cstate->num_mixers ==2 ))return BLEND_3D_H_ROW_INT ;return BLEND_3D_NONE ;
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c +2 -30
@@ -195,9 +195,6 @@ static void dpu_encoder_phys_cmd_mode_set( {struct dpu_encoder_phys_cmd *cmd_enc =to_dpu_encoder_phys_cmd (phys_enc); -struct dpu_rm *rm = &phys_enc->dpu_kms->rm; -struct dpu_rm_hw_iter iter; -int i, instance;if (!phys_enc || !mode || !adj_mode) {DPU_ERROR ("invalid args\n" );
@@ -205,23 +202,8 @@ static void dpu_encoder_phys_cmd_mode_set( } phys_enc->cached_mode = *adj_mode;DPU_DEBUG_CMDENC (cmd_enc,"caching mode:\n" ); -drm_mode_debug_printmodeline (adj_mode); - - instance = phys_enc->split_role ==ENC_ROLE_SLAVE ?1 :0 ; -/* Retrieve previously allocated HW Resources. Shouldn't fail */ -dpu_rm_init_hw_iter (&iter, phys_enc->parent->base.id,DPU_HW_BLK_CTL ); -for (i =0 ; i <= instance; i++) { -if (dpu_rm_get_hw (rm, &iter)) - phys_enc->hw_ctl = (struct dpu_hw_ctl *)iter.hw; - } - -if (IS_ERR_OR_NULL (phys_enc->hw_ctl)) { -DPU_ERROR_CMDENC (cmd_enc,"failed to init ctl: %ld\n" , -PTR_ERR (phys_enc->hw_ctl)); - phys_enc->hw_ctl =NULL ; -return ; - } +drm_mode_debug_printmodeline (adj_mode);_dpu_encoder_phys_cmd_setup_irq_hw_idx (phys_enc); }
@@ -830,7 +812,6 @@ struct dpu_encoder_phys *dpu_encoder_phys_cmd_init( {struct dpu_encoder_phys *phys_enc =NULL ;struct dpu_encoder_phys_cmd *cmd_enc =NULL ; -struct dpu_hw_mdp *hw_mdp;struct dpu_encoder_irq *irq;int i, ret =0 ;
@@ -843,14 +824,7 @@ struct dpu_encoder_phys *dpu_encoder_phys_cmd_init( goto fail; } phys_enc = &cmd_enc->base; - - hw_mdp =dpu_rm_get_mdp (&p->dpu_kms->rm); -if (IS_ERR_OR_NULL (hw_mdp)) { - ret =PTR_ERR (hw_mdp); -DPU_ERROR ("failed to get mdptop\n" ); - goto fail_mdp_init; - } - phys_enc->hw_mdptop = hw_mdp; + phys_enc->hw_mdptop = p->dpu_kms->hw_mdp; phys_enc->intf_idx = p->intf_idx;dpu_encoder_phys_cmd_init_ops (&phys_enc->ops);
@@ -905,8 +879,6 @@ struct dpu_encoder_phys *dpu_encoder_phys_cmd_init(return phys_enc; -fail_mdp_init: -kfree (cmd_enc); fail:return ERR_PTR (ret); }
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c +18 -68
162 lines not on this page · raw message
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +12 -7
@@ -1005,6 +1005,7 @@ static long dpu_kms_round_pixclk(struct msm_kms *kms, unsigned long rate,static void _dpu_kms_hw_destroy (struct dpu_kms *dpu_kms) {struct drm_device *dev; +struct dpu_private_state *dpu_priv_state;int i; dev = dpu_kms->dev;
@@ -1039,9 +1040,12 @@ static void _dpu_kms_hw_destroy(struct dpu_kms *dpu_kms) } } -if (dpu_kms->rm_init) -dpu_rm_destroy (&dpu_kms->rm); - dpu_kms->rm_init = false; + dpu_priv_state =to_dpu_private_state (dpu_kms->priv_obj.state); +if (dpu_priv_state) { +if (dpu_priv_state->rm_init) +dpu_rm_destroy (&dpu_priv_state->rm); + dpu_priv_state->rm_init = false; + }if (dpu_kms->catalog)dpu_hw_catalog_deinit (dpu_kms->catalog);
@@ -1391,6 +1395,7 @@ static int dpu_kms_hw_init(struct msm_kms *kms)struct dpu_kms *dpu_kms;struct drm_device *dev;struct msm_drm_private *priv; +struct dpu_private_state *dpu_priv_state;int i, rc = -EINVAL ;if (!kms) {
@@ -1512,16 +1517,16 @@ static int dpu_kms_hw_init(struct msm_kms *kms) goto power_error; } - rc =dpu_rm_init (&dpu_kms->rm, dpu_kms->catalog, dpu_kms->mmio, - dpu_kms->dev); + dpu_priv_state =to_dpu_private_state (dpu_kms->priv_obj.state); + rc =dpu_rm_init (&dpu_priv_state->rm, dpu_kms->catalog, dpu_kms->mmio);if (rc) {DPU_ERROR ("rm init failed: %d\n" , rc); goto power_error; } - dpu_kms->rm_init = true; + dpu_priv_state->rm_init = true; - dpu_kms->hw_mdp =dpu_rm_get_mdp (&dpu_kms->rm); + dpu_kms->hw_mdp =dpu_rm_get_mdp (&dpu_priv_state->rm);if (IS_ERR_OR_NULL (dpu_kms->hw_mdp)) { rc =PTR_ERR (dpu_kms->hw_mdp);if (!dpu_kms->hw_mdp)
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h +4 -4
@@ -32,10 +32,10 @@#include "dpu_hw_lm.h" #include "dpu_hw_interrupts.h" #include "dpu_hw_top.h" -#include "dpu_rm.h" #include "dpu_power_handle.h" #include "dpu_irq.h" #include "dpu_core_perf.h" +#include "dpu_rm.h" #define DRMID (x) ((x) ? (x)->base.id : -1)
@@ -184,9 +184,6 @@ struct dpu_kms {struct drm_atomic_state *suspend_state;bool suspend_block; -struct dpu_rm rm; -bool rm_init; -struct dpu_hw_vbif *hw_vbif[VBIF_MAX ];struct dpu_hw_mdp *hw_mdp;
@@ -202,6 +199,9 @@ struct dpu_kms {struct dpu_private_state {struct drm_private_state base; + +struct dpu_rm rm; +bool rm_init; };struct vsync_info {
drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c +216 -589
1,109 lines not on this page · raw message
drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h +41 -108
209 lines not on this page · raw message
Signature · 7 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
A message that is not in the archive (sent off-list or not yet received): 1528852667-14833-5-git-send-email-jsanka-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org
Re: [DPU PATCH 4/4] drm/msm/dpu: use private obj to track hw resources
Quoted 88 lines · Jeykumar Sankaran
Switch to state based resource management. This patch overhauls the resource manager and HW allocation methods by maintaining the global resource pool and allocated hw blocks in respective drm component states.
Global resource manager(RM) is tracked in private object. Allocation strategy is switched from single point allocation of HW resources for the display pipeline to per component based allocation, where each drm component allocates HW blocks mapped to it's domain and tracks them in their respective state objects.
Fixes resource contention due to race conditions between user space and display thread by reserving resources only in atomic check.
Signed-off-by Jeykumar Sankaran <[email protected]>--- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 210 +++--- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 59 +- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 223 ++---- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 4 - drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h | 9 +- .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 32 +- .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 86 +-- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 19 +- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 8 +- drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 805 ++++++--------------- drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h | 149 ++-- 11 files changed, 534 insertions(+), 1070 deletions(-)drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +7
-6@@ -47,6 +47,8 @@#define RIGHT_MIXER 1#define MISR_BUFF_SIZE 256 +#define MAX_VDISPLAY_SPLIT 1080 +static inline struct dpu_kms *_dpu_crtc_get_kms (struct drm_crtc *crtc) {@@ -142,9 +144,9 @@ static void _dpu_crtc_program_lm_output_roi(struct drm_crtc *crtc) crtc_state =to_dpu_crtc_state (crtc->state); lm_horiz_position =0 ; -for (lm_idx =0 ; lm_idx < dpu_crtc->num_mixers; lm_idx++) { +for (lm_idx =0 ; lm_idx < crtc_state->num_mixers; lm_idx++) {const struct dpu_rect *lm_roi = &crtc_state->lm_bounds[lm_idx]; -struct dpu_hw_mixer *hw_lm = dpu_crtc->mixers[lm_idx].hw_lm; +struct dpu_hw_mixer *hw_lm = crtc_state->mixers[lm_idx].hw_lm;struct dpu_hw_mixer_cfg cfg;if (dpu_kms_rect_is_null (lm_roi))@@ -182,7 +184,7 @@ static void _dpu_crtc_blend_setup_mixer(struct drm_crtc *crtc,return ; } - ctl = mixer->hw_ctl; + ctl = mixer->lm_ctl; lm = mixer->hw_lm; stage_cfg = &dpu_crtc->stage_cfg; cstate =to_dpu_crtc_state (crtc->state);@@ -237,7 +239,7 @@ static void _dpu_crtc_blend_setup_mixer(struct drm_crtc *crtc, format->base.pixel_format, fb ? fb->modifier : 0);/* blend config update */ -for (lm_idx =0 ; lm_idx < dpu_crtc->num_mixers; lm_idx++) { +for (lm_idx =0 ; lm_idx < cstate->num_mixers; lm_idx++) {_dpu_crtc_setup_blend_cfg (mixer + lm_idx, pstate); mixer[lm_idx].flush_mask |= flush_mask;@@ -260,7 +262,7 @@ static void _dpu_crtc_blend_setup_mixer(struct drm_crtc *crtc,static void _dpu_crtc_blend_setup (struct drm_crtc *crtc) {struct dpu_crtc *dpu_crtc; -struct dpu_crtc_state *dpu_crtc_state; +struct dpu_crtc_state *cstate;struct dpu_crtc_mixer *mixer;struct dpu_hw_ctl *ctl;struct dpu_hw_mixer *lm;@@ -271,26 +273,26 @@ static void _dpu_crtc_blend_setup(struct drm_crtc *crtc)return ; dpu_crtc =to_dpu_crtc (crtc); - dpu_crtc_state =to_dpu_crtc_state (crtc->state);
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c static void _dpu_crtc_blend_setup(struct drm_crtc *crtc) · line 282
Quoted 10 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +4
-3- mixer = dpu_crtc->mixers; + cstate =to_dpu_crtc_state (crtc->state); + mixer = cstate->mixers;DPU_DEBUG ("%s\n" , dpu_crtc->name); -if (dpu_crtc->num_mixers >CRTC_DUAL_MIXERS ) { -DPU_ERROR ("invalid number mixers: %d\n" , dpu_crtc->num_mixers); +if (cstate->num_mixers >CRTC_DUAL_MIXERS ) { +DPU_ERROR ("invalid number mixers: %d\n" , cstate->num_mixers);
Nit - this could be worded a bit better - "too many mixers" would be better, but I have to ask - under what circumstances would the number of mixers be larger than CRTC_DUAL_MIXERS and/or why don't we support a dynamic number of mixers?
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c static void _dpu_crtc_blend_setup(struct drm_crtc *crtc) · line 284
Quoted 2 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +0
-0return ; }
<ship>
Quoted 6 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +2
-3+static void _dpu_crtc_setup_mixers (struct drm_crtc_state *crtc_state) { -struct dpu_crtc *dpu_crtc =to_dpu_crtc (crtc); -struct dpu_kms *dpu_kms =_dpu_crtc_get_kms (crtc); -struct dpu_rm *rm = &dpu_kms->rm; +struct dpu_crtc_state *cstate =to_dpu_crtc_state (crtc_state);
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c void dpu_crtc_complete_commit(struct drm_crtc *crtc, · line 592
Quoted 10 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +3
-4struct dpu_crtc_mixer *mixer; -struct dpu_hw_ctl *last_valid_ctl =NULL ;int i; -struct dpu_rm_hw_iter lm_iter, ctl_iter; -dpu_rm_init_hw_iter (&lm_iter, enc->base.id,DPU_HW_BLK_LM ); -dpu_rm_init_hw_iter (&ctl_iter, enc->base.id,DPU_HW_BLK_CTL ); +if (!cstate->num_mixers || !cstate->num_ctls) { +DPU_ERROR ("invalid hw count-lm's:%d ctl's:%d\n" , + cstate->num_mixers, cstate->num_ctls);
This can also be reworded - I don't know what lm is, and you shouldn't use an apostrophe - it would just be 'ctls' or 'mixers'. Instead of invalid, perhaps using "no mixers defined" and "no controls defined".
Quoted 2 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +2
-0+return ; + }
<snip>
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c static int dpu_crtc_atomic_check(struct drm_crtc *crtc, · line 1584
Quoted 7 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +3
-0@@ -1584,6 +1579,23 @@ static int dpu_crtc_atomic_check(struct drm_crtc *crtc, } } +/* Resource allocation */ + dpu_priv_state =dpu_get_private_state (state->state); +
Ah, here is a use of dpu_get_private_state() that assumes dpu_priv_state is valid - this could use a ERR check but I think it also implies that dpu_get_private_state() doesn't have a legitimate reason to return NULL.
Quoted 17 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +14
-0+ topology =dpu_crtc_get_topology (cstate, &state->adjusted_mode); +if (!topology.needs_realloc) + goto end; + +dpu_rm_release_crtc_res (&dpu_priv_state->rm, cstate); + rc =dpu_rm_reserve_crtc_res (&dpu_priv_state->rm, cstate, &topology); +if (rc) { +DPU_ERROR ("failed to allocate resources for crtc: %d\n" , + crtc->base.id); + goto end; + } + +_dpu_crtc_setup_mixers (state); + end:return rc; }
<snip>
Quoted 14 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +2
-7@@ -657,27 +666,31 @@ static int dpu_encoder_virt_atomic_check( } } - topology =dpu_encoder_get_topology (dpu_enc, dpu_kms, adj_mode); +if (ret) + goto end; -/* Reserve dynamic resources now. Indicating AtomicTest phase */ -if (!ret) { -/* -* Avoid reserving resources when mode set is pending. Topology -* info may not be available to complete reservation. -*/
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c static int dpu_encoder_virt_atomic_check( · line 675
Quoted 10 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +4
-6-if (drm_atomic_crtc_needs_modeset (crtc_state) - && dpu_enc->mode_set_complete) { - ret =dpu_rm_reserve (&dpu_kms->rm, drm_enc, crtc_state, - conn_state, topology, true); - dpu_enc->mode_set_complete = false; - } +/* hw resource allocation */ +dpu_encoder_get_hw_resources (drm_enc, &enc_hw_res, conn_state); + + dpu_priv_state =dpu_get_private_state (crtc_state->state);
Here is another use of dpu_get_private_state() that assumes a valid pointer.
Quoted 22 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +13
-3+ topology =dpu_encoder_get_topology (dpu_enc, dpu_cstate); +if (!topology.needs_realloc) + goto end; + +dpu_rm_release_encoder_res (&dpu_priv_state->rm, dpu_cstate); + ret =dpu_rm_reserve_encoder_res (&dpu_priv_state->rm, + dpu_cstate, &enc_hw_res); +if (ret) { +DPU_ERROR_ENC (dpu_enc, +"failed to allocate hw resources\n" ); + goto end; } -if (!ret) -drm_mode_set_crtcinfo (adj_mode,0 ); +drm_mode_set_crtcinfo (adj_mode,0 );DPU_EVT32 (DRMID (drm_enc), adj_mode->flags, adj_mode->private_flags); - +end:return ret; }
<snip>
Quoted 32 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +8
-6@@ -1170,35 +1159,48 @@ void dpu_encoder_virt_restore(struct drm_encoder *drm_enc)static void dpu_encoder_virt_enable (struct drm_encoder *drm_enc) {struct dpu_encoder_virt *dpu_enc =NULL ; +struct dpu_encoder_phys *phys =NULL ;int i, ret =0 ; -struct drm_display_mode *cur_mode =NULL ;if (!drm_enc) {DPU_ERROR ("invalid encoder\n" );return ; } dpu_enc =to_dpu_encoder_virt (drm_enc); - cur_mode = &dpu_enc->base.crtc->state->adjusted_mode;DPU_DEBUG_ENC (dpu_enc,"\n" ); -DPU_EVT32 (DRMID (drm_enc), cur_mode->hdisplay, cur_mode->vdisplay); dpu_enc->cur_master =NULL ; + dpu_enc->cur_slave =NULL ;for (i =0 ; i < dpu_enc->num_phys_encs; i++) { -struct dpu_encoder_phys *phys = dpu_enc->phys_encs[i]; + phys = dpu_enc->phys_encs[i]; -if (phys && phys->ops.is_master && phys->ops.is_master (phys)) { -DPU_DEBUG_ENC (dpu_enc,"master is now idx %d\n" , i); +if (!phys || !phys->ops.is_master) +continue ; + +if (phys->ops.is_master (phys)) { +DPU_DEBUG_ENC (dpu_enc,"master is at idx %d\n" , i); dpu_enc->cur_master = phys;
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c void dpu_encoder_virt_restore(struct drm_encoder *drm_enc) · line 1191
Quoted 10 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +4
-2-break ; + }else { +DPU_DEBUG_ENC (dpu_enc,"slave is at idx %d\n" , i); + dpu_enc->cur_slave = phys; } }if (!dpu_enc->cur_master) { -DPU_ERROR ("virt encoder has no master! num_phys %d\n" , i); +DPU_ERROR ("virt encoder has no master!\n" );
I don't think this rises to the occasion of needing a exclamation point.
<snip>
Signature · 6 lines
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
A message that is not in the archive (sent off-list or not yet received): 20180613164456.GK11565-9PYrDHPZ2Orvke4nUoYGnHL1okKdlPRT@public.gmane.org
Re: [DPU PATCH 4/4] drm/msm/dpu: use private obj to track hw resources
Quoted 115 lines · Jordan Crouse
Quoted 17 lines · Jeykumar Sankaran
Switch to state based resource management. This patch overhauls the resource manager and HW allocation methods by maintaining the global resource pool and allocated hw blocks in respective drm component states.
Global resource manager(RM) is tracked in private object. Allocation strategy is switched from single point allocation of HW resources for the display pipeline to per component based allocation, where each drm component allocates HW blocks mapped to it's domain and tracks them in their respective state objects.
Fixes resource contention due to race conditions between user space and display thread by reserving resources only in atomic check.
Signed-off-by Jeykumar Sankaran <[email protected]>Quoted 11 lines
--- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 210 +++--- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 59 +- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 223 ++---- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 4 - drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h | 9 +- .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 32 +- .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 86 +-- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 19 +- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 8 +- drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 805++++++---------------
Review
Quoted 4 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h | 149 ++-- 11 files changed, 534 insertions(+), 1070 deletions(-)(quoted diff) +0
-0
b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.cdrivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c static void _dpu_crtc_program_lm_output_roi(struct
Quoted 14 lines
index 426e2ad..a484c06 100644
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +2
-0@@ -47,6 +47,8 @@#define RIGHT_MIXER 1#define MISR_BUFF_SIZE 256 +#define MAX_VDISPLAY_SPLIT 1080 +static inline struct dpu_kms *_dpu_crtc_get_kms (struct drm_crtc *crtc){
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +0
-0@@ -142,9 +144,9 @@ static void _dpu_crtc_program_lm_output_roi(struct
drm_crtc*crtc)drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c static void _dpu_crtc_program_lm_output_roi(struct drm_crtc *crtc)
Quoted 6 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +1
-1crtc_state =to_dpu_crtc_state (crtc->state); lm_horiz_position =0 ; -for (lm_idx =0 ; lm_idx < dpu_crtc->num_mixers; lm_idx++) { +for (lm_idx =0 ; lm_idx < crtc_state->num_mixers; lm_idx++) { const struct dpu_rect *lm_roi =&crtc_state->lm_bounds[lm_idx];
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c static void _dpu_crtc_program_lm_output_roi(struct · line 147
Quoted 1 line
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +0
-1- struct dpu_hw_mixer *hw_lm =dpu_crtc->mixers[lm_idx].hw_lm;
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c static void _dpu_crtc_program_lm_output_roi(struct · line 149
Quoted 1 line
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +1
-0+ struct dpu_hw_mixer *hw_lm =crtc_state->mixers[lm_idx].hw_lm;
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c static void _dpu_crtc_blend_setup_mixer(struct
Quoted 4 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +0
-0struct dpu_hw_mixer_cfg cfg;if (dpu_kms_rect_is_null (lm_roi))@@ -182,7 +184,7 @@ static void _dpu_crtc_blend_setup_mixer(struct
drm_crtc*crtc,drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c static void _dpu_crtc_blend_setup_mixer(struct
Quoted 9 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +1
-1return ; } - ctl = mixer->hw_ctl; + ctl = mixer->lm_ctl; lm = mixer->hw_lm; stage_cfg = &dpu_crtc->stage_cfg; cstate =to_dpu_crtc_state (crtc->state);@@ -237,7 +239,7 @@ static void _dpu_crtc_blend_setup_mixer(struct
drm_crtc*crtc,drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c static void _dpu_crtc_blend_setup_mixer(struct drm_crtc *crtc,
Quoted 4 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +0
-1format->base.pixel_format, fb ? fb->modifier : 0);/* blend config update */ -for (lm_idx =0 ; lm_idx < dpu_crtc->num_mixers; lm_idx++){
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c static void _dpu_crtc_blend_setup_mixer(struct
Quoted 5 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +1
-0+for (lm_idx =0 ; lm_idx < cstate->num_mixers; lm_idx++) {_dpu_crtc_setup_blend_cfg (mixer + lm_idx, pstate); mixer[lm_idx].flush_mask |= flush_mask;@@ -260,7 +262,7 @@ static void _dpu_crtc_blend_setup_mixer(struct
drm_crtc*crtc,Quoted 10 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +1
-1static void _dpu_crtc_blend_setup (struct drm_crtc *crtc) {struct dpu_crtc *dpu_crtc; -struct dpu_crtc_state *dpu_crtc_state; +struct dpu_crtc_state *cstate;struct dpu_crtc_mixer *mixer;struct dpu_hw_ctl *ctl;struct dpu_hw_mixer *lm;@@ -271,26 +273,26 @@ static void _dpu_crtc_blend_setup(struct
drm_crtc*crtc)
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c static void _dpu_crtc_blend_setup(struct drm_crtc *crtc)
Quoted 12 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +2
-4return ; dpu_crtc =to_dpu_crtc (crtc); - dpu_crtc_state =to_dpu_crtc_state (crtc->state); - mixer = dpu_crtc->mixers; + cstate =to_dpu_crtc_state (crtc->state); + mixer = cstate->mixers;DPU_DEBUG ("%s\n" , dpu_crtc->name); -if (dpu_crtc->num_mixers >CRTC_DUAL_MIXERS ) { - DPU_ERROR("invalid number mixers: %d\n",
dpu_crtc->num_mixers);drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
Quoted 2 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +2
-0+if (cstate->num_mixers >CRTC_DUAL_MIXERS ) { + DPU_ERROR("invalid number mixers: %d\n",
cstate->num_mixers);
Quoted 7 lines
Nit - this could be worded a bit better - "too many mixers" would be better, but
I have to ask - under what circumstances would the number of mixers be larger
thanCRTC_DUAL_MIXERSand/or why don't we support a dynamic number of mixers?
Comes from downstream driver implementation where CRTC iterates through RM free pool to identify mixers tagged with the current crtc id. If the previous clean up was screwed up this may have more than 2 mixers. With the new state based RM, its very unlikely we hit this condition.
We do support dynamic mixer counts. Based on the connector (panel) resolution, CRTC allocates 1 or 2 (panel_width > hw mixer width) mixer block(s) on the first atomic check. DPU limits max no. of hw mixers that can be ganged up for a display to 2.
Quoted 89 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
Quoted 2 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +0
-0return ; }<ship>
Quoted 6 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +2
-3+static void _dpu_crtc_setup_mixers (struct drm_crtc_state *crtc_state) { -struct dpu_crtc *dpu_crtc =to_dpu_crtc (crtc); -struct dpu_kms *dpu_kms =_dpu_crtc_get_kms (crtc); -struct dpu_rm *rm = &dpu_kms->rm; +struct dpu_crtc_state *cstate =to_dpu_crtc_state (crtc_state);drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c void dpu_crtc_complete_commit(struct drm_crtc *crtc, · line 592
Quoted 10 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +3
-4struct dpu_crtc_mixer *mixer; -struct dpu_hw_ctl *last_valid_ctl =NULL ;int i; -struct dpu_rm_hw_iter lm_iter, ctl_iter; -dpu_rm_init_hw_iter (&lm_iter, enc->base.id,DPU_HW_BLK_LM ); -dpu_rm_init_hw_iter (&ctl_iter, enc->base.id,DPU_HW_BLK_CTL ); +if (!cstate->num_mixers || !cstate->num_ctls) { +DPU_ERROR ("invalid hw count-lm's:%d ctl's:%d\n" , + cstate->num_mixers, cstate->num_ctls);This can also be reworded - I don't know what lm is, and you shouldn't use an
apostrophe - it would just be 'ctls' or 'mixers'. Instead of invalid, perhaps
using "no mixers defined" and "no controls defined".Quoted 2 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +2
-0+return ; + }<snip>
Quoted 2 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +0
-0@@ -1584,6 +1579,23 @@ static int dpu_crtc_atomic_check(struct
drm_crtc*crtc,
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c static int dpu_crtc_atomic_check(struct drm_crtc *crtc, · line 1584
Quoted 6 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +3
-0} } +/* Resource allocation */ + dpu_priv_state =dpu_get_private_state (state->state); +Ah, here is a use of
dpu_get_private_state()that assumesdpu_priv_stateis
valid - this could use a ERR check but I think it also implies thatdpu_get_private_state()doesn't have a legitimate reason to return NULL.drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c static int dpu_crtc_atomic_check(struct drm_crtc *crtc,
Quoted 6 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +6
-0+ topology =dpu_crtc_get_topology (cstate, &state->adjusted_mode); +if (!topology.needs_realloc) + goto end; + +dpu_rm_release_crtc_res (&dpu_priv_state->rm, cstate); + rc = dpu_rm_reserve_crtc_res(&dpu_priv_state->rm, cstate,&topology);
Quoted 11 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +8
-0+if (rc) { +DPU_ERROR ("failed to allocate resources for crtc: %d\n" , + crtc->base.id); + goto end; + } + +_dpu_crtc_setup_mixers (state); + end:return rc; }<snip>
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c static int dpu_encoder_virt_atomic_check( · line 665
Quoted 12 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +2
-5@@ -657,27 +666,31 @@ static int dpu_encoder_virt_atomic_check( } } - topology =dpu_encoder_get_topology (dpu_enc, dpu_kms, adj_mode); +if (ret) + goto end; -/* Reserve dynamic resources now. Indicating AtomicTest phase */ -if (!ret) { -/* -* Avoid reserving resources when mode set is pending. Topology
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c static int dpu_encoder_virt_atomic_check( · line 670
Quoted 5 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +0
-5-* info may not be available to complete reservation. -*/ -if (drm_atomic_crtc_needs_modeset (crtc_state) - && dpu_enc->mode_set_complete) { - ret = dpu_rm_reserve(&dpu_kms->rm, drm_enc,
crtc_state,
Quoted 10 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c static int dpu_encoder_virt_atomic_check( · line 675
Quoted 7 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +4
-3- conn_state, topology, true); - dpu_enc->mode_set_complete = false; - } +/* hw resource allocation */ +dpu_encoder_get_hw_resources (drm_enc, &enc_hw_res, conn_state); + + dpu_priv_state =dpu_get_private_state (crtc_state->state);Here is another use of
dpu_get_private_state()that assumes a valid pointer.
Will add IS_ERR check.
Quoted 72 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c static int dpu_encoder_virt_atomic_check( · line 682
Quoted 8 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +7
-0+ topology =dpu_encoder_get_topology (dpu_enc, dpu_cstate); +if (!topology.needs_realloc) + goto end; + +dpu_rm_release_encoder_res (&dpu_priv_state->rm, dpu_cstate); + ret = dpu_rm_reserve_encoder_res(&dpu_priv_state->rm, + dpu_cstate,
&enc_hw_res);drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c static int dpu_encoder_virt_atomic_check( · line 691
Quoted 11 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +5
-2+if (ret) { +DPU_ERROR_ENC (dpu_enc, +"failed to allocate hw resources\n" ); + goto end; } -if (!ret) -drm_mode_set_crtcinfo (adj_mode,0 ); +drm_mode_set_crtcinfo (adj_mode,0 ); DPU_EVT32(DRMID(drm_enc), adj_mode->flags,
adj_mode->private_flags);Quoted 4 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +1
-1- +end:return ret; }<snip>
Quoted 2 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +0
-0@@ -1170,35 +1159,48 @@ void dpu_encoder_virt_restore(struct
drm_encoder
*drm_enc)Quoted 14 lines
static void
dpu_encoder_virt_enable(struct drm_encoder *drm_enc){drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +1
-2struct dpu_encoder_virt *dpu_enc =NULL ; +struct dpu_encoder_phys *phys =NULL ;int i, ret =0 ; -struct drm_display_mode *cur_mode =NULL ;if (!drm_enc) {DPU_ERROR ("invalid encoder\n" );return ; } dpu_enc =to_dpu_encoder_virt (drm_enc); - cur_mode = &dpu_enc->base.crtc->state->adjusted_mode;drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
Quoted 10 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +2
-3DPU_DEBUG_ENC (dpu_enc,"\n" ); -DPU_EVT32 (DRMID (drm_enc), cur_mode->hdisplay, cur_mode->vdisplay); dpu_enc->cur_master =NULL ; + dpu_enc->cur_slave =NULL ;for (i =0 ; i < dpu_enc->num_phys_encs; i++) { -struct dpu_encoder_phys *phys = dpu_enc->phys_encs[i]; + phys = dpu_enc->phys_encs[i]; - if (phys && phys->ops.is_master &&
phys->ops.is_master(phys)) {drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
Quoted 1 line
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +0
-1- DPU_DEBUG_ENC(dpu_enc, "master is now idx %d\n",i);
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
Quoted 5 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +5
-0+if (!phys || !phys->ops.is_master) +continue ; + +if (phys->ops.is_master (phys)) { + DPU_DEBUG_ENC(dpu_enc, "master is at idx %d\n",i);
Quoted 8 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +3
-1dpu_enc->cur_master = phys; -break ; + }else { +DPU_DEBUG_ENC (dpu_enc,"slave is at idx %d\n" , i); + dpu_enc->cur_slave = phys; } }
Quoted 7 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
Quoted 3 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +1
-1if (!dpu_enc->cur_master) { -DPU_ERROR ("virt encoder has no master! num_phys %d\n" , i); +DPU_ERROR ("virt encoder has no master!\n" );I don't think this rises to the occasion of needing a exclamation point.
<snip>
Will address rest of the comments in V2.
Signature · 5 lines
Jeykumar S _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
Re: [DPU PATCH 4/4] drm/msm/dpu: use private obj to track hw resources
Quoted 30 lines · Jeykumar Sankaran
Quoted 29 lines · Jordan Crouse
Quoted 28 lines · Jeykumar Sankaran
Switch to state based resource management. This patch overhauls the resource manager and HW allocation methods by maintaining the global resource pool and allocated hw blocks in respective drm component states.
Global resource manager(RM) is tracked in private object. Allocation strategy is switched from single point allocation of HW resources for the display pipeline to per component based allocation, where each drm component allocates HW blocks mapped to it's domain and tracks them in their respective state objects.
Fixes resource contention due to race conditions between user space and display thread by reserving resources only in atomic check.
Signed-off-by Jeykumar Sankaran <[email protected]>--- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 210 +++--- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 59 +- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 223 ++---- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 4 - drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h | 9 +- .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 32 +- .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 86 +-- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 19 +- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 8 +- drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 805
Quoted 3 lines
Quoted 3 lines
++++++---------------
Quoted 2 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h | 149 ++-- 11 files changed, 534 insertions(+), 1070 deletions(-)
/snip
Quoted 9 lines
Quoted 9 lines
cstate->num_mixers);Nit - this could be worded a bit better - "too many mixers" would be better, but
I have to ask - under what circumstances would the number of mixers be larger
thanCRTC_DUAL_MIXERSand/or why don't we support a dynamic number of mixers?
Quoted 5 lines
Comes from downstream driver implementation where CRTC iterates through RM free pool to identify mixers tagged with the current crtc id. If the previous clean up was screwed up this may have more than 2 mixers. With the new state based RM, its very unlikely we hit this condition.
In this case, add a comment with "/* This should never happen */"
I'm just kidding, that would virtually guarantee that it does happen and we certainly don't need that bad juju around!
Sean
Quoted 10 lines
We do support dynamic mixer counts. Based on the connector (panel) resolution,
CRTC allocates 1 or 2 (panel_width> hw mixer width) mixer block(s) on the first
atomic check. DPU limits max no. of hw mixers that can be ganged up for a display to 2.Quoted 3 lines
Quoted 2 lines
(quoted diff) +0
-0return; }
/snip
Signature · 5 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [DPU PATCH 4/4] drm/msm/dpu: use private obj to track hw resources
In reply to Jeykumar SankaranQuoted 17 lines · Jeykumar Sankaran
Switch to state based resource management. This patch overhauls the resource manager and HW allocation methods by maintaining the global resource pool and allocated hw blocks in respective drm component states.
Global resource manager(RM) is tracked in private object. Allocation strategy is switched from single point allocation of HW resources for the display pipeline to per component based allocation, where each drm component allocates HW blocks mapped to it's domain and tracks them in their respective state objects.
Fixes resource contention due to race conditions between user space and display thread by reserving resources only in atomic check.
Signed-off-by Jeykumar Sankaran <[email protected]>
Quoted 13 lines
--- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 210 +++--- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 59 +- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 223 ++---- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 4 - drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h | 9 +- .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 32 +- .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 86 +-- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 19 +- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 8 +- drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 805 ++++++--------------- drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h | 149 ++-- 11 files changed, 534 insertions(+), 1070 deletions(-)
Ok, there's a lot going on here. It's pretty easy to review megapatches where the diffstat is mostly negative. However, this patch has a lot of code deleted and moving around, along with the new private obj. It's really hard to review changes like this.
Could you please split this up into a bunch of simple patches which do one thing? ie: Moving topology is a patch, using cstate instead of crtc is a patch, using private obj is a patch, etc, etc.
Basically, cut things down into small enough pieces such that each patch can be easily explained without using "and" in the commit message :-)
/snip
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c static void dpu_crtc_disable(struct drm_crtc *crtc) · line 1204
Quoted 8 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +4
-0+ dpu_crtc =to_dpu_crtc (crtc); cstate =to_dpu_crtc_state (crtc->state); mode = &cstate->base.adjusted_mode; priv = crtc->dev->dev_private; + dpu_kms =to_dpu_kms (priv->kms); + +/* accessing after swap state. piv_obj.state is the current state */
s/piv_obj/priv_obj/
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c static void dpu_crtc_disable(struct drm_crtc *crtc) · line 1207
Quoted 4 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +1
-0+ dpu_priv_state =to_dpu_private_state (dpu_kms->priv_obj.state);DPU_DEBUG ("crtc%d\n" , crtc->base.id);
/snip
Signature · 5 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 11 lines · Jeykumar Sankaran
This patchset introduces drm private object in KMS to manage HW resource management. It modifies the resource manager by introducing API's to do per DRM object resource allocation/cleanups.
The patchset is based on: https://patchwork.kernel.org/patch/10461375/
Jeykumar Sankaran (4):
drm/msm/dpu: add atomic private object to dpu kms drm/msm/dpu: remove scalar config definitions drm/msm/dpu: remove resource pool manager drm/msm/dpu: use private obj to track hw resources
Kind of an odd arrangement of patches. Since you're respinning anyways, can you please reorder to:
drm/msm/dpu: remove scalar config definitions drm/msm/dpu: remove resource pool manager drm/msm/dpu: add atomic private object to dpu kms drm/msm/dpu: use private obj to track hw resources
Sean
Quoted 19 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 704 +++--------------- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 144 ++-- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 223 ++---- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 4 - drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h | 9 +- .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 32 +- .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 86 +-- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h | 10 - drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 85 ++- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 23 +- drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 805 ++++++--------------- drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h | 149 ++-- 12 files changed, 615 insertions(+), 1659 deletions(-)Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Signature · 5 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno