It's never called since we use the atomic helpers Signed-off-by: Sean Paul <seanpaul@xxxxxxxxxxxx> --- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 26 ------------------------- drivers/gpu/drm/msm/msm_kms.h | 3 --- 2 files changed, 29 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c index edb5d40f9160..4011525e1d7e 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c @@ -773,31 +773,6 @@ static void dpu_kms_preclose(struct msm_kms *kms, struct drm_file *file) dpu_crtc_cancel_pending_flip(priv->crtcs[i], file); } -static int dpu_kms_atomic_check(struct msm_kms *kms, - struct drm_atomic_state *state) -{ - struct dpu_kms *dpu_kms; - struct drm_device *dev; - int ret; - - if (!kms || !state) - return -EINVAL; - - dpu_kms = to_dpu_kms(kms); - dev = dpu_kms->dev; - - if (dpu_kms_is_suspend_blocked(dev)) { - DPU_DEBUG("suspended, skip atomic_check\n"); - return -EBUSY; - } - - ret = drm_atomic_helper_check(dev, state); - if (ret) - return ret; - - return 0; -} - static int dpu_kms_pm_suspend(struct device *dev) { struct drm_device *ddev; @@ -962,7 +937,6 @@ static const struct msm_kms_funcs kms_funcs = { .enable_vblank = dpu_kms_enable_vblank, .disable_vblank = dpu_kms_disable_vblank, .check_modified_format = dpu_format_check_modified_format, - .atomic_check = dpu_kms_atomic_check, .get_format = dpu_get_msm_format, .round_pixclk = dpu_kms_round_pixclk, .pm_suspend = dpu_kms_pm_suspend, diff --git a/drivers/gpu/drm/msm/msm_kms.h b/drivers/gpu/drm/msm/msm_kms.h index e275cc42ecd3..93e46d75bf56 100644 --- a/drivers/gpu/drm/msm/msm_kms.h +++ b/drivers/gpu/drm/msm/msm_kms.h @@ -60,9 +60,6 @@ struct msm_kms_funcs { const struct msm_format *msm_fmt, const struct drm_mode_fb_cmd2 *cmd, struct drm_gem_object **bos); - /* perform complete atomic check of given atomic state */ - int (*atomic_check)(struct msm_kms *kms, - struct drm_atomic_state *state); /* misc: */ long (*round_pixclk)(struct msm_kms *kms, unsigned long rate, struct drm_encoder *encoder); -- Sean Paul, Software Engineer, Google / Chromium OS -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html