Komeda HW can support side by side, which splits the internal display
processing to two single halves (LEFT/RIGHT) and handle them by two
pipelines separately and simultaneously.
The data flow of side_by_side as blow:
slave.layer0 ->\ /-> slave.wb_layer -> fb.right_part
... -> slave.compiz ->
slave.layer3 ->/ \-> slave.improcessor->
\ /-> output-link0
master.layer0 ->\ /-> master.improcessor ->\-> output-link1
... -> master.compiz ->
master.layer3 ->/ \-> master.wb_layer -> fb.right_part
Depends on:
- https://patchwork.freedesktop.org/series/62280/
Signed-off-by: James Qian Wang (Arm Technology China) <james.qian.wang@xxxxxxx>
---
.../gpu/drm/arm/display/komeda/komeda_crtc.c | 9 +++-
.../gpu/drm/arm/display/komeda/komeda_dev.c | 3 ++
.../gpu/drm/arm/display/komeda/komeda_dev.h | 9 ++++
.../gpu/drm/arm/display/komeda/komeda_kms.h | 3 ++
.../drm/arm/display/komeda/komeda_pipeline.c | 50 +++++++++++++++++--
.../drm/arm/display/komeda/komeda_pipeline.h | 1 +
6 files changed, 69 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c b/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c
index 3744e6d1ba96..c3bb111c454c 100644
--- a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c
+++ b/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c
@@ -591,16 +591,21 @@ int komeda_kms_setup_crtcs(struct komeda_kms_dev *kms,
crtc->master = master;
crtc->slave = komeda_pipeline_get_slave(master);
+ crtc->side_by_side = mdev->side_by_side;
if (crtc->slave)
sprintf(str, "pipe-%d", crtc->slave->id);
else
sprintf(str, "None");
- DRM_INFO("CRTC-%d: master(pipe-%d) slave(%s).\n",
- kms->n_crtcs, master->id, str);
+ DRM_INFO("CRTC-%d: master(pipe-%d) slave(%s) sbs(%s).\n",
+ kms->n_crtcs, master->id, str,
+ crtc->side_by_side ? "On" : "Off");
kms->n_crtcs++;
+
+ if (mdev->side_by_side)
+ break;
}
return 0;
diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_dev.c b/drivers/gpu/drm/arm/display/komeda/komeda_dev.c
index bb72642cfd67..2aee735a683f 100644
--- a/drivers/gpu/drm/arm/display/komeda/komeda_dev.c
+++ b/drivers/gpu/drm/arm/display/komeda/komeda_dev.c
@@ -191,6 +191,9 @@ static int komeda_parse_dt(struct device *dev, struct komeda_dev *mdev)
}
}
+ mdev->side_by_side = !of_property_read_u32(np, "side_by_side_master",
+ &mdev->side_by_side_master);
+
return ret;
}
diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_dev.h b/drivers/gpu/drm/arm/display/komeda/komeda_dev.h
index e863ec327790..c70cc25d246f 100644
--- a/drivers/gpu/drm/arm/display/komeda/komeda_dev.h
+++ b/drivers/gpu/drm/arm/display/komeda/komeda_dev.h
@@ -176,6 +176,15 @@ struct komeda_dev {
/** @irq: irq number */
int irq;
+ /**
+ * @side_by_side:
+ *
+ * on sbs the whole display frame will be split to two halves (1:2),
+ * master pipeline handles the left part, slave for the right part
+ */
+ bool side_by_side;
+ /** @side_by_side_master: master pipe id for side by side */
+ int side_by_side_master;
/** @lock: used to protect dpmode */
struct mutex lock;
diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_kms.h b/drivers/gpu/drm/arm/display/komeda/komeda_kms.h
index d0cf8381d2ab..0dbfd7ad7805 100644
--- a/drivers/gpu/drm/arm/display/komeda/komeda_kms.h
+++ b/drivers/gpu/drm/arm/display/komeda/komeda_kms.h
@@ -84,6 +84,9 @@ struct komeda_crtc {
*/
struct komeda_pipeline *slave;
+ /** @side_by_side: if the master and slave works on side by side mode */
+ bool side_by_side;
+
/** @slave_planes: komeda slave planes mask */
u32 slave_planes;
diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.c b/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.c
index 452e505a1fd3..104e27cc1dc3 100644
--- a/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.c
+++ b/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.c
@@ -326,14 +326,56 @@ static void komeda_pipeline_assemble(struct komeda_pipeline *pipe)
struct komeda_pipeline *
komeda_pipeline_get_slave(struct komeda_pipeline *master)
{
- struct komeda_component *slave;
+ struct komeda_dev *mdev = master->mdev;
+ struct komeda_component *comp, *slave;
+ u32 avail_inputs;
+
+ /* on SBS, slave pipeline merge to master via image processor */
+ if (mdev->side_by_side) {
+ comp = &master->improc->base;
+ avail_inputs = KOMEDA_PIPELINE_IMPROCS;
+ } else {
+ comp = &master->compiz->base;
+ avail_inputs = KOMEDA_PIPELINE_COMPIZS;
+ }
- slave = komeda_component_pickup_input(&master->compiz->base,
- KOMEDA_PIPELINE_COMPIZS);
+ slave = komeda_component_pickup_input(comp, avail_inputs);
return slave ? slave->pipeline : NULL;
}
+static int komeda_assemble_side_by_side(struct komeda_dev *mdev)
+{
+ struct komeda_pipeline *master, *slave;
+ int i;
+
+ if (!mdev->side_by_side)
+ return 0;
+
+ if (mdev->side_by_side_master >= mdev->n_pipelines) {
+ DRM_ERROR("DT configured side by side master-%d is invalid.\n",
+ mdev->side_by_side_master);
+ return -EINVAL;
+ }
+
+ master = mdev->pipelines[mdev->side_by_side_master];
+ slave = komeda_pipeline_get_slave(master);
+ if (!slave || slave->n_layers != master->n_layers) {
+ DRM_ERROR("Current HW doesn't support side by side.\n");
+ return -EINVAL;
+ }
+
+ if (!master->dual_link) {
+ DRM_DEBUG_ATOMIC("SBS can not work without dual link.\n");
+ return -EINVAL;
+ }
+
+ for (i = 0; i < master->n_layers; i++)
+ master->layers[i]->sbs_slave = slave->layers[i];
+
+ return 0;
+}
+
int komeda_assemble_pipelines(struct komeda_dev *mdev)
{
struct komeda_pipeline *pipe;
@@ -346,7 +388,7 @@ int komeda_assemble_pipelines(struct komeda_dev *mdev)
komeda_pipeline_dump(pipe);
}
- return 0;
+ return komeda_assemble_side_by_side(mdev);
}
void komeda_pipeline_dump_register(struct komeda_pipeline *pipe,
diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h b/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h
index 66d76642bc5b..6d3745bb8c1d 100644
--- a/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h
+++ b/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h
@@ -236,6 +236,7 @@ struct komeda_layer {
* not the source buffer.
*/
struct komeda_layer *right;
+ struct komeda_layer *sbs_slave;
};
struct komeda_layer_state {
--
2.20.1
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
