diff options
author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2016-09-28 09:51:36 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-10-04 02:23:09 -0400 |
commit | ab5603c4d334224e3a884e62e7083ec69849fa7a (patch) | |
tree | d6ca3aff90ec5dca66492a50921a7c0c418a137f /drivers/gpu | |
parent | 75d7e542bd3669a7ce41b713be8d3fd71e0ed2fa (diff) |
drm/edid: Make max_tmds_clock kHz instead of MHz
We generally store clocks in kHz, so let's do that for the
HDMI max TMDS clock value as well. Less surpising.
v2: Deal with superfluous code shuffling
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Christian König <christian.koenig@amd.com> (v1)
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1475070703-6435-4-git-send-email-ville.syrjala@linux.intel.com
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/drm_edid.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_connectors.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c index decbba5ad438..58d51e680385 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | |||
@@ -173,7 +173,7 @@ int amdgpu_connector_get_monitor_bpc(struct drm_connector *connector) | |||
173 | mode_clock = amdgpu_connector->pixelclock_for_modeset; | 173 | mode_clock = amdgpu_connector->pixelclock_for_modeset; |
174 | 174 | ||
175 | /* Maximum allowable input clock in kHz */ | 175 | /* Maximum allowable input clock in kHz */ |
176 | max_tmds_clock = connector->max_tmds_clock * 1000; | 176 | max_tmds_clock = connector->max_tmds_clock; |
177 | 177 | ||
178 | DRM_DEBUG("%s: hdmi mode dotclock %d kHz, max tmds input clock %d kHz.\n", | 178 | DRM_DEBUG("%s: hdmi mode dotclock %d kHz, max tmds input clock %d kHz.\n", |
179 | connector->name, mode_clock, max_tmds_clock); | 179 | connector->name, mode_clock, max_tmds_clock); |
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index d0166cc990cb..b144d5ee66ea 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c | |||
@@ -3262,7 +3262,7 @@ parse_hdmi_vsdb(struct drm_connector *connector, const u8 *db) | |||
3262 | connector->dvi_dual = db[6] & 1; | 3262 | connector->dvi_dual = db[6] & 1; |
3263 | } | 3263 | } |
3264 | if (len >= 7) | 3264 | if (len >= 7) |
3265 | connector->max_tmds_clock = db[7] * 5; | 3265 | connector->max_tmds_clock = db[7] * 5000; |
3266 | if (len >= 8) { | 3266 | if (len >= 8) { |
3267 | connector->latency_present[0] = db[8] >> 7; | 3267 | connector->latency_present[0] = db[8] >> 7; |
3268 | connector->latency_present[1] = (db[8] >> 6) & 1; | 3268 | connector->latency_present[1] = (db[8] >> 6) & 1; |
diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c index b79f3b002471..db5488732e31 100644 --- a/drivers/gpu/drm/radeon/radeon_connectors.c +++ b/drivers/gpu/drm/radeon/radeon_connectors.c | |||
@@ -203,7 +203,7 @@ int radeon_get_monitor_bpc(struct drm_connector *connector) | |||
203 | mode_clock = radeon_connector->pixelclock_for_modeset; | 203 | mode_clock = radeon_connector->pixelclock_for_modeset; |
204 | 204 | ||
205 | /* Maximum allowable input clock in kHz */ | 205 | /* Maximum allowable input clock in kHz */ |
206 | max_tmds_clock = connector->max_tmds_clock * 1000; | 206 | max_tmds_clock = connector->max_tmds_clock; |
207 | 207 | ||
208 | DRM_DEBUG("%s: hdmi mode dotclock %d kHz, max tmds input clock %d kHz.\n", | 208 | DRM_DEBUG("%s: hdmi mode dotclock %d kHz, max tmds input clock %d kHz.\n", |
209 | connector->name, mode_clock, max_tmds_clock); | 209 | connector->name, mode_clock, max_tmds_clock); |