[kernel/rawhide/user/kyle/kernel-git] update drm-intel-big-hammer.patch

[Kyle McMartin]

commit ae502d2a45dcf802ff9c088fdee661ab06819f2c
Author: Kyle McMartin <kyle at redhat.com>
Date:   Wed Jan 12 20:52:03 2011 -0500

    update drm-intel-big-hammer.patch
    
    i915_gem execbuffer code was split into its own file. also drop patches
    which have been merged upstream.

 applesmc_update.patch                              | 2293 --------------------
 drm-intel-big-hammer.patch                         |   12 +-
 ...-eDP-encoder-correctly-when-setting-modes.patch |   33 -
 kernel.spec                                        |    6 -
 linux-next-macbook-air-input.patch                 |  185 --
 5 files changed, 6 insertions(+), 2523 deletions(-)
---
diff --git a/drm-intel-big-hammer.patch b/drm-intel-big-hammer.patch
index 97bb2e8..bf152af 100644
--- a/drm-intel-big-hammer.patch
+++ b/drm-intel-big-hammer.patch
@@ -1,13 +1,13 @@
 omgwtfbbqchainsaw?
 ---
- drivers/gpu/drm/i915/i915_gem.c |    5 +++++
+ drivers/gpu/drm/i915/i915_gem_execbuffer.c |    5 +++++
  1 files changed, 5 insertions(+), 0 deletions(-)
 
-diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
-index 8eb8453..36fa9d7 100644
---- a/drivers/gpu/drm/i915/i915_gem.c
-+++ b/drivers/gpu/drm/i915/i915_gem.c
-@@ -3692,6 +3692,11 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data,
+diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+index e698343..21e601d1 100644
+--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
++++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+@@ -1090,6 +1090,11 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data,
  	if (ret)
  		goto pre_mutex_err;
  
diff --git a/kernel.spec b/kernel.spec
index 8dca743..e1323cc 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -678,7 +678,6 @@ Patch1824: drm-intel-next.patch
 # make sure the lvds comes back on lid open
 Patch1825: drm-intel-make-lvds-work.patch
 Patch1826: drm-intel-edp-fixes.patch
-Patch1827: drm_i915-check-eDP-encoder-correctly-when-setting-modes.patch
 
 Patch1900: linux-2.6-intel-iommu-igfx.patch
 
@@ -720,10 +719,8 @@ Patch12018: neuter_intel_microcode_load.patch
 
 Patch12030: tpm-fix-stall-on-boot.patch
 
-Patch12100: applesmc_update.patch
 Patch12101: apple_backlight.patch
 Patch12102: efifb_update.patch
-Patch12103: linux-next-macbook-air-input.patch
 Patch12200: acpi_reboot.patch
 Patch12210: efi_default_physical.patch
 
@@ -1300,7 +1297,6 @@ ApplyPatch drm-intel-big-hammer.patch
 ApplyPatch drm-intel-make-lvds-work.patch
 ApplyPatch linux-2.6-intel-iommu-igfx.patch
 ApplyPatch drm-intel-edp-fixes.patch
-ApplyPatch drm_i915-check-eDP-encoder-correctly-when-setting-modes.patch
 
 # linux1394 git patches
 #ApplyPatch linux-2.6-firewire-git-update.patch
@@ -1338,10 +1334,8 @@ ApplyPatch neuter_intel_microcode_load.patch
 ApplyPatch tpm-fix-stall-on-boot.patch
 
 # various fixes for Apple and EFI
-ApplyPatch applesmc_update.patch
 ApplyPatch apple_backlight.patch
 ApplyPatch efifb_update.patch
-ApplyPatch linux-next-macbook-air-input.patch
 ApplyPatch acpi_reboot.patch
 ApplyPatch efi_default_physical.patch