hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
linux-sg2042/drivers/gpu/drm/mgag200
History
Dave Airlie 4300a0f8bd Linux 3.10-rc7 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.13 (GNU/Linux)
 
 iQEbBAABAgAGBQJRxf9cAAoJEHm+PkMAQRiGMWkH911xM4gRmFgE7SqVW4F4AWBm
 ngcqMqNy9IdqKfibORUUDvVfEa5gjD5ai2quIKpfQiaukbpQJ696H90ijuAkajLn
 DQBrN243s0pzhhc/quWINnWxsFQ613JjdUMUMaD7e9A1aKjYzWrPGt/tSjrFXGCP
 tArTupVzc/iOmnEQDKiROI/Nokq44QJ36aTGPM7n08xMtpKmkCXM+9/UosBteB0O
 HVI33dmjwz7i55fI53XAWyuZCE+gSEnA4z8spJ9LfXso2W14V+roc+GuL6OyeeTI
 pCn/+4niVPb4B0ROZlpyVmdZjbPPcMMEK5o+BSJI68SH6LHZTQh2iVuqYfpSyA==
 =uUH5
 -----END PGP SIGNATURE-----

Merge tag 'v3.10-rc7' into drm-next

Linux 3.10-rc7

The sdvo lvds fix in this -fixes pull

commit c3456fb3e4
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date:   Mon Jun 10 09:47:58 2013 +0200

    drm/i915: prefer VBT modes for SVDO-LVDS over EDID

has a silent functional conflict with

commit 990256aec2
Author: Ville Syrjälä <ville.syrjala@linux.intel.com>
Date:   Fri May 31 12:17:07 2013 +0000

    drm: Add probed modes in probe order

in drm-next. W simply need to add the vbt modes before edid modes, i.e. the
other way round than now.

Conflicts:
	drivers/gpu/drm/drm_prime.c
	drivers/gpu/drm/i915/intel_sdvo.c
 		2013-06-27 20:40:44 +10:00
..
Kconfig drivers/gpu/drm/mgag200: remove depends on CONFIG_EXPERIMENTAL 2013-01-21 14:52:43 -08:00
Makefile drm/mgag200: Hardware cursor support 2013-06-17 19:42:48 +10:00
mgag200_cursor.c drm/mgag200: Hardware cursor support 2013-06-17 19:42:48 +10:00
mgag200_drv.c Drivers: gpu: remove __dev* attributes. 2013-01-03 15:57:15 -08:00
mgag200_drv.h drm/mgag200: Hardware cursor support 2013-06-17 19:42:48 +10:00
mgag200_fb.c drm/mgag200: deal with bo reserve fail in dirty update path 2013-05-02 12:46:39 +10:00
mgag200_i2c.c drm/mgag200: Bug fix: Renesas board now selects native resolution. 2013-03-08 08:31:49 +10:00
mgag200_main.c drm/mgag200: Don't do full cleanup if mgag200_device_init fails 2013-06-17 19:42:49 +10:00
mgag200_mode.c Linux 3.10-rc7 2013-06-27 20:40:44 +10:00
mgag200_reg.h drm/mgag200: Hardware cursor support 2013-06-17 19:42:48 +10:00
mgag200_ttm.c drm (ast, cirrus, mgag200, nouveau, savage, vmwgfx): Remove drm_mtrr_{add, del} 2013-05-31 13:02:54 +10:00