diff options
| author | Harry Wentland <harry.wentland@amd.com> | 2017-09-08 10:23:42 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2017-09-26 18:17:40 -0400 |
| commit | 1ecfc3da95428983725d643e80e9a320497d2059 (patch) | |
| tree | f9070261702afcc0d66b97ef225d34c75467c8b3 /drivers/gpu/drm/amd | |
| parent | 05230fa90d96523755ddad30972a25b6651de739 (diff) | |
drm/amd/display: Format changes to bring in line with internal tree
Signed-off-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd')
| -rw-r--r-- | drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 6 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 1 |
3 files changed, 5 insertions, 6 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 d2ece343b5fa..bb4f415746d5 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; @@ -1794,7 +1794,7 @@ static int fill_plane_attributes_from_fb( break; default: DRM_ERROR("Unsupported screen format %s\n", - drm_get_format_name(fb->format->format, &format_name)); + drm_get_format_name(fb->format->format, &format_name)); return -EINVAL; } @@ -2618,7 +2618,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 276adf96d5f2..22d41d35249e 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 25f6f9103c44..f7d049c0e62a 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) |