aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/drm/drm_crtc_helper.c3
-rw-r--r--drivers/gpu/drm/i915/i915_dma.c2
-rw-r--r--include/drm/drm_crtc_helper.h2
3 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
index 4c93b7b8560f..a04639dc633d 100644
--- a/drivers/gpu/drm/drm_crtc_helper.c
+++ b/drivers/gpu/drm/drm_crtc_helper.c
@@ -913,7 +913,6 @@ bool drm_helper_plugged_event(struct drm_device *dev)
913/** 913/**
914 * drm_initial_config - setup a sane initial connector configuration 914 * drm_initial_config - setup a sane initial connector configuration
915 * @dev: DRM device 915 * @dev: DRM device
916 * @can_grow: this configuration is growable
917 * 916 *
918 * LOCKING: 917 * LOCKING:
919 * Called at init time, must take mode config lock. 918 * Called at init time, must take mode config lock.
@@ -925,7 +924,7 @@ bool drm_helper_plugged_event(struct drm_device *dev)
925 * RETURNS: 924 * RETURNS:
926 * Zero if everything went ok, nonzero otherwise. 925 * Zero if everything went ok, nonzero otherwise.
927 */ 926 */
928bool drm_helper_initial_config(struct drm_device *dev, bool can_grow) 927bool drm_helper_initial_config(struct drm_device *dev)
929{ 928{
930 struct drm_connector *connector; 929 struct drm_connector *connector;
931 int count = 0; 930 int count = 0;
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 85549f615b1f..9648d79fe36d 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1049,7 +1049,7 @@ static int i915_load_modeset_init(struct drm_device *dev)
1049 1049
1050 intel_modeset_init(dev); 1050 intel_modeset_init(dev);
1051 1051
1052 drm_helper_initial_config(dev, false); 1052 drm_helper_initial_config(dev);
1053 1053
1054 return 0; 1054 return 0;
1055 1055
diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
index 95f1a849e68f..ec073d8288d9 100644
--- a/include/drm/drm_crtc_helper.h
+++ b/include/drm/drm_crtc_helper.h
@@ -91,7 +91,7 @@ struct drm_connector_helper_funcs {
91extern int drm_helper_probe_single_connector_modes(struct drm_connector *connector, uint32_t maxX, uint32_t maxY); 91extern int drm_helper_probe_single_connector_modes(struct drm_connector *connector, uint32_t maxX, uint32_t maxY);
92extern void drm_helper_disable_unused_functions(struct drm_device *dev); 92extern void drm_helper_disable_unused_functions(struct drm_device *dev);
93extern int drm_helper_hotplug_stage_two(struct drm_device *dev); 93extern int drm_helper_hotplug_stage_two(struct drm_device *dev);
94extern bool drm_helper_initial_config(struct drm_device *dev, bool can_grow); 94extern bool drm_helper_initial_config(struct drm_device *dev);
95extern int drm_crtc_helper_set_config(struct drm_mode_set *set); 95extern int drm_crtc_helper_set_config(struct drm_mode_set *set);
96extern bool drm_crtc_helper_set_mode(struct drm_crtc *crtc, 96extern bool drm_crtc_helper_set_mode(struct drm_crtc *crtc,
97 struct drm_display_mode *mode, 97 struct drm_display_mode *mode,