* [PATCH 01/11] drm/amd/display: fix typo in function name
@ 2017-10-11 14:06 Alex Deucher
[not found] ` <1507730801-17362-1-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org>
0 siblings, 1 reply; 14+ messages in thread
From: Alex Deucher @ 2017-10-11 14:06 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Cc: Alex Deucher, harry.wenland-5C7GfCeVMHo
s/amdgpu_dm_find_first_crct_matching_connector/
amdgpu_dm_find_first_crtc_matching_connector/
And while here, make it static.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 12 ++++++------
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 6 ------
2 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 9bfe1f9..4357db8 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -568,10 +568,10 @@ static int dm_suspend(void *handle)
return ret;
}
-struct amdgpu_dm_connector *amdgpu_dm_find_first_crct_matching_connector(
- struct drm_atomic_state *state,
- struct drm_crtc *crtc,
- bool from_state_var)
+static struct amdgpu_dm_connector *
+amdgpu_dm_find_first_crtc_matching_connector(struct drm_atomic_state *state,
+ struct drm_crtc *crtc,
+ bool from_state_var)
{
uint32_t i;
struct drm_connector_state *conn_state;
@@ -4114,7 +4114,7 @@ void amdgpu_dm_atomic_commit_tail(
new_stream = new_acrtc_state->stream;
aconnector =
- amdgpu_dm_find_first_crct_matching_connector(
+ amdgpu_dm_find_first_crtc_matching_connector(
state,
&new_crtcs[i]->base,
false);
@@ -4402,7 +4402,7 @@ static int dm_update_crtcs_state(
new_acrtc_state = to_dm_crtc_state(crtc_state);
acrtc = to_amdgpu_crtc(crtc);
- aconnector = amdgpu_dm_find_first_crct_matching_connector(state, crtc, true);
+ aconnector = amdgpu_dm_find_first_crtc_matching_connector(state, crtc, true);
/* TODO This hack should go away */
if (aconnector) {
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
index 630e6cd..aca061a 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
@@ -226,12 +226,6 @@ extern const struct amdgpu_ip_block_version dm_ip_block;
void amdgpu_dm_update_connector_after_detect(
struct amdgpu_dm_connector *aconnector);
-struct amdgpu_dm_connector *amdgpu_dm_find_first_crct_matching_connector(
- struct drm_atomic_state *state,
- struct drm_crtc *crtc,
- bool from_state_var);
-
-
struct amdgpu_framebuffer;
struct amdgpu_display_manager;
struct dc_validation_set;
--
2.5.5
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 02/11] drm/amd/display: whitespace cleanup in amdgpu_dm.c/h
[not found] ` <1507730801-17362-1-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org>
@ 2017-10-11 14:06 ` Alex Deucher
2017-10-11 14:06 ` [PATCH 03/11] drm/amd/display: make a bunch of stuff in amdgpu_dm.c static Alex Deucher
` (9 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Alex Deucher @ 2017-10-11 14:06 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Cc: Alex Deucher, harry.wenland-5C7GfCeVMHo
To match kernel standards. No intended functional change.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 330 ++++++++++------------
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 91 +++---
2 files changed, 192 insertions(+), 229 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 4357db8..8d305ee 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -127,7 +127,7 @@ static u32 dm_vblank_get_counter(struct amdgpu_device *adev, int crtc)
}
static int dm_crtc_get_scanoutpos(struct amdgpu_device *adev, int crtc,
- u32 *vbl, u32 *position)
+ u32 *vbl, u32 *position)
{
uint32_t v_blank_start, v_blank_end, h_position, v_position;
@@ -184,9 +184,9 @@ static int dm_soft_reset(void *handle)
return 0;
}
-static struct amdgpu_crtc *get_crtc_by_otg_inst(
- struct amdgpu_device *adev,
- int otg_inst)
+static struct amdgpu_crtc *
+get_crtc_by_otg_inst(struct amdgpu_device *adev,
+ int otg_inst)
{
struct drm_device *dev = adev->ddev;
struct drm_crtc *crtc;
@@ -746,8 +746,8 @@ static struct drm_mode_config_helper_funcs amdgpu_dm_mode_config_helperfuncs = {
.atomic_commit_tail = amdgpu_dm_atomic_commit_tail
};
-void amdgpu_dm_update_connector_after_detect(
- struct amdgpu_dm_connector *aconnector)
+void
+amdgpu_dm_update_connector_after_detect(struct amdgpu_dm_connector *aconnector)
{
struct drm_connector *connector = &aconnector->base;
struct drm_device *dev = connector->dev;
@@ -1498,11 +1498,10 @@ static const struct amdgpu_display_funcs dm_display_funcs = {
#if defined(CONFIG_DEBUG_KERNEL_DC)
-static ssize_t s3_debug_store(
- struct device *device,
- struct device_attribute *attr,
- const char *buf,
- size_t count)
+static ssize_t s3_debug_store(struct device *device,
+ struct device_attribute *attr,
+ const char *buf,
+ size_t count)
{
int ret;
int s3_state;
@@ -1678,9 +1677,8 @@ static const struct drm_encoder_funcs amdgpu_dm_encoder_funcs = {
.destroy = amdgpu_dm_encoder_destroy,
};
-static bool fill_rects_from_plane_state(
- const struct drm_plane_state *state,
- struct dc_plane_state *plane_state)
+static bool fill_rects_from_plane_state(const struct drm_plane_state *state,
+ struct dc_plane_state *plane_state)
{
plane_state->src_rect.x = state->src_x >> 16;
plane_state->src_rect.y = state->src_y >> 16;
@@ -1729,10 +1727,9 @@ static bool fill_rects_from_plane_state(
return true;
}
-static int get_fb_info(
- const struct amdgpu_framebuffer *amdgpu_fb,
- uint64_t *tiling_flags,
- uint64_t *fb_location)
+static int get_fb_info(const struct amdgpu_framebuffer *amdgpu_fb,
+ uint64_t *tiling_flags,
+ uint64_t *fb_location)
{
struct amdgpu_bo *rbo = gem_to_amdgpu_bo(amdgpu_fb->obj);
int r = amdgpu_bo_reserve(rbo, false);
@@ -1753,10 +1750,10 @@ static int get_fb_info(
return r;
}
-static int fill_plane_attributes_from_fb(
- struct amdgpu_device *adev,
- struct dc_plane_state *plane_state,
- const struct amdgpu_framebuffer *amdgpu_fb, bool addReq)
+static int fill_plane_attributes_from_fb(struct amdgpu_device *adev,
+ struct dc_plane_state *plane_state,
+ const struct amdgpu_framebuffer *amdgpu_fb,
+ bool addReq)
{
uint64_t tiling_flags;
uint64_t fb_location = 0;
@@ -1905,9 +1902,8 @@ static int fill_plane_attributes_from_fb(
}
-static void fill_gamma_from_crtc_state(
- const struct drm_crtc_state *crtc_state,
- struct dc_plane_state *plane_state)
+static void fill_gamma_from_crtc_state(const struct drm_crtc_state *crtc_state,
+ struct dc_plane_state *plane_state)
{
int i;
struct dc_gamma *gamma;
@@ -1932,12 +1928,11 @@ static void fill_gamma_from_crtc_state(
plane_state->gamma_correction = gamma;
}
-static int fill_plane_attributes(
- struct amdgpu_device *adev,
- struct dc_plane_state *dc_plane_state,
- struct drm_plane_state *plane_state,
- struct drm_crtc_state *crtc_state,
- bool addrReq)
+static int fill_plane_attributes(struct amdgpu_device *adev,
+ struct dc_plane_state *dc_plane_state,
+ struct drm_plane_state *plane_state,
+ struct drm_crtc_state *crtc_state,
+ bool addrReq)
{
const struct amdgpu_framebuffer *amdgpu_fb =
to_amdgpu_framebuffer(plane_state->fb);
@@ -1976,8 +1971,8 @@ static int fill_plane_attributes(
/*****************************************************************************/
-struct amdgpu_dm_connector *aconnector_from_drm_crtc_id(
- const struct drm_crtc *crtc)
+struct amdgpu_dm_connector *
+aconnector_from_drm_crtc_id(const struct drm_crtc *crtc)
{
struct drm_device *dev = crtc->dev;
struct drm_connector *connector;
@@ -2000,10 +1995,9 @@ struct amdgpu_dm_connector *aconnector_from_drm_crtc_id(
return NULL;
}
-static void update_stream_scaling_settings(
- const struct drm_display_mode *mode,
- const struct dm_connector_state *dm_state,
- struct dc_stream_state *stream)
+static void update_stream_scaling_settings(const struct drm_display_mode *mode,
+ const struct dm_connector_state *dm_state,
+ struct dc_stream_state *stream)
{
enum amdgpu_rmx_type rmx_type;
@@ -2054,8 +2048,8 @@ static void update_stream_scaling_settings(
}
-static enum dc_color_depth convert_color_depth_from_display_info(
- const struct drm_connector *connector)
+static enum dc_color_depth
+convert_color_depth_from_display_info(const struct drm_connector *connector)
{
uint32_t bpc = connector->display_info.bpc;
@@ -2089,8 +2083,8 @@ static enum dc_color_depth convert_color_depth_from_display_info(
}
}
-static enum dc_aspect_ratio get_aspect_ratio(
- const struct drm_display_mode *mode_in)
+static enum dc_aspect_ratio
+get_aspect_ratio(const struct drm_display_mode *mode_in)
{
int32_t width = mode_in->crtc_hdisplay * 9;
int32_t height = mode_in->crtc_vdisplay * 16;
@@ -2101,8 +2095,8 @@ static enum dc_aspect_ratio get_aspect_ratio(
return ASPECT_RATIO_4_3;
}
-static enum dc_color_space get_output_color_space(
- const struct dc_crtc_timing *dc_crtc_timing)
+static enum dc_color_space
+get_output_color_space(const struct dc_crtc_timing *dc_crtc_timing)
{
enum dc_color_space color_space = COLOR_SPACE_SRGB;
@@ -2146,10 +2140,10 @@ static enum dc_color_space get_output_color_space(
/*****************************************************************************/
-static void fill_stream_properties_from_drm_display_mode(
- struct dc_stream_state *stream,
- const struct drm_display_mode *mode_in,
- const struct drm_connector *connector)
+static void
+fill_stream_properties_from_drm_display_mode(struct dc_stream_state *stream,
+ const struct drm_display_mode *mode_in,
+ const struct drm_connector *connector)
{
struct dc_crtc_timing *timing_out = &stream->timing;
@@ -2204,10 +2198,9 @@ static void fill_stream_properties_from_drm_display_mode(
}
}
-static void fill_audio_info(
- struct audio_info *audio_info,
- const struct drm_connector *drm_connector,
- const struct dc_sink *dc_sink)
+static void fill_audio_info(struct audio_info *audio_info,
+ const struct drm_connector *drm_connector,
+ const struct dc_sink *dc_sink)
{
int i = 0;
int cea_revision = 0;
@@ -2252,9 +2245,9 @@ static void fill_audio_info(
}
-static void copy_crtc_timing_for_drm_display_mode(
- const struct drm_display_mode *src_mode,
- struct drm_display_mode *dst_mode)
+static void
+copy_crtc_timing_for_drm_display_mode(const struct drm_display_mode *src_mode,
+ struct drm_display_mode *dst_mode)
{
dst_mode->crtc_hdisplay = src_mode->crtc_hdisplay;
dst_mode->crtc_vdisplay = src_mode->crtc_vdisplay;
@@ -2272,10 +2265,10 @@ static void copy_crtc_timing_for_drm_display_mode(
dst_mode->crtc_vtotal = src_mode->crtc_vtotal;
}
-static void decide_crtc_timing_for_drm_display_mode(
- struct drm_display_mode *drm_mode,
- const struct drm_display_mode *native_mode,
- bool scale_enabled)
+static void
+decide_crtc_timing_for_drm_display_mode(struct drm_display_mode *drm_mode,
+ const struct drm_display_mode *native_mode,
+ bool scale_enabled)
{
if (scale_enabled) {
copy_crtc_timing_for_drm_display_mode(native_mode, drm_mode);
@@ -2307,10 +2300,10 @@ static void create_fake_sink(struct amdgpu_dm_connector *aconnector)
aconnector->dc_link->local_sink = sink;
}
-static struct dc_stream_state *create_stream_for_sink(
- struct amdgpu_dm_connector *aconnector,
- const struct drm_display_mode *drm_mode,
- const struct dm_connector_state *dm_state)
+static struct dc_stream_state *
+create_stream_for_sink(struct amdgpu_dm_connector *aconnector,
+ const struct drm_display_mode *drm_mode,
+ const struct dm_connector_state *dm_state)
{
struct drm_display_mode *preferred_mode = NULL;
const struct drm_connector *drm_connector;
@@ -2388,7 +2381,7 @@ void amdgpu_dm_crtc_destroy(struct drm_crtc *crtc)
}
static void dm_crtc_destroy_state(struct drm_crtc *crtc,
- struct drm_crtc_state *state)
+ struct drm_crtc_state *state)
{
struct dm_crtc_state *cur = to_dm_crtc_state(state);
@@ -2474,11 +2467,10 @@ amdgpu_dm_connector_detect(struct drm_connector *connector, bool force)
connector_status_disconnected);
}
-int amdgpu_dm_connector_atomic_set_property(
- struct drm_connector *connector,
- struct drm_connector_state *connector_state,
- struct drm_property *property,
- uint64_t val)
+int amdgpu_dm_connector_atomic_set_property(struct drm_connector *connector,
+ struct drm_connector_state *connector_state,
+ struct drm_property *property,
+ uint64_t val)
{
struct drm_device *dev = connector->dev;
struct amdgpu_device *adev = dev->dev_private;
@@ -2527,11 +2519,10 @@ int amdgpu_dm_connector_atomic_set_property(
return ret;
}
-int amdgpu_dm_connector_atomic_get_property(
- struct drm_connector *connector,
- const struct drm_connector_state *state,
- struct drm_property *property,
- uint64_t *val)
+int amdgpu_dm_connector_atomic_get_property(struct drm_connector *connector,
+ const struct drm_connector_state *state,
+ struct drm_property *property,
+ uint64_t *val)
{
struct drm_device *dev = connector->dev;
struct amdgpu_device *adev = dev->dev_private;
@@ -2613,8 +2604,8 @@ void amdgpu_dm_connector_funcs_reset(struct drm_connector *connector)
}
}
-struct drm_connector_state *amdgpu_dm_connector_atomic_duplicate_state(
- struct drm_connector *connector)
+struct drm_connector_state *
+amdgpu_dm_connector_atomic_duplicate_state(struct drm_connector *connector)
{
struct dm_connector_state *state =
to_dm_connector_state(connector->state);
@@ -2719,9 +2710,8 @@ static void handle_edid_mgmt(struct amdgpu_dm_connector *aconnector)
create_eml_sink(aconnector);
}
-int amdgpu_dm_connector_mode_valid(
- struct drm_connector *connector,
- struct drm_display_mode *mode)
+int amdgpu_dm_connector_mode_valid(struct drm_connector *connector,
+ struct drm_display_mode *mode)
{
int result = MODE_ERROR;
struct dc_sink *dc_sink;
@@ -2788,9 +2778,8 @@ static void dm_crtc_helper_disable(struct drm_crtc *crtc)
{
}
-static int dm_crtc_helper_atomic_check(
- struct drm_crtc *crtc,
- struct drm_crtc_state *state)
+static int dm_crtc_helper_atomic_check(struct drm_crtc *crtc,
+ struct drm_crtc_state *state)
{
struct amdgpu_device *adev = crtc->dev->dev_private;
struct dc *dc = adev->dm.dc;
@@ -2813,10 +2802,9 @@ static int dm_crtc_helper_atomic_check(
return ret;
}
-static bool dm_crtc_helper_mode_fixup(
- struct drm_crtc *crtc,
- const struct drm_display_mode *mode,
- struct drm_display_mode *adjusted_mode)
+static bool dm_crtc_helper_mode_fixup(struct drm_crtc *crtc,
+ const struct drm_display_mode *mode,
+ struct drm_display_mode *adjusted_mode)
{
return true;
}
@@ -2832,10 +2820,9 @@ static void dm_encoder_helper_disable(struct drm_encoder *encoder)
}
-static int dm_encoder_helper_atomic_check(
- struct drm_encoder *encoder,
- struct drm_crtc_state *crtc_state,
- struct drm_connector_state *conn_state)
+static int dm_encoder_helper_atomic_check(struct drm_encoder *encoder,
+ struct drm_crtc_state *crtc_state,
+ struct drm_connector_state *conn_state)
{
return 0;
}
@@ -2883,7 +2870,7 @@ dm_drm_plane_duplicate_state(struct drm_plane *plane)
}
void dm_drm_plane_destroy_state(struct drm_plane *plane,
- struct drm_plane_state *state)
+ struct drm_plane_state *state)
{
struct dm_plane_state *dm_plane_state = to_dm_plane_state(state);
@@ -2902,9 +2889,8 @@ static const struct drm_plane_funcs dm_plane_funcs = {
.atomic_destroy_state = dm_drm_plane_destroy_state,
};
-static int dm_plane_helper_prepare_fb(
- struct drm_plane *plane,
- struct drm_plane_state *new_state)
+static int dm_plane_helper_prepare_fb(struct drm_plane *plane,
+ struct drm_plane_state *new_state)
{
struct amdgpu_framebuffer *afb;
struct drm_gem_object *obj;
@@ -2972,9 +2958,8 @@ static int dm_plane_helper_prepare_fb(
return 0;
}
-static void dm_plane_helper_cleanup_fb(
- struct drm_plane *plane,
- struct drm_plane_state *old_state)
+static void dm_plane_helper_cleanup_fb(struct drm_plane *plane,
+ struct drm_plane_state *old_state)
{
struct amdgpu_bo *rbo;
struct amdgpu_framebuffer *afb;
@@ -2997,7 +2982,8 @@ static void dm_plane_helper_cleanup_fb(
}
int dm_create_validation_set_for_connector(struct drm_connector *connector,
- struct drm_display_mode *mode, struct dc_validation_set *val_set)
+ struct drm_display_mode *mode,
+ struct dc_validation_set *val_set)
{
int result = MODE_ERROR;
struct dc_sink *dc_sink =
@@ -3035,7 +3021,7 @@ int dm_create_validation_set_for_connector(struct drm_connector *connector,
}
int dm_plane_atomic_check(struct drm_plane *plane,
- struct drm_plane_state *state)
+ struct drm_plane_state *state)
{
struct amdgpu_device *adev = plane->dev->dev_private;
struct dc *dc = adev->dm.dc;
@@ -3083,8 +3069,8 @@ static const u32 cursor_formats[] = {
};
int amdgpu_dm_plane_init(struct amdgpu_display_manager *dm,
- struct amdgpu_plane *aplane,
- unsigned long possible_crtcs)
+ struct amdgpu_plane *aplane,
+ unsigned long possible_crtcs)
{
int res = -EPERM;
@@ -3232,9 +3218,10 @@ static void amdgpu_dm_get_native_mode(struct drm_connector *connector)
}
}
-static struct drm_display_mode *amdgpu_dm_create_common_mode(
- struct drm_encoder *encoder, char *name,
- int hdisplay, int vdisplay)
+static struct drm_display_mode *
+amdgpu_dm_create_common_mode(struct drm_encoder *encoder,
+ char *name,
+ int hdisplay, int vdisplay)
{
struct drm_device *dev = encoder->dev;
struct amdgpu_encoder *amdgpu_encoder = to_amdgpu_encoder(encoder);
@@ -3256,7 +3243,7 @@ static struct drm_display_mode *amdgpu_dm_create_common_mode(
}
static void amdgpu_dm_connector_add_common_modes(struct drm_encoder *encoder,
- struct drm_connector *connector)
+ struct drm_connector *connector)
{
struct amdgpu_encoder *amdgpu_encoder = to_amdgpu_encoder(encoder);
struct drm_display_mode *mode = NULL;
@@ -3314,9 +3301,8 @@ static void amdgpu_dm_connector_add_common_modes(struct drm_encoder *encoder,
}
}
-static void amdgpu_dm_connector_ddc_get_modes(
- struct drm_connector *connector,
- struct edid *edid)
+static void amdgpu_dm_connector_ddc_get_modes(struct drm_connector *connector,
+ struct edid *edid)
{
struct amdgpu_dm_connector *amdgpu_dm_connector =
to_amdgpu_dm_connector(connector);
@@ -3350,12 +3336,11 @@ int amdgpu_dm_connector_get_modes(struct drm_connector *connector)
return amdgpu_dm_connector->num_modes;
}
-void amdgpu_dm_connector_init_helper(
- struct amdgpu_display_manager *dm,
- struct amdgpu_dm_connector *aconnector,
- int connector_type,
- struct dc_link *link,
- int link_index)
+void amdgpu_dm_connector_init_helper(struct amdgpu_display_manager *dm,
+ struct amdgpu_dm_connector *aconnector,
+ int connector_type,
+ struct dc_link *link,
+ int link_index)
{
struct amdgpu_device *adev = dm->ddev->dev_private;
@@ -3403,7 +3388,7 @@ void amdgpu_dm_connector_init_helper(
}
int amdgpu_dm_i2c_xfer(struct i2c_adapter *i2c_adap,
- struct i2c_msg *msgs, int num)
+ struct i2c_msg *msgs, int num)
{
struct amdgpu_i2c_adapter *i2c = i2c_get_adapdata(i2c_adap);
struct ddc_service *ddc_service = i2c->ddc_service;
@@ -3447,10 +3432,10 @@ static const struct i2c_algorithm amdgpu_dm_i2c_algo = {
.functionality = amdgpu_dm_i2c_func,
};
-static struct amdgpu_i2c_adapter *create_i2c(
- struct ddc_service *ddc_service,
- int link_index,
- int *res)
+static struct amdgpu_i2c_adapter *
+create_i2c(struct ddc_service *ddc_service,
+ int link_index,
+ int *res)
{
struct amdgpu_device *adev = ddc_service->ctx->driver_context;
struct amdgpu_i2c_adapter *i2c;
@@ -3470,11 +3455,10 @@ static struct amdgpu_i2c_adapter *create_i2c(
/* Note: this function assumes that dc_link_detect() was called for the
* dc_link which will be represented by this aconnector.
*/
-int amdgpu_dm_connector_init(
- struct amdgpu_display_manager *dm,
- struct amdgpu_dm_connector *aconnector,
- uint32_t link_index,
- struct amdgpu_encoder *aencoder)
+int amdgpu_dm_connector_init(struct amdgpu_display_manager *dm,
+ struct amdgpu_dm_connector *aconnector,
+ uint32_t link_index,
+ struct amdgpu_encoder *aencoder)
{
int res = 0;
int connector_type;
@@ -3577,10 +3561,9 @@ int amdgpu_dm_get_encoder_crtc_mask(struct amdgpu_device *adev)
}
}
-int amdgpu_dm_encoder_init(
- struct drm_device *dev,
- struct amdgpu_encoder *aencoder,
- uint32_t link_index)
+int amdgpu_dm_encoder_init(struct drm_device *dev,
+ struct amdgpu_encoder *aencoder,
+ uint32_t link_index)
{
struct amdgpu_device *adev = dev->dev_private;
@@ -3602,10 +3585,9 @@ int amdgpu_dm_encoder_init(
return res;
}
-static void manage_dm_interrupts(
- struct amdgpu_device *adev,
- struct amdgpu_crtc *acrtc,
- bool enable)
+static void manage_dm_interrupts(struct amdgpu_device *adev,
+ struct amdgpu_crtc *acrtc,
+ bool enable)
{
/*
* this is not correct translation but will work as soon as VBLANK
@@ -3632,9 +3614,9 @@ static void manage_dm_interrupts(
}
}
-static bool is_scaling_state_different(
- const struct dm_connector_state *dm_state,
- const struct dm_connector_state *old_dm_state)
+static bool
+is_scaling_state_different(const struct dm_connector_state *dm_state,
+ const struct dm_connector_state *old_dm_state)
{
if (dm_state->scaling != old_dm_state->scaling)
return true;
@@ -3650,10 +3632,9 @@ static bool is_scaling_state_different(
return false;
}
-static void remove_stream(
- struct amdgpu_device *adev,
- struct amdgpu_crtc *acrtc,
- struct dc_stream_state *stream)
+static void remove_stream(struct amdgpu_device *adev,
+ struct amdgpu_crtc *acrtc,
+ struct dc_stream_state *stream)
{
/* this is the update mode case */
if (adev->dm.freesync_module)
@@ -3664,7 +3645,7 @@ static void remove_stream(
}
int get_cursor_position(struct drm_plane *plane, struct drm_crtc *crtc,
- struct dc_cursor_position *position)
+ struct dc_cursor_position *position)
{
struct amdgpu_crtc *amdgpu_crtc = amdgpu_crtc = to_amdgpu_crtc(crtc);
int x, y;
@@ -3708,9 +3689,8 @@ int get_cursor_position(struct drm_plane *plane, struct drm_crtc *crtc,
return 0;
}
-static void handle_cursor_update(
- struct drm_plane *plane,
- struct drm_plane_state *old_plane_state)
+static void handle_cursor_update(struct drm_plane *plane,
+ struct drm_plane_state *old_plane_state)
{
struct amdgpu_framebuffer *afb = to_amdgpu_framebuffer(plane->state->fb);
struct drm_crtc *crtc = afb ? plane->state->crtc : old_plane_state->crtc;
@@ -3788,10 +3768,9 @@ static void prepare_flip_isr(struct amdgpu_crtc *acrtc)
*
* Waits on all BO's fences and for proper vblank count
*/
-static void amdgpu_dm_do_flip(
- struct drm_crtc *crtc,
- struct drm_framebuffer *fb,
- uint32_t target)
+static void amdgpu_dm_do_flip(struct drm_crtc *crtc,
+ struct drm_framebuffer *fb,
+ uint32_t target)
{
unsigned long flags;
uint32_t target_vblank;
@@ -3874,10 +3853,10 @@ static void amdgpu_dm_do_flip(
}
static void amdgpu_dm_commit_planes(struct drm_atomic_state *state,
- struct drm_device *dev,
- struct amdgpu_display_manager *dm,
- struct drm_crtc *pcrtc,
- bool *wait_for_vblank)
+ struct drm_device *dev,
+ struct amdgpu_display_manager *dm,
+ struct drm_crtc *pcrtc,
+ bool *wait_for_vblank)
{
uint32_t i;
struct drm_plane *plane;
@@ -3970,10 +3949,9 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state,
}
-int amdgpu_dm_atomic_commit(
- struct drm_device *dev,
- struct drm_atomic_state *state,
- bool nonblock)
+int amdgpu_dm_atomic_commit(struct drm_device *dev,
+ struct drm_atomic_state *state,
+ bool nonblock)
{
struct drm_crtc *crtc;
struct drm_crtc_state *new_state;
@@ -4000,8 +3978,7 @@ int amdgpu_dm_atomic_commit(
/*TODO Handle EINTR, reenable IRQ*/
}
-void amdgpu_dm_atomic_commit_tail(
- struct drm_atomic_state *state)
+void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state)
{
struct drm_device *dev = state->dev;
struct amdgpu_device *adev = dev->dev_private;
@@ -4300,7 +4277,8 @@ static int dm_force_atomic_commit(struct drm_connector *connector)
* This include when the same display is unplugged then plugged back into the
* same port and when we are running without usermode desktop manager supprot
*/
-void dm_restore_drm_connector_state(struct drm_device *dev, struct drm_connector *connector)
+void dm_restore_drm_connector_state(struct drm_device *dev,
+ struct drm_connector *connector)
{
struct amdgpu_dm_connector *aconnector = to_amdgpu_dm_connector(connector);
struct amdgpu_crtc *disconnected_acrtc;
@@ -4328,9 +4306,8 @@ void dm_restore_drm_connector_state(struct drm_device *dev, struct drm_connector
* Grabs all modesetting locks to serialize against any blocking commits,
* Waits for completion of all non blocking commits.
*/
-static int do_aquire_global_lock(
- struct drm_device *dev,
- struct drm_atomic_state *state)
+static int do_aquire_global_lock(struct drm_device *dev,
+ struct drm_atomic_state *state)
{
struct drm_crtc *crtc;
struct drm_crtc_commit *commit;
@@ -4374,11 +4351,10 @@ static int do_aquire_global_lock(
return ret < 0 ? ret : 0;
}
-static int dm_update_crtcs_state(
- struct dc *dc,
- struct drm_atomic_state *state,
- bool enable,
- bool *lock_and_validation_needed)
+static int dm_update_crtcs_state(struct dc *dc,
+ struct drm_atomic_state *state,
+ bool enable,
+ bool *lock_and_validation_needed)
{
struct drm_crtc *crtc;
struct drm_crtc_state *crtc_state;
@@ -4524,11 +4500,10 @@ static int dm_update_crtcs_state(
return ret;
}
-static int dm_update_planes_state(
- struct dc *dc,
- struct drm_atomic_state *state,
- bool enable,
- bool *lock_and_validation_needed)
+static int dm_update_planes_state(struct dc *dc,
+ struct drm_atomic_state *state,
+ bool enable,
+ bool *lock_and_validation_needed)
{
struct drm_crtc *new_plane_crtc, *old_plane_crtc;
struct drm_crtc_state *new_crtc_state;
@@ -4645,7 +4620,7 @@ static int dm_update_planes_state(
}
int amdgpu_dm_atomic_check(struct drm_device *dev,
- struct drm_atomic_state *state)
+ struct drm_atomic_state *state)
{
int i;
int ret;
@@ -4776,9 +4751,8 @@ int amdgpu_dm_atomic_check(struct drm_device *dev,
return ret;
}
-static bool is_dp_capable_without_timing_msa(
- struct dc *dc,
- struct amdgpu_dm_connector *amdgpu_dm_connector)
+static bool is_dp_capable_without_timing_msa(struct dc *dc,
+ struct amdgpu_dm_connector *amdgpu_dm_connector)
{
uint8_t dpcd_data;
bool capable = false;
@@ -4795,9 +4769,8 @@ static bool is_dp_capable_without_timing_msa(
return capable;
}
-void amdgpu_dm_add_sink_to_freesync_module(
- struct drm_connector *connector,
- struct edid *edid)
+void amdgpu_dm_add_sink_to_freesync_module(struct drm_connector *connector,
+ struct edid *edid)
{
int i;
uint64_t val_capable;
@@ -4877,8 +4850,7 @@ void amdgpu_dm_add_sink_to_freesync_module(
}
-void amdgpu_dm_remove_sink_from_freesync_module(
- struct drm_connector *connector)
+void amdgpu_dm_remove_sink_from_freesync_module(struct drm_connector *connector)
{
/*
* TODO fill in once we figure out how to deal with freesync in
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
index aca061a..eb20642 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
@@ -206,12 +206,10 @@ void amdgpu_dm_destroy(void);
*
* Returns 0 on success
*/
-int amdgpu_dm_initialize_drm_device(
- struct amdgpu_device *adev);
+int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev);
/* removes and deallocates the drm structures, created by the above function */
-void amdgpu_dm_destroy_drm_device(
- struct amdgpu_display_manager *dm);
+void amdgpu_dm_destroy_drm_device(struct amdgpu_display_manager *dm);
/* Locking/Mutex */
bool amdgpu_dm_acquire_dal_lock(struct amdgpu_display_manager *dm);
@@ -223,8 +221,8 @@ void amdgpu_dm_register_backlight_device(struct amdgpu_display_manager *dm);
extern const struct amdgpu_ip_block_version dm_ip_block;
-void amdgpu_dm_update_connector_after_detect(
- struct amdgpu_dm_connector *aconnector);
+void
+amdgpu_dm_update_connector_after_detect(struct amdgpu_dm_connector *aconnector);
struct amdgpu_framebuffer;
struct amdgpu_display_manager;
@@ -256,19 +254,18 @@ struct dm_atomic_state {
/*TODO Jodan Hersen use the one in amdgpu_dm*/
int amdgpu_dm_plane_init(struct amdgpu_display_manager *dm,
- struct amdgpu_plane *aplane,
- unsigned long possible_crtcs);
+ struct amdgpu_plane *aplane,
+ unsigned long possible_crtcs);
int amdgpu_dm_crtc_init(struct amdgpu_display_manager *dm,
struct drm_plane *plane,
uint32_t link_index);
int amdgpu_dm_connector_init(struct amdgpu_display_manager *dm,
- struct amdgpu_dm_connector *amdgpu_dm_connector,
- uint32_t link_index,
- struct amdgpu_encoder *amdgpu_encoder);
-int amdgpu_dm_encoder_init(
- struct drm_device *dev,
- struct amdgpu_encoder *aencoder,
- uint32_t link_index);
+ struct amdgpu_dm_connector *amdgpu_dm_connector,
+ uint32_t link_index,
+ struct amdgpu_encoder *amdgpu_encoder);
+int amdgpu_dm_encoder_init(struct drm_device *dev,
+ struct amdgpu_encoder *aencoder,
+ uint32_t link_index);
void amdgpu_dm_crtc_destroy(struct drm_crtc *crtc);
void amdgpu_dm_connector_destroy(struct drm_connector *connector);
@@ -276,53 +273,47 @@ void amdgpu_dm_encoder_destroy(struct drm_encoder *encoder);
int amdgpu_dm_connector_get_modes(struct drm_connector *connector);
-int amdgpu_dm_atomic_commit(
- struct drm_device *dev,
- struct drm_atomic_state *state,
- bool nonblock);
+int amdgpu_dm_atomic_commit(struct drm_device *dev,
+ struct drm_atomic_state *state,
+ bool nonblock);
-void amdgpu_dm_atomic_commit_tail(
- struct drm_atomic_state *state);
+void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state);
int amdgpu_dm_atomic_check(struct drm_device *dev,
- struct drm_atomic_state *state);
+ struct drm_atomic_state *state);
void amdgpu_dm_connector_funcs_reset(struct drm_connector *connector);
-struct drm_connector_state *amdgpu_dm_connector_atomic_duplicate_state(
- struct drm_connector *connector);
-int amdgpu_dm_connector_atomic_set_property(
- struct drm_connector *connector,
- struct drm_connector_state *state,
- struct drm_property *property,
- uint64_t val);
-
-int amdgpu_dm_connector_atomic_get_property(
- struct drm_connector *connector,
- const struct drm_connector_state *state,
- struct drm_property *property,
- uint64_t *val);
+struct drm_connector_state *
+amdgpu_dm_connector_atomic_duplicate_state(struct drm_connector *connector);
+int amdgpu_dm_connector_atomic_set_property(struct drm_connector *connector,
+ struct drm_connector_state *state,
+ struct drm_property *property,
+ uint64_t val);
+
+int amdgpu_dm_connector_atomic_get_property(struct drm_connector *connector,
+ const struct drm_connector_state *state,
+ struct drm_property *property,
+ uint64_t *val);
int amdgpu_dm_get_encoder_crtc_mask(struct amdgpu_device *adev);
-void amdgpu_dm_connector_init_helper(
- struct amdgpu_display_manager *dm,
- struct amdgpu_dm_connector *aconnector,
- int connector_type,
- struct dc_link *link,
- int link_index);
+void amdgpu_dm_connector_init_helper(struct amdgpu_display_manager *dm,
+ struct amdgpu_dm_connector *aconnector,
+ int connector_type,
+ struct dc_link *link,
+ int link_index);
-int amdgpu_dm_connector_mode_valid(
- struct drm_connector *connector,
- struct drm_display_mode *mode);
+int amdgpu_dm_connector_mode_valid(struct drm_connector *connector,
+ struct drm_display_mode *mode);
-void dm_restore_drm_connector_state(struct drm_device *dev, struct drm_connector *connector);
+void dm_restore_drm_connector_state(struct drm_device *dev,
+ struct drm_connector *connector);
-void amdgpu_dm_add_sink_to_freesync_module(
- struct drm_connector *connector,
- struct edid *edid);
+void amdgpu_dm_add_sink_to_freesync_module(struct drm_connector *connector,
+ struct edid *edid);
-void amdgpu_dm_remove_sink_from_freesync_module(
- struct drm_connector *connector);
+void
+amdgpu_dm_remove_sink_from_freesync_module(struct drm_connector *connector);
extern const struct drm_encoder_helper_funcs amdgpu_dm_encoder_helper_funcs;
--
2.5.5
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 03/11] drm/amd/display: make a bunch of stuff in amdgpu_dm.c static
[not found] ` <1507730801-17362-1-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org>
2017-10-11 14:06 ` [PATCH 02/11] drm/amd/display: whitespace cleanup in amdgpu_dm.c/h Alex Deucher
@ 2017-10-11 14:06 ` Alex Deucher
2017-10-11 14:06 ` [PATCH 04/11] drm/amd/display: drop unused functions in amdgpu_dm.c Alex Deucher
` (8 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Alex Deucher @ 2017-10-11 14:06 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Cc: Alex Deucher, harry.wenland-5C7GfCeVMHo
Not used outside of that file.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 136 +++++++++++++++-------
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 59 ----------
2 files changed, 91 insertions(+), 104 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 8d305ee..1b3cc8d 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -70,6 +70,50 @@
#include "i2caux_interface.h"
+/* basic init/fini API */
+static int amdgpu_dm_init(struct amdgpu_device *adev);
+static void amdgpu_dm_fini(struct amdgpu_device *adev);
+
+/* initializes drm_device display related structures, based on the information
+ * provided by DAL. The drm strcutures are: drm_crtc, drm_connector,
+ * drm_encoder, drm_mode_config
+ *
+ * Returns 0 on success
+ */
+static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev);
+/* removes and deallocates the drm structures, created by the above function */
+static void amdgpu_dm_destroy_drm_device(struct amdgpu_display_manager *dm);
+
+static void
+amdgpu_dm_update_connector_after_detect(struct amdgpu_dm_connector *aconnector);
+
+static int amdgpu_dm_plane_init(struct amdgpu_display_manager *dm,
+ struct amdgpu_plane *aplane,
+ unsigned long possible_crtcs);
+static int amdgpu_dm_crtc_init(struct amdgpu_display_manager *dm,
+ struct drm_plane *plane,
+ uint32_t link_index);
+static int amdgpu_dm_connector_init(struct amdgpu_display_manager *dm,
+ struct amdgpu_dm_connector *amdgpu_dm_connector,
+ uint32_t link_index,
+ struct amdgpu_encoder *amdgpu_encoder);
+static int amdgpu_dm_encoder_init(struct drm_device *dev,
+ struct amdgpu_encoder *aencoder,
+ uint32_t link_index);
+
+static int amdgpu_dm_connector_get_modes(struct drm_connector *connector);
+
+static int amdgpu_dm_atomic_commit(struct drm_device *dev,
+ struct drm_atomic_state *state,
+ bool nonblock);
+
+static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state);
+
+static int amdgpu_dm_atomic_check(struct drm_device *dev,
+ struct drm_atomic_state *state);
+
+
+
static const enum drm_plane_type dm_plane_type_default[AMDGPU_MAX_PLANES] = {
DRM_PLANE_TYPE_PRIMARY,
@@ -306,7 +350,7 @@ static void hotplug_notify_work_func(struct work_struct *work)
/* TODO: Dynamic allocation */
#define AMDGPU_FBC_SIZE (3840 * 2160 * 4)
-void amdgpu_dm_initialize_fbc(struct amdgpu_device *adev)
+static void amdgpu_dm_initialize_fbc(struct amdgpu_device *adev)
{
int r;
struct dm_comressor_info *compressor = &adev->dm.compressor;
@@ -328,7 +372,7 @@ void amdgpu_dm_initialize_fbc(struct amdgpu_device *adev)
*
* Returns 0 on success
*/
-int amdgpu_dm_init(struct amdgpu_device *adev)
+static int amdgpu_dm_init(struct amdgpu_device *adev)
{
struct dc_init_data init_data;
adev->dm.ddev = adev->ddev;
@@ -431,7 +475,7 @@ int amdgpu_dm_init(struct amdgpu_device *adev)
return -1;
}
-void amdgpu_dm_fini(struct amdgpu_device *adev)
+static void amdgpu_dm_fini(struct amdgpu_device *adev)
{
amdgpu_dm_destroy_drm_device(&adev->dm);
/*
@@ -455,7 +499,7 @@ void amdgpu_dm_fini(struct amdgpu_device *adev)
}
/* moved from amdgpu_dm_kms.c */
-void amdgpu_dm_destroy()
+static void amdgpu_dm_destroy(void)
{
}
@@ -693,7 +737,7 @@ const struct amdgpu_ip_block_version dm_ip_block =
};
-struct drm_atomic_state *
+static struct drm_atomic_state *
dm_atomic_state_alloc(struct drm_device *dev)
{
struct dm_atomic_state *state = kzalloc(sizeof(*state), GFP_KERNEL);
@@ -746,7 +790,7 @@ static struct drm_mode_config_helper_funcs amdgpu_dm_mode_config_helperfuncs = {
.atomic_commit_tail = amdgpu_dm_atomic_commit_tail
};
-void
+static void
amdgpu_dm_update_connector_after_detect(struct amdgpu_dm_connector *aconnector)
{
struct drm_connector *connector = &aconnector->base;
@@ -1253,7 +1297,8 @@ static const struct backlight_ops amdgpu_dm_backlight_ops = {
.update_status = amdgpu_dm_backlight_update_status,
};
-void amdgpu_dm_register_backlight_device(struct amdgpu_display_manager *dm)
+static void
+amdgpu_dm_register_backlight_device(struct amdgpu_display_manager *dm)
{
char bl_name[16];
struct backlight_properties props = { 0 };
@@ -1285,7 +1330,7 @@ void amdgpu_dm_register_backlight_device(struct amdgpu_display_manager *dm)
*
* Returns 0 on success
*/
-int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev)
+static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev)
{
struct amdgpu_display_manager *dm = &adev->dm;
uint32_t i;
@@ -1418,7 +1463,7 @@ int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev)
return -1;
}
-void amdgpu_dm_destroy_drm_device(struct amdgpu_display_manager *dm)
+static void amdgpu_dm_destroy_drm_device(struct amdgpu_display_manager *dm)
{
drm_mode_config_cleanup(dm->ddev);
return;
@@ -1621,13 +1666,13 @@ static int dm_early_init(void *handle)
return 0;
}
-bool amdgpu_dm_acquire_dal_lock(struct amdgpu_display_manager *dm)
+static bool amdgpu_dm_acquire_dal_lock(struct amdgpu_display_manager *dm)
{
/* TODO */
return true;
}
-bool amdgpu_dm_release_dal_lock(struct amdgpu_display_manager *dm)
+static bool amdgpu_dm_release_dal_lock(struct amdgpu_display_manager *dm)
{
/* TODO */
return true;
@@ -1667,7 +1712,7 @@ static bool modereset_required(struct drm_crtc_state *crtc_state)
return !crtc_state->enable || !crtc_state->active;
}
-void amdgpu_dm_encoder_destroy(struct drm_encoder *encoder)
+static void amdgpu_dm_encoder_destroy(struct drm_encoder *encoder)
{
drm_encoder_cleanup(encoder);
kfree(encoder);
@@ -1971,7 +2016,7 @@ static int fill_plane_attributes(struct amdgpu_device *adev,
/*****************************************************************************/
-struct amdgpu_dm_connector *
+static struct amdgpu_dm_connector *
aconnector_from_drm_crtc_id(const struct drm_crtc *crtc)
{
struct drm_device *dev = crtc->dev;
@@ -2374,7 +2419,7 @@ create_stream_for_sink(struct amdgpu_dm_connector *aconnector,
return stream;
}
-void amdgpu_dm_crtc_destroy(struct drm_crtc *crtc)
+static void amdgpu_dm_crtc_destroy(struct drm_crtc *crtc)
{
drm_crtc_cleanup(crtc);
kfree(crtc);
@@ -2560,7 +2605,7 @@ int amdgpu_dm_connector_atomic_get_property(struct drm_connector *connector,
return ret;
}
-void amdgpu_dm_connector_destroy(struct drm_connector *connector)
+static void amdgpu_dm_connector_destroy(struct drm_connector *connector)
{
struct amdgpu_dm_connector *aconnector = to_amdgpu_dm_connector(connector);
const struct dc_link *link = aconnector->dc_link;
@@ -2981,9 +3026,10 @@ static void dm_plane_helper_cleanup_fb(struct drm_plane *plane,
amdgpu_bo_unref(&rbo);
}
-int dm_create_validation_set_for_connector(struct drm_connector *connector,
- struct drm_display_mode *mode,
- struct dc_validation_set *val_set)
+static int
+dm_create_validation_set_for_connector(struct drm_connector *connector,
+ struct drm_display_mode *mode,
+ struct dc_validation_set *val_set)
{
int result = MODE_ERROR;
struct dc_sink *dc_sink =
@@ -3020,8 +3066,8 @@ int dm_create_validation_set_for_connector(struct drm_connector *connector,
return MODE_OK;
}
-int dm_plane_atomic_check(struct drm_plane *plane,
- struct drm_plane_state *state)
+static int dm_plane_atomic_check(struct drm_plane *plane,
+ struct drm_plane_state *state)
{
struct amdgpu_device *adev = plane->dev->dev_private;
struct dc *dc = adev->dm.dc;
@@ -3068,9 +3114,9 @@ static const u32 cursor_formats[] = {
DRM_FORMAT_ARGB8888
};
-int amdgpu_dm_plane_init(struct amdgpu_display_manager *dm,
- struct amdgpu_plane *aplane,
- unsigned long possible_crtcs)
+static int amdgpu_dm_plane_init(struct amdgpu_display_manager *dm,
+ struct amdgpu_plane *aplane,
+ unsigned long possible_crtcs)
{
int res = -EPERM;
@@ -3114,9 +3160,9 @@ int amdgpu_dm_plane_init(struct amdgpu_display_manager *dm,
return res;
}
-int amdgpu_dm_crtc_init(struct amdgpu_display_manager *dm,
- struct drm_plane *plane,
- uint32_t crtc_index)
+static int amdgpu_dm_crtc_init(struct amdgpu_display_manager *dm,
+ struct drm_plane *plane,
+ uint32_t crtc_index)
{
struct amdgpu_crtc *acrtc = NULL;
struct amdgpu_plane *cursor_plane;
@@ -3320,7 +3366,7 @@ static void amdgpu_dm_connector_ddc_get_modes(struct drm_connector *connector,
amdgpu_dm_connector->num_modes = 0;
}
-int amdgpu_dm_connector_get_modes(struct drm_connector *connector)
+static int amdgpu_dm_connector_get_modes(struct drm_connector *connector)
{
const struct drm_connector_helper_funcs *helper =
connector->helper_private;
@@ -3387,8 +3433,8 @@ void amdgpu_dm_connector_init_helper(struct amdgpu_display_manager *dm,
}
-int amdgpu_dm_i2c_xfer(struct i2c_adapter *i2c_adap,
- struct i2c_msg *msgs, int num)
+static int amdgpu_dm_i2c_xfer(struct i2c_adapter *i2c_adap,
+ struct i2c_msg *msgs, int num)
{
struct amdgpu_i2c_adapter *i2c = i2c_get_adapdata(i2c_adap);
struct ddc_service *ddc_service = i2c->ddc_service;
@@ -3422,7 +3468,7 @@ int amdgpu_dm_i2c_xfer(struct i2c_adapter *i2c_adap,
return result;
}
-u32 amdgpu_dm_i2c_func(struct i2c_adapter *adap)
+static u32 amdgpu_dm_i2c_func(struct i2c_adapter *adap)
{
return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL;
}
@@ -3455,10 +3501,10 @@ create_i2c(struct ddc_service *ddc_service,
/* Note: this function assumes that dc_link_detect() was called for the
* dc_link which will be represented by this aconnector.
*/
-int amdgpu_dm_connector_init(struct amdgpu_display_manager *dm,
- struct amdgpu_dm_connector *aconnector,
- uint32_t link_index,
- struct amdgpu_encoder *aencoder)
+static int amdgpu_dm_connector_init(struct amdgpu_display_manager *dm,
+ struct amdgpu_dm_connector *aconnector,
+ uint32_t link_index,
+ struct amdgpu_encoder *aencoder)
{
int res = 0;
int connector_type;
@@ -3561,9 +3607,9 @@ int amdgpu_dm_get_encoder_crtc_mask(struct amdgpu_device *adev)
}
}
-int amdgpu_dm_encoder_init(struct drm_device *dev,
- struct amdgpu_encoder *aencoder,
- uint32_t link_index)
+static int amdgpu_dm_encoder_init(struct drm_device *dev,
+ struct amdgpu_encoder *aencoder,
+ uint32_t link_index)
{
struct amdgpu_device *adev = dev->dev_private;
@@ -3644,8 +3690,8 @@ static void remove_stream(struct amdgpu_device *adev,
acrtc->enabled = false;
}
-int get_cursor_position(struct drm_plane *plane, struct drm_crtc *crtc,
- struct dc_cursor_position *position)
+static int get_cursor_position(struct drm_plane *plane, struct drm_crtc *crtc,
+ struct dc_cursor_position *position)
{
struct amdgpu_crtc *amdgpu_crtc = amdgpu_crtc = to_amdgpu_crtc(crtc);
int x, y;
@@ -3949,9 +3995,9 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state,
}
-int amdgpu_dm_atomic_commit(struct drm_device *dev,
- struct drm_atomic_state *state,
- bool nonblock)
+static int amdgpu_dm_atomic_commit(struct drm_device *dev,
+ struct drm_atomic_state *state,
+ bool nonblock)
{
struct drm_crtc *crtc;
struct drm_crtc_state *new_state;
@@ -3978,7 +4024,7 @@ int amdgpu_dm_atomic_commit(struct drm_device *dev,
/*TODO Handle EINTR, reenable IRQ*/
}
-void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state)
+static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state)
{
struct drm_device *dev = state->dev;
struct amdgpu_device *adev = dev->dev_private;
@@ -4619,8 +4665,8 @@ static int dm_update_planes_state(struct dc *dc,
return ret;
}
-int amdgpu_dm_atomic_check(struct drm_device *dev,
- struct drm_atomic_state *state)
+static int amdgpu_dm_atomic_check(struct drm_device *dev,
+ struct drm_atomic_state *state)
{
int i;
int ret;
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
index eb20642..be3b70d 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
@@ -193,37 +193,8 @@ struct amdgpu_dm_connector {
#define to_amdgpu_dm_connector(x) container_of(x, struct amdgpu_dm_connector, base)
-/* basic init/fini API */
-int amdgpu_dm_init(struct amdgpu_device *adev);
-
-void amdgpu_dm_fini(struct amdgpu_device *adev);
-
-void amdgpu_dm_destroy(void);
-
-/* initializes drm_device display related structures, based on the information
- * provided by DAL. The drm strcutures are: drm_crtc, drm_connector,
- * drm_encoder, drm_mode_config
- *
- * Returns 0 on success
- */
-int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev);
-
-/* removes and deallocates the drm structures, created by the above function */
-void amdgpu_dm_destroy_drm_device(struct amdgpu_display_manager *dm);
-
-/* Locking/Mutex */
-bool amdgpu_dm_acquire_dal_lock(struct amdgpu_display_manager *dm);
-
-bool amdgpu_dm_release_dal_lock(struct amdgpu_display_manager *dm);
-
-/* Register "Backlight device" accessible by user-mode. */
-void amdgpu_dm_register_backlight_device(struct amdgpu_display_manager *dm);
-
extern const struct amdgpu_ip_block_version dm_ip_block;
-void
-amdgpu_dm_update_connector_after_detect(struct amdgpu_dm_connector *aconnector);
-
struct amdgpu_framebuffer;
struct amdgpu_display_manager;
struct dc_validation_set;
@@ -252,36 +223,6 @@ struct dm_atomic_state {
#define to_dm_atomic_state(x) container_of(x, struct dm_atomic_state, base)
-/*TODO Jodan Hersen use the one in amdgpu_dm*/
-int amdgpu_dm_plane_init(struct amdgpu_display_manager *dm,
- struct amdgpu_plane *aplane,
- unsigned long possible_crtcs);
-int amdgpu_dm_crtc_init(struct amdgpu_display_manager *dm,
- struct drm_plane *plane,
- uint32_t link_index);
-int amdgpu_dm_connector_init(struct amdgpu_display_manager *dm,
- struct amdgpu_dm_connector *amdgpu_dm_connector,
- uint32_t link_index,
- struct amdgpu_encoder *amdgpu_encoder);
-int amdgpu_dm_encoder_init(struct drm_device *dev,
- struct amdgpu_encoder *aencoder,
- uint32_t link_index);
-
-void amdgpu_dm_crtc_destroy(struct drm_crtc *crtc);
-void amdgpu_dm_connector_destroy(struct drm_connector *connector);
-void amdgpu_dm_encoder_destroy(struct drm_encoder *encoder);
-
-int amdgpu_dm_connector_get_modes(struct drm_connector *connector);
-
-int amdgpu_dm_atomic_commit(struct drm_device *dev,
- struct drm_atomic_state *state,
- bool nonblock);
-
-void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state);
-
-int amdgpu_dm_atomic_check(struct drm_device *dev,
- struct drm_atomic_state *state);
-
void amdgpu_dm_connector_funcs_reset(struct drm_connector *connector);
struct drm_connector_state *
amdgpu_dm_connector_atomic_duplicate_state(struct drm_connector *connector);
--
2.5.5
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 04/11] drm/amd/display: drop unused functions in amdgpu_dm.c
[not found] ` <1507730801-17362-1-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org>
2017-10-11 14:06 ` [PATCH 02/11] drm/amd/display: whitespace cleanup in amdgpu_dm.c/h Alex Deucher
2017-10-11 14:06 ` [PATCH 03/11] drm/amd/display: make a bunch of stuff in amdgpu_dm.c static Alex Deucher
@ 2017-10-11 14:06 ` Alex Deucher
2017-10-11 14:06 ` [PATCH 05/11] drm/amd/display: implement dm_delay_in_microseconds Alex Deucher
` (7 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Alex Deucher @ 2017-10-11 14:06 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Cc: Alex Deucher, harry.wenland-5C7GfCeVMHo
Not used anywhere.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 82 -----------------------
1 file changed, 82 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 1b3cc8d..0202c6f 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -498,11 +498,6 @@ static void amdgpu_dm_fini(struct amdgpu_device *adev)
return;
}
-/* moved from amdgpu_dm_kms.c */
-static void amdgpu_dm_destroy(void)
-{
-}
-
static int dm_sw_init(void *handle)
{
return 0;
@@ -1666,19 +1661,6 @@ static int dm_early_init(void *handle)
return 0;
}
-static bool amdgpu_dm_acquire_dal_lock(struct amdgpu_display_manager *dm)
-{
- /* TODO */
- return true;
-}
-
-static bool amdgpu_dm_release_dal_lock(struct amdgpu_display_manager *dm)
-{
- /* TODO */
- return true;
-}
-
-
struct dm_connector_state {
struct drm_connector_state base;
@@ -2016,30 +1998,6 @@ static int fill_plane_attributes(struct amdgpu_device *adev,
/*****************************************************************************/
-static struct amdgpu_dm_connector *
-aconnector_from_drm_crtc_id(const struct drm_crtc *crtc)
-{
- struct drm_device *dev = crtc->dev;
- struct drm_connector *connector;
- struct amdgpu_crtc *acrtc = to_amdgpu_crtc(crtc);
- struct amdgpu_dm_connector *aconnector;
-
- list_for_each_entry(connector,
- &dev->mode_config.connector_list, head) {
-
- aconnector = to_amdgpu_dm_connector(connector);
-
- if (aconnector->base.state->crtc != &acrtc->base)
- continue;
-
- /* Found the connector */
- return aconnector;
- }
-
- /* If we get here, not found. */
- return NULL;
-}
-
static void update_stream_scaling_settings(const struct drm_display_mode *mode,
const struct dm_connector_state *dm_state,
struct dc_stream_state *stream)
@@ -3026,46 +2984,6 @@ static void dm_plane_helper_cleanup_fb(struct drm_plane *plane,
amdgpu_bo_unref(&rbo);
}
-static int
-dm_create_validation_set_for_connector(struct drm_connector *connector,
- struct drm_display_mode *mode,
- struct dc_validation_set *val_set)
-{
- int result = MODE_ERROR;
- struct dc_sink *dc_sink =
- to_amdgpu_dm_connector(connector)->dc_sink;
- /* TODO: Unhardcode stream count */
- struct dc_stream_state *stream;
-
- if ((mode->flags & DRM_MODE_FLAG_INTERLACE) ||
- (mode->flags & DRM_MODE_FLAG_DBLSCAN))
- return result;
-
- if (dc_sink == NULL) {
- DRM_ERROR("dc_sink is NULL!\n");
- return result;
- }
-
- stream = dc_create_stream_for_sink(dc_sink);
-
- if (stream == NULL) {
- DRM_ERROR("Failed to create stream for sink!\n");
- return result;
- }
-
- drm_mode_set_crtcinfo(mode, 0);
-
- fill_stream_properties_from_drm_display_mode(stream, mode, connector);
-
- val_set->stream = stream;
-
- stream->src.width = mode->hdisplay;
- stream->src.height = mode->vdisplay;
- stream->dst = stream->src;
-
- return MODE_OK;
-}
-
static int dm_plane_atomic_check(struct drm_plane *plane,
struct drm_plane_state *state)
{
--
2.5.5
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 05/11] drm/amd/display: implement dm_delay_in_microseconds
[not found] ` <1507730801-17362-1-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org>
` (2 preceding siblings ...)
2017-10-11 14:06 ` [PATCH 04/11] drm/amd/display: drop unused functions in amdgpu_dm.c Alex Deucher
@ 2017-10-11 14:06 ` Alex Deucher
[not found] ` <1507730801-17362-5-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org>
2017-10-11 14:06 ` [PATCH 06/11] drm/amd/display: drop unused functions in amdgpu_dm_services.c Alex Deucher
` (6 subsequent siblings)
10 siblings, 1 reply; 14+ messages in thread
From: Alex Deucher @ 2017-10-11 14:06 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Cc: Alex Deucher, harry.wenland-5C7GfCeVMHo
dc uses this. Not sure how important it is.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_services.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_services.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_services.c
index 56bc7cc..2a58f86 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_services.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_services.c
@@ -103,8 +103,7 @@ bool dm_read_persistent_data(struct dc_context *ctx,
void dm_delay_in_microseconds(struct dc_context *ctx,
unsigned int microSeconds)
{
- /*TODO implement*/
- return;
+ udelay(microSeconds);
}
/**** power component interfaces ****/
--
2.5.5
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 06/11] drm/amd/display: drop unused functions in amdgpu_dm_services.c
[not found] ` <1507730801-17362-1-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org>
` (3 preceding siblings ...)
2017-10-11 14:06 ` [PATCH 05/11] drm/amd/display: implement dm_delay_in_microseconds Alex Deucher
@ 2017-10-11 14:06 ` Alex Deucher
2017-10-11 14:06 ` [PATCH 07/11] drm/amd/display: whitespace cleanup in amdgpu_dm_mst_types.c/h Alex Deucher
` (5 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Alex Deucher @ 2017-10-11 14:06 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Cc: Alex Deucher, harry.wenland-5C7GfCeVMHo
not used.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
.../drm/amd/display/amdgpu_dm/amdgpu_dm_services.c | 53 ----------------------
1 file changed, 53 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_services.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_services.c
index 2a58f86..b7979ed 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_services.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_services.c
@@ -35,47 +35,6 @@
#include "amdgpu_dm_irq.h"
#include "amdgpu_pm.h"
-/******************************************************************************
- * IRQ Interfaces.
- *****************************************************************************/
-
-void dal_register_timer_interrupt(
- struct dc_context *ctx,
- struct dc_timer_interrupt_params *int_params,
- interrupt_handler ih,
- void *args)
-{
- struct amdgpu_device *adev = ctx->driver_context;
-
- if (!adev || !int_params) {
- DRM_ERROR("DM_IRQ: invalid input!\n");
- return;
- }
-
- if (int_params->int_context != INTERRUPT_LOW_IRQ_CONTEXT) {
- /* only low irq ctx is supported. */
- DRM_ERROR("DM_IRQ: invalid context: %d!\n",
- int_params->int_context);
- return;
- }
-
- amdgpu_dm_irq_register_timer(adev, int_params, ih, args);
-}
-
-void dal_isr_acquire_lock(struct dc_context *ctx)
-{
- /*TODO*/
-}
-
-void dal_isr_release_lock(struct dc_context *ctx)
-{
- /*TODO*/
-}
-
-/******************************************************************************
- * End-of-IRQ Interfaces.
- *****************************************************************************/
-
bool dm_write_persistent_data(struct dc_context *ctx,
const struct dc_sink *sink,
const char *module_name,
@@ -117,18 +76,6 @@ bool dm_pp_pre_dce_clock_change(
return false;
}
-bool dm_pp_apply_safe_state(
- const struct dc_context *ctx)
-{
- struct amdgpu_device *adev = ctx->driver_context;
-
- if (adev->pm.dpm_enabled) {
- /* TODO: Does this require PreModeChange event to PPLIB? */
- }
-
- return true;
-}
-
bool dm_pp_apply_display_requirements(
const struct dc_context *ctx,
const struct dm_pp_display_configuration *pp_display_cfg)
--
2.5.5
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 07/11] drm/amd/display: whitespace cleanup in amdgpu_dm_mst_types.c/h
[not found] ` <1507730801-17362-1-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org>
` (4 preceding siblings ...)
2017-10-11 14:06 ` [PATCH 06/11] drm/amd/display: drop unused functions in amdgpu_dm_services.c Alex Deucher
@ 2017-10-11 14:06 ` Alex Deucher
2017-10-11 14:06 ` [PATCH 08/11] drm/amd/display: make log_dpcd static Alex Deucher
` (4 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Alex Deucher @ 2017-10-11 14:06 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Cc: Alex Deucher, harry.wenland-5C7GfCeVMHo
To match kernel standards. No intended functional change.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
.../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 39 +++++++++++-----------
.../amd/display/amdgpu_dm/amdgpu_dm_mst_types.h | 5 ++-
2 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
index 343645e..eed316a 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
@@ -57,10 +57,10 @@ static inline char *side_band_msg_type_to_str(uint32_t address)
}
void log_dpcd(uint8_t type,
- uint32_t address,
- uint8_t *data,
- uint32_t size,
- bool res)
+ uint32_t address,
+ uint8_t *data,
+ uint32_t size,
+ bool res)
{
DRM_DEBUG_KMS("Op: %s, addr: %04x, SideBand Msg: %s, Op res: %s\n",
(type == DP_AUX_NATIVE_READ) ||
@@ -77,9 +77,11 @@ void log_dpcd(uint8_t type,
}
#endif
-static ssize_t dm_dp_aux_transfer(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg)
+static ssize_t dm_dp_aux_transfer(struct drm_dp_aux *aux,
+ struct drm_dp_aux_msg *msg)
{
- enum i2c_mot_mode mot = (msg->request & DP_AUX_I2C_MOT) ? I2C_MOT_TRUE : I2C_MOT_FALSE;
+ enum i2c_mot_mode mot = (msg->request & DP_AUX_I2C_MOT) ?
+ I2C_MOT_TRUE : I2C_MOT_FALSE;
enum ddc_result res;
switch (msg->request & ~DP_AUX_I2C_MOT) {
@@ -125,10 +127,10 @@ static ssize_t dm_dp_aux_transfer(struct drm_dp_aux *aux, struct drm_dp_aux_msg
#ifdef TRACE_DPCD
log_dpcd(msg->request,
- msg->address,
- msg->buffer,
- msg->size,
- r == DDC_RESULT_SUCESSFULL);
+ msg->address,
+ msg->buffer,
+ msg->size,
+ r == DDC_RESULT_SUCESSFULL);
#endif
return msg->size;
@@ -229,9 +231,10 @@ dm_dp_create_fake_mst_encoder(struct amdgpu_dm_connector *connector)
return amdgpu_encoder;
}
-static struct drm_connector *dm_dp_add_mst_connector(struct drm_dp_mst_topology_mgr *mgr,
- struct drm_dp_mst_port *port,
- const char *pathprop)
+static struct drm_connector *
+dm_dp_add_mst_connector(struct drm_dp_mst_topology_mgr *mgr,
+ struct drm_dp_mst_port *port,
+ const char *pathprop)
{
struct amdgpu_dm_connector *master = container_of(mgr, struct amdgpu_dm_connector, mst_mgr);
struct drm_device *dev = master->base.dev;
@@ -311,9 +314,8 @@ static struct drm_connector *dm_dp_add_mst_connector(struct drm_dp_mst_topology_
return connector;
}
-static void dm_dp_destroy_mst_connector(
- struct drm_dp_mst_topology_mgr *mgr,
- struct drm_connector *connector)
+static void dm_dp_destroy_mst_connector(struct drm_dp_mst_topology_mgr *mgr,
+ struct drm_connector *connector)
{
struct amdgpu_dm_connector *aconnector = to_amdgpu_dm_connector(connector);
@@ -438,9 +440,8 @@ static const struct drm_dp_mst_topology_cbs dm_mst_cbs = {
.register_connector = dm_dp_mst_register_connector
};
-void amdgpu_dm_initialize_dp_connector(
- struct amdgpu_display_manager *dm,
- struct amdgpu_dm_connector *aconnector)
+void amdgpu_dm_initialize_dp_connector(struct amdgpu_display_manager *dm,
+ struct amdgpu_dm_connector *aconnector)
{
aconnector->dm_dp_aux.aux.name = "dmdc";
aconnector->dm_dp_aux.aux.dev = dm->adev->dev;
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h
index ba64a40..2da851b 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h
@@ -29,8 +29,7 @@
struct amdgpu_display_manager;
struct amdgpu_dm_connector;
-void amdgpu_dm_initialize_dp_connector(
- struct amdgpu_display_manager *dm,
- struct amdgpu_dm_connector *aconnector);
+void amdgpu_dm_initialize_dp_connector(struct amdgpu_display_manager *dm,
+ struct amdgpu_dm_connector *aconnector);
#endif
--
2.5.5
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 08/11] drm/amd/display: make log_dpcd static
[not found] ` <1507730801-17362-1-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org>
` (5 preceding siblings ...)
2017-10-11 14:06 ` [PATCH 07/11] drm/amd/display: whitespace cleanup in amdgpu_dm_mst_types.c/h Alex Deucher
@ 2017-10-11 14:06 ` Alex Deucher
2017-10-11 14:06 ` [PATCH 09/11] drm/amd/display: whitespace cleanup in amdgpu_dm_irq.c/h Alex Deucher
` (3 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Alex Deucher @ 2017-10-11 14:06 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Cc: Alex Deucher, harry.wenland-5C7GfCeVMHo
It's only used in this file.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
index eed316a..dfcfb5a 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
@@ -56,11 +56,11 @@ static inline char *side_band_msg_type_to_str(uint32_t address)
return str;
}
-void log_dpcd(uint8_t type,
- uint32_t address,
- uint8_t *data,
- uint32_t size,
- bool res)
+static void log_dpcd(uint8_t type,
+ uint32_t address,
+ uint8_t *data,
+ uint32_t size,
+ bool res)
{
DRM_DEBUG_KMS("Op: %s, addr: %04x, SideBand Msg: %s, Op res: %s\n",
(type == DP_AUX_NATIVE_READ) ||
--
2.5.5
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 09/11] drm/amd/display: whitespace cleanup in amdgpu_dm_irq.c/h
[not found] ` <1507730801-17362-1-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org>
` (6 preceding siblings ...)
2017-10-11 14:06 ` [PATCH 08/11] drm/amd/display: make log_dpcd static Alex Deucher
@ 2017-10-11 14:06 ` Alex Deucher
2017-10-11 14:06 ` [PATCH 10/11] drm/amd/display: remove unused functions in amdgpu_dm_irq.c Alex Deucher
` (2 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Alex Deucher @ 2017-10-11 14:06 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Cc: Alex Deucher, harry.wenland-5C7GfCeVMHo
To match kernel standards. No intended functional change.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 111 +++++++++------------
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.h | 38 +++----
2 files changed, 64 insertions(+), 85 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c
index 22d41d3..743a9a3 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c
@@ -66,11 +66,10 @@ struct amdgpu_dm_timer_handler_data {
* Private functions.
*****************************************************************************/
-static void init_handler_common_data(
- struct handler_common_data *hcd,
- void (*ih)(void *),
- void *args,
- struct amdgpu_display_manager *dm)
+static void init_handler_common_data(struct handler_common_data *hcd,
+ void (*ih)(void *),
+ void *args,
+ struct amdgpu_display_manager *dm)
{
hcd->handler = ih;
hcd->handler_arg = args;
@@ -115,10 +114,9 @@ static void dm_irq_work_func(struct work_struct *work)
* Remove a handler and return a pointer to hander list from which the
* handler was removed.
*/
-static struct list_head *remove_irq_handler(
- struct amdgpu_device *adev,
- void *ih,
- const struct dc_interrupt_params *int_params)
+static struct list_head *remove_irq_handler(struct amdgpu_device *adev,
+ void *ih,
+ const struct dc_interrupt_params *int_params)
{
struct list_head *hnd_list;
struct list_head *entry, *tmp;
@@ -172,9 +170,8 @@ static struct list_head *remove_irq_handler(
}
/* If 'handler_in == NULL' then remove ALL handlers. */
-static void remove_timer_handler(
- struct amdgpu_device *adev,
- struct amdgpu_dm_timer_handler_data *handler_in)
+static void remove_timer_handler(struct amdgpu_device *adev,
+ struct amdgpu_dm_timer_handler_data *handler_in)
{
struct amdgpu_dm_timer_handler_data *handler_temp;
struct list_head *handler_list;
@@ -236,8 +233,7 @@ static void remove_timer_handler(
*
* @work: work struct
*/
-static void dm_timer_work_func(
- struct work_struct *work)
+static void dm_timer_work_func(struct work_struct *work)
{
struct amdgpu_dm_timer_handler_data *handler_data =
container_of(work, struct amdgpu_dm_timer_handler_data,
@@ -253,9 +249,9 @@ static void dm_timer_work_func(
remove_timer_handler(handler_data->hcd.dm->adev, handler_data);
}
-static bool validate_irq_registration_params(
- struct dc_interrupt_params *int_params,
- void (*ih)(void *))
+static bool
+validate_irq_registration_params(struct dc_interrupt_params *int_params,
+ void (*ih)(void *))
{
if (NULL == int_params || NULL == ih) {
DRM_ERROR("DM_IRQ: invalid input!\n");
@@ -277,9 +273,8 @@ static bool validate_irq_registration_params(
return true;
}
-static bool validate_irq_unregistration_params(
- enum dc_irq_source irq_source,
- irq_handler_idx handler_idx)
+static bool validate_irq_unregistration_params(enum dc_irq_source irq_source,
+ irq_handler_idx handler_idx)
{
if (DAL_INVALID_IRQ_HANDLER_IDX == handler_idx) {
DRM_ERROR("DM_IRQ: invalid handler_idx==NULL!\n");
@@ -299,11 +294,10 @@ static bool validate_irq_unregistration_params(
* Note: caller is responsible for input validation.
*****************************************************************************/
-void *amdgpu_dm_irq_register_interrupt(
- struct amdgpu_device *adev,
- struct dc_interrupt_params *int_params,
- void (*ih)(void *),
- void *handler_args)
+void *amdgpu_dm_irq_register_interrupt(struct amdgpu_device *adev,
+ struct dc_interrupt_params *int_params,
+ void (*ih)(void *),
+ void *handler_args)
{
struct list_head *hnd_list;
struct amdgpu_dm_irq_handler_data *handler_data;
@@ -359,10 +353,9 @@ void *amdgpu_dm_irq_register_interrupt(
return handler_data;
}
-void amdgpu_dm_irq_unregister_interrupt(
- struct amdgpu_device *adev,
- enum dc_irq_source irq_source,
- void *ih)
+void amdgpu_dm_irq_unregister_interrupt(struct amdgpu_device *adev,
+ enum dc_irq_source irq_source,
+ void *ih)
{
struct list_head *handler_list;
struct dc_interrupt_params int_params;
@@ -394,8 +387,7 @@ void amdgpu_dm_irq_unregister_interrupt(
}
}
-int amdgpu_dm_irq_init(
- struct amdgpu_device *adev)
+int amdgpu_dm_irq_init(struct amdgpu_device *adev)
{
int src;
struct irq_list_head *lh;
@@ -427,11 +419,10 @@ int amdgpu_dm_irq_init(
return 0;
}
-void amdgpu_dm_irq_register_timer(
- struct amdgpu_device *adev,
- struct dc_timer_interrupt_params *int_params,
- interrupt_handler ih,
- void *args)
+void amdgpu_dm_irq_register_timer(struct amdgpu_device *adev,
+ struct dc_timer_interrupt_params *int_params,
+ interrupt_handler ih,
+ void *args)
{
unsigned long jf_delay;
struct list_head *handler_list;
@@ -470,8 +461,7 @@ void amdgpu_dm_irq_register_timer(
}
/* DM IRQ and timer resource release */
-void amdgpu_dm_irq_fini(
- struct amdgpu_device *adev)
+void amdgpu_dm_irq_fini(struct amdgpu_device *adev)
{
int src;
struct irq_list_head *lh;
@@ -492,8 +482,7 @@ void amdgpu_dm_irq_fini(
destroy_workqueue(adev->dm.timer_workqueue);
}
-int amdgpu_dm_irq_suspend(
- struct amdgpu_device *adev)
+int amdgpu_dm_irq_suspend(struct amdgpu_device *adev)
{
int src;
struct list_head *hnd_list_h;
@@ -576,9 +565,8 @@ int amdgpu_dm_irq_resume_late(struct amdgpu_device *adev)
* amdgpu_dm_irq_schedule_work - schedule all work items registered for the
* "irq_source".
*/
-static void amdgpu_dm_irq_schedule_work(
- struct amdgpu_device *adev,
- enum dc_irq_source irq_source)
+static void amdgpu_dm_irq_schedule_work(struct amdgpu_device *adev,
+ enum dc_irq_source irq_source)
{
unsigned long irq_table_flags;
struct work_struct *work = NULL;
@@ -601,9 +589,8 @@ static void amdgpu_dm_irq_schedule_work(
/** amdgpu_dm_irq_immediate_work
* Callback high irq work immediately, don't send to work queue
*/
-static void amdgpu_dm_irq_immediate_work(
- struct amdgpu_device *adev,
- enum dc_irq_source irq_source)
+static void amdgpu_dm_irq_immediate_work(struct amdgpu_device *adev,
+ enum dc_irq_source irq_source)
{
struct amdgpu_dm_irq_handler_data *handler_data;
struct list_head *entry;
@@ -635,10 +622,9 @@ static void amdgpu_dm_irq_immediate_work(
* Generic IRQ handler, calls all registered high irq work immediately, and
* schedules work for low irq
*/
-int amdgpu_dm_irq_handler(
- struct amdgpu_device *adev,
- struct amdgpu_irq_src *source,
- struct amdgpu_iv_entry *entry)
+int amdgpu_dm_irq_handler(struct amdgpu_device *adev,
+ struct amdgpu_irq_src *source,
+ struct amdgpu_iv_entry *entry)
{
enum dc_irq_source src =
@@ -678,9 +664,9 @@ static enum dc_irq_source amdgpu_dm_hpd_to_dal_irq_source(unsigned type)
}
static int amdgpu_dm_set_hpd_irq_state(struct amdgpu_device *adev,
- struct amdgpu_irq_src *source,
- unsigned type,
- enum amdgpu_interrupt_state state)
+ struct amdgpu_irq_src *source,
+ unsigned type,
+ enum amdgpu_interrupt_state state)
{
enum dc_irq_source src = amdgpu_dm_hpd_to_dal_irq_source(type);
bool st = (state == AMDGPU_IRQ_STATE_ENABLE);
@@ -689,13 +675,12 @@ static int amdgpu_dm_set_hpd_irq_state(struct amdgpu_device *adev,
return 0;
}
-static inline int dm_irq_state(
- struct amdgpu_device *adev,
- struct amdgpu_irq_src *source,
- unsigned crtc_id,
- enum amdgpu_interrupt_state state,
- const enum irq_type dal_irq_type,
- const char *func)
+static inline int dm_irq_state(struct amdgpu_device *adev,
+ struct amdgpu_irq_src *source,
+ unsigned crtc_id,
+ enum amdgpu_interrupt_state state,
+ const enum irq_type dal_irq_type,
+ const char *func)
{
bool st;
enum dc_irq_source irq_source;
@@ -719,9 +704,9 @@ static inline int dm_irq_state(
}
static int amdgpu_dm_set_pflip_irq_state(struct amdgpu_device *adev,
- struct amdgpu_irq_src *source,
- unsigned crtc_id,
- enum amdgpu_interrupt_state state)
+ struct amdgpu_irq_src *source,
+ unsigned crtc_id,
+ enum amdgpu_interrupt_state state)
{
return dm_irq_state(
adev,
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.h
index 9d30076..0927ed4 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.h
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.h
@@ -39,8 +39,7 @@
* 0 - success
* non-zero - error
*/
-int amdgpu_dm_irq_init(
- struct amdgpu_device *adev);
+int amdgpu_dm_irq_init(struct amdgpu_device *adev);
/**
* amdgpu_dm_irq_fini - deallocate internal structures of 'amdgpu_dm_irq'.
@@ -48,8 +47,7 @@ int amdgpu_dm_irq_init(
* This function should be called exactly once - during DM destruction.
*
*/
-void amdgpu_dm_irq_fini(
- struct amdgpu_device *adev);
+void amdgpu_dm_irq_fini(struct amdgpu_device *adev);
/**
* amdgpu_dm_irq_register_interrupt - register irq handler for Display block.
@@ -65,11 +63,10 @@ void amdgpu_dm_irq_fini(
*
* Cannot be called from an interrupt handler.
*/
-void *amdgpu_dm_irq_register_interrupt(
- struct amdgpu_device *adev,
- struct dc_interrupt_params *int_params,
- void (*ih)(void *),
- void *handler_args);
+void *amdgpu_dm_irq_register_interrupt(struct amdgpu_device *adev,
+ struct dc_interrupt_params *int_params,
+ void (*ih)(void *),
+ void *handler_args);
/**
* amdgpu_dm_irq_unregister_interrupt - unregister handler which was registered
@@ -79,26 +76,23 @@ void *amdgpu_dm_irq_register_interrupt(
* @ih_index: irq handler index which was returned by
* amdgpu_dm_irq_register_interrupt
*/
-void amdgpu_dm_irq_unregister_interrupt(
- struct amdgpu_device *adev,
- enum dc_irq_source irq_source,
- void *ih_index);
+void amdgpu_dm_irq_unregister_interrupt(struct amdgpu_device *adev,
+ enum dc_irq_source irq_source,
+ void *ih_index);
-void amdgpu_dm_irq_register_timer(
- struct amdgpu_device *adev,
- struct dc_timer_interrupt_params *int_params,
- interrupt_handler ih,
- void *args);
+void amdgpu_dm_irq_register_timer(struct amdgpu_device *adev,
+ struct dc_timer_interrupt_params *int_params,
+ interrupt_handler ih,
+ void *args);
/**
* amdgpu_dm_irq_handler
* Generic IRQ handler, calls all registered high irq work immediately, and
* schedules work for low irq
*/
-int amdgpu_dm_irq_handler(
- struct amdgpu_device *adev,
- struct amdgpu_irq_src *source,
- struct amdgpu_iv_entry *entry);
+int amdgpu_dm_irq_handler(struct amdgpu_device *adev,
+ struct amdgpu_irq_src *source,
+ struct amdgpu_iv_entry *entry);
void amdgpu_dm_set_irq_funcs(struct amdgpu_device *adev);
--
2.5.5
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 10/11] drm/amd/display: remove unused functions in amdgpu_dm_irq.c
[not found] ` <1507730801-17362-1-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org>
` (7 preceding siblings ...)
2017-10-11 14:06 ` [PATCH 09/11] drm/amd/display: whitespace cleanup in amdgpu_dm_irq.c/h Alex Deucher
@ 2017-10-11 14:06 ` Alex Deucher
2017-10-11 14:06 ` [PATCH 11/11] drm/amd/display: make amdgpu_dm_irq_handler static Alex Deucher
2017-10-11 14:26 ` [PATCH 01/11] drm/amd/display: fix typo in function name Christian König
10 siblings, 0 replies; 14+ messages in thread
From: Alex Deucher @ 2017-10-11 14:06 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Cc: Alex Deucher, harry.wenland-5C7GfCeVMHo
Not used.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 62 ----------------------
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.h | 5 --
2 files changed, 67 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c
index 743a9a3..1b7df0b 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c
@@ -228,27 +228,6 @@ static void remove_timer_handler(struct amdgpu_device *adev,
}
}
-/**
- * dm_timer_work_func - Handle a timer.
- *
- * @work: work struct
- */
-static void dm_timer_work_func(struct work_struct *work)
-{
- struct amdgpu_dm_timer_handler_data *handler_data =
- container_of(work, struct amdgpu_dm_timer_handler_data,
- d_work.work);
-
- DRM_DEBUG_KMS("DM_IRQ: work_func: handler_data=%p\n", handler_data);
-
- /* Call a DAL subcomponent which registered for timer notification. */
- handler_data->hcd.handler(handler_data->hcd.handler_arg);
-
- /* We support only "single shot" timers. That means we must delete
- * the handler after it was called. */
- remove_timer_handler(handler_data->hcd.dm->adev, handler_data);
-}
-
static bool
validate_irq_registration_params(struct dc_interrupt_params *int_params,
void (*ih)(void *))
@@ -419,47 +398,6 @@ int amdgpu_dm_irq_init(struct amdgpu_device *adev)
return 0;
}
-void amdgpu_dm_irq_register_timer(struct amdgpu_device *adev,
- struct dc_timer_interrupt_params *int_params,
- interrupt_handler ih,
- void *args)
-{
- unsigned long jf_delay;
- struct list_head *handler_list;
- struct amdgpu_dm_timer_handler_data *handler_data;
- unsigned long irq_table_flags;
-
- handler_data = kzalloc(sizeof(*handler_data), GFP_KERNEL);
- if (!handler_data) {
- DRM_ERROR("DM_IRQ: failed to allocate timer handler!\n");
- return;
- }
-
- memset(handler_data, 0, sizeof(*handler_data));
-
- init_handler_common_data(&handler_data->hcd, ih, args, &adev->dm);
-
- INIT_DELAYED_WORK(&handler_data->d_work, dm_timer_work_func);
-
- /* Lock the list, add the handler. */
- DM_IRQ_TABLE_LOCK(adev, irq_table_flags);
-
- handler_list = &adev->dm.timer_handler_list;
-
- list_add_tail(&handler_data->hcd.list, handler_list);
-
- DM_IRQ_TABLE_UNLOCK(adev, irq_table_flags);
-
- jf_delay = usecs_to_jiffies(int_params->micro_sec_interval);
-
- queue_delayed_work(adev->dm.timer_workqueue, &handler_data->d_work,
- jf_delay);
-
- DRM_DEBUG_KMS("DM_IRQ: added handler:%p with micro_sec_interval=%u\n",
- handler_data, int_params->micro_sec_interval);
- return;
-}
-
/* DM IRQ and timer resource release */
void amdgpu_dm_irq_fini(struct amdgpu_device *adev)
{
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.h
index 0927ed4..393fcf7 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.h
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.h
@@ -80,11 +80,6 @@ void amdgpu_dm_irq_unregister_interrupt(struct amdgpu_device *adev,
enum dc_irq_source irq_source,
void *ih_index);
-void amdgpu_dm_irq_register_timer(struct amdgpu_device *adev,
- struct dc_timer_interrupt_params *int_params,
- interrupt_handler ih,
- void *args);
-
/**
* amdgpu_dm_irq_handler
* Generic IRQ handler, calls all registered high irq work immediately, and
--
2.5.5
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 11/11] drm/amd/display: make amdgpu_dm_irq_handler static
[not found] ` <1507730801-17362-1-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org>
` (8 preceding siblings ...)
2017-10-11 14:06 ` [PATCH 10/11] drm/amd/display: remove unused functions in amdgpu_dm_irq.c Alex Deucher
@ 2017-10-11 14:06 ` Alex Deucher
[not found] ` <1507730801-17362-11-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org>
2017-10-11 14:26 ` [PATCH 01/11] drm/amd/display: fix typo in function name Christian König
10 siblings, 1 reply; 14+ messages in thread
From: Alex Deucher @ 2017-10-11 14:06 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Cc: Alex Deucher, harry.wenland-5C7GfCeVMHo
It's not used outside the file.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 6 +++---
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.h | 9 ---------
2 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c
index 1b7df0b..52b6e4a 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c
@@ -560,9 +560,9 @@ static void amdgpu_dm_irq_immediate_work(struct amdgpu_device *adev,
* Generic IRQ handler, calls all registered high irq work immediately, and
* schedules work for low irq
*/
-int amdgpu_dm_irq_handler(struct amdgpu_device *adev,
- struct amdgpu_irq_src *source,
- struct amdgpu_iv_entry *entry)
+static int amdgpu_dm_irq_handler(struct amdgpu_device *adev,
+ struct amdgpu_irq_src *source,
+ struct amdgpu_iv_entry *entry)
{
enum dc_irq_source src =
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.h
index 393fcf7..82f8e76 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.h
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.h
@@ -80,15 +80,6 @@ void amdgpu_dm_irq_unregister_interrupt(struct amdgpu_device *adev,
enum dc_irq_source irq_source,
void *ih_index);
-/**
- * amdgpu_dm_irq_handler
- * Generic IRQ handler, calls all registered high irq work immediately, and
- * schedules work for low irq
- */
-int amdgpu_dm_irq_handler(struct amdgpu_device *adev,
- struct amdgpu_irq_src *source,
- struct amdgpu_iv_entry *entry);
-
void amdgpu_dm_set_irq_funcs(struct amdgpu_device *adev);
void amdgpu_dm_hpd_init(struct amdgpu_device *adev);
--
2.5.5
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH 01/11] drm/amd/display: fix typo in function name
[not found] ` <1507730801-17362-1-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org>
` (9 preceding siblings ...)
2017-10-11 14:06 ` [PATCH 11/11] drm/amd/display: make amdgpu_dm_irq_handler static Alex Deucher
@ 2017-10-11 14:26 ` Christian König
10 siblings, 0 replies; 14+ messages in thread
From: Christian König @ 2017-10-11 14:26 UTC (permalink / raw)
To: Alex Deucher, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Cc: Alex Deucher, harry.wenland-5C7GfCeVMHo
Am 11.10.2017 um 16:06 schrieb Alex Deucher:
> s/amdgpu_dm_find_first_crct_matching_connector/
> amdgpu_dm_find_first_crtc_matching_connector/
>
> And while here, make it static.
>
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>
> ---
> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 12 ++++++------
> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 6 ------
> 2 files changed, 6 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> index 9bfe1f9..4357db8 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -568,10 +568,10 @@ static int dm_suspend(void *handle)
> return ret;
> }
>
> -struct amdgpu_dm_connector *amdgpu_dm_find_first_crct_matching_connector(
> - struct drm_atomic_state *state,
> - struct drm_crtc *crtc,
> - bool from_state_var)
> +static struct amdgpu_dm_connector *
> +amdgpu_dm_find_first_crtc_matching_connector(struct drm_atomic_state *state,
> + struct drm_crtc *crtc,
> + bool from_state_var)
> {
> uint32_t i;
> struct drm_connector_state *conn_state;
> @@ -4114,7 +4114,7 @@ void amdgpu_dm_atomic_commit_tail(
>
> new_stream = new_acrtc_state->stream;
> aconnector =
> - amdgpu_dm_find_first_crct_matching_connector(
> + amdgpu_dm_find_first_crtc_matching_connector(
> state,
> &new_crtcs[i]->base,
> false);
> @@ -4402,7 +4402,7 @@ static int dm_update_crtcs_state(
> new_acrtc_state = to_dm_crtc_state(crtc_state);
> acrtc = to_amdgpu_crtc(crtc);
>
> - aconnector = amdgpu_dm_find_first_crct_matching_connector(state, crtc, true);
> + aconnector = amdgpu_dm_find_first_crtc_matching_connector(state, crtc, true);
>
> /* TODO This hack should go away */
> if (aconnector) {
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
> index 630e6cd..aca061a 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
> @@ -226,12 +226,6 @@ extern const struct amdgpu_ip_block_version dm_ip_block;
> void amdgpu_dm_update_connector_after_detect(
> struct amdgpu_dm_connector *aconnector);
>
> -struct amdgpu_dm_connector *amdgpu_dm_find_first_crct_matching_connector(
> - struct drm_atomic_state *state,
> - struct drm_crtc *crtc,
> - bool from_state_var);
> -
> -
> struct amdgpu_framebuffer;
> struct amdgpu_display_manager;
> struct dc_validation_set;
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 05/11] drm/amd/display: implement dm_delay_in_microseconds
[not found] ` <1507730801-17362-5-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org>
@ 2017-10-11 15:57 ` Harry Wentland
0 siblings, 0 replies; 14+ messages in thread
From: Harry Wentland @ 2017-10-11 15:57 UTC (permalink / raw)
To: Alex Deucher, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Cc: Alex Deucher, harry.wenland-5C7GfCeVMHo
On 2017-10-11 10:06 AM, Alex Deucher wrote:
> dc uses this. Not sure how important it is.
>
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
> ---
> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_services.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_services.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_services.c
> index 56bc7cc..2a58f86 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_services.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_services.c
> @@ -103,8 +103,7 @@ bool dm_read_persistent_data(struct dc_context *ctx,
> void dm_delay_in_microseconds(struct dc_context *ctx,
> unsigned int microSeconds)
> {
> - /*TODO implement*/
> - return;
> + udelay(microSeconds);
> }
>
We can drop this completely and replace all calls to it with udelay.
Not sure why we have this in the first place.
Harry
> /**** power component interfaces ****/
>
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 11/11] drm/amd/display: make amdgpu_dm_irq_handler static
[not found] ` <1507730801-17362-11-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org>
@ 2017-10-11 16:01 ` Harry Wentland
0 siblings, 0 replies; 14+ messages in thread
From: Harry Wentland @ 2017-10-11 16:01 UTC (permalink / raw)
To: Alex Deucher, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Alex Deucher
1-4, 6-11 are
Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Harry
On 2017-10-11 10:06 AM, Alex Deucher wrote:
> It's not used outside the file.
>
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
> ---
> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 6 +++---
> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.h | 9 ---------
> 2 files changed, 3 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c
> index 1b7df0b..52b6e4a 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c
> @@ -560,9 +560,9 @@ static void amdgpu_dm_irq_immediate_work(struct amdgpu_device *adev,
> * Generic IRQ handler, calls all registered high irq work immediately, and
> * schedules work for low irq
> */
> -int amdgpu_dm_irq_handler(struct amdgpu_device *adev,
> - struct amdgpu_irq_src *source,
> - struct amdgpu_iv_entry *entry)
> +static int amdgpu_dm_irq_handler(struct amdgpu_device *adev,
> + struct amdgpu_irq_src *source,
> + struct amdgpu_iv_entry *entry)
> {
>
> enum dc_irq_source src =
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.h
> index 393fcf7..82f8e76 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.h
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.h
> @@ -80,15 +80,6 @@ void amdgpu_dm_irq_unregister_interrupt(struct amdgpu_device *adev,
> enum dc_irq_source irq_source,
> void *ih_index);
>
> -/**
> - * amdgpu_dm_irq_handler
> - * Generic IRQ handler, calls all registered high irq work immediately, and
> - * schedules work for low irq
> - */
> -int amdgpu_dm_irq_handler(struct amdgpu_device *adev,
> - struct amdgpu_irq_src *source,
> - struct amdgpu_iv_entry *entry);
> -
> void amdgpu_dm_set_irq_funcs(struct amdgpu_device *adev);
>
> void amdgpu_dm_hpd_init(struct amdgpu_device *adev);
>
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2017-10-11 16:01 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-10-11 14:06 [PATCH 01/11] drm/amd/display: fix typo in function name Alex Deucher
[not found] ` <1507730801-17362-1-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org>
2017-10-11 14:06 ` [PATCH 02/11] drm/amd/display: whitespace cleanup in amdgpu_dm.c/h Alex Deucher
2017-10-11 14:06 ` [PATCH 03/11] drm/amd/display: make a bunch of stuff in amdgpu_dm.c static Alex Deucher
2017-10-11 14:06 ` [PATCH 04/11] drm/amd/display: drop unused functions in amdgpu_dm.c Alex Deucher
2017-10-11 14:06 ` [PATCH 05/11] drm/amd/display: implement dm_delay_in_microseconds Alex Deucher
[not found] ` <1507730801-17362-5-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org>
2017-10-11 15:57 ` Harry Wentland
2017-10-11 14:06 ` [PATCH 06/11] drm/amd/display: drop unused functions in amdgpu_dm_services.c Alex Deucher
2017-10-11 14:06 ` [PATCH 07/11] drm/amd/display: whitespace cleanup in amdgpu_dm_mst_types.c/h Alex Deucher
2017-10-11 14:06 ` [PATCH 08/11] drm/amd/display: make log_dpcd static Alex Deucher
2017-10-11 14:06 ` [PATCH 09/11] drm/amd/display: whitespace cleanup in amdgpu_dm_irq.c/h Alex Deucher
2017-10-11 14:06 ` [PATCH 10/11] drm/amd/display: remove unused functions in amdgpu_dm_irq.c Alex Deucher
2017-10-11 14:06 ` [PATCH 11/11] drm/amd/display: make amdgpu_dm_irq_handler static Alex Deucher
[not found] ` <1507730801-17362-11-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org>
2017-10-11 16:01 ` Harry Wentland
2017-10-11 14:26 ` [PATCH 01/11] drm/amd/display: fix typo in function name Christian König
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.