* [PATCH] drm/i915: Nuke drm_crtc_state and use intel_atomic_state instead
@ 2019-04-11 23:02 Manasi Navare
2019-04-12 0:42 ` ✗ Fi.CI.BAT: failure for " Patchwork
` (6 more replies)
0 siblings, 7 replies; 13+ messages in thread
From: Manasi Navare @ 2019-04-11 23:02 UTC (permalink / raw)
To: intel-gfx
This is one of the patches to start replacing drm pointers
and use the intel_atomic_state and intel_crtc to derive
the necessary intel state variables required for the intel
modeset functions.
Suggested-by: Ville Syrjala <ville.syrjala@linux.intel.com>
Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
Signed-off-by: Manasi Navare <manasi.d.navare@intel.com>
---
drivers/gpu/drm/i915/intel_display.c | 38 +++++++++++++---------------
1 file changed, 18 insertions(+), 20 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index f29a348e8d71..062b9e86a987 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -125,8 +125,8 @@ static void vlv_prepare_pll(struct intel_crtc *crtc,
const struct intel_crtc_state *pipe_config);
static void chv_prepare_pll(struct intel_crtc *crtc,
const struct intel_crtc_state *pipe_config);
-static void intel_begin_crtc_commit(struct drm_crtc *, struct drm_crtc_state *);
-static void intel_finish_crtc_commit(struct drm_crtc *, struct drm_crtc_state *);
+static void intel_begin_crtc_commit(struct intel_crtc *, struct intel_atomic_state *);
+static void intel_finish_crtc_commit(struct intel_crtc *, struct intel_atomic_state *);
static void intel_crtc_init_scalers(struct intel_crtc *crtc,
struct intel_crtc_state *crtc_state);
static void skylake_pfit_enable(const struct intel_crtc_state *crtc_state);
@@ -13273,14 +13273,14 @@ static void intel_update_crtc(struct drm_crtc *crtc,
else if (new_plane_state)
intel_fbc_enable(intel_crtc, pipe_config, new_plane_state);
- intel_begin_crtc_commit(crtc, old_crtc_state);
+ intel_begin_crtc_commit(intel_crtc, to_intel_atomic_state(state));
if (INTEL_GEN(dev_priv) >= 9)
skl_update_planes_on_crtc(to_intel_atomic_state(state), intel_crtc);
else
i9xx_update_planes_on_crtc(to_intel_atomic_state(state), intel_crtc);
- intel_finish_crtc_commit(crtc, old_crtc_state);
+ intel_finish_crtc_commit(intel_crtc, to_intel_atomic_state(state));
}
static void intel_update_crtcs(struct drm_atomic_state *state)
@@ -14070,18 +14070,16 @@ skl_max_scale(const struct intel_crtc_state *crtc_state,
return max_scale;
}
-static void intel_begin_crtc_commit(struct drm_crtc *crtc,
- struct drm_crtc_state *old_crtc_state)
+static void intel_begin_crtc_commit(struct intel_crtc *crtc,
+ struct intel_atomic_state *state)
{
- struct drm_device *dev = crtc->dev;
+ struct drm_device *dev = crtc->base.dev;
struct drm_i915_private *dev_priv = to_i915(dev);
- struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
struct intel_crtc_state *old_intel_cstate =
- to_intel_crtc_state(old_crtc_state);
- struct intel_atomic_state *old_intel_state =
- to_intel_atomic_state(old_crtc_state->state);
+ intel_atomic_get_old_crtc_state(state,
+ crtc);
struct intel_crtc_state *intel_cstate =
- intel_atomic_get_new_crtc_state(old_intel_state, intel_crtc);
+ intel_atomic_get_new_crtc_state(state, crtc);
bool modeset = needs_modeset(&intel_cstate->base);
/* Perform vblank evasion around commit operation */
@@ -14101,7 +14099,7 @@ static void intel_begin_crtc_commit(struct drm_crtc *crtc,
out:
if (dev_priv->display.atomic_update_watermarks)
- dev_priv->display.atomic_update_watermarks(old_intel_state,
+ dev_priv->display.atomic_update_watermarks(state,
intel_cstate);
}
@@ -14121,21 +14119,21 @@ void intel_crtc_arm_fifo_underrun(struct intel_crtc *crtc,
}
}
-static void intel_finish_crtc_commit(struct drm_crtc *crtc,
- struct drm_crtc_state *old_crtc_state)
+static void intel_finish_crtc_commit(struct intel_crtc *crtc,
+ struct intel_atomic_state *state)
{
- struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
- struct intel_atomic_state *old_intel_state =
- to_intel_atomic_state(old_crtc_state->state);
+ struct drm_crtc_state *old_crtc_state =
+ &intel_atomic_get_old_crtc_state(state,
+ crtc)->base;
struct intel_crtc_state *new_crtc_state =
- intel_atomic_get_new_crtc_state(old_intel_state, intel_crtc);
+ intel_atomic_get_new_crtc_state(state, crtc);
intel_pipe_update_end(new_crtc_state);
if (new_crtc_state->update_pipe &&
!needs_modeset(&new_crtc_state->base) &&
old_crtc_state->mode.private_flags & I915_MODE_FLAG_INHERITED)
- intel_crtc_arm_fifo_underrun(intel_crtc, new_crtc_state);
+ intel_crtc_arm_fifo_underrun(crtc, new_crtc_state);
}
/**
--
2.19.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 13+ messages in thread
* ✗ Fi.CI.BAT: failure for drm/i915: Nuke drm_crtc_state and use intel_atomic_state instead
2019-04-11 23:02 [PATCH] drm/i915: Nuke drm_crtc_state and use intel_atomic_state instead Manasi Navare
@ 2019-04-12 0:42 ` Patchwork
2019-04-12 6:11 ` [PATCH] " Ville Syrjälä
` (5 subsequent siblings)
6 siblings, 0 replies; 13+ messages in thread
From: Patchwork @ 2019-04-12 0:42 UTC (permalink / raw)
To: Manasi Navare; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Nuke drm_crtc_state and use intel_atomic_state instead
URL : https://patchwork.freedesktop.org/series/59363/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_5917 -> Patchwork_12769
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_12769 absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_12769, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
External URL: https://patchwork.freedesktop.org/api/1.0/series/59363/revisions/1/mbox/
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_12769:
### IGT changes ###
#### Possible regressions ####
* igt@gem_busy@basic-busy-default:
- fi-icl-y: PASS -> INCOMPLETE
Known issues
------------
Here are the changes found in Patchwork_12769 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_basic@gtt-bsd2:
- fi-byt-clapper: NOTRUN -> SKIP [fdo#109271] +52
* igt@gem_exec_basic@readonly-bsd1:
- fi-snb-2520m: NOTRUN -> SKIP [fdo#109271] +52
* igt@gem_exec_store@basic-bsd2:
- fi-hsw-4770: NOTRUN -> SKIP [fdo#109271] +41
* igt@i915_module_load@reload:
- fi-blb-e6850: PASS -> INCOMPLETE [fdo#107718]
* igt@kms_busy@basic-flip-c:
- fi-byt-clapper: NOTRUN -> SKIP [fdo#109271] / [fdo#109278]
- fi-snb-2520m: NOTRUN -> SKIP [fdo#109271] / [fdo#109278]
* igt@kms_frontbuffer_tracking@basic:
- fi-byt-clapper: NOTRUN -> FAIL [fdo#103167]
#### Possible fixes ####
* igt@i915_selftest@live_execlists:
- fi-apl-guc: INCOMPLETE [fdo#103927] / [fdo#109720] -> PASS
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109720]: https://bugs.freedesktop.org/show_bug.cgi?id=109720
Participating hosts (47 -> 43)
------------------------------
Additional (3): fi-hsw-4770 fi-byt-clapper fi-snb-2520m
Missing (7): fi-kbl-soraka fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-gdg-551 fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_5917 -> Patchwork_12769
CI_DRM_5917: b01c0e68e8d1092c436dbba4d03b260c828f37c9 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4944: 9b74b8226e8c108db091bd3b1d105a71dc0fb861 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_12769: ca70ec970e00607d2b759e098067b1a6b1b567ee @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
ca70ec970e00 drm/i915: Nuke drm_crtc_state and use intel_atomic_state instead
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12769/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] drm/i915: Nuke drm_crtc_state and use intel_atomic_state instead
2019-04-11 23:02 [PATCH] drm/i915: Nuke drm_crtc_state and use intel_atomic_state instead Manasi Navare
2019-04-12 0:42 ` ✗ Fi.CI.BAT: failure for " Patchwork
@ 2019-04-12 6:11 ` Ville Syrjälä
2019-04-12 19:58 ` Manasi Navare
2019-04-12 21:22 ` [PATCH v2] " Manasi Navare
` (4 subsequent siblings)
6 siblings, 1 reply; 13+ messages in thread
From: Ville Syrjälä @ 2019-04-12 6:11 UTC (permalink / raw)
To: Manasi Navare; +Cc: intel-gfx
On Thu, Apr 11, 2019 at 04:02:54PM -0700, Manasi Navare wrote:
> This is one of the patches to start replacing drm pointers
> and use the intel_atomic_state and intel_crtc to derive
> the necessary intel state variables required for the intel
> modeset functions.
>
> Suggested-by: Ville Syrjala <ville.syrjala@linux.intel.com>
> Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
> Signed-off-by: Manasi Navare <manasi.d.navare@intel.com>
> ---
> drivers/gpu/drm/i915/intel_display.c | 38 +++++++++++++---------------
> 1 file changed, 18 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index f29a348e8d71..062b9e86a987 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -125,8 +125,8 @@ static void vlv_prepare_pll(struct intel_crtc *crtc,
> const struct intel_crtc_state *pipe_config);
> static void chv_prepare_pll(struct intel_crtc *crtc,
> const struct intel_crtc_state *pipe_config);
> -static void intel_begin_crtc_commit(struct drm_crtc *, struct drm_crtc_state *);
> -static void intel_finish_crtc_commit(struct drm_crtc *, struct drm_crtc_state *);
> +static void intel_begin_crtc_commit(struct intel_crtc *, struct intel_atomic_state *);
> +static void intel_finish_crtc_commit(struct intel_crtc *, struct intel_atomic_state *);
> static void intel_crtc_init_scalers(struct intel_crtc *crtc,
> struct intel_crtc_state *crtc_state);
> static void skylake_pfit_enable(const struct intel_crtc_state *crtc_state);
> @@ -13273,14 +13273,14 @@ static void intel_update_crtc(struct drm_crtc *crtc,
> else if (new_plane_state)
> intel_fbc_enable(intel_crtc, pipe_config, new_plane_state);
>
> - intel_begin_crtc_commit(crtc, old_crtc_state);
> + intel_begin_crtc_commit(intel_crtc, to_intel_atomic_state(state));
>
> if (INTEL_GEN(dev_priv) >= 9)
> skl_update_planes_on_crtc(to_intel_atomic_state(state), intel_crtc);
> else
> i9xx_update_planes_on_crtc(to_intel_atomic_state(state), intel_crtc);
>
> - intel_finish_crtc_commit(crtc, old_crtc_state);
> + intel_finish_crtc_commit(intel_crtc, to_intel_atomic_state(state));
> }
>
> static void intel_update_crtcs(struct drm_atomic_state *state)
> @@ -14070,18 +14070,16 @@ skl_max_scale(const struct intel_crtc_state *crtc_state,
> return max_scale;
> }
>
> -static void intel_begin_crtc_commit(struct drm_crtc *crtc,
> - struct drm_crtc_state *old_crtc_state)
> +static void intel_begin_crtc_commit(struct intel_crtc *crtc,
> + struct intel_atomic_state *state)
Flip the arguments around to be consistent with existing code.
> {
> - struct drm_device *dev = crtc->dev;
> + struct drm_device *dev = crtc->base.dev;
That can be killed as well.
> struct drm_i915_private *dev_priv = to_i915(dev);
> - struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
> struct intel_crtc_state *old_intel_cstate =
Please rename to old_crtc_state, and similarly for new_crtc_state.
> - to_intel_crtc_state(old_crtc_state);
> - struct intel_atomic_state *old_intel_state =
> - to_intel_atomic_state(old_crtc_state->state);
> + intel_atomic_get_old_crtc_state(state,
> + crtc);
Too many newlines.
> struct intel_crtc_state *intel_cstate =
> - intel_atomic_get_new_crtc_state(old_intel_state, intel_crtc);
> + intel_atomic_get_new_crtc_state(state, crtc);
> bool modeset = needs_modeset(&intel_cstate->base);
>
> /* Perform vblank evasion around commit operation */
> @@ -14101,7 +14099,7 @@ static void intel_begin_crtc_commit(struct drm_crtc *crtc,
>
> out:
> if (dev_priv->display.atomic_update_watermarks)
> - dev_priv->display.atomic_update_watermarks(old_intel_state,
> + dev_priv->display.atomic_update_watermarks(state,
> intel_cstate);
> }
>
> @@ -14121,21 +14119,21 @@ void intel_crtc_arm_fifo_underrun(struct intel_crtc *crtc,
> }
> }
>
> -static void intel_finish_crtc_commit(struct drm_crtc *crtc,
> - struct drm_crtc_state *old_crtc_state)
> +static void intel_finish_crtc_commit(struct intel_crtc *crtc,
> + struct intel_atomic_state *state)
> {
> - struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
> - struct intel_atomic_state *old_intel_state =
> - to_intel_atomic_state(old_crtc_state->state);
> + struct drm_crtc_state *old_crtc_state =
Pls convert this to intel type as well.
> + &intel_atomic_get_old_crtc_state(state,
> + crtc)->base;
> struct intel_crtc_state *new_crtc_state =
> - intel_atomic_get_new_crtc_state(old_intel_state, intel_crtc);
> + intel_atomic_get_new_crtc_state(state, crtc);
>
> intel_pipe_update_end(new_crtc_state);
>
> if (new_crtc_state->update_pipe &&
> !needs_modeset(&new_crtc_state->base) &&
> old_crtc_state->mode.private_flags & I915_MODE_FLAG_INHERITED)
> - intel_crtc_arm_fifo_underrun(intel_crtc, new_crtc_state);
> + intel_crtc_arm_fifo_underrun(crtc, new_crtc_state);
> }
>
> /**
> --
> 2.19.1
--
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] drm/i915: Nuke drm_crtc_state and use intel_atomic_state instead
2019-04-12 6:11 ` [PATCH] " Ville Syrjälä
@ 2019-04-12 19:58 ` Manasi Navare
0 siblings, 0 replies; 13+ messages in thread
From: Manasi Navare @ 2019-04-12 19:58 UTC (permalink / raw)
To: Ville Syrjälä; +Cc: intel-gfx
On Fri, Apr 12, 2019 at 09:11:58AM +0300, Ville Syrjälä wrote:
> On Thu, Apr 11, 2019 at 04:02:54PM -0700, Manasi Navare wrote:
> > This is one of the patches to start replacing drm pointers
> > and use the intel_atomic_state and intel_crtc to derive
> > the necessary intel state variables required for the intel
> > modeset functions.
> >
> > Suggested-by: Ville Syrjala <ville.syrjala@linux.intel.com>
> > Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
> > Signed-off-by: Manasi Navare <manasi.d.navare@intel.com>
> > ---
> > drivers/gpu/drm/i915/intel_display.c | 38 +++++++++++++---------------
> > 1 file changed, 18 insertions(+), 20 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> > index f29a348e8d71..062b9e86a987 100644
> > --- a/drivers/gpu/drm/i915/intel_display.c
> > +++ b/drivers/gpu/drm/i915/intel_display.c
> > @@ -125,8 +125,8 @@ static void vlv_prepare_pll(struct intel_crtc *crtc,
> > const struct intel_crtc_state *pipe_config);
> > static void chv_prepare_pll(struct intel_crtc *crtc,
> > const struct intel_crtc_state *pipe_config);
> > -static void intel_begin_crtc_commit(struct drm_crtc *, struct drm_crtc_state *);
> > -static void intel_finish_crtc_commit(struct drm_crtc *, struct drm_crtc_state *);
> > +static void intel_begin_crtc_commit(struct intel_crtc *, struct intel_atomic_state *);
> > +static void intel_finish_crtc_commit(struct intel_crtc *, struct intel_atomic_state *);
> > static void intel_crtc_init_scalers(struct intel_crtc *crtc,
> > struct intel_crtc_state *crtc_state);
> > static void skylake_pfit_enable(const struct intel_crtc_state *crtc_state);
> > @@ -13273,14 +13273,14 @@ static void intel_update_crtc(struct drm_crtc *crtc,
> > else if (new_plane_state)
> > intel_fbc_enable(intel_crtc, pipe_config, new_plane_state);
> >
> > - intel_begin_crtc_commit(crtc, old_crtc_state);
> > + intel_begin_crtc_commit(intel_crtc, to_intel_atomic_state(state));
> >
> > if (INTEL_GEN(dev_priv) >= 9)
> > skl_update_planes_on_crtc(to_intel_atomic_state(state), intel_crtc);
> > else
> > i9xx_update_planes_on_crtc(to_intel_atomic_state(state), intel_crtc);
> >
> > - intel_finish_crtc_commit(crtc, old_crtc_state);
> > + intel_finish_crtc_commit(intel_crtc, to_intel_atomic_state(state));
> > }
> >
> > static void intel_update_crtcs(struct drm_atomic_state *state)
> > @@ -14070,18 +14070,16 @@ skl_max_scale(const struct intel_crtc_state *crtc_state,
> > return max_scale;
> > }
> >
> > -static void intel_begin_crtc_commit(struct drm_crtc *crtc,
> > - struct drm_crtc_state *old_crtc_state)
> > +static void intel_begin_crtc_commit(struct intel_crtc *crtc,
> > + struct intel_atomic_state *state)
>
> Flip the arguments around to be consistent with existing code.
But most functions have the modeset object (crtc, plane etc) as the first argument
then the state.
Do you still want to flip the arguments?
Manasi
>
> > {
> > - struct drm_device *dev = crtc->dev;
> > + struct drm_device *dev = crtc->base.dev;
>
> That can be killed as well.
>
> > struct drm_i915_private *dev_priv = to_i915(dev);
> > - struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
> > struct intel_crtc_state *old_intel_cstate =
>
> Please rename to old_crtc_state, and similarly for new_crtc_state.
>
> > - to_intel_crtc_state(old_crtc_state);
> > - struct intel_atomic_state *old_intel_state =
> > - to_intel_atomic_state(old_crtc_state->state);
> > + intel_atomic_get_old_crtc_state(state,
> > + crtc);
>
> Too many newlines.
>
> > struct intel_crtc_state *intel_cstate =
> > - intel_atomic_get_new_crtc_state(old_intel_state, intel_crtc);
> > + intel_atomic_get_new_crtc_state(state, crtc);
> > bool modeset = needs_modeset(&intel_cstate->base);
> >
> > /* Perform vblank evasion around commit operation */
> > @@ -14101,7 +14099,7 @@ static void intel_begin_crtc_commit(struct drm_crtc *crtc,
> >
> > out:
> > if (dev_priv->display.atomic_update_watermarks)
> > - dev_priv->display.atomic_update_watermarks(old_intel_state,
> > + dev_priv->display.atomic_update_watermarks(state,
> > intel_cstate);
> > }
> >
> > @@ -14121,21 +14119,21 @@ void intel_crtc_arm_fifo_underrun(struct intel_crtc *crtc,
> > }
> > }
> >
> > -static void intel_finish_crtc_commit(struct drm_crtc *crtc,
> > - struct drm_crtc_state *old_crtc_state)
> > +static void intel_finish_crtc_commit(struct intel_crtc *crtc,
> > + struct intel_atomic_state *state)
> > {
> > - struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
> > - struct intel_atomic_state *old_intel_state =
> > - to_intel_atomic_state(old_crtc_state->state);
> > + struct drm_crtc_state *old_crtc_state =
>
> Pls convert this to intel type as well.
>
> > + &intel_atomic_get_old_crtc_state(state,
> > + crtc)->base;
> > struct intel_crtc_state *new_crtc_state =
> > - intel_atomic_get_new_crtc_state(old_intel_state, intel_crtc);
> > + intel_atomic_get_new_crtc_state(state, crtc);
> >
> > intel_pipe_update_end(new_crtc_state);
> >
> > if (new_crtc_state->update_pipe &&
> > !needs_modeset(&new_crtc_state->base) &&
> > old_crtc_state->mode.private_flags & I915_MODE_FLAG_INHERITED)
> > - intel_crtc_arm_fifo_underrun(intel_crtc, new_crtc_state);
> > + intel_crtc_arm_fifo_underrun(crtc, new_crtc_state);
> > }
> >
> > /**
> > --
> > 2.19.1
>
> --
> Ville Syrjälä
> Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v2] drm/i915: Nuke drm_crtc_state and use intel_atomic_state instead
2019-04-11 23:02 [PATCH] drm/i915: Nuke drm_crtc_state and use intel_atomic_state instead Manasi Navare
2019-04-12 0:42 ` ✗ Fi.CI.BAT: failure for " Patchwork
2019-04-12 6:11 ` [PATCH] " Ville Syrjälä
@ 2019-04-12 21:22 ` Manasi Navare
2019-04-15 12:17 ` Ville Syrjälä
2019-04-15 18:22 ` [PATCH v3] " Manasi Navare
2019-04-12 22:33 ` ✓ Fi.CI.BAT: success for drm/i915: Nuke drm_crtc_state and use intel_atomic_state instead (rev2) Patchwork
` (3 subsequent siblings)
6 siblings, 2 replies; 13+ messages in thread
From: Manasi Navare @ 2019-04-12 21:22 UTC (permalink / raw)
To: intel-gfx
This is one of the patches to start replacing drm pointers
and use the intel_atomic_state and intel_crtc to derive
the necessary intel state variables required for the intel
modeset functions.
v2:
* Flip the function arguments (Ville)
* Remove some remaining instances of drm pointers (Ville)
* Use old_crtc_state and new_crtc_state (Ville)
Suggested-by: Ville Syrjala <ville.syrjala@linux.intel.com>
Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
Signed-off-by: Manasi Navare <manasi.d.navare@intel.com>
---
drivers/gpu/drm/i915/intel_display.c | 62 +++++++++++++---------------
1 file changed, 29 insertions(+), 33 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index f29a348e8d71..aa84f57cd65d 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -125,8 +125,8 @@ static void vlv_prepare_pll(struct intel_crtc *crtc,
const struct intel_crtc_state *pipe_config);
static void chv_prepare_pll(struct intel_crtc *crtc,
const struct intel_crtc_state *pipe_config);
-static void intel_begin_crtc_commit(struct drm_crtc *, struct drm_crtc_state *);
-static void intel_finish_crtc_commit(struct drm_crtc *, struct drm_crtc_state *);
+static void intel_begin_crtc_commit(struct intel_atomic_state *, struct intel_crtc *);
+static void intel_finish_crtc_commit(struct intel_atomic_state *, struct intel_crtc *);
static void intel_crtc_init_scalers(struct intel_crtc *crtc,
struct intel_crtc_state *crtc_state);
static void skylake_pfit_enable(const struct intel_crtc_state *crtc_state);
@@ -13273,14 +13273,14 @@ static void intel_update_crtc(struct drm_crtc *crtc,
else if (new_plane_state)
intel_fbc_enable(intel_crtc, pipe_config, new_plane_state);
- intel_begin_crtc_commit(crtc, old_crtc_state);
+ intel_begin_crtc_commit(to_intel_atomic_state(state), intel_crtc);
if (INTEL_GEN(dev_priv) >= 9)
skl_update_planes_on_crtc(to_intel_atomic_state(state), intel_crtc);
else
i9xx_update_planes_on_crtc(to_intel_atomic_state(state), intel_crtc);
- intel_finish_crtc_commit(crtc, old_crtc_state);
+ intel_finish_crtc_commit(to_intel_atomic_state(state), intel_crtc);
}
static void intel_update_crtcs(struct drm_atomic_state *state)
@@ -14070,39 +14070,36 @@ skl_max_scale(const struct intel_crtc_state *crtc_state,
return max_scale;
}
-static void intel_begin_crtc_commit(struct drm_crtc *crtc,
- struct drm_crtc_state *old_crtc_state)
+static void intel_begin_crtc_commit(struct intel_atomic_state *state,
+ struct intel_crtc *crtc)
{
- struct drm_device *dev = crtc->dev;
- struct drm_i915_private *dev_priv = to_i915(dev);
- struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
- struct intel_crtc_state *old_intel_cstate =
- to_intel_crtc_state(old_crtc_state);
- struct intel_atomic_state *old_intel_state =
- to_intel_atomic_state(old_crtc_state->state);
- struct intel_crtc_state *intel_cstate =
- intel_atomic_get_new_crtc_state(old_intel_state, intel_crtc);
- bool modeset = needs_modeset(&intel_cstate->base);
+ struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
+ struct intel_crtc_state *old_crtc_state =
+ intel_atomic_get_old_crtc_state(state,
+ crtc);
+ struct intel_crtc_state *new_crtc_state =
+ intel_atomic_get_new_crtc_state(state, crtc);
+ bool modeset = needs_modeset(&new_crtc_state->base);
/* Perform vblank evasion around commit operation */
- intel_pipe_update_start(intel_cstate);
+ intel_pipe_update_start(new_crtc_state);
if (modeset)
goto out;
- if (intel_cstate->base.color_mgmt_changed ||
- intel_cstate->update_pipe)
- intel_color_commit(intel_cstate);
+ if (new_crtc_state->base.color_mgmt_changed ||
+ new_crtc_state->update_pipe)
+ intel_color_commit(new_crtc_state);
- if (intel_cstate->update_pipe)
- intel_update_pipe_config(old_intel_cstate, intel_cstate);
+ if (new_crtc_state->update_pipe)
+ intel_update_pipe_config(old_crtc_state, new_crtc_state);
else if (INTEL_GEN(dev_priv) >= 9)
- skl_detach_scalers(intel_cstate);
+ skl_detach_scalers(new_crtc_state);
out:
if (dev_priv->display.atomic_update_watermarks)
- dev_priv->display.atomic_update_watermarks(old_intel_state,
- intel_cstate);
+ dev_priv->display.atomic_update_watermarks(state,
+ new_crtc_state);
}
void intel_crtc_arm_fifo_underrun(struct intel_crtc *crtc,
@@ -14121,21 +14118,20 @@ void intel_crtc_arm_fifo_underrun(struct intel_crtc *crtc,
}
}
-static void intel_finish_crtc_commit(struct drm_crtc *crtc,
- struct drm_crtc_state *old_crtc_state)
+static void intel_finish_crtc_commit(struct intel_atomic_state *state,
+ struct intel_crtc *crtc)
{
- struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
- struct intel_atomic_state *old_intel_state =
- to_intel_atomic_state(old_crtc_state->state);
+ struct intel_crtc_state *old_crtc_state =
+ intel_atomic_get_old_crtc_state(state, crtc);
struct intel_crtc_state *new_crtc_state =
- intel_atomic_get_new_crtc_state(old_intel_state, intel_crtc);
+ intel_atomic_get_new_crtc_state(state, crtc);
intel_pipe_update_end(new_crtc_state);
if (new_crtc_state->update_pipe &&
!needs_modeset(&new_crtc_state->base) &&
- old_crtc_state->mode.private_flags & I915_MODE_FLAG_INHERITED)
- intel_crtc_arm_fifo_underrun(intel_crtc, new_crtc_state);
+ old_crtc_state->base.mode.private_flags & I915_MODE_FLAG_INHERITED)
+ intel_crtc_arm_fifo_underrun(crtc, new_crtc_state);
}
/**
--
2.19.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 13+ messages in thread
* ✓ Fi.CI.BAT: success for drm/i915: Nuke drm_crtc_state and use intel_atomic_state instead (rev2)
2019-04-11 23:02 [PATCH] drm/i915: Nuke drm_crtc_state and use intel_atomic_state instead Manasi Navare
` (2 preceding siblings ...)
2019-04-12 21:22 ` [PATCH v2] " Manasi Navare
@ 2019-04-12 22:33 ` Patchwork
2019-04-13 2:30 ` ✓ Fi.CI.IGT: " Patchwork
` (2 subsequent siblings)
6 siblings, 0 replies; 13+ messages in thread
From: Patchwork @ 2019-04-12 22:33 UTC (permalink / raw)
To: Manasi Navare; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Nuke drm_crtc_state and use intel_atomic_state instead (rev2)
URL : https://patchwork.freedesktop.org/series/59363/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5925 -> Patchwork_12786
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/59363/revisions/2/mbox/
Known issues
------------
Here are the changes found in Patchwork_12786 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_suspend@basic-s3:
- fi-whl-u: PASS -> FAIL [fdo#103375]
* igt@gem_exec_suspend@basic-s4-devices:
- fi-icl-y: PASS -> DMESG-WARN [fdo#109638]
* igt@i915_selftest@live_contexts:
- fi-skl-gvtdvm: PASS -> DMESG-FAIL [fdo#110235 ]
* igt@i915_selftest@live_hangcheck:
- fi-icl-y: PASS -> INCOMPLETE [fdo#108569]
* igt@kms_busy@basic-flip-c:
- fi-blb-e6850: NOTRUN -> SKIP [fdo#109271] / [fdo#109278]
* igt@kms_chamelium@dp-crc-fast:
- fi-blb-e6850: NOTRUN -> SKIP [fdo#109271] +43
* igt@kms_pipe_crc_basic@nonblocking-crc-pipe-a:
- fi-byt-clapper: PASS -> FAIL [fdo#103191]
#### Possible fixes ####
* igt@gem_exec_suspend@basic-s3:
- fi-blb-e6850: INCOMPLETE [fdo#107718] -> PASS
* igt@i915_selftest@live_execlists:
- fi-apl-guc: INCOMPLETE [fdo#103927] / [fdo#109720] -> PASS
* igt@kms_busy@basic-flip-a:
- {fi-kbl-7567u}: SKIP [fdo#109271] / [fdo#109278] -> PASS +2
* igt@kms_pipe_crc_basic@read-crc-pipe-b:
- fi-byt-clapper: FAIL [fdo#103191] -> PASS +3
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#103191]: https://bugs.freedesktop.org/show_bug.cgi?id=103191
[fdo#103375]: https://bugs.freedesktop.org/show_bug.cgi?id=103375
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718
[fdo#108569]: https://bugs.freedesktop.org/show_bug.cgi?id=108569
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109638]: https://bugs.freedesktop.org/show_bug.cgi?id=109638
[fdo#109720]: https://bugs.freedesktop.org/show_bug.cgi?id=109720
[fdo#110235 ]: https://bugs.freedesktop.org/show_bug.cgi?id=110235
Participating hosts (49 -> 43)
------------------------------
Missing (6): fi-kbl-soraka fi-byt-j1900 fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_5925 -> Patchwork_12786
CI_DRM_5925: 376300435a559dad92a025c1c338820ff5b6eda8 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4945: a52cc643cfe6733465cfc9ccb3d21cbdc4fd7506 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_12786: 5aec130e872d7721e1a7d2ae16bb719ecb132687 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
5aec130e872d drm/i915: Nuke drm_crtc_state and use intel_atomic_state instead
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12786/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 13+ messages in thread
* ✓ Fi.CI.IGT: success for drm/i915: Nuke drm_crtc_state and use intel_atomic_state instead (rev2)
2019-04-11 23:02 [PATCH] drm/i915: Nuke drm_crtc_state and use intel_atomic_state instead Manasi Navare
` (3 preceding siblings ...)
2019-04-12 22:33 ` ✓ Fi.CI.BAT: success for drm/i915: Nuke drm_crtc_state and use intel_atomic_state instead (rev2) Patchwork
@ 2019-04-13 2:30 ` Patchwork
2019-04-15 18:56 ` ✓ Fi.CI.BAT: success for drm/i915: Nuke drm_crtc_state and use intel_atomic_state instead (rev3) Patchwork
2019-04-15 20:00 ` ✗ Fi.CI.IGT: failure " Patchwork
6 siblings, 0 replies; 13+ messages in thread
From: Patchwork @ 2019-04-13 2:30 UTC (permalink / raw)
To: Manasi Navare; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Nuke drm_crtc_state and use intel_atomic_state instead (rev2)
URL : https://patchwork.freedesktop.org/series/59363/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5925_full -> Patchwork_12786_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_12786_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_busy@extended-semaphore-blt:
- shard-snb: NOTRUN -> SKIP [fdo#109271] +35
* igt@gem_cs_tlb@bsd1:
- shard-iclb: NOTRUN -> SKIP [fdo#109276]
* igt@gem_ctx_isolation@vcs1-s3:
- shard-kbl: PASS -> DMESG-WARN [fdo#108566]
* igt@gem_exec_parse@basic-allocation:
- shard-iclb: NOTRUN -> SKIP [fdo#109289] +1
* igt@gem_mmap_gtt@coherency:
- shard-iclb: NOTRUN -> SKIP [fdo#109292]
* igt@gem_softpin@noreloc-s3:
- shard-skl: PASS -> INCOMPLETE [fdo#104108] / [fdo#107773]
* igt@gem_workarounds@suspend-resume-context:
- shard-apl: PASS -> DMESG-WARN [fdo#108566] +2
* igt@i915_pm_rpm@i2c:
- shard-iclb: PASS -> DMESG-WARN [fdo#109982]
* igt@kms_busy@extended-modeset-hang-oldfb-render-d:
- shard-skl: NOTRUN -> SKIP [fdo#109271] / [fdo#109278] +8
* igt@kms_busy@extended-pageflip-hang-newfb-render-d:
- shard-iclb: NOTRUN -> SKIP [fdo#109278] +2
* igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-d:
- shard-snb: NOTRUN -> SKIP [fdo#109271] / [fdo#109278] +6
* igt@kms_chamelium@vga-hpd-without-ddc:
- shard-iclb: NOTRUN -> SKIP [fdo#109284]
* igt@kms_cursor_legacy@2x-cursor-vs-flip-legacy:
- shard-iclb: NOTRUN -> SKIP [fdo#109274] +1
* igt@kms_draw_crc@draw-method-xrgb8888-blt-untiled:
- shard-snb: PASS -> SKIP [fdo#109271] +1
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-pwrite:
- shard-apl: PASS -> FAIL [fdo#103167]
* igt@kms_frontbuffer_tracking@fbc-suspend:
- shard-apl: NOTRUN -> DMESG-WARN [fdo#108566]
* igt@kms_frontbuffer_tracking@fbcpsr-1p-offscren-pri-indfb-draw-pwrite:
- shard-iclb: PASS -> FAIL [fdo#109247] +19
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-indfb-draw-blt:
- shard-iclb: PASS -> FAIL [fdo#103167] +5
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-spr-indfb-draw-blt:
- shard-apl: NOTRUN -> SKIP [fdo#109271] +71
* igt@kms_frontbuffer_tracking@psr-2p-scndscrn-cur-indfb-draw-mmap-wc:
- shard-iclb: NOTRUN -> SKIP [fdo#109280] +5
* igt@kms_lease@atomic_implicit_crtc:
- shard-skl: NOTRUN -> FAIL [fdo#110279]
* igt@kms_lease@cursor_implicit_plane:
- shard-apl: NOTRUN -> FAIL [fdo#110278]
* igt@kms_lease@setcrtc_implicit_plane:
- shard-apl: NOTRUN -> FAIL [fdo#110281]
- shard-iclb: NOTRUN -> FAIL [fdo#110281]
* igt@kms_plane_alpha_blend@pipe-a-alpha-7efc:
- shard-apl: NOTRUN -> FAIL [fdo#108145] +1
* igt@kms_plane_alpha_blend@pipe-b-alpha-basic:
- shard-skl: NOTRUN -> FAIL [fdo#108145] +2
* igt@kms_plane_alpha_blend@pipe-b-constant-alpha-min:
- shard-skl: PASS -> FAIL [fdo#108145]
* igt@kms_plane_lowres@pipe-a-tiling-x:
- shard-iclb: PASS -> FAIL [fdo#103166]
* igt@kms_plane_scaling@pipe-b-scaler-with-clipping-clamping:
- shard-glk: PASS -> SKIP [fdo#109271] / [fdo#109278] +1
* igt@kms_psr2_su@frontbuffer:
- shard-iclb: PASS -> SKIP [fdo#109642]
* igt@kms_psr@cursor_mmap_gtt:
- shard-iclb: PASS -> FAIL [fdo#107383] / [fdo#110215] +3
* igt@kms_psr@no_drrs:
- shard-iclb: PASS -> FAIL [fdo#108341]
* igt@kms_psr@psr2_cursor_plane_onoff:
- shard-iclb: PASS -> SKIP [fdo#109441] +1
* igt@kms_setmode@basic:
- shard-apl: PASS -> FAIL [fdo#99912]
* igt@kms_sysfs_edid_timing:
- shard-apl: NOTRUN -> FAIL [fdo#100047]
* igt@kms_universal_plane@disable-primary-vs-flip-pipe-d:
- shard-apl: NOTRUN -> SKIP [fdo#109271] / [fdo#109278] +5
* igt@kms_vrr@flip-suspend:
- shard-skl: NOTRUN -> SKIP [fdo#109271] +94
* igt@prime_nv_test@nv_i915_sharing:
- shard-iclb: NOTRUN -> SKIP [fdo#109291]
#### Possible fixes ####
* igt@gem_ctx_isolation@rcs0-s3:
- shard-apl: DMESG-WARN [fdo#108566] -> PASS +5
* igt@gem_exec_nop@basic-series:
- shard-iclb: INCOMPLETE [fdo#109100] -> PASS
* igt@i915_pm_rpm@system-suspend-execbuf:
- shard-apl: INCOMPLETE [fdo#103927] -> PASS +1
* igt@kms_flip@flip-vs-expired-vblank:
- shard-skl: FAIL [fdo#105363] -> PASS
- shard-glk: FAIL [fdo#105363] -> PASS
* igt@kms_frontbuffer_tracking@fbc-rgb565-draw-pwrite:
- shard-iclb: FAIL [fdo#103167] -> PASS +4
* igt@kms_frontbuffer_tracking@psr-1p-primscrn-pri-indfb-draw-mmap-cpu:
- shard-iclb: FAIL [fdo#109247] -> PASS +15
* igt@kms_plane@pixel-format-pipe-c-planes:
- shard-glk: SKIP [fdo#109271] -> PASS +1
* igt@kms_plane_alpha_blend@pipe-a-coverage-7efc:
- shard-skl: FAIL [fdo#108145] -> PASS
* igt@kms_plane_scaling@pipe-c-scaler-with-rotation:
- shard-glk: SKIP [fdo#109271] / [fdo#109278] -> PASS
* igt@kms_psr@cursor_plane_move:
- shard-iclb: FAIL [fdo#107383] / [fdo#110215] -> PASS
* igt@kms_psr@psr2_basic:
- shard-iclb: SKIP [fdo#109441] -> PASS +1
* igt@testdisplay:
- shard-kbl: INCOMPLETE [fdo#103665] -> PASS
[fdo#100047]: https://bugs.freedesktop.org/show_bug.cgi?id=100047
[fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
[fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
[fdo#107383]: https://bugs.freedesktop.org/show_bug.cgi?id=107383
[fdo#107773]: https://bugs.freedesktop.org/show_bug.cgi?id=107773
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#108341]: https://bugs.freedesktop.org/show_bug.cgi?id=108341
[fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
[fdo#109100]: https://bugs.freedesktop.org/show_bug.cgi?id=109100
[fdo#109247]: https://bugs.freedesktop.org/show_bug.cgi?id=109247
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109274]: https://bugs.freedesktop.org/show_bug.cgi?id=109274
[fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109280]: https://bugs.freedesktop.org/show_bug.cgi?id=109280
[fdo#109284]: https://bugs.freedesktop.org/show_bug.cgi?id=109284
[fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289
[fdo#109291]: https://bugs.freedesktop.org/show_bug.cgi?id=109291
[fdo#109292]: https://bugs.freedesktop.org/show_bug.cgi?id=109292
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#109982]: https://bugs.freedesktop.org/show_bug.cgi?id=109982
[fdo#110215]: https://bugs.freedesktop.org/show_bug.cgi?id=110215
[fdo#110278]: https://bugs.freedesktop.org/show_bug.cgi?id=110278
[fdo#110279]: https://bugs.freedesktop.org/show_bug.cgi?id=110279
[fdo#110281]: https://bugs.freedesktop.org/show_bug.cgi?id=110281
[fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912
Participating hosts (10 -> 9)
------------------------------
Missing (1): shard-hsw
Build changes
-------------
* Linux: CI_DRM_5925 -> Patchwork_12786
CI_DRM_5925: 376300435a559dad92a025c1c338820ff5b6eda8 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4945: a52cc643cfe6733465cfc9ccb3d21cbdc4fd7506 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_12786: 5aec130e872d7721e1a7d2ae16bb719ecb132687 @ 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_12786/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v2] drm/i915: Nuke drm_crtc_state and use intel_atomic_state instead
2019-04-12 21:22 ` [PATCH v2] " Manasi Navare
@ 2019-04-15 12:17 ` Ville Syrjälä
2019-04-15 18:15 ` Manasi Navare
2019-04-15 18:22 ` [PATCH v3] " Manasi Navare
1 sibling, 1 reply; 13+ messages in thread
From: Ville Syrjälä @ 2019-04-15 12:17 UTC (permalink / raw)
To: Manasi Navare; +Cc: intel-gfx
On Fri, Apr 12, 2019 at 02:22:32PM -0700, Manasi Navare wrote:
> This is one of the patches to start replacing drm pointers
> and use the intel_atomic_state and intel_crtc to derive
> the necessary intel state variables required for the intel
> modeset functions.
>
> v2:
> * Flip the function arguments (Ville)
> * Remove some remaining instances of drm pointers (Ville)
> * Use old_crtc_state and new_crtc_state (Ville)
>
> Suggested-by: Ville Syrjala <ville.syrjala@linux.intel.com>
> Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
> Signed-off-by: Manasi Navare <manasi.d.navare@intel.com>
> ---
> drivers/gpu/drm/i915/intel_display.c | 62 +++++++++++++---------------
> 1 file changed, 29 insertions(+), 33 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index f29a348e8d71..aa84f57cd65d 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -125,8 +125,8 @@ static void vlv_prepare_pll(struct intel_crtc *crtc,
> const struct intel_crtc_state *pipe_config);
> static void chv_prepare_pll(struct intel_crtc *crtc,
> const struct intel_crtc_state *pipe_config);
> -static void intel_begin_crtc_commit(struct drm_crtc *, struct drm_crtc_state *);
> -static void intel_finish_crtc_commit(struct drm_crtc *, struct drm_crtc_state *);
> +static void intel_begin_crtc_commit(struct intel_atomic_state *, struct intel_crtc *);
> +static void intel_finish_crtc_commit(struct intel_atomic_state *, struct intel_crtc *);
> static void intel_crtc_init_scalers(struct intel_crtc *crtc,
> struct intel_crtc_state *crtc_state);
> static void skylake_pfit_enable(const struct intel_crtc_state *crtc_state);
> @@ -13273,14 +13273,14 @@ static void intel_update_crtc(struct drm_crtc *crtc,
> else if (new_plane_state)
> intel_fbc_enable(intel_crtc, pipe_config, new_plane_state);
>
> - intel_begin_crtc_commit(crtc, old_crtc_state);
> + intel_begin_crtc_commit(to_intel_atomic_state(state), intel_crtc);
>
> if (INTEL_GEN(dev_priv) >= 9)
> skl_update_planes_on_crtc(to_intel_atomic_state(state), intel_crtc);
> else
> i9xx_update_planes_on_crtc(to_intel_atomic_state(state), intel_crtc);
>
> - intel_finish_crtc_commit(crtc, old_crtc_state);
> + intel_finish_crtc_commit(to_intel_atomic_state(state), intel_crtc);
> }
>
> static void intel_update_crtcs(struct drm_atomic_state *state)
> @@ -14070,39 +14070,36 @@ skl_max_scale(const struct intel_crtc_state *crtc_state,
> return max_scale;
> }
>
> -static void intel_begin_crtc_commit(struct drm_crtc *crtc,
> - struct drm_crtc_state *old_crtc_state)
> +static void intel_begin_crtc_commit(struct intel_atomic_state *state,
> + struct intel_crtc *crtc)
> {
> - struct drm_device *dev = crtc->dev;
> - struct drm_i915_private *dev_priv = to_i915(dev);
> - struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
> - struct intel_crtc_state *old_intel_cstate =
> - to_intel_crtc_state(old_crtc_state);
> - struct intel_atomic_state *old_intel_state =
> - to_intel_atomic_state(old_crtc_state->state);
> - struct intel_crtc_state *intel_cstate =
> - intel_atomic_get_new_crtc_state(old_intel_state, intel_crtc);
> - bool modeset = needs_modeset(&intel_cstate->base);
> + struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
> + struct intel_crtc_state *old_crtc_state =
> + intel_atomic_get_old_crtc_state(state,
> + crtc);
Pointless newline.
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> + struct intel_crtc_state *new_crtc_state =
> + intel_atomic_get_new_crtc_state(state, crtc);
> + bool modeset = needs_modeset(&new_crtc_state->base);
>
> /* Perform vblank evasion around commit operation */
> - intel_pipe_update_start(intel_cstate);
> + intel_pipe_update_start(new_crtc_state);
>
> if (modeset)
> goto out;
>
> - if (intel_cstate->base.color_mgmt_changed ||
> - intel_cstate->update_pipe)
> - intel_color_commit(intel_cstate);
> + if (new_crtc_state->base.color_mgmt_changed ||
> + new_crtc_state->update_pipe)
> + intel_color_commit(new_crtc_state);
>
> - if (intel_cstate->update_pipe)
> - intel_update_pipe_config(old_intel_cstate, intel_cstate);
> + if (new_crtc_state->update_pipe)
> + intel_update_pipe_config(old_crtc_state, new_crtc_state);
> else if (INTEL_GEN(dev_priv) >= 9)
> - skl_detach_scalers(intel_cstate);
> + skl_detach_scalers(new_crtc_state);
>
> out:
> if (dev_priv->display.atomic_update_watermarks)
> - dev_priv->display.atomic_update_watermarks(old_intel_state,
> - intel_cstate);
> + dev_priv->display.atomic_update_watermarks(state,
> + new_crtc_state);
> }
>
> void intel_crtc_arm_fifo_underrun(struct intel_crtc *crtc,
> @@ -14121,21 +14118,20 @@ void intel_crtc_arm_fifo_underrun(struct intel_crtc *crtc,
> }
> }
>
> -static void intel_finish_crtc_commit(struct drm_crtc *crtc,
> - struct drm_crtc_state *old_crtc_state)
> +static void intel_finish_crtc_commit(struct intel_atomic_state *state,
> + struct intel_crtc *crtc)
> {
> - struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
> - struct intel_atomic_state *old_intel_state =
> - to_intel_atomic_state(old_crtc_state->state);
> + struct intel_crtc_state *old_crtc_state =
> + intel_atomic_get_old_crtc_state(state, crtc);
> struct intel_crtc_state *new_crtc_state =
> - intel_atomic_get_new_crtc_state(old_intel_state, intel_crtc);
> + intel_atomic_get_new_crtc_state(state, crtc);
>
> intel_pipe_update_end(new_crtc_state);
>
> if (new_crtc_state->update_pipe &&
> !needs_modeset(&new_crtc_state->base) &&
> - old_crtc_state->mode.private_flags & I915_MODE_FLAG_INHERITED)
> - intel_crtc_arm_fifo_underrun(intel_crtc, new_crtc_state);
> + old_crtc_state->base.mode.private_flags & I915_MODE_FLAG_INHERITED)
> + intel_crtc_arm_fifo_underrun(crtc, new_crtc_state);
> }
>
> /**
> --
> 2.19.1
--
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v2] drm/i915: Nuke drm_crtc_state and use intel_atomic_state instead
2019-04-15 12:17 ` Ville Syrjälä
@ 2019-04-15 18:15 ` Manasi Navare
0 siblings, 0 replies; 13+ messages in thread
From: Manasi Navare @ 2019-04-15 18:15 UTC (permalink / raw)
To: Ville Syrjälä; +Cc: intel-gfx
On Mon, Apr 15, 2019 at 03:17:30PM +0300, Ville Syrjälä wrote:
> On Fri, Apr 12, 2019 at 02:22:32PM -0700, Manasi Navare wrote:
> > This is one of the patches to start replacing drm pointers
> > and use the intel_atomic_state and intel_crtc to derive
> > the necessary intel state variables required for the intel
> > modeset functions.
> >
> > v2:
> > * Flip the function arguments (Ville)
> > * Remove some remaining instances of drm pointers (Ville)
> > * Use old_crtc_state and new_crtc_state (Ville)
> >
> > Suggested-by: Ville Syrjala <ville.syrjala@linux.intel.com>
> > Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
> > Signed-off-by: Manasi Navare <manasi.d.navare@intel.com>
> > ---
> > drivers/gpu/drm/i915/intel_display.c | 62 +++++++++++++---------------
> > 1 file changed, 29 insertions(+), 33 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> > index f29a348e8d71..aa84f57cd65d 100644
> > --- a/drivers/gpu/drm/i915/intel_display.c
> > +++ b/drivers/gpu/drm/i915/intel_display.c
> > @@ -125,8 +125,8 @@ static void vlv_prepare_pll(struct intel_crtc *crtc,
> > const struct intel_crtc_state *pipe_config);
> > static void chv_prepare_pll(struct intel_crtc *crtc,
> > const struct intel_crtc_state *pipe_config);
> > -static void intel_begin_crtc_commit(struct drm_crtc *, struct drm_crtc_state *);
> > -static void intel_finish_crtc_commit(struct drm_crtc *, struct drm_crtc_state *);
> > +static void intel_begin_crtc_commit(struct intel_atomic_state *, struct intel_crtc *);
> > +static void intel_finish_crtc_commit(struct intel_atomic_state *, struct intel_crtc *);
> > static void intel_crtc_init_scalers(struct intel_crtc *crtc,
> > struct intel_crtc_state *crtc_state);
> > static void skylake_pfit_enable(const struct intel_crtc_state *crtc_state);
> > @@ -13273,14 +13273,14 @@ static void intel_update_crtc(struct drm_crtc *crtc,
> > else if (new_plane_state)
> > intel_fbc_enable(intel_crtc, pipe_config, new_plane_state);
> >
> > - intel_begin_crtc_commit(crtc, old_crtc_state);
> > + intel_begin_crtc_commit(to_intel_atomic_state(state), intel_crtc);
> >
> > if (INTEL_GEN(dev_priv) >= 9)
> > skl_update_planes_on_crtc(to_intel_atomic_state(state), intel_crtc);
> > else
> > i9xx_update_planes_on_crtc(to_intel_atomic_state(state), intel_crtc);
> >
> > - intel_finish_crtc_commit(crtc, old_crtc_state);
> > + intel_finish_crtc_commit(to_intel_atomic_state(state), intel_crtc);
> > }
> >
> > static void intel_update_crtcs(struct drm_atomic_state *state)
> > @@ -14070,39 +14070,36 @@ skl_max_scale(const struct intel_crtc_state *crtc_state,
> > return max_scale;
> > }
> >
> > -static void intel_begin_crtc_commit(struct drm_crtc *crtc,
> > - struct drm_crtc_state *old_crtc_state)
> > +static void intel_begin_crtc_commit(struct intel_atomic_state *state,
> > + struct intel_crtc *crtc)
> > {
> > - struct drm_device *dev = crtc->dev;
> > - struct drm_i915_private *dev_priv = to_i915(dev);
> > - struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
> > - struct intel_crtc_state *old_intel_cstate =
> > - to_intel_crtc_state(old_crtc_state);
> > - struct intel_atomic_state *old_intel_state =
> > - to_intel_atomic_state(old_crtc_state->state);
> > - struct intel_crtc_state *intel_cstate =
> > - intel_atomic_get_new_crtc_state(old_intel_state, intel_crtc);
> > - bool modeset = needs_modeset(&intel_cstate->base);
> > + struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
> > + struct intel_crtc_state *old_crtc_state =
> > + intel_atomic_get_old_crtc_state(state,
> > + crtc);
>
> Pointless newline.
>
> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Thanks for the review, will fix the pointless newline in the v3
and add your r-b
Manasi
>
> > + struct intel_crtc_state *new_crtc_state =
> > + intel_atomic_get_new_crtc_state(state, crtc);
> > + bool modeset = needs_modeset(&new_crtc_state->base);
> >
> > /* Perform vblank evasion around commit operation */
> > - intel_pipe_update_start(intel_cstate);
> > + intel_pipe_update_start(new_crtc_state);
> >
> > if (modeset)
> > goto out;
> >
> > - if (intel_cstate->base.color_mgmt_changed ||
> > - intel_cstate->update_pipe)
> > - intel_color_commit(intel_cstate);
> > + if (new_crtc_state->base.color_mgmt_changed ||
> > + new_crtc_state->update_pipe)
> > + intel_color_commit(new_crtc_state);
> >
> > - if (intel_cstate->update_pipe)
> > - intel_update_pipe_config(old_intel_cstate, intel_cstate);
> > + if (new_crtc_state->update_pipe)
> > + intel_update_pipe_config(old_crtc_state, new_crtc_state);
> > else if (INTEL_GEN(dev_priv) >= 9)
> > - skl_detach_scalers(intel_cstate);
> > + skl_detach_scalers(new_crtc_state);
> >
> > out:
> > if (dev_priv->display.atomic_update_watermarks)
> > - dev_priv->display.atomic_update_watermarks(old_intel_state,
> > - intel_cstate);
> > + dev_priv->display.atomic_update_watermarks(state,
> > + new_crtc_state);
> > }
> >
> > void intel_crtc_arm_fifo_underrun(struct intel_crtc *crtc,
> > @@ -14121,21 +14118,20 @@ void intel_crtc_arm_fifo_underrun(struct intel_crtc *crtc,
> > }
> > }
> >
> > -static void intel_finish_crtc_commit(struct drm_crtc *crtc,
> > - struct drm_crtc_state *old_crtc_state)
> > +static void intel_finish_crtc_commit(struct intel_atomic_state *state,
> > + struct intel_crtc *crtc)
> > {
> > - struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
> > - struct intel_atomic_state *old_intel_state =
> > - to_intel_atomic_state(old_crtc_state->state);
> > + struct intel_crtc_state *old_crtc_state =
> > + intel_atomic_get_old_crtc_state(state, crtc);
> > struct intel_crtc_state *new_crtc_state =
> > - intel_atomic_get_new_crtc_state(old_intel_state, intel_crtc);
> > + intel_atomic_get_new_crtc_state(state, crtc);
> >
> > intel_pipe_update_end(new_crtc_state);
> >
> > if (new_crtc_state->update_pipe &&
> > !needs_modeset(&new_crtc_state->base) &&
> > - old_crtc_state->mode.private_flags & I915_MODE_FLAG_INHERITED)
> > - intel_crtc_arm_fifo_underrun(intel_crtc, new_crtc_state);
> > + old_crtc_state->base.mode.private_flags & I915_MODE_FLAG_INHERITED)
> > + intel_crtc_arm_fifo_underrun(crtc, new_crtc_state);
> > }
> >
> > /**
> > --
> > 2.19.1
>
> --
> Ville Syrjälä
> Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v3] drm/i915: Nuke drm_crtc_state and use intel_atomic_state instead
2019-04-12 21:22 ` [PATCH v2] " Manasi Navare
2019-04-15 12:17 ` Ville Syrjälä
@ 2019-04-15 18:22 ` Manasi Navare
2019-04-15 20:02 ` Manasi Navare
1 sibling, 1 reply; 13+ messages in thread
From: Manasi Navare @ 2019-04-15 18:22 UTC (permalink / raw)
To: intel-gfx
This is one of the patches to start replacing drm pointers
and use the intel_atomic_state and intel_crtc to derive
the necessary intel state variables required for the intel
modeset functions.
v3:
* Remove the unwanted newline (Ville)
v2:
* Flip the function arguments (Ville)
* Remove some remaining instances of drm pointers (Ville)
* Use old_crtc_state and new_crtc_state (Ville)
Suggested-by: Ville Syrjala <ville.syrjala@linux.intel.com>
Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
Signed-off-by: Manasi Navare <manasi.d.navare@intel.com>
Reviewed-by: Ville Syrjala <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/intel_display.c | 61 +++++++++++++---------------
1 file changed, 28 insertions(+), 33 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index f29a348e8d71..aaf44ab6766f 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -125,8 +125,8 @@ static void vlv_prepare_pll(struct intel_crtc *crtc,
const struct intel_crtc_state *pipe_config);
static void chv_prepare_pll(struct intel_crtc *crtc,
const struct intel_crtc_state *pipe_config);
-static void intel_begin_crtc_commit(struct drm_crtc *, struct drm_crtc_state *);
-static void intel_finish_crtc_commit(struct drm_crtc *, struct drm_crtc_state *);
+static void intel_begin_crtc_commit(struct intel_atomic_state *, struct intel_crtc *);
+static void intel_finish_crtc_commit(struct intel_atomic_state *, struct intel_crtc *);
static void intel_crtc_init_scalers(struct intel_crtc *crtc,
struct intel_crtc_state *crtc_state);
static void skylake_pfit_enable(const struct intel_crtc_state *crtc_state);
@@ -13273,14 +13273,14 @@ static void intel_update_crtc(struct drm_crtc *crtc,
else if (new_plane_state)
intel_fbc_enable(intel_crtc, pipe_config, new_plane_state);
- intel_begin_crtc_commit(crtc, old_crtc_state);
+ intel_begin_crtc_commit(to_intel_atomic_state(state), intel_crtc);
if (INTEL_GEN(dev_priv) >= 9)
skl_update_planes_on_crtc(to_intel_atomic_state(state), intel_crtc);
else
i9xx_update_planes_on_crtc(to_intel_atomic_state(state), intel_crtc);
- intel_finish_crtc_commit(crtc, old_crtc_state);
+ intel_finish_crtc_commit(to_intel_atomic_state(state), intel_crtc);
}
static void intel_update_crtcs(struct drm_atomic_state *state)
@@ -14070,39 +14070,35 @@ skl_max_scale(const struct intel_crtc_state *crtc_state,
return max_scale;
}
-static void intel_begin_crtc_commit(struct drm_crtc *crtc,
- struct drm_crtc_state *old_crtc_state)
+static void intel_begin_crtc_commit(struct intel_atomic_state *state,
+ struct intel_crtc *crtc)
{
- struct drm_device *dev = crtc->dev;
- struct drm_i915_private *dev_priv = to_i915(dev);
- struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
- struct intel_crtc_state *old_intel_cstate =
- to_intel_crtc_state(old_crtc_state);
- struct intel_atomic_state *old_intel_state =
- to_intel_atomic_state(old_crtc_state->state);
- struct intel_crtc_state *intel_cstate =
- intel_atomic_get_new_crtc_state(old_intel_state, intel_crtc);
- bool modeset = needs_modeset(&intel_cstate->base);
+ struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
+ struct intel_crtc_state *old_crtc_state =
+ intel_atomic_get_old_crtc_state(state, crtc);
+ struct intel_crtc_state *new_crtc_state =
+ intel_atomic_get_new_crtc_state(state, crtc);
+ bool modeset = needs_modeset(&new_crtc_state->base);
/* Perform vblank evasion around commit operation */
- intel_pipe_update_start(intel_cstate);
+ intel_pipe_update_start(new_crtc_state);
if (modeset)
goto out;
- if (intel_cstate->base.color_mgmt_changed ||
- intel_cstate->update_pipe)
- intel_color_commit(intel_cstate);
+ if (new_crtc_state->base.color_mgmt_changed ||
+ new_crtc_state->update_pipe)
+ intel_color_commit(new_crtc_state);
- if (intel_cstate->update_pipe)
- intel_update_pipe_config(old_intel_cstate, intel_cstate);
+ if (new_crtc_state->update_pipe)
+ intel_update_pipe_config(old_crtc_state, new_crtc_state);
else if (INTEL_GEN(dev_priv) >= 9)
- skl_detach_scalers(intel_cstate);
+ skl_detach_scalers(new_crtc_state);
out:
if (dev_priv->display.atomic_update_watermarks)
- dev_priv->display.atomic_update_watermarks(old_intel_state,
- intel_cstate);
+ dev_priv->display.atomic_update_watermarks(state,
+ new_crtc_state);
}
void intel_crtc_arm_fifo_underrun(struct intel_crtc *crtc,
@@ -14121,21 +14117,20 @@ void intel_crtc_arm_fifo_underrun(struct intel_crtc *crtc,
}
}
-static void intel_finish_crtc_commit(struct drm_crtc *crtc,
- struct drm_crtc_state *old_crtc_state)
+static void intel_finish_crtc_commit(struct intel_atomic_state *state,
+ struct intel_crtc *crtc)
{
- struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
- struct intel_atomic_state *old_intel_state =
- to_intel_atomic_state(old_crtc_state->state);
+ struct intel_crtc_state *old_crtc_state =
+ intel_atomic_get_old_crtc_state(state, crtc);
struct intel_crtc_state *new_crtc_state =
- intel_atomic_get_new_crtc_state(old_intel_state, intel_crtc);
+ intel_atomic_get_new_crtc_state(state, crtc);
intel_pipe_update_end(new_crtc_state);
if (new_crtc_state->update_pipe &&
!needs_modeset(&new_crtc_state->base) &&
- old_crtc_state->mode.private_flags & I915_MODE_FLAG_INHERITED)
- intel_crtc_arm_fifo_underrun(intel_crtc, new_crtc_state);
+ old_crtc_state->base.mode.private_flags & I915_MODE_FLAG_INHERITED)
+ intel_crtc_arm_fifo_underrun(crtc, new_crtc_state);
}
/**
--
2.19.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 13+ messages in thread
* ✓ Fi.CI.BAT: success for drm/i915: Nuke drm_crtc_state and use intel_atomic_state instead (rev3)
2019-04-11 23:02 [PATCH] drm/i915: Nuke drm_crtc_state and use intel_atomic_state instead Manasi Navare
` (4 preceding siblings ...)
2019-04-13 2:30 ` ✓ Fi.CI.IGT: " Patchwork
@ 2019-04-15 18:56 ` Patchwork
2019-04-15 20:00 ` ✗ Fi.CI.IGT: failure " Patchwork
6 siblings, 0 replies; 13+ messages in thread
From: Patchwork @ 2019-04-15 18:56 UTC (permalink / raw)
To: Manasi Navare; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Nuke drm_crtc_state and use intel_atomic_state instead (rev3)
URL : https://patchwork.freedesktop.org/series/59363/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5934 -> Patchwork_12806
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/59363/revisions/3/mbox/
Known issues
------------
Here are the changes found in Patchwork_12806 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@amdgpu/amd_basic@userptr:
- fi-kbl-8809g: PASS -> DMESG-WARN [fdo#108965]
* igt@gem_exec_create@basic:
- fi-icl-y: PASS -> INCOMPLETE [fdo#107713]
* igt@gem_exec_suspend@basic-s4-devices:
- fi-blb-e6850: PASS -> INCOMPLETE [fdo#107718]
* igt@kms_busy@basic-flip-a:
- fi-bsw-n3050: NOTRUN -> SKIP [fdo#109271] / [fdo#109278] +1
* igt@kms_chamelium@hdmi-crc-fast:
- fi-bsw-n3050: NOTRUN -> SKIP [fdo#109271] +57
#### Possible fixes ####
* igt@i915_selftest@live_contexts:
- fi-bdw-gvtdvm: DMESG-FAIL [fdo#110235 ] -> PASS
* igt@i915_selftest@live_hangcheck:
- fi-skl-iommu: INCOMPLETE [fdo#108602] / [fdo#108744] -> PASS
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718
[fdo#108602]: https://bugs.freedesktop.org/show_bug.cgi?id=108602
[fdo#108744]: https://bugs.freedesktop.org/show_bug.cgi?id=108744
[fdo#108965]: https://bugs.freedesktop.org/show_bug.cgi?id=108965
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#110235 ]: https://bugs.freedesktop.org/show_bug.cgi?id=110235
Participating hosts (50 -> 40)
------------------------------
Additional (1): fi-bsw-n3050
Missing (11): fi-kbl-soraka fi-ilk-m540 fi-bdw-5557u fi-byt-squawks fi-icl-u2 fi-bsw-cyan fi-kbl-7500u fi-ctg-p8600 fi-byt-clapper fi-bdw-samus fi-snb-2600
Build changes
-------------
* Linux: CI_DRM_5934 -> Patchwork_12806
CI_DRM_5934: cc5334c0e706ec423c5f1a139cf3da7bd3287db6 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4946: 56bdc68638cec64c6b02cd6b220b52b76059b51a @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_12806: 344cfdc4f851900bef2147526f7d0a8a22e71893 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
344cfdc4f851 drm/i915: Nuke drm_crtc_state and use intel_atomic_state instead
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12806/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 13+ messages in thread
* ✗ Fi.CI.IGT: failure for drm/i915: Nuke drm_crtc_state and use intel_atomic_state instead (rev3)
2019-04-11 23:02 [PATCH] drm/i915: Nuke drm_crtc_state and use intel_atomic_state instead Manasi Navare
` (5 preceding siblings ...)
2019-04-15 18:56 ` ✓ Fi.CI.BAT: success for drm/i915: Nuke drm_crtc_state and use intel_atomic_state instead (rev3) Patchwork
@ 2019-04-15 20:00 ` Patchwork
6 siblings, 0 replies; 13+ messages in thread
From: Patchwork @ 2019-04-15 20:00 UTC (permalink / raw)
To: Manasi Navare; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Nuke drm_crtc_state and use intel_atomic_state instead (rev3)
URL : https://patchwork.freedesktop.org/series/59363/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_5934_full -> Patchwork_12806_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_12806_full absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_12806_full, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_12806_full:
### Piglit changes ###
#### Possible regressions ####
* spec@arb_texture_multisample@sample-position@2 (NEW):
- pig-snb-2600: NOTRUN -> FAIL
New tests
---------
New tests have been introduced between CI_DRM_5934_full and Patchwork_12806_full:
### New Piglit tests (1) ###
* spec@arb_texture_multisample@sample-position@2:
- Statuses : 1 fail(s)
- Exec time: [6.98] s
Known issues
------------
Here are the changes found in Patchwork_12806_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@debugfs_test@read_all_entries_display_off:
- shard-skl: PASS -> INCOMPLETE [fdo#104108] +1
* igt@gem_ctx_isolation@bcs0-s3:
- shard-apl: PASS -> DMESG-WARN [fdo#108566] +1
* igt@kms_atomic_transition@2x-modeset-transitions-nonblocking:
- shard-kbl: NOTRUN -> SKIP [fdo#109271] +21
* igt@kms_busy@basic-modeset-f:
- shard-apl: NOTRUN -> SKIP [fdo#109271] / [fdo#109278]
* igt@kms_busy@extended-pageflip-hang-newfb-render-f:
- shard-kbl: NOTRUN -> SKIP [fdo#109271] / [fdo#109278] +3
* igt@kms_content_protection@atomic-dpms:
- shard-apl: NOTRUN -> FAIL [fdo#110321] / [fdo#110336]
* igt@kms_cursor_crc@cursor-256x256-suspend:
- shard-iclb: NOTRUN -> INCOMPLETE [fdo#110389]
* igt@kms_flip@absolute-wf_vblank-interruptible:
- shard-apl: PASS -> DMESG-WARN [fdo#110376] +1
* igt@kms_flip@modeset-vs-vblank-race:
- shard-apl: PASS -> FAIL [fdo#103060]
* igt@kms_frontbuffer_tracking@fbc-1p-rte:
- shard-iclb: PASS -> FAIL [fdo#103167] / [fdo#110378]
* igt@kms_frontbuffer_tracking@fbc-2p-primscrn-pri-indfb-draw-pwrite:
- shard-skl: NOTRUN -> SKIP [fdo#109271] +53
* igt@kms_frontbuffer_tracking@fbc-suspend:
- shard-apl: NOTRUN -> DMESG-WARN [fdo#108566]
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-mmap-gtt:
- shard-iclb: PASS -> FAIL [fdo#109247] +17
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-shrfb-draw-pwrite:
- shard-iclb: PASS -> FAIL [fdo#103167] +4
* igt@kms_frontbuffer_tracking@fbcpsr-2p-scndscrn-cur-indfb-move:
- shard-apl: NOTRUN -> SKIP [fdo#109271] +22
* igt@kms_frontbuffer_tracking@psr-2p-scndscrn-pri-indfb-draw-render:
- shard-iclb: NOTRUN -> SKIP [fdo#109280]
* igt@kms_pipe_crc_basic@read-crc-pipe-d:
- shard-skl: NOTRUN -> SKIP [fdo#109271] / [fdo#109278] +3
* igt@kms_plane_alpha_blend@pipe-c-alpha-opaque-fb:
- shard-skl: NOTRUN -> FAIL [fdo#108145] +1
* igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:
- shard-skl: NOTRUN -> FAIL [fdo#110403]
* igt@kms_psr@cursor_mmap_gtt:
- shard-iclb: PASS -> FAIL [fdo#107383] / [fdo#110215] +3
* igt@kms_setmode@basic:
- shard-kbl: PASS -> FAIL [fdo#99912]
* igt@v3d_get_bo_offset@create-get-offsets:
- shard-iclb: NOTRUN -> SKIP [fdo#109315]
#### Possible fixes ####
* igt@gem_exec_suspend@basic-s3:
- shard-kbl: DMESG-WARN [fdo#108566] -> PASS
* igt@i915_pm_rpm@i2c:
- shard-iclb: FAIL [fdo#104097] -> PASS
* igt@i915_suspend@fence-restore-tiled2untiled:
- shard-apl: DMESG-WARN [fdo#108566] -> PASS +4
* igt@kms_flip@flip-vs-expired-vblank-interruptible:
- shard-glk: FAIL [fdo#102887] / [fdo#105363] -> PASS
* igt@kms_flip@modeset-vs-vblank-race:
- shard-glk: FAIL [fdo#103060] -> PASS
* igt@kms_flip_tiling@flip-to-x-tiled:
- shard-skl: FAIL [fdo#108134] -> PASS
* igt@kms_frontbuffer_tracking@fbc-rgb565-draw-pwrite:
- shard-iclb: FAIL [fdo#103167] -> PASS +6
* igt@kms_frontbuffer_tracking@fbcpsr-1p-offscren-pri-indfb-draw-blt:
- shard-iclb: FAIL [fdo#109247] -> PASS +24
* igt@kms_plane@pixel-format-pipe-c-planes:
- shard-glk: SKIP [fdo#109271] -> PASS
* igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
- shard-skl: FAIL [fdo#110403] -> PASS
* igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min:
- shard-skl: FAIL [fdo#108145] -> PASS
* igt@kms_plane_scaling@pipe-c-scaler-with-rotation:
- shard-glk: SKIP [fdo#109271] / [fdo#109278] -> PASS
* igt@kms_psr@psr2_sprite_blt:
- shard-iclb: SKIP [fdo#109441] -> PASS +2
* igt@kms_psr@sprite_mmap_cpu:
- shard-iclb: FAIL [fdo#107383] / [fdo#110215] -> PASS
#### Warnings ####
* igt@i915_pm_rpm@dpms-non-lpsp:
- shard-skl: INCOMPLETE [fdo#107807] -> SKIP [fdo#109271]
[fdo#102887]: https://bugs.freedesktop.org/show_bug.cgi?id=102887
[fdo#103060]: https://bugs.freedesktop.org/show_bug.cgi?id=103060
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#104097]: https://bugs.freedesktop.org/show_bug.cgi?id=104097
[fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
[fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
[fdo#107383]: https://bugs.freedesktop.org/show_bug.cgi?id=107383
[fdo#107807]: https://bugs.freedesktop.org/show_bug.cgi?id=107807
[fdo#108134]: https://bugs.freedesktop.org/show_bug.cgi?id=108134
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
[fdo#109247]: https://bugs.freedesktop.org/show_bug.cgi?id=109247
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109280]: https://bugs.freedesktop.org/show_bug.cgi?id=109280
[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#110215]: https://bugs.freedesktop.org/show_bug.cgi?id=110215
[fdo#110321]: https://bugs.freedesktop.org/show_bug.cgi?id=110321
[fdo#110336]: https://bugs.freedesktop.org/show_bug.cgi?id=110336
[fdo#110376]: https://bugs.freedesktop.org/show_bug.cgi?id=110376
[fdo#110378]: https://bugs.freedesktop.org/show_bug.cgi?id=110378
[fdo#110389]: https://bugs.freedesktop.org/show_bug.cgi?id=110389
[fdo#110403]: https://bugs.freedesktop.org/show_bug.cgi?id=110403
[fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912
Participating hosts (10 -> 10)
------------------------------
Additional (1): pig-snb-2600
Missing (1): shard-hsw
Build changes
-------------
* Linux: CI_DRM_5934 -> Patchwork_12806
CI_DRM_5934: cc5334c0e706ec423c5f1a139cf3da7bd3287db6 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4946: 56bdc68638cec64c6b02cd6b220b52b76059b51a @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_12806: 344cfdc4f851900bef2147526f7d0a8a22e71893 @ 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_12806/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v3] drm/i915: Nuke drm_crtc_state and use intel_atomic_state instead
2019-04-15 18:22 ` [PATCH v3] " Manasi Navare
@ 2019-04-15 20:02 ` Manasi Navare
0 siblings, 0 replies; 13+ messages in thread
From: Manasi Navare @ 2019-04-15 20:02 UTC (permalink / raw)
To: intel-gfx
Pushed to dinq, thanks for the review!
Regards
Manasi
On Mon, Apr 15, 2019 at 11:22:10AM -0700, Manasi Navare wrote:
> This is one of the patches to start replacing drm pointers
> and use the intel_atomic_state and intel_crtc to derive
> the necessary intel state variables required for the intel
> modeset functions.
>
> v3:
> * Remove the unwanted newline (Ville)
> v2:
> * Flip the function arguments (Ville)
> * Remove some remaining instances of drm pointers (Ville)
> * Use old_crtc_state and new_crtc_state (Ville)
>
> Suggested-by: Ville Syrjala <ville.syrjala@linux.intel.com>
> Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
> Signed-off-by: Manasi Navare <manasi.d.navare@intel.com>
> Reviewed-by: Ville Syrjala <ville.syrjala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/intel_display.c | 61 +++++++++++++---------------
> 1 file changed, 28 insertions(+), 33 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index f29a348e8d71..aaf44ab6766f 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -125,8 +125,8 @@ static void vlv_prepare_pll(struct intel_crtc *crtc,
> const struct intel_crtc_state *pipe_config);
> static void chv_prepare_pll(struct intel_crtc *crtc,
> const struct intel_crtc_state *pipe_config);
> -static void intel_begin_crtc_commit(struct drm_crtc *, struct drm_crtc_state *);
> -static void intel_finish_crtc_commit(struct drm_crtc *, struct drm_crtc_state *);
> +static void intel_begin_crtc_commit(struct intel_atomic_state *, struct intel_crtc *);
> +static void intel_finish_crtc_commit(struct intel_atomic_state *, struct intel_crtc *);
> static void intel_crtc_init_scalers(struct intel_crtc *crtc,
> struct intel_crtc_state *crtc_state);
> static void skylake_pfit_enable(const struct intel_crtc_state *crtc_state);
> @@ -13273,14 +13273,14 @@ static void intel_update_crtc(struct drm_crtc *crtc,
> else if (new_plane_state)
> intel_fbc_enable(intel_crtc, pipe_config, new_plane_state);
>
> - intel_begin_crtc_commit(crtc, old_crtc_state);
> + intel_begin_crtc_commit(to_intel_atomic_state(state), intel_crtc);
>
> if (INTEL_GEN(dev_priv) >= 9)
> skl_update_planes_on_crtc(to_intel_atomic_state(state), intel_crtc);
> else
> i9xx_update_planes_on_crtc(to_intel_atomic_state(state), intel_crtc);
>
> - intel_finish_crtc_commit(crtc, old_crtc_state);
> + intel_finish_crtc_commit(to_intel_atomic_state(state), intel_crtc);
> }
>
> static void intel_update_crtcs(struct drm_atomic_state *state)
> @@ -14070,39 +14070,35 @@ skl_max_scale(const struct intel_crtc_state *crtc_state,
> return max_scale;
> }
>
> -static void intel_begin_crtc_commit(struct drm_crtc *crtc,
> - struct drm_crtc_state *old_crtc_state)
> +static void intel_begin_crtc_commit(struct intel_atomic_state *state,
> + struct intel_crtc *crtc)
> {
> - struct drm_device *dev = crtc->dev;
> - struct drm_i915_private *dev_priv = to_i915(dev);
> - struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
> - struct intel_crtc_state *old_intel_cstate =
> - to_intel_crtc_state(old_crtc_state);
> - struct intel_atomic_state *old_intel_state =
> - to_intel_atomic_state(old_crtc_state->state);
> - struct intel_crtc_state *intel_cstate =
> - intel_atomic_get_new_crtc_state(old_intel_state, intel_crtc);
> - bool modeset = needs_modeset(&intel_cstate->base);
> + struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
> + struct intel_crtc_state *old_crtc_state =
> + intel_atomic_get_old_crtc_state(state, crtc);
> + struct intel_crtc_state *new_crtc_state =
> + intel_atomic_get_new_crtc_state(state, crtc);
> + bool modeset = needs_modeset(&new_crtc_state->base);
>
> /* Perform vblank evasion around commit operation */
> - intel_pipe_update_start(intel_cstate);
> + intel_pipe_update_start(new_crtc_state);
>
> if (modeset)
> goto out;
>
> - if (intel_cstate->base.color_mgmt_changed ||
> - intel_cstate->update_pipe)
> - intel_color_commit(intel_cstate);
> + if (new_crtc_state->base.color_mgmt_changed ||
> + new_crtc_state->update_pipe)
> + intel_color_commit(new_crtc_state);
>
> - if (intel_cstate->update_pipe)
> - intel_update_pipe_config(old_intel_cstate, intel_cstate);
> + if (new_crtc_state->update_pipe)
> + intel_update_pipe_config(old_crtc_state, new_crtc_state);
> else if (INTEL_GEN(dev_priv) >= 9)
> - skl_detach_scalers(intel_cstate);
> + skl_detach_scalers(new_crtc_state);
>
> out:
> if (dev_priv->display.atomic_update_watermarks)
> - dev_priv->display.atomic_update_watermarks(old_intel_state,
> - intel_cstate);
> + dev_priv->display.atomic_update_watermarks(state,
> + new_crtc_state);
> }
>
> void intel_crtc_arm_fifo_underrun(struct intel_crtc *crtc,
> @@ -14121,21 +14117,20 @@ void intel_crtc_arm_fifo_underrun(struct intel_crtc *crtc,
> }
> }
>
> -static void intel_finish_crtc_commit(struct drm_crtc *crtc,
> - struct drm_crtc_state *old_crtc_state)
> +static void intel_finish_crtc_commit(struct intel_atomic_state *state,
> + struct intel_crtc *crtc)
> {
> - struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
> - struct intel_atomic_state *old_intel_state =
> - to_intel_atomic_state(old_crtc_state->state);
> + struct intel_crtc_state *old_crtc_state =
> + intel_atomic_get_old_crtc_state(state, crtc);
> struct intel_crtc_state *new_crtc_state =
> - intel_atomic_get_new_crtc_state(old_intel_state, intel_crtc);
> + intel_atomic_get_new_crtc_state(state, crtc);
>
> intel_pipe_update_end(new_crtc_state);
>
> if (new_crtc_state->update_pipe &&
> !needs_modeset(&new_crtc_state->base) &&
> - old_crtc_state->mode.private_flags & I915_MODE_FLAG_INHERITED)
> - intel_crtc_arm_fifo_underrun(intel_crtc, new_crtc_state);
> + old_crtc_state->base.mode.private_flags & I915_MODE_FLAG_INHERITED)
> + intel_crtc_arm_fifo_underrun(crtc, new_crtc_state);
> }
>
> /**
> --
> 2.19.1
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2019-04-15 20:00 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-11 23:02 [PATCH] drm/i915: Nuke drm_crtc_state and use intel_atomic_state instead Manasi Navare
2019-04-12 0:42 ` ✗ Fi.CI.BAT: failure for " Patchwork
2019-04-12 6:11 ` [PATCH] " Ville Syrjälä
2019-04-12 19:58 ` Manasi Navare
2019-04-12 21:22 ` [PATCH v2] " Manasi Navare
2019-04-15 12:17 ` Ville Syrjälä
2019-04-15 18:15 ` Manasi Navare
2019-04-15 18:22 ` [PATCH v3] " Manasi Navare
2019-04-15 20:02 ` Manasi Navare
2019-04-12 22:33 ` ✓ Fi.CI.BAT: success for drm/i915: Nuke drm_crtc_state and use intel_atomic_state instead (rev2) Patchwork
2019-04-13 2:30 ` ✓ Fi.CI.IGT: " Patchwork
2019-04-15 18:56 ` ✓ Fi.CI.BAT: success for drm/i915: Nuke drm_crtc_state and use intel_atomic_state instead (rev3) Patchwork
2019-04-15 20:00 ` ✗ Fi.CI.IGT: failure " Patchwork
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.