3 display pipes combination system support
Subsystems (3)
cover 3 display pipes combination system support
This is a proposed RFC solution for 3 display pipes combination system support.
Anshuman Gupta (6):
drm/i915: Iterate over pipe and skip the disabled one drm/i915: Remove (pipe == crtc->index) asummption drm/i915: Fix wrongly populated plane possible_crtcs bit mask drm/i915: Get right max plane stride
drm/i915: Add WARN_ON in intel_get_crtc_for_pipe() drm/i915: Enable 3 display pipes support
drivers/gpu/drm/i915/display/intel_display.c | 40 +++++++++++++++---- drivers/gpu/drm/i915/display/intel_display.h | 5 ++- .../drm/i915/display/intel_display_types.h | 2 + drivers/gpu/drm/i915/i915_irq.c | 6 ++- drivers/gpu/drm/i915/intel_device_info.c | 7 ++-- 5 files changed, 45 insertions(+), 15 deletions(-)
Signature · 6 lines
2.24.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 1/6 drm/i915: Iterate over pipe and skip the disabled one
It should not be assumed that a disabled display pipe will be always last the pipe.for_each_pipe() should iterate over I915_MAX_PIPES and check for the disabled pipe and skip that pipe so that it should not initialize the intel crtc for any disabled pipes.
Few compilation error needed to handle accordingly due to change in for_each_pipe() macro.
--- drivers/gpu/drm/i915/display/intel_display.h | 5 +++-- drivers/gpu/drm/i915/i915_irq.c | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/display/intel_display.h +3 -2
@@ -312,10 +312,11 @@ enum phy_fia { };#define for_each_pipe (__dev_priv, __p) \ - for ((__p) = 0; (__p) < INTEL_NUM_PIPES(__dev_priv); (__p)++) + for ((__p) = 0; (__p) < I915_MAX_PIPES; (__p)++) \ + for_each_if((INTEL_INFO(__dev_priv)->pipe_mask) & BIT(__p))#define for_each_pipe_masked (__dev_priv, __p, __mask) \ - for ((__p) = 0; (__p) < INTEL_NUM_PIPES(__dev_priv); (__p)++) \ + for_each_pipe(__dev_priv, __p) \ for_each_if((__mask) & BIT(__p))#define for_each_cpu_transcoder_masked (__dev_priv, __t, __mask) \
drivers/gpu/drm/i915/i915_irq.c +4 -2
@@ -1735,11 +1735,12 @@ static void ibx_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)if (pch_iir &SDE_POISON )DRM_ERROR ("PCH poison interrupt\n" ); -if (pch_iir &SDE_FDI_MASK ) +if (pch_iir &SDE_FDI_MASK ) {for_each_pipe (dev_priv, pipe)DRM_DEBUG_DRIVER (" pipe %c FDI IIR: 0x%08x\n" ,pipe_name (pipe),I915_READ (FDI_RX_IIR (pipe))); + }if (pch_iir & (SDE_TRANSB_CRC_DONE |SDE_TRANSA_CRC_DONE ))DRM_DEBUG_DRIVER ("PCH transcoder CRC done interrupt\n" );
@@ -1818,11 +1819,12 @@ static void cpt_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)if (pch_iir &SDE_AUDIO_CP_CHG_CPT )DRM_DEBUG_DRIVER ("Audio CP change interrupt\n" ); -if (pch_iir &SDE_FDI_MASK_CPT ) +if (pch_iir &SDE_FDI_MASK_CPT ) {for_each_pipe (dev_priv, pipe)DRM_DEBUG_DRIVER (" pipe %c FDI IIR: 0x%08x\n" ,pipe_name (pipe),I915_READ (FDI_RX_IIR (pipe))); + }if (pch_iir &SDE_ERROR_CPT )cpt_serr_int_handler (dev_priv);
Signature · 6 lines
2.24.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [RFC 1/6] drm/i915: Iterate over pipe and skip the disabled one
Quoted 8 lines · Anshuman Gupta
It should not be assumed that a disabled display pipe will be always last the pipe.
for_each_pipe()should iterate overI915_MAX_PIPESand check for the disabled pipe and skip that pipe so that it should not initialize the intel crtc for any disabled pipes.Few compilation error needed to handle accordingly due to change in
for_each_pipe()macro.
Really? Please paste.
Quoted 13 lines
Cc Ville Syrjälä <[email protected]>Signed-off-by Anshuman Gupta <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.h | 5 +++-- drivers/gpu/drm/i915/i915_irq.c | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-)drivers/gpu/drm/i915/display/intel_display.h +0
-0
drivers/gpu/drm/i915/display/intel_display.h enum phy_fia { · line 315
Quoted 5 lines
drivers/gpu/drm/i915/display/intel_display.h +1
-1@@ -312,10 +312,11 @@ enum phy_fia { };#define for_each_pipe (__dev_priv, __p) \ - for ((__p) = 0; (__p) < INTEL_NUM_PIPES(__dev_priv); (__p)++) + for ((__p) = 0; (__p) < I915_MAX_PIPES; (__p)++) \
Originally I was envisioning using for_each_set_bit() from bitops.h for this. It's probably more efficient, however I'm not sure if efficiency matters much here. The ugly part is that for_each_set_bit() requires an explicit cast to unsigned long *.
Perhaps this is just as well, it's not wrong, and can always be updated later.
Quoted 13 lines
drivers/gpu/drm/i915/display/intel_display.h +2
-1+ for_each_if((INTEL_INFO(__dev_priv)->pipe_mask) & BIT(__p))#define for_each_pipe_masked (__dev_priv, __p, __mask) \ - for ((__p) = 0; (__p) < INTEL_NUM_PIPES(__dev_priv); (__p)++) \ + for_each_pipe(__dev_priv, __p) \ for_each_if((__mask) & BIT(__p))#define for_each_cpu_transcoder_masked (__dev_priv, __t, __mask) \drivers/gpu/drm/i915/i915_irq.c +0
-0
drivers/gpu/drm/i915/i915_irq.c static void ibx_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir) · line 1743
Quoted 10 lines
drivers/gpu/drm/i915/i915_irq.c +2
-1@@ -1735,11 +1735,12 @@ static void ibx_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)if (pch_iir &SDE_POISON )DRM_ERROR ("PCH poison interrupt\n" ); -if (pch_iir &SDE_FDI_MASK ) +if (pch_iir &SDE_FDI_MASK ) {for_each_pipe (dev_priv, pipe)DRM_DEBUG_DRIVER (" pipe %c FDI IIR: 0x%08x\n" ,pipe_name (pipe),I915_READ (FDI_RX_IIR (pipe))); + }
Are the brace changes really needed? This is what the for_each_if hack is supposed to tackle.
Quoted 17 lines
drivers/gpu/drm/i915/i915_irq.c +2
-1if (pch_iir & (SDE_TRANSB_CRC_DONE |SDE_TRANSA_CRC_DONE ))DRM_DEBUG_DRIVER ("PCH transcoder CRC done interrupt\n" );@@ -1818,11 +1819,12 @@ static void cpt_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)if (pch_iir &SDE_AUDIO_CP_CHG_CPT )DRM_DEBUG_DRIVER ("Audio CP change interrupt\n" ); -if (pch_iir &SDE_FDI_MASK_CPT ) +if (pch_iir &SDE_FDI_MASK_CPT ) {for_each_pipe (dev_priv, pipe)DRM_DEBUG_DRIVER (" pipe %c FDI IIR: 0x%08x\n" ,pipe_name (pipe),I915_READ (FDI_RX_IIR (pipe))); + }if (pch_iir &SDE_ERROR_CPT )cpt_serr_int_handler (dev_priv);
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [RFC 1/6] drm/i915: Iterate over pipe and skip the disabled one
Quoted 11 lines · Jani Nikula
Quoted 8 lines · Anshuman Gupta
It should not be assumed that a disabled display pipe will be always last the pipe.
for_each_pipe()should iterate overI915_MAX_PIPESand check for the disabled pipe and skip that pipe so that it should not initialize the intel crtc for any disabled pipes.Few compilation error needed to handle accordingly due to change in
for_each_pipe()macro.Really? Please paste.
It is dangling-else warning at couple of places.drivers/gpu/drm/i915/i915_irq.c:1861:5: error: suggest explicit braces to avoid ambiguous ‘else’ [-Werror=dangling-else]
1861 | if (pch_iir & SDE_FDI_MASK)drivers/gpu/drm/i915/i915_irq.c:1944:5: error: suggest explicit braces to avoid ambiguous ‘else’ [-Werror=dangling-else] 1944 | if (pch_iir & SDE_FDI_MASK_CPT)
Quoted 44 lines
Quoted 14 lines
Cc Ville Syrjälä <[email protected]>Signed-off-by Anshuman Gupta <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.h | 5 +++-- drivers/gpu/drm/i915/i915_irq.c | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-)drivers/gpu/drm/i915/display/intel_display.h +0
-0drivers/gpu/drm/i915/display/intel_display.h enum phy_fia { · line 315
Quoted 5 lines
drivers/gpu/drm/i915/display/intel_display.h +1
-1@@ -312,10 +312,11 @@ enum phy_fia { };#define for_each_pipe (__dev_priv, __p) \ - for ((__p) = 0; (__p) < INTEL_NUM_PIPES(__dev_priv); (__p)++) + for ((__p) = 0; (__p) < I915_MAX_PIPES; (__p)++) \Originally I was envisioning using
for_each_set_bit()frombitops.hfor this. It's probably more efficient, however I'm not sure if efficiency matters much here. The ugly part is thatfor_each_set_bit()requires an explicit cast to unsigned long *.Perhaps this is just as well, it's not wrong, and can always be updated later.
Quoted 16 lines
drivers/gpu/drm/i915/display/intel_display.h +2
-1+ for_each_if((INTEL_INFO(__dev_priv)->pipe_mask) & BIT(__p))#define for_each_pipe_masked (__dev_priv, __p, __mask) \ - for ((__p) = 0; (__p) < INTEL_NUM_PIPES(__dev_priv); (__p)++) \ + for_each_pipe(__dev_priv, __p) \ for_each_if((__mask) & BIT(__p))#define for_each_cpu_transcoder_masked (__dev_priv, __t, __mask) \drivers/gpu/drm/i915/i915_irq.c +0
-0@@ -1735,11 +1735,12 @@ static void ibx_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)if (pch_iir &SDE_POISON )DRM_ERROR ("PCH poison interrupt\n" );
Quoted 10 lines
drivers/gpu/drm/i915/i915_irq.c static void ibx_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir) · line 1743
Quoted 7 lines
drivers/gpu/drm/i915/i915_irq.c +2
-1-if (pch_iir &SDE_FDI_MASK ) +if (pch_iir &SDE_FDI_MASK ) {for_each_pipe (dev_priv, pipe)DRM_DEBUG_DRIVER (" pipe %c FDI IIR: 0x%08x\n" ,pipe_name (pipe),I915_READ (FDI_RX_IIR (pipe))); + }Are the brace changes really needed? This is what the
for_each_ifhack is supposed to tackle.
IMHO it was dangling-else compilation, warning that requires braces. please correct me if i am wrong.
Thanks,
Anshuman
Quoted 16 lines
Quoted 16 lines
drivers/gpu/drm/i915/i915_irq.c +2
-1if (pch_iir & (SDE_TRANSB_CRC_DONE |SDE_TRANSA_CRC_DONE ))DRM_DEBUG_DRIVER ("PCH transcoder CRC done interrupt\n" );@@ -1818,11 +1819,12 @@ static void cpt_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)if (pch_iir &SDE_AUDIO_CP_CHG_CPT )DRM_DEBUG_DRIVER ("Audio CP change interrupt\n" ); -if (pch_iir &SDE_FDI_MASK_CPT ) +if (pch_iir &SDE_FDI_MASK_CPT ) {for_each_pipe (dev_priv, pipe)DRM_DEBUG_DRIVER (" pipe %c FDI IIR: 0x%08x\n" ,pipe_name (pipe),I915_READ (FDI_RX_IIR (pipe))); + }
Quoted 5 lines
Quoted 2 lines
drivers/gpu/drm/i915/i915_irq.c +0
-0if (pch_iir &SDE_ERROR_CPT )cpt_serr_int_handler (dev_priv);Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [RFC 1/6] drm/i915: Iterate over pipe and skip the disabled one
Quoted 11 lines · Anshuman Gupta
Quoted 10 lines · Jani Nikula
Quoted 8 lines · Anshuman Gupta
It should not be assumed that a disabled display pipe will be always last the pipe.
for_each_pipe()should iterate overI915_MAX_PIPESand check for the disabled pipe and skip that pipe so that it should not initialize the intel crtc for any disabled pipes.Few compilation error needed to handle accordingly due to change in
for_each_pipe()macro.
Quoted 6 lines
Quoted 1 line
Really? Please paste.
It is dangling-else warning at couple of places.
drivers/gpu/drm/i915/i915_irq.c:1861:5: error: suggest explicit braces to avoid ambiguous ‘else’ [-Werror=dangling-else]
1861 | if (pch_iir&SDE_FDI_MASK)drivers/gpu/drm/i915/i915_irq.c:1944:5: error: suggest explicit braces to avoid ambiguous ‘else’ [-Werror=dangling-else] 1944 | if (pch_iir&SDE_FDI_MASK_CPT)
Right, I suppose this is caused by the nesting of the for loops with if-else.
Perhaps the right course of action is to *not* reuse for_each_pipe() in for_each_pipe_masked(). Just combine the conditions into one.
BR,
Jani.
Quoted 79 lines
Quoted 44 lines
Quoted 14 lines
Cc Ville Syrjälä <[email protected]>Signed-off-by Anshuman Gupta <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.h | 5 +++-- drivers/gpu/drm/i915/i915_irq.c | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-)drivers/gpu/drm/i915/display/intel_display.h +0
-0drivers/gpu/drm/i915/display/intel_display.h enum phy_fia { · line 315
Quoted 5 lines
drivers/gpu/drm/i915/display/intel_display.h +1
-1@@ -312,10 +312,11 @@ enum phy_fia { };#define for_each_pipe (__dev_priv, __p) \ - for ((__p) = 0; (__p) < INTEL_NUM_PIPES(__dev_priv); (__p)++) + for ((__p) = 0; (__p) < I915_MAX_PIPES; (__p)++) \Originally I was envisioning using
for_each_set_bit()frombitops.hfor this. It's probably more efficient, however I'm not sure if efficiency matters much here. The ugly part is thatfor_each_set_bit()requires an explicit cast to unsigned long *.Perhaps this is just as well, it's not wrong, and can always be updated later.
Quoted 16 lines
drivers/gpu/drm/i915/display/intel_display.h +2
-1+ for_each_if((INTEL_INFO(__dev_priv)->pipe_mask) & BIT(__p))#define for_each_pipe_masked (__dev_priv, __p, __mask) \ - for ((__p) = 0; (__p) < INTEL_NUM_PIPES(__dev_priv); (__p)++) \ + for_each_pipe(__dev_priv, __p) \ for_each_if((__mask) & BIT(__p))#define for_each_cpu_transcoder_masked (__dev_priv, __t, __mask) \drivers/gpu/drm/i915/i915_irq.c +0
-0@@ -1735,11 +1735,12 @@ static void ibx_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)if (pch_iir &SDE_POISON )DRM_ERROR ("PCH poison interrupt\n" );Quoted 10 lines
drivers/gpu/drm/i915/i915_irq.c static void ibx_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir) · line 1743
Quoted 7 lines
drivers/gpu/drm/i915/i915_irq.c +2
-1-if (pch_iir &SDE_FDI_MASK ) +if (pch_iir &SDE_FDI_MASK ) {for_each_pipe (dev_priv, pipe)DRM_DEBUG_DRIVER (" pipe %c FDI IIR: 0x%08x\n" ,pipe_name (pipe),I915_READ (FDI_RX_IIR (pipe))); + }Are the brace changes really needed? This is what the
for_each_ifhack is supposed to tackle.IMHO it was dangling-else compilation, warning that requires braces. please correct me if i am wrong.
Thanks,
AnshumanQuoted 21 lines
Quoted 18 lines
drivers/gpu/drm/i915/i915_irq.c +2
-1if (pch_iir & (SDE_TRANSB_CRC_DONE |SDE_TRANSA_CRC_DONE ))DRM_DEBUG_DRIVER ("PCH transcoder CRC done interrupt\n" );@@ -1818,11 +1819,12 @@ static void cpt_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)if (pch_iir &SDE_AUDIO_CP_CHG_CPT )DRM_DEBUG_DRIVER ("Audio CP change interrupt\n" ); -if (pch_iir &SDE_FDI_MASK_CPT ) +if (pch_iir &SDE_FDI_MASK_CPT ) {for_each_pipe (dev_priv, pipe)DRM_DEBUG_DRIVER (" pipe %c FDI IIR: 0x%08x\n" ,pipe_name (pipe),I915_READ (FDI_RX_IIR (pipe))); + }if (pch_iir &SDE_ERROR_CPT )cpt_serr_int_handler (dev_priv);Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [RFC 1/6] drm/i915: Iterate over pipe and skip the disabled one
Quoted 19 lines · Jani Nikula
Quoted 11 lines · Anshuman Gupta
Quoted 10 lines · Jani Nikula
Quoted 8 lines · Anshuman Gupta
It should not be assumed that a disabled display pipe will be always last the pipe.
for_each_pipe()should iterate overI915_MAX_PIPESand check for the disabled pipe and skip that pipe so that it should not initialize the intel crtc for any disabled pipes.Few compilation error needed to handle accordingly due to change in
for_each_pipe()macro.Quoted 6 lines
Quoted 1 line
Really? Please paste.
It is dangling-else warning at couple of places.
drivers/gpu/drm/i915/i915_irq.c:1861:5: error: suggest explicit braces to avoid ambiguous ‘else’ [-Werror=dangling-else]
1861 | if (pch_iir&SDE_FDI_MASK)drivers/gpu/drm/i915/i915_irq.c:1944:5: error: suggest explicit braces to avoid ambiguous ‘else’ [-Werror=dangling-else] 1944 | if (pch_iir&SDE_FDI_MASK_CPT)
Quoted 5 lines
Right, I suppose this is caused by the nesting of the for loops with if-else.
Perhaps the right course of action is to *not* reuse
for_each_pipe()infor_each_pipe_masked(). Just combine the conditions into one.
This is not caused by for_each_pipe_masked, this is caused by for_each_pipe itself, if (foo)
/*for_each_pipe()*/
for(;;)
if (condition) {}
elseQuoted 80 lines
BR,
Jani.Quoted 74 lines
Quoted 44 lines
Quoted 14 lines
Cc Ville Syrjälä <[email protected]>Signed-off-by Anshuman Gupta <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.h | 5 +++-- drivers/gpu/drm/i915/i915_irq.c | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-)drivers/gpu/drm/i915/display/intel_display.h +0
-0drivers/gpu/drm/i915/display/intel_display.h enum phy_fia { · line 315
Quoted 5 lines
drivers/gpu/drm/i915/display/intel_display.h +1
-1@@ -312,10 +312,11 @@ enum phy_fia { };#define for_each_pipe (__dev_priv, __p) \ - for ((__p) = 0; (__p) < INTEL_NUM_PIPES(__dev_priv); (__p)++) + for ((__p) = 0; (__p) < I915_MAX_PIPES; (__p)++) \Originally I was envisioning using
for_each_set_bit()frombitops.hfor this. It's probably more efficient, however I'm not sure if efficiency matters much here. The ugly part is thatfor_each_set_bit()requires an explicit cast to unsigned long *.Perhaps this is just as well, it's not wrong, and can always be updated later.
Quoted 16 lines
drivers/gpu/drm/i915/display/intel_display.h +2
-1+ for_each_if((INTEL_INFO(__dev_priv)->pipe_mask) & BIT(__p))#define for_each_pipe_masked (__dev_priv, __p, __mask) \ - for ((__p) = 0; (__p) < INTEL_NUM_PIPES(__dev_priv); (__p)++) \ + for_each_pipe(__dev_priv, __p) \ for_each_if((__mask) & BIT(__p))#define for_each_cpu_transcoder_masked (__dev_priv, __t, __mask) \drivers/gpu/drm/i915/i915_irq.c +0
-0@@ -1735,11 +1735,12 @@ static void ibx_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)if (pch_iir &SDE_POISON )DRM_ERROR ("PCH poison interrupt\n" );Quoted 10 lines
drivers/gpu/drm/i915/i915_irq.c static void ibx_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir) · line 1743
Quoted 7 lines
drivers/gpu/drm/i915/i915_irq.c +2
-1-if (pch_iir &SDE_FDI_MASK ) +if (pch_iir &SDE_FDI_MASK ) {for_each_pipe (dev_priv, pipe)DRM_DEBUG_DRIVER (" pipe %c FDI IIR: 0x%08x\n" ,pipe_name (pipe),I915_READ (FDI_RX_IIR (pipe))); + }Are the brace changes really needed? This is what the
for_each_ifhack is supposed to tackle.IMHO it was dangling-else compilation, warning that requires braces. please correct me if i am wrong.
Thanks,
AnshumanQuoted 16 lines
Quoted 16 lines
drivers/gpu/drm/i915/i915_irq.c +2
-1if (pch_iir & (SDE_TRANSB_CRC_DONE |SDE_TRANSA_CRC_DONE ))DRM_DEBUG_DRIVER ("PCH transcoder CRC done interrupt\n" );@@ -1818,11 +1819,12 @@ static void cpt_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)if (pch_iir &SDE_AUDIO_CP_CHG_CPT )DRM_DEBUG_DRIVER ("Audio CP change interrupt\n" ); -if (pch_iir &SDE_FDI_MASK_CPT ) +if (pch_iir &SDE_FDI_MASK_CPT ) {for_each_pipe (dev_priv, pipe)DRM_DEBUG_DRIVER (" pipe %c FDI IIR: 0x%08x\n" ,pipe_name (pipe),I915_READ (FDI_RX_IIR (pipe))); + }
Quoted 8 lines
Quoted 5 lines
Quoted 5 lines
Quoted 2 lines
drivers/gpu/drm/i915/i915_irq.c +0
-0if (pch_iir &SDE_ERROR_CPT )cpt_serr_int_handler (dev_priv);Signature · 1 line
Jani Nikula, Intel Open Source Graphics CenterSignature · 1 line
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [RFC 1/6] drm/i915: Iterate over pipe and skip the disabled one
Quoted 23 lines · Anshuman Gupta
Quoted 22 lines · Jani Nikula
Quoted 11 lines · Anshuman Gupta
Quoted 10 lines · Jani Nikula
Quoted 8 lines · Anshuman Gupta
It should not be assumed that a disabled display pipe will be always last the pipe.
for_each_pipe()should iterate overI915_MAX_PIPESand check for the disabled pipe and skip that pipe so that it should not initialize the intel crtc for any disabled pipes.Few compilation error needed to handle accordingly due to change in
for_each_pipe()macro.Quoted 6 lines
Quoted 1 line
Really? Please paste.
It is dangling-else warning at couple of places.
drivers/gpu/drm/i915/i915_irq.c:1861:5: error: suggest explicit braces to avoid ambiguous ‘else’ [-Werror=dangling-else]
1861 | if (pch_iir&SDE_FDI_MASK)drivers/gpu/drm/i915/i915_irq.c:1944:5: error: suggest explicit braces to avoid ambiguous ‘else’ [-Werror=dangling-else] 1944 | if (pch_iir&SDE_FDI_MASK_CPT)Right, I suppose this is caused by the nesting of the for loops with if-else.
Quoted 8 lines
Quoted 2 lines
Perhaps the right course of action is to *not* reuse
for_each_pipe()infor_each_pipe_masked(). Just combine the conditions into one.This is not caused by
for_each_pipe_masked, this is caused byfor_each_pipeitself, if (foo)/*for_each_pipe()*/ for(;;) if (condition) {} else
Sorry for the noise, please carry on with the patch.
*blush*
BR,
Jani.
Quoted 88 lines
Quoted 88 lines
BR,
Jani.Quoted 79 lines
Quoted 44 lines
Quoted 14 lines
Cc Ville Syrjälä <[email protected]>Signed-off-by Anshuman Gupta <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.h | 5 +++-- drivers/gpu/drm/i915/i915_irq.c | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-)drivers/gpu/drm/i915/display/intel_display.h +0
-0drivers/gpu/drm/i915/display/intel_display.h enum phy_fia { · line 315
Quoted 5 lines
drivers/gpu/drm/i915/display/intel_display.h +1
-1@@ -312,10 +312,11 @@ enum phy_fia { };#define for_each_pipe (__dev_priv, __p) \ - for ((__p) = 0; (__p) < INTEL_NUM_PIPES(__dev_priv); (__p)++) + for ((__p) = 0; (__p) < I915_MAX_PIPES; (__p)++) \Originally I was envisioning using
for_each_set_bit()frombitops.hfor this. It's probably more efficient, however I'm not sure if efficiency matters much here. The ugly part is thatfor_each_set_bit()requires an explicit cast to unsigned long *.Perhaps this is just as well, it's not wrong, and can always be updated later.
Quoted 16 lines
drivers/gpu/drm/i915/display/intel_display.h +2
-1+ for_each_if((INTEL_INFO(__dev_priv)->pipe_mask) & BIT(__p))#define for_each_pipe_masked (__dev_priv, __p, __mask) \ - for ((__p) = 0; (__p) < INTEL_NUM_PIPES(__dev_priv); (__p)++) \ + for_each_pipe(__dev_priv, __p) \ for_each_if((__mask) & BIT(__p))#define for_each_cpu_transcoder_masked (__dev_priv, __t, __mask) \drivers/gpu/drm/i915/i915_irq.c +0
-0@@ -1735,11 +1735,12 @@ static void ibx_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)if (pch_iir &SDE_POISON )DRM_ERROR ("PCH poison interrupt\n" );Quoted 10 lines
drivers/gpu/drm/i915/i915_irq.c static void ibx_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir) · line 1743
Quoted 7 lines
drivers/gpu/drm/i915/i915_irq.c +2
-1-if (pch_iir &SDE_FDI_MASK ) +if (pch_iir &SDE_FDI_MASK ) {for_each_pipe (dev_priv, pipe)DRM_DEBUG_DRIVER (" pipe %c FDI IIR: 0x%08x\n" ,pipe_name (pipe),I915_READ (FDI_RX_IIR (pipe))); + }Are the brace changes really needed? This is what the
for_each_ifhack is supposed to tackle.IMHO it was dangling-else compilation, warning that requires braces. please correct me if i am wrong.
Thanks,
AnshumanQuoted 21 lines
Quoted 18 lines
drivers/gpu/drm/i915/i915_irq.c +2
-1if (pch_iir & (SDE_TRANSB_CRC_DONE |SDE_TRANSA_CRC_DONE ))DRM_DEBUG_DRIVER ("PCH transcoder CRC done interrupt\n" );@@ -1818,11 +1819,12 @@ static void cpt_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)if (pch_iir &SDE_AUDIO_CP_CHG_CPT )DRM_DEBUG_DRIVER ("Audio CP change interrupt\n" ); -if (pch_iir &SDE_FDI_MASK_CPT ) +if (pch_iir &SDE_FDI_MASK_CPT ) {for_each_pipe (dev_priv, pipe)DRM_DEBUG_DRIVER (" pipe %c FDI IIR: 0x%08x\n" ,pipe_name (pipe),I915_READ (FDI_RX_IIR (pipe))); + }if (pch_iir &SDE_ERROR_CPT )cpt_serr_int_handler (dev_priv);Signature · 1 line
Jani Nikula, Intel Open Source Graphics CenterSignature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 2/6 drm/i915: Remove (pipe == crtc->index) asummption
In reply to Anshuman Guptawe can't have (pipe == crtc->index) assumption in
driver in order to support 3 non-contiguous
display pipe system.
--- drivers/gpu/drm/i915/display/intel_display.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +4 -6
@@ -14070,11 +14070,11 @@ verify_single_dpll_state(struct drm_i915_private *dev_priv,if (new_crtc_state->hw.active)I915_STATE_WARN (!(pll->active_mask & crtc_mask),"pll active mismatch (expected pipe %c in active mask 0x%02x)\n" , -pipe_name (drm_crtc_index (&crtc->base)), pll->active_mask); +pipe_name (crtc->pipe), pll->active_mask);else I915_STATE_WARN (pll->active_mask & crtc_mask,"pll active mismatch (didn't expect pipe %c in active mask 0x%02x)\n" , -pipe_name (drm_crtc_index (&crtc->base)), pll->active_mask); +pipe_name (crtc->pipe), pll->active_mask); I915_STATE_WARN(!(pll->state.crtc_mask & crtc_mask), "pll enabled crtcs mismatch (expected 0x%x in 0x%02x)\n",
@@ -14103,10 +14103,10 @@ verify_shared_dpll_state(struct intel_crtc *crtc,I915_STATE_WARN (pll->active_mask & crtc_mask,"pll active mismatch (didn't expect pipe %c in active mask)\n" , -pipe_name (drm_crtc_index (&crtc->base))); +pipe_name (crtc->pipe));I915_STATE_WARN (pll->state.crtc_mask & crtc_mask,"pll enabled crtcs mismatch (found %x in enabled mask)\n" , -pipe_name (drm_crtc_index (&crtc->base))); +pipe_name (crtc->pipe)); } }
@@ -16485,8 +16485,6 @@ static int intel_crtc_init(struct drm_i915_private *dev_priv, enum pipe pipe)intel_color_init (crtc); -WARN_ON (drm_crtc_index (&crtc->base) != crtc->pipe); -return 0 ; fail:
Signature · 6 lines
2.24.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [RFC 2/6] drm/i915: Remove (pipe == crtc->index) asummption
Quoted 42 lines · Anshuman Gupta
we can't have (pipe ==
crtc->index) assumption in
driver in order to support 3 non-contiguous
display pipe system.Cc Ville Syrjälä <[email protected]>Signed-off-by Anshuman Gupta <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +4
-4@@ -14070,11 +14070,11 @@ verify_single_dpll_state(struct drm_i915_private *dev_priv,if (new_crtc_state->hw.active)I915_STATE_WARN (!(pll->active_mask & crtc_mask),"pll active mismatch (expected pipe %c in active mask 0x%02x)\n" , -pipe_name (drm_crtc_index (&crtc->base)), pll->active_mask); +pipe_name (crtc->pipe), pll->active_mask);else I915_STATE_WARN (pll->active_mask & crtc_mask,"pll active mismatch (didn't expect pipe %c in active mask 0x%02x)\n" , -pipe_name (drm_crtc_index (&crtc->base)), pll->active_mask); +pipe_name (crtc->pipe), pll->active_mask); I915_STATE_WARN(!(pll->state.crtc_mask & crtc_mask), "pll enabled crtcs mismatch (expected 0x%x in 0x%02x)\n",@@ -14103,10 +14103,10 @@ verify_shared_dpll_state(struct intel_crtc *crtc,I915_STATE_WARN (pll->active_mask & crtc_mask,"pll active mismatch (didn't expect pipe %c in active mask)\n" , -pipe_name (drm_crtc_index (&crtc->base))); +pipe_name (crtc->pipe));I915_STATE_WARN (pll->state.crtc_mask & crtc_mask,"pll enabled crtcs mismatch (found %x in enabled mask)\n" , -pipe_name (drm_crtc_index (&crtc->base))); +pipe_name (crtc->pipe)); } }
drivers/gpu/drm/i915/display/intel_display.c static int intel_crtc_init(struct drm_i915_private *dev_priv, enum pipe pipe) · line 16489
Quoted 5 lines
drivers/gpu/drm/i915/display/intel_display.c +0
-2@@ -16485,8 +16485,6 @@ static int intel_crtc_init(struct drm_i915_private *dev_priv, enum pipe pipe)intel_color_init (crtc); -WARN_ON (drm_crtc_index (&crtc->base) != crtc->pipe); -
The first and second hunks don't really have anything to do with each other. Also the WARN_ON() should not be removed until all the assumptions are fixed.
Quoted 5 lines
drivers/gpu/drm/i915/display/intel_display.c +0
-0return 0 ; fail:Signature · 1 line
2.24.0
Signature · 6 lines
Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [RFC 2/6] drm/i915: Remove (pipe == crtc->index) asummption
Quoted 44 lines · Ville Syrjälä
Quoted 43 lines · Anshuman Gupta
we can't have (pipe ==
crtc->index) assumption in
driver in order to support 3 non-contiguous
display pipe system.Cc Ville Syrjälä <[email protected]>Signed-off-by Anshuman Gupta <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +4
-4@@ -14070,11 +14070,11 @@ verify_single_dpll_state(struct drm_i915_private *dev_priv,if (new_crtc_state->hw.active)I915_STATE_WARN (!(pll->active_mask & crtc_mask),"pll active mismatch (expected pipe %c in active mask 0x%02x)\n" , -pipe_name (drm_crtc_index (&crtc->base)), pll->active_mask); +pipe_name (crtc->pipe), pll->active_mask);else I915_STATE_WARN (pll->active_mask & crtc_mask,"pll active mismatch (didn't expect pipe %c in active mask 0x%02x)\n" , -pipe_name (drm_crtc_index (&crtc->base)), pll->active_mask); +pipe_name (crtc->pipe), pll->active_mask); I915_STATE_WARN(!(pll->state.crtc_mask & crtc_mask), "pll enabled crtcs mismatch (expected 0x%x in 0x%02x)\n",@@ -14103,10 +14103,10 @@ verify_shared_dpll_state(struct intel_crtc *crtc,I915_STATE_WARN (pll->active_mask & crtc_mask,"pll active mismatch (didn't expect pipe %c in active mask)\n" , -pipe_name (drm_crtc_index (&crtc->base))); +pipe_name (crtc->pipe));I915_STATE_WARN (pll->state.crtc_mask & crtc_mask,"pll enabled crtcs mismatch (found %x in enabled mask)\n" , -pipe_name (drm_crtc_index (&crtc->base))); +pipe_name (crtc->pipe)); } }@@ -16485,8 +16485,6 @@ static int intel_crtc_init(struct drm_i915_private *dev_priv, enum pipe pipe)
Quoted 8 lines
drivers/gpu/drm/i915/display/intel_display.c static int intel_crtc_init(struct drm_i915_private *dev_priv, enum pipe pipe) · line 16489
Quoted 4 lines
drivers/gpu/drm/i915/display/intel_display.c +0
-2intel_color_init (crtc); -WARN_ON (drm_crtc_index (&crtc->base) != crtc->pipe); -The first and second hunks don't really have anything to do with each other. Also the
WARN_ON()should not be removed until all the assumptions are fixed.
True there can be other assumptions as well, there are few, i have come to know drm_handle_vblank(&dev_priv->drm, pipe) in gen8_de_irq_handler() drm_wait_one_vblank(&dev_priv->drm, pipe) in intel_wait_for_vblank(), i will fix these assumptions is next update, are there any other similar kind of assumption on which u can throw some light to look for?
I am not sure how does above WARN_ON helps to know all such kind of assumptions, but it make sense to have it with FIXME.
Thanks,
Anshuman Gupta.
Quoted 10 lines
Quoted 6 lines
drivers/gpu/drm/i915/display/intel_display.c +0
-0return 0 ; fail:Signature · 1 line
2.24.0Signature · 2 lines
Ville Syrjälä Intel
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [RFC 2/6] drm/i915: Remove (pipe == crtc->index) asummption
Quoted 47 lines · Anshuman Gupta
Quoted 46 lines · Ville Syrjälä
Quoted 45 lines · Anshuman Gupta
we can't have (pipe ==
crtc->index) assumption in
driver in order to support 3 non-contiguous
display pipe system.Cc Ville Syrjälä <[email protected]>Signed-off-by Anshuman Gupta <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +4
-4@@ -14070,11 +14070,11 @@ verify_single_dpll_state(struct drm_i915_private *dev_priv,if (new_crtc_state->hw.active)I915_STATE_WARN (!(pll->active_mask & crtc_mask),"pll active mismatch (expected pipe %c in active mask 0x%02x)\n" , -pipe_name (drm_crtc_index (&crtc->base)), pll->active_mask); +pipe_name (crtc->pipe), pll->active_mask);else I915_STATE_WARN (pll->active_mask & crtc_mask,"pll active mismatch (didn't expect pipe %c in active mask 0x%02x)\n" , -pipe_name (drm_crtc_index (&crtc->base)), pll->active_mask); +pipe_name (crtc->pipe), pll->active_mask); I915_STATE_WARN(!(pll->state.crtc_mask & crtc_mask), "pll enabled crtcs mismatch (expected 0x%x in 0x%02x)\n",@@ -14103,10 +14103,10 @@ verify_shared_dpll_state(struct intel_crtc *crtc,I915_STATE_WARN (pll->active_mask & crtc_mask,"pll active mismatch (didn't expect pipe %c in active mask)\n" , -pipe_name (drm_crtc_index (&crtc->base))); +pipe_name (crtc->pipe));I915_STATE_WARN (pll->state.crtc_mask & crtc_mask,"pll enabled crtcs mismatch (found %x in enabled mask)\n" , -pipe_name (drm_crtc_index (&crtc->base))); +pipe_name (crtc->pipe)); } }@@ -16485,8 +16485,6 @@ static int intel_crtc_init(struct drm_i915_private *dev_priv, enum pipe pipe)intel_color_init (crtc);
Quoted 8 lines
Quoted 6 lines
drivers/gpu/drm/i915/display/intel_display.c static int intel_crtc_init(struct drm_i915_private *dev_priv, enum pipe pipe) · line 16489
Quoted 2 lines
drivers/gpu/drm/i915/display/intel_display.c +0
-2-WARN_ON (drm_crtc_index (&crtc->base) != crtc->pipe); -The first and second hunks don't really have anything to do with each other. Also the
WARN_ON()should not be removed until all the assumptions are fixed.True there can be other assumptions as well, there are few, i have come to know
drm_handle_vblank(&dev_priv->drm, pipe)ingen8_de_irq_handler()
In fact it's in all irq handlers.
Quoted 1 line
drm_wait_one_vblank(&dev_priv->drm, pipe)inintel_wait_for_vblank(),
Good catch. Totally forgot about these.
Quoted 4 lines
i will fix these assumptions is next update, are there any other similar kind of assumption on which u can throw some light to look for?
I am not sure how does aboveWARN_ONhelps to know all such kind of assumptions, but it make sense to have it with FIXME.
It doesn't help finding them, what it does is make people realize that they're running a driver which is known to be broken.
Signature · 6 lines
Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [RFC 2/6] drm/i915: Remove (pipe == crtc->index) asummption
Quoted 63 lines · Ville Syrjälä
Quoted 47 lines · Anshuman Gupta
Quoted 46 lines · Ville Syrjälä
Quoted 45 lines · Anshuman Gupta
we can't have (pipe ==
crtc->index) assumption in
driver in order to support 3 non-contiguous
display pipe system.Cc Ville Syrjälä <[email protected]>Signed-off-by Anshuman Gupta <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +4
-4@@ -14070,11 +14070,11 @@ verify_single_dpll_state(struct drm_i915_private *dev_priv,if (new_crtc_state->hw.active)I915_STATE_WARN (!(pll->active_mask & crtc_mask),"pll active mismatch (expected pipe %c in active mask 0x%02x)\n" , -pipe_name (drm_crtc_index (&crtc->base)), pll->active_mask); +pipe_name (crtc->pipe), pll->active_mask);else I915_STATE_WARN (pll->active_mask & crtc_mask,"pll active mismatch (didn't expect pipe %c in active mask 0x%02x)\n" , -pipe_name (drm_crtc_index (&crtc->base)), pll->active_mask); +pipe_name (crtc->pipe), pll->active_mask); I915_STATE_WARN(!(pll->state.crtc_mask & crtc_mask), "pll enabled crtcs mismatch (expected 0x%x in 0x%02x)\n",@@ -14103,10 +14103,10 @@ verify_shared_dpll_state(struct intel_crtc *crtc,I915_STATE_WARN (pll->active_mask & crtc_mask,"pll active mismatch (didn't expect pipe %c in active mask)\n" , -pipe_name (drm_crtc_index (&crtc->base))); +pipe_name (crtc->pipe));I915_STATE_WARN (pll->state.crtc_mask & crtc_mask,"pll enabled crtcs mismatch (found %x in enabled mask)\n" , -pipe_name (drm_crtc_index (&crtc->base))); +pipe_name (crtc->pipe)); } }@@ -16485,8 +16485,6 @@ static int intel_crtc_init(struct drm_i915_private *dev_priv, enum pipe pipe)intel_color_init (crtc);Quoted 8 lines
Quoted 6 lines
drivers/gpu/drm/i915/display/intel_display.c static int intel_crtc_init(struct drm_i915_private *dev_priv, enum pipe pipe) · line 16489
Quoted 2 lines
drivers/gpu/drm/i915/display/intel_display.c +0
-2-WARN_ON (drm_crtc_index (&crtc->base) != crtc->pipe); -The first and second hunks don't really have anything to do with each other. Also the
WARN_ON()should not be removed until all the assumptions are fixed.True there can be other assumptions as well, there are few, i have come to know
drm_handle_vblank(&dev_priv->drm, pipe)ingen8_de_irq_handler()In fact it's in all irq handlers.
Quoted 1 line
drm_wait_one_vblank(&dev_priv->drm, pipe)inintel_wait_for_vblank(),Good catch. Totally forgot about these.
Quoted 7 lines
Quoted 4 lines
i will fix these assumptions is next update, are there any other similar kind of assumption on which u can throw some light to look for?
I am not sure how does aboveWARN_ONhelps to know all such kind of assumptions, but it make sense to have it with FIXME.It doesn't help finding them, what it does is make people realize that they're running a driver which is known to be broken.
Just remembered another borked thing: trans_offsets[]. Some places use that to check if the transcoder is present, and we don't take fusing into account when filling that. Though looks like intel_display_capture_error_state() is the only place where can actually do the wrong thing (assuming EDP/DSI transcoders are never fused off).
Signature · 6 lines
Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [RFC 2/6] drm/i915: Remove (pipe == crtc->index) asummption
In reply to Anshuman GuptaQuoted 6 lines · Anshuman Gupta
we can't have (pipe ==
crtc->index) assumption in
driver in order to support 3 non-contiguous
display pipe system.Cc Ville Syrjälä <[email protected]>Signed-off-by Anshuman Gupta <[email protected]>
Quoted 44 lines
--- drivers/gpu/drm/i915/display/intel_display.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +4
-6@@ -14070,11 +14070,11 @@ verify_single_dpll_state(struct drm_i915_private *dev_priv,if (new_crtc_state->hw.active)I915_STATE_WARN (!(pll->active_mask & crtc_mask),"pll active mismatch (expected pipe %c in active mask 0x%02x)\n" , -pipe_name (drm_crtc_index (&crtc->base)), pll->active_mask); +pipe_name (crtc->pipe), pll->active_mask);else I915_STATE_WARN (pll->active_mask & crtc_mask,"pll active mismatch (didn't expect pipe %c in active mask 0x%02x)\n" , -pipe_name (drm_crtc_index (&crtc->base)), pll->active_mask); +pipe_name (crtc->pipe), pll->active_mask); I915_STATE_WARN(!(pll->state.crtc_mask & crtc_mask), "pll enabled crtcs mismatch (expected 0x%x in 0x%02x)\n",@@ -14103,10 +14103,10 @@ verify_shared_dpll_state(struct intel_crtc *crtc,I915_STATE_WARN (pll->active_mask & crtc_mask,"pll active mismatch (didn't expect pipe %c in active mask)\n" , -pipe_name (drm_crtc_index (&crtc->base))); +pipe_name (crtc->pipe));I915_STATE_WARN (pll->state.crtc_mask & crtc_mask,"pll enabled crtcs mismatch (found %x in enabled mask)\n" , -pipe_name (drm_crtc_index (&crtc->base))); +pipe_name (crtc->pipe)); } }@@ -16485,8 +16485,6 @@ static int intel_crtc_init(struct drm_i915_private *dev_priv, enum pipe pipe)intel_color_init (crtc); -WARN_ON (drm_crtc_index (&crtc->base) != crtc->pipe); -return 0 ; fail:
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 3/6 drm/i915: Fix wrongly populated plane possible_crtcs bit mask
In reply to Anshuman GuptaAs a disabled pipe in pipe_mask is not having a valid intel crtc, driver wrongly populates the possible_crtcs mask while initializing the plane for a CRTC. Fixing up the plane possible_crtc mask.
--- drivers/gpu/drm/i915/display/intel_display.c | 23 ++++++++++++++++++++ 1 file changed, 23 insertions(+)
drivers/gpu/drm/i915/display/intel_display.c +23 -0
@@ -16407,6 +16407,28 @@ static void intel_crtc_free(struct intel_crtc *crtc)kfree (crtc); } +static void intel_plane_possible_crtc_fixup (struct drm_i915_private *dev_priv) +{ +struct intel_crtc *crtc; +struct intel_plane *plane; + +/* +* if in case the disabled fused pipe is not the last pipe, +* it requires to fix the wrong populated possible_crtcs mask. +*/ +if (is_power_of_2 (INTEL_INFO (dev_priv)->pipe_mask +1 )) +return ; + +for_each_intel_crtc (&dev_priv->drm, crtc) { +for_each_intel_plane_on_crtc (&dev_priv->drm, crtc, plane) { +if (WARN_ON (!(plane->base.possible_crtcs &BIT (crtc->pipe)))) +return ; + plane->base.possible_crtcs = +drm_crtc_mask (&crtc->base); + } + } +} +static int intel_crtc_init (struct drm_i915_private *dev_priv,enum pipe pipe) {struct intel_plane *primary, *cursor;
@@ -17544,6 +17566,7 @@ int intel_modeset_init(struct drm_i915_private *i915) } } +intel_plane_possible_crtc_fixup (i915);intel_shared_dpll_init (dev);intel_update_fdi_pll_freq (i915);
Signature · 6 lines
2.24.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [RFC 3/6] drm/i915: Fix wrongly populated plane possible_crtcs bit mask
Quoted 19 lines · Anshuman Gupta
As a disabled pipe in
pipe_maskis not having a valid intel crtc, driver wrongly populates thepossible_crtcsmask while initializing the plane for a CRTC. Fixing up the planepossible_crtcmask.Cc Ville Syrjälä <[email protected]>Signed-off-by Anshuman Gupta <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.c | 23 ++++++++++++++++++++ 1 file changed, 23 insertions(+)drivers/gpu/drm/i915/display/intel_display.c +1
-0@@ -16407,6 +16407,28 @@ static void intel_crtc_free(struct intel_crtc *crtc)kfree (crtc); } +static void intel_plane_possible_crtc_fixup (struct drm_i915_private *dev_priv)
drivers/gpu/drm/i915/display/intel_display.c static void intel_crtc_free(struct intel_crtc *crtc) · line 16420
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_display.c +10
-0+{ +struct intel_crtc *crtc; +struct intel_plane *plane; + +/* +* if in case the disabled fused pipe is not the last pipe, +* it requires to fix the wrong populated possible_crtcs mask. +*/ +if (is_power_of_2 (INTEL_INFO (dev_priv)->pipe_mask +1 )) +return ;
I don't undestand what you're trying to do here. Looks totally pointless.
drivers/gpu/drm/i915/display/intel_display.c static void intel_crtc_free(struct intel_crtc *crtc) · line 16425
Quoted 5 lines
drivers/gpu/drm/i915/display/intel_display.c +5
-0+ +for_each_intel_crtc (&dev_priv->drm, crtc) { +for_each_intel_plane_on_crtc (&dev_priv->drm, crtc, plane) { +if (WARN_ON (!(plane->base.possible_crtcs &BIT (crtc->pipe)))) +return ;
Rather ugly abuse of possible_crtcs. I would remove the current possible_crtcs assignments totally, and just do something simple like
for_each_intel_plane() {
crtc = crtc_for_pipe(plane->pipe);
plane->possible_crtcs = crtc_mask(&crtc->base);
}Quoted 19 lines
drivers/gpu/drm/i915/display/intel_display.c +7
-0+ plane->base.possible_crtcs = +drm_crtc_mask (&crtc->base); + } + } +} +static int intel_crtc_init (struct drm_i915_private *dev_priv,enum pipe pipe) {struct intel_plane *primary, *cursor;@@ -17544,6 +17566,7 @@ int intel_modeset_init(struct drm_i915_private *i915) } } +intel_plane_possible_crtc_fixup (i915);intel_shared_dpll_init (dev);intel_update_fdi_pll_freq (i915);Signature · 1 line
2.24.0
Signature · 6 lines
Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 4/6 drm/i915: Get right max plane stride
In reply to Anshuman Guptaintel_plane_fb_max_stride should return the max stride of primary plane for first available pipe in intel device info pipe_mask.
--- drivers/gpu/drm/i915/display/intel_display.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +5 -2
@@ -2703,12 +2703,15 @@ u32 intel_plane_fb_max_stride(struct drm_i915_private *dev_priv, {struct intel_crtc *crtc;struct intel_plane *plane; +enum pipe pipe;/* * We assume the primary plane for pipe A has -* the highest stride limits of them all. +* the highest stride limits of them all, +* if in case pipe A is disabled, use the first pipe from pipe_mask. */ - crtc =intel_get_crtc_for_pipe (dev_priv,PIPE_A ); + pipe =ffs (INTEL_INFO (dev_priv)->pipe_mask) -1 ; + crtc =intel_get_crtc_for_pipe (dev_priv, pipe);if (!crtc)return 0 ;
Signature · 6 lines
2.24.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [RFC 4/6] drm/i915: Get right max plane stride
Quoted 19 lines · Anshuman Gupta
intel_plane_fb_max_strideshould return the max stride of primary plane for first available pipe in intel device infopipe_mask.Cc Ville Syrjälä <[email protected]>Signed-off-by Anshuman Gupta <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +1
-0@@ -2703,12 +2703,15 @@ u32 intel_plane_fb_max_stride(struct drm_i915_private *dev_priv, {struct intel_crtc *crtc;struct intel_plane *plane; +enum pipe pipe;
drivers/gpu/drm/i915/display/intel_display.c u32 intel_plane_fb_max_stride(struct drm_i915_private *dev_priv, · line 2714
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_display.c +4
-2/* * We assume the primary plane for pipe A has -* the highest stride limits of them all. +* the highest stride limits of them all, +* if in case pipe A is disabled, use the first pipe from pipe_mask. */ - crtc =intel_get_crtc_for_pipe (dev_priv,PIPE_A ); + pipe =ffs (INTEL_INFO (dev_priv)->pipe_mask) -1 ; + crtc =intel_get_crtc_for_pipe (dev_priv, pipe);
I'd probably just add a small helper for this. Eg.:
intel_get_first_crtc()
{
return to_intel_crtc(drm_crtc_from_index(0))
}
Quoted 5 lines
drivers/gpu/drm/i915/display/intel_display.c +0
-0if (!crtc)return 0 ;Signature · 1 line
2.24.0
Signature · 6 lines
Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 5/6 drm/i915: Add WARN_ON in intel_get_crtc_for_pipe()
In reply to Anshuman GuptaAdd a WARN_ON for a disabled pipe in pipe_mask atintel_get_crtc_for_pipe() function.
--- drivers/gpu/drm/i915/display/intel_display_types.h | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/i915/display/intel_display_types.h +2 -0
@@ -1426,6 +1426,8 @@ vlv_pipe_to_channel(enum pipe pipe)static inline struct intel_crtc *intel_get_crtc_for_pipe (struct drm_i915_private *dev_priv,enum pipe pipe) { +/* pipe_to_crtc_mapping may have hole on any of 3 display pipe system */ +WARN_ON (!(INTEL_INFO (dev_priv)->pipe_mask &BIT (pipe)));return dev_priv->pipe_to_crtc_mapping[pipe]; }
Signature · 6 lines
2.24.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [RFC 5/6] drm/i915: Add WARN_ON in intel_get_crtc_for_pipe()
Quoted 14 lines · Anshuman Gupta
Add a
WARN_ONfor a disabled pipe inpipe_maskatintel_get_crtc_for_pipe()function.Cc Ville Syrjälä <[email protected]>Signed-off-by Anshuman Gupta <[email protected]>--- drivers/gpu/drm/i915/display/intel_display_types.h | 2 ++ 1 file changed, 2 insertions(+)drivers/gpu/drm/i915/display/intel_display_types.h +0
-0
drivers/gpu/drm/i915/display/intel_display_types.h vlv_pipe_to_channel(enum pipe pipe) · line 1430
Quoted 5 lines
drivers/gpu/drm/i915/display/intel_display_types.h +2
-0@@ -1426,6 +1426,8 @@ vlv_pipe_to_channel(enum pipe pipe)static inline struct intel_crtc *intel_get_crtc_for_pipe (struct drm_i915_private *dev_priv,enum pipe pipe) { +/* pipe_to_crtc_mapping may have hole on any of 3 display pipe system */ +WARN_ON (!(INTEL_INFO (dev_priv)->pipe_mask &BIT (pipe)));
Sure. Might help catch accidents where the caller does a NULL check and thus doesn't oops.
Quoted 5 lines
drivers/gpu/drm/i915/display/intel_display_types.h +0
-0return dev_priv->pipe_to_crtc_mapping[pipe]; }Signature · 1 line
2.24.0
Signature · 6 lines
Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 6/6 drm/i915: Enable 3 display pipes support
In reply to Anshuman GuptaAllow 3-display pipes SKU system with any combination in INTEL_INFO pipe mask.
B.Spec:50075
--- drivers/gpu/drm/i915/intel_device_info.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_device_info.c +4 -3
@@ -997,10 +997,11 @@ void intel_device_info_runtime_init(struct drm_i915_private *dev_priv)/* * At least one pipe should be enabled and if there are -* disabled pipes, they should be the last ones, with no holes -* in the mask. +* disabled pipes, up to Display Gen<=12, they should be the +* last ones, with no holses in the mask. */ -if (enabled_mask ==0 || !is_power_of_2 (enabled_mask +1 )) +if (enabled_mask ==0 || (!is_power_of_2 (enabled_mask +1 ) && + (INTEL_GEN (dev_priv) <=11 ||IS_TIGERLAKE (dev_priv))))drm_err (&dev_priv->drm,"invalid pipe fuse configuration: enabled_mask=0x%x\n" , enabled_mask);
Signature · 6 lines
2.24.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [RFC 6/6] drm/i915: Enable 3 display pipes support
Quoted 16 lines · Anshuman Gupta
Allow 3-display pipes SKU system with any combination in
INTEL_INFOpipe mask.
B.Spec:50075Cc Ville Syrjälä <[email protected]>Signed-off-by Anshuman Gupta <[email protected]>--- drivers/gpu/drm/i915/intel_device_info.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/intel_device_info.c +0
-0@@ -997,10 +997,11 @@ void intel_device_info_runtime_init(struct drm_i915_private *dev_priv)
drivers/gpu/drm/i915/intel_device_info.c void intel_device_info_runtime_init(struct drm_i915_private *dev_priv) · line 1004
Quoted 10 lines
drivers/gpu/drm/i915/intel_device_info.c +4
-3/* * At least one pipe should be enabled and if there are -* disabled pipes, they should be the last ones, with no holes -* in the mask. +* disabled pipes, up to Display Gen<=12, they should be the +* last ones, with no holses in the mask. */ -if (enabled_mask ==0 || !is_power_of_2 (enabled_mask +1 )) +if (enabled_mask ==0 || (!is_power_of_2 (enabled_mask +1 ) && + (INTEL_GEN (dev_priv) <=11 ||IS_TIGERLAKE (dev_priv))))
intel_pipe_mask_is_valid() or something to avoid this horror show in the if condition.
Quoted 5 lines
drivers/gpu/drm/i915/intel_device_info.c +0
-0drm_err (&dev_priv->drm,"invalid pipe fuse configuration: enabled_mask=0x%x\n" , enabled_mask);Signature · 1 line
2.24.0
Signature · 6 lines
Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for 3 display pipes combination system support
In reply to Anshuman Gupta== Series Details ==
== Series Details ==
Series: 3 display pipes combination system support
URL : https://patchwork.freedesktop.org/series/72468/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip ff6c602c84d0 drm/i915: Iterate over pipe and skip the disabled one dbdf2193b56c drm/i915: Remove (pipe == crtc->index) asummption d0cb3e6e2556 drm/i915: Fix wrongly populated plane possible_crtcs bit mask 3d9a940bfc7e drm/i915: Get right max plane stride 7c0eef4e0e3c drm/i915: Add WARN_ON in intel_get_crtc_for_pipe() ca9423f88fb2 drm/i915: Enable 3 display pipes support -:31: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #31: FILE: drivers/gpu/drm/i915/intel_device_info.c:1004: + if (enabled_mask == 0 || (!is_power_of_2(enabled_mask + 1) && + (INTEL_GEN(dev_priv) <= 11 || IS_TIGERLAKE(dev_priv))))
total: 0 errors, 0 warnings, 1 checks, 14 lines checked
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✓ Fi.CI.BAT: success for 3 display pipes combination system support
In reply to Anshuman Gupta== Series Details ==
== Series Details ==
Series: 3 display pipes combination system support
URL : https://patchwork.freedesktop.org/series/72468/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_7804 -> Patchwork_16235
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/index.html
Known issues
------------
Here are the changes found in Patchwork_16235 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_parallel@fds:
- fi-byt-n2820: [PASS][1] -> [TIMEOUT][2] ([fdo#112271])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7804/fi-byt-n2820/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/fi-byt-n2820/igt@[email protected]
* igt@i915_module_load@reload-with-fault-injection:
- fi-cfl-guc: [PASS][3] -> [INCOMPLETE][4] ([i915#505] / [i915#671])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7804/fi-cfl-guc/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/fi-cfl-guc/igt@[email protected]
* igt@i915_selftest@live_gem_contexts:
- fi-byt-n2820: [PASS][5] -> [DMESG-FAIL][6] ([i915#722])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7804/fi-byt-n2820/igt@i915_selftest@live_gem_contexts.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/fi-byt-n2820/igt@i915_selftest@live_gem_contexts.html
* igt@kms_chamelium@dp-edid-read:
- fi-cml-u2: [PASS][7] -> [FAIL][8] ([i915#217])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7804/fi-cml-u2/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/fi-cml-u2/igt@[email protected]
* igt@prime_vgem@basic-gtt:
- fi-tgl-y: [PASS][9] -> [DMESG-WARN][10] ([CI#94] / [i915#402]) +1 similar issue
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7804/fi-tgl-y/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/fi-tgl-y/igt@[email protected]
#### Possible fixes ####
* igt@gem_close_race@basic-threads:
- fi-byt-j1900: [TIMEOUT][11] ([fdo#112271] / [i915#816]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7804/fi-byt-j1900/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/fi-byt-j1900/igt@[email protected]
* igt@gem_exec_parallel@contexts:
- fi-byt-n2820: [TIMEOUT][13] ([fdo#112271]) -> [PASS][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7804/fi-byt-n2820/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/fi-byt-n2820/igt@[email protected]
* igt@i915_selftest@live_blt:
- fi-hsw-4770r: [DMESG-FAIL][15] ([i915#725]) -> [PASS][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7804/fi-hsw-4770r/igt@i915_selftest@live_blt.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/fi-hsw-4770r/igt@i915_selftest@live_blt.html
* igt@kms_addfb_basic@bad-pitch-0:
- fi-tgl-y: [DMESG-WARN][17] ([CI#94] / [i915#402]) -> [PASS][18] +1 similar issue
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7804/fi-tgl-y/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/fi-tgl-y/igt@[email protected]
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7500u: [FAIL][19] ([fdo#111096] / [i915#323]) -> [PASS][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7804/fi-kbl-7500u/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/fi-kbl-7500u/igt@[email protected]
#### Warnings ####
* igt@i915_selftest@live_blt:
- fi-hsw-4770: [DMESG-FAIL][21] ([i915#725]) -> [DMESG-FAIL][22] ([i915#553] / [i915#725])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7804/fi-hsw-4770/igt@i915_selftest@live_blt.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/fi-hsw-4770/igt@i915_selftest@live_blt.html
[CI#94]: https://gitlab.freedesktop.org/gfx-ci/i915-infra/issues/94
[fdo#111096]: https://bugs.freedesktop.org/show_bug.cgi?id=111096
[fdo#112271]: https://bugs.freedesktop.org/show_bug.cgi?id=112271
[i915#217]: https://gitlab.freedesktop.org/drm/intel/issues/217
[i915#323]: https://gitlab.freedesktop.org/drm/intel/issues/323
[i915#402]: https://gitlab.freedesktop.org/drm/intel/issues/402
[i915#505]: https://gitlab.freedesktop.org/drm/intel/issues/505
[i915#553]: https://gitlab.freedesktop.org/drm/intel/issues/553
[i915#671]: https://gitlab.freedesktop.org/drm/intel/issues/671
[i915#722]: https://gitlab.freedesktop.org/drm/intel/issues/722
[i915#725]: https://gitlab.freedesktop.org/drm/intel/issues/725
[i915#816]: https://gitlab.freedesktop.org/drm/intel/issues/816
Participating hosts (49 -> 43)
------------------------------
Additional (3): fi-hsw-peppy fi-kbl-7560u fi-snb-2600
Missing (9): fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-bwr-2160 fi-ilk-650 fi-ctg-p8600 fi-bdw-samus fi-byt-clapper fi-skl-6700k2
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_7804 -> Patchwork_16235
CI-20190529: 20190529
CI_DRM_7804: 74ed9d57007ab848a57ec6d785de4187b70acd9b @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5382: 8dbe5ce61baa2d563d4dd7c56a018bb1e1077467 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_16235: ca9423f88fb22b387a66c32a457a53f172388a1b @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
ca9423f88fb2 drm/i915: Enable 3 display pipes support 7c0eef4e0e3c drm/i915: Add WARN_ON in intel_get_crtc_for_pipe() 3d9a940bfc7e drm/i915: Get right max plane strided0cb3e6e2556 drm/i915: Fix wrongly populated plane possible_crtcs bit mask dbdf2193b56c drm/i915: Remove (pipe == crtc->index) asummption ff6c602c84d0 drm/i915: Iterate over pipe and skip the disabled one
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✓ Fi.CI.IGT: success for 3 display pipes combination system support
In reply to Anshuman Gupta== Series Details ==
== Series Details ==
Series: 3 display pipes combination system support
URL : https://patchwork.freedesktop.org/series/72468/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_7804_full -> Patchwork_16235_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_16235_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_busy@busy-vcs1:
- shard-iclb: [PASS][1] -> [SKIP][2] ([fdo#112080]) +16 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7804/shard-iclb4/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/shard-iclb5/igt@[email protected]
* igt@gem_ctx_persistence@vcs1-mixed:
- shard-iclb: [PASS][3] -> [SKIP][4] ([fdo#109276] / [fdo#112080]) +2 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7804/shard-iclb4/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/shard-iclb8/igt@[email protected]
* igt@gem_ctx_persistence@vecs0-mixed-process:
- shard-glk: [PASS][5] -> [FAIL][6] ([i915#679])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7804/shard-glk1/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/shard-glk1/igt@[email protected]
* igt@gem_ctx_shared@exec-single-timeline-bsd:
- shard-iclb: [PASS][7] -> [SKIP][8] ([fdo#110841])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7804/shard-iclb7/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/shard-iclb4/igt@[email protected]
* igt@gem_eio@kms:
- shard-snb: [PASS][9] -> [INCOMPLETE][10] ([i915#82])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7804/shard-snb1/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/shard-snb4/igt@[email protected]
* igt@gem_exec_reloc@basic-gtt-active:
- shard-skl: [PASS][11] -> [DMESG-WARN][12] ([i915#109]) +1 similar issue
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7804/shard-skl7/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/shard-skl7/igt@[email protected]
* igt@gem_exec_schedule@preemptive-hang-bsd:
- shard-iclb: [PASS][13] -> [SKIP][14] ([fdo#112146]) +9 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7804/shard-iclb3/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/shard-iclb2/igt@[email protected]
* igt@gem_persistent_relocs@forked-faulting-reloc-thrashing:
- shard-kbl: [PASS][15] -> [INCOMPLETE][16] ([fdo#103665])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7804/shard-kbl1/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/shard-kbl3/igt@[email protected]
* igt@gem_persistent_relocs@forked-interruptible-faulting-reloc-thrashing:
- shard-glk: [PASS][17] -> [INCOMPLETE][18] ([i915#58] / [i915#970] / [k.org#198133])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7804/shard-glk5/igt@gem_persistent_relocs@forked-interruptible-faulting-reloc-thrashing.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/shard-glk2/igt@gem_persistent_relocs@forked-interruptible-faulting-reloc-thrashing.html
* igt@gem_persistent_relocs@forked-thrashing:
- shard-hsw: [PASS][19] -> [INCOMPLETE][20] ([i915#61]) +1 similar issue
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7804/shard-hsw5/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/shard-hsw6/igt@[email protected]
* igt@i915_pm_rps@waitboost:
- shard-iclb: [PASS][21] -> [FAIL][22] ([i915#413])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7804/shard-iclb4/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/shard-iclb8/igt@[email protected]
* igt@i915_suspend@fence-restore-untiled:
- shard-kbl: [PASS][23] -> [DMESG-WARN][24] ([i915#180]) +1 similar issue
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7804/shard-kbl7/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/shard-kbl4/igt@[email protected]
* igt@kms_color@pipe-b-ctm-green-to-red:
- shard-skl: [PASS][25] -> [FAIL][26] ([i915#129])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7804/shard-skl7/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/shard-skl7/igt@[email protected]
* igt@kms_flip@2x-flip-vs-expired-vblank-interruptible:
- shard-glk: [PASS][27] -> [FAIL][28] ([i915#79])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7804/shard-glk3/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/shard-glk7/igt@[email protected]
* igt@kms_flip@flip-vs-expired-vblank:
- shard-skl: [PASS][29] -> [FAIL][30] ([i915#79])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7804/shard-skl2/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/shard-skl9/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbcpsr-rgb565-draw-blt:
- shard-tglb: [PASS][31] -> [FAIL][32] ([i915#49]) +4 similar issues
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7804/shard-tglb8/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/shard-tglb2/igt@[email protected]
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c:
- shard-apl: [PASS][33] -> [DMESG-WARN][34] ([i915#180])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7804/shard-apl6/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/shard-apl2/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min:
- shard-skl: [PASS][35] -> [FAIL][36] ([fdo#108145])
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7804/shard-skl8/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/shard-skl1/igt@[email protected]
* igt@kms_psr2_su@frontbuffer:
- shard-iclb: [PASS][37] -> [SKIP][38] ([fdo#109642] / [fdo#111068])
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7804/shard-iclb2/igt@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/shard-iclb1/igt@[email protected]
* igt@kms_psr@psr2_sprite_blt:
- shard-iclb: [PASS][39] -> [SKIP][40] ([fdo#109441])
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7804/shard-iclb2/igt@kms_psr@psr2_sprite_blt.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/shard-iclb7/igt@kms_psr@psr2_sprite_blt.html
* igt@kms_setmode@basic:
- shard-apl: [PASS][41] -> [FAIL][42] ([i915#31])
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7804/shard-apl4/igt@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/shard-apl2/igt@[email protected]
* igt@prime_busy@hang-bsd2:
- shard-iclb: [PASS][43] -> [SKIP][44] ([fdo#109276]) +26 similar issues
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7804/shard-iclb1/igt@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/shard-iclb6/igt@[email protected]
#### Possible fixes ####
* igt@gem_ctx_isolation@vcs1-dirty-create:
- shard-iclb: [SKIP][45] ([fdo#109276] / [fdo#112080]) -> [PASS][46] +2 similar issues
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7804/shard-iclb5/igt@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/shard-iclb2/igt@[email protected]
* igt@gem_ctx_persistence@rcs0-mixed-process:
- shard-glk: [FAIL][47] ([i915#679]) -> [PASS][48]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7804/shard-glk3/igt@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/shard-glk1/igt@[email protected]
* igt@gem_ctx_persistence@vecs0-mixed-process:
- shard-tglb: [FAIL][49] ([i915#679]) -> [PASS][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7804/shard-tglb5/igt@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/shard-tglb3/igt@[email protected]
* igt@gem_exec_async@concurrent-writes-bsd:
- shard-iclb: [SKIP][51] ([fdo#112146]) -> [PASS][52] +6 similar issues
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7804/shard-iclb4/igt@[email protected]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/shard-iclb8/igt@[email protected]
* igt@gem_exec_schedule@promotion-bsd1:
- shard-iclb: [SKIP][53] ([fdo#109276]) -> [PASS][54] +13 similar issues
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7804/shard-iclb3/igt@[email protected]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/shard-iclb2/igt@[email protected]
* igt@gem_persistent_relocs@forked-faulting-reloc-thrashing:
- shard-hsw: [INCOMPLETE][55] ([i915#61]) -> [PASS][56]
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7804/shard-hsw1/igt@[email protected]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/shard-hsw2/igt@[email protected]
* igt@gem_persistent_relocs@forked-interruptible-thrashing:
- shard-glk: [INCOMPLETE][57] ([i915#58] / [k.org#198133]) -> [PASS][58]
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7804/shard-glk7/igt@[email protected]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/shard-glk6/igt@[email protected]
* igt@gem_persistent_relocs@forked-thrashing:
- shard-kbl: [INCOMPLETE][59] ([fdo#103665]) -> [PASS][60] +3 similar issues
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7804/shard-kbl6/igt@[email protected]
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/shard-kbl7/igt@[email protected]
* igt@gem_ppgtt@flink-and-close-vma-leak:
- shard-apl: [FAIL][61] ([i915#644]) -> [PASS][62]
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7804/shard-apl7/igt@[email protected]
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/shard-apl8/igt@[email protected]
* igt@i915_selftest@mock_requests:
- shard-tglb: [INCOMPLETE][63] ([i915#472]) -> [PASS][64]
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7804/shard-tglb4/igt@i915_selftest@mock_requests.html
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/shard-tglb8/igt@i915_selftest@mock_requests.html
- shard-apl: [INCOMPLETE][65] ([fdo#103927]) -> [PASS][66]
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7804/shard-apl7/igt@i915_selftest@mock_requests.html
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/shard-apl1/igt@i915_selftest@mock_requests.html
* igt@i915_suspend@fence-restore-tiled2untiled:
- shard-apl: [DMESG-WARN][67] ([i915#180]) -> [PASS][68] +3 similar issues
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7804/shard-apl4/igt@[email protected]
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/shard-apl7/igt@[email protected]
* igt@kms_color@pipe-b-ctm-0-75:
- shard-skl: [DMESG-WARN][69] ([i915#109]) -> [PASS][70]
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7804/shard-skl2/igt@[email protected]
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/shard-skl1/igt@[email protected]
* igt@kms_flip@flip-vs-suspend-interruptible:
- shard-skl: [INCOMPLETE][71] ([i915#221]) -> [PASS][72]
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7804/shard-skl6/igt@[email protected]
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/shard-skl10/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-spr-indfb-draw-blt:
- shard-tglb: [FAIL][73] ([i915#49]) -> [PASS][74] +1 similar issue
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7804/shard-tglb8/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-spr-indfb-draw-blt.html
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/shard-tglb2/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-spr-indfb-draw-blt.html
* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes:
- shard-kbl: [DMESG-WARN][75] ([i915#180]) -> [PASS][76] +2 similar issues
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7804/shard-kbl6/igt@[email protected]
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/shard-kbl7/igt@[email protected]
* igt@kms_psr2_su@page_flip:
- shard-iclb: [SKIP][77] ([fdo#109642] / [fdo#111068]) -> [PASS][78]
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7804/shard-iclb3/igt@kms_psr2_su@page_flip.html
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/shard-iclb2/igt@kms_psr2_su@page_flip.html
* igt@kms_psr@psr2_cursor_render:
- shard-iclb: [SKIP][79] ([fdo#109441]) -> [PASS][80] +2 similar issues
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7804/shard-iclb5/igt@kms_psr@psr2_cursor_render.html
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/shard-iclb2/igt@kms_psr@psr2_cursor_render.html
* igt@perf_pmu@init-busy-vcs1:
- shard-iclb: [SKIP][81] ([fdo#112080]) -> [PASS][82] +9 similar issues
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7804/shard-iclb8/igt@[email protected]
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/shard-iclb1/igt@[email protected]
#### Warnings ####
* igt@gem_tiled_blits@interruptible:
- shard-hsw: [FAIL][83] ([i915#818]) -> [FAIL][84] ([i915#694])
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7804/shard-hsw7/igt@[email protected]
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/shard-hsw2/igt@[email protected]
* igt@i915_pm_rpm@basic-pci-d3-state:
- shard-snb: [SKIP][85] ([fdo#109271]) -> [INCOMPLETE][86] ([i915#82])
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7804/shard-snb5/igt@[email protected]
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/shard-snb2/igt@[email protected]
* igt@i915_selftest@live_blt:
- shard-hsw: [DMESG-FAIL][87] ([i915#770]) -> [DMESG-FAIL][88] ([i915#725])
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7804/shard-hsw8/igt@i915_selftest@live_blt.html
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/shard-hsw8/igt@i915_selftest@live_blt.html
* igt@kms_atomic_transition@3x-modeset-transitions:
- shard-hsw: [SKIP][89] ([fdo#109271] / [i915#439]) -> [SKIP][90] ([fdo#109271])
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7804/shard-hsw2/igt@[email protected]
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/shard-hsw1/igt@[email protected]
[fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#110841]: https://bugs.freedesktop.org/show_bug.cgi?id=110841
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#112080]: https://bugs.freedesktop.org/show_bug.cgi?id=112080
[fdo#112146]: https://bugs.freedesktop.org/show_bug.cgi?id=112146
[i915#109]: https://gitlab.freedesktop.org/drm/intel/issues/109
[i915#129]: https://gitlab.freedesktop.org/drm/intel/issues/129
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#221]: https://gitlab.freedesktop.org/drm/intel/issues/221
[i915#31]: https://gitlab.freedesktop.org/drm/intel/issues/31
[i915#413]: https://gitlab.freedesktop.org/drm/intel/issues/413
[i915#439]: https://gitlab.freedesktop.org/drm/intel/issues/439
[i915#472]: https://gitlab.freedesktop.org/drm/intel/issues/472
[i915#49]: https://gitlab.freedesktop.org/drm/intel/issues/49
[i915#58]: https://gitlab.freedesktop.org/drm/intel/issues/58
[i915#61]: https://gitlab.freedesktop.org/drm/intel/issues/61
[i915#644]: https://gitlab.freedesktop.org/drm/intel/issues/644
[i915#679]: https://gitlab.freedesktop.org/drm/intel/issues/679
[i915#694]: https://gitlab.freedesktop.org/drm/intel/issues/694
[i915#725]: https://gitlab.freedesktop.org/drm/intel/issues/725
[i915#770]: https://gitlab.freedesktop.org/drm/intel/issues/770
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
[i915#818]: https://gitlab.freedesktop.org/drm/intel/issues/818
[i915#82]: https://gitlab.freedesktop.org/drm/intel/issues/82
[i915#970]: https://gitlab.freedesktop.org/drm/intel/issues/970
[k.org#198133]: https://bugzilla.kernel.org/show_bug.cgi?id=198133
Participating hosts (10 -> 10)
------------------------------
No changes in participating hosts
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_7804 -> Patchwork_16235
CI-20190529: 20190529
CI_DRM_7804: 74ed9d57007ab848a57ec6d785de4187b70acd9b @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5382: 8dbe5ce61baa2d563d4dd7c56a018bb1e1077467 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_16235: ca9423f88fb22b387a66c32a457a53f172388a1b @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16235/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx