From: Lyude Paul <lyude@redhat.com>
To: amd-gfx@lists.freedesktop.org
Cc: "Ville Syrjälä" <ville.syrjala@linux.intel.com>,
"Harry Wentland" <harry.wentland@amd.com>,
"Leo Li" <sunpeng.li@amd.com>,
"Alex Deucher" <alexander.deucher@amd.com>,
"Christian König" <christian.koenig@amd.com>,
"David (ChunMing) Zhou" <David1.Zhou@amd.com>,
"David Airlie" <airlied@linux.ie>,
"Daniel Vetter" <daniel@ffwll.ch>,
"Nicholas Kazlauskas" <nicholas.kazlauskas@amd.com>,
"David Francis" <David.Francis@amd.com>,
"Mario Kleiner" <mario.kleiner.de@gmail.com>,
dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
Subject: [PATCH 5/6] drm/amdgpu/dm/mst: Report possible_crtcs incorrectly, for now
Date: Thu, 26 Sep 2019 18:51:07 -0400 [thread overview]
Message-ID: <20190926225122.31455-6-lyude@redhat.com> (raw)
In-Reply-To: <20190926225122.31455-1-lyude@redhat.com>
This commit is seperate from the previous one to make it easier to
revert in the future. Basically, there's multiple userspace applications
that interpret possible_crtcs very wrong:
https://gitlab.freedesktop.org/xorg/xserver/merge_requests/277
https://gitlab.gnome.org/GNOME/mutter/issues/759
While work is ongoing to fix these issues in userspace, we need to
report ->possible_crtcs incorrectly for now in order to avoid
introducing a regression in in userspace. Once these issues get fixed,
this commit should be reverted.
Signed-off-by: Lyude Paul <lyude@redhat.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index b404f1ae6df7..fe8ac801d7a5 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -4807,6 +4807,17 @@ static int amdgpu_dm_crtc_init(struct amdgpu_display_manager *dm,
if (!acrtc->mst_encoder)
goto fail;
+ /*
+ * FIXME: This is a hack to workaround the following issues:
+ *
+ * https://gitlab.gnome.org/GNOME/mutter/issues/759
+ * https://gitlab.freedesktop.org/xorg/xserver/merge_requests/277
+ *
+ * One these issues are closed, this should be removed
+ */
+ acrtc->mst_encoder->base.possible_crtcs =
+ amdgpu_dm_get_encoder_crtc_mask(dm->adev);
+
return 0;
fail:
--
2.21.0
next prev parent reply other threads:[~2019-09-26 22:52 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-26 22:51 [PATCH 0/6] drm/amdgpu: Fix incorrect encoder API usages Lyude Paul
2019-09-26 22:51 ` [PATCH 1/6] drm/amdgpu/dm/mst: Don't create MST topology managers for eDP ports Lyude Paul
2019-09-27 17:48 ` Harry Wentland
2019-09-27 18:18 ` Alex Deucher
2019-09-26 22:51 ` [PATCH 2/6] drm/amdgpu/dm/mst: Remove unnecessary NULL check Lyude Paul
2019-09-27 14:05 ` Alex Deucher
2019-09-26 22:51 ` [PATCH 3/6] drm/amdgpu/dm/mst: Use ->atomic_best_encoder Lyude Paul
2019-09-27 14:06 ` Alex Deucher
2019-09-27 17:56 ` Harry Wentland
2019-09-27 18:20 ` Alex Deucher
2019-09-26 22:51 ` [PATCH 4/6] drm/amdgpu/dm/mst: Make MST encoders per-CRTC and fix encoder usage Lyude Paul
2019-09-26 22:51 ` Lyude Paul [this message]
2019-09-27 15:27 ` [PATCH 5/6] drm/amdgpu/dm/mst: Report possible_crtcs incorrectly, for now Sean Paul
2019-10-09 15:01 ` Daniel Vetter
2019-10-11 20:51 ` Lyude Paul
2019-10-14 8:45 ` Daniel Vetter
2019-09-26 22:51 ` [PATCH 6/6] drm/encoder: WARN() when adding/removing encoders after device registration Lyude Paul
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=20190926225122.31455-6-lyude@redhat.com \
--to=lyude@redhat.com \
--cc=David.Francis@amd.com \
--cc=David1.Zhou@amd.com \
--cc=airlied@linux.ie \
--cc=alexander.deucher@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=christian.koenig@amd.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=harry.wentland@amd.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mario.kleiner.de@gmail.com \
--cc=nicholas.kazlauskas@amd.com \
--cc=sunpeng.li@amd.com \
--cc=ville.syrjala@linux.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