diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2019-09-03 16:44:56 +0300 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2021-06-14 22:39:39 +0000 |
| commit | d16f6403153596b62c555fb511881289f59f9e81 (patch) | |
| tree | 8ead9e307124bebe26f577271be1151a3a13b520 | |
| parent | f1e76731a02e77c73521134933e424a17df40a1c (diff) | |
modesetting: Fix possible_crtcs
Populate outout possible_crtcs as the union of possible_crtcs from
the encoders rather than the intersection. Otherwise we're easily left
with possible_crtcs==0 when all the possible encoders have
non-overlapping possible_crtcs.
No idea what the magic 0x7f is about, but keep it around in case
it matters.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
(cherry picked from commit 0e4bd71d02d09c320e76280ae8f14df169387507)
| -rw-r--r-- | hw/xfree86/drivers/modesetting/drmmode_display.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c index 360434ebd..6f5f8caf6 100644 --- a/hw/xfree86/drivers/modesetting/drmmode_display.c +++ b/hw/xfree86/drivers/modesetting/drmmode_display.c @@ -2997,9 +2997,9 @@ drmmode_output_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, drmModeResPtr mode_r output->driver_private = drmmode_output; output->non_desktop = nonDesktop; - output->possible_crtcs = 0x7f; + output->possible_crtcs = 0; for (i = 0; i < koutput->count_encoders; i++) { - output->possible_crtcs &= kencoders[i]->possible_crtcs >> crtcshift; + output->possible_crtcs |= (kencoders[i]->possible_crtcs >> crtcshift) & 0x7f; } /* work out the possible clones later */ output->possible_clones = 0; |