Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
R128
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Ermine
R128
Commits
b694dfb2
Commit
b694dfb2
authored
15 years ago
by
Ben Skeggs
Browse files
Options
Downloads
Patches
Plain Diff
drm/nouveau: fix build with CONFIG_AGP=n
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
61c2bb45
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
drivers/gpu/drm/nouveau/nouveau_bo.c
+2
-0
2 additions, 0 deletions
drivers/gpu/drm/nouveau/nouveau_bo.c
drivers/gpu/drm/nouveau/nouveau_mem.c
+4
-0
4 additions, 0 deletions
drivers/gpu/drm/nouveau/nouveau_mem.c
with
6 additions
and
0 deletions
drivers/gpu/drm/nouveau/nouveau_bo.c
+
2
−
0
View file @
b694dfb2
...
...
@@ -311,8 +311,10 @@ nouveau_bo_create_ttm_backend_entry(struct ttm_bo_device *bdev)
struct
drm_device
*
dev
=
dev_priv
->
dev
;
switch
(
dev_priv
->
gart_info
.
type
)
{
#if __OS_HAS_AGP
case
NOUVEAU_GART_AGP
:
return
ttm_agp_backend_init
(
bdev
,
dev
->
agp
->
bridge
);
#endif
case
NOUVEAU_GART_SGDMA
:
return
nouveau_sgdma_init_ttm
(
dev
);
default:
...
...
This diff is collapsed.
Click to expand it.
drivers/gpu/drm/nouveau/nouveau_mem.c
+
4
−
0
View file @
b694dfb2
...
...
@@ -407,6 +407,7 @@ uint64_t nouveau_mem_fb_amount(struct drm_device *dev)
return
0
;
}
#if __OS_HAS_AGP
static
void
nouveau_mem_reset_agp
(
struct
drm_device
*
dev
)
{
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)
nv_wr32
(
dev
,
NV04_PBUS_PCI_NV_19
,
saved_pci_nv_19
);
nv_wr32
(
dev
,
NV04_PBUS_PCI_NV_1
,
saved_pci_nv_1
);
}
#endif
int
nouveau_mem_init_agp
(
struct
drm_device
*
dev
)
{
#if __OS_HAS_AGP
struct
drm_nouveau_private
*
dev_priv
=
dev
->
dev_private
;
struct
drm_agp_info
info
;
struct
drm_agp_mode
mode
;
...
...
@@ -471,6 +474,7 @@ nouveau_mem_init_agp(struct drm_device *dev)
dev_priv
->
gart_info
.
type
=
NOUVEAU_GART_AGP
;
dev_priv
->
gart_info
.
aper_base
=
info
.
aperture_base
;
dev_priv
->
gart_info
.
aper_size
=
info
.
aperture_size
;
#endif
return
0
;
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment