Re: [PATCH v2 09/18] drm/i915/audio: remove misleading checks for !eld[0]

Rodrigo Vivi
2014-10-27T18:29:42Z

oh nevermind... I'm 100% convinced...

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

On Mon, Oct 27, 2014 at 11:27 AM, Rodrigo Vivi <rodrigo.vivi@gmail.com> wrote:
> I'm not 100% convinced drm_select_eld will always cover this check... so
> What do you think about changing it to a BUG_ON or at least a WARN_ON?
>
> On Mon, Oct 27, 2014 at 7:26 AM, Jani Nikula <jani.nikula@intel.com> wrote:
>> We'll never end up in the hooks with eld[0] unset, as that's checked by
>> drm_select_eld().
>>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>> ---
>> drivers/gpu/drm/i915/intel_audio.c | 12 ------------
>> 1 file changed, 12 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
>> index c38c62eaebad..076377f43a49 100644
>> --- a/drivers/gpu/drm/i915/intel_audio.c
>> +++ b/drivers/gpu/drm/i915/intel_audio.c
>> @@ -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);
>> --
>> 2.1.1
>>
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
>
>
> --
> Rodrigo Vivi
> Blog: http://blog.vivi.eng.br

--
Rodrigo Vivi
Blog: http://blog.vivi.eng.br