From 030db828326174969f63eef62b1585a1daed327f Mon Sep 17 00:00:00 2001 From: Harry Wentland Date: Fri, 8 Sep 2017 10:23:42 -0400 Subject: [PATCH 2380/4131] drm/amd/display: Format changes to bring in line with internal tree Change-Id: Icde91f6c0d7ce99b7f0e8abd8f6b1cdc1d616cf6 Signed-off-by: Harry Wentland Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 ++-- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 4 ++-- drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 1 - 3 files changed, 4 insertions(+), 5 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 76fdafe..f023c20 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -603,7 +603,7 @@ static int dm_resume(void *handle) return 0; } -int amdgpu_dm_display_resume(struct amdgpu_device *adev ) +int amdgpu_dm_display_resume(struct amdgpu_device *adev) { struct drm_device *ddev = adev->ddev; struct amdgpu_display_manager *dm = &adev->dm; @@ -2833,7 +2833,7 @@ struct drm_connector_state *amdgpu_dm_connector_atomic_duplicate_state( if (new_state) { __drm_atomic_helper_connector_duplicate_state(connector, - &new_state->base); + &new_state->base); return &new_state->base; } 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 7409403..0b11e7f 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 @@ -705,8 +705,8 @@ static inline int dm_irq_state( if (!acrtc) { DRM_ERROR( "%s: crtc is NULL at id :%d\n", - func, - crtc_id); + func, + crtc_id); return 0; } diff --git a/drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c b/drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c index 25f6f91..f7d049c 100644 --- a/drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c +++ b/drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c @@ -41,7 +41,6 @@ */ #include "dce80/hw_factory_dce80.h" - #include "dce110/hw_factory_dce110.h" #include "dce120/hw_factory_dce120.h" #if defined(CONFIG_DRM_AMD_DC_DCN1_0) -- 2.7.4