Bit a bit -fixes pull request in the merge window than usual dua to two feauture-y things: - Display CRCs are now enabled on all platforms, including the odd DP case on gm45/vlv. Since this is a testing-only feature it should ever hurt, but I figured it'll help with regression-testing -fixes. So I left it in and didn't postpone it to 3.14. - Display power well refactoring from Imre. Would have caused major pain conflict with the bdw stage 1 patches if I'd postpone this to -next. It's only an relatively small interface rework, so shouldn't cause pain. It's also been in my tree since almost 3 weeks already. That accounts for about two thirds of the pull, otherwise just bugfixes: - vlv backlight fix from Jesse/Jani - vlv vblank timestamp fix from Jesse - improved edp detection through vbt from Ville (fixes a vlv issue) - eDP vdd fix from Paulo - fixes for dvo lvds on i830M - a few smaller things all over Note: This contains a backmerge of v3.12. Since the -internal branch always applied on top of -nightly I need that unified base to merge bdw patches. So you'll get a conflict with radeon connector props when pulling this (and nouveau/master will also conflict a bit when Ben doesn't rebase). The backmerge itself only had conflicts in drm/i915. There's also a tiny conflict between Jani's backlight fix and your sysfs lifetime fix in drm-next. * tag 'drm-intel-fixes-2013-11-07' of git://people.freedesktop.org/~danvet/drm-intel: (940 commits) drm/i915/vlv: use per-pipe backlight controls v2 drm/i915: make backlight functions take a connector drm/i915: move opregion asle request handling to a work queue drm/i915/vlv: use PIPE_START_VBLANK interrupts on VLV drm/i915: Make intel_dp_is_edp() less specific drm/i915: Give names to the VBT child device type bits drm/i915/vlv: enable HDA display audio for Valleyview2 drm/i915/dvo: call ->mode_set callback only when the port is running drm/i915: avoid unclaimed registers when capturing the error state drm/i915: Enable DP port CRC for the "auto" source on g4x/vlv drm/i915: scramble reset support for DP port CRC on vlv drm/i915: scramble reset support for DP port CRC on g4x drm/i916: add "auto" pipe CRC source ...
Showing the changes to include/uapi (5 of 873 files). Show all
Unified · Split
| @@ -240,6 +240,8 @@ struct drm_mode_get_connector { · 239 unmodified lines | ||
| 240 | 240 | __u32 connection; |
| 241 | 241 | __u32 mm_width, mm_height; /**< HxW in millimeters */ |
| 242 | 242 | __u32 subpixel; |
| 243 | + | |
| 244 | + __u32 pad; | |
| 243 | 245 | }; |
| 244 | 246 | |
| 245 | 247 | #define DRM_MODE_PROP_PENDING (1<<0) |
| @@ -456,13 +456,15 @@ struct perf_event_mmap_page { · 455 unmodified lines | ||
| 456 | 456 | /* |
| 457 | 457 | * Control data for the mmap() data buffer. |
| 458 | 458 | * |
| 459 | − * User-space reading the @data_head value should issue an rmb(), on | |
| 460 | − * SMP capable platforms, after reading this value -- see | |
| 461 | − * perf_event_wakeup(). | |
| 459 | + * User-space reading the @data_head value should issue an smp_rmb(), | |
| 460 | + * after reading this value. | |
| 462 | 461 | * |
| 463 | 462 | * When the mapping is PROT_WRITE the @data_tail value should be |
| 464 | − * written by userspace to reflect the last read data. In this case | |
| 465 | − * the kernel will not over-write unread data. | |
| 463 | + * written by userspace to reflect the last read data, after issueing | |
| 464 | + * an smp_mb() to separate the data read from the ->data_tail store. | |
| 465 | + * In this case the kernel will not over-write unread data. | |
| 466 | + * | |
| 467 | + * See perf_output_put_handle() for the data ordering. | |
| 466 | 468 | */ |
| 467 | 469 | __u64 data_head; /* head in the data section */ |
| 468 | 470 | __u64 data_tail; /* user-space written tail */ |
| @@ -1,5 +1,6 @@ | ||
| 1 | 1 | # UAPI Header export list |
| 2 | 2 | header-y += tc_csum.h |
| 3 | +header-y += tc_defact.h | |
| 3 | 4 | header-y += tc_gact.h |
| 4 | 5 | header-y += tc_ipt.h |
| 5 | 6 | header-y += tc_mirred.h |
| @@ -0,0 +1,19 @@ | ||
| 1 | +#ifndef __LINUX_TC_DEF_H | |
| 2 | +#define __LINUX_TC_DEF_H | |
| 3 | + | |
| 4 | +#include <linux/pkt_cls.h> | |
| 5 | + | |
| 6 | +struct tc_defact { | |
| 7 | + tc_gen; | |
| 8 | +}; | |
| 9 | + | |
| 10 | +enum { | |
| 11 | + TCA_DEF_UNSPEC, | |
| 12 | + TCA_DEF_TM, | |
| 13 | + TCA_DEF_PARMS, | |
| 14 | + TCA_DEF_DATA, | |
| 15 | + __TCA_DEF_MAX | |
| 16 | +}; | |
| 17 | +#define TCA_DEF_MAX (__TCA_DEF_MAX - 1) | |
| 18 | + | |
| 19 | +#endif | |
| @@ -87,8 +87,10 @@ enum { · 86 unmodified lines | ||
| 87 | 87 | IB_USER_VERBS_CMD_CLOSE_XRCD, |
| 88 | 88 | IB_USER_VERBS_CMD_CREATE_XSRQ, |
| 89 | 89 | IB_USER_VERBS_CMD_OPEN_QP, |
| 90 | +#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING | |
| 90 | 91 | IB_USER_VERBS_CMD_CREATE_FLOW = IB_USER_VERBS_CMD_THRESHOLD, |
| 91 | 92 | IB_USER_VERBS_CMD_DESTROY_FLOW |
| 93 | +#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */ | |
| 92 | 94 | }; |
| 93 | 95 | |
| 94 | 96 | /* |
| @@ -126,6 +128,7 @@ struct ib_uverbs_cmd_hdr { · 31 unmodified lines | ||
| 126 | 128 | __u16 out_words; |
| 127 | 129 | }; |
| 128 | 130 | |
| 131 | +#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING | |
| 129 | 132 | struct ib_uverbs_cmd_hdr_ex { |
| 130 | 133 | __u32 command; |
| 131 | 134 | __u16 in_words; |
| @@ -134,6 +137,7 @@ struct ib_uverbs_cmd_hdr_ex { · 2 unmodified lines | ||
| 134 | 137 | __u16 provider_out_words; |
| 135 | 138 | __u32 cmd_hdr_reserved; |
| 136 | 139 | }; |
| 140 | +#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */ | |
| 137 | 141 | |
| 138 | 142 | struct ib_uverbs_get_context { |
| 139 | 143 | __u64 response; |
| @@ -696,6 +700,7 @@ struct ib_uverbs_detach_mcast { · 556 unmodified lines | ||
| 696 | 700 | __u64 driver_data[0]; |
| 697 | 701 | }; |
| 698 | 702 | |
| 703 | +#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING | |
| 699 | 704 | struct ib_kern_eth_filter { |
| 700 | 705 | __u8 dst_mac[6]; |
| 701 | 706 | __u8 src_mac[6]; |
| @@ -780,6 +785,7 @@ struct ib_uverbs_destroy_flow { · 78 unmodified lines | ||
| 780 | 785 | __u32 comp_mask; |
| 781 | 786 | __u32 flow_handle; |
| 782 | 787 | }; |
| 788 | +#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */ | |
| 783 | 789 | |
| 784 | 790 | struct ib_uverbs_create_srq { |
| 785 | 791 | __u64 response; |