Commit 8e10ee9a authored by Adam Jackson's avatar Adam Jackson Committed by Dave Airlie
Browse files

drm/edid: Fix CVT width/height decode 



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

drivers/gpu/drm/drm_edid.c

+5 −5
Original line number Diff line number Diff line
@@ -920,18 +920,18 @@ static int drm_cvt_modes(struct drm_connector *connector, 
		if (!memcmp(cvt->code, empty, 3))

			continue;



		height = (cvt->code[0] + ((cvt->code[1] & 0xf0) << 8) + 1) * 2;

		switch (cvt->code[1] & 0xc0) {

		height = (cvt->code[0] + ((cvt->code[1] & 0xf0) << 4) + 1) * 2;

		switch (cvt->code[1] & 0x0c) {

		case 0x00:

			width = height * 4 / 3;

			break;

		case 0x40:

		case 0x04:

			width = height * 16 / 9;

			break;

		case 0x80:

		case 0x08:

			width = height * 16 / 10;

			break;

		case 0xc0:

		case 0x0c:

			width = height * 15 / 9;

			break;

		}