summaryrefslogtreecommitdiffstats
path: root/debian/grub-extras/915resolution
diff options
context:
space:
mode:
Diffstat (limited to 'debian/grub-extras/915resolution')
-rw-r--r--debian/grub-extras/915resolution/915resolution.c1081
-rw-r--r--debian/grub-extras/915resolution/COPYING674
-rw-r--r--debian/grub-extras/915resolution/Makefile.core.def7
-rw-r--r--debian/grub-extras/915resolution/README11
4 files changed, 1773 insertions, 0 deletions
diff --git a/debian/grub-extras/915resolution/915resolution.c b/debian/grub-extras/915resolution/915resolution.c
new file mode 100644
index 0000000..0091a66
--- /dev/null
+++ b/debian/grub-extras/915resolution/915resolution.c
@@ -0,0 +1,1081 @@
+/* 915resolution - Utility to change vbemodes on the intel
+ * integrated video chipset */
+
+/*
+ * Based on Nathan Coulson's http://nathancoulson.com/proj/eee/grub-1.96-915resolution-0.5.2-3.patch
+ * Oct 10, 2008, Released as 915
+ * Oct 10, 2008, Updated to include support for 945GM thanks to Scot Doyle
+ */
+
+/* Copied from 915 resolution created by steve tomjenovic
+ * 915 resolution was in the public domain.
+ *
+ * All I have done, was make the above program run within
+ * the grub2 environment.
+ *
+ * Some of the checks are still commented, as I did not find
+ * easy replacement for memmem.
+ *
+ * Slightly edited by Nathan Coulson (conathan@gmail.com)
+ */
+
+/*
+ * GRUB -- GRand Unified Bootloader
+ * Copyright (C) 2003,2007 Free Software Foundation, Inc.
+ * Copyright (C) 2003 NIIBE Yutaka <gniibe@m17n.org>
+ *
+ * GRUB is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GRUB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GRUB. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+/* 915 resolution by steve tomljenovic
+ *
+ * This was tested only on Sony VGN-FS550. Use at your own risk
+ *
+ * This code is based on the techniques used in :
+ *
+ * - 855patch. Many thanks to Christian Zietz (czietz gmx net)
+ * for demonstrating how to shadow the VBIOS into system RAM
+ * and then modify it.
+ *
+ * - 1280patch by Andrew Tipton (andrewtipton null li).
+ *
+ * - 855resolution by Alain Poirier
+ *
+ * This source code is into the public domain.
+ */
+
+#include <grub/types.h>
+#include <grub/misc.h>
+#include <grub/mm.h>
+#include <grub/err.h>
+#include <grub/dl.h>
+#include <grub/normal.h>
+#include <grub/i386/io.h>
+
+GRUB_MOD_LICENSE ("GPLv3+");
+
+#define printf grub_printf
+#define malloc grub_malloc
+#define free grub_free
+#define strcmp grub_strcmp
+#define fprintf(stream, ...) grub_printf(__VA_ARGS__)
+#define strtol(x,y,z) grub_strtoul(x,y,z)
+#define atoi(x) grub_strtoul(x,NULL,10)
+#define assert(x)
+#define memset grub_memset
+#define outl grub_outl
+#define outb grub_outb
+#define inl grub_inl
+#define inb grub_inb
+
+#define NEW(a) ((a *)(malloc(sizeof(a))))
+#define FREE(a) (free(a))
+
+#define VBIOS_START 0xc0000
+#define VBIOS_SIZE 0x10000
+
+#define VBIOS_FILE "/dev/mem"
+
+#define FALSE 0
+#define TRUE 1
+
+#define MODE_TABLE_OFFSET_845G 617
+
+#define RES915_VERSION "0.5.3"
+
+#define ATI_SIGNATURE1 "ATI MOBILITY RADEON"
+#define ATI_SIGNATURE2 "ATI Technologies Inc"
+#define NVIDIA_SIGNATURE "NVIDIA Corp"
+#define INTEL_SIGNATURE "Intel Corp"
+
+#define DEBUG 0
+
+typedef unsigned char * address;
+typedef unsigned char byte;
+typedef unsigned short word;
+typedef unsigned char boolean;
+typedef unsigned int cardinal;
+
+typedef enum {
+ CT_UNKWN, CT_830, CT_845G, CT_855GM, CT_865G, CT_915G, CT_915GM, CT_945G, CT_945GM, CT_945GME,
+ CT_946GZ, CT_G965, CT_Q965, CT_965GM, CT_G33, CT_Q33, CT_Q35, CT_500GMA,
+ CT_GM45, CT_GMA3150, CT_HD3000
+} chipset_type;
+
+const char *const chipset_type_names[] = {
+ "UNKNOWN", "830", "845G", "855GM", "865G", "915G", "915GM", "945G", "945GM", "945GME",
+ "946GZ", "G965", "Q965", "965GM", "G33", "Q33", "Q35", "500GMA",
+ "GM45", "GMA3150", "HD3000"
+};
+
+typedef enum {
+ BT_UNKWN, BT_1, BT_2, BT_3
+} bios_type;
+
+const char *const bios_type_names[] = {"UNKNOWN", "TYPE 1", "TYPE 2", "TYPE 3"};
+
+int freqs[] = { 60, 75, 85 };
+
+typedef struct {
+ byte mode;
+ byte bits_per_pixel;
+ word resolution;
+ byte unknown;
+} __attribute__((packed)) vbios_mode;
+
+typedef struct {
+ byte unknow1[2];
+ byte x1;
+ byte x_total;
+ byte x2;
+ byte y1;
+ byte y_total;
+ byte y2;
+} __attribute__((packed)) vbios_resolution_type1;
+
+typedef struct {
+ unsigned long clock;
+
+ word x1;
+ word htotal;
+ word x2;
+ word hblank;
+ word hsyncstart;
+ word hsyncend;
+
+ word y1;
+ word vtotal;
+ word y2;
+ word vblank;
+ word vsyncstart;
+ word vsyncend;
+} __attribute__((packed)) vbios_modeline_type2;
+
+typedef struct {
+ byte xchars;
+ byte ychars;
+ byte unknown[4];
+
+ vbios_modeline_type2 modelines[];
+} __attribute__((packed)) vbios_resolution_type2;
+
+typedef struct {
+ unsigned long clock;
+
+ word x1;
+ word htotal;
+ word x2;
+ word hblank;
+ word hsyncstart;
+ word hsyncend;
+
+ word y1;
+ word vtotal;
+ word y2;
+ word vblank;
+ word vsyncstart;
+ word vsyncend;
+
+ word timing_h;
+ word timing_v;
+
+ byte unknown[6];
+} __attribute__((packed)) vbios_modeline_type3;
+
+typedef struct {
+ unsigned char unknown[6];
+
+ vbios_modeline_type3 modelines[];
+} __attribute__((packed)) vbios_resolution_type3;
+
+
+typedef struct {
+ cardinal chipset_id;
+ chipset_type chipset;
+ bios_type bios;
+
+ int bios_fd;
+ address bios_ptr;
+
+ vbios_mode * mode_table;
+ cardinal mode_table_size;
+
+ byte b1, b2;
+
+ boolean unlocked;
+} vbios_map;
+
+
+static cardinal get_chipset_id(void) {
+ outl(0x80000000, 0xcf8);
+ return inl(0xcfc);
+}
+
+static chipset_type get_chipset(cardinal id) {
+ chipset_type type;
+
+ switch (id) {
+ case 0x35758086:
+ type = CT_830;
+ break;
+
+ case 0x25608086:
+ type = CT_845G;
+ break;
+
+ case 0x35808086:
+ type = CT_855GM;
+ break;
+
+ case 0x25708086:
+ type = CT_865G;
+ break;
+
+ case 0x25808086:
+ type = CT_915G;
+ break;
+
+ case 0x25908086:
+ type = CT_915GM;
+ break;
+
+ case 0x27708086:
+ type = CT_945G;
+ break;
+
+ case 0x27a08086:
+ type = CT_945GM;
+ break;
+
+ case 0x27ac8086:
+ type = CT_945GME;
+ break;
+
+ case 0x29708086:
+ type = CT_946GZ;
+ break;
+
+ case 0x29a08086:
+ type = CT_G965;
+ break;
+
+ case 0x29908086:
+ type = CT_Q965;
+ break;
+
+ case 0x2a008086:
+ type = CT_965GM;
+ break;
+
+ case 0x29c08086:
+ type = CT_G33;
+ break;
+
+ case 0x29b08086:
+ type = CT_Q35;
+ break;
+
+ case 0x29d08086:
+ type = CT_Q33;
+ break;
+
+ case 0x81008086:
+ type = CT_500GMA;
+ break;
+
+ case 0xa0008086:
+ type = CT_GMA3150;
+ break;
+
+ case 0xa0108086:
+ type = CT_GMA3150;
+ break;
+
+ case 0x01048086:
+ type = CT_HD3000;
+ break;
+
+ case 0x2a408086:
+ type = CT_GM45;
+ break;
+
+ case 0x2a018086:
+ type = CT_965GM;
+ break;
+
+ case 0x2a028086:
+ type = CT_965GM;
+ break;
+
+ default:
+ type = CT_UNKWN;
+ break;
+ }
+
+ return type;
+}
+
+
+static vbios_resolution_type1 * map_type1_resolution(vbios_map * map, word res) {
+ vbios_resolution_type1 * ptr = ((vbios_resolution_type1*)(map->bios_ptr + res));
+ return ptr;
+}
+
+static vbios_resolution_type2 * map_type2_resolution(vbios_map * map, word res) {
+ vbios_resolution_type2 * ptr = ((vbios_resolution_type2*)(map->bios_ptr + res));
+ return ptr;
+}
+
+static vbios_resolution_type3 * map_type3_resolution(vbios_map * map, word res) {
+ vbios_resolution_type3 * ptr = ((vbios_resolution_type3*)(map->bios_ptr + res));
+ return ptr;
+}
+
+
+static boolean detect_bios_type(vbios_map * map, int entry_size) {
+ unsigned i;
+ short int r1, r2;
+
+ r1 = r2 = 32000;
+
+ for (i=0; i < map->mode_table_size; i++) {
+ if (map->mode_table[i].resolution <= r1) {
+ r1 = map->mode_table[i].resolution;
+ }
+ else {
+ if (map->mode_table[i].resolution <= r2) {
+ r2 = map->mode_table[i].resolution;
+ }
+ }
+
+ /*printf("r1 = %d r2 = %d\n", r1, r2);*/
+ }
+
+ return (r2-r1-6) % entry_size == 0;
+}
+
+
+static void close_vbios(vbios_map * map);
+
+
+static vbios_map * open_vbios(chipset_type forced_chipset) {
+ vbios_map * map = NEW(vbios_map);
+ memset (map, 0, sizeof(vbios_map));
+
+ /*
+ * Determine chipset
+ */
+
+ if (forced_chipset == CT_UNKWN) {
+ map->chipset_id = get_chipset_id();
+
+ map->chipset = get_chipset(map->chipset_id);
+ }
+ else if (forced_chipset != CT_UNKWN) {
+ map->chipset = forced_chipset;
+ }
+ else {
+ map->chipset = CT_915GM;
+ }
+
+ /*
+ * Map the video bios to memory
+ */
+
+ map->bios_ptr = (unsigned char *) VBIOS_START;
+
+#if 0
+ /*
+ * check if we have ATI Radeon
+ */
+
+ if (memmem(map->bios_ptr, VBIOS_SIZE, ATI_SIGNATURE1, strlen(ATI_SIGNATURE1)) ||
+ memmem(map->bios_ptr, VBIOS_SIZE, ATI_SIGNATURE2, strlen(ATI_SIGNATURE2)) ) {
+ fprintf(stderr, "ATI chipset detected. 915resolution only works with Intel 800/900 series graphic chipsets.\n");
+ close(map->bios_fd);
+ exit(2);
+ }
+
+ /*
+ * check if we have NVIDIA
+ */
+
+ if (memmem(map->bios_ptr, VBIOS_SIZE, NVIDIA_SIGNATURE, strlen(NVIDIA_SIGNATURE))) {
+ fprintf(stderr, "NVIDIA chipset detected. 915resolution only works with Intel 800/900 series graphic chipsets.\n");
+ close(map->bios_fd);
+ exit(2);
+ }
+
+ /*
+ * check if we have Intel
+ */
+
+ if (map->chipset == CT_UNKWN && memmem(map->bios_ptr, VBIOS_SIZE, INTEL_SIGNATURE, strlen(INTEL_SIGNATURE))) {
+ fprintf(stderr, "Intel chipset detected. However, 915resolution was unable to determine the chipset type.\n");
+
+ fprintf(stderr, "Chipset Id: %x\n", map->chipset_id);
+
+ fprintf(stderr, "Please report this problem to stomljen@yahoo.com\n");
+
+ close_vbios(map);
+ exit(2);
+ }
+#endif
+
+ /*
+ * check for others
+ */
+
+ if (map->chipset == CT_UNKWN) {
+ fprintf(stderr, "Unknown chipset type and unrecognized bios.\n");
+ fprintf(stderr, "915resolution only works with Intel 800/900 series graphic chipsets.\n");
+
+ fprintf(stderr, "Chipset Id: %x\n", map->chipset_id);
+ close_vbios(map);
+ return 0;
+ }
+
+ /*
+ * Figure out where the mode table is
+ */
+
+ {
+ address p = map->bios_ptr + 16;
+ address limit = map->bios_ptr + VBIOS_SIZE - (3 * sizeof(vbios_mode));
+
+ while (p < limit && map->mode_table == 0) {
+ vbios_mode * mode_ptr = (vbios_mode *) p;
+
+ if (((mode_ptr[0].mode & 0xf0) == 0x30) && ((mode_ptr[1].mode & 0xf0) == 0x30) &&
+ ((mode_ptr[2].mode & 0xf0) == 0x30) && ((mode_ptr[3].mode & 0xf0) == 0x30)) {
+
+ map->mode_table = mode_ptr;
+ }
+
+ p++;
+ }
+
+ if (map->mode_table == 0) {
+ fprintf(stderr, "Unable to locate the mode table.\n");
+ fprintf(stderr, "Please run the program 'dump_bios' as root and\n");
+ fprintf(stderr, "email the file 'vbios.dmp' to stomljen@yahoo.com.\n");
+
+ fprintf(stderr, "Chipset: %s\n", chipset_type_names[map->chipset]);
+ close_vbios(map);
+ return 0;
+ }
+ }
+
+ /*
+ * Determine size of mode table
+ */
+
+ {
+ vbios_mode * mode_ptr = map->mode_table;
+
+ while (mode_ptr->mode != 0xff) {
+ map->mode_table_size++;
+ mode_ptr++;
+ }
+ }
+
+ /*
+ * Figure out what type of bios we have
+ * order of detection is important
+ */
+
+ if (detect_bios_type(map, sizeof(vbios_modeline_type3))) {
+ map->bios = BT_3;
+ }
+ else if (detect_bios_type(map, sizeof(vbios_modeline_type2))) {
+ map->bios = BT_2;
+ }
+ else if (detect_bios_type(map, sizeof(vbios_resolution_type1))) {
+ map->bios = BT_1;
+ }
+ else {
+ fprintf(stderr, "Unable to determine bios type.\n");
+ fprintf(stderr, "Please run the program 'dump_bios' as root and\n");
+ fprintf(stderr, "email the file 'vbios.dmp' to stomljen@yahoo.com.\n");
+
+ fprintf(stderr, "Chipset: %s\n", chipset_type_names[map->chipset]);
+ fprintf(stderr, "Mode Table Offset: $C0000 + $%x\n", ((cardinal)map->mode_table) - ((cardinal)map->bios_ptr));
+ fprintf(stderr, "Mode Table Entries: %u\n", map->mode_table_size);
+ return 0;
+ }
+
+ return map;
+}
+
+static void close_vbios(vbios_map * map) {
+ assert(!map->unlocked);
+
+ FREE(map);
+}
+
+static void unlock_vbios(vbios_map * map) {
+
+ assert(!map->unlocked);
+
+ map->unlocked = TRUE;
+
+ switch (map->chipset) {
+ case CT_UNKWN:
+ break;
+ case CT_830:
+ case CT_855GM:
+ outl(0x8000005a, 0xcf8);
+ map->b1 = inb(0xcfe);
+
+ outl(0x8000005a, 0xcf8);
+ outb(0x33, 0xcfe);
+ break;
+ case CT_845G:
+ case CT_865G:
+ case CT_915G:
+ case CT_915GM:
+ case CT_945G:
+ case CT_945GM:
+ case CT_945GME:
+ case CT_946GZ:
+ case CT_G965:
+ case CT_Q965:
+ case CT_965GM:
+ case CT_G33:
+ case CT_Q35:
+ case CT_Q33:
+ case CT_500GMA:
+ case CT_GM45:
+ case CT_GMA3150:
+ case CT_HD3000:
+ outl(0x80000090, 0xcf8);
+ map->b1 = inb(0xcfd);
+ map->b2 = inb(0xcfe);
+
+ outl(0x80000090, 0xcf8);
+ outb(0x33, 0xcfd);
+ outb(0x33, 0xcfe);
+ break;
+ }
+
+#if DEBUG
+ {
+ cardinal t = inl(0xcfc);
+ printf("unlock PAM: (0x%08x)\n", t);
+ }
+#endif
+}
+
+static void relock_vbios(vbios_map * map) {
+
+ assert(map->unlocked);
+ map->unlocked = FALSE;
+
+ switch (map->chipset) {
+ case CT_UNKWN:
+ break;
+ case CT_830:
+ case CT_855GM:
+ outl(0x8000005a, 0xcf8);
+ outb(map->b1, 0xcfe);
+ break;
+ case CT_845G:
+ case CT_865G:
+ case CT_915G:
+ case CT_915GM:
+ case CT_945G:
+ case CT_945GM:
+ case CT_945GME:
+ case CT_946GZ:
+ case CT_G965:
+ case CT_Q965:
+ case CT_965GM:
+ case CT_G33:
+ case CT_Q35:
+ case CT_Q33:
+ case CT_500GMA:
+ case CT_GM45:
+ case CT_GMA3150:
+ case CT_HD3000:
+ outl(0x80000090, 0xcf8);
+ outb(map->b1, 0xcfd);
+ outb(map->b2, 0xcfe);
+ break;
+ }
+
+#if DEBUG
+ {
+ cardinal t = inl(0xcfc);
+ printf("relock PAM: (0x%08x)\n", t);
+ }
+#endif
+}
+
+
+static void list_modes(vbios_map *map, cardinal raw) {
+ cardinal i, x, y;
+
+ for (i=0; i < map->mode_table_size; i++) {
+ switch(map->bios) {
+ case BT_1:
+ {
+ vbios_resolution_type1 * res = map_type1_resolution(map, map->mode_table[i].resolution);
+
+ x = ((((cardinal) res->x2) & 0xf0) << 4) | res->x1;
+ y = ((((cardinal) res->y2) & 0xf0) << 4) | res->y1;
+
+ if (x != 0 && y != 0) {
+ printf("Mode %02x : %dx%d, %d bits/pixel\n", map->mode_table[i].mode, x, y, map->mode_table[i].bits_per_pixel);
+ }
+
+ if (raw)
+ {
+ printf("Mode %02x (raw) :\n\t%02x %02x\n\t%02x\n\t%02x\n\t%02x\n\t%02x\n\t%02x\n\t%02x\n", map->mode_table[i].mode, res->unknow1[0],res->unknow1[1], res->x1,res->x_total,res->x2,res->y1,res->y_total,res->y2);
+ }
+
+ }
+ break;
+ case BT_2:
+ {
+ vbios_resolution_type2 * res = map_type2_resolution(map, map->mode_table[i].resolution);
+
+ x = res->modelines[0].x1+1;
+ y = res->modelines[0].y1+1;
+
+ if (x != 0 && y != 0) {
+ printf("Mode %02x : %dx%d, %d bits/pixel\n", map->mode_table[i].mode, x, y, map->mode_table[i].bits_per_pixel);
+ }
+ }
+ break;
+ case BT_3:
+ {
+ vbios_resolution_type3 * res = map_type3_resolution(map, map->mode_table[i].resolution);
+
+ x = res->modelines[0].x1+1;
+ y = res->modelines[0].y1+1;
+
+ if (x != 0 && y != 0) {
+ printf("Mode %02x : %dx%d, %d bits/pixel\n", map->mode_table[i].mode, x, y, map->mode_table[i].bits_per_pixel);
+ }
+ }
+ break;
+ case BT_UNKWN:
+ break;
+ }
+ }
+}
+
+static void gtf_timings(int x, int y, int freq,
+ unsigned long *clock,
+ word *hsyncstart, word *hsyncend, word *hblank,
+ word *vsyncstart, word *vsyncend, word *vblank)
+{
+ int hbl, vbl, vfreq;
+
+ /*
+ (y+1)/(20000.0/(11*freq) - 1) + 0.5
+ = ((y+1) * (11*freq))/(20000.0 - (11*freq)) + 0.5
+ = ((y+1) * (11*freq) + 10000.0 - (11*freq) / 2)/(20000.0 - (11*freq))
+ = ((y+1) * (11*freq) + 10000.0 - 5 * freq - (freq + 1) / 2)/(20000.0 - (11*freq))
+*/
+ vbl = y + 1 +
+ grub_divmod64 (((y+1) * (11*(long long)freq) + 10000 - 5 * (long long)freq
+ - (freq + 1) / 2),
+ (20000 - (11*(long long)freq)), 0);
+ vfreq = vbl * freq;
+ /*
+ (x * (30.0 - 300000.0 / vfreq) /
+ (70.0 + 300000.0 / vfreq) / 16.0 + 0.5)
+ = ((x * (30.0 - 300000.0 / vfreq) /
+ (70.0 + 300000.0 / vfreq) + 8) / 16)
+ = ((x * (30.0 * vfreq - 300000.0) /
+ (70.0 * vfreq + 300000.0) + 8) / 16)
+ = (((x * (30 * vfreq - 300000)) /
+ (70 * vfreq + 300000) + 8) / 16)
+ */
+ hbl = 16 * (int)((grub_divmod64((x * (30 * (long long)vfreq - 300000)),
+ (70 * (long long)vfreq + 300000), 0)
+ + 8) / 16);
+
+ *vsyncstart = y;
+ *vsyncend = y + 3;
+ *vblank = vbl - 1;
+ *hsyncstart = x + hbl / 2 - (x + hbl + 50) / 100 * 8 - 1;
+ *hsyncend = x + hbl / 2 - 1;
+ *hblank = x + hbl - 1;
+ *clock = (x + hbl) * vfreq / 1000;
+}
+
+static void set_mode(vbios_map * map, cardinal mode, cardinal x, cardinal y, cardinal bp, cardinal htotal, cardinal vtotal) {
+ int xprev, yprev;
+ cardinal i, j;
+
+ for (i=0; i < map->mode_table_size; i++) {
+ if (map->mode_table[i].mode == mode) {
+ switch(map->bios) {
+ case BT_1:
+ {
+ vbios_resolution_type1 * res = map_type1_resolution(map, map->mode_table[i].resolution);
+
+ if (bp) {
+ map->mode_table[i].bits_per_pixel = bp;
+ }
+
+ res->x2 = (htotal?(((htotal-x) >> 8) & 0x0f) : (res->x2 & 0x0f)) | ((x >> 4) & 0xf0);
+ res->x1 = (x & 0xff);
+
+ res->y2 = (vtotal?(((vtotal-y) >> 8) & 0x0f) : (res->y2 & 0x0f)) | ((y >> 4) & 0xf0);
+ res->y1 = (y & 0xff);
+ if (htotal)
+ res->x_total = ((htotal-x) & 0xff);
+
+ if (vtotal)
+ res->y_total = ((vtotal-y) & 0xff);
+ }
+ break;
+ case BT_2:
+ {
+ vbios_resolution_type2 * res = map_type2_resolution(map, map->mode_table[i].resolution);
+
+ res->xchars = x / 8;
+ res->ychars = y / 16 - 1;
+ xprev = res->modelines[0].x1;
+ yprev = res->modelines[0].y1;
+
+ for(j=0; j < 3; j++) {
+ vbios_modeline_type2 * modeline = &res->modelines[j];
+
+ if (modeline->x1 == xprev && modeline->y1 == yprev) {
+ unsigned long clock;
+ word hsyncstart, hsyncend, hblank;
+ word vsyncstart, vsyncend, vblank;
+
+ modeline->x1 = modeline->x2 = x-1;
+ modeline->y1 = modeline->y2 = y-1;
+
+ gtf_timings(x, y, freqs[j], &clock,
+ &hsyncstart, &hsyncend, &hblank,
+ &vsyncstart, &vsyncend, &vblank);
+ modeline->clock = clock;
+ modeline->hsyncstart = hsyncstart;
+ modeline->hsyncend = hsyncend;
+ modeline->hblank = hblank;
+ modeline->vsyncstart = vsyncstart;
+ modeline->vsyncend = vsyncend;
+ modeline->vblank = vblank;
+
+ if (htotal)
+ modeline->htotal = htotal;
+ else
+ modeline->htotal = modeline->hblank;
+
+ if (vtotal)
+ modeline->vtotal = vtotal;
+ else
+ modeline->vtotal = modeline->vblank;
+ }
+ }
+ }
+ break;
+ case BT_3:
+ {
+ vbios_resolution_type3 * res = map_type3_resolution(map, map->mode_table[i].resolution);
+
+ xprev = res->modelines[0].x1;
+ yprev = res->modelines[0].y1;
+
+ for (j=0; j < 3; j++) {
+ vbios_modeline_type3 * modeline = &res->modelines[j];
+
+ if (modeline->x1 == xprev && modeline->y1 == yprev) {
+ unsigned long clock;
+ word hsyncstart, hsyncend, hblank;
+ word vsyncstart, vsyncend, vblank;
+
+ modeline->x1 = modeline->x2 = x-1;
+ modeline->y1 = modeline->y2 = y-1;
+
+ gtf_timings(x, y, freqs[j], &clock,
+ &hsyncstart, &hsyncend, &hblank,
+ &vsyncstart, &vsyncend, &vblank);
+ modeline->clock = clock;
+ modeline->hsyncstart = hsyncstart;
+ modeline->hsyncend = hsyncend;
+ modeline->hblank = hblank;
+ modeline->vsyncstart = vsyncstart;
+ modeline->vsyncend = vsyncend;
+ modeline->vblank = vblank;
+
+ if (htotal)
+ modeline->htotal = htotal;
+ else
+ modeline->htotal = modeline->hblank;
+ if (vtotal)
+ modeline->vtotal = vtotal;
+ else
+ modeline->vtotal = modeline->vblank;
+
+ modeline->timing_h = y-1;
+ modeline->timing_v = x-1;
+ }
+ }
+ }
+ break;
+ case BT_UNKWN:
+ break;
+ }
+ }
+ }
+}
+
+static void display_map_info(vbios_map * map) {
+ printf("Chipset: %s\n", chipset_type_names[map->chipset]);
+ printf("BIOS: %s\n", bios_type_names[map->bios]);
+
+ printf("Mode Table Offset: $C0000 + $%x\n", ((cardinal)map->mode_table) - ((cardinal)map->bios_ptr));
+ printf("Mode Table Entries: %u\n", map->mode_table_size);
+}
+
+
+static int parse_args(cardinal argc, char *argv[], chipset_type *forced_chipset,
+ cardinal *list, cardinal *mode, cardinal *x, cardinal *y,
+ cardinal *bp, cardinal *raw, cardinal *htotal,
+ cardinal *vtotal, cardinal *quiet) {
+ cardinal index = 0;
+
+ *list = *mode = *x = *y = *raw = *htotal = *vtotal = 0;
+ *bp = 0;
+ *quiet = 0;
+
+ *forced_chipset = CT_UNKWN;
+
+ if ((argc > index) && !strcmp(argv[index], "-q")) {
+ *quiet = 1;
+ index++;
+
+ if(argc<=index) {
+ return 0;
+ }
+ }
+
+ if ((argc > index) && !strcmp(argv[index], "-c")) {
+ index++;
+
+ if(argc<=index) {
+ return 0;
+ }
+
+ if (!strcmp(argv[index], "845")) {
+ *forced_chipset = CT_845G;
+ }
+ else if (!strcmp(argv[index], "855")) {
+ *forced_chipset = CT_855GM;
+ }
+ else if (!strcmp(argv[index], "865")) {
+ *forced_chipset = CT_865G;
+ }
+ else if (!strcmp(argv[index], "915G")) {
+ *forced_chipset = CT_915G;
+ }
+ else if (!strcmp(argv[index], "915GM")) {
+ *forced_chipset = CT_915GM;
+ }
+ else if (!strcmp(argv[index], "945G")) {
+ *forced_chipset = CT_945G;
+ }
+ else if (!strcmp(argv[index], "945GM")) {
+ *forced_chipset = CT_945GM;
+ }
+ else if (!strcmp(argv[index], "945GME")) {
+ *forced_chipset = CT_945GME;
+ }
+ else if (!strcmp(argv[index], "946GZ")) {
+ *forced_chipset = CT_946GZ;
+ }
+ else if (!strcmp(argv[index], "G965")) {
+ *forced_chipset = CT_G965;
+ }
+ else if (!strcmp(argv[index], "Q965")) {
+ *forced_chipset = CT_Q965;
+ }
+ else if (!strcmp(argv[index], "965GM")) {
+ *forced_chipset = CT_965GM;
+ }
+ else if (!strcmp(argv[index], "G33")) {
+ *forced_chipset = CT_G33;
+ }
+ else if (!strcmp(argv[index], "Q35")) {
+ *forced_chipset = CT_Q35;
+ }
+ else if (!strcmp(argv[index], "Q33")) {
+ *forced_chipset = CT_Q33;
+ }
+ else if (!strcmp(argv[index], "500GMA")) {
+ *forced_chipset = CT_500GMA;
+ }
+ else if (!strcmp(argv[index], "GM45")) {
+ *forced_chipset = CT_GM45;
+ }
+ else if (!strcmp(argv[index], "GMA3150")) {
+ *forced_chipset = CT_GMA3150;
+ }
+ else if (!strcmp(argv[index], "HD3000")) {
+ *forced_chipset = CT_HD3000;
+ }
+ else {
+ *forced_chipset = CT_UNKWN;
+ }
+
+ index++;
+
+ if (argc<=index) {
+ return 0;
+ }
+ }
+
+ if ((argc > index) && !strcmp(argv[index], "-l")) {
+ *list = 1;
+ index++;
+
+ if(argc<=index) {
+ return 0;
+ }
+ }
+
+ if ((argc > index) && !strcmp(argv[index], "-r")) {
+ *raw = 1;
+ index++;
+
+ if(argc<=index) {
+ return 0;
+ }
+ }
+
+ if (argc-index < 3 || argc-index > 6) {
+ return -1;
+ }
+
+ *mode = (cardinal) strtol(argv[index], NULL, 16);
+ *x = (cardinal)atoi(argv[index+1]);
+ *y = (cardinal)atoi(argv[index+2]);
+
+
+ if (argc-index > 3) {
+ *bp = (cardinal)atoi(argv[index+3]);
+ }
+ else {
+ *bp = 0;
+ }
+
+ if (argc-index > 4) {
+ *htotal = (cardinal)atoi(argv[index+4]);
+ }
+ else {
+ *htotal = 0;
+ }
+
+ if (argc-index > 5) {
+ *vtotal = (cardinal)atoi(argv[index+5]);
+ }
+ else {
+ *vtotal = 0;
+ }
+
+ return 0;
+}
+
+static void usage(void) {
+ printf("Usage: 915resolution [-q] [-c chipset] [-l] [mode X Y] [bits/pixel] [htotal] [vtotal]\n");
+ printf(" Set the resolution to XxY for a video mode\n");
+ printf(" Bits per pixel are optional. htotal/vtotal settings are additionally optional.\n");
+ printf(" Options:\n");
+ printf(" -q don't show any normal messages\n");
+ printf(" -c force chipset type (THIS IS USED FOR DEBUG PURPOSES)\n");
+ printf(" -l display the modes found in the video BIOS\n");
+ printf(" -r display the modes found in the video BIOS in raw mode (THIS IS USED FOR DEBUG PURPOSES)\n");
+}
+
+static int main_915 (int argc, char *argv[])
+{
+ vbios_map * map;
+ cardinal list, mode, x, y, bp, raw, htotal, vtotal;
+ cardinal quiet;
+ chipset_type forced_chipset;
+
+ if (parse_args(argc, argv, &forced_chipset, &list, &mode,
+ &x, &y, &bp, &raw, &htotal, &vtotal, &quiet) == -1) {
+ printf("Intel 800/900 Series VBIOS Hack : version %s\n\n",
+ RES915_VERSION);
+ usage();
+ return 2;
+ }
+
+ if (!quiet)
+ printf("Intel 800/900 Series VBIOS Hack : version %s\n\n",
+ RES915_VERSION);
+
+ map = open_vbios(forced_chipset);
+ if (!quiet)
+ {
+ display_map_info(map);
+ printf("\n");
+ }
+
+ if (list) {
+ list_modes(map, raw);
+ }
+
+ if (mode!=0 && x!=0 && y!=0) {
+ unlock_vbios(map);
+
+ set_mode(map, mode, x, y, bp, htotal, vtotal);
+
+ relock_vbios(map);
+
+ printf("Patch mode %02x to resolution %dx%d complete\n", mode, x, y);
+
+ if (list) {
+ list_modes(map, raw);
+ }
+ }
+
+ close_vbios(map);
+
+ return 0;
+}
+
+
+
+
+
+static grub_err_t
+grub_cmd_915resolution (grub_command_t cmd __attribute__ ((unused)),
+ int argc, char *argv[])
+{
+ return main_915 (argc, argv);
+}
+
+static grub_command_t cmd;
+
+GRUB_MOD_INIT(915resolution)
+{
+ cmd = grub_register_command ("915resolution", grub_cmd_915resolution,
+ "915resolution", "Intel VBE editor");
+}
+
+GRUB_MOD_FINI(915resolution)
+{
+ grub_unregister_command (cmd);
+}
diff --git a/debian/grub-extras/915resolution/COPYING b/debian/grub-extras/915resolution/COPYING
new file mode 100644
index 0000000..94a9ed0
--- /dev/null
+++ b/debian/grub-extras/915resolution/COPYING
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ <program> Copyright (C) <year> <name of author>
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/debian/grub-extras/915resolution/Makefile.core.def b/debian/grub-extras/915resolution/Makefile.core.def
new file mode 100644
index 0000000..14c0ae5
--- /dev/null
+++ b/debian/grub-extras/915resolution/Makefile.core.def
@@ -0,0 +1,7 @@
+AutoGen definitions Makefile.tpl;
+
+module = {
+ name = '915resolution';
+ i386_pc = contrib/915resolution/915resolution.c;
+ enable = i386_pc;
+};
diff --git a/debian/grub-extras/915resolution/README b/debian/grub-extras/915resolution/README
new file mode 100644
index 0000000..874bd08
--- /dev/null
+++ b/debian/grub-extras/915resolution/README
@@ -0,0 +1,11 @@
+
+grub-extras is meant to be used as an overlay on grub2 source tree.
+
+Build instructions:
+
+ - Copy grub-extras in a subdirectory of your grub2 checkout.
+ For example, "grub-extras".
+
+ - Export GRUB_CONTRIB environment variable to point to this directory.
+
+ - Build GRUB as usual.