Re: [PATCH v2 7/7] drm/i915: Parametrize the dphy and other spec specific parameters

[Jani Nikula <jani.nikula@intel.com>]

On Fri, 15 Nov 2013, Jani Nikula <jani.nikula@intel.com> wrote:
> On Sat, 09 Nov 2013, Shobhit Kumar <shobhit.kumar@intel.com> wrote:
>> The values of these parameters will be different for differnet panel
>> based on dsi rate, lane count, etc. Remove the hardcodings and make
>> these as parameters whch will be initialized in panel specific
>> sub-encoder implementaion.
>>
>> This will also form groundwork for planned generic panel sub-encoder
>> implemntation based on VBT design enhancments to support multiple panels
>>
>> Signed-off-by: Shobhit Kumar <shobhit.kumar@intel.com>
>> ---
>>  drivers/gpu/drm/i915/intel_dsi.c |   27 +++++++++++++--------------
>>  drivers/gpu/drm/i915/intel_dsi.h |   14 ++++++++++++++
>>  2 files changed, 27 insertions(+), 14 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c
>> index 4dccb4b..e9fde76 100644
>> --- a/drivers/gpu/drm/i915/intel_dsi.c
>> +++ b/drivers/gpu/drm/i915/intel_dsi.c
>> @@ -160,6 +160,7 @@ static void intel_dsi_enable(struct intel_encoder *encoder)
>>  
>>  		/* assert ip_tg_enable signal */
>>  		temp = I915_READ(MIPI_PORT_CTRL(pipe));
>> +		temp = temp | intel_dsi->port_bits;
>
> Need to mask away port_bits before OR:ing?

Other than that,
Reviewed-by: Jani Nikula <jani.nikula@intel.com>




