Merge tag 'drm-misc-next-2018-09-13' of git://anongit.freedesktop.org/drm/drm-misc into drm-next

drm-misc-next for 4.20:

UAPI Changes:
- Add host endian variants for the most common formats (Gerd)
- Fail ADDFB2 for big-endian drivers that don't advertise BE quirk (Gerd)
- clear smem_start in fbdev for drm drivers to avoid leaking fb addr (Daniel)

Cross-subsystem Changes:

Core Changes:
- fix drm_mode_addfb() on big endian machines (Gerd)
- add timeline point to syncobj find+replace (Chunming)
- more drmP.h removal effort (Daniel)
- split uapi portions of drm_atomic.c into drm_atomic_uapi.c (Daniel)

Driver Changes:
- bochs: Convert open-coded portions to use helpers (Peter)
- vkms: Add cursor support (Haneen)
- udmabuf: Lots of fixups (mostly cosmetic afaict) (Gerd)
- qxl: Convert to use fbdev helper (Peter)

Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Chunming Zhou <david1.zhou@amd.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Peter Wu <peter@lekensteyn.nl>
Cc: Haneen Mohammed <hamohammed.sa@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

From: Sean Paul <sean@poorly.run>
Link: https://patchwork.freedesktop.org/patch/msgid/20180913130254.GA156437@art_vandelay

1 files changed, 45 insertions, 4 deletions

diff --git a/drivers/gpu/drm/drm_framebuffer.c b/drivers/gpu/drm/drm_framebuffer.c
index 781af1d42d76..6eaacd4eb8cc 100644
--- a/drivers/gpu/drm/drm_framebuffer.c
+++ b/drivers/gpu/drm/drm_framebuffer.c
@@ -25,6 +25,7 @@
 #include <drm/drm_auth.h>
 #include <drm/drm_framebuffer.h>
 #include <drm/drm_atomic.h>
+#include <drm/drm_atomic_uapi.h>
 #include <drm/drm_print.h>
 
 #include "drm_internal.h"
@@ -112,18 +113,34 @@ int drm_mode_addfb(struct drm_device *dev, struct drm_mode_fb_cmd *or,
         struct drm_mode_fb_cmd2 r = {};
         int ret;
 
+        r.pixel_format = drm_mode_legacy_fb_format(or->bpp, or->depth);
+        if (r.pixel_format == DRM_FORMAT_INVALID) {
+                DRM_DEBUG("bad {bpp:%d, depth:%d}\n", or->bpp, or->depth);
+                return -EINVAL;
+        }
+
         /* convert to new format and call new ioctl */
         r.fb_id = or->fb_id;
         r.width = or->width;
         r.height = or->height;
         r.pitches[0] = or->pitch;
-        r.pixel_format = drm_mode_legacy_fb_format(or->bpp, or->depth);
         r.handles[0] = or->handle;
 
-        if (r.pixel_format == DRM_FORMAT_XRGB2101010 &&
-            dev->driver->driver_features & DRIVER_PREFER_XBGR_30BPP)
+        if (dev->mode_config.quirk_addfb_prefer_xbgr_30bpp &&
+            r.pixel_format == DRM_FORMAT_XRGB2101010)
                 r.pixel_format = DRM_FORMAT_XBGR2101010;
 
+        if (dev->mode_config.quirk_addfb_prefer_host_byte_order) {
+                if (r.pixel_format == DRM_FORMAT_XRGB8888)
+                        r.pixel_format = DRM_FORMAT_HOST_XRGB8888;
+                if (r.pixel_format == DRM_FORMAT_ARGB8888)
+                        r.pixel_format = DRM_FORMAT_HOST_ARGB8888;
+                if (r.pixel_format == DRM_FORMAT_RGB565)
+                        r.pixel_format = DRM_FORMAT_HOST_RGB565;
+                if (r.pixel_format == DRM_FORMAT_XRGB1555)
+                        r.pixel_format = DRM_FORMAT_HOST_XRGB1555;
+        }
+
         ret = drm_mode_addfb2(dev, &r, file_priv);
         if (ret)
                 return ret;
@@ -164,7 +181,7 @@ static int framebuffer_check(struct drm_device *dev,
         int i;
 
         /* check if the format is supported at all */
-        info = __drm_format_info(r->pixel_format & ~DRM_FORMAT_BIG_ENDIAN);
+        info = __drm_format_info(r->pixel_format);
         if (!info) {
                 struct drm_format_name_buf format_name;
 
@@ -352,6 +369,30 @@ int drm_mode_addfb2(struct drm_device *dev,
         return 0;
 }
 
+int drm_mode_addfb2_ioctl(struct drm_device *dev,
+                          void *data, struct drm_file *file_priv)
+{
+#ifdef __BIG_ENDIAN
+        if (!dev->mode_config.quirk_addfb_prefer_host_byte_order) {
+                /*
+                 * Drivers must set the
+                 * quirk_addfb_prefer_host_byte_order quirk to make
+                 * the drm_mode_addfb() compat code work correctly on
+                 * bigendian machines.
+                 *
+                 * If they don't they interpret pixel_format values
+                 * incorrectly for bug compatibility, which in turn
+                 * implies the ADDFB2 ioctl does not work correctly
+                 * then.  So block it to make userspace fallback to
+                 * ADDFB.
+                 */
+                DRM_DEBUG_KMS("addfb2 broken on bigendian");
+                return -EINVAL;
+        }
+#endif
+        return drm_mode_addfb2(dev, data, file_priv);
+}
+
 struct drm_mode_rmfb_work {
         struct work_struct work;
         struct list_head fbs;