Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
cloud-kernel
提交
c64f7ba5
cloud-kernel
项目概览
openanolis
/
cloud-kernel
1 年多 前同步成功
通知
161
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看板
提交
c64f7ba5
编写于
14年前
作者:
C
Chris Wilson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
agp/intel: Remove confusion of stolen entries not stolen memory
Signed-off-by:
N
Chris Wilson
<
chris@chris-wilson.co.uk
>
上级
1b6064d7
master
alk-4.19.24
alk-4.19.30
alk-4.19.34
alk-4.19.36
alk-4.19.43
alk-4.19.48
alk-4.19.57
ck-4.19.67
ck-4.19.81
ck-4.19.91
github/fork/deepanshu1422/fix-typo-in-comment
github/fork/haosdent/fix-typo
linux-next
v4.19.91
v4.19.90
v4.19.89
v4.19.88
v4.19.87
v4.19.86
v4.19.85
v4.19.84
v4.19.83
v4.19.82
v4.19.81
v4.19.80
v4.19.79
v4.19.78
v4.19.77
v4.19.76
v4.19.75
v4.19.74
v4.19.73
v4.19.72
v4.19.71
v4.19.70
v4.19.69
v4.19.68
v4.19.67
v4.19.66
v4.19.65
v4.19.64
v4.19.63
v4.19.62
v4.19.61
v4.19.60
v4.19.59
v4.19.58
v4.19.57
v4.19.56
v4.19.55
v4.19.54
v4.19.53
v4.19.52
v4.19.51
v4.19.50
v4.19.49
v4.19.48
v4.19.47
v4.19.46
v4.19.45
v4.19.44
v4.19.43
v4.19.42
v4.19.41
v4.19.40
v4.19.39
v4.19.38
v4.19.37
v4.19.36
v4.19.35
v4.19.34
v4.19.33
v4.19.32
v4.19.31
v4.19.30
v4.19.29
v4.19.28
v4.19.27
v4.19.26
v4.19.25
v4.19.24
v4.19.23
v4.19.22
v4.19.21
v4.19.20
v4.19.19
v4.19.18
v4.19.17
v4.19.16
v4.19.15
v4.19.14
v4.19.13
v4.19.12
v4.19.11
v4.19.10
v4.19.9
v4.19.8
v4.19.7
v4.19.6
v4.19.5
v4.19.4
v4.19.3
v4.19.2
v4.19.1
v4.19
v4.19-rc8
v4.19-rc7
v4.19-rc6
v4.19-rc5
v4.19-rc4
v4.19-rc3
v4.19-rc2
v4.19-rc1
ck-release-21
ck-release-20
ck-release-19.2
ck-release-19.1
ck-release-19
ck-release-18
ck-release-17.2
ck-release-17.1
ck-release-17
ck-release-16
ck-release-15.1
ck-release-15
ck-release-14
ck-release-13.2
ck-release-13
ck-release-12
ck-release-11
ck-release-10
ck-release-9
ck-release-7
alk-release-15
alk-release-14
alk-release-13.2
alk-release-13
alk-release-12
alk-release-11
alk-release-10
alk-release-9
alk-release-7
无相关合并请求
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
15 addition
and
42 deletion
+15
-42
drivers/char/agp/intel-gtt.c
drivers/char/agp/intel-gtt.c
+7
-33
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/i915_dma.c
+2
-2
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_drv.h
+1
-1
include/drm/intel-gtt.h
include/drm/intel-gtt.h
+5
-6
未找到文件。
drivers/char/agp/intel-gtt.c
浏览文件 @
c64f7ba5
...
...
@@ -477,26 +477,17 @@ static const struct aper_size_info_fixed const intel_fake_agp_sizes[] = {
{
512
,
131072
,
7
},
};
static
unsigned
int
intel_gtt_stolen_
entries
(
void
)
static
unsigned
int
intel_gtt_stolen_
size
(
void
)
{
u16
gmch_ctrl
;
u8
rdct
;
int
local
=
0
;
static
const
int
ddt
[
4
]
=
{
0
,
16
,
32
,
64
};
unsigned
int
overhead_entries
;
unsigned
int
stolen_size
=
0
;
pci_read_config_word
(
intel_private
.
bridge_dev
,
I830_GMCH_CTRL
,
&
gmch_ctrl
);
if
(
INTEL_GTT_GEN
>
4
||
IS_PINEVIEW
)
overhead_entries
=
0
;
else
overhead_entries
=
intel_private
.
base
.
gtt_mappable_entries
/
1024
;
overhead_entries
+=
1
;
/* BIOS popup */
if
(
intel_private
.
bridge_dev
->
device
==
PCI_DEVICE_ID_INTEL_82830_HB
||
intel_private
.
bridge_dev
->
device
==
PCI_DEVICE_ID_INTEL_82845G_HB
)
{
switch
(
gmch_ctrl
&
I830_GMCH_GMS_MASK
)
{
...
...
@@ -631,7 +622,7 @@ static unsigned int intel_gtt_stolen_entries(void)
stolen_size
=
0
;
}
return
stolen_size
/
KB
(
4
)
-
overhead_entries
;
return
stolen_size
;
}
static
void
i965_adjust_pgetbl_size
(
unsigned
int
size_flag
)
...
...
@@ -817,8 +808,8 @@ static int intel_gtt_init(void)
global_cache_flush
();
/* FIXME: ? */
/* we have to call this as early as possible after the MMIO base address is known */
intel_private
.
base
.
gtt_stolen_entries
=
intel_gtt_stolen_entries
();
if
(
intel_private
.
base
.
gtt_stolen_entries
==
0
)
{
intel_private
.
base
.
stolen_size
=
intel_gtt_stolen_size
();
if
(
intel_private
.
base
.
stolen_size
==
0
)
{
intel_private
.
driver
->
cleanup
();
iounmap
(
intel_private
.
registers
);
iounmap
(
intel_private
.
gtt
);
...
...
@@ -1006,8 +997,7 @@ static int intel_fake_agp_configure(void)
agp_bridge
->
gart_bus_addr
=
intel_private
.
gma_bus_addr
;
for
(
i
=
intel_private
.
base
.
gtt_stolen_entries
;
i
<
intel_private
.
base
.
gtt_total_entries
;
i
++
)
{
for
(
i
=
0
;
i
<
intel_private
.
base
.
gtt_total_entries
;
i
++
)
{
intel_private
.
driver
->
write_entry
(
intel_private
.
scratch_page_dma
,
i
,
0
);
}
...
...
@@ -1065,17 +1055,7 @@ static int intel_fake_agp_insert_entries(struct agp_memory *mem,
if
(
mem
->
page_count
==
0
)
goto
out
;
if
(
pg_start
<
intel_private
.
base
.
gtt_stolen_entries
)
{
dev_printk
(
KERN_DEBUG
,
&
intel_private
.
pcidev
->
dev
,
"pg_start == 0x%.8lx, gtt_stolen_entries == 0x%.8x
\n
"
,
pg_start
,
intel_private
.
base
.
gtt_stolen_entries
);
dev_info
(
&
intel_private
.
pcidev
->
dev
,
"trying to insert into local/stolen memory
\n
"
);
goto
out_err
;
}
if
((
pg_start
+
mem
->
page_count
)
>
intel_private
.
base
.
gtt_total_entries
)
if
(
pg_start
+
mem
->
page_count
>
intel_private
.
base
.
gtt_total_entries
)
goto
out_err
;
if
(
type
!=
mem
->
type
)
...
...
@@ -1118,12 +1098,6 @@ static int intel_fake_agp_remove_entries(struct agp_memory *mem,
if
(
mem
->
page_count
==
0
)
return
0
;
if
(
pg_start
<
intel_private
.
base
.
gtt_stolen_entries
)
{
dev_info
(
&
intel_private
.
pcidev
->
dev
,
"trying to disable local/stolen memory
\n
"
);
return
-
EINVAL
;
}
if
(
USE_PCI_DMA_API
&&
INTEL_GTT_GEN
>
2
)
intel_agp_unmap_memory
(
mem
);
...
...
@@ -1629,7 +1603,7 @@ int intel_gmch_probe(struct pci_dev *pdev,
}
EXPORT_SYMBOL
(
intel_gmch_probe
);
struct
intel_gtt
*
intel_gtt_get
(
void
)
const
struct
intel_gtt
*
intel_gtt_get
(
void
)
{
return
&
intel_private
.
base
;
}
...
...
This diff is collapsed.
Click to expand it.
drivers/gpu/drm/i915/i915_dma.c
浏览文件 @
c64f7ba5
...
...
@@ -1044,7 +1044,7 @@ static unsigned long i915_stolen_to_phys(struct drm_device *dev, u32 offset)
pci_read_config_byte
(
pdev
,
0x9c
,
&
val
);
base
=
val
>>
3
<<
27
;
}
base
-=
dev_priv
->
mm
.
gtt
->
gtt_stolen_entries
<<
PAGE_SHIFT
;
base
-=
dev_priv
->
mm
.
gtt
->
stolen_size
;
#endif
return
base
+
offset
;
...
...
@@ -1168,7 +1168,7 @@ static int i915_load_modeset_init(struct drm_device *dev)
unsigned
long
prealloc_size
,
gtt_size
,
mappable_size
;
int
ret
=
0
;
prealloc_size
=
dev_priv
->
mm
.
gtt
->
gtt_stolen_entries
<<
PAGE_SHIFT
;
prealloc_size
=
dev_priv
->
mm
.
gtt
->
stolen_size
;
gtt_size
=
dev_priv
->
mm
.
gtt
->
gtt_total_entries
<<
PAGE_SHIFT
;
mappable_size
=
dev_priv
->
mm
.
gtt
->
gtt_mappable_entries
<<
PAGE_SHIFT
;
...
...
This diff is collapsed.
Click to expand it.
drivers/gpu/drm/i915/i915_drv.h
浏览文件 @
c64f7ba5
...
...
@@ -542,7 +542,7 @@ typedef struct drm_i915_private {
struct
{
/** Bridge to intel-gtt-ko */
struct
intel_gtt
*
gtt
;
const
struct
intel_gtt
*
gtt
;
/** Memory allocator for GTT stolen memory */
struct
drm_mm
stolen
;
/** Memory allocator for GTT */
...
...
This diff is collapsed.
Click to expand it.
include/drm/intel-gtt.h
浏览文件 @
c64f7ba5
...
...
@@ -2,17 +2,16 @@
#ifndef _DRM_INTEL_GTT_H
#define _DRM_INTEL_GTT_H
struct
intel_gtt
{
/* Number of stolen gtt entries at the beginning. */
unsigned
int
gtt_stolen_entries
;
const
struct
intel_gtt
{
/* Size of memory reserved for graphics by the BIOS */
unsigned
int
stolen_size
;
/* Total number of gtt entries. */
unsigned
int
gtt_total_entries
;
/* Part of the gtt that is mappable by the cpu, for those chips where
* this is not the full gtt. */
unsigned
int
gtt_mappable_entries
;
};
struct
intel_gtt
*
intel_gtt_get
(
void
);
}
*
intel_gtt_get
(
void
);
#endif
This diff is collapsed.
Click to expand it.
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录
新手
引导
客服
返回
顶部