Skip to content

Commit 05ab0ca

Browse files
committed
Revert "drm/i915/audio: Add flag to skip device link creation for audio component"
This reverts commit 7b8a0b7. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
1 parent f3da514 commit 05ab0ca

File tree

2 files changed

+5
-14
lines changed

2 files changed

+5
-14
lines changed

drivers/gpu/drm/i915/display/intel_audio.c

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1263,12 +1263,10 @@ static int intel_audio_component_bind(struct device *drv_kdev,
12631263
if (drm_WARN_ON(display->drm, acomp->base.ops || acomp->base.dev))
12641264
return -EEXIST;
12651265

1266-
if (!acomp->no_device_link) {
1267-
if (drm_WARN_ON(display->drm,
1268-
!device_link_add(hda_kdev, drv_kdev,
1269-
DL_FLAG_STATELESS)))
1270-
return -ENOMEM;
1271-
}
1266+
if (drm_WARN_ON(display->drm,
1267+
!device_link_add(hda_kdev, drv_kdev,
1268+
DL_FLAG_STATELESS)))
1269+
return -ENOMEM;
12721270

12731271
drm_modeset_lock_all(display->drm);
12741272
acomp->base.ops = &intel_audio_component_ops;
@@ -1294,8 +1292,7 @@ static void intel_audio_component_unbind(struct device *drv_kdev,
12941292
display->audio.component = NULL;
12951293
drm_modeset_unlock_all(display->drm);
12961294

1297-
if (!acomp->no_device_link)
1298-
device_link_remove(hda_kdev, drv_kdev);
1295+
device_link_remove(hda_kdev, drv_kdev);
12991296

13001297
if (display->audio.power_refcount)
13011298
drm_err(display->drm,

include/drm/intel/i915_component.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,6 @@ struct i915_audio_component {
5151
* @aud_sample_rate: the array of audio sample rate per port
5252
*/
5353
int aud_sample_rate[MAX_PORTS];
54-
55-
/**
56-
* @no_device_link: Do not add device link for HDMI audio
57-
*/
58-
bool no_device_link:1;
59-
6054
};
6155

6256
#endif /* _I915_COMPONENT_H_ */

0 commit comments

Comments
 (0)