From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thierry Reding Subject: [GIT PULL] drm/tegra: Changes for v3.19-rc1 Date: Thu, 13 Nov 2014 16:32:13 +0100 Message-ID: <20141113153210.GA663@ulmo> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1075428319==" Return-path: Received: from mail-wi0-f176.google.com (mail-wi0-f176.google.com [209.85.212.176]) by gabe.freedesktop.org (Postfix) with ESMTP id 8DB556ED06 for ; Thu, 13 Nov 2014 07:32:16 -0800 (PST) Received: by mail-wi0-f176.google.com with SMTP id ex7so1383154wid.3 for ; Thu, 13 Nov 2014 07:32:15 -0800 (PST) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Dave Airlie Cc: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org --===============1075428319== Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="C7zPtVaVf+AK4Oqc" Content-Disposition: inline --C7zPtVaVf+AK4Oqc Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hi Dave, The following changes since commit ba6b3be0a088b831c95431f8528d034c2dd2542f: Merge branch 'drm/panel/for-next' into drm/tegra/for-next (2014-11-13 16:09:48 +0100) are available in the git repository at: git://people.freedesktop.org/~tagr/linux tags/drm/tegra/for-3.19-rc1 for you to fetch changes up to 7e0180e3570cc791e95e6b6cd5fbeb0aedc62776: drm/tegra: gem: Check before freeing CMA memory (2014-11-13 16:18:34 +0100) Note that this will cause a couple of trivial merge conflicts with the Tegra pull request I sent out earlier targetting v3.18-rc5. Let me know if you want me to rebase on top of that pull request and resolve there. Thanks, Thierry ---------------------------------------------------------------- drm/tegra: Changes for v3.19-rc1 The highlights in this pull request are: * IOMMU support: The Tegra DRM driver can now deal with discontiguous buffers if an IOMMU exists in the system. That means it can allocate using drm_gem_get_pages() and will map them into IOVA space via the IOMMU API. Similarly, non-contiguous PRIME buffers can be imported from a different driver, which allows better integration with gk20a (nouveau) and less hacks. * Universal planes: This is precursory work for atomic modesetting and will allow hardware cursor support to be implemented on pre-Tegra114 where RGB cursors were not supported. * DSI ganged-mode support: The DSI controller can now gang up with a second DSI controller to drive high resolution DSI panels. Besides those bigger changes there is a slew of fixes, cleanups, plugged memory leaks and so on. ---------------------------------------------------------------- Sean Paul (5): gpu: host1x: mipi: Preserve the contents of MIPI_CAL_CTRL gpu: host1x: mipi: Calibrate clock lanes gpu: host1x: mipi: Set MIPI_CAL_BIAS_PAD_CFG1 register drm/tegra: DPMS off/on in encoder prepare/commit drm/tegra: dsi: Set up PHY_TIMING & BTA_TIMING registers earlier Thierry Reding (39): drm/tegra: Depend on COMMON_CLK gpu: host1x: Use struct host1x_bo pointers in traces gpu: host1x: Make mapped field of push buffers void * gpu: host1x: Fix typo in comment gpu: host1x: Print address/offset pairs consistently gpu: host1x: Make gather offsets unsigned gpu: host1x: mipi: Registers are 32 bits wide drm/tegra: dc: Add powergate support drm/tegra: Do not enable output on .mode_set() drm/tegra: dsi: Make FIFO depths host parameters drm/tegra: dsi: Do not manage clock on enable/disable drm/tegra: dsi: Leave parent clock alone drm/tegra: dsi: Mark connector hotpluggable drm/tegra: dsi: Properly cleanup on probe failure drm/tegra: dsi: Refactor in preparation for command mode drm/tegra: dsi: Add command mode support drm/tegra: dsi: Split out tegra_dsi_set_timeout() drm/tegra: dsi: Add ganged mode support drm/tegra: dsi: Implement host transfers drm/tegra: dsi: Replace 1000000000UL by NSEC_PER_SEC drm/tegra: dsi: Replace 1000000 by USEC_PER_SEC drm/tegra: gem: Extract tegra_bo_alloc_object() drm/tegra: gem: Cleanup tegra_bo_create_with_handle() drm/tegra: gem: Remove redundant drm_gem_free_mmap_offset() drm/tegra: gem: Use dma_mmap_writecombine() drm/tegra: Fix error handling cleanup drm/tegra: Add IOMMU support drm/tegra: dc: Factor out DC, window and cursor commit drm/tegra: dc: Registers are 32 bits wide drm/tegra: dc: Universal plane support drm/tegra: Enable the hotplug interrupt only when necessary drm/tegra: gem: dumb: pitch and size are outputs drm/tegra: fb: Do not destroy framebuffer drm/tegra: gem: Use more consistent data types drm/tegra: Plug memory leak drm/tegra: Detach panel when a connector is removed drm/tegra: fb: Properly release GEM objects on failure drm/tegra: fb: Add error codes to error messages drm/tegra: gem: Check before freeing CMA memory .../bindings/gpu/nvidia,tegra20-host1x.txt | 2 + drivers/gpu/drm/tegra/Kconfig | 1 + drivers/gpu/drm/tegra/dc.c | 593 ++++++++++----- drivers/gpu/drm/tegra/drm.c | 46 +- drivers/gpu/drm/tegra/drm.h | 18 +- drivers/gpu/drm/tegra/dsi.c | 811 +++++++++++++++++---- drivers/gpu/drm/tegra/dsi.h | 14 +- drivers/gpu/drm/tegra/fb.c | 52 +- drivers/gpu/drm/tegra/gem.c | 366 ++++++++-- drivers/gpu/drm/tegra/gem.h | 14 +- drivers/gpu/drm/tegra/output.c | 35 +- drivers/gpu/host1x/cdma.c | 2 +- drivers/gpu/host1x/cdma.h | 2 +- drivers/gpu/host1x/hw/cdma_hw.c | 10 +- drivers/gpu/host1x/hw/channel_hw.c | 12 +- drivers/gpu/host1x/hw/debug_hw.c | 4 +- drivers/gpu/host1x/job.h | 2 +- drivers/gpu/host1x/mipi.c | 148 ++-- include/trace/events/host1x.h | 27 +- 19 files changed, 1678 insertions(+), 481 deletions(-) --C7zPtVaVf+AK4Oqc Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJUZM76AAoJEN0jrNd/PrOhnkcP/1d9+uK6cJqaxR7GRZYK95Fu hbCa6TE5UqpcSOET2g8ApsWWtE0hpQRMwK4JkwPTJAz1v2yD6Ox3n7mxnjq1x89W /FZbUMy++sKJ2VNsDD5CYktwitpD/6aDnwFiYdj0thiYrx9cKI8IJxYthwxL6I3C TswDBq43lMHW6BZiS61bVL0A+Ngx6WPB8w0Koiz67Cty2W/nrV92WaqJmTgsngDM o2kmtvk8rqcjPFl3SEn+lnGYHsXh4vBPuFRz9VLAAZ9QXILRYHzR2F3N+4HlRick vayTMwgPLHkZESUaiwghrsY+hI86tqh+MUE7MtiQPOdLNOE3gKdbHOy3yrX8T7ZH 22Ivn955mlcwelR5jRLKcym0WIIPKglW6WP19eQcRLR86KI2qDIcwQnEjne7YV/X UCJibgrfZZ49YE+u8N6GIOKTJ3cpRk00lAS8IG3begEwmotNb44iqXhLZVbtFfWg Gxdvt/QyfYhQIC818WBVrs4DqVri65gvSK+E/mnPsURHJoqxY+eE+ZUTOVZwaRoq nWZDD09JeSjZ/PwYSVN69GAhm9nmKfLoLDqvWqyluhBUjO8YzsbqGOXRESuHYOte vs2ntQ5JVbCiKv0knQiYBCGnI6y4V50X5CYru8CjzyXyG5HDut0k2QWaZN4MLJEQ eyNIhNQc6F02zWg+8Ics =n9tb -----END PGP SIGNATURE----- --C7zPtVaVf+AK4Oqc-- --===============1075428319== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVs IG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK --===============1075428319==--