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
dded35de
Commit
dded35de
authored
Apr 25, 2013
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau/device: convert to engine, rather than subdev
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
2ecda48b
Changes
15
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
32 additions
and
32 deletions
+32
-32
drivers/gpu/drm/nouveau/Makefile
drivers/gpu/drm/nouveau/Makefile
+9
-9
drivers/gpu/drm/nouveau/core/core/client.c
drivers/gpu/drm/nouveau/core/core/client.c
+1
-1
drivers/gpu/drm/nouveau/core/core/engine.c
drivers/gpu/drm/nouveau/core/core/engine.c
+2
-2
drivers/gpu/drm/nouveau/core/engine/device/base.c
drivers/gpu/drm/nouveau/core/engine/device/base.c
+6
-6
drivers/gpu/drm/nouveau/core/engine/device/nv04.c
drivers/gpu/drm/nouveau/core/engine/device/nv04.c
+1
-1
drivers/gpu/drm/nouveau/core/engine/device/nv10.c
drivers/gpu/drm/nouveau/core/engine/device/nv10.c
+1
-1
drivers/gpu/drm/nouveau/core/engine/device/nv20.c
drivers/gpu/drm/nouveau/core/engine/device/nv20.c
+1
-1
drivers/gpu/drm/nouveau/core/engine/device/nv30.c
drivers/gpu/drm/nouveau/core/engine/device/nv30.c
+1
-1
drivers/gpu/drm/nouveau/core/engine/device/nv40.c
drivers/gpu/drm/nouveau/core/engine/device/nv40.c
+1
-1
drivers/gpu/drm/nouveau/core/engine/device/nv50.c
drivers/gpu/drm/nouveau/core/engine/device/nv50.c
+1
-1
drivers/gpu/drm/nouveau/core/engine/device/nvc0.c
drivers/gpu/drm/nouveau/core/engine/device/nvc0.c
+1
-1
drivers/gpu/drm/nouveau/core/engine/device/nve0.c
drivers/gpu/drm/nouveau/core/engine/device/nve0.c
+1
-1
drivers/gpu/drm/nouveau/core/include/core/device.h
drivers/gpu/drm/nouveau/core/include/core/device.h
+3
-3
drivers/gpu/drm/nouveau/core/include/engine/device.h
drivers/gpu/drm/nouveau/core/include/engine/device.h
+0
-0
drivers/gpu/drm/nouveau/nouveau_drm.c
drivers/gpu/drm/nouveau/nouveau_drm.c
+3
-3
No files found.
drivers/gpu/drm/nouveau/Makefile
View file @
dded35de
...
...
@@ -53,15 +53,6 @@ nouveau-y += core/subdev/clock/nva3.o
nouveau-y
+=
core/subdev/clock/nvc0.o
nouveau-y
+=
core/subdev/clock/pllnv04.o
nouveau-y
+=
core/subdev/clock/pllnva3.o
nouveau-y
+=
core/subdev/device/base.o
nouveau-y
+=
core/subdev/device/nv04.o
nouveau-y
+=
core/subdev/device/nv10.o
nouveau-y
+=
core/subdev/device/nv20.o
nouveau-y
+=
core/subdev/device/nv30.o
nouveau-y
+=
core/subdev/device/nv40.o
nouveau-y
+=
core/subdev/device/nv50.o
nouveau-y
+=
core/subdev/device/nvc0.o
nouveau-y
+=
core/subdev/device/nve0.o
nouveau-y
+=
core/subdev/devinit/base.o
nouveau-y
+=
core/subdev/devinit/nv04.o
nouveau-y
+=
core/subdev/devinit/nv05.o
...
...
@@ -151,6 +142,15 @@ nouveau-y += core/engine/copy/nvc0.o
nouveau-y
+=
core/engine/copy/nve0.o
nouveau-y
+=
core/engine/crypt/nv84.o
nouveau-y
+=
core/engine/crypt/nv98.o
nouveau-y
+=
core/engine/device/base.o
nouveau-y
+=
core/engine/device/nv04.o
nouveau-y
+=
core/engine/device/nv10.o
nouveau-y
+=
core/engine/device/nv20.o
nouveau-y
+=
core/engine/device/nv30.o
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/disp/base.o
nouveau-y
+=
core/engine/disp/nv04.o
nouveau-y
+=
core/engine/disp/nv50.o
...
...
drivers/gpu/drm/nouveau/core/core/client.c
View file @
dded35de
...
...
@@ -27,7 +27,7 @@
#include <core/handle.h>
#include <core/option.h>
#include <
subdev
/device.h>
#include <
engine
/device.h>
static
void
nouveau_client_dtor
(
struct
nouveau_object
*
object
)
...
...
drivers/gpu/drm/nouveau/core/core/engine.c
View file @
dded35de
...
...
@@ -33,7 +33,6 @@ nouveau_engine_create_(struct nouveau_object *parent,
const
char
*
iname
,
const
char
*
fname
,
int
length
,
void
**
pobject
)
{
struct
nouveau_device
*
device
=
nv_device
(
parent
);
struct
nouveau_engine
*
engine
;
int
ret
;
...
...
@@ -43,7 +42,8 @@ nouveau_engine_create_(struct nouveau_object *parent,
if
(
ret
)
return
ret
;
if
(
!
nouveau_boolopt
(
device
->
cfgopt
,
iname
,
enable
))
{
if
(
parent
&&
!
nouveau_boolopt
(
nv_device
(
parent
)
->
cfgopt
,
iname
,
enable
))
{
if
(
!
enable
)
nv_warn
(
engine
,
"disabled, %s=1 to enable
\n
"
,
iname
);
return
-
ENODEV
;
...
...
drivers/gpu/drm/nouveau/core/
subdev
/device/base.c
→
drivers/gpu/drm/nouveau/core/
engine
/device/base.c
View file @
dded35de
...
...
@@ -29,7 +29,7 @@
#include <core/class.h>
#include <
subdev
/device.h>
#include <
engine
/device.h>
static
DEFINE_MUTEX
(
nv_devices_mutex
);
static
LIST_HEAD
(
nv_devices
);
...
...
@@ -428,15 +428,15 @@ nouveau_device_dtor(struct nouveau_object *object)
list_del
(
&
device
->
head
);
mutex_unlock
(
&
nv_devices_mutex
);
if
(
device
->
base
.
mmio
)
iounmap
(
device
->
base
.
mmio
);
if
(
nv_subdev
(
device
)
->
mmio
)
iounmap
(
nv_subdev
(
device
)
->
mmio
);
nouveau_
subdev
_destroy
(
&
device
->
base
);
nouveau_
engine
_destroy
(
&
device
->
base
);
}
static
struct
nouveau_oclass
nouveau_device_oclass
=
{
.
handle
=
NV_
SUBDEV
(
DEVICE
,
0x00
),
.
handle
=
NV_
ENGINE
(
DEVICE
,
0x00
),
.
ofuncs
=
&
(
struct
nouveau_ofuncs
)
{
.
dtor
=
nouveau_device_dtor
,
},
...
...
@@ -456,7 +456,7 @@ nouveau_device_create_(struct pci_dev *pdev, u64 name, const char *sname,
goto
done
;
}
ret
=
nouveau_
subdev_create_
(
NULL
,
NULL
,
&
nouveau_device_oclass
,
0
,
ret
=
nouveau_
engine_create_
(
NULL
,
NULL
,
&
nouveau_device_oclass
,
true
,
"DEVICE"
,
"device"
,
length
,
pobject
);
device
=
*
pobject
;
if
(
ret
)
...
...
drivers/gpu/drm/nouveau/core/
subdev
/device/nv04.c
→
drivers/gpu/drm/nouveau/core/
engine
/device/nv04.c
View file @
dded35de
...
...
@@ -22,7 +22,6 @@
* Authors: Ben Skeggs
*/
#include <subdev/device.h>
#include <subdev/bios.h>
#include <subdev/bus.h>
#include <subdev/i2c.h>
...
...
@@ -34,6 +33,7 @@
#include <subdev/instmem.h>
#include <subdev/vm.h>
#include <engine/device.h>
#include <engine/dmaobj.h>
#include <engine/fifo.h>
#include <engine/software.h>
...
...
drivers/gpu/drm/nouveau/core/
subdev
/device/nv10.c
→
drivers/gpu/drm/nouveau/core/
engine
/device/nv10.c
View file @
dded35de
...
...
@@ -22,7 +22,6 @@
* Authors: Ben Skeggs
*/
#include <subdev/device.h>
#include <subdev/bios.h>
#include <subdev/bus.h>
#include <subdev/gpio.h>
...
...
@@ -35,6 +34,7 @@
#include <subdev/instmem.h>
#include <subdev/vm.h>
#include <engine/device.h>
#include <engine/dmaobj.h>
#include <engine/fifo.h>
#include <engine/software.h>
...
...
drivers/gpu/drm/nouveau/core/
subdev
/device/nv20.c
→
drivers/gpu/drm/nouveau/core/
engine
/device/nv20.c
View file @
dded35de
...
...
@@ -22,7 +22,6 @@
* Authors: Ben Skeggs
*/
#include <subdev/device.h>
#include <subdev/bios.h>
#include <subdev/bus.h>
#include <subdev/gpio.h>
...
...
@@ -36,6 +35,7 @@
#include <subdev/instmem.h>
#include <subdev/vm.h>
#include <engine/device.h>
#include <engine/dmaobj.h>
#include <engine/fifo.h>
#include <engine/software.h>
...
...
drivers/gpu/drm/nouveau/core/
subdev
/device/nv30.c
→
drivers/gpu/drm/nouveau/core/
engine
/device/nv30.c
View file @
dded35de
...
...
@@ -22,7 +22,6 @@
* Authors: Ben Skeggs
*/
#include <subdev/device.h>
#include <subdev/bios.h>
#include <subdev/bus.h>
#include <subdev/gpio.h>
...
...
@@ -35,6 +34,7 @@
#include <subdev/instmem.h>
#include <subdev/vm.h>
#include <engine/device.h>
#include <engine/dmaobj.h>
#include <engine/fifo.h>
#include <engine/software.h>
...
...
drivers/gpu/drm/nouveau/core/
subdev
/device/nv40.c
→
drivers/gpu/drm/nouveau/core/
engine
/device/nv40.c
View file @
dded35de
...
...
@@ -22,7 +22,6 @@
* Authors: Ben Skeggs
*/
#include <subdev/device.h>
#include <subdev/bios.h>
#include <subdev/bus.h>
#include <subdev/vm.h>
...
...
@@ -37,6 +36,7 @@
#include <subdev/instmem.h>
#include <subdev/vm.h>
#include <engine/device.h>
#include <engine/dmaobj.h>
#include <engine/fifo.h>
#include <engine/software.h>
...
...
drivers/gpu/drm/nouveau/core/
subdev
/device/nv50.c
→
drivers/gpu/drm/nouveau/core/
engine
/device/nv50.c
View file @
dded35de
...
...
@@ -22,7 +22,6 @@
* Authors: Ben Skeggs
*/
#include <subdev/device.h>
#include <subdev/bios.h>
#include <subdev/bus.h>
#include <subdev/gpio.h>
...
...
@@ -38,6 +37,7 @@
#include <subdev/vm.h>
#include <subdev/bar.h>
#include <engine/device.h>
#include <engine/dmaobj.h>
#include <engine/fifo.h>
#include <engine/software.h>
...
...
drivers/gpu/drm/nouveau/core/
subdev
/device/nvc0.c
→
drivers/gpu/drm/nouveau/core/
engine
/device/nvc0.c
View file @
dded35de
...
...
@@ -22,7 +22,6 @@
* Authors: Ben Skeggs
*/
#include <subdev/device.h>
#include <subdev/bios.h>
#include <subdev/bus.h>
#include <subdev/gpio.h>
...
...
@@ -40,6 +39,7 @@
#include <subdev/vm.h>
#include <subdev/bar.h>
#include <engine/device.h>
#include <engine/dmaobj.h>
#include <engine/fifo.h>
#include <engine/software.h>
...
...
drivers/gpu/drm/nouveau/core/
subdev
/device/nve0.c
→
drivers/gpu/drm/nouveau/core/
engine
/device/nve0.c
View file @
dded35de
...
...
@@ -22,7 +22,6 @@
* Authors: Ben Skeggs
*/
#include <subdev/device.h>
#include <subdev/bios.h>
#include <subdev/bus.h>
#include <subdev/gpio.h>
...
...
@@ -40,6 +39,7 @@
#include <subdev/vm.h>
#include <subdev/bar.h>
#include <engine/device.h>
#include <engine/dmaobj.h>
#include <engine/fifo.h>
#include <engine/software.h>
...
...
drivers/gpu/drm/nouveau/core/include/core/device.h
View file @
dded35de
...
...
@@ -6,7 +6,7 @@
#include <core/engine.h>
enum
nv_subdev_type
{
NVDEV_
SUBDEV
_DEVICE
,
NVDEV_
ENGINE
_DEVICE
,
NVDEV_SUBDEV_VBIOS
,
/* All subdevs from DEVINIT to DEVINIT_LAST will be created before
...
...
@@ -57,7 +57,7 @@ enum nv_subdev_type {
};
struct
nouveau_device
{
struct
nouveau_
subdev
base
;
struct
nouveau_
engine
base
;
struct
list_head
head
;
struct
pci_dev
*
pdev
;
...
...
@@ -99,7 +99,7 @@ nv_device(void *obj)
#if CONFIG_NOUVEAU_DEBUG >= NV_DBG_PARANOIA
if
(
unlikely
(
!
nv_iclass
(
device
,
NV_SUBDEV_CLASS
)
||
(
nv_hclass
(
device
)
&
0xff
)
!=
NVDEV_
SUBDEV
_DEVICE
))
{
(
nv_hclass
(
device
)
&
0xff
)
!=
NVDEV_
ENGINE
_DEVICE
))
{
nv_assert
(
"BAD CAST -> NvDevice, 0x%08x 0x%08x"
,
nv_hclass
(
object
),
nv_hclass
(
device
));
}
...
...
drivers/gpu/drm/nouveau/core/include/
subdev
/device.h
→
drivers/gpu/drm/nouveau/core/include/
engine
/device.h
View file @
dded35de
File moved
drivers/gpu/drm/nouveau/nouveau_drm.c
View file @
dded35de
...
...
@@ -31,11 +31,11 @@
#include <core/gpuobj.h>
#include <core/class.h>
#include <subdev/device.h>
#include <subdev/vm.h>
#include <engine/device.h>
#include <engine/disp.h>
#include <subdev/vm.h>
#include "nouveau_drm.h"
#include "nouveau_dma.h"
#include "nouveau_ttm.h"
...
...
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