Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci-2.6.23
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci-2.6.23
Commits
33bc227e
Commit
33bc227e
authored
Nov 23, 2005
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'drm-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
parents
569cfaad
7655f493
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
5 deletions
+4
-5
drivers/char/drm/drm_memory.c
drivers/char/drm/drm_memory.c
+1
-1
drivers/char/drm/drm_memory_debug.h
drivers/char/drm/drm_memory_debug.h
+1
-1
drivers/char/drm/mga_drv.c
drivers/char/drm/mga_drv.c
+1
-1
drivers/char/drm/radeon_drv.h
drivers/char/drm/radeon_drv.h
+1
-2
No files found.
drivers/char/drm/drm_memory.c
View file @
33bc227e
...
...
@@ -95,7 +95,7 @@ unsigned long drm_alloc_pages(int order, int area)
unsigned
long
addr
;
unsigned
int
sz
;
address
=
__get_free_pages
(
GFP_KERNEL
,
order
);
address
=
__get_free_pages
(
GFP_KERNEL
|
__GFP_COMP
,
order
);
if
(
!
address
)
return
0
;
...
...
drivers/char/drm/drm_memory_debug.h
View file @
33bc227e
...
...
@@ -221,7 +221,7 @@ unsigned long DRM(alloc_pages) (int order, int area) {
}
spin_unlock
(
&
DRM
(
mem_lock
));
address
=
__get_free_pages
(
GFP_KERNEL
,
order
);
address
=
__get_free_pages
(
GFP_KERNEL
|
__GFP_COMP
,
order
);
if
(
!
address
)
{
spin_lock
(
&
DRM
(
mem_lock
));
++
DRM
(
mem_stats
)[
area
].
fail_count
;
...
...
drivers/char/drm/mga_drv.c
View file @
33bc227e
...
...
@@ -161,7 +161,7 @@ static int mga_driver_device_is_agp(drm_device_t * dev)
* device.
*/
if
((
pdev
->
device
==
0x0525
)
if
((
pdev
->
device
==
0x0525
)
&&
pdev
->
bus
->
self
&&
(
pdev
->
bus
->
self
->
vendor
==
0x3388
)
&&
(
pdev
->
bus
->
self
->
device
==
0x0021
))
{
return
0
;
...
...
drivers/char/drm/radeon_drv.h
View file @
33bc227e
...
...
@@ -214,8 +214,6 @@ typedef struct drm_radeon_private {
int
microcode_version
;
int
is_pci
;
struct
{
u32
boxes
;
int
freelist_timeouts
;
...
...
@@ -275,6 +273,7 @@ typedef struct drm_radeon_private {
/* starting from here on, data is preserved accross an open */
uint32_t
flags
;
/* see radeon_chip_flags */
int
is_pci
;
}
drm_radeon_private_t
;
typedef
struct
drm_radeon_buf_priv
{
...
...
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