Commit 171fdd89 authored by Adam Jackson's avatar Adam Jackson Committed by Dave Airlie
Browse files

drm/modes: Fix interlaced mode names 



Height in frame size, not field size, and trailed with an 'i'.  Matches
the X server behaviour.

Signed-off-by: default avatarAdam Jackson <ajax@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 7a374350

drivers/gpu/drm/drm_edid.c

+2 −2
Original line number Diff line number Diff line
@@ -1013,10 +1013,10 @@ static struct drm_display_mode *drm_mode_detailed(struct drm_device *dev, 
	if (mode->vsync_end > mode->vtotal)

		mode->vtotal = mode->vsync_end + 1;



	drm_mode_set_name(mode);



	drm_mode_do_interlace_quirk(mode, pt);



	drm_mode_set_name(mode);



	if (quirks & EDID_QUIRK_DETAILED_SYNC_PP) {

		pt->misc |= DRM_EDID_PT_HSYNC_POSITIVE | DRM_EDID_PT_VSYNC_POSITIVE;

	}

drivers/gpu/drm/drm_modes.c

+12 −9
Original line number Diff line number Diff line
@@ -258,8 +258,10 @@ struct drm_display_mode *drm_cvt_mode(struct drm_device *dev, int hdisplay, 
	drm_mode->clock -= drm_mode->clock % CVT_CLOCK_STEP;

	/* 18/16. Find actual vertical frame frequency */

	/* ignore - just set the mode flag for interlaced */

	if (interlaced)

	if (interlaced) {

		drm_mode->vtotal *= 2;

		drm_mode->flags |= DRM_MODE_FLAG_INTERLACE;

	}

	/* Fill the mode line name */

	drm_mode_set_name(drm_mode);

	if (reduced)
@@ -268,8 +270,6 @@ struct drm_display_mode *drm_cvt_mode(struct drm_device *dev, int hdisplay, 
	else

		drm_mode->flags |= (DRM_MODE_FLAG_PVSYNC |

					DRM_MODE_FLAG_NHSYNC);

	if (interlaced)

		drm_mode->flags |= DRM_MODE_FLAG_INTERLACE;



	return drm_mode;

}
@@ -446,14 +446,14 @@ drm_gtf_mode_complex(struct drm_device *dev, int hdisplay, int vdisplay, 


	drm_mode->clock = pixel_freq;



	drm_mode_set_name(drm_mode);

	drm_mode->flags = DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC;



	if (interlaced) {

		drm_mode->vtotal *= 2;

		drm_mode->flags |= DRM_MODE_FLAG_INTERLACE;

	}



	drm_mode_set_name(drm_mode);

	drm_mode->flags = DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC;



	return drm_mode;

}

EXPORT_SYMBOL(drm_gtf_mode_complex);
@@ -509,8 +509,11 @@ EXPORT_SYMBOL(drm_gtf_mode); 
 */

void drm_mode_set_name(struct drm_display_mode *mode)

{

	snprintf(mode->name, DRM_DISPLAY_MODE_LEN, "%dx%d", mode->hdisplay,

		 mode->vdisplay);

	bool interlaced = !!(mode->flags & DRM_MODE_FLAG_INTERLACE);



	snprintf(mode->name, DRM_DISPLAY_MODE_LEN, "%dx%d%s",

		 mode->hdisplay, mode->vdisplay,

		 interlaced ? "i" : "");

}

EXPORT_SYMBOL(drm_mode_set_name);