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
b5d499cf
Commit
b5d499cf
authored
Jul 10, 2005
by
Dave Airlie
Committed by
Dave Airlie
Jul 10, 2005
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm: make drm_alloc_agp take a dev arg.
Signed-off-by:
Dave Airlie
<
airlied@linux.ie
>
parent
93f453f3
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
drivers/char/drm/drmP.h
drivers/char/drm/drmP.h
+1
-1
drivers/char/drm/drm_agpsupport.c
drivers/char/drm/drm_agpsupport.c
+1
-1
drivers/char/drm/drm_memory.c
drivers/char/drm/drm_memory.c
+2
-2
No files found.
drivers/char/drm/drmP.h
View file @
b5d499cf
...
...
@@ -829,7 +829,7 @@ extern void *drm_ioremap_nocache(unsigned long offset, unsigned long size,
drm_device_t
*
dev
);
extern
void
drm_ioremapfree
(
void
*
pt
,
unsigned
long
size
,
drm_device_t
*
dev
);
extern
DRM_AGP_MEM
*
drm_alloc_agp
(
struct
agp_bridge_data
*
bridge
,
int
pages
,
u32
type
);
extern
DRM_AGP_MEM
*
drm_alloc_agp
(
drm_device_t
*
dev
,
int
pages
,
u32
type
);
extern
int
drm_free_agp
(
DRM_AGP_MEM
*
handle
,
int
pages
);
extern
int
drm_bind_agp
(
DRM_AGP_MEM
*
handle
,
unsigned
int
start
);
extern
int
drm_unbind_agp
(
DRM_AGP_MEM
*
handle
);
...
...
drivers/char/drm/drm_agpsupport.c
View file @
b5d499cf
...
...
@@ -229,7 +229,7 @@ int drm_agp_alloc(struct inode *inode, struct file *filp,
pages
=
(
request
.
size
+
PAGE_SIZE
-
1
)
/
PAGE_SIZE
;
type
=
(
u32
)
request
.
type
;
if
(
!
(
memory
=
drm_alloc_agp
(
dev
->
agp
->
bridge
,
pages
,
type
)))
{
if
(
!
(
memory
=
drm_alloc_agp
(
dev
,
pages
,
type
)))
{
drm_free
(
entry
,
sizeof
(
*
entry
),
DRM_MEM_AGPLISTS
);
return
-
ENOMEM
;
}
...
...
drivers/char/drm/drm_memory.c
View file @
b5d499cf
...
...
@@ -142,9 +142,9 @@ void drm_free_pages(unsigned long address, int order, int area)
#if __OS_HAS_AGP
/** Wrapper around agp_allocate_memory() */
DRM_AGP_MEM
*
drm_alloc_agp
(
struct
agp_bridge_data
*
bridge
,
int
pages
,
u32
type
)
DRM_AGP_MEM
*
drm_alloc_agp
(
drm_device_t
*
dev
,
int
pages
,
u32
type
)
{
return
drm_agp_allocate_memory
(
bridge
,
pages
,
type
);
return
drm_agp_allocate_memory
(
dev
->
agp
->
bridge
,
pages
,
type
);
}
EXPORT_SYMBOL
(
drm_alloc_agp
);
...
...
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