From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 21 Sep 2009 15:10:09 +0000 (-0700)
Subject: Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied... 
X-Git-Tag: v2.6.32-rc1~621
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=44040f107e64d689ccd3211ac62c6bc44f3f0775;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge branch 'drm-linus' of git://git./linux/kernel/git/airlied/drm-2.6

* 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (133 commits)
  drm/vgaarb: add VGA arbitration support to the drm and kms.
  drm/radeon: some r420s have a CP race with the DMA engine.
  drm/radeon/r600/kms: rv670 is not DCE3
  drm/radeon/kms: r420 idle after programming GA_ENHANCE
  drm/radeon/kms: more fixes to rv770 suspend/resume path.
  drm/radeon/kms: more alignment for rv770.c with r600.c
  drm/radeon/kms: rv770 blit init called too late.
  drm/radeon/kms: move around new init path code to avoid posting at init
  drm/radeon/r600: fix some issues with suspend/resume.
  drm/radeon/kms: disable VGA rendering engine before taking over VRAM
  drm/radeon/kms: Move radeon_get_clock_info() call out of radeon_clocks_init().
  drm/radeon/kms: add initial connector properties
  drm/radeon/kms: Use surfaces for scanout / cursor byte swapping on big endian.
  drm/radeon/kms: don't fail if we fail to init GPU acceleration
  drm/r600/kms: fixup number of loops per blit calculation.
  drm/radeon/kms: reprogram format in set base.
  drm/radeon: avivo chips have no separate int bit for display
  drm/radeon/r600: don't do interrupts
  drm: fix _DRM_GEM addmap error message
  drm: update crtc x/y when only fb changes
  ...

Fixed up trivial conflicts in firmware/Makefile due to network driver
(cxgb3) and drm (mga/r128/radeon) firmware being listed next to each
other.
---

44040f107e64d689ccd3211ac62c6bc44f3f0775
diff --cc firmware/Makefile
index ffe2663,d166a7f..5ea80b1
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@@ -42,10 -41,23 +42,26 @@@ fw-shipped-$(CONFIG_CASSINI) += sun/cas
  fw-shipped-$(CONFIG_COMPUTONE) += intelliport2.bin
  fw-shipped-$(CONFIG_CHELSIO_T3) += cxgb3/t3b_psram-1.1.0.bin \
  				   cxgb3/t3c_psram-1.1.0.bin \
 -				   cxgb3/t3fw-7.4.0.bin
 +				   cxgb3/t3fw-7.4.0.bin \
 +				   cxgb3/ael2005_opt_edc.bin \
 +				   cxgb3/ael2005_twx_edc.bin \
 +				   cxgb3/ael2020_twx_edc.bin
+ fw-shipped-$(CONFIG_DRM_MGA) += matrox/g200_warp.fw matrox/g400_warp.fw
+ fw-shipped-$(CONFIG_DRM_R128) += r128/r128_cce.bin
+ fw-shipped-$(CONFIG_DRM_RADEON) += radeon/R100_cp.bin radeon/R200_cp.bin \
+ 				   radeon/R300_cp.bin radeon/R420_cp.bin \
+ 				   radeon/RS690_cp.bin radeon/RS600_cp.bin \
+ 				   radeon/R520_cp.bin \
+ 				   radeon/R600_pfp.bin radeon/R600_me.bin \
+ 				   radeon/RV610_pfp.bin radeon/RV610_me.bin \
+ 				   radeon/RV630_pfp.bin radeon/RV630_me.bin \
+ 				   radeon/RV620_pfp.bin radeon/RV620_me.bin \
+ 				   radeon/RV635_pfp.bin radeon/RV635_me.bin \
+ 				   radeon/RV670_pfp.bin radeon/RV670_me.bin \
+ 				   radeon/RS780_pfp.bin radeon/RS780_me.bin \
+ 				   radeon/RV770_pfp.bin radeon/RV770_me.bin \
+ 				   radeon/RV730_pfp.bin radeon/RV730_me.bin \
+ 				   radeon/RV710_pfp.bin radeon/RV710_me.bin
  fw-shipped-$(CONFIG_DVB_AV7110) += av7110/bootcode.bin
  fw-shipped-$(CONFIG_DVB_TTUSB_BUDGET) += ttusb-budget/dspbootcode.bin
  fw-shipped-$(CONFIG_E100) += e100/d101m_ucode.bin e100/d101s_ucode.bin \