drm_connector_helper_add(&hdmi->connector,
                                 &dw_hdmi_connector_helper_funcs);
 -      drm_connector_init(drm, &hdmi->connector, &dw_hdmi_connector_funcs,
 -                         DRM_MODE_CONNECTOR_HDMIA);
 +
 +      if (drm_core_check_feature(drm, DRIVER_ATOMIC))
 +              drm_connector_init(drm, &hdmi->connector,
 +                                 &dw_hdmi_atomic_connector_funcs,
 +                                 DRM_MODE_CONNECTOR_HDMIA);
 +      else
 +              drm_connector_init(drm, &hdmi->connector,
 +                                 &dw_hdmi_connector_funcs,
 +                                 DRM_MODE_CONNECTOR_HDMIA);
  
-       hdmi->connector.encoder = encoder;
- 
        drm_mode_connector_attach_encoder(&hdmi->connector, encoder);
  
        return 0;