[quantal]: Update ubuntu/i915 to v3.8.13.11 and fix #1138700

Timo Aaltonen tjaalton at ubuntu.com
Thu Oct 17 08:58:52 UTC 2013


	Hi!

  So, after a few twists, here's an update to ubuntu/i915 (i915_hsw) to
bring it to the same level as stable v3.8.13.11:

git://kernel.ubuntu.com/tjaalton/ubuntu-quantal.git i915-hsw-update

34 commits from the 37 commit diff between v3.8.13..v3.8.13.11 were
applied, dropped ones were:

b102182257eb315 drm/i915: add more VLV IDs
- doesn't apply since the driver is limited to HSW ID's

349fe2edae985d4 drm/i915: Adding more reserved PCI IDs for Haswell.
- already applied as e6f62efea8618bd

16f091c6e04b5ac drm/i915: Make data/link N value power of two
- already applied as d91121cdce1af0a


and the top commit of the branch includes the patch for #1138700 that
got reverted recently since it broke the build (needed 88c76f8c4063979
from this branch).

I've build & runtime tested the kernel on HSW, works fine!


ps. for future reference, here's what I did to make this happen:
- checked out a temp branch from v3.8.13.11
- applied the commit diff to drivers/gpu/drm/i915 until v3.8.13.11
  # for i in `git log1 --reverse v3.8.13..v3.8.13.11 \
      drivers/gpu/drm/i915 | sed 's/ .*//'`; do git cherry-pick -x $i; \
    done
- pull the patches from the branch
  # git format-patch -p -k <sha of v3.8.13 head on this branch>
- remove the three patches already applied to quantal
- mangle the patches so they apply to ubuntu/i915 instead
  # sed -i 's/drivers\/gpu\/drm/ubuntu/g' *.patch
- add the BugLink header
  # sed -i '/commit .*upstream./a \\nBugLink:
https://bugs.launchpad.net/bugs/1240639' *.patch
- apply them to the quantal tree
  # for i in `ls ../.../*.patch`; do git am -s $i; done
- profit


-- 
t




More information about the kernel-team mailing list