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
a1e88736
Commit
a1e88736
authored
Aug 20, 2015
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau/device: decouple from engine machinery
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
a1bfb29a
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
104 additions
and
59 deletions
+104
-59
drivers/gpu/drm/nouveau/include/nvkm/core/device.h
drivers/gpu/drm/nouveau/include/nvkm/core/device.h
+7
-1
drivers/gpu/drm/nouveau/nvkm/core/client.c
drivers/gpu/drm/nouveau/nvkm/core/client.c
+8
-3
drivers/gpu/drm/nouveau/nvkm/core/gpuobj.c
drivers/gpu/drm/nouveau/nvkm/core/gpuobj.c
+2
-7
drivers/gpu/drm/nouveau/nvkm/core/subdev.c
drivers/gpu/drm/nouveau/nvkm/core/subdev.c
+1
-1
drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
+19
-18
drivers/gpu/drm/nouveau/nvkm/engine/device/priv.h
drivers/gpu/drm/nouveau/nvkm/engine/device/priv.h
+0
-2
drivers/gpu/drm/nouveau/nvkm/engine/device/user.c
drivers/gpu/drm/nouveau/nvkm/engine/device/user.c
+47
-6
drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c
drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c
+14
-14
drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c
drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c
+4
-5
drivers/gpu/drm/nouveau/nvkm/engine/pm/priv.h
drivers/gpu/drm/nouveau/nvkm/engine/pm/priv.h
+2
-2
No files found.
drivers/gpu/drm/nouveau/include/nvkm/core/device.h
View file @
a1e88736
...
@@ -4,7 +4,6 @@
...
@@ -4,7 +4,6 @@
#include <core/event.h>
#include <core/event.h>
enum
nvkm_devidx
{
enum
nvkm_devidx
{
NVDEV_ENGINE_DEVICE
,
NVDEV_SUBDEV_VBIOS
,
NVDEV_SUBDEV_VBIOS
,
/* All subdevs from DEVINIT to DEVINIT_LAST will be created before
/* All subdevs from DEVINIT to DEVINIT_LAST will be created before
...
@@ -65,7 +64,10 @@ enum nvkm_devidx {
...
@@ -65,7 +64,10 @@ enum nvkm_devidx {
struct
nvkm_device
{
struct
nvkm_device
{
struct
nvkm_engine
engine
;
struct
nvkm_engine
engine
;
struct
list_head
head
;
struct
list_head
head
;
struct
mutex
mutex
;
int
refcount
;
struct
pci_dev
*
pdev
;
struct
pci_dev
*
pdev
;
struct
platform_device
*
platformdev
;
struct
platform_device
*
platformdev
;
...
@@ -210,11 +212,15 @@ enum nv_bus_type {
...
@@ -210,11 +212,15 @@ enum nv_bus_type {
NVKM_BUS_PLATFORM
,
NVKM_BUS_PLATFORM
,
};
};
extern
struct
nvkm_ofuncs
nvkm_udevice_ofuncs
;
int
nvkm_device_new
(
void
*
,
enum
nv_bus_type
type
,
u64
name
,
int
nvkm_device_new
(
void
*
,
enum
nv_bus_type
type
,
u64
name
,
const
char
*
sname
,
const
char
*
cfg
,
const
char
*
dbg
,
const
char
*
sname
,
const
char
*
cfg
,
const
char
*
dbg
,
bool
detect
,
bool
mmio
,
u64
subdev_mask
,
bool
detect
,
bool
mmio
,
u64
subdev_mask
,
struct
nvkm_device
**
);
struct
nvkm_device
**
);
void
nvkm_device_del
(
struct
nvkm_device
**
);
void
nvkm_device_del
(
struct
nvkm_device
**
);
int
nvkm_device_init
(
struct
nvkm_device
*
);
int
nvkm_device_fini
(
struct
nvkm_device
*
,
bool
suspend
);
/* device logging */
/* device logging */
#define nvdev_printk_(d,l,p,f,a...) do { \
#define nvdev_printk_(d,l,p,f,a...) do { \
...
...
drivers/gpu/drm/nouveau/nvkm/core/client.c
View file @
a1e88736
...
@@ -226,6 +226,12 @@ nvkm_client_del(struct nvkm_client **pclient)
...
@@ -226,6 +226,12 @@ nvkm_client_del(struct nvkm_client **pclient)
}
}
}
}
static
struct
nvkm_oclass
nvkm_client_sclass
[]
=
{
{
NV_DEVICE
,
&
nvkm_udevice_ofuncs
},
{}
};
int
int
nvkm_client_new
(
const
char
*
name
,
u64
devname
,
const
char
*
cfg
,
nvkm_client_new
(
const
char
*
name
,
u64
devname
,
const
char
*
cfg
,
const
char
*
dbg
,
struct
nvkm_client
**
pclient
)
const
char
*
dbg
,
struct
nvkm_client
**
pclient
)
...
@@ -239,9 +245,8 @@ nvkm_client_new(const char *name, u64 devname, const char *cfg,
...
@@ -239,9 +245,8 @@ nvkm_client_new(const char *name, u64 devname, const char *cfg,
return
-
ENODEV
;
return
-
ENODEV
;
ret
=
nvkm_namedb_create
(
NULL
,
NULL
,
&
nvkm_client_oclass
,
ret
=
nvkm_namedb_create
(
NULL
,
NULL
,
&
nvkm_client_oclass
,
NV_CLIENT_CLASS
,
NULL
,
NV_CLIENT_CLASS
,
nvkm_client_sclass
,
(
1ULL
<<
NVDEV_ENGINE_DEVICE
),
0
,
&
client
);
&
client
);
*
pclient
=
client
;
*
pclient
=
client
;
if
(
ret
)
if
(
ret
)
return
ret
;
return
ret
;
...
...
drivers/gpu/drm/nouveau/nvkm/core/gpuobj.c
View file @
a1e88736
...
@@ -216,7 +216,6 @@ nvkm_gpuobj_new(struct nvkm_object *parent, struct nvkm_object *pargpu,
...
@@ -216,7 +216,6 @@ nvkm_gpuobj_new(struct nvkm_object *parent, struct nvkm_object *pargpu,
u32
size
,
u32
align
,
u32
flags
,
u32
size
,
u32
align
,
u32
flags
,
struct
nvkm_gpuobj
**
pgpuobj
)
struct
nvkm_gpuobj
**
pgpuobj
)
{
{
struct
nvkm_object
*
engine
=
parent
;
struct
nvkm_gpuobj_class
args
=
{
struct
nvkm_gpuobj_class
args
=
{
.
pargpu
=
pargpu
,
.
pargpu
=
pargpu
,
.
size
=
size
,
.
size
=
size
,
...
@@ -224,12 +223,8 @@ nvkm_gpuobj_new(struct nvkm_object *parent, struct nvkm_object *pargpu,
...
@@ -224,12 +223,8 @@ nvkm_gpuobj_new(struct nvkm_object *parent, struct nvkm_object *pargpu,
.
flags
=
flags
,
.
flags
=
flags
,
};
};
if
(
!
nv_iclass
(
engine
,
NV_SUBDEV_CLASS
))
return
nvkm_object_ctor
(
parent
,
&
parent
->
engine
->
subdev
.
object
,
engine
=
&
engine
->
engine
->
subdev
.
object
;
&
_nvkm_gpuobj_oclass
,
&
args
,
sizeof
(
args
),
BUG_ON
(
engine
==
NULL
);
return
nvkm_object_ctor
(
parent
,
engine
,
&
_nvkm_gpuobj_oclass
,
&
args
,
sizeof
(
args
),
(
struct
nvkm_object
**
)
pgpuobj
);
(
struct
nvkm_object
**
)
pgpuobj
);
}
}
...
...
drivers/gpu/drm/nouveau/nvkm/core/subdev.c
View file @
a1e88736
...
@@ -31,7 +31,7 @@ nvkm_subdev(void *obj, int idx)
...
@@ -31,7 +31,7 @@ nvkm_subdev(void *obj, int idx)
struct
nvkm_object
*
object
=
nv_object
(
obj
);
struct
nvkm_object
*
object
=
nv_object
(
obj
);
while
(
object
&&
!
nv_iclass
(
object
,
NV_SUBDEV_CLASS
))
while
(
object
&&
!
nv_iclass
(
object
,
NV_SUBDEV_CLASS
))
object
=
object
->
parent
;
object
=
object
->
parent
;
if
(
object
==
NULL
||
nv_subidx
(
nv_subdev
(
object
))
!=
idx
)
if
(
object
==
NULL
||
!
object
->
parent
||
nv_subidx
(
nv_subdev
(
object
))
!=
idx
)
object
=
nv_device
(
obj
)
->
subdev
[
idx
];
object
=
nv_device
(
obj
)
->
subdev
[
idx
];
return
object
?
nv_subdev
(
object
)
:
NULL
;
return
object
?
nv_subdev
(
object
)
:
NULL
;
}
}
...
...
drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
View file @
a1e88736
...
@@ -61,13 +61,24 @@ nvkm_device_list(u64 *name, int size)
...
@@ -61,13 +61,24 @@ nvkm_device_list(u64 *name, int size)
return
nr
;
return
nr
;
}
}
#include <core/parent.h>
struct
nvkm_device
*
struct
nvkm_device
*
nv_device
(
void
*
obj
)
nv_device
(
void
*
obj
)
{
{
struct
nvkm_object
*
device
=
nv_object
(
obj
);
struct
nvkm_object
*
device
=
nv_object
(
obj
);
if
(
device
->
engine
==
NULL
)
{
if
(
device
->
engine
==
NULL
)
{
while
(
device
&&
device
->
parent
)
while
(
device
&&
device
->
parent
)
{
if
(
nv_mclass
(
device
)
==
0x0080
)
{
struct
{
struct
nvkm_parent
base
;
struct
nvkm_device
*
device
;
}
*
udevice
=
(
void
*
)
device
;
return
udevice
->
device
;
}
device
=
device
->
parent
;
device
=
device
->
parent
;
}
}
else
{
}
else
{
device
=
&
nv_object
(
obj
)
->
engine
->
subdev
.
object
;
device
=
&
nv_object
(
obj
)
->
engine
->
subdev
.
object
;
if
(
device
&&
device
->
parent
)
if
(
device
&&
device
->
parent
)
...
@@ -79,12 +90,6 @@ nv_device(void *obj)
...
@@ -79,12 +90,6 @@ nv_device(void *obj)
return
(
void
*
)
device
;
return
(
void
*
)
device
;
}
}
static
struct
nvkm_oclass
nvkm_device_sclass
[]
=
{
{
0x0080
,
&
nvkm_udevice_ofuncs
},
{}
};
static
int
static
int
nvkm_device_event_ctor
(
struct
nvkm_object
*
object
,
void
*
data
,
u32
size
,
nvkm_device_event_ctor
(
struct
nvkm_object
*
object
,
void
*
data
,
u32
size
,
struct
nvkm_notify
*
notify
)
struct
nvkm_notify
*
notify
)
...
@@ -103,10 +108,9 @@ nvkm_device_event_func = {
...
@@ -103,10 +108,9 @@ nvkm_device_event_func = {
.
ctor
=
nvkm_device_event_ctor
,
.
ctor
=
nvkm_device_event_ctor
,
};
};
static
int
int
nvkm_device_fini
(
struct
nvkm_
object
*
object
,
bool
suspend
)
nvkm_device_fini
(
struct
nvkm_
device
*
device
,
bool
suspend
)
{
{
struct
nvkm_device
*
device
=
(
void
*
)
object
;
struct
nvkm_object
*
subdev
;
struct
nvkm_object
*
subdev
;
int
ret
,
i
;
int
ret
,
i
;
...
@@ -136,10 +140,9 @@ nvkm_device_fini(struct nvkm_object *object, bool suspend)
...
@@ -136,10 +140,9 @@ nvkm_device_fini(struct nvkm_object *object, bool suspend)
return
ret
;
return
ret
;
}
}
static
int
int
nvkm_device_init
(
struct
nvkm_
object
*
object
)
nvkm_device_init
(
struct
nvkm_
device
*
device
)
{
{
struct
nvkm_device
*
device
=
(
void
*
)
object
;
struct
nvkm_object
*
subdev
;
struct
nvkm_object
*
subdev
;
int
ret
,
i
=
0
,
c
;
int
ret
,
i
=
0
,
c
;
...
@@ -147,7 +150,7 @@ nvkm_device_init(struct nvkm_object *object)
...
@@ -147,7 +150,7 @@ nvkm_device_init(struct nvkm_object *object)
if
(
ret
)
if
(
ret
)
goto
fail
;
goto
fail
;
for
(
i
=
1
,
c
=
1
;
i
<
NVDEV_SUBDEV_NR
;
i
++
)
{
for
(
i
=
0
,
c
=
0
;
i
<
NVDEV_SUBDEV_NR
;
i
++
)
{
#define _(s,m) case s: if (device->oclass[s] && !device->subdev[s]) { \
#define _(s,m) case s: if (device->oclass[s] && !device->subdev[s]) { \
ret = nvkm_object_ctor(nv_object(device), NULL, \
ret = nvkm_object_ctor(nv_object(device), NULL, \
device->oclass[s], NULL, (s), \
device->oclass[s], NULL, (s), \
...
@@ -286,10 +289,7 @@ nv_device_get_irq(struct nvkm_device *device, bool stall)
...
@@ -286,10 +289,7 @@ nv_device_get_irq(struct nvkm_device *device, bool stall)
static
struct
nvkm_oclass
static
struct
nvkm_oclass
nvkm_device_oclass
=
{
nvkm_device_oclass
=
{
.
handle
=
NV_ENGINE
(
DEVICE
,
0x00
),
.
ofuncs
=
&
(
struct
nvkm_ofuncs
)
{
.
ofuncs
=
&
(
struct
nvkm_ofuncs
)
{
.
init
=
nvkm_device_init
,
.
fini
=
nvkm_device_fini
,
},
},
};
};
...
@@ -356,7 +356,6 @@ nvkm_device_new(void *dev, enum nv_bus_type type, u64 name,
...
@@ -356,7 +356,6 @@ nvkm_device_new(void *dev, enum nv_bus_type type, u64 name,
device
->
name
=
sname
;
device
->
name
=
sname
;
nv_subdev
(
device
)
->
debug
=
nvkm_dbgopt
(
device
->
dbgopt
,
"DEVICE"
);
nv_subdev
(
device
)
->
debug
=
nvkm_dbgopt
(
device
->
dbgopt
,
"DEVICE"
);
nv_engine
(
device
)
->
sclass
=
nvkm_device_sclass
;
list_add_tail
(
&
device
->
head
,
&
nv_devices
);
list_add_tail
(
&
device
->
head
,
&
nv_devices
);
ret
=
nvkm_event_init
(
&
nvkm_device_event_func
,
1
,
1
,
&
device
->
event
);
ret
=
nvkm_event_init
(
&
nvkm_device_event_func
,
1
,
1
,
&
device
->
event
);
...
@@ -482,6 +481,8 @@ nvkm_device_new(void *dev, enum nv_bus_type type, u64 name,
...
@@ -482,6 +481,8 @@ nvkm_device_new(void *dev, enum nv_bus_type type, u64 name,
device
->
oclass
[
i
]
=
NULL
;
device
->
oclass
[
i
]
=
NULL
;
}
}
atomic_set
(
&
device
->
engine
.
subdev
.
object
.
usecount
,
2
);
mutex_init
(
&
device
->
mutex
);
done:
done:
mutex_unlock
(
&
nv_devices_mutex
);
mutex_unlock
(
&
nv_devices_mutex
);
return
ret
;
return
ret
;
...
...
drivers/gpu/drm/nouveau/nvkm/engine/device/priv.h
View file @
a1e88736
...
@@ -13,6 +13,4 @@ int nv50_identify(struct nvkm_device *);
...
@@ -13,6 +13,4 @@ int nv50_identify(struct nvkm_device *);
int
gf100_identify
(
struct
nvkm_device
*
);
int
gf100_identify
(
struct
nvkm_device
*
);
int
gk104_identify
(
struct
nvkm_device
*
);
int
gk104_identify
(
struct
nvkm_device
*
);
int
gm100_identify
(
struct
nvkm_device
*
);
int
gm100_identify
(
struct
nvkm_device
*
);
extern
struct
nvkm_ofuncs
nvkm_udevice_ofuncs
;
#endif
#endif
drivers/gpu/drm/nouveau/nvkm/engine/device/user.c
View file @
a1e88736
...
@@ -173,13 +173,55 @@ nvkm_udevice_map(struct nvkm_object *object, u64 *addr, u32 *size)
...
@@ -173,13 +173,55 @@ nvkm_udevice_map(struct nvkm_object *object, u64 *addr, u32 *size)
return
0
;
return
0
;
}
}
static
int
nvkm_udevice_fini
(
struct
nvkm_object
*
object
,
bool
suspend
)
{
struct
nvkm_udevice
*
udev
=
(
void
*
)
object
;
struct
nvkm_device
*
device
=
udev
->
device
;
int
ret
=
0
;
mutex_lock
(
&
device
->
mutex
);
if
(
!--
device
->
refcount
)
{
ret
=
nvkm_device_fini
(
device
,
suspend
);
if
(
ret
&&
suspend
)
{
device
->
refcount
++
;
goto
done
;
}
}
done:
mutex_unlock
(
&
device
->
mutex
);
return
ret
;
}
static
int
nvkm_udevice_init
(
struct
nvkm_object
*
object
)
{
struct
nvkm_udevice
*
udev
=
(
void
*
)
object
;
struct
nvkm_device
*
device
=
udev
->
device
;
int
ret
=
0
;
mutex_lock
(
&
device
->
mutex
);
if
(
!
device
->
refcount
++
)
{
ret
=
nvkm_device_init
(
device
);
if
(
ret
)
{
device
->
refcount
--
;
goto
done
;
}
}
done:
mutex_unlock
(
&
device
->
mutex
);
return
ret
;
}
static
struct
nvkm_oclass
static
struct
nvkm_oclass
nvkm_udevice_oclass_super
=
{
nvkm_udevice_oclass_super
=
{
.
handle
=
NV_DEVICE
,
.
handle
=
NV_DEVICE
,
.
ofuncs
=
&
(
struct
nvkm_ofuncs
)
{
.
ofuncs
=
&
(
struct
nvkm_ofuncs
)
{
.
dtor
=
_nvkm_parent_dtor
,
.
dtor
=
_nvkm_parent_dtor
,
.
init
=
_nvkm_parent
_init
,
.
init
=
nvkm_udevice
_init
,
.
fini
=
_nvkm_parent
_fini
,
.
fini
=
nvkm_udevice
_fini
,
.
mthd
=
nvkm_udevice_mthd
,
.
mthd
=
nvkm_udevice_mthd
,
.
map
=
nvkm_udevice_map
,
.
map
=
nvkm_udevice_map
,
.
rd08
=
nvkm_udevice_rd08
,
.
rd08
=
nvkm_udevice_rd08
,
...
@@ -223,8 +265,7 @@ nvkm_udevice_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
...
@@ -223,8 +265,7 @@ nvkm_udevice_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
return
-
ENODEV
;
return
-
ENODEV
;
}
}
ret
=
nvkm_parent_create
(
parent
,
nv_object
(
device
),
oclass
,
0
,
ret
=
nvkm_parent_create
(
parent
,
NULL
,
oclass
,
0
,
nvkm_control_oclass
,
nvkm_control_oclass
,
(
1ULL
<<
NVDEV_ENGINE_DMAOBJ
)
|
(
1ULL
<<
NVDEV_ENGINE_DMAOBJ
)
|
(
1ULL
<<
NVDEV_ENGINE_FIFO
)
|
(
1ULL
<<
NVDEV_ENGINE_FIFO
)
|
(
1ULL
<<
NVDEV_ENGINE_DISP
)
|
(
1ULL
<<
NVDEV_ENGINE_DISP
)
|
...
@@ -241,7 +282,7 @@ struct nvkm_ofuncs
...
@@ -241,7 +282,7 @@ struct nvkm_ofuncs
nvkm_udevice_ofuncs
=
{
nvkm_udevice_ofuncs
=
{
.
ctor
=
nvkm_udevice_ctor
,
.
ctor
=
nvkm_udevice_ctor
,
.
dtor
=
_nvkm_parent_dtor
,
.
dtor
=
_nvkm_parent_dtor
,
.
init
=
_nvkm_parent
_init
,
.
init
=
nvkm_udevice
_init
,
.
fini
=
_nvkm_parent
_fini
,
.
fini
=
nvkm_udevice
_fini
,
.
mthd
=
nvkm_udevice_mthd
,
.
mthd
=
nvkm_udevice_mthd
,
};
};
drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c
View file @
a1e88736
...
@@ -26,7 +26,7 @@
...
@@ -26,7 +26,7 @@
#include "outpdp.h"
#include "outpdp.h"
#include <core/client.h>
#include <core/client.h>
#include <core/
engctx
.h>
#include <core/
gpuobj
.h>
#include <core/enum.h>
#include <core/enum.h>
#include <core/handle.h>
#include <core/handle.h>
#include <core/ramht.h>
#include <core/ramht.h>
...
@@ -1292,8 +1292,8 @@ nv50_disp_data_ctor(struct nvkm_object *parent,
...
@@ -1292,8 +1292,8 @@ nv50_disp_data_ctor(struct nvkm_object *parent,
struct
nvkm_object
**
pobject
)
struct
nvkm_object
**
pobject
)
{
{
struct
nv50_disp
*
disp
=
(
void
*
)
engine
;
struct
nv50_disp
*
disp
=
(
void
*
)
engine
;
struct
nvkm_
engctx
*
ectx
;
struct
nvkm_
gpuobj
*
gpuobj
;
int
ret
=
-
EBUSY
;
int
ret
;
/* no context needed for channel objects... */
/* no context needed for channel objects... */
if
(
nv_mclass
(
parent
)
!=
NV_DEVICE
)
{
if
(
nv_mclass
(
parent
)
!=
NV_DEVICE
)
{
...
@@ -1303,26 +1303,26 @@ nv50_disp_data_ctor(struct nvkm_object *parent,
...
@@ -1303,26 +1303,26 @@ nv50_disp_data_ctor(struct nvkm_object *parent,
}
}
/* allocate display hardware to client */
/* allocate display hardware to client */
ret
=
nvkm_gpuobj_create
(
parent
,
engine
,
oclass
,
0
,
NULL
,
0x10000
,
0x10000
,
NVOBJ_FLAG_HEAP
,
&
gpuobj
);
*
pobject
=
nv_object
(
gpuobj
);
mutex_lock
(
&
nv_subdev
(
disp
)
->
mutex
);
mutex_lock
(
&
nv_subdev
(
disp
)
->
mutex
);
if
(
list_empty
(
&
nv_engine
(
disp
)
->
contexts
))
{
if
(
!
list_empty
(
&
nv_engine
(
disp
)
->
contexts
))
ret
=
nvkm_engctx_create
(
parent
,
engine
,
oclass
,
NULL
,
0x10000
,
ret
=
-
EBUSY
;
0x10000
,
NVOBJ_FLAG_HEAP
,
&
ectx
);
*
pobject
=
nv_object
(
ectx
);
}
mutex_unlock
(
&
nv_subdev
(
disp
)
->
mutex
);
mutex_unlock
(
&
nv_subdev
(
disp
)
->
mutex
);
return
ret
;
return
ret
;
}
}
struct
nvkm_oclass
struct
nvkm_oclass
nv50_disp_cclass
=
{
nv50_disp_cclass
=
{
.
handle
=
NV_ENGCTX
(
DISP
,
0x50
),
.
ofuncs
=
&
(
struct
nvkm_ofuncs
)
{
.
ofuncs
=
&
(
struct
nvkm_ofuncs
)
{
.
ctor
=
nv50_disp_data_ctor
,
.
ctor
=
nv50_disp_data_ctor
,
.
dtor
=
_nvkm_
engctx
_dtor
,
.
dtor
=
_nvkm_
gpuobj
_dtor
,
.
init
=
_nvkm_
engctx
_init
,
.
init
=
_nvkm_
gpuobj
_init
,
.
fini
=
_nvkm_
engctx
_fini
,
.
fini
=
_nvkm_
gpuobj
_fini
,
.
rd32
=
_nvkm_
engctx
_rd32
,
.
rd32
=
_nvkm_
gpuobj
_rd32
,
.
wr32
=
_nvkm_
engctx
_wr32
,
.
wr32
=
_nvkm_
gpuobj
_wr32
,
},
},
};
};
...
...
drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c
View file @
a1e88736
...
@@ -639,7 +639,7 @@ nvkm_perfctx_dtor(struct nvkm_object *object)
...
@@ -639,7 +639,7 @@ nvkm_perfctx_dtor(struct nvkm_object *object)
struct
nvkm_perfctx
*
ctx
=
(
void
*
)
object
;
struct
nvkm_perfctx
*
ctx
=
(
void
*
)
object
;
mutex_lock
(
&
nv_subdev
(
pm
)
->
mutex
);
mutex_lock
(
&
nv_subdev
(
pm
)
->
mutex
);
nvkm_
engctx
_destroy
(
&
ctx
->
base
);
nvkm_
gpuobj
_destroy
(
&
ctx
->
base
);
if
(
pm
->
context
==
ctx
)
if
(
pm
->
context
==
ctx
)
pm
->
context
=
NULL
;
pm
->
context
=
NULL
;
mutex_unlock
(
&
nv_subdev
(
pm
)
->
mutex
);
mutex_unlock
(
&
nv_subdev
(
pm
)
->
mutex
);
...
@@ -661,7 +661,7 @@ nvkm_perfctx_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
...
@@ -661,7 +661,7 @@ nvkm_perfctx_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
return
1
;
return
1
;
}
}
ret
=
nvkm_
engctx_create
(
parent
,
engine
,
oclass
,
NULL
,
0
,
0
,
0
,
&
ctx
);
ret
=
nvkm_
gpuobj_create
(
parent
,
engine
,
oclass
,
0
,
NULL
,
0
,
0
,
0
,
&
ctx
);
*
pobject
=
nv_object
(
ctx
);
*
pobject
=
nv_object
(
ctx
);
if
(
ret
)
if
(
ret
)
return
ret
;
return
ret
;
...
@@ -678,12 +678,11 @@ nvkm_perfctx_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
...
@@ -678,12 +678,11 @@ nvkm_perfctx_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
struct
nvkm_oclass
struct
nvkm_oclass
nvkm_pm_cclass
=
{
nvkm_pm_cclass
=
{
.
handle
=
NV_ENGCTX
(
PM
,
0x00
),
.
ofuncs
=
&
(
struct
nvkm_ofuncs
)
{
.
ofuncs
=
&
(
struct
nvkm_ofuncs
)
{
.
ctor
=
nvkm_perfctx_ctor
,
.
ctor
=
nvkm_perfctx_ctor
,
.
dtor
=
nvkm_perfctx_dtor
,
.
dtor
=
nvkm_perfctx_dtor
,
.
init
=
_nvkm_
engctx
_init
,
.
init
=
_nvkm_
gpuobj
_init
,
.
fini
=
_nvkm_
engctx
_fini
,
.
fini
=
_nvkm_
gpuobj
_fini
,
},
},
};
};
...
...
drivers/gpu/drm/nouveau/nvkm/engine/pm/priv.h
View file @
a1e88736
...
@@ -14,10 +14,10 @@ struct nvkm_perfctr {
...
@@ -14,10 +14,10 @@ struct nvkm_perfctr {
extern
struct
nvkm_oclass
nvkm_pm_sclass
[];
extern
struct
nvkm_oclass
nvkm_pm_sclass
[];
#include <core/
engctx
.h>
#include <core/
gpuobj
.h>
struct
nvkm_perfctx
{
struct
nvkm_perfctx
{
struct
nvkm_
engctx
base
;
struct
nvkm_
gpuobj
base
;
};
};
extern
struct
nvkm_oclass
nvkm_pm_cclass
;
extern
struct
nvkm_oclass
nvkm_pm_cclass
;
...
...
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