| Message ID | 20230907122541.32261-2-ville.syrjala@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915: Slightly more atomic multi-pipe commits | expand |
On Thu, Sep 07, 2023 at 03:25:39PM +0300, Ville Syrjala wrote: > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > Since commit 7de5b6b54630 ("drm/i915: Don't flag both full > modeset and fastset at the same time") > intel_crtc_needs_fastset() and intel_crtc_needs_modeset() have > been mutually exclusive. Drop the redundant check. > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Let's see if the crash returns, however if it does then anyway its time to change/refactor bigjoiner logic(as we suspected it to be bigjoiner issue) Reviewed-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com> > --- > drivers/gpu/drm/i915/display/intel_display.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c > index 83e1bc858b9f..526f38b502be 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -6606,7 +6606,7 @@ static void intel_update_crtc(struct intel_atomic_state *state, > * valid pipe configuration from the BIOS we need to take care > * of enabling them on the CRTC's first fastset. > */ > - if (intel_crtc_needs_fastset(new_crtc_state) && !modeset && > + if (intel_crtc_needs_fastset(new_crtc_state) && > old_crtc_state->inherited) > intel_crtc_arm_fifo_underrun(crtc, new_crtc_state); > } > -- > 2.41.0 >
On Wed, Oct 11, 2023 at 04:47:00PM +0300, Lisovskiy, Stanislav wrote: > On Thu, Sep 07, 2023 at 03:25:39PM +0300, Ville Syrjala wrote: > > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > > > Since commit 7de5b6b54630 ("drm/i915: Don't flag both full > > modeset and fastset at the same time") > > intel_crtc_needs_fastset() and intel_crtc_needs_modeset() have > > been mutually exclusive. Drop the redundant check. > > > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > > Let's see if the crash returns, however if it does then anyway > its time to change/refactor bigjoiner logic(as we suspected it > to be bigjoiner issue) You must be thinking of some other patch. > > Reviewed-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com> > > > --- > > drivers/gpu/drm/i915/display/intel_display.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c > > index 83e1bc858b9f..526f38b502be 100644 > > --- a/drivers/gpu/drm/i915/display/intel_display.c > > +++ b/drivers/gpu/drm/i915/display/intel_display.c > > @@ -6606,7 +6606,7 @@ static void intel_update_crtc(struct intel_atomic_state *state, > > * valid pipe configuration from the BIOS we need to take care > > * of enabling them on the CRTC's first fastset. > > */ > > - if (intel_crtc_needs_fastset(new_crtc_state) && !modeset && > > + if (intel_crtc_needs_fastset(new_crtc_state) && > > old_crtc_state->inherited) > > intel_crtc_arm_fifo_underrun(crtc, new_crtc_state); > > } > > -- > > 2.41.0 > >
On Wed, Oct 11, 2023 at 06:50:05PM +0300, Ville Syrjälä wrote: > On Wed, Oct 11, 2023 at 04:47:00PM +0300, Lisovskiy, Stanislav wrote: > > On Thu, Sep 07, 2023 at 03:25:39PM +0300, Ville Syrjala wrote: > > > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > > > > > Since commit 7de5b6b54630 ("drm/i915: Don't flag both full > > > modeset and fastset at the same time") > > > intel_crtc_needs_fastset() and intel_crtc_needs_modeset() have > > > been mutually exclusive. Drop the redundant check. > > > > > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > > > > Let's see if the crash returns, however if it does then anyway > > its time to change/refactor bigjoiner logic(as we suspected it > > to be bigjoiner issue) > > You must be thinking of some other patch. Yeah right, it was about another one. Anyways that change is ok for me. Stan > > > > > Reviewed-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com> > > > > > --- > > > drivers/gpu/drm/i915/display/intel_display.c | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c > > > index 83e1bc858b9f..526f38b502be 100644 > > > --- a/drivers/gpu/drm/i915/display/intel_display.c > > > +++ b/drivers/gpu/drm/i915/display/intel_display.c > > > @@ -6606,7 +6606,7 @@ static void intel_update_crtc(struct intel_atomic_state *state, > > > * valid pipe configuration from the BIOS we need to take care > > > * of enabling them on the CRTC's first fastset. > > > */ > > > - if (intel_crtc_needs_fastset(new_crtc_state) && !modeset && > > > + if (intel_crtc_needs_fastset(new_crtc_state) && > > > old_crtc_state->inherited) > > > intel_crtc_arm_fifo_underrun(crtc, new_crtc_state); > > > } > > > -- > > > 2.41.0 > > > > > -- > Ville Syrjälä > Intel
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index 83e1bc858b9f..526f38b502be 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -6606,7 +6606,7 @@ static void intel_update_crtc(struct intel_atomic_state *state, * valid pipe configuration from the BIOS we need to take care * of enabling them on the CRTC's first fastset. */ - if (intel_crtc_needs_fastset(new_crtc_state) && !modeset && + if (intel_crtc_needs_fastset(new_crtc_state) && old_crtc_state->inherited) intel_crtc_arm_fifo_underrun(crtc, new_crtc_state); }