blob: 6464bc4889b3afb65d16f9a11a1cf87cb8bd28d0 (
plain)
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
|
From 908238c34419a1281d988b811e5295e76bbb560a Mon Sep 17 00:00:00 2001
From: Harry Wentland <harry.wentland@amd.com>
Date: Fri, 23 Dec 2016 10:53:24 -0500
Subject: [PATCH 0106/4131] drm/amd/display: Don't use target before null check
It might blow up.
Signed-off-by: Harry Wentland <harry.wentland@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/display/dc/core/dc_target.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_target.c b/drivers/gpu/drm/amd/display/dc/core/dc_target.c
index d4ecf2d..2d25b00 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_target.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_target.c
@@ -151,9 +151,9 @@ bool dc_target_set_cursor_attributes(
const struct dc_cursor_attributes *attributes)
{
int i, j;
- struct core_target *target = DC_TARGET_TO_CORE(dc_target);
- struct core_dc *core_dc = DC_TO_CORE(target->ctx->dc);
- struct resource_context *res_ctx = &core_dc->current_context->res_ctx;
+ struct core_target *target;
+ struct core_dc *core_dc;
+ struct resource_context *res_ctx;
bool ret = false;
if (NULL == dc_target) {
@@ -165,6 +165,10 @@ bool dc_target_set_cursor_attributes(
return false;
}
+ target = DC_TARGET_TO_CORE(dc_target);
+ core_dc = DC_TO_CORE(target->ctx->dc);
+ res_ctx = &core_dc->current_context->res_ctx;
+
for (i = 0; i < dc_target->stream_count; i++) {
const struct dc_stream *stream = dc_target->streams[i];
--
2.7.4
|
