drm/i915: Reuse normal state readout for LVDS/DVO fixed mode
Subsystems (2)
PATCH 1/2 drm/i915: Reuse normal state readout for LVDS/DVO fixed mode
From: Ville Syrjälä <[email protected]>
Reuse the normal state readout code to get the fixed mode for LVDS/DVO encoders. This removes some partially duplicated state readout code from LVDS/DVO encoders. The duplicated code wasn't actually even populating the negative h/vsync flags, leading to possible state checker complaints. The normal readout code populates that stuff fully.
--- drivers/gpu/drm/i915/intel_display.c | 50 +++++++++++++++++------------------- drivers/gpu/drm/i915/intel_drv.h | 5 ++-- drivers/gpu/drm/i915/intel_dvo.c | 33 ++++++------------------ drivers/gpu/drm/i915/intel_lvds.c | 18 ++++--------- 4 files changed, 39 insertions(+), 67 deletions(-)
drivers/gpu/drm/i915/intel_display.c +23 -27
@@ -10247,48 +10247,44 @@ static void ironlake_pch_clock_get(struct intel_crtc *crtc, &pipe_config->fdi_m_n); } -/** Returns the currently programmed mode of the given pipe. */ -struct drm_display_mode *intel_crtc_mode_get (struct drm_device *dev, -struct drm_crtc *crtc) +/* Returns the currently programmed mode of the given encoder. */ +struct drm_display_mode * +intel_encoder_current_mode (struct intel_encoder *encoder) { -struct drm_i915_private *dev_priv =to_i915 (dev); -struct intel_crtc *intel_crtc =to_intel_crtc (crtc); +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_crtc_state *crtc_state;struct drm_display_mode *mode; -struct intel_crtc_state *pipe_config; -enum pipe pipe = intel_crtc->pipe; +struct intel_crtc *crtc; +enum pipe pipe; + +if (!encoder->get_hw_state (encoder, &pipe)) +return NULL ; + + crtc =intel_get_crtc_for_pipe (dev_priv, pipe); mode =kzalloc (sizeof (*mode),GFP_KERNEL );if (!mode)return NULL ; - pipe_config =kzalloc (sizeof (*pipe_config),GFP_KERNEL ); -if (!pipe_config) { + crtc_state =kzalloc (sizeof (*crtc_state),GFP_KERNEL ); +if (!crtc_state) {kfree (mode);return NULL ; } -/* -* Construct a pipe_config sufficient for getting the clock info -* back out of crtc_clock_get. -* -* Note, if LVDS ever uses a non-1 pixel multiplier, we'll need -* to use a real value here instead. -*/ - pipe_config->cpu_transcoder = (enum transcoder ) pipe; - pipe_config->pixel_multiplier =1 ; - pipe_config->dpll_hw_state.dpll =I915_READ (DPLL (pipe)); - pipe_config->dpll_hw_state.fp0 =I915_READ (FP0 (pipe)); - pipe_config->dpll_hw_state.fp1 =I915_READ (FP1 (pipe)); -i9xx_crtc_clock_get (intel_crtc, pipe_config); + crtc_state->base.crtc = &crtc->base; - pipe_config->base.adjusted_mode.crtc_clock = - pipe_config->port_clock / pipe_config->pixel_multiplier; +if (!dev_priv->display.get_pipe_config (crtc, crtc_state)) { +kfree (crtc_state); +kfree (mode); +return NULL ; + } -intel_get_pipe_timings (intel_crtc, pipe_config); + encoder->get_config (encoder, crtc_state); -intel_mode_from_pipe_config (mode, pipe_config); +intel_mode_from_pipe_config (mode, crtc_state); -kfree (pipe_config); +kfree (crtc_state);return mode; }
drivers/gpu/drm/i915/intel_drv.h +3 -2
@@ -1363,8 +1363,9 @@ struct intel_connector *intel_connector_alloc(void);bool intel_connector_get_hw_state (struct intel_connector *connector);void intel_connector_attach_encoder (struct intel_connector *connector,struct intel_encoder *encoder); -struct drm_display_mode *intel_crtc_mode_get (struct drm_device *dev, -struct drm_crtc *crtc); +struct drm_display_mode * +intel_encoder_current_mode (struct intel_encoder *encoder); +enum pipe intel_get_pipe_from_connector (struct intel_connector *connector);int intel_get_pipe_from_crtc_id (struct drm_device *dev,void *data,struct drm_file *file_priv);
drivers/gpu/drm/i915/intel_dvo.c +8 -25
@@ -379,32 +379,15 @@ static const struct drm_encoder_funcs intel_dvo_enc_funcs = {* chip being on DVOB/C and having multiple pipes. */ static struct drm_display_mode * -intel_dvo_get_current_mode (struct drm_connector *connector) +intel_dvo_get_current_mode (struct intel_encoder *encoder) { -struct drm_device *dev = connector->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); -struct intel_dvo *intel_dvo =intel_attached_dvo (connector); -uint32_t dvo_val =I915_READ (intel_dvo->dev.dvo_reg); -struct drm_display_mode *mode =NULL ; +struct drm_display_mode *mode; -/* If the DVO port is active, that'll be the LVDS, so we can pull out -* its timings to get how the BIOS set up the panel. -*/ -if (dvo_val &DVO_ENABLE ) { -struct intel_crtc *crtc; -int pipe = (dvo_val &DVO_PIPE_B_SELECT ) ?1 :0 ; - - crtc =intel_get_crtc_for_pipe (dev_priv, pipe); -if (crtc) { - mode =intel_crtc_mode_get (dev, &crtc->base); -if (mode) { - mode->type |=DRM_MODE_TYPE_PREFERRED ; -if (dvo_val &DVO_HSYNC_ACTIVE_HIGH ) - mode->flags |=DRM_MODE_FLAG_PHSYNC ; -if (dvo_val &DVO_VSYNC_ACTIVE_HIGH ) - mode->flags |=DRM_MODE_FLAG_PVSYNC ; - } - } + mode =intel_encoder_current_mode (encoder); +if (mode) { +DRM_DEBUG_KMS ("using current (BIOS) mode: " ); +drm_mode_debug_printmodeline (mode); + mode->type |=DRM_MODE_TYPE_PREFERRED ; }return mode;
@@ -551,7 +534,7 @@ void intel_dvo_init(struct drm_i915_private *dev_priv)* mode being output through DVO. */ intel_panel_init (&intel_connector->panel, -intel_dvo_get_current_mode (connector), +intel_dvo_get_current_mode (intel_encoder),NULL ,NULL ); intel_dvo->panel_wants_dither = true; }
drivers/gpu/drm/i915/intel_lvds.c +5 -13
@@ -939,10 +939,8 @@ void intel_lvds_init(struct drm_i915_private *dev_priv)struct drm_display_mode *fixed_mode =NULL ;struct drm_display_mode *downclock_mode =NULL ;struct edid *edid; -struct intel_crtc *crtc;i915_reg_t lvds_reg;u32 lvds; -int pipe;u8 pin;u32 allowed_scalers;
@@ -1118,17 +1116,11 @@ void intel_lvds_init(struct drm_i915_private *dev_priv)if (HAS_PCH_SPLIT (dev_priv)) goto failed; - pipe = (lvds &LVDS_PIPEB_SELECT ) ?1 :0 ; - crtc =intel_get_crtc_for_pipe (dev_priv, pipe); - -if (crtc && (lvds &LVDS_PORT_EN )) { - fixed_mode =intel_crtc_mode_get (dev, &crtc->base); -if (fixed_mode) { -DRM_DEBUG_KMS ("using current (BIOS) mode: " ); -drm_mode_debug_printmodeline (fixed_mode); - fixed_mode->type |=DRM_MODE_TYPE_PREFERRED ; - goto out; - } + fixed_mode =intel_encoder_current_mode (intel_encoder); +if (fixed_mode) { +DRM_DEBUG_KMS ("using current (BIOS) mode: " ); +drm_mode_debug_printmodeline (fixed_mode); + fixed_mode->type |=DRM_MODE_TYPE_PREFERRED ; }/* If we still don't have a mode after all that, give up. */
Signature · 6 lines
2.13.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/2 drm/i915: Allow PCH platforms fall back to BIOS LVDS mode
From: Ville Syrjälä <[email protected]>
With intel_encoder_current_mode() using the normal state readout code it actually works on PCH platforms as well. So let's nuke the PCH check from intel_lvds_init(). I suppose there aren't any machines that actually need this, but at least we get to eliminate a few lines of code, and one FIXME.
--- drivers/gpu/drm/i915/intel_lvds.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/gpu/drm/i915/intel_lvds.c +0 -5
@@ -1111,11 +1111,6 @@ void intel_lvds_init(struct drm_i915_private *dev_priv)* on. If so, assume that whatever is currently programmed is the * correct mode. */ - -/* Ironlake: FIXME if still fail, not try pipe mode now */ -if (HAS_PCH_SPLIT (dev_priv)) - goto failed; - fixed_mode =intel_encoder_current_mode (intel_encoder);if (fixed_mode) {DRM_DEBUG_KMS ("using current (BIOS) mode: " );
Signature · 6 lines
2.13.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] drm/i915: Allow PCH platforms fall back to BIOS LVDS mode
Quoting Ville Syrjala (2017-10-09 17:19:51)
Quoted 9 lines
From: Ville Syrjälä <[email protected]>
With
intel_encoder_current_mode()using the normal state readout code it actually works on PCH platforms as well. So let's nuke the PCH check fromintel_lvds_init(). I suppose there aren't any machines that actually need this, but at least we get to eliminate a few lines of code, and one FIXME.Signed-off-by Ville Syrjälä <[email protected]>
I have to admit the FIXME comment confused me utterly. Having read the function, this should now work given the conversion of intel_encoder_current_mode() to use the common encoder->get_hw_state() routine.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] drm/i915: Allow PCH platforms fall back to BIOS LVDS mode
Quoted 9 lines · Chris Wilson
Quoting Ville Syrjala (2017-10-09 17:19:51)
Quoted 8 lines
From: Ville Syrjälä <[email protected]>
With
intel_encoder_current_mode()using the normal state readout code it actually works on PCH platforms as well. So let's nuke the PCH check fromintel_lvds_init(). I suppose there aren't any machines that actually need this, but at least we get to eliminate a few lines of code, and one FIXME.
Quoted 3 lines
Quoted 1 line
Signed-off-by Ville Syrjälä <[email protected]>I have to admit the FIXME comment confused me utterly.
It does seem to be something not quite English.
Quoted 6 lines
Having read the
function, this should now work given the conversion ofintel_encoder_current_mode()to use the commonencoder->get_hw_state()routine.Reviewed-by Chris Wilson <[email protected]>
Thanks. Pushed this one as well.
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915: Reuse normal state readout for LVDS/DVO fixed mode
In reply to Ville Syrjala== Series Details ==
== Series Details ==
Series: series starting with [1/2] drm/i915: Reuse normal state readout for LVDS/DVO fixed mode
URL : https://patchwork.freedesktop.org/series/31599/
State : success
== Summary ==
Series 31599v1 series starting with [1/2] drm/i915: Reuse normal state readout for LVDS/DVO fixed mode
https://patchwork.freedesktop.org/api/1.0/series/31599/revisions/1/mbox/
Test kms_cursor_legacy:
Subgroup basic-flip-after-cursor-legacy:
incomplete -> PASS (fi-glk-1)
Test kms_pipe_crc_basic:
Subgroup read-crc-pipe-b:
dmesg-warn -> PASS (fi-skl-6700k)fi-bdw-5557u total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:450s fi-bdw-gvtdvm total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:465s fi-blb-e6850 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:389s fi-bsw-n3050 total:289 pass:243 dwarn:0 dfail:0 fail:0 skip:46 time:560s fi-bwr-2160 total:289 pass:183 dwarn:0 dfail:0 fail:0 skip:106 time:284s fi-bxt-dsi total:289 pass:259 dwarn:0 dfail:0 fail:0 skip:30 time:519s fi-bxt-j4205 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:528s fi-byt-j1900 total:289 pass:253 dwarn:1 dfail:0 fail:0 skip:35 time:532s fi-byt-n2820 total:289 pass:249 dwarn:1 dfail:0 fail:0 skip:39 time:516s fi-cfl-s total:289 pass:256 dwarn:1 dfail:0 fail:0 skip:32 time:555s fi-cnl-y total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:621s fi-elk-e7500 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:428s fi-glk-1 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:593s fi-hsw-4770 total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:434s fi-hsw-4770r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:422s fi-ilk-650 total:289 pass:228 dwarn:0 dfail:0 fail:0 skip:61 time:458s fi-ivb-3520m total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:506s fi-ivb-3770 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:473s fi-kbl-7500u total:289 pass:264 dwarn:1 dfail:0 fail:0 skip:24 time:504s fi-kbl-7560u total:289 pass:270 dwarn:0 dfail:0 fail:0 skip:19 time:581s fi-kbl-7567u total:289 pass:265 dwarn:4 dfail:0 fail:0 skip:20 time:487s fi-kbl-r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:591s fi-pnv-d510 total:289 pass:222 dwarn:1 dfail:0 fail:0 skip:66 time:663s fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:467s fi-skl-6700hq total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:655s fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:530s fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:507s fi-skl-gvtdvm total:289 pass:266 dwarn:0 dfail:0 fail:0 skip:23 time:467s fi-snb-2520m total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:573s fi-snb-2600 total:289 pass:249 dwarn:0 dfail:0 fail:0 skip:40 time:430s
080df4bff8208a891f31629d6415ff29f6d7931a drm-tip: 2017y-10m-09d-15h-14m-40s UTC integration manifest 22fa1ff9ae0c drm/i915: Allow PCH platforms fall back to BIOS LVDS modea8af7891506e drm/i915: Reuse normal state readout for LVDS/DVO fixed mode
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5957/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for series starting with [1/2] drm/i915: Reuse normal state readout for LVDS/DVO fixed mode
In reply to Ville Syrjala== Series Details ==
== Series Details ==
Series: series starting with [1/2] drm/i915: Reuse normal state readout for LVDS/DVO fixed mode
URL : https://patchwork.freedesktop.org/series/31599/
State : success
== Summary ==
Test perf:
Subgroup blocking:
pass -> FAIL (shard-hsw) fdo#102252fdo#102252 https://bugs.freedesktop.org/show_bug.cgi?id=102252
shard-hsw total:2482 pass:1347 dwarn:23 dfail:0 fail:9 skip:1103 time:9822s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5957/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoting Ville Syrjala (2017-10-09 17:19:50)
Quoted 34 lines
From: Ville Syrjälä <[email protected]>
Reuse the normal state readout code to get the fixed mode for LVDS/DVO encoders. This removes some partially duplicated state readout code from LVDS/DVO encoders. The duplicated code wasn't actually even populating the negative h/vsync flags, leading to possible state checker complaints. The normal readout code populates that stuff fully.
Cc Chris Wilson <[email protected]>Signed-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 50 +++++++++++++++++------------------- drivers/gpu/drm/i915/intel_drv.h | 5 ++-- drivers/gpu/drm/i915/intel_dvo.c | 33 ++++++------------------ drivers/gpu/drm/i915/intel_lvds.c | 18 ++++--------- 4 files changed, 39 insertions(+), 67 deletions(-)drivers/gpu/drm/i915/intel_display.c +3
-5@@ -10247,48 +10247,44 @@ static void ironlake_pch_clock_get(struct intel_crtc *crtc, &pipe_config->fdi_m_n); } -/** Returns the currently programmed mode of the given pipe. */ -struct drm_display_mode *intel_crtc_mode_get (struct drm_device *dev, -struct drm_crtc *crtc) +/* Returns the currently programmed mode of the given encoder. */ +struct drm_display_mode * +intel_encoder_current_mode (struct intel_encoder *encoder) { -struct drm_i915_private *dev_priv =to_i915 (dev); -struct intel_crtc *intel_crtc =to_intel_crtc (crtc);
drivers/gpu/drm/i915/intel_display.c static void ironlake_pch_clock_get(struct intel_crtc *crtc, · line 10261
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +7
-2+struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_crtc_state *crtc_state;struct drm_display_mode *mode; -struct intel_crtc_state *pipe_config; -enum pipe pipe = intel_crtc->pipe; +struct intel_crtc *crtc; +enum pipe pipe; + +if (!encoder->get_hw_state (encoder, &pipe)) +return NULL ;
There's no chance that get_hw_state can return a pipe beyond our knowledge? I'm presuming we are part of the early hw setup here, so may not have sanitized everything?
Quoted 36 lines
drivers/gpu/drm/i915/intel_display.c +9
-17+ + crtc =intel_get_crtc_for_pipe (dev_priv, pipe); mode =kzalloc (sizeof (*mode),GFP_KERNEL );if (!mode)return NULL ; - pipe_config =kzalloc (sizeof (*pipe_config),GFP_KERNEL ); -if (!pipe_config) { + crtc_state =kzalloc (sizeof (*crtc_state),GFP_KERNEL ); +if (!crtc_state) {kfree (mode);return NULL ; } -/* -* Construct a pipe_config sufficient for getting the clock info -* back out of crtc_clock_get. -* -* Note, if LVDS ever uses a non-1 pixel multiplier, we'll need -* to use a real value here instead. -*/ - pipe_config->cpu_transcoder = (enum transcoder ) pipe; - pipe_config->pixel_multiplier =1 ; - pipe_config->dpll_hw_state.dpll =I915_READ (DPLL (pipe)); - pipe_config->dpll_hw_state.fp0 =I915_READ (FP0 (pipe)); - pipe_config->dpll_hw_state.fp1 =I915_READ (FP1 (pipe)); -i9xx_crtc_clock_get (intel_crtc, pipe_config); + crtc_state->base.crtc = &crtc->base; - pipe_config->base.adjusted_mode.crtc_clock = - pipe_config->port_clock / pipe_config->pixel_multiplier; +if (!dev_priv->display.get_pipe_config (crtc, crtc_state)) { +kfree (crtc_state); +kfree (mode); +return NULL ;
drivers/gpu/drm/i915/intel_display.c static void ironlake_pch_clock_get(struct intel_crtc *crtc, · line 10287
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +4
-3+ } -intel_get_pipe_timings (intel_crtc, pipe_config); + encoder->get_config (encoder, crtc_state); -intel_mode_from_pipe_config (mode, pipe_config); +intel_mode_from_pipe_config (mode, crtc_state); -kfree (pipe_config); +kfree (crtc_state);
This all looks consistent to my eyes.
Quoted 46 lines
drivers/gpu/drm/i915/intel_display.c +0
-0return mode; }drivers/gpu/drm/i915/intel_drv.h +3
-2@@ -1363,8 +1363,9 @@ struct intel_connector *intel_connector_alloc(void);bool intel_connector_get_hw_state (struct intel_connector *connector);void intel_connector_attach_encoder (struct intel_connector *connector,struct intel_encoder *encoder); -struct drm_display_mode *intel_crtc_mode_get (struct drm_device *dev, -struct drm_crtc *crtc); +struct drm_display_mode * +intel_encoder_current_mode (struct intel_encoder *encoder); +enum pipe intel_get_pipe_from_connector (struct intel_connector *connector);int intel_get_pipe_from_crtc_id (struct drm_device *dev,void *data,struct drm_file *file_priv);drivers/gpu/drm/i915/intel_dvo.c +2
-15@@ -379,32 +379,15 @@ static const struct drm_encoder_funcs intel_dvo_enc_funcs = {* chip being on DVOB/C and having multiple pipes. */ static struct drm_display_mode * -intel_dvo_get_current_mode (struct drm_connector *connector) +intel_dvo_get_current_mode (struct intel_encoder *encoder) { -struct drm_device *dev = connector->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); -struct intel_dvo *intel_dvo =intel_attached_dvo (connector); -uint32_t dvo_val =I915_READ (intel_dvo->dev.dvo_reg); -struct drm_display_mode *mode =NULL ; +struct drm_display_mode *mode; -/* If the DVO port is active, that'll be the LVDS, so we can pull out -* its timings to get how the BIOS set up the panel. -*/ -if (dvo_val &DVO_ENABLE ) { -struct intel_crtc *crtc; -int pipe = (dvo_val &DVO_PIPE_B_SELECT ) ?1 :0 ; - - crtc =intel_get_crtc_for_pipe (dev_priv, pipe); -if (crtc) {
drivers/gpu/drm/i915/intel_dvo.c static const struct drm_encoder_funcs intel_dvo_enc_funcs = { · line 386
Quoted 10 lines
drivers/gpu/drm/i915/intel_dvo.c +1
-9- mode =intel_crtc_mode_get (dev, &crtc->base); -if (mode) { - mode->type |=DRM_MODE_TYPE_PREFERRED ; -if (dvo_val &DVO_HSYNC_ACTIVE_HIGH ) - mode->flags |=DRM_MODE_FLAG_PHSYNC ; -if (dvo_val &DVO_VSYNC_ACTIVE_HIGH ) - mode->flags |=DRM_MODE_FLAG_PVSYNC ; - } - } + mode =intel_encoder_current_mode (encoder);
Ok.
Quoted 44 lines
drivers/gpu/drm/i915/intel_dvo.c +5
-1+if (mode) { +DRM_DEBUG_KMS ("using current (BIOS) mode: " ); +drm_mode_debug_printmodeline (mode); + mode->type |=DRM_MODE_TYPE_PREFERRED ; }return mode;@@ -551,7 +534,7 @@ void intel_dvo_init(struct drm_i915_private *dev_priv)* mode being output through DVO. */ intel_panel_init (&intel_connector->panel, -intel_dvo_get_current_mode (connector), +intel_dvo_get_current_mode (intel_encoder),NULL ,NULL ); intel_dvo->panel_wants_dither = true; }drivers/gpu/drm/i915/intel_lvds.c +0
-11@@ -939,10 +939,8 @@ void intel_lvds_init(struct drm_i915_private *dev_priv)struct drm_display_mode *fixed_mode =NULL ;struct drm_display_mode *downclock_mode =NULL ;struct edid *edid; -struct intel_crtc *crtc;i915_reg_t lvds_reg;u32 lvds; -int pipe;u8 pin;u32 allowed_scalers;@@ -1118,17 +1116,11 @@ void intel_lvds_init(struct drm_i915_private *dev_priv)if (HAS_PCH_SPLIT (dev_priv)) goto failed; - pipe = (lvds &LVDS_PIPEB_SELECT ) ?1 :0 ; - crtc =intel_get_crtc_for_pipe (dev_priv, pipe); - -if (crtc && (lvds &LVDS_PORT_EN )) { - fixed_mode =intel_crtc_mode_get (dev, &crtc->base); -if (fixed_mode) { -DRM_DEBUG_KMS ("using current (BIOS) mode: " ); -drm_mode_debug_printmodeline (fixed_mode); - fixed_mode->type |=DRM_MODE_TYPE_PREFERRED ;
drivers/gpu/drm/i915/intel_lvds.c void intel_lvds_init(struct drm_i915_private *dev_priv) · line 1126
Quoted 10 lines
drivers/gpu/drm/i915/intel_lvds.c +5
-2- goto out; - } + fixed_mode =intel_encoder_current_mode (intel_encoder); +if (fixed_mode) { +DRM_DEBUG_KMS ("using current (BIOS) mode: " ); +drm_mode_debug_printmodeline (fixed_mode); + fixed_mode->type |=DRM_MODE_TYPE_PREFERRED ; }/* If we still don't have a mode after all that, give up. */
I will give it a spin shortly (give or take compilation times on a slow machine and forgetfulness).
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 40 lines · Chris Wilson
Quoting Ville Syrjala (2017-10-09 17:19:50)
Quoted 39 lines
From: Ville Syrjälä <[email protected]>
Reuse the normal state readout code to get the fixed mode for LVDS/DVO encoders. This removes some partially duplicated state readout code from LVDS/DVO encoders. The duplicated code wasn't actually even populating the negative h/vsync flags, leading to possible state checker complaints. The normal readout code populates that stuff fully.
Cc Chris Wilson <[email protected]>Signed-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 50 +++++++++++++++++------------------- drivers/gpu/drm/i915/intel_drv.h | 5 ++-- drivers/gpu/drm/i915/intel_dvo.c | 33 ++++++------------------ drivers/gpu/drm/i915/intel_lvds.c | 18 ++++--------- 4 files changed, 39 insertions(+), 67 deletions(-)drivers/gpu/drm/i915/intel_display.c +5
-7@@ -10247,48 +10247,44 @@ static void ironlake_pch_clock_get(struct intel_crtc *crtc, &pipe_config->fdi_m_n); } -/** Returns the currently programmed mode of the given pipe. */ -struct drm_display_mode *intel_crtc_mode_get (struct drm_device *dev, -struct drm_crtc *crtc) +/* Returns the currently programmed mode of the given encoder. */ +struct drm_display_mode * +intel_encoder_current_mode (struct intel_encoder *encoder) { -struct drm_i915_private *dev_priv =to_i915 (dev); -struct intel_crtc *intel_crtc =to_intel_crtc (crtc); +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_crtc_state *crtc_state;struct drm_display_mode *mode; -struct intel_crtc_state *pipe_config; -enum pipe pipe = intel_crtc->pipe;
Quoted 8 lines
drivers/gpu/drm/i915/intel_display.c static void ironlake_pch_clock_get(struct intel_crtc *crtc, · line 10261
Quoted 5 lines
drivers/gpu/drm/i915/intel_display.c +5
-0+struct intel_crtc *crtc; +enum pipe pipe; + +if (!encoder->get_hw_state (encoder, &pipe)) +return NULL ;There's no chance that
get_hw_statecan return a pipe beyond our knowledge?
It shouldn't, unless the hardware registers are plain lying to us. It just checks the port register whether the port is enabled, and which pipe is connected to it.
Quoted 2 lines
I'm presuming we are part of the early hw setup here, so may not have sanitized everything?
I think we should have done enough setup by this time. And we do the normal state readout very shortly afterwards, so things had better be ready by then.
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Chris Wilson
Tested-byQuoting Chris Wilson (2017-10-10 15:33:33)
Quoted 210 lines
Quoting Ville Syrjala (2017-10-09 17:19:50)
Quoted 34 lines
From: Ville Syrjälä <[email protected]>
Reuse the normal state readout code to get the fixed mode for LVDS/DVO encoders. This removes some partially duplicated state readout code from LVDS/DVO encoders. The duplicated code wasn't actually even populating the negative h/vsync flags, leading to possible state checker complaints. The normal readout code populates that stuff fully.
Cc Chris Wilson <[email protected]>Signed-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 50 +++++++++++++++++------------------- drivers/gpu/drm/i915/intel_drv.h | 5 ++-- drivers/gpu/drm/i915/intel_dvo.c | 33 ++++++------------------ drivers/gpu/drm/i915/intel_lvds.c | 18 ++++--------- 4 files changed, 39 insertions(+), 67 deletions(-)drivers/gpu/drm/i915/intel_display.c +3
-5@@ -10247,48 +10247,44 @@ static void ironlake_pch_clock_get(struct intel_crtc *crtc, &pipe_config->fdi_m_n); } -/** Returns the currently programmed mode of the given pipe. */ -struct drm_display_mode *intel_crtc_mode_get (struct drm_device *dev, -struct drm_crtc *crtc) +/* Returns the currently programmed mode of the given encoder. */ +struct drm_display_mode * +intel_encoder_current_mode (struct intel_encoder *encoder) { -struct drm_i915_private *dev_priv =to_i915 (dev); -struct intel_crtc *intel_crtc =to_intel_crtc (crtc);drivers/gpu/drm/i915/intel_display.c static void ironlake_pch_clock_get(struct intel_crtc *crtc, · line 10261
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +7
-2+struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_crtc_state *crtc_state;struct drm_display_mode *mode; -struct intel_crtc_state *pipe_config; -enum pipe pipe = intel_crtc->pipe; +struct intel_crtc *crtc; +enum pipe pipe; + +if (!encoder->get_hw_state (encoder, &pipe)) +return NULL ;There's no chance that
get_hw_statecan return a pipe beyond our knowledge? I'm presuming we are part of the early hw setup here, so may not have sanitized everything?Quoted 36 lines
drivers/gpu/drm/i915/intel_display.c +9
-17+ + crtc =intel_get_crtc_for_pipe (dev_priv, pipe); mode =kzalloc (sizeof (*mode),GFP_KERNEL );if (!mode)return NULL ; - pipe_config =kzalloc (sizeof (*pipe_config),GFP_KERNEL ); -if (!pipe_config) { + crtc_state =kzalloc (sizeof (*crtc_state),GFP_KERNEL ); +if (!crtc_state) {kfree (mode);return NULL ; } -/* -* Construct a pipe_config sufficient for getting the clock info -* back out of crtc_clock_get. -* -* Note, if LVDS ever uses a non-1 pixel multiplier, we'll need -* to use a real value here instead. -*/ - pipe_config->cpu_transcoder = (enum transcoder ) pipe; - pipe_config->pixel_multiplier =1 ; - pipe_config->dpll_hw_state.dpll =I915_READ (DPLL (pipe)); - pipe_config->dpll_hw_state.fp0 =I915_READ (FP0 (pipe)); - pipe_config->dpll_hw_state.fp1 =I915_READ (FP1 (pipe)); -i9xx_crtc_clock_get (intel_crtc, pipe_config); + crtc_state->base.crtc = &crtc->base; - pipe_config->base.adjusted_mode.crtc_clock = - pipe_config->port_clock / pipe_config->pixel_multiplier; +if (!dev_priv->display.get_pipe_config (crtc, crtc_state)) { +kfree (crtc_state); +kfree (mode); +return NULL ;drivers/gpu/drm/i915/intel_display.c static void ironlake_pch_clock_get(struct intel_crtc *crtc, · line 10287
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +4
-3+ } -intel_get_pipe_timings (intel_crtc, pipe_config); + encoder->get_config (encoder, crtc_state); -intel_mode_from_pipe_config (mode, pipe_config); +intel_mode_from_pipe_config (mode, crtc_state); -kfree (pipe_config); +kfree (crtc_state);This all looks consistent to my eyes.
Quoted 46 lines
drivers/gpu/drm/i915/intel_display.c +0
-0return mode; }drivers/gpu/drm/i915/intel_drv.h +3
-2@@ -1363,8 +1363,9 @@ struct intel_connector *intel_connector_alloc(void);bool intel_connector_get_hw_state (struct intel_connector *connector);void intel_connector_attach_encoder (struct intel_connector *connector,struct intel_encoder *encoder); -struct drm_display_mode *intel_crtc_mode_get (struct drm_device *dev, -struct drm_crtc *crtc); +struct drm_display_mode * +intel_encoder_current_mode (struct intel_encoder *encoder); +enum pipe intel_get_pipe_from_connector (struct intel_connector *connector);int intel_get_pipe_from_crtc_id (struct drm_device *dev,void *data,struct drm_file *file_priv);drivers/gpu/drm/i915/intel_dvo.c +2
-15@@ -379,32 +379,15 @@ static const struct drm_encoder_funcs intel_dvo_enc_funcs = {* chip being on DVOB/C and having multiple pipes. */ static struct drm_display_mode * -intel_dvo_get_current_mode (struct drm_connector *connector) +intel_dvo_get_current_mode (struct intel_encoder *encoder) { -struct drm_device *dev = connector->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); -struct intel_dvo *intel_dvo =intel_attached_dvo (connector); -uint32_t dvo_val =I915_READ (intel_dvo->dev.dvo_reg); -struct drm_display_mode *mode =NULL ; +struct drm_display_mode *mode; -/* If the DVO port is active, that'll be the LVDS, so we can pull out -* its timings to get how the BIOS set up the panel. -*/ -if (dvo_val &DVO_ENABLE ) { -struct intel_crtc *crtc; -int pipe = (dvo_val &DVO_PIPE_B_SELECT ) ?1 :0 ; - - crtc =intel_get_crtc_for_pipe (dev_priv, pipe); -if (crtc) {drivers/gpu/drm/i915/intel_dvo.c static const struct drm_encoder_funcs intel_dvo_enc_funcs = { · line 386
Quoted 10 lines
drivers/gpu/drm/i915/intel_dvo.c +1
-9- mode =intel_crtc_mode_get (dev, &crtc->base); -if (mode) { - mode->type |=DRM_MODE_TYPE_PREFERRED ; -if (dvo_val &DVO_HSYNC_ACTIVE_HIGH ) - mode->flags |=DRM_MODE_FLAG_PHSYNC ; -if (dvo_val &DVO_VSYNC_ACTIVE_HIGH ) - mode->flags |=DRM_MODE_FLAG_PVSYNC ; - } - } + mode =intel_encoder_current_mode (encoder);Ok.
Quoted 53 lines
drivers/gpu/drm/i915/intel_dvo.c +5
-1+if (mode) { +DRM_DEBUG_KMS ("using current (BIOS) mode: " ); +drm_mode_debug_printmodeline (mode); + mode->type |=DRM_MODE_TYPE_PREFERRED ; }return mode;@@ -551,7 +534,7 @@ void intel_dvo_init(struct drm_i915_private *dev_priv)* mode being output through DVO. */ intel_panel_init (&intel_connector->panel, -intel_dvo_get_current_mode (connector), +intel_dvo_get_current_mode (intel_encoder),NULL ,NULL ); intel_dvo->panel_wants_dither = true; }drivers/gpu/drm/i915/intel_lvds.c +5
-13@@ -939,10 +939,8 @@ void intel_lvds_init(struct drm_i915_private *dev_priv)struct drm_display_mode *fixed_mode =NULL ;struct drm_display_mode *downclock_mode =NULL ;struct edid *edid; -struct intel_crtc *crtc;i915_reg_t lvds_reg;u32 lvds; -int pipe;u8 pin;u32 allowed_scalers;@@ -1118,17 +1116,11 @@ void intel_lvds_init(struct drm_i915_private *dev_priv)if (HAS_PCH_SPLIT (dev_priv)) goto failed; - pipe = (lvds &LVDS_PIPEB_SELECT ) ?1 :0 ; - crtc =intel_get_crtc_for_pipe (dev_priv, pipe); - -if (crtc && (lvds &LVDS_PORT_EN )) { - fixed_mode =intel_crtc_mode_get (dev, &crtc->base); -if (fixed_mode) { -DRM_DEBUG_KMS ("using current (BIOS) mode: " ); -drm_mode_debug_printmodeline (fixed_mode); - fixed_mode->type |=DRM_MODE_TYPE_PREFERRED ; - goto out; - } + fixed_mode =intel_encoder_current_mode (intel_encoder); +if (fixed_mode) { +DRM_DEBUG_KMS ("using current (BIOS) mode: " ); +drm_mode_debug_printmodeline (fixed_mode); + fixed_mode->type |=DRM_MODE_TYPE_PREFERRED ; }
Quoted 6 lines
drivers/gpu/drm/i915/intel_lvds.c void intel_lvds_init(struct drm_i915_private *dev_priv) · line 1126
Quoted 1 line
drivers/gpu/drm/i915/intel_lvds.c +0
-0/* If we still don't have a mode after all that, give up. */ Reviewed-by Chris Wilson <[email protected]>I will give it a spin shortly (give or take compilation times on a slow machine and forgetfulness).
Compiled, booted, and lightly toasted,
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 215 lines · Chris Wilson
Quoting Chris Wilson (2017-10-10 15:33:33)
Quoted 214 lines
Quoting Ville Syrjala (2017-10-09 17:19:50)
Quoted 34 lines
From: Ville Syrjälä <[email protected]>
Reuse the normal state readout code to get the fixed mode for LVDS/DVO encoders. This removes some partially duplicated state readout code from LVDS/DVO encoders. The duplicated code wasn't actually even populating the negative h/vsync flags, leading to possible state checker complaints. The normal readout code populates that stuff fully.
Cc Chris Wilson <[email protected]>Signed-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 50 +++++++++++++++++------------------- drivers/gpu/drm/i915/intel_drv.h | 5 ++-- drivers/gpu/drm/i915/intel_dvo.c | 33 ++++++------------------ drivers/gpu/drm/i915/intel_lvds.c | 18 ++++--------- 4 files changed, 39 insertions(+), 67 deletions(-)drivers/gpu/drm/i915/intel_display.c +3
-5@@ -10247,48 +10247,44 @@ static void ironlake_pch_clock_get(struct intel_crtc *crtc, &pipe_config->fdi_m_n); } -/** Returns the currently programmed mode of the given pipe. */ -struct drm_display_mode *intel_crtc_mode_get (struct drm_device *dev, -struct drm_crtc *crtc) +/* Returns the currently programmed mode of the given encoder. */ +struct drm_display_mode * +intel_encoder_current_mode (struct intel_encoder *encoder) { -struct drm_i915_private *dev_priv =to_i915 (dev); -struct intel_crtc *intel_crtc =to_intel_crtc (crtc);drivers/gpu/drm/i915/intel_display.c static void ironlake_pch_clock_get(struct intel_crtc *crtc, · line 10261
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +7
-2+struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_crtc_state *crtc_state;struct drm_display_mode *mode; -struct intel_crtc_state *pipe_config; -enum pipe pipe = intel_crtc->pipe; +struct intel_crtc *crtc; +enum pipe pipe; + +if (!encoder->get_hw_state (encoder, &pipe)) +return NULL ;There's no chance that
get_hw_statecan return a pipe beyond our knowledge? I'm presuming we are part of the early hw setup here, so may not have sanitized everything?Quoted 36 lines
drivers/gpu/drm/i915/intel_display.c +9
-17+ + crtc =intel_get_crtc_for_pipe (dev_priv, pipe); mode =kzalloc (sizeof (*mode),GFP_KERNEL );if (!mode)return NULL ; - pipe_config =kzalloc (sizeof (*pipe_config),GFP_KERNEL ); -if (!pipe_config) { + crtc_state =kzalloc (sizeof (*crtc_state),GFP_KERNEL ); +if (!crtc_state) {kfree (mode);return NULL ; } -/* -* Construct a pipe_config sufficient for getting the clock info -* back out of crtc_clock_get. -* -* Note, if LVDS ever uses a non-1 pixel multiplier, we'll need -* to use a real value here instead. -*/ - pipe_config->cpu_transcoder = (enum transcoder ) pipe; - pipe_config->pixel_multiplier =1 ; - pipe_config->dpll_hw_state.dpll =I915_READ (DPLL (pipe)); - pipe_config->dpll_hw_state.fp0 =I915_READ (FP0 (pipe)); - pipe_config->dpll_hw_state.fp1 =I915_READ (FP1 (pipe)); -i9xx_crtc_clock_get (intel_crtc, pipe_config); + crtc_state->base.crtc = &crtc->base; - pipe_config->base.adjusted_mode.crtc_clock = - pipe_config->port_clock / pipe_config->pixel_multiplier; +if (!dev_priv->display.get_pipe_config (crtc, crtc_state)) { +kfree (crtc_state); +kfree (mode); +return NULL ;drivers/gpu/drm/i915/intel_display.c static void ironlake_pch_clock_get(struct intel_crtc *crtc, · line 10287
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +4
-3+ } -intel_get_pipe_timings (intel_crtc, pipe_config); + encoder->get_config (encoder, crtc_state); -intel_mode_from_pipe_config (mode, pipe_config); +intel_mode_from_pipe_config (mode, crtc_state); -kfree (pipe_config); +kfree (crtc_state);This all looks consistent to my eyes.
Quoted 46 lines
drivers/gpu/drm/i915/intel_display.c +0
-0return mode; }drivers/gpu/drm/i915/intel_drv.h +3
-2@@ -1363,8 +1363,9 @@ struct intel_connector *intel_connector_alloc(void);bool intel_connector_get_hw_state (struct intel_connector *connector);void intel_connector_attach_encoder (struct intel_connector *connector,struct intel_encoder *encoder); -struct drm_display_mode *intel_crtc_mode_get (struct drm_device *dev, -struct drm_crtc *crtc); +struct drm_display_mode * +intel_encoder_current_mode (struct intel_encoder *encoder); +enum pipe intel_get_pipe_from_connector (struct intel_connector *connector);int intel_get_pipe_from_crtc_id (struct drm_device *dev,void *data,struct drm_file *file_priv);drivers/gpu/drm/i915/intel_dvo.c +2
-15@@ -379,32 +379,15 @@ static const struct drm_encoder_funcs intel_dvo_enc_funcs = {* chip being on DVOB/C and having multiple pipes. */ static struct drm_display_mode * -intel_dvo_get_current_mode (struct drm_connector *connector) +intel_dvo_get_current_mode (struct intel_encoder *encoder) { -struct drm_device *dev = connector->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); -struct intel_dvo *intel_dvo =intel_attached_dvo (connector); -uint32_t dvo_val =I915_READ (intel_dvo->dev.dvo_reg); -struct drm_display_mode *mode =NULL ; +struct drm_display_mode *mode; -/* If the DVO port is active, that'll be the LVDS, so we can pull out -* its timings to get how the BIOS set up the panel. -*/ -if (dvo_val &DVO_ENABLE ) { -struct intel_crtc *crtc; -int pipe = (dvo_val &DVO_PIPE_B_SELECT ) ?1 :0 ; - - crtc =intel_get_crtc_for_pipe (dev_priv, pipe); -if (crtc) {drivers/gpu/drm/i915/intel_dvo.c static const struct drm_encoder_funcs intel_dvo_enc_funcs = { · line 386
Quoted 10 lines
drivers/gpu/drm/i915/intel_dvo.c +1
-9- mode =intel_crtc_mode_get (dev, &crtc->base); -if (mode) { - mode->type |=DRM_MODE_TYPE_PREFERRED ; -if (dvo_val &DVO_HSYNC_ACTIVE_HIGH ) - mode->flags |=DRM_MODE_FLAG_PHSYNC ; -if (dvo_val &DVO_VSYNC_ACTIVE_HIGH ) - mode->flags |=DRM_MODE_FLAG_PVSYNC ; - } - } + mode =intel_encoder_current_mode (encoder);Ok.
Quoted 44 lines
drivers/gpu/drm/i915/intel_dvo.c +5
-1+if (mode) { +DRM_DEBUG_KMS ("using current (BIOS) mode: " ); +drm_mode_debug_printmodeline (mode); + mode->type |=DRM_MODE_TYPE_PREFERRED ; }return mode;@@ -551,7 +534,7 @@ void intel_dvo_init(struct drm_i915_private *dev_priv)* mode being output through DVO. */ intel_panel_init (&intel_connector->panel, -intel_dvo_get_current_mode (connector), +intel_dvo_get_current_mode (intel_encoder),NULL ,NULL ); intel_dvo->panel_wants_dither = true; }drivers/gpu/drm/i915/intel_lvds.c +0
-11@@ -939,10 +939,8 @@ void intel_lvds_init(struct drm_i915_private *dev_priv)struct drm_display_mode *fixed_mode =NULL ;struct drm_display_mode *downclock_mode =NULL ;struct edid *edid; -struct intel_crtc *crtc;i915_reg_t lvds_reg;u32 lvds; -int pipe;u8 pin;u32 allowed_scalers;@@ -1118,17 +1116,11 @@ void intel_lvds_init(struct drm_i915_private *dev_priv)if (HAS_PCH_SPLIT (dev_priv)) goto failed; - pipe = (lvds &LVDS_PIPEB_SELECT ) ?1 :0 ; - crtc =intel_get_crtc_for_pipe (dev_priv, pipe); - -if (crtc && (lvds &LVDS_PORT_EN )) { - fixed_mode =intel_crtc_mode_get (dev, &crtc->base); -if (fixed_mode) { -DRM_DEBUG_KMS ("using current (BIOS) mode: " ); -drm_mode_debug_printmodeline (fixed_mode); - fixed_mode->type |=DRM_MODE_TYPE_PREFERRED ;drivers/gpu/drm/i915/intel_lvds.c void intel_lvds_init(struct drm_i915_private *dev_priv) · line 1126
Quoted 10 lines
drivers/gpu/drm/i915/intel_lvds.c +5
-2- goto out; - } + fixed_mode =intel_encoder_current_mode (intel_encoder); +if (fixed_mode) { +DRM_DEBUG_KMS ("using current (BIOS) mode: " ); +drm_mode_debug_printmodeline (fixed_mode); + fixed_mode->type |=DRM_MODE_TYPE_PREFERRED ; }/* If we still don't have a mode after all that, give up. */ Reviewed-by Chris Wilson <[email protected]>
Quoted 5 lines
Quoted 2 lines
I will give it a spin shortly (give or take compilation times on a slow machine and forgetfulness).
Compiled, booted, and lightly toasted,
Tested-by Chris Wilson <[email protected]>
Cool. Thanks for checking again. Patch pushed to dinq.
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx