Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 080a4168 authored by Dave Airlie's avatar Dave Airlie
Browse files

Revert "intelfb driver -- use the regular modedb table instead of the VESA" 



This reverts 2c47430a commit.
This conflicts with a patch in -mm from Antonino reapply later.

Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent 65eb2f97

drivers/video/intelfb/intelfbdrv.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -1033,13 +1033,15 @@ intelfb_init_var(struct intelfb_info *dinfo) 
	} else {

	} else {

		if (mode) {

		if (mode) {

			msrc = fb_find_mode(var, dinfo->info, mode,

			msrc = fb_find_mode(var, dinfo->info, mode,

					    NULL, 0, NULL, 0);

					    vesa_modes, VESA_MODEDB_SIZE,

					    NULL, 0);

			if (msrc)

			if (msrc)

				msrc |= 8;

				msrc |= 8;

		}

		}

		if (!msrc) {

		if (!msrc) {

			msrc = fb_find_mode(var, dinfo->info, PREFERRED_MODE,

			msrc = fb_find_mode(var, dinfo->info, PREFERRED_MODE,

					    NULL, 0, NULL, 0);

					    vesa_modes, VESA_MODEDB_SIZE,

					    NULL, 0);

		}

		}

	}

	}