aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjames qian wang (Arm Technology China) <james.qian.wang@arm.com>2019-04-24 01:48:11 -0400
committerLiviu Dudau <Liviu.Dudau@arm.com>2019-05-07 06:26:04 -0400
commit8c919745ee1c4d8d811a1e015d637d17aa78fe26 (patch)
tree75dafe959b6bb92504bdc050b934ff0a798fc2e9
parent8c134d13a07884048756dc5de7cd4526b440483b (diff)
drm/komeda: Fixed warning: Function parameter or member not described
Fixed the warnings: Function parameter or member 'xxx' not described when make htmldocs This patch depends on: - https://patchwork.freedesktop.org/series/54448/ - https://patchwork.freedesktop.org/series/54449/ - https://patchwork.freedesktop.org/series/54450/ v2: Rebase and add reporter Reported-by: kbuild test robot <lkp@intel.com> Signed-off-by: James Qian Wang (Arm Technology China) <james.qian.wang@arm.com> Signed-off-by: Liviu Dudau <liviu.dudau@arm.com>
-rw-r--r--drivers/gpu/drm/arm/display/komeda/komeda_crtc.c14
-rw-r--r--drivers/gpu/drm/arm/display/komeda/komeda_dev.h16
-rw-r--r--drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.h9
-rw-r--r--drivers/gpu/drm/arm/display/komeda/komeda_kms.h18
-rw-r--r--drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h43
-rw-r--r--drivers/gpu/drm/arm/display/komeda/komeda_plane.c8
6 files changed, 85 insertions, 23 deletions
diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c b/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c
index 053b1e3e74be..d335fec1b727 100644
--- a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c
+++ b/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c
@@ -18,9 +18,17 @@
18#include "komeda_dev.h" 18#include "komeda_dev.h"
19#include "komeda_kms.h" 19#include "komeda_kms.h"
20 20
21/* crtc_atomic_check is the final check stage, so beside build a display data 21/**
22 * pipeline according the crtc_state, but still needs to release/disable the 22 * komeda_crtc_atomic_check - build display output data flow
23 * unclaimed pipeline resources. 23 * @crtc: DRM crtc
24 * @state: the crtc state object
25 *
26 * crtc_atomic_check is the final check stage, so beside build a display data
27 * pipeline according to the crtc_state, but still needs to release or disable
28 * the unclaimed pipeline resources.
29 *
30 * RETURNS:
31 * Zero for success or -errno
24 */ 32 */
25static int 33static int
26komeda_crtc_atomic_check(struct drm_crtc *crtc, 34komeda_crtc_atomic_check(struct drm_crtc *crtc,
diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_dev.h b/drivers/gpu/drm/arm/display/komeda/komeda_dev.h
index 0c3e32b596d9..29e03c4e1ffc 100644
--- a/drivers/gpu/drm/arm/display/komeda/komeda_dev.h
+++ b/drivers/gpu/drm/arm/display/komeda/komeda_dev.h
@@ -120,7 +120,7 @@ struct komeda_dev_funcs {
120 int master_pipe, u32 active_pipes); 120 int master_pipe, u32 active_pipes);
121}; 121};
122 122
123/** 123/*
124 * DISPLAY_MODE describes how many display been enabled, and which will be 124 * DISPLAY_MODE describes how many display been enabled, and which will be
125 * passed to CHIP by &komeda_dev_funcs->change_opmode(), then CHIP can do the 125 * passed to CHIP by &komeda_dev_funcs->change_opmode(), then CHIP can do the
126 * pipeline resources assignment according to this usage hint. 126 * pipeline resources assignment according to this usage hint.
@@ -145,24 +145,31 @@ enum {
145 * control-abilites of device. 145 * control-abilites of device.
146 */ 146 */
147struct komeda_dev { 147struct komeda_dev {
148 /** @dev: the base device structure */
148 struct device *dev; 149 struct device *dev;
150 /** @reg_base: the base address of komeda io space */
149 u32 __iomem *reg_base; 151 u32 __iomem *reg_base;
150 152
153 /** @chip: the basic chip information */
151 struct komeda_chip_info chip; 154 struct komeda_chip_info chip;
152 /** @fmt_tbl: initialized by &komeda_dev_funcs->init_format_table */ 155 /** @fmt_tbl: initialized by &komeda_dev_funcs->init_format_table */
153 struct komeda_format_caps_table fmt_tbl; 156 struct komeda_format_caps_table fmt_tbl;
154 /** @pclk: APB clock for register access */ 157 /** @pclk: APB clock for register access */
155 struct clk *pclk; 158 struct clk *pclk;
156 /** @mck: HW main engine clk */ 159 /** @mclk: HW main engine clk */
157 struct clk *mclk; 160 struct clk *mclk;
158 161
159 /** @irq: irq number */ 162 /** @irq: irq number */
160 int irq; 163 int irq;
161 164
162 struct mutex lock; /* used to protect dpmode */ 165 /** @lock: used to protect dpmode */
163 u32 dpmode; /* current display mode */ 166 struct mutex lock;
167 /** @dpmode: current display mode */
168 u32 dpmode;
164 169
170 /** @n_pipelines: the number of pipe in @pipelines */
165 int n_pipelines; 171 int n_pipelines;
172 /** @pipelines: the komeda pipelines */
166 struct komeda_pipeline *pipelines[KOMEDA_MAX_PIPELINES]; 173 struct komeda_pipeline *pipelines[KOMEDA_MAX_PIPELINES];
167 174
168 /** @funcs: chip funcs to access to HW */ 175 /** @funcs: chip funcs to access to HW */
@@ -175,6 +182,7 @@ struct komeda_dev {
175 */ 182 */
176 void *chip_data; 183 void *chip_data;
177 184
185 /** @debugfs_root: root directory of komeda debugfs */
178 struct dentry *debugfs_root; 186 struct dentry *debugfs_root;
179}; 187};
180 188
diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.h b/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.h
index 0de2e4a2afd2..ea2fe190c1e3 100644
--- a/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.h
+++ b/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.h
@@ -10,11 +10,16 @@
10#include <drm/drm_framebuffer.h> 10#include <drm/drm_framebuffer.h>
11#include "komeda_format_caps.h" 11#include "komeda_format_caps.h"
12 12
13/** struct komeda_fb - entend drm_framebuffer with komeda attribute */ 13/**
14 * struct komeda_fb - Entending drm_framebuffer with komeda attribute
15 */
14struct komeda_fb { 16struct komeda_fb {
15 /** @base: &drm_framebuffer */ 17 /** @base: &drm_framebuffer */
16 struct drm_framebuffer base; 18 struct drm_framebuffer base;
17 /* @format_caps: &komeda_format_caps */ 19 /**
20 * @format_caps:
21 * extends drm_format_info for komeda specific information
22 */
18 const struct komeda_format_caps *format_caps; 23 const struct komeda_format_caps *format_caps;
19 /** @aligned_w: aligned frame buffer width */ 24 /** @aligned_w: aligned frame buffer width */
20 u32 aligned_w; 25 u32 aligned_w;
diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_kms.h b/drivers/gpu/drm/arm/display/komeda/komeda_kms.h
index 7ec571d3c240..ac3d9209b4d9 100644
--- a/drivers/gpu/drm/arm/display/komeda/komeda_kms.h
+++ b/drivers/gpu/drm/arm/display/komeda/komeda_kms.h
@@ -15,7 +15,9 @@
15#include <video/videomode.h> 15#include <video/videomode.h>
16#include <video/display_timing.h> 16#include <video/display_timing.h>
17 17
18/** struct komeda_plane - komeda instance of drm_plane */ 18/**
19 * struct komeda_plane - komeda instance of drm_plane
20 */
19struct komeda_plane { 21struct komeda_plane {
20 /** @base: &drm_plane */ 22 /** @base: &drm_plane */
21 struct drm_plane base; 23 struct drm_plane base;
@@ -71,11 +73,13 @@ struct komeda_crtc {
71 */ 73 */
72 struct komeda_pipeline *slave; 74 struct komeda_pipeline *slave;
73 75
74 /* this flip_done is for tracing the disable */ 76 /** @disable_done: this flip_done is for tracing the disable */
75 struct completion *disable_done; 77 struct completion *disable_done;
76}; 78};
77 79
78/** struct komeda_crtc_state */ 80/**
81 * struct komeda_crtc_state
82 */
79struct komeda_crtc_state { 83struct komeda_crtc_state {
80 /** @base: &drm_crtc_state */ 84 /** @base: &drm_crtc_state */
81 struct drm_crtc_state base; 85 struct drm_crtc_state base;
@@ -83,7 +87,15 @@ struct komeda_crtc_state {
83 /* private properties */ 87 /* private properties */
84 88
85 /* computed state which are used by validate/check */ 89 /* computed state which are used by validate/check */
90 /**
91 * @affected_pipes:
92 * the affected pipelines in once display instance
93 */
86 u32 affected_pipes; 94 u32 affected_pipes;
95 /**
96 * @active_pipes:
97 * the active pipelines in once display instance
98 */
87 u32 active_pipes; 99 u32 active_pipes;
88}; 100};
89 101
diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h b/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h
index 233e512319e8..b1f813a349a4 100644
--- a/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h
+++ b/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h
@@ -90,32 +90,35 @@ struct komeda_component {
90 u32 __iomem *reg; 90 u32 __iomem *reg;
91 /** @id: component id */ 91 /** @id: component id */
92 u32 id; 92 u32 id;
93 /** @hw_ic: component hw id, 93 /**
94 * which is initialized by chip and used by chip only 94 * @hw_id: component hw id,
95 * which is initialized by chip and used by chip only
95 */ 96 */
96 u32 hw_id; 97 u32 hw_id;
97 98
98 /** 99 /**
99 * @max_active_inputs: 100 * @max_active_inputs:
100 * @max_active_outpus: 101 * @max_active_outputs:
101 * 102 *
102 * maximum number of inputs/outputs that can be active in the same time 103 * maximum number of inputs/outputs that can be active at the same time
103 * Note: 104 * Note:
104 * the number isn't the bit number of @supported_inputs or 105 * the number isn't the bit number of @supported_inputs or
105 * @supported_outputs, but may be less than it, since component may not 106 * @supported_outputs, but may be less than it, since component may not
106 * support enabling all @supported_inputs/outputs at the same time. 107 * support enabling all @supported_inputs/outputs at the same time.
107 */ 108 */
108 u8 max_active_inputs; 109 u8 max_active_inputs;
110 /** @max_active_outputs: maximum number of outputs */
109 u8 max_active_outputs; 111 u8 max_active_outputs;
110 /** 112 /**
111 * @supported_inputs: 113 * @supported_inputs:
112 * @supported_outputs: 114 * @supported_outputs:
113 * 115 *
114 * bitmask of BIT(component->id) for the supported inputs/outputs 116 * bitmask of BIT(component->id) for the supported inputs/outputs,
115 * describes the possibilities of how a component is linked into a 117 * describes the possibilities of how a component is linked into a
116 * pipeline. 118 * pipeline.
117 */ 119 */
118 u32 supported_inputs; 120 u32 supported_inputs;
121 /** @supported_outputs: bitmask of supported output componenet ids */
119 u32 supported_outputs; 122 u32 supported_outputs;
120 123
121 /** 124 /**
@@ -134,7 +137,8 @@ struct komeda_component {
134struct komeda_component_output { 137struct komeda_component_output {
135 /** @component: indicate which component the data comes from */ 138 /** @component: indicate which component the data comes from */
136 struct komeda_component *component; 139 struct komeda_component *component;
137 /** @output_port: 140 /**
141 * @output_port:
138 * the output port of the &komeda_component_output.component 142 * the output port of the &komeda_component_output.component
139 */ 143 */
140 u8 output_port; 144 u8 output_port;
@@ -150,11 +154,12 @@ struct komeda_component_output {
150struct komeda_component_state { 154struct komeda_component_state {
151 /** @obj: tracking component_state by drm_atomic_state */ 155 /** @obj: tracking component_state by drm_atomic_state */
152 struct drm_private_state obj; 156 struct drm_private_state obj;
157 /** @component: backpointer to the component */
153 struct komeda_component *component; 158 struct komeda_component *component;
154 /** 159 /**
155 * @binding_user: 160 * @binding_user:
156 * currently bound user, the user can be crtc/plane/wb_conn, which is 161 * currently bound user, the user can be @crtc, @plane or @wb_conn,
157 * valid decided by @component and @inputs 162 * which is valid decided by @component and @inputs
158 * 163 *
159 * - Layer: its user always is plane. 164 * - Layer: its user always is plane.
160 * - compiz/improc/timing_ctrlr: the user is crtc. 165 * - compiz/improc/timing_ctrlr: the user is crtc.
@@ -162,20 +167,24 @@ struct komeda_component_state {
162 * - scaler: plane when input is layer, wb_conn if input is compiz. 167 * - scaler: plane when input is layer, wb_conn if input is compiz.
163 */ 168 */
164 union { 169 union {
170 /** @crtc: backpointer for user crtc */
165 struct drm_crtc *crtc; 171 struct drm_crtc *crtc;
172 /** @plane: backpointer for user plane */
166 struct drm_plane *plane; 173 struct drm_plane *plane;
174 /** @wb_conn: backpointer for user wb_connector */
167 struct drm_connector *wb_conn; 175 struct drm_connector *wb_conn;
168 void *binding_user; 176 void *binding_user;
169 }; 177 };
178
170 /** 179 /**
171 * @active_inputs: 180 * @active_inputs:
172 * 181 *
173 * active_inputs is bitmask of @inputs index 182 * active_inputs is bitmask of @inputs index
174 * 183 *
175 * - active_inputs = changed_active_inputs + unchanged_active_inputs 184 * - active_inputs = changed_active_inputs | unchanged_active_inputs
176 * - affected_inputs = old->active_inputs + new->active_inputs; 185 * - affected_inputs = old->active_inputs | new->active_inputs;
177 * - disabling_inputs = affected_inputs ^ active_inputs; 186 * - disabling_inputs = affected_inputs ^ active_inputs;
178 * - changed_inputs = disabling_inputs + changed_active_inputs; 187 * - changed_inputs = disabling_inputs | changed_active_inputs;
179 * 188 *
180 * NOTE: 189 * NOTE:
181 * changed_inputs doesn't include all active_input but only 190 * changed_inputs doesn't include all active_input but only
@@ -183,7 +192,9 @@ struct komeda_component_state {
183 * level for dirty update. 192 * level for dirty update.
184 */ 193 */
185 u16 active_inputs; 194 u16 active_inputs;
195 /** @changed_active_inputs: bitmask of the changed @active_inputs */
186 u16 changed_active_inputs; 196 u16 changed_active_inputs;
197 /** @affected_inputs: bitmask for affected @inputs */
187 u16 affected_inputs; 198 u16 affected_inputs;
188 /** 199 /**
189 * @inputs: 200 * @inputs:
@@ -319,14 +330,23 @@ struct komeda_pipeline {
319 int id; 330 int id;
320 /** @avail_comps: available components mask of pipeline */ 331 /** @avail_comps: available components mask of pipeline */
321 u32 avail_comps; 332 u32 avail_comps;
333 /** @n_layers: the number of layer on @layers */
322 int n_layers; 334 int n_layers;
335 /** @layers: the pipeline layers */
323 struct komeda_layer *layers[KOMEDA_PIPELINE_MAX_LAYERS]; 336 struct komeda_layer *layers[KOMEDA_PIPELINE_MAX_LAYERS];
337 /** @n_scalers: the number of scaler on @scalers */
324 int n_scalers; 338 int n_scalers;
339 /** @scalers: the pipeline scalers */
325 struct komeda_scaler *scalers[KOMEDA_PIPELINE_MAX_SCALERS]; 340 struct komeda_scaler *scalers[KOMEDA_PIPELINE_MAX_SCALERS];
341 /** @compiz: compositor */
326 struct komeda_compiz *compiz; 342 struct komeda_compiz *compiz;
343 /** @wb_layer: writeback layer */
327 struct komeda_layer *wb_layer; 344 struct komeda_layer *wb_layer;
345 /** @improc: post image processor */
328 struct komeda_improc *improc; 346 struct komeda_improc *improc;
347 /** @ctrlr: timing controller */
329 struct komeda_timing_ctrlr *ctrlr; 348 struct komeda_timing_ctrlr *ctrlr;
349 /** @funcs: chip pipeline functions */
330 struct komeda_pipeline_funcs *funcs; /* private pipeline functions */ 350 struct komeda_pipeline_funcs *funcs; /* private pipeline functions */
331 351
332 /** @of_node: pipeline dt node */ 352 /** @of_node: pipeline dt node */
@@ -347,6 +367,7 @@ struct komeda_pipeline {
347struct komeda_pipeline_state { 367struct komeda_pipeline_state {
348 /** @obj: tracking pipeline_state by drm_atomic_state */ 368 /** @obj: tracking pipeline_state by drm_atomic_state */
349 struct drm_private_state obj; 369 struct drm_private_state obj;
370 /** @pipe: backpointer to the pipeline */
350 struct komeda_pipeline *pipe; 371 struct komeda_pipeline *pipe;
351 /** @crtc: currently bound crtc */ 372 /** @crtc: currently bound crtc */
352 struct drm_crtc *crtc; 373 struct drm_crtc *crtc;
diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_plane.c b/drivers/gpu/drm/arm/display/komeda/komeda_plane.c
index ffcd3d08b5d3..46654f0be73d 100644
--- a/drivers/gpu/drm/arm/display/komeda/komeda_plane.c
+++ b/drivers/gpu/drm/arm/display/komeda/komeda_plane.c
@@ -39,6 +39,14 @@ komeda_plane_init_data_flow(struct drm_plane_state *st,
39 return 0; 39 return 0;
40} 40}
41 41
42/**
43 * komeda_plane_atomic_check - build input data flow
44 * @plane: DRM plane
45 * @state: the plane state object
46 *
47 * RETURNS:
48 * Zero for success or -errno
49 */
42int komeda_plane_atomic_check(struct drm_plane *plane, 50int komeda_plane_atomic_check(struct drm_plane *plane,
43 struct drm_plane_state *state) 51 struct drm_plane_state *state)
44{ 52{