Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gsplhtlxg
clone-Linux
提交
e489bda4
C
clone-Linux
项目概览
gsplhtlxg
/
clone-Linux
通知
2
Star
0
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
clone-Linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
e489bda4
编写于
6月 29, 2011
作者:
K
Keith Packard
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'drm-intel-fixes' into drm-intel-next
上级
1c70c0ce
dc501fbc
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
23 addition
and
14 deletion
+23
-14
drivers/gpu/drm/i915/i915_debugfs.c
drivers/gpu/drm/i915/i915_debugfs.c
+10
-6
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_drv.h
+0
-2
drivers/gpu/drm/i915/i915_suspend.c
drivers/gpu/drm/i915/i915_suspend.c
+13
-6
未找到文件。
drivers/gpu/drm/i915/i915_debugfs.c
浏览文件 @
e489bda4
...
@@ -1245,13 +1245,17 @@ static int i915_context_status(struct seq_file *m, void *unused)
...
@@ -1245,13 +1245,17 @@ static int i915_context_status(struct seq_file *m, void *unused)
if
(
ret
)
if
(
ret
)
return
ret
;
return
ret
;
seq_printf
(
m
,
"power context "
);
if
(
dev_priv
->
pwrctx
)
{
describe_obj
(
m
,
dev_priv
->
pwrctx
);
seq_printf
(
m
,
"power context "
);
seq_printf
(
m
,
"
\n
"
);
describe_obj
(
m
,
dev_priv
->
pwrctx
);
seq_printf
(
m
,
"
\n
"
);
}
seq_printf
(
m
,
"render context "
);
if
(
dev_priv
->
renderctx
)
{
describe_obj
(
m
,
dev_priv
->
renderctx
);
seq_printf
(
m
,
"render context "
);
seq_printf
(
m
,
"
\n
"
);
describe_obj
(
m
,
dev_priv
->
renderctx
);
seq_printf
(
m
,
"
\n
"
);
}
mutex_unlock
(
&
dev
->
mode_config
.
mutex
);
mutex_unlock
(
&
dev
->
mode_config
.
mutex
);
...
...
drivers/gpu/drm/i915/i915_drv.h
浏览文件 @
e489bda4
...
@@ -998,8 +998,6 @@ extern bool i915_enable_hangcheck;
...
@@ -998,8 +998,6 @@ extern bool i915_enable_hangcheck;
extern
int
i915_suspend
(
struct
drm_device
*
dev
,
pm_message_t
state
);
extern
int
i915_suspend
(
struct
drm_device
*
dev
,
pm_message_t
state
);
extern
int
i915_resume
(
struct
drm_device
*
dev
);
extern
int
i915_resume
(
struct
drm_device
*
dev
);
extern
void
i915_save_display
(
struct
drm_device
*
dev
);
extern
void
i915_restore_display
(
struct
drm_device
*
dev
);
extern
int
i915_master_create
(
struct
drm_device
*
dev
,
struct
drm_master
*
master
);
extern
int
i915_master_create
(
struct
drm_device
*
dev
,
struct
drm_master
*
master
);
extern
void
i915_master_destroy
(
struct
drm_device
*
dev
,
struct
drm_master
*
master
);
extern
void
i915_master_destroy
(
struct
drm_device
*
dev
,
struct
drm_master
*
master
);
...
...
drivers/gpu/drm/i915/i915_suspend.c
浏览文件 @
e489bda4
...
@@ -597,7 +597,7 @@ static void i915_restore_modeset_reg(struct drm_device *dev)
...
@@ -597,7 +597,7 @@ static void i915_restore_modeset_reg(struct drm_device *dev)
return
;
return
;
}
}
void
i915_save_display
(
struct
drm_device
*
dev
)
static
void
i915_save_display
(
struct
drm_device
*
dev
)
{
{
struct
drm_i915_private
*
dev_priv
=
dev
->
dev_private
;
struct
drm_i915_private
*
dev_priv
=
dev
->
dev_private
;
...
@@ -678,7 +678,6 @@ void i915_save_display(struct drm_device *dev)
...
@@ -678,7 +678,6 @@ void i915_save_display(struct drm_device *dev)
}
}
/* VGA state */
/* VGA state */
mutex_lock
(
&
dev
->
struct_mutex
);
dev_priv
->
saveVGA0
=
I915_READ
(
VGA0
);
dev_priv
->
saveVGA0
=
I915_READ
(
VGA0
);
dev_priv
->
saveVGA1
=
I915_READ
(
VGA1
);
dev_priv
->
saveVGA1
=
I915_READ
(
VGA1
);
dev_priv
->
saveVGA_PD
=
I915_READ
(
VGA_PD
);
dev_priv
->
saveVGA_PD
=
I915_READ
(
VGA_PD
);
...
@@ -688,10 +687,9 @@ void i915_save_display(struct drm_device *dev)
...
@@ -688,10 +687,9 @@ void i915_save_display(struct drm_device *dev)
dev_priv
->
saveVGACNTRL
=
I915_READ
(
VGACNTRL
);
dev_priv
->
saveVGACNTRL
=
I915_READ
(
VGACNTRL
);
i915_save_vga
(
dev
);
i915_save_vga
(
dev
);
mutex_unlock
(
&
dev
->
struct_mutex
);
}
}
void
i915_restore_display
(
struct
drm_device
*
dev
)
static
void
i915_restore_display
(
struct
drm_device
*
dev
)
{
{
struct
drm_i915_private
*
dev_priv
=
dev
->
dev_private
;
struct
drm_i915_private
*
dev_priv
=
dev
->
dev_private
;
...
@@ -783,7 +781,6 @@ void i915_restore_display(struct drm_device *dev)
...
@@ -783,7 +781,6 @@ void i915_restore_display(struct drm_device *dev)
else
else
I915_WRITE
(
VGACNTRL
,
dev_priv
->
saveVGACNTRL
);
I915_WRITE
(
VGACNTRL
,
dev_priv
->
saveVGACNTRL
);
mutex_lock
(
&
dev
->
struct_mutex
);
I915_WRITE
(
VGA0
,
dev_priv
->
saveVGA0
);
I915_WRITE
(
VGA0
,
dev_priv
->
saveVGA0
);
I915_WRITE
(
VGA1
,
dev_priv
->
saveVGA1
);
I915_WRITE
(
VGA1
,
dev_priv
->
saveVGA1
);
I915_WRITE
(
VGA_PD
,
dev_priv
->
saveVGA_PD
);
I915_WRITE
(
VGA_PD
,
dev_priv
->
saveVGA_PD
);
...
@@ -791,7 +788,6 @@ void i915_restore_display(struct drm_device *dev)
...
@@ -791,7 +788,6 @@ void i915_restore_display(struct drm_device *dev)
udelay
(
150
);
udelay
(
150
);
i915_restore_vga
(
dev
);
i915_restore_vga
(
dev
);
mutex_unlock
(
&
dev
->
struct_mutex
);
}
}
int
i915_save_state
(
struct
drm_device
*
dev
)
int
i915_save_state
(
struct
drm_device
*
dev
)
...
@@ -801,6 +797,8 @@ int i915_save_state(struct drm_device *dev)
...
@@ -801,6 +797,8 @@ int i915_save_state(struct drm_device *dev)
pci_read_config_byte
(
dev
->
pdev
,
LBB
,
&
dev_priv
->
saveLBB
);
pci_read_config_byte
(
dev
->
pdev
,
LBB
,
&
dev_priv
->
saveLBB
);
mutex_lock
(
&
dev
->
struct_mutex
);
/* Hardware status page */
/* Hardware status page */
dev_priv
->
saveHWS
=
I915_READ
(
HWS_PGA
);
dev_priv
->
saveHWS
=
I915_READ
(
HWS_PGA
);
...
@@ -840,6 +838,8 @@ int i915_save_state(struct drm_device *dev)
...
@@ -840,6 +838,8 @@ int i915_save_state(struct drm_device *dev)
for
(
i
=
0
;
i
<
3
;
i
++
)
for
(
i
=
0
;
i
<
3
;
i
++
)
dev_priv
->
saveSWF2
[
i
]
=
I915_READ
(
SWF30
+
(
i
<<
2
));
dev_priv
->
saveSWF2
[
i
]
=
I915_READ
(
SWF30
+
(
i
<<
2
));
mutex_unlock
(
&
dev
->
struct_mutex
);
return
0
;
return
0
;
}
}
...
@@ -850,6 +850,8 @@ int i915_restore_state(struct drm_device *dev)
...
@@ -850,6 +850,8 @@ int i915_restore_state(struct drm_device *dev)
pci_write_config_byte
(
dev
->
pdev
,
LBB
,
dev_priv
->
saveLBB
);
pci_write_config_byte
(
dev
->
pdev
,
LBB
,
dev_priv
->
saveLBB
);
mutex_lock
(
&
dev
->
struct_mutex
);
/* Hardware status page */
/* Hardware status page */
I915_WRITE
(
HWS_PGA
,
dev_priv
->
saveHWS
);
I915_WRITE
(
HWS_PGA
,
dev_priv
->
saveHWS
);
...
@@ -867,6 +869,7 @@ int i915_restore_state(struct drm_device *dev)
...
@@ -867,6 +869,7 @@ int i915_restore_state(struct drm_device *dev)
I915_WRITE
(
IER
,
dev_priv
->
saveIER
);
I915_WRITE
(
IER
,
dev_priv
->
saveIER
);
I915_WRITE
(
IMR
,
dev_priv
->
saveIMR
);
I915_WRITE
(
IMR
,
dev_priv
->
saveIMR
);
}
}
mutex_unlock
(
&
dev
->
struct_mutex
);
intel_init_clock_gating
(
dev
);
intel_init_clock_gating
(
dev
);
...
@@ -880,6 +883,8 @@ int i915_restore_state(struct drm_device *dev)
...
@@ -880,6 +883,8 @@ int i915_restore_state(struct drm_device *dev)
gen6_update_ring_freq
(
dev_priv
);
gen6_update_ring_freq
(
dev_priv
);
}
}
mutex_lock
(
&
dev
->
struct_mutex
);
/* Cache mode state */
/* Cache mode state */
I915_WRITE
(
CACHE_MODE_0
,
dev_priv
->
saveCACHE_MODE_0
|
0xffff0000
);
I915_WRITE
(
CACHE_MODE_0
,
dev_priv
->
saveCACHE_MODE_0
|
0xffff0000
);
...
@@ -893,6 +898,8 @@ int i915_restore_state(struct drm_device *dev)
...
@@ -893,6 +898,8 @@ int i915_restore_state(struct drm_device *dev)
for
(
i
=
0
;
i
<
3
;
i
++
)
for
(
i
=
0
;
i
<
3
;
i
++
)
I915_WRITE
(
SWF30
+
(
i
<<
2
),
dev_priv
->
saveSWF2
[
i
]);
I915_WRITE
(
SWF30
+
(
i
<<
2
),
dev_priv
->
saveSWF2
[
i
]);
mutex_unlock
(
&
dev
->
struct_mutex
);
intel_i2c_reset
(
dev
);
intel_i2c_reset
(
dev
);
return
0
;
return
0
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录