git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
x86, suspend, acpi: correct and add comments about Big Real Mode
[pandora-kernel.git]
/
drivers
/
char
/
drm
/
i810_dma.c
diff --git
a/drivers/char/drm/i810_dma.c
b/drivers/char/drm/i810_dma.c
index
eb381a7
..
e5de8ea
100644
(file)
--- a/
drivers/char/drm/i810_dma.c
+++ b/
drivers/char/drm/i810_dma.c
@@
-40,7
+40,7
@@
#define I810_BUF_FREE 2
#define I810_BUF_CLIENT 1
#define I810_BUF_FREE 2
#define I810_BUF_CLIENT 1
-#define I810_BUF_HARDWARE
0
+#define I810_BUF_HARDWARE 0
#define I810_BUF_UNMAPPED 0
#define I810_BUF_MAPPED 1
#define I810_BUF_UNMAPPED 0
#define I810_BUF_MAPPED 1
@@
-94,7
+94,7
@@
static int i810_mmap_buffers(struct file *filp, struct vm_area_struct *vma)
drm_i810_buf_priv_t *buf_priv;
lock_kernel();
drm_i810_buf_priv_t *buf_priv;
lock_kernel();
- dev = priv->
head
->dev;
+ dev = priv->
minor
->dev;
dev_priv = dev->dev_private;
buf = dev_priv->mmap_buffer;
buf_priv = buf->dev_private;
dev_priv = dev->dev_private;
buf = dev_priv->mmap_buffer;
buf_priv = buf->dev_private;
@@
-122,7
+122,7
@@
static const struct file_operations i810_buffer_fops = {
static int i810_map_buffer(struct drm_buf * buf, struct drm_file *file_priv)
{
static int i810_map_buffer(struct drm_buf * buf, struct drm_file *file_priv)
{
- struct drm_device *dev = file_priv->
head
->dev;
+ struct drm_device *dev = file_priv->
minor
->dev;
drm_i810_buf_priv_t *buf_priv = buf->dev_private;
drm_i810_private_t *dev_priv = dev->dev_private;
const struct file_operations *old_fops;
drm_i810_buf_priv_t *buf_priv = buf->dev_private;
drm_i810_private_t *dev_priv = dev->dev_private;
const struct file_operations *old_fops;
@@
-570,7
+570,7
@@
static void i810EmitState(struct drm_device * dev)
drm_i810_sarea_t *sarea_priv = dev_priv->sarea_priv;
unsigned int dirty = sarea_priv->dirty;
drm_i810_sarea_t *sarea_priv = dev_priv->sarea_priv;
unsigned int dirty = sarea_priv->dirty;
- DRM_DEBUG("%
s %x\n", __FUNCTION__
, dirty);
+ DRM_DEBUG("%
x\n"
, dirty);
if (dirty & I810_UPLOAD_BUFFERS) {
i810EmitDestVerified(dev, sarea_priv->BufferState);
if (dirty & I810_UPLOAD_BUFFERS) {
i810EmitDestVerified(dev, sarea_priv->BufferState);
@@
-802,8
+802,7
@@
static void i810_dma_dispatch_flip(struct drm_device * dev)
int pitch = dev_priv->pitch;
RING_LOCALS;
int pitch = dev_priv->pitch;
RING_LOCALS;
- DRM_DEBUG("%s: page=%d pfCurrentPage=%d\n",
- __FUNCTION__,
+ DRM_DEBUG("page=%d pfCurrentPage=%d\n",
dev_priv->current_page,
dev_priv->sarea_priv->pf_current_page);
dev_priv->current_page,
dev_priv->sarea_priv->pf_current_page);
@@
-848,8
+847,6
@@
static void i810_dma_quiescent(struct drm_device * dev)
drm_i810_private_t *dev_priv = dev->dev_private;
RING_LOCALS;
drm_i810_private_t *dev_priv = dev->dev_private;
RING_LOCALS;
-/* printk("%s\n", __FUNCTION__); */
-
i810_kernel_lost_context(dev);
BEGIN_LP_RING(4);
i810_kernel_lost_context(dev);
BEGIN_LP_RING(4);
@@
-869,8
+866,6
@@
static int i810_flush_queue(struct drm_device * dev)
int i, ret = 0;
RING_LOCALS;
int i, ret = 0;
RING_LOCALS;
-/* printk("%s\n", __FUNCTION__); */
-
i810_kernel_lost_context(dev);
BEGIN_LP_RING(2);
i810_kernel_lost_context(dev);
BEGIN_LP_RING(2);
@@
-949,7
+944,7
@@
static int i810_dma_vertex(struct drm_device *dev, void *data,
LOCK_TEST_WITH_RETURN(dev, file_priv);
LOCK_TEST_WITH_RETURN(dev, file_priv);
- DRM_DEBUG("i
810 dma vertex, i
dx %d used %d discard %d\n",
+ DRM_DEBUG("idx %d used %d discard %d\n",
vertex->idx, vertex->used, vertex->discard);
if (vertex->idx < 0 || vertex->idx > dma->buf_count)
vertex->idx, vertex->used, vertex->discard);
if (vertex->idx < 0 || vertex->idx > dma->buf_count)
@@
-987,7
+982,7
@@
static int i810_clear_bufs(struct drm_device *dev, void *data,
static int i810_swap_bufs(struct drm_device *dev, void *data,
struct drm_file *file_priv)
{
static int i810_swap_bufs(struct drm_device *dev, void *data,
struct drm_file *file_priv)
{
- DRM_DEBUG("
i810_swap_bufs
\n");
+ DRM_DEBUG("\n");
LOCK_TEST_WITH_RETURN(dev, file_priv);
LOCK_TEST_WITH_RETURN(dev, file_priv);
@@
-1068,11
+1063,10
@@
static void i810_dma_dispatch_mc(struct drm_device * dev, struct drm_buf * buf,
sarea_priv->dirty = 0x7f;
sarea_priv->dirty = 0x7f;
- DRM_DEBUG("
dispatch mc
addr 0x%lx, used 0x%x\n", address, used);
+ DRM_DEBUG("addr 0x%lx, used 0x%x\n", address, used);
dev_priv->counter++;
DRM_DEBUG("dispatch counter : %ld\n", dev_priv->counter);
dev_priv->counter++;
DRM_DEBUG("dispatch counter : %ld\n", dev_priv->counter);
- DRM_DEBUG("i810_dma_dispatch_mc\n");
DRM_DEBUG("start : %lx\n", start);
DRM_DEBUG("used : %d\n", used);
DRM_DEBUG("start + used - 4 : %ld\n", start + used - 4);
DRM_DEBUG("start : %lx\n", start);
DRM_DEBUG("used : %d\n", used);
DRM_DEBUG("start + used - 4 : %ld\n", start + used - 4);
@@
-1179,7
+1173,7
@@
static void i810_do_init_pageflip(struct drm_device * dev)
{
drm_i810_private_t *dev_priv = dev->dev_private;
{
drm_i810_private_t *dev_priv = dev->dev_private;
- DRM_DEBUG("
%s\n", __FUNCTION__
);
+ DRM_DEBUG("
\n"
);
dev_priv->page_flipping = 1;
dev_priv->current_page = 0;
dev_priv->sarea_priv->pf_current_page = dev_priv->current_page;
dev_priv->page_flipping = 1;
dev_priv->current_page = 0;
dev_priv->sarea_priv->pf_current_page = dev_priv->current_page;
@@
-1189,7
+1183,7
@@
static int i810_do_cleanup_pageflip(struct drm_device * dev)
{
drm_i810_private_t *dev_priv = dev->dev_private;
{
drm_i810_private_t *dev_priv = dev->dev_private;
- DRM_DEBUG("
%s\n", __FUNCTION__
);
+ DRM_DEBUG("
\n"
);
if (dev_priv->current_page != 0)
i810_dma_dispatch_flip(dev);
if (dev_priv->current_page != 0)
i810_dma_dispatch_flip(dev);
@@
-1202,7
+1196,7
@@
static int i810_flip_bufs(struct drm_device *dev, void *data,
{
drm_i810_private_t *dev_priv = dev->dev_private;
{
drm_i810_private_t *dev_priv = dev->dev_private;
- DRM_DEBUG("
%s\n", __FUNCTION__
);
+ DRM_DEBUG("
\n"
);
LOCK_TEST_WITH_RETURN(dev, file_priv);
LOCK_TEST_WITH_RETURN(dev, file_priv);