diff options
Diffstat (limited to '0002-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch')
-rw-r--r-- | 0002-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/0002-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch b/0002-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch index f24b2ebbbccd..181009ab9183 100644 --- a/0002-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch +++ b/0002-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch @@ -1,7 +1,7 @@ -From b7438d9dd645801027ab11470850033da0521338 Mon Sep 17 00:00:00 2001 -Message-Id: <b7438d9dd645801027ab11470850033da0521338.1527290717.git.jan.steffens@gmail.com> -In-Reply-To: <ee91df95bf010fad44be5d2564e7d40038987f19.1527290717.git.jan.steffens@gmail.com> -References: <ee91df95bf010fad44be5d2564e7d40038987f19.1527290717.git.jan.steffens@gmail.com> +From 6cc33158e691a70111672a6105c7a37e66e6d3c3 Mon Sep 17 00:00:00 2001 +Message-Id: <6cc33158e691a70111672a6105c7a37e66e6d3c3.1528777685.git.jan.steffens@gmail.com> +In-Reply-To: <9a5adbc45b1c7d43fe4b27936f2a6939660617a1.1528777685.git.jan.steffens@gmail.com> +References: <9a5adbc45b1c7d43fe4b27936f2a6939660617a1.1528777685.git.jan.steffens@gmail.com> From: Jani Nikula <jani.nikula@intel.com> Date: Wed, 16 May 2018 11:01:10 +0300 Subject: [PATCH 2/2] Revert "drm/i915/edp: Allow alternate fixed mode for eDP @@ -61,10 +61,10 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20180516080110.22770-1-jani. 6 files changed, 8 insertions(+), 45 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c -index 79521da5d11d..de0d0f83551e 100644 +index b7b4cfdeb974..48cb8df5ae97 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c -@@ -1584,23 +1584,6 @@ static int intel_dp_compute_bpp(struct intel_dp *intel_dp, +@@ -1671,23 +1671,6 @@ static int intel_dp_compute_bpp(struct intel_dp *intel_dp, return bpp; } @@ -88,7 +88,7 @@ index 79521da5d11d..de0d0f83551e 100644 bool intel_dp_compute_config(struct intel_encoder *encoder, struct intel_crtc_state *pipe_config, -@@ -1647,16 +1630,8 @@ intel_dp_compute_config(struct intel_encoder *encoder, +@@ -1734,16 +1717,8 @@ intel_dp_compute_config(struct intel_encoder *encoder, pipe_config->has_audio = intel_conn_state->force_audio == HDMI_AUDIO_ON; if (intel_dp_is_edp(intel_dp) && intel_connector->panel.fixed_mode) { @@ -107,7 +107,7 @@ index 79521da5d11d..de0d0f83551e 100644 if (INTEL_GEN(dev_priv) >= 9) { int ret; -@@ -5821,7 +5796,6 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, +@@ -6121,7 +6096,6 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, struct drm_i915_private *dev_priv = to_i915(dev); struct drm_connector *connector = &intel_connector->base; struct drm_display_mode *fixed_mode = NULL; @@ -115,7 +115,7 @@ index 79521da5d11d..de0d0f83551e 100644 struct drm_display_mode *downclock_mode = NULL; bool has_dpcd; struct drm_display_mode *scan; -@@ -5876,14 +5850,13 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, +@@ -6176,14 +6150,13 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, } intel_connector->edid = edid; @@ -132,7 +132,7 @@ index 79521da5d11d..de0d0f83551e 100644 } } -@@ -5920,8 +5893,7 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, +@@ -6220,8 +6193,7 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, pipe_name(pipe)); } @@ -143,10 +143,10 @@ index 79521da5d11d..de0d0f83551e 100644 intel_panel_setup_backlight(connector, pipe); diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h -index 30f791f89d64..9b75b82a2956 100644 +index a80fbad9be0f..7f3e83f17adb 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h -@@ -264,7 +264,6 @@ struct intel_encoder { +@@ -269,7 +269,6 @@ struct intel_encoder { struct intel_panel { struct drm_display_mode *fixed_mode; @@ -154,7 +154,7 @@ index 30f791f89d64..9b75b82a2956 100644 struct drm_display_mode *downclock_mode; /* backlight */ -@@ -1720,7 +1719,6 @@ void intel_overlay_reset(struct drm_i915_private *dev_priv); +@@ -1820,7 +1819,6 @@ void intel_overlay_reset(struct drm_i915_private *dev_priv); /* intel_panel.c */ int intel_panel_init(struct intel_panel *panel, struct drm_display_mode *fixed_mode, @@ -163,10 +163,10 @@ index 30f791f89d64..9b75b82a2956 100644 void intel_panel_fini(struct intel_panel *panel); void intel_fixed_panel_mode(const struct drm_display_mode *fixed_mode, diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c -index f67d321376e4..551bf1c14093 100644 +index 51a1d6868b1e..cf39ca90d887 100644 --- a/drivers/gpu/drm/i915/intel_dsi.c +++ b/drivers/gpu/drm/i915/intel_dsi.c -@@ -1851,7 +1851,7 @@ void intel_dsi_init(struct drm_i915_private *dev_priv) +@@ -1846,7 +1846,7 @@ void intel_dsi_init(struct drm_i915_private *dev_priv) connector->display_info.width_mm = fixed_mode->width_mm; connector->display_info.height_mm = fixed_mode->height_mm; @@ -176,10 +176,10 @@ index f67d321376e4..551bf1c14093 100644 intel_dsi_add_properties(intel_connector); diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c -index 754baa00bea9..05bd65e37cb5 100644 +index eb0c559b2715..a70d767313aa 100644 --- a/drivers/gpu/drm/i915/intel_dvo.c +++ b/drivers/gpu/drm/i915/intel_dvo.c -@@ -537,7 +537,7 @@ void intel_dvo_init(struct drm_i915_private *dev_priv) +@@ -536,7 +536,7 @@ void intel_dvo_init(struct drm_i915_private *dev_priv) */ intel_panel_init(&intel_connector->panel, intel_dvo_get_current_mode(intel_encoder), @@ -189,10 +189,10 @@ index 754baa00bea9..05bd65e37cb5 100644 } diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c -index 7ed6f7b69556..ab5a63f007eb 100644 +index e125d16a1aa7..d278f24ba6ae 100644 --- a/drivers/gpu/drm/i915/intel_lvds.c +++ b/drivers/gpu/drm/i915/intel_lvds.c -@@ -1128,8 +1128,7 @@ void intel_lvds_init(struct drm_i915_private *dev_priv) +@@ -1175,8 +1175,7 @@ void intel_lvds_init(struct drm_i915_private *dev_priv) out: mutex_unlock(&dev->mode_config.mutex); @@ -203,10 +203,10 @@ index 7ed6f7b69556..ab5a63f007eb 100644 lvds_encoder->is_dual_link = compute_is_dual_link_lvds(lvds_encoder); diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c -index fa6831f8c004..c0ac6d6bf8ef 100644 +index 41d00b1603e3..b443278e569c 100644 --- a/drivers/gpu/drm/i915/intel_panel.c +++ b/drivers/gpu/drm/i915/intel_panel.c -@@ -1924,30 +1924,24 @@ intel_panel_init_backlight_funcs(struct intel_panel *panel) +@@ -1928,30 +1928,24 @@ intel_panel_init_backlight_funcs(struct intel_panel *panel) int intel_panel_init(struct intel_panel *panel, struct drm_display_mode *fixed_mode, @@ -238,5 +238,5 @@ index fa6831f8c004..c0ac6d6bf8ef 100644 drm_mode_destroy(intel_connector->base.dev, panel->downclock_mode); -- -2.17.0 +2.17.1 |