Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
Kernel
提交
887a82ee
K
Kernel
项目概览
openeuler
/
Kernel
大约 1 年 前同步成功
通知
5
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
Kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
887a82ee
编写于
7月 25, 2011
作者:
K
Keith Packard
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'drm-intel-fixes' into drm-intel-next
上级
df797679
a65e34c7
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
27 addition
and
21 deletion
+27
-21
drivers/gpu/drm/i915/i915_irq.c
drivers/gpu/drm/i915/i915_irq.c
+3
-0
drivers/gpu/drm/i915/intel_dp.c
drivers/gpu/drm/i915/intel_dp.c
+24
-21
未找到文件。
drivers/gpu/drm/i915/i915_irq.c
浏览文件 @
887a82ee
...
...
@@ -306,6 +306,7 @@ static void i915_hotplug_work_func(struct work_struct *work)
struct
drm_mode_config
*
mode_config
=
&
dev
->
mode_config
;
struct
intel_encoder
*
encoder
;
mutex_lock
(
&
mode_config
->
mutex
);
DRM_DEBUG_KMS
(
"running encoder hotplug functions
\n
"
);
list_for_each_entry
(
encoder
,
&
mode_config
->
encoder_list
,
base
.
head
)
...
...
@@ -314,6 +315,8 @@ static void i915_hotplug_work_func(struct work_struct *work)
/* Just fire off a uevent and let userspace tell us what to do */
drm_helper_hpd_irq_event
(
dev
);
mutex_unlock
(
&
mode_config
->
mutex
);
}
static
void
i915_handle_rps_change
(
struct
drm_device
*
dev
)
...
...
drivers/gpu/drm/i915/intel_dp.c
浏览文件 @
887a82ee
...
...
@@ -52,7 +52,7 @@ struct intel_dp {
uint32_t
color_range
;
uint8_t
link_bw
;
uint8_t
lane_count
;
uint8_t
dpcd
[
4
];
uint8_t
dpcd
[
8
];
struct
i2c_adapter
adapter
;
struct
i2c_algo_dp_aux_data
algo
;
bool
is_pch_edp
;
...
...
@@ -770,6 +770,7 @@ intel_dp_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode,
memset
(
intel_dp
->
link_configuration
,
0
,
DP_LINK_CONFIGURATION_SIZE
);
intel_dp
->
link_configuration
[
0
]
=
intel_dp
->
link_bw
;
intel_dp
->
link_configuration
[
1
]
=
intel_dp
->
lane_count
;
intel_dp
->
link_configuration
[
8
]
=
DP_SET_ANSI_8B10B
;
/*
* Check for DPCD version > 1.1 and enhanced framing support
...
...
@@ -1596,11 +1597,23 @@ intel_dp_check_link_status(struct intel_dp *intel_dp)
}
}
static
enum
drm_connector_status
i915_dp_detect_common
(
struct
intel_dp
*
intel_dp
)
{
enum
drm_connector_status
status
=
connector_status_disconnected
;
if
(
intel_dp_aux_native_read_retry
(
intel_dp
,
0x000
,
intel_dp
->
dpcd
,
sizeof
(
intel_dp
->
dpcd
))
&&
(
intel_dp
->
dpcd
[
DP_DPCD_REV
]
!=
0
))
status
=
connector_status_connected
;
return
status
;
}
static
enum
drm_connector_status
ironlake_dp_detect
(
struct
intel_dp
*
intel_dp
)
{
enum
drm_connector_status
status
;
bool
ret
;
/* Can't disconnect eDP, but you can close the lid... */
if
(
is_edp
(
intel_dp
))
{
...
...
@@ -1610,15 +1623,7 @@ ironlake_dp_detect(struct intel_dp *intel_dp)
return
status
;
}
status
=
connector_status_disconnected
;
ret
=
intel_dp_aux_native_read_retry
(
intel_dp
,
0x000
,
intel_dp
->
dpcd
,
sizeof
(
intel_dp
->
dpcd
));
if
(
ret
&&
intel_dp
->
dpcd
[
DP_DPCD_REV
]
!=
0
)
status
=
connector_status_connected
;
DRM_DEBUG_KMS
(
"DPCD: %hx%hx%hx%hx
\n
"
,
intel_dp
->
dpcd
[
0
],
intel_dp
->
dpcd
[
1
],
intel_dp
->
dpcd
[
2
],
intel_dp
->
dpcd
[
3
]);
return
status
;
return
i915_dp_detect_common
(
intel_dp
);
}
static
enum
drm_connector_status
...
...
@@ -1626,7 +1631,6 @@ g4x_dp_detect(struct intel_dp *intel_dp)
{
struct
drm_device
*
dev
=
intel_dp
->
base
.
base
.
dev
;
struct
drm_i915_private
*
dev_priv
=
dev
->
dev_private
;
enum
drm_connector_status
status
;
uint32_t
temp
,
bit
;
switch
(
intel_dp
->
output_reg
)
{
...
...
@@ -1648,15 +1652,7 @@ g4x_dp_detect(struct intel_dp *intel_dp)
if
((
temp
&
bit
)
==
0
)
return
connector_status_disconnected
;
status
=
connector_status_disconnected
;
if
(
intel_dp_aux_native_read
(
intel_dp
,
0x000
,
intel_dp
->
dpcd
,
sizeof
(
intel_dp
->
dpcd
))
==
sizeof
(
intel_dp
->
dpcd
))
{
if
(
intel_dp
->
dpcd
[
DP_DPCD_REV
]
!=
0
)
status
=
connector_status_connected
;
}
return
status
;
return
i915_dp_detect_common
(
intel_dp
);
}
/**
...
...
@@ -1674,11 +1670,18 @@ intel_dp_detect(struct drm_connector *connector, bool force)
struct
edid
*
edid
=
NULL
;
intel_dp
->
has_audio
=
false
;
memset
(
intel_dp
->
dpcd
,
0
,
sizeof
(
intel_dp
->
dpcd
));
if
(
HAS_PCH_SPLIT
(
dev
))
status
=
ironlake_dp_detect
(
intel_dp
);
else
status
=
g4x_dp_detect
(
intel_dp
);
DRM_DEBUG_KMS
(
"DPCD: %02hx%02hx%02hx%02hx%02hx%02hx%02hx%02hx
\n
"
,
intel_dp
->
dpcd
[
0
],
intel_dp
->
dpcd
[
1
],
intel_dp
->
dpcd
[
2
],
intel_dp
->
dpcd
[
3
],
intel_dp
->
dpcd
[
4
],
intel_dp
->
dpcd
[
5
],
intel_dp
->
dpcd
[
6
],
intel_dp
->
dpcd
[
7
]);
if
(
status
!=
connector_status_connected
)
return
status
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录