drm/i915/dsi: abstract dsi bpp derivation from pixel format
Subsystems (2)
PATCH RESEND 1/3 drm/i915/dsi: abstract dsi bpp derivation from pixel format
Nuke three copies of the same switch case.
Hopefully we can switch to a drm generic function later on, but that will require us to swich to enum mipi_dsi_pixel_format first.
--- drivers/gpu/drm/i915/intel_dsi_pll.c | 67 +++++++++++++----------------------- 1 file changed, 24 insertions(+), 43 deletions(-)
drivers/gpu/drm/i915/intel_dsi_pll.c +24 -43
@@ -38,6 +38,27 @@#define DSI_HFP_PACKET_EXTRA_SIZE 6#define DSI_EOTP_PACKET_SIZE 4 +static int dsi_pixel_format_bpp (int pixel_format) +{ +int bpp; + +switch (pixel_format) { +default : +case VID_MODE_FORMAT_RGB888 : +case VID_MODE_FORMAT_RGB666_LOOSE : + bpp =24 ; +break ; +case VID_MODE_FORMAT_RGB666 : + bpp =18 ; +break ; +case VID_MODE_FORMAT_RGB565 : + bpp =16 ; +break ; + } + +return bpp; +} +struct dsi_mnp {u32 dsi_pll_ctrl;u32 dsi_pll_div;
@@ -65,19 +86,7 @@ static u32 dsi_rr_formula(const struct drm_display_mode *mode,u32 dsi_bit_clock_hz;u32 dsi_clk; -switch (pixel_format) { -default : -case VID_MODE_FORMAT_RGB888 : -case VID_MODE_FORMAT_RGB666_LOOSE : - bpp =24 ; -break ; -case VID_MODE_FORMAT_RGB666 : - bpp =18 ; -break ; -case VID_MODE_FORMAT_RGB565 : - bpp =16 ; -break ; - } + bpp =dsi_pixel_format_bpp (pixel_format); hactive = mode->hdisplay; vactive = mode->vdisplay;
@@ -137,21 +146,7 @@ static u32 dsi_rr_formula(const struct drm_display_mode *mode,static u32 dsi_clk_from_pclk (u32 pclk,int pixel_format,int lane_count) {u32 dsi_clk_khz; -u32 bpp; - -switch (pixel_format) { -default : -case VID_MODE_FORMAT_RGB888 : -case VID_MODE_FORMAT_RGB666_LOOSE : - bpp =24 ; -break ; -case VID_MODE_FORMAT_RGB666 : - bpp =18 ; -break ; -case VID_MODE_FORMAT_RGB565 : - bpp =16 ; -break ; - } +u32 bpp =dsi_pixel_format_bpp (pixel_format);/* DSI data rate = pixel clock * bits per pixel / lane count pixel clock is converted from KHz to Hz */
@@ -286,21 +281,7 @@ void vlv_disable_dsi_pll(struct intel_encoder *encoder)static void assert_bpp_mismatch (int pixel_format,int pipe_bpp) { -int bpp; - -switch (pixel_format) { -default : -case VID_MODE_FORMAT_RGB888 : -case VID_MODE_FORMAT_RGB666_LOOSE : - bpp =24 ; -break ; -case VID_MODE_FORMAT_RGB666 : - bpp =18 ; -break ; -case VID_MODE_FORMAT_RGB565 : - bpp =16 ; -break ; - } +int bpp =dsi_pixel_format_bpp (pixel_format); WARN(bpp != pipe_bpp, "bpp match assertion failure (expected %d, current %d)\n",
Signature · 6 lines
2.1.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH RESEND 2/3 drm/i915: Support for higher DSI clk
From: Gaurav K Singh <[email protected]>
For MIPI panels requiring higher DSI clk, values needs to be added in lfsr_converts table for getting the correct values of pll ctrl and dividor values which gets programmed in cck regs, otherwise DSI PLL does not get locked leading to no display on the MIPI panel.
--- drivers/gpu/drm/i915/intel_dsi_pll.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_dsi_pll.c +2 -2
@@ -67,8 +67,8 @@ struct dsi_mnp {static const u32 lfsr_converts[] = {426 ,469 ,234 ,373 ,442 ,221 ,110 ,311 ,411 ,/* 62 - 70 */ 461 ,486 ,243 ,377 ,188 ,350 ,175 ,343 ,427 ,213 ,/* 71 - 80 */ -106 ,53 ,282 ,397 ,354 ,227 ,113 ,56 ,284 ,142 ,/* 81 - 90 */ -71 ,35 /* 91 - 92 */ +106 ,53 ,282 ,397 ,454 ,227 ,113 ,56 ,284 ,142 ,/* 81 - 90 */ +71 ,35 ,273 ,136 ,324 ,418 ,465 ,488 ,500 ,506 /* 91 - 100 */ };#ifdef DSI_CLK_FROM_RR
Signature · 6 lines
2.1.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH RESEND 3/3 drm/i915: Changes required to enable DSI Video Mode on CHT
In reply to Jani NikulaFrom: Gaurav K Singh <[email protected]>
On CHT, changes are required for calculating the correct m,n & p with minimal error +/- for the required DSI clock, so that the correct dividor & ctrl values are written in cck regs for DSI. This patch has been tested on CHT RVP with 1200 x 1920 panel.
v2 by Jani, rebased on earlier refactoring, original at [1].
[1] http://mid.gmane.org/[email protected]
--- drivers/gpu/drm/i915/intel_dsi_pll.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/intel_dsi_pll.c +20 -6
@@ -157,11 +157,13 @@ static u32 dsi_clk_from_pclk(u32 pclk, int pixel_format, int lane_count)#endif -static int dsi_calc_mnp (int target_dsi_clk,struct dsi_mnp *dsi_mnp) +static int dsi_calc_mnp (struct drm_i915_private *dev_priv, +struct dsi_mnp *dsi_mnp,int target_dsi_clk) {unsigned int calc_m =0 , calc_p =0 ; -unsigned int m, n =1 , p; -int ref_clk =25000 ; +unsigned int m_min, m_max, p_min =2 , p_max =6 ; +unsigned int m, n, p; +int ref_clk;int delta = target_dsi_clk;u32 m_seed;
@@ -171,8 +173,20 @@ static int dsi_calc_mnp(int target_dsi_clk, struct dsi_mnp *dsi_mnp)return -ECHRNG ; } -for (m =62 ; m <=92 && delta; m++) { -for (p =2 ; p <=6 && delta; p++) { +if (IS_CHERRYVIEW (dev_priv)) { + ref_clk =100000 ; + n =4 ; + m_min =70 ; + m_max =96 ; + }else { + ref_clk =25000 ; + n =1 ; + m_min =62 ; + m_max =92 ; + } + +for (m = m_min; m <= m_max && delta; m++) { +for (p = p_min; p <= p_max && delta; p++) {/* * Find the optimal m and p divisors with minimal delta * +/- the required clock
@@ -212,7 +226,7 @@ static void vlv_configure_dsi_pll(struct intel_encoder *encoder) dsi_clk =dsi_clk_from_pclk (intel_dsi->pclk, intel_dsi->pixel_format, intel_dsi->lane_count); - ret =dsi_calc_mnp (dsi_clk, &dsi_mnp); + ret =dsi_calc_mnp (dev_priv, &dsi_mnp, dsi_clk);if (ret) {DRM_DEBUG_KMS ("dsi_calc_mnp failed\n" );return ;
Signature · 6 lines
2.1.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH RESEND 3/3] drm/i915: Changes required to enable DSI Video Mode on CHT
Task id: 6700 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
ILK 302/302 302/302 SNB 312/316 312/316 IVB 343/343 343/343
BYT -1 287/287 286/287
HSW 380/380 380/380
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
*BYT igt@gem_partial_pwrite_pread@reads-display PASS(1) FAIL(1)
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 7 lines · Jani Nikula
Nuke three copies of the same switch case.
Hopefully we can switch to a drm generic function later on, but that will require us to swich to enum
mipi_dsi_pixel_formatfirst.Reviewed-by Ville Syrjälä <[email protected]>Signed-off-by Jani Nikula <[email protected]>
All merged, thanks for resending.
-Daniel
Quoted 110 lines
--- drivers/gpu/drm/i915/intel_dsi_pll.c | 67 +++++++++++++----------------------- 1 file changed, 24 insertions(+), 43 deletions(-)drivers/gpu/drm/i915/intel_dsi_pll.c +24
-43@@ -38,6 +38,27 @@#define DSI_HFP_PACKET_EXTRA_SIZE 6#define DSI_EOTP_PACKET_SIZE 4 +static int dsi_pixel_format_bpp (int pixel_format) +{ +int bpp; + +switch (pixel_format) { +default : +case VID_MODE_FORMAT_RGB888 : +case VID_MODE_FORMAT_RGB666_LOOSE : + bpp =24 ; +break ; +case VID_MODE_FORMAT_RGB666 : + bpp =18 ; +break ; +case VID_MODE_FORMAT_RGB565 : + bpp =16 ; +break ; + } + +return bpp; +} +struct dsi_mnp {u32 dsi_pll_ctrl;u32 dsi_pll_div;@@ -65,19 +86,7 @@ static u32 dsi_rr_formula(const struct drm_display_mode *mode,u32 dsi_bit_clock_hz;u32 dsi_clk; -switch (pixel_format) { -default : -case VID_MODE_FORMAT_RGB888 : -case VID_MODE_FORMAT_RGB666_LOOSE : - bpp =24 ; -break ; -case VID_MODE_FORMAT_RGB666 : - bpp =18 ; -break ; -case VID_MODE_FORMAT_RGB565 : - bpp =16 ; -break ; - } + bpp =dsi_pixel_format_bpp (pixel_format); hactive = mode->hdisplay; vactive = mode->vdisplay;@@ -137,21 +146,7 @@ static u32 dsi_rr_formula(const struct drm_display_mode *mode,static u32 dsi_clk_from_pclk (u32 pclk,int pixel_format,int lane_count) {u32 dsi_clk_khz; -u32 bpp; - -switch (pixel_format) { -default : -case VID_MODE_FORMAT_RGB888 : -case VID_MODE_FORMAT_RGB666_LOOSE : - bpp =24 ; -break ; -case VID_MODE_FORMAT_RGB666 : - bpp =18 ; -break ; -case VID_MODE_FORMAT_RGB565 : - bpp =16 ; -break ; - } +u32 bpp =dsi_pixel_format_bpp (pixel_format);/* DSI data rate = pixel clock * bits per pixel / lane count pixel clock is converted from KHz to Hz */ @@ -286,21 +281,7 @@ void vlv_disable_dsi_pll(struct intel_encoder *encoder)static void assert_bpp_mismatch (int pixel_format,int pipe_bpp) { -int bpp; - -switch (pixel_format) { -default : -case VID_MODE_FORMAT_RGB888 : -case VID_MODE_FORMAT_RGB666_LOOSE : - bpp =24 ; -break ; -case VID_MODE_FORMAT_RGB666 : - bpp =18 ; -break ; -case VID_MODE_FORMAT_RGB565 : - bpp =16 ; -break ; - } +int bpp =dsi_pixel_format_bpp (pixel_format); WARN(bpp != pipe_bpp, "bpp match assertion failure (expected %d, current %d)\n",Signature · 6 lines
2.1.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx