DSI Command mode(DBI mode) enabling on CHT
Subsystems (2)
cover DSI Command mode(DBI mode) enabling on CHT
Hi,
These set of patches are for enabling DSI command mode. Command Mode refers to an operation in which transactions primarily take the form of sending commands and data to a peripheral that incorporates a display controller. The display controller may include local registers and a frame buffer. The host processor indirectly controls activity at the peripheral by sending commands, parameters and data to the display controller.
Sink refreshes from its local frame buffer. Image updates require Source to write new data into the frame buffer which Source sends in the form of command + payload.
The command mode panel we have here is 1080 x 1920. For this panel, features like support of i2c transactions for sending backlight on sequence, VBT version 3 patches, GPIO configuration changes for CHT are required. The same will be added as part of different patch series. Floating the command mode patches separately to start with the initial review.
Regards
Gaurav
Gaurav K Singh (14):
drm/i915: allocate gem memory for mipi dbi cmd buffer drm/i915: Add support for TEAR ON Sequence drm/i915: Add functions for dcs memory write cmd drm/i915: Calculate bw timer for mipi DBI interface drm/i915: Use the bpp value wrt the pixel format drm/i915: Disable vlank interrupt for disabling MIPI cmd mode drm/i915: Disable MIPI display self refresh mode drm/i915: Disable Tearing effect trigger by GPIO pin drm/i915: Changes for command mode preparation drm/i915: Enable Tearing effect trigger by GPIO pin drm/i915: Enable MIPI display self refresh mode drm/i915: Generalize DSI enable function
drm/i915: Reset the display hw if vid mode to cmd mode drm/i915: send one frame after enabling mipi cmd mode
drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_bios.h | 4 + drivers/gpu/drm/i915/intel_display.c | 155 ++++++++++++++++++++++++---- drivers/gpu/drm/i915/intel_drv.h | 7 ++ drivers/gpu/drm/i915/intel_dsi.c | 136 +++++++++++++++++++++--- drivers/gpu/drm/i915/intel_dsi.h | 5 + drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 36 ++++++- 8 files changed, 311 insertions(+), 34 deletions(-)
Signature · 6 lines
1.7.9.5 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 1/14 drm/i915: allocate gem memory for mipi dbi cmd buffer
Allocate gem memory for MIPI DBI command buffer. This memory will be used when sending command via DBI interface.
--- drivers/gpu/drm/i915/intel_dsi.c | 31 +++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_dsi.h | 4 ++++ 2 files changed, 35 insertions(+)
drivers/gpu/drm/i915/intel_dsi.c +31 -0
@@ -415,6 +415,27 @@ static void intel_dsi_pre_enable(struct intel_encoder *encoder)DRM_DEBUG_KMS ("\n" ); +if (!intel_dsi->gem_obj &&is_cmd_mode (intel_dsi)) { + intel_dsi->gem_obj =i915_gem_alloc_object (dev,4096 ); +if (!intel_dsi->gem_obj) { +DRM_ERROR ("Failed to allocate seqno page\n" ); +return ; + } + +i915_gem_object_set_cache_level (intel_dsi->gem_obj, +I915_CACHE_LLC ); + +if (i915_gem_obj_ggtt_pin (intel_dsi->gem_obj,4096 ,0 )) { +DRM_ERROR ("MIPI command buffer GTT pin failed" ); +return ; + } + + intel_dsi->cmd_buff = +kmap (sg_page (intel_dsi->gem_obj->pages->sgl)); + intel_dsi->cmd_buff_phy_addr =page_to_phys ( +sg_page (intel_dsi->gem_obj->pages->sgl)); + } +/* Disable DPOunit clock gating, can stall pipe * and we need DPLL REFA always enabled */ tmp =I915_READ (DPLL (pipe));
@@ -576,6 +597,12 @@ static void intel_dsi_post_disable(struct intel_encoder *encoder)msleep (intel_dsi->panel_off_delay);msleep (intel_dsi->panel_pwr_cycle_delay); + +if (intel_dsi->gem_obj) { +kunmap (intel_dsi->cmd_buff); +i915_gem_object_ggtt_unpin (intel_dsi->gem_obj); +drm_gem_object_unreference (&intel_dsi->gem_obj->base); + } } static bool intel_dsi_get_hw_state(struct intel_encoder *encoder,
@@ -1048,6 +1075,10 @@ void intel_dsi_init(struct drm_device *dev) intel_dsi->ports = (1 <<PORT_C ); } + intel_dsi->cmd_buff =NULL ; + intel_dsi->cmd_buff_phy_addr =0 ; + intel_dsi->gem_obj =NULL ; +/* Create a DSI host (and a device) for each port. */ for_each_dsi_port (port, intel_dsi->ports) {struct intel_dsi_host *host;
drivers/gpu/drm/i915/intel_dsi.h +4 -0
@@ -44,6 +44,10 @@ struct intel_dsi {struct intel_connector *attached_connector; +struct drm_i915_gem_object *gem_obj; +void *cmd_buff; +dma_addr_t cmd_buff_phy_addr; +/* bit mask of ports being driven */ u16 ports;
Signature · 6 lines
1.7.9.5 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [RFC 01/14] drm/i915: allocate gem memory for mipi dbi cmd buffer
Quoted 2 lines · Gaurav K Singh
Allocate gem memory for MIPI DBI command buffer. This memory will be used when sending command via DBI interface.
Why would you allocate this via gem? AFAICS you only feed the bus address to the hardware. Using the dma-api would seem like the right choice here, but I'm not sure how to deal with the dma mask.
Quoted 87 lines
Signed-off-by Yogesh Mohan Marimuthu <[email protected]>Signed-off-by Gaurav K Singh <[email protected]>Signed-off-by Shobhit Kumar <[email protected]>--- drivers/gpu/drm/i915/intel_dsi.c | 31 +++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_dsi.h | 4 ++++ 2 files changed, 35 insertions(+)drivers/gpu/drm/i915/intel_dsi.c +31
-0@@ -415,6 +415,27 @@ static void intel_dsi_pre_enable(struct intel_encoder *encoder)DRM_DEBUG_KMS ("\n" ); +if (!intel_dsi->gem_obj &&is_cmd_mode (intel_dsi)) { + intel_dsi->gem_obj =i915_gem_alloc_object (dev,4096 ); +if (!intel_dsi->gem_obj) { +DRM_ERROR ("Failed to allocate seqno page\n" ); +return ; + } + +i915_gem_object_set_cache_level (intel_dsi->gem_obj, +I915_CACHE_LLC ); + +if (i915_gem_obj_ggtt_pin (intel_dsi->gem_obj,4096 ,0 )) { +DRM_ERROR ("MIPI command buffer GTT pin failed" ); +return ; + } + + intel_dsi->cmd_buff = +kmap (sg_page (intel_dsi->gem_obj->pages->sgl)); + intel_dsi->cmd_buff_phy_addr =page_to_phys ( +sg_page (intel_dsi->gem_obj->pages->sgl)); + } +/* Disable DPOunit clock gating, can stall pipe * and we need DPLL REFA always enabled */ tmp =I915_READ (DPLL (pipe));@@ -576,6 +597,12 @@ static void intel_dsi_post_disable(struct intel_encoder *encoder)msleep (intel_dsi->panel_off_delay);msleep (intel_dsi->panel_pwr_cycle_delay); + +if (intel_dsi->gem_obj) { +kunmap (intel_dsi->cmd_buff); +i915_gem_object_ggtt_unpin (intel_dsi->gem_obj); +drm_gem_object_unreference (&intel_dsi->gem_obj->base); + } } static bool intel_dsi_get_hw_state(struct intel_encoder *encoder,@@ -1048,6 +1075,10 @@ void intel_dsi_init(struct drm_device *dev) intel_dsi->ports = (1 <<PORT_C ); } + intel_dsi->cmd_buff =NULL ; + intel_dsi->cmd_buff_phy_addr =0 ; + intel_dsi->gem_obj =NULL ; +/* Create a DSI host (and a device) for each port. */ for_each_dsi_port (port, intel_dsi->ports) {struct intel_dsi_host *host;drivers/gpu/drm/i915/intel_dsi.h +4
-0@@ -44,6 +44,10 @@ struct intel_dsi {struct intel_connector *attached_connector; +struct drm_i915_gem_object *gem_obj; +void *cmd_buff; +dma_addr_t cmd_buff_phy_addr; +/* bit mask of ports being driven */ u16 ports;Signature · 6 lines
1.7.9.5 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [RFC 01/14] drm/i915: allocate gem memory for mipi dbi cmd buffer
Quoted 7 lines · Ville Syrjälä
Quoted 2 lines · Gaurav K Singh
Allocate gem memory for MIPI DBI command buffer. This memory will be used when sending command via DBI interface.
Why would you allocate this via gem? AFAICS you only feed the bus address to the hardware. Using the dma-api would seem like the right choice here, but I'm not sure how to deal with the dma mask.
Yeah dma_alloc_coherent is what you want here. The mask can be ignored, it should be suitable already.
-Daniel
Quoted 96 lines
Quoted 88 lines
Signed-off-by Yogesh Mohan Marimuthu <[email protected]>Signed-off-by Gaurav K Singh <[email protected]>Signed-off-by Shobhit Kumar <[email protected]>--- drivers/gpu/drm/i915/intel_dsi.c | 31 +++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_dsi.h | 4 ++++ 2 files changed, 35 insertions(+)drivers/gpu/drm/i915/intel_dsi.c +31
-0@@ -415,6 +415,27 @@ static void intel_dsi_pre_enable(struct intel_encoder *encoder)DRM_DEBUG_KMS ("\n" ); +if (!intel_dsi->gem_obj &&is_cmd_mode (intel_dsi)) { + intel_dsi->gem_obj =i915_gem_alloc_object (dev,4096 ); +if (!intel_dsi->gem_obj) { +DRM_ERROR ("Failed to allocate seqno page\n" ); +return ; + } + +i915_gem_object_set_cache_level (intel_dsi->gem_obj, +I915_CACHE_LLC ); + +if (i915_gem_obj_ggtt_pin (intel_dsi->gem_obj,4096 ,0 )) { +DRM_ERROR ("MIPI command buffer GTT pin failed" ); +return ; + } + + intel_dsi->cmd_buff = +kmap (sg_page (intel_dsi->gem_obj->pages->sgl)); + intel_dsi->cmd_buff_phy_addr =page_to_phys ( +sg_page (intel_dsi->gem_obj->pages->sgl)); + } +/* Disable DPOunit clock gating, can stall pipe * and we need DPLL REFA always enabled */ tmp =I915_READ (DPLL (pipe));@@ -576,6 +597,12 @@ static void intel_dsi_post_disable(struct intel_encoder *encoder)msleep (intel_dsi->panel_off_delay);msleep (intel_dsi->panel_pwr_cycle_delay); + +if (intel_dsi->gem_obj) { +kunmap (intel_dsi->cmd_buff); +i915_gem_object_ggtt_unpin (intel_dsi->gem_obj); +drm_gem_object_unreference (&intel_dsi->gem_obj->base); + } } static bool intel_dsi_get_hw_state(struct intel_encoder *encoder,@@ -1048,6 +1075,10 @@ void intel_dsi_init(struct drm_device *dev) intel_dsi->ports = (1 <<PORT_C ); } + intel_dsi->cmd_buff =NULL ; + intel_dsi->cmd_buff_phy_addr =0 ; + intel_dsi->gem_obj =NULL ; +/* Create a DSI host (and a device) for each port. */ for_each_dsi_port (port, intel_dsi->ports) {struct intel_dsi_host *host;drivers/gpu/drm/i915/intel_dsi.h +4
-0@@ -44,6 +44,10 @@ struct intel_dsi {struct intel_connector *attached_connector; +struct drm_i915_gem_object *gem_obj; +void *cmd_buff; +dma_addr_t cmd_buff_phy_addr; +/* bit mask of ports being driven */ u16 ports;Signature · 6 lines
1.7.9.5 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfxSignature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ 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
Re: [RFC 01/14] drm/i915: allocate gem memory for mipi dbi cmd buffer
Quoted 11 lines · Daniel Vetter
Quoted 7 lines · Ville Syrjälä
Quoted 2 lines · Gaurav K Singh
Allocate gem memory for MIPI DBI command buffer. This memory will be used when sending command via DBI interface.
Why would you allocate this via gem? AFAICS you only feed the bus address to the hardware. Using the dma-api would seem like the right choice here, but I'm not sure how to deal with the dma mask.
Yeah
dma_alloc_coherentis what you want here. The mask can be ignored, it should be suitable already.
Umm, this thing seems to limited to 32bit addresses. And we set the mask to 39 or 40 bits depending on the gen.
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [RFC 01/14] drm/i915: allocate gem memory for mipi dbi cmd buffer
Quoted 10 lines · Ville Syrjälä
Quoted 9 lines · Daniel Vetter
Quoted 7 lines · Ville Syrjälä
Quoted 2 lines · Gaurav K Singh
Allocate gem memory for MIPI DBI command buffer. This memory will be used when sending command via DBI interface.
Why would you allocate this via gem? AFAICS you only feed the bus address to the hardware. Using the dma-api would seem like the right choice here, but I'm not sure how to deal with the dma mask.
Quoted 5 lines
Quoted 2 lines
Yeah
dma_alloc_coherentis what you want here. The mask can be ignored, it should be suitable already.Umm, this thing seems to limited to 32bit addresses. And we set the mask to 39 or 40 bits depending on the gen.
Well that's what we have dma_set_coherent_mask for, hooray. Not the first one, see the other hacks with comments in i915_driver_load. -Daniel
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
Re: [RFC 01/14] drm/i915: allocate gem memory for mipi dbi cmd buffer
Quoted 9 lines · Daniel Vetter
Quoted 8 lines · Ville Syrjälä
Quoted 7 lines · Daniel Vetter
Quoted 6 lines · Ville Syrjälä
Quoted 2 lines · Gaurav K Singh
Allocate gem memory for MIPI DBI command buffer. This memory will be used when sending command via DBI interface.
Why would you allocate this via gem? AFAICS you only feed the bus address to the hardware. Using the dma-api would seem like the right choice here, but I'm not sure how to deal with the dma mask.
Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
Yeah
dma_alloc_coherentis what you want here. The mask can be ignored, it should be suitable already.Umm, this thing seems to limited to 32bit addresses. And we set the mask to 39 or 40 bits depending on the gen.
Well that's what we have
dma_set_coherent_maskfor, hooray. Not the first one, see the other hacks with comments ini915_driver_load. -Daniel
checking on the usage of dma_alloc_coherent. Will come back on this.
With regards,
Gaurav
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
{Intel-gfx] [RFC 01/14] drm/i915: allocate gem memory for mipi dbi cmd buffer
Allocate gem memory for MIPI DBI command buffer. This memory will be used when sending command via DBI interface.
v2: lock mutex before gem object unreference and later set gem obj ptr to NULL (Gaurav)
--- drivers/gpu/drm/i915/intel_dsi.c | 40 ++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_dsi.h | 4 ++++ 2 files changed, 44 insertions(+)
drivers/gpu/drm/i915/intel_dsi.c +40 -0
@@ -407,9 +407,35 @@ static void intel_dsi_pre_enable(struct intel_encoder *encoder)enum pipe pipe = intel_crtc->pipe;enum port port;u32 tmp; +int ret;DRM_DEBUG_KMS ("\n" ); +if (!intel_dsi->gem_obj &&is_cmd_mode (intel_dsi)) { + intel_dsi->gem_obj =i915_gem_alloc_object (dev,4096 ); +if (!intel_dsi->gem_obj) { +DRM_ERROR ("Failed to allocate seqno page\n" ); +return ; + } + + ret =i915_gem_object_set_cache_level (intel_dsi->gem_obj, +I915_CACHE_LLC ); +if (ret) + goto err_unref; + + ret =i915_gem_obj_ggtt_pin (intel_dsi->gem_obj,4096 ,0 ); +if (ret) { +err_unref: +drm_gem_object_unreference (&intel_dsi->gem_obj->base); +return ; + } + + intel_dsi->cmd_buff = +kmap (sg_page (intel_dsi->gem_obj->pages->sgl)); + intel_dsi->cmd_buff_phy_addr =page_to_phys ( +sg_page (intel_dsi->gem_obj->pages->sgl)); + } +/* Disable DPOunit clock gating, can stall pipe * and we need DPLL REFA always enabled */ tmp =I915_READ (DPLL (pipe));
@@ -555,6 +581,7 @@ static void intel_dsi_post_disable(struct intel_encoder *encoder) {struct drm_i915_private *dev_priv = encoder->base.dev->dev_private;struct intel_dsi *intel_dsi =enc_to_intel_dsi (&encoder->base); +struct drm_device *dev = encoder->base.dev;u32 val;DRM_DEBUG_KMS ("\n" );
@@ -571,6 +598,15 @@ static void intel_dsi_post_disable(struct intel_encoder *encoder)msleep (intel_dsi->panel_off_delay);msleep (intel_dsi->panel_pwr_cycle_delay); + +if (intel_dsi->gem_obj) { +kunmap (intel_dsi->cmd_buff); +i915_gem_object_ggtt_unpin (intel_dsi->gem_obj); +mutex_lock (&dev->struct_mutex); +drm_gem_object_unreference (&intel_dsi->gem_obj->base); +mutex_unlock (&dev->struct_mutex); + } + intel_dsi->gem_obj =NULL ; } static bool intel_dsi_get_hw_state(struct intel_encoder *encoder,
@@ -1042,6 +1078,10 @@ void intel_dsi_init(struct drm_device *dev) intel_dsi->ports = (1 <<PORT_C ); } + intel_dsi->cmd_buff =NULL ; + intel_dsi->cmd_buff_phy_addr =0 ; + intel_dsi->gem_obj =NULL ; +/* Create a DSI host (and a device) for each port. */ for_each_dsi_port (port, intel_dsi->ports) {struct intel_dsi_host *host;
drivers/gpu/drm/i915/intel_dsi.h +4 -0
@@ -44,6 +44,10 @@ struct intel_dsi {struct intel_connector *attached_connector; +struct drm_i915_gem_object *gem_obj; +void *cmd_buff; +dma_addr_t cmd_buff_phy_addr; +/* bit mask of ports being driven */ u16 ports;
Signature · 6 lines
1.7.9.5 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: {Intel-gfx] [RFC 01/14] drm/i915: allocate gem memory for mipi dbi cmd buffer
Quoted 93 lines · Gaurav K Singh
Allocate gem memory for MIPI DBI command buffer. This memory will be used when sending command via DBI interface.
v2: lock mutex before gem object unreference and later set gem obj ptr to NULL (Gaurav)
Signed-off-by Yogesh Mohan Marimuthu <[email protected]>Signed-off-by Gaurav K Singh <[email protected]>Signed-off-by Shobhit Kumar <[email protected]>--- drivers/gpu/drm/i915/intel_dsi.c | 40 ++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_dsi.h | 4 ++++ 2 files changed, 44 insertions(+)drivers/gpu/drm/i915/intel_dsi.c +40
-0@@ -407,9 +407,35 @@ static void intel_dsi_pre_enable(struct intel_encoder *encoder)enum pipe pipe = intel_crtc->pipe;enum port port;u32 tmp; +int ret;DRM_DEBUG_KMS ("\n" ); +if (!intel_dsi->gem_obj &&is_cmd_mode (intel_dsi)) { + intel_dsi->gem_obj =i915_gem_alloc_object (dev,4096 ); +if (!intel_dsi->gem_obj) { +DRM_ERROR ("Failed to allocate seqno page\n" ); +return ; + } + + ret =i915_gem_object_set_cache_level (intel_dsi->gem_obj, +I915_CACHE_LLC ); +if (ret) + goto err_unref; + + ret =i915_gem_obj_ggtt_pin (intel_dsi->gem_obj,4096 ,0 ); +if (ret) { +err_unref: +drm_gem_object_unreference (&intel_dsi->gem_obj->base); +return ; + } + + intel_dsi->cmd_buff = +kmap (sg_page (intel_dsi->gem_obj->pages->sgl)); + intel_dsi->cmd_buff_phy_addr =page_to_phys ( +sg_page (intel_dsi->gem_obj->pages->sgl)); + } +/* Disable DPOunit clock gating, can stall pipe * and we need DPLL REFA always enabled */ tmp =I915_READ (DPLL (pipe));@@ -555,6 +581,7 @@ static void intel_dsi_post_disable(struct intel_encoder *encoder) {struct drm_i915_private *dev_priv = encoder->base.dev->dev_private;struct intel_dsi *intel_dsi =enc_to_intel_dsi (&encoder->base); +struct drm_device *dev = encoder->base.dev;u32 val;DRM_DEBUG_KMS ("\n" );@@ -571,6 +598,15 @@ static void intel_dsi_post_disable(struct intel_encoder *encoder)msleep (intel_dsi->panel_off_delay);msleep (intel_dsi->panel_pwr_cycle_delay); + +if (intel_dsi->gem_obj) { +kunmap (intel_dsi->cmd_buff); +i915_gem_object_ggtt_unpin (intel_dsi->gem_obj); +mutex_lock (&dev->struct_mutex); +drm_gem_object_unreference (&intel_dsi->gem_obj->base); +mutex_unlock (&dev->struct_mutex); + } + intel_dsi->gem_obj =NULL ; } static bool intel_dsi_get_hw_state(struct intel_encoder *encoder,@@ -1042,6 +1078,10 @@ void intel_dsi_init(struct drm_device *dev) intel_dsi->ports = (1 <<PORT_C ); } + intel_dsi->cmd_buff =NULL ; + intel_dsi->cmd_buff_phy_addr =0 ; + intel_dsi->gem_obj =NULL ; +/* Create a DSI host (and a device) for each port. */ for_each_dsi_port (port, intel_dsi->ports) {struct intel_dsi_host *host;drivers/gpu/drm/i915/intel_dsi.h +0
-0
drivers/gpu/drm/i915/intel_dsi.h struct intel_dsi { · line 53
Quoted 10 lines
drivers/gpu/drm/i915/intel_dsi.h +4
-0@@ -44,6 +44,10 @@ struct intel_dsi {struct intel_connector *attached_connector; +struct drm_i915_gem_object *gem_obj; +void *cmd_buff; +dma_addr_t cmd_buff_phy_addr; +/* bit mask of ports being driven */ u16 ports;
Corrected the initial patch. Working on the dma_alloc_coherent patch , will update soon.
With regards,
Gaurav
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 2/14 drm/i915: Add support for TEAR ON Sequence
In reply to Gaurav K SinghFor command mode panel, panel's fb enabling and tearing configuration is done as part of TEAR ON sequence. This patch parses and executes TEAR ON sequence for MIPI command mode.
--- drivers/gpu/drm/i915/intel_bios.h | 4 ++++ drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 11 ++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_bios.h +4 -0
@@ -934,6 +934,10 @@ enum mipi_seq {MIPI_SEQ_DISPLAY_ON ,MIPI_SEQ_DISPLAY_OFF ,MIPI_SEQ_DEASSERT_RESET , +MIPI_SEQ_BACKLIGHT_ON , +MIPI_SEQ_BACKLIGHT_OFF , +MIPI_SEQ_TEAR_ON , +MIPI_SEQ_TEAR_OFF , MIPI_SEQ_MAX };
drivers/gpu/drm/i915/intel_dsi_panel_vbt.c +10 -1
@@ -251,7 +251,11 @@ static const char * const seq_name[] = {"MIPI_SEQ_INIT_OTP" ,"MIPI_SEQ_DISPLAY_ON" ,"MIPI_SEQ_DISPLAY_OFF" , - "MIPI_SEQ_DEASSERT_RESET" +"MIPI_SEQ_DEASSERT_RESET" , +"MIPI_SEQ_BACKLIGHT_ON" , +"MIPI_SEQ_BACKLIGHT_OFF" , +"MIPI_SEQ_TEAR_ON" , + "MIPI_SEQ_TEAR_OFF" };static void generic_exec_sequence (struct intel_dsi *intel_dsi,const u8 *data)
@@ -306,6 +310,11 @@ static int vbt_panel_prepare(struct drm_panel *panel) sequence = dev_priv->vbt.dsi.sequence[MIPI_SEQ_INIT_OTP ];generic_exec_sequence (intel_dsi, sequence); +if (intel_dsi->operation_mode ==INTEL_DSI_COMMAND_MODE ) { + sequence = dev_priv->vbt.dsi.sequence[MIPI_SEQ_TEAR_ON ]; +generic_exec_sequence (intel_dsi, sequence); + } +return 0 ; }
Signature · 6 lines
1.7.9.5 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 3/14 drm/i915: Add functions for dcs memory write cmd
In reply to Gaurav K SinghAdd functions for DCS memory write command. The mem write command to send fb data to panel is sent using this function.
--- drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_dsi.c | 44 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 46 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +1 -0
@@ -4231,6 +4231,7 @@ enum skl_disp_power_wells {#define PIPECONF_INTERLACED_DBL_ILK (4 << 21)/* ilk/snb only */ #define PIPECONF_PFIT_PF_INTERLACED_DBL_ILK (5 << 21)/* ilk/snb only */ #define PIPECONF_INTERLACE_MODE_MASK (7 << 21) +#define PIPECONF_MIPI_DSR_ENABLE (1 << 20)#define PIPECONF_EDP_RR_MODE_SWITCH (1 << 20)#define PIPECONF_CXSR_DOWNCLOCK (1<<16)#define PIPECONF_EDP_RR_MODE_SWITCH_VLV (1 << 14)
drivers/gpu/drm/i915/intel_drv.h +1 -0
@@ -1197,6 +1197,7 @@ void intel_dp_mst_encoder_cleanup(struct intel_digital_port *intel_dig_port);/* intel_dsi.c */ void intel_dsi_init (struct drm_device *dev); +void intel_dsi_update_panel_fb (struct intel_encoder *encoder);/* intel_dvo.c */ void intel_dvo_init (struct drm_device *dev);
drivers/gpu/drm/i915/intel_dsi.c +44 -0
62 lines not on this page · raw message
Signature · 6 lines
1.7.9.5 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 4/14 drm/i915: Calculate bw timer for mipi DBI interface
In reply to Gaurav K SinghThis patch will calculate the bandwidth timer for MIPI DBI interface. If the BW timer value is available from VBT, then value from VBT will be used.
--- drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_dsi_panel_vbt.c +23 -1
@@ -56,6 +56,11 @@ static inline struct vbt_panel *to_vbt_panel(struct drm_panel *panel)#define CLK_ZERO_CNT_MAX 0xFF#define TRAIL_CNT_MAX 0x1F +#define LP_HDR_FOOT_SIZE 6 +#define BW_LP_NUM_OF_PKT 16 +#define BW_LP_LOAD_SIZE 252 +#define EXTRA_ONE_BYTE 1 +#define NS_KHZ_RATIO 1000000#define GPI0_NC_0_HV_DDI0_HPD 0x4130
@@ -430,7 +435,6 @@ struct drm_panel *vbt_panel_init(struct intel_dsi *intel_dsi, u16 panel_id) intel_dsi->turn_arnd_val = mipi_config->turn_around_timeout; intel_dsi->rst_timer_val = mipi_config->device_reset_timer; intel_dsi->init_count = mipi_config->master_init_timer; - intel_dsi->bw_timer = mipi_config->dbi_bw_timer; intel_dsi->video_frmt_cfg_bits = mipi_config->bta_enabled ?DISABLE_VIDEO_BTA :0 ;
@@ -588,6 +592,24 @@ struct drm_panel *vbt_panel_init(struct intel_dsi *intel_dsi, u16 panel_id) intel_dsi->dphy_reg = exit_zero_cnt <<24 | trail_cnt <<16 | clk_zero_cnt <<8 | prepare_cnt; +if (mipi_config->dbi_bw_timer) { + intel_dsi->bw_timer = mipi_config->dbi_bw_timer; + }else { +/* +* bw timer should be more than 16 longs packets containing +* 252 bytes + 2 blanking packets. +* bw timer = 16 long packets * (252 bytes payload for each +* long packet + 6 bytes for long packet header and +* footer) + 12 bytes for 2 blanking packets + 1 +* byte for having more of the above. +*/ + intel_dsi->bw_timer =DIV_ROUND_UP (BW_LP_NUM_OF_PKT * + (BW_LP_LOAD_SIZE +LP_HDR_FOOT_SIZE ), + intel_dsi->lane_count); + + intel_dsi->bw_timer += (extra_byte_count +EXTRA_ONE_BYTE ); + } +/* * LP to HS switch count = 4TLPX + PREP_COUNT * 2 + EXIT_ZERO_COUNT * 2 * + 10UI + Extra Byte Count
Signature · 6 lines
1.7.9.5 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 5/14 drm/i915: Use the bpp value wrt the pixel format
In reply to Gaurav K SinghThe bpp value which is used while calulating the txbyteclkhs values should be wrt the pixel format value. Currently bpp is coming from pipe config to calculate txbyteclkhs.
--- drivers/gpu/drm/i915/intel_dsi.c | 5 ++--- drivers/gpu/drm/i915/intel_dsi.h | 1 + drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 1 + 3 files changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_dsi.c +2 -3
@@ -762,10 +762,9 @@ static void set_dsi_timings(struct drm_encoder *encoder, {struct drm_device *dev = encoder->dev;struct drm_i915_private *dev_priv = dev->dev_private; -struct intel_crtc *intel_crtc =to_intel_crtc (encoder->crtc);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);enum port port; -unsigned int bpp = intel_crtc->config->pipe_bpp; +unsigned int bpp = intel_dsi->dsi_bpp;unsigned int lane_count = intel_dsi->lane_count;u16 hactive, hfp, hsync, hbp, vfp, vsync, vbp;
@@ -822,7 +821,7 @@ static void intel_dsi_prepare(struct intel_encoder *intel_encoder)struct drm_display_mode *adjusted_mode = &intel_crtc->config->base.adjusted_mode;enum port port; -unsigned int bpp = intel_crtc->config->pipe_bpp; +unsigned int bpp = intel_dsi->dsi_bpp;u32 val, tmp;u16 mode_hdisplay;
drivers/gpu/drm/i915/intel_dsi.h +1 -0
@@ -65,6 +65,7 @@ struct intel_dsi {/* video mode pixel format for MIPI_DSI_FUNC_PRG register */ u32 pixel_format; +u32 dsi_bpp;/* video mode format for MIPI_VIDEO_MODE_FORMAT register */ u32 video_mode_format;
drivers/gpu/drm/i915/intel_dsi_panel_vbt.c +1 -0
@@ -437,6 +437,7 @@ struct drm_panel *vbt_panel_init(struct intel_dsi *intel_dsi, u16 panel_id) intel_dsi->init_count = mipi_config->master_init_timer; intel_dsi->video_frmt_cfg_bits = mipi_config->bta_enabled ?DISABLE_VIDEO_BTA :0 ; + intel_dsi->dsi_bpp = bits_per_pixel; pclk = mode->clock;
Signature · 6 lines
1.7.9.5 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 6/14 drm/i915: Disable vlank interrupt for disabling MIPI cmd mode
In reply to Gaurav K Singhvblank interrupt should be disabled before starting the disable sequence for MIPI command mode. Otherwise when pipe is disabled TE interurpt will be still handled and one memory write command will be sent with pipe disabled. This makes the pipe hw to get stuck and it doesn't recover in the next enable sequence causing display blank out.
--- drivers/gpu/drm/i915/intel_dsi.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
drivers/gpu/drm/i915/intel_dsi.c +14 -0
@@ -513,11 +513,25 @@ static void intel_dsi_enable_nop(struct intel_encoder *encoder)static void intel_dsi_pre_disable (struct intel_encoder *encoder) { +struct drm_device *dev = encoder->base.dev;struct intel_dsi *intel_dsi =enc_to_intel_dsi (&encoder->base); +struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc); +int pipe = intel_crtc->pipe;enum port port;DRM_DEBUG_KMS ("\n" ); +if (is_cmd_mode (intel_dsi)) { + dev->driver->disable_vblank (dev, pipe); + +/* +* Make sure that the last frame is sent otherwise pipe can get +* stuck. Currently providing delay time for ~2 vblanks +* assuming 60fps. +*/ +mdelay (40 ); + } +if (is_vid_mode (intel_dsi)) {/* Send Shutdown command to the panel in LP mode */ for_each_dsi_port (port, intel_dsi->ports)
Signature · 6 lines
1.7.9.5 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [RFC 06/14] drm/i915: Disable vlank interrupt for disabling MIPI cmd mode
Quoted 29 lines · Gaurav K Singh
vblank interrupt should be disabled before starting the disable sequence for MIPI command mode. Otherwise when pipe is disabled TE interurpt will be still handled and one memory write command will be sent with pipe disabled. This makes the pipe hw to get stuck and it doesn't recover in the next enable sequence causing display blank out.
Signed-off-by Yogesh Mohan Marimuthu <[email protected]>Signed-off-by Gaurav K Singh <[email protected]>--- drivers/gpu/drm/i915/intel_dsi.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)drivers/gpu/drm/i915/intel_dsi.c +3
-0@@ -513,11 +513,25 @@ static void intel_dsi_enable_nop(struct intel_encoder *encoder)static void intel_dsi_pre_disable (struct intel_encoder *encoder) { +struct drm_device *dev = encoder->base.dev;struct intel_dsi *intel_dsi =enc_to_intel_dsi (&encoder->base); +struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc); +int pipe = intel_crtc->pipe;enum port port;DRM_DEBUG_KMS ("\n" );
drivers/gpu/drm/i915/intel_dsi.c static void intel_dsi_enable_nop(struct intel_encoder *encoder) · line 533
Quoted 10 lines
drivers/gpu/drm/i915/intel_dsi.c +10
-0+if (is_cmd_mode (intel_dsi)) { + dev->driver->disable_vblank (dev, pipe); + +/* +* Make sure that the last frame is sent otherwise pipe can get +* stuck. Currently providing delay time for ~2 vblanks +* assuming 60fps. +*/ +mdelay (40 ); + }
Nope. You need to move around the drm_vblank_off suitably, only that function correctly handles all the book-keeping around vblank interrupts. If this doesn't work out because of ordering we need to dig into this and figure out something. Worst case we need to push the drm_vblank_off call into encoder callbacks for everyone. That's something we already discussed but then decided against.
-Daniel
Quoted 11 lines
drivers/gpu/drm/i915/intel_dsi.c +1
-0+if (is_vid_mode (intel_dsi)) {/* Send Shutdown command to the panel in LP mode */ for_each_dsi_port (port, intel_dsi->ports)Signature · 6 lines
1.7.9.5 _______________________________________________ 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
Re: [RFC 06/14] drm/i915: Disable vlank interrupt for disabling MIPI cmd mode
Quoted 39 lines · Daniel Vetter
Quoted 38 lines · Gaurav K Singh
vblank interrupt should be disabled before starting the disable sequence for MIPI command mode. Otherwise when pipe is disabled TE interurpt will be still handled and one memory write command will be sent with pipe disabled. This makes the pipe hw to get stuck and it doesn't recover in the next enable sequence causing display blank out.
Signed-off-by Yogesh Mohan Marimuthu <[email protected]>Signed-off-by Gaurav K Singh <[email protected]>--- drivers/gpu/drm/i915/intel_dsi.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)drivers/gpu/drm/i915/intel_dsi.c +12
-0@@ -513,11 +513,25 @@ static void intel_dsi_enable_nop(struct intel_encoder *encoder)static void intel_dsi_pre_disable (struct intel_encoder *encoder) { +struct drm_device *dev = encoder->base.dev;struct intel_dsi *intel_dsi =enc_to_intel_dsi (&encoder->base); +struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc); +int pipe = intel_crtc->pipe;enum port port;DRM_DEBUG_KMS ("\n" ); +if (is_cmd_mode (intel_dsi)) { + dev->driver->disable_vblank (dev, pipe); + +/* +* Make sure that the last frame is sent otherwise pipe can get +* stuck. Currently providing delay time for ~2 vblanks +* assuming 60fps. +*/ +mdelay (40 );
Quoted 8 lines
drivers/gpu/drm/i915/intel_dsi.c static void intel_dsi_enable_nop(struct intel_encoder *encoder) · line 533
Quoted 1 line
drivers/gpu/drm/i915/intel_dsi.c +1
-0+ }Nope. You need to move around the
drm_vblank_offsuitably, only that function correctly handles all the book-keeping around vblank interrupts. If this doesn't work out because of ordering we need to dig into this and figure out something. Worst case we need to push thedrm_vblank_offcall into encoder callbacks for everyone. That's something we already discussed but then decided against.
I seem to be blind, but where exactly is that vblank-driven upload code? -Daniel
Quoted 18 lines
-Daniel
Quoted 11 lines
drivers/gpu/drm/i915/intel_dsi.c +1
-0+if (is_vid_mode (intel_dsi)) {/* Send Shutdown command to the panel in LP mode */ for_each_dsi_port (port, intel_dsi->ports)Signature · 6 lines
1.7.9.5 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfxSignature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
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
Re: [RFC 06/14] drm/i915: Disable vlank interrupt for disabling MIPI cmd mode
Quoted 47 lines · Daniel Vetter
Quoted 30 lines · Daniel Vetter
Quoted 29 lines · Gaurav K Singh
vblank interrupt should be disabled before starting the disable sequence for MIPI command mode. Otherwise when pipe is disabled TE interurpt will be still handled and one memory write command will be sent with pipe disabled. This makes the pipe hw to get stuck and it doesn't recover in the next enable sequence causing display blank out.
Signed-off-by Yogesh Mohan Marimuthu <[email protected]>Signed-off-by Gaurav K Singh <[email protected]>--- drivers/gpu/drm/i915/intel_dsi.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)drivers/gpu/drm/i915/intel_dsi.c +3
-0@@ -513,11 +513,25 @@ static void intel_dsi_enable_nop(struct intel_encoder *encoder)static void intel_dsi_pre_disable (struct intel_encoder *encoder) { +struct drm_device *dev = encoder->base.dev;struct intel_dsi *intel_dsi =enc_to_intel_dsi (&encoder->base); +struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc); +int pipe = intel_crtc->pipe;enum port port;DRM_DEBUG_KMS ("\n" );Quoted 16 lines
drivers/gpu/drm/i915/intel_dsi.c static void intel_dsi_enable_nop(struct intel_encoder *encoder) · line 533
Quoted 10 lines
drivers/gpu/drm/i915/intel_dsi.c +10
-0+if (is_cmd_mode (intel_dsi)) { + dev->driver->disable_vblank (dev, pipe); + +/* +* Make sure that the last frame is sent otherwise pipe can get +* stuck. Currently providing delay time for ~2 vblanks +* assuming 60fps. +*/ +mdelay (40 ); + }Nope. You need to move around the
drm_vblank_offsuitably, only that function correctly handles all the book-keeping around vblank interrupts. If this doesn't work out because of ordering we need to dig into this and figure out something. Worst case we need to push thedrm_vblank_offcall into encoder callbacks for everyone. That's something we already discussed but then decided against.
Quoted 2 lines
I seem to be blind, but where exactly is that vblank-driven upload code? -Daniel
Hi Daniel,
dev->driver->disable_vblank calls valleyview_disable_vblank which already exists. But I did check with drm_vblank_off, it seems to work fine.
I will float the updated patch shortly.
With regards,
Gaurav
Quoted 9 lines
Quoted 9 lines
-Daniel
Quoted 7 lines
drivers/gpu/drm/i915/intel_dsi.c +1
-0+if (is_vid_mode (intel_dsi)) {/* Send Shutdown command to the panel in LP mode */ for_each_dsi_port (port, intel_dsi->ports)Signature · 1 line
1.7.9.5
Quoted 8 lines
Quoted 8 lines
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfxSignature · 3 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
Re: [RFC 06/14] drm/i915: Disable vlank interrupt for disabling MIPI cmd mode
Quoted 47 lines · Gaurav K
Quoted 44 lines · Daniel Vetter
Quoted 43 lines · Daniel Vetter
Quoted 26 lines · Gaurav K Singh
vblank interrupt should be disabled before starting the disable sequence for MIPI command mode. Otherwise when pipe is disabled TE interurpt will be still handled and one memory write command will be sent with pipe disabled. This makes the pipe hw to get stuck and it doesn't recover in the next enable sequence causing display blank out.
Signed-off-by Yogesh Mohan Marimuthu <[email protected]>Signed-off-by Gaurav K Singh <[email protected]>--- drivers/gpu/drm/i915/intel_dsi.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)drivers/gpu/drm/i915/intel_dsi.c +3
-0@@ -513,11 +513,25 @@ static void intel_dsi_enable_nop(struct intel_encoder *encoder)static void intel_dsi_pre_disable (struct intel_encoder *encoder) { +struct drm_device *dev = encoder->base.dev;struct intel_dsi *intel_dsi =enc_to_intel_dsi (&encoder->base); +struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc); +int pipe = intel_crtc->pipe;enum port port;DRM_DEBUG_KMS ("\n" );drivers/gpu/drm/i915/intel_dsi.c static void intel_dsi_enable_nop(struct intel_encoder *encoder) · line 530
Quoted 10 lines
drivers/gpu/drm/i915/intel_dsi.c +10
-0+if (is_cmd_mode (intel_dsi)) { + dev->driver->disable_vblank (dev, pipe); + +/* +* Make sure that the last frame is sent otherwise pipe can get +* stuck. Currently providing delay time for ~2 vblanks +* assuming 60fps. +*/ +mdelay (40 ); + }Nope. You need to move around the
drm_vblank_offsuitably, only that function correctly handles all the book-keeping around vblank interrupts. If this doesn't work out because of ordering we need to dig into this and figure out something. Worst case we need to push thedrm_vblank_offcall into encoder callbacks for everyone. That's something we already discussed but then decided against.
Quoted 1 line
Quoted 1 line
I seem to be blind, but where exactly is that vblank-driven upload code?
This question is still open for me. Why exactly do we have to disable vblanks here already? I feel like this is hiding some deeper synchronization issue - just disabling the vblank source doesn't mean they have all be processed correctly by the irq handler. If this is really required then you still have a big race here, even when using drm_vblank_off.
-Daneil
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
RFC 6/14 drm/i915: Disable vlank interrupt for disabling MIPI cmd mode
In reply to Singh, Gaurav Kvblank interrupt should be disabled before starting the disable sequence for MIPI command mode. Otherwise when pipe is disabled TE interurpt will be still handled and one memory write command will be sent with pipe disabled. This makes the pipe hw to get stuck and it doesn't recover in the next enable sequence causing display blank out.
v2: Use drm_blank_off instead of platform specific disable vblank functions (Daniel)
--- drivers/gpu/drm/i915/intel_dsi.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
drivers/gpu/drm/i915/intel_dsi.c +14 -0
@@ -513,11 +513,25 @@ static void intel_dsi_enable_nop(struct intel_encoder *encoder)static void intel_dsi_pre_disable (struct intel_encoder *encoder) { +struct drm_device *dev = encoder->base.dev;struct intel_dsi *intel_dsi =enc_to_intel_dsi (&encoder->base); +struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc); +int pipe = intel_crtc->pipe;enum port port;DRM_DEBUG_KMS ("\n" ); +if (is_cmd_mode (intel_dsi)) { +drm_vblank_off (dev, pipe); + +/* +* Make sure that the last frame is sent otherwise pipe can get +* stuck. Currently providing delay time for ~2 vblanks +* assuming 60fps. +*/ +mdelay (40 ); + } +if (is_vid_mode (intel_dsi)) {/* Send Shutdown command to the panel in LP mode */ for_each_dsi_port (port, intel_dsi->ports)
Signature · 6 lines
1.7.9.5 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [RFC 06/14] drm/i915: Disable vlank interrupt for disabling MIPI cmd mode
Quoted 23 lines · Gaurav K Singh
vblank interrupt should be disabled before starting the disable sequence for MIPI command mode. Otherwise when pipe is disabled TE interurpt will be still handled and one memory write command will be sent with pipe disabled. This makes the pipe hw to get stuck and it doesn't recover in the next enable sequence causing display blank out.
v2: Use
drm_blank_offinstead of platform specific disable vblank functions (Daniel)Signed-off-by Yogesh Mohan Marimuthu <[email protected]>Signed-off-by Gaurav K Singh <[email protected]>--- drivers/gpu/drm/i915/intel_dsi.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)drivers/gpu/drm/i915/intel_dsi.c +0
-0@@ -513,11 +513,25 @@ static void intel_dsi_enable_nop(struct intel_encoder *encoder)static void intel_dsi_pre_disable (struct intel_encoder *encoder) {
drivers/gpu/drm/i915/intel_dsi.c static void intel_dsi_enable_nop(struct intel_encoder *encoder) · line 525
Quoted 10 lines
drivers/gpu/drm/i915/intel_dsi.c +5
-0+struct drm_device *dev = encoder->base.dev;struct intel_dsi *intel_dsi =enc_to_intel_dsi (&encoder->base); +struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc); +int pipe = intel_crtc->pipe;enum port port;DRM_DEBUG_KMS ("\n" ); +if (is_cmd_mode (intel_dsi)) { +drm_vblank_off (dev, pipe);
Now you'll have 2 drm_vblank_off in the crtc disable path, which should result in some pretty loud warning. If it doesn't we need to fix up drm_vblank_off to WARN, and you also need to move around the existing drm_vblank_off in the vlv/chv code into encoder callbacks for _all_ encoders.
Hm, looking at drm_irq.c we indeed seem to be missing these crucial WARN_ONs. I'll float a patch to address this asap. -Daniel
Quoted 19 lines
drivers/gpu/drm/i915/intel_dsi.c +9
-0+ +/* +* Make sure that the last frame is sent otherwise pipe can get +* stuck. Currently providing delay time for ~2 vblanks +* assuming 60fps. +*/ +mdelay (40 ); + } +if (is_vid_mode (intel_dsi)) {/* Send Shutdown command to the panel in LP mode */ for_each_dsi_port (port, intel_dsi->ports)Signature · 6 lines
1.7.9.5 _______________________________________________ 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
RFC 7/14 drm/i915: Disable MIPI display self refresh mode
In reply to Gaurav K SinghDuring disable sequence for MIPI encoder in command mode, disable MIPI display self-refresh mode bit in Pipe Ctrl reg.
--- drivers/gpu/drm/i915/intel_display.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
drivers/gpu/drm/i915/intel_display.c +13 -0
@@ -2171,6 +2171,9 @@ static void intel_enable_pipe(struct intel_crtc *crtc)static void intel_disable_pipe (struct intel_crtc *crtc) {struct drm_i915_private *dev_priv = crtc->base.dev->dev_private; +struct intel_encoder *encoder; +struct intel_dsi *intel_dsi; +struct drm_device *dev = crtc->base.dev;enum transcoder cpu_transcoder = crtc->config->cpu_transcoder;enum pipe pipe = crtc->pipe;int reg;
@@ -2189,6 +2192,16 @@ static void intel_disable_pipe(struct intel_crtc *crtc)if ((val &PIPECONF_ENABLE ) ==0 )return ; +for_each_encoder_on_crtc (dev, &crtc->base, encoder) { +if (encoder->type ==INTEL_OUTPUT_DSI ) { + intel_dsi =enc_to_intel_dsi (&encoder->base); +if (intel_dsi && (intel_dsi->operation_mode == +INTEL_DSI_COMMAND_MODE )) + val = val & ~PIPECONF_MIPI_DSR_ENABLE ; +break ; + } + } +/* * Double wide has implications for planes * so best keep it disabled when not needed.
Signature · 6 lines
1.7.9.5 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [RFC 07/14] drm/i915: Disable MIPI display self refresh mode
Quoted 27 lines · Gaurav K Singh
During disable sequence for MIPI encoder in command mode, disable MIPI display self-refresh mode bit in Pipe Ctrl reg.
Signed-off-by Gaurav K Singh <[email protected]>Signed-off-by Yogesh Mohan Marimuthu <[email protected]>Signed-off-by Shobhit Kumar <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)drivers/gpu/drm/i915/intel_display.c +3
-0@@ -2171,6 +2171,9 @@ static void intel_enable_pipe(struct intel_crtc *crtc)static void intel_disable_pipe (struct intel_crtc *crtc) {struct drm_i915_private *dev_priv = crtc->base.dev->dev_private; +struct intel_encoder *encoder; +struct intel_dsi *intel_dsi; +struct drm_device *dev = crtc->base.dev;enum transcoder cpu_transcoder = crtc->config->cpu_transcoder;enum pipe pipe = crtc->pipe;int reg;@@ -2189,6 +2192,16 @@ static void intel_disable_pipe(struct intel_crtc *crtc)if ((val &PIPECONF_ENABLE ) ==0 )return ;
drivers/gpu/drm/i915/intel_display.c static void intel_disable_pipe(struct intel_crtc *crtc) · line 2203
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +9
-0+for_each_encoder_on_crtc (dev, &crtc->base, encoder) { +if (encoder->type ==INTEL_OUTPUT_DSI ) { + intel_dsi =enc_to_intel_dsi (&encoder->base); +if (intel_dsi && (intel_dsi->operation_mode == +INTEL_DSI_COMMAND_MODE )) + val = val & ~PIPECONF_MIPI_DSR_ENABLE ; +break ; + } + }
This must be moved into a suitable encoder callback. Yes the ddi code is full of cases where encoder stuff is done from the generic crtc code. But we now have 2 completely different kinds of ports on bxt (ddi and dsi), and we need to get some solid structure into the code again. -Daniel
Quoted 11 lines
drivers/gpu/drm/i915/intel_display.c +1
-0+/* * Double wide has implications for planes * so best keep it disabled when not needed. Signature · 6 lines
1.7.9.5 _______________________________________________ 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
Re: [RFC 07/14] drm/i915: Disable MIPI display self refresh mode
Quoted 29 lines · Daniel Vetter
Quoted 28 lines · Gaurav K Singh
During disable sequence for MIPI encoder in command mode, disable MIPI display self-refresh mode bit in Pipe Ctrl reg.
Signed-off-by Gaurav K Singh <[email protected]>Signed-off-by Yogesh Mohan Marimuthu <[email protected]>Signed-off-by Shobhit Kumar <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)drivers/gpu/drm/i915/intel_display.c +3
-0@@ -2171,6 +2171,9 @@ static void intel_enable_pipe(struct intel_crtc *crtc)static void intel_disable_pipe (struct intel_crtc *crtc) {struct drm_i915_private *dev_priv = crtc->base.dev->dev_private; +struct intel_encoder *encoder; +struct intel_dsi *intel_dsi; +struct drm_device *dev = crtc->base.dev;enum transcoder cpu_transcoder = crtc->config->cpu_transcoder;enum pipe pipe = crtc->pipe;int reg;@@ -2189,6 +2192,16 @@ static void intel_disable_pipe(struct intel_crtc *crtc)if ((val &PIPECONF_ENABLE ) ==0 )return ;
Quoted 14 lines
drivers/gpu/drm/i915/intel_display.c static void intel_disable_pipe(struct intel_crtc *crtc) · line 2203
Quoted 9 lines
drivers/gpu/drm/i915/intel_display.c +9
-0+for_each_encoder_on_crtc (dev, &crtc->base, encoder) { +if (encoder->type ==INTEL_OUTPUT_DSI ) { + intel_dsi =enc_to_intel_dsi (&encoder->base); +if (intel_dsi && (intel_dsi->operation_mode == +INTEL_DSI_COMMAND_MODE )) + val = val & ~PIPECONF_MIPI_DSR_ENABLE ; +break ; + } + }This must be moved into a suitable encoder callback. Yes the ddi code is full of cases where encoder stuff is done from the generic crtc code. But we now have 2 completely different kinds of ports on bxt (ddi and dsi), and we need to get some solid structure into the code again.
Ah I missed that this is a pipeconf thing. Unconditionally clearing this bit will achieve the same, without the need to loop over connectors. -Daniel
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
Re: [RFC 07/14] drm/i915: Disable MIPI display self refresh mode
Quoted 43 lines · Daniel Vetter
Quoted 29 lines · Daniel Vetter
Quoted 28 lines · Gaurav K Singh
During disable sequence for MIPI encoder in command mode, disable MIPI display self-refresh mode bit in Pipe Ctrl reg.
Signed-off-by Gaurav K Singh <[email protected]>Signed-off-by Yogesh Mohan Marimuthu <[email protected]>Signed-off-by Shobhit Kumar <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)drivers/gpu/drm/i915/intel_display.c +3
-0@@ -2171,6 +2171,9 @@ static void intel_enable_pipe(struct intel_crtc *crtc)static void intel_disable_pipe (struct intel_crtc *crtc) {struct drm_i915_private *dev_priv = crtc->base.dev->dev_private; +struct intel_encoder *encoder; +struct intel_dsi *intel_dsi; +struct drm_device *dev = crtc->base.dev;enum transcoder cpu_transcoder = crtc->config->cpu_transcoder;enum pipe pipe = crtc->pipe;int reg;@@ -2189,6 +2192,16 @@ static void intel_disable_pipe(struct intel_crtc *crtc)if ((val &PIPECONF_ENABLE ) ==0 )return ;Quoted 13 lines
drivers/gpu/drm/i915/intel_display.c static void intel_disable_pipe(struct intel_crtc *crtc) · line 2203
Quoted 9 lines
drivers/gpu/drm/i915/intel_display.c +9
-0+for_each_encoder_on_crtc (dev, &crtc->base, encoder) { +if (encoder->type ==INTEL_OUTPUT_DSI ) { + intel_dsi =enc_to_intel_dsi (&encoder->base); +if (intel_dsi && (intel_dsi->operation_mode == +INTEL_DSI_COMMAND_MODE )) + val = val & ~PIPECONF_MIPI_DSR_ENABLE ; +break ; + } + }This must be moved into a suitable encoder callback. Yes the ddi code is full of cases where encoder stuff is done from the generic crtc code. But we now have 2 completely different kinds of ports on bxt (ddi and dsi), and we need to get some solid structure into the code again.
Quoted 3 lines
Ah I missed that this is a pipeconf thing. Unconditionally clearing this bit will achieve the same, without the need to loop over connectors. -Daniel
Agree with you. Instead of loop over the encoders, will set up the state flag and will use it here.
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 7/14 drm/i915: Disable MIPI display self refresh mode
During disable sequence for MIPI encoder in command mode, disable MIPI display self-refresh mode bit in Pipe Ctrl reg.
v2: Use crtc state flag instead of loop over encoders (Daniel)
--- drivers/gpu/drm/i915/intel_display.c | 3 +++ drivers/gpu/drm/i915/intel_drv.h | 3 +++ drivers/gpu/drm/i915/intel_dsi.c | 3 +++ 3 files changed, 9 insertions(+)
drivers/gpu/drm/i915/intel_display.c +3 -0
@@ -2193,6 +2193,9 @@ static void intel_disable_pipe(struct intel_crtc *crtc)if ((val &PIPECONF_ENABLE ) ==0 )return ; +if (crtc->config->dsi_self_refresh) + val = val & ~PIPECONF_MIPI_DSR_ENABLE ; +/* * Double wide has implications for planes * so best keep it disabled when not needed.
drivers/gpu/drm/i915/intel_drv.h +3 -0
@@ -444,6 +444,9 @@ struct intel_crtc_state {bool double_wide;bool dp_encoder_is_mst; + +bool dsi_self_refresh; +int pbn;struct intel_crtc_scaler_state scaler_state;
drivers/gpu/drm/i915/intel_dsi.c +3 -0
@@ -308,6 +308,9 @@ static bool intel_dsi_compute_config(struct intel_encoder *encoder,DRM_DEBUG_KMS ("\n" ); +if (is_cmd_mode (intel_dsi)) + config->dsi_self_refresh = true; +if (fixed_mode)intel_fixed_panel_mode (fixed_mode, adjusted_mode);
Signature · 6 lines
1.7.9.5 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [RFC 07/14] drm/i915: Disable MIPI display self refresh mode
Quoted 19 lines · Gaurav K Singh
During disable sequence for MIPI encoder in command mode, disable MIPI display self-refresh mode bit in Pipe Ctrl reg.
v2: Use crtc state flag instead of loop over encoders (Daniel)
Signed-off-by Gaurav K Singh <[email protected]>Signed-off-by Yogesh Mohan Marimuthu <[email protected]>Signed-off-by Shobhit Kumar <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 3 +++ drivers/gpu/drm/i915/intel_drv.h | 3 +++ drivers/gpu/drm/i915/intel_dsi.c | 3 +++ 3 files changed, 9 insertions(+)drivers/gpu/drm/i915/intel_display.c +0
-0
drivers/gpu/drm/i915/intel_display.c static void intel_disable_pipe(struct intel_crtc *crtc) · line 2197
Quoted 5 lines
drivers/gpu/drm/i915/intel_display.c +2
-0@@ -2193,6 +2193,9 @@ static void intel_disable_pipe(struct intel_crtc *crtc)if ((val &PIPECONF_ENABLE ) ==0 )return ; +if (crtc->config->dsi_self_refresh) + val = val & ~PIPECONF_MIPI_DSR_ENABLE ;
This shouldn't be required since we just clear all of PIPECONF when disabling (well when re-enabling too) the crtc.
What's missing though is the hw state readout & cross-check support for this new state bit. Also the code to set this bit seems to be missing. -Daniel
Quoted 39 lines
drivers/gpu/drm/i915/intel_display.c +1
-0+/* * Double wide has implications for planes * so best keep it disabled when not needed. drivers/gpu/drm/i915/intel_drv.h +3
-0@@ -444,6 +444,9 @@ struct intel_crtc_state {bool double_wide;bool dp_encoder_is_mst; + +bool dsi_self_refresh; +int pbn;struct intel_crtc_scaler_state scaler_state;drivers/gpu/drm/i915/intel_dsi.c +3
-0@@ -308,6 +308,9 @@ static bool intel_dsi_compute_config(struct intel_encoder *encoder,DRM_DEBUG_KMS ("\n" ); +if (is_cmd_mode (intel_dsi)) + config->dsi_self_refresh = true; +if (fixed_mode)intel_fixed_panel_mode (fixed_mode, adjusted_mode);Signature · 6 lines
1.7.9.5 _______________________________________________ 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
RFC 8/14 drm/i915: Disable Tearing effect trigger by GPIO pin
In reply to Gaurav K SinghWhile disabling MIPI Port in command mode, disable TE trigger by GPIO pin.
--- drivers/gpu/drm/i915/intel_dsi.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_dsi.c +6 -2
@@ -367,8 +367,12 @@ static void intel_dsi_port_disable(struct intel_encoder *encoder)for_each_dsi_port (port, intel_dsi->ports) {/* de-assert ip_tg_enable signal */ - temp =I915_READ (MIPI_PORT_CTRL (port)); -I915_WRITE (MIPI_PORT_CTRL (port), temp & ~DPI_ENABLE ); +if (is_cmd_mode (intel_dsi)) { +I915_WRITE (MIPI_PORT_CTRL (port),0 ); + }else { + temp =I915_READ (MIPI_PORT_CTRL (port)); +I915_WRITE (MIPI_PORT_CTRL (port), temp & ~DPI_ENABLE ); + }POSTING_READ (MIPI_PORT_CTRL (port)); } }
Signature · 6 lines
1.7.9.5 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 9/14 drm/i915: Changes for command mode preparation
In reply to Gaurav K SinghChanges done in preparation of command mode-
1. Set DBI HS LS Switch bit for DBI packets to be tramitted in HS mode.
2. Set DBI FIFO watermark.
3. Timing regs need not be programmmed for command mode.
--- drivers/gpu/drm/i915/intel_dsi.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_dsi.c +11 -2
@@ -876,12 +876,16 @@ static void intel_dsi_prepare(struct intel_encoder *intel_encoder) mode_hdisplay << HORIZONTAL_ADDRESS_SHIFT); } -set_dsi_timings (encoder, adjusted_mode); +if (is_vid_mode (intel_dsi)) +set_dsi_timings (encoder, adjusted_mode); val = intel_dsi->lane_count <<DATA_LANES_PRG_REG_SHIFT ;if (is_cmd_mode (intel_dsi)) { val |= intel_dsi->channel <<CMD_MODE_CHANNEL_NUMBER_SHIFT ; - val |=CMD_MODE_DATA_WIDTH_8_BIT ;/* XXX */ + val |=CMD_MODE_DATA_WIDTH_OPTION2 ; +I915_WRITE (MIPI_DBI_FIFO_THROTTLE (port), +DBI_FIFO_EMPTY_QUARTER ); +I915_WRITE (MIPI_HS_LP_DBI_ENABLE (port),0 ); }else { val |= intel_dsi->channel <<VID_MODE_CHANNEL_NUMBER_SHIFT ;
@@ -983,6 +987,11 @@ static void intel_dsi_prepare(struct intel_encoder *intel_encoder) intel_dsi->video_mode_format |IP_TG_CONFIG | RANDOM_DPI_DISPLAY_RESOLUTION); + else +I915_WRITE (MIPI_VIDEO_MODE_FORMAT (port ), + intel_dsi->video_frmt_cfg_bits | + IP_TG_CONFIG | +RANDOM_DPI_DISPLAY_RESOLUTION ); } }
Signature · 6 lines
1.7.9.5 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 10/14 drm/i915: Enable Tearing effect trigger by GPIO pin
In reply to Gaurav K SinghWhile enabling MIPI Port in command mode, enable tearing effect by GPIO pin.
--- drivers/gpu/drm/i915/intel_dsi.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_dsi.c +5 -1
@@ -352,7 +352,11 @@ static void intel_dsi_port_enable(struct intel_encoder *encoder)LANE_CONFIGURATION_DUAL_LINK_A ; }/* assert ip_tg_enable signal */ -I915_WRITE (MIPI_PORT_CTRL (port), temp |DPI_ENABLE ); +if (is_cmd_mode (intel_dsi)) +I915_WRITE (MIPI_PORT_CTRL (port), + temp |TEARING_EFFECT_GPIO ); +else +I915_WRITE (MIPI_PORT_CTRL (port), temp |DPI_ENABLE );POSTING_READ (MIPI_PORT_CTRL (port)); } }
Signature · 6 lines
1.7.9.5 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 11/14 drm/i915: Enable MIPI display self refresh mode
In reply to Gaurav K SinghDuring enable sequence for MIPI encoder in command mode, enable MIPI display self-refresh mode bit in Pipe Ctrl reg.
--- drivers/gpu/drm/i915/intel_display.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
drivers/gpu/drm/i915/intel_display.c +15 -0
@@ -44,6 +44,7 @@#include <drm/drm_plane_helper.h> #include <drm/drm_rect.h> #include <linux/dma_remapping.h> +#include "intel_dsi.h" /* Primary plane formats supported by all gen */ #define COMMON_PRIMARY_FORMATS \
@@ -2110,6 +2111,8 @@ static void intel_enable_pipe(struct intel_crtc *crtc) {struct drm_device *dev = crtc->base.dev;struct drm_i915_private *dev_priv = dev->dev_private; +struct intel_encoder *encoder; +struct intel_dsi *intel_dsi;enum pipe pipe = crtc->pipe;enum transcoder cpu_transcoder =intel_pipe_to_cpu_transcoder (dev_priv, pipe);
@@ -2154,6 +2157,18 @@ static void intel_enable_pipe(struct intel_crtc *crtc)return ; } +for_each_encoder_on_crtc (dev, &crtc->base, encoder) { +if (encoder->type ==INTEL_OUTPUT_DSI ) { + intel_dsi =enc_to_intel_dsi (&encoder->base); +if (intel_dsi && (intel_dsi->operation_mode == +INTEL_DSI_COMMAND_MODE )) { + val = val |PIPECONF_MIPI_DSR_ENABLE ; +I915_WRITE (reg, val); + } +break ; + } + } +I915_WRITE (reg, val |PIPECONF_ENABLE );POSTING_READ (reg); }
Signature · 6 lines
1.7.9.5 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [RFC 11/14] drm/i915: Enable MIPI display self refresh mode
Quoted 36 lines · Gaurav K Singh
During enable sequence for MIPI encoder in command mode, enable MIPI display self-refresh mode bit in Pipe Ctrl reg.
Signed-off-by Gaurav K Singh <[email protected]>Signed-off-by Yogesh Mohan Marimuthu <[email protected]>Signed-off-by Shobhit Kumar <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)drivers/gpu/drm/i915/intel_display.c +4
-0@@ -44,6 +44,7 @@#include <drm/drm_plane_helper.h> #include <drm/drm_rect.h> #include <linux/dma_remapping.h> +#include "intel_dsi.h" /* Primary plane formats supported by all gen */ #define COMMON_PRIMARY_FORMATS \@@ -2110,6 +2111,8 @@ static void intel_enable_pipe(struct intel_crtc *crtc) {struct drm_device *dev = crtc->base.dev;struct drm_i915_private *dev_priv = dev->dev_private; +struct intel_encoder *encoder; +struct intel_dsi *intel_dsi;enum pipe pipe = crtc->pipe;enum transcoder cpu_transcoder =intel_pipe_to_cpu_transcoder (dev_priv, pipe);@@ -2154,6 +2157,18 @@ static void intel_enable_pipe(struct intel_crtc *crtc)return ; } +for_each_encoder_on_crtc (dev, &crtc->base, encoder) {
drivers/gpu/drm/i915/intel_display.c static void intel_enable_pipe(struct intel_crtc *crtc) · line 2170
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +10
-0+if (encoder->type ==INTEL_OUTPUT_DSI ) { + intel_dsi =enc_to_intel_dsi (&encoder->base); +if (intel_dsi && (intel_dsi->operation_mode == +INTEL_DSI_COMMAND_MODE )) { + val = val |PIPECONF_MIPI_DSR_ENABLE ; +I915_WRITE (reg, val); + } +break ; + } + }
When we have these kind of encoder/crtc state depencies we resolve them by adding a bit of state to intel_crtc_state which is set as needed in the encoder's compute_config callback. Then all you need here is
if (intel_state->dsi_self_refresh) val |= PIPECONF_MIPI_DSR_ENABLE;
Also is that additional write really required?
-Daniel
Quoted 11 lines
drivers/gpu/drm/i915/intel_display.c +1
-0+I915_WRITE (reg, val |PIPECONF_ENABLE );POSTING_READ (reg); }Signature · 6 lines
1.7.9.5 _______________________________________________ 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
Re: [RFC 11/14] drm/i915: Enable MIPI display self refresh mode
Quoted 51 lines · Daniel Vetter
Quoted 36 lines · Gaurav K Singh
During enable sequence for MIPI encoder in command mode, enable MIPI display self-refresh mode bit in Pipe Ctrl reg.
Signed-off-by Gaurav K Singh <[email protected]>Signed-off-by Yogesh Mohan Marimuthu <[email protected]>Signed-off-by Shobhit Kumar <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)drivers/gpu/drm/i915/intel_display.c +4
-0@@ -44,6 +44,7 @@#include <drm/drm_plane_helper.h> #include <drm/drm_rect.h> #include <linux/dma_remapping.h> +#include "intel_dsi.h" /* Primary plane formats supported by all gen */ #define COMMON_PRIMARY_FORMATS \@@ -2110,6 +2111,8 @@ static void intel_enable_pipe(struct intel_crtc *crtc) {struct drm_device *dev = crtc->base.dev;struct drm_i915_private *dev_priv = dev->dev_private; +struct intel_encoder *encoder; +struct intel_dsi *intel_dsi;enum pipe pipe = crtc->pipe;enum transcoder cpu_transcoder =intel_pipe_to_cpu_transcoder (dev_priv, pipe);@@ -2154,6 +2157,18 @@ static void intel_enable_pipe(struct intel_crtc *crtc)return ; } +for_each_encoder_on_crtc (dev, &crtc->base, encoder) {drivers/gpu/drm/i915/intel_display.c static void intel_enable_pipe(struct intel_crtc *crtc) · line 2170
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +10
-0+if (encoder->type ==INTEL_OUTPUT_DSI ) { + intel_dsi =enc_to_intel_dsi (&encoder->base); +if (intel_dsi && (intel_dsi->operation_mode == +INTEL_DSI_COMMAND_MODE )) { + val = val |PIPECONF_MIPI_DSR_ENABLE ; +I915_WRITE (reg, val); + } +break ; + } + }When we have these kind of encoder/crtc state depencies we resolve them by adding a bit of state to
intel_crtc_statewhich is set as needed in the encoder'scompute_configcallback. Then all you need here is
Quoted 5 lines
if (intel_state->dsi_self_refresh) val |= PIPECONF_MIPI_DSR_ENABLE;Also is that additional write really required?
-Daniel
Yes additional write is required. MIPI_DSR_ENABLE has to be written first then followed by pipe enable. if MIPI_DSR_ENABLE and pipe enable is done in same write, observed that the image from pipe is not sent to panel when issued mem write command.
Having a state variable instead of looping through the encoders definitely looks good. Need to find a place to update the state variable. I will get back on this.
Quoted 11 lines
Quoted 11 lines
drivers/gpu/drm/i915/intel_display.c +1
-0+I915_WRITE (reg, val |PIPECONF_ENABLE );POSTING_READ (reg); }Signature · 6 lines
1.7.9.5 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [RFC 11/14] drm/i915: Enable MIPI display self refresh mode
Quoted 63 lines · Yogesh
Quoted 49 lines · Daniel Vetter
Quoted 34 lines · Gaurav K Singh
During enable sequence for MIPI encoder in command mode, enable MIPI display self-refresh mode bit in Pipe Ctrl reg.
Signed-off-by Gaurav K Singh <[email protected]>Signed-off-by Yogesh Mohan Marimuthu <[email protected]>Signed-off-by Shobhit Kumar <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)drivers/gpu/drm/i915/intel_display.c +4
-0@@ -44,6 +44,7 @@#include <drm/drm_plane_helper.h> #include <drm/drm_rect.h> #include <linux/dma_remapping.h> +#include "intel_dsi.h" /* Primary plane formats supported by all gen */ #define COMMON_PRIMARY_FORMATS \@@ -2110,6 +2111,8 @@ static void intel_enable_pipe(struct intel_crtc *crtc) {struct drm_device *dev = crtc->base.dev;struct drm_i915_private *dev_priv = dev->dev_private; +struct intel_encoder *encoder; +struct intel_dsi *intel_dsi;enum pipe pipe = crtc->pipe;enum transcoder cpu_transcoder =intel_pipe_to_cpu_transcoder (dev_priv, pipe);@@ -2154,6 +2157,18 @@ static void intel_enable_pipe(struct intel_crtc *crtc)return ; } +for_each_encoder_on_crtc (dev, &crtc->base, encoder) {drivers/gpu/drm/i915/intel_display.c static void intel_enable_pipe(struct intel_crtc *crtc) · line 2169
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +10
-0+if (encoder->type ==INTEL_OUTPUT_DSI ) { + intel_dsi =enc_to_intel_dsi (&encoder->base); +if (intel_dsi && (intel_dsi->operation_mode == +INTEL_DSI_COMMAND_MODE )) { + val = val |PIPECONF_MIPI_DSR_ENABLE ; +I915_WRITE (reg, val); + } +break ; + } + }When we have these kind of encoder/crtc state depencies we resolve them by adding a bit of state to
intel_crtc_statewhich is set as needed in the encoder'scompute_configcallback. Then all you need here isQuoted 5 lines
if (intel_state->dsi_self_refresh) val |= PIPECONF_MIPI_DSR_ENABLE;Also is that additional write really required?
-DanielYes additional write is required.
MIPI_DSR_ENABLEhas to be written first then followed
by pipe enable. ifMIPI_DSR_ENABLEand pipe enable is done in same write, observed
that the image from pipe is not sent to panel when issued mem write command.
Quoted 3 lines
Having a state variable instead of looping through the encoders definitely looks good.
Need to find a place to update the state variable. I will get back on this.
Like I said such state is precomputed in the encoder callbacks, in this case intel_dsi_compute_config.
Cheers, Daniel
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
Re: [RFC 11/14] drm/i915: Enable MIPI display self refresh mode
Quoted 63 lines · Daniel Vetter
Quoted 62 lines · Yogesh
Quoted 49 lines · Daniel Vetter
Quoted 34 lines · Gaurav K Singh
During enable sequence for MIPI encoder in command mode, enable MIPI display self-refresh mode bit in Pipe Ctrl reg.
Signed-off-by Gaurav K Singh <[email protected]>Signed-off-by Yogesh Mohan Marimuthu <[email protected]>Signed-off-by Shobhit Kumar <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)drivers/gpu/drm/i915/intel_display.c +4
-0@@ -44,6 +44,7 @@#include <drm/drm_plane_helper.h> #include <drm/drm_rect.h> #include <linux/dma_remapping.h> +#include "intel_dsi.h" /* Primary plane formats supported by all gen */ #define COMMON_PRIMARY_FORMATS \@@ -2110,6 +2111,8 @@ static void intel_enable_pipe(struct intel_crtc *crtc) {struct drm_device *dev = crtc->base.dev;struct drm_i915_private *dev_priv = dev->dev_private; +struct intel_encoder *encoder; +struct intel_dsi *intel_dsi;enum pipe pipe = crtc->pipe;enum transcoder cpu_transcoder =intel_pipe_to_cpu_transcoder (dev_priv, pipe);@@ -2154,6 +2157,18 @@ static void intel_enable_pipe(struct intel_crtc *crtc)return ; } +for_each_encoder_on_crtc (dev, &crtc->base, encoder) {drivers/gpu/drm/i915/intel_display.c static void intel_enable_pipe(struct intel_crtc *crtc) · line 2169
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +10
-0+if (encoder->type ==INTEL_OUTPUT_DSI ) { + intel_dsi =enc_to_intel_dsi (&encoder->base); +if (intel_dsi && (intel_dsi->operation_mode == +INTEL_DSI_COMMAND_MODE )) { + val = val |PIPECONF_MIPI_DSR_ENABLE ; +I915_WRITE (reg, val); + } +break ; + } + }When we have these kind of encoder/crtc state depencies we resolve them by adding a bit of state to
intel_crtc_statewhich is set as needed in the encoder'scompute_configcallback. Then all you need here isQuoted 5 lines
if (intel_state->dsi_self_refresh) val |= PIPECONF_MIPI_DSR_ENABLE;Also is that additional write really required?
-DanielYes additional write is required.
MIPI_DSR_ENABLEhas to be written first then followed
by pipe enable. ifMIPI_DSR_ENABLEand pipe enable is done in same write, observed
that the image from pipe is not sent to panel when issued mem write command.
Quoted 7 lines
Quoted 3 lines
Having a state variable instead of looping through the encoders definitely looks good.
Need to find a place to update the state variable. I will get back on this.Like I said such state is precomputed in the encoder callbacks, in this case
intel_dsi_compute_config.Cheers, Daniel
Agree with you daniel regarding state flag. Updated patch is ready, will upload shortly.
Regarding additional write, as Yogesh confirmed, both the writes are required.
With regards,
Gaurav
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [RFC 11/14] drm/i915: Enable MIPI display self refresh mode
Quoted 72 lines · Gaurav K
Quoted 69 lines · Daniel Vetter
Quoted 62 lines · Yogesh
Quoted 49 lines · Daniel Vetter
Quoted 34 lines · Gaurav K Singh
During enable sequence for MIPI encoder in command mode, enable MIPI display self-refresh mode bit in Pipe Ctrl reg.
Signed-off-by Gaurav K Singh <[email protected]>Signed-off-by Yogesh Mohan Marimuthu <[email protected]>Signed-off-by Shobhit Kumar <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)drivers/gpu/drm/i915/intel_display.c +4
-0@@ -44,6 +44,7 @@#include <drm/drm_plane_helper.h> #include <drm/drm_rect.h> #include <linux/dma_remapping.h> +#include "intel_dsi.h" /* Primary plane formats supported by all gen */ #define COMMON_PRIMARY_FORMATS \@@ -2110,6 +2111,8 @@ static void intel_enable_pipe(struct intel_crtc *crtc) {struct drm_device *dev = crtc->base.dev;struct drm_i915_private *dev_priv = dev->dev_private; +struct intel_encoder *encoder; +struct intel_dsi *intel_dsi;enum pipe pipe = crtc->pipe;enum transcoder cpu_transcoder =intel_pipe_to_cpu_transcoder (dev_priv, pipe);@@ -2154,6 +2157,18 @@ static void intel_enable_pipe(struct intel_crtc *crtc)return ; } +for_each_encoder_on_crtc (dev, &crtc->base, encoder) {drivers/gpu/drm/i915/intel_display.c static void intel_enable_pipe(struct intel_crtc *crtc) · line 2169
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +10
-0+if (encoder->type ==INTEL_OUTPUT_DSI ) { + intel_dsi =enc_to_intel_dsi (&encoder->base); +if (intel_dsi && (intel_dsi->operation_mode == +INTEL_DSI_COMMAND_MODE )) { + val = val |PIPECONF_MIPI_DSR_ENABLE ; +I915_WRITE (reg, val); + } +break ; + } + }When we have these kind of encoder/crtc state depencies we resolve them by adding a bit of state to
intel_crtc_statewhich is set as needed in the encoder'scompute_configcallback. Then all you need here isQuoted 5 lines
if (intel_state->dsi_self_refresh) val |= PIPECONF_MIPI_DSR_ENABLE;Also is that additional write really required?
-DanielYes additional write is required.
MIPI_DSR_ENABLEhas to be written first then followed
by pipe enable. ifMIPI_DSR_ENABLEand pipe enable is done in same write, observed
that the image from pipe is not sent to panel when issued mem write command.Quoted 3 lines
Having a state variable instead of looping through the encoders definitely looks good.
Need to find a place to update the state variable. I will get back on this.Like I said such state is precomputed in the encoder callbacks, in this case
intel_dsi_compute_config.
Quoted 6 lines
Quoted 1 line
Cheers, Daniel
Agree with you daniel regarding state flag. Updated patch is ready, will upload shortly.
Regarding additional write, as Yogesh confirmed, both the writes are required.
If we _must_ have that second write, then you need a POSTING_READ and a comment to explain this. Otherwise this extra write will get refactoring into just one eventually. Also if you really need a 2nd write I wonder why we don't have to wait for hw somehow to process the first one? -Daniel
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
RFC 11/14 drm/i915: Enable MIPI display self refresh mode
In reply to Singh, Gaurav KDuring enable sequence for MIPI encoder in command mode, enable MIPI display self-refresh mode bit in Pipe Ctrl reg.
v2: Use crtc state flag instead of loop over encoders (Daniel)
--- drivers/gpu/drm/i915/intel_display.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/gpu/drm/i915/intel_display.c +5 -0
@@ -2158,6 +2158,11 @@ static void intel_enable_pipe(struct intel_crtc *crtc)return ; } +if (crtc->config->dsi_self_refresh) { + val = val |PIPECONF_MIPI_DSR_ENABLE ; +I915_WRITE (reg, val); + } +I915_WRITE (reg, val |PIPECONF_ENABLE );POSTING_READ (reg); }
Signature · 6 lines
1.7.9.5 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [RFC 11/14] drm/i915: Enable MIPI display self refresh mode
Quoted 17 lines · Gaurav K Singh
During enable sequence for MIPI encoder in command mode, enable MIPI display self-refresh mode bit in Pipe Ctrl reg.
v2: Use crtc state flag instead of loop over encoders (Daniel)
Signed-off-by Gaurav K Singh <[email protected]>Signed-off-by Yogesh Mohan Marimuthu <[email protected]>Signed-off-by Shobhit Kumar <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 5 +++++ 1 file changed, 5 insertions(+)drivers/gpu/drm/i915/intel_display.c +0
-0
drivers/gpu/drm/i915/intel_display.c static void intel_enable_pipe(struct intel_crtc *crtc) · line 2164
Quoted 7 lines
drivers/gpu/drm/i915/intel_display.c +4
-0@@ -2158,6 +2158,11 @@ static void intel_enable_pipe(struct intel_crtc *crtc)return ; } +if (crtc->config->dsi_self_refresh) { + val = val |PIPECONF_MIPI_DSR_ENABLE ; +I915_WRITE (reg, val); + }
Ah here it is. Please squash this patch with patch 7 so that you introduce the state tracking and the user for the new dsi_self_refresh bit in one patch. Makes reviewing a lot easier. Also please add a comment here that the additional write is required, and enforce ordering with a POSTING_READ.
Thanks, Daniel
Quoted 11 lines
drivers/gpu/drm/i915/intel_display.c +1
-0+I915_WRITE (reg, val |PIPECONF_ENABLE );POSTING_READ (reg); }Signature · 6 lines
1.7.9.5 _______________________________________________ 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
Re: [RFC 11/14] drm/i915: Enable MIPI display self refresh mode
Quoted 21 lines · Daniel Vetter
Quoted 20 lines · Gaurav K Singh
During enable sequence for MIPI encoder in command mode, enable MIPI display self-refresh mode bit in Pipe Ctrl reg.
v2: Use crtc state flag instead of loop over encoders (Daniel)
Signed-off-by Gaurav K Singh <[email protected]>Signed-off-by Yogesh Mohan Marimuthu <[email protected]>Signed-off-by Shobhit Kumar <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 5 +++++ 1 file changed, 5 insertions(+)drivers/gpu/drm/i915/intel_display.c +0
-0@@ -2158,6 +2158,11 @@ static void intel_enable_pipe(struct intel_crtc *crtc)return ; }
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c static void intel_enable_pipe(struct intel_crtc *crtc) · line 2164
Quoted 4 lines
drivers/gpu/drm/i915/intel_display.c +4
-0+if (crtc->config->dsi_self_refresh) { + val = val |PIPECONF_MIPI_DSR_ENABLE ; +I915_WRITE (reg, val); + }Ah here it is. Please squash this patch with patch 7 so that you introduce the state tracking and the user for the new
dsi_self_refreshbit in one patch. Makes reviewing a lot easier. Also please add a comment here that the additional write is required, and enforce ordering with aPOSTING_READ.
And I just realized that I've written the same review in the discussion of the previous patch. Please make sure next time around you address all the outstanding review, since if you don't the reviewer has to paintstakingly check _everything_ every time around, which is a massive waste of everyone's time.
Also can you pls change the subject to include DSI (and drop the MIPI part, that's just the standard's group and not the standard itself)? Applies to a few other patches in this series too.
Thanks, Daniel
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
RFC 12/14 drm/i915: Generalize DSI enable function
In reply to Gaurav K SinghFor command mode and video mode, panel prepare, wait for FIFO checks are required. Making these changes generic across command mode and video mode.
--- drivers/gpu/drm/i915/intel_dsi.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/intel_dsi.c +6 -5
@@ -437,14 +437,15 @@ static void intel_dsi_enable(struct intel_encoder *encoder)for_each_dsi_port (port, intel_dsi->ports)dpi_send_cmd (intel_dsi,TURN_ON , false, port);msleep (100 ); + } -drm_panel_enable (intel_dsi->panel); +drm_panel_enable (intel_dsi->panel); -for_each_dsi_port (port, intel_dsi->ports) -wait_for_dsi_fifo_empty (intel_dsi, port); +for_each_dsi_port (port, intel_dsi->ports) +wait_for_dsi_fifo_empty (intel_dsi, port); + +intel_dsi_port_enable (encoder); -intel_dsi_port_enable (encoder); - } }static void intel_dsi_pre_enable (struct intel_encoder *encoder)
Signature · 6 lines
1.7.9.5 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 13/14 drm/i915: Reset the display hw if vid mode to cmd mode
In reply to Gaurav K SinghReset the display hardware if video mode to command mode transition has to be done in MIPI display. otherwise command mode will not work.
--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_display.c | 81 ++++++++++++++++++++++++++-------- drivers/gpu/drm/i915/intel_dsi.c | 4 ++ 3 files changed, 67 insertions(+), 19 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -1854,6 +1854,7 @@ struct drm_i915_private { } gt;bool edp_low_vswing; +bool video_disabled;/* * NOTE: This is the dri1/ums dungeon, don't add stuff here. Your patch
drivers/gpu/drm/i915/intel_display.c +62 -19
105 lines not on this page · raw message
drivers/gpu/drm/i915/intel_dsi.c +4 -0
@@ -369,9 +369,13 @@ static void intel_dsi_port_disable(struct intel_encoder *encoder)enum port port;u32 temp; + dev_priv->video_disabled = false; +for_each_dsi_port (port, intel_dsi->ports) {/* de-assert ip_tg_enable signal */ if (is_cmd_mode (intel_dsi)) { +if (I915_READ (MIPI_PORT_CTRL (port)) &DPI_ENABLE ) + dev_priv->video_disabled = true;I915_WRITE (MIPI_PORT_CTRL (port),0 ); }else { temp =I915_READ (MIPI_PORT_CTRL (port));
Signature · 6 lines
1.7.9.5 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 14/14 drm/i915: send one frame after enabling mipi cmd mode
In reply to Gaurav K SinghIf MIPI is operated in command mode, and after display reset. if not even one frame is sent after enabling the pipe and then if it is disabled, pipe is getting stuck. This patch will fix this issue by sending one frame after enabling the pipe.
Ideally,there should not be a case where there is mode set and no frames are sent.
--- drivers/gpu/drm/i915/intel_display.c | 46 ++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_drv.h | 6 +++++ 2 files changed, 52 insertions(+)
drivers/gpu/drm/i915/intel_display.c +46 -0
@@ -5905,6 +5905,7 @@ static void valleyview_crtc_enable(struct drm_crtc *crtc)struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_crtc *intel_crtc =to_intel_crtc (crtc);struct intel_encoder *encoder; +struct intel_dsi *intel_dsi;int pipe = intel_crtc->pipe;bool is_dsi;
@@ -5967,6 +5968,25 @@ static void valleyview_crtc_enable(struct drm_crtc *crtc)for_each_encoder_on_crtc (dev, crtc, encoder) encoder->enable (encoder); + +for_each_encoder_on_crtc (dev, crtc, encoder) { +if (encoder->type !=INTEL_OUTPUT_DSI ) +continue ; + + intel_dsi =enc_to_intel_dsi (&encoder->base); +if (intel_dsi->operation_mode ==INTEL_DSI_COMMAND_MODE ) { +/* +* save the current pipe counter. During disable use +* this variable to check if at least one frame has +* been sent. If no frame is sent and MIPI is disabled +* in command mode, then pipe gets stuck. +*/ + intel_crtc->hw_frm_cnt_at_enable = +I915_READ (PIPEFRAME (pipe)); + } +break ; + } + }static void i9xx_set_pll_dividers (struct intel_crtc *crtc)
@@ -6065,6 +6085,7 @@ static void i9xx_crtc_disable(struct drm_crtc *crtc)struct drm_i915_private *dev_priv = dev->dev_private;struct intel_crtc *intel_crtc =to_intel_crtc (crtc);struct intel_encoder *encoder; +struct intel_dsi *intel_dsi;int pipe = intel_crtc->pipe;bool all_pipe_disabled;u32 val;
@@ -6072,6 +6093,31 @@ static void i9xx_crtc_disable(struct drm_crtc *crtc)if (!intel_crtc->active)return ; +for_each_encoder_on_crtc (dev, crtc, encoder) { +if (encoder->type !=INTEL_OUTPUT_DSI ) +continue ; + + intel_dsi =enc_to_intel_dsi (&encoder->base); +if ((intel_dsi->operation_mode ==INTEL_DSI_COMMAND_MODE ) && + (intel_crtc->hw_frm_cnt_at_enable == +I915_READ (PIPEFRAME (pipe)))) { + +intel_dsi_update_panel_fb (encoder); + +/* +* wait for ~2 frames for TE interrupt and sending one +* frame. +*/ +msleep (40 ); + +if (intel_crtc->hw_frm_cnt_at_enable == +I915_READ (PIPEFRAME (pipe))) +DRM_ERROR ("Pipe is stuck for DSI cmd mode." ); + } + +break ; + } +/* * On gen2 planes are double buffered but the pipe isn't, so we must * wait for planes to fully turn off before disabling the pipe.
drivers/gpu/drm/i915/intel_drv.h +6 -0
@@ -550,6 +550,12 @@ struct intel_crtc {/* scalers available on this crtc */ int num_scalers; + +/* +* save the frame counter at enable sequence to make sure one frame has +* been sent before disable sequence. +*/ +u32 hw_frm_cnt_at_enable; };struct intel_plane_wm_parameters {
Signature · 6 lines
1.7.9.5 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx