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
nexedi
linux
Commits
b694dfb2
Commit
b694dfb2
authored
Dec 15, 2009
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau: fix build with CONFIG_AGP=n
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
61c2bb45
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
0 deletions
+6
-0
drivers/gpu/drm/nouveau/nouveau_bo.c
drivers/gpu/drm/nouveau/nouveau_bo.c
+2
-0
drivers/gpu/drm/nouveau/nouveau_mem.c
drivers/gpu/drm/nouveau/nouveau_mem.c
+4
-0
No files found.
drivers/gpu/drm/nouveau/nouveau_bo.c
View file @
b694dfb2
...
@@ -311,8 +311,10 @@ nouveau_bo_create_ttm_backend_entry(struct ttm_bo_device *bdev)
...
@@ -311,8 +311,10 @@ nouveau_bo_create_ttm_backend_entry(struct ttm_bo_device *bdev)
struct
drm_device
*
dev
=
dev_priv
->
dev
;
struct
drm_device
*
dev
=
dev_priv
->
dev
;
switch
(
dev_priv
->
gart_info
.
type
)
{
switch
(
dev_priv
->
gart_info
.
type
)
{
#if __OS_HAS_AGP
case
NOUVEAU_GART_AGP
:
case
NOUVEAU_GART_AGP
:
return
ttm_agp_backend_init
(
bdev
,
dev
->
agp
->
bridge
);
return
ttm_agp_backend_init
(
bdev
,
dev
->
agp
->
bridge
);
#endif
case
NOUVEAU_GART_SGDMA
:
case
NOUVEAU_GART_SGDMA
:
return
nouveau_sgdma_init_ttm
(
dev
);
return
nouveau_sgdma_init_ttm
(
dev
);
default:
default:
...
...
drivers/gpu/drm/nouveau/nouveau_mem.c
View file @
b694dfb2
...
@@ -407,6 +407,7 @@ uint64_t nouveau_mem_fb_amount(struct drm_device *dev)
...
@@ -407,6 +407,7 @@ uint64_t nouveau_mem_fb_amount(struct drm_device *dev)
return
0
;
return
0
;
}
}
#if __OS_HAS_AGP
static
void
nouveau_mem_reset_agp
(
struct
drm_device
*
dev
)
static
void
nouveau_mem_reset_agp
(
struct
drm_device
*
dev
)
{
{
uint32_t
saved_pci_nv_1
,
saved_pci_nv_19
,
pmc_enable
;
uint32_t
saved_pci_nv_1
,
saved_pci_nv_19
,
pmc_enable
;
...
@@ -432,10 +433,12 @@ static void nouveau_mem_reset_agp(struct drm_device *dev)
...
@@ -432,10 +433,12 @@ static void nouveau_mem_reset_agp(struct drm_device *dev)
nv_wr32
(
dev
,
NV04_PBUS_PCI_NV_19
,
saved_pci_nv_19
);
nv_wr32
(
dev
,
NV04_PBUS_PCI_NV_19
,
saved_pci_nv_19
);
nv_wr32
(
dev
,
NV04_PBUS_PCI_NV_1
,
saved_pci_nv_1
);
nv_wr32
(
dev
,
NV04_PBUS_PCI_NV_1
,
saved_pci_nv_1
);
}
}
#endif
int
int
nouveau_mem_init_agp
(
struct
drm_device
*
dev
)
nouveau_mem_init_agp
(
struct
drm_device
*
dev
)
{
{
#if __OS_HAS_AGP
struct
drm_nouveau_private
*
dev_priv
=
dev
->
dev_private
;
struct
drm_nouveau_private
*
dev_priv
=
dev
->
dev_private
;
struct
drm_agp_info
info
;
struct
drm_agp_info
info
;
struct
drm_agp_mode
mode
;
struct
drm_agp_mode
mode
;
...
@@ -471,6 +474,7 @@ nouveau_mem_init_agp(struct drm_device *dev)
...
@@ -471,6 +474,7 @@ nouveau_mem_init_agp(struct drm_device *dev)
dev_priv
->
gart_info
.
type
=
NOUVEAU_GART_AGP
;
dev_priv
->
gart_info
.
type
=
NOUVEAU_GART_AGP
;
dev_priv
->
gart_info
.
aper_base
=
info
.
aperture_base
;
dev_priv
->
gart_info
.
aper_base
=
info
.
aperture_base
;
dev_priv
->
gart_info
.
aper_size
=
info
.
aperture_size
;
dev_priv
->
gart_info
.
aper_size
=
info
.
aperture_size
;
#endif
return
0
;
return
0
;
}
}
...
...
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