Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
Linux
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD 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
jan.koester
Linux
Commits
fb172f5f
Commit
fb172f5f
authored
5 years ago
by
Ben Skeggs
Browse files
Options
Downloads
Patches
Plain Diff
drm/nouveau/gr/gk20a: move MODULE_FIRMWARE firmware definitions
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
d2bcfce7
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_platform.c
+0
-11
0 additions, 11 deletions
drivers/gpu/drm/nouveau/nouveau_platform.c
drivers/gpu/drm/nouveau/nvkm/engine/gr/gk20a.c
+11
-0
11 additions, 0 deletions
drivers/gpu/drm/nouveau/nvkm/engine/gr/gk20a.c
with
11 additions
and
11 deletions
drivers/gpu/drm/nouveau/nouveau_platform.c
+
0
−
11
View file @
fb172f5f
...
...
@@ -95,14 +95,3 @@ struct platform_driver nouveau_platform_driver = {
.
probe
=
nouveau_platform_probe
,
.
remove
=
nouveau_platform_remove
,
};
#if IS_ENABLED(CONFIG_ARCH_TEGRA_124_SOC) || IS_ENABLED(CONFIG_ARCH_TEGRA_132_SOC)
MODULE_FIRMWARE
(
"nvidia/gk20a/fecs_data.bin"
);
MODULE_FIRMWARE
(
"nvidia/gk20a/fecs_inst.bin"
);
MODULE_FIRMWARE
(
"nvidia/gk20a/gpccs_data.bin"
);
MODULE_FIRMWARE
(
"nvidia/gk20a/gpccs_inst.bin"
);
MODULE_FIRMWARE
(
"nvidia/gk20a/sw_bundle_init.bin"
);
MODULE_FIRMWARE
(
"nvidia/gk20a/sw_ctx.bin"
);
MODULE_FIRMWARE
(
"nvidia/gk20a/sw_method_init.bin"
);
MODULE_FIRMWARE
(
"nvidia/gk20a/sw_nonctx.bin"
);
#endif
This diff is collapsed.
Click to expand it.
drivers/gpu/drm/nouveau/nvkm/engine/gr/gk20a.c
+
11
−
0
View file @
fb172f5f
...
...
@@ -319,6 +319,17 @@ gk20a_gr_load_sw(struct gf100_gr *gr, const char *path, int ver)
return
0
;
}
#if IS_ENABLED(CONFIG_ARCH_TEGRA_124_SOC) || IS_ENABLED(CONFIG_ARCH_TEGRA_132_SOC)
MODULE_FIRMWARE
(
"nvidia/gk20a/fecs_data.bin"
);
MODULE_FIRMWARE
(
"nvidia/gk20a/fecs_inst.bin"
);
MODULE_FIRMWARE
(
"nvidia/gk20a/gpccs_data.bin"
);
MODULE_FIRMWARE
(
"nvidia/gk20a/gpccs_inst.bin"
);
MODULE_FIRMWARE
(
"nvidia/gk20a/sw_bundle_init.bin"
);
MODULE_FIRMWARE
(
"nvidia/gk20a/sw_ctx.bin"
);
MODULE_FIRMWARE
(
"nvidia/gk20a/sw_method_init.bin"
);
MODULE_FIRMWARE
(
"nvidia/gk20a/sw_nonctx.bin"
);
#endif
static
int
gk20a_gr_load
(
struct
gf100_gr
*
gr
,
int
ver
,
const
struct
gf100_gr_fwif
*
fwif
)
{
...
...
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