diff options
author | Liu Ying <gnuiyl@gmail.com> | 2016-07-08 05:41:00 -0400 |
---|---|---|
committer | Philipp Zabel <p.zabel@pengutronix.de> | 2016-07-12 12:24:08 -0400 |
commit | 6b7279e13e3ac15b9f4fbcc3a7c93caa94a5ea04 (patch) | |
tree | eb6454d22b3d0a9f9b4fe54f366a43372904ab6b | |
parent | 5f2f911578fb13b0110e125d43775f08cf1dd281 (diff) |
drm/bridge: dw-hdmi: Remove the legacy drm_connector_funcs structure
There is no one using the legacy drm_connector_funcs structure since
the imx-drm has been converted to atomic, so we may remove it.
Signed-off-by: Liu Ying <gnuiyl@gmail.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
-rw-r--r-- | drivers/gpu/drm/bridge/dw-hdmi.c | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/drivers/gpu/drm/bridge/dw-hdmi.c b/drivers/gpu/drm/bridge/dw-hdmi.c index dd5b21a95443..77ab47341658 100644 --- a/drivers/gpu/drm/bridge/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/dw-hdmi.c | |||
@@ -1495,17 +1495,6 @@ static void dw_hdmi_connector_force(struct drm_connector *connector) | |||
1495 | } | 1495 | } |
1496 | 1496 | ||
1497 | static const struct drm_connector_funcs dw_hdmi_connector_funcs = { | 1497 | static const struct drm_connector_funcs dw_hdmi_connector_funcs = { |
1498 | .dpms = drm_helper_connector_dpms, | ||
1499 | .fill_modes = drm_helper_probe_single_connector_modes, | ||
1500 | .detect = dw_hdmi_connector_detect, | ||
1501 | .destroy = dw_hdmi_connector_destroy, | ||
1502 | .force = dw_hdmi_connector_force, | ||
1503 | .reset = drm_atomic_helper_connector_reset, | ||
1504 | .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, | ||
1505 | .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, | ||
1506 | }; | ||
1507 | |||
1508 | static const struct drm_connector_funcs dw_hdmi_atomic_connector_funcs = { | ||
1509 | .dpms = drm_atomic_helper_connector_dpms, | 1498 | .dpms = drm_atomic_helper_connector_dpms, |
1510 | .fill_modes = drm_helper_probe_single_connector_modes, | 1499 | .fill_modes = drm_helper_probe_single_connector_modes, |
1511 | .detect = dw_hdmi_connector_detect, | 1500 | .detect = dw_hdmi_connector_detect, |
@@ -1637,14 +1626,9 @@ static int dw_hdmi_register(struct drm_device *drm, struct dw_hdmi *hdmi) | |||
1637 | drm_connector_helper_add(&hdmi->connector, | 1626 | drm_connector_helper_add(&hdmi->connector, |
1638 | &dw_hdmi_connector_helper_funcs); | 1627 | &dw_hdmi_connector_helper_funcs); |
1639 | 1628 | ||
1640 | if (drm_core_check_feature(drm, DRIVER_ATOMIC)) | 1629 | drm_connector_init(drm, &hdmi->connector, |
1641 | drm_connector_init(drm, &hdmi->connector, | 1630 | &dw_hdmi_connector_funcs, |
1642 | &dw_hdmi_atomic_connector_funcs, | 1631 | DRM_MODE_CONNECTOR_HDMIA); |
1643 | DRM_MODE_CONNECTOR_HDMIA); | ||
1644 | else | ||
1645 | drm_connector_init(drm, &hdmi->connector, | ||
1646 | &dw_hdmi_connector_funcs, | ||
1647 | DRM_MODE_CONNECTOR_HDMIA); | ||
1648 | 1632 | ||
1649 | drm_mode_connector_attach_encoder(&hdmi->connector, encoder); | 1633 | drm_mode_connector_attach_encoder(&hdmi->connector, encoder); |
1650 | 1634 | ||