diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2015-01-14 03:02:28 +0100 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2015-01-22 03:17:45 +0100 |
commit | b8bf04e1fd3aba5cdd81ec766fc0372c7894497c (patch) | |
tree | 7588cd484512fbebc118763dea9af8ea320c35d2 /drivers/gpu/drm/nouveau/include/nvif/device.h | |
parent | drm/nouveau/ce: rename from copy (no binary change) (diff) | |
download | linux-b8bf04e1fd3aba5cdd81ec766fc0372c7894497c.tar.xz linux-b8bf04e1fd3aba5cdd81ec766fc0372c7894497c.zip |
drm/nouveau/gr: rename from graph (no binary change)
Shorter device name, match Tegra and our existing enums.
The namespace of NVKM is being changed to nvkm_ instead of nouveau_,
which will be used for the DRM part of the driver. This is being
done in order to make it very clear as to what part of the driver a
given symbol belongs to, and as a minor step towards splitting the
DRM driver out to be able to stand on its own (for virt).
Because there's already a large amount of churn here anyway, this is
as good a time as any to also switch to NVIDIA's device and chipset
naming to ease collaboration with them.
A comparison of objdump disassemblies proves no code changes.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/include/nvif/device.h')
-rw-r--r-- | drivers/gpu/drm/nouveau/include/nvif/device.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/include/nvif/device.h b/drivers/gpu/drm/nouveau/include/nvif/device.h index 93acd5153bee..7f1770beff21 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/device.h +++ b/drivers/gpu/drm/nouveau/include/nvif/device.h @@ -52,11 +52,11 @@ void nvif_device_ref(struct nvif_device *, struct nvif_device **); #include <engine/device.h> #include <engine/fifo.h> -#include <engine/graph.h> +#include <engine/gr.h> #include <engine/software.h> #define nvkm_fifo(a) nouveau_fifo(nvkm_device(a)) #define nvkm_fifo_chan(a) ((struct nouveau_fifo_chan *)nvkm_object(a)) -#define nvkm_gr(a) ((struct nouveau_graph *)nouveau_engine(nvkm_object(a), NVDEV_ENGINE_GR)) +#define nvkm_gr(a) ((struct nouveau_gr *)nouveau_engine(nvkm_object(a), NVDEV_ENGINE_GR)) #endif |