Hey Dave,
seems like patchwork (and/or pwclient) messed up Uwe's name.. if you've already pulled my branch could you run:
git filter-branch -f --env-filter "case $GIT_COMMIT in 66172017da1c*) GIT_AUTHOR_NAME='$(echo 'Uwe Kleine-K+APY-nig' | iconv -f utf-7 -t utf-8)';; esac" 66172017da1c^..
or otherwise, I've fixed it and re-pushed:
----------
The following changes since commit 3f05eb4e3fc56df678f83925ced78bc97166b052:
drm/virtio: remove some dead code (2015-06-11 13:16:35 +1000)
are available in the git repository at:
git://people.freedesktop.org/~robclark/linux
for you to fetch changes up to 1a370be9ac51129e40b0ed7fa71d2b2b92bc47e5:
drm/msm: restart queued submits after hang (2015-06-11 13:11:06 -0400)
----------
BR, -R
On Sun, Jun 7, 2015 at 10:40 PM, Rob Clark robdclark@gmail.com wrote:
Hi Dave,
Main pull req for 4.2.. I think there will be a secondary pull-req.. I'd like to land the hdcp support patches, since all the review comments have been long since addressed, and they have been ready to merge for a couple release cycles now other than the scm dependency (which should be coming in through arm-soc tree for 4.2). So I am not including them in this initial pull req to avoid merge ordering issues.
Main highlights:
- adreno a306 support (for apq8x16 and upcoming dragonboard 410c)
- various dsi bits
- various 64bit fixes (mostly warnings)
- NV12MT support, pulled in via msm-next rather than drm-misc since
dependency on on regenerated envytools headers (but lgtm'd-by danvet) 5) random fixes and cleanups
BR, -R
The following changes since commit ae45577324d1f749c907840247d443696ac3bc7a:
virtgpu: include linux/types.h to avoid warning. (2015-06-05 12:31:12 +1000)
are available in the git repository at:
git://people.freedesktop.org/~robclark/linux drm-next
for you to fetch changes up to d22855673f2e9a55f77eea8ab1646994cb2114c2:
drm/msm: restart queued submits after hang (2015-06-07 22:18:43 -0400)
Archit Taneja (1): drm/msm: dsi: Provide option to force continuous HS clock
Brian Norris (1): drm/msm: dsi: fix compile errors when CONFIG_GPIOLIB=n
Fabian Frederick (2): drm/msm: use IS_ERR() to check msm_ioremap() return drm/msm: use IS_ERR() to check regulator_get() return
Hai Li (8): dt-bindings: Add MSM DSI controller documentation dt-bindings: Add MSM eDP controller documentation drm/msm: Use customized function to wait for atomic commit done drm/msm/mdp5: Wait for PP_DONE irq for command mode CRTC atomic commit drm/msm/dsi: Add DSI PLL clock driver support drm/msm/dsi: Enable PLL driver in MSM DSI drm/msm/dsi: Separate PHY to another platform device drm/msm/mdp5: Always generate active-high sync signals for DSI
Laurent Pinchart (1): drm/msm/atomic: Clean up planes in the error paths of .atomic_commit()
Mikko Rapeli (1): drm/msm: use __s32, __s64, __u32 and __u64 from linux/types.h for uabi
Nicholas Mc Guire (6): drm/msm: fixup wait_for_completion_timeout handling drm/msm: fix HZ dependency of timeout drm/msm: drop redundant output in debug message drm/msm: match wait_for_completion_timeout return type drm/msm: wait_for_completion_timeout return is never negative drm/msm: drop redundant debug output
Rob Clark (11): drm/msm/adreno: dump scratch regs and other info on hang drm/msm: add missing DRIVER_ATOMIC flag drm/msm: update generated headers drm/msm/mdp4: Support NV12MT format in mdp4 drm/msm: clarify downstream bus scaling drm/msm: adreno a306 support drm/msm: workaround for missing irq on a306/8x16 drm/msm/mdp5: fix for crash in disable path drm/msm/edp: fix build warning - missing prototype drm/msm: fix timeout calculation drm/msm: restart queued submits after hang
Stephane Viau (3): drm/msm/mdp: Add support for more 32-bit RGB formats drm/msm/hdmi: Point to the right struct device drm/msm/hdmi: Use pinctrl in HDMI driver
Uwe Kleine-König (1): drm/msm: use devm_gpiod_get_optional for optional reset gpio
jilai wang (1): drm/msm: Call drm_prime_gem_destroy to clean up imported GEM object
Documentation/devicetree/bindings/drm/msm/dsi.txt | 120 ++++ Documentation/devicetree/bindings/drm/msm/edp.txt | 60 ++ Documentation/devicetree/bindings/drm/msm/hdmi.txt | 6 + drivers/gpu/drm/drm_crtc.c | 18 + drivers/gpu/drm/msm/Kconfig | 7 + drivers/gpu/drm/msm/Makefile | 5 + drivers/gpu/drm/msm/adreno/a2xx.xml.h | 6 +- drivers/gpu/drm/msm/adreno/a3xx.xml.h | 168 +++++- drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 15 +- drivers/gpu/drm/msm/adreno/a4xx.xml.h | 420 ++++++++++++- drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 3 +- drivers/gpu/drm/msm/adreno/adreno_common.xml.h | 6 +- drivers/gpu/drm/msm/adreno/adreno_device.c | 12 +- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 34 +- drivers/gpu/drm/msm/adreno/adreno_gpu.h | 9 +- drivers/gpu/drm/msm/adreno/adreno_pm4.xml.h | 31 +- drivers/gpu/drm/msm/dsi/dsi.c | 43 +- drivers/gpu/drm/msm/dsi/dsi.h | 61 +- drivers/gpu/drm/msm/dsi/dsi.xml.h | 163 +++++- drivers/gpu/drm/msm/dsi/dsi_host.c | 120 ++-- drivers/gpu/drm/msm/dsi/dsi_manager.c | 79 ++- drivers/gpu/drm/msm/dsi/dsi_phy.c | 315 +++++++++- drivers/gpu/drm/msm/dsi/mmss_cc.xml.h | 12 +- drivers/gpu/drm/msm/dsi/pll/dsi_pll.c | 164 ++++++ drivers/gpu/drm/msm/dsi/pll/dsi_pll.h | 89 +++ drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm.c | 652 +++++++++++++++++++++ drivers/gpu/drm/msm/dsi/sfpb.xml.h | 12 +- drivers/gpu/drm/msm/edp/edp.xml.h | 101 +++- drivers/gpu/drm/msm/edp/edp_aux.c | 12 +- drivers/gpu/drm/msm/edp/edp_ctrl.c | 9 +- drivers/gpu/drm/msm/hdmi/hdmi.xml.h | 99 +++- drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 43 +- drivers/gpu/drm/msm/hdmi/qfprom.xml.h | 12 +- drivers/gpu/drm/msm/mdp/mdp4/mdp4.xml.h | 32 +- drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 39 ++ drivers/gpu/drm/msm/mdp/mdp4/mdp4_dtv_encoder.c | 2 +- drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 9 + drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h | 3 +- drivers/gpu/drm/msm/mdp/mdp4/mdp4_lcdc_encoder.c | 2 +- drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c | 22 + drivers/gpu/drm/msm/mdp/mdp5/mdp5.xml.h | 398 ++++++++++++- drivers/gpu/drm/msm/mdp/mdp5/mdp5_cmd_encoder.c | 20 +- drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 128 +++- drivers/gpu/drm/msm/mdp/mdp5/mdp5_ctl.c | 11 +- drivers/gpu/drm/msm/mdp/mdp5/mdp5_ctl.h | 3 +- drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c | 24 +- drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 7 + drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h | 1 + drivers/gpu/drm/msm/mdp/mdp_common.xml.h | 16 +- drivers/gpu/drm/msm/mdp/mdp_format.c | 6 + drivers/gpu/drm/msm/mdp/mdp_kms.h | 2 +- drivers/gpu/drm/msm/msm_atomic.c | 46 +- drivers/gpu/drm/msm/msm_drv.c | 27 +- drivers/gpu/drm/msm/msm_drv.h | 4 +- drivers/gpu/drm/msm/msm_gem.c | 4 +- drivers/gpu/drm/msm/msm_gem.h | 1 + drivers/gpu/drm/msm/msm_gem_submit.c | 1 - drivers/gpu/drm/msm/msm_gpu.c | 52 +- drivers/gpu/drm/msm/msm_gpu.h | 6 +- drivers/gpu/drm/msm/msm_kms.h | 3 + include/uapi/drm/drm_fourcc.h | 15 + include/uapi/drm/msm_drm.h | 76 +-- 62 files changed, 3475 insertions(+), 391 deletions(-) create mode 100644 Documentation/devicetree/bindings/drm/msm/dsi.txt create mode 100644 Documentation/devicetree/bindings/drm/msm/edp.txt create mode 100644 drivers/gpu/drm/msm/dsi/pll/dsi_pll.c create mode 100644 drivers/gpu/drm/msm/dsi/pll/dsi_pll.h create mode 100644 drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm.c