Implement komeda DRM-Plane
Subsystems (4)
v2 cover Implement komeda DRM-Plane
This is the 3rd patchset for the komeda driver.
This patchset implemented plane/plane_helper functions for DRM-Plane. per the komeda driver design, A DRM-plane maps to komeda layer input pipeline, so the plane->atomic_check will build a layer input pipeline according to the plane_state. and with this build function the plane_state will be covert to komeda private component states to represent the real HW configuration.
Beside that also added some basic functions for operating the komeda private object.
v2:
- Rebase
- Introduce struct komeda_data_flow_cfg
- Update code after applied commit:
b962a12050a3 ("drm/atomic: integrate modeset lock with private objects")
james qian wang (Arm Technology China) (5):
drm: Add drm_atomic_get_old/new_private_obj_state drm/komeda: Add komeda_pipeline/component_get_state_and_set_user drm/komeda: Initialize komeda component as drm private object drm/komeda: Add komeda_build_layer_data_flow drm/komeda: Add komeda_plane/plane_helper_funcs
drivers/gpu/drm/arm/display/komeda/Makefile | 1 + .../gpu/drm/arm/display/komeda/komeda_kms.c | 3 +- .../gpu/drm/arm/display/komeda/komeda_kms.h | 2 +- .../drm/arm/display/komeda/komeda_pipeline.h | 24 ++ .../display/komeda/komeda_pipeline_state.c | 406 ++++++++++++++++++ .../gpu/drm/arm/display/komeda/komeda_plane.c | 128 ++++++ .../arm/display/komeda/komeda_private_obj.c | 220 +++++++++- drivers/gpu/drm/drm_atomic.c | 45 +- include/drm/drm_atomic.h | 6 + 9 files changed, 817 insertions(+), 18 deletions(-) create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 1/5 drm: Add drm_atomic_get_old/new_private_obj_state
From: "james qian wang (Arm Technology China)" <[email protected]>
This pair of functions return the old/new private object state for the given private_obj, or NULL if the private_obj is not part of the global atomic state.
--- drivers/gpu/drm/drm_atomic.c | 45 +++++++++++++++++++++++++++++++++++- include/drm/drm_atomic.h | 6 +++++ 2 files changed, 50 insertions(+), 1 deletion(-)
drivers/gpu/drm/drm_atomic.c +44 -1
@@ -775,6 +775,50 @@ drm_atomic_get_private_obj_state(struct drm_atomic_state *state, }EXPORT_SYMBOL (drm_atomic_get_private_obj_state); +/** +* drm_atomic_get_old_private_obj_state +* @state: global atomic state object +* @obj: private_obj to grab +* +* This function returns the old private object state for the given private_obj, +* or NULL if the private_obj is not part of the global atomic state. +*/ +struct drm_private_state * +drm_atomic_get_old_private_obj_state (struct drm_atomic_state *state, +struct drm_private_obj *obj) +{ +int i; + +for (i =0 ; i < state->num_private_objs; i++) +if (obj == state->private_objs[i].ptr) +return state->private_objs[i].old_state; + +return NULL ; +} +EXPORT_SYMBOL (drm_atomic_get_old_private_obj_state); + +/** +* drm_atomic_get_new_private_obj_state +* @state: global atomic state object +* @obj: private_obj to grab +* +* This function returns the new private object state for the given private_obj, +* or NULL if the private_obj is not part of the global atomic state. +*/ +struct drm_private_state * +drm_atomic_get_new_private_obj_state (struct drm_atomic_state *state, +struct drm_private_obj *obj) +{ +int i; + +for (i =0 ; i < state->num_private_objs; i++) +if (obj == state->private_objs[i].ptr) +return state->private_objs[i].new_state; + +return NULL ; +} +EXPORT_SYMBOL (drm_atomic_get_new_private_obj_state); +/** * drm_atomic_get_connector_state - get connector state * @state: global atomic state object
@@ -1214,4 +1258,3 @@ int drm_atomic_debugfs_init(struct drm_minor *minor) minor->debugfs_root, minor); }#endif -
include/drm/drm_atomic.h +6 -0
@@ -443,6 +443,12 @@ void drm_atomic_private_obj_fini(struct drm_private_obj *obj);struct drm_private_state *__must_check drm_atomic_get_private_obj_state (struct drm_atomic_state *state,struct drm_private_obj *obj); +struct drm_private_state * +drm_atomic_get_old_private_obj_state (struct drm_atomic_state *state, +struct drm_private_obj *obj); +struct drm_private_state * +drm_atomic_get_new_private_obj_state (struct drm_atomic_state *state, +struct drm_private_obj *obj);/** * drm_atomic_get_existing_crtc_state - get crtc state, if it exists
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 2/5 drm/komeda: Add komeda_pipeline/component_get_state_and_set_user
In reply to james qian wang (Arm Technology China)From: "james qian wang (Arm Technology China)" <[email protected]>
get_state_and_set_user packed get_state and set_user into one function, which get pipeline/component state for a specific pipeline/component, if success set the user to it.
v2:
- Rebase.
- Applied commit:
b962a12050a3 ("drm/atomic: integrate modeset lock with private objects") And delete our private modeset lock for pipeline.
--- drivers/gpu/drm/arm/display/komeda/Makefile | 1 + .../display/komeda/komeda_pipeline_state.c | 142 ++++++++++++++++++ 2 files changed, 143 insertions(+) create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c
drivers/gpu/drm/arm/display/komeda/Makefile +1 -0
@@ -9,6 +9,7 @@ komeda-y := \ komeda_dev.o \ komeda_format_caps.o \ komeda_pipeline.o \ + komeda_pipeline_state.o \ komeda_framebuffer.o \ komeda_kms.o \ komeda_crtc.o \
drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c new file +142 -0
142 lines not on this page · raw message
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 3/5 drm/komeda: Initialize komeda component as drm private object
In reply to james qian wang (Arm Technology China)From: "james qian wang (Arm Technology China)" <[email protected]>
Initialize koemda_layer, komeda_compiz, komeda_improc and komeda_timing_ctrlr as drm private object, then track komeda private component state by drm_atomic_state.
v2:
- Update code after Applied commit:
b962a12050a3 ("drm/atomic: integrate modeset lock with private objects")
--- .../gpu/drm/arm/display/komeda/komeda_kms.c | 3 +- .../gpu/drm/arm/display/komeda/komeda_kms.h | 2 +- .../arm/display/komeda/komeda_private_obj.c | 220 ++++++++++++++++-- 3 files changed, 208 insertions(+), 17 deletions(-)
drivers/gpu/drm/arm/display/komeda/komeda_kms.c +2 -1
@@ -179,6 +179,7 @@ struct komeda_kms_dev *komeda_kms_attach(struct komeda_dev *mdev)drm_irq_uninstall (drm); cleanup_mode_config:drm_mode_config_cleanup (drm); +komeda_kms_cleanup_private_objs (kms); free_kms:kfree (kms);return ERR_PTR (err);
@@ -193,7 +194,7 @@ void komeda_kms_detach(struct komeda_kms_dev *kms)drm_dev_unregister (drm);drm_irq_uninstall (drm);component_unbind_all (mdev->dev, drm); -komeda_kms_cleanup_private_objs (mdev); +komeda_kms_cleanup_private_objs (kms);drm_mode_config_cleanup (drm); drm->dev_private =NULL ;drm_dev_put (drm);
drivers/gpu/drm/arm/display/komeda/komeda_kms.h +1 -1
@@ -107,7 +107,7 @@ int komeda_kms_add_crtcs(struct komeda_kms_dev *kms, struct komeda_dev *mdev);int komeda_kms_add_planes (struct komeda_kms_dev *kms,struct komeda_dev *mdev);int komeda_kms_add_private_objs (struct komeda_kms_dev *kms,struct komeda_dev *mdev); -void komeda_kms_cleanup_private_objs (struct komeda_dev *mdev); +void komeda_kms_cleanup_private_objs (struct komeda_kms_dev *kms);void komeda_crtc_handle_event (struct komeda_crtc *kcrtc,struct komeda_events *evts);
drivers/gpu/drm/arm/display/komeda/komeda_private_obj.c +205 -15
243 lines not on this page · raw message
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 4/5 drm/komeda: Add komeda_build_layer_data_flow
In reply to james qian wang (Arm Technology China)From: "james qian wang (Arm Technology China)" <[email protected]>
build_layer_data_flow builds a input pipeline according to plane_state. and in this initial stage only added this simplest pipeline usage:
Layer -> compiz
The scaler and layer_split will be added in the future.
v2:
- Rebase.
- Introduce struct komeda_data_flow_cfg
- Add a function komeda_component_validate_private to replace the MACRO component_validate_private
--- .../drm/arm/display/komeda/komeda_pipeline.h | 24 ++ .../display/komeda/komeda_pipeline_state.c | 266 +++++++++++++++++- 2 files changed, 289 insertions(+), 1 deletion(-)
drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h +24 -0
@@ -278,6 +278,22 @@ struct komeda_timing_ctrlr_state {struct komeda_component_state base; }; +/* Why define A separated structure but not use plane_state directly ? +* 1. Komeda supports layer_split which means a plane_state can be split and +* handled by two layers, one layer only handle half of plane image. +* 2. Fix up the user properties according to HW's capabilities, like user +* set rotation to R180, but HW only supports REFLECT_X+Y. the rot here is +* after drm_rotation_simplify() +*/ +struct komeda_data_flow_cfg { +struct komeda_component_output input; +u16 in_x, in_y, in_w, in_h; +u32 out_x, out_y, out_w, out_h; +u32 rot; +int blending_zorder; +u8 pixel_blend_mode, layer_alpha; +}; +/** struct komeda_pipeline_funcs */ struct komeda_pipeline_funcs {/* dump_register: Optional, dump registers to seq_file */
@@ -382,4 +398,12 @@ komeda_component_add(struct komeda_pipeline *pipe,void komeda_component_destroy (struct komeda_dev *mdev,struct komeda_component *c); +struct komeda_plane_state ; +struct komeda_crtc_state ; + +int komeda_build_layer_data_flow (struct komeda_layer *layer, +struct komeda_plane_state *kplane_st, +struct komeda_crtc_state *kcrtc_st, +struct komeda_data_flow_cfg *dflow); +#endif /* _KOMEDA_PIPELINE_H_*/
drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c +265 -1
287 lines not on this page · raw message
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 5/5 drm/komeda: Add komeda_plane/plane_helper_funcs
In reply to james qian wang (Arm Technology China)From: "james qian wang (Arm Technology China)" <[email protected]>
Per komeda design KMS-plane maps to komeda layer input pipeline. komeda_plane_atomic_check is for building a komeda layer input pipeline.
And KMS-plane is only a user of komeda resources. so there is no real HW update for plane, but all HW update will be handled in crtc->flush.
v2: Rebase
--- .../gpu/drm/arm/display/komeda/komeda_plane.c | 128 ++++++++++++++++++ 1 file changed, 128 insertions(+)
drivers/gpu/drm/arm/display/komeda/komeda_plane.c +128 -0
@@ -10,7 +10,82 @@#include "komeda_dev.h" #include "komeda_kms.h" +static int +komeda_plane_init_data_flow (struct drm_plane_state *st, +struct komeda_data_flow_cfg *dflow) +{ +struct drm_framebuffer *fb = st->fb; + +memset (dflow,0 ,sizeof (*dflow)); + + dflow->blending_zorder = st->zpos; + +/* if format doesn't have alpha, fix blend mode to PIXEL_NONE */ + dflow->pixel_blend_mode = fb->format->has_alpha ? + st->pixel_blend_mode :DRM_MODE_BLEND_PIXEL_NONE ; + dflow->layer_alpha = st->alpha >>8 ; + + dflow->out_x = st->crtc_x; + dflow->out_y = st->crtc_y; + dflow->out_w = st->crtc_w; + dflow->out_h = st->crtc_h; + + dflow->in_x = st->src_x >>16 ; + dflow->in_y = st->src_y >>16 ; + dflow->in_w = st->src_w >>16 ; + dflow->in_h = st->src_h >>16 ; + +return 0 ; +} + +int komeda_plane_atomic_check (struct drm_plane *plane, +struct drm_plane_state *state) +{ +struct komeda_plane *kplane =to_kplane (plane); +struct komeda_plane_state *kplane_st =to_kplane_st (state); +struct komeda_layer *layer = kplane->layer; +struct drm_crtc_state *crtc_st; +struct komeda_crtc *kcrtc; +struct komeda_crtc_state *kcrtc_st; +struct komeda_data_flow_cfg dflow; +int err; + +if (!state->crtc || !state->fb) +return 0 ; + + crtc_st =drm_atomic_get_crtc_state (state->state, state->crtc); +if (!crtc_st->enable) { +DRM_DEBUG_ATOMIC ("Cannot update plane on a disabled CRTC.\n" ); +return -EINVAL ; + } + +/* crtc is inactive, skip the resource assignment */ +if (!crtc_st->active) +return 0 ; + + kcrtc =to_kcrtc (state->crtc); + kcrtc_st =to_kcrtc_st (crtc_st); + + err =komeda_plane_init_data_flow (state, &dflow); +if (err) +return err; + + err =komeda_build_layer_data_flow (layer, kplane_st, kcrtc_st, &dflow); + +return err; +} + +/* plane doesn't represent a real HW, so there is no HW update for plane. +* komeda handles all the HW update in crtc->atomic_flush +*/ +void komeda_plane_atomic_update (struct drm_plane *plane, +struct drm_plane_state *old_state) +{ +} +static const struct drm_plane_helper_funcs komeda_plane_helper_funcs = { + .atomic_check = komeda_plane_atomic_check, + .atomic_update = komeda_plane_atomic_update, };static void komeda_plane_destroy (struct drm_plane *plane)
@@ -20,7 +95,60 @@ static void komeda_plane_destroy(struct drm_plane *plane)kfree (to_kplane (plane)); } +static void komeda_plane_reset (struct drm_plane *plane) +{ +struct komeda_plane_state *state; +struct komeda_plane *kplane =to_kplane (plane); + +if (plane->state) +__drm_atomic_helper_plane_destroy_state (plane->state); + +kfree (plane->state); + plane->state =NULL ; + + state =kzalloc (sizeof (*state),GFP_KERNEL ); +if (state) { + state->base.rotation =DRM_MODE_ROTATE_0 ; + state->base.pixel_blend_mode =DRM_MODE_BLEND_PREMULTI ; + state->base.alpha =DRM_BLEND_ALPHA_OPAQUE ; + state->base.zpos = kplane->layer->base.id; + plane->state = &state->base; + plane->state->plane = plane; + } +} + +static struct drm_plane_state * +komeda_plane_atomic_duplicate_state (struct drm_plane *plane) +{ +struct komeda_plane_state *new; + +if (WARN_ON (!plane->state)) +return NULL ; + + new =kzalloc (sizeof (*new),GFP_KERNEL ); +if (!new) +return NULL ; + +__drm_atomic_helper_plane_duplicate_state (plane, &new->base); + +return &new->base; +} + +static void +komeda_plane_atomic_destroy_state (struct drm_plane *plane, +struct drm_plane_state *state) +{ +__drm_atomic_helper_plane_destroy_state (state); +kfree (to_kplane_st (state)); +} +static const struct drm_plane_funcs komeda_plane_funcs = { + .update_plane = drm_atomic_helper_update_plane, + .disable_plane = drm_atomic_helper_disable_plane, + .destroy = komeda_plane_destroy, + .reset = komeda_plane_reset, + .atomic_duplicate_state = komeda_plane_atomic_duplicate_state, + .atomic_destroy_state = komeda_plane_atomic_destroy_state, };/* for komeda, which is pipeline can be share between crtcs */
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel