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

Commit c7aed179 authored by Denis Vlasenko's avatar Denis Vlasenko Committed by Dave Airlie
Browse files

drm: i810_dma.c: fix pointer arithmetic for 64-bit target 



First warning result from open-coded PTR_ERR,
the rest is caused by code like this:

*(u32 *) ((u32) buf_priv->kernel_virtual + used)

I've also fixed a missing PTR_ERR in i830_dma.c

Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent 0a0c721d

drivers/char/drm/i810_dma.c

+4 −4
Original line number Diff line number Diff line
@@ -141,10 +141,10 @@ static int i810_map_buffer(drm_buf_t * buf, struct file *filp) 
					    MAP_SHARED, buf->bus_address);

	dev_priv->mmap_buffer = NULL;

	filp->f_op = old_fops;

	if ((unsigned long)buf_priv->virtual > -1024UL) {

	if (IS_ERR(buf_priv->virtual)) {

		/* Real error */

		DRM_ERROR("mmap error\n");

		retcode = (signed int)buf_priv->virtual;

		retcode = PTR_ERR(buf_priv->virtual);

		buf_priv->virtual = NULL;

	}

	up_write(&current->mm->mmap_sem);
@@ -808,7 +808,7 @@ static void i810_dma_dispatch_vertex(drm_device_t * dev, 
		    ((GFX_OP_PRIMITIVE | prim | ((used / 4) - 2)));



		if (used & 4) {

			*(u32 *) ((u32) buf_priv->kernel_virtual + used) = 0;

			*(u32 *) ((char *) buf_priv->kernel_virtual + used) = 0;

			used += 4;

		}
@@ -1166,7 +1166,7 @@ static void i810_dma_dispatch_mc(drm_device_t * dev, drm_buf_t * buf, int used, 


	if (buf_priv->currently_mapped == I810_BUF_MAPPED) {

		if (used & 4) {

			*(u32 *) ((u32) buf_priv->virtual + used) = 0;

			*(u32 *) ((char *) buf_priv->virtual + used) = 0;

			used += 4;

		}

drivers/char/drm/i830_dma.c

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ static int i830_map_buffer(drm_buf_t * buf, struct file *filp) 
	if (IS_ERR((void *)virtual)) {	/* ugh */

		/* Real error */

		DRM_ERROR("mmap error\n");

		retcode = virtual;

		retcode = PTR_ERR((void *)virtual);

		buf_priv->virtual = NULL;

	} else {

		buf_priv->virtual = (void __user *)virtual;