Skip to content

Commit b957f45

Browse files
robclarkairlied
robclark
authored and
airlied
committed
drm/radeon: use helpers
Signed-off-by: Rob Clark <robdclark@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
1 parent 7707e65 commit b957f45

File tree

3 files changed

+22
-56
lines changed

3 files changed

+22
-56
lines changed

‎drivers/gpu/drm/radeon/r100.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1401,7 +1401,6 @@ int r100_cs_parse_packet0(struct radeon_cs_parser *p,
14011401
*/
14021402
int r100_cs_packet_parse_vline(struct radeon_cs_parser *p)
14031403
{
1404-
struct drm_mode_object *obj;
14051404
struct drm_crtc *crtc;
14061405
struct radeon_crtc *radeon_crtc;
14071406
struct radeon_cs_packet p3reloc, waitreloc;
@@ -1441,12 +1440,11 @@ int r100_cs_packet_parse_vline(struct radeon_cs_parser *p)
14411440
header = radeon_get_ib_value(p, h_idx);
14421441
crtc_id = radeon_get_ib_value(p, h_idx + 5);
14431442
reg = R100_CP_PACKET0_GET_REG(header);
1444-
obj = drm_mode_object_find(p->rdev->ddev, crtc_id, DRM_MODE_OBJECT_CRTC);
1445-
if (!obj) {
1443+
crtc = drm_crtc_find(p->rdev->ddev, crtc_id);
1444+
if (!crtc) {
14461445
DRM_ERROR("cannot find crtc %d\n", crtc_id);
14471446
return -ENOENT;
14481447
}
1449-
crtc = obj_to_crtc(obj);
14501448
radeon_crtc = to_radeon_crtc(crtc);
14511449
crtc_id = radeon_crtc->crtc_id;
14521450

‎drivers/gpu/drm/radeon/r600_cs.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -825,7 +825,6 @@ int r600_cs_common_vline_parse(struct radeon_cs_parser *p,
825825
uint32_t *vline_start_end,
826826
uint32_t *vline_status)
827827
{
828-
struct drm_mode_object *obj;
829828
struct drm_crtc *crtc;
830829
struct radeon_crtc *radeon_crtc;
831830
struct radeon_cs_packet p3reloc, wait_reg_mem;
@@ -887,12 +886,11 @@ int r600_cs_common_vline_parse(struct radeon_cs_parser *p,
887886
crtc_id = radeon_get_ib_value(p, h_idx + 2 + 7 + 1);
888887
reg = R600_CP_PACKET0_GET_REG(header);
889888

890-
obj = drm_mode_object_find(p->rdev->ddev, crtc_id, DRM_MODE_OBJECT_CRTC);
891-
if (!obj) {
889+
crtc = drm_crtc_find(p->rdev->ddev, crtc_id);
890+
if (!crtc) {
892891
DRM_ERROR("cannot find crtc %d\n", crtc_id);
893892
return -ENOENT;
894893
}
895-
crtc = obj_to_crtc(obj);
896894
radeon_crtc = to_radeon_crtc(crtc);
897895
crtc_id = radeon_crtc->crtc_id;
898896

‎drivers/gpu/drm/radeon/radeon_connectors.c

Lines changed: 18 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,6 @@ radeon_connector_update_scratch_regs(struct drm_connector *connector, enum drm_c
216216
struct drm_encoder *best_encoder = NULL;
217217
struct drm_encoder *encoder = NULL;
218218
struct drm_connector_helper_funcs *connector_funcs = connector->helper_private;
219-
struct drm_mode_object *obj;
220219
bool connected;
221220
int i;
222221

@@ -226,14 +225,11 @@ radeon_connector_update_scratch_regs(struct drm_connector *connector, enum drm_c
226225
if (connector->encoder_ids[i] == 0)
227226
break;
228227

229-
obj = drm_mode_object_find(connector->dev,
230-
connector->encoder_ids[i],
231-
DRM_MODE_OBJECT_ENCODER);
232-
if (!obj)
228+
encoder = drm_encoder_find(connector->dev,
229+
connector->encoder_ids[i]);
230+
if (!encoder)
233231
continue;
234232

235-
encoder = obj_to_encoder(obj);
236-
237233
if ((encoder == best_encoder) && (status == connector_status_connected))
238234
connected = true;
239235
else
@@ -249,19 +245,17 @@ radeon_connector_update_scratch_regs(struct drm_connector *connector, enum drm_c
249245

250246
static struct drm_encoder *radeon_find_encoder(struct drm_connector *connector, int encoder_type)
251247
{
252-
struct drm_mode_object *obj;
253248
struct drm_encoder *encoder;
254249
int i;
255250

256251
for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) {
257252
if (connector->encoder_ids[i] == 0)
258253
break;
259254

260-
obj = drm_mode_object_find(connector->dev, connector->encoder_ids[i], DRM_MODE_OBJECT_ENCODER);
261-
if (!obj)
255+
encoder = drm_encoder_find(connector->dev, connector->encoder_ids[i]);
256+
if (!encoder)
262257
continue;
263258

264-
encoder = obj_to_encoder(obj);
265259
if (encoder->encoder_type == encoder_type)
266260
return encoder;
267261
}
@@ -271,17 +265,9 @@ static struct drm_encoder *radeon_find_encoder(struct drm_connector *connector,
271265
static struct drm_encoder *radeon_best_single_encoder(struct drm_connector *connector)
272266
{
273267
int enc_id = connector->encoder_ids[0];
274-
struct drm_mode_object *obj;
275-
struct drm_encoder *encoder;
276-
277268
/* pick the encoder ids */
278-
if (enc_id) {
279-
obj = drm_mode_object_find(connector->dev, enc_id, DRM_MODE_OBJECT_ENCODER);
280-
if (!obj)
281-
return NULL;
282-
encoder = obj_to_encoder(obj);
283-
return encoder;
284-
}
269+
if (enc_id)
270+
return drm_encoder_find(connector->dev, enc_id);
285271
return NULL;
286272
}
287273

@@ -1048,7 +1034,6 @@ radeon_dvi_detect(struct drm_connector *connector, bool force)
10481034
struct radeon_connector *radeon_connector = to_radeon_connector(connector);
10491035
struct drm_encoder *encoder = NULL;
10501036
struct drm_encoder_helper_funcs *encoder_funcs;
1051-
struct drm_mode_object *obj;
10521037
int i, r;
10531038
enum drm_connector_status ret = connector_status_disconnected;
10541039
bool dret = false, broken_edid = false;
@@ -1153,14 +1138,11 @@ radeon_dvi_detect(struct drm_connector *connector, bool force)
11531138
if (connector->encoder_ids[i] == 0)
11541139
break;
11551140

1156-
obj = drm_mode_object_find(connector->dev,
1157-
connector->encoder_ids[i],
1158-
DRM_MODE_OBJECT_ENCODER);
1159-
if (!obj)
1141+
encoder = drm_encoder_find(connector->dev,
1142+
connector->encoder_ids[i]);
1143+
if (!encoder)
11601144
continue;
11611145

1162-
encoder = obj_to_encoder(obj);
1163-
11641146
if (encoder->encoder_type != DRM_MODE_ENCODER_DAC &&
11651147
encoder->encoder_type != DRM_MODE_ENCODER_TVDAC)
11661148
continue;
@@ -1225,19 +1207,16 @@ static struct drm_encoder *radeon_dvi_encoder(struct drm_connector *connector)
12251207
{
12261208
int enc_id = connector->encoder_ids[0];
12271209
struct radeon_connector *radeon_connector = to_radeon_connector(connector);
1228-
struct drm_mode_object *obj;
12291210
struct drm_encoder *encoder;
12301211
int i;
12311212
for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) {
12321213
if (connector->encoder_ids[i] == 0)
12331214
break;
12341215

1235-
obj = drm_mode_object_find(connector->dev, connector->encoder_ids[i], DRM_MODE_OBJECT_ENCODER);
1236-
if (!obj)
1216+
encoder = drm_encoder_find(connector->dev, connector->encoder_ids[i]);
1217+
if (!encoder)
12371218
continue;
12381219

1239-
encoder = obj_to_encoder(obj);
1240-
12411220
if (radeon_connector->use_digital == true) {
12421221
if (encoder->encoder_type == DRM_MODE_ENCODER_TMDS)
12431222
return encoder;
@@ -1252,13 +1231,8 @@ static struct drm_encoder *radeon_dvi_encoder(struct drm_connector *connector)
12521231

12531232
/* then check use digitial */
12541233
/* pick the first one */
1255-
if (enc_id) {
1256-
obj = drm_mode_object_find(connector->dev, enc_id, DRM_MODE_OBJECT_ENCODER);
1257-
if (!obj)
1258-
return NULL;
1259-
encoder = obj_to_encoder(obj);
1260-
return encoder;
1261-
}
1234+
if (enc_id)
1235+
return drm_encoder_find(connector->dev, enc_id);
12621236
return NULL;
12631237
}
12641238

@@ -1391,7 +1365,6 @@ static int radeon_dp_get_modes(struct drm_connector *connector)
13911365

13921366
u16 radeon_connector_encoder_get_dp_bridge_encoder_id(struct drm_connector *connector)
13931367
{
1394-
struct drm_mode_object *obj;
13951368
struct drm_encoder *encoder;
13961369
struct radeon_encoder *radeon_encoder;
13971370
int i;
@@ -1400,11 +1373,10 @@ u16 radeon_connector_encoder_get_dp_bridge_encoder_id(struct drm_connector *conn
14001373
if (connector->encoder_ids[i] == 0)
14011374
break;
14021375

1403-
obj = drm_mode_object_find(connector->dev, connector->encoder_ids[i], DRM_MODE_OBJECT_ENCODER);
1404-
if (!obj)
1376+
encoder = drm_encoder_find(connector->dev, connector->encoder_ids[i]);
1377+
if (!encoder)
14051378
continue;
14061379

1407-
encoder = obj_to_encoder(obj);
14081380
radeon_encoder = to_radeon_encoder(encoder);
14091381

14101382
switch (radeon_encoder->encoder_id) {
@@ -1421,7 +1393,6 @@ u16 radeon_connector_encoder_get_dp_bridge_encoder_id(struct drm_connector *conn
14211393

14221394
bool radeon_connector_encoder_is_hbr2(struct drm_connector *connector)
14231395
{
1424-
struct drm_mode_object *obj;
14251396
struct drm_encoder *encoder;
14261397
struct radeon_encoder *radeon_encoder;
14271398
int i;
@@ -1431,11 +1402,10 @@ bool radeon_connector_encoder_is_hbr2(struct drm_connector *connector)
14311402
if (connector->encoder_ids[i] == 0)
14321403
break;
14331404

1434-
obj = drm_mode_object_find(connector->dev, connector->encoder_ids[i], DRM_MODE_OBJECT_ENCODER);
1435-
if (!obj)
1405+
encoder = drm_encoder_find(connector->dev, connector->encoder_ids[i]);
1406+
if (!encoder)
14361407
continue;
14371408

1438-
encoder = obj_to_encoder(obj);
14391409
radeon_encoder = to_radeon_encoder(encoder);
14401410
if (radeon_encoder->caps & ATOM_ENCODER_CAP_RECORD_HBR2)
14411411
found = true;

0 commit comments

Comments
 (0)