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
|
From dd8c1688623a58caad6ffcf9d8c0aaefae81cbc8 Mon Sep 17 00:00:00 2001
From: Harry Wentland <harry.wentland@amd.com>
Date: Mon, 24 Jul 2017 15:20:50 -0400
Subject: [PATCH 0664/4131] drm/amd/display: Roll gamma struct into core_gamma
Signed-off-by: Harry Wentland <harry.wentland@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_surface.c | 21 ++++-----------------
drivers/gpu/drm/amd/display/dc/inc/core_types.h | 3 +++
2 files changed, 7 insertions(+), 17 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_surface.c b/drivers/gpu/drm/amd/display/dc/core/dc_surface.c
index 9a21ea7..a8b9515 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_surface.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_surface.c
@@ -32,19 +32,6 @@
#include "transform.h"
/*******************************************************************************
- * Private structures
- ******************************************************************************/
-struct gamma {
- struct core_gamma protected;
- int ref_count;
-};
-
-#define DC_GAMMA_TO_GAMMA(dc_gamma) \
- container_of(dc_gamma, struct gamma, protected.public)
-#define CORE_GAMMA_TO_GAMMA(core_gamma) \
- container_of(core_gamma, struct gamma, protected)
-
-/*******************************************************************************
* Private functions
******************************************************************************/
static bool construct(struct dc_context *ctx, struct dc_surface *surface)
@@ -152,7 +139,7 @@ void dc_surface_release(struct dc_surface *surface)
void dc_gamma_retain(const struct dc_gamma *dc_gamma)
{
- struct gamma *gamma = DC_GAMMA_TO_GAMMA(dc_gamma);
+ struct core_gamma *gamma = DC_GAMMA_TO_CORE(dc_gamma);
ASSERT(gamma->ref_count > 0);
++gamma->ref_count;
@@ -160,7 +147,7 @@ void dc_gamma_retain(const struct dc_gamma *dc_gamma)
void dc_gamma_release(const struct dc_gamma **dc_gamma)
{
- struct gamma *gamma = DC_GAMMA_TO_GAMMA(*dc_gamma);
+ struct core_gamma *gamma = DC_GAMMA_TO_CORE(*dc_gamma);
ASSERT(gamma->ref_count > 0);
--gamma->ref_count;
@@ -173,14 +160,14 @@ void dc_gamma_release(const struct dc_gamma **dc_gamma)
struct dc_gamma *dc_create_gamma()
{
- struct gamma *gamma = dm_alloc(sizeof(*gamma));
+ struct core_gamma *gamma = dm_alloc(sizeof(*gamma));
if (gamma == NULL)
goto alloc_fail;
++gamma->ref_count;
- return &gamma->protected.public;
+ return &gamma->public;
alloc_fail:
return NULL;
diff --git a/drivers/gpu/drm/amd/display/dc/inc/core_types.h b/drivers/gpu/drm/amd/display/dc/inc/core_types.h
index 1d733c8..43e9ada 100644
--- a/drivers/gpu/drm/amd/display/dc/inc/core_types.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/core_types.h
@@ -46,6 +46,9 @@ struct core_stream;
struct core_gamma {
struct dc_gamma public;
struct dc_context *ctx;
+
+ /* private to dc_surface.c */
+ int ref_count;
};
void enable_surface_flip_reporting(struct dc_surface *dc_surface,
--
2.7.4
|
