1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
|
From 0e26b2c7ed70747209b8cc5fb4b7111888e5348d Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexander.deucher@amd.com>
Date: Thu, 8 Oct 2015 11:25:38 -0400
Subject: [PATCH 0595/1050] drm/amdgpu/dce10: Clean up reference counting and
pinning of the cursor BOs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Take a GEM reference for and pin the new cursor BO, unpin and drop the
GEM reference for the old cursor BO in dce10 crtc_cursor_set2, and use
amdgpu_crtc->cursor_addr in dce10 set_cursor.
This fixes dce10 cursor_reset accidentally incrementing the cursor BO
pin count, and cleans up the code a little.
Port of radeon commit:
cd404af0c930104462aa91344f07d002cf8248ed
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 61 +++++++++++++---------------------
1 file changed, 24 insertions(+), 37 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
index 681bc3e..114f397 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
@@ -2555,34 +2555,15 @@ static int dce_v10_0_cursor_move_locked(struct drm_crtc *crtc,
return 0;
}
-static int dce_v10_0_set_cursor(struct drm_crtc *crtc, struct drm_gem_object *obj)
+static void dce_v10_0_set_cursor(struct drm_crtc *crtc)
{
struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);
struct amdgpu_device *adev = crtc->dev->dev_private;
- struct amdgpu_bo *aobj = gem_to_amdgpu_bo(obj);
- uint64_t gpu_addr;
- int ret;
-
- ret = amdgpu_bo_reserve(aobj, false);
- if (unlikely(ret != 0))
- goto fail;
-
- ret = amdgpu_bo_pin(aobj, AMDGPU_GEM_DOMAIN_VRAM, &gpu_addr);
- amdgpu_bo_unreserve(aobj);
- if (ret)
- goto fail;
WREG32(mmCUR_SURFACE_ADDRESS_HIGH + amdgpu_crtc->crtc_offset,
- upper_32_bits(gpu_addr));
+ upper_32_bits(amdgpu_crtc->cursor_addr));
WREG32(mmCUR_SURFACE_ADDRESS + amdgpu_crtc->crtc_offset,
- lower_32_bits(gpu_addr));
-
- return 0;
-
-fail:
- drm_gem_object_unreference_unlocked(obj);
-
- return ret;
+ lower_32_bits(amdgpu_crtc->cursor_addr));
}
static int dce_v10_0_crtc_cursor_move(struct drm_crtc *crtc,
@@ -2607,6 +2588,7 @@ static int dce_v10_0_crtc_cursor_set2(struct drm_crtc *crtc,
{
struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);
struct drm_gem_object *obj;
+ struct amdgpu_bo *aobj;
int ret;
if (!handle) {
@@ -2628,6 +2610,21 @@ static int dce_v10_0_crtc_cursor_set2(struct drm_crtc *crtc,
return -ENOENT;
}
+ aobj = gem_to_amdgpu_bo(obj);
+ ret = amdgpu_bo_reserve(aobj, false);
+ if (ret != 0) {
+ drm_gem_object_unreference_unlocked(obj);
+ return ret;
+ }
+
+ ret = amdgpu_bo_pin(aobj, AMDGPU_GEM_DOMAIN_VRAM, &amdgpu_crtc->cursor_addr);
+ amdgpu_bo_unreserve(aobj);
+ if (ret) {
+ DRM_ERROR("Failed to pin new cursor BO (%d)\n", ret);
+ drm_gem_object_unreference_unlocked(obj);
+ return ret;
+ }
+
amdgpu_crtc->cursor_width = width;
amdgpu_crtc->cursor_height = height;
@@ -2646,12 +2643,8 @@ static int dce_v10_0_crtc_cursor_set2(struct drm_crtc *crtc,
amdgpu_crtc->cursor_hot_y = hot_y;
}
- ret = dce_v10_0_set_cursor(crtc, obj);
- if (ret)
- DRM_ERROR("dce_v10_0_set_cursor returned %d, not changing cursor\n",
- ret);
- else
- dce_v10_0_show_cursor(crtc);
+ dce_v10_0_set_cursor(crtc);
+ dce_v10_0_show_cursor(crtc);
dce_v10_0_lock_cursor(crtc, false);
unpin:
@@ -2662,8 +2655,7 @@ unpin:
amdgpu_bo_unpin(aobj);
amdgpu_bo_unreserve(aobj);
}
- if (amdgpu_crtc->cursor_bo != obj)
- drm_gem_object_unreference_unlocked(amdgpu_crtc->cursor_bo);
+ drm_gem_object_unreference_unlocked(amdgpu_crtc->cursor_bo);
}
amdgpu_crtc->cursor_bo = obj;
@@ -2673,7 +2665,6 @@ unpin:
static void dce_v10_0_cursor_reset(struct drm_crtc *crtc)
{
struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);
- int ret;
if (amdgpu_crtc->cursor_bo) {
dce_v10_0_lock_cursor(crtc, true);
@@ -2681,12 +2672,8 @@ static void dce_v10_0_cursor_reset(struct drm_crtc *crtc)
dce_v10_0_cursor_move_locked(crtc, amdgpu_crtc->cursor_x,
amdgpu_crtc->cursor_y);
- ret = dce_v10_0_set_cursor(crtc, amdgpu_crtc->cursor_bo);
- if (ret)
- DRM_ERROR("dce_v10_0_set_cursor returned %d, not showing "
- "cursor\n", ret);
- else
- dce_v10_0_show_cursor(crtc);
+ dce_v10_0_set_cursor(crtc);
+ dce_v10_0_show_cursor(crtc);
dce_v10_0_lock_cursor(crtc, false);
}
--
1.9.1
|
