1 files changed, 18 insertions, 48 deletions

diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
index 8137b7a34696..c667c43f1c1f 100644
--- a/drivers/gpu/drm/radeon/radeon_connectors.c
+++ b/drivers/gpu/drm/radeon/radeon_connectors.c
@@ -216,7 +216,6 @@ radeon_connector_update_scratch_regs(struct drm_connector *connector, enum drm_c
         struct drm_encoder *best_encoder = NULL;
         struct drm_encoder *encoder = NULL;
         struct drm_connector_helper_funcs *connector_funcs = connector->helper_private;
-        struct drm_mode_object *obj;
         bool connected;
         int i;
 
@@ -226,14 +225,11 @@ radeon_connector_update_scratch_regs(struct drm_connector *connector, enum drm_c
                 if (connector->encoder_ids[i] == 0)
                         break;
 
-                obj = drm_mode_object_find(connector->dev,
-                                           connector->encoder_ids[i],
-                                           DRM_MODE_OBJECT_ENCODER);
-                if (!obj)
+                encoder = drm_encoder_find(connector->dev,
+                                           connector->encoder_ids[i]);
+                if (!encoder)
                         continue;
 
-                encoder = obj_to_encoder(obj);
-
                 if ((encoder == best_encoder) && (status == connector_status_connected))
                         connected = true;
                 else
@@ -249,7 +245,6 @@ radeon_connector_update_scratch_regs(struct drm_connector *connector, enum drm_c
 
 static struct drm_encoder *radeon_find_encoder(struct drm_connector *connector, int encoder_type)
 {
-        struct drm_mode_object *obj;
         struct drm_encoder *encoder;
         int i;
 
@@ -257,11 +252,10 @@ static struct drm_encoder *radeon_find_encoder(struct drm_connector *connector,
                 if (connector->encoder_ids[i] == 0)
                         break;
 
-                obj = drm_mode_object_find(connector->dev, connector->encoder_ids[i], DRM_MODE_OBJECT_ENCODER);
-                if (!obj)
+                encoder = drm_encoder_find(connector->dev, connector->encoder_ids[i]);
+                if (!encoder)
                         continue;
 
-                encoder = obj_to_encoder(obj);
                 if (encoder->encoder_type == encoder_type)
                         return encoder;
         }
@@ -271,17 +265,9 @@ static struct drm_encoder *radeon_find_encoder(struct drm_connector *connector,
 static struct drm_encoder *radeon_best_single_encoder(struct drm_connector *connector)
 {
         int enc_id = connector->encoder_ids[0];
-        struct drm_mode_object *obj;
-        struct drm_encoder *encoder;
-
         /* pick the encoder ids */
-        if (enc_id) {
-                obj = drm_mode_object_find(connector->dev, enc_id, DRM_MODE_OBJECT_ENCODER);
-                if (!obj)
-                        return NULL;
-                encoder = obj_to_encoder(obj);
-                return encoder;
-        }
+        if (enc_id)
+                return drm_encoder_find(connector->dev, enc_id);
         return NULL;
 }
 
@@ -1048,7 +1034,6 @@ radeon_dvi_detect(struct drm_connector *connector, bool force)
         struct radeon_connector *radeon_connector = to_radeon_connector(connector);
         struct drm_encoder *encoder = NULL;
         struct drm_encoder_helper_funcs *encoder_funcs;
-        struct drm_mode_object *obj;
         int i, r;
         enum drm_connector_status ret = connector_status_disconnected;
         bool dret = false, broken_edid = false;
@@ -1153,14 +1138,11 @@ radeon_dvi_detect(struct drm_connector *connector, bool force)
                         if (connector->encoder_ids[i] == 0)
                                 break;
 
-                        obj = drm_mode_object_find(connector->dev,
-                                                   connector->encoder_ids[i],
-                                                   DRM_MODE_OBJECT_ENCODER);
-                        if (!obj)
+                        encoder = drm_encoder_find(connector->dev,
+                                                   connector->encoder_ids[i]);
+                        if (!encoder)
                                 continue;
 
-                        encoder = obj_to_encoder(obj);
-
                         if (encoder->encoder_type != DRM_MODE_ENCODER_DAC &&
                             encoder->encoder_type != DRM_MODE_ENCODER_TVDAC)
                                 continue;
@@ -1225,19 +1207,16 @@ static struct drm_encoder *radeon_dvi_encoder(struct drm_connector *connector)
 {
         int enc_id = connector->encoder_ids[0];
         struct radeon_connector *radeon_connector = to_radeon_connector(connector);
-        struct drm_mode_object *obj;
         struct drm_encoder *encoder;
         int i;
         for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) {
                 if (connector->encoder_ids[i] == 0)
                         break;
 
-                obj = drm_mode_object_find(connector->dev, connector->encoder_ids[i], DRM_MODE_OBJECT_ENCODER);
-                if (!obj)
+                encoder = drm_encoder_find(connector->dev, connector->encoder_ids[i]);
+                if (!encoder)
                         continue;
 
-                encoder = obj_to_encoder(obj);
-
                 if (radeon_connector->use_digital == true) {
                         if (encoder->encoder_type == DRM_MODE_ENCODER_TMDS)
                                 return encoder;
@@ -1252,13 +1231,8 @@ static struct drm_encoder *radeon_dvi_encoder(struct drm_connector *connector)
 
         /* then check use digitial */
         /* pick the first one */
-        if (enc_id) {
-                obj = drm_mode_object_find(connector->dev, enc_id, DRM_MODE_OBJECT_ENCODER);
-                if (!obj)
-                        return NULL;
-                encoder = obj_to_encoder(obj);
-                return encoder;
-        }
+        if (enc_id)
+                return drm_encoder_find(connector->dev, enc_id);
         return NULL;
 }
 
@@ -1391,7 +1365,6 @@ static int radeon_dp_get_modes(struct drm_connector *connector)
 
 u16 radeon_connector_encoder_get_dp_bridge_encoder_id(struct drm_connector *connector)
 {
-        struct drm_mode_object *obj;
         struct drm_encoder *encoder;
         struct radeon_encoder *radeon_encoder;
         int i;
@@ -1400,11 +1373,10 @@ u16 radeon_connector_encoder_get_dp_bridge_encoder_id(struct drm_connector *conn
                 if (connector->encoder_ids[i] == 0)
                         break;
 
-                obj = drm_mode_object_find(connector->dev, connector->encoder_ids[i], DRM_MODE_OBJECT_ENCODER);
-                if (!obj)
+                encoder = drm_encoder_find(connector->dev, connector->encoder_ids[i]);
+                if (!encoder)
                         continue;
 
-                encoder = obj_to_encoder(obj);
                 radeon_encoder = to_radeon_encoder(encoder);
 
                 switch (radeon_encoder->encoder_id) {
@@ -1421,7 +1393,6 @@ u16 radeon_connector_encoder_get_dp_bridge_encoder_id(struct drm_connector *conn
 
 bool radeon_connector_encoder_is_hbr2(struct drm_connector *connector)
 {
-        struct drm_mode_object *obj;
         struct drm_encoder *encoder;
         struct radeon_encoder *radeon_encoder;
         int i;
@@ -1431,11 +1402,10 @@ bool radeon_connector_encoder_is_hbr2(struct drm_connector *connector)
                 if (connector->encoder_ids[i] == 0)
                         break;
 
-                obj = drm_mode_object_find(connector->dev, connector->encoder_ids[i], DRM_MODE_OBJECT_ENCODER);
-                if (!obj)
+                encoder = drm_encoder_find(connector->dev, connector->encoder_ids[i]);
+                if (!encoder)
                         continue;
 
-                encoder = obj_to_encoder(obj);
                 radeon_encoder = to_radeon_encoder(encoder);
                 if (radeon_encoder->caps & ATOM_ENCODER_CAP_RECORD_HBR2)
                         found = true;