diff options
-rw-r--r-- | drivers/gpu/drm/i915/i915_params.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/i915_params.h | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/intel_drv.h | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/intel_panel.c | 20 |
4 files changed, 0 insertions, 26 deletions
diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c index 817576701ed7..295e981e4a39 100644 --- a/drivers/gpu/drm/i915/i915_params.c +++ b/drivers/gpu/drm/i915/i915_params.c | |||
@@ -44,10 +44,6 @@ i915_param_named(modeset, int, 0400, | |||
44 | "Use kernel modesetting [KMS] (0=disable, " | 44 | "Use kernel modesetting [KMS] (0=disable, " |
45 | "1=on, -1=force vga console preference [default])"); | 45 | "1=on, -1=force vga console preference [default])"); |
46 | 46 | ||
47 | i915_param_named_unsafe(panel_ignore_lid, int, 0600, | ||
48 | "Override lid status (0=autodetect, 1=autodetect disabled [default], " | ||
49 | "-1=force lid closed, -2=force lid open)"); | ||
50 | |||
51 | i915_param_named_unsafe(enable_dc, int, 0400, | 47 | i915_param_named_unsafe(enable_dc, int, 0400, |
52 | "Enable power-saving display C-states. " | 48 | "Enable power-saving display C-states. " |
53 | "(-1=auto [default]; 0=disable; 1=up to DC5; 2=up to DC6)"); | 49 | "(-1=auto [default]; 0=disable; 1=up to DC5; 2=up to DC6)"); |
diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h index aebe0469ddaa..6c4d4a21474b 100644 --- a/drivers/gpu/drm/i915/i915_params.h +++ b/drivers/gpu/drm/i915/i915_params.h | |||
@@ -36,7 +36,6 @@ struct drm_printer; | |||
36 | #define I915_PARAMS_FOR_EACH(param) \ | 36 | #define I915_PARAMS_FOR_EACH(param) \ |
37 | param(char *, vbt_firmware, NULL) \ | 37 | param(char *, vbt_firmware, NULL) \ |
38 | param(int, modeset, -1) \ | 38 | param(int, modeset, -1) \ |
39 | param(int, panel_ignore_lid, 1) \ | ||
40 | param(int, lvds_channel_mode, 0) \ | 39 | param(int, lvds_channel_mode, 0) \ |
41 | param(int, panel_use_ssc, -1) \ | 40 | param(int, panel_use_ssc, -1) \ |
42 | param(int, vbt_sdvo_panel_type, -1) \ | 41 | param(int, vbt_sdvo_panel_type, -1) \ |
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 92b68ebc7413..edcfd85e7b94 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h | |||
@@ -1889,7 +1889,6 @@ void intel_panel_enable_backlight(const struct intel_crtc_state *crtc_state, | |||
1889 | const struct drm_connector_state *conn_state); | 1889 | const struct drm_connector_state *conn_state); |
1890 | void intel_panel_disable_backlight(const struct drm_connector_state *old_conn_state); | 1890 | void intel_panel_disable_backlight(const struct drm_connector_state *old_conn_state); |
1891 | void intel_panel_destroy_backlight(struct drm_connector *connector); | 1891 | void intel_panel_destroy_backlight(struct drm_connector *connector); |
1892 | enum drm_connector_status intel_panel_detect(struct drm_i915_private *dev_priv); | ||
1893 | extern struct drm_display_mode *intel_find_panel_downclock( | 1892 | extern struct drm_display_mode *intel_find_panel_downclock( |
1894 | struct drm_i915_private *dev_priv, | 1893 | struct drm_i915_private *dev_priv, |
1895 | struct drm_display_mode *fixed_mode, | 1894 | struct drm_display_mode *fixed_mode, |
diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c index 14b827ec5427..4a9f139e7b73 100644 --- a/drivers/gpu/drm/i915/intel_panel.c +++ b/drivers/gpu/drm/i915/intel_panel.c | |||
@@ -375,26 +375,6 @@ out: | |||
375 | pipe_config->gmch_pfit.lvds_border_bits = border; | 375 | pipe_config->gmch_pfit.lvds_border_bits = border; |
376 | } | 376 | } |
377 | 377 | ||
378 | enum drm_connector_status | ||
379 | intel_panel_detect(struct drm_i915_private *dev_priv) | ||
380 | { | ||
381 | /* Assume that the BIOS does not lie through the OpRegion... */ | ||
382 | if (!i915_modparams.panel_ignore_lid && dev_priv->opregion.lid_state) { | ||
383 | return *dev_priv->opregion.lid_state & 0x1 ? | ||
384 | connector_status_connected : | ||
385 | connector_status_disconnected; | ||
386 | } | ||
387 | |||
388 | switch (i915_modparams.panel_ignore_lid) { | ||
389 | case -2: | ||
390 | return connector_status_connected; | ||
391 | case -1: | ||
392 | return connector_status_disconnected; | ||
393 | default: | ||
394 | return connector_status_unknown; | ||
395 | } | ||
396 | } | ||
397 | |||
398 | /** | 378 | /** |
399 | * scale - scale values from one range to another | 379 | * scale - scale values from one range to another |
400 | * @source_val: value in range [@source_min..@source_max] | 380 | * @source_val: value in range [@source_min..@source_max] |