Rebase of main pull for 3.20. There was a mid-air collision between the bridge changes and msm eDP support. And atomic dpms support broke msm somewhat, due to using prepare/commit hooks in a different way. Compared to the initial pull req, this fixes up a memory leak caused by the bridge changes, rebases the eDP support on the bridge changes, and migrates to the atomic dpms hooks to fix the dpms breakage.
Highlights (from original pull req):
1) YUV support for mdp4 and mdp5 2) eDP support 3) hw cursor support for mdp5[*] 4) additional hdmi support for apq8084 (snapdragon 805) 5) few bug fixes
Note that I may have a later pull to enable hdmi hpd irqs.. but (un)fortunately I seem to have a particularly troublesome monitor.. I managed to figure out a workaround for spurious hpd disconnect irqs that works with some of my boards but not others, so holding off on that patch for now. There are also patches for HDCP support, but those are waiting on some scm patches outside of drm so I think waiting until 3.21 at this point.
[*] yes, still using legacy cursor APIs (like mdp4) rather than cursor-plane stuff.. but at this point I just want cursor to work (vs. forgetting to disable hw cursor when switching between mdp4/mdp5).. the interesting one to convert (with the additional vsync guarantees that cursor-plane asserts) will be mdp4, which I'll do some time later when there aren't bigger fires. In the mean time, no point to block mdp5 hw cursor and annoy myself further
The following changes since commit 9ec60ca68268e984a2a06398a44cd9ccbaae6184:
drm: atmel-hlcdc: Add dependency on ARM (2015-01-31 10:14:28 +1000)
are available in the git repository at:
git://people.freedesktop.org/~robclark/linux
for you to fetch changes up to e90dfec78ec288d6c89a7b508a5c5d4ae8b7f934:
drm/msm: add moduleparam to disable fbdev (2015-02-01 15:34:04 -0500)
---------------------------------------------------------------- Beeresh Gopal (2): drm/msm/mdp4: add YUV format support drm/msm/mdp5: Add hardware cursor support
Bruno Prémont (1): drm/msm: Do not BUG_ON(!spin_is_locked()) on UP
Hai Li (2): drm/msm: Initial add eDP support in msm drm driver (v5) drm/msm: Add the eDP connector in msm drm driver (V2)
Laurent Pinchart (1): drm/msm: Remove CRTC .mode_set and .mode_set_base helpers
Rob Clark (9): drm/dp: add drm_dp_link_power_down() helper drm/msm: fix fallout of atomic dpms changes drm/msm/hdmi: fix memory leak after bridge changes drm/msm: update generated headers drm/msm/dp: use link power helpers drm/msm/atomic: fix issue with gnome-shell wayland drm/msm/hdmi: disallow interlaced drm/msm: fix build error with W=1 drm/msm: add moduleparam to disable fbdev
Stephane Viau (7): drm/msm/mdp: add common YUV information for MDP4/MDP5 drm/msm/mdp5: add NV12 support for MDP5 drm/msm/mdp5: fix parameter type for mdp5_ctl_set_intf() drm/msm/hdmi: use dynamic allocation for hdmi resources drm/msm/hdmi: Add HDMI platform config for apq8084 drm/msm/hdmi: rework hdmi configurations, using dt_match[] drm/msm/mdp5: Fix negative SMP block allocation
Documentation/devicetree/bindings/drm/msm/hdmi.txt | 2 + drivers/gpu/drm/drm_dp_helper.c | 31 + drivers/gpu/drm/msm/Makefile | 9 +- drivers/gpu/drm/msm/adreno/a2xx.xml.h | 6 +- drivers/gpu/drm/msm/adreno/a3xx.xml.h | 248 ++-- drivers/gpu/drm/msm/adreno/a4xx.xml.h | 420 ++++-- drivers/gpu/drm/msm/adreno/adreno_common.xml.h | 6 +- drivers/gpu/drm/msm/adreno/adreno_pm4.xml.h | 41 +- drivers/gpu/drm/msm/dsi/dsi.xml.h | 11 +- drivers/gpu/drm/msm/dsi/mmss_cc.xml.h | 11 +- drivers/gpu/drm/msm/dsi/sfpb.xml.h | 11 +- drivers/gpu/drm/msm/edp/edp.c | 208 +++ drivers/gpu/drm/msm/edp/edp.h | 85 ++ drivers/gpu/drm/msm/edp/edp.xml.h | 292 +++++ drivers/gpu/drm/msm/edp/edp_aux.c | 268 ++++ drivers/gpu/drm/msm/edp/edp_bridge.c | 120 ++ drivers/gpu/drm/msm/edp/edp_connector.c | 161 +++ drivers/gpu/drm/msm/edp/edp_ctrl.c | 1373 ++++++++++++++++++++ drivers/gpu/drm/msm/edp/edp_phy.c | 106 ++ drivers/gpu/drm/msm/hdmi/hdmi.c | 141 +- drivers/gpu/drm/msm/hdmi/hdmi.h | 8 +- drivers/gpu/drm/msm/hdmi/hdmi.xml.h | 106 +- drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 9 +- drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 4 +- drivers/gpu/drm/msm/hdmi/qfprom.xml.h | 11 +- drivers/gpu/drm/msm/mdp/mdp4/mdp4.xml.h | 55 +- drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 62 +- drivers/gpu/drm/msm/mdp/mdp4/mdp4_dtv_encoder.c | 119 +- drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 34 + drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h | 19 +- drivers/gpu/drm/msm/mdp/mdp4/mdp4_lcdc_encoder.c | 154 ++- drivers/gpu/drm/msm/mdp/mdp4/mdp4_lvds_connector.c | 2 +- drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c | 104 +- drivers/gpu/drm/msm/mdp/mdp5/mdp5.xml.h | 245 +++- drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 227 +++- drivers/gpu/drm/msm/mdp/mdp5/mdp5_ctl.c | 2 +- drivers/gpu/drm/msm/mdp/mdp5/mdp5_ctl.h | 2 +- drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c | 127 +- drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 56 +- drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h | 19 +- drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 215 ++- drivers/gpu/drm/msm/mdp/mdp5/mdp5_smp.c | 5 +- drivers/gpu/drm/msm/mdp/mdp_common.xml.h | 28 +- drivers/gpu/drm/msm/mdp/mdp_format.c | 108 +- drivers/gpu/drm/msm/mdp/mdp_kms.c | 2 +- drivers/gpu/drm/msm/mdp/mdp_kms.h | 24 +- drivers/gpu/drm/msm/msm_atomic.c | 30 +- drivers/gpu/drm/msm/msm_drv.c | 11 +- drivers/gpu/drm/msm/msm_drv.h | 12 + drivers/gpu/drm/msm/msm_fb.c | 4 +- drivers/gpu/drm/msm/msm_fbdev.c | 3 - drivers/gpu/drm/msm/msm_kms.h | 5 + include/drm/drm_dp_helper.h | 1 + 53 files changed, 4641 insertions(+), 722 deletions(-) create mode 100644 drivers/gpu/drm/msm/edp/edp.c create mode 100644 drivers/gpu/drm/msm/edp/edp.h create mode 100644 drivers/gpu/drm/msm/edp/edp.xml.h create mode 100644 drivers/gpu/drm/msm/edp/edp_aux.c create mode 100644 drivers/gpu/drm/msm/edp/edp_bridge.c create mode 100644 drivers/gpu/drm/msm/edp/edp_connector.c create mode 100644 drivers/gpu/drm/msm/edp/edp_ctrl.c create mode 100644 drivers/gpu/drm/msm/edp/edp_phy.c