From: Jani Nikula <jani.nikula@intel.com>
To: "José Roberto de Souza" <jose.souza@intel.com>,
intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx] [PATCH] drm/i915: Fix redefinition of sanitize_watermarks_add_affected
Date: Thu, 06 Feb 2020 13:07:05 +0200 [thread overview]
Message-ID: <87mu9wnfdy.fsf@intel.com> (raw)
In-Reply-To: <20200206003046.171642-1-jose.souza@intel.com>
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
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
prev parent reply other threads:[~2020-02-06 11:07 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-06 0:30 [Intel-gfx] [PATCH] drm/i915: Fix redefinition of sanitize_watermarks_add_affected José Roberto de Souza
2020-02-06 2:58 ` [Intel-gfx] ✗ Fi.CI.BAT: failure for " Patchwork
2020-02-06 11:07 ` Jani Nikula [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87mu9wnfdy.fsf@intel.com \
--to=jani.nikula@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jose.souza@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox