Transcoder Port Sync preparation refactoring/renaming
Subsystems (3)
cover Transcoder Port Sync preparation refactoring/renaming
This series renames some functions to match the drm function definitions and also refactors some functions out of intel_atomic_commit_tail() as a prep for adding newer hooks required for transcoder port sync enable series The renaming is done as suggested by Daniel Vetter.
There is no functional change
Manasi Navare (2):
drm/i915/display: Rename update_crtcs() to commit_modeset_enables() drm/i915/display: Move the commit_tail() disable sequence to
commit_modeset_disables() hook
drivers/gpu/drm/i915/display/intel_display.c | 104 ++++++++++++------- drivers/gpu/drm/i915/i915_drv.h | 3 +- 2 files changed, 67 insertions(+), 40 deletions(-)
Signature · 6 lines
2.19.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/2 drm/i915/display: Rename update_crtcs() to commit_modeset_enables()
This patch has no functional changes. This just renames the update_crtcs() hooks to commit_modeset_enables() to match the drm_atomic helper naming conventions.
v2:
* Rebase on drm-tip
--- drivers/gpu/drm/i915/display/intel_display.c | 10 +++++----- drivers/gpu/drm/i915/i915_drv.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +5 -5
@@ -13758,7 +13758,7 @@ static void intel_update_crtc(struct intel_crtc *crtc,intel_finish_crtc_commit (state, crtc); } -static void intel_update_crtcs (struct intel_atomic_state *state) +static void intel_commit_modeset_enables (struct intel_atomic_state *state) {struct intel_crtc *crtc;struct intel_crtc_state *old_crtc_state, *new_crtc_state;
@@ -13773,7 +13773,7 @@ static void intel_update_crtcs(struct intel_atomic_state *state) } } -static void skl_update_crtcs (struct intel_atomic_state *state) +static void skl_commit_modeset_enables (struct intel_atomic_state *state) {struct drm_i915_private *dev_priv =to_i915 (state->base.dev);struct intel_crtc *crtc;
@@ -14014,7 +14014,7 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)intel_encoders_update_prepare (state);/* Now enable the clocks, plane, pipe, and connectors that we set up. */ - dev_priv->display.update_crtcs (state); + dev_priv->display.commit_modeset_enables (state);if (state->modeset) {intel_encoders_update_complete (state);
@@ -15926,9 +15926,9 @@ void intel_init_display_hooks(struct drm_i915_private *dev_priv) }if (INTEL_GEN (dev_priv) >=9 ) - dev_priv->display.update_crtcs = skl_update_crtcs; + dev_priv->display.commit_modeset_enables = skl_commit_modeset_enables;else - dev_priv->display.update_crtcs = intel_update_crtcs; + dev_priv->display.commit_modeset_enables = intel_commit_modeset_enables; }static i915_reg_t i915_vgacntrl_reg (struct drm_i915_private *dev_priv)
drivers/gpu/drm/i915/i915_drv.h +1 -1
@@ -288,7 +288,7 @@ struct drm_i915_display_funcs { struct intel_atomic_state *old_state);void (*crtc_disable)(struct intel_crtc_state *old_crtc_state,struct intel_atomic_state *old_state); -void (*update_crtcs)(struct intel_atomic_state *state); +void (*commit_modeset_enables)(struct intel_atomic_state *state);void (*audio_codec_enable)(struct intel_encoder *encoder,const struct intel_crtc_state *crtc_state,const struct drm_connector_state *conn_state);
Signature · 6 lines
2.19.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/2] drm/i915/display: Rename update_crtcs() to commit_modeset_enables()
Quoted 3 lines · Manasi Navare
This patch has no functional changes. This just renames the
update_crtcs()hooks tocommit_modeset_enables()to match thedrm_atomichelper naming conventions.
Maarten, do you also want to avoid having a separate hook here for enables() for ICL? Instead use the same intel_commit_modeset_enables() for even ICL+ with special handling for trans_port_sync cases?
Other than that, do I have your r-b on this rename?
Manasi
Quoted 74 lines
v2:
* Rebase on drm-tipSuggested-by Daniel Vetter <[email protected]>Cc Ville Syrjälä <[email protected]>Cc Maarten Lankhorst <[email protected]>Cc Matt Roper <[email protected]>Cc Jani Nikula <[email protected]>Signed-off-by Manasi Navare <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.c | 10 +++++----- drivers/gpu/drm/i915/i915_drv.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +5
-5@@ -13758,7 +13758,7 @@ static void intel_update_crtc(struct intel_crtc *crtc,intel_finish_crtc_commit (state, crtc); } -static void intel_update_crtcs (struct intel_atomic_state *state) +static void intel_commit_modeset_enables (struct intel_atomic_state *state) {struct intel_crtc *crtc;struct intel_crtc_state *old_crtc_state, *new_crtc_state;@@ -13773,7 +13773,7 @@ static void intel_update_crtcs(struct intel_atomic_state *state) } } -static void skl_update_crtcs (struct intel_atomic_state *state) +static void skl_commit_modeset_enables (struct intel_atomic_state *state) {struct drm_i915_private *dev_priv =to_i915 (state->base.dev);struct intel_crtc *crtc;@@ -14014,7 +14014,7 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)intel_encoders_update_prepare (state);/* Now enable the clocks, plane, pipe, and connectors that we set up. */ - dev_priv->display.update_crtcs (state); + dev_priv->display.commit_modeset_enables (state);if (state->modeset) {intel_encoders_update_complete (state);@@ -15926,9 +15926,9 @@ void intel_init_display_hooks(struct drm_i915_private *dev_priv) }if (INTEL_GEN (dev_priv) >=9 ) - dev_priv->display.update_crtcs = skl_update_crtcs; + dev_priv->display.commit_modeset_enables = skl_commit_modeset_enables;else - dev_priv->display.update_crtcs = intel_update_crtcs; + dev_priv->display.commit_modeset_enables = intel_commit_modeset_enables; }static i915_reg_t i915_vgacntrl_reg (struct drm_i915_private *dev_priv)drivers/gpu/drm/i915/i915_drv.h +1
-1@@ -288,7 +288,7 @@ struct drm_i915_display_funcs { struct intel_atomic_state *old_state);void (*crtc_disable)(struct intel_crtc_state *old_crtc_state,struct intel_atomic_state *old_state); -void (*update_crtcs)(struct intel_atomic_state *state); +void (*commit_modeset_enables)(struct intel_atomic_state *state);void (*audio_codec_enable)(struct intel_encoder *encoder,const struct intel_crtc_state *crtc_state,const struct drm_connector_state *conn_state);Signature · 1 line
2.19.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/2] drm/i915/display: Rename update_crtcs() to commit_modeset_enables()
Op 28-08-2019 om 19:11 schreef Manasi Navare:
Quoted 7 lines · Manasi Navare
Quoted 3 lines
This patch has no functional changes. This just renames the
update_crtcs()hooks tocommit_modeset_enables()to match thedrm_atomichelper naming conventions.Maarten, do you also want to avoid having a separate hook here for
enables()for ICL? Instead use the sameintel_commit_modeset_enables()for even ICL+ with special handling fortrans_port_synccases?
Yes, because there is no difference in skylake and gen11 for the !trans_port_sync cases, so it can use the old hook.
Quoted 69 lines
Other than that, do I have your r-b on this rename?
Manasi
Quoted 65 lines
v2:
* Rebase on drm-tipSuggested-by Daniel Vetter <[email protected]>Cc Ville Syrjälä <[email protected]>Cc Maarten Lankhorst <[email protected]>Cc Matt Roper <[email protected]>Cc Jani Nikula <[email protected]>Signed-off-by Manasi Navare <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.c | 10 +++++----- drivers/gpu/drm/i915/i915_drv.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +5
-5@@ -13758,7 +13758,7 @@ static void intel_update_crtc(struct intel_crtc *crtc,intel_finish_crtc_commit (state, crtc); } -static void intel_update_crtcs (struct intel_atomic_state *state) +static void intel_commit_modeset_enables (struct intel_atomic_state *state) {struct intel_crtc *crtc;struct intel_crtc_state *old_crtc_state, *new_crtc_state;@@ -13773,7 +13773,7 @@ static void intel_update_crtcs(struct intel_atomic_state *state) } } -static void skl_update_crtcs (struct intel_atomic_state *state) +static void skl_commit_modeset_enables (struct intel_atomic_state *state) {struct drm_i915_private *dev_priv =to_i915 (state->base.dev);struct intel_crtc *crtc;@@ -14014,7 +14014,7 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)intel_encoders_update_prepare (state);/* Now enable the clocks, plane, pipe, and connectors that we set up. */ - dev_priv->display.update_crtcs (state); + dev_priv->display.commit_modeset_enables (state);if (state->modeset) {intel_encoders_update_complete (state);@@ -15926,9 +15926,9 @@ void intel_init_display_hooks(struct drm_i915_private *dev_priv) }if (INTEL_GEN (dev_priv) >=9 ) - dev_priv->display.update_crtcs = skl_update_crtcs; + dev_priv->display.commit_modeset_enables = skl_commit_modeset_enables;else - dev_priv->display.update_crtcs = intel_update_crtcs; + dev_priv->display.commit_modeset_enables = intel_commit_modeset_enables; }static i915_reg_t i915_vgacntrl_reg (struct drm_i915_private *dev_priv)drivers/gpu/drm/i915/i915_drv.h +0
-0@@ -288,7 +288,7 @@ struct drm_i915_display_funcs { struct intel_atomic_state *old_state);void (*crtc_disable)(struct intel_crtc_state *old_crtc_state,struct intel_atomic_state *old_state);
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/i915/i915_drv.h +1
-1-void (*update_crtcs)(struct intel_atomic_state *state); +void (*commit_modeset_enables)(struct intel_atomic_state *state);void (*audio_codec_enable)(struct intel_encoder *encoder,const struct intel_crtc_state *crtc_state,const struct drm_connector_state *conn_state);Signature · 1 line
2.19.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/2] drm/i915/display: Rename update_crtcs() to commit_modeset_enables()
In reply to Manasi NavareThanks for the review pushed to dinq
Manasi
Quoted 83 lines · Manasi Navare
Quoted 3 lines · Manasi Navare
This patch has no functional changes. This just renames the
update_crtcs()hooks tocommit_modeset_enables()to match thedrm_atomichelper naming conventions.Maarten, do you also want to avoid having a separate hook here for
enables()for ICL? Instead use the sameintel_commit_modeset_enables()for even ICL+ with special handling fortrans_port_synccases?Other than that, do I have your r-b on this rename?
Manasi
Quoted 70 lines
v2:
* Rebase on drm-tipSuggested-by Daniel Vetter <[email protected]>Cc Ville Syrjälä <[email protected]>Cc Maarten Lankhorst <[email protected]>Cc Matt Roper <[email protected]>Cc Jani Nikula <[email protected]>Signed-off-by Manasi Navare <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.c | 10 +++++----- drivers/gpu/drm/i915/i915_drv.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +5
-5@@ -13758,7 +13758,7 @@ static void intel_update_crtc(struct intel_crtc *crtc,intel_finish_crtc_commit (state, crtc); } -static void intel_update_crtcs (struct intel_atomic_state *state) +static void intel_commit_modeset_enables (struct intel_atomic_state *state) {struct intel_crtc *crtc;struct intel_crtc_state *old_crtc_state, *new_crtc_state;@@ -13773,7 +13773,7 @@ static void intel_update_crtcs(struct intel_atomic_state *state) } } -static void skl_update_crtcs (struct intel_atomic_state *state) +static void skl_commit_modeset_enables (struct intel_atomic_state *state) {struct drm_i915_private *dev_priv =to_i915 (state->base.dev);struct intel_crtc *crtc;@@ -14014,7 +14014,7 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)intel_encoders_update_prepare (state);/* Now enable the clocks, plane, pipe, and connectors that we set up. */ - dev_priv->display.update_crtcs (state); + dev_priv->display.commit_modeset_enables (state);if (state->modeset) {intel_encoders_update_complete (state);@@ -15926,9 +15926,9 @@ void intel_init_display_hooks(struct drm_i915_private *dev_priv) }if (INTEL_GEN (dev_priv) >=9 ) - dev_priv->display.update_crtcs = skl_update_crtcs; + dev_priv->display.commit_modeset_enables = skl_commit_modeset_enables;else - dev_priv->display.update_crtcs = intel_update_crtcs; + dev_priv->display.commit_modeset_enables = intel_commit_modeset_enables; }static i915_reg_t i915_vgacntrl_reg (struct drm_i915_private *dev_priv)drivers/gpu/drm/i915/i915_drv.h +1
-1@@ -288,7 +288,7 @@ struct drm_i915_display_funcs { struct intel_atomic_state *old_state);void (*crtc_disable)(struct intel_crtc_state *old_crtc_state,struct intel_atomic_state *old_state); -void (*update_crtcs)(struct intel_atomic_state *state); +void (*commit_modeset_enables)(struct intel_atomic_state *state); void (*audio_codec_enable)(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state,
Quoted 8 lines
Quoted 4 lines
drivers/gpu/drm/i915/i915_drv.h +0
-0const struct drm_connector_state *conn_state);Signature · 1 line
2.19.1_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/2 drm/i915/display: Move the commit_tail() disable sequence to commit_modeset_disables() hook
In reply to Manasi NavareCreate a new hook commit_modeset_disables() consistent with the naming in drm atomic helpers and similar to the commit_modeset_enables() hook. This helps better organize the disable sequence in atomic_commit_tail() and move that to this disable hook.
No functional change
v3:
* Rebase (Manasi)
v2:
* Create a helper for old_crtc_state disables (Lucas)
--- drivers/gpu/drm/i915/display/intel_display.c | 94 +++++++++++++------- drivers/gpu/drm/i915/i915_drv.h | 1 + 2 files changed, 61 insertions(+), 34 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +60 -34
@@ -13758,6 +13758,61 @@ static void intel_update_crtc(struct intel_crtc *crtc,intel_finish_crtc_commit (state, crtc); } +static void intel_old_crtc_state_disables (struct intel_atomic_state *state, +struct intel_crtc_state *old_crtc_state, +struct intel_crtc_state *new_crtc_state, +struct intel_crtc *crtc) +{ +struct drm_i915_private *dev_priv =to_i915 (state->base.dev); + +intel_crtc_disable_planes (state, crtc); + +/* +* We need to disable pipe CRC before disabling the pipe, +* or we race against vblank off. +*/ +intel_crtc_disable_pipe_crc (crtc); + + dev_priv->display.crtc_disable (old_crtc_state, state); + crtc->active = false; +intel_fbc_disable (crtc); +intel_disable_shared_dpll (old_crtc_state); + +/* +* Underruns don't always raise interrupts, +* so check manually. +*/ +intel_check_cpu_fifo_underruns (dev_priv); +intel_check_pch_fifo_underruns (dev_priv); + +/* FIXME unify this for all platforms */ +if (!new_crtc_state->base.active && + !HAS_GMCH (dev_priv) && + dev_priv->display.initial_watermarks) + dev_priv->display.initial_watermarks (state, + new_crtc_state); +} + +static void intel_commit_modeset_disables (struct intel_atomic_state *state) +{ +struct intel_crtc_state *new_crtc_state, *old_crtc_state; +struct intel_crtc *crtc; +int i; + +for_each_oldnew_intel_crtc_in_state (state, crtc, old_crtc_state, new_crtc_state, i) { +if (!needs_modeset (new_crtc_state)) +continue ; + +intel_pre_plane_update (old_crtc_state, new_crtc_state); + +if (old_crtc_state->base.active) +intel_old_crtc_state_disables (state, + old_crtc_state, + new_crtc_state, + crtc); + } +} +static void intel_commit_modeset_enables (struct intel_atomic_state *state) {struct intel_crtc *crtc;
@@ -13938,42 +13993,10 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state) put_domains[crtc->pipe] =modeset_get_crtc_power_domains (new_crtc_state); } - -if (!needs_modeset (new_crtc_state)) -continue ; - -intel_pre_plane_update (old_crtc_state, new_crtc_state); - -if (old_crtc_state->base.active) { -intel_crtc_disable_planes (state, crtc); - -/* -* We need to disable pipe CRC before disabling the pipe, -* or we race against vblank off. -*/ -intel_crtc_disable_pipe_crc (crtc); - - dev_priv->display.crtc_disable (old_crtc_state, state); - crtc->active = false; -intel_fbc_disable (crtc); -intel_disable_shared_dpll (old_crtc_state); - -/* -* Underruns don't always raise -* interrupts, so check manually. -*/ -intel_check_cpu_fifo_underruns (dev_priv); -intel_check_pch_fifo_underruns (dev_priv); - -/* FIXME unify this for all platforms */ -if (!new_crtc_state->base.active && - !HAS_GMCH (dev_priv) && - dev_priv->display.initial_watermarks) - dev_priv->display.initial_watermarks (state, - new_crtc_state); - } } + dev_priv->display.commit_modeset_disables (state); +/* FIXME: Eventually get rid of our crtc->config pointer */ for_each_new_intel_crtc_in_state (state, crtc, new_crtc_state, i) crtc->config = new_crtc_state;
@@ -15929,6 +15952,9 @@ void intel_init_display_hooks(struct drm_i915_private *dev_priv) dev_priv->display.commit_modeset_enables = skl_commit_modeset_enables; else dev_priv->display.commit_modeset_enables = intel_commit_modeset_enables; + + dev_priv->display.commit_modeset_disables = intel_commit_modeset_disables; + }static i915_reg_t i915_vgacntrl_reg (struct drm_i915_private *dev_priv)
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -289,6 +289,7 @@ struct drm_i915_display_funcs {void (*crtc_disable)(struct intel_crtc_state *old_crtc_state,struct intel_atomic_state *old_state);void (*commit_modeset_enables)(struct intel_atomic_state *state); +void (*commit_modeset_disables)(struct intel_atomic_state *state);void (*audio_codec_enable)(struct intel_encoder *encoder,const struct intel_crtc_state *crtc_state,const struct drm_connector_state *conn_state);
Signature · 6 lines
2.19.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] drm/i915/display: Move the commit_tail() disable sequence to commit_modeset_disables() hook
Op 28-08-2019 om 00:17 schreef Manasi Navare:
Quoted 149 lines
Create a new hook
commit_modeset_disables()consistent with the naming in drm atomic helpers and similar to thecommit_modeset_enables()hook. This helps better organize the disable sequence inatomic_commit_tail()and move that to this disable hook.No functional change
v3:
* Rebase (Manasi)
v2:
* Create a helper forold_crtc_statedisables (Lucas)Suggested-by Daniel Vetter <[email protected]>Cc Ville Syrjälä <[email protected]>Cc Maarten Lankhorst <[email protected]>Cc Matt Roper <[email protected]>Cc Jani Nikula <[email protected]>Signed-off-by Manasi Navare <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.c | 94 +++++++++++++------- drivers/gpu/drm/i915/i915_drv.h | 1 + 2 files changed, 61 insertions(+), 34 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +60
-34@@ -13758,6 +13758,61 @@ static void intel_update_crtc(struct intel_crtc *crtc,intel_finish_crtc_commit (state, crtc); } +static void intel_old_crtc_state_disables (struct intel_atomic_state *state, +struct intel_crtc_state *old_crtc_state, +struct intel_crtc_state *new_crtc_state, +struct intel_crtc *crtc) +{ +struct drm_i915_private *dev_priv =to_i915 (state->base.dev); + +intel_crtc_disable_planes (state, crtc); + +/* +* We need to disable pipe CRC before disabling the pipe, +* or we race against vblank off. +*/ +intel_crtc_disable_pipe_crc (crtc); + + dev_priv->display.crtc_disable (old_crtc_state, state); + crtc->active = false; +intel_fbc_disable (crtc); +intel_disable_shared_dpll (old_crtc_state); + +/* +* Underruns don't always raise interrupts, +* so check manually. +*/ +intel_check_cpu_fifo_underruns (dev_priv); +intel_check_pch_fifo_underruns (dev_priv); + +/* FIXME unify this for all platforms */ +if (!new_crtc_state->base.active && + !HAS_GMCH (dev_priv) && + dev_priv->display.initial_watermarks) + dev_priv->display.initial_watermarks (state, + new_crtc_state); +} + +static void intel_commit_modeset_disables (struct intel_atomic_state *state) +{ +struct intel_crtc_state *new_crtc_state, *old_crtc_state; +struct intel_crtc *crtc; +int i; + +for_each_oldnew_intel_crtc_in_state (state, crtc, old_crtc_state, new_crtc_state, i) { +if (!needs_modeset (new_crtc_state)) +continue ; + +intel_pre_plane_update (old_crtc_state, new_crtc_state); + +if (old_crtc_state->base.active) +intel_old_crtc_state_disables (state, + old_crtc_state, + new_crtc_state, + crtc); + } +} +static void intel_commit_modeset_enables (struct intel_atomic_state *state) {struct intel_crtc *crtc;@@ -13938,42 +13993,10 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state) put_domains[crtc->pipe] =modeset_get_crtc_power_domains (new_crtc_state); } - -if (!needs_modeset (new_crtc_state)) -continue ; - -intel_pre_plane_update (old_crtc_state, new_crtc_state); - -if (old_crtc_state->base.active) { -intel_crtc_disable_planes (state, crtc); - -/* -* We need to disable pipe CRC before disabling the pipe, -* or we race against vblank off. -*/ -intel_crtc_disable_pipe_crc (crtc); - - dev_priv->display.crtc_disable (old_crtc_state, state); - crtc->active = false; -intel_fbc_disable (crtc); -intel_disable_shared_dpll (old_crtc_state); - -/* -* Underruns don't always raise -* interrupts, so check manually. -*/ -intel_check_cpu_fifo_underruns (dev_priv); -intel_check_pch_fifo_underruns (dev_priv); - -/* FIXME unify this for all platforms */ -if (!new_crtc_state->base.active && - !HAS_GMCH (dev_priv) && - dev_priv->display.initial_watermarks) - dev_priv->display.initial_watermarks (state, - new_crtc_state); - } } + dev_priv->display.commit_modeset_disables (state); +/* FIXME: Eventually get rid of our crtc->config pointer */ for_each_new_intel_crtc_in_state (state, crtc, new_crtc_state, i) crtc->config = new_crtc_state;@@ -15929,6 +15952,9 @@ void intel_init_display_hooks(struct drm_i915_private *dev_priv) dev_priv->display.commit_modeset_enables = skl_commit_modeset_enables; else dev_priv->display.commit_modeset_enables = intel_commit_modeset_enables; + + dev_priv->display.commit_modeset_disables = intel_commit_modeset_disables; + }static i915_reg_t i915_vgacntrl_reg (struct drm_i915_private *dev_priv)drivers/gpu/drm/i915/i915_drv.h +0
-0
drivers/gpu/drm/i915/i915_drv.h struct drm_i915_display_funcs { · line 295
Quoted 7 lines
drivers/gpu/drm/i915/i915_drv.h +1
-0@@ -289,6 +289,7 @@ struct drm_i915_display_funcs {void (*crtc_disable)(struct intel_crtc_state *old_crtc_state,struct intel_atomic_state *old_state);void (*commit_modeset_enables)(struct intel_atomic_state *state); +void (*commit_modeset_disables)(struct intel_atomic_state *state);void (*audio_codec_enable)(struct intel_encoder *encoder,const struct intel_crtc_state *crtc_state,const struct drm_connector_state *conn_state);
Hey,
Nack, there is no need to start introducing a special case here. The same enable and disable sequence for gen11 will still work all the way back to gen9 if transcoder sync is not used. :) For disable all the way back to gen2.
It could still be beneficial to make those separate functions, just no function pointer.
intel_old_crtc_state_disables(
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] drm/i915/display: Move the commit_tail() disable sequence to commit_modeset_disables() hook
Quoted 160 lines · Maarten Lankhorst
Op 28-08-2019 om 00:17 schreef Manasi Navare:
Quoted 149 lines
Create a new hook
commit_modeset_disables()consistent with the naming in drm atomic helpers and similar to thecommit_modeset_enables()hook. This helps better organize the disable sequence inatomic_commit_tail()and move that to this disable hook.No functional change
v3:
* Rebase (Manasi)
v2:
* Create a helper forold_crtc_statedisables (Lucas)Suggested-by Daniel Vetter <[email protected]>Cc Ville Syrjälä <[email protected]>Cc Maarten Lankhorst <[email protected]>Cc Matt Roper <[email protected]>Cc Jani Nikula <[email protected]>Signed-off-by Manasi Navare <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.c | 94 +++++++++++++------- drivers/gpu/drm/i915/i915_drv.h | 1 + 2 files changed, 61 insertions(+), 34 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +60
-34@@ -13758,6 +13758,61 @@ static void intel_update_crtc(struct intel_crtc *crtc,intel_finish_crtc_commit (state, crtc); } +static void intel_old_crtc_state_disables (struct intel_atomic_state *state, +struct intel_crtc_state *old_crtc_state, +struct intel_crtc_state *new_crtc_state, +struct intel_crtc *crtc) +{ +struct drm_i915_private *dev_priv =to_i915 (state->base.dev); + +intel_crtc_disable_planes (state, crtc); + +/* +* We need to disable pipe CRC before disabling the pipe, +* or we race against vblank off. +*/ +intel_crtc_disable_pipe_crc (crtc); + + dev_priv->display.crtc_disable (old_crtc_state, state); + crtc->active = false; +intel_fbc_disable (crtc); +intel_disable_shared_dpll (old_crtc_state); + +/* +* Underruns don't always raise interrupts, +* so check manually. +*/ +intel_check_cpu_fifo_underruns (dev_priv); +intel_check_pch_fifo_underruns (dev_priv); + +/* FIXME unify this for all platforms */ +if (!new_crtc_state->base.active && + !HAS_GMCH (dev_priv) && + dev_priv->display.initial_watermarks) + dev_priv->display.initial_watermarks (state, + new_crtc_state); +} + +static void intel_commit_modeset_disables (struct intel_atomic_state *state) +{ +struct intel_crtc_state *new_crtc_state, *old_crtc_state; +struct intel_crtc *crtc; +int i; + +for_each_oldnew_intel_crtc_in_state (state, crtc, old_crtc_state, new_crtc_state, i) { +if (!needs_modeset (new_crtc_state)) +continue ; + +intel_pre_plane_update (old_crtc_state, new_crtc_state); + +if (old_crtc_state->base.active) +intel_old_crtc_state_disables (state, + old_crtc_state, + new_crtc_state, + crtc); + } +} +static void intel_commit_modeset_enables (struct intel_atomic_state *state) {struct intel_crtc *crtc;@@ -13938,42 +13993,10 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state) put_domains[crtc->pipe] =modeset_get_crtc_power_domains (new_crtc_state); } - -if (!needs_modeset (new_crtc_state)) -continue ; - -intel_pre_plane_update (old_crtc_state, new_crtc_state); - -if (old_crtc_state->base.active) { -intel_crtc_disable_planes (state, crtc); - -/* -* We need to disable pipe CRC before disabling the pipe, -* or we race against vblank off. -*/ -intel_crtc_disable_pipe_crc (crtc); - - dev_priv->display.crtc_disable (old_crtc_state, state); - crtc->active = false; -intel_fbc_disable (crtc); -intel_disable_shared_dpll (old_crtc_state); - -/* -* Underruns don't always raise -* interrupts, so check manually. -*/ -intel_check_cpu_fifo_underruns (dev_priv); -intel_check_pch_fifo_underruns (dev_priv); - -/* FIXME unify this for all platforms */ -if (!new_crtc_state->base.active && - !HAS_GMCH (dev_priv) && - dev_priv->display.initial_watermarks) - dev_priv->display.initial_watermarks (state, - new_crtc_state); - } } + dev_priv->display.commit_modeset_disables (state); +/* FIXME: Eventually get rid of our crtc->config pointer */ for_each_new_intel_crtc_in_state (state, crtc, new_crtc_state, i) crtc->config = new_crtc_state;@@ -15929,6 +15952,9 @@ void intel_init_display_hooks(struct drm_i915_private *dev_priv) dev_priv->display.commit_modeset_enables = skl_commit_modeset_enables; else dev_priv->display.commit_modeset_enables = intel_commit_modeset_enables; + + dev_priv->display.commit_modeset_disables = intel_commit_modeset_disables; + }static i915_reg_t i915_vgacntrl_reg (struct drm_i915_private *dev_priv)drivers/gpu/drm/i915/i915_drv.h +0
-0drivers/gpu/drm/i915/i915_drv.h struct drm_i915_display_funcs { · line 295
Quoted 7 lines
drivers/gpu/drm/i915/i915_drv.h +1
-0@@ -289,6 +289,7 @@ struct drm_i915_display_funcs {void (*crtc_disable)(struct intel_crtc_state *old_crtc_state,struct intel_atomic_state *old_state);void (*commit_modeset_enables)(struct intel_atomic_state *state); +void (*commit_modeset_disables)(struct intel_atomic_state *state);void (*audio_codec_enable)(struct intel_encoder *encoder,const struct intel_crtc_state *crtc_state,const struct drm_connector_state *conn_state);Hey,
Quoted 2 lines
Nack, there is no need to start introducing a special case here. The same enable and disable sequence for gen11 will still work all the way back to gen9 if transcoder sync is not used. :) For disable all the way back to gen2.
So just use the same function for all gens and do special handiling only if trans_port_sync_mode() in that same function?
Danvet had suggested adding a separate hook for ICL since this feature is supported for ICL+ and having it in separate hook avoids possibility of regressions. But if you strongly feel against it I will not create another hook.
Quoted 1 line
It could still be beneficial to make those separate functions, just no function pointer.
So you mean not create a new commit_modeset_disables hook? Just extract the intel_old_crtc_state_disables() from atomic_commit_tail()?
Manasi
Quoted 3 lines
intel_old_crtc_state_disables(
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 2/2 drm/i915/display: Move the commit_tail() disable sequence to separate function
In reply to Manasi NavareCreate a new function intel_commit_modeset_disables() consistent with the naming in drm atomic helpers and similar to the enable function.
This helps better organize the disable sequence in atomic_commit_tail()
No functional change
v4:
* Do not create a function pointer, just a function (Maarten) v3:
* Rebase (Manasi)
v2:
* Create a helper for old_crtc_state disables (Lucas)
--- drivers/gpu/drm/i915/display/intel_display.c | 92 ++++++++++++-------- drivers/gpu/drm/i915/i915_drv.h | 1 + 2 files changed, 59 insertions(+), 34 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +58 -34
@@ -13758,6 +13758,61 @@ static void intel_update_crtc(struct intel_crtc *crtc,intel_finish_crtc_commit (state, crtc); } +static void intel_old_crtc_state_disables (struct intel_atomic_state *state, +struct intel_crtc_state *old_crtc_state, +struct intel_crtc_state *new_crtc_state, +struct intel_crtc *crtc) +{ +struct drm_i915_private *dev_priv =to_i915 (state->base.dev); + +intel_crtc_disable_planes (state, crtc); + +/* +* We need to disable pipe CRC before disabling the pipe, +* or we race against vblank off. +*/ +intel_crtc_disable_pipe_crc (crtc); + + dev_priv->display.crtc_disable (old_crtc_state, state); + crtc->active = false; +intel_fbc_disable (crtc); +intel_disable_shared_dpll (old_crtc_state); + +/* +* Underruns don't always raise interrupts, +* so check manually. +*/ +intel_check_cpu_fifo_underruns (dev_priv); +intel_check_pch_fifo_underruns (dev_priv); + +/* FIXME unify this for all platforms */ +if (!new_crtc_state->base.active && + !HAS_GMCH (dev_priv) && + dev_priv->display.initial_watermarks) + dev_priv->display.initial_watermarks (state, + new_crtc_state); +} + +static void intel_commit_modeset_disables (struct intel_atomic_state *state) +{ +struct intel_crtc_state *new_crtc_state, *old_crtc_state; +struct intel_crtc *crtc; +int i; + +for_each_oldnew_intel_crtc_in_state (state, crtc, old_crtc_state, new_crtc_state, i) { +if (!needs_modeset (new_crtc_state)) +continue ; + +intel_pre_plane_update (old_crtc_state, new_crtc_state); + +if (old_crtc_state->base.active) +intel_old_crtc_state_disables (state, + old_crtc_state, + new_crtc_state, + crtc); + } +} +static void intel_commit_modeset_enables (struct intel_atomic_state *state) {struct intel_crtc *crtc;
@@ -13938,42 +13993,10 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state) put_domains[crtc->pipe] =modeset_get_crtc_power_domains (new_crtc_state); } - -if (!needs_modeset (new_crtc_state)) -continue ; - -intel_pre_plane_update (old_crtc_state, new_crtc_state); - -if (old_crtc_state->base.active) { -intel_crtc_disable_planes (state, crtc); - -/* -* We need to disable pipe CRC before disabling the pipe, -* or we race against vblank off. -*/ -intel_crtc_disable_pipe_crc (crtc); - - dev_priv->display.crtc_disable (old_crtc_state, state); - crtc->active = false; -intel_fbc_disable (crtc); -intel_disable_shared_dpll (old_crtc_state); - -/* -* Underruns don't always raise -* interrupts, so check manually. -*/ -intel_check_cpu_fifo_underruns (dev_priv); -intel_check_pch_fifo_underruns (dev_priv); - -/* FIXME unify this for all platforms */ -if (!new_crtc_state->base.active && - !HAS_GMCH (dev_priv) && - dev_priv->display.initial_watermarks) - dev_priv->display.initial_watermarks (state, - new_crtc_state); - } } +intel_commit_modeset_disables (state); +/* FIXME: Eventually get rid of our crtc->config pointer */ for_each_new_intel_crtc_in_state (state, crtc, new_crtc_state, i) crtc->config = new_crtc_state;
@@ -15929,6 +15952,7 @@ void intel_init_display_hooks(struct drm_i915_private *dev_priv) dev_priv->display.commit_modeset_enables = skl_commit_modeset_enables; else dev_priv->display.commit_modeset_enables = intel_commit_modeset_enables; + }static i915_reg_t i915_vgacntrl_reg (struct drm_i915_private *dev_priv)
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -289,6 +289,7 @@ struct drm_i915_display_funcs {void (*crtc_disable)(struct intel_crtc_state *old_crtc_state,struct intel_atomic_state *old_state);void (*commit_modeset_enables)(struct intel_atomic_state *state); +void (*commit_modeset_disables)(struct intel_atomic_state *state);void (*audio_codec_enable)(struct intel_encoder *encoder,const struct intel_crtc_state *crtc_state,const struct drm_connector_state *conn_state);
Signature · 6 lines
2.19.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 2/2] drm/i915/display: Move the commit_tail() disable sequence to separate function
Op 29-08-2019 om 00:47 schreef Manasi Navare:
Quoted 56 lines
Create a new function
intel_commit_modeset_disables()consistent with the naming in drm atomic helpers and similar to the enable function.
This helps better organize the disable sequence inatomic_commit_tail()No functional change
v4:
* Do not create a function pointer, just a function (Maarten) v3:
* Rebase (Manasi)
v2:
* Create a helper forold_crtc_statedisables (Lucas)Suggested-by Daniel Vetter <[email protected]>Cc Ville Syrjälä <[email protected]>Cc Maarten Lankhorst <[email protected]>Cc Matt Roper <[email protected]>Cc Jani Nikula <[email protected]>Signed-off-by Manasi Navare <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.c | 92 ++++++++++++-------- drivers/gpu/drm/i915/i915_drv.h | 1 + 2 files changed, 59 insertions(+), 34 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +24
-0@@ -13758,6 +13758,61 @@ static void intel_update_crtc(struct intel_crtc *crtc,intel_finish_crtc_commit (state, crtc); } +static void intel_old_crtc_state_disables (struct intel_atomic_state *state, +struct intel_crtc_state *old_crtc_state, +struct intel_crtc_state *new_crtc_state, +struct intel_crtc *crtc) +{ +struct drm_i915_private *dev_priv =to_i915 (state->base.dev); + +intel_crtc_disable_planes (state, crtc); + +/* +* We need to disable pipe CRC before disabling the pipe, +* or we race against vblank off. +*/ +intel_crtc_disable_pipe_crc (crtc); + + dev_priv->display.crtc_disable (old_crtc_state, state); + crtc->active = false; +intel_fbc_disable (crtc); +intel_disable_shared_dpll (old_crtc_state); + +/* +* Underruns don't always raise interrupts, +* so check manually. +*/
drivers/gpu/drm/i915/display/intel_display.c static void intel_update_crtc(struct intel_crtc *crtc, · line 13794
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_display.c +10
-0+intel_check_cpu_fifo_underruns (dev_priv); +intel_check_pch_fifo_underruns (dev_priv); + +/* FIXME unify this for all platforms */ +if (!new_crtc_state->base.active && + !HAS_GMCH (dev_priv) && + dev_priv->display.initial_watermarks) + dev_priv->display.initial_watermarks (state, + new_crtc_state); +}
intel_old_crtc_disable() ?
Otherwise for both patches:
Quoted 82 lines
drivers/gpu/drm/i915/display/intel_display.c +24
-34+ +static void intel_commit_modeset_disables (struct intel_atomic_state *state) +{ +struct intel_crtc_state *new_crtc_state, *old_crtc_state; +struct intel_crtc *crtc; +int i; + +for_each_oldnew_intel_crtc_in_state (state, crtc, old_crtc_state, new_crtc_state, i) { +if (!needs_modeset (new_crtc_state)) +continue ; + +intel_pre_plane_update (old_crtc_state, new_crtc_state); + +if (old_crtc_state->base.active) +intel_old_crtc_state_disables (state, + old_crtc_state, + new_crtc_state, + crtc); + } +} +static void intel_commit_modeset_enables (struct intel_atomic_state *state) {struct intel_crtc *crtc;@@ -13938,42 +13993,10 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state) put_domains[crtc->pipe] =modeset_get_crtc_power_domains (new_crtc_state); } - -if (!needs_modeset (new_crtc_state)) -continue ; - -intel_pre_plane_update (old_crtc_state, new_crtc_state); - -if (old_crtc_state->base.active) { -intel_crtc_disable_planes (state, crtc); - -/* -* We need to disable pipe CRC before disabling the pipe, -* or we race against vblank off. -*/ -intel_crtc_disable_pipe_crc (crtc); - - dev_priv->display.crtc_disable (old_crtc_state, state); - crtc->active = false; -intel_fbc_disable (crtc); -intel_disable_shared_dpll (old_crtc_state); - -/* -* Underruns don't always raise -* interrupts, so check manually. -*/ -intel_check_cpu_fifo_underruns (dev_priv); -intel_check_pch_fifo_underruns (dev_priv); - -/* FIXME unify this for all platforms */ -if (!new_crtc_state->base.active && - !HAS_GMCH (dev_priv) && - dev_priv->display.initial_watermarks) - dev_priv->display.initial_watermarks (state, - new_crtc_state); - } } +intel_commit_modeset_disables (state); +/* FIXME: Eventually get rid of our crtc->config pointer */ for_each_new_intel_crtc_in_state (state, crtc, new_crtc_state, i) crtc->config = new_crtc_state;@@ -15929,6 +15952,7 @@ void intel_init_display_hooks(struct drm_i915_private *dev_priv) dev_priv->display.commit_modeset_enables = skl_commit_modeset_enables; else dev_priv->display.commit_modeset_enables = intel_commit_modeset_enables; + }static i915_reg_t i915_vgacntrl_reg (struct drm_i915_private *dev_priv)drivers/gpu/drm/i915/i915_drv.h +0
-0
drivers/gpu/drm/i915/i915_drv.h struct drm_i915_display_funcs { · line 295
Quoted 7 lines
drivers/gpu/drm/i915/i915_drv.h +1
-0@@ -289,6 +289,7 @@ struct drm_i915_display_funcs {void (*crtc_disable)(struct intel_crtc_state *old_crtc_state,struct intel_atomic_state *old_state);void (*commit_modeset_enables)(struct intel_atomic_state *state); +void (*commit_modeset_disables)(struct intel_atomic_state *state);void (*audio_codec_enable)(struct intel_encoder *encoder,const struct intel_crtc_state *crtc_state,const struct drm_connector_state *conn_state);
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 2/2] drm/i915/display: Move the commit_tail() disable sequence to separate function
In reply to Manasi NavareThanks for the review pushed to dinq
Manasi
Quoted 158 lines · Manasi Navare
Create a new function
intel_commit_modeset_disables()consistent with the naming in drm atomic helpers and similar to the enable function.
This helps better organize the disable sequence inatomic_commit_tail()No functional change
v4:
* Do not create a function pointer, just a function (Maarten) v3:
* Rebase (Manasi)
v2:
* Create a helper forold_crtc_statedisables (Lucas)Suggested-by Daniel Vetter <[email protected]>Cc Ville Syrjälä <[email protected]>Cc Maarten Lankhorst <[email protected]>Cc Matt Roper <[email protected]>Cc Jani Nikula <[email protected]>Signed-off-by Manasi Navare <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.c | 92 ++++++++++++-------- drivers/gpu/drm/i915/i915_drv.h | 1 + 2 files changed, 59 insertions(+), 34 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +58
-34@@ -13758,6 +13758,61 @@ static void intel_update_crtc(struct intel_crtc *crtc,intel_finish_crtc_commit (state, crtc); } +static void intel_old_crtc_state_disables (struct intel_atomic_state *state, +struct intel_crtc_state *old_crtc_state, +struct intel_crtc_state *new_crtc_state, +struct intel_crtc *crtc) +{ +struct drm_i915_private *dev_priv =to_i915 (state->base.dev); + +intel_crtc_disable_planes (state, crtc); + +/* +* We need to disable pipe CRC before disabling the pipe, +* or we race against vblank off. +*/ +intel_crtc_disable_pipe_crc (crtc); + + dev_priv->display.crtc_disable (old_crtc_state, state); + crtc->active = false; +intel_fbc_disable (crtc); +intel_disable_shared_dpll (old_crtc_state); + +/* +* Underruns don't always raise interrupts, +* so check manually. +*/ +intel_check_cpu_fifo_underruns (dev_priv); +intel_check_pch_fifo_underruns (dev_priv); + +/* FIXME unify this for all platforms */ +if (!new_crtc_state->base.active && + !HAS_GMCH (dev_priv) && + dev_priv->display.initial_watermarks) + dev_priv->display.initial_watermarks (state, + new_crtc_state); +} + +static void intel_commit_modeset_disables (struct intel_atomic_state *state) +{ +struct intel_crtc_state *new_crtc_state, *old_crtc_state; +struct intel_crtc *crtc; +int i; + +for_each_oldnew_intel_crtc_in_state (state, crtc, old_crtc_state, new_crtc_state, i) { +if (!needs_modeset (new_crtc_state)) +continue ; + +intel_pre_plane_update (old_crtc_state, new_crtc_state); + +if (old_crtc_state->base.active) +intel_old_crtc_state_disables (state, + old_crtc_state, + new_crtc_state, + crtc); + } +} +static void intel_commit_modeset_enables (struct intel_atomic_state *state) {struct intel_crtc *crtc;@@ -13938,42 +13993,10 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state) put_domains[crtc->pipe] =modeset_get_crtc_power_domains (new_crtc_state); } - -if (!needs_modeset (new_crtc_state)) -continue ; - -intel_pre_plane_update (old_crtc_state, new_crtc_state); - -if (old_crtc_state->base.active) { -intel_crtc_disable_planes (state, crtc); - -/* -* We need to disable pipe CRC before disabling the pipe, -* or we race against vblank off. -*/ -intel_crtc_disable_pipe_crc (crtc); - - dev_priv->display.crtc_disable (old_crtc_state, state); - crtc->active = false; -intel_fbc_disable (crtc); -intel_disable_shared_dpll (old_crtc_state); - -/* -* Underruns don't always raise -* interrupts, so check manually. -*/ -intel_check_cpu_fifo_underruns (dev_priv); -intel_check_pch_fifo_underruns (dev_priv); - -/* FIXME unify this for all platforms */ -if (!new_crtc_state->base.active && - !HAS_GMCH (dev_priv) && - dev_priv->display.initial_watermarks) - dev_priv->display.initial_watermarks (state, - new_crtc_state); - } } +intel_commit_modeset_disables (state); +/* FIXME: Eventually get rid of our crtc->config pointer */ for_each_new_intel_crtc_in_state (state, crtc, new_crtc_state, i) crtc->config = new_crtc_state;@@ -15929,6 +15952,7 @@ void intel_init_display_hooks(struct drm_i915_private *dev_priv) dev_priv->display.commit_modeset_enables = skl_commit_modeset_enables; else dev_priv->display.commit_modeset_enables = intel_commit_modeset_enables; + }static i915_reg_t i915_vgacntrl_reg (struct drm_i915_private *dev_priv)drivers/gpu/drm/i915/i915_drv.h +1
-0@@ -289,6 +289,7 @@ struct drm_i915_display_funcs {void (*crtc_disable)(struct intel_crtc_state *old_crtc_state,struct intel_atomic_state *old_state);void (*commit_modeset_enables)(struct intel_atomic_state *state); +void (*commit_modeset_disables)(struct intel_atomic_state *state);void (*audio_codec_enable)(struct intel_encoder *encoder,const struct intel_crtc_state *crtc_state,const struct drm_connector_state *conn_state);Signature · 1 line
2.19.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 2/2] drm/i915/display: Move the commit_tail() disable sequence to separate function
In reply to Manasi NavareOp 29-08-2019 om 00:47 schreef Manasi Navare:
Quoted 64 lines
Create a new function
intel_commit_modeset_disables()consistent with the naming in drm atomic helpers and similar to the enable function.
This helps better organize the disable sequence inatomic_commit_tail()No functional change
v4:
* Do not create a function pointer, just a function (Maarten) v3:
* Rebase (Manasi)
v2:
* Create a helper forold_crtc_statedisables (Lucas)Suggested-by Daniel Vetter <[email protected]>Cc Ville Syrjälä <[email protected]>Cc Maarten Lankhorst <[email protected]>Cc Matt Roper <[email protected]>Cc Jani Nikula <[email protected]>Signed-off-by Manasi Navare <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.c | 92 ++++++++++++-------- drivers/gpu/drm/i915/i915_drv.h | 1 + 2 files changed, 59 insertions(+), 34 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +32
-0@@ -13758,6 +13758,61 @@ static void intel_update_crtc(struct intel_crtc *crtc,intel_finish_crtc_commit (state, crtc); } +static void intel_old_crtc_state_disables (struct intel_atomic_state *state, +struct intel_crtc_state *old_crtc_state, +struct intel_crtc_state *new_crtc_state, +struct intel_crtc *crtc) +{ +struct drm_i915_private *dev_priv =to_i915 (state->base.dev); + +intel_crtc_disable_planes (state, crtc); + +/* +* We need to disable pipe CRC before disabling the pipe, +* or we race against vblank off. +*/ +intel_crtc_disable_pipe_crc (crtc); + + dev_priv->display.crtc_disable (old_crtc_state, state); + crtc->active = false; +intel_fbc_disable (crtc); +intel_disable_shared_dpll (old_crtc_state); + +/* +* Underruns don't always raise interrupts, +* so check manually. +*/ +intel_check_cpu_fifo_underruns (dev_priv); +intel_check_pch_fifo_underruns (dev_priv); + +/* FIXME unify this for all platforms */ +if (!new_crtc_state->base.active && + !HAS_GMCH (dev_priv) && + dev_priv->display.initial_watermarks) + dev_priv->display.initial_watermarks(state,
drivers/gpu/drm/i915/display/intel_display.c static void intel_update_crtc(struct intel_crtc *crtc, · line 13802
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_display.c +10
-0+ new_crtc_state); +} + +static void intel_commit_modeset_disables (struct intel_atomic_state *state) +{ +struct intel_crtc_state *new_crtc_state, *old_crtc_state; +struct intel_crtc *crtc; +int i; + +for_each_oldnew_intel_crtc_in_state (state, crtc, old_crtc_state, new_crtc_state, i) {
You dropped a for_each_*_reverse. :) Fix sent.
Quoted 73 lines
drivers/gpu/drm/i915/display/intel_display.c +15
-34+if (!needs_modeset (new_crtc_state)) +continue ; + +intel_pre_plane_update (old_crtc_state, new_crtc_state); + +if (old_crtc_state->base.active) +intel_old_crtc_state_disables (state, + old_crtc_state, + new_crtc_state, + crtc); + } +}static void intel_commit_modeset_enables (struct intel_atomic_state *state) {struct intel_crtc *crtc;@@ -13938,42 +13993,10 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state) put_domains[crtc->pipe] =modeset_get_crtc_power_domains (new_crtc_state); } - -if (!needs_modeset (new_crtc_state)) -continue ; - -intel_pre_plane_update (old_crtc_state, new_crtc_state); - -if (old_crtc_state->base.active) { -intel_crtc_disable_planes (state, crtc); - -/* -* We need to disable pipe CRC before disabling the pipe, -* or we race against vblank off. -*/ -intel_crtc_disable_pipe_crc (crtc); - - dev_priv->display.crtc_disable (old_crtc_state, state); - crtc->active = false; -intel_fbc_disable (crtc); -intel_disable_shared_dpll (old_crtc_state); - -/* -* Underruns don't always raise -* interrupts, so check manually. -*/ -intel_check_cpu_fifo_underruns (dev_priv); -intel_check_pch_fifo_underruns (dev_priv); - -/* FIXME unify this for all platforms */ -if (!new_crtc_state->base.active && - !HAS_GMCH (dev_priv) && - dev_priv->display.initial_watermarks) - dev_priv->display.initial_watermarks (state, - new_crtc_state); - } } +intel_commit_modeset_disables (state); +/* FIXME: Eventually get rid of our crtc->config pointer */ for_each_new_intel_crtc_in_state (state, crtc, new_crtc_state, i) crtc->config = new_crtc_state;@@ -15929,6 +15952,7 @@ void intel_init_display_hooks(struct drm_i915_private *dev_priv) dev_priv->display.commit_modeset_enables = skl_commit_modeset_enables; else dev_priv->display.commit_modeset_enables = intel_commit_modeset_enables; + }static i915_reg_t i915_vgacntrl_reg (struct drm_i915_private *dev_priv)drivers/gpu/drm/i915/i915_drv.h +0
-0
drivers/gpu/drm/i915/i915_drv.h struct drm_i915_display_funcs { · line 295
Quoted 7 lines
drivers/gpu/drm/i915/i915_drv.h +1
-0@@ -289,6 +289,7 @@ struct drm_i915_display_funcs {void (*crtc_disable)(struct intel_crtc_state *old_crtc_state,struct intel_atomic_state *old_state);void (*commit_modeset_enables)(struct intel_atomic_state *state); +void (*commit_modeset_disables)(struct intel_atomic_state *state);void (*audio_codec_enable)(struct intel_encoder *encoder,const struct intel_crtc_state *crtc_state,const struct drm_connector_state *conn_state);
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for Transcoder Port Sync preparation refactoring/renaming
In reply to Manasi Navare== Series Details ==
== Series Details ==
Series: Transcoder Port Sync preparation refactoring/renaming
URL : https://patchwork.freedesktop.org/series/65899/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6794 -> Patchwork_14208
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14208/
Known issues
------------
Here are the changes found in Patchwork_14208 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@kms_chamelium@dp-edid-read:
- fi-kbl-7500u: [PASS][1] -> [WARN][2] ([fdo#109483])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6794/fi-kbl-7500u/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14208/fi-kbl-7500u/igt@[email protected]
* igt@kms_frontbuffer_tracking@basic:
- fi-icl-u2: [PASS][3] -> [FAIL][4] ([fdo#103167])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6794/fi-icl-u2/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14208/fi-icl-u2/igt@[email protected]
#### Possible fixes ####
* igt@kms_chamelium@dp-crc-fast:
- fi-kbl-7500u: [FAIL][5] ([fdo#109483] / [fdo#109635 ]) -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6794/fi-kbl-7500u/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14208/fi-kbl-7500u/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#109483]: https://bugs.freedesktop.org/show_bug.cgi?id=109483
[fdo#109635 ]: https://bugs.freedesktop.org/show_bug.cgi?id=109635
Participating hosts (51 -> 44)
------------------------------
Additional (2): fi-hsw-peppy fi-gdg-551
Missing (9): fi-kbl-soraka fi-ilk-m540 fi-tgl-u fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-icl-y fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_6794 -> Patchwork_14208
CI-20190529: 20190529
CI_DRM_6794: a1a45a21f6fef00f6150dc151c23555aa851bf74 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5150: a4e8217bcdfef9bb523f26a9084bbf615a6e8abb @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_14208: 158585267b7aee23faf8d81b9888784d1181b4de @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
158585267b7a drm/i915/display: Move the commit_tail() disable sequence to commit_modeset_disables() hook 29272745c805 drm/i915/display: Rename update_crtcs() to commit_modeset_enables()
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14208/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.CHECKPATCH: warning for Transcoder Port Sync preparation refactoring/renaming (rev2)
In reply to Manasi Navare== Series Details ==
== Series Details ==
Series: Transcoder Port Sync preparation refactoring/renaming (rev2)
URL : https://patchwork.freedesktop.org/series/65899/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip f857f08fb9b0 drm/i915/display: Rename update_crtcs() to commit_modeset_enables() f9427f469d27 drm/i915/display: Move the commit_tail() disable sequence to separate function -:10: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line) #10: Create a new function intel_commit_modeset_disables() consistent with the naming
total: 0 errors, 1 warnings, 0 checks, 119 lines checked
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for Transcoder Port Sync preparation refactoring/renaming (rev2)
In reply to Manasi Navare== Series Details ==
== Series Details ==
Series: Transcoder Port Sync preparation refactoring/renaming (rev2)
URL : https://patchwork.freedesktop.org/series/65899/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6800 -> Patchwork_14218
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14218/
Known issues
------------
Here are the changes found in Patchwork_14218 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_suspend@basic-s3:
- fi-blb-e6850: [PASS][1] -> [INCOMPLETE][2] ([fdo#107718])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6800/fi-blb-e6850/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14218/fi-blb-e6850/igt@[email protected]
#### Possible fixes ####
* igt@gem_ctx_create@basic:
- fi-bxt-dsi: [INCOMPLETE][3] ([fdo#103927]) -> [PASS][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6800/fi-bxt-dsi/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14218/fi-bxt-dsi/igt@[email protected]
* igt@i915_selftest@live_gem_contexts:
- fi-cfl-guc: [INCOMPLETE][5] -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6800/fi-cfl-guc/igt@i915_selftest@live_gem_contexts.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14218/fi-cfl-guc/igt@i915_selftest@live_gem_contexts.html
* igt@kms_frontbuffer_tracking@basic:
- {fi-icl-u4}: [FAIL][7] ([fdo#103167]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6800/fi-icl-u4/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14218/fi-icl-u4/igt@[email protected]
- fi-icl-u2: [FAIL][9] ([fdo#103167]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6800/fi-icl-u2/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14218/fi-icl-u2/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#106107]: https://bugs.freedesktop.org/show_bug.cgi?id=106107
[fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718
Participating hosts (52 -> 43)
------------------------------
Missing (9): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-gdg-551 fi-icl-y fi-icl-guc fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_6800 -> Patchwork_14218
CI-20190529: 20190529
CI_DRM_6800: 88fa1d35a714b69fa2461f05ae9525dd76333dca @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5152: f9d17c54c6946eb6391fce88687f9b071be9446b @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_14218: f9427f469d277e54154a5177c469425afd16ae38 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
f9427f469d27 drm/i915/display: Move the commit_tail() disable sequence to separate function f857f08fb9b0 drm/i915/display: Rename update_crtcs() to commit_modeset_enables()
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14218/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for Transcoder Port Sync preparation refactoring/renaming
In reply to Manasi Navare== Series Details ==
== Series Details ==
Series: Transcoder Port Sync preparation refactoring/renaming
URL : https://patchwork.freedesktop.org/series/65899/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6794_full -> Patchwork_14208_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_14208_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_isolation@rcs0-s3:
- shard-apl: [PASS][1] -> [DMESG-WARN][2] ([fdo#108566]) +3 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6794/shard-apl7/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14208/shard-apl6/igt@[email protected]
* igt@gem_eio@in-flight-suspend:
- shard-skl: [PASS][3] -> [INCOMPLETE][4] ([fdo#104108])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6794/shard-skl10/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14208/shard-skl1/igt@[email protected]
* igt@gem_exec_schedule@preempt-other-chain-bsd:
- shard-iclb: [PASS][5] -> [SKIP][6] ([fdo#111325]) +4 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6794/shard-iclb6/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14208/shard-iclb4/igt@[email protected]
* igt@gem_exec_schedule@preempt-queue-bsd2:
- shard-iclb: [PASS][7] -> [SKIP][8] ([fdo#109276]) +18 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6794/shard-iclb1/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14208/shard-iclb8/igt@[email protected]
* igt@gem_wait@busy-bcs0:
- shard-apl: [PASS][9] -> [INCOMPLETE][10] ([fdo#103927]) +1 similar issue
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6794/shard-apl6/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14208/shard-apl1/igt@[email protected]
* igt@kms_cursor_crc@pipe-a-cursor-128x42-onscreen:
- shard-apl: [PASS][11] -> [FAIL][12] ([fdo#103232])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6794/shard-apl6/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14208/shard-apl1/igt@[email protected]
* igt@kms_draw_crc@draw-method-xrgb8888-mmap-gtt-xtiled:
- shard-iclb: [PASS][13] -> [FAIL][14] ([fdo#103184] / [fdo#103232])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6794/shard-iclb5/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14208/shard-iclb8/igt@[email protected]
* igt@kms_flip@basic-flip-vs-modeset:
- shard-iclb: [PASS][15] -> [INCOMPLETE][16] ([fdo#107713])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6794/shard-iclb3/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14208/shard-iclb7/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-shrfb-msflip-blt:
- shard-iclb: [PASS][17] -> [FAIL][18] ([fdo#103167]) +5 similar issues
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6794/shard-iclb4/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14208/shard-iclb1/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-mmap-wc:
- shard-skl: [PASS][19] -> [FAIL][20] ([fdo#103167]) +2 similar issues
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6794/shard-skl1/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-mmap-wc.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14208/shard-skl6/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-mmap-wc.html
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
- shard-kbl: [PASS][21] -> [DMESG-WARN][22] ([fdo#108566])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6794/shard-kbl6/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14208/shard-kbl3/igt@[email protected]
* igt@kms_psr@psr2_sprite_plane_move:
- shard-iclb: [PASS][23] -> [SKIP][24] ([fdo#109441]) +1 similar issue
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6794/shard-iclb2/igt@kms_psr@psr2_sprite_plane_move.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14208/shard-iclb6/igt@kms_psr@psr2_sprite_plane_move.html
#### Possible fixes ####
* igt@gem_ctx_shared@exec-single-timeline-bsd:
- shard-iclb: [SKIP][25] ([fdo#110841]) -> [PASS][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6794/shard-iclb4/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14208/shard-iclb3/igt@[email protected]
* igt@gem_eio@reset-stress:
- shard-snb: [FAIL][27] ([fdo#109661]) -> [PASS][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6794/shard-snb5/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14208/shard-snb7/igt@[email protected]
* igt@gem_exec_balancer@smoke:
- shard-iclb: [SKIP][29] ([fdo#110854]) -> [PASS][30]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6794/shard-iclb8/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14208/shard-iclb4/igt@[email protected]
* igt@gem_exec_schedule@promotion-bsd1:
- shard-iclb: [SKIP][31] ([fdo#109276]) -> [PASS][32] +15 similar issues
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6794/shard-iclb8/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14208/shard-iclb4/igt@[email protected]
* igt@gem_exec_schedule@reorder-wide-bsd:
- shard-iclb: [SKIP][33] ([fdo#111325]) -> [PASS][34] +4 similar issues
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6794/shard-iclb1/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14208/shard-iclb8/igt@[email protected]
* igt@kms_cursor_crc@pipe-a-cursor-128x42-random:
- shard-skl: [FAIL][35] ([fdo#103232]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6794/shard-skl7/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14208/shard-skl4/igt@[email protected]
* igt@kms_cursor_legacy@2x-long-flip-vs-cursor-atomic:
- shard-glk: [FAIL][37] ([fdo#104873]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6794/shard-glk9/igt@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14208/shard-glk7/igt@[email protected]
* igt@kms_cursor_legacy@cursor-vs-flip-toggle:
- shard-hsw: [FAIL][39] ([fdo#103355]) -> [PASS][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6794/shard-hsw6/igt@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14208/shard-hsw8/igt@[email protected]
* igt@kms_cursor_legacy@flip-vs-cursor-varying-size:
- shard-skl: [FAIL][41] ([fdo#102670] / [fdo#106081]) -> [PASS][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6794/shard-skl2/igt@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14208/shard-skl10/igt@[email protected]
* igt@kms_flip@flip-vs-expired-vblank:
- shard-skl: [FAIL][43] ([fdo#105363]) -> [PASS][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6794/shard-skl2/igt@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14208/shard-skl9/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbc-indfb-scaledprimary:
- shard-iclb: [FAIL][45] ([fdo#103167]) -> [PASS][46] +2 similar issues
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6794/shard-iclb4/igt@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14208/shard-iclb3/igt@[email protected]
* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes:
- shard-apl: [DMESG-WARN][47] ([fdo#108566]) -> [PASS][48] +3 similar issues
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6794/shard-apl5/igt@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14208/shard-apl2/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
- shard-skl: [FAIL][49] ([fdo#108145] / [fdo#110403]) -> [PASS][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6794/shard-skl9/igt@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14208/shard-skl9/igt@[email protected]
* igt@kms_plane_lowres@pipe-a-tiling-x:
- shard-iclb: [FAIL][51] ([fdo#103166]) -> [PASS][52] +1 similar issue
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6794/shard-iclb5/igt@[email protected]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14208/shard-iclb8/igt@[email protected]
* igt@kms_psr@psr2_suspend:
- shard-iclb: [SKIP][53] ([fdo#109441]) -> [PASS][54] +1 similar issue
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6794/shard-iclb6/igt@kms_psr@psr2_suspend.html
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14208/shard-iclb2/igt@kms_psr@psr2_suspend.html
* igt@kms_setmode@basic:
- shard-hsw: [FAIL][55] ([fdo#99912]) -> [PASS][56]
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6794/shard-hsw4/igt@[email protected]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14208/shard-hsw6/igt@[email protected]
* igt@perf@blocking:
- shard-skl: [FAIL][57] ([fdo#110728]) -> [PASS][58] +1 similar issue
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6794/shard-skl2/igt@[email protected]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14208/shard-skl10/igt@[email protected]
#### Warnings ####
* igt@gem_mocs_settings@mocs-isolation-bsd2:
- shard-iclb: [SKIP][59] ([fdo#109276]) -> [FAIL][60] ([fdo#111330])
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6794/shard-iclb6/igt@[email protected]
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14208/shard-iclb4/igt@[email protected]
* igt@gem_mocs_settings@mocs-rc6-bsd2:
- shard-iclb: [FAIL][61] ([fdo#111330]) -> [SKIP][62] ([fdo#109276])
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6794/shard-iclb1/igt@[email protected]
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14208/shard-iclb3/igt@[email protected]
[fdo#102670]: https://bugs.freedesktop.org/show_bug.cgi?id=102670
[fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103184]: https://bugs.freedesktop.org/show_bug.cgi?id=103184
[fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232
[fdo#103355]: https://bugs.freedesktop.org/show_bug.cgi?id=103355
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
[fdo#104873]: https://bugs.freedesktop.org/show_bug.cgi?id=104873
[fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
[fdo#106081]: https://bugs.freedesktop.org/show_bug.cgi?id=106081
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
[fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109661]: https://bugs.freedesktop.org/show_bug.cgi?id=109661
[fdo#110403]: https://bugs.freedesktop.org/show_bug.cgi?id=110403
[fdo#110728]: https://bugs.freedesktop.org/show_bug.cgi?id=110728
[fdo#110841]: https://bugs.freedesktop.org/show_bug.cgi?id=110841
[fdo#110854]: https://bugs.freedesktop.org/show_bug.cgi?id=110854
[fdo#111325]: https://bugs.freedesktop.org/show_bug.cgi?id=111325
[fdo#111330]: https://bugs.freedesktop.org/show_bug.cgi?id=111330
[fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912
Participating hosts (10 -> 10)
------------------------------
No changes in participating hosts
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_6794 -> Patchwork_14208
CI-20190529: 20190529
CI_DRM_6794: a1a45a21f6fef00f6150dc151c23555aa851bf74 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5150: a4e8217bcdfef9bb523f26a9084bbf615a6e8abb @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_14208: 158585267b7aee23faf8d81b9888784d1181b4de @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14208/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for Transcoder Port Sync preparation refactoring/renaming (rev2)
In reply to Manasi Navare== Series Details ==
== Series Details ==
Series: Transcoder Port Sync preparation refactoring/renaming (rev2)
URL : https://patchwork.freedesktop.org/series/65899/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6800_full -> Patchwork_14218_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_14218_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_schedule@preempt-other-chain-bsd:
- shard-iclb: [PASS][1] -> [SKIP][2] ([fdo#111325]) +2 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6800/shard-iclb7/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14218/shard-iclb4/igt@[email protected]
* igt@gem_exec_schedule@preempt-queue-bsd1:
- shard-iclb: [PASS][3] -> [SKIP][4] ([fdo#109276]) +20 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6800/shard-iclb1/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14218/shard-iclb6/igt@[email protected]
* igt@i915_suspend@fence-restore-tiled2untiled:
- shard-apl: [PASS][5] -> [DMESG-WARN][6] ([fdo#108566]) +5 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6800/shard-apl8/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14218/shard-apl5/igt@[email protected]
* igt@kms_cursor_crc@pipe-c-cursor-suspend:
- shard-kbl: [PASS][7] -> [DMESG-WARN][8] ([fdo#108566]) +1 similar issue
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6800/shard-kbl1/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14218/shard-kbl6/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-indfb-draw-blt:
- shard-iclb: [PASS][9] -> [FAIL][10] ([fdo#103167]) +3 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6800/shard-iclb7/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14218/shard-iclb2/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbcpsr-1p-rte:
- shard-iclb: [PASS][11] -> [FAIL][12] ([fdo#103167] / [fdo#110378])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6800/shard-iclb5/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14218/shard-iclb2/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
- shard-skl: [PASS][13] -> [FAIL][14] ([fdo#108145] / [fdo#110403])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6800/shard-skl9/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14218/shard-skl1/igt@[email protected]
* igt@kms_psr2_su@page_flip:
- shard-iclb: [PASS][15] -> [SKIP][16] ([fdo#109642] / [fdo#111068])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6800/shard-iclb2/igt@kms_psr2_su@page_flip.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14218/shard-iclb7/igt@kms_psr2_su@page_flip.html
* igt@kms_psr@psr2_primary_page_flip:
- shard-iclb: [PASS][17] -> [SKIP][18] ([fdo#109441]) +4 similar issues
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6800/shard-iclb2/igt@kms_psr@psr2_primary_page_flip.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14218/shard-iclb7/igt@kms_psr@psr2_primary_page_flip.html
* igt@kms_setmode@basic:
- shard-apl: [PASS][19] -> [FAIL][20] ([fdo#99912])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6800/shard-apl1/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14218/shard-apl5/igt@[email protected]
- shard-skl: [PASS][21] -> [FAIL][22] ([fdo#99912])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6800/shard-skl1/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14218/shard-skl7/igt@[email protected]
- shard-kbl: [PASS][23] -> [FAIL][24] ([fdo#99912])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6800/shard-kbl7/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14218/shard-kbl2/igt@[email protected]
* igt@perf@short-reads:
- shard-kbl: [PASS][25] -> [FAIL][26] ([fdo#103183])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6800/shard-kbl2/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14218/shard-kbl6/igt@[email protected]
* igt@perf_pmu@rc6:
- shard-kbl: [PASS][27] -> [SKIP][28] ([fdo#109271])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6800/shard-kbl4/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14218/shard-kbl4/igt@[email protected]
#### Possible fixes ####
* igt@gem_ctx_isolation@bcs0-s3:
- shard-apl: [DMESG-WARN][29] ([fdo#108566]) -> [PASS][30] +3 similar issues
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6800/shard-apl6/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14218/shard-apl2/igt@[email protected]
- shard-skl: [INCOMPLETE][31] ([fdo#104108]) -> [PASS][32] +2 similar issues
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6800/shard-skl7/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14218/shard-skl9/igt@[email protected]
* igt@gem_ctx_shared@exec-single-timeline-bsd:
- shard-iclb: [SKIP][33] ([fdo#110841]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6800/shard-iclb1/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14218/shard-iclb6/igt@[email protected]
* igt@gem_exec_balancer@smoke:
- shard-iclb: [SKIP][35] ([fdo#110854]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6800/shard-iclb7/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14218/shard-iclb4/igt@[email protected]
* igt@gem_exec_schedule@reorder-wide-bsd:
- shard-iclb: [SKIP][37] ([fdo#111325]) -> [PASS][38] +9 similar issues
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6800/shard-iclb2/igt@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14218/shard-iclb7/igt@[email protected]
* igt@i915_selftest@live_gem_contexts:
- shard-kbl: [INCOMPLETE][39] ([fdo#103665]) -> [PASS][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6800/shard-kbl7/igt@i915_selftest@live_gem_contexts.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14218/shard-kbl2/igt@i915_selftest@live_gem_contexts.html
* igt@kms_cursor_crc@pipe-b-cursor-suspend:
- shard-skl: [INCOMPLETE][41] ([fdo#110741]) -> [PASS][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6800/shard-skl9/igt@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14218/shard-skl9/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-blt:
- shard-iclb: [FAIL][43] ([fdo#103167]) -> [PASS][44] +2 similar issues
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6800/shard-iclb2/igt@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14218/shard-iclb1/igt@[email protected]
* igt@kms_psr@psr2_sprite_plane_move:
- shard-iclb: [SKIP][45] ([fdo#109441]) -> [PASS][46] +2 similar issues
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6800/shard-iclb7/igt@kms_psr@psr2_sprite_plane_move.html
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14218/shard-iclb2/igt@kms_psr@psr2_sprite_plane_move.html
* igt@perf@blocking:
- shard-skl: [FAIL][47] ([fdo#110728]) -> [PASS][48]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6800/shard-skl5/igt@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14218/shard-skl8/igt@[email protected]
* igt@prime_busy@hang-bsd2:
- shard-iclb: [SKIP][49] ([fdo#109276]) -> [PASS][50] +18 similar issues
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6800/shard-iclb7/igt@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14218/shard-iclb2/igt@[email protected]
#### Warnings ####
* igt@gem_mocs_settings@mocs-settings-bsd2:
- shard-iclb: [FAIL][51] ([fdo#111330]) -> [SKIP][52] ([fdo#109276]) +2 similar issues
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6800/shard-iclb1/igt@[email protected]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14218/shard-iclb6/igt@[email protected]
* igt@kms_dp_dsc@basic-dsc-enable-edp:
- shard-iclb: [DMESG-WARN][53] ([fdo#107724]) -> [SKIP][54] ([fdo#109349])
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6800/shard-iclb2/igt@[email protected]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14218/shard-iclb5/igt@[email protected]
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103183]: https://bugs.freedesktop.org/show_bug.cgi?id=103183
[fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665
[fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
[fdo#109349]: https://bugs.freedesktop.org/show_bug.cgi?id=109349
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#110378]: https://bugs.freedesktop.org/show_bug.cgi?id=110378
[fdo#110403]: https://bugs.freedesktop.org/show_bug.cgi?id=110403
[fdo#110728]: https://bugs.freedesktop.org/show_bug.cgi?id=110728
[fdo#110741]: https://bugs.freedesktop.org/show_bug.cgi?id=110741
[fdo#110841]: https://bugs.freedesktop.org/show_bug.cgi?id=110841
[fdo#110854]: https://bugs.freedesktop.org/show_bug.cgi?id=110854
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#111325]: https://bugs.freedesktop.org/show_bug.cgi?id=111325
[fdo#111330]: https://bugs.freedesktop.org/show_bug.cgi?id=111330
[fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912
Participating hosts (10 -> 10)
------------------------------
No changes in participating hosts
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_6800 -> Patchwork_14218
CI-20190529: 20190529
CI_DRM_6800: 88fa1d35a714b69fa2461f05ae9525dd76333dca @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5152: f9d17c54c6946eb6391fce88687f9b071be9446b @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_14218: f9427f469d277e54154a5177c469425afd16ae38 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14218/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx