diff options
| author | Marc-André Lureau <marcandre.lureau@gmail.com> | 2013-10-18 16:11:30 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-10-23 14:21:12 +0100 |
| commit | 3fbd6439e4639ecaeaae6c079e0aa497a1ac3482 (patch) | |
| tree | 4cf75adf7857e6c9e7591753b9a4ec63ca3a3aab /drivers/gpu/drm/drm_modes.c | |
| parent | 4fdb086924db46489b1af679e2a06683f73c9cbc (diff) | |
| download | blackbird-op-linux-3fbd6439e4639ecaeaae6c079e0aa497a1ac3482.tar.gz blackbird-op-linux-3fbd6439e4639ecaeaae6c079e0aa497a1ac3482.zip | |
drm: copy mode type in drm_mode_connector_list_update()
In commit 38d5487db7f289be1d56ac7df704ee49ed3213b9, Keith explained:
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.
However, merging the bits means that a flag becomes sticky. It is not
possible, for example to update the mode type to remove the
DRM_MODE_TYPE_PREFERRED bit.
After a brief discussion with Dave Airlie on irc, it was agreed to
propose that change, instead of introducing another function to remove a
bit from exisiting modes type.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/drm_modes.c')
| -rw-r--r-- | drivers/gpu/drm/drm_modes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c index b0733153dfd2..85071a1c4547 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c @@ -1041,7 +1041,7 @@ void drm_mode_connector_list_update(struct drm_connector *connector) /* if equal delete the probed mode */ mode->status = pmode->status; /* Merge type bits together */ - mode->type |= pmode->type; + mode->type = pmode->type; list_del(&pmode->head); drm_mode_destroy(connector->dev, pmode); break; |
