@@ -225,6 +225,7 @@ struct dpu_crtc_state {
enum dpu_crtc_crc_source crc_source;
int crc_frame_skip_count;
+ struct msm_display_topology topology;
};
#define to_dpu_crtc_state(x) \
@@ -217,6 +217,18 @@ static u32 dither_matrix[DITHER_MATRIX_SZ] = {
15, 7, 13, 5, 3, 11, 1, 9, 12, 4, 14, 6, 0, 8, 2, 10
};
+static void dpu_encoder_virt_atomic_mode_set(struct drm_encoder *drm_enc,
+ struct drm_crtc_state *crtc_state,
+ struct drm_connector_state *conn_state);
+
+static bool _dpu_enc_is_topology_changed(struct drm_crtc_state *crtc_state,
+ struct msm_display_topology topology)
+{
+ struct dpu_crtc_state *cstate = to_dpu_crtc_state(crtc_state);
+
+ return !!memcmp(&cstate->topology,
+ &topology, sizeof(struct msm_display_topology));
+}
bool dpu_encoder_is_widebus_enabled(const struct drm_encoder *drm_enc)
{
@@ -650,12 +662,16 @@ static int dpu_encoder_virt_atomic_check(
* Release and Allocate resources on every modeset
* Dont allocate when active is false.
*/
- if (drm_atomic_crtc_needs_modeset(crtc_state)) {
+ if (drm_atomic_crtc_needs_modeset(crtc_state) ||
+ _dpu_enc_is_topology_changed(crtc_state, topology)) {
dpu_rm_release(global_state, drm_enc);
- if (!crtc_state->active_changed || crtc_state->active)
+ if (crtc_state->enable) {
ret = dpu_rm_reserve(&dpu_kms->rm, global_state,
drm_enc, crtc_state, topology);
+ if (!ret)
+ dpu_enc->topology = topology;
+ }
}
}
@@ -1089,7 +1105,7 @@ static void dpu_encoder_virt_atomic_mode_set(struct drm_encoder *drm_enc,
}
cstate->num_mixers = num_lm;
-
+ cstate->topology = dpu_enc->topology;
dpu_enc->connector = conn_state->connector;
for (i = 0; i < dpu_enc->num_phys_encs; i++) {
@@ -2076,11 +2092,14 @@ void dpu_encoder_helper_phys_cleanup(struct dpu_encoder_phys *phys_enc)
ctl->ops.clear_pending_flush(ctl);
}
-void dpu_encoder_prepare_commit(struct drm_encoder *drm_enc)
+void dpu_encoder_prepare_commit(struct drm_encoder *drm_enc,
+ struct drm_crtc_state *crtc_state)
{
struct dpu_encoder_virt *dpu_enc;
struct dpu_encoder_phys *phys;
int i;
+ struct list_head *connector_list;
+ struct drm_connector *conn = NULL, *conn_iter;
if (!drm_enc) {
DPU_ERROR("invalid encoder\n");
@@ -2088,6 +2107,20 @@ void dpu_encoder_prepare_commit(struct drm_encoder *drm_enc)
}
dpu_enc = to_dpu_encoder_virt(drm_enc);
+ connector_list = &drm_enc->dev->mode_config.connector_list;
+ list_for_each_entry(conn_iter, connector_list, head)
+ if (conn_iter->state->best_encoder == drm_enc)
+ conn = conn_iter;
+
+ /*
+ * In case of modeset, DRM kernel will trigger a atomic_mode_set
+ * call back, for usecases where there is no mode change but a topology
+ * change, update the resources from here.
+ */
+ if (!drm_atomic_crtc_needs_modeset(crtc_state) &&
+ _dpu_enc_is_topology_changed(crtc_state, dpu_enc->topology))
+ dpu_encoder_virt_atomic_mode_set(drm_enc, crtc_state, conn->state);
+
for (i = 0; i < dpu_enc->num_phys_encs; i++) {
phys = dpu_enc->phys_encs[i];
if (phys->ops.prepare_commit)
@@ -150,8 +150,10 @@ int dpu_encoder_setup(struct drm_device *dev, struct drm_encoder *enc,
* dpu_encoder_prepare_commit - prepare encoder at the very beginning of an
* atomic commit, before any registers are written
* @drm_enc: Pointer to previously created drm encoder structure
+ * @crtc_state: Pointer to drm crtc state
*/
-void dpu_encoder_prepare_commit(struct drm_encoder *drm_enc);
+void dpu_encoder_prepare_commit(struct drm_encoder *drm_enc,
+ struct drm_crtc_state *crtc_state);
/**
* dpu_encoder_set_idle_timeout - set the idle timeout for video
@@ -455,7 +455,7 @@ static void dpu_kms_prepare_commit(struct msm_kms *kms,
for_each_new_crtc_in_state(state, crtc, crtc_state, i) {
drm_for_each_encoder_mask(encoder, crtc->dev,
crtc_state->encoder_mask) {
- dpu_encoder_prepare_commit(encoder);
+ dpu_encoder_prepare_commit(encoder, crtc_state);
}
}
}
@@ -586,10 +586,6 @@ int dpu_rm_reserve(
struct dpu_rm_requirements reqs;
int ret;
- /* Check if this is just a page-flip */
- if (!drm_atomic_crtc_needs_modeset(crtc_state))
- return 0;
-
if (IS_ERR(global_state)) {
DPU_ERROR("failed to global state\n");
return PTR_ERR(global_state);
Some features like ctm can be enabled dynamically. Release and reserve the dpu resources whenever a topology change occurs such that required hw blocks are allocated appropriately. Signed-off-by: Kalyan Thota <quic_kalyant@quicinc.com> --- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 1 + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 41 ++++++++++++++++++++++++++--- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 4 ++- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 2 +- drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 4 --- 5 files changed, 42 insertions(+), 10 deletions(-)