From: Harry Wentland <harry.wentland@amd.com>
Date: Fri, 8 Sep 2017 10:23:42 -0400
Subject: drm/amd/display: Format changes to bring in line with internal tree
Git-commit: 1ecfc3da95428983725d643e80e9a320497d2059
Patch-mainline: v4.15-rc1
References: FATE#326289 FATE#326079 FATE#326049 FATE#322398 FATE#326166

Signed-off-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Acked-by: Petr Tesarik <ptesarik@suse.com>
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c     |    6 +++---
 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, 5 insertions(+), 6 deletions(-)

--- 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_co
 
 	if (new_state) {
 		__drm_atomic_helper_connector_duplicate_state(connector,
-								      &new_state->base);
+							      &new_state->base);
 		return &new_state->base;
 	}
 
--- 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;
 	}
 
--- 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)