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
6d8cf000
Commit
6d8cf000
authored
Mar 06, 2013
by
Alex Deucher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/radeon: initialize save/restore buffer for pg on verde
Signed-off-by:
Alex Deucher
<
alexander.deucher@amd.com
>
parent
93656cdd
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
241 additions
and
2 deletions
+241
-2
drivers/gpu/drm/radeon/si.c
drivers/gpu/drm/radeon/si.c
+241
-2
No files found.
drivers/gpu/drm/radeon/si.c
View file @
6d8cf000
...
...
@@ -77,6 +77,228 @@ extern u32 evergreen_get_number_of_dram_channels(struct radeon_device *rdev);
extern
void
evergreen_print_gpu_status_regs
(
struct
radeon_device
*
rdev
);
extern
bool
evergreen_is_display_hung
(
struct
radeon_device
*
rdev
);
static
const
u32
verde_rlc_save_restore_register_list
[]
=
{
(
0x8000
<<
16
)
|
(
0x98f4
>>
2
),
0x00000000
,
(
0x8040
<<
16
)
|
(
0x98f4
>>
2
),
0x00000000
,
(
0x8000
<<
16
)
|
(
0xe80
>>
2
),
0x00000000
,
(
0x8040
<<
16
)
|
(
0xe80
>>
2
),
0x00000000
,
(
0x8000
<<
16
)
|
(
0x89bc
>>
2
),
0x00000000
,
(
0x8040
<<
16
)
|
(
0x89bc
>>
2
),
0x00000000
,
(
0x8000
<<
16
)
|
(
0x8c1c
>>
2
),
0x00000000
,
(
0x8040
<<
16
)
|
(
0x8c1c
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x98f0
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0xe7c
>>
2
),
0x00000000
,
(
0x8000
<<
16
)
|
(
0x9148
>>
2
),
0x00000000
,
(
0x8040
<<
16
)
|
(
0x9148
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x9150
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x897c
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x8d8c
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0xac54
>>
2
),
0X00000000
,
0x3
,
(
0x9c00
<<
16
)
|
(
0x98f8
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x9910
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x9914
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x9918
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x991c
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x9920
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x9924
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x9928
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x992c
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x9930
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x9934
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x9938
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x993c
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x9940
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x9944
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x9948
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x994c
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x9950
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x9954
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x9958
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x995c
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x9960
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x9964
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x9968
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x996c
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x9970
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x9974
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x9978
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x997c
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x9980
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x9984
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x9988
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x998c
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x8c00
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x8c14
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x8c04
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x8c08
>>
2
),
0x00000000
,
(
0x8000
<<
16
)
|
(
0x9b7c
>>
2
),
0x00000000
,
(
0x8040
<<
16
)
|
(
0x9b7c
>>
2
),
0x00000000
,
(
0x8000
<<
16
)
|
(
0xe84
>>
2
),
0x00000000
,
(
0x8040
<<
16
)
|
(
0xe84
>>
2
),
0x00000000
,
(
0x8000
<<
16
)
|
(
0x89c0
>>
2
),
0x00000000
,
(
0x8040
<<
16
)
|
(
0x89c0
>>
2
),
0x00000000
,
(
0x8000
<<
16
)
|
(
0x914c
>>
2
),
0x00000000
,
(
0x8040
<<
16
)
|
(
0x914c
>>
2
),
0x00000000
,
(
0x8000
<<
16
)
|
(
0x8c20
>>
2
),
0x00000000
,
(
0x8040
<<
16
)
|
(
0x8c20
>>
2
),
0x00000000
,
(
0x8000
<<
16
)
|
(
0x9354
>>
2
),
0x00000000
,
(
0x8040
<<
16
)
|
(
0x9354
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x9060
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x9364
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x9100
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x913c
>>
2
),
0x00000000
,
(
0x8000
<<
16
)
|
(
0x90e0
>>
2
),
0x00000000
,
(
0x8000
<<
16
)
|
(
0x90e4
>>
2
),
0x00000000
,
(
0x8000
<<
16
)
|
(
0x90e8
>>
2
),
0x00000000
,
(
0x8040
<<
16
)
|
(
0x90e0
>>
2
),
0x00000000
,
(
0x8040
<<
16
)
|
(
0x90e4
>>
2
),
0x00000000
,
(
0x8040
<<
16
)
|
(
0x90e8
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x8bcc
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x8b24
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x88c4
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x8e50
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x8c0c
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x8e58
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x8e5c
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x9508
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x950c
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x9494
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0xac0c
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0xac10
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0xac14
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0xae00
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0xac08
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x88d4
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x88c8
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x88cc
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x89b0
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x8b10
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x8a14
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x9830
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x9834
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x9838
>>
2
),
0x00000000
,
(
0x9c00
<<
16
)
|
(
0x9a10
>>
2
),
0x00000000
,
(
0x8000
<<
16
)
|
(
0x9870
>>
2
),
0x00000000
,
(
0x8000
<<
16
)
|
(
0x9874
>>
2
),
0x00000000
,
(
0x8001
<<
16
)
|
(
0x9870
>>
2
),
0x00000000
,
(
0x8001
<<
16
)
|
(
0x9874
>>
2
),
0x00000000
,
(
0x8040
<<
16
)
|
(
0x9870
>>
2
),
0x00000000
,
(
0x8040
<<
16
)
|
(
0x9874
>>
2
),
0x00000000
,
(
0x8041
<<
16
)
|
(
0x9870
>>
2
),
0x00000000
,
(
0x8041
<<
16
)
|
(
0x9874
>>
2
),
0x00000000
,
0x00000000
};
static
const
u32
tahiti_golden_rlc_registers
[]
=
{
0xc424
,
0xffffffff
,
0x00601005
,
...
...
@@ -4363,7 +4585,8 @@ void si_rlc_fini(struct radeon_device *rdev)
int
si_rlc_init
(
struct
radeon_device
*
rdev
)
{
int
r
;
int
r
,
i
;
volatile
u32
*
dst_ptr
;
/* save restore block */
if
(
rdev
->
rlc
.
save_restore_obj
==
NULL
)
{
...
...
@@ -4383,13 +4606,29 @@ int si_rlc_init(struct radeon_device *rdev)
}
r
=
radeon_bo_pin
(
rdev
->
rlc
.
save_restore_obj
,
RADEON_GEM_DOMAIN_VRAM
,
&
rdev
->
rlc
.
save_restore_gpu_addr
);
radeon_bo_unreserve
(
rdev
->
rlc
.
save_restore_obj
);
if
(
r
)
{
radeon_bo_unreserve
(
rdev
->
rlc
.
save_restore_obj
);
dev_warn
(
rdev
->
dev
,
"(%d) pin RLC sr bo failed
\n
"
,
r
);
si_rlc_fini
(
rdev
);
return
r
;
}
if
(
rdev
->
family
==
CHIP_VERDE
)
{
r
=
radeon_bo_kmap
(
rdev
->
rlc
.
save_restore_obj
,
(
void
**
)
&
rdev
->
rlc
.
sr_ptr
);
if
(
r
)
{
dev_warn
(
rdev
->
dev
,
"(%d) map RLC sr bo failed
\n
"
,
r
);
si_rlc_fini
(
rdev
);
return
r
;
}
/* write the sr buffer */
dst_ptr
=
rdev
->
rlc
.
sr_ptr
;
for
(
i
=
0
;
i
<
ARRAY_SIZE
(
verde_rlc_save_restore_register_list
);
i
++
)
{
dst_ptr
[
i
]
=
verde_rlc_save_restore_register_list
[
i
];
}
radeon_bo_kunmap
(
rdev
->
rlc
.
save_restore_obj
);
}
radeon_bo_unreserve
(
rdev
->
rlc
.
save_restore_obj
);
/* clear state block */
if
(
rdev
->
rlc
.
clear_state_obj
==
NULL
)
{
r
=
radeon_bo_create
(
rdev
,
RADEON_GPU_PAGE_SIZE
,
PAGE_SIZE
,
true
,
...
...
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