Merge remote-tracking branch 'quic/dev/msm-4.14-display' into msm-4.14

* quic/dev/msm-4.14-display:
  drm/msm/sde: fix variable declaration compilation issues
  drm/msm/dp: fix variable declaration compilation issues
  drm/msm/dsi-staging: update edid with resolution details
  drm/msm/dsi-staging: add default edid
  ARM: dts: msm: reserve memory for display ramdump for TRINKET
  ARM: dts: msm: add cont splash memory for TRINKET

Change-Id: I75d2e9cb8eebaab58dda8494ce39ca8349f12b01
Signed-off-by: Rohith Palakurthi <prohit@codeaurora.org>