7 files changed, 30 insertions, 25 deletions

diff --git a/drivers/gpu/drm/udl/udl_connector.c b/drivers/gpu/drm/udl/udl_connector.c
index 8d9dc44f1f94..d568aa4b10d1 100644
--- a/drivers/gpu/drm/udl/udl_connector.c
+++ b/drivers/gpu/drm/udl/udl_connector.c
@@ -57,11 +57,8 @@ static int udl_get_modes(struct drm_connector *connector)
 
         edid = (struct edid *)udl_get_edid(udl);
 
-        connector->display_info.raw_edid = (char *)edid;
-
         drm_mode_connector_update_edid_property(connector, edid);
         ret = drm_add_edid_modes(connector, edid);
-        connector->display_info.raw_edid = NULL;
         kfree(edid);
         return ret;
 }
diff --git a/drivers/gpu/drm/udl/udl_encoder.c b/drivers/gpu/drm/udl/udl_encoder.c
index 0731ab2e6c06..0476bfe06d14 100644
--- a/drivers/gpu/drm/udl/udl_encoder.c
+++ b/drivers/gpu/drm/udl/udl_encoder.c
@@ -16,7 +16,7 @@
 #include "udl_drv.h"
 
 /* dummy encoder */
-void udl_enc_destroy(struct drm_encoder *encoder)
+static void udl_enc_destroy(struct drm_encoder *encoder)
 {
         drm_encoder_cleanup(encoder);
         kfree(encoder);
diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c
index ce9a61179925..0e47e9614b78 100644
--- a/drivers/gpu/drm/udl/udl_fb.c
+++ b/drivers/gpu/drm/udl/udl_fb.c
@@ -13,6 +13,7 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/fb.h>
+#include <linux/dma-buf.h>
 
 #include "drmP.h"
 #include "drm.h"
@@ -356,12 +357,12 @@ static struct fb_ops udlfb_ops = {
         .fb_release = udl_fb_release,
 };
 
-void udl_crtc_fb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green,
+static void udl_crtc_fb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green,
                            u16 blue, int regno)
 {
 }
 
