Prechádzať zdrojové kódy

Merge tag 'drm-misc-fixes-2017-04-11' of git://anongit.freedesktop.org/git/drm-misc into drm-fixes

drm-misc-fixes for 2017-04-11

Core changes:
 - None

Driver changes
 - udl: Fix unaligned memory access on SPARC (Jonathan)

* tag 'drm-misc-fixes-2017-04-11' of git://anongit.freedesktop.org/git/drm-misc:
  drm/udl: Fix unaligned memory access in udl_render_hline
Dave Airlie 8 rokov pred
rodič
commit
97d93f3549
1 zmenil súbory, kde vykonal 2 pridanie a 1 odobranie
  1. 2 1
      drivers/gpu/drm/udl/udl_transfer.c

+ 2 - 1
drivers/gpu/drm/udl/udl_transfer.c

@@ -14,6 +14,7 @@
 #include <linux/slab.h>
 #include <linux/slab.h>
 #include <linux/fb.h>
 #include <linux/fb.h>
 #include <linux/prefetch.h>
 #include <linux/prefetch.h>
+#include <asm/unaligned.h>
 
 
 #include <drm/drmP.h>
 #include <drm/drmP.h>
 #include "udl_drv.h"
 #include "udl_drv.h"
@@ -163,7 +164,7 @@ static void udl_compress_hline16(
 			const u8 *const start = pixel;
 			const u8 *const start = pixel;
 			const uint16_t repeating_pixel_val16 = pixel_val16;
 			const uint16_t repeating_pixel_val16 = pixel_val16;
 
 
-			*(uint16_t *)cmd = cpu_to_be16(pixel_val16);
+			put_unaligned_be16(pixel_val16, cmd);
 
 
 			cmd += 2;
 			cmd += 2;
 			pixel += bpp;
 			pixel += bpp;