Dave Airlie
28184f2217
Merge tag 'drm-intel-next-2013-04-06' of git://people.freedesktop.org/~danvet/drm-intel into drm-next ...
Daniel writes:
Since I expect Linus to open the merge window in about a week I guess this
is the last i915 feature pull for 3.10. Highlights:
Updated testing tree for -next. Highlights:
- Corner case fixes discovered with static analyzers (Damien).
- More fixes to combat unclaimed register errors on Haswell (Paulo).
- Some small fixes to the gpu turbo code (Rodrigo+Ben), Ben has more
fixes for overclocking support pending.
- More prep work for fastboot from Chris.
- VT-switchless suspend/resume from Jesse.
- The prep work of Egbert Eich's hpd irq storm handling. Hopefully we can
squeeze in the actual storm handling code for 3.10 ...
- More convenience helpers for Imre's sg iterator. Core parts acked by
Andrew Morton.
- A bit of backlight code cleanup from Jani.
- Fixed ilk gpu reset (Jesse).
- Reduced color range handling fixes for VLV (Ville).
The big item here is though the introduction of pipe_config to properly
pre-compute the desired modeset state before touching the hw. Together
with some very basic support to read out the current config from the hw
and compare the state with the sw tracking. This is all prep work for more
reliable fastboot, atomic modesets and other cool features. Stuff
converted to the new world includes:
- Most simple pipe attributes (reduce color range, pixel multiplier).
- Pipe bpp/dither handling.
- Some convenience flags like ->has_pch_encoder to simplify the code flow.
- (Almost) DP clock handling, had to be reverted since part of a prep
patch was lost in rebasing ...
Expect a lot of patches for this throughout 3.11, there's tons of work
till we have all state properly tracked for fastbooting to woExpect a lot
of patches for this throughout 3.11, there's tons of work till we have all
state properly tracked for fastbooting to work.
For 3.10 I have a bunch of fixes queued up and I plan to send them all out
at the end of this week. I need to shuffle patches in my -next queue a bit
so that we don't but feature-y stuff in there, too. The main thing I'd
like to sneak in is Egbert's hpd irq storm handling, which should be
pretty low-risk since all the infrastructure work has landed already. I
also have the oops fix pending, but that only mustered review before the
w/e and giving how hairy that part of our modeset code is, I want to give
it some more testing before forwarding.
Note: annarchy.fd.o seems to run out of disk space, so couldn't push the
usual for-airlied branch. Tag should work though.
Note 2: I've had to do a backmerge since conflicts grew too ugly, but the
upstream -rc I've backmerged is already in your drm-next.
* tag 'drm-intel-next-2013-04-06' of git://people.freedesktop.org/~danvet/drm-intel: (75 commits)
drm/i915: info level for simulated gpu hang dmesg notice
drm/i915: revert eDP bpp clamping code changes
Revert "drm/i915: fix DP get_hw_state return value"
drm/i915: Don't use the HDMI port color range bit on Valleyview
drm/i915: Set PIPECONF color range bit on Valleyview
drm/i915: extract i9xx_set_pipeconf
drm/i915: Add no-lvds quirk for Fujitsu Esprimo Q900
drm/i915: create pipe_config->dpll for clock state
drm/i915: hw readout support for ->has_pch_encoders
drm/i915: add hw state readout/checking for pipe_config
drm/i915: rip out superflous is_dp&is_cpu_edp tracking
drm/i915: remove leaky eDP functions
drm/i915: track dp target_clock in pipe_config
drm/i915: move dp_m_n computation to dp_encoder->compute_config
drm/i915: clear up the fdi/dp set_m_n confusion
drm/i915: Fix sdvo connector get_hw_state function
drm/i915: drop DPFLIPSTAT enables on VLV v3
drm/i915: add Punit read/write routines for VLV v2
drm/i915: panel power sequencing for VLV eDP v2
drm/i915/dp: fix up VLV DP handling v2
...
2013-04-16 13:03:47 +10:00
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2013-02-26 09:24:48 -08:00
Fairly unexciting MTD merge for 3.9:
2013-03-02 16:33:54 -08:00
libceph: add support for HASHPSPOOL pool flag
2013-02-26 15:03:06 -08:00
arm-soc: soc-specific updates
2013-02-21 15:27:22 -08:00
hsi: fix kernel-doc warnings
2013-03-01 13:39:00 -08:00
Input: atmel_mxt_ts - Support for touchpad variant
2013-03-08 16:03:29 -08:00
iio: Fix build error seen if IIO_TRIGGER is defined but IIO_BUFFER is not
2013-03-02 16:31:21 +00:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2013-02-20 11:00:43 -08:00
ImgTec Meta architecture changes for v3.9-rc1
2013-03-03 12:06:09 -08:00
Merge branch 'for-3.9' of git://linux-nfs.org/~bfields/linux
2013-02-28 18:02:55 -08:00
char/misc driver fixes for 3.9-rc4
2013-03-28 15:51:33 -07:00
Main batch of InfiniBand/RDMA changes for 3.9:
2013-02-26 11:41:08 -08:00
mmc: sh_mobile_sdhi: remove unused .pdata field
2013-02-24 14:37:22 -05:00
mtd: nand: reintroduce NAND_NO_READRDY as NAND_NEED_READRDY
2013-03-14 12:48:54 +00:00
Merge branch 'master' of git://1984.lsi.us.es/nf
2013-02-26 17:24:26 -05:00
Fairly unexciting MTD merge for 3.9:
2013-03-02 16:33:54 -08:00
bq2415x_charger: Add support for offline and 100mA mode
2013-02-16 13:34:10 -08:00
regulator: core: update kernel documentation for regulator_desc
2013-03-01 06:07:22 +00:00
sched: move RR_TIMESLICE from sysctl.h to rt.h
2013-02-22 09:20:11 -08:00
Staging tree update for 3.9-rc1
2013-02-21 12:11:44 -08:00
NFS client bugfixes for Linux 3.9
2013-03-02 16:46:07 -08:00
usb: add find_raw_port_number callback to struct hc_driver()
2013-03-25 10:39:17 -07:00
x86, ACPI, mm: Revert movablemem_map support
2013-03-02 09:34:39 -08:00
bdi: allow block devices to say that they require stable page writes
2013-02-21 17:22:19 -08:00
watchdog: bcm47xx_wdt.c: use platform device
2013-03-01 12:47:16 +01:00
fs/exec.c: make bprm_mm_init() static
2013-02-26 02:46:13 -05:00
memory-hotplug: common APIs to support page tables hot-remove
2013-02-23 17:50:12 -08:00
Btrfs: move fs/btrfs/ioctl.h to include/uapi/linux/btrfs.h
2013-02-20 09:37:28 -05:00
bug.h, compiler.h: introduce compiletime_assert & BUILD_BUG_ON_MSG
2013-02-21 17:22:16 -08:00
mm: compaction: make __compact_pgdat() and compact_pgdat() return void
2013-02-23 17:50:10 -08:00
Fix breakage in MIPS siginfo handling
2013-03-19 19:15:52 +01:00
compiler-gcc.h: Add gcc-recommended GCC_VERSION macro
2013-02-21 17:22:15 -08:00
compiler-gcc{3,4}.h: Use GCC_VERSION macro
2013-02-21 17:22:15 -08:00
compiler{,-gcc4}.h, bug.h: Remove duplicate macros
2013-02-21 17:22:15 -08:00
bug.h, compiler.h: introduce compiletime_assert & BUILD_BUG_ON_MSG
2013-02-21 17:22:16 -08:00
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2013-02-25 16:46:44 -08:00
vfs: kill FS_REVAL_DOT by adding a d_weak_revalidate dentry op
2013-02-26 02:46:09 -05:00
Revert "lockdep: check that no locks held at freeze time"
2013-03-31 11:38:33 -07:00
dm: add target num_write_bios fn
2013-03-01 22:45:49 +00:00
Driver core patches for 3.9-rc1
2013-02-21 12:05:51 -08:00
dm kcopyd: introduce configurable throttling
2013-03-01 22:45:49 +00:00
dma-buf: implement vmap refcounting in the interface logic
2013-02-27 15:13:36 +05:30
dmaengine: add dma_request_slave_channel_compat()
2013-02-27 22:37:34 +05:30
dmaengine: dw_dmac: move to generic DMA binding
2013-02-28 09:53:21 +05:30
eCryptfs: allow userspace messaging to be disabled
2013-03-03 23:59:59 -08:00
EDAC: Merge mci.mem_is_per_rank with mci.csbased
2013-03-16 06:32:30 +01:00
A few fixes to reduce places where pstore might hang
2013-02-21 09:38:18 -08:00
Merge branch 'for-3.9/core' of git://git.kernel.dk/linux-block
2013-02-28 12:52:24 -08:00
default SET_PERSONALITY() in linux/elf.h
2013-02-26 02:46:08 -05:00
include/linux/eventfd.h: fix incorrect filename is a comment
2013-02-27 19:10:23 -08:00
fb: add support for drivers not needing VT switch at suspend/resume time
2013-02-20 01:33:41 +01:00
memory-hotplug: remove /sys/firmware/memmap/X sysfs
2013-02-23 17:50:12 -08:00
Revert "lockdep: check that no locks held at freeze time"
2013-03-31 11:38:33 -07:00
fs: Limit sys_mount to only request filesystem modules.
2013-03-03 19:36:31 -08:00
userns: Don't allow creation if the user is chrooted
2013-03-27 07:49:29 -07:00
new helper: file_inode(file)
2013-02-22 23:31:31 -05:00
block: fix part_pack_uuid() build error
2013-02-26 03:10:52 +11:00
irq: Remove IRQ_EXIT_OFFSET workaround
2013-02-22 00:05:07 +01:00
kprobes: Make hash_64() as always inlined
2013-03-18 10:21:23 +01:00
hlist: drop the node parameter from iterators
2013-02-27 19:10:24 -08:00
video: Add generic HDMI infoframe helpers
2013-02-22 08:20:05 +01:00
Merge branches 'for-3.9/logitech', 'for-3.9/multitouch', 'for-3.9/ntrig', 'for-3.9/thingm' and 'for-3.9/upstream' into for-linus
2013-02-21 10:45:01 +01:00
mm: remove unused memclear_highpage_flush()
2013-02-23 17:50:16 -08:00
mm/rmap: rename anon_vma_unlock() => anon_vma_unlock_write()
2013-02-23 17:50:17 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-02-26 20:16:07 -08:00
idr: deprecate idr_pre_get() and idr_get_new[_above]()
2013-03-13 15:21:47 -07:00
hlist: drop the node parameter from iterators
2013-02-27 19:10:24 -08:00
vlan: adjust vlan_set_encap_proto() for its callers
2013-02-23 21:00:06 -05:00
sched/rt: Add <linux/sched/rt.h> header to <linux/init_task.h>
2013-02-19 08:06:01 +01:00
ipmi: remove superfluous kernel/userspace explanation
2013-02-27 19:10:21 -08:00
irq_work.h: fix warning when CONFIG_IRQ_WORK=n
2013-03-22 16:41:19 -07:00
printk: Provide a wake_up_klogd() off-case
2013-03-22 16:41:20 -07:00
ksm: remove old stable nodes more thoroughly
2013-02-23 17:50:19 -08:00
Revert "KVM: allow host header to be included even for !CONFIG_KVM"
2013-03-22 08:08:06 -03:00
list: Fix double fetch of pointer in hlist_entry_safe()
2013-03-14 13:18:30 -07:00
xen-blkfront: drop the use of llist_for_each_entry_safe
2013-02-19 15:17:08 -05:00
Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2013-02-22 19:25:09 -08:00
lib/lzo: Update LZO compression to current upstream version
2013-02-20 19:36:01 +01:00
x86, ACPI, mm: Revert movablemem_map support
2013-03-02 09:34:39 -08:00
mm: refactor inactive_file_is_low() to use get_lru_size()
2013-02-23 17:50:20 -08:00
memory-hotplug: export the function try_offline_node()
2013-02-23 17:50:13 -08:00
mm: remove offlining arg to migrate_pages
2013-02-23 17:50:19 -08:00
Revert "mm: introduce VM_POPULATE flag to better deal with racy userspace programs"
2013-03-28 17:45:51 -07:00
mm: fold page->_last_nid into page->flags where possible
2013-02-23 17:50:17 -08:00
Revert "mm: introduce VM_POPULATE flag to better deal with racy userspace programs"
2013-03-28 17:45:51 -07:00
mm: zone_end_pfn is too small
2013-03-22 16:41:20 -07:00
vfs: Add a mount flag to lock read only bind mounts
2013-03-27 07:50:04 -07:00
ARM: video: mxs: Fix mxsfb misconfiguring VDCTRL0
2013-03-19 11:07:58 +08:00
line up comment for ndo_bridge_getlink
2013-03-27 14:06:41 -04:00
NFS client bugfixes for Linux 3.9
2013-03-02 16:46:07 -08:00
PM / OPP: fix condition for empty of_init_opp_table()
2013-02-23 00:30:08 +01:00
mm: fold page->_last_nid into page->flags where possible
2013-02-23 17:50:17 -08:00
mm: remove MIGRATE_ISOLATE check in hotpath
2013-02-23 17:50:15 -08:00
mm: only enforce stable page writes if the backing device requires it
2013-02-21 17:22:19 -08:00
constify path_get/path_put and fs_struct.c stuff
2013-03-01 23:51:07 -05:00
PCI changes for the v3.9 merge window:
2013-02-25 21:18:18 -08:00
Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac
2013-02-28 20:42:33 -08:00
perf,x86: fix link failure for non-Intel configs
2013-03-17 15:59:15 -07:00
hlist: drop the node parameter from iterators
2013-02-27 19:10:24 -08:00
Linux 3.9-rc3
2013-03-19 09:47:30 +01:00
pm / runtime: introduce pm_runtime_set_memalloc_noio()
2013-02-23 17:50:16 -08:00
Driver core patches for 3.9-rc1
2013-02-21 12:05:51 -08:00
printk: Provide a wake_up_klogd() off-case
2013-03-22 16:41:20 -07:00
tty/serial patches for 3.9-rc1
2013-02-21 13:41:04 -08:00
pwm: Changes for v3.9-rc1
2013-02-26 09:34:29 -08:00
hlist: drop the node parameter from iterators
2013-02-27 19:10:24 -08:00
include/linux/res_counter.h needs errno.h
2013-03-13 15:21:44 -07:00
mm/rmap: rename anon_vma_unlock() => anon_vma_unlock_write()
2013-02-23 17:50:17 -08:00
Driver core patches for 3.9-rc1
2013-02-21 12:05:51 -08:00
lib/scatterlist: sg_page_iter: support sg lists w/o backing pages
2013-03-27 17:13:44 +01:00
coredump: remove redundant defines for dumpable states
2013-02-27 19:10:11 -08:00
seqlock: Use seqcount infrastructure
2013-02-19 08:43:34 +01:00
Fix breakage in MIPS siginfo handling
2013-03-19 19:15:52 +01:00
skb: Propagate pfmemalloc on skb from head page only
2013-03-14 11:53:32 -04:00
smp: make smp_call_function_many() use logic similar to smp_call_function_single()
2013-02-21 17:22:20 -08:00
stop_machine: Mark per cpu stopper enabled early
2013-02-26 22:25:17 +01:00
rtc: stmp3xxx: add wdt-accessor function
2013-03-01 12:40:36 +01:00
vmscan: change type of vm_total_pages to unsigned long
2013-02-23 17:50:22 -08:00
thermal: shorten too long mcast group name
2013-03-20 17:56:58 -04:00
arm-soc: cleanups
2013-02-21 14:58:40 -08:00
udp: add encap_destroy callback
2013-03-20 12:10:38 -04:00
userns: Restrict when proc and sysfs can be mounted
2013-03-27 07:50:08 -07:00
mm: don't wait on congested zones in balance_pgdat()
2013-02-23 17:50:15 -08:00
mm: numa: handle side-effects in count_vm_numa_events() for !CONFIG_NUMA_BALANCING
2013-02-23 17:50:16 -08:00
watchdog: core: dt: add support for the timeout-sec dt property
2013-03-01 12:48:36 +01:00
