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
Kirill Smelkov
linux
Commits
3f204647
Commit
3f204647
authored
Feb 24, 2014
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/gm100/device: recognise GM107
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
c68c29c0
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
113 additions
and
0 deletions
+113
-0
drivers/gpu/drm/nouveau/Makefile
drivers/gpu/drm/nouveau/Makefile
+1
-0
drivers/gpu/drm/nouveau/core/engine/device/base.c
drivers/gpu/drm/nouveau/core/engine/device/base.c
+2
-0
drivers/gpu/drm/nouveau/core/engine/device/gm100.c
drivers/gpu/drm/nouveau/core/engine/device/gm100.c
+108
-0
drivers/gpu/drm/nouveau/core/include/core/device.h
drivers/gpu/drm/nouveau/core/include/core/device.h
+1
-0
drivers/gpu/drm/nouveau/core/include/engine/device.h
drivers/gpu/drm/nouveau/core/include/engine/device.h
+1
-0
No files found.
drivers/gpu/drm/nouveau/Makefile
View file @
3f204647
...
...
@@ -211,6 +211,7 @@ nouveau-y += core/engine/device/nv40.o
nouveau-y
+=
core/engine/device/nv50.o
nouveau-y
+=
core/engine/device/nvc0.o
nouveau-y
+=
core/engine/device/nve0.o
nouveau-y
+=
core/engine/device/gm100.o
nouveau-y
+=
core/engine/disp/base.o
nouveau-y
+=
core/engine/disp/nv04.o
nouveau-y
+=
core/engine/disp/nv50.o
...
...
drivers/gpu/drm/nouveau/core/engine/device/base.c
View file @
3f204647
...
...
@@ -185,6 +185,7 @@ nouveau_devobj_ctor(struct nouveau_object *parent,
case
0x0e0
:
case
0x0f0
:
case
0x100
:
device
->
card_type
=
NV_E0
;
break
;
case
0x110
:
device
->
card_type
=
GM100
;
break
;
default:
break
;
}
...
...
@@ -208,6 +209,7 @@ nouveau_devobj_ctor(struct nouveau_object *parent,
case
NV_C0
:
case
NV_D0
:
ret
=
nvc0_identify
(
device
);
break
;
case
NV_E0
:
ret
=
nve0_identify
(
device
);
break
;
case
GM100
:
ret
=
gm100_identify
(
device
);
break
;
default:
ret
=
-
EINVAL
;
break
;
...
...
drivers/gpu/drm/nouveau/core/engine/device/gm100.c
0 → 100644
View file @
3f204647
/*
* Copyright 2012 Red Hat Inc.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*
* Authors: Ben Skeggs
*/
#include <subdev/bios.h>
#include <subdev/bus.h>
#include <subdev/gpio.h>
#include <subdev/i2c.h>
#include <subdev/clock.h>
#include <subdev/therm.h>
#include <subdev/mxm.h>
#include <subdev/devinit.h>
#include <subdev/mc.h>
#include <subdev/timer.h>
#include <subdev/fb.h>
#include <subdev/ltcg.h>
#include <subdev/ibus.h>
#include <subdev/instmem.h>
#include <subdev/vm.h>
#include <subdev/bar.h>
#include <subdev/pwr.h>
#include <subdev/volt.h>
#include <engine/device.h>
#include <engine/dmaobj.h>
#include <engine/fifo.h>
#include <engine/software.h>
#include <engine/graph.h>
#include <engine/disp.h>
#include <engine/copy.h>
#include <engine/bsp.h>
#include <engine/vp.h>
#include <engine/ppp.h>
#include <engine/perfmon.h>
int
gm100_identify
(
struct
nouveau_device
*
device
)
{
switch
(
device
->
chipset
)
{
case
0x117
:
device
->
cname
=
"GM107"
;
device
->
oclass
[
NVDEV_SUBDEV_VBIOS
]
=
&
nouveau_bios_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_GPIO
]
=
&
nve0_gpio_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_I2C
]
=
&
nvd0_i2c_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_CLOCK
]
=
&
nve0_clock_oclass
;
#if 0
device->oclass[NVDEV_SUBDEV_THERM ] = &nvd0_therm_oclass;
#endif
device
->
oclass
[
NVDEV_SUBDEV_MXM
]
=
&
nv50_mxm_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_DEVINIT
]
=
gm107_devinit_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_MC
]
=
nvc3_mc_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_BUS
]
=
nvc0_bus_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_TIMER
]
=
&
gk20a_timer_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_FB
]
=
gm107_fb_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_LTCG
]
=
gm107_ltcg_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_IBUS
]
=
&
nve0_ibus_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_INSTMEM
]
=
nv50_instmem_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_VM
]
=
&
nvc0_vmmgr_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_BAR
]
=
&
nvc0_bar_oclass
;
#if 0
device->oclass[NVDEV_SUBDEV_PWR ] = &nv108_pwr_oclass;
device->oclass[NVDEV_SUBDEV_VOLT ] = &nv40_volt_oclass;
#endif
device
->
oclass
[
NVDEV_ENGINE_DMAOBJ
]
=
&
nvd0_dmaeng_oclass
;
device
->
oclass
[
NVDEV_ENGINE_FIFO
]
=
nv108_fifo_oclass
;
device
->
oclass
[
NVDEV_ENGINE_SW
]
=
nvc0_software_oclass
;
#if 0
device->oclass[NVDEV_ENGINE_GR ] = nv108_graph_oclass;
#endif
device
->
oclass
[
NVDEV_ENGINE_DISP
]
=
gm107_disp_oclass
;
device
->
oclass
[
NVDEV_ENGINE_COPY0
]
=
&
nve0_copy0_oclass
;
#if 0
device->oclass[NVDEV_ENGINE_COPY1 ] = &nve0_copy1_oclass;
#endif
device
->
oclass
[
NVDEV_ENGINE_COPY2
]
=
&
nve0_copy2_oclass
;
#if 0
device->oclass[NVDEV_ENGINE_BSP ] = &nve0_bsp_oclass;
device->oclass[NVDEV_ENGINE_VP ] = &nve0_vp_oclass;
device->oclass[NVDEV_ENGINE_PPP ] = &nvc0_ppp_oclass;
#endif
break
;
default:
nv_fatal
(
device
,
"unknown Maxwell chipset
\n
"
);
return
-
EINVAL
;
}
return
0
;
}
drivers/gpu/drm/nouveau/core/include/core/device.h
View file @
3f204647
...
...
@@ -85,6 +85,7 @@ struct nouveau_device {
NV_C0
=
0xc0
,
NV_D0
=
0xd0
,
NV_E0
=
0xe0
,
GM100
=
0x110
,
}
card_type
;
u32
chipset
;
u32
crystal
;
...
...
drivers/gpu/drm/nouveau/core/include/engine/device.h
View file @
3f204647
...
...
@@ -17,6 +17,7 @@ int nv40_identify(struct nouveau_device *);
int
nv50_identify
(
struct
nouveau_device
*
);
int
nvc0_identify
(
struct
nouveau_device
*
);
int
nve0_identify
(
struct
nouveau_device
*
);
int
gm100_identify
(
struct
nouveau_device
*
);
struct
nouveau_device
*
nouveau_device_find
(
u64
name
);
...
...
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