All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jani Nikula <jani.nikula@intel.com>
To: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 1/2] drm/i915/dsi: abstract get pclk platform differences
Date: Fri, 08 Jan 2016 13:32:08 +0200	[thread overview]
Message-ID: <8737u8z4qv.fsf@intel.com> (raw)
In-Reply-To: <20160108110514.GR4437@intel.com>

On Fri, 08 Jan 2016, Ville Syrjälä <ville.syrjala@linux.intel.com> wrote:
> On Fri, Jan 08, 2016 at 12:45:39PM +0200, Jani Nikula wrote:
>> Hide away the platform differences in intel_dsi_get_pckl() within
>> intel_dsi_pll.c. No functional changes.
>> 
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>
> For the series
> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

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

BR,
Jani.


>
>> ---
>>  drivers/gpu/drm/i915/intel_dsi.c     |  9 ++-------
>>  drivers/gpu/drm/i915/intel_dsi.h     |  3 +--
>>  drivers/gpu/drm/i915/intel_dsi_pll.c | 12 ++++++++++--
>>  3 files changed, 13 insertions(+), 11 deletions(-)
>> 
>> diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c
>> index 44742fa2f616..91cef3525c93 100644
>> --- a/drivers/gpu/drm/i915/intel_dsi.c
>> +++ b/drivers/gpu/drm/i915/intel_dsi.c
>> @@ -702,7 +702,7 @@ static bool intel_dsi_get_hw_state(struct intel_encoder *encoder,
>>  static void intel_dsi_get_config(struct intel_encoder *encoder,
>>  				 struct intel_crtc_state *pipe_config)
>>  {
>> -	u32 pclk = 0;
>> +	u32 pclk;
>>  	DRM_DEBUG_KMS("\n");
>>  
>>  	pipe_config->has_dsi_encoder = true;
>> @@ -713,12 +713,7 @@ static void intel_dsi_get_config(struct intel_encoder *encoder,
>>  	 */
>>  	pipe_config->dpll_hw_state.dpll_md = 0;
>>  
>> -	if (IS_BROXTON(encoder->base.dev))
>> -		pclk = bxt_get_dsi_pclk(encoder, pipe_config->pipe_bpp);
>> -	else if (IS_VALLEYVIEW(encoder->base.dev) ||
>> -		 IS_CHERRYVIEW(encoder->base.dev))
>> -		pclk = vlv_get_dsi_pclk(encoder, pipe_config->pipe_bpp);
>> -
>> +	pclk = intel_dsi_get_pclk(encoder, pipe_config->pipe_bpp);
>>  	if (!pclk)
>>  		return;
>>  
>> diff --git a/drivers/gpu/drm/i915/intel_dsi.h b/drivers/gpu/drm/i915/intel_dsi.h
>> index 02551ff228c2..de7be7f3fb42 100644
>> --- a/drivers/gpu/drm/i915/intel_dsi.h
>> +++ b/drivers/gpu/drm/i915/intel_dsi.h
>> @@ -126,8 +126,7 @@ static inline struct intel_dsi *enc_to_intel_dsi(struct drm_encoder *encoder)
>>  
>>  extern void intel_enable_dsi_pll(struct intel_encoder *encoder);
>>  extern void intel_disable_dsi_pll(struct intel_encoder *encoder);
>> -extern u32 vlv_get_dsi_pclk(struct intel_encoder *encoder, int pipe_bpp);
>> -extern u32 bxt_get_dsi_pclk(struct intel_encoder *encoder, int pipe_bpp);
>> +extern u32 intel_dsi_get_pclk(struct intel_encoder *encoder, int pipe_bpp);
>>  extern void intel_dsi_reset_clocks(struct intel_encoder *encoder,
>>  							enum port port);
>>  
>> diff --git a/drivers/gpu/drm/i915/intel_dsi_pll.c b/drivers/gpu/drm/i915/intel_dsi_pll.c
>> index fbd2b51810ca..4c5bb7dd95a2 100644
>> --- a/drivers/gpu/drm/i915/intel_dsi_pll.c
>> +++ b/drivers/gpu/drm/i915/intel_dsi_pll.c
>> @@ -322,7 +322,7 @@ static void assert_bpp_mismatch(int pixel_format, int pipe_bpp)
>>  	     bpp, pipe_bpp);
>>  }
>>  
>> -u32 vlv_get_dsi_pclk(struct intel_encoder *encoder, int pipe_bpp)
>> +static u32 vlv_dsi_get_pclk(struct intel_encoder *encoder, int pipe_bpp)
>>  {
>>  	struct drm_i915_private *dev_priv = encoder->base.dev->dev_private;
>>  	struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);
>> @@ -384,7 +384,7 @@ u32 vlv_get_dsi_pclk(struct intel_encoder *encoder, int pipe_bpp)
>>  	return pclk;
>>  }
>>  
>> -u32 bxt_get_dsi_pclk(struct intel_encoder *encoder, int pipe_bpp)
>> +static u32 bxt_dsi_get_pclk(struct intel_encoder *encoder, int pipe_bpp)
>>  {
>>  	u32 pclk;
>>  	u32 dsi_clk;
>> @@ -419,6 +419,14 @@ u32 bxt_get_dsi_pclk(struct intel_encoder *encoder, int pipe_bpp)
>>  	return pclk;
>>  }
>>  
>> +u32 intel_dsi_get_pclk(struct intel_encoder *encoder, int pipe_bpp)
>> +{
>> +	if (IS_BROXTON(encoder->base.dev))
>> +		return bxt_dsi_get_pclk(encoder, pipe_bpp);
>> +	else
>> +		return vlv_dsi_get_pclk(encoder, pipe_bpp);
>> +}
>> +
>>  static void vlv_dsi_reset_clocks(struct intel_encoder *encoder, enum port port)
>>  {
>>  	u32 temp;
>> -- 
>> 2.1.4

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

      reply	other threads:[~2016-01-08 11:32 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-08 10:45 [PATCH 1/2] drm/i915/dsi: abstract get pclk platform differences Jani Nikula
2016-01-08 10:45 ` [PATCH 2/2] drm/i915/dsi: remove unused dsi_rr_formula() Jani Nikula
2016-01-08 11:05 ` [PATCH 1/2] drm/i915/dsi: abstract get pclk platform differences Ville Syrjälä
2016-01-08 11:32   ` Jani Nikula [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=8737u8z4qv.fsf@intel.com \
    --to=jani.nikula@intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=ville.syrjala@linux.intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.