diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-08-10 18:12:01 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-08-10 18:12:01 +0200 |
| commit | 148b1e115eae37c9f3705691b4c45aa4cc0fa71d (patch) | |
| tree | 3f42609b3e7f53eb81830c976fadde1d7bc36a2c /drivers/gpu/drm/omapdrm/omap_connector.c | |
| parent | 3ec0af7f223bab9503c4ed57d00ed34b137df476 (diff) | |
| parent | 09ef2378dc42339f3871584dc26d27da220277cb (diff) | |
Merge airlied/drm-next into drm-intel-next-queued
Ben Widawsky/Daniel Stone need the extended modifier support from
drm-misc to be able to merge CCS support for i915.ko
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_connector.c')
| -rw-r--r-- | drivers/gpu/drm/omapdrm/omap_connector.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_connector.c b/drivers/gpu/drm/omapdrm/omap_connector.c index c24b6b783e9a..d1ec76ef5cc6 100644 --- a/drivers/gpu/drm/omapdrm/omap_connector.c +++ b/drivers/gpu/drm/omapdrm/omap_connector.c @@ -195,7 +195,6 @@ static int omap_connector_mode_valid(struct drm_connector *connector, } static const struct drm_connector_funcs omap_connector_funcs = { - .dpms = drm_atomic_helper_connector_dpms, .reset = drm_atomic_helper_connector_reset, .detect = omap_connector_detect, .fill_modes = drm_helper_probe_single_connector_modes, |