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>

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 d2ece34..bb4f415 100644 (file)
--- 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 276adf9..22d41d3 100644 (file)
--- 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 (file)
--- 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)