drm/i915/psr: set CHICKEN_TRANS for psr2
Subsystems (2)
PATCH 6/10 drm/i915/psr: set CHICKEN_TRANS for psr2
As per bpsec, CHICKEN_TRANS_EDP bit 12 ,15
must be programmed.
Enable bit 12 for programmable header packet.
Enable bit 15 for Y cordinate support.
v2: (Rodrigo)
- move CHICKEN_TRANS_EDP bit set logic right after setup_vsc
v3:(Rodrigo)
- initialize chicken_trans to CHICKEN_TRANS_BIT12 instead of 0
--- drivers/gpu/drm/i915/i915_reg.h | 7 +++++++ drivers/gpu/drm/i915/intel_psr.c | 6 ++++++ 2 files changed, 13 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +7 -0
@@ -6449,6 +6449,13 @@ enum {#define BDW_DPRS_MASK_VBLANK_SRD (1 << 0)#define CHICKEN_PIPESL_1 (pipe) _MMIO_PIPE(pipe, _CHICKEN_PIPESL_1_A, _CHICKEN_PIPESL_1_B) +#define CHICKEN_TRANS_A 0x420c0 +#define CHICKEN_TRANS_B 0x420c4 +#define CHICKEN_TRANS (trans) _MMIO_TRANS(trans, CHICKEN_TRANS_A, CHICKEN_TRANS_B) +#define TRANS_EDP 3 +#define CHICKEN_TRANS_BIT12 (1<<12) +#define CHICKEN_TRANS_BIT15 (1<<15) +#define DISP_ARB_CTL _MMIO(0x45000)#define DISP_FBC_MEMORY_WAKE (1<<31)#define DISP_TILE_SURFACE_SWIZZLING (1<<13)
drivers/gpu/drm/i915/intel_psr.c +6 -0
@@ -475,6 +475,8 @@ void intel_psr_enable(struct intel_dp *intel_dp)struct drm_device *dev = intel_dig_port->base.base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_crtc *crtc =to_intel_crtc (intel_dig_port->base.base.crtc); +/* Set CHICKEN_TRANS_BIT12 for programable header */ +uint32_t chicken_trans =CHICKEN_TRANS_BIT12 ;if (!HAS_PSR (dev_priv)) {DRM_DEBUG_KMS ("PSR not supported on this platform\n" );
@@ -505,6 +507,10 @@ void intel_psr_enable(struct intel_dp *intel_dp) dev_priv->psr.psr2_support = false; elseskl_psr_setup_su_vsc (intel_dp ); +/* Set CHICKEN_TRANS_BIT15 if Y coordinate is supported */ +if (dev_priv->psr.y_cord_support) + chicken_trans |=CHICKEN_TRANS_BIT15 ; +I915_WRITE (CHICKEN_TRANS (TRANS_EDP ), chicken_trans); }else {/* set up vsc header for psr1 */ hsw_psr_setup_vsc (intel_dp);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Vivi, Rodrigo
maintainerQuoted 43 lines · vathsala nagaraju
As per bpsec,
CHICKEN_TRANS_EDPbit 12 ,15
must be programmed.
Enable bit 12 for programmable header packet.
Enable bit 15 for Y cordinate support.v2: (Rodrigo)
- moveCHICKEN_TRANS_EDPbit set logic right aftersetup_vscv3:(Rodrigo)
- initializechicken_transtoCHICKEN_TRANS_BIT12instead of 0Cc Rodrigo Vivi <[email protected]>Cc Jim Bride <[email protected]>Signed-off-by vathsala nagaraju <[email protected]>Signed-off-by Patil Deepti <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 7 +++++++ drivers/gpu/drm/i915/intel_psr.c | 6 ++++++ 2 files changed, 13 insertions(+)drivers/gpu/drm/i915/i915_reg.h +7
-0@@ -6449,6 +6449,13 @@ enum {#define BDW_DPRS_MASK_VBLANK_SRD (1 << 0)#define CHICKEN_PIPESL_1 (pipe) _MMIO_PIPE(pipe, _CHICKEN_PIPESL_1_A, _CHICKEN_PIPESL_1_B) +#define CHICKEN_TRANS_A 0x420c0 +#define CHICKEN_TRANS_B 0x420c4 +#define CHICKEN_TRANS (trans) _MMIO_TRANS(trans, CHICKEN_TRANS_A, CHICKEN_TRANS_B) +#define TRANS_EDP 3 +#define CHICKEN_TRANS_BIT12 (1<<12) +#define CHICKEN_TRANS_BIT15 (1<<15) +#define DISP_ARB_CTL _MMIO(0x45000)#define DISP_FBC_MEMORY_WAKE (1<<31)#define DISP_TILE_SURFACE_SWIZZLING (1<<13)drivers/gpu/drm/i915/intel_psr.c +0
-0
drivers/gpu/drm/i915/intel_psr.c void intel_psr_enable(struct intel_dp *intel_dp) · line 479
Quoted 5 lines
drivers/gpu/drm/i915/intel_psr.c +2
-0@@ -475,6 +475,8 @@ void intel_psr_enable(struct intel_dp *intel_dp)struct drm_device *dev = intel_dig_port->base.base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_crtc *crtc =to_intel_crtc (intel_dig_port->base.base.crtc); +/* Set CHICKEN_TRANS_BIT12 for programable header */ +uint32_t chicken_trans =CHICKEN_TRANS_BIT12 ;
+ uint32_t chicken_trans;
drivers/gpu/drm/i915/intel_psr.c void intel_psr_enable(struct intel_dp *intel_dp) · line 509
Quoted 7 lines
drivers/gpu/drm/i915/intel_psr.c +0
-0if (!HAS_PSR (dev_priv)) {DRM_DEBUG_KMS ("PSR not supported on this platform\n" );@@ -505,6 +507,10 @@ void intel_psr_enable(struct intel_dp *intel_dp) dev_priv->psr.psr2_support = false; elseskl_psr_setup_su_vsc (intel_dp );
+
+ /* Set CHICKEN_TRANS_BIT12 for programable header */
+ chicken_trans = CHICKEN_TRANS_BIT12;
drivers/gpu/drm/i915/intel_psr.c void intel_psr_enable(struct intel_dp *intel_dp) · line 516
Quoted 7 lines
drivers/gpu/drm/i915/intel_psr.c +4
-0+/* Set CHICKEN_TRANS_BIT15 if Y coordinate is supported */ +if (dev_priv->psr.y_cord_support) + chicken_trans |=CHICKEN_TRANS_BIT15 ; +I915_WRITE (CHICKEN_TRANS (TRANS_EDP ), chicken_trans); }else {/* set up vsc header for psr1 */ hsw_psr_setup_vsc (intel_dp);
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 6/10 drm/i915/psr: set CHICKEN_TRANS for psr2
In reply to vathsala nagarajuAs per bpsec, CHICKEN_TRANS_EDP bit 12 ,15
must be programmed.
Enable bit 12 for programmable header packet.
Enable bit 15 for Y cordinate support.
v2: (Rodrigo)
- move CHICKEN_TRANS_EDP bit set logic right after setup_vsc
v3:(Rodrigo)
- initialize chicken_trans to CHICKEN_TRANS_BIT12 instead of 0
v4:(Rodrigo)
- initialize chicken_trans=0,add chicken_trans=CHICKEN_TRANS_BIT12
--- drivers/gpu/drm/i915/i915_reg.h | 7 +++++++ drivers/gpu/drm/i915/intel_psr.c | 7 +++++++ 2 files changed, 14 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +7 -0
@@ -6449,6 +6449,13 @@ enum {#define BDW_DPRS_MASK_VBLANK_SRD (1 << 0)#define CHICKEN_PIPESL_1 (pipe) _MMIO_PIPE(pipe, _CHICKEN_PIPESL_1_A, _CHICKEN_PIPESL_1_B) +#define CHICKEN_TRANS_A 0x420c0 +#define CHICKEN_TRANS_B 0x420c4 +#define CHICKEN_TRANS (trans) _MMIO_TRANS(trans, CHICKEN_TRANS_A, CHICKEN_TRANS_B) +#define TRANS_EDP 3 +#define CHICKEN_TRANS_BIT12 (1<<12) +#define CHICKEN_TRANS_BIT15 (1<<15) +#define DISP_ARB_CTL _MMIO(0x45000)#define DISP_FBC_MEMORY_WAKE (1<<31)#define DISP_TILE_SURFACE_SWIZZLING (1<<13)
drivers/gpu/drm/i915/intel_psr.c +7 -0
@@ -475,6 +475,7 @@ void intel_psr_enable(struct intel_dp *intel_dp)struct drm_device *dev = intel_dig_port->base.base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_crtc *crtc =to_intel_crtc (intel_dig_port->base.base.crtc); +uint32_t chicken_trans =0 ;if (!HAS_PSR (dev_priv)) {DRM_DEBUG_KMS ("PSR not supported on this platform\n" );
@@ -505,6 +506,12 @@ void intel_psr_enable(struct intel_dp *intel_dp) dev_priv->psr.psr2_support = false; elseskl_psr_setup_su_vsc (intel_dp ); +/* Set CHICKEN_TRANS_BIT12 for programable header */ + chicken_trans =CHICKEN_TRANS_BIT12 ; +/* Set CHICKEN_TRANS_BIT15 if Y coordinate is supported */ +if (dev_priv->psr.y_cord_support) + chicken_trans |=CHICKEN_TRANS_BIT15 ; +I915_WRITE (CHICKEN_TRANS (TRANS_EDP ), chicken_trans); }else {/* set up vsc header for psr1 */ hsw_psr_setup_vsc (intel_dp);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 6/10 drm/i915/psr: set CHICKEN_TRANS for psr2
In reply to vathsala nagarajuAs per bpsec, CHICKEN_TRANS_EDP bit 12 ,15
must be programmed.
Enable bit 12 for programmable header packet.
Enable bit 15 for Y cordinate support.
v2: (Rodrigo)
- move CHICKEN_TRANS_EDP bit set logic right after setup_vsc
v3:(Rodrigo)
- initialize chicken_trans to CHICKEN_TRANS_BIT12 instead of 0
v4:(Rodrigo)
- initialize chicken_trans=0,add chicken_trans=CHICKEN_TRANS_BIT12
--- drivers/gpu/drm/i915/i915_reg.h | 7 +++++++ drivers/gpu/drm/i915/intel_psr.c | 7 +++++++ 2 files changed, 14 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +7 -0
@@ -6449,6 +6449,13 @@ enum {#define BDW_DPRS_MASK_VBLANK_SRD (1 << 0)#define CHICKEN_PIPESL_1 (pipe) _MMIO_PIPE(pipe, _CHICKEN_PIPESL_1_A, _CHICKEN_PIPESL_1_B) +#define CHICKEN_TRANS_A 0x420c0 +#define CHICKEN_TRANS_B 0x420c4 +#define CHICKEN_TRANS (trans) _MMIO_TRANS(trans, CHICKEN_TRANS_A, CHICKEN_TRANS_B) +#define TRANS_EDP 3 +#define CHICKEN_TRANS_BIT12 (1<<12) +#define CHICKEN_TRANS_BIT15 (1<<15) +#define DISP_ARB_CTL _MMIO(0x45000)#define DISP_FBC_MEMORY_WAKE (1<<31)#define DISP_TILE_SURFACE_SWIZZLING (1<<13)
drivers/gpu/drm/i915/intel_psr.c +7 -0
@@ -475,6 +475,7 @@ void intel_psr_enable(struct intel_dp *intel_dp)struct drm_device *dev = intel_dig_port->base.base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_crtc *crtc =to_intel_crtc (intel_dig_port->base.base.crtc); +uint32_t chicken_trans =0 ;if (!HAS_PSR (dev_priv)) {DRM_DEBUG_KMS ("PSR not supported on this platform\n" );
@@ -505,6 +506,12 @@ void intel_psr_enable(struct intel_dp *intel_dp) dev_priv->psr.psr2_support = false; elseskl_psr_setup_su_vsc (intel_dp ); +/* Set CHICKEN_TRANS_BIT12 for programable header */ + chicken_trans =CHICKEN_TRANS_BIT12 ; +/* Set CHICKEN_TRANS_BIT15 if Y coordinate is supported */ +if (dev_priv->psr.y_cord_support) + chicken_trans |=CHICKEN_TRANS_BIT15 ; +I915_WRITE (CHICKEN_TRANS (TRANS_EDP ), chicken_trans); }else {/* set up vsc header for psr1 */ hsw_psr_setup_vsc (intel_dp);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 5 lines · vathsala nagaraju
As per bpsec,
CHICKEN_TRANS_EDPbit 12 ,15
must be programmed.
Enable bit 12 for programmable header packet.
Enable bit 15 for Y cordinate support.
Quoted 8 lines
v2: (Rodrigo)
- moveCHICKEN_TRANS_EDPbit set logic right aftersetup_vscv3:(Rodrigo)
- initializechicken_transtoCHICKEN_TRANS_BIT12instead of 0v4:(Rodrigo)
- initialize chicken_trans=0,add chicken_trans=CHICKEN_TRANS_BIT12
Weird. Just scope the variable properly, use the correct type.
Quoted 14 lines
Cc Rodrigo Vivi <[email protected]>Cc Jim Bride <[email protected]>Signed-off-by vathsala nagaraju <[email protected]>Signed-off-by Patil Deepti <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 7 +++++++ drivers/gpu/drm/i915/intel_psr.c | 7 +++++++ 2 files changed, 14 insertions(+)drivers/gpu/drm/i915/i915_reg.h +0
-0
drivers/gpu/drm/i915/i915_reg.h enum { · line 6457
Quoted 9 lines
drivers/gpu/drm/i915/i915_reg.h +6
-0@@ -6449,6 +6449,13 @@ enum {#define BDW_DPRS_MASK_VBLANK_SRD (1 << 0)#define CHICKEN_PIPESL_1 (pipe) _MMIO_PIPE(pipe, _CHICKEN_PIPESL_1_A, _CHICKEN_PIPESL_1_B) +#define CHICKEN_TRANS_A 0x420c0 +#define CHICKEN_TRANS_B 0x420c4 +#define CHICKEN_TRANS (trans) _MMIO_TRANS(trans, CHICKEN_TRANS_A, CHICKEN_TRANS_B) +#define TRANS_EDP 3 +#define CHICKEN_TRANS_BIT12 (1<<12) +#define CHICKEN_TRANS_BIT15 (1<<15)
Useless naming. Either given them proper names or don't.
drivers/gpu/drm/i915/i915_reg.h enum { · line 6458
Quoted 1 line
drivers/gpu/drm/i915/i915_reg.h +0
-0if (!HAS_PSR (dev_priv)) {
u32 chicken;
drivers/gpu/drm/i915/i915_reg.h void intel_psr_enable(struct intel_dp *intel_dp) · line 510
Quoted 7 lines
drivers/gpu/drm/i915/i915_reg.h +2
-0DRM_DEBUG_KMS ("PSR not supported on this platform\n" );@@ -505,6 +506,12 @@ void intel_psr_enable(struct intel_dp *intel_dp) dev_priv->psr.psr2_support = false; elseskl_psr_setup_su_vsc (intel_dp ); +/* Set CHICKEN_TRANS_BIT12 for programable header */ + chicken_trans =CHICKEN_TRANS_BIT12 ;
We can see you are setting CHICKEN_TRANS_BIT12, so don't bother repeating that. What programmable header? Why is this in a chicken bit, what is the bspec reference, all of those would be useful to answer.
drivers/gpu/drm/i915/i915_reg.h void intel_psr_enable(struct intel_dp *intel_dp) · line 513
Quoted 3 lines
drivers/gpu/drm/i915/i915_reg.h +3
-0+/* Set CHICKEN_TRANS_BIT15 if Y coordinate is supported */ +if (dev_priv->psr.y_cord_support) + chicken_trans |=CHICKEN_TRANS_BIT15 ;
Again. Tell us why, we can read the code. Are the names meaningful? More meaningful than chicken |= BIT(15); ?
Quoted 11 lines
drivers/gpu/drm/i915/i915_reg.h +1
-0+I915_WRITE (CHICKEN_TRANS (TRANS_EDP ), chicken_trans); }else {/* set up vsc header for psr1 */ hsw_psr_setup_vsc (intel_dp);Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 44 lines · Chris Wilson
Quoted 5 lines · vathsala nagaraju
As per bpsec,
CHICKEN_TRANS_EDPbit 12 ,15
must be programmed.
Enable bit 12 for programmable header packet.
Enable bit 15 for Y cordinate support.Quoted 8 lines
v2: (Rodrigo)
- moveCHICKEN_TRANS_EDPbit set logic right aftersetup_vscv3:(Rodrigo)
- initializechicken_transtoCHICKEN_TRANS_BIT12instead of 0v4:(Rodrigo)
- initialize chicken_trans=0,add chicken_trans=CHICKEN_TRANS_BIT12Weird. Just scope the variable properly, use the correct type.
Quoted 14 lines
Cc Rodrigo Vivi <[email protected]>Cc Jim Bride <[email protected]>Signed-off-by vathsala nagaraju <[email protected]>Signed-off-by Patil Deepti <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 7 +++++++ drivers/gpu/drm/i915/intel_psr.c | 7 +++++++ 2 files changed, 14 insertions(+)drivers/gpu/drm/i915/i915_reg.h +0
-0drivers/gpu/drm/i915/i915_reg.h enum { · line 6457
Quoted 9 lines
drivers/gpu/drm/i915/i915_reg.h +6
-0@@ -6449,6 +6449,13 @@ enum {#define BDW_DPRS_MASK_VBLANK_SRD (1 << 0)#define CHICKEN_PIPESL_1 (pipe) _MMIO_PIPE(pipe, _CHICKEN_PIPESL_1_A, _CHICKEN_PIPESL_1_B) +#define CHICKEN_TRANS_A 0x420c0 +#define CHICKEN_TRANS_B 0x420c4 +#define CHICKEN_TRANS (trans) _MMIO_TRANS(trans, CHICKEN_TRANS_A, CHICKEN_TRANS_B) +#define TRANS_EDP 3 +#define CHICKEN_TRANS_BIT12 (1<<12) +#define CHICKEN_TRANS_BIT15 (1<<15)Useless naming. Either given them proper names or don't.
drivers/gpu/drm/i915/i915_reg.h enum { · line 6458
Quoted 1 line
drivers/gpu/drm/i915/i915_reg.h +0
-0if (!HAS_PSR (dev_priv)) {u32 chicken;
Quoted 10 lines
drivers/gpu/drm/i915/i915_reg.h void intel_psr_enable(struct intel_dp *intel_dp) · line 510
Quoted 7 lines
drivers/gpu/drm/i915/i915_reg.h +2
-0DRM_DEBUG_KMS ("PSR not supported on this platform\n" );@@ -505,6 +506,12 @@ void intel_psr_enable(struct intel_dp *intel_dp) dev_priv->psr.psr2_support = false; elseskl_psr_setup_su_vsc (intel_dp ); +/* Set CHICKEN_TRANS_BIT12 for programable header */ + chicken_trans =CHICKEN_TRANS_BIT12 ;We can see you are setting
CHICKEN_TRANS_BIT12, so don't bother repeating that. What programmable header? Why is this in a chicken bit, what is the bspec reference, all of those would be useful to answer.
Thanks for the review.
In bspec, it's part of psr2 enable sequence.
"Program Transcoder EDP VSC DIP header with a valid setting for PSR2 and Set CHICKEN_TRANS_EDP(0x420cc) bit 12 for programmable header packet"
Will remove the comment.
Quoted 6 lines
drivers/gpu/drm/i915/i915_reg.h void intel_psr_enable(struct intel_dp *intel_dp) · line 513
Quoted 4 lines
drivers/gpu/drm/i915/i915_reg.h +3
-0+/* Set CHICKEN_TRANS_BIT15 if Y coordinate is supported */ +if (dev_priv->psr.y_cord_support) + chicken_trans |=CHICKEN_TRANS_BIT15 ;Again. Tell us why, we can read the code. Are the names meaningful? More meaningful than chicken |= BIT(15); ?
In bspec, for register CHICKEN_TRANS, bit field name for 12 and 15 are spare 12 and spare 15. Named CHICKEN_TRANS_BIT15 instead of spare 15. Will remove the comment and change to BIT(12) and BIT(15)
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/i915/i915_reg.h +1
-0+I915_WRITE (CHICKEN_TRANS (TRANS_EDP ), chicken_trans); }else {/* set up vsc header for psr1 */ hsw_psr_setup_vsc (intel_dp);Signature · 1 line
1.9.1
Quoted 4 lines
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 6/10 drm/i915/psr: set CHICKEN_TRANS for psr2
In reply to vathsala nagarajuAs per bpsec, CHICKEN_TRANS_EDP bit 12 ,15 must be programmed in psr2 enable sequence.
Program Transcoder EDP VSC DIP header with a valid setting for PSR2 and Set CHICKEN_TRANS_EDP(0x420cc) bit 12 for programmable header packet.
Set CHICKEN_TRANS_EDP(0x420cc) bit 15 if Y coordinate is supported
v2: (Rodrigo)
- move CHICKEN_TRANS_EDP bit set logic right after setup_vsc
v3:(Rodrigo)
- initialize chicken_trans to CHICKEN_TRANS_BIT12 instead of 0
v4:(chris wilson)
- use BIT(12), remove CHICKEN_TRANS_BIT12
- remove unnecessary comments
- update commit message
--- drivers/gpu/drm/i915/i915_reg.h | 5 +++++ drivers/gpu/drm/i915/intel_psr.c | 5 +++++ 2 files changed, 10 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +5 -0
@@ -6449,6 +6449,11 @@ enum {#define BDW_DPRS_MASK_VBLANK_SRD (1 << 0)#define CHICKEN_PIPESL_1 (pipe) _MMIO_PIPE(pipe, _CHICKEN_PIPESL_1_A, _CHICKEN_PIPESL_1_B) +#define CHICKEN_TRANS_A 0x420c0 +#define CHICKEN_TRANS_B 0x420c4 +#define CHICKEN_TRANS (trans) _MMIO_TRANS(trans, CHICKEN_TRANS_A, CHICKEN_TRANS_B) +#define TRANS_EDP 3 +#define DISP_ARB_CTL _MMIO(0x45000)#define DISP_FBC_MEMORY_WAKE (1<<31)#define DISP_TILE_SURFACE_SWIZZLING (1<<13)
drivers/gpu/drm/i915/intel_psr.c +5 -0
@@ -475,6 +475,7 @@ void intel_psr_enable(struct intel_dp *intel_dp)struct drm_device *dev = intel_dig_port->base.base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_crtc *crtc =to_intel_crtc (intel_dig_port->base.base.crtc); +u32 chicken =0 ;if (!HAS_PSR (dev_priv)) {DRM_DEBUG_KMS ("PSR not supported on this platform\n" );
@@ -505,6 +506,10 @@ void intel_psr_enable(struct intel_dp *intel_dp) dev_priv->psr.psr2_support = false; elseskl_psr_setup_su_vsc (intel_dp ); + chicken =BIT (12 ); +if (dev_priv->psr.y_cord_support) + chicken |=BIT (15 ); +I915_WRITE (CHICKEN_TRANS (TRANS_EDP ), chicken); }else {/* set up vsc header for psr1 */ hsw_psr_setup_vsc (intel_dp);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 56 lines · vathsala nagaraju
As per bpsec,
CHICKEN_TRANS_EDPbit 12 ,15 must be programmed in psr2 enable sequence.
Program Transcoder EDP VSC DIP header with a valid setting for PSR2 and SetCHICKEN_TRANS_EDP(0x420cc)bit 12 for programmable header packet.
SetCHICKEN_TRANS_EDP(0x420cc)bit 15 if Y coordinate is supportedv2: (Rodrigo)
- moveCHICKEN_TRANS_EDPbit set logic right aftersetup_vscv3:(Rodrigo)
- initializechicken_transtoCHICKEN_TRANS_BIT12instead of 0v4:(chris wilson)
- use BIT(12), removeCHICKEN_TRANS_BIT12
- remove unnecessary comments
- update commit messageCc Rodrigo Vivi <[email protected]>Cc Jim Bride <[email protected]>Signed-off-by vathsala nagaraju <[email protected]>Signed-off-by Patil Deepti <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 5 +++++ drivers/gpu/drm/i915/intel_psr.c | 5 +++++ 2 files changed, 10 insertions(+)drivers/gpu/drm/i915/i915_reg.h +5
-0@@ -6449,6 +6449,11 @@ enum {#define BDW_DPRS_MASK_VBLANK_SRD (1 << 0)#define CHICKEN_PIPESL_1 (pipe) _MMIO_PIPE(pipe, _CHICKEN_PIPESL_1_A, _CHICKEN_PIPESL_1_B) +#define CHICKEN_TRANS_A 0x420c0 +#define CHICKEN_TRANS_B 0x420c4 +#define CHICKEN_TRANS (trans) _MMIO_TRANS(trans, CHICKEN_TRANS_A, CHICKEN_TRANS_B) +#define TRANS_EDP 3 +#define DISP_ARB_CTL _MMIO(0x45000)#define DISP_FBC_MEMORY_WAKE (1<<31)#define DISP_TILE_SURFACE_SWIZZLING (1<<13)drivers/gpu/drm/i915/intel_psr.c +1
-0@@ -475,6 +475,7 @@ void intel_psr_enable(struct intel_dp *intel_dp)struct drm_device *dev = intel_dig_port->base.base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_crtc *crtc =to_intel_crtc (intel_dig_port->base.base.crtc); +u32 chicken =0 ;if (!HAS_PSR (dev_priv)) {DRM_DEBUG_KMS ("PSR not supported on this platform\n" );
drivers/gpu/drm/i915/intel_psr.c void intel_psr_enable(struct intel_dp *intel_dp) · line 511
Quoted 6 lines
drivers/gpu/drm/i915/intel_psr.c +3
-0@@ -505,6 +506,10 @@ void intel_psr_enable(struct intel_dp *intel_dp) dev_priv->psr.psr2_support = false; elseskl_psr_setup_su_vsc (intel_dp ); + chicken =BIT (12 ); +if (dev_priv->psr.y_cord_support) + chicken |=BIT (15 );
In cases like this I think the better option is to invent a decent name for the bit. Otherwise no one can figure out what the code does without consulting the spec.
Quoted 11 lines
drivers/gpu/drm/i915/intel_psr.c +1
-0+I915_WRITE (CHICKEN_TRANS (TRANS_EDP ), chicken); }else {/* set up vsc header for psr1 */ hsw_psr_setup_vsc (intel_dp);Signature · 6 lines
1.9.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx