Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci
Commits
0107bae0
Commit
0107bae0
authored
Jan 22, 2010
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nv50: fail auxch transaction if reply count not what we expect
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
0208843d
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
1 deletion
+7
-1
drivers/gpu/drm/nouveau/nouveau_dp.c
drivers/gpu/drm/nouveau/nouveau_dp.c
+7
-1
No files found.
drivers/gpu/drm/nouveau/nouveau_dp.c
View file @
0107bae0
...
@@ -490,7 +490,8 @@ nouveau_dp_auxch(struct nouveau_i2c_chan *auxch, int cmd, int addr,
...
@@ -490,7 +490,8 @@ nouveau_dp_auxch(struct nouveau_i2c_chan *auxch, int cmd, int addr,
if
(
!
nv_wait
(
NV50_AUXCH_CTRL
(
index
),
0x00010000
,
0x00000000
))
{
if
(
!
nv_wait
(
NV50_AUXCH_CTRL
(
index
),
0x00010000
,
0x00000000
))
{
NV_ERROR
(
dev
,
"expected bit 16 == 0, got 0x%08x
\n
"
,
NV_ERROR
(
dev
,
"expected bit 16 == 0, got 0x%08x
\n
"
,
nv_rd32
(
dev
,
NV50_AUXCH_CTRL
(
index
)));
nv_rd32
(
dev
,
NV50_AUXCH_CTRL
(
index
)));
return
-
EBUSY
;
ret
=
-
EBUSY
;
goto
out
;
}
}
udelay
(
400
);
udelay
(
400
);
...
@@ -501,6 +502,11 @@ nouveau_dp_auxch(struct nouveau_i2c_chan *auxch, int cmd, int addr,
...
@@ -501,6 +502,11 @@ nouveau_dp_auxch(struct nouveau_i2c_chan *auxch, int cmd, int addr,
break
;
break
;
}
}
if
((
stat
&
NV50_AUXCH_STAT_COUNT
)
!=
data_nr
)
{
ret
=
-
EREMOTEIO
;
goto
out
;
}
if
(
cmd
&
1
)
{
if
(
cmd
&
1
)
{
for
(
i
=
0
;
i
<
4
;
i
++
)
{
for
(
i
=
0
;
i
<
4
;
i
++
)
{
data32
[
i
]
=
nv_rd32
(
dev
,
NV50_AUXCH_DATA_IN
(
index
,
i
));
data32
[
i
]
=
nv_rd32
(
dev
,
NV50_AUXCH_DATA_IN
(
index
,
i
));
...
...
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