diff options
author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2015-12-10 15:39:08 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-12-11 03:26:47 -0500 |
commit | 5ba894064d98547c82a1efd50eba40a92df777a1 (patch) | |
tree | 78259fd1e7c4ca812396479298c8bb64f35c302e | |
parent | be8719a610003297c28b140f1ebd4445aef1d613 (diff) |
drm: Rename MODE_UNVERIFIED to MODE_STALE
MODE_UNVERIFIED actually means that the mode came from a previous probe,
and if the new probe doesn't produce a matching mode it will get pruned
from the list. Rename the flag to MODE_STALE to better convey the
meaning.
v2: Rebased due to conflicts with Daniel's doc stuff
Cc: Adam Jackson <ajax@redhat.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1449779948-10906-1-git-send-email-ville.syrjala@linux.intel.com
-rw-r--r-- | drivers/gpu/drm/drm_modes.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/drm_probe_helper.c | 4 | ||||
-rw-r--r-- | include/drm/drm_modes.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c index 1892e615528a..6cd582fdcc4b 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c | |||
@@ -1074,7 +1074,7 @@ static const char * const drm_mode_status_names[] = { | |||
1074 | MODE_STATUS(ONE_SIZE), | 1074 | MODE_STATUS(ONE_SIZE), |
1075 | MODE_STATUS(NO_REDUCED), | 1075 | MODE_STATUS(NO_REDUCED), |
1076 | MODE_STATUS(NO_STEREO), | 1076 | MODE_STATUS(NO_STEREO), |
1077 | MODE_STATUS(UNVERIFIED), | 1077 | MODE_STATUS(STALE), |
1078 | MODE_STATUS(BAD), | 1078 | MODE_STATUS(BAD), |
1079 | MODE_STATUS(ERROR), | 1079 | MODE_STATUS(ERROR), |
1080 | }; | 1080 | }; |
diff --git a/drivers/gpu/drm/drm_probe_helper.c b/drivers/gpu/drm/drm_probe_helper.c index b691253aa752..3bdc8684fe58 100644 --- a/drivers/gpu/drm/drm_probe_helper.c +++ b/drivers/gpu/drm/drm_probe_helper.c | |||
@@ -146,9 +146,9 @@ static int drm_helper_probe_single_connector_modes_merge_bits(struct drm_connect | |||
146 | 146 | ||
147 | DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n", connector->base.id, | 147 | DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n", connector->base.id, |
148 | connector->name); | 148 | connector->name); |
149 | /* set all modes to the unverified state */ | 149 | /* set all old modes to the stale state */ |
150 | list_for_each_entry(mode, &connector->modes, head) | 150 | list_for_each_entry(mode, &connector->modes, head) |
151 | mode->status = MODE_UNVERIFIED; | 151 | mode->status = MODE_STALE; |
152 | 152 | ||
153 | old_status = connector->status; | 153 | old_status = connector->status; |
154 | 154 | ||
diff --git a/include/drm/drm_modes.h b/include/drm/drm_modes.h index 9e6d7a1cd19b..d7445ccd958d 100644 --- a/include/drm/drm_modes.h +++ b/include/drm/drm_modes.h | |||
@@ -73,7 +73,7 @@ | |||
73 | * @MODE_ONE_SIZE: only one resolution is supported | 73 | * @MODE_ONE_SIZE: only one resolution is supported |
74 | * @MODE_NO_REDUCED: monitor doesn't accept reduced blanking | 74 | * @MODE_NO_REDUCED: monitor doesn't accept reduced blanking |
75 | * @MODE_NO_STEREO: stereo modes not supported | 75 | * @MODE_NO_STEREO: stereo modes not supported |
76 | * @MODE_UNVERIFIED: mode needs to reverified | 76 | * @MODE_STALE: mode has become stale |
77 | * @MODE_BAD: unspecified reason | 77 | * @MODE_BAD: unspecified reason |
78 | * @MODE_ERROR: error condition | 78 | * @MODE_ERROR: error condition |
79 | * | 79 | * |
@@ -117,7 +117,7 @@ enum drm_mode_status { | |||
117 | MODE_ONE_SIZE, | 117 | MODE_ONE_SIZE, |
118 | MODE_NO_REDUCED, | 118 | MODE_NO_REDUCED, |
119 | MODE_NO_STEREO, | 119 | MODE_NO_STEREO, |
120 | MODE_UNVERIFIED = -3, | 120 | MODE_STALE = -3, |
121 | MODE_BAD = -2, | 121 | MODE_BAD = -2, |
122 | MODE_ERROR = -1 | 122 | MODE_ERROR = -1 |
123 | }; | 123 | }; |