Dave Airlie 1dda8d02ac
Merge remote-tracking branch 'pfdo/drm-rcar-for-v3.12' into drm-next ...
Merge the rcar stable branch that is being shared with the arm-soc tree.
Signed-off-by: Dave Airlie <airlied@redhat.com >
* pfdo/drm-rcar-for-v3.12: (220 commits)
drm/rcar-du: Add FBDEV emulation support
drm/rcar-du: Add internal LVDS encoder support
drm/rcar-du: Configure RGB output routing to DPAD0
drm/rcar-du: Rework output routing support
drm/rcar-du: Add support for DEFR8 register
drm/rcar-du: Add support for multiple groups
drm/rcar-du: Fix buffer pitch alignment for R8A7790 DU
drm/rcar-du: Add support for the R8A7790 DU
drm/rcar-du: Move output routing configuration to group
drm/rcar-du: Remove register definitions for the second channel
drm/rcar-du: Use dynamic number of CRTCs instead of CRTCs array size
drm/rcar-du: Introduce CRTCs groups
drm/rcar-du: Rename rcar_du_plane_(init|register) to rcar_du_planes_*
drm/rcar-du: Create rcar_du_planes structure
drm/rcar-du: Rename platform data fields to match what they describe
drm/rcar-du: Merge LVDS and VGA encoder code
drm/rcar-du: Split VGA encoder and connector
drm/rcar-du: Split LVDS encoder and connector
drm/rcar-du: Clarify comment regarding plane Y source coordinate
drm/rcar-du: Support per-CRTC clock and IRQ
...
Conflicts:
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/intel_pm.c
drivers/gpu/drm/qxl/qxl_release.c
2013-08-19 09:24:13 +10:00
2013-07-22 19:02:52 -07:00
2013-07-03 16:08:06 -07:00
2013-07-03 14:35:40 -07:00
2012-12-17 17:15:25 -08:00
2013-07-04 11:40:58 -07:00
2013-06-12 16:42:20 +01:00
2013-04-29 18:28:19 -07:00
2012-04-16 14:37:13 +02:00
2013-05-28 12:02:12 +02:00
2013-02-27 19:10:22 -08:00
2012-11-09 18:07:11 +05:30
2011-09-27 18:08:04 +02:00
2013-07-11 13:03:24 -07:00
2012-06-26 21:19:02 -07:00
2013-05-21 10:21:57 -07:00
2013-06-04 14:25:59 +02:00
2013-04-23 13:45:22 +02:00
2012-04-03 13:09:18 +02:00
2013-07-03 16:07:42 -07:00
2011-12-12 14:14:31 -08:00
2013-07-11 13:05:40 -07:00
2013-07-26 12:42:40 -07:00
2013-07-25 20:47:04 +10:00
2013-01-22 09:41:43 -08:00
2013-01-01 11:18:26 -02:00
2013-06-05 16:24:58 +02:00
2013-04-12 14:06:16 +10:00
2012-04-20 09:24:27 -07:00
2012-11-19 14:28:24 +01:00
2013-07-09 16:04:31 -07:00
2013-07-13 11:40:24 -07:00
2012-11-14 15:07:18 -08:00
2013-06-18 15:42:15 -07:00
2011-09-27 18:08:04 +02:00
2012-12-14 08:48:59 +01:00
2013-07-03 19:56:35 -07:00
2013-07-04 14:02:09 -07:00
2012-03-07 16:08:24 +01:00
2013-04-02 09:39:55 -07:00
2012-03-30 16:03:15 -07:00
2012-09-20 16:49:17 -04:00
2013-06-13 21:32:00 +02:00
2013-06-26 21:10:13 +02:00
2012-03-30 16:03:15 -07:00
2013-07-24 22:06:34 -07:00
2013-07-10 16:06:46 -07:00
2013-07-04 11:40:58 -07:00
2012-02-15 14:48:01 -08:00
2013-05-28 12:02:12 +02:00
2013-04-01 11:04:53 -07:00
2013-05-17 15:17:12 +02:00
2012-05-02 00:10:49 -07:00
2013-05-28 12:02:12 +02:00
2011-03-31 11:26:23 -03:00
2013-05-28 12:02:12 +02:00
2013-03-22 12:10:42 -04:00
2013-01-26 22:20:06 -08:00
2013-07-09 18:24:39 -07:00
2013-01-10 01:27:46 +01:00
2013-07-09 22:09:19 +02:00
2013-01-24 17:25:13 +01:00
2013-06-28 13:01:40 +02:00
2013-07-01 11:50:10 +10:00
2012-10-02 21:14:29 +10:00
2011-05-13 16:31:00 -07:00
2011-05-23 13:01:00 -07:00
2013-07-03 16:08:05 -07:00
2013-06-10 13:46:44 -07:00
2013-05-02 15:50:20 +02:00
2013-06-19 12:58:42 +02:00
2013-06-24 17:52:10 -07:00
2013-03-19 14:16:42 -07:00
2013-06-03 14:31:39 -07:00
2013-06-17 11:16:33 +02:00
2013-01-03 15:57:16 -08:00
2013-07-10 17:08:27 -07:00
2012-09-17 17:12:58 -07:00
2013-07-11 12:26:08 -07:00
2013-06-10 13:42:38 -07:00
2013-07-11 09:02:09 -07:00
2013-07-02 11:44:19 -07:00
2011-07-14 17:57:09 -07:00
2013-07-13 12:09:57 -07:00
2013-07-04 11:40:58 -07:00
2013-07-10 18:11:34 -07:00
2013-07-04 11:40:58 -07:00
2013-07-11 21:47:58 +02:00
2013-07-09 10:33:30 -07:00
2013-05-09 01:07:09 -07:00
2013-06-17 09:18:29 -03:00
2013-06-18 15:41:03 -07:00
2013-01-08 14:14:55 -08:00
2013-07-04 11:40:58 -07:00
2011-09-27 18:08:04 +02:00
2011-05-25 08:39:21 -07:00
2011-07-11 16:48:38 -07:00
2013-06-10 23:54:14 +02:00
2013-07-03 22:58:20 +02:00
2013-07-03 16:08:01 -07:00
2013-07-14 19:36:59 -04:00
2012-03-23 16:58:37 -07:00
2011-03-31 11:26:23 -03:00
2013-07-03 16:08:03 -07:00
2011-11-09 12:10:37 +02:00
2013-02-27 19:10:23 -08:00
2012-10-24 17:06:43 +02:00
2012-11-29 03:30:34 -08:00
2013-05-01 16:35:36 +05:30
2012-03-07 16:08:24 +01:00
2013-06-08 02:13:44 +05:30
2012-11-19 14:10:53 +01:00
2013-05-28 12:02:12 +02:00
2012-07-29 21:11:05 -03:00
2012-05-17 19:06:13 -04:00
2011-08-13 18:34:03 -07:00
2011-04-28 16:12:47 -04:00
2013-04-16 18:47:19 +09:00
2013-06-03 14:22:57 -07:00
2013-03-10 18:16:36 +08:00
2011-09-21 19:45:34 +03:00
2012-05-25 16:18:34 +02:00
2013-01-11 11:38:03 -08:00
2013-04-29 15:18:50 +02:00
2013-02-27 19:10:21 -08:00
2011-05-25 08:39:45 -07:00
2012-12-05 23:52:10 +00:00
2011-03-31 11:26:23 -03:00
2013-05-28 12:02:11 +02:00
2011-09-27 18:08:04 +02:00
2013-07-11 09:02:09 -07:00
2013-07-04 11:40:58 -07:00
2011-12-02 16:12:42 +00:00
2012-09-04 16:06:34 -07:00
2012-11-28 18:36:06 +10:00
2011-12-11 10:31:23 -08:00
2013-02-19 08:42:37 +01:00
2012-02-11 15:11:28 +01:00
2013-01-31 19:20:33 -05:00
2012-05-09 13:59:09 -07:00
2012-06-28 12:03:15 +02:00
2013-07-03 09:43:28 +10:00
2013-07-13 12:09:57 -07:00
2013-01-08 14:14:55 -08:00
2012-12-12 17:38:33 -08:00
2012-03-30 16:03:15 -07:00
2012-02-28 16:05:06 +01:00
2011-11-07 07:54:42 +10:30
2012-03-30 16:03:15 -07:00
2012-09-26 19:56:15 +02:00
2013-07-04 11:40:58 -07:00
2013-07-01 23:22:13 -07:00
2013-06-21 11:32:51 +02:00
2012-09-06 22:16:58 -07:00
2012-10-09 16:22:40 +09:00
2012-09-18 12:53:22 +03:00
2011-09-27 18:08:04 +02:00
2013-01-03 15:57:16 -08:00
2013-06-19 12:58:42 +02:00
2013-07-03 16:07:54 -07:00
2011-03-31 11:26:23 -03:00
2012-10-01 15:27:48 +02:00
2012-12-17 17:15:23 -08:00
2013-06-19 12:58:42 +02:00
2011-03-30 12:02:05 +02:00
2012-06-25 12:11:58 -07:00
2012-04-16 14:37:13 +02:00
2013-06-03 14:20:18 -07:00
2011-08-13 18:34:03 -07:00
2013-04-29 18:28:20 -07:00
2013-04-30 17:04:10 -07:00
2013-04-04 10:24:53 -07:00
2013-07-10 14:50:08 -07:00
2012-01-02 13:04:55 +01:00
2012-05-08 16:01:34 -07:00
2012-07-13 22:24:45 -07:00
2013-06-26 12:10:56 +02:00
1dda8d02ac
