Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
d38043a0
Commit
d38043a0
authored
Sep 04, 2004
by
Dave Airlie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Dump __HAVE_DMA_FREELIST is only used by gamma.
Signed-off-by:
Dave Airlie
<
airlied@linux.ie
>
parent
6584b1ab
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
2 additions
and
39 deletions
+2
-39
drivers/char/drm/drmP.h
drivers/char/drm/drmP.h
+0
-3
drivers/char/drm/drm_bufs.h
drivers/char/drm/drm_bufs.h
+0
-22
drivers/char/drm/drm_dma.h
drivers/char/drm/drm_dma.h
+0
-13
drivers/char/drm/gamma.h
drivers/char/drm/gamma.h
+2
-1
No files found.
drivers/char/drm/drmP.h
View file @
d38043a0
...
@@ -98,9 +98,6 @@
...
@@ -98,9 +98,6 @@
#ifndef __HAVE_DMA_WAITLIST
#ifndef __HAVE_DMA_WAITLIST
#define __HAVE_DMA_WAITLIST 0
#define __HAVE_DMA_WAITLIST 0
#endif
#endif
#ifndef __HAVE_DMA_FREELIST
#define __HAVE_DMA_FREELIST 0
#endif
#define __REALLY_HAVE_AGP (__HAVE_AGP && (defined(CONFIG_AGP) || \
#define __REALLY_HAVE_AGP (__HAVE_AGP && (defined(CONFIG_AGP) || \
defined(CONFIG_AGP_MODULE)))
defined(CONFIG_AGP_MODULE)))
...
...
drivers/char/drm/drm_bufs.h
View file @
d38043a0
...
@@ -336,10 +336,6 @@ static void DRM(cleanup_buf_error)(drm_buf_entry_t *entry)
...
@@ -336,10 +336,6 @@ static void DRM(cleanup_buf_error)(drm_buf_entry_t *entry)
sizeof
(
*
entry
->
buflist
),
sizeof
(
*
entry
->
buflist
),
DRM_MEM_BUFS
);
DRM_MEM_BUFS
);
#if __HAVE_DMA_FREELIST
DRM
(
freelist_destroy
)(
&
entry
->
freelist
);
#endif
entry
->
buf_count
=
0
;
entry
->
buf_count
=
0
;
}
}
}
}
...
@@ -508,12 +504,6 @@ int DRM(addbufs_agp)( struct inode *inode, struct file *filp,
...
@@ -508,12 +504,6 @@ int DRM(addbufs_agp)( struct inode *inode, struct file *filp,
DRM_DEBUG
(
"dma->buf_count : %d
\n
"
,
dma
->
buf_count
);
DRM_DEBUG
(
"dma->buf_count : %d
\n
"
,
dma
->
buf_count
);
DRM_DEBUG
(
"entry->buf_count : %d
\n
"
,
entry
->
buf_count
);
DRM_DEBUG
(
"entry->buf_count : %d
\n
"
,
entry
->
buf_count
);
#if __HAVE_DMA_FREELIST
DRM
(
freelist_create
)(
&
entry
->
freelist
,
entry
->
buf_count
);
for
(
i
=
0
;
i
<
entry
->
buf_count
;
i
++
)
{
DRM
(
freelist_put
)(
dev
,
&
entry
->
freelist
,
&
entry
->
buflist
[
i
]
);
}
#endif
up
(
&
dev
->
struct_sem
);
up
(
&
dev
->
struct_sem
);
request
.
count
=
entry
->
buf_count
;
request
.
count
=
entry
->
buf_count
;
...
@@ -747,12 +737,6 @@ int DRM(addbufs_pci)( struct inode *inode, struct file *filp,
...
@@ -747,12 +737,6 @@ int DRM(addbufs_pci)( struct inode *inode, struct file *filp,
dma
->
page_count
+=
entry
->
seg_count
<<
page_order
;
dma
->
page_count
+=
entry
->
seg_count
<<
page_order
;
dma
->
byte_count
+=
PAGE_SIZE
*
(
entry
->
seg_count
<<
page_order
);
dma
->
byte_count
+=
PAGE_SIZE
*
(
entry
->
seg_count
<<
page_order
);
#if __HAVE_DMA_FREELIST
DRM
(
freelist_create
)(
&
entry
->
freelist
,
entry
->
buf_count
);
for
(
i
=
0
;
i
<
entry
->
buf_count
;
i
++
)
{
DRM
(
freelist_put
)(
dev
,
&
entry
->
freelist
,
&
entry
->
buflist
[
i
]
);
}
#endif
up
(
&
dev
->
struct_sem
);
up
(
&
dev
->
struct_sem
);
request
.
count
=
entry
->
buf_count
;
request
.
count
=
entry
->
buf_count
;
...
@@ -918,12 +902,6 @@ int DRM(addbufs_sg)( struct inode *inode, struct file *filp,
...
@@ -918,12 +902,6 @@ int DRM(addbufs_sg)( struct inode *inode, struct file *filp,
DRM_DEBUG
(
"dma->buf_count : %d
\n
"
,
dma
->
buf_count
);
DRM_DEBUG
(
"dma->buf_count : %d
\n
"
,
dma
->
buf_count
);
DRM_DEBUG
(
"entry->buf_count : %d
\n
"
,
entry
->
buf_count
);
DRM_DEBUG
(
"entry->buf_count : %d
\n
"
,
entry
->
buf_count
);
#if __HAVE_DMA_FREELIST
DRM
(
freelist_create
)(
&
entry
->
freelist
,
entry
->
buf_count
);
for
(
i
=
0
;
i
<
entry
->
buf_count
;
i
++
)
{
DRM
(
freelist_put
)(
dev
,
&
entry
->
freelist
,
&
entry
->
buflist
[
i
]
);
}
#endif
up
(
&
dev
->
struct_sem
);
up
(
&
dev
->
struct_sem
);
request
.
count
=
entry
->
buf_count
;
request
.
count
=
entry
->
buf_count
;
...
...
drivers/char/drm/drm_dma.h
View file @
d38043a0
...
@@ -116,9 +116,6 @@ void DRM(dma_takedown)(drm_device_t *dev)
...
@@ -116,9 +116,6 @@ void DRM(dma_takedown)(drm_device_t *dev)
dma
->
bufs
[
i
].
buf_count
*
dma
->
bufs
[
i
].
buf_count
*
sizeof
(
*
dma
->
bufs
[
0
].
buflist
),
sizeof
(
*
dma
->
bufs
[
0
].
buflist
),
DRM_MEM_BUFS
);
DRM_MEM_BUFS
);
#if __HAVE_DMA_FREELIST
DRM
(
freelist_destroy
)(
&
dma
->
bufs
[
i
].
freelist
);
#endif
}
}
}
}
...
@@ -158,16 +155,6 @@ void DRM(free_buffer)(drm_device_t *dev, drm_buf_t *buf)
...
@@ -158,16 +155,6 @@ void DRM(free_buffer)(drm_device_t *dev, drm_buf_t *buf)
if
(
__HAVE_DMA_WAITQUEUE
&&
waitqueue_active
(
&
buf
->
dma_wait
))
{
if
(
__HAVE_DMA_WAITQUEUE
&&
waitqueue_active
(
&
buf
->
dma_wait
))
{
wake_up_interruptible
(
&
buf
->
dma_wait
);
wake_up_interruptible
(
&
buf
->
dma_wait
);
}
}
#if __HAVE_DMA_FREELIST
else
{
drm_device_dma_t
*
dma
=
dev
->
dma
;
/* If processes are waiting, the last one
to wake will put the buffer on the free
list. If no processes are waiting, we
put the buffer on the freelist here. */
DRM
(
freelist_put
)(
dev
,
&
dma
->
bufs
[
buf
->
order
].
freelist
,
buf
);
}
#endif
}
}
#if !__HAVE_DMA_RECLAIM
#if !__HAVE_DMA_RECLAIM
...
...
drivers/char/drm/gamma.h
View file @
d38043a0
...
@@ -81,7 +81,8 @@
...
@@ -81,7 +81,8 @@
#define __HAVE_DMA_WAITQUEUE 1
#define __HAVE_DMA_WAITQUEUE 1
#define __HAVE_DMA_WAITLIST 1
#define __HAVE_DMA_WAITLIST 1
#define __HAVE_DMA_FREELIST 1
/* removed from DRM HAVE_DMA_FREELIST */
//#define __HAVE_DMA_FREELIST 1
#define __HAVE_DMA_SCHEDULE 1
#define __HAVE_DMA_SCHEDULE 1
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment