From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 24 May 2011 19:06:40 +0000 (-0700)
Subject: Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied... 
X-Git-Tag: v3.0-rc1~312
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=98b98d316349e9a028e632629fe813d07fa5afdd;p=~shefty%2Frdma-dev.git

Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

* 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (169 commits)
  drivers/gpu/drm/radeon/atom.c: fix warning
  drm/radeon/kms: bump kms version number
  drm/radeon/kms: properly set num banks for fusion asics
  drm/radeon/kms/atom: move dig phy init out of modesetting
  drm/radeon/kms/cayman: fix typo in register mask
  drm/radeon/kms: fix typo in spread spectrum code
  drm/radeon/kms: fix tile_config value reported to userspace on cayman.
  drm/radeon/kms: fix incorrect comparison in cayman setup code.
  drm/radeon/kms: add wait idle ioctl for eg->cayman
  drm/radeon/cayman: setup hdp to invalidate and flush when asked
  drm/radeon/evergreen/btc/fusion: setup hdp to invalidate and flush when asked
  agp/uninorth: Fix lockups with radeon KMS and >1x.
  drm/radeon/kms: the SS_Id field in the LCD table if for LVDS only
  drm/radeon/kms: properly set the CLK_REF bit for DCE3 devices
  drm/radeon/kms: fixup eDP connector handling
  drm/radeon/kms: bail early for eDP in hotplug callback
  drm/radeon/kms: simplify hotplug handler logic
  drm/radeon/kms: rewrite DP handling
  drm/radeon/kms/atom: add support for setting DP panel mode
  drm/radeon/kms: atombios.h updates for DP panel mode
  ...
---

98b98d316349e9a028e632629fe813d07fa5afdd
diff --cc drivers/gpu/drm/i915/i915_drv.c
index 32d1b3e829c,817fd9cbb11..0defd427059
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@@ -49,12 -49,15 +49,15 @@@ module_param_named(panel_ignore_lid, i9
  unsigned int i915_powersave = 1;
  module_param_named(powersave, i915_powersave, int, 0600);
  
 -unsigned int i915_semaphores = 1;
 +unsigned int i915_semaphores = 0;
  module_param_named(semaphores, i915_semaphores, int, 0600);
  
- unsigned int i915_enable_rc6 = 0;
+ unsigned int i915_enable_rc6 = 1;
  module_param_named(i915_enable_rc6, i915_enable_rc6, int, 0600);
  
+ unsigned int i915_enable_fbc = 0;
+ module_param_named(i915_enable_fbc, i915_enable_fbc, int, 0600);
+ 
  unsigned int i915_lvds_downclock = 0;
  module_param_named(lvds_downclock, i915_lvds_downclock, int, 0400);