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-09-02 11:49:56 +05:30
2013-09-26 14:02:33 -04:00
2013-08-21 09:28:29 +02:00
2013-09-09 11:15:49 -07:00
2013-08-14 13:55:15 +05:30
2013-08-05 08:52:45 +09:00
2013-08-19 14:20:21 +05:30
2013-09-06 13:21:16 -07:00
2013-08-17 19:34:52 +01:00
2013-09-09 16:35:29 -07:00
2013-09-10 13:33:09 -07:00
2013-09-05 14:54:29 -07:00
2013-10-10 09:23:59 -07:00
2013-08-26 11:32:07 -04:00
2013-08-30 21:37:01 +01:00
2013-09-16 20:35:55 +02:00
2013-08-28 13:34:41 +02:00
2013-09-12 11:35:33 -07:00
2013-08-30 17:34:52 -07:00
2013-09-10 13:03:41 -07:00
2013-09-17 11:49:25 +01:00
2013-09-10 13:33:09 -07:00
2013-09-10 20:04:59 -07:00
2013-10-17 09:34:30 -07:00
2013-08-02 12:33:54 -07:00
2013-07-31 14:20:39 +02:00
2013-08-25 09:39:12 -04:00
2013-09-11 15:58:04 -07:00
2013-09-30 14:31:02 -07:00
2013-09-11 15:59:04 -07:00
2013-09-21 13:57:47 -06:00
2013-09-04 09:23:46 -04:00
2013-08-30 23:44:11 -07:00
2013-08-26 18:40:56 -04:00
2013-08-19 12:27:17 -07:00
2013-08-27 17:50:38 -07:00
2013-09-11 15:56:57 -07:00
2013-09-11 15:58:25 -07:00
2013-10-11 07:39:14 +02:00
2013-08-14 17:14:51 +02:00
2013-08-14 17:14:54 +02:00
2013-09-13 15:09:52 +02:00
2013-08-27 01:44:40 +02:00
2013-10-18 15:05:29 +02:00
2013-09-11 15:59:10 -07:00
2013-09-07 12:56:26 +10:00
2013-09-10 18:56:29 -04:00
2013-08-27 22:09:12 -07:00
2013-08-18 17:39:55 -07:00
2013-09-20 10:36:34 -04:00
2013-09-09 10:26:33 -07:00
2013-08-02 12:33:54 -07:00
2013-08-27 09:18:29 +02:00
2013-08-29 21:55:23 -04:00
2013-09-10 13:37:36 -07:00
2013-09-03 20:57:49 -04:00
2013-09-07 19:54:57 -04:00
2013-08-26 20:15:23 +09:00
2013-10-07 15:16:45 -04:00
2013-08-22 22:13:54 -07:00
2013-09-12 10:12:47 -07:00
2013-09-13 23:06:40 -04:00
2013-09-06 09:17:30 +01:00
2013-09-06 09:17:30 +01:00
2013-09-03 07:41:11 +02:00
2013-09-11 15:57:35 -07:00
2013-09-13 15:09:52 +02:00
2013-08-30 08:42:01 +10:00
2013-08-26 13:46:11 +02:00
2013-08-26 13:46:11 +02:00
2013-09-13 15:11:21 +02:00
2013-08-26 21:40:24 +02:00
2013-09-12 15:38:03 -07:00
2013-09-11 15:57:49 -07:00
2013-09-26 14:20:21 -07:00
2013-08-23 10:22:29 +02:00
2013-08-26 09:30:03 -07:00
2013-08-29 14:08:24 -04:00
2013-08-22 20:30:15 -07:00
2013-09-11 15:59:37 -07:00
2013-09-24 13:04:07 +02:00
2013-09-13 15:09:52 +02:00
2013-08-14 11:38:34 +02:00
2013-11-03 10:53:11 -08:00
2013-08-29 15:32:08 -04:00
2013-09-13 15:09:52 +02:00
2013-09-13 15:09:52 +02:00
2013-09-13 15:09:52 +02:00
2013-08-09 10:49:00 +02:00
2013-08-20 11:46:54 -07:00
2013-08-09 07:53:54 -07:00
2013-08-09 07:53:54 -07:00
2013-09-13 15:09:52 +02:00
2013-09-20 15:38:26 -04:00
2013-08-28 21:35:14 -07:00
2013-09-11 15:58:52 -07:00
2013-09-17 12:52:31 +03:00
2013-08-25 09:39:12 -04:00
2013-09-10 18:56:32 -04:00
2013-09-07 15:49:18 -07:00
2013-09-11 15:59:45 -07:00
2013-08-23 09:02:14 -04:00
2013-08-06 14:10:45 +00:00
2013-09-11 15:57:51 -07:00
2013-10-16 21:35:53 -07:00
2013-08-21 11:52:20 -07:00
2013-09-11 15:57:48 -07:00
2013-08-22 23:20:54 +08:00
2013-09-13 10:55:58 -07:00
2013-09-26 11:03:29 +02:00
2013-09-11 15:58:01 -07:00
2013-09-13 10:55:58 -07:00
2013-09-12 15:38:03 -07:00
2013-09-11 15:58:01 -07:00
2013-09-07 09:48:41 -07:00
2013-09-03 16:35:47 +09:30
2013-08-20 15:37:42 +09:30
2013-08-12 15:27:01 +00:00
2013-09-28 12:46:21 +02:00
2013-08-02 12:33:54 -07:00
2013-09-08 20:20:23 -04:00
2013-10-07 12:29:26 -04:00
2013-08-28 00:26:48 +02:00
2013-09-06 14:49:16 -04:00
2013-09-03 15:26:29 -04:00
2013-09-26 10:20:18 -04:00
2013-08-27 13:52:52 -04:00
2013-09-03 16:40:32 -04:00
2013-08-21 10:29:51 +01:00
2013-09-10 13:53:52 -07:00
2013-09-24 21:12:32 -05:00
2013-08-28 20:50:19 +01:00
2013-08-12 15:27:01 +00:00
2013-09-10 13:53:52 -07:00
2013-08-15 17:22:27 -07:00
2013-09-03 22:52:48 -04:00
2013-09-05 14:54:29 -07:00
2013-09-15 17:41:30 -04:00
2013-09-06 13:30:06 -07:00
2013-09-09 14:29:15 -07:00
2013-08-23 16:08:27 -04:00
2013-10-30 14:27:03 -07:00
2013-10-04 09:58:53 +02:00
2013-08-27 18:42:48 -07:00
2013-08-19 21:22:34 -07:00
2013-08-14 17:14:52 +02:00
2013-08-06 14:21:01 -07:00
2013-08-19 10:18:11 -07:00
2013-08-14 19:54:30 +01:00
2013-08-20 16:53:58 -05:00
2013-08-17 09:32:32 -04:00
2013-09-11 15:59:36 -07:00
2013-09-11 15:59:37 -07:00
2013-09-23 06:35:06 -04:00
2013-09-11 15:59:20 -07:00
2013-08-18 17:40:16 -07:00
2013-08-31 14:43:50 -07:00
2013-09-03 10:07:40 -07:00
2013-09-12 15:38:02 -07:00
2013-10-16 21:35:53 -07:00
2013-09-12 09:25:23 -07:00
2013-08-27 14:25:27 +05:30
2013-08-20 17:10:41 -07:00
2013-08-27 14:25:09 +05:30
2013-09-10 18:56:32 -04:00
2013-09-01 14:16:33 -07:00
2013-09-30 22:32:39 -07:00
2013-09-04 20:51:33 +03:00
2013-09-04 23:11:42 +03:00
2013-09-04 20:53:16 +03:00
2013-09-24 17:00:25 -07:00
2013-08-02 12:33:54 -07:00
2013-08-07 16:52:33 -07:00
2013-08-13 08:19:26 -07:00
2013-08-30 17:26:09 -04:00
2013-09-12 15:38:02 -07:00
2013-08-13 17:57:47 -07:00
2013-09-11 15:58:25 -07:00
2013-08-28 09:51:41 -07:00
2013-07-31 12:16:45 -07:00
2013-08-29 13:54:34 -07:00
2013-09-03 09:10:24 -04:00
2013-08-14 17:58:56 +02:00
2013-10-10 12:31:43 -07:00
2013-10-16 13:32:04 -07:00
2013-08-12 11:56:16 -07:00
2013-09-07 14:35:32 -07:00
2013-08-05 10:52:36 -06:00
2013-08-29 13:30:21 +10:00
2013-10-11 15:19:22 +10:00
2013-09-11 15:57:09 -07:00
2013-09-03 18:25:03 -07:00
2013-09-11 15:58:01 -07:00
2013-08-14 17:14:54 +02:00
2013-08-22 08:53:30 -07:00
2013-09-11 15:58:02 -07:00
2013-10-17 15:53:09 -04:00
7f16e5c141