>
>>  		I915_WRITE(MIPI_PORT_CTRL(pipe), temp | DPI_ENABLE);
>>  		POSTING_READ(MIPI_PORT_CTRL(pipe));
>>  	}
>> @@ -391,11 +392,7 @@ static void intel_dsi_mode_set(struct intel_encoder *intel_encoder)
>>  	I915_WRITE(MIPI_INTR_STAT(pipe), 0xffffffff);
>>  	I915_WRITE(MIPI_INTR_EN(pipe), 0xffffffff);
>>  
>> -	I915_WRITE(MIPI_DPHY_PARAM(pipe),
>> -		   0x3c << EXIT_ZERO_COUNT_SHIFT |
>> -		   0x1f << TRAIL_COUNT_SHIFT |
>> -		   0xc5 << CLK_ZERO_COUNT_SHIFT |
>> -		   0x1f << PREPARE_COUNT_SHIFT);
>> +	I915_WRITE(MIPI_DPHY_PARAM(pipe), intel_dsi->dphy_reg);
>>  
>>  	I915_WRITE(MIPI_DPI_RESOLUTION(pipe),
>>  		   adjusted_mode->vdisplay << VERTICAL_ADDRESS_SHIFT |
>> @@ -443,9 +440,9 @@ static void intel_dsi_mode_set(struct intel_encoder *intel_encoder)
>>  				       adjusted_mode->htotal,
>>  				       bpp, intel_dsi->lane_count) + 1);
>>  	}
>> -	I915_WRITE(MIPI_LP_RX_TIMEOUT(pipe), 8309); /* max */
>> -	I915_WRITE(MIPI_TURN_AROUND_TIMEOUT(pipe), 0x14); /* max */
>> -	I915_WRITE(MIPI_DEVICE_RESET_TIMER(pipe), 0xffff); /* max */
>> +	I915_WRITE(MIPI_LP_RX_TIMEOUT(pipe), intel_dsi->lp_rx_timeout);
>> +	I915_WRITE(MIPI_TURN_AROUND_TIMEOUT(pipe), intel_dsi->turn_arnd_val);
>> +	I915_WRITE(MIPI_DEVICE_RESET_TIMER(pipe), intel_dsi->rst_timer_val);
>>  
>>  	/* dphy stuff */
>>  
>> @@ -460,29 +457,31 @@ static void intel_dsi_mode_set(struct intel_encoder *intel_encoder)
>>  	 *
>>  	 * XXX: write MIPI_STOP_STATE_STALL?
>>  	 */
>> -	I915_WRITE(MIPI_HIGH_LOW_SWITCH_COUNT(pipe), 0x46);
>> +	I915_WRITE(MIPI_HIGH_LOW_SWITCH_COUNT(pipe),
>> +						intel_dsi->hs_to_lp_count);
>>  
>>  	/* XXX: low power clock equivalence in terms of byte clock. the number
>>  	 * of byte clocks occupied in one low power clock. based on txbyteclkhs
>>  	 * and txclkesc. txclkesc time / txbyteclk time * (105 +
>>  	 * MIPI_STOP_STATE_STALL) / 105.???
>>  	 */
>> -	I915_WRITE(MIPI_LP_BYTECLK(pipe), 4);
>> +	I915_WRITE(MIPI_LP_BYTECLK(pipe), intel_dsi->lp_byte_clk);
>>  
>>  	/* the bw essential for transmitting 16 long packets containing 252
>>  	 * bytes meant for dcs write memory command is programmed in this
>>  	 * register in terms of byte clocks. based on dsi transfer rate and the
>>  	 * number of lanes configured the time taken to transmit 16 long packets
>>  	 * in a dsi stream varies. */
>> -	I915_WRITE(MIPI_DBI_BW_CTRL(pipe), 0x820);
>> +	I915_WRITE(MIPI_DBI_BW_CTRL(pipe), intel_dsi->bw_timer);
>>  
>>  	I915_WRITE(MIPI_CLK_LANE_SWITCH_TIME_CNT(pipe),
>> -		   0xa << LP_HS_SSW_CNT_SHIFT |
>> -		   0x14 << HS_LP_PWR_SW_CNT_SHIFT);
>> +		   intel_dsi->clk_lp_to_hs_count << LP_HS_SSW_CNT_SHIFT |
>> +		   intel_dsi->clk_hs_to_lp_count << HS_LP_PWR_SW_CNT_SHIFT);
>>  
>>  	if (is_vid_mode(intel_dsi))
>>  		I915_WRITE(MIPI_VIDEO_MODE_FORMAT(pipe),
>> -			   intel_dsi->video_mode_format);
>> +				intel_dsi->video_frmt_cfg_bits |
>> +				intel_dsi->video_mode_format);
>>  }
>>  
>>  static enum drm_connector_status
>> diff --git a/drivers/gpu/drm/i915/intel_dsi.h b/drivers/gpu/drm/i915/intel_dsi.h
>> index 387dfe1..b4a27ce 100644
>> --- a/drivers/gpu/drm/i915/intel_dsi.h
>> +++ b/drivers/gpu/drm/i915/intel_dsi.h
>> @@ -96,6 +96,20 @@ struct intel_dsi {
>>  
>>  	/* eot for MIPI_EOT_DISABLE register */
>>  	u32 eot_disable;
>> +
>> +	u32 port_bits;
>> +	u32 bw_timer;
>> +	u32 dphy_reg;
>> +	u32 video_frmt_cfg_bits;
>> +	u16 lp_byte_clk;
>> +
>> +	/* timeouts in byte clocks */
>> +	u16 lp_rx_timeout;
>> +	u16 turn_arnd_val;
>> +	u16 rst_timer_val;
>> +	u16 hs_to_lp_count;
>> +	u16 clk_lp_to_hs_count;
>> +	u16 clk_hs_to_lp_count;
>>  };
>>  
>>  static inline struct intel_dsi *enc_to_intel_dsi(struct drm_encoder *encoder)
>> -- 
>> 1.7.9.5
>>
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
> -- 
> Jani Nikula, Intel Open Source Technology Center

-- 
Jani Nikula, Intel Open Source Technology Center