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, 3 insertions, 18 deletions

diff --git a/include/drm/drm_modes.h b/include/drm/drm_modes.h
index baded6514456..be4fed97e727 100644
--- a/include/drm/drm_modes.h
+++ b/include/drm/drm_modes.h
@@ -136,8 +136,7 @@ enum drm_mode_status {
         .hdisplay = (hd), .hsync_start = (hss), .hsync_end = (hse), \
         .htotal = (ht), .hskew = (hsk), .vdisplay = (vd), \
         .vsync_start = (vss), .vsync_end = (vse), .vtotal = (vt), \
-        .vscan = (vs), .flags = (f), \
-        .base.type = DRM_MODE_OBJECT_MODE
+        .vscan = (vs), .flags = (f)
 
 #define CRTC_INTERLACE_HALVE_V  (1 << 0) /* halve V values for interlacing */
 #define CRTC_STEREO_DOUBLE      (1 << 1) /* adjust timings for stereo modes */
@@ -214,20 +213,6 @@ struct drm_display_mode {
         struct list_head head;
 
         /**
-         * @base:
-         *
-         * A display mode is a normal modeset object, possibly including public
-         * userspace id.
-         *
-         * FIXME:
-         *
-         * This can probably be removed since the entire concept of userspace
-         * managing modes explicitly has never landed in upstream kernel mode
-         * setting support.
-         */
-        struct drm_mode_object base;
-
-        /**
          * @name:
          *
          * Human-readable name of the mode, filled out with drm_mode_set_name().
@@ -429,14 +414,14 @@ struct drm_display_mode {
 /**
  * DRM_MODE_FMT - printf string for &struct drm_display_mode
  */
-#define DRM_MODE_FMT    "%d:\"%s\" %d %d %d %d %d %d %d %d %d %d 0x%x 0x%x"
+#define DRM_MODE_FMT    "\"%s\": %d %d %d %d %d %d %d %d %d %d 0x%x 0x%x"
 
 /**
  * DRM_MODE_ARG - printf arguments for &struct drm_display_mode
  * @m: display mode
  */
 #define DRM_MODE_ARG(m) \
-        (m)->base.id, (m)->name, (m)->vrefresh, (m)->clock, \
+        (m)->name, (m)->vrefresh, (m)->clock, \
         (m)->hdisplay, (m)->hsync_start, (m)->hsync_end, (m)->htotal, \
         (m)->vdisplay, (m)->vsync_start, (m)->vsync_end, (m)->vtotal, \
         (m)->type, (m)->flags