-void udl_crtc_fb_gamma_get(struct drm_crtc *crtc, u16 *red, u16 *green,
+static void udl_crtc_fb_gamma_get(struct drm_crtc *crtc, u16 *red, u16 *green,
                              u16 *blue, int regno)
 {
         *red = 0;
@@ -377,16 +378,33 @@ static int udl_user_framebuffer_dirty(struct drm_framebuffer *fb,
 {
         struct udl_framebuffer *ufb = to_udl_fb(fb);
         int i;
+        int ret = 0;
 
         if (!ufb->active_16)
                 return 0;
 
+        if (ufb->obj->base.import_attach) {
+                ret = dma_buf_begin_cpu_access(ufb->obj->base.import_attach->dmabuf,
+                                               0, ufb->obj->base.size,
+                                               DMA_FROM_DEVICE);
+                if (ret)
+                        return ret;
+        }
+
         for (i = 0; i < num_clips; i++) {
-                udl_handle_damage(ufb, clips[i].x1, clips[i].y1,
+                ret = udl_handle_damage(ufb, clips[i].x1, clips[i].y1,
                                   clips[i].x2 - clips[i].x1,
                                   clips[i].y2 - clips[i].y1);
+                if (ret)
+                        break;
         }
-        return 0;
+
+        if (ufb->obj->base.import_attach) {
+                dma_buf_end_cpu_access(ufb->obj->base.import_attach->dmabuf,
+                                       0, ufb->obj->base.size,
+                                       DMA_FROM_DEVICE);
+        }
+        return ret;
 }
 
 static void udl_user_framebuffer_destroy(struct drm_framebuffer *fb)
diff --git a/drivers/gpu/drm/udl/udl_gem.c b/drivers/gpu/drm/udl/udl_gem.c
index 291ecc145585..47b256375831 100644
--- a/drivers/gpu/drm/udl/udl_gem.c
+++ b/drivers/gpu/drm/udl/udl_gem.c
@@ -181,11 +181,6 @@ int udl_gem_vmap(struct udl_gem_object *obj)
         int ret;
 
         if (obj->base.import_attach) {
-                ret = dma_buf_begin_cpu_access(obj->base.import_attach->dmabuf,
-                                               0, obj->base.size, DMA_BIDIRECTIONAL);
-                if (ret)
-                        return -EINVAL;
-
                 obj->vmapping = dma_buf_vmap(obj->base.import_attach->dmabuf);
                 if (!obj->vmapping)
                         return -ENOMEM;
@@ -206,8 +201,6 @@ void udl_gem_vunmap(struct udl_gem_object *obj)
 {
         if (obj->base.import_attach) {
                 dma_buf_vunmap(obj->base.import_attach->dmabuf, obj->vmapping);
-                dma_buf_end_cpu_access(obj->base.import_attach->dmabuf, 0,
-                                       obj->base.size, DMA_BIDIRECTIONAL);
                 return;
         }
 
diff --git a/drivers/gpu/drm/udl/udl_main.c b/drivers/gpu/drm/udl/udl_main.c
index 4c2d836a0893..40bf468c46c2 100644
--- a/drivers/gpu/drm/udl/udl_main.c
+++ b/drivers/gpu/drm/udl/udl_main.c
@@ -41,11 +41,8 @@ static int udl_parse_vendor_descriptor(struct drm_device *dev,
         total_len = usb_get_descriptor(usbdev, 0x5f, /* vendor specific */
                                     0, desc, MAX_VENDOR_DESCRIPTOR_SIZE);
         if (total_len > 5) {
-                DRM_INFO("vendor descriptor length:%x data:%02x %02x %02x %02x" \
-                        "%02x %02x %02x %02x %02x %02x %02x\n",
-                        total_len, desc[0],
-                        desc[1], desc[2], desc[3], desc[4], desc[5], desc[6],
-                        desc[7], desc[8], desc[9], desc[10]);
+                DRM_INFO("vendor descriptor length:%x data:%*ph\n",
+                        total_len, 11, desc);
 
                 if ((desc[0] != total_len) || /* descriptor length */
                     (desc[1] != 0x5f) ||   /* vendor descriptor type */
diff --git a/drivers/gpu/drm/udl/udl_modeset.c b/drivers/gpu/drm/udl/udl_modeset.c
index 9159d48d1dfd..8f258158c1fe 100644
--- a/drivers/gpu/drm/udl/udl_modeset.c
+++ b/drivers/gpu/drm/udl/udl_modeset.c
@@ -391,7 +391,7 @@ static const struct drm_crtc_funcs udl_crtc_funcs = {
         .destroy = udl_crtc_destroy,
 };
 
-int udl_crtc_init(struct drm_device *dev)
+static int udl_crtc_init(struct drm_device *dev)
 {
         struct drm_crtc *crtc;
 
diff --git a/drivers/gpu/drm/udl/udl_transfer.c b/drivers/gpu/drm/udl/udl_transfer.c
index b9320e2608dd..f9fff657a90b 100644
--- a/drivers/gpu/drm/udl/udl_transfer.c
+++ b/drivers/gpu/drm/udl/udl_transfer.c
@@ -126,10 +126,10 @@ static void udl_compress_hline16(
 
         while ((pixel_end > pixel) &&
                (cmd_buffer_end - MIN_RLX_CMD_BYTES > cmd)) {
-                uint8_t *raw_pixels_count_byte = 0;
-                uint8_t *cmd_pixels_count_byte = 0;
-                const u8 *raw_pixel_start = 0;
-                const u8 *cmd_pixel_start, *cmd_pixel_end = 0;
+                uint8_t *raw_pixels_count_byte = NULL;
+                uint8_t *cmd_pixels_count_byte = NULL;
+                const u8 *raw_pixel_start = NULL;
+                const u8 *cmd_pixel_start, *cmd_pixel_end = NULL;
 
                 prefetchw((void *) cmd); /* pull in one cache line at least */