drm: Add 1600x1200 (UXGA) screen resolution to the built-in EDIDs (8091ee5c) · Commits · 戴 / test

Documentation/EDID/1600x1200.S

0 → 100644

+44 −0

Original line number	Diff line number	Diff line
		/*
		1600x1200.S: EDID data set for standard 1600x1200 60 Hz monitor

		Copyright (C) 2013 Carsten Emde <C.Emde@osadl.org>

		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 2
		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, write to the Free Software
		Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
		*/

		/* EDID */
		#define VERSION 1
		#define REVISION 3

		/* Display */
		#define CLOCK 162000 /* kHz */
		#define XPIX 1600
		#define YPIX 1200
		#define XY_RATIO XY_RATIO_4_3
		#define XBLANK 560
		#define YBLANK 50
		#define XOFFSET 64
		#define XPULSE 192
		#define YOFFSET (63+1)
		#define YPULSE (63+3)
		#define DPI 72
		#define VFREQ 60 /* Hz */
		#define TIMING_NAME "Linux UXGA"
		#define ESTABLISHED_TIMINGS_BITS 0x00 /* none */
		#define HSYNC_POL 1
		#define VSYNC_POL 1
		#define CRC 0x9d

		#include "edid.S"

Documentation/EDID/HOWTO.txt

+6 −6

Original line number	Diff line number	Diff line
		@@ -18,12 +18,12 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE was introduced. It allows to provide an
		individually prepared or corrected EDID data set in the /lib/firmware
		directory from where it is loaded via the firmware interface. The code
		(see drivers/gpu/drm/drm_edid_load.c) contains built-in data sets for
		commonly used screen resolutions (1024x768, 1280x1024, 1680x1050,
		1920x1080) as binary blobs, but the kernel source tree does not contain
		code to create these data. In order to elucidate the origin of the
		built-in binary EDID blobs and to facilitate the creation of individual
		data for a specific misbehaving monitor, commented sources and a
		Makefile environment are given here.
		commonly used screen resolutions (1024x768, 1280x1024, 1600x1200,
		1680x1050, 1920x1080) as binary blobs, but the kernel source tree does
		not contain code to create these data. In order to elucidate the origin
		of the built-in binary EDID blobs and to facilitate the creation of
		individual data for a specific misbehaving monitor, commented sources
		and a Makefile environment are given here.

		To create binary EDID and C source code files from the existing data
		material, simply type "make".

drivers/gpu/drm/drm_edid_load.c

+20 −1

Original line number	Diff line number	Diff line
		@@ -31,10 +31,11 @@ module_param_string(edid_firmware, edid_firmware, sizeof(edid_firmware), 0644);
		MODULE_PARM_DESC(edid_firmware, "Do not probe monitor, use specified EDID blob "
		"from built-in data or /lib/firmware instead. ");

		#define GENERIC_EDIDS 4
		#define GENERIC_EDIDS 5
		static char *generic_edid_name[GENERIC_EDIDS] = {
		"edid/1024x768.bin",
		"edid/1280x1024.bin",
		"edid/1600x1200.bin",
		"edid/1680x1050.bin",
		"edid/1920x1080.bin",
		};
		@@ -79,6 +80,24 @@ static u8 generic_edid[GENERIC_EDIDS][128] = {
		{
		0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
		0x31, 0xd8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x05, 0x16, 0x01, 0x03, 0x6d, 0x37, 0x29, 0x78,
		0xea, 0x5e, 0xc0, 0xa4, 0x59, 0x4a, 0x98, 0x25,
		0x20, 0x50, 0x54, 0x00, 0x00, 0x00, 0xa9, 0x40,
		0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
		0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x48, 0x3f,
		0x40, 0x30, 0x62, 0xb0, 0x32, 0x40, 0x40, 0xc0,
		0x13, 0x00, 0x2b, 0xa0, 0x21, 0x00, 0x00, 0x1e,
		0x00, 0x00, 0x00, 0xff, 0x00, 0x4c, 0x69, 0x6e,
		0x75, 0x78, 0x20, 0x23, 0x30, 0x0a, 0x20, 0x20,
		0x20, 0x20, 0x00, 0x00, 0x00, 0xfd, 0x00, 0x3b,
		0x3d, 0x4a, 0x4c, 0x11, 0x00, 0x0a, 0x20, 0x20,
		0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0xfc,
		0x00, 0x4c, 0x69, 0x6e, 0x75, 0x78, 0x20, 0x55,
		0x58, 0x47, 0x41, 0x0a, 0x20, 0x20, 0x00, 0x9d,
		},
		{
		0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
		0x31, 0xd8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x05, 0x16, 0x01, 0x03, 0x6d, 0x2b, 0x1b, 0x78,
		0xea, 0x5e, 0xc0, 0xa4, 0x59, 0x4a, 0x98, 0x25,
		0x20, 0x50, 0x54, 0x00, 0x00, 0x00, 0xb3, 0x00,

Admin message