Re: [Intel-gfx] [PATCH RESEND 8/9] drm/i915/audio: rename N value getter to emphasize it's for hdmi

2016-10-11 Thread Jani Nikula 
On Tue, 11 Oct 2016, "Yang, Libin" <libin.y...@intel.com> wrote:
> Reviewed-by: Libin Yang <libin.y...@intel.com>

Pushed patches 1-8 to drm-intel-next-queued, thanks for the review.

BR,
Jani.

>
> Regards,
> Libin
>
>
>> -Original Message-
>> From: Intel-gfx [mailto:intel-gfx-boun...@lists.freedesktop.org] On Behalf Of
>> Jani Nikula
>> Sent: Monday, October 10, 2016 11:04 PM
>> To: intel-gfx@lists.freedesktop.org
>> Cc: Nikula, Jani <jani.nik...@intel.com>; libin.y...@linux.intel.com;
>> Pandiyan, Dhinakaran <dhinakaran.pandi...@intel.com>
>> Subject: [Intel-gfx] [PATCH RESEND 8/9] drm/i915/audio: rename N value
>> getter to emphasize it's for hdmi
>> 
>> We'll be getting a function and a table for dp parameters soon enough, so
>> rename the function and table for hdmi. No functional changes.
>> 
>> Cc: Libin Yang <libin.y...@linux.intel.com>
>> Signed-off-by: Jani Nikula <jani.nik...@intel.com>
>> ---
>>  drivers/gpu/drm/i915/intel_audio.c | 16 
>>  1 file changed, 8 insertions(+), 8 deletions(-)
>> 
>> diff --git a/drivers/gpu/drm/i915/intel_audio.c
>> b/drivers/gpu/drm/i915/intel_audio.c
>> index d2c6227f72b8..81df29ca4947 100644
>> --- a/drivers/gpu/drm/i915/intel_audio.c
>> +++ b/drivers/gpu/drm/i915/intel_audio.c
>> @@ -81,7 +81,7 @@ static const struct {
>>  int clock;
>>  int n;
>>  int cts;
>> -} aud_ncts[] = {
>> +} hdmi_aud_ncts[] = {
>>  { 44100, TMDS_296M, 4459, 234375 },
>>  { 44100, TMDS_297M, 4704, 247500 },
>>  { 48000, TMDS_296M, 5824, 281250 },
>> @@ -121,15 +121,15 @@ static u32 audio_config_hdmi_pixel_clock(const
>> struct drm_display_mode *adjusted
>>  return hdmi_audio_clock[i].config;
>>  }
>> 
>> -static int audio_config_get_n(const struct drm_display_mode
>> *adjusted_mode,
>> -  int rate)
>> +static int audio_config_hdmi_get_n(const struct drm_display_mode
>> *adjusted_mode,
>> +   int rate)
>>  {
>>  int i;
>> 
>> -for (i = 0; i < ARRAY_SIZE(aud_ncts); i++) {
>> -if ((rate == aud_ncts[i].sample_rate) &&
>> -(adjusted_mode->crtc_clock == aud_ncts[i].clock)) {
>> -return aud_ncts[i].n;
>> +for (i = 0; i < ARRAY_SIZE(hdmi_aud_ncts); i++) {
>> +if (rate == hdmi_aud_ncts[i].sample_rate &&
>> +adjusted_mode->crtc_clock == hdmi_aud_ncts[i].clock) {
>> +return hdmi_aud_ncts[i].n;
>>  }
>>  }
>>  return 0;
>> @@ -256,7 +256,7 @@ hsw_hdmi_audio_config_update(struct intel_crtc
>> *intel_crtc, enum port port,
>> 
>>  if (adjusted_mode->crtc_clock == TMDS_296M ||
>>  adjusted_mode->crtc_clock == TMDS_297M) {
>> -n = audio_config_get_n(adjusted_mode, rate);
>> +n = audio_config_hdmi_get_n(adjusted_mode, rate);
>>  if (n != 0) {
>>  tmp &= ~AUD_CONFIG_N_MASK;
>>  tmp |= AUD_CONFIG_N(n);
>> --
>> 2.1.4
>> 
>> ___
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Jani Nikula, Intel Open Source Technology Center
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH RESEND 8/9] drm/i915/audio: rename N value getter to emphasize it's for hdmi

2016-10-10 Thread Yang, Libin 
Reviewed-by: Libin Yang <libin.y...@intel.com>

Regards,
Libin


> -Original Message-
> From: Intel-gfx [mailto:intel-gfx-boun...@lists.freedesktop.org] On Behalf Of
> Jani Nikula
> Sent: Monday, October 10, 2016 11:04 PM
> To: intel-gfx@lists.freedesktop.org
> Cc: Nikula, Jani <jani.nik...@intel.com>; libin.y...@linux.intel.com;
> Pandiyan, Dhinakaran <dhinakaran.pandi...@intel.com>
> Subject: [Intel-gfx] [PATCH RESEND 8/9] drm/i915/audio: rename N value
> getter to emphasize it's for hdmi
> 
> We'll be getting a function and a table for dp parameters soon enough, so
> rename the function and table for hdmi. No functional changes.
> 
> Cc: Libin Yang <libin.y...@linux.intel.com>
> Signed-off-by: Jani Nikula <jani.nik...@intel.com>
> ---
>  drivers/gpu/drm/i915/intel_audio.c | 16 
>  1 file changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_audio.c
> b/drivers/gpu/drm/i915/intel_audio.c
> index d2c6227f72b8..81df29ca4947 100644
> --- a/drivers/gpu/drm/i915/intel_audio.c
> +++ b/drivers/gpu/drm/i915/intel_audio.c
> @@ -81,7 +81,7 @@ static const struct {
>   int clock;
>   int n;
>   int cts;
> -} aud_ncts[] = {
> +} hdmi_aud_ncts[] = {
>   { 44100, TMDS_296M, 4459, 234375 },
>   { 44100, TMDS_297M, 4704, 247500 },
>   { 48000, TMDS_296M, 5824, 281250 },
> @@ -121,15 +121,15 @@ static u32 audio_config_hdmi_pixel_clock(const
> struct drm_display_mode *adjusted
>   return hdmi_audio_clock[i].config;
>  }
> 
> -static int audio_config_get_n(const struct drm_display_mode
> *adjusted_mode,
> -   int rate)
> +static int audio_config_hdmi_get_n(const struct drm_display_mode
> *adjusted_mode,
> +int rate)
>  {
>   int i;
> 
> - for (i = 0; i < ARRAY_SIZE(aud_ncts); i++) {
> - if ((rate == aud_ncts[i].sample_rate) &&
> - (adjusted_mode->crtc_clock == aud_ncts[i].clock)) {
> - return aud_ncts[i].n;
> + for (i = 0; i < ARRAY_SIZE(hdmi_aud_ncts); i++) {
> + if (rate == hdmi_aud_ncts[i].sample_rate &&
> + adjusted_mode->crtc_clock == hdmi_aud_ncts[i].clock) {
> + return hdmi_aud_ncts[i].n;
>   }
>   }
>   return 0;
> @@ -256,7 +256,7 @@ hsw_hdmi_audio_config_update(struct intel_crtc
> *intel_crtc, enum port port,
> 
>   if (adjusted_mode->crtc_clock == TMDS_296M ||
>   adjusted_mode->crtc_clock == TMDS_297M) {
> - n = audio_config_get_n(adjusted_mode, rate);
> + n = audio_config_hdmi_get_n(adjusted_mode, rate);
>   if (n != 0) {
>   tmp &= ~AUD_CONFIG_N_MASK;
>   tmp |= AUD_CONFIG_N(n);
> --
> 2.1.4
> 
> ___
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH RESEND 8/9] drm/i915/audio: rename N value getter to emphasize it's for hdmi

2016-10-10 Thread Jani Nikula 
We'll be getting a function and a table for dp parameters soon enough,
so rename the function and table for hdmi. No functional changes.

Cc: Libin Yang 
Signed-off-by: Jani Nikula 
---
 drivers/gpu/drm/i915/intel_audio.c | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_audio.c 
b/drivers/gpu/drm/i915/intel_audio.c
index d2c6227f72b8..81df29ca4947 100644
--- a/drivers/gpu/drm/i915/intel_audio.c
+++ b/drivers/gpu/drm/i915/intel_audio.c
@@ -81,7 +81,7 @@ static const struct {
int clock;
int n;
int cts;
-} aud_ncts[] = {
+} hdmi_aud_ncts[] = {
{ 44100, TMDS_296M, 4459, 234375 },
{ 44100, TMDS_297M, 4704, 247500 },
{ 48000, TMDS_296M, 5824, 281250 },
@@ -121,15 +121,15 @@ static u32 audio_config_hdmi_pixel_clock(const struct 
drm_display_mode *adjusted
return hdmi_audio_clock[i].config;
 }
 
-static int audio_config_get_n(const struct drm_display_mode *adjusted_mode,
- int rate)
+static int audio_config_hdmi_get_n(const struct drm_display_mode 
*adjusted_mode,
+  int rate)
 {
int i;
 
-   for (i = 0; i < ARRAY_SIZE(aud_ncts); i++) {
-   if ((rate == aud_ncts[i].sample_rate) &&
-   (adjusted_mode->crtc_clock == aud_ncts[i].clock)) {
-   return aud_ncts[i].n;
+   for (i = 0; i < ARRAY_SIZE(hdmi_aud_ncts); i++) {
+   if (rate == hdmi_aud_ncts[i].sample_rate &&
+   adjusted_mode->crtc_clock == hdmi_aud_ncts[i].clock) {
+   return hdmi_aud_ncts[i].n;
}
}
return 0;
@@ -256,7 +256,7 @@ hsw_hdmi_audio_config_update(struct intel_crtc *intel_crtc, 
enum port port,
 
if (adjusted_mode->crtc_clock == TMDS_296M ||
adjusted_mode->crtc_clock == TMDS_297M) {
-   n = audio_config_get_n(adjusted_mode, rate);
+   n = audio_config_hdmi_get_n(adjusted_mode, rate);
if (n != 0) {
tmp &= ~AUD_CONFIG_N_MASK;
tmp |= AUD_CONFIG_N(n);
-- 
2.1.4

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx