projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit '33b458d276bb' into kvm-next
[cascardo/linux.git]
/
drivers
/
gpu
/
drm
/
radeon
/
clearstate_cayman.h
diff --git
a/drivers/gpu/drm/radeon/clearstate_cayman.h
b/drivers/gpu/drm/radeon/clearstate_cayman.h
index
aa908c5
..
e48a140
100644
(file)
--- a/
drivers/gpu/drm/radeon/clearstate_cayman.h
+++ b/
drivers/gpu/drm/radeon/clearstate_cayman.h
@@
-1050,7
+1050,7
@@
static const struct cs_extent_def SECT_CONTEXT_defs[] =
{SECT_CONTEXT_def_5, 0x0000a29e, 5 },
{SECT_CONTEXT_def_6, 0x0000a2a5, 56 },
{SECT_CONTEXT_def_7, 0x0000a2de, 290 },
{SECT_CONTEXT_def_5, 0x0000a29e, 5 },
{SECT_CONTEXT_def_6, 0x0000a2a5, 56 },
{SECT_CONTEXT_def_7, 0x0000a2de, 290 },
- {
0
, 0, 0 }
+ {
NULL
, 0, 0 }
};
static const u32 SECT_CLEAR_def_1[] =
{
};
static const u32 SECT_CLEAR_def_1[] =
{
@@
-1061,7
+1061,7
@@
static const u32 SECT_CLEAR_def_1[] =
static const struct cs_extent_def SECT_CLEAR_defs[] =
{
{SECT_CLEAR_def_1, 0x0000ffc0, 3 },
static const struct cs_extent_def SECT_CLEAR_defs[] =
{
{SECT_CLEAR_def_1, 0x0000ffc0, 3 },
- {
0
, 0, 0 }
+ {
NULL
, 0, 0 }
};
static const u32 SECT_CTRLCONST_def_1[] =
{
};
static const u32 SECT_CTRLCONST_def_1[] =
{
@@
-1071,11
+1071,11
@@
static const u32 SECT_CTRLCONST_def_1[] =
static const struct cs_extent_def SECT_CTRLCONST_defs[] =
{
{SECT_CTRLCONST_def_1, 0x0000f3fc, 2 },
static const struct cs_extent_def SECT_CTRLCONST_defs[] =
{
{SECT_CTRLCONST_def_1, 0x0000f3fc, 2 },
- {
0
, 0, 0 }
+ {
NULL
, 0, 0 }
};
static const struct cs_section_def cayman_cs_data[] = {
{ SECT_CONTEXT_defs, SECT_CONTEXT },
{ SECT_CLEAR_defs, SECT_CLEAR },
{ SECT_CTRLCONST_defs, SECT_CTRLCONST },
};
static const struct cs_section_def cayman_cs_data[] = {
{ SECT_CONTEXT_defs, SECT_CONTEXT },
{ SECT_CLEAR_defs, SECT_CLEAR },
{ SECT_CTRLCONST_defs, SECT_CTRLCONST },
- {
0
, SECT_NONE }
+ {
NULL
, SECT_NONE }
};
};