Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba9ca088 authored by Luc Van Oostenryck's avatar Luc Van Oostenryck Committed by Alex Deucher
Browse files

drm/admgpu: fix mode_valid's return type 



The method struct drm_connector_helper_funcs::mode_valid is defined
as returning an 'enum drm_mode_status' but the driver implementation
for this method uses an 'int' for it.

Fix this by using 'enum drm_mode_status' in the driver too.

Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarLuc Van Oostenryck <luc.vanoostenryck@gmail.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 7a47f20e

drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c

+4 −4
Original line number Diff line number Diff line
@@ -691,7 +691,7 @@ static int amdgpu_connector_lvds_get_modes(struct drm_connector *connector) 
	return ret;

}



static int amdgpu_connector_lvds_mode_valid(struct drm_connector *connector,

static enum drm_mode_status amdgpu_connector_lvds_mode_valid(struct drm_connector *connector,

					     struct drm_display_mode *mode)

{

	struct drm_encoder *encoder = amdgpu_connector_best_single_encoder(connector);
@@ -843,7 +843,7 @@ static int amdgpu_connector_vga_get_modes(struct drm_connector *connector) 
	return ret;

}



static int amdgpu_connector_vga_mode_valid(struct drm_connector *connector,

static enum drm_mode_status amdgpu_connector_vga_mode_valid(struct drm_connector *connector,

					    struct drm_display_mode *mode)

{

	struct drm_device *dev = connector->dev;
@@ -1172,7 +1172,7 @@ static void amdgpu_connector_dvi_force(struct drm_connector *connector) 
		amdgpu_connector->use_digital = true;

}



static int amdgpu_connector_dvi_mode_valid(struct drm_connector *connector,

static enum drm_mode_status amdgpu_connector_dvi_mode_valid(struct drm_connector *connector,

					    struct drm_display_mode *mode)

{

	struct drm_device *dev = connector->dev;
@@ -1448,7 +1448,7 @@ amdgpu_connector_dp_detect(struct drm_connector *connector, bool force) 
	return ret;

}



static int amdgpu_connector_dp_mode_valid(struct drm_connector *connector,

static enum drm_mode_status amdgpu_connector_dp_mode_valid(struct drm_connector *connector,

					   struct drm_display_mode *mode)

{

	struct amdgpu_connector *amdgpu_connector = to_amdgpu_connector(connector);

drivers/gpu/drm/amd/amdgpu/dce_virtual.c

+1 −1
Original line number Diff line number Diff line
@@ -327,7 +327,7 @@ static int dce_virtual_get_modes(struct drm_connector *connector) 
	return 0;

}



static int dce_virtual_mode_valid(struct drm_connector *connector,

static enum drm_mode_status dce_virtual_mode_valid(struct drm_connector *connector,

				  struct drm_display_mode *mode)

{

	return MODE_OK;

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+1 −1
Original line number Diff line number Diff line
@@ -2838,7 +2838,7 @@ static void handle_edid_mgmt(struct amdgpu_dm_connector *aconnector) 
	create_eml_sink(aconnector);

}



int amdgpu_dm_connector_mode_valid(struct drm_connector *connector,

enum drm_mode_status amdgpu_dm_connector_mode_valid(struct drm_connector *connector,

				   struct drm_display_mode *mode)

{

	int result = MODE_ERROR;

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h

+1 −1
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ void amdgpu_dm_connector_init_helper(struct amdgpu_display_manager *dm, 
				     struct dc_link *link,

				     int link_index);



int amdgpu_dm_connector_mode_valid(struct drm_connector *connector,

enum drm_mode_status amdgpu_dm_connector_mode_valid(struct drm_connector *connector,

				   struct drm_display_mode *mode);



void dm_restore_drm_connector_state(struct drm_device *dev,