Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
cloud-kernel
提交
80bc340b
cloud-kernel
项目概览
openanolis
/
cloud-kernel
接近 1 年 前同步成功
通知
152
Star
36
Fork
7
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
10
列表
看板
标记
里程碑
合并请求
2
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
cloud-kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
10
Issue
10
列表
看板
标记
里程碑
合并请求
2
合并请求
2
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
80bc340b
编写于
8月 10, 2014
作者:
B
Ben Skeggs
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
drm/nouveau/disp: implement nvif event sources for vblank/connector notifiers
Signed-off-by:
N
Ben Skeggs
<
bskeggs@redhat.com
>
上级
b76f1529
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
47 addition
and
20 deletion
+47
-20
drivers/gpu/drm/nouveau/core/engine/disp/base.c
drivers/gpu/drm/nouveau/core/engine/disp/base.c
+19
-0
drivers/gpu/drm/nouveau/core/engine/disp/nv04.c
drivers/gpu/drm/nouveau/core/engine/disp/nv04.c
+1
-0
drivers/gpu/drm/nouveau/core/engine/disp/nv50.c
drivers/gpu/drm/nouveau/core/engine/disp/nv50.c
+1
-0
drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c
drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c
+1
-0
drivers/gpu/drm/nouveau/core/engine/disp/priv.h
drivers/gpu/drm/nouveau/core/engine/disp/priv.h
+1
-0
drivers/gpu/drm/nouveau/nouveau_connector.c
drivers/gpu/drm/nouveau/nouveau_connector.c
+5
-5
drivers/gpu/drm/nouveau/nouveau_connector.h
drivers/gpu/drm/nouveau/nouveau_connector.h
+3
-1
drivers/gpu/drm/nouveau/nouveau_crtc.h
drivers/gpu/drm/nouveau/nouveau_crtc.h
+3
-1
drivers/gpu/drm/nouveau/nouveau_display.c
drivers/gpu/drm/nouveau/nouveau_display.c
+10
-10
drivers/gpu/drm/nouveau/nvif/class.h
drivers/gpu/drm/nouveau/nvif/class.h
+3
-1
drivers/gpu/drm/nouveau/nvif/device.h
drivers/gpu/drm/nouveau/nvif/device.h
+0
-2
未找到文件。
drivers/gpu/drm/nouveau/core/engine/disp/base.c
浏览文件 @
80bc340b
...
...
@@ -24,6 +24,7 @@
#include <core/os.h>
#include <nvif/unpack.h>
#include <nvif/class.h>
#include <nvif/event.h>
#include "priv.h"
...
...
@@ -92,6 +93,24 @@ nouveau_disp_hpd_func = {
.
ctor
=
nouveau_disp_hpd_ctor
};
int
nouveau_disp_ntfy
(
struct
nouveau_object
*
object
,
u32
type
,
struct
nvkm_event
**
event
)
{
struct
nouveau_disp
*
disp
=
(
void
*
)
object
->
engine
;
switch
(
type
)
{
case
NV04_DISP_NTFY_VBLANK
:
*
event
=
&
disp
->
vblank
;
return
0
;
case
NV04_DISP_NTFY_CONN
:
*
event
=
&
disp
->
hpd
;
return
0
;
default:
break
;
}
return
-
EINVAL
;
}
int
_nouveau_disp_fini
(
struct
nouveau_object
*
object
,
bool
suspend
)
{
...
...
drivers/gpu/drm/nouveau/core/engine/disp/nv04.c
浏览文件 @
80bc340b
...
...
@@ -112,6 +112,7 @@ nv04_disp_ofuncs = {
.
init
=
nouveau_object_init
,
.
fini
=
nouveau_object_fini
,
.
mthd
=
nv04_disp_mthd
,
.
ntfy
=
nouveau_disp_ntfy
,
};
static
struct
nouveau_oclass
...
...
drivers/gpu/drm/nouveau/core/engine/disp/nv50.c
浏览文件 @
80bc340b
...
...
@@ -1142,6 +1142,7 @@ nv50_disp_base_ofuncs = {
.
init
=
nv50_disp_base_init
,
.
fini
=
nv50_disp_base_fini
,
.
mthd
=
nv50_disp_base_mthd
,
.
ntfy
=
nouveau_disp_ntfy
,
};
static
struct
nouveau_oclass
...
...
drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c
浏览文件 @
80bc340b
...
...
@@ -716,6 +716,7 @@ nvd0_disp_base_ofuncs = {
.
init
=
nvd0_disp_base_init
,
.
fini
=
nvd0_disp_base_fini
,
.
mthd
=
nv50_disp_base_mthd
,
.
ntfy
=
nouveau_disp_ntfy
,
};
static
struct
nouveau_oclass
...
...
drivers/gpu/drm/nouveau/core/engine/disp/priv.h
浏览文件 @
80bc340b
...
...
@@ -42,5 +42,6 @@ extern struct nouveau_oclass *nvkm_connector_oclass;
int
nouveau_disp_vblank_ctor
(
void
*
data
,
u32
size
,
struct
nvkm_notify
*
);
void
nouveau_disp_vblank
(
struct
nouveau_disp
*
,
int
head
);
int
nouveau_disp_ntfy
(
struct
nouveau_object
*
,
u32
,
struct
nvkm_event
**
);
#endif
drivers/gpu/drm/nouveau/nouveau_connector.c
浏览文件 @
80bc340b
...
...
@@ -100,7 +100,7 @@ static void
nouveau_connector_destroy
(
struct
drm_connector
*
connector
)
{
struct
nouveau_connector
*
nv_connector
=
nouveau_connector
(
connector
);
nv
km
_notify_fini
(
&
nv_connector
->
hpd
);
nv
if
_notify_fini
(
&
nv_connector
->
hpd
);
kfree
(
nv_connector
->
edid
);
drm_connector_unregister
(
connector
);
drm_connector_cleanup
(
connector
);
...
...
@@ -937,7 +937,7 @@ nouveau_connector_funcs_dp = {
};
static
int
nouveau_connector_hotplug
(
struct
nv
km
_notify
*
notify
)
nouveau_connector_hotplug
(
struct
nv
if
_notify
*
notify
)
{
struct
nouveau_connector
*
nv_connector
=
container_of
(
notify
,
typeof
(
*
nv_connector
),
hpd
);
...
...
@@ -959,7 +959,7 @@ nouveau_connector_hotplug(struct nvkm_notify *notify)
drm_helper_hpd_irq_event
(
connector
->
dev
);
}
return
NV
KM
_NOTIFY_KEEP
;
return
NV
IF
_NOTIFY_KEEP
;
}
static
ssize_t
...
...
@@ -1029,7 +1029,6 @@ nouveau_connector_create(struct drm_device *dev, int index)
struct
nouveau_drm
*
drm
=
nouveau_drm
(
dev
);
struct
nouveau_display
*
disp
=
nouveau_display
(
dev
);
struct
nouveau_connector
*
nv_connector
=
NULL
;
struct
nouveau_disp
*
pdisp
=
nvkm_disp
(
&
drm
->
device
);
struct
drm_connector
*
connector
;
int
type
,
ret
=
0
;
bool
dummy
;
...
...
@@ -1215,7 +1214,8 @@ nouveau_connector_create(struct drm_device *dev, int index)
break
;
}
ret
=
nvkm_notify_init
(
&
pdisp
->
hpd
,
nouveau_connector_hotplug
,
true
,
ret
=
nvif_notify_init
(
&
disp
->
disp
,
NULL
,
nouveau_connector_hotplug
,
true
,
NV04_DISP_NTFY_CONN
,
&
(
struct
nvif_notify_conn_req_v0
)
{
.
mask
=
NVIF_NOTIFY_CONN_V0_ANY
,
.
conn
=
index
,
...
...
drivers/gpu/drm/nouveau/nouveau_connector.h
浏览文件 @
80bc340b
...
...
@@ -27,6 +27,8 @@
#ifndef __NOUVEAU_CONNECTOR_H__
#define __NOUVEAU_CONNECTOR_H__
#include <nvif/notify.h>
#include <drm/drm_edid.h>
#include <drm/drm_dp_helper.h>
#include "nouveau_crtc.h"
...
...
@@ -63,7 +65,7 @@ struct nouveau_connector {
u8
index
;
u8
*
dcb
;
struct
nv
km
_notify
hpd
;
struct
nv
if
_notify
hpd
;
struct
drm_dp_aux
aux
;
...
...
drivers/gpu/drm/nouveau/nouveau_crtc.h
浏览文件 @
80bc340b
...
...
@@ -27,11 +27,13 @@
#ifndef __NOUVEAU_CRTC_H__
#define __NOUVEAU_CRTC_H__
#include <nvif/notify.h>
struct
nouveau_crtc
{
struct
drm_crtc
base
;
int
index
;
struct
nv
km
_notify
vblank
;
struct
nv
if
_notify
vblank
;
uint32_t
dpms_saved_fp_control
;
uint32_t
fp_users
;
...
...
drivers/gpu/drm/nouveau/nouveau_display.c
浏览文件 @
80bc340b
...
...
@@ -42,12 +42,12 @@
#include <nvif/event.h>
static
int
nouveau_display_vblank_handler
(
struct
nv
km
_notify
*
notify
)
nouveau_display_vblank_handler
(
struct
nv
if
_notify
*
notify
)
{
struct
nouveau_crtc
*
nv_crtc
=
container_of
(
notify
,
typeof
(
*
nv_crtc
),
vblank
);
drm_handle_vblank
(
nv_crtc
->
base
.
dev
,
nv_crtc
->
index
);
return
NV
KM
_NOTIFY_KEEP
;
return
NV
IF
_NOTIFY_KEEP
;
}
int
...
...
@@ -57,7 +57,7 @@ nouveau_display_vblank_enable(struct drm_device *dev, int head)
list_for_each_entry
(
crtc
,
&
dev
->
mode_config
.
crtc_list
,
head
)
{
struct
nouveau_crtc
*
nv_crtc
=
nouveau_crtc
(
crtc
);
if
(
nv_crtc
->
index
==
head
)
{
nv
km
_notify_get
(
&
nv_crtc
->
vblank
);
nv
if
_notify_get
(
&
nv_crtc
->
vblank
);
return
0
;
}
}
...
...
@@ -71,7 +71,7 @@ nouveau_display_vblank_disable(struct drm_device *dev, int head)
list_for_each_entry
(
crtc
,
&
dev
->
mode_config
.
crtc_list
,
head
)
{
struct
nouveau_crtc
*
nv_crtc
=
nouveau_crtc
(
crtc
);
if
(
nv_crtc
->
index
==
head
)
{
nv
km
_notify_put
(
&
nv_crtc
->
vblank
);
nv
if
_notify_put
(
&
nv_crtc
->
vblank
);
return
;
}
}
...
...
@@ -172,22 +172,22 @@ nouveau_display_vblank_fini(struct drm_device *dev)
list_for_each_entry
(
crtc
,
&
dev
->
mode_config
.
crtc_list
,
head
)
{
struct
nouveau_crtc
*
nv_crtc
=
nouveau_crtc
(
crtc
);
nv
km
_notify_fini
(
&
nv_crtc
->
vblank
);
nv
if
_notify_fini
(
&
nv_crtc
->
vblank
);
}
}
static
int
nouveau_display_vblank_init
(
struct
drm_device
*
dev
)
{
struct
nouveau_drm
*
drm
=
nouveau_drm
(
dev
);
struct
nouveau_disp
*
pdisp
=
nvkm_disp
(
&
drm
->
device
);
struct
nouveau_display
*
disp
=
nouveau_display
(
dev
);
struct
drm_crtc
*
crtc
;
int
ret
;
list_for_each_entry
(
crtc
,
&
dev
->
mode_config
.
crtc_list
,
head
)
{
struct
nouveau_crtc
*
nv_crtc
=
nouveau_crtc
(
crtc
);
ret
=
nv
km_notify_init
(
&
pdisp
->
vblank
,
ret
=
nv
if_notify_init
(
&
disp
->
disp
,
NULL
,
nouveau_display_vblank_handler
,
false
,
NV04_DISP_NTFY_VBLANK
,
&
(
struct
nvif_notify_head_req_v0
)
{
.
head
=
nv_crtc
->
index
,
},
...
...
@@ -371,7 +371,7 @@ nouveau_display_init(struct drm_device *dev)
/* enable hotplug interrupts */
list_for_each_entry
(
connector
,
&
dev
->
mode_config
.
connector_list
,
head
)
{
struct
nouveau_connector
*
conn
=
nouveau_connector
(
connector
);
nv
km
_notify_get
(
&
conn
->
hpd
);
nv
if
_notify_get
(
&
conn
->
hpd
);
}
return
ret
;
...
...
@@ -391,7 +391,7 @@ nouveau_display_fini(struct drm_device *dev)
/* disable hotplug interrupts */
list_for_each_entry
(
connector
,
&
dev
->
mode_config
.
connector_list
,
head
)
{
struct
nouveau_connector
*
conn
=
nouveau_connector
(
connector
);
nv
km
_notify_put
(
&
conn
->
hpd
);
nv
if
_notify_put
(
&
conn
->
hpd
);
}
drm_kms_helper_poll_disable
(
dev
);
...
...
drivers/gpu/drm/nouveau/nvif/class.h
浏览文件 @
80bc340b
...
...
@@ -343,6 +343,9 @@ struct kepler_channel_gpfifo_a_v0 {
* legacy display
******************************************************************************/
#define NV04_DISP_NTFY_VBLANK 0x00
#define NV04_DISP_NTFY_CONN 0x01
struct
nv04_disp_mthd_v0
{
__u8
version
;
#define NV04_DISP_SCANOUTPOS 0x00
...
...
@@ -365,7 +368,6 @@ struct nv04_disp_scanoutpos_v0 {
__u16
hline
;
};
/*******************************************************************************
* display
******************************************************************************/
...
...
drivers/gpu/drm/nouveau/nvif/device.h
浏览文件 @
80bc340b
...
...
@@ -54,13 +54,11 @@ void nvif_device_ref(struct nvif_device *, struct nvif_device **);
#include <engine/device.h>
#include <engine/fifo.h>
#include <engine/disp.h>
#include <engine/graph.h>
#include <engine/software.h>
#define nvkm_fifo(a) nouveau_fifo(nvkm_device(a))
#define nvkm_fifo_chan(a) ((struct nouveau_fifo_chan *)nvkm_object(a))
#define nvkm_disp(a) nouveau_disp(nvkm_device(a))
#define nvkm_gr(a) ((struct nouveau_graph *)nouveau_engine(nvkm_object(a), NVDEV_ENGINE_GR))
#endif
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录