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

Commit 9f50bd89 authored by David Herrmann's avatar David Herrmann Committed by Dave Airlie
Browse files

drm/radeon: move drm_buffer to drm/radeon/



Radeon UMS is the last user of drm_buffer. Move it out of sight so radeon
can drop it together with UMS.

Signed-off-by: default avatarDavid Herrmann <dh.herrmann@gmail.com>
Reviewed-by: default avatarThierry Reding <treding@nvidia.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 58b21c22
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -4,7 +4,7 @@


ccflags-y := -Iinclude/drm
ccflags-y := -Iinclude/drm


drm-y       :=	drm_auth.o drm_buffer.o drm_bufs.o drm_cache.o \
drm-y       :=	drm_auth.o drm_bufs.o drm_cache.o \
		drm_context.o drm_dma.o \
		drm_context.o drm_dma.o \
		drm_fops.o drm_gem.o drm_ioctl.o drm_irq.o \
		drm_fops.o drm_gem.o drm_ioctl.o drm_irq.o \
		drm_lock.o drm_memory.o drm_drv.o drm_vm.o \
		drm_lock.o drm_memory.o drm_drv.o drm_vm.o \
+1 −1
Original line number Original line Diff line number Diff line
@@ -60,7 +60,7 @@ radeon-y := radeon_drv.o


# add UMS driver
# add UMS driver
radeon-$(CONFIG_DRM_RADEON_UMS)+= radeon_cp.o radeon_state.o radeon_mem.o \
radeon-$(CONFIG_DRM_RADEON_UMS)+= radeon_cp.o radeon_state.o radeon_mem.o \
	radeon_irq.o r300_cmdbuf.o r600_cp.o r600_blit.o
	radeon_irq.o r300_cmdbuf.o r600_cp.o r600_blit.o drm_buffer.o


# add KMS driver
# add KMS driver
radeon-y += radeon_device.o radeon_asic.o radeon_kms.o \
radeon-y += radeon_device.o radeon_asic.o radeon_kms.o \
+1 −5
Original line number Original line Diff line number Diff line
@@ -33,7 +33,7 @@
 */
 */


#include <linux/export.h>
#include <linux/export.h>
#include <drm/drm_buffer.h>
#include "drm_buffer.h"


/**
/**
 * Allocate the drm buffer object.
 * Allocate the drm buffer object.
@@ -86,7 +86,6 @@ int drm_buffer_alloc(struct drm_buffer **buf, int size)
	kfree(*buf);
	kfree(*buf);
	return -ENOMEM;
	return -ENOMEM;
}
}
EXPORT_SYMBOL(drm_buffer_alloc);


/**
/**
 * Copy the user data to the begin of the buffer and reset the processing
 * Copy the user data to the begin of the buffer and reset the processing
@@ -123,7 +122,6 @@ int drm_buffer_copy_from_user(struct drm_buffer *buf,
	buf->iterator = 0;
	buf->iterator = 0;
	return 0;
	return 0;
}
}
EXPORT_SYMBOL(drm_buffer_copy_from_user);


/**
/**
 * Free the drm buffer object
 * Free the drm buffer object
@@ -141,7 +139,6 @@ void drm_buffer_free(struct drm_buffer *buf)
		kfree(buf);
		kfree(buf);
	}
	}
}
}
EXPORT_SYMBOL(drm_buffer_free);


/**
/**
 * Read an object from buffer that may be split to multiple parts. If object
 * Read an object from buffer that may be split to multiple parts. If object
@@ -178,4 +175,3 @@ void *drm_buffer_read_object(struct drm_buffer *buf,
	drm_buffer_advance(buf, objsize);
	drm_buffer_advance(buf, objsize);
	return obj;
	return obj;
}
}
EXPORT_SYMBOL(drm_buffer_read_object);
+1 −1
Original line number Original line Diff line number Diff line
@@ -34,10 +34,10 @@
 */
 */


#include <drm/drmP.h>
#include <drm/drmP.h>
#include <drm/drm_buffer.h>
#include <drm/radeon_drm.h>
#include <drm/radeon_drm.h>
#include "radeon_drv.h"
#include "radeon_drv.h"
#include "r300_reg.h"
#include "r300_reg.h"
#include "drm_buffer.h"


#include <asm/unaligned.h>
#include <asm/unaligned.h>


Loading