On Tue, Jan 29, 2019 at 4:03 PM David Francis <David.Francis@xxxxxxx> wrote:
>
> Some of the grandfathered amd display code does not follow
> Linux coding style and emits warnings or errors on checkpatch
>
> No functional changes here - just cleanup
>
> Signed-off-by: David Francis <David.Francis@xxxxxxx>
Acked-by: Alex Deucher <alexander.deucher@xxxxxxx>
> ---
> .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 96 +++++++++----------
> 1 file changed, 47 insertions(+), 49 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 cdda68aba70e..973517d35d5c 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -176,56 +176,56 @@ static const enum drm_plane_type dm_plane_type_stoney[AMDGPU_MAX_PLANES] = {
> */
> static u32 dm_vblank_get_counter(struct amdgpu_device *adev, int crtc)
> {
> + struct amdgpu_crtc *acrtc;
> + struct dm_crtc_state *acrtc_state;
> +
> if (crtc >= adev->mode_info.num_crtc)
> return 0;
> - else {
> - struct amdgpu_crtc *acrtc = adev->mode_info.crtcs[crtc];
> - struct dm_crtc_state *acrtc_state = to_dm_crtc_state(
> - acrtc->base.state);
>
> + acrtc = adev->mode_info.crtcs[crtc];
> + acrtc_state = to_dm_crtc_state(acrtc->base.state);
>
> - if (acrtc_state->stream == NULL) {
> - DRM_ERROR("dc_stream_state is NULL for crtc '%d'!\n",
> - crtc);
> - return 0;
> - }
> -
> - return dc_stream_get_vblank_counter(acrtc_state->stream);
> + if (acrtc_state->stream == NULL) {
> + DRM_ERROR("dc_stream_state is NULL for crtc '%d'!\n",
> + crtc);
> + return 0;
> }
> +
> + return dc_stream_get_vblank_counter(acrtc_state->stream);
> }
>
> static int dm_crtc_get_scanoutpos(struct amdgpu_device *adev, int crtc,
> u32 *vbl, u32 *position)
> {
> uint32_t v_blank_start, v_blank_end, h_position, v_position;
> + struct amdgpu_crtc *acrtc;
> + struct dm_crtc_state *acrtc_state;
>
> if ((crtc < 0) || (crtc >= adev->mode_info.num_crtc))
> return -EINVAL;
> - else {
> - struct amdgpu_crtc *acrtc = adev->mode_info.crtcs[crtc];
> - struct dm_crtc_state *acrtc_state = to_dm_crtc_state(
> - acrtc->base.state);
> -
> - if (acrtc_state->stream == NULL) {
> - DRM_ERROR("dc_stream_state is NULL for crtc '%d'!\n",
> - crtc);
> - return 0;
> - }
>
> - /*
> - * TODO rework base driver to use values directly.
> - * for now parse it back into reg-format
> - */
> - dc_stream_get_scanoutpos(acrtc_state->stream,
> - &v_blank_start,
> - &v_blank_end,
> - &h_position,
> - &v_position);
> + acrtc = adev->mode_info.crtcs[crtc];
> + acrtc_state = to_dm_crtc_state(acrtc->base.state);
>
> - *position = v_position | (h_position << 16);
> - *vbl = v_blank_start | (v_blank_end << 16);
> + if (acrtc_state->stream == NULL) {
> + DRM_ERROR("dc_stream_state is NULL for crtc '%d'!\n",
> + crtc);
> + return 0;
> }
>
> + /*
> + * TODO rework base driver to use values directly.
> + * for now parse it back into reg-format
> + */
> + dc_stream_get_scanoutpos(acrtc_state->stream,
> + &v_blank_start,
> + &v_blank_end,
> + &h_position,
> + &v_position);
> +
> + *position = v_position | (h_position << 16);
> + *vbl = v_blank_start | (v_blank_end << 16);
> +
> return 0;
> }
>
> @@ -293,8 +293,8 @@ static void dm_pflip_high_irq(void *interrupt_params)
>
> spin_lock_irqsave(&adev->ddev->event_lock, flags);
>
> - if (amdgpu_crtc->pflip_status != AMDGPU_FLIP_SUBMITTED){
> - DRM_DEBUG_DRIVER("amdgpu_crtc->pflip_status = %d !=AMDGPU_FLIP_SUBMITTED(%d) on crtc:%d[%p] \n",
> + if (amdgpu_crtc->pflip_status != AMDGPU_FLIP_SUBMITTED) {
> + DRM_DEBUG_DRIVER("amdgpu_crtc->pflip_status = %d !=AMDGPU_FLIP_SUBMITTED(%d) on crtc:%d[%p]\n",
> amdgpu_crtc->pflip_status,
> AMDGPU_FLIP_SUBMITTED,
> amdgpu_crtc->crtc_id,
> @@ -370,7 +370,7 @@ static int dm_set_powergating_state(void *handle,
> }
>
> /* Prototypes of private functions */
> -static int dm_early_init(void* handle);
> +static int dm_early_init(void *handle);
>
> /* Allocate memory for FBC compressed data */
> static void amdgpu_dm_fbc_init(struct drm_connector *connector)
> @@ -416,6 +416,7 @@ static void amdgpu_dm_fbc_init(struct drm_connector *connector)
> static int amdgpu_dm_init(struct amdgpu_device *adev)
> {
> struct dc_init_data init_data;
> +
> adev->dm.ddev = adev->ddev;
> adev->dm.adev = adev;
>
> @@ -424,7 +425,7 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)
>
> mutex_init(&adev->dm.dc_lock);
>
> - if(amdgpu_dm_irq_init(adev)) {
> + if (amdgpu_dm_irq_init(adev)) {
> DRM_ERROR("amdgpu: failed to initialize DM IRQ support.\n");
> goto error;
> }
> @@ -540,8 +541,6 @@ static void amdgpu_dm_fini(struct amdgpu_device *adev)
> dc_destroy(&adev->dm.dc);
>
> mutex_destroy(&adev->dm.dc_lock);
> -
> - return;
> }
>
> static int load_dmcu_fw(struct amdgpu_device *adev)
> @@ -1021,8 +1020,7 @@ static const struct amd_ip_funcs amdgpu_dm_funcs = {
> .set_powergating_state = dm_set_powergating_state,
> };
>
> -const struct amdgpu_ip_block_version dm_ip_block =
> -{
> +const struct amdgpu_ip_block_version dm_ip_block = {
> .type = AMD_IP_BLOCK_TYPE_DCE,
> .major = 1,
> .minor = 0,
> @@ -1242,6 +1240,7 @@ static void dm_handle_hpd_rx_irq(struct amdgpu_dm_connector *aconnector)
> while (dret == dpcd_bytes_to_read &&
> process_count < max_process_count) {
> uint8_t retry;
> +
> dret = 0;
>
> process_count++;
> @@ -1367,7 +1366,7 @@ static void register_hpd_handlers(struct amdgpu_device *adev)
> aconnector = to_amdgpu_dm_connector(connector);
> dc_link = aconnector->dc_link;
>
> - if (DC_IRQ_SOURCE_INVALID != dc_link->irq_source_hpd) {
> + if (dc_link->irq_source_hpd != DC_IRQ_SOURCE_INVALID) {
> int_params.int_context = INTERRUPT_LOW_IRQ_CONTEXT;
> int_params.irq_source = dc_link->irq_source_hpd;
>
> @@ -1376,7 +1375,7 @@ static void register_hpd_handlers(struct amdgpu_device *adev)
> (void *) aconnector);
> }
>
> - if (DC_IRQ_SOURCE_INVALID != dc_link->irq_source_hpd_rx) {
> + if (dc_link->irq_source_hpd_rx != DC_IRQ_SOURCE_INVALID) {
>
> /* Also register for DP short pulse (hpd_rx). */
> int_params.int_context = INTERRUPT_LOW_IRQ_CONTEXT;
> @@ -1397,7 +1396,7 @@ static int dce110_register_irq_handlers(struct amdgpu_device *adev)
> struct dc_interrupt_params int_params = {0};
> int r;
> int i;
> - unsigned client_id = AMDGPU_IRQ_CLIENTID_LEGACY;
> + unsigned int client_id = AMDGPU_IRQ_CLIENTID_LEGACY;
>
> if (adev->asic_type == CHIP_VEGA10 ||
> adev->asic_type == CHIP_VEGA12 ||
> @@ -2034,7 +2033,6 @@ static void amdgpu_dm_destroy_drm_device(struct amdgpu_display_manager *dm)
> {
> drm_mode_config_cleanup(dm->ddev);
> drm_atomic_private_obj_fini(&dm->atomic_obj);
> - return;
> }
>
> /******************************************************************************
> @@ -3094,9 +3092,9 @@ create_stream_for_sink(struct amdgpu_dm_connector *aconnector,
> drm_mode_set_crtcinfo(&mode, 0);
>
> /*
> - * If scaling is enabled and refresh rate didn't change
> - * we copy the vic and polarities of the old timings
> - */
> + * If scaling is enabled and refresh rate didn't change
> + * we copy the vic and polarities of the old timings
> + */
> if (!scale || mode_refresh != preferred_refresh)
> fill_stream_properties_from_drm_display_mode(stream,
> &mode, &aconnector->base, NULL);
> @@ -5678,7 +5676,7 @@ static int dm_update_crtc_state(struct amdgpu_display_manager *dm,
> skip_modeset:
> /* Release extra reference */
> if (new_stream)
> - dc_stream_release(new_stream);
> + dc_stream_release(new_stream);
>
> /*
> * We want to do dc stream updates that do not require a
> @@ -6179,7 +6177,7 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,
> else if (ret == -EINTR || ret == -EAGAIN || ret == -ERESTARTSYS)
> DRM_DEBUG_DRIVER("Atomic check stopped due to signal.\n");
> else
> - DRM_DEBUG_DRIVER("Atomic check failed with err: %d \n", ret);
> + DRM_DEBUG_DRIVER("Atomic check failed with err: %d.\n", ret);
>
> return ret;
> }
> --
> 2.17.1
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
amd-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
