drm/i915: access the PP_CONTROL reg only pre GEN5
Subsystems (2)
PATCH 1/2 drm/i915: access the PP_CONTROL reg only pre GEN5
This register exists only pre GEN5, but atm we also access it on VLV/BXT/CHV. Prevent accessing it on these latter platforms.
--- drivers/gpu/drm/i915/intel_lvds.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_lvds.c +1 -1
@@ -955,7 +955,7 @@ void intel_lvds_init(struct drm_device *dev)if (HAS_PCH_SPLIT (dev)) {I915_WRITE (PCH_PP_CONTROL ,I915_READ (PCH_PP_CONTROL ) |PANEL_UNLOCK_REGS ); - }else { + }else if (INTEL_INFO (dev_priv)->gen <5 ) {I915_WRITE (PP_CONTROL ,I915_READ (PP_CONTROL ) |PANEL_UNLOCK_REGS ); }
Signature · 6 lines
2.1.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 2/2 drm/i915: access the PP_ON_DELAYS/PP_OFF_DELAYS regs only pre GEN5
These registers exist only before GEN5, so currently we may access undefined registers on VLV/CHV and BXT. Apply the workaround only pre GEN5.
Since the workaround is relevant only when LVDS is present, for clarity apply it only if this is the case.
This triggered an unclaimed register access warning on BXT.
v2: (Ville)
- move the workaround to the LVDS init code
- print a debug note about the workaround
--- drivers/gpu/drm/i915/i915_dma.c | 2 -- drivers/gpu/drm/i915/intel_bios.c | 18 ------------------ drivers/gpu/drm/i915/intel_bios.h | 1 - drivers/gpu/drm/i915/intel_lvds.c | 12 ++++++++++++ 4 files changed, 12 insertions(+), 21 deletions(-)
drivers/gpu/drm/i915/i915_dma.c +0 -2
@@ -997,8 +997,6 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)intel_setup_gmbus (dev);intel_opregion_setup (dev); -intel_setup_bios (dev); -i915_gem_load (dev);/* On the 945G/GM, the chipset reports the MSI capability on the
drivers/gpu/drm/i915/intel_bios.c +0 -18
@@ -1340,21 +1340,3 @@ intel_parse_bios(struct drm_device *dev)return 0 ; } - -/* Ensure that vital registers have been initialised, even if the BIOS -* is absent or just failing to do its job. -*/ -void intel_setup_bios (struct drm_device *dev) -{ -struct drm_i915_private *dev_priv = dev->dev_private; - -/* Set the Panel Power On/Off timings if uninitialized. */ -if (!HAS_PCH_SPLIT (dev) && -I915_READ (PP_ON_DELAYS ) ==0 &&I915_READ (PP_OFF_DELAYS ) ==0 ) { -/* Set T2 to 40ms and T5 to 200ms */ -I915_WRITE (PP_ON_DELAYS ,0x019007d0 ); - -/* Set T3 to 35ms and Tx to 200ms */ -I915_WRITE (PP_OFF_DELAYS ,0x015e07d0 ); - } -}
drivers/gpu/drm/i915/intel_bios.h +0 -1
@@ -588,7 +588,6 @@ struct bdb_psr {struct psr_table psr_table[16 ]; } __packed; -void intel_setup_bios (struct drm_device *dev);int intel_parse_bios (struct drm_device *dev);/*
drivers/gpu/drm/i915/intel_lvds.c +12 -0
@@ -985,6 +985,18 @@ void intel_lvds_init(struct drm_device *dev)DRM_DEBUG_KMS ("LVDS is not present in VBT, but enabled anyway\n" ); } +/* Set the Panel Power On/Off timings if uninitialized. */ +if (INTEL_INFO (dev_priv)->gen <5 && +I915_READ (PP_ON_DELAYS ) ==0 &&I915_READ (PP_OFF_DELAYS ) ==0 ) { +/* Set T2 to 40ms and T5 to 200ms */ +I915_WRITE (PP_ON_DELAYS ,0x019007d0 ); + +/* Set T3 to 35ms and Tx to 200ms */ +I915_WRITE (PP_OFF_DELAYS ,0x015e07d0 ); + +DRM_DEBUG_KMS ("Panel power timings uninitialized, setting defaults\n" ); + } + lvds_encoder =kzalloc (sizeof (*lvds_encoder),GFP_KERNEL );if (!lvds_encoder)return ;
Signature · 6 lines
2.1.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 2/2] drm/i915: access the PP_ON_DELAYS/PP_OFF_DELAYS regs only pre GEN5
Quoted 7 lines · Imre Deak
These registers exist only before GEN5, so currently we may access undefined registers on VLV/CHV and BXT. Apply the workaround only pre GEN5.
Since the workaround is relevant only when LVDS is present, for clarity apply it only if this is the case.
Quoted 7 lines
This triggered an unclaimed register access warning on BXT.
v2: (Ville)
- move the workaround to the LVDS init code
- print a debug note about the workaroundSigned-off-by Imre Deak <[email protected]>
Quoted 83 lines
--- drivers/gpu/drm/i915/i915_dma.c | 2 -- drivers/gpu/drm/i915/intel_bios.c | 18 ------------------ drivers/gpu/drm/i915/intel_bios.h | 1 - drivers/gpu/drm/i915/intel_lvds.c | 12 ++++++++++++ 4 files changed, 12 insertions(+), 21 deletions(-)drivers/gpu/drm/i915/i915_dma.c +0
-2@@ -997,8 +997,6 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)intel_setup_gmbus (dev);intel_opregion_setup (dev); -intel_setup_bios (dev); -i915_gem_load (dev);/* On the 945G/GM, the chipset reports the MSI capability on the drivers/gpu/drm/i915/intel_bios.c +0
-18@@ -1340,21 +1340,3 @@ intel_parse_bios(struct drm_device *dev)return 0 ; } - -/* Ensure that vital registers have been initialised, even if the BIOS -* is absent or just failing to do its job. -*/ -void intel_setup_bios (struct drm_device *dev) -{ -struct drm_i915_private *dev_priv = dev->dev_private; - -/* Set the Panel Power On/Off timings if uninitialized. */ -if (!HAS_PCH_SPLIT (dev) && -I915_READ (PP_ON_DELAYS ) ==0 &&I915_READ (PP_OFF_DELAYS ) ==0 ) { -/* Set T2 to 40ms and T5 to 200ms */ -I915_WRITE (PP_ON_DELAYS ,0x019007d0 ); - -/* Set T3 to 35ms and Tx to 200ms */ -I915_WRITE (PP_OFF_DELAYS ,0x015e07d0 ); - } -}drivers/gpu/drm/i915/intel_bios.h +0
-1@@ -588,7 +588,6 @@ struct bdb_psr {struct psr_table psr_table[16 ]; } __packed; -void intel_setup_bios (struct drm_device *dev);int intel_parse_bios (struct drm_device *dev);/* drivers/gpu/drm/i915/intel_lvds.c +12
-0@@ -985,6 +985,18 @@ void intel_lvds_init(struct drm_device *dev)DRM_DEBUG_KMS ("LVDS is not present in VBT, but enabled anyway\n" ); } +/* Set the Panel Power On/Off timings if uninitialized. */ +if (INTEL_INFO (dev_priv)->gen <5 && +I915_READ (PP_ON_DELAYS ) ==0 &&I915_READ (PP_OFF_DELAYS ) ==0 ) { +/* Set T2 to 40ms and T5 to 200ms */ +I915_WRITE (PP_ON_DELAYS ,0x019007d0 ); + +/* Set T3 to 35ms and Tx to 200ms */ +I915_WRITE (PP_OFF_DELAYS ,0x015e07d0 ); + +DRM_DEBUG_KMS ("Panel power timings uninitialized, setting defaults\n" ); + } + lvds_encoder =kzalloc (sizeof (*lvds_encoder),GFP_KERNEL );if (!lvds_encoder)return ;Signature · 1 line
2.1.4
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 2/2] drm/i915: access the PP_ON_DELAYS/PP_OFF_DELAYS regs only pre GEN5
Quoted 10 lines · Ville Syrjälä
Quoted 9 lines · Imre Deak
These registers exist only before GEN5, so currently we may access undefined registers on VLV/CHV and BXT. Apply the workaround only pre GEN5.
Since the workaround is relevant only when LVDS is present, for clarity apply it only if this is the case.
This triggered an unclaimed register access warning on BXT.
Quoted 7 lines
Quoted 5 lines
v2: (Ville)
- move the workaround to the LVDS init code
- print a debug note about the workaroundSigned-off-by Imre Deak <[email protected]>Reviewed-by Ville Syrjälä <[email protected]>
Both patches applied to dinq, thanks.
-Daniel
Quoted 92 lines
Quoted 84 lines
--- drivers/gpu/drm/i915/i915_dma.c | 2 -- drivers/gpu/drm/i915/intel_bios.c | 18 ------------------ drivers/gpu/drm/i915/intel_bios.h | 1 - drivers/gpu/drm/i915/intel_lvds.c | 12 ++++++++++++ 4 files changed, 12 insertions(+), 21 deletions(-)drivers/gpu/drm/i915/i915_dma.c +0
-2@@ -997,8 +997,6 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)intel_setup_gmbus (dev);intel_opregion_setup (dev); -intel_setup_bios (dev); -i915_gem_load (dev);/* On the 945G/GM, the chipset reports the MSI capability on the drivers/gpu/drm/i915/intel_bios.c +0
-18@@ -1340,21 +1340,3 @@ intel_parse_bios(struct drm_device *dev)return 0 ; } - -/* Ensure that vital registers have been initialised, even if the BIOS -* is absent or just failing to do its job. -*/ -void intel_setup_bios (struct drm_device *dev) -{ -struct drm_i915_private *dev_priv = dev->dev_private; - -/* Set the Panel Power On/Off timings if uninitialized. */ -if (!HAS_PCH_SPLIT (dev) && -I915_READ (PP_ON_DELAYS ) ==0 &&I915_READ (PP_OFF_DELAYS ) ==0 ) { -/* Set T2 to 40ms and T5 to 200ms */ -I915_WRITE (PP_ON_DELAYS ,0x019007d0 ); - -/* Set T3 to 35ms and Tx to 200ms */ -I915_WRITE (PP_OFF_DELAYS ,0x015e07d0 ); - } -}drivers/gpu/drm/i915/intel_bios.h +0
-1@@ -588,7 +588,6 @@ struct bdb_psr {struct psr_table psr_table[16 ]; } __packed; -void intel_setup_bios (struct drm_device *dev);int intel_parse_bios (struct drm_device *dev);/* drivers/gpu/drm/i915/intel_lvds.c +12
-0@@ -985,6 +985,18 @@ void intel_lvds_init(struct drm_device *dev)DRM_DEBUG_KMS ("LVDS is not present in VBT, but enabled anyway\n" ); } +/* Set the Panel Power On/Off timings if uninitialized. */ +if (INTEL_INFO (dev_priv)->gen <5 && +I915_READ (PP_ON_DELAYS ) ==0 &&I915_READ (PP_OFF_DELAYS ) ==0 ) { +/* Set T2 to 40ms and T5 to 200ms */ +I915_WRITE (PP_ON_DELAYS ,0x019007d0 ); + +/* Set T3 to 35ms and Tx to 200ms */ +I915_WRITE (PP_OFF_DELAYS ,0x015e07d0 ); + +DRM_DEBUG_KMS ("Panel power timings uninitialized, setting defaults\n" ); + } + lvds_encoder =kzalloc (sizeof (*lvds_encoder),GFP_KERNEL );if (!lvds_encoder)return ;Signature · 1 line
2.1.4Signature · 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
Jani Nikula
maintainerRe: [PATCH v2 2/2] drm/i915: access the PP_ON_DELAYS/PP_OFF_DELAYS regs only pre GEN5
In reply to Imre DeakQuoted 6 lines · Imre Deak
These registers exist only before GEN5, so currently we may access undefined registers on VLV/CHV and BXT. Apply the workaround only pre GEN5.
Since the workaround is relevant only when LVDS is present, for clarity apply it only if this is the case.
Fun thought, if those registers are indeed 0, it's probably safe to assume PP_CONTROL is too, or at least doesn't have PANEL_UNLOCK_REGS set... which in turn would mean the write in intel_setup_bios() didn't go through anyway. With this patch, we'll actually do something about it. :)
Jani.
Quoted 96 lines
This triggered an unclaimed register access warning on BXT.
v2: (Ville)
- move the workaround to the LVDS init code
- print a debug note about the workaroundSigned-off-by Imre Deak <[email protected]>--- drivers/gpu/drm/i915/i915_dma.c | 2 -- drivers/gpu/drm/i915/intel_bios.c | 18 ------------------ drivers/gpu/drm/i915/intel_bios.h | 1 - drivers/gpu/drm/i915/intel_lvds.c | 12 ++++++++++++ 4 files changed, 12 insertions(+), 21 deletions(-)drivers/gpu/drm/i915/i915_dma.c +0
-2@@ -997,8 +997,6 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)intel_setup_gmbus (dev);intel_opregion_setup (dev); -intel_setup_bios (dev); -i915_gem_load (dev);/* On the 945G/GM, the chipset reports the MSI capability on the drivers/gpu/drm/i915/intel_bios.c +0
-18@@ -1340,21 +1340,3 @@ intel_parse_bios(struct drm_device *dev)return 0 ; } - -/* Ensure that vital registers have been initialised, even if the BIOS -* is absent or just failing to do its job. -*/ -void intel_setup_bios (struct drm_device *dev) -{ -struct drm_i915_private *dev_priv = dev->dev_private; - -/* Set the Panel Power On/Off timings if uninitialized. */ -if (!HAS_PCH_SPLIT (dev) && -I915_READ (PP_ON_DELAYS ) ==0 &&I915_READ (PP_OFF_DELAYS ) ==0 ) { -/* Set T2 to 40ms and T5 to 200ms */ -I915_WRITE (PP_ON_DELAYS ,0x019007d0 ); - -/* Set T3 to 35ms and Tx to 200ms */ -I915_WRITE (PP_OFF_DELAYS ,0x015e07d0 ); - } -}drivers/gpu/drm/i915/intel_bios.h +0
-1@@ -588,7 +588,6 @@ struct bdb_psr {struct psr_table psr_table[16 ]; } __packed; -void intel_setup_bios (struct drm_device *dev);int intel_parse_bios (struct drm_device *dev);/* drivers/gpu/drm/i915/intel_lvds.c +12
-0@@ -985,6 +985,18 @@ void intel_lvds_init(struct drm_device *dev)DRM_DEBUG_KMS ("LVDS is not present in VBT, but enabled anyway\n" ); } +/* Set the Panel Power On/Off timings if uninitialized. */ +if (INTEL_INFO (dev_priv)->gen <5 && +I915_READ (PP_ON_DELAYS ) ==0 &&I915_READ (PP_OFF_DELAYS ) ==0 ) { +/* Set T2 to 40ms and T5 to 200ms */ +I915_WRITE (PP_ON_DELAYS ,0x019007d0 ); + +/* Set T3 to 35ms and Tx to 200ms */ +I915_WRITE (PP_OFF_DELAYS ,0x015e07d0 ); + +DRM_DEBUG_KMS ("Panel power timings uninitialized, setting defaults\n" ); + } + lvds_encoder =kzalloc (sizeof (*lvds_encoder),GFP_KERNEL );if (!lvds_encoder)return ;Signature · 6 lines
2.1.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 2 lines · Imre Deak
This register exists only pre GEN5, but atm we also access it on VLV/BXT/CHV. Prevent accessing it on these latter platforms.
We don't have LVDS on any of those platforms.
Quoted 21 lines
Signed-off-by Imre Deak <[email protected]>--- drivers/gpu/drm/i915/intel_lvds.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/i915/intel_lvds.c +1
-1@@ -955,7 +955,7 @@ void intel_lvds_init(struct drm_device *dev)if (HAS_PCH_SPLIT (dev)) {I915_WRITE (PCH_PP_CONTROL ,I915_READ (PCH_PP_CONTROL ) |PANEL_UNLOCK_REGS ); - }else { + }else if (INTEL_INFO (dev_priv)->gen <5 ) {I915_WRITE (PP_CONTROL ,I915_READ (PP_CONTROL ) |PANEL_UNLOCK_REGS ); }Signature · 1 line
2.1.4
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Ville Syrjälä
Reviewed-byQuoted 5 lines · Ville Syrjälä
Quoted 2 lines · Imre Deak
This register exists only pre GEN5, but atm we also access it on VLV/BXT/CHV. Prevent accessing it on these latter platforms.
We don't have LVDS on any of those platforms.
Bah. Imre pointed out that we call intel_lvds_init() uncodnditionally on all platforms, so the patch does make sense.
What a mess. Someone should really move the PPS unlock to some early modeset init/resume code and also fix it for VLV/CHV/etc.
In the meantime this does what it says, so
Quoted 30 lines
Quoted 22 lines
Signed-off-by Imre Deak <[email protected]>--- drivers/gpu/drm/i915/intel_lvds.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/i915/intel_lvds.c +1
-1@@ -955,7 +955,7 @@ void intel_lvds_init(struct drm_device *dev)if (HAS_PCH_SPLIT (dev)) {I915_WRITE (PCH_PP_CONTROL ,I915_READ (PCH_PP_CONTROL ) |PANEL_UNLOCK_REGS ); - }else { + }else if (INTEL_INFO (dev_priv)->gen <5 ) {I915_WRITE (PP_CONTROL ,I915_READ (PP_CONTROL ) |PANEL_UNLOCK_REGS ); }Signature · 1 line
2.1.4Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ 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