All of lore.kernel.org
 help / color / mirror / Atom feed
From: Bhawanpreet Lakha <Bhawanpreet.Lakha-5C7GfCeVMHo@public.gmane.org>
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
Cc: Dmytro Laktyushkin <Dmytro.Laktyushkin-5C7GfCeVMHo@public.gmane.org>
Subject: [PATCH 07/38] drm/amd/display: fix pipe re-assignment when odm present
Date: Wed, 2 Oct 2019 14:16:02 -0400	[thread overview]
Message-ID: <20191002181633.22805-8-Bhawanpreet.Lakha@amd.com> (raw)
In-Reply-To: <20191002181633.22805-1-Bhawanpreet.Lakha-5C7GfCeVMHo@public.gmane.org>

From: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>

Currently pipe split may steal an existing ODM pipe depending on stream
sequence. This change prevents that from happening as easily.

Change-Id: I2e604894aaef2c782284fcc12d4e9a7381cf6eab
Signed-off-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Reviewed-by: Gary Kattan <Gary.Kattan@amd.com>
Acked-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
---
 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
index f57c686398fe..af0e0d1be147 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
@@ -2201,7 +2201,8 @@ static struct pipe_ctx *dcn20_find_secondary_pipe(struct dc *dc,
 		 */
 		if (secondary_pipe == NULL) {
 			for (j = dc->res_pool->pipe_count - 1; j >= 0; j--) {
-				if (dc->current_state->res_ctx.pipe_ctx[j].top_pipe == NULL) {
+				if (dc->current_state->res_ctx.pipe_ctx[j].top_pipe == NULL
+						&& dc->current_state->res_ctx.pipe_ctx[j].prev_odm_pipe == NULL) {
 					preferred_pipe_idx = j;
 
 					if (res_ctx->pipe_ctx[preferred_pipe_idx].stream == NULL) {
-- 
2.17.1

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

  parent reply	other threads:[~2019-10-02 18:16 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-02 18:15 [PATCH 00/38] DC Patches 02 Oct 2019 Bhawanpreet Lakha
     [not found] ` <20191002181633.22805-1-Bhawanpreet.Lakha-5C7GfCeVMHo@public.gmane.org>
2019-10-02 18:15   ` [PATCH 01/38] drm/amd/display: Added pixel dynamic expansion control Bhawanpreet Lakha
2019-10-02 18:15   ` [PATCH 02/38] drm/amd/display: Correct values in AVI infoframe Bhawanpreet Lakha
2019-10-02 18:15   ` [PATCH 03/38] drm/amd/display: skip enable stream on disconnected display Bhawanpreet Lakha
2019-10-02 18:15   ` [PATCH 04/38] drm/amd/display: Add Logging for Gamma Related information Bhawanpreet Lakha
2019-10-02 18:16   ` [PATCH 05/38] drm/amd/display: Update V_UPDATE whenever VSTARTUP changes Bhawanpreet Lakha
2019-10-02 18:16   ` [PATCH 06/38] drm/amd/display: Reprogram FMT on pipe change Bhawanpreet Lakha
2019-10-02 18:16   ` Bhawanpreet Lakha [this message]
2019-10-02 18:16   ` [PATCH 08/38] drm/amd/display: fix hotplug during display off Bhawanpreet Lakha
2019-10-02 18:16   ` [PATCH 09/38] drm/amd/display: add support for VSIP info packet Bhawanpreet Lakha
2019-10-02 18:16   ` [PATCH 10/38] drm/amd/display: add explicit comparator as default optimization check Bhawanpreet Lakha
2019-10-02 18:16   ` [PATCH 11/38] drm/amd/display: Add missing shifts and masks for dpp registers on dcn2 Bhawanpreet Lakha
2019-10-02 18:16   ` [PATCH 12/38] drm/amd/display: 3.2.52 Bhawanpreet Lakha
2019-10-02 18:16   ` [PATCH 13/38] drm/amd/display: build up VSIF infopacket Bhawanpreet Lakha
2019-10-02 18:16   ` [PATCH 14/38] drm/amd/display: check phy dpalt lane count config Bhawanpreet Lakha
2019-10-02 18:16   ` [PATCH 15/38] drm/amd/display: Restore should_update_pstate_support after bad revert Bhawanpreet Lakha
2019-10-02 18:16   ` [PATCH 16/38] drm/amd/display: Properly round nominal frequency for SPD Bhawanpreet Lakha
2019-10-02 18:16   ` [PATCH 17/38] drm/amd/display: Add output bitrate to DML calculations Bhawanpreet Lakha
2019-10-02 18:16   ` [PATCH 18/38] drm/amd/display: wait for set pipe mcp command completion Bhawanpreet Lakha
2019-10-02 18:16   ` [PATCH 19/38] drm/amd/display: fix bug with check for HPD Low in verify link cap Bhawanpreet Lakha
2019-10-02 18:16   ` [PATCH 20/38] drm/amd/display: Use dcn1 Optimal Taps Get Bhawanpreet Lakha
2019-10-02 18:16   ` [PATCH 21/38] drm/amd/display: 3.2.53 Bhawanpreet Lakha
2019-10-02 18:16   ` [PATCH 22/38] drm/amd/display: Program DWB watermarks from correct state Bhawanpreet Lakha
2019-10-02 18:16   ` [PATCH 23/38] drm/amd/display: exit PSR during detection Bhawanpreet Lakha
2019-10-02 18:16   ` [PATCH 24/38] drm/amd/display: fix code to control 48mhz refclk Bhawanpreet Lakha
2019-10-02 18:16   ` [PATCH 25/38] drm/amd/display: add guard for SMU ver, for 48mhz clk Bhawanpreet Lakha
2019-10-02 18:16   ` [PATCH 26/38] drm/amd/display: Update number of dcn21 audio endpoints Bhawanpreet Lakha
2019-10-02 18:16   ` [PATCH 27/38] drm/amd/display: add new active dongle to existent w/a Bhawanpreet Lakha
2019-10-02 18:16   ` [PATCH 28/38] drm/amd/display: add more checks to validate seamless boot timing Bhawanpreet Lakha
2019-10-02 18:16   ` [PATCH 29/38] drm/amd/display: Fix maybe-uninitialized warning Bhawanpreet Lakha
2019-10-02 18:16   ` [PATCH 30/38] drm/amd/display: use vbios message to call smu for dpm level Bhawanpreet Lakha
2019-10-02 18:16   ` [PATCH 31/38] drm/amd/display: make aux defer delay and aux sw start delay seperate Bhawanpreet Lakha
2019-10-02 18:16   ` [PATCH 32/38] drm/amd/display: 3.2.54 Bhawanpreet Lakha
2019-10-02 18:16   ` [PATCH 33/38] drm/amd/display: Add capability check for static ramp calc Bhawanpreet Lakha
2019-10-02 18:16   ` [PATCH 34/38] drm/amd/display: Fix dongle_caps containing stale information Bhawanpreet Lakha
2019-10-02 18:16   ` [PATCH 35/38] drm/amd/display: correct stream LTE_340MCSC_SCRAMBLE value Bhawanpreet Lakha
2019-10-02 18:16   ` [PATCH 36/38] drm/amd/display: Skip DIG Check if Link is Virtual for Display Count Bhawanpreet Lakha
2019-10-02 18:16   ` [PATCH 37/38] drm/amd/display: hook up notify watermark ranges and get clock table Bhawanpreet Lakha
2019-10-02 18:16   ` [PATCH 38/38] drm/amd/display: add renoir specific watermark range and clk helper Bhawanpreet Lakha

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=20191002181633.22805-8-Bhawanpreet.Lakha@amd.com \
    --to=bhawanpreet.lakha-5c7gfcevmho@public.gmane.org \
    --cc=Dmytro.Laktyushkin-5C7GfCeVMHo@public.gmane.org \
    --cc=amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org \
    /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 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.