Linux v3.9-8933-gce85722

- First DRM merge

config-armv7

@@ -463,7 +463,12 @@ CONFIG_NVEC_PAZ00=y
 
 CONFIG_PWM_TEGRA=m
 
-CONFIG_DRM_TEGRA=m
+CONFIG_TEGRA_HOST1X=m
+CONFIG_TEGRA_HOST1X_FIREWALL=y
+
+CONFIG_DRM_TEGRA=y
+# CONFIG_DRM_TEGRA_STAGING is not set
+# CONFIG_DRM_TEGRA_DEBUG is not set
 
 CONFIG_CRYPTO_DEV_TEGRA_AES=m
 

config-generic

@@ -339,6 +339,7 @@ CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_VIRTIO_CONSOLE=y
 CONFIG_VHOST_NET=m
 CONFIG_TCM_VHOST=m
+CONFIG_VHOST_SCSI=m
 
 #
 # SCSI device support
@@ -4072,6 +4073,7 @@ CONFIG_CRYPTO_ECB=y
 CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_GCM=m
 CONFIG_CRYPTO_GF128MUL=m
+CONFIG_CRYPTO_CMAC=m
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_KHAZAD=m
 CONFIG_CRYPTO_LRW=m

config-x86_64-generic

@@ -34,7 +34,7 @@ CONFIG_TRANSPARENT_HUGEPAGE=y
 CONFIG_KEXEC_JUMP=y
 
 CONFIG_ACPI_BLACKLIST_YEAR=0
-CONFIG_ACPI_HOTPLUG_MEMORY=m
+CONFIG_ACPI_HOTPLUG_MEMORY=y
 
 # CONFIG_INTEL_SCU_IPC is not set
 
@@ -47,14 +47,20 @@ CONFIG_CRYPTO_TWOFISH_X86_64=m
 CONFIG_CRYPTO_SALSA20_X86_64=m
 CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
 CONFIG_CRYPTO_SHA1_SSSE3=m
+CONFIG_CRYPTO_SHA256_SSSE3=m
+CONFIG_CRYPTO_SHA512_SSSE3=m
 CONFIG_CRYPTO_BLOWFISH_X86_64=m
+CONFIG_CRYPTO_BLOWFISH_AVX2_X86_64=m
 CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
 CONFIG_CRYPTO_CAMELLIA_X86_64=m
+CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64=m
+CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m
 CONFIG_CRYPTO_CAST5_AVX_X86_64=m
 CONFIG_CRYPTO_CAST6_AVX_X86_64=m
 CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
+CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m
 CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
-CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64=m
+CONFIG_CRYPTO_TWOFISH_AVX2_X86_64=m
 
 # CONFIG_I2C_ALI1535 is not set
 # CONFIG_I2C_ALI1563 is not set

drm-i915-dp-stfu.patch

@@ -1,17 +1,17 @@
 diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
-index f61cb79..64a24c0 100644
+index fb2fbc1..0aaf67d 100644
 --- a/drivers/gpu/drm/i915/intel_dp.c
 +++ b/drivers/gpu/drm/i915/intel_dp.c
-@@ -315,7 +315,7 @@ intel_dp_check_edp(struct intel_dp *intel_dp)
+@@ -283,7 +283,7 @@ intel_dp_check_edp(struct intel_dp *intel_dp)
- 	if (!is_edp(intel_dp))
+ 	pp_ctrl_reg = IS_VALLEYVIEW(dev) ? PIPEA_PP_CONTROL : PCH_PP_CONTROL;
- 		return;
+ 
  	if (!ironlake_edp_have_panel_power(intel_dp) && !ironlake_edp_have_panel_vdd(intel_dp)) {
 -		WARN(1, "eDP powered off while attempting aux channel communication.\n");
 +		DRM_ERROR("eDP powered off while attempting aux channel communication.\n");
  		DRM_DEBUG_KMS("Status 0x%08x Control 0x%08x\n",
- 			      I915_READ(PCH_PP_STATUS),
+ 				I915_READ(pp_stat_reg),
- 			      I915_READ(PCH_PP_CONTROL));
+ 				I915_READ(pp_ctrl_reg));
-@@ -446,7 +446,7 @@ intel_dp_aux_ch(struct intel_dp *intel_dp,
+@@ -376,7 +376,7 @@ intel_dp_aux_ch(struct intel_dp *intel_dp,
  	}
  
  	if (try == 3) {
@@ -20,7 +20,7 @@ index f61cb79..64a24c0 100644
  		     I915_READ(ch_ctl));
  		ret = -EBUSY;
  		goto out;
-@@ -1083,8 +1083,8 @@ void ironlake_edp_panel_vdd_on(struct intel_dp *intel_dp)
+@@ -995,8 +995,8 @@ void ironlake_edp_panel_vdd_on(struct intel_dp *intel_dp)
  		return;
  	DRM_DEBUG_KMS("Turn eDP VDD on\n");
  
@@ -31,7 +31,7 @@ index f61cb79..64a24c0 100644
  
  	intel_dp->want_panel_vdd = true;
  
-@@ -1151,7 +1151,8 @@ void ironlake_edp_panel_vdd_off(struct intel_dp *intel_dp, bool sync)
+@@ -1070,7 +1070,8 @@ void ironlake_edp_panel_vdd_off(struct intel_dp *intel_dp, bool sync)
  		return;
  
  	DRM_DEBUG_KMS("Turn eDP VDD off %d\n", intel_dp->want_panel_vdd);
@@ -41,7 +41,7 @@ index f61cb79..64a24c0 100644
  
  	intel_dp->want_panel_vdd = false;
  
-@@ -1221,7 +1222,8 @@ void ironlake_edp_panel_off(struct intel_dp *intel_dp)
+@@ -1144,7 +1145,8 @@ void ironlake_edp_panel_off(struct intel_dp *intel_dp)
  
  	DRM_DEBUG_KMS("Turn eDP power off\n");
  
@@ -49,5 +49,5 @@ index f61cb79..64a24c0 100644
 +	if (!intel_dp->want_panel_vdd)
 +		DRM_ERROR("Need VDD to turn off panel\n");
  
- 	pp = ironlake_get_pp_control(dev_priv);
+ 	pp = ironlake_get_pp_control(intel_dp);
  	/* We need to switch off panel power _and_ force vdd, for otherwise some

drm-ttm-exports-for-qxl.patch

@@ -1,86 +0,0 @@
-From b538d2921b8aaaa1d7abf1bf0ba3ab9330b0b0c8 Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@gmail.com>
-Date: Tue, 22 Jan 2013 13:56:04 +1000
-Subject: [PATCH 1/2] ttm: export functions to allow qxl do its own iomapping
-
-qxl wants to use io mapping like i915 gem does, for now
-just export the symbols so the driver can implement atomic
-page maps using io mapping.
-
-Signed-off-by: Dave Airlie <airlied@redhat.com>
----
- drivers/gpu/drm/ttm/ttm_bo_util.c | 13 +++++++++----
- include/drm/ttm/ttm_bo_driver.h   |  4 ++++
- 2 files changed, 13 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c
-index 44420fc..aaf6f47 100644
---- a/drivers/gpu/drm/ttm/ttm_bo_util.c
-+++ b/drivers/gpu/drm/ttm/ttm_bo_util.c
-@@ -86,6 +86,7 @@ int ttm_mem_io_lock(struct ttm_mem_type_manager *man, bool interruptible)
- 	mutex_lock(&man->io_reserve_mutex);
- 	return 0;
- }
-+EXPORT_SYMBOL(ttm_mem_io_lock);
- 
- void ttm_mem_io_unlock(struct ttm_mem_type_manager *man)
- {
-@@ -94,6 +95,7 @@ void ttm_mem_io_unlock(struct ttm_mem_type_manager *man)
- 
- 	mutex_unlock(&man->io_reserve_mutex);
- }
-+EXPORT_SYMBOL(ttm_mem_io_unlock);
- 
- static int ttm_mem_io_evict(struct ttm_mem_type_manager *man)
- {
-@@ -111,8 +113,9 @@ static int ttm_mem_io_evict(struct ttm_mem_type_manager *man)
- 	return 0;
- }
- 
--static int ttm_mem_io_reserve(struct ttm_bo_device *bdev,
--			      struct ttm_mem_reg *mem)
-+
-+int ttm_mem_io_reserve(struct ttm_bo_device *bdev,
-+		       struct ttm_mem_reg *mem)
- {
- 	struct ttm_mem_type_manager *man = &bdev->man[mem->mem_type];
- 	int ret = 0;
-@@ -134,9 +137,10 @@ retry:
- 	}
- 	return ret;
- }
-+EXPORT_SYMBOL(ttm_mem_io_reserve);
- 
--static void ttm_mem_io_free(struct ttm_bo_device *bdev,
--			    struct ttm_mem_reg *mem)
-+void ttm_mem_io_free(struct ttm_bo_device *bdev,
-+		     struct ttm_mem_reg *mem)
- {
- 	struct ttm_mem_type_manager *man = &bdev->man[mem->mem_type];
- 
-@@ -149,6 +153,7 @@ static void ttm_mem_io_free(struct ttm_bo_device *bdev,
- 		bdev->driver->io_mem_free(bdev, mem);
- 
- }
-+EXPORT_SYMBOL(ttm_mem_io_free);
- 
- int ttm_mem_io_reserve_vm(struct ttm_buffer_object *bo)
- {
-diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h
-index 0fbd046..9c8dca7 100644
---- a/include/drm/ttm/ttm_bo_driver.h
-+++ b/include/drm/ttm/ttm_bo_driver.h
-@@ -902,6 +902,10 @@ extern void ttm_bo_unreserve_locked(struct ttm_buffer_object *bo);
-  * ttm_bo_util.c
-  */
- 
-+int ttm_mem_io_reserve(struct ttm_bo_device *bdev,
-+		       struct ttm_mem_reg *mem);
-+void ttm_mem_io_free(struct ttm_bo_device *bdev,
-+		     struct ttm_mem_reg *mem);
- /**
-  * ttm_bo_move_ttm
-  *
--- 
-1.8.1.4
-

kernel.spec

@@ -95,7 +95,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 0
 # The git snapshot level
-%define gitrev 13
+%define gitrev 14
 # Set rpm version accordingly
 %define rpmversion 3.%{upstream_sublevel}.0
 %endif
@@ -663,8 +663,7 @@ Patch1000: devel-pekey-secure-boot-20130502.patch
 # DRM
 #atch1700: drm-edid-try-harder-to-fix-up-broken-headers.patch
 #Patch1800: drm-vgem.patch
-Patch1700: drm-ttm-exports-for-qxl.patch
+
-Patch1701: drm-qxl-driver.patch
 # nouveau + drm fixes
 # intel drm is all merged upstream
 Patch1824: drm-intel-next.patch
@@ -1361,8 +1360,6 @@ ApplyPatch devel-pekey-secure-boot-20130502.patch
 # Assorted Virt Fixes
 
 # DRM core
-ApplyPatch drm-ttm-exports-for-qxl.patch
-ApplyPatch drm-qxl-driver.patch
 #ApplyPatch drm-edid-try-harder-to-fix-up-broken-headers.patch
 #ApplyPatch drm-vgem.patch
 
@@ -2246,6 +2243,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Fri May 03 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.0-0.rc0.git14.1
+- Linux v3.9-8933-gce85722
+
 * Fri May  3 2013 Peter Robinson <pbrobinson@fedoraproject.org>
 - ARM 3.10 merge and general cleanup
 - Drop dedicated tegra kernel as now Multiplatform enabled

sources

@@ -1,2 +1,2 @@
 4348c9b6b2eb3144d601e87c19d5d909  linux-3.9.tar.xz
-87c320a09dfc606233ba1da2b878338c  patch-3.9-git13.xz
+0d6c4fbc1b63eecefb91835ff0630fc8  patch-3.9-git14.xz