|
@@ -79,9 +79,6 @@ static bool intel_eld_uptodate(struct drm_connector *connector,
|
|
|
tmp = I915_READ(reg_eldv);
|
|
|
tmp &= bits_eldv;
|
|
|
|
|
|
- if (!eld[0])
|
|
|
- return !tmp;
|
|
|
-
|
|
|
if (!tmp)
|
|
|
return false;
|
|
|
|
|
@@ -123,9 +120,6 @@ static void g4x_audio_codec_enable(struct drm_connector *connector,
|
|
|
len = (tmp >> 9) & 0x1f; /* ELD buffer size */
|
|
|
I915_WRITE(G4X_AUD_CNTL_ST, tmp);
|
|
|
|
|
|
- if (!eld[0])
|
|
|
- return;
|
|
|
-
|
|
|
len = min_t(int, eld[2], len);
|
|
|
DRM_DEBUG_DRIVER("ELD size %d\n", len);
|
|
|
for (i = 0; i < len; i++)
|
|
@@ -207,9 +201,6 @@ static void hsw_audio_codec_enable(struct drm_connector *connector,
|
|
|
tmp &= ~eldv;
|
|
|
I915_WRITE(aud_cntrl_st2, tmp);
|
|
|
|
|
|
- if (!eld[0])
|
|
|
- return;
|
|
|
-
|
|
|
tmp = I915_READ(aud_cntl_st);
|
|
|
tmp &= ~IBX_ELD_ADDRESS;
|
|
|
I915_WRITE(aud_cntl_st, tmp);
|
|
@@ -304,9 +295,6 @@ static void ilk_audio_codec_enable(struct drm_connector *connector,
|
|
|
tmp &= ~eldv;
|
|
|
I915_WRITE(aud_cntrl_st2, tmp);
|
|
|
|
|
|
- if (!eld[0])
|
|
|
- return;
|
|
|
-
|
|
|
tmp = I915_READ(aud_cntl_st);
|
|
|
tmp &= ~IBX_ELD_ADDRESS;
|
|
|
I915_WRITE(aud_cntl_st, tmp);
|