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
49debbe4
Commit
49debbe4
authored
May 14, 2013
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nvc0/ltcg: fix handling of disabled partitions
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
6d5f8383
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
7 deletions
+8
-7
drivers/gpu/drm/nouveau/core/subdev/ltcg/nvc0.c
drivers/gpu/drm/nouveau/core/subdev/ltcg/nvc0.c
+8
-7
No files found.
drivers/gpu/drm/nouveau/core/subdev/ltcg/nvc0.c
View file @
49debbe4
...
@@ -29,7 +29,6 @@
...
@@ -29,7 +29,6 @@
struct
nvc0_ltcg_priv
{
struct
nvc0_ltcg_priv
{
struct
nouveau_ltcg
base
;
struct
nouveau_ltcg
base
;
u32
part_nr
;
u32
part_nr
;
u32
part_mask
;
u32
subp_nr
;
u32
subp_nr
;
struct
nouveau_mm
tags
;
struct
nouveau_mm
tags
;
u32
num_tags
;
u32
num_tags
;
...
@@ -105,8 +104,6 @@ nvc0_ltcg_tags_clear(struct nouveau_ltcg *ltcg, u32 first, u32 count)
...
@@ -105,8 +104,6 @@ nvc0_ltcg_tags_clear(struct nouveau_ltcg *ltcg, u32 first, u32 count)
/* wait until it's finished with clearing */
/* wait until it's finished with clearing */
for
(
p
=
0
;
p
<
priv
->
part_nr
;
++
p
)
{
for
(
p
=
0
;
p
<
priv
->
part_nr
;
++
p
)
{
if
(
!
(
priv
->
part_mask
&
(
1
<<
p
)))
continue
;
for
(
i
=
0
;
i
<
priv
->
subp_nr
;
++
i
)
for
(
i
=
0
;
i
<
priv
->
subp_nr
;
++
i
)
nv_wait
(
priv
,
0x1410c8
+
p
*
0x2000
+
i
*
0x400
,
~
0
,
0
);
nv_wait
(
priv
,
0x1410c8
+
p
*
0x2000
+
i
*
0x400
,
~
0
,
0
);
}
}
...
@@ -167,16 +164,20 @@ nvc0_ltcg_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
...
@@ -167,16 +164,20 @@ nvc0_ltcg_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
{
{
struct
nvc0_ltcg_priv
*
priv
;
struct
nvc0_ltcg_priv
*
priv
;
struct
nouveau_fb
*
pfb
=
nouveau_fb
(
parent
);
struct
nouveau_fb
*
pfb
=
nouveau_fb
(
parent
);
int
ret
;
u32
parts
,
mask
;
int
ret
,
i
;
ret
=
nouveau_ltcg_create
(
parent
,
engine
,
oclass
,
&
priv
);
ret
=
nouveau_ltcg_create
(
parent
,
engine
,
oclass
,
&
priv
);
*
pobject
=
nv_object
(
priv
);
*
pobject
=
nv_object
(
priv
);
if
(
ret
)
if
(
ret
)
return
ret
;
return
ret
;
priv
->
part_nr
=
nv_rd32
(
priv
,
0x022438
);
parts
=
nv_rd32
(
priv
,
0x022438
);
priv
->
part_mask
=
nv_rd32
(
priv
,
0x022554
);
mask
=
nv_rd32
(
priv
,
0x022554
);
for
(
i
=
0
;
i
<
parts
;
i
++
)
{
if
(
!
(
mask
&
(
1
<<
i
)))
priv
->
part_nr
++
;
}
priv
->
subp_nr
=
nv_rd32
(
priv
,
0x17e8dc
)
>>
28
;
priv
->
subp_nr
=
nv_rd32
(
priv
,
0x17e8dc
)
>>
28
;
nv_mask
(
priv
,
0x17e820
,
0x00100000
,
0x00000000
);
/* INTR_EN &= ~0x10 */
nv_mask
(
priv
,
0x17e820
,
0x00100000
,
0x00000000
);
/* INTR_EN &= ~0x10 */
...
...
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