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

drm-misc-next for v4.21:

Core Changes:
- Merge drm_info.c into drm_debugfs.c
- Complete the fake drm_crtc_commit's hw_done/flip_done sooner.
- Remove deprecated drm_obj_ref/unref functions. All drivers use get/put now.
- Decrease stack use of drm_gem_prime_mmap.
- Improve documentation for dumb callbacks.

Driver Changes:
- Add edid support to virtio.
- Wait on implicit fence in meson and sun4i.
- Add support for BGRX8888 to sun4i.
- Preparation patches for sun4i driver to start supporting linear and tiled YUV formats.
- Add support for HDMI 1.4 4k modes to meson, and support for VIC alternate timings.
- Drop custom dumb_map in vkms.
- Small fixes and cleanups to v3d.

Signed-off-by: Dave Airlie <airlied@redhat.com>

From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/151a3270-b1be-ed75-bd58-6b29d741f592@linux.intel.com

1 files changed, 10 insertions, 5 deletions

diff --git a/drivers/gpu/drm/sun4i/sun4i_layer.c b/drivers/gpu/drm/sun4i/sun4i_layer.c
index 78f77af8805a..29631e0efde3 100644
--- a/drivers/gpu/drm/sun4i/sun4i_layer.c
+++ b/drivers/gpu/drm/sun4i/sun4i_layer.c
@@ -12,6 +12,7 @@
 
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_plane_helper.h>
+#include <drm/drm_gem_framebuffer_helper.h>
 #include <drm/drmP.h>
 
 #include "sun4i_backend.h"
@@ -92,14 +93,16 @@ static void sun4i_backend_layer_atomic_update(struct drm_plane *plane,
         struct sun4i_backend *backend = layer->backend;
         struct sun4i_frontend *frontend = backend->frontend;
 
+        sun4i_backend_cleanup_layer(backend, layer->id);
+
         if (layer_state->uses_frontend) {
                 sun4i_frontend_init(frontend);
                 sun4i_frontend_update_coord(frontend, plane);
                 sun4i_frontend_update_buffer(frontend, plane);
                 sun4i_frontend_update_formats(frontend, plane,
-                                              DRM_FORMAT_ARGB8888);
+                                              DRM_FORMAT_XRGB8888);
                 sun4i_backend_update_layer_frontend(backend, layer->id,
-                                                    DRM_FORMAT_ARGB8888);
+                                                    DRM_FORMAT_XRGB8888);
                 sun4i_frontend_enable(frontend);
         } else {
                 sun4i_backend_update_layer_formats(backend, layer->id, plane);
@@ -112,6 +115,7 @@ static void sun4i_backend_layer_atomic_update(struct drm_plane *plane,
 }
 
 static const struct drm_plane_helper_funcs sun4i_backend_layer_helper_funcs = {
+        .prepare_fb     = drm_gem_fb_prepare_fb,
         .atomic_disable = sun4i_backend_layer_atomic_disable,
         .atomic_update  = sun4i_backend_layer_atomic_update,
 };
@@ -125,10 +129,11 @@ static const struct drm_plane_funcs sun4i_backend_layer_funcs = {
         .update_plane           = drm_atomic_helper_update_plane,
 };
 
-static const uint32_t sun4i_backend_layer_formats[] = {
+static const uint32_t sun4i_layer_formats[] = {
         DRM_FORMAT_ARGB8888,
         DRM_FORMAT_ARGB4444,
         DRM_FORMAT_ARGB1555,
+        DRM_FORMAT_BGRX8888,
         DRM_FORMAT_RGBA5551,
         DRM_FORMAT_RGBA4444,
         DRM_FORMAT_RGB888,
@@ -154,8 +159,8 @@ static struct sun4i_layer *sun4i_layer_init_one(struct drm_device *drm,
         /* possible crtcs are set later */
         ret = drm_universal_plane_init(drm, &layer->plane, 0,
                                        &sun4i_backend_layer_funcs,
-                                       sun4i_backend_layer_formats,
-                                       ARRAY_SIZE(sun4i_backend_layer_formats),
+                                       sun4i_layer_formats,
+                                       ARRAY_SIZE(sun4i_layer_formats),
                                        NULL, type, NULL);
         if (ret) {
                 dev_err(drm->dev, "Couldn't initialize layer\n");