From: Vincenzo Frascino Vincenzo.Frascino@arm.com
This reverts commit 12915156a976fcd0dbafdd06e3d73e860d037200.
The change will be replaced by cb1bb9a736de6aaf48cdccd0b46d98e71201900c backported from linux-6.1 with a future patch.
Signed-off-by: Vincenzo Frascino Vincenzo.Frascino@arm.com --- .../gpu/drm/arm/display/komeda/komeda_crtc.c | 10 ---------- .../gpu/drm/arm/display/komeda/komeda_kms.c | 19 +------------------ .../gpu/drm/arm/display/komeda/komeda_kms.h | 3 --- 3 files changed, 1 insertion(+), 31 deletions(-)
diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c b/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c index b7f0a5f97222..59172acb9738 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c @@ -227,16 +227,6 @@ void komeda_crtc_handle_event(struct komeda_crtc *kcrtc, complete_all(kcrtc->disable_done); kcrtc->disable_done = NULL; } else if (crtc->state->event) { - if (kcrtc->state_needs_handling) { - event = kcrtc->state_needs_handling->event; - if (event) { - kcrtc->state_needs_handling->event = NULL; - kcrtc->state_needs_handling = NULL; - drm_crtc_send_vblank_event(crtc, event); - } else { - kcrtc->state_needs_handling = NULL; - } - } event = crtc->state->event; /* * Consume event before notifying drm core that flip diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_kms.c b/drivers/gpu/drm/arm/display/komeda/komeda_kms.c index bbc051a1896a..93b7f09b96ca 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_kms.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_kms.c @@ -226,27 +226,10 @@ static int komeda_kms_check(struct drm_device *dev, return 0; }
-static int komeda_kms_commit(struct drm_device *drm, - struct drm_atomic_state *state, - bool nonblock) -{ - int i; - struct drm_crtc *crtc; - struct drm_crtc_state *old_crtc_state, *new_crtc_state; - struct komeda_crtc *kcrtc; - - for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, - new_crtc_state, i) { - kcrtc = to_kcrtc(crtc); - kcrtc->state_needs_handling = crtc->state; - } - return drm_atomic_helper_commit(drm, state, nonblock); -} - static const struct drm_mode_config_funcs komeda_mode_config_funcs = { .fb_create = komeda_fb_create, .atomic_check = komeda_kms_check, - .atomic_commit = komeda_kms_commit, + .atomic_commit = drm_atomic_helper_commit, };
static void komeda_kms_mode_config_init(struct komeda_kms_dev *kms, diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_kms.h b/drivers/gpu/drm/arm/display/komeda/komeda_kms.h index 8ff3ad04dfe4..456f3c435719 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_kms.h +++ b/drivers/gpu/drm/arm/display/komeda/komeda_kms.h @@ -84,9 +84,6 @@ struct komeda_crtc {
/** @disable_done: this flip_done is for tracing the disable */ struct completion *disable_done; - - /** @state_needs_handling: Has not had it's vblank event handled yet */ - struct drm_crtc_state *state_needs_handling; };
/**