| Message ID | 20200206003046.171642-1-jose.souza@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915: Fix redefinition of sanitize_watermarks_add_affected | expand |
On Wed, 05 Feb 2020, José Roberto de Souza <jose.souza@intel.com> wrote: > Commit 44a67719497b ("drm/i915: Fix modeset locks in sanitize_watermarks()") > that added this function is correctly, this issue was introduced when > resolving the merge conflict. It was a silent conflict in drm-tip rebuild. Chris fixed it with a fixup patch in drm-rerere. bc1bdfd57a19 ("2020y-02m-06d-01h-52m-12s UTC: drm-tip rerere cache update"). BR, Jani. > > Fixes: 9c654e423507 ("Merge remote-tracking branch >'drm-intel/drm-intel-next-queued' into drm-tip") Cc: Jani Nikula ><jani.nikula@intel.com> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> >Signed-off-by: José Roberto de Souza <jose.souza@intel.com> --- >drivers/gpu/drm/i915/display/intel_display.c | 24 -------------------- >1 file changed, 24 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c > index cde10b536a91..80eebdc4c670 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -17688,30 +17688,6 @@ static int sanitize_watermarks_add_affected(struct drm_atomic_state *state) > return 0; > } > > -static int sanitize_watermarks_add_affected(struct drm_atomic_state *state) > -{ > - struct drm_plane *plane; > - struct drm_crtc *crtc; > - > - drm_for_each_crtc(crtc, state->dev) { > - struct drm_crtc_state *crtc_state; > - > - crtc_state = drm_atomic_get_crtc_state(state, crtc); > - if (IS_ERR(crtc_state)) > - return PTR_ERR(crtc_state); > - } > - > - drm_for_each_plane(plane, state->dev) { > - struct drm_plane_state *plane_state; > - > - plane_state = drm_atomic_get_plane_state(state, plane); > - if (IS_ERR(plane_state)) > - return PTR_ERR(plane_state); > - } > - > - return 0; > -} > - > /* > * Calculate what we think the watermarks should be for the state we've read > * out of the hardware and then immediately program those watermarks so that
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index cde10b536a91..80eebdc4c670 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -17688,30 +17688,6 @@ static int sanitize_watermarks_add_affected(struct drm_atomic_state *state) return 0; } -static int sanitize_watermarks_add_affected(struct drm_atomic_state *state) -{ - struct drm_plane *plane; - struct drm_crtc *crtc; - - drm_for_each_crtc(crtc, state->dev) { - struct drm_crtc_state *crtc_state; - - crtc_state = drm_atomic_get_crtc_state(state, crtc); - if (IS_ERR(crtc_state)) - return PTR_ERR(crtc_state); - } - - drm_for_each_plane(plane, state->dev) { - struct drm_plane_state *plane_state; - - plane_state = drm_atomic_get_plane_state(state, plane); - if (IS_ERR(plane_state)) - return PTR_ERR(plane_state); - } - - return 0; -} - /* * Calculate what we think the watermarks should be for the state we've read * out of the hardware and then immediately program those watermarks so that
Commit 44a67719497b ("drm/i915: Fix modeset locks in sanitize_watermarks()") that added this function is correctly, this issue was introduced when resolving the merge conflict. Fixes: 9c654e423507 ("Merge remote-tracking branch 'drm-intel/drm-intel-next-queued' into drm-tip") Cc: Jani Nikula <jani.nikula@intel.com> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Signed-off-by: José Roberto de Souza <jose.souza@intel.com> --- drivers/gpu/drm/i915/display/intel_display.c | 24 -------------------- 1 file changed, 24 deletions(-)