diff options
author | Adam Jackson <ajax@redhat.com> | 2012-04-13 16:33:30 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-04-20 07:56:56 -0400 |
commit | f8b46a05e6ced02e75cd782c015a57e67d5c644d (patch) | |
tree | 64706f9c431c47023455374dc319cf4068702ccf /drivers/gpu/drm/drm_edid.c | |
parent | 33c7531df850869a7b623d4dfcfcb7e2ab873844 (diff) |
drm/edid: Rewrite drm_mode_find_dmt search loop
No functional change, but will make an upcoming change clearer.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Tested-by: Takashi Iwai <tiwai@suse.de>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/drm_edid.c')
-rw-r--r-- | drivers/gpu/drm/drm_edid.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index a75aefef528e..9c8fa8860f6b 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c | |||
@@ -499,20 +499,21 @@ static void edid_fixup_preferred(struct drm_connector *connector, | |||
499 | struct drm_display_mode *drm_mode_find_dmt(struct drm_device *dev, | 499 | struct drm_display_mode *drm_mode_find_dmt(struct drm_device *dev, |
500 | int hsize, int vsize, int fresh) | 500 | int hsize, int vsize, int fresh) |
501 | { | 501 | { |
502 | struct drm_display_mode *mode = NULL; | ||
503 | int i; | 502 | int i; |
504 | 503 | ||
505 | for (i = 0; i < drm_num_dmt_modes; i++) { | 504 | for (i = 0; i < drm_num_dmt_modes; i++) { |
506 | const struct drm_display_mode *ptr = &drm_dmt_modes[i]; | 505 | const struct drm_display_mode *ptr = &drm_dmt_modes[i]; |
507 | if (hsize == ptr->hdisplay && | 506 | if (hsize != ptr->hdisplay) |
508 | vsize == ptr->vdisplay && | 507 | continue; |
509 | fresh == drm_mode_vrefresh(ptr)) { | 508 | if (vsize != ptr->vdisplay) |
510 | /* get the expected default mode */ | 509 | continue; |
511 | mode = drm_mode_duplicate(dev, ptr); | 510 | if (fresh != drm_mode_vrefresh(ptr)) |
512 | break; | 511 | continue; |
513 | } | 512 | |
513 | return drm_mode_duplicate(dev, ptr); | ||
514 | } | 514 | } |
515 | return mode; | 515 | |
516 | return NULL; | ||
516 | } | 517 | } |
517 | EXPORT_SYMBOL(drm_mode_find_dmt); | 518 | EXPORT_SYMBOL(drm_mode_find_dmt); |
518 | 519 | ||