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

Commit dc87cd5c authored by Alex Deucher's avatar Alex Deucher Committed by Dave Airlie
Browse files

drm/radeon/kms: fix return type for radeon_encoder_get_dp_bridge_encoder_id 



Seems like something got mis-merged here.

Noticed by kallisti5 on IRC.

Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 45e713ef

drivers/gpu/drm/radeon/radeon_encoders.c

+3 −4
Original line number Diff line number Diff line
@@ -233,13 +233,12 @@ u16 radeon_encoder_get_dp_bridge_encoder_id(struct drm_encoder *encoder) 
		switch (radeon_encoder->encoder_id) {

		case ENCODER_OBJECT_ID_TRAVIS:

		case ENCODER_OBJECT_ID_NUTMEG:

			return true;

			return radeon_encoder->encoder_id;

		default:

			return false;

			return ENCODER_OBJECT_ID_NONE;

		}

	}



	return false;

	return ENCODER_OBJECT_ID_NONE;

}



void radeon_panel_mode_fixup(struct drm_encoder *encoder,