Merge tag 'drm/tegra/for-5.1-rc1' of git://anongit.freedesktop.org/tegra/linux into...

drm/tegra: Changes for v5.1-rc1

This set of changes starts of with some refactoring of the CEC support
to make it reusable on Tegra210 and later. Following are a couple of
fixes for HDMI audio support (via HDA).

The bulk here is a set of preparatory patches working towards enabling
Tegra186 support for host1x and VIC. Additional patches will be needed
to fully enable this, but they're not quite ready yet.

To round things off, this also adds support for configuring the SOR
crossbar using device tree, and fixes a couple of job-related issues in
the host1x code.

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thierry Reding <thierry.reding@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190208144721.25830-1-thierry.reding@gmail.com

diff --cc drivers/gpu/drm/tegra/drm.h
Simple merge

diff --cc drivers/gpu/drm/tegra/hdmi.c
index 78bc7c906e2202fe6add1a7a8462db9948a22938,3ce551911548613eb4bad1965852b0f693483b59..47c55974756d576b71193219b92d976078006b4e
--- 1/drivers/gpu/drm/tegra/hdmi.c
--- 2/drivers/gpu/drm/tegra/hdmi.c
+++ b/drivers/gpu/drm/tegra/hdmi.c
@@@ -18,12 -19,9 +19,9 @@@
  
  #include <drm/drm_atomic_helper.h>
  #include <drm/drm_crtc.h>
 -#include <drm/drm_crtc_helper.h>
 +#include <drm/drm_probe_helper.h>
  
- #include <sound/hda_verbs.h>
- 
- #include <media/cec-notifier.h>
- 
+ #include "hda.h"
  #include "hdmi.h"
  #include "drm.h"
  #include "dc.h"

diff --cc drivers/gpu/drm/tegra/sor.c
Simple merge