1 files changed, 28 insertions, 6 deletions

diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
index 769f3f586661..ae55a6865d5c 100644
--- a/drivers/gpu/drm/i915/intel_audio.c
+++ b/drivers/gpu/drm/i915/intel_audio.c
@@ -144,26 +144,43 @@ static const struct {
 /* HDMI N/CTS table */
 #define TMDS_297M 297000
 #define TMDS_296M 296703
+#define TMDS_594M 594000
+#define TMDS_593M 593407
+
 static const struct {
         int sample_rate;
         int clock;
         int n;
         int cts;
 } hdmi_aud_ncts[] = {
-        { 44100, TMDS_296M, 4459, 234375 },
-        { 44100, TMDS_297M, 4704, 247500 },
-        { 48000, TMDS_296M, 5824, 281250 },
-        { 48000, TMDS_297M, 5120, 247500 },
         { 32000, TMDS_296M, 5824, 421875 },
         { 32000, TMDS_297M, 3072, 222750 },
+        { 32000, TMDS_593M, 5824, 843750 },
+        { 32000, TMDS_594M, 3072, 445500 },
+        { 44100, TMDS_296M, 4459, 234375 },
+        { 44100, TMDS_297M, 4704, 247500 },
+        { 44100, TMDS_593M, 8918, 937500 },
+        { 44100, TMDS_594M, 9408, 990000 },
         { 88200, TMDS_296M, 8918, 234375 },
         { 88200, TMDS_297M, 9408, 247500 },
-        { 96000, TMDS_296M, 11648, 281250 },
-        { 96000, TMDS_297M, 10240, 247500 },
+        { 88200, TMDS_593M, 17836, 937500 },
+        { 88200, TMDS_594M, 18816, 990000 },
         { 176400, TMDS_296M, 17836, 234375 },
         { 176400, TMDS_297M, 18816, 247500 },
+        { 176400, TMDS_593M, 35672, 937500 },
+        { 176400, TMDS_594M, 37632, 990000 },
+        { 48000, TMDS_296M, 5824, 281250 },
+        { 48000, TMDS_297M, 5120, 247500 },
+        { 48000, TMDS_593M, 5824, 562500 },
+        { 48000, TMDS_594M, 6144, 594000 },
+        { 96000, TMDS_296M, 11648, 281250 },
+        { 96000, TMDS_297M, 10240, 247500 },
+        { 96000, TMDS_593M, 11648, 562500 },
+        { 96000, TMDS_594M, 12288, 594000 },
         { 192000, TMDS_296M, 23296, 281250 },
         { 192000, TMDS_297M, 20480, 247500 },
+        { 192000, TMDS_593M, 23296, 562500 },
+        { 192000, TMDS_594M, 24576, 594000 },
 };
 
 /* get AUD_CONFIG_PIXEL_CLOCK_HDMI_* value for mode */
@@ -912,6 +929,9 @@ static int i915_audio_component_bind(struct device *i915_kdev,
         if (WARN_ON(acomp->base.ops || acomp->base.dev))
                 return -EEXIST;
 
+        if (WARN_ON(!device_link_add(hda_kdev, i915_kdev, DL_FLAG_STATELESS)))
+                return -ENOMEM;
+
         drm_modeset_lock_all(&dev_priv->drm);
         acomp->base.ops = &i915_audio_component_ops;
         acomp->base.dev = i915_kdev;
@@ -935,6 +955,8 @@ static void i915_audio_component_unbind(struct device *i915_kdev,
         acomp->base.dev = NULL;
         dev_priv->audio_component = NULL;
         drm_modeset_unlock_all(&dev_priv->drm);
+
+        device_link_remove(hda_kdev, i915_kdev);
 }
 
 static const struct component_ops i915_audio_component_bind_ops = {