summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2017-08-10 19:12:01 +0300
committerDaniel Vetter <daniel.vetter@ffwll.ch>2017-08-10 19:12:01 +0300
commit148b1e115eae37c9f3705691b4c45aa4cc0fa71d (patch)
tree3f42609b3e7f53eb81830c976fadde1d7bc36a2c /drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
parent3ec0af7f223bab9503c4ed57d00ed34b137df476 (diff)
parent09ef2378dc42339f3871584dc26d27da220277cb (diff)
downloadlinux-148b1e115eae37c9f3705691b4c45aa4cc0fa71d.tar.xz
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/bridge/megachips-stdpxxxx-ge-b850v3-fw.c')
-rw-r--r--drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c b/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
index 11f11086a68f..7ccadba7c98c 100644
--- a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
+++ b/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
@@ -193,7 +193,6 @@ static enum drm_connector_status ge_b850v3_lvds_detect(
}
static const struct drm_connector_funcs ge_b850v3_lvds_connector_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.fill_modes = drm_helper_probe_single_connector_modes,
.detect = ge_b850v3_lvds_detect,
.destroy = drm_connector_cleanup,