drm: Nuke drm_atomic_helper_connector_dpms

[mirror_ubuntu-bionic-kernel.git] / drivers / gpu / drm / nouveau / nouveau_connector.c

diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
index 72a6595e652b680ae7ad41fe69b7089009d53ca9..196eb668d30ddbd59d653869d26ee67f491de2e0 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_connector.c
+++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
@@ -1072,17 +1072,9 @@ nouveau_connector_helper_funcs = {
        .best_encoder = nouveau_connector_best_encoder,
 };
 
-static int
-nouveau_connector_dpms(struct drm_connector *connector, int mode)
-{
-       if (drm_drv_uses_atomic_modeset(connector->dev))
-               return drm_atomic_helper_connector_dpms(connector, mode);
-       return drm_helper_connector_dpms(connector, mode);
-}
-
 static const struct drm_connector_funcs
 nouveau_connector_funcs = {
-       .dpms = nouveau_connector_dpms,
+       .dpms = drm_helper_connector_dpms,
        .reset = nouveau_conn_reset,
        .detect = nouveau_connector_detect,
        .force = nouveau_connector_force,
@@ -1097,7 +1089,7 @@ nouveau_connector_funcs = {
 
 static const struct drm_connector_funcs
 nouveau_connector_funcs_lvds = {
-       .dpms = nouveau_connector_dpms,
+       .dpms = drm_helper_connector_dpms,
        .reset = nouveau_conn_reset,
        .detect = nouveau_connector_detect_lvds,
        .force = nouveau_connector_force,