leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/amd/display: Format changes to bring in line with internal tree

Browse Source 
Signed-off-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Harry Wentland 2017-09-08 10:23:42 -04:00 committed by Alex Deucher
parent 05230fa90d
commit 1ecfc3da95
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
View File

@ -603,7 +603,7 @@ static int dm_resume(void *handle)
return 0; 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 drm_device *ddev = adev->ddev;
struct amdgpu_display_manager *dm = &adev->dm; struct amdgpu_display_manager *dm = &adev->dm;
@ -1794,7 +1794,7 @@ static int fill_plane_attributes_from_fb(
break; break;
default: default:
DRM_ERROR("Unsupported screen format %s\n", 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; return -EINVAL;
} }
@ -2618,7 +2618,7 @@ struct drm_connector_state *amdgpu_dm_connector_atomic_duplicate_state(
if (new_state) { if (new_state) {
__drm_atomic_helper_connector_duplicate_state(connector, __drm_atomic_helper_connector_duplicate_state(connector,
&new_state->base); &new_state->base);
return &new_state->base; return &new_state->base;
} }

4
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c
View File

@ -705,8 +705,8 @@ static inline int dm_irq_state(
if (!acrtc) { if (!acrtc) {
DRM_ERROR( DRM_ERROR(
"%s: crtc is NULL at id :%d\n", "%s: crtc is NULL at id :%d\n",
func, func,
crtc_id); crtc_id);
return 0; return 0;
} }

1
drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c
View File

@ -41,7 +41,6 @@
*/ */
#include "dce80/hw_factory_dce80.h" #include "dce80/hw_factory_dce80.h"
#include "dce110/hw_factory_dce110.h" #include "dce110/hw_factory_dce110.h"
#include "dce120/hw_factory_dce120.h" #include "dce120/hw_factory_dce120.h"
#if defined(CONFIG_DRM_AMD_DC_DCN1_0) #if defined(CONFIG_DRM_AMD_DC_DCN1_0)