@@ -481,6 +481,34 @@ static void tilcdc_crtc_mode_set_nofb(struct drm_crtc *crtc)
crtc->hwmode = crtc->state->adjusted_mode;
}
+static int tilcdc_crtc_atomic_check(struct drm_crtc *crtc,
+ struct drm_crtc_state *state)
+{
+ struct drm_display_mode *mode = &state->mode;
+ struct drm_display_mode *adjusted_mode = &state->adjusted_mode;
+ int ret;
+
+ if (state->state->plane_states[0]->crtc != crtc ||
+ state->state->planes[0] != crtc->primary) {
+ dev_dbg(crtc->dev->dev, "CRTC primary plane must be present");
+ return -EINVAL;
+ }
+
+ ret = tilcdc_crtc_mode_valid(crtc, mode);
+ if (ret) {
+ dev_dbg(crtc->dev->dev, "Mode \"%s\" not valid", mode->name);
+ return -EINVAL;
+ }
+
+ if (!tilcdc_crtc_mode_fixup(crtc, mode, adjusted_mode)) {
+ dev_dbg(crtc->dev->dev, "Mode fixup for \"%s\" failed",
+ mode->name);
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
static int tilcdc_crtc_mode_set(struct drm_crtc *crtc,
struct drm_display_mode *mode,
struct drm_display_mode *adjusted_mode,
@@ -697,6 +725,7 @@ static const struct drm_crtc_helper_funcs tilcdc_crtc_helper_funcs = {
.commit = tilcdc_crtc_commit,
.mode_set = tilcdc_crtc_mode_set,
.mode_set_base = tilcdc_crtc_mode_set_base,
+ .atomic_check = tilcdc_crtc_atomic_check,
.mode_set_nofb = tilcdc_crtc_mode_set_nofb,
};
Add tilcdc_crtc_atomic_check(). Checks the display mode validity and the presence of the mandatory primary plane. Signed-off-by: Jyri Sarha <jsarha@ti.com> --- drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+)