Daniel Vetter 7f16e5c141
Merge tag 'v3.12' into drm-intel-next ...
I want to merge in the new Broadwell support as a late hw enabling
pull request. But since the internal branch was based upon our
drm-intel-nightly integration branch I need to resolve all the
oustanding conflicts in drm/i915 with a backmerge to make the 60+
patches apply properly.
We'll propably have some fun because Linus will come up with a
slightly different merge solution.
Conflicts:
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/intel_crt.c
drivers/gpu/drm/i915/intel_ddi.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_dp.c
drivers/gpu/drm/i915/intel_drv.h
All rather simple adjacent lines changed or partial backports from
-next to -fixes, with the exception of the thaw code in i915_dma.c.
That one needed a bit of shuffling to restore the intent.
Oh and the massive header file reordering in intel_drv.h is a bit
trouble. But not much.
v2: Also don't forget the fixup for the silent conflict that results
in compile fail ...
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch >
2013-11-04 16:28:52 +01:00
2013-07-30 17:24:12 -04:00
2013-08-30 16:31:04 -04:00
2013-10-09 18:17:10 +10:00
2013-10-18 16:16:19 -04:00
2013-08-30 16:31:04 -04:00
2013-08-30 16:30:11 -04:00
2013-10-09 17:13:47 -04:00
2013-09-23 10:29:51 -04:00
2013-06-27 19:15:44 -04:00
2013-08-30 16:29:57 -04:00
2013-09-23 10:29:53 -04:00
2013-08-30 16:31:06 -04:00
2013-09-11 11:44:28 -04:00
2013-06-25 17:50:28 -04:00
2013-06-25 17:50:28 -04:00
2013-08-30 16:30:09 -04:00
2013-09-02 09:31:40 +10:00
2013-10-18 16:16:17 -04:00
2013-08-30 16:31:01 -04:00
2013-08-30 16:30:08 -04:00
2013-08-30 16:30:08 -04:00
2013-06-27 10:49:18 -04:00
2013-08-30 16:30:08 -04:00
2013-06-27 19:16:31 -04:00
2013-09-15 20:27:52 -04:00
2013-06-27 19:16:19 -04:00
2013-10-18 20:00:09 -04:00
2013-08-30 16:29:57 -04:00
2013-03-07 12:58:59 -05:00
2013-08-30 16:30:42 -04:00
2013-10-23 16:25:12 -04:00
2013-06-27 19:16:26 -04:00
2013-06-27 19:15:22 -04:00
2013-10-09 17:13:46 -04:00
2013-10-09 17:13:46 -04:00
2013-01-31 16:24:47 -05:00
2013-10-23 16:25:18 -04:00
2013-09-11 11:44:38 -04:00
2013-09-11 11:44:38 -04:00
2013-08-30 16:30:45 -04:00
2013-07-03 16:07:43 -07:00
2013-09-02 09:31:40 +10:00
2013-09-23 10:29:52 -04:00
2013-07-08 17:41:11 -04:00
2013-10-18 16:16:17 -04:00
2013-07-14 10:11:28 -04:00
2013-06-27 19:16:10 -04:00
2013-06-26 16:11:34 -04:00
2013-09-11 11:44:37 -04:00
2013-08-30 16:30:11 -04:00
2013-01-31 16:24:45 -05:00
2013-09-20 17:34:52 -04:00
2013-01-31 16:24:46 -05:00
2013-01-31 16:24:45 -05:00
2013-05-13 15:23:34 +10:00
2013-08-20 12:44:51 +02:00
2013-01-31 16:24:46 -05:00
2013-09-11 11:44:29 -04:00
2013-04-22 10:39:09 -04:00
2013-06-03 10:17:54 -04:00
2013-08-30 16:30:45 -04:00
2013-08-30 16:29:57 -04:00
2013-08-30 16:29:57 -04:00
2013-07-23 20:14:24 +10:00
2013-02-25 16:46:44 -08:00
2013-09-02 09:31:40 +10:00
2013-09-23 10:29:50 -04:00
2013-08-30 16:30:27 -04:00
2013-10-18 16:16:18 -04:00
2013-06-27 19:16:30 -04:00
2013-10-18 16:16:17 -04:00
2013-10-09 17:13:46 -04:00
2013-06-27 19:16:23 -04:00
2013-09-24 11:00:59 -04:00
2013-09-11 11:44:40 -04:00
2013-09-20 14:28:15 -04:00
2013-02-20 08:51:21 -05:00
2013-03-15 18:47:18 -04:00
2013-10-09 15:55:33 +10:00
2013-07-22 15:57:14 -04:00
2013-10-18 16:16:19 -04:00
2013-07-23 20:14:24 +10:00
2013-10-18 16:16:16 -04:00
2013-06-26 16:11:38 -04:00
2013-09-23 10:53:18 -04:00
2013-09-11 11:44:25 -04:00
2013-11-04 16:28:52 +01:00
2013-01-31 16:24:47 -05:00
2013-06-25 17:50:22 -04:00
2013-05-28 12:02:13 +02:00
2013-08-07 17:37:15 -04:00
2013-08-07 17:37:17 -04:00
2013-10-09 14:38:02 +10:00
2013-08-30 16:31:11 -04:00
2013-01-31 16:24:47 -05:00
2013-10-09 15:55:33 +10:00
2013-05-20 10:44:57 -04:00
2013-01-31 16:24:47 -05:00
2013-09-11 11:44:25 -04:00
2013-08-19 09:34:47 +10:00
2013-07-25 20:47:07 +10:00
2013-10-09 17:13:45 -04:00
2013-08-19 09:34:47 +10:00
2013-06-26 16:11:38 -04:00
2013-09-20 17:34:52 -04:00
2013-07-14 10:11:31 -04:00
2013-01-31 16:24:47 -05:00
2013-10-09 17:13:47 -04:00
2013-09-11 11:44:33 -04:00
2013-08-27 11:54:58 +10:00
2013-08-30 16:30:29 -04:00
2013-10-18 16:16:16 -04:00
2013-10-23 16:25:18 -04:00
2013-09-11 11:44:29 -04:00
2013-09-11 11:44:29 -04:00
2013-09-11 11:44:29 -04:00
2013-04-09 10:31:31 -04:00
2013-09-15 20:27:51 -04:00
2013-06-27 10:49:25 -04:00
2013-07-17 16:47:52 -04:00
2013-09-15 20:27:52 -04:00
2013-06-27 10:50:08 -04:00
2013-06-27 10:50:08 -04:00
2013-09-11 11:44:29 -04:00
2013-01-31 16:24:46 -05:00
2013-06-27 19:14:59 -04:00
2013-06-27 19:14:59 -04:00
2013-06-27 19:16:12 -04:00
2013-06-27 19:14:59 -04:00
2013-08-30 16:30:42 -04:00
2013-09-15 20:27:52 -04:00
2013-08-07 17:37:10 -04:00
2013-09-11 11:44:28 -04:00
2013-09-11 11:44:28 -04:00
2013-08-30 16:31:15 -04:00
2013-09-15 20:27:51 -04:00
2013-08-30 16:30:42 -04:00
2013-10-09 17:13:48 -04:00
2013-06-27 19:40:05 -04:00
2013-09-11 11:44:28 -04:00
2013-10-18 16:16:17 -04:00
2013-10-09 17:13:46 -04:00
2013-06-27 19:40:05 -04:00
2013-08-30 16:30:29 -04:00
2013-08-30 16:30:28 -04:00
2013-08-30 16:30:28 -04:00
2013-09-15 20:27:52 -04:00
2013-08-30 16:30:10 -04:00
2013-06-27 19:16:22 -04:00
2013-06-27 19:15:48 -04:00
2013-10-09 17:13:50 -04:00
2013-09-11 11:44:39 -04:00
2013-09-11 11:44:37 -04:00
2013-06-27 19:15:48 -04:00
2013-10-18 16:16:16 -04:00
2013-08-30 16:30:42 -04:00
2013-08-30 16:30:42 -04:00
2013-08-30 16:31:12 -04:00
Daniel Vetter
7f16e5c141