diff options
author | Rob Herring <rob.herring@calxeda.com> | 2012-11-07 17:59:14 -0600 |
---|---|---|
committer | Rob Herring <rob.herring@calxeda.com> | 2012-11-07 17:59:14 -0600 |
commit | d3ad4a60a1b1448e59914eebefe1ccc8e64f9e2f (patch) | |
tree | f0862d1905a599cdbad86fcc8816d86a6f33459f /drivers/gpu/drm/udl/udl_transfer.c | |
parent | e095c0d122c09efabe7d4136ce77f72c636c4879 (diff) | |
parent | e5c5f2adeb370559f4b221d57214db85858b786a (diff) |
Merge remote-tracking branch 'arm-soc/devel/debug_ll_init' into debug_ll
Diffstat (limited to 'drivers/gpu/drm/udl/udl_transfer.c')
-rw-r--r-- | drivers/gpu/drm/udl/udl_transfer.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/udl/udl_transfer.c b/drivers/gpu/drm/udl/udl_transfer.c index dc095526ffb..142fee5f983 100644 --- a/drivers/gpu/drm/udl/udl_transfer.c +++ b/drivers/gpu/drm/udl/udl_transfer.c @@ -213,11 +213,12 @@ static void udl_compress_hline16( */ int udl_render_hline(struct drm_device *dev, int bpp, struct urb **urb_ptr, const char *front, char **urb_buf_ptr, - u32 byte_offset, u32 byte_width, + u32 byte_offset, u32 device_byte_offset, + u32 byte_width, int *ident_ptr, int *sent_ptr) { const u8 *line_start, *line_end, *next_pixel; - u32 base16 = 0 + (byte_offset / bpp) * 2; + u32 base16 = 0 + (device_byte_offset / bpp) * 2; struct urb *urb = *urb_ptr; u8 *cmd = *urb_buf_ptr; u8 *cmd_end = (u8 *) urb->transfer_buffer + urb->transfer_buffer_length; |