|
@@ -22,6 +22,7 @@
|
|
|
|
|
|
#include <drm/drm_of.h>
|
|
|
#include <drm/drmP.h>
|
|
|
+#include <drm/drm_atomic_helper.h>
|
|
|
#include <drm/drm_crtc_helper.h>
|
|
|
#include <drm/drm_edid.h>
|
|
|
#include <drm/drm_encoder_slave.h>
|
|
@@ -1522,6 +1523,17 @@ static const struct drm_connector_funcs dw_hdmi_connector_funcs = {
|
|
|
.force = dw_hdmi_connector_force,
|
|
|
};
|
|
|
|
|
|
+static const struct drm_connector_funcs dw_hdmi_atomic_connector_funcs = {
|
|
|
+ .dpms = drm_atomic_helper_connector_dpms,
|
|
|
+ .fill_modes = drm_helper_probe_single_connector_modes,
|
|
|
+ .detect = dw_hdmi_connector_detect,
|
|
|
+ .destroy = dw_hdmi_connector_destroy,
|
|
|
+ .force = dw_hdmi_connector_force,
|
|
|
+ .reset = drm_atomic_helper_connector_reset,
|
|
|
+ .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
|
|
|
+ .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
|
|
|
+};
|
|
|
+
|
|
|
static const struct drm_connector_helper_funcs dw_hdmi_connector_helper_funcs = {
|
|
|
.get_modes = dw_hdmi_connector_get_modes,
|
|
|
.mode_valid = dw_hdmi_connector_mode_valid,
|
|
@@ -1645,8 +1657,15 @@ static int dw_hdmi_register(struct drm_device *drm, struct dw_hdmi *hdmi)
|
|
|
|
|
|
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;
|
|
|
|