tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/radeon: consolidate duplicate encode is digital function
Only need one copy.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+23
-47
-23
drivers/gpu/drm/radeon/atombios_encoders.c
-23
drivers/gpu/drm/radeon/atombios_encoders.c
···
291
291
bool radeon_atom_get_tv_timings(struct radeon_device *rdev, int index,
292
292
struct drm_display_mode *mode);
293
293
294
-
295
-
static inline bool radeon_encoder_is_digital(struct drm_encoder *encoder)
296
-
{
297
-
struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
298
-
switch (radeon_encoder->encoder_id) {
299
-
case ENCODER_OBJECT_ID_INTERNAL_LVDS:
300
-
case ENCODER_OBJECT_ID_INTERNAL_TMDS1:
301
-
case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1:
302
-
case ENCODER_OBJECT_ID_INTERNAL_LVTM1:
303
-
case ENCODER_OBJECT_ID_INTERNAL_DVO1:
304
-
case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1:
305
-
case ENCODER_OBJECT_ID_INTERNAL_DDI:
306
-
case ENCODER_OBJECT_ID_INTERNAL_UNIPHY:
307
-
case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA:
308
-
case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1:
309
-
case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2:
310
-
case ENCODER_OBJECT_ID_INTERNAL_UNIPHY3:
311
-
return true;
312
-
default:
313
-
return false;
314
-
}
315
-
}
316
-
317
294
static bool radeon_atom_mode_fixup(struct drm_encoder *encoder,
318
295
const struct drm_display_mode *mode,
319
296
struct drm_display_mode *adjusted_mode)
+1
-24
drivers/gpu/drm/radeon/r600_audio.c
+1
-24
drivers/gpu/drm/radeon/r600_audio.c
···
30
30
#include "atom.h"
31
31
32
32
/*
33
-
* check if enc_priv stores radeon_encoder_atom_dig
34
-
*/
35
-
static bool radeon_dig_encoder(struct drm_encoder *encoder)
36
-
{
37
-
struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
38
-
switch (radeon_encoder->encoder_id) {
39
-
case ENCODER_OBJECT_ID_INTERNAL_LVDS:
40
-
case ENCODER_OBJECT_ID_INTERNAL_TMDS1:
41
-
case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1:
42
-
case ENCODER_OBJECT_ID_INTERNAL_LVTM1:
43
-
case ENCODER_OBJECT_ID_INTERNAL_DVO1:
44
-
case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1:
45
-
case ENCODER_OBJECT_ID_INTERNAL_DDI:
46
-
case ENCODER_OBJECT_ID_INTERNAL_UNIPHY:
47
-
case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA:
48
-
case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1:
49
-
case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2:
50
-
return true;
51
-
}
52
-
return false;
53
-
}
54
-
55
-
/*
56
33
* check if the chipset is supported
57
34
*/
58
35
static int r600_audio_chipset_supported(struct radeon_device *rdev)
···
111
134
}
112
135
113
136
list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
114
-
if (!radeon_dig_encoder(encoder))
137
+
if (!radeon_encoder_is_digital(encoder))
115
138
continue;
116
139
if (changed || r600_hdmi_buffer_status_changed(encoder))
117
140
r600_hdmi_update_audio_settings(encoder);
+21
drivers/gpu/drm/radeon/radeon_encoders.c
+21
drivers/gpu/drm/radeon/radeon_encoders.c
···
382
382
}
383
383
}
384
384
385
+
bool radeon_encoder_is_digital(struct drm_encoder *encoder)
386
+
{
387
+
struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
388
+
switch (radeon_encoder->encoder_id) {
389
+
case ENCODER_OBJECT_ID_INTERNAL_LVDS:
390
+
case ENCODER_OBJECT_ID_INTERNAL_TMDS1:
391
+
case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1:
392
+
case ENCODER_OBJECT_ID_INTERNAL_LVTM1:
393
+
case ENCODER_OBJECT_ID_INTERNAL_DVO1:
394
+
case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1:
395
+
case ENCODER_OBJECT_ID_INTERNAL_DDI:
396
+
case ENCODER_OBJECT_ID_INTERNAL_UNIPHY:
397
+
case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA:
398
+
case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1:
399
+
case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2:
400
+
case ENCODER_OBJECT_ID_INTERNAL_UNIPHY3:
401
+
return true;
402
+
default:
403
+
return false;
404
+
}
405
+
}
+1
drivers/gpu/drm/radeon/radeon_mode.h
+1
drivers/gpu/drm/radeon/radeon_mode.h
···
777
777
extern int atombios_get_encoder_mode(struct drm_encoder *encoder);
778
778
extern bool atombios_set_edp_panel_power(struct drm_connector *connector, int action);
779
779
extern void radeon_encoder_set_active_device(struct drm_encoder *encoder);
780
+
extern bool radeon_encoder_is_digital(struct drm_encoder *encoder);
780
781
781
782
extern void radeon_crtc_load_lut(struct drm_crtc *crtc);
782
783
extern int atombios_crtc_set_base(struct drm_crtc *crtc, int x, int y,