reserve RM resources in private obj state
v2 cover reserve RM resources in private obj state
v2 patches for [1].
changes in v2:
- Reserve and track hw resources allocated per display in subclassed drm private object states.
- Private objects are created per CRTC.
[1] https://patchwork.freedesktop.org/series/50722/
Follow up series will be submitted to clean up RM iterator API's.
Thanks and Regards,
Jeykumar S.
Jeykumar Sankaran (4):
drm/msm/dpu: add atomic private object to dpu crtc drm/msm/dpu: track HW resources using private object state drm/msm/dpu: remove reserve in encoder mode_set drm/msm/dpu: remove mode_set_complete
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 10 +- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 163 ++++++++++------------------ drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 73 ++++++++++++- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 32 ++++++ drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 131 +++++++++++++++------- drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h | 8 +- 6 files changed, 257 insertions(+), 160 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): 1550109142-28303-1-git-send-email-jsanka-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org
PATCH v2 1/4 drm/msm/dpu: add atomic private object to dpu crtc
Subclass drm private object state for DPU for handling driver specific data. Adds atomic private object to dpu crtc to track hw resources per display. Provide helper function to retrieve DPU private data from current atomic state before atomic swap.
changes in v2:
- private objects are maintained in dpu_crtc as the resources are tracked per display
--- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 3 ++ drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 64 +++++++++++++++++++++++++++++++- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 15 ++++++++ 3 files changed, 81 insertions(+), 1 deletion(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h +3 -0
@@ -141,6 +141,7 @@ struct dpu_crtc_frame_event {* @frame_pending : Whether or not an update is pending * @frame_events : static allocation of in-flight frame events * @frame_event_list : available frame event list +* @priv_obj : private state object to track hw resources * @spin_lock : spin lock for frame event, transaction status, etc... * @frame_done_comp : for frame_event_done synchronization * @event_thread : Pointer to event handler thread
@@ -176,6 +177,8 @@ struct dpu_crtc {spinlock_t spin_lock;struct completion frame_done_comp; +struct drm_private_obj priv_obj; +/* for handling internal event thread */ spinlock_t event_lock;
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +63 -1
94 lines not on this page · raw message
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h +15 -0
@@ -32,6 +32,8 @@#include "dpu_rm.h" #include "dpu_core_perf.h" +struct dpu_crtc ; +#define DRMID (x) ((x) ? (x)->base.id : -1)/**
@@ -136,6 +138,10 @@ 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;
@@ -143,6 +149,15 @@ struct vsync_info {#define to_dpu_kms (x) container_of(x, struct dpu_kms, base) +/** +* dpu_get_private_state - get dpu private state from atomic state +* @state: drm atomic state +* @crtc: pointer to crtc obj +* Return: pointer to dpu private state object +*/ +struct dpu_private_state *dpu_get_private_state (struct drm_atomic_state *state, +struct dpu_crtc *crtc); +/* get struct msm_kms * from drm_device * */ #define ddev_to_msm_kms (D ) ((D) && (D)->dev_private ? \ ((struct msm_drm_private *)((D)->dev_private))->kms : NULL)
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): 1550109142-28303-2-git-send-email-jsanka-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org
Re: [PATCH v2 1/4] drm/msm/dpu: add atomic private object to dpu crtc
Quoted 9 lines · Jeykumar Sankaran
Subclass drm private object state for DPU for handling driver specific data. Adds atomic private object to dpu crtc to track hw resources per display. Provide helper function to retrieve DPU private data from current atomic state before atomic swap.
changes in v2:
- private objects are maintained indpu_crtcas the resources are tracked per display
Seems like you could just store it in crtc_state if it's per-crtc?
Sean
Quoted 179 lines
Signed-off-by Jeykumar Sankaran <[email protected]>--- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 3 ++ drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 64 +++++++++++++++++++++++++++++++- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 15 ++++++++ 3 files changed, 81 insertions(+), 1 deletion(-)drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h +3
-0@@ -141,6 +141,7 @@ struct dpu_crtc_frame_event {* @frame_pending : Whether or not an update is pending * @frame_events : static allocation of in-flight frame events * @frame_event_list : available frame event list +* @priv_obj : private state object to track hw resources * @spin_lock : spin lock for frame event, transaction status, etc... * @frame_done_comp : for frame_event_done synchronization * @event_thread : Pointer to event handler thread @@ -176,6 +177,8 @@ struct dpu_crtc {spinlock_t spin_lock;struct completion frame_done_comp; +struct drm_private_obj priv_obj; +/* for handling internal event thread */ spinlock_t event_lock;drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +63
-1@@ -459,6 +459,49 @@ static int _dpu_kms_setup_displays(struct drm_device *dev,return _dpu_kms_initialize_dsi (dev, priv, dpu_kms); } +struct dpu_private_state *dpu_get_private_state (struct drm_atomic_state *state, +struct dpu_crtc *crtc) +{ +struct drm_private_state *priv_state; + + priv_state =drm_atomic_get_private_obj_state (state, &crtc->priv_obj); +if (IS_ERR (priv_state)) +return ERR_PTR (-ENOMEM ); + + return container_of(priv_state, struct dpu_private_state, base); +} + +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 =container_of (state, + struct dpu_private_state, + base); + +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, +}; +static void _dpu_kms_drm_obj_destroy (struct dpu_kms *dpu_kms) {struct msm_drm_private *priv;@@ -476,8 +519,12 @@ static void _dpu_kms_drm_obj_destroy(struct dpu_kms *dpu_kms) } priv = dpu_kms->dev->dev_private; -for (i =0 ; i < priv->num_crtcs; i++) +for (i =0 ; i < priv->num_crtcs; i++) { +struct dpu_crtc *dpu_crtc =to_dpu_crtc (priv->crtcs[i]); + +drm_atomic_private_obj_fini (&dpu_crtc->priv_obj); priv->crtcs[i]->funcs->destroy (priv->crtcs[i]); + } priv->num_crtcs =0 ;for (i =0 ; i < priv->num_planes; i++)@@ -499,6 +546,7 @@ static int _dpu_kms_drm_obj_init(struct dpu_kms *dpu_kms)struct drm_plane *primary_planes[MAX_PLANES ], *plane;struct drm_plane *cursor_planes[MAX_PLANES ] = {NULL };struct drm_crtc *crtc; +struct dpu_private_state *dpu_priv_state;struct msm_drm_private *priv;struct dpu_mdss_cfg *catalog;@@ -560,11 +608,25 @@ static int _dpu_kms_drm_obj_init(struct dpu_kms *dpu_kms)/* Create one CRTC per encoder */ for (i =0 ; i < max_crtc_count; i++) { +struct dpu_crtc *dpu_crtc; + crtc =dpu_crtc_init (dev, primary_planes[i], cursor_planes[i]);if (IS_ERR (crtc)) { ret =PTR_ERR (crtc); goto fail; } + + dpu_crtc =to_dpu_crtc (crtc); + +/* Initialize private obj's */ + dpu_priv_state =kzalloc (sizeof (*dpu_priv_state),GFP_KERNEL ); +if (!dpu_priv_state) +return -ENOMEM ; + +drm_atomic_private_obj_init (&dpu_crtc->priv_obj, + &dpu_priv_state->base, + &priv_obj_funcs); + priv->crtcs[priv->num_crtcs++] = crtc; }drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h +15
-0@@ -32,6 +32,8 @@#include "dpu_rm.h" #include "dpu_core_perf.h" +struct dpu_crtc ; +#define DRMID (x) ((x) ? (x)->base.id : -1)/** @@ -136,6 +138,10 @@ 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;@@ -143,6 +149,15 @@ struct vsync_info {#define to_dpu_kms (x) container_of(x, struct dpu_kms, base) +/** +* dpu_get_private_state - get dpu private state from atomic state +* @state: drm atomic state +* @crtc: pointer to crtc obj +* Return: pointer to dpu private state object +*/ +struct dpu_private_state *dpu_get_private_state (struct drm_atomic_state *state, +struct dpu_crtc *crtc); +/* get struct msm_kms * from drm_device * */ #define ddev_to_msm_kms (D ) ((D) && (D)->dev_private ? \ ((struct msm_drm_private *)((D)->dev_private))->kms : NULL)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
Signature · 5 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
Re: [PATCH v2 1/4] drm/msm/dpu: add atomic private object to dpu crtc
Quoted 7 lines · Sean Paul
Quoted 6 lines · Jeykumar Sankaran
Subclass drm private object state for DPU for handling driver specific data. Adds atomic private object to dpu crtc to track hw resources per display. Provide helper function to retrieve DPU private data from current atomic state before atomic swap.
Quoted 6 lines
Quoted 3 lines
changes in v2:
- private objects are maintained indpu_crtcas the resources are tracked per displaySeems like you could just store it in
crtc_stateif it's per-crtc?
If you mean - "no need for priv object, maintain in crtc state", that was the original v1 implementation. But you proposed to have them tracked in a private object since I had to use crtc_state for tracking interfaces too which were mapped in encoders.
It made sense as the private objects not bounded to any DRM object domain and is the best candidate to track per display assignments. So v2 implementation moved all the RM assignment to private objects state and provided an interface for CRTC and Encoder to query its domain specific hw blocks.
v1: https://patchwork.freedesktop.org/patch/255452/
Thanks and Regards,
Jeykumar S.
Quoted 203 lines
Sean
Quoted 5 lines
Signed-off-by Jeykumar Sankaran <[email protected]>--- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 3 ++ drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 64+++++++++++++++++++++++++++++++-
Review
Quoted 4 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 15 ++++++++ 3 files changed, 81 insertions(+), 1 deletion(-)(quoted diff) +0
-0
b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.hdrivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h struct dpu_crtc_frame_event { · line 145
Quoted 9 lines
index e59d62b..be07554 100644
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h +1
-0@@ -141,6 +141,7 @@ struct dpu_crtc_frame_event {* @frame_pending : Whether or not an update is pending * @frame_events : static allocation of in-flight frame events * @frame_event_list : available frame event list +* @priv_obj : private state object to track hw resources * @spin_lock : spin lock for frame event, transaction status, etc...
Review
Quoted 12 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h +2
-0* @frame_done_comp : for frame_event_done synchronization * @event_thread : Pointer to event handler thread @@ -176,6 +177,8 @@ struct dpu_crtc {spinlock_t spin_lock;struct completion frame_done_comp; +struct drm_private_obj priv_obj; +/* for handling internal event thread */ spinlock_t event_lock;(quoted diff) +0
-0
b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.cdrivers/gpu/drm/msm/disp/dpu1/dpu_kms.c static int _dpu_kms_setup_displays(struct
Quoted 4 lines
index 885bf88..1677862 100644
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +0
-0@@ -459,6 +459,49 @@ static int _dpu_kms_setup_displays(struct
drm_device*dev,Quoted 5 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +1
-0return _dpu_kms_initialize_dsi (dev, priv, dpu_kms); } +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_setup_displays(struct drm_device *dev,
Quoted 5 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +5
-0+ struct dpu_crtc *crtc) +{ +struct drm_private_state *priv_state; + + priv_state = drm_atomic_get_private_obj_state(state,
&crtc->priv_obj);Quoted 8 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +8
-0+if (IS_ERR (priv_state)) +return ERR_PTR (-ENOMEM ); + + return container_of(priv_state, struct dpu_private_state, base); +} + +static struct drm_private_state * +dpu_private_obj_duplicate_state (struct drm_private_obj *obj)drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c static int _dpu_kms_setup_displays(struct drm_device *dev, · line 486
Quoted 10 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +10
-0+{ +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);drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c static int _dpu_kms_setup_displays(struct drm_device *dev,
Quoted 10 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +5
-0+ +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 +4
-0+ struct drm_private_state *state) +{ +struct dpu_private_state *dpu_priv_state =container_of (state, + struct
dpu_private_state,Quoted 14 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +10
-0+ base); + +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, +}; +static void _dpu_kms_drm_obj_destroy (struct dpu_kms *dpu_kms) {struct msm_drm_private *priv;@@ -476,8 +519,12 @@ static void _dpu_kms_drm_obj_destroy(structQuoted 1 line
dpu_kms
*dpu_kms)drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c static int _dpu_kms_drm_obj_init(struct dpu_kms
Quoted 14 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +5
-1} priv = dpu_kms->dev->dev_private; -for (i =0 ; i < priv->num_crtcs; i++) +for (i =0 ; i < priv->num_crtcs; i++) { +struct dpu_crtc *dpu_crtc =to_dpu_crtc (priv->crtcs[i]); + +drm_atomic_private_obj_fini (&dpu_crtc->priv_obj); priv->crtcs[i]->funcs->destroy (priv->crtcs[i]); + } priv->num_crtcs =0 ;for (i =0 ; i < priv->num_planes; i++)@@ -499,6 +546,7 @@ static int _dpu_kms_drm_obj_init(struct dpu_kms
*dpu_kms)drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c static int _dpu_kms_drm_obj_init(struct dpu_kms
Quoted 8 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +1
-0struct drm_plane *primary_planes[MAX_PLANES ], *plane;struct drm_plane *cursor_planes[MAX_PLANES ] = {NULL };struct drm_crtc *crtc; +struct dpu_private_state *dpu_priv_state;struct msm_drm_private *priv;struct dpu_mdss_cfg *catalog;@@ -560,11 +608,25 @@ static int _dpu_kms_drm_obj_init(struct dpu_kms
*dpu_kms)drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c static int _dpu_kms_drm_obj_init(struct dpu_kms *dpu_kms)
Quoted 6 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +2
-0/* Create one CRTC per encoder */ for (i =0 ; i < max_crtc_count; i++) { +struct dpu_crtc *dpu_crtc; + crtc = dpu_crtc_init(dev, primary_planes[i],cursor_planes[i]);
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c static int _dpu_kms_drm_obj_init(struct dpu_kms *dpu_kms)
Quoted 9 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +5
-0if (IS_ERR (crtc)) { ret =PTR_ERR (crtc); goto fail; } + + dpu_crtc =to_dpu_crtc (crtc); + +/* Initialize private obj's */ + dpu_priv_state = kzalloc(sizeof(*dpu_priv_state),
GFP_KERNEL);Review
Quoted 11 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +7
-0+if (!dpu_priv_state) +return -ENOMEM ; + +drm_atomic_private_obj_init (&dpu_crtc->priv_obj, + &dpu_priv_state->base, + &priv_obj_funcs); + priv->crtcs[priv->num_crtcs++] = crtc; }(quoted diff) +0
-0
b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.hQuoted 34 lines
index ac75cfc..3deedfb 100644
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h +13
-0@@ -32,6 +32,8 @@#include "dpu_rm.h" #include "dpu_core_perf.h" +struct dpu_crtc ; +#define DRMID (x) ((x) ? (x)->base.id : -1)/** @@ -136,6 +138,10 @@ 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;@@ -143,6 +149,15 @@ struct vsync_info {#define to_dpu_kms (x) container_of(x, struct dpu_kms, base) +/** +* dpu_get_private_state - get dpu private state from atomic state +* @state: drm atomic state +* @crtc: pointer to crtc obj +* Return: pointer to dpu private state object +*/ +struct dpu_private_state *dpu_get_private_state(structQuoted 1 line
drm_atomic_state*state,
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h struct vsync_info {
Quoted 5 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h +2
-0+ struct dpu_crtc *crtc); +/* get struct msm_kms * from drm_device * */ #define ddev_to_msm_kms (D ) ((D) && (D)->dev_private ? \ ((struct msm_drm_private *)((D)->dev_private))->kms :NULL)
Quoted 2 lines
--
The Qualcomm Innovation Center, Inc. is a member of the Code AuroraForum,
Quoted 6 lines
a Linux Foundation Collaborative Project
_______________________________________________
Freedreno mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/freedreno
Signature · 5 lines
Jeykumar S _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
Sean Paul
reviewerRe: [Freedreno] [PATCH v2 1/4] drm/msm/dpu: add atomic private object to dpu crtc
Quoted 19 lines · Jeykumar Sankaran
Quoted 7 lines · Sean Paul
Quoted 6 lines · Jeykumar Sankaran
Subclass drm private object state for DPU for handling driver specific data. Adds atomic private object to dpu crtc to track hw resources per display. Provide helper function to retrieve DPU private data from current atomic state before atomic swap.
Quoted 6 lines
Quoted 3 lines
changes in v2:
- private objects are maintained indpu_crtcas the resources are tracked per displaySeems like you could just store it in
crtc_stateif it's per-crtc?If you mean - "no need for priv object, maintain in crtc state", that was the original v1 implementation. But you proposed to have them tracked in a private object since I had to use
crtc_statefor tracking interfaces too which were mapped in encoders.
Quoted 6 lines
It made sense as the private objects not bounded to any DRM object domain and is the best candidate to track per display assignments. So v2 implementation moved all the RM assignment to private objects state and provided an interface for CRTC and Encoder to query its domain specific hw blocks.
Apologies for the churn, I'm trying my best to grok all of this, but obviously failing :(
I think it makes sense to use private objects if you're tracking resources across the entire driver. So if that's what you're trying to do, I'd prefer storing it all in one private object at the top-level. If you want to store it per-crtc, then use the crtc state since it's already managed by the core/helpers.
Sean
Quoted 212 lines
v1: https://patchwork.freedesktop.org/patch/255452/
Thanks and Regards,
Jeykumar S.Quoted 203 lines
Sean
Quoted 5 lines
Signed-off-by Jeykumar Sankaran <[email protected]>--- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 3 ++ drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 64+++++++++++++++++++++++++++++++-
Review
Quoted 4 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 15 ++++++++ 3 files changed, 81 insertions(+), 1 deletion(-)(quoted diff) +0
-0
b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.hdrivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h struct dpu_crtc_frame_event { · line 145
Quoted 9 lines
index e59d62b..be07554 100644
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h +1
-0@@ -141,6 +141,7 @@ struct dpu_crtc_frame_event {* @frame_pending : Whether or not an update is pending * @frame_events : static allocation of in-flight frame events * @frame_event_list : available frame event list +* @priv_obj : private state object to track hw resources * @spin_lock : spin lock for frame event, transaction status, etc...
Review
Quoted 12 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h +2
-0* @frame_done_comp : for frame_event_done synchronization * @event_thread : Pointer to event handler thread @@ -176,6 +177,8 @@ struct dpu_crtc {spinlock_t spin_lock;struct completion frame_done_comp; +struct drm_private_obj priv_obj; +/* for handling internal event thread */ spinlock_t event_lock;(quoted diff) +0
-0
b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.cdrivers/gpu/drm/msm/disp/dpu1/dpu_kms.c static int _dpu_kms_setup_displays(struct
Quoted 4 lines
index 885bf88..1677862 100644
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +0
-0@@ -459,6 +459,49 @@ static int _dpu_kms_setup_displays(struct
drm_device*dev,Quoted 5 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +1
-0return _dpu_kms_initialize_dsi (dev, priv, dpu_kms); } +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_setup_displays(struct drm_device *dev,
Quoted 5 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +5
-0+ struct dpu_crtc *crtc) +{ +struct drm_private_state *priv_state; + + priv_state = drm_atomic_get_private_obj_state(state,
&crtc->priv_obj);Quoted 8 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +8
-0+if (IS_ERR (priv_state)) +return ERR_PTR (-ENOMEM ); + + return container_of(priv_state, struct dpu_private_state, base); +} + +static struct drm_private_state * +dpu_private_obj_duplicate_state (struct drm_private_obj *obj)drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c static int _dpu_kms_setup_displays(struct drm_device *dev, · line 486
Quoted 10 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +10
-0+{ +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);drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c static int _dpu_kms_setup_displays(struct drm_device *dev,
Quoted 10 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +5
-0+ +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 +4
-0+ struct drm_private_state *state) +{ +struct dpu_private_state *dpu_priv_state =container_of (state, + struct
dpu_private_state,Quoted 14 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +10
-0+ base); + +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, +}; +static void _dpu_kms_drm_obj_destroy (struct dpu_kms *dpu_kms) {struct msm_drm_private *priv;@@ -476,8 +519,12 @@ static void _dpu_kms_drm_obj_destroy(structQuoted 1 line
dpu_kms
*dpu_kms)drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c static int _dpu_kms_drm_obj_init(struct dpu_kms
Quoted 14 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +5
-1} priv = dpu_kms->dev->dev_private; -for (i =0 ; i < priv->num_crtcs; i++) +for (i =0 ; i < priv->num_crtcs; i++) { +struct dpu_crtc *dpu_crtc =to_dpu_crtc (priv->crtcs[i]); + +drm_atomic_private_obj_fini (&dpu_crtc->priv_obj); priv->crtcs[i]->funcs->destroy (priv->crtcs[i]); + } priv->num_crtcs =0 ;for (i =0 ; i < priv->num_planes; i++)@@ -499,6 +546,7 @@ static int _dpu_kms_drm_obj_init(struct dpu_kms
*dpu_kms)drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c static int _dpu_kms_drm_obj_init(struct dpu_kms
Quoted 8 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +1
-0struct drm_plane *primary_planes[MAX_PLANES ], *plane;struct drm_plane *cursor_planes[MAX_PLANES ] = {NULL };struct drm_crtc *crtc; +struct dpu_private_state *dpu_priv_state;struct msm_drm_private *priv;struct dpu_mdss_cfg *catalog;@@ -560,11 +608,25 @@ static int _dpu_kms_drm_obj_init(struct dpu_kms
*dpu_kms)drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c static int _dpu_kms_drm_obj_init(struct dpu_kms *dpu_kms)
Quoted 6 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +2
-0/* Create one CRTC per encoder */ for (i =0 ; i < max_crtc_count; i++) { +struct dpu_crtc *dpu_crtc; + crtc = dpu_crtc_init(dev, primary_planes[i],cursor_planes[i]);
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c static int _dpu_kms_drm_obj_init(struct dpu_kms *dpu_kms)
Quoted 9 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +5
-0if (IS_ERR (crtc)) { ret =PTR_ERR (crtc); goto fail; } + + dpu_crtc =to_dpu_crtc (crtc); + +/* Initialize private obj's */ + dpu_priv_state = kzalloc(sizeof(*dpu_priv_state),
GFP_KERNEL);Review
Quoted 11 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +7
-0+if (!dpu_priv_state) +return -ENOMEM ; + +drm_atomic_private_obj_init (&dpu_crtc->priv_obj, + &dpu_priv_state->base, + &priv_obj_funcs); + priv->crtcs[priv->num_crtcs++] = crtc; }(quoted diff) +0
-0
b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.hQuoted 34 lines
index ac75cfc..3deedfb 100644
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h +13
-0@@ -32,6 +32,8 @@#include "dpu_rm.h" #include "dpu_core_perf.h" +struct dpu_crtc ; +#define DRMID (x) ((x) ? (x)->base.id : -1)/** @@ -136,6 +138,10 @@ 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;@@ -143,6 +149,15 @@ struct vsync_info {#define to_dpu_kms (x) container_of(x, struct dpu_kms, base) +/** +* dpu_get_private_state - get dpu private state from atomic state +* @state: drm atomic state +* @crtc: pointer to crtc obj +* Return: pointer to dpu private state object +*/ +struct dpu_private_state *dpu_get_private_state(structQuoted 1 line
drm_atomic_state*state,
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h struct vsync_info {
Quoted 5 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h +2
-0+ struct dpu_crtc *crtc); +/* get struct msm_kms * from drm_device * */ #define ddev_to_msm_kms (D ) ((D) && (D)->dev_private ? \ ((struct msm_drm_private *)((D)->dev_private))->kms :NULL)
Quoted 2 lines
--
The Qualcomm Innovation Center, Inc. is a member of the Code AuroraForum,
Quoted 6 lines
a Linux Foundation Collaborative Project
_______________________________________________
Freedreno mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/freedrenoSignature · 1 line
Jeykumar S
Signature · 5 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 2/4 drm/msm/dpu: track HW resources using private object state
In reply to a message not in the archiveDPU maintained reservation lists to cache assigned HW blocks for the display and a retrieval mechanism for the individual DRM components to query their respective HW blocks.
This patch uses the sub-classed private object state to store and track HW blocks assigned for different components of the display pipeline. It helps the driver:
- to get rid of unwanted store and retrieval RM API's
- to preserve HW resources assigned in atomic_check through atomic swap/duplicate.
Resources are reserved only when drm_atomic_crtc_needs_modeset is set to TRUE and are released in atomic disable path.
With TEST_ONLY atomic commit path, reserved resources are released back to RM pool in private_obj_destroy_state call.
changes in v2 (comments from Sean Paul):
- Track resources in private object state instead of crtc state.
- Avoid duplicate tracking of hw_ctls in crtc
- No explicit count for hw_ctl as they match with hw_intf count
--- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 7 +- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 157 ++++++++++++---------------- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 9 ++ drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 17 +++ drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 131 +++++++++++++++-------- drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h | 8 +- 6 files changed, 185 insertions(+), 144 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h +1 -6
@@ -202,8 +202,6 @@ struct dpu_crtc {* @new_perf: new performance state being requested * @num_mixers : Number of mixers in use * @mixers : List of active mixers -* @num_ctls : Number of ctl paths in use -* @hw_ctls : List of active ctl paths */ struct dpu_crtc_state {struct drm_crtc_state base;
@@ -217,11 +215,8 @@ struct dpu_crtc_state {struct dpu_core_perf_params new_perf;/* HW Resources reserved for the crtc */ -u32 num_mixers; +int num_mixers;struct dpu_crtc_mixer mixers[CRTC_DUAL_MIXERS ]; - -u32 num_ctls; -struct dpu_hw_ctl *hw_ctls[CRTC_DUAL_MIXERS ]; };#define to_dpu_crtc_state (x) \
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +65 -92
227 lines not on this page · raw message
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +9 -0
@@ -490,10 +490,19 @@ struct dpu_private_state *dpu_get_private_state(struct drm_atomic_state *state,static void dpu_private_obj_destroy_state (struct drm_private_obj *obj,struct drm_private_state *state) { +struct msm_drm_private *priv = state->state->dev->dev_private; +struct dpu_kms *dpu_kms =to_dpu_kms (priv->kms);struct dpu_private_state *dpu_priv_state =container_of (state, struct dpu_private_state, base); +/* +* Destroy state will be triggering RM release only when resources +* are allocated during TEST_ONLY commits where resources need +* to be freed back to the RM pool +*/ +dpu_rm_release (&dpu_kms->rm, state); +kfree (dpu_priv_state); }
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h +17 -0
@@ -26,6 +26,7 @@#include "dpu_hw_catalog.h" #include "dpu_hw_ctl.h" #include "dpu_hw_lm.h" +#include "dpu_hw_intf.h" #include "dpu_hw_interrupts.h" #include "dpu_hw_top.h" #include "dpu_io_util.h"
@@ -140,6 +141,22 @@ struct dpu_kms {struct dpu_private_state {struct drm_private_state base; + +/* +* layer mixers and ping pong blocks +* are hard chained +*/ +int num_mixers; +struct dpu_hw_mixer *hw_lms[CRTC_DUAL_MIXERS ]; +struct dpu_hw_pingpong *hw_pps[CRTC_DUAL_MIXERS ]; + +/* +* until SDM845 each interface is controlled +* by its own hw_ctl +*/ +int num_intfs; +struct dpu_hw_ctl *hw_ctls[CRTC_DUAL_MIXERS ]; +struct dpu_hw_intf *hw_intfs[CRTC_DUAL_MIXERS ]; };struct vsync_info {
drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c +89 -42
264 lines not on this page · raw message
drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h +4 -4
@@ -81,14 +81,14 @@ int dpu_rm_init(struct dpu_rm *rm,* HW Reservations should be released via dpu_rm_release_hw. * @rm: DPU Resource Manager handle * @drm_enc: DRM Encoder handle -* @crtc_state: Proposed Atomic DRM CRTC State handle +* @priv_state: Pointer to drm private obj state * @topology: Pointer to topology info for the display * @test_only: Atomic-Test phase, discard results (unless property overrides) * @Return: 0 on Success otherwise -ERROR */ int dpu_rm_reserve (struct dpu_rm *rm,struct drm_encoder *drm_enc, -struct drm_crtc_state *crtc_state, +struct drm_private_state *priv_state,struct msm_display_topology topology,bool test_only);
@@ -96,10 +96,10 @@ int dpu_rm_reserve(struct dpu_rm *rm,* dpu_rm_reserve - Given the encoder for the display chain, release any * HW blocks previously reserved for that use case. * @rm: DPU Resource Manager handle -* @enc: DRM Encoder handle +* @priv_state: Pointer to drm private obj state * @Return: 0 on Success otherwise -ERROR */ -void dpu_rm_release (struct dpu_rm *rm,struct drm_encoder *enc); +void dpu_rm_release (struct dpu_rm *rm,struct drm_private_state *priv_state);/** * dpu_rm_init_hw_iter - setup given iterator for new iteration over hw list
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 v2 3/4 drm/msm/dpu: remove reserve in encoder mode_set
In reply to a message not in the archiveNow that we have dpu private state tracking the reserved HW resources, we have access to them after atomic swap. So avoid reserving the resources in mode_set.
changes in v2:
- removal applied on private object based reservation
--- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +2 -16
@@ -605,8 +605,6 @@ static int dpu_encoder_virt_atomic_check( }/* -* Reserve dynamic resources now. Indicating AtomicTest phase -* * Avoid reserving resources when mode set is pending. Topology * info may not be available to complete reservation. */
@@ -620,7 +618,7 @@ static int dpu_encoder_virt_atomic_check( to_dpu_crtc(crtc_state->crtc)); ret =dpu_rm_reserve (&dpu_kms->rm, drm_enc, - &dpu_priv_state->base, topology, true); + &dpu_priv_state->base, topology, false); dpu_enc->mode_set_complete = false; }
@@ -966,10 +964,9 @@ static void dpu_encoder_virt_mode_set(struct drm_encoder *drm_enc,struct drm_connector *conn =NULL , *conn_iter;struct drm_crtc *drm_crtc;struct dpu_crtc_state *dpu_cstate; -struct msm_display_topology topology;struct dpu_crtc *dpu_crtc;struct dpu_private_state *dpu_private_state; -int i, j, ret; +int i, j;if (!drm_enc) {DPU_ERROR ("invalid encoder\n" );
@@ -1001,18 +998,7 @@ static void dpu_encoder_virt_mode_set(struct drm_encoder *drm_enc,if (drm_crtc->state->encoder_mask &drm_encoder_mask (drm_enc))break ; - topology =dpu_encoder_get_topology (dpu_enc, dpu_kms, adj_mode); dpu_crtc =to_dpu_crtc (drm_crtc); - -/* Reserve dynamic resources now. Indicating non-AtomicTest phase */ - ret =dpu_rm_reserve (&dpu_kms->rm, drm_enc, dpu_crtc->priv_obj.state, - topology, false); -if (ret) { -DPU_ERROR_ENC (dpu_enc, -"failed to reserve hw resources, %d\n" , ret); -return ; - } - dpu_cstate =to_dpu_crtc_state (drm_crtc->state); dpu_private_state =container_of (dpu_crtc->priv_obj.state, struct dpu_private_state, base);
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 v2 4/4 drm/msm/dpu: remove mode_set_complete
In reply to a message not in the archiveThis flag was introduced as a fix to notify modeset complete when hw reservations were happening in both atomic_check and atomic_commit paths. Now that we are reserving only in atomic_check, we can get rid of this flag.
changes in v2:
- none
--- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +1 -11
@@ -170,7 +170,6 @@ enum dpu_enc_rc_states {* clks and resources after IDLE_TIMEOUT time. * @vsync_event_work: worker to handle vsync event for autorefresh * @topology: topology of the display -* @mode_set_complete: flag to indicate modeset completion * @idle_timeout: idle timeout duration in milliseconds */ struct dpu_encoder_virt {
@@ -208,7 +207,6 @@ struct dpu_encoder_virt {struct delayed_work delayed_off_work;struct kthread_work vsync_event_work;struct msm_display_topology topology; -bool mode_set_complete;u32 idle_timeout; };
@@ -604,12 +602,7 @@ static int dpu_encoder_virt_atomic_check( } } -/* -* Avoid reserving resources when mode set is pending. Topology -* info may not be available to complete reservation. -*/ -if (!ret &&drm_atomic_crtc_needs_modeset (crtc_state) - && dpu_enc->mode_set_complete) { +if (!ret &&drm_atomic_crtc_needs_modeset (crtc_state)) {struct msm_display_topology topology;struct dpu_private_state *dpu_priv_state;
@@ -619,7 +612,6 @@ static int dpu_encoder_virt_atomic_check( ret =dpu_rm_reserve (&dpu_kms->rm, drm_enc, &dpu_priv_state->base, topology, false); - dpu_enc->mode_set_complete = false; }if (!ret)
@@ -1039,8 +1031,6 @@ static void dpu_encoder_virt_mode_set(struct drm_encoder *drm_enc,if (phys->ops.mode_set) phys->ops.mode_set (phys, mode, adj_mode); } - - dpu_enc->mode_set_complete = true; }static void _dpu_encoder_virt_enable_helper (struct drm_encoder *drm_enc)
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