Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
Kernel
提交
c0077061
K
Kernel
项目概览
openeuler
/
Kernel
1 年多 前同步成功
通知
8
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看板
提交
c0077061
编写于
7月 26, 2012
作者:
B
Ben Skeggs
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
drm/nouveau/acpi: move definitions out of nouveau_drv.h
Signed-off-by:
N
Ben Skeggs
<
bskeggs@redhat.com
>
上级
d38ac521
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
40 addition
and
36 deletion
+40
-36
drivers/gpu/drm/nouveau/Makefile
drivers/gpu/drm/nouveau/Makefile
+3
-1
drivers/gpu/drm/nouveau/nouveau_acpi.c
drivers/gpu/drm/nouveau/nouveau_acpi.c
+11
-16
drivers/gpu/drm/nouveau/nouveau_acpi.h
drivers/gpu/drm/nouveau/nouveau_acpi.h
+22
-0
drivers/gpu/drm/nouveau/nouveau_connector.c
drivers/gpu/drm/nouveau/nouveau_connector.c
+2
-1
drivers/gpu/drm/nouveau/nouveau_drv.c
drivers/gpu/drm/nouveau/nouveau_drv.c
+1
-0
drivers/gpu/drm/nouveau/nouveau_drv.h
drivers/gpu/drm/nouveau/nouveau_drv.h
+0
-18
drivers/gpu/drm/nouveau/nouveau_state.c
drivers/gpu/drm/nouveau/nouveau_state.c
+1
-0
未找到文件。
drivers/gpu/drm/nouveau/Makefile
浏览文件 @
c0077061
...
...
@@ -167,6 +167,9 @@ nouveau-y += nv50_fbcon.o nvc0_fbcon.o
# drm/kms/nvd9-
# other random bits
nouveau-$(CONFIG_ACPI)
+=
nouveau_acpi.o
##
## unported bits below
##
...
...
@@ -200,7 +203,6 @@ nouveau-y += nouveau_mem.o
# optional stuff
nouveau-$(CONFIG_COMPAT)
+=
nouveau_ioc32.o
nouveau-$(CONFIG_DRM_NOUVEAU_BACKLIGHT)
+=
nouveau_backlight.o
nouveau-$(CONFIG_ACPI)
+=
nouveau_acpi.o
obj-$(CONFIG_DRM_NOUVEAU)
+=
nouveau.o
drivers/gpu/drm/nouveau/nouveau_acpi.c
浏览文件 @
c0077061
...
...
@@ -7,16 +7,13 @@
#include <acpi/acpi.h>
#include <linux/mxm-wmi.h>
#include "drmP.h"
#include "drm.h"
#include "drm_sarea.h"
#include "drm_crtc_helper.h"
#include "nouveau_drv.h"
#include <nouveau_drm.h>
#include "nouveau_connector.h"
#include <linux/vga_switcheroo.h>
#include "drm_edid.h"
#include "nouveau_drm.h"
#include "nouveau_acpi.h"
#define NOUVEAU_DSM_LED 0x02
#define NOUVEAU_DSM_LED_STATE 0x00
#define NOUVEAU_DSM_LED_OFF 0x10
...
...
@@ -389,10 +386,9 @@ int nouveau_acpi_get_bios_chunk(uint8_t *bios, int offset, int len)
return
nouveau_rom_call
(
nouveau_dsm_priv
.
rom_handle
,
bios
,
offset
,
len
);
}
int
void
*
nouveau_acpi_edid
(
struct
drm_device
*
dev
,
struct
drm_connector
*
connector
)
{
struct
nouveau_connector
*
nv_connector
=
nouveau_connector
(
connector
);
struct
acpi_device
*
acpidev
;
acpi_handle
handle
;
int
type
,
ret
;
...
...
@@ -404,21 +400,20 @@ nouveau_acpi_edid(struct drm_device *dev, struct drm_connector *connector)
type
=
ACPI_VIDEO_DISPLAY_LCD
;
break
;
default:
return
-
EINVA
L
;
return
NUL
L
;
}
handle
=
DEVICE_ACPI_HANDLE
(
&
dev
->
pdev
->
dev
);
if
(
!
handle
)
return
-
ENODEV
;
return
NULL
;
ret
=
acpi_bus_get_device
(
handle
,
&
acpidev
);
if
(
ret
)
return
-
ENODEV
;
return
NULL
;
ret
=
acpi_video_get_edid
(
acpidev
,
type
,
-
1
,
&
edid
);
if
(
ret
<
0
)
return
ret
;
return
NULL
;
nv_connector
->
edid
=
kmemdup
(
edid
,
EDID_LENGTH
,
GFP_KERNEL
);
return
0
;
return
kmemdup
(
edid
,
EDID_LENGTH
,
GFP_KERNEL
);
}
drivers/gpu/drm/nouveau/nouveau_acpi.h
0 → 100644
浏览文件 @
c0077061
#ifndef __NOUVEAU_ACPI_H__
#define __NOUVEAU_ACPI_H__
#define ROM_BIOS_PAGE 4096
#if defined(CONFIG_ACPI)
void
nouveau_register_dsm_handler
(
void
);
void
nouveau_unregister_dsm_handler
(
void
);
void
nouveau_switcheroo_optimus_dsm
(
void
);
int
nouveau_acpi_get_bios_chunk
(
uint8_t
*
bios
,
int
offset
,
int
len
);
bool
nouveau_acpi_rom_supported
(
struct
pci_dev
*
pdev
);
void
*
nouveau_acpi_edid
(
struct
drm_device
*
,
struct
drm_connector
*
);
#else
static
inline
void
nouveau_register_dsm_handler
(
void
)
{}
static
inline
void
nouveau_unregister_dsm_handler
(
void
)
{}
static
inline
void
nouveau_switcheroo_optimus_dsm
(
void
)
{}
static
inline
bool
nouveau_acpi_rom_supported
(
struct
pci_dev
*
pdev
)
{
return
false
;
}
static
inline
int
nouveau_acpi_get_bios_chunk
(
uint8_t
*
bios
,
int
offset
,
int
len
)
{
return
-
EINVAL
;
}
static
inline
void
*
nouveau_acpi_edid
(
struct
drm_device
*
dev
,
struct
drm_connector
*
connector
)
{
return
NULL
;
}
#endif
#endif
drivers/gpu/drm/nouveau/nouveau_connector.c
浏览文件 @
c0077061
...
...
@@ -36,6 +36,7 @@
#include "nouveau_crtc.h"
#include "nouveau_connector.h"
#include "nouveau_hw.h"
#include "nouveau_acpi.h"
#include <subdev/bios/gpio.h>
...
...
@@ -335,7 +336,7 @@ nouveau_connector_detect_lvds(struct drm_connector *connector, bool force)
* valid - it's not (rh#613284)
*/
if
(
nv_encoder
->
dcb
->
lvdsconf
.
use_acpi_for_edid
)
{
if
(
!
nouveau_acpi_edid
(
dev
,
connector
))
{
if
(
!
(
nv_connector
->
edid
=
nouveau_acpi_edid
(
dev
,
connector
)
))
{
status
=
connector_status_connected
;
goto
out
;
}
...
...
drivers/gpu/drm/nouveau/nouveau_drv.c
浏览文件 @
c0077061
...
...
@@ -36,6 +36,7 @@
#include "nouveau_fence.h"
#include "nouveau_pm.h"
#include "nv50_display.h"
#include "nouveau_acpi.h"
#include "drm_pciids.h"
...
...
drivers/gpu/drm/nouveau/nouveau_drv.h
浏览文件 @
c0077061
...
...
@@ -366,24 +366,6 @@ extern void nouveau_irq_preinstall(struct drm_device *);
extern
int
nouveau_irq_postinstall
(
struct
drm_device
*
);
extern
void
nouveau_irq_uninstall
(
struct
drm_device
*
);
/* nouveau_acpi.c */
#define ROM_BIOS_PAGE 4096
#if defined(CONFIG_ACPI)
void
nouveau_register_dsm_handler
(
void
);
void
nouveau_unregister_dsm_handler
(
void
);
void
nouveau_switcheroo_optimus_dsm
(
void
);
int
nouveau_acpi_get_bios_chunk
(
uint8_t
*
bios
,
int
offset
,
int
len
);
bool
nouveau_acpi_rom_supported
(
struct
pci_dev
*
pdev
);
int
nouveau_acpi_edid
(
struct
drm_device
*
,
struct
drm_connector
*
);
#else
static
inline
void
nouveau_register_dsm_handler
(
void
)
{}
static
inline
void
nouveau_unregister_dsm_handler
(
void
)
{}
static
inline
void
nouveau_switcheroo_optimus_dsm
(
void
)
{}
static
inline
bool
nouveau_acpi_rom_supported
(
struct
pci_dev
*
pdev
)
{
return
false
;
}
static
inline
int
nouveau_acpi_get_bios_chunk
(
uint8_t
*
bios
,
int
offset
,
int
len
)
{
return
-
EINVAL
;
}
static
inline
int
nouveau_acpi_edid
(
struct
drm_device
*
dev
,
struct
drm_connector
*
connector
)
{
return
-
EINVAL
;
}
#endif
/* nouveau_backlight.c */
#ifdef CONFIG_DRM_NOUVEAU_BACKLIGHT
extern
int
nouveau_backlight_init
(
struct
drm_device
*
);
...
...
drivers/gpu/drm/nouveau/nouveau_state.c
浏览文件 @
c0077061
...
...
@@ -38,6 +38,7 @@
#include "nouveau_pm.h"
#include "nv04_display.h"
#include "nv50_display.h"
#include "nouveau_acpi.h"
static
void
nouveau_stub_takedown
(
struct
drm_device
*
dev
)
{}
static
int
nouveau_stub_init
(
struct
drm_device
*
dev
)
{
return
0
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录