Implement komeda DRM-Crtc
Subsystems (4)
v2 cover Implement komeda DRM-Crtc
This is the 4th patchset for komeda-driver, with this patchset the driver can bring up and enable the D71 support with basic features.
This patchset implemented komeda_crtc/crtc_helper functions for DRM-crtc.
v2: Rebase
james qian wang (Arm Technology China) (11):
drm/komeda: Add komeda_build_display_data_flow drm/komeda: Add komeda_release_unclaimed_resources drm/komeda: Add komeda_crtc_atomic_flush drm/komeda: Add komeda_crtc_mode_valid/fixup drm/komeda: Add komeda_crtc_prepare/unprepare drm/komeda: Add komeda_crtc_atomic_enable/disable drm/komeda: Add komeda_crtc_vblank_enable/disable drm/komeda: Add komeda_crtc_funcs
drm/komeda: Add komeda_kms_check
drm/komeda: Add sysfs attribute: core_id and config_id drm/komeda: Expose bus_width to Komeda-CORE
.../drm/arm/display/include/malidp_product.h | 12 + .../gpu/drm/arm/display/komeda/d71/d71_dev.c | 54 +++ .../gpu/drm/arm/display/komeda/komeda_crtc.c | 385 +++++++++++++++++- .../gpu/drm/arm/display/komeda/komeda_dev.c | 50 +++ .../gpu/drm/arm/display/komeda/komeda_dev.h | 34 ++ .../gpu/drm/arm/display/komeda/komeda_drv.c | 7 + .../gpu/drm/arm/display/komeda/komeda_kms.c | 36 +- .../gpu/drm/arm/display/komeda/komeda_kms.h | 3 + .../drm/arm/display/komeda/komeda_pipeline.h | 14 + .../display/komeda/komeda_pipeline_state.c | 203 ++++++++- 10 files changed, 790 insertions(+), 8 deletions(-)
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 1/11 drm/komeda: Add komeda_build_display_data_flow
From: "james qian wang (Arm Technology China)" <[email protected]>
This function builds a display output pipeline according to crtc_state. And this change only added single pipeline support, the dual pipeline with slave enabled data flow support will be added in the following change.
v2: Rebase
--- .../drm/arm/display/komeda/komeda_pipeline.h | 3 + .../display/komeda/komeda_pipeline_state.c | 76 ++++++++++++++++++- 2 files changed, 78 insertions(+), 1 deletion(-)
drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h +3 -0
@@ -400,10 +400,13 @@ void komeda_component_destroy(struct komeda_dev *mdev,struct komeda_plane_state ;struct komeda_crtc_state ; +struct komeda_crtc ;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); +int komeda_build_display_data_flow (struct komeda_crtc *kcrtc, +struct komeda_crtc_state *kcrtc_st);#endif /* _KOMEDA_PIPELINE_H_*/
drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c +75 -1
91 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v2 2/11 drm/komeda: Add komeda_release_unclaimed_resources
In reply to james qian wang (Arm Technology China)From: "james qian wang (Arm Technology China)" <[email protected]>
Komeda driver treats KMS-CRTC/PLANE as user which will acquire pipeline resources, but we still need to release the unclaimed resources. crtc_atomic_check is the final check stage, so beside build a display data pipeline according the crtc_state, but still needs to release/disable the unclaimed pipeline resources.
v2: Rebase
--- .../gpu/drm/arm/display/komeda/komeda_crtc.c | 27 +++++++++ .../drm/arm/display/komeda/komeda_pipeline.h | 3 + .../display/komeda/komeda_pipeline_state.c | 58 +++++++++++++++++++ 3 files changed, 88 insertions(+)
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +27 -0
@@ -14,6 +14,32 @@#include "komeda_dev.h" #include "komeda_kms.h" +/* crtc_atomic_check is the final check stage, so beside build a display data +* pipeline according the crtc_state, but still needs to release/disable the +* unclaimed pipeline resources. +*/ +static int +komeda_crtc_atomic_check (struct drm_crtc *crtc, +struct drm_crtc_state *state) +{ +struct komeda_crtc *kcrtc =to_kcrtc (crtc); +struct komeda_crtc_state *kcrtc_st =to_kcrtc_st (state); +int err; + +if (state->active) { + err =komeda_build_display_data_flow (kcrtc, kcrtc_st); +if (err) +return err; + } + +/* release unclaimed pipeline resources */ + err =komeda_release_unclaimed_resources (kcrtc->master, kcrtc_st); +if (err) +return err; + +return 0 ; +} +void komeda_crtc_handle_event (struct komeda_crtc *kcrtc,struct komeda_events *evts) {
@@ -33,6 +59,7 @@ void komeda_crtc_handle_event(struct komeda_crtc *kcrtc, }struct drm_crtc_helper_funcs komeda_crtc_helper_funcs = { + .atomic_check = komeda_crtc_atomic_check, };static const struct drm_crtc_funcs komeda_crtc_funcs = {
drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h +3 -0
@@ -409,4 +409,7 @@ int komeda_build_layer_data_flow(struct komeda_layer *layer,int komeda_build_display_data_flow (struct komeda_crtc *kcrtc,struct komeda_crtc_state *kcrtc_st); +int komeda_release_unclaimed_resources (struct komeda_pipeline *pipe, +struct komeda_crtc_state *kcrtc_st); +#endif /* _KOMEDA_PIPELINE_H_*/
drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c +58 -0
67 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/11 drm/komeda: Add komeda_crtc_atomic_flush
In reply to james qian wang (Arm Technology China)From: "james qian wang (Arm Technology China)" <[email protected]>
A komeda flush is comprised two steps:
1. update pipeline/component state to HW.
2. call dev_func->flush to notify HW to kickoff the update.
--- .../gpu/drm/arm/display/komeda/d71/d71_dev.c | 11 ++++++ .../gpu/drm/arm/display/komeda/komeda_crtc.c | 33 +++++++++++++++++ .../gpu/drm/arm/display/komeda/komeda_dev.h | 3 ++ .../drm/arm/display/komeda/komeda_pipeline.h | 5 +++ .../display/komeda/komeda_pipeline_state.c | 37 +++++++++++++++++++ 5 files changed, 89 insertions(+)
drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c +11 -0
@@ -241,6 +241,16 @@ static int d71_disable_irq(struct komeda_dev *mdev)return 0 ; } +static void d71_flush (struct komeda_dev *mdev, +int master_pipe,u32 active_pipes) +{ +struct d71_dev *d71 = mdev->chip_data; +u32 reg_offset = (master_pipe ==0 ) ? +GCU_CONFIG_VALID0 :GCU_CONFIG_VALID1 ; + +malidp_write32 (d71->gcu_addr, reg_offset,GCU_CONFIG_CVAL ); +} +static int d71_reset (struct d71_dev *d71) {u32 __iomem *gcu = d71->gcu_addr;
@@ -457,6 +467,7 @@ static struct komeda_dev_funcs d71_chip_funcs = { .irq_handler = d71_irq_handler, .enable_irq = d71_enable_irq, .disable_irq = d71_disable_irq, + .flush = d71_flush, }; struct komeda_dev_funcs *
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +33 -0
@@ -58,8 +58,41 @@ void komeda_crtc_handle_event(struct komeda_crtc *kcrtc,DRM_DEBUG ("FLIP Done.\n" ); } +static void +komeda_crtc_do_flush (struct drm_crtc *crtc, +struct drm_crtc_state *old) +{ +struct komeda_crtc *kcrtc =to_kcrtc (crtc); +struct komeda_crtc_state *kcrtc_st =to_kcrtc_st (crtc->state); +struct komeda_dev *mdev = kcrtc->base.dev->dev_private; +struct komeda_pipeline *master = kcrtc->master; + +DRM_DEBUG_ATOMIC ("CRTC%d_FLUSH: active_pipes: 0x%x, affected: 0x%x.\n" , +drm_crtc_index (crtc), + kcrtc_st->active_pipes, kcrtc_st->affected_pipes); + +/* step 1: update the pipeline/component state to HW */ +if (has_bit (master->id, kcrtc_st->affected_pipes)) +komeda_pipeline_update (master, old->state); + +/* step 2: notify the HW to kickoff the update */ + mdev->funcs->flush (mdev, master->id, kcrtc_st->active_pipes); +} + +static void +komeda_crtc_atomic_flush (struct drm_crtc *crtc, +struct drm_crtc_state *old) +{ +/* commit with modeset will be handled in enable/disable */ +if (drm_atomic_crtc_needs_modeset (crtc->state)) +return ; + +komeda_crtc_do_flush (crtc, old); +} +struct drm_crtc_helper_funcs komeda_crtc_helper_funcs = { .atomic_check = komeda_crtc_atomic_check, + .atomic_flush = komeda_crtc_atomic_flush, };static const struct drm_crtc_funcs komeda_crtc_funcs = {
drivers/gpu/drm/arm/display/komeda/komeda_dev.h +3 -0
@@ -106,6 +106,9 @@ struct komeda_dev_funcs {/** @dump_register: Optional, dump registers to seq_file */ void (*dump_register)(struct komeda_dev *mdev,struct seq_file *seq); +/** @flush: Notify the HW to flush or kickoff the update */ +void (*flush)(struct komeda_dev *mdev, +int master_pipe,u32 active_pipes); };/**
drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h +5 -0
@@ -412,4 +412,9 @@ int komeda_build_display_data_flow(struct komeda_crtc *kcrtc,int komeda_release_unclaimed_resources (struct komeda_pipeline *pipe,struct komeda_crtc_state *kcrtc_st); +void komeda_pipeline_disable (struct komeda_pipeline *pipe, +struct drm_atomic_state *old_state); +void komeda_pipeline_update (struct komeda_pipeline *pipe, +struct drm_atomic_state *old_state); +#endif /* _KOMEDA_PIPELINE_H_*/
drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c +37 -0
@@ -31,6 +31,18 @@ komeda_pipeline_get_state(struct komeda_pipeline *pipe,return priv_to_pipe_st (priv_st); } +struct komeda_pipeline_state * +komeda_pipeline_get_old_state (struct komeda_pipeline *pipe, +struct drm_atomic_state *state) +{ +struct drm_private_state *priv_st; + + priv_st =drm_atomic_get_old_private_obj_state (state, &pipe->obj); +if (priv_st) +return priv_to_pipe_st (priv_st); +return NULL ; +} +struct komeda_pipeline_state *komeda_pipeline_get_new_state (struct komeda_pipeline *pipe,struct drm_atomic_state *state)
@@ -536,3 +548,28 @@ int komeda_release_unclaimed_resources(struct komeda_pipeline *pipe,return 0 ; } + +void komeda_pipeline_update (struct komeda_pipeline *pipe, +struct drm_atomic_state *old_state) +{ +struct komeda_pipeline_state *new =priv_to_pipe_st (pipe->obj.state); +struct komeda_pipeline_state *old; +struct komeda_component *c; +u32 id, changed_comps =0 ; + + old =komeda_pipeline_get_old_state (pipe, old_state); + + changed_comps = new->active_comps | old->active_comps; + +DRM_DEBUG_ATOMIC ("PIPE%d: active_comps: 0x%x, changed: 0x%x.\n" , + pipe->id, new->active_comps, changed_comps); + +dp_for_each_set_bit (id, changed_comps) { + c =komeda_pipeline_get_component (pipe, id); + +if (new->active_comps &BIT (c->id)) + c->funcs->update (c,priv_to_comp_st (c->obj.state)); +else + c->funcs->disable (c); + } +}
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 4/11 drm/komeda: Add komeda_crtc_mode_valid/fixup
In reply to james qian wang (Arm Technology China)From: "james qian wang (Arm Technology China)" <[email protected]>
komeda_crtc_mode_valid compares the input mode->clk with main engine clk and AXI clk, and reject the mode if the required pixel clk can not be satisfied by main engine clk and AXI-clk.
--- .../gpu/drm/arm/display/komeda/komeda_crtc.c | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+)
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +52 -0
@@ -90,9 +90,61 @@ komeda_crtc_atomic_flush(struct drm_crtc *crtc,komeda_crtc_do_flush (crtc, old); } +static enum drm_mode_status +komeda_crtc_mode_valid (struct drm_crtc *crtc,const struct drm_display_mode *m) +{ +struct komeda_dev *mdev = crtc->dev->dev_private; +struct komeda_crtc *kcrtc =to_kcrtc (crtc); +struct komeda_pipeline *master = kcrtc->master; +long mode_clk, pxlclk; + +if (m->flags &DRM_MODE_FLAG_INTERLACE ) +return MODE_NO_INTERLACE ; + +/* main clock/AXI clk must be faster than pxlclk*/ + mode_clk = m->clock *1000 ; + pxlclk =clk_round_rate (master->pxlclk, mode_clk); +if (pxlclk != mode_clk) { +DRM_DEBUG_ATOMIC ("pxlclk doesn't support %ld Hz\n" , mode_clk); + +return MODE_NOCLOCK ; + } + +if (clk_round_rate (mdev->mclk, mode_clk) < pxlclk) { +DRM_DEBUG_ATOMIC ("mclk can't satisfy the requirement of %s-clk: %ld.\n" , + m->name, pxlclk); + +return MODE_CLOCK_HIGH ; + } + +if (clk_round_rate (master->aclk, mode_clk) < pxlclk) { +DRM_DEBUG_ATOMIC ("aclk can't satisfy the requirement of %s-clk: %ld.\n" , + m->name, pxlclk); + +return MODE_CLOCK_HIGH ; + } + +return MODE_OK ; +} + +static bool komeda_crtc_mode_fixup (struct drm_crtc *crtc, +const struct drm_display_mode *m, +struct drm_display_mode *adjusted_mode) +{ +struct komeda_crtc *kcrtc =to_kcrtc (crtc); +struct komeda_pipeline *master = kcrtc->master; +long mode_clk = m->clock *1000 ; + + adjusted_mode->clock =clk_round_rate (master->pxlclk, mode_clk) /1000 ; + +return true; +} +struct drm_crtc_helper_funcs komeda_crtc_helper_funcs = { .atomic_check = komeda_crtc_atomic_check, .atomic_flush = komeda_crtc_atomic_flush, + .mode_valid = komeda_crtc_mode_valid, + .mode_fixup = komeda_crtc_mode_fixup, };static const struct drm_crtc_funcs komeda_crtc_funcs = {
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 5/11 drm/komeda: Add komeda_crtc_prepare/unprepare
In reply to james qian wang (Arm Technology China)From: "james qian wang (Arm Technology China)" <[email protected]>
These two function will be used by komeda_crtc_enable/disable to do some prepartion works when enable/disable a crtc. like enable a crtc:
1. Adjust display operation mode.
2. Enable/prepare needed clk.
v2: Rebase
--- .../gpu/drm/arm/display/komeda/d71/d71_dev.c | 32 ++++++ .../gpu/drm/arm/display/komeda/komeda_crtc.c | 104 ++++++++++++++++++ .../gpu/drm/arm/display/komeda/komeda_dev.c | 2 + .../gpu/drm/arm/display/komeda/komeda_dev.h | 26 +++++ 4 files changed, 164 insertions(+)
drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c +32 -0
@@ -241,6 +241,37 @@ static int d71_disable_irq(struct komeda_dev *mdev)return 0 ; } +static int to_d71_opmode (int core_mode) +{ +switch (core_mode) { +case KOMEDA_MODE_DISP0 : +return DO0_ACTIVE_MODE ; +case KOMEDA_MODE_DISP1 : +return DO1_ACTIVE_MODE ; +case KOMEDA_MODE_DUAL_DISP : +return DO01_ACTIVE_MODE ; +case KOMEDA_MODE_INACTIVE : +return INACTIVE_MODE ; +default : +WARN (1 ,"Unknown operation mode" ); +return INACTIVE_MODE ; + } +} + +static int d71_change_opmode (struct komeda_dev *mdev,int new_mode) +{ +struct d71_dev *d71 = mdev->chip_data; +u32 opmode =to_d71_opmode (new_mode); +int ret; + +malidp_write32_mask (d71->gcu_addr,BLK_CONTROL ,0x7 , opmode); + + ret =dp_wait_cond (((malidp_read32 (d71->gcu_addr,BLK_CONTROL ) &0x7 ) == opmode), +100 ,1000 ,10000 ); + +return ret >0 ?0 : -ETIMEDOUT ; +} +static void d71_flush (struct komeda_dev *mdev,int master_pipe,u32 active_pipes) {
@@ -467,6 +498,7 @@ static struct komeda_dev_funcs d71_chip_funcs = { .irq_handler = d71_irq_handler, .enable_irq = d71_enable_irq, .disable_irq = d71_disable_irq, + .change_opmode = d71_change_opmode, .flush = d71_flush, };
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +104 -0
110 lines not on this page · raw message
drivers/gpu/drm/arm/display/komeda/komeda_dev.c +2 -0
@@ -145,6 +145,8 @@ struct komeda_dev *komeda_dev_create(struct device *dev)if (!mdev)return ERR_PTR (-ENOMEM ); +mutex_init (&mdev->lock); + mdev->dev = dev; mdev->reg_base =devm_ioremap_resource (dev, io_res);if (IS_ERR (mdev->reg_base)) {
drivers/gpu/drm/arm/display/komeda/komeda_dev.h +26 -0
@@ -106,11 +106,34 @@ struct komeda_dev_funcs {/** @dump_register: Optional, dump registers to seq_file */ void (*dump_register)(struct komeda_dev *mdev,struct seq_file *seq); +/** +* @change_opmode: +* +* Notify HW to switch to a new display operation mode. +*/ +int (*change_opmode)(struct komeda_dev *mdev,int new_mode);/** @flush: Notify the HW to flush or kickoff the update */ void (*flush)(struct komeda_dev *mdev,int master_pipe,u32 active_pipes); }; +/** +* DISPLAY_MODE describes how many display been enabled, and which will be +* passed to CHIP by &komeda_dev_funcs->change_opmode(), then CHIP can do the +* pipeline resources assignment according to this usage hint. +* - KOMEDA_MODE_DISP0: Only one display enabled, pipeline-0 work as master. +* - KOMEDA_MODE_DISP1: Only one display enabled, pipeline-0 work as master. +* - KOMEDA_MODE_DUAL_DISP: Dual display mode, both display has been enabled. +* And D71 supports assign two pipelines to one single display on mode +* KOMEDA_MODE_DISP0/DISP1 +*/ +enum { +KOMEDA_MODE_INACTIVE =0 , +KOMEDA_MODE_DISP0 =BIT (0 ), +KOMEDA_MODE_DISP1 =BIT (1 ), +KOMEDA_MODE_DUAL_DISP =KOMEDA_MODE_DISP0 |KOMEDA_MODE_DISP1 , +}; +/** * struct komeda_dev *
@@ -133,6 +156,9 @@ struct komeda_dev {/** @irq: irq number */ int irq; +struct mutex lock;/* used to protect dpmode */ +u32 dpmode;/* current display mode */ +int n_pipelines;struct komeda_pipeline *pipelines[KOMEDA_MAX_PIPELINES ];
Signature · 1 line
2.17.1
PATCH v2 6/11 drm/komeda: Add komeda_crtc_atomic_enable/disable
In reply to james qian wang (Arm Technology China)From: "james qian wang (Arm Technology China)" <[email protected]>
Pass enable/disable command to komeda and adjust komeda hardware for enable/disable a display instance.
v2: Rebase
--- .../gpu/drm/arm/display/komeda/komeda_crtc.c | 106 +++++++++++++++++- .../gpu/drm/arm/display/komeda/komeda_kms.h | 3 + .../drm/arm/display/komeda/komeda_pipeline.h | 3 + .../display/komeda/komeda_pipeline_state.c | 32 ++++++ 4 files changed, 139 insertions(+), 5 deletions(-)
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +101 -5
@@ -51,7 +51,7 @@ u32 komeda_calc_mclk(struct komeda_crtc_state *kcrtc_st)* 1. adjust display operation mode. * 2. enable needed clk */ -int +static int komeda_crtc_prepare (struct komeda_crtc *kcrtc) {struct komeda_dev *mdev = kcrtc->base.dev->dev_private;
@@ -107,7 +107,7 @@ komeda_crtc_prepare(struct komeda_crtc *kcrtc)return err; } -int +static int komeda_crtc_unprepare (struct komeda_crtc *kcrtc) {struct komeda_dev *mdev = kcrtc->base.dev->dev_private;
@@ -157,9 +157,28 @@ void komeda_crtc_handle_event(struct komeda_crtc *kcrtc,if (events &KOMEDA_EVENT_EOW )DRM_DEBUG ("EOW.\n" ); -/* will handle it with crtc->flush */ -if (events &KOMEDA_EVENT_FLIP ) -DRM_DEBUG ("FLIP Done.\n" ); +if (events &KOMEDA_EVENT_FLIP ) { +unsigned long flags; +struct drm_pending_vblank_event *event; + +spin_lock_irqsave (&crtc->dev->event_lock, flags); +if (kcrtc->disable_done) { +complete_all (kcrtc->disable_done); + kcrtc->disable_done =NULL ; + }else if (crtc->state->event) { + event = crtc->state->event; +/* +* Consume event before notifying drm core that flip +* happened. +*/ + crtc->state->event =NULL ; +drm_crtc_send_vblank_event (crtc, event); + }else { +DRM_WARN ("CRTC[%d]: FLIP happen but no pending commit.\n" , +drm_crtc_index (&kcrtc->base)); + } +spin_unlock_irqrestore (&crtc->dev->event_lock, flags); + } } static void
@@ -183,6 +202,81 @@ komeda_crtc_do_flush(struct drm_crtc *crtc, mdev->funcs->flush (mdev, master->id, kcrtc_st->active_pipes); } +static void +komeda_crtc_atomic_enable (struct drm_crtc *crtc, +struct drm_crtc_state *old) +{ +komeda_crtc_prepare (to_kcrtc (crtc)); +drm_crtc_vblank_on (crtc); +komeda_crtc_do_flush (crtc, old); +} + +static void +komeda_crtc_atomic_disable (struct drm_crtc *crtc, +struct drm_crtc_state *old) +{ +struct komeda_crtc *kcrtc =to_kcrtc (crtc); +struct komeda_crtc_state *old_st =to_kcrtc_st (old); +struct komeda_dev *mdev = crtc->dev->dev_private; +struct komeda_pipeline *master = kcrtc->master; +struct completion *disable_done = &crtc->state->commit->flip_done; +struct completion temp; +int timeout; + +DRM_DEBUG_ATOMIC ("CRTC%d_DISABLE: active_pipes: 0x%x, affected: 0x%x.\n" , +drm_crtc_index (crtc), + old_st->active_pipes, old_st->affected_pipes); + +if (has_bit (master->id, old_st->active_pipes)) +komeda_pipeline_disable (master, old->state); + +/* crtc_disable has two scenarios according to the state->active switch. +* 1. active -> inactive +* this commit is a disable commit. and the commit will be finished +* or done after the disable operation. on this case we can directly +* use the crtc->state->event to tracking the HW disable operation. +* 2. active -> active +* the crtc->commit is not for disable, but a modeset operation when +* crtc is active, such commit actually has been completed by 3 +* DRM operations: +* crtc_disable, update_planes(crtc_flush), crtc_enable +* so on this case the crtc->commit is for the whole process. +* we can not use it for tracing the disable, we need a temporary +* flip_done for tracing the disable. and crtc->state->event for +* the crtc_enable operation. +* That's also the reason why skip modeset commit in +* komeda_crtc_atomic_flush() +*/ +if (crtc->state->active) { +struct komeda_pipeline_state *pipe_st; +/* clear the old active_comps to zero */ + pipe_st =komeda_pipeline_get_old_state (master, old->state); + pipe_st->active_comps =0 ; + +init_completion (&temp); + kcrtc->disable_done = &temp; + disable_done = &temp; + } + + mdev->funcs->flush (mdev, master->id,0 ); + +/* wait the disable take affect.*/ + timeout =wait_for_completion_timeout (disable_done,HZ ); +if (timeout ==0 ) { +DRM_ERROR ("disable pipeline%d timeout.\n" , kcrtc->master->id); +if (crtc->state->active) { +unsigned long flags; + +spin_lock_irqsave (&crtc->dev->event_lock, flags); + kcrtc->disable_done =NULL ; +spin_unlock_irqrestore (&crtc->dev->event_lock, flags); + } + } + +drm_crtc_vblank_off (crtc); +komeda_crtc_unprepare (kcrtc); +} +static void komeda_crtc_atomic_flush (struct drm_crtc *crtc,struct drm_crtc_state *old)
@@ -247,6 +341,8 @@ static bool komeda_crtc_mode_fixup(struct drm_crtc *crtc,struct drm_crtc_helper_funcs komeda_crtc_helper_funcs = { .atomic_check = komeda_crtc_atomic_check, .atomic_flush = komeda_crtc_atomic_flush, + .atomic_enable = komeda_crtc_atomic_enable, + .atomic_disable = komeda_crtc_atomic_disable, .mode_valid = komeda_crtc_mode_valid, .mode_fixup = komeda_crtc_mode_fixup, };
drivers/gpu/drm/arm/display/komeda/komeda_kms.h +3 -0
@@ -69,6 +69,9 @@ struct komeda_crtc {* merge into the master. */ struct komeda_pipeline *slave; + +/* this flip_done is for tracing the disable */ +struct completion *disable_done; };/** struct komeda_crtc_state */
drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h +3 -0
@@ -412,6 +412,9 @@ int komeda_build_display_data_flow(struct komeda_crtc *kcrtc,int komeda_release_unclaimed_resources (struct komeda_pipeline *pipe,struct komeda_crtc_state *kcrtc_st); +struct komeda_pipeline_state * +komeda_pipeline_get_old_state (struct komeda_pipeline *pipe, +struct drm_atomic_state *state);void komeda_pipeline_disable (struct komeda_pipeline *pipe,struct drm_atomic_state *old_state); void komeda_pipeline_update(struct komeda_pipeline *pipe,
drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c +32 -0
@@ -549,6 +549,38 @@ int komeda_release_unclaimed_resources(struct komeda_pipeline *pipe,return 0 ; } +void komeda_pipeline_disable (struct komeda_pipeline *pipe, +struct drm_atomic_state *old_state) +{ +struct komeda_pipeline_state *old; +struct komeda_component *c; +struct komeda_component_state *c_st; +u32 id, disabling_comps =0 ; + + old =komeda_pipeline_get_old_state (pipe, old_state); + + disabling_comps = old->active_comps; +DRM_DEBUG_ATOMIC ("PIPE%d: disabling_comps: 0x%x.\n" , + pipe->id, disabling_comps); + +dp_for_each_set_bit (id, disabling_comps) { + c =komeda_pipeline_get_component (pipe, id); + c_st =priv_to_comp_st (c->obj.state); + +/* +* If we disabled a component then all active_inputs should be +* put in the list of changed_active_inputs, so they get +* re-enabled. +* This usually happens during a modeset when the pipeline is +* first disabled and then the actual state gets committed +* again. +*/ + c_st->changed_active_inputs |= c_st->active_inputs; + + c->funcs->disable (c); + } +} +void komeda_pipeline_update (struct komeda_pipeline *pipe,struct drm_atomic_state *old_state) {
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 7/11 drm/komeda: Add komeda_crtc_vblank_enable/disable
In reply to james qian wang (Arm Technology China)From: "james qian wang (Arm Technology China)" <[email protected]>
Add a new komeda_dev_func->on_off_vblank to enable/disable HW vblank event
--- .../gpu/drm/arm/display/komeda/d71/d71_dev.c | 10 ++++++++++ .../gpu/drm/arm/display/komeda/komeda_crtc.c | 19 +++++++++++++++++++ .../gpu/drm/arm/display/komeda/komeda_dev.h | 3 +++ 3 files changed, 32 insertions(+)
drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c +10 -0
@@ -241,6 +241,15 @@ static int d71_disable_irq(struct komeda_dev *mdev)return 0 ; } +static void d71_on_off_vblank (struct komeda_dev *mdev,int master_pipe,bool on) +{ +struct d71_dev *d71 = mdev->chip_data; +struct d71_pipeline *pipe = d71->pipes[master_pipe]; + +malidp_write32_mask (pipe->dou_addr,BLK_IRQ_MASK , +DOU_IRQ_PL0 , on ?DOU_IRQ_PL0 :0 ); +} +static int to_d71_opmode (int core_mode) {switch (core_mode) {
@@ -498,6 +507,7 @@ static struct komeda_dev_funcs d71_chip_funcs = { .irq_handler = d71_irq_handler, .enable_irq = d71_enable_irq, .disable_irq = d71_disable_irq, + .on_off_vblank = d71_on_off_vblank, .change_opmode = d71_change_opmode, .flush = d71_flush, };
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +19 -0
@@ -347,7 +347,26 @@ struct drm_crtc_helper_funcs komeda_crtc_helper_funcs = { .mode_fixup = komeda_crtc_mode_fixup, }; +static int komeda_crtc_vblank_enable (struct drm_crtc *crtc) +{ +struct komeda_dev *mdev = crtc->dev->dev_private; +struct komeda_crtc *kcrtc =to_kcrtc (crtc); + + mdev->funcs->on_off_vblank (mdev, kcrtc->master->id, true); +return 0 ; +} + +static void komeda_crtc_vblank_disable (struct drm_crtc *crtc) +{ +struct komeda_dev *mdev = crtc->dev->dev_private; +struct komeda_crtc *kcrtc =to_kcrtc (crtc); + + mdev->funcs->on_off_vblank (mdev, kcrtc->master->id, false); +} +static const struct drm_crtc_funcs komeda_crtc_funcs = { + .enable_vblank = komeda_crtc_vblank_enable, + .disable_vblank = komeda_crtc_vblank_disable, }; int komeda_kms_setup_crtcs(struct komeda_kms_dev *kms,
drivers/gpu/drm/arm/display/komeda/komeda_dev.h +3 -0
@@ -103,6 +103,9 @@ struct komeda_dev_funcs {int (*enable_irq)(struct komeda_dev *mdev);/** @disable_irq: disable irq */ int (*disable_irq)(struct komeda_dev *mdev); +/** @on_off_vblank: notify HW to on/off vblank */ +void (*on_off_vblank)(struct komeda_dev *mdev, +int master_pipe,bool on);/** @dump_register: Optional, dump registers to seq_file */ void (*dump_register)(struct komeda_dev *mdev,struct seq_file *seq);
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 8/11 drm/komeda: Add komeda_crtc_funcs
In reply to james qian wang (Arm Technology China)From: "james qian wang (Arm Technology China)" <[email protected]>
Added functions:
- komeda_crtc_reset - komeda_crtc_vblank_enable - komeda_crtc_vblank_disable
--- .../gpu/drm/arm/display/komeda/komeda_crtc.c | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+)
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +48 -0
@@ -347,6 +347,47 @@ struct drm_crtc_helper_funcs komeda_crtc_helper_funcs = { .mode_fixup = komeda_crtc_mode_fixup, }; +static void komeda_crtc_reset (struct drm_crtc *crtc) +{ +struct komeda_crtc_state *state; + +if (crtc->state) +__drm_atomic_helper_crtc_destroy_state (crtc->state); + +kfree (to_kcrtc_st (crtc->state)); + crtc->state =NULL ; + + state =kzalloc (sizeof (*state),GFP_KERNEL ); +if (state) { + crtc->state = &state->base; + crtc->state->crtc = crtc; + } +} + +static struct drm_crtc_state * +komeda_crtc_atomic_duplicate_state (struct drm_crtc *crtc) +{ +struct komeda_crtc_state *old =to_kcrtc_st (crtc->state); +struct komeda_crtc_state *new; + + new =kzalloc (sizeof (*new),GFP_KERNEL ); +if (!new) +return NULL ; + +__drm_atomic_helper_crtc_duplicate_state (crtc, &new->base); + + new->affected_pipes = old->active_pipes; + +return &new->base; +} + +static void komeda_crtc_atomic_destroy_state (struct drm_crtc *crtc, +struct drm_crtc_state *state) +{ +__drm_atomic_helper_crtc_destroy_state (state); +kfree (to_kcrtc_st (state)); +} +static int komeda_crtc_vblank_enable (struct drm_crtc *crtc) {struct komeda_dev *mdev = crtc->dev->dev_private;
@@ -365,6 +406,13 @@ static void komeda_crtc_vblank_disable(struct drm_crtc *crtc) }static const struct drm_crtc_funcs komeda_crtc_funcs = { + .gamma_set = drm_atomic_helper_legacy_gamma_set, + .destroy = drm_crtc_cleanup, + .set_config = drm_atomic_helper_set_config, + .page_flip = drm_atomic_helper_page_flip, + .reset = komeda_crtc_reset, + .atomic_duplicate_state = komeda_crtc_atomic_duplicate_state, + .atomic_destroy_state = komeda_crtc_atomic_destroy_state, .enable_vblank = komeda_crtc_vblank_enable, .disable_vblank = komeda_crtc_vblank_disable, };
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 9/11 drm/komeda: Add komeda_kms_check
In reply to james qian wang (Arm Technology China)From: "james qian wang (Arm Technology China)" <[email protected]>
Implement komeda_kms_check to add all affected_planes (even unchanged) to drm_atomic_state. since komeda need to re-calculate the resources assumption in every commit.
v2: Rebase
--- .../gpu/drm/arm/display/komeda/komeda_kms.c | 30 ++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-)
drivers/gpu/drm/arm/display/komeda/komeda_kms.c +29 -1
@@ -95,9 +95,37 @@ static const struct drm_mode_config_helper_funcs komeda_mode_config_helpers = { .atomic_commit_tail = komeda_kms_commit_tail, }; +static int komeda_kms_check (struct drm_device *dev, +struct drm_atomic_state *state) +{ +struct drm_crtc *crtc; +struct drm_crtc_state *old_crtc_st, *new_crtc_st; +int i, err; + + err =drm_atomic_helper_check_modeset (dev, state); +if (err) +return err; + +/* komeda need to re-calculate resource assumption in every commit +* so need to add all affected_planes (even unchanged) to +* drm_atomic_state. +*/ +for_each_oldnew_crtc_in_state (state, crtc, old_crtc_st, new_crtc_st, i) { + err =drm_atomic_add_affected_planes (state, crtc); +if (err) +return err; + } + + err =drm_atomic_helper_check_planes (dev, state); +if (err) +return err; + +return 0 ; +} +static const struct drm_mode_config_funcs komeda_mode_config_funcs = { .fb_create = komeda_fb_create, - .atomic_check = drm_atomic_helper_check, + .atomic_check = komeda_kms_check, .atomic_commit = drm_atomic_helper_commit, };
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 10/11 drm/komeda: Add sysfs attribute: core_id and config_id
In reply to james qian wang (Arm Technology China)From: "james qian wang (Arm Technology China)" <[email protected]>
Add two sysfs node: core_id, config_id, user can read them to fetch the HW product information.
v2: Rebase
--- .../drm/arm/display/include/malidp_product.h | 12 +++++ .../gpu/drm/arm/display/komeda/komeda_dev.c | 48 +++++++++++++++++++ .../gpu/drm/arm/display/komeda/komeda_dev.h | 2 + .../gpu/drm/arm/display/komeda/komeda_drv.c | 7 +++ 4 files changed, 69 insertions(+)
drivers/gpu/drm/arm/display/include/malidp_product.h +12 -0
@@ -20,4 +20,16 @@/* Mali-display product IDs */ #define MALIDP_D71_PRODUCT_ID 0x0071 +union komeda_config_id { +struct { +__u32 max_line_sz:16 , + n_pipelines:2 , + n_scalers:2 ,/* number of scalers per pipeline */ + n_layers:3 ,/* number of layers per pipeline */ + n_richs:3 ,/* number of rich layers per pipeline */ + reserved_bits:6 ; + }; +__u32 value; +}; +#endif /* _MALIDP_PRODUCT_H_ */
drivers/gpu/drm/arm/display/komeda/komeda_dev.c +48 -0
66 lines not on this page · raw message
drivers/gpu/drm/arm/display/komeda/komeda_dev.h +2 -0
@@ -190,4 +190,6 @@ d71_identify(u32 __iomem *reg, struct komeda_chip_info *chip);struct komeda_dev *komeda_dev_create (struct device *dev);void komeda_dev_destroy (struct komeda_dev *mdev); +struct komeda_dev *dev_to_mdev (struct device *dev); +#endif /*_KOMEDA_DEV_H_*/
drivers/gpu/drm/arm/display/komeda/komeda_drv.c +7 -0
@@ -17,6 +17,13 @@ struct komeda_drv {struct komeda_kms_dev *kms; }; +struct komeda_dev *dev_to_mdev (struct device *dev) +{ +struct komeda_drv *mdrv =dev_get_drvdata (dev); + +return mdrv ? mdrv->mdev :NULL ; +} +static void komeda_unbind (struct device *dev) {struct komeda_drv *mdrv =dev_get_drvdata (dev);
Signature · 1 line
2.17.1
PATCH v2 11/11 drm/komeda: Expose bus_width to Komeda-CORE
In reply to james qian wang (Arm Technology China)From: "james qian wang (Arm Technology China)" <[email protected]>
CHIP set bus_width according to the HW configuration, and CORE will use it as buffer alignment.
v2: Rebase
--- drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c | 1 + drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c +1 -0
@@ -518,6 +518,7 @@ d71_identify(u32 __iomem *reg_base, struct komeda_chip_info *chip) chip->arch_id =malidp_read32 (reg_base,GLB_ARCH_ID ); chip->core_id =malidp_read32 (reg_base,GLB_CORE_ID ); chip->core_info =malidp_read32 (reg_base,GLB_CORE_INFO ); + chip->bus_width =D71_BUS_WIDTH_16_BYTES ;return &d71_chip_funcs; }
drivers/gpu/drm/arm/display/komeda/komeda_kms.c +3 -3
@@ -21,10 +21,10 @@ static int komeda_gem_cma_dumb_create(struct drm_file *file,struct drm_device *dev, struct drm_mode_create_dumb *args) { - u32 alignment = 16; /* TODO get alignment from dev */ + struct komeda_dev *mdev = dev->dev_private; +u32 pitch =DIV_ROUND_UP (args->width * args->bpp,8 ); - args->pitch =ALIGN (DIV_ROUND_UP (args->width * args->bpp,8 ), - alignment); + args->pitch =ALIGN (pitch, mdev->chip.bus_width);return drm_gem_cma_dumb_create_internal (file, dev, args); }
Signature · 1 line
2.17.1