Merge tag 'drm-misc-next-2019-01-16' of git://anongit.freedesktop.org/drm/drm-misc into drm-next

drm-misc-next for 5.1:

UAPI Changes:
 - New fourcc identifier for ARM Framebuffer Compression v1.3

Cross-subsystem Changes:

Core Changes:
 - Reorganisation of drm_device and drm_framebuffer headers
 - Cleanup of the drmP inclusion
 - Fix leaks in the fb-helpers
 - Allow for depth different from bpp in fb-helper fbdev emulation
 - Remove drm_mode_object from drm_display_mode

Driver Changes:
 - Add reflection properties to rockchip
 - a bunch of fixes for virtio
 - a bunch of fixes for dp_mst and drivers using it, and introduction of a
   new refcounting scheme
 - Convertion of bochs to atomic and generic fbdev emulation
 - Allow meson to remove the firmware framebuffers

[airlied: patch rcar-du to add drm_modes.h]
Signed-off-by: Dave Airlie <airlied@redhat.com>

From: Maxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190116200428.u2n4jbk4mzza7n6e@flea

6 files changed, 8 insertions, 5 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 8a078f4ae73d..28bccceaa363 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -2708,7 +2708,7 @@ void amdgpu_device_fini(struct amdgpu_device *adev)
         amdgpu_irq_disable_all(adev);
         if (adev->mode_info.mode_config_initialized){
                 if (!amdgpu_device_has_dc_support(adev))
-                        drm_crtc_force_disable_all(adev->ddev);
+                        drm_helper_force_disable_all(adev->ddev);
                 else
                         drm_atomic_helper_shutdown(adev->ddev);
         }
diff --git a/drivers/gpu/drm/amd/amdgpu/atom.c b/drivers/gpu/drm/amd/amdgpu/atom.c
index e9934de1b9cf..dd30f4e61a8c 100644
--- a/drivers/gpu/drm/amd/amdgpu/atom.c
+++ b/drivers/gpu/drm/amd/amdgpu/atom.c
@@ -27,6 +27,8 @@
 #include <linux/slab.h>
 #include <asm/unaligned.h>
 
+#include <drm/drm_util.h>
+
 #define ATOM_DEBUG
 
 #include "atom.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
index 4cfecdce29a3..1f0426d2fc2a 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
@@ -1682,7 +1682,7 @@ static void dce_v10_0_afmt_setmode(struct drm_encoder *encoder,
         dce_v10_0_audio_write_sad_regs(encoder);
         dce_v10_0_audio_write_latency_fields(encoder, mode);
 
-        err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode, false);
+        err = drm_hdmi_avi_infoframe_from_display_mode(&frame, connector, mode);
         if (err < 0) {
                 DRM_ERROR("failed to setup AVI infoframe: %zd\n", err);
                 return;
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
index 7c868916d90f..2280b971d758 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
@@ -1724,7 +1724,7 @@ static void dce_v11_0_afmt_setmode(struct drm_encoder *encoder,
         dce_v11_0_audio_write_sad_regs(encoder);
         dce_v11_0_audio_write_latency_fields(encoder, mode);
 
-        err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode, false);
+        err = drm_hdmi_avi_infoframe_from_display_mode(&frame, connector, mode);
         if (err < 0) {
                 DRM_ERROR("failed to setup AVI infoframe: %zd\n", err);
                 return;
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
index 17eaaba36017..db443ec53d3a 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
@@ -1423,6 +1423,7 @@ static void dce_v6_0_audio_set_avi_infoframe(struct drm_encoder *encoder,
         struct amdgpu_device *adev = dev->dev_private;
         struct amdgpu_encoder *amdgpu_encoder = to_amdgpu_encoder(encoder);
         struct amdgpu_encoder_atom_dig *dig = amdgpu_encoder->enc_priv;
+        struct drm_connector *connector = amdgpu_get_connector_for_encoder(encoder);
         struct hdmi_avi_infoframe frame;
         u8 buffer[HDMI_INFOFRAME_HEADER_SIZE + HDMI_AVI_INFOFRAME_SIZE];
         uint8_t *payload = buffer + 3;
@@ -1430,7 +1431,7 @@ static void dce_v6_0_audio_set_avi_infoframe(struct drm_encoder *encoder,
         ssize_t err;
         u32 tmp;
 
-        err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode, false);
+        err = drm_hdmi_avi_infoframe_from_display_mode(&frame, connector, mode);
         if (err < 0) {
                 DRM_ERROR("failed to setup AVI infoframe: %zd\n", err);
                 return;
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
index 8c0576978d36..13da915991dd 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
@@ -1616,7 +1616,7 @@ static void dce_v8_0_afmt_setmode(struct drm_encoder *encoder,
         dce_v8_0_audio_write_sad_regs(encoder);
         dce_v8_0_audio_write_latency_fields(encoder, mode);
 
-        err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode, false);
+        err = drm_hdmi_avi_infoframe_from_display_mode(&frame, connector, mode);
         if (err < 0) {
                 DRM_ERROR("failed to setup AVI infoframe: %zd\n", err);
                 return;