drm/komeda: Add writeback support
Subsystems (4)
PATCH v2 1/1 drm/komeda: Add writeback support
From: "james qian wang (Arm Technology China)" <[email protected]>
Komeda driver uses a individual component to describe the HW's writeback caps, but drivers doesn't define a new structure and still uses the existing "struct komeda_layer" to describe this new component. The detailed changes as follow:
1. Initialize wb_layer according to HW and report it to CORE.
2. CORE exposes wb_layer as a resource to KMS by private_obj.
3. Report writeback supporting by add a wb_connector to KMS, and then wb_connector will take act as a component resources user, so the func komeda_wb_encoder_atomic_check claims komeda resources (scaler and wb_layer) accroding to its state configuration to the wb_connector. and the wb_state configuration will be validated on the specific component resources to see if the caps of component can meet the requirement of wb_connector. if not check failed.
4. Update irq_handler to notify the completion of writeback.
NOTE:
This change doesn't add scaling writeback support, that support will be added in the future after the scaler support.
v2: Rebase
--- drivers/gpu/drm/arm/display/komeda/Makefile | 1 + .../arm/display/komeda/d71/d71_component.c | 90 ++++++++- .../gpu/drm/arm/display/komeda/komeda_crtc.c | 15 ++ .../arm/display/komeda/komeda_framebuffer.c | 19 ++ .../gpu/drm/arm/display/komeda/komeda_kms.c | 4 + .../gpu/drm/arm/display/komeda/komeda_kms.h | 27 +++ .../drm/arm/display/komeda/komeda_pipeline.h | 7 + .../display/komeda/komeda_pipeline_state.c | 51 ++++- .../arm/display/komeda/komeda_private_obj.c | 6 + .../arm/display/komeda/komeda_wb_connector.c | 181 ++++++++++++++++++ 10 files changed, 398 insertions(+), 3 deletions(-) create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c
drivers/gpu/drm/arm/display/komeda/Makefile +1 -0
@@ -14,6 +14,7 @@ komeda-y := \ komeda_kms.o \ komeda_crtc.o \ komeda_plane.o \ + komeda_wb_connector.o \ komeda_private_obj.o komeda-y += \
drivers/gpu/drm/arm/display/komeda/d71/d71_component.c +89 -1
99 lines not on this page · raw message
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +15 -0
@@ -165,6 +165,15 @@ void komeda_crtc_handle_event(struct komeda_crtc *kcrtc,if (events &KOMEDA_EVENT_VSYNC )drm_crtc_handle_vblank (crtc); +if (events &KOMEDA_EVENT_EOW ) { +struct komeda_wb_connector *wb_conn = kcrtc->wb_conn; + +if (wb_conn) +drm_writeback_signal_completion (&wb_conn->base,0 ); +else +DRM_WARN ("CRTC[%d]: EOW happen but no wb_connector.\n" , +drm_crtc_index (&kcrtc->base)); + }/* will handle it together with the write back support */ if (events &KOMEDA_EVENT_EOW )DRM_DEBUG ("EOW.\n" );
@@ -201,6 +210,8 @@ komeda_crtc_do_flush(struct drm_crtc *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; +struct komeda_wb_connector *wb_conn = kcrtc->wb_conn; +struct drm_connector_state *conn_st; DRM_DEBUG_ATOMIC("CRTC%d_FLUSH: active_pipes: 0x%x, affected: 0x%x.\n", drm_crtc_index(crtc),
@@ -210,6 +221,10 @@ komeda_crtc_do_flush(struct drm_crtc *crtc,if (has_bit (master->id, kcrtc_st->affected_pipes))komeda_pipeline_update (master, old->state); + conn_st = wb_conn ? wb_conn->base.base.state :NULL ; +if (conn_st && conn_st->writeback_job) +drm_writeback_queue_job (&wb_conn->base, conn_st); +/* step 2: notify the HW to kickoff the update */ mdev->funcs->flush (mdev, master->id, kcrtc_st->active_pipes); }
drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c +19 -0
@@ -165,3 +165,22 @@ komeda_fb_get_pixel_addr(struct komeda_fb *kfb, int x, int y, int plane)return obj->paddr + offset; } + +/* if the fb can be supported by a specific layer */ +bool komeda_fb_is_layer_supported (struct komeda_fb *kfb,u32 layer_type) +{ +struct drm_framebuffer *fb = &kfb->base; +struct komeda_dev *mdev = fb->dev->dev_private; +const struct komeda_format_caps *caps; +u32 fourcc = fb->format->format; +u64 modifier = fb->modifier; + + caps =komeda_get_format_caps (&mdev->fmt_tbl, fourcc, modifier); +if (!caps) +return false; + +if (!(caps->supported_layer_types & layer_type)) +return false; + +return true; +}
drivers/gpu/drm/arm/display/komeda/komeda_kms.c +4 -0
@@ -188,6 +188,10 @@ struct komeda_kms_dev *komeda_kms_attach(struct komeda_dev *mdev)if (err) goto cleanup_mode_config; + err =komeda_kms_add_wb_connectors (kms, mdev); +if (err) + goto cleanup_mode_config; + err =component_bind_all (mdev->dev, kms);if (err) goto cleanup_mode_config;
drivers/gpu/drm/arm/display/komeda/komeda_kms.h +27 -0
@@ -12,6 +12,7 @@#include <drm/drm_crtc_helper.h> #include <drm/drm_device.h> #include <drm/drm_writeback.h> +#include <drm/drm_print.h> #include <video/videomode.h> #include <video/display_timing.h>
@@ -73,6 +74,9 @@ struct komeda_crtc {*/ struct komeda_pipeline *slave; +/** @wb_conn: komeda write back connector */ +struct komeda_wb_connector *wb_conn; +/** @disable_done: this flip_done is for tracing the disable */ struct completion *disable_done; };
@@ -116,6 +120,27 @@ struct komeda_kms_dev {#define to_kcrtc (p) container_of(p, struct komeda_crtc, base)#define to_kcrtc_st (p) container_of(p, struct komeda_crtc_state, base)#define to_kdev (p) container_of(p, struct komeda_kms_dev, base) +#define to_wb_conn (x) container_of(x, struct drm_writeback_connector, base) + +static inline bool is_writeback_only (struct drm_crtc_state *st) +{ +struct komeda_wb_connector *wb_conn =to_kcrtc (st->crtc)->wb_conn; +struct drm_connector *conn = wb_conn ? &wb_conn->base.base :NULL ; + +return conn && (st->connector_mask ==BIT (drm_connector_index (conn))); +} + +static inline bool +is_only_changed_connector (struct drm_crtc_state *st,struct drm_connector *conn) +{ +struct drm_crtc_state *old_st; +u32 changed_connectors; + + old_st =drm_atomic_get_old_crtc_state (st->state, st->crtc); + changed_connectors = st->connector_mask ^ old_st->connector_mask; + +return BIT (drm_connector_index (conn)) == changed_connectors; +}int komeda_kms_setup_crtcs (struct komeda_kms_dev *kms,struct komeda_dev *mdev);
@@ -123,6 +148,8 @@ 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); +int komeda_kms_add_wb_connectors (struct komeda_kms_dev *kms, +struct komeda_dev *mdev);void komeda_kms_cleanup_private_objs (struct komeda_kms_dev *kms); void komeda_crtc_handle_event(struct komeda_crtc *kcrtc,
drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h +7 -0
@@ -423,10 +423,17 @@ struct komeda_plane_state;struct komeda_crtc_state ;struct komeda_crtc ; +void pipeline_composition_size (struct komeda_crtc_state *kcrtc_st, +u16 *hsize,u16 *vsize); +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_wb_data_flow (struct komeda_layer *wb_layer, +struct drm_connector_state *conn_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);
drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c +49 -2
63 lines not on this page · raw message
drivers/gpu/drm/arm/display/komeda/komeda_private_obj.c +6 -0
@@ -252,6 +252,12 @@ int komeda_kms_add_private_objs(struct komeda_kms_dev *kms,return err; } +if (pipe->wb_layer) { + err =komeda_layer_obj_add (kms, pipe->wb_layer); +if (err) +return err; + } + err =komeda_compiz_obj_add (kms, pipe->compiz);if (err)return err;
drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c new file +181 -0
181 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