backports: prepare v3.11-rc3 release
cover backports: prepare v3.11-rc3 release
From: "Luis R. Rodriguez" <[email protected]>
The linux-3.11.y branch for backports gets started based on the last patch that got us up to next-20130712. After that the following two patches need to be applied.
Since we're late the first backports release based on v3.11 will be based on v3.11-rc3.
Luis R. Rodriguez (2):
backports: remove DRM shrinkers patches
backports: refresh patches for v3.11-rc3
.../drivers_gpu_drm_i915_i915_gem.patch | 2 +- .../drivers_gpu_drm_i915_i915_gem.patch | 2 +- .../drivers_gpu_drm_i915_i915_gem.patch | 2 +- .../14-shrinkers-api/drivers_gpu_drm_i915.patch | 116 -------------------- .../drm/14-shrinkers-api/drivers_gpu_drm_ttm.patch | 105 ------------------ .../network/0001-netdev_ops/atl1e.patch | 2 +- .../network/0010-disable-usb-net-asix.patch | 2 +- .../network/05-usb/ath9k_htc.patch | 2 +- ...ers_net_ethernet_atheros_atl1e_atl1e_main.patch | 6 +- .../drivers_bluetooth_ath3k.patch | 2 +- .../drivers_bluetooth_btusb.patch | 2 +- .../drivers_net_usb_cdc_ether.patch | 2 +- .../drivers_net_wireless_ath_ath9k_hif_usb.patch | 2 +- 13 files changed, 13 insertions(+), 234 deletions(-) delete mode 100644 patches/collateral-evolutions/drm/14-shrinkers-api/drivers_gpu_drm_i915.patch delete mode 100644 patches/collateral-evolutions/drm/14-shrinkers-api/drivers_gpu_drm_ttm.patch
Signature · 1 line
1.7.10.4
PATCH 1/2 backports: remove DRM shrinkers patches
From: "Luis R. Rodriguez" <[email protected]>
<sad_trombone>This did not make it to v3.11</sad_trombone>
commit 84292b549bf48f80d470215b357179ea13d64a35
Author: Dave Chinner <[email protected]> Date: Wed Jul 3 10:19:58 2013 +1000
drivers: convert shrinkers to new count/scan API
--- .../14-shrinkers-api/drivers_gpu_drm_i915.patch | 116 -------------------- .../drm/14-shrinkers-api/drivers_gpu_drm_ttm.patch | 105 ------------------ 2 files changed, 221 deletions(-) delete mode 100644 patches/collateral-evolutions/drm/14-shrinkers-api/drivers_gpu_drm_i915.patch delete mode 100644 patches/collateral-evolutions/drm/14-shrinkers-api/drivers_gpu_drm_ttm.patch
patches/collateral-evolutions/drm/14-shrinkers-api/drivers_gpu_drm_i915.patch deleted +0 -116
@@ -1,116 +0,0 @@ ---- a/drivers/gpu/drm/i915/i915_dma.c -+++ b/drivers/gpu/drm/i915/i915_dma.c -@@ -1657,7 +1657,11 @@ int i915_driver_load(struct drm_device * - return 0; - - out_gem_unload: -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)) - if (dev_priv->mm.inactive_shrinker.scan_objects) -+#else -+ if (dev_priv->mm.inactive_shrinker.shrink) -+#endif - unregister_shrinker(&dev_priv->mm.inactive_shrinker); - - if (dev->pdev->msi_enabled) -@@ -1691,7 +1695,11 @@ int i915_driver_unload(struct drm_device - - i915_teardown_sysfs(dev); - -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)) - if (dev_priv->mm.inactive_shrinker.scan_objects) -+#else -+ if (dev_priv->mm.inactive_shrinker.shrink) -+#endif - unregister_shrinker(&dev_priv->mm.inactive_shrinker); - - mutex_lock(&dev->struct_mutex); ---- a/drivers/gpu/drm/i915/i915_gem.c -+++ b/drivers/gpu/drm/i915/i915_gem.c -@@ -53,10 +53,15 @@ static void i915_gem_object_update_fence - struct drm_i915_fence_reg *fence, - bool enable); - -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)) - static unsigned long i915_gem_inactive_count(struct shrinker *shrinker, - struct shrink_control *sc); - static unsigned long i915_gem_inactive_scan(struct shrinker *shrinker, - struct shrink_control *sc); -+#else -+static int i915_gem_inactive_shrink(struct shrinker *shrinker, -+ struct shrink_control *sc); -+#endif - static long i915_gem_purge(struct drm_i915_private *dev_priv, long target); - static long i915_gem_shrink_all(struct drm_i915_private *dev_priv); - static void i915_gem_object_truncate(struct drm_i915_gem_object *obj); -@@ -4360,8 +4365,12 @@ i915_gem_load(struct drm_device *dev) - - dev_priv->mm.interruptible = true; - -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)) - dev_priv->mm.inactive_shrinker.scan_objects = i915_gem_inactive_scan; - dev_priv->mm.inactive_shrinker.count_objects = i915_gem_inactive_count; -+#else -+ dev_priv->mm.inactive_shrinker.shrink = i915_gem_inactive_shrink; -+#endif - dev_priv->mm.inactive_shrinker.seeks = DEFAULT_SEEKS; - register_shrinker(&dev_priv->mm.inactive_shrinker); - } -@@ -4584,8 +4593,14 @@ static bool mutex_is_locked_by(struct mu - #endif - } - -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)) - static unsigned long - i915_gem_inactive_count(struct shrinker *shrinker, struct shrink_control *sc) -+#else -+#define SHRINK_STOP -1 -+static int -+i915_gem_inactive_shrink(struct shrinker *shrinker, struct shrink_control *sc) -+#endif - { - struct drm_i915_private *dev_priv = - container_of(shrinker, -@@ -4594,7 +4609,12 @@ i915_gem_inactive_count(struct shrinker - struct drm_device *dev = dev_priv->dev; - struct drm_i915_gem_object *obj; - bool unlock = true; -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)) - unsigned long count; -+#else -+ int nr_to_scan = sc->nr_to_scan; -+ int count; -+#endif - - if (!mutex_trylock(&dev->struct_mutex)) { - if (!mutex_is_locked_by(&dev->struct_mutex, current)) -@@ -4606,6 +4626,17 @@ i915_gem_inactive_count(struct shrinker - unlock = false; - } - -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,11,0)) -+ if (nr_to_scan) { -+ nr_to_scan -= i915_gem_purge(dev_priv, nr_to_scan); -+ if (nr_to_scan > 0) -+ nr_to_scan -= __i915_gem_shrink(dev_priv, nr_to_scan, -+ false); -+ if (nr_to_scan > 0) -+ i915_gem_shrink_all(dev_priv); -+ } -+#endif -+ - count = 0; - list_for_each_entry(obj, &dev_priv->mm.unbound_list, global_list) - if (obj->pages_pin_count == 0) -@@ -4619,6 +4650,7 @@ i915_gem_inactive_count(struct shrinker - return count; - } - -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)) - static unsigned long - i915_gem_inactive_scan(struct shrinker *shrinker, struct shrink_control *sc) - { -@@ -4652,3 +4684,4 @@ i915_gem_inactive_scan(struct shrinker * - mutex_unlock(&dev->struct_mutex); - return freed; - } -+#endif
patches/collateral-evolutions/drm/14-shrinkers-api/drivers_gpu_drm_ttm.patch deleted +0 -105
105 lines not on this page · raw message
Signature · 1 line
1.7.10.4
PATCH 2/2 backports: refresh patches for v3.11-rc3
In reply to Luis R. RodriguezFrom: "Luis R. Rodriguez" <[email protected]>
1 2.6.24 [ OK ] 2 2.6.25 [ OK ] 3 2.6.26 [ OK ] 4 2.6.27 [ OK ] 5 2.6.28 [ OK ] 6 2.6.29 [ OK ] 7 2.6.30 [ OK ] 8 2.6.31 [ OK ] 9 2.6.32 [ OK ] 10 2.6.33 [ OK ] 11 2.6.34 [ OK ] 12 2.6.35 [ OK ] 13 2.6.36 [ OK ] 14 2.6.37 [ OK ] 15 2.6.38 [ OK ] 16 2.6.39 [ OK ] 17 3.0.79 [ OK ] 18 3.1.10 [ OK ] 19 3.10-rc1 [ OK ] 20 3.2.45 [ OK ] 21 3.3.8 [ OK ] 22 3.4.46 [ OK ] 23 3.5.7 [ OK ] 24 3.6.11 [ OK ] 25 3.7.10 [ OK ] 26 3.8.13 [ OK ] 27 3.9.3 [ OK ]
real 34m26.742s user 929m30.328s sys 128m39.452s
--- .../drm/02-revert-vm_mmap/drivers_gpu_drm_i915_i915_gem.patch | 2 +- .../drm/07-intel-gtt/drivers_gpu_drm_i915_i915_gem.patch | 2 +- .../08-shmem_truncate_range/drivers_gpu_drm_i915_i915_gem.patch | 2 +- .../collateral-evolutions/network/0001-netdev_ops/atl1e.patch | 2 +- .../network/0010-disable-usb-net-asix.patch | 2 +- patches/collateral-evolutions/network/05-usb/ath9k_htc.patch | 2 +- .../drivers_net_ethernet_atheros_atl1e_atl1e_main.patch | 6 +++--- .../network/62-usb_driver_lpm/drivers_bluetooth_ath3k.patch | 2 +- .../network/62-usb_driver_lpm/drivers_bluetooth_btusb.patch | 2 +- .../network/62-usb_driver_lpm/drivers_net_usb_cdc_ether.patch | 2 +- .../drivers_net_wireless_ath_ath9k_hif_usb.patch | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-)
patches/collateral-evolutions/drm/02-revert-vm_mmap/drivers_gpu_drm_i915_i915_gem.patch +1 -1
@@ -1,6 +1,6 @@ --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c -@@ -1292,10 +1292,17 @@ i915_gem_mmap_ioctl(struct drm_device *d +@@ -1290,10 +1290,17 @@ i915_gem_mmap_ioctl(struct drm_device *d drm_gem_object_unreference_unlocked(obj); return -EINVAL; }
patches/collateral-evolutions/drm/07-intel-gtt/drivers_gpu_drm_i915_i915_gem.patch +1 -1
@@ -1,6 +1,6 @@ --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c -@@ -4147,9 +4147,14 @@ i915_gem_init_hw(struct drm_device *dev) +@@ -4154,9 +4154,14 @@ i915_gem_init_hw(struct drm_device *dev) drm_i915_private_t *dev_priv = dev->dev_private; int ret;
patches/collateral-evolutions/drm/08-shmem_truncate_range/drivers_gpu_drm_i915_i915_gem.patch +1 -1
@@ -1,6 +1,6 @@ --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c -@@ -1616,7 +1616,13 @@ i915_gem_object_truncate(struct drm_i915 +@@ -1614,7 +1614,13 @@ i915_gem_object_truncate(struct drm_i915 * backing pages, *now*. */ inode = file_inode(obj->base.filp);
patches/collateral-evolutions/network/0001-netdev_ops/atl1e.patch +1 -1
@@ -1,6 +1,6 @@ --- a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c +++ b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c -@@ -2192,7 +2192,7 @@ static int atl1e_init_netdev(struct net_ +@@ -2236,7 +2236,7 @@ static int atl1e_init_netdev(struct net_ SET_NETDEV_DEV(netdev, &pdev->dev); pci_set_drvdata(pdev, netdev);
patches/collateral-evolutions/network/0010-disable-usb-net-asix.patch +1 -1
@@ -6,5 +6,5 @@ obj-$(CONFIG_USB_NET_AX8817X) += asix.o -asix-y := asix_devices.o asix_common.o ax88172a.o obj-$(CONFIG_USB_NET_AX88179_178A) += ax88179_178a.o - obj-$(CONFIG_USB_NET_CDCETHER) += cdc_ether.o + obj-$(CONFIG_USB_NET_CDCETHER) += cdc_ether.o r815x.o obj-$(CONFIG_USB_NET_CDC_EEM) += cdc_eem.o
patches/collateral-evolutions/network/05-usb/ath9k_htc.patch +1 -1
@@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ath/ath9k/hif_usb.c +++ b/drivers/net/wireless/ath/ath9k/hif_usb.c -@@ -1379,7 +1379,9 @@ static struct usb_driver ath9k_hif_usb_d +@@ -1376,7 +1376,9 @@ static struct usb_driver ath9k_hif_usb_d .reset_resume = ath9k_hif_usb_resume, #endif .id_table = ath9k_hif_usb_ids,
patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atl1e_atl1e_main.patch +3 -3
@@ -16,7 +16,7 @@ /** * atl1e_change_mtu - Change the Maximum Transfer Unit -@@ -1910,7 +1912,11 @@ void atl1e_down(struct atl1e_adapter *ad +@@ -1954,7 +1956,11 @@ void atl1e_down(struct atl1e_adapter *ad * reschedule our watchdog timer */ set_bit(__AT_DOWN, &adapter->flags);
@@ -28,7 +28,7 @@ /* reset MAC to disable all RX/TX */ atl1e_reset_hw(&adapter->hw); -@@ -2180,8 +2186,10 @@ static const struct net_device_ops atl1e +@@ -2224,8 +2230,10 @@ static const struct net_device_ops atl1e .ndo_set_rx_mode = atl1e_set_multi, .ndo_validate_addr = eth_validate_addr, .ndo_set_mac_address = atl1e_set_mac_addr,
@@ -39,7 +39,7 @@ .ndo_change_mtu = atl1e_change_mtu, .ndo_do_ioctl = atl1e_ioctl, .ndo_tx_timeout = atl1e_tx_timeout, -@@ -2201,10 +2209,15 @@ static int atl1e_init_netdev(struct net_ +@@ -2245,10 +2253,15 @@ static int atl1e_init_netdev(struct net_ netdev->watchdog_timeo = AT_TX_WATCHDOG; atl1e_set_ethtool_ops(netdev);
patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_ath3k.patch +1 -1
@@ -1,6 +1,6 @@ --- a/drivers/bluetooth/ath3k.c +++ b/drivers/bluetooth/ath3k.c -@@ -475,7 +475,9 @@ static struct usb_driver ath3k_driver = +@@ -473,7 +473,9 @@ static struct usb_driver ath3k_driver = .probe = ath3k_probe, .disconnect = ath3k_disconnect, .id_table = ath3k_table,
patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_btusb.patch +1 -1
@@ -1,6 +1,6 @@ --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c -@@ -1624,7 +1624,9 @@ static struct usb_driver btusb_driver = +@@ -1623,7 +1623,9 @@ static struct usb_driver btusb_driver = #endif .id_table = btusb_table, .supports_autosuspend = 1,
patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_usb_cdc_ether.patch +1 -1
@@ -1,6 +1,6 @@ --- a/drivers/net/usb/cdc_ether.c +++ b/drivers/net/usb/cdc_ether.c -@@ -752,7 +752,9 @@ static struct usb_driver cdc_driver = { +@@ -757,7 +757,9 @@ static struct usb_driver cdc_driver = { .resume = usbnet_resume, .reset_resume = usbnet_resume, .supports_autosuspend = 1,
patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_ath_ath9k_hif_usb.patch +1 -1
@@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ath/ath9k/hif_usb.c +++ b/drivers/net/wireless/ath/ath9k/hif_usb.c -@@ -1382,7 +1382,9 @@ static struct usb_driver ath9k_hif_usb_d +@@ -1379,7 +1379,9 @@ static struct usb_driver ath9k_hif_usb_d #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)) .soft_unbind = 1, #endif
Signature · 1 line
1.7.10.4