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

1 files changed, 18 insertions, 17 deletions

diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
index 68f2fb89ece3..2e0fd9927db2 100644
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
@@ -344,51 +344,52 @@ intel_crt_mode_valid(struct drm_connector *connector,
         return MODE_OK;
 }
 
-static bool intel_crt_compute_config(struct intel_encoder *encoder,
-                                     struct intel_crtc_state *pipe_config,
-                                     struct drm_connector_state *conn_state)
+static int intel_crt_compute_config(struct intel_encoder *encoder,
+                                    struct intel_crtc_state *pipe_config,
+                                    struct drm_connector_state *conn_state)
 {
         struct drm_display_mode *adjusted_mode =
                 &pipe_config->base.adjusted_mode;
 
         if (adjusted_mode->flags & DRM_MODE_FLAG_DBLSCAN)
-                return false;
+                return -EINVAL;
 
         pipe_config->output_format = INTEL_OUTPUT_FORMAT_RGB;
-        return true;
+
+        return 0;
 }
 
-static bool pch_crt_compute_config(struct intel_encoder *encoder,
-                                   struct intel_crtc_state *pipe_config,
-                                   struct drm_connector_state *conn_state)
+static int pch_crt_compute_config(struct intel_encoder *encoder,
+                                  struct intel_crtc_state *pipe_config,
+                                  struct drm_connector_state *conn_state)
 {
         struct drm_display_mode *adjusted_mode =
                 &pipe_config->base.adjusted_mode;
 
         if (adjusted_mode->flags & DRM_MODE_FLAG_DBLSCAN)
-                return false;
+                return -EINVAL;
 
         pipe_config->has_pch_encoder = true;
         pipe_config->output_format = INTEL_OUTPUT_FORMAT_RGB;
 
-        return true;
+        return 0;
 }
 
-static bool hsw_crt_compute_config(struct intel_encoder *encoder,
-                                   struct intel_crtc_state *pipe_config,
-                                   struct drm_connector_state *conn_state)
+static int hsw_crt_compute_config(struct intel_encoder *encoder,
+                                  struct intel_crtc_state *pipe_config,
+                                  struct drm_connector_state *conn_state)
 {
         struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
         struct drm_display_mode *adjusted_mode =
                 &pipe_config->base.adjusted_mode;
 
         if (adjusted_mode->flags & DRM_MODE_FLAG_DBLSCAN)
-                return false;
+                return -EINVAL;
 
         /* HSW/BDW FDI limited to 4k */
         if (adjusted_mode->crtc_hdisplay > 4096 ||
             adjusted_mode->crtc_hblank_start > 4096)
-                return false;
+                return -EINVAL;
 
         pipe_config->has_pch_encoder = true;
         pipe_config->output_format = INTEL_OUTPUT_FORMAT_RGB;
@@ -397,7 +398,7 @@ static bool hsw_crt_compute_config(struct intel_encoder *encoder,
         if (HAS_PCH_LPT(dev_priv)) {
                 if (pipe_config->bw_constrained && pipe_config->pipe_bpp < 24) {
                         DRM_DEBUG_KMS("LPT only supports 24bpp\n");
-                        return false;
+                        return -EINVAL;
                 }
 
                 pipe_config->pipe_bpp = 24;
@@ -406,7 +407,7 @@ static bool hsw_crt_compute_config(struct intel_encoder *encoder,
         /* FDI must always be 2.7 GHz */
         pipe_config->port_clock = 135000 * 2;
 
-        return true;
+        return 0;
 }
 
 static bool intel_ironlake_crt_detect_hotplug(struct drm_connector *connector)