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
nexedi
linux
Commits
bdda4703
Commit
bdda4703
authored
Dec 05, 2014
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau/disp: outp/conns do not have an engine
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
c272d86e
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
8 deletions
+7
-8
drivers/gpu/drm/nouveau/core/engine/disp/base.c
drivers/gpu/drm/nouveau/core/engine/disp/base.c
+1
-2
drivers/gpu/drm/nouveau/core/engine/disp/conn.c
drivers/gpu/drm/nouveau/core/engine/disp/conn.c
+1
-1
drivers/gpu/drm/nouveau/core/engine/disp/conn.h
drivers/gpu/drm/nouveau/core/engine/disp/conn.h
+1
-1
drivers/gpu/drm/nouveau/core/engine/disp/outp.c
drivers/gpu/drm/nouveau/core/engine/disp/outp.c
+3
-3
drivers/gpu/drm/nouveau/core/engine/disp/outp.h
drivers/gpu/drm/nouveau/core/engine/disp/outp.h
+1
-1
No files found.
drivers/gpu/drm/nouveau/core/engine/disp/base.c
View file @
bdda4703
...
@@ -225,8 +225,7 @@ nouveau_disp_create_(struct nouveau_object *parent,
...
@@ -225,8 +225,7 @@ nouveau_disp_create_(struct nouveau_object *parent,
sclass
++
;
sclass
++
;
}
}
nouveau_object_ctor
(
*
pobject
,
*
pobject
,
oclass
,
nouveau_object_ctor
(
*
pobject
,
NULL
,
oclass
,
&
dcbE
,
i
,
&
object
);
&
dcbE
,
i
,
&
object
);
hpd
=
max
(
hpd
,
(
u8
)(
dcbE
.
connector
+
1
));
hpd
=
max
(
hpd
,
(
u8
)(
dcbE
.
connector
+
1
));
}
}
...
...
drivers/gpu/drm/nouveau/core/engine/disp/conn.c
View file @
bdda4703
...
@@ -86,8 +86,8 @@ nvkm_connector_create_(struct nouveau_object *parent,
...
@@ -86,8 +86,8 @@ nvkm_connector_create_(struct nouveau_object *parent,
int
length
,
void
**
pobject
)
int
length
,
void
**
pobject
)
{
{
static
const
u8
hpd
[]
=
{
0x07
,
0x08
,
0x51
,
0x52
,
0x5e
,
0x5f
,
0x60
};
static
const
u8
hpd
[]
=
{
0x07
,
0x08
,
0x51
,
0x52
,
0x5e
,
0x5f
,
0x60
};
struct
nouveau_disp
*
disp
=
nouveau_disp
(
parent
);
struct
nouveau_gpio
*
gpio
=
nouveau_gpio
(
parent
);
struct
nouveau_gpio
*
gpio
=
nouveau_gpio
(
parent
);
struct
nouveau_disp
*
disp
=
(
void
*
)
engine
;
struct
nvkm_connector
*
conn
;
struct
nvkm_connector
*
conn
;
struct
nvkm_output
*
outp
;
struct
nvkm_output
*
outp
;
struct
dcb_gpio_func
func
;
struct
dcb_gpio_func
func
;
...
...
drivers/gpu/drm/nouveau/core/engine/disp/conn.h
View file @
bdda4703
...
@@ -46,7 +46,7 @@ struct nvkm_connector_impl {
...
@@ -46,7 +46,7 @@ struct nvkm_connector_impl {
#ifndef MSG
#ifndef MSG
#define MSG(l,f,a...) do { \
#define MSG(l,f,a...) do { \
struct nvkm_connector *_conn = (void *)conn; \
struct nvkm_connector *_conn = (void *)conn; \
nv_##l(
nv_object(conn)->engine, "%02x:%02x%02x: "f, _conn->index,
\
nv_##l(
_conn, "%02x:%02x%02x: "f, _conn->index,
\
_conn->info.location, _conn->info.type, ##a); \
_conn->info.location, _conn->info.type, ##a); \
} while(0)
} while(0)
#define DBG(f,a...) MSG(debug, f, ##a)
#define DBG(f,a...) MSG(debug, f, ##a)
...
...
drivers/gpu/drm/nouveau/core/engine/disp/outp.c
View file @
bdda4703
...
@@ -62,9 +62,9 @@ nvkm_output_create_(struct nouveau_object *parent,
...
@@ -62,9 +62,9 @@ nvkm_output_create_(struct nouveau_object *parent,
struct
dcb_output
*
dcbE
,
int
index
,
struct
dcb_output
*
dcbE
,
int
index
,
int
length
,
void
**
pobject
)
int
length
,
void
**
pobject
)
{
{
struct
nouveau_bios
*
bios
=
nouveau_bios
(
engine
);
struct
nouveau_disp
*
disp
=
nouveau_disp
(
parent
);
struct
nouveau_bios
*
bios
=
nouveau_bios
(
parent
);
struct
nouveau_i2c
*
i2c
=
nouveau_i2c
(
parent
);
struct
nouveau_i2c
*
i2c
=
nouveau_i2c
(
parent
);
struct
nouveau_disp
*
disp
=
(
void
*
)
engine
;
struct
nvbios_connE
connE
;
struct
nvbios_connE
connE
;
struct
nvkm_output
*
outp
;
struct
nvkm_output
*
outp
;
u8
ver
,
hdr
;
u8
ver
,
hdr
;
...
@@ -98,7 +98,7 @@ nvkm_output_create_(struct nouveau_object *parent,
...
@@ -98,7 +98,7 @@ nvkm_output_create_(struct nouveau_object *parent,
connE
.
type
=
DCB_CONNECTOR_NONE
;
connE
.
type
=
DCB_CONNECTOR_NONE
;
}
}
ret
=
nouveau_object_ctor
(
parent
,
engine
,
nvkm_connector_oclass
,
ret
=
nouveau_object_ctor
(
parent
,
NULL
,
nvkm_connector_oclass
,
&
connE
,
outp
->
info
.
connector
,
&
connE
,
outp
->
info
.
connector
,
(
struct
nouveau_object
**
)
&
outp
->
conn
);
(
struct
nouveau_object
**
)
&
outp
->
conn
);
if
(
ret
<
0
)
{
if
(
ret
<
0
)
{
...
...
drivers/gpu/drm/nouveau/core/engine/disp/outp.h
View file @
bdda4703
...
@@ -50,7 +50,7 @@ struct nvkm_output_impl {
...
@@ -50,7 +50,7 @@ struct nvkm_output_impl {
#ifndef MSG
#ifndef MSG
#define MSG(l,f,a...) do { \
#define MSG(l,f,a...) do { \
struct nvkm_output *_outp = (void *)outp; \
struct nvkm_output *_outp = (void *)outp; \
nv_##l(
nv_object(outp)->engine, "%02x:%04x:%04x: "f, _outp->index,
\
nv_##l(
_outp, "%02x:%04x:%04x: "f, _outp->index,
\
_outp->info.hasht, _outp->info.hashm, ##a); \
_outp->info.hasht, _outp->info.hashm, ##a); \
} while(0)
} while(0)
#define DBG(f,a...) MSG(debug, f, ##a)
#define DBG(f,a...) MSG(debug, f, ##a)
...
...
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