Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38d5487d authored by Keith Packard's avatar Keith Packard Committed by Dave Airlie
Browse files

drm: When adding probed modes, preserve duplicate mode types 



The code which takes probed modes and adds them to a connector eliminates
duplicate modes by comparing them using drm_mode_equal. That function
doesn't consider the type bits, which means that any modes which differ only
in the type field will be lost.

One of the bits in the mode->type field is the DRM_MODE_TYPE_PREFERRED bit.
If the mode with that bit is lost, then higher level code will not know
which mode to select, causing a random mode to be used instead.

This patch simply merges the two mode type bits together; that seems
reasonable to me, but perhaps only a subset of the bits should be used? None
of these can be user defined as they all come from looking at just the
hardware.

Signed-off-by: default avatarKeith Packard <keithp@keithp.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 7b2aa037

drivers/gpu/drm/drm_modes.c

+2 −0
Original line number Diff line number Diff line
@@ -566,6 +566,8 @@ void drm_mode_connector_list_update(struct drm_connector *connector) 
				found_it = 1;

				/* if equal delete the probed mode */

				mode->status = pmode->status;

				/* Merge type bits together */

				mode->type |= pmode->type;

				list_del(&pmode->head);

				drm_mode_destroy(connector->dev, pmode);

				break;