drm/i915: Send a DPIO cmnreset during driver load or system resume.
Subsystems (2)
A message that is not in the archive (sent off-list or not yet received): [PATCH 1/2] drm/i915: Send a DPIO cmnreset during driver load or
system resume.
PATCH 1/2 drm/i915: Send a DPIO cmnreset during driver load or system resume.
Without the DPIO cmnreset, the PLL fail to lock. This should have done by BIOS.
v2: Move this to intel_uncore_sanitize to allow it to get call during resume path. (Daniel)
v3: Remove redundant write 0 to DPIO_CTL, and use DPIO_RESET instead of just 0x1 (Ville)
Without BIOS, DPIO/render well/media well may still power gated.
Turn it off.
--- drivers/gpu/drm/i915/i915_reg.h | 9 +++++++++ drivers/gpu/drm/i915/intel_uncore.c | 23 +++++++++++++++++++++++ 2 files changed, 32 insertions(+), 0 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +9 -0
@@ -361,6 +361,15 @@#define PUNIT_OPCODE_REG_READ 6#define PUNIT_OPCODE_REG_WRITE 7 +#define PUNIT_REG_PWRGT_CTRL 0x60 +#define PUNIT_REG_PWRGT_STATUS 0x61 +#define PUNIT_CLK_GATE 1 +#define PUNIT_PWR_RESET 2 +#define PUNIT_PWR_GATE 3 +#define RENDER_PWRGT (PUNIT_PWR_GATE << 0) +#define MEDIA_PWRGT (PUNIT_PWR_GATE << 2) +#define DPIO_PWRGT (PUNIT_PWR_GATE << 6) +#define PUNIT_REG_GPU_LFM 0xd3#define PUNIT_REG_GPU_FREQ_REQ 0xd4#define PUNIT_REG_GPU_FREQ_STS 0xd8
drivers/gpu/drm/i915/intel_uncore.c +23 -0
@@ -276,10 +276,33 @@ static void intel_uncore_forcewake_reset(struct drm_device *dev)void intel_uncore_sanitize (struct drm_device *dev) { +struct drm_i915_private *dev_priv = dev->dev_private; +u32 reg_val; +intel_uncore_forcewake_reset (dev);/* BIOS often leaves RC6 enabled, but disable it for hw init */ intel_disable_gt_powersave (dev); + +/* Trigger DPIO CMN RESET and turn off power gate, require +* especially in BIOS less system +*/ +if (IS_VALLEYVIEW (dev)) { + +mutex_lock (&dev_priv->rps.hw_lock); + reg_val =vlv_punit_read (dev_priv,PUNIT_REG_PWRGT_STATUS ); + +if (reg_val & (RENDER_PWRGT |MEDIA_PWRGT |DPIO_PWRGT )) +vlv_punit_write (dev_priv,PUNIT_REG_PWRGT_CTRL ,0x0 ); + +mutex_unlock (&dev_priv->rps.hw_lock); + + reg_val =I915_READ (DPIO_CTL ); +if (!(reg_val &DPIO_RESET )) { +I915_WRITE (DPIO_CTL ,DPIO_RESET ); +POSTING_READ (DPIO_CTL ); + } + } }/*
Signature · 1 line
1.7.7.6
Quoted 22 lines · Chon Ming Lee
Without the DPIO cmnreset, the PLL fail to lock. This should have done by BIOS.
v2: Move this to
intel_uncore_sanitizeto allow it to get call during resume path. (Daniel)
v3: Remove redundant write 0 toDPIO_CTL, and useDPIO_RESETinstead of just0x1(Ville)
Without BIOS, DPIO/render well/media well may still power gated.
Turn it off.Signed-off-by Chon Ming Lee <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 9 +++++++++ drivers/gpu/drm/i915/intel_uncore.c | 23 +++++++++++++++++++++++ 2 files changed, 32 insertions(+), 0 deletions(-)drivers/gpu/drm/i915/i915_reg.h +0
-0@@ -361,6 +361,15 @@#define PUNIT_OPCODE_REG_READ 6
drivers/gpu/drm/i915/i915_reg.h line 371
Quoted 10 lines
drivers/gpu/drm/i915/i915_reg.h +8
-0#define PUNIT_OPCODE_REG_WRITE 7 +#define PUNIT_REG_PWRGT_CTRL 0x60 +#define PUNIT_REG_PWRGT_STATUS 0x61 +#define PUNIT_CLK_GATE 1 +#define PUNIT_PWR_RESET 2 +#define PUNIT_PWR_GATE 3 +#define RENDER_PWRGT (PUNIT_PWR_GATE << 0) +#define MEDIA_PWRGT (PUNIT_PWR_GATE << 2) +#define DPIO_PWRGT (PUNIT_PWR_GATE << 6)
Subsys 6 seems to be one of four TX lanes, and there's also the common lane subsys, and the disp2d is one as well. RX supposedly is not relevant for display PHY, not sure why it has subsys allocated too.
Anyways my point would be that shouldn't we check all subsys ie render + media + disp2d + common lane + all tx lanes?
And should we maybe power gate the RX lanes always as those shouldn't be needed for display?
Quoted 49 lines
drivers/gpu/drm/i915/i915_reg.h +1
-0+#define PUNIT_REG_GPU_LFM 0xd3#define PUNIT_REG_GPU_FREQ_REQ 0xd4#define PUNIT_REG_GPU_FREQ_STS 0xd8drivers/gpu/drm/i915/intel_uncore.c +23
-0@@ -276,10 +276,33 @@ static void intel_uncore_forcewake_reset(struct drm_device *dev)void intel_uncore_sanitize (struct drm_device *dev) { +struct drm_i915_private *dev_priv = dev->dev_private; +u32 reg_val; +intel_uncore_forcewake_reset (dev);/* BIOS often leaves RC6 enabled, but disable it for hw init */ intel_disable_gt_powersave (dev); + +/* Trigger DPIO CMN RESET and turn off power gate, require +* especially in BIOS less system +*/ +if (IS_VALLEYVIEW (dev)) { + +mutex_lock (&dev_priv->rps.hw_lock); + reg_val =vlv_punit_read (dev_priv,PUNIT_REG_PWRGT_STATUS ); + +if (reg_val & (RENDER_PWRGT |MEDIA_PWRGT |DPIO_PWRGT )) +vlv_punit_write (dev_priv,PUNIT_REG_PWRGT_CTRL ,0x0 ); + +mutex_unlock (&dev_priv->rps.hw_lock); + + reg_val =I915_READ (DPIO_CTL ); +if (!(reg_val &DPIO_RESET )) { +I915_WRITE (DPIO_CTL ,DPIO_RESET ); +POSTING_READ (DPIO_CTL ); + } + } }/* Signature · 6 lines
1.7.7.6 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 2 lines
Ville Syrjälä Intel OTC
Quoted 38 lines · Ville Syrjälä
Quoted 22 lines · Chon Ming Lee
Without the DPIO cmnreset, the PLL fail to lock. This should have done by BIOS.
v2: Move this to
intel_uncore_sanitizeto allow it to get call during resume path. (Daniel)
v3: Remove redundant write 0 toDPIO_CTL, and useDPIO_RESETinstead of just0x1(Ville)
Without BIOS, DPIO/render well/media well may still power gated.
Turn it off.Signed-off-by Chon Ming Lee <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 9 +++++++++ drivers/gpu/drm/i915/intel_uncore.c | 23 +++++++++++++++++++++++ 2 files changed, 32 insertions(+), 0 deletions(-)drivers/gpu/drm/i915/i915_reg.h +0
-0@@ -361,6 +361,15 @@#define PUNIT_OPCODE_REG_READ 6drivers/gpu/drm/i915/i915_reg.h line 371
Quoted 10 lines
drivers/gpu/drm/i915/i915_reg.h +8
-0#define PUNIT_OPCODE_REG_WRITE 7 +#define PUNIT_REG_PWRGT_CTRL 0x60 +#define PUNIT_REG_PWRGT_STATUS 0x61 +#define PUNIT_CLK_GATE 1 +#define PUNIT_PWR_RESET 2 +#define PUNIT_PWR_GATE 3 +#define RENDER_PWRGT (PUNIT_PWR_GATE << 0) +#define MEDIA_PWRGT (PUNIT_PWR_GATE << 2) +#define DPIO_PWRGT (PUNIT_PWR_GATE << 6)Subsys 6 seems to be one of four TX lanes, and there's also the common lane subsys, and the disp2d is one as well. RX supposedly is not relevant for display PHY, not sure why it has subsys allocated too.
Quoted 3 lines
Anyways my point would be that shouldn't we check all subsys ie render + media + disp2d + common lane + all tx lanes?
By default, the common lane + all tx lanes are not power gated during cold boot or system resume. Unless S0ix entry actually power gate it by driver, then, this will need to add to turn off it.
Quoted 2 lines
And should we maybe power gate the RX lanes always as those shouldn't be needed for display?
Yes, you are correct. I believe there should be another patch to do it, to enable power gate the VLV correctly for SOix entry or exit.
Quoted 54 lines
Quoted 50 lines
drivers/gpu/drm/i915/i915_reg.h +1
-0+#define PUNIT_REG_GPU_LFM 0xd3#define PUNIT_REG_GPU_FREQ_REQ 0xd4#define PUNIT_REG_GPU_FREQ_STS 0xd8drivers/gpu/drm/i915/intel_uncore.c +23
-0@@ -276,10 +276,33 @@ static void intel_uncore_forcewake_reset(struct drm_device *dev)void intel_uncore_sanitize (struct drm_device *dev) { +struct drm_i915_private *dev_priv = dev->dev_private; +u32 reg_val; +intel_uncore_forcewake_reset (dev);/* BIOS often leaves RC6 enabled, but disable it for hw init */ intel_disable_gt_powersave (dev); + +/* Trigger DPIO CMN RESET and turn off power gate, require +* especially in BIOS less system +*/ +if (IS_VALLEYVIEW (dev)) { + +mutex_lock (&dev_priv->rps.hw_lock); + reg_val =vlv_punit_read (dev_priv,PUNIT_REG_PWRGT_STATUS ); + +if (reg_val & (RENDER_PWRGT |MEDIA_PWRGT |DPIO_PWRGT )) +vlv_punit_write (dev_priv,PUNIT_REG_PWRGT_CTRL ,0x0 ); + +mutex_unlock (&dev_priv->rps.hw_lock); + + reg_val =I915_READ (DPIO_CTL ); +if (!(reg_val &DPIO_RESET )) { +I915_WRITE (DPIO_CTL ,DPIO_RESET ); +POSTING_READ (DPIO_CTL ); + } + } }/* Signature · 6 lines
1.7.7.6 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfxSignature · 2 lines
Ville Syrjälä Intel OTC
Quoted 39 lines · Chon Ming
Quoted 38 lines · Ville Syrjälä
Quoted 22 lines · Chon Ming Lee
Without the DPIO cmnreset, the PLL fail to lock. This should have done by BIOS.
v2: Move this to
intel_uncore_sanitizeto allow it to get call during resume path. (Daniel)
v3: Remove redundant write 0 toDPIO_CTL, and useDPIO_RESETinstead of just0x1(Ville)
Without BIOS, DPIO/render well/media well may still power gated.
Turn it off.Signed-off-by Chon Ming Lee <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 9 +++++++++ drivers/gpu/drm/i915/intel_uncore.c | 23 +++++++++++++++++++++++ 2 files changed, 32 insertions(+), 0 deletions(-)drivers/gpu/drm/i915/i915_reg.h +0
-0@@ -361,6 +361,15 @@#define PUNIT_OPCODE_REG_READ 6drivers/gpu/drm/i915/i915_reg.h line 371
Quoted 10 lines
drivers/gpu/drm/i915/i915_reg.h +8
-0#define PUNIT_OPCODE_REG_WRITE 7 +#define PUNIT_REG_PWRGT_CTRL 0x60 +#define PUNIT_REG_PWRGT_STATUS 0x61 +#define PUNIT_CLK_GATE 1 +#define PUNIT_PWR_RESET 2 +#define PUNIT_PWR_GATE 3 +#define RENDER_PWRGT (PUNIT_PWR_GATE << 0) +#define MEDIA_PWRGT (PUNIT_PWR_GATE << 2) +#define DPIO_PWRGT (PUNIT_PWR_GATE << 6)Subsys 6 seems to be one of four TX lanes, and there's also the common lane subsys, and the disp2d is one as well. RX supposedly is not relevant for display PHY, not sure why it has subsys allocated too.
Quoted 6 lines
Quoted 3 lines
Anyways my point would be that shouldn't we check all subsys ie render + media + disp2d + common lane + all tx lanes?
By default, the common lane + all tx lanes are not power gated during cold boot or system resume. Unless S0ix entry actually power gate it by driver, then, this will need to add to turn off it.
OK. And as Imre pointed out to me the '<< 6' isn't a TX lane as I claimed but the display subsystems (3). I assume that's the same thing as the disp2d block, ie. the pipes. So the DPIO in the name is wrong. It should be called display or disp2d I think.
If you say the PHY side isn't power gated during cold boot, I think we can ignore it for now.
So if you rename the DPIO thing, this patch should be OK.
Quoted 6 lines
Quoted 3 lines
And should we maybe power gate the RX lanes always as those shouldn't be needed for display?
Yes, you are correct. I believe there should be another patch to do it, to enable power gate the VLV correctly for SOix entry or exit.
My plan is to power gate everything we can during runtime, not just s0ix. But that's a biger topic we can discuss once Imre gets some relevant patches ready.
Quoted 54 lines
Quoted 54 lines
Quoted 50 lines
drivers/gpu/drm/i915/i915_reg.h +1
-0+#define PUNIT_REG_GPU_LFM 0xd3#define PUNIT_REG_GPU_FREQ_REQ 0xd4#define PUNIT_REG_GPU_FREQ_STS 0xd8drivers/gpu/drm/i915/intel_uncore.c +23
-0@@ -276,10 +276,33 @@ static void intel_uncore_forcewake_reset(struct drm_device *dev)void intel_uncore_sanitize (struct drm_device *dev) { +struct drm_i915_private *dev_priv = dev->dev_private; +u32 reg_val; +intel_uncore_forcewake_reset (dev);/* BIOS often leaves RC6 enabled, but disable it for hw init */ intel_disable_gt_powersave (dev); + +/* Trigger DPIO CMN RESET and turn off power gate, require +* especially in BIOS less system +*/ +if (IS_VALLEYVIEW (dev)) { + +mutex_lock (&dev_priv->rps.hw_lock); + reg_val =vlv_punit_read (dev_priv,PUNIT_REG_PWRGT_STATUS ); + +if (reg_val & (RENDER_PWRGT |MEDIA_PWRGT |DPIO_PWRGT )) +vlv_punit_write (dev_priv,PUNIT_REG_PWRGT_CTRL ,0x0 ); + +mutex_unlock (&dev_priv->rps.hw_lock); + + reg_val =I915_READ (DPIO_CTL ); +if (!(reg_val &DPIO_RESET )) { +I915_WRITE (DPIO_CTL ,DPIO_RESET ); +POSTING_READ (DPIO_CTL ); + } + } }/* Signature · 6 lines
1.7.7.6 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfxSignature · 2 lines
Ville Syrjälä Intel OTC
Signature · 2 lines
Ville Syrjälä Intel OTC
PATCH 1/1 drm/i915/vlv: Turn off power gate for BIOS-less system.
In reply to Chon Ming LeeDuring system boot up, by default, the power gate for render, media and display well still power gated. Normally, BIOS will turn off the power gate. In the BIOS-less system, the driver need to turn off the power gate very early during driver load.
v2: Move this to intel_uncore_sanitize to allow it to get call during resume path. (Daniel)
v3: Remove redundant write 0 to DPIO_CTL, and use DPIO_RESET instead of just 0x1 (Ville)
Add turn of power gate for display 2d/render well/media well.
v4: Remove toggle cmnreset in intel_uncore_sanitize. Cmnreset should toggle after CRI clock source has been selected. Jesse DPIO reset patch which toggle the cmnreset in intel_modeset_init_hw() should handle it. (Ville)
--- drivers/gpu/drm/i915/i915_reg.h | 9 +++++++++ drivers/gpu/drm/i915/intel_uncore.c | 16 ++++++++++++++++ 2 files changed, 25 insertions(+), 0 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +9 -0
@@ -361,6 +361,15 @@#define PUNIT_OPCODE_REG_READ 6#define PUNIT_OPCODE_REG_WRITE 7 +#define PUNIT_REG_PWRGT_CTRL 0x60 +#define PUNIT_REG_PWRGT_STATUS 0x61 +#define PUNIT_CLK_GATE 1 +#define PUNIT_PWR_RESET 2 +#define PUNIT_PWR_GATE 3 +#define RENDER_PWRGT (PUNIT_PWR_GATE << 0) +#define MEDIA_PWRGT (PUNIT_PWR_GATE << 2) +#define DISP2D_PWRGT (PUNIT_PWR_GATE << 6) +#define PUNIT_REG_GPU_LFM 0xd3#define PUNIT_REG_GPU_FREQ_REQ 0xd4#define PUNIT_REG_GPU_FREQ_STS 0xd8
drivers/gpu/drm/i915/intel_uncore.c +16 -0
@@ -301,10 +301,26 @@ static void intel_uncore_forcewake_reset(struct drm_device *dev)void intel_uncore_sanitize (struct drm_device *dev) { +struct drm_i915_private *dev_priv = dev->dev_private; +u32 reg_val; +intel_uncore_forcewake_reset (dev);/* BIOS often leaves RC6 enabled, but disable it for hw init */ intel_disable_gt_powersave (dev); + +/* Turn off power gate, require especially for the BIOS less system */ +if (IS_VALLEYVIEW (dev)) { + +mutex_lock (&dev_priv->rps.hw_lock); + reg_val =vlv_punit_read (dev_priv,PUNIT_REG_PWRGT_STATUS ); + +if (reg_val & (RENDER_PWRGT |MEDIA_PWRGT |DISP2D_PWRGT )) +vlv_punit_write (dev_priv,PUNIT_REG_PWRGT_CTRL ,0x0 ); + +mutex_unlock (&dev_priv->rps.hw_lock); + + } }/*
Signature · 1 line
1.7.7.6
Re: [PATCH] drm/i915/vlv: Turn off power gate for BIOS-less system.
Quoted 15 lines · Chon Ming Lee
During system boot up, by default, the power gate for render, media and display well still power gated. Normally, BIOS will turn off the power gate. In the BIOS-less system, the driver need to turn off the power gate very early during driver load.
v2: Move this to
intel_uncore_sanitizeto allow it to get call during resume path. (Daniel)
v3: Remove redundant write 0 toDPIO_CTL, and useDPIO_RESETinstead of just0x1(Ville)
Add turn of power gate for display 2d/render well/media well.
v4: Remove toggle cmnreset inintel_uncore_sanitize. Cmnreset should toggle after CRI clock source has been selected. Jesse DPIO reset patch which toggle the cmnreset inintel_modeset_init_hw()should handle it. (Ville)
Quoted 1 line
Signed-off-by Chon Ming Lee <[email protected]>
Looks OK as a short term solution.
Quoted 63 lines
--- drivers/gpu/drm/i915/i915_reg.h | 9 +++++++++ drivers/gpu/drm/i915/intel_uncore.c | 16 ++++++++++++++++ 2 files changed, 25 insertions(+), 0 deletions(-)drivers/gpu/drm/i915/i915_reg.h +9
-0@@ -361,6 +361,15 @@#define PUNIT_OPCODE_REG_READ 6#define PUNIT_OPCODE_REG_WRITE 7 +#define PUNIT_REG_PWRGT_CTRL 0x60 +#define PUNIT_REG_PWRGT_STATUS 0x61 +#define PUNIT_CLK_GATE 1 +#define PUNIT_PWR_RESET 2 +#define PUNIT_PWR_GATE 3 +#define RENDER_PWRGT (PUNIT_PWR_GATE << 0) +#define MEDIA_PWRGT (PUNIT_PWR_GATE << 2) +#define DISP2D_PWRGT (PUNIT_PWR_GATE << 6) +#define PUNIT_REG_GPU_LFM 0xd3#define PUNIT_REG_GPU_FREQ_REQ 0xd4#define PUNIT_REG_GPU_FREQ_STS 0xd8drivers/gpu/drm/i915/intel_uncore.c +16
-0@@ -301,10 +301,26 @@ static void intel_uncore_forcewake_reset(struct drm_device *dev)void intel_uncore_sanitize (struct drm_device *dev) { +struct drm_i915_private *dev_priv = dev->dev_private; +u32 reg_val; +intel_uncore_forcewake_reset (dev);/* BIOS often leaves RC6 enabled, but disable it for hw init */ intel_disable_gt_powersave (dev); + +/* Turn off power gate, require especially for the BIOS less system */ +if (IS_VALLEYVIEW (dev)) { + +mutex_lock (&dev_priv->rps.hw_lock); + reg_val =vlv_punit_read (dev_priv,PUNIT_REG_PWRGT_STATUS ); + +if (reg_val & (RENDER_PWRGT |MEDIA_PWRGT |DISP2D_PWRGT )) +vlv_punit_write (dev_priv,PUNIT_REG_PWRGT_CTRL ,0x0 ); + +mutex_unlock (&dev_priv->rps.hw_lock); + + } }/* Signature · 6 lines
1.7.7.6 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 2 lines
Ville Syrjälä Intel OTC
Daniel Vetter
AppliedRe: [PATCH] drm/i915/vlv: Turn off power gate for BIOS-less system.
Quoted 16 lines · Ville Syrjälä
Quoted 15 lines · Chon Ming Lee
During system boot up, by default, the power gate for render, media and display well still power gated. Normally, BIOS will turn off the power gate. In the BIOS-less system, the driver need to turn off the power gate very early during driver load.
v2: Move this to
intel_uncore_sanitizeto allow it to get call during resume path. (Daniel)
v3: Remove redundant write 0 toDPIO_CTL, and useDPIO_RESETinstead of just0x1(Ville)
Add turn of power gate for display 2d/render well/media well.
v4: Remove toggle cmnreset inintel_uncore_sanitize. Cmnreset should toggle after CRI clock source has been selected. Jesse DPIO reset patch which toggle the cmnreset inintel_modeset_init_hw()should handle it. (Ville)
Quoted 5 lines
Quoted 1 line
Signed-off-by Chon Ming Lee <[email protected]>Looks OK as a short term solution.
Reviewed-by Ville Syrjälä <[email protected]>
Queued for -next, thanks for the patch.
-Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch