Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97d93f35 authored by Dave Airlie's avatar Dave Airlie
Browse files

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
parents c7aae622 0c45b36f

drivers/gpu/drm/udl/udl_transfer.c

+2 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/slab.h>

#include <linux/fb.h>

#include <linux/prefetch.h>

#include <asm/unaligned.h>



#include <drm/drmP.h>

#include "udl_drv.h"
@@ -163,7 +164,7 @@ static void udl_compress_hline16( 
			const u8 *const start = pixel;

			const uint16_t repeating_pixel_val16 = pixel_val16;



			*(uint16_t *)cmd = cpu_to_be16(pixel_val16);

			put_unaligned_be16(pixel_val16, cmd);



			cmd += 2;

			pixel += bpp;