drm/i915: Fix up the CCS code
Subsystems (3)
v2 cover drm/i915: Fix up the CCS code
From: Ville Syrjälä <[email protected]>
Here's a rebased series of the remaining CCS patches. Apart from the rebase and some commit message changes nothing has changed.
Ville Syrjälä (8):
drm/i915: Add a comment exlaining CCS hsub/vsub
drm/i915: Nuke a pointless unreachable()
drm/i915: Add the missing Y/Yf modifiers for SKL+ sprites drm/i915: Clean up the sprite modifier checks
drm/i915: Add CCS capability for sprites
drm/i915: Allow up to 32KB stride on SKL+ "sprites"
drm: Check that the plane supports the request format+modifier combo drm/i915: Remove the pipe/plane ID checks from
skl_check_ccs_aux_surface()
drivers/gpu/drm/drm_atomic.c | 10 ++-- drivers/gpu/drm/drm_crtc.c | 10 ++-- drivers/gpu/drm/drm_crtc_internal.h | 4 +- drivers/gpu/drm/drm_plane.c | 33 ++++++++--- drivers/gpu/drm/i915/intel_display.c | 36 +++--------- drivers/gpu/drm/i915/intel_drv.h | 2 + drivers/gpu/drm/i915/intel_sprite.c | 103 ++++++++++++++++++++++++----------- 7 files changed, 121 insertions(+), 77 deletions(-)
Signature · 6 lines
2.13.6 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 1/8 drm/i915: Add a comment exlaining CCS hsub/vsub
From: Ville Syrjälä <[email protected]>
Let's document why we claim hsub==8,vsub==16 for CCS even though the memory layout would suggest that we use 16x8 instead.
--- drivers/gpu/drm/i915/intel_display.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/gpu/drm/i915/intel_display.c +7 -0
@@ -2387,6 +2387,13 @@ static unsigned int intel_fb_modifier_to_tiling(uint64_t fb_modifier) } } +/* +* 1 byte of CCS actually corresponds to 16x8 pixels on the main +* surface, and the memory layout for the CCS tile is 64x64 bytes. +* But since we're pretending the CCS tile is 128 bytes wide we +* adjust hsub/vsub here accordingly to 8x16 so that the +* bytes<->x/y conversions come out correct. +*/ static const struct drm_format_info ccs_formats[] = { { .format =DRM_FORMAT_XRGB8888 , .depth =24 , .num_planes =2 , .cpp = {4 ,1 , }, .hsub =8 , .vsub =16 , }, { .format =DRM_FORMAT_XBGR8888 , .depth =24 , .num_planes =2 , .cpp = {4 ,1 , }, .hsub =8 , .vsub =16 , },
Signature · 6 lines
2.13.6 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/8] drm/i915: Add a comment exlaining CCS hsub/vsub
Quoted 10 lines · Ville Syrjala
From: Ville Syrjälä <[email protected]>
Let's document why we claim hsub==8,vsub==16 for CCS even though the memory layout would suggest that we use 16x8 instead.
Cc Daniel Vetter <[email protected]>Cc Ben Widawsky <[email protected]>Cc Jason Ekstrand <[email protected]>Cc Daniel Stone <[email protected]>Signed-off-by Ville Syrjälä <[email protected]>
Imo this needs an ack from Jason (or someone else who groks the CCS layout), passsing on this one.
-Daniel
Quoted 25 lines
--- drivers/gpu/drm/i915/intel_display.c | 7 +++++++ 1 file changed, 7 insertions(+)drivers/gpu/drm/i915/intel_display.c +7
-0@@ -2387,6 +2387,13 @@ static unsigned int intel_fb_modifier_to_tiling(uint64_t fb_modifier) } } +/* +* 1 byte of CCS actually corresponds to 16x8 pixels on the main +* surface, and the memory layout for the CCS tile is 64x64 bytes. +* But since we're pretending the CCS tile is 128 bytes wide we +* adjust hsub/vsub here accordingly to 8x16 so that the +* bytes<->x/y conversions come out correct. +*/ static const struct drm_format_info ccs_formats[] = { { .format =DRM_FORMAT_XRGB8888 , .depth =24 , .num_planes =2 , .cpp = {4 ,1 , }, .hsub =8 , .vsub =16 , }, { .format =DRM_FORMAT_XBGR8888 , .depth =24 , .num_planes =2 , .cpp = {4 ,1 , }, .hsub =8 , .vsub =16 , },Signature · 1 line
2.13.6
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/8] drm/i915: Add a comment exlaining CCS hsub/vsub
In reply to Ville SyrjalaQuoted 21 lines · Ville Syrjala
From: Ville Syrjälä <[email protected]>
Let's document why we claim hsub==8,vsub==16 for CCS even though the memory layout would suggest that we use 16x8 instead.
Cc Daniel Vetter <[email protected]>Cc Ben Widawsky <[email protected]>Cc Jason Ekstrand <[email protected]>Cc Daniel Stone <[email protected]>Signed-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 7 +++++++ 1 file changed, 7 insertions(+)drivers/gpu/drm/i915/intel_display.c +0
-0@@ -2387,6 +2387,13 @@ static unsigned int intel_fb_modifier_to_tiling(uint64_t fb_modifier)
drivers/gpu/drm/i915/intel_display.c static unsigned int intel_fb_modifier_to_tiling(uint64_t · line 2397
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +6
-0} } +/* +* 1 byte of CCS actually corresponds to 16x8 pixels on the main +* surface, and the memory layout for the CCS tile is 64x64 bytes. +* But since we're pretending the CCS tile is 128 bytes wide we +* adjust hsub/vsub here accordingly to 8x16 so that the +* bytes<->x/y conversions come out correct.
I'm not particularly happy with this comment as I think it pushes the mental model for these calculations in the wrong direction. The PRM says:
The Color Control Surface (CCS) contains the compression status of the cache-line pairs. The
compression state of the cache-line pair is specified by 2 bits in the CCS. Each CCS cache-line represents
an area on the main surface of 16 x16 sets of 128 byte Y-tiled cache-line-pairs. CCS is always Y tiled.
If you understand that a "cache line pair" in the main surface is a horizontally adjacent cache line pair (cl1_addr = cl0_addr + 512) and you just accept the statement about Y-tiling, this is the correct calculation. Calculating these things in terms of pixels is occasionally useful but is the wrong mental model. The cache line statement above both accurately describes the layout of the CCS (at the cache line granularity) and scales to other pixel formats which are not 32-bit.
I know that Ville and I have disagreed on this in the past but I don't think adding comments about how we're "pretending the CCS tile is 128 bytes wide" is making anything more clear.
--Jason
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +1
-0+*/ static const struct drm_format_info ccs_formats[] = {{ .format = DRM_FORMAT_XRGB8888, .depth = 24, .num_planes = 2, .cpp = { 4, 1, }, .hsub = 8, .vsub = 16, }, { .format = DRM_FORMAT_XBGR8888, .depth = 24, .num_planes = 2,.cpp = { 4, 1, }, .hsub = 8, .vsub = 16, },
--
2.13.6
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/8] drm/i915: Add a comment exlaining CCS hsub/vsub
Quoted 53 lines · Jason Ekstrand
Quoted 21 lines · Ville Syrjala
From: Ville Syrjälä <[email protected]>
Let's document why we claim hsub==8,vsub==16 for CCS even though the memory layout would suggest that we use 16x8 instead.
Cc Daniel Vetter <[email protected]>Cc Ben Widawsky <[email protected]>Cc Jason Ekstrand <[email protected]>Cc Daniel Stone <[email protected]>Signed-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 7 +++++++ 1 file changed, 7 insertions(+)drivers/gpu/drm/i915/intel_display.c +0
-0@@ -2387,6 +2387,13 @@ static unsigned int intel_fb_modifier_to_tiling(uint64_t fb_modifier)drivers/gpu/drm/i915/intel_display.c static unsigned int intel_fb_modifier_to_tiling(uint64_t · line 2397
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +6
-0} } +/* +* 1 byte of CCS actually corresponds to 16x8 pixels on the main +* surface, and the memory layout for the CCS tile is 64x64 bytes. +* But since we're pretending the CCS tile is 128 bytes wide we +* adjust hsub/vsub here accordingly to 8x16 so that the +* bytes<->x/y conversions come out correct. I'm not particularly happy with this comment as I think it pushes the mental model for these calculations in the wrong direction. The PRM says:
The Color Control Surface (CCS) contains the compression status of the cache-line pairs. The
compression state of the cache-line pair is specified by 2 bits in the CCS. Each CCS cache-line represents
an area on the main surface of 16 x16 sets of 128 byte Y-tiled cache-line-pairs. CCS is always Y tiled.If you understand that a "cache line pair" in the main surface is a horizontally adjacent cache line pair (
cl1_addr=cl0_addr+ 512) and you just accept the statement about Y-tiling, this is the correct calculation. Calculating these things in terms of pixels is occasionally useful but is the wrong mental model. The cache line statement above both accurately describes the layout of the CCS (at the cache line granularity) and scales to other pixel formats which are not 32-bit.
Quoted 3 lines
I know that Ville and I have disagreed on this in the past but I don't think adding comments about how we're "pretending the CCS tile is 128 bytes wide" is making anything more clear.
I don't really see how talk about cachelines is going to help explain the hsub/vsub values we use here.
But I don't really care that much. We could just leave them as magic numbers if no one can come up with a clear explanation for them.
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/8] drm/i915: Add a comment exlaining CCS hsub/vsub
Quoted 61 lines · Ville Syrjälä
Quoted 17 lines · Jason Ekstrand
Quoted 14 lines · Ville Syrjala
From: Ville Syrjälä <[email protected]>
Let's document why we claim hsub==8,vsub==16 for CCS even though the memory layout would suggest that we use 16x8 instead.
Cc Daniel Vetter <[email protected]>Cc Ben Widawsky <[email protected]>Cc Jason Ekstrand <[email protected]>Cc Daniel Stone <[email protected]>Signed-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 7 +++++++ 1 file changed, 7 insertions(+)Quoted 6 lines
drivers/gpu/drm/i915/intel_display.c static unsigned int intel_fb_modifier_to_tiling(
Quoted 6 lines
drivers/gpu/drm/i915/intel_display.c +0
-0@@ -2387,6 +2387,13 @@ static unsigned int intel_fb_modifier_to_tiling(
uint64_tQuoted 12 lines
drivers/gpu/drm/i915/intel_display.c static unsigned int intel_fb_modifier_to_tiling(uint64_t fb_modifier)
Quoted 11 lines
drivers/gpu/drm/i915/intel_display.c +6
-0fb_modifier) } } +/* +* 1 byte of CCS actually corresponds to 16x8 pixels on the main +* surface, and the memory layout for the CCS tile is 64x64 bytes. +* But since we're pretending the CCS tile is 128 bytes wide we +* adjust hsub/vsub here accordingly to 8x16 so that the +* bytes<->x/y conversions come out correct. Quoted 2 lines
I'm not particularly happy with this comment as I think it pushes the mental model for these calculations in the wrong direction. The PRM
says:
Quoted 4 lines
The Color Control Surface (CCS) contains the compression status of the cache-line pairs. The
compression state of the cache-line pair is specified by 2 bits in theCCS.
Quoted 7 lines
Each CCS cache-line represents
an area on the main surface of 16 x16 sets of 128 byte Y-tiled cache-line-pairs. CCS is always Y tiled.If you understand that a "cache line pair" in the main surface is a horizontally adjacent cache line pair (
cl1_addr=cl0_addr+ 512) and you just accept the statement about Y-tiling, this is the correctcalculation.
Quoted 3 lines
Calculating these things in terms of pixels is occasionally useful but is the wrong mental model. The cache line statement above both accurately describes the layout of the CCS (at the cache line granularity) and
scales
Quoted 4 lines
to other pixel formats which are not 32-bit.
I know that Ville and I have disagreed on this in the past but I don't think adding comments about how we're "pretending the CCS tile is 128
Quoted 9 lines
bytes
Quoted 1 line
wide" is making anything more clear.
I don't really see how talk about cachelines is going to help explain the hsub/vsub values we use here.
But I don't really care that much. We could just leave them as magic numbers if no one can come up with a clear explanation for them.
How about a comment like this:
/*From the Sky Lake PRM:
*
* The Color Control Surface (CCS) contains the compression status of
the cache-line pairs. The
* compression state of the cache-line pair is specified by 2 bits in
the CCS. Each CCS cache-line represents
* an area on the main surface of 16 x16 sets of 128 byte Y-tiled
cache-line-pairs. CCS is always Y tiled.
*
* Since cache line pairs refers to horizontally adjacent cache lines, each
cache line in the CCS
* corresponds to an area of 32x16 cache lines on the main surface. Since
each pixel is 4 bytes,
* this gives us a ratio of one byte in the CCS for each 8x16 pixels in the
main surface.
*/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/8] drm/i915: Add a comment exlaining CCS hsub/vsub
Quoted 76 lines · Jason Ekstrand
Quoted 61 lines · Ville Syrjälä
Quoted 17 lines · Jason Ekstrand
Quoted 14 lines · Ville Syrjala
From: Ville Syrjälä <[email protected]>
Let's document why we claim hsub==8,vsub==16 for CCS even though the memory layout would suggest that we use 16x8 instead.
Cc Daniel Vetter <[email protected]>Cc Ben Widawsky <[email protected]>Cc Jason Ekstrand <[email protected]>Cc Daniel Stone <[email protected]>Signed-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 7 +++++++ 1 file changed, 7 insertions(+)Quoted 6 lines
drivers/gpu/drm/i915/intel_display.c static unsigned int intel_fb_modifier_to_tiling(
Quoted 6 lines
drivers/gpu/drm/i915/intel_display.c +0
-0@@ -2387,6 +2387,13 @@ static unsigned int intel_fb_modifier_to_tiling(
uint64_tQuoted 12 lines
drivers/gpu/drm/i915/intel_display.c static unsigned int intel_fb_modifier_to_tiling(uint64_t fb_modifier)
Quoted 11 lines
drivers/gpu/drm/i915/intel_display.c +6
-0fb_modifier) } } +/* +* 1 byte of CCS actually corresponds to 16x8 pixels on the main +* surface, and the memory layout for the CCS tile is 64x64 bytes. +* But since we're pretending the CCS tile is 128 bytes wide we +* adjust hsub/vsub here accordingly to 8x16 so that the +* bytes<->x/y conversions come out correct. Quoted 2 lines
I'm not particularly happy with this comment as I think it pushes the mental model for these calculations in the wrong direction. The PRM
says:
Quoted 4 lines
The Color Control Surface (CCS) contains the compression status of the cache-line pairs. The
compression state of the cache-line pair is specified by 2 bits in theCCS.
Quoted 7 lines
Each CCS cache-line represents
an area on the main surface of 16 x16 sets of 128 byte Y-tiled cache-line-pairs. CCS is always Y tiled.If you understand that a "cache line pair" in the main surface is a horizontally adjacent cache line pair (
cl1_addr=cl0_addr+ 512) and you just accept the statement about Y-tiling, this is the correctcalculation.
Quoted 3 lines
Calculating these things in terms of pixels is occasionally useful but is the wrong mental model. The cache line statement above both accurately describes the layout of the CCS (at the cache line granularity) and
scales
Quoted 4 lines
to other pixel formats which are not 32-bit.
I know that Ville and I have disagreed on this in the past but I don't think adding comments about how we're "pretending the CCS tile is 128
Quoted 9 lines
bytes
Quoted 1 line
wide" is making anything more clear.
I don't really see how talk about cachelines is going to help explain the hsub/vsub values we use here.
But I don't really care that much. We could just leave them as magic numbers if no one can come up with a clear explanation for them.
How about a comment like this:
Quoted 16 lines
/*From the Sky Lake PRM:
*
* The Color Control Surface (CCS) contains the compression status of
the cache-line pairs. The
* compression state of the cache-line pair is specified by 2 bits in
the CCS. Each CCS cache-line represents
* an area on the main surface of 16 x16 sets of 128 byte Y-tiled
cache-line-pairs. CCS is always Y tiled.
*
* Since cache line pairs refers to horizontally adjacent cache lines, each
cache line in the CCS
* corresponds to an area of 32x16 cache lines on the main surface. Since
each pixel is 4 bytes,
* this gives us a ratio of one byte in the CCS for each 8x16 pixels in the
main surface.
*/
Works for me. Should I just suck that into my patch, or you want to submit it as a proper patch?
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/8] drm/i915: Add a comment exlaining CCS hsub/vsub
Quoted 99 lines · Ville Syrjälä
Quoted 10 lines · Jason Ekstrand
Quoted 7 lines · Ville Syrjälä
Quoted 6 lines · Jason Ekstrand
Quoted 3 lines · Ville Syrjala
From: Ville Syrjälä <[email protected]>
Let's document why we claim hsub==8,vsub==16 for CCS even though
the
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
memory layout would suggest that we use 16x8 instead.
Cc Daniel Vetter <[email protected]>Cc Ben Widawsky <[email protected]>Cc Jason Ekstrand <[email protected]>Cc Daniel Stone <[email protected]>Signed-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 7 +++++++ 1 file changed, 7 insertions(+)Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
drivers/gpu/drm/i915/intel_display.c static unsigned int
Quoted 6 lines
drivers/gpu/drm/i915/intel_display.c +0
-0@@ -2387,6 +2387,13 @@ static unsigned intintel_fb_modifier_to_tiling(
Quoted 13 lines
Quoted 13 lines
uint64_tQuoted 12 lines
Quoted 11 lines
drivers/gpu/drm/i915/intel_display.c +6
-0fb_modifier) } } +/* +* 1 byte of CCS actually corresponds to 16x8 pixels on the main +* surface, and the memory layout for the CCS tile is 64x64 bytes. +* But since we're pretending the CCS tile is 128 bytes wide we +* adjust hsub/vsub here accordingly to 8x16 so that the +* bytes<->x/y conversions come out correct. Quoted 5 lines
Quoted 5 lines
Quoted 2 lines
I'm not particularly happy with this comment as I think it pushes the mental model for these calculations in the wrong direction. The PRM
says:
Quoted 2 lines
The Color Control Surface (CCS) contains the compression status of
the
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
cache-line pairs. The
compression state of the cache-line pair is specified by 2 bits inthe
Quoted 7 lines
Quoted 7 lines
CCS.
Quoted 6 lines
Each CCS cache-line represents
an area on the main surface of 16 x16 sets of 128 byte Y-tiled cache-line-pairs. CCS is always Y tiled.If you understand that a "cache line pair" in the main surface is a horizontally adjacent cache line pair (
cl1_addr=cl0_addr+ 512)and you
Quoted 3 lines
Quoted 3 lines
Quoted 1 line
just accept the statement about Y-tiling, this is the correct
calculation.
Quoted 1 line
Calculating these things in terms of pixels is occasionally useful
but is
Quoted 1 line
Quoted 1 line
Quoted 1 line
the wrong mental model. The cache line statement above both
accurately
Quoted 5 lines
Quoted 5 lines
Quoted 1 line
describes the layout of the CCS (at the cache line granularity) and
scales
Quoted 3 lines
to other pixel formats which are not 32-bit.
I know that Ville and I have disagreed on this in the past but I
don't
Quoted 13 lines
Quoted 10 lines
Quoted 1 line
think adding comments about how we're "pretending the CCS tile is 128
bytes
Quoted 1 line
wide" is making anything more clear.
I don't really see how talk about cachelines is going to help explain the hsub/vsub values we use here.
But I don't really care that much. We could just leave them as magic numbers if no one can come up with a clear explanation for them.
How about a comment like this:
Quoted 10 lines
/*From the Sky Lake PRM:
*
* The Color Control Surface (CCS) contains the compression status of
the cache-line pairs. The
* compression state of the cache-line pair is specified by 2 bits in
the CCS. Each CCS cache-line represents
* an area on the main surface of 16 x16 sets of 128 byte Y-tiled
cache-line-pairs. CCS is always Y tiled.
*
* Since cache line pairs refers to horizontally adjacent cache lines,each
Quoted 2 lines
cache line in the CCS
* corresponds to an area of 32x16 cache lines on the main surface.Since
Quoted 9 lines
Quoted 2 lines
each pixel is 4 bytes,
* this gives us a ratio of one byte in the CCS for each 8x16 pixels inthe
Quoted 2 lines
main surface.
*/Works for me. Should I just suck that into my patch, or you want to submit it as a proper patch?
Feel free to suck it in.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 1/8 drm/i915: Add a comment exlaining CCS hsub/vsub
In reply to Ville SyrjalaFrom: Ville Syrjälä <[email protected]>
Let's document why we claim hsub==8,vsub==16 for CCS.
v2: Replace my explanation with Jason's
--- drivers/gpu/drm/i915/intel_display.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
drivers/gpu/drm/i915/intel_display.c +14 -0
@@ -2387,6 +2387,20 @@ static unsigned int intel_fb_modifier_to_tiling(uint64_t fb_modifier) } } +/* +* From the Sky Lake PRM: +* "The Color Control Surface (CCS) contains the compression status of +* the cache-line pairs. The compression state of the cache-line pair +* is specified by 2 bits in the CCS. Each CCS cache-line represents +* an area on the main surface of 16 x16 sets of 128 byte Y-tiled +* cache-line-pairs. CCS is always Y tiled." +* +* Since cache line pairs refers to horizontally adjacent cache lines, +* each cache line in the CCS corresponds to an area of 32x16 cache +* lines on the main surface. Since each pixel is 4 bytes, this gives +* us a ratio of one byte in the CCS for each 8x16 pixels in the +* main surface. +*/ static const struct drm_format_info ccs_formats[] = { { .format =DRM_FORMAT_XRGB8888 , .depth =24 , .num_planes =2 , .cpp = {4 ,1 , }, .hsub =8 , .vsub =16 , }, { .format =DRM_FORMAT_XBGR8888 , .depth =24 , .num_planes =2 , .cpp = {4 ,1 , }, .hsub =8 , .vsub =16 , },
Signature · 6 lines
2.13.6 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 1/8] drm/i915: Add a comment exlaining CCS hsub/vsub
Quoted 42 lines · Ville Syrjala
From: Ville Syrjälä <[email protected]>
Let's document why we claim hsub==8,vsub==16 for CCS.
v2: Replace my explanation with Jason's
Cc Daniel Vetter <[email protected]>Cc Ben Widawsky <[email protected]>Cc Jason Ekstrand <[email protected]>Cc Daniel Stone <[email protected]>Signed-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)drivers/gpu/drm/i915/intel_display.c +14
-0@@ -2387,6 +2387,20 @@ static unsigned int intel_fb_modifier_to_tiling(uint64_t fb_modifier) } } +/* +* From the Sky Lake PRM: +* "The Color Control Surface (CCS) contains the compression status of +* the cache-line pairs. The compression state of the cache-line pair +* is specified by 2 bits in the CCS. Each CCS cache-line represents +* an area on the main surface of 16 x16 sets of 128 byte Y-tiled +* cache-line-pairs. CCS is always Y tiled." +* +* Since cache line pairs refers to horizontally adjacent cache lines, +* each cache line in the CCS corresponds to an area of 32x16 cache +* lines on the main surface. Since each pixel is 4 bytes, this gives +* us a ratio of one byte in the CCS for each 8x16 pixels in the +* main surface. +*/ static const struct drm_format_info ccs_formats[] = { { .format =DRM_FORMAT_XRGB8888 , .depth =24 , .num_planes =2 ,.cpp = { 4, 1, }, .hsub = 8, .vsub = 16, },
Quoted 6 lines
{ .format = DRM_FORMAT_XBGR8888, .depth = 24, .num_planes = 2,.cpp = { 4, 1, }, .hsub = 8, .vsub = 16, }, --
2.13.6
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 1/8] drm/i915: Add a comment exlaining CCS hsub/vsub
Quoted 1 line · Jason Ekstrand
Reviewed-by Jason Ekstrand <[email protected]>
Thanks for the comment and review ;) Patches 1-6 have now been pushed to dinq.
Quoted 52 lines
Quoted 48 lines · Ville Syrjala
From: Ville Syrjälä <[email protected]>
Let's document why we claim hsub==8,vsub==16 for CCS.
v2: Replace my explanation with Jason's
Cc Daniel Vetter <[email protected]>Cc Ben Widawsky <[email protected]>Cc Jason Ekstrand <[email protected]>Cc Daniel Stone <[email protected]>Signed-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)drivers/gpu/drm/i915/intel_display.c +14
-0@@ -2387,6 +2387,20 @@ static unsigned int intel_fb_modifier_to_tiling(uint64_t fb_modifier) } } +/* +* From the Sky Lake PRM: +* "The Color Control Surface (CCS) contains the compression status of +* the cache-line pairs. The compression state of the cache-line pair +* is specified by 2 bits in the CCS. Each CCS cache-line represents +* an area on the main surface of 16 x16 sets of 128 byte Y-tiled +* cache-line-pairs. CCS is always Y tiled." +* +* Since cache line pairs refers to horizontally adjacent cache lines, +* each cache line in the CCS corresponds to an area of 32x16 cache +* lines on the main surface. Since each pixel is 4 bytes, this gives +* us a ratio of one byte in the CCS for each 8x16 pixels in the +* main surface. +*/ static const struct drm_format_info ccs_formats[] = { { .format =DRM_FORMAT_XRGB8888 , .depth =24 , .num_planes =2 ,.cpp = { 4, 1, }, .hsub = 8, .vsub = 16, },
{ .format = DRM_FORMAT_XBGR8888, .depth = 24, .num_planes = 2,.cpp = { 4, 1, }, .hsub = 8, .vsub = 16, }, --
2.13.6
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 2/8 drm/i915: Nuke a pointless unreachable()
In reply to Ville SyrjalaFrom: Ville Syrjälä <[email protected]>
The unreachable() is very much unreachable and the compiler knows that, so there's no point in having it.
--- drivers/gpu/drm/i915/intel_display.c | 2 -- 1 file changed, 2 deletions(-)
drivers/gpu/drm/i915/intel_display.c +0 -2
@@ -12951,8 +12951,6 @@ static bool intel_primary_plane_format_mod_supported(struct drm_plane *plane,return i965_mod_supported (format, modifier); else return i8xx_mod_supported(format, modifier); - -unreachable (); } static bool intel_cursor_plane_format_mod_supported(struct drm_plane *plane,
Signature · 6 lines
2.13.6 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/8] drm/i915: Nuke a pointless unreachable()
Quoted 9 lines · Ville Syrjala
From: Ville Syrjälä <[email protected]>
The
unreachable()is very much unreachable and the compiler knows that, so there's no point in having it.Cc Ben Widawsky <[email protected]>Cc Jason Ekstrand <[email protected]>Cc Daniel Stone <[email protected]>Signed-off-by Ville Syrjälä <[email protected]>
Quoted 24 lines
--- drivers/gpu/drm/i915/intel_display.c | 2 -- 1 file changed, 2 deletions(-)drivers/gpu/drm/i915/intel_display.c +0
-2@@ -12951,8 +12951,6 @@ static bool intel_primary_plane_format_mod_supported(struct drm_plane *plane,return i965_mod_supported (format, modifier); else return i8xx_mod_supported(format, modifier); - -unreachable (); } static bool intel_cursor_plane_format_mod_supported(struct drm_plane *plane,Signature · 6 lines
2.13.6 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 3/8 drm/i915: Add the missing Y/Yf modifiers for SKL+ sprites
In reply to Ville SyrjalaFrom: Ville Syrjälä <[email protected]>
Y/Yf were dropped out from the SKL+ sprite modifier list on account of some watermark issues Daniel Stone was having. My subsequent testing seemed to indicate that things work better now, so add the modifiers back in.
v2: Update the commit message with a better explanation
--- drivers/gpu/drm/i915/intel_sprite.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/i915/intel_sprite.c +2 -0
@@ -1162,6 +1162,8 @@ static uint32_t skl_plane_formats[] = { };static const uint64_t skl_plane_format_modifiers[] = { + I915_FORMAT_MOD_Yf_TILED, +I915_FORMAT_MOD_Y_TILED ,I915_FORMAT_MOD_X_TILED ,DRM_FORMAT_MOD_LINEAR ,DRM_FORMAT_MOD_INVALID
Signature · 6 lines
2.13.6 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 3/8] drm/i915: Add the missing Y/Yf modifiers for SKL+ sprites
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 3/8] drm/i915: Add the missing Y/Yf modifiers for SKL+ sprites
In reply to Ville SyrjalaQuoted 7 lines · Ville Syrjala
From: Ville Syrjälä <[email protected]>
Y/Yf were dropped out from the SKL+ sprite modifier list on account of some watermark issues Daniel Stone was having. My subsequent testing seemed to indicate that things work better now, so add the modifiers back in.
Quoted 6 lines
v2: Update the commit message with a better explanation
Cc Ben Widawsky <[email protected]>Cc Jason Ekstrand <[email protected]>Cc Daniel Stone <[email protected]>Signed-off-by Ville Syrjälä <[email protected]>
Do we have coverage for this in igt? If yes, then
Quoted 24 lines
--- drivers/gpu/drm/i915/intel_sprite.c | 2 ++ 1 file changed, 2 insertions(+)drivers/gpu/drm/i915/intel_sprite.c +2
-0@@ -1162,6 +1162,8 @@ static uint32_t skl_plane_formats[] = { };static const uint64_t skl_plane_format_modifiers[] = { + I915_FORMAT_MOD_Yf_TILED, +I915_FORMAT_MOD_Y_TILED ,I915_FORMAT_MOD_X_TILED ,DRM_FORMAT_MOD_LINEAR ,DRM_FORMAT_MOD_INVALID Signature · 6 lines
2.13.6 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 3/8] drm/i915: Add the missing Y/Yf modifiers for SKL+ sprites
Quoted 8 lines · Daniel Vetter
Quoted 7 lines · Ville Syrjala
From: Ville Syrjälä <[email protected]>
Y/Yf were dropped out from the SKL+ sprite modifier list on account of some watermark issues Daniel Stone was having. My subsequent testing seemed to indicate that things work better now, so add the modifiers back in.
Quoted 8 lines
Quoted 6 lines
v2: Update the commit message with a better explanation
Cc Ben Widawsky <[email protected]>Cc Jason Ekstrand <[email protected]>Cc Daniel Stone <[email protected]>Signed-off-by Ville Syrjälä <[email protected]>Do we have coverage for this in igt? If yes, then
Not sure what test you're actually after here. This only changes what we expose in the blobifier, but it doesn't change what kind modifiers the user can actually use with the sprites. Ie. Y/Yf tiled framebuffers are accepted even before this patch. I do believe we have some Y/Yf tests on arbitrary planes in some of the plane tests.
We have no specific tests for blobifiers I think. kms_ccs does use them to check for CCS support though. We should probably add something to igt_kms to use them for figuring out which format+modifier combos are supported by each plane.
Quoted 32 lines
Reviewed-by Daniel Vetter <[email protected]>Quoted 24 lines
--- drivers/gpu/drm/i915/intel_sprite.c | 2 ++ 1 file changed, 2 insertions(+)drivers/gpu/drm/i915/intel_sprite.c +2
-0@@ -1162,6 +1162,8 @@ static uint32_t skl_plane_formats[] = { };static const uint64_t skl_plane_format_modifiers[] = { + I915_FORMAT_MOD_Yf_TILED, +I915_FORMAT_MOD_Y_TILED ,I915_FORMAT_MOD_X_TILED ,DRM_FORMAT_MOD_LINEAR ,DRM_FORMAT_MOD_INVALID Signature · 6 lines
2.13.6 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfxSignature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 4/8 drm/i915: Clean up the sprite modifier checks
In reply to Ville SyrjalaFrom: Ville Syrjälä <[email protected]>
Split the g4x and snb cases into separate functions to match how we deal with all other platforms. Also sort the switch cases to match the format lists we've declared earlier, to ease comparisons.
--- drivers/gpu/drm/i915/intel_sprite.c | 48 ++++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 19 deletions(-)
drivers/gpu/drm/i915/intel_sprite.c +29 -19
@@ -1169,12 +1169,9 @@ static const uint64_t skl_plane_format_modifiers[] = { DRM_FORMAT_MOD_INVALID }; -static bool g4x_sprite_plane_format_mod_supported (struct drm_plane *plane, -uint32_t format, -uint64_t modifier) +static bool g4x_mod_supported (uint32_t format,uint64_t modifier) {switch (format) { -case DRM_FORMAT_XBGR8888 :case DRM_FORMAT_XRGB8888 :case DRM_FORMAT_YUYV :case DRM_FORMAT_YVYU :
@@ -1189,22 +1186,38 @@ static bool g4x_sprite_plane_format_mod_supported(struct drm_plane *plane, } } -static bool vlv_sprite_plane_format_mod_supported (struct drm_plane *plane, -uint32_t format, -uint64_t modifier) +static bool snb_mod_supported (uint32_t format,uint64_t modifier) {switch (format) { +case DRM_FORMAT_XRGB8888 : +case DRM_FORMAT_XBGR8888 :case DRM_FORMAT_YUYV :case DRM_FORMAT_YVYU :case DRM_FORMAT_UYVY :case DRM_FORMAT_VYUY : +if (modifier ==DRM_FORMAT_MOD_LINEAR || + modifier ==I915_FORMAT_MOD_X_TILED ) +return true; +/* fall through */ +default : +return false; + } +} + +static bool vlv_mod_supported (uint32_t format,uint64_t modifier) +{ +switch (format) {case DRM_FORMAT_RGB565 : -case DRM_FORMAT_XRGB8888 : +case DRM_FORMAT_ABGR8888 :case DRM_FORMAT_ARGB8888 : +case DRM_FORMAT_XBGR8888 : +case DRM_FORMAT_XRGB8888 :case DRM_FORMAT_XBGR2101010 :case DRM_FORMAT_ABGR2101010 : -case DRM_FORMAT_XBGR8888 : -case DRM_FORMAT_ABGR8888 : +case DRM_FORMAT_YUYV : +case DRM_FORMAT_YVYU : +case DRM_FORMAT_UYVY : +case DRM_FORMAT_VYUY :if (modifier ==DRM_FORMAT_MOD_LINEAR || modifier ==I915_FORMAT_MOD_X_TILED )return true;
@@ -1214,11 +1227,8 @@ static bool vlv_sprite_plane_format_mod_supported(struct drm_plane *plane, } } -static bool skl_sprite_plane_format_mod_supported (struct drm_plane *plane, -uint32_t format, -uint64_t modifier) +static bool skl_mod_supported (uint32_t format,uint64_t modifier) { -/* This is the same as primary plane since SKL has universal planes */ switch (format) {case DRM_FORMAT_XRGB8888 :case DRM_FORMAT_XBGR8888 :
@@ -1259,13 +1269,13 @@ static bool intel_sprite_plane_format_mod_supported(struct drm_plane *plane,return false;if (INTEL_GEN (dev_priv) >=9 ) -return skl_sprite_plane_format_mod_supported (plane, format, modifier); +return skl_mod_supported (format, modifier);else if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) -return vlv_sprite_plane_format_mod_supported (plane, format, modifier); +return vlv_mod_supported (format, modifier); +else if (INTEL_GEN (dev_priv) >=6 ) +return snb_mod_supported (format, modifier);else -return g4x_sprite_plane_format_mod_supported (plane, format, modifier); - -unreachable (); +return g4x_mod_supported (format, modifier); }static const struct drm_plane_funcs intel_sprite_plane_funcs = {
Signature · 6 lines
2.13.6 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 4/8] drm/i915: Clean up the sprite modifier checks
Quoted 10 lines · Ville Syrjala
From: Ville Syrjälä <[email protected]>
Split the g4x and snb cases into separate functions to match how we deal with all other platforms. Also sort the switch cases to match the format lists we've declared earlier, to ease comparisons.
Cc Ben Widawsky <[email protected]>Cc Jason Ekstrand <[email protected]>Cc Daniel Stone <[email protected]>Signed-off-by Ville Syrjälä <[email protected]>
Quoted 106 lines
--- drivers/gpu/drm/i915/intel_sprite.c | 48 ++++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 19 deletions(-)drivers/gpu/drm/i915/intel_sprite.c +29
-19@@ -1169,12 +1169,9 @@ static const uint64_t skl_plane_format_modifiers[] = { DRM_FORMAT_MOD_INVALID }; -static bool g4x_sprite_plane_format_mod_supported (struct drm_plane *plane, -uint32_t format, -uint64_t modifier) +static bool g4x_mod_supported (uint32_t format,uint64_t modifier) {switch (format) { -case DRM_FORMAT_XBGR8888 :case DRM_FORMAT_XRGB8888 :case DRM_FORMAT_YUYV :case DRM_FORMAT_YVYU :@@ -1189,22 +1186,38 @@ static bool g4x_sprite_plane_format_mod_supported(struct drm_plane *plane, } } -static bool vlv_sprite_plane_format_mod_supported (struct drm_plane *plane, -uint32_t format, -uint64_t modifier) +static bool snb_mod_supported (uint32_t format,uint64_t modifier) {switch (format) { +case DRM_FORMAT_XRGB8888 : +case DRM_FORMAT_XBGR8888 :case DRM_FORMAT_YUYV :case DRM_FORMAT_YVYU :case DRM_FORMAT_UYVY :case DRM_FORMAT_VYUY : +if (modifier ==DRM_FORMAT_MOD_LINEAR || + modifier ==I915_FORMAT_MOD_X_TILED ) +return true; +/* fall through */ +default : +return false; + } +} + +static bool vlv_mod_supported (uint32_t format,uint64_t modifier) +{ +switch (format) {case DRM_FORMAT_RGB565 : -case DRM_FORMAT_XRGB8888 : +case DRM_FORMAT_ABGR8888 :case DRM_FORMAT_ARGB8888 : +case DRM_FORMAT_XBGR8888 : +case DRM_FORMAT_XRGB8888 :case DRM_FORMAT_XBGR2101010 :case DRM_FORMAT_ABGR2101010 : -case DRM_FORMAT_XBGR8888 : -case DRM_FORMAT_ABGR8888 : +case DRM_FORMAT_YUYV : +case DRM_FORMAT_YVYU : +case DRM_FORMAT_UYVY : +case DRM_FORMAT_VYUY :if (modifier ==DRM_FORMAT_MOD_LINEAR || modifier ==I915_FORMAT_MOD_X_TILED )return true;@@ -1214,11 +1227,8 @@ static bool vlv_sprite_plane_format_mod_supported(struct drm_plane *plane, } } -static bool skl_sprite_plane_format_mod_supported (struct drm_plane *plane, -uint32_t format, -uint64_t modifier) +static bool skl_mod_supported (uint32_t format,uint64_t modifier) { -/* This is the same as primary plane since SKL has universal planes */ switch (format) {case DRM_FORMAT_XRGB8888 :case DRM_FORMAT_XBGR8888 :@@ -1259,13 +1269,13 @@ static bool intel_sprite_plane_format_mod_supported(struct drm_plane *plane,return false;if (INTEL_GEN (dev_priv) >=9 ) -return skl_sprite_plane_format_mod_supported (plane, format, modifier); +return skl_mod_supported (format, modifier);else if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) -return vlv_sprite_plane_format_mod_supported (plane, format, modifier); +return vlv_mod_supported (format, modifier); +else if (INTEL_GEN (dev_priv) >=6 ) +return snb_mod_supported (format, modifier);else -return g4x_sprite_plane_format_mod_supported (plane, format, modifier); - -unreachable (); +return g4x_mod_supported (format, modifier); }static const struct drm_plane_funcs intel_sprite_plane_funcs = {Signature · 6 lines
2.13.6 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 5/8 drm/i915: Add CCS capability for sprites
In reply to Ville SyrjalaFrom: Ville Syrjälä <[email protected]>
Allow sprites to scan out compressed framebuffers.
Since different platforms have a different set of planes that support CCS let's add a small helper to determine whether a specific plane supports CCS or not. Currently that information is spread around in many places, and not all the pieces of code even agree with each other.
In addition to allowing sprites to scan out compressed fbs, the other fix here is that we stop rejecting them on pipe C on CNL.
--- drivers/gpu/drm/i915/intel_display.c | 25 ++++-------------- drivers/gpu/drm/i915/intel_drv.h | 2 ++ drivers/gpu/drm/i915/intel_sprite.c | 50 ++++++++++++++++++++++++++---------- 3 files changed, 44 insertions(+), 33 deletions(-)
drivers/gpu/drm/i915/intel_display.c +5 -20
@@ -3034,6 +3034,7 @@ static int skl_check_nv12_aux_surface(struct intel_plane_state *plane_state)static int skl_check_ccs_aux_surface (struct intel_plane_state *plane_state) {struct intel_plane *plane =to_intel_plane (plane_state->base.plane); +struct drm_i915_private *dev_priv =to_i915 (plane->base.dev);struct intel_crtc *crtc =to_intel_crtc (plane_state->base.crtc);const struct drm_framebuffer *fb = plane_state->base.fb;int src_x = plane_state->base.src.x1 >>16 ;
@@ -3044,17 +3045,8 @@ static int skl_check_ccs_aux_surface(struct intel_plane_state *plane_state)int y = src_y / vsub;u32 offset; -switch (plane->id) { -case PLANE_PRIMARY : -case PLANE_SPRITE0 : -break ; -default : -DRM_DEBUG_KMS ("RC support only on plane 1 and 2\n" ); -return -EINVAL ; - } - -if (crtc->pipe ==PIPE_C ) { -DRM_DEBUG_KMS ("No RC support on pipe C\n" ); +if (!skl_plane_has_ccs (dev_priv, crtc->pipe, plane->id)) { +DRM_DEBUG_KMS ("No RC support on %s\n" , plane->base.name);return -EINVAL ; }
@@ -13161,18 +13153,11 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe) primary->frontbuffer_bit =INTEL_FRONTBUFFER_PRIMARY (pipe); primary->check_plane = intel_check_primary_plane; -if (INTEL_GEN (dev_priv) >=10 ) { +if (INTEL_GEN (dev_priv) >=9 ) { intel_primary_formats = skl_primary_formats; num_formats =ARRAY_SIZE (skl_primary_formats); - modifiers = skl_format_modifiers_ccs; - primary->update_plane = skl_update_plane; - primary->disable_plane = skl_disable_plane; - primary->get_hw_state = skl_plane_get_hw_state; - }else if (INTEL_GEN (dev_priv) >=9 ) { - intel_primary_formats = skl_primary_formats; - num_formats =ARRAY_SIZE (skl_primary_formats); -if (pipe <PIPE_C ) +if (skl_plane_has_ccs (dev_priv, pipe,PLANE_PRIMARY )) modifiers = skl_format_modifiers_ccs;else modifiers = skl_format_modifiers_noccs;
drivers/gpu/drm/i915/intel_drv.h +2 -0
@@ -1932,6 +1932,8 @@ void skl_update_plane(struct intel_plane *plane, const struct intel_plane_state *plane_state);void skl_disable_plane (struct intel_plane *plane,struct intel_crtc *crtc);bool skl_plane_get_hw_state (struct intel_plane *plane); +bool skl_plane_has_ccs (struct drm_i915_private *dev_priv, +enum pipe pipe,enum plane_id plane_id);/* intel_tv.c */ void intel_tv_init (struct drm_i915_private *dev_priv);
drivers/gpu/drm/i915/intel_sprite.c +37 -13
81 lines not on this page · raw message
Signature · 6 lines
2.13.6 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 5/8] drm/i915: Add CCS capability for sprites
Quoted 10 lines · Ville Syrjala
From: Ville Syrjälä <[email protected]>
Allow sprites to scan out compressed framebuffers.
Since different platforms have a different set of planes that support CCS let's add a small helper to determine whether a specific plane supports CCS or not. Currently that information is spread around in many places, and not all the pieces of code even agree with each other.
Quoted 7 lines
In addition to allowing sprites to scan out compressed fbs, the other fix here is that we stop rejecting them on pipe C on CNL.
Cc Ben Widawsky <[email protected]>Cc Jason Ekstrand <[email protected]>Cc Daniel Stone <[email protected]>
Quoted 186 lines
Signed-off-by Ville Syrjälä <[email protected]>---
drivers/gpu/drm/i915/intel_display.c | 25 ++++-------------- drivers/gpu/drm/i915/intel_drv.h | 2 ++ drivers/gpu/drm/i915/intel_sprite.c | 50
++++++++++++++++++++++++++----------3 files changed, 44 insertions(+), 33 deletions(-)drivers/gpu/drm/i915/intel_display.c +0
-0@@ -3034,6 +3034,7 @@ static int skl_check_nv12_aux_surface(struct intel_plane_state *plane_state)static int
skl_check_ccs_aux_surface(struct intel_plane_state *plane_state)
{
structintel_plane*plane = to_intel_plane(plane_state-Quoted 1 line
base.plane);
drivers/gpu/drm/i915/intel_display.c +1
-0+ struct drm_i915_private *dev_priv = to_i915(plane-Quoted 1 line
base.dev);
struct
intel_crtc*crtc = to_intel_crtc(plane_state-Quoted 1 line
base.crtc);
const struct
drm_framebuffer*fb =plane_state->base.fb; intsrc_x=plane_state->base.src.x1>> 16;drivers/gpu/drm/i915/intel_display.c +0
-0@@ -3044,17 +3045,8 @@ static int skl_check_ccs_aux_surface(struct intel_plane_state *plane_state) int y = src_y / vsub; u32 offset;drivers/gpu/drm/i915/intel_display.c +2
-11-switch (plane->id) { -case PLANE_PRIMARY : -case PLANE_SPRITE0 : -break ; -default : -DRM_DEBUG_KMS ("RC support only on plane 1 and 2\n" ); -return -EINVAL ; - } - -if (crtc->pipe ==PIPE_C ) { -DRM_DEBUG_KMS ("No RC support on pipe C\n" ); +if (!skl_plane_has_ccs (dev_priv, crtc->pipe, plane->id)) { + DRM_DEBUG_KMS("No RC support on %s\n", plane-Quoted 1 line
base.name);
return
-EINVAL;
}drivers/gpu/drm/i915/intel_display.c +0
-0@@ -13161,18 +13153,11 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe) primary->frontbuffer_bit = INTEL_FRONTBUFFER_PRIMARY(pipe); primary->check_plane = intel_check_primary_plane;drivers/gpu/drm/i915/intel_display.c +1
-1-if (INTEL_GEN (dev_priv) >=10 ) { +if (INTEL_GEN (dev_priv) >=9 ) {
intel_primary_formats=skl_primary_formats;num_formats=ARRAY_SIZE(skl_primary_formats);drivers/gpu/drm/i915/intel_display.c +0
-1- modifiers = skl_format_modifiers_ccs;drivers/gpu/drm/i915/intel_display.c +1
-7- primary->update_plane = skl_update_plane; - primary->disable_plane = skl_disable_plane; - primary->get_hw_state = skl_plane_get_hw_state; - }else if (INTEL_GEN (dev_priv) >=9 ) { - intel_primary_formats = skl_primary_formats; - num_formats =ARRAY_SIZE (skl_primary_formats); -if (pipe <PIPE_C ) + if (skl_plane_has_ccs(dev_priv, pipe,
PLANE_PRIMARY))
modifiers =skl_format_modifiers_ccs; else
modifiers =skl_format_modifiers_noccs;drivers/gpu/drm/i915/intel_drv.h +0
-0@@ -1932,6 +1932,8 @@ void skl_update_plane(struct intel_plane *plane, const struct intel_plane_state *plane_state);void
skl_disable_plane(struct intel_plane *plane, struct intel_crtc *crtc);
boolskl_plane_get_hw_state(struct intel_plane *plane);drivers/gpu/drm/i915/intel_drv.h +2
-0+bool skl_plane_has_ccs (struct drm_i915_private *dev_priv, + enum pipe pipe, enum plane_id plane_id);
/*intel_tv.c*/
voidintel_tv_init(struct drm_i915_private *dev_priv);drivers/gpu/drm/i915/intel_sprite.c +0
-0@@ -1161,7 +1161,17 @@ static uint32_t skl_plane_formats[] = { DRM_FORMAT_VYUY, };drivers/gpu/drm/i915/intel_sprite.c +11
-1-static const uint64_t skl_plane_format_modifiers[] = { +static const uint64_t skl_plane_format_modifiers_noccs[] = { + I915_FORMAT_MOD_Yf_TILED, +I915_FORMAT_MOD_Y_TILED , +I915_FORMAT_MOD_X_TILED , +DRM_FORMAT_MOD_LINEAR , +DRM_FORMAT_MOD_INVALID +}; + +static const uint64_t skl_plane_format_modifiers_ccs[] = { + I915_FORMAT_MOD_Yf_TILED_CCS, +I915_FORMAT_MOD_Y_TILED_CCS ,
I915_FORMAT_MOD_Yf_TILED,
I915_FORMAT_MOD_Y_TILED,
I915_FORMAT_MOD_X_TILED,drivers/gpu/drm/i915/intel_sprite.c +0
-0@@ -1234,6 +1244,10 @@ static bool skl_mod_supported(uint32_t format, uint64_t modifier)case
DRM_FORMAT_XBGR8888:
caseDRM_FORMAT_ARGB8888:
caseDRM_FORMAT_ABGR8888:drivers/gpu/drm/i915/intel_sprite.c +4
-0+if (modifier == I915_FORMAT_MOD_Yf_TILED_CCS || + modifier == I915_FORMAT_MOD_Y_TILED_CCS) +return true; +/* fall through */ case
DRM_FORMAT_RGB565:
caseDRM_FORMAT_XRGB2101010:
caseDRM_FORMAT_XBGR2101010:drivers/gpu/drm/i915/intel_sprite.c +0
-0@@ -1289,6 +1303,23 @@ static const struct drm_plane_funcs intel_sprite_plane_funcs = {.format_mod_supported =
intel_sprite_plane_format_mod_supported,
};drivers/gpu/drm/i915/intel_sprite.c +17
-0+bool skl_plane_has_ccs (struct drm_i915_private *dev_priv, + enum pipe pipe, enum plane_id plane_id) +{ +if (plane_id ==PLANE_CURSOR ) +return false; + +if (INTEL_GEN (dev_priv) >=10 ) +return true; + +if (IS_GEMINILAKE (dev_priv)) +return pipe !=PIPE_C ; + +return pipe !=PIPE_C && + (plane_id ==PLANE_PRIMARY || + plane_id == PLANE_SPRITE0); +} +struct
intel_plane*intel_sprite_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe, int plane)drivers/gpu/drm/i915/intel_sprite.c +0
-0@@ -1315,7 +1346,7 @@ intel_sprite_plane_create(structdrm_i915_private *dev_priv, } intel_plane->base.state = &state->base;drivers/gpu/drm/i915/intel_sprite.c +1
-1-if (INTEL_GEN (dev_priv) >=10 ) { +if (INTEL_GEN (dev_priv) >=9 ) {
intel_plane->can_scale= true;
state->scaler_id= -1;drivers/gpu/drm/i915/intel_sprite.c +0
-0@@ -1325,18 +1356,11 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv,
plane_formats=skl_plane_formats;num_plane_formats=ARRAY_SIZE(skl_plane_formats);drivers/gpu/drm/i915/intel_sprite.c +0
-4- modifiers = skl_plane_format_modifiers; - }else if (INTEL_GEN (dev_priv) >=9 ) { - intel_plane->can_scale = true; - state->scaler_id =-1 ;drivers/gpu/drm/i915/intel_sprite.c +5
-7- intel_plane->update_plane = skl_update_plane; - intel_plane->disable_plane = skl_disable_plane; - intel_plane->get_hw_state = skl_plane_get_hw_state; - - plane_formats = skl_plane_formats; - num_plane_formats =ARRAY_SIZE (skl_plane_formats); - modifiers = skl_plane_format_modifiers; +if (skl_plane_has_ccs (dev_priv, pipe,PLANE_SPRITE0 + plane)) + modifiers = skl_plane_format_modifiers_ccs; +else + modifiers =
skl_plane_format_modifiers_noccs;
} else if (IS_VALLEYVIEW(dev_priv)||IS_CHERRYVIEW(dev_priv)) {
intel_plane->can_scale= false;
intel_plane->max_downscale= 1;
Signature · 6 lines
Mika Kahola - Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 6/8 drm/i915: Allow up to 32KB stride on SKL+ "sprites"
In reply to Ville SyrjalaFrom: Ville Syrjälä <[email protected]>
SKL+ "sprites" no longer have 16KB max stride limit that earlier platforms had. Bump up the limit to 32KB.
--- drivers/gpu/drm/i915/intel_sprite.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_sprite.c +2 -1
@@ -865,6 +865,7 @@ intel_check_sprite_plane(struct intel_plane *plane,struct drm_rect *src = &state->base.src;struct drm_rect *dst = &state->base.dst;const struct drm_rect *clip = &state->clip; +int max_stride =INTEL_GEN (dev_priv) >=9 ?32768 :16384 ;int hscale, vscale;int max_scale, min_scale;bool can_scale;
@@ -885,7 +886,7 @@ intel_check_sprite_plane(struct intel_plane *plane, }/* FIXME check all gen limits */ -if (fb->width <3 || fb->height <3 || fb->pitches[0 ] >16384 ) { +if (fb->width <3 || fb->height <3 || fb->pitches[0 ] > max_stride) {DRM_DEBUG_KMS ("Unsuitable framebuffer for plane\n" );return -EINVAL ; }
Signature · 6 lines
2.13.6 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 6/8] drm/i915: Allow up to 32KB stride on SKL+ "sprites"
Quoted 26 lines · Ville Syrjala
From: Ville Syrjälä <[email protected]>
SKL+ "sprites" no longer have 16KB max stride limit that earlier platforms had. Bump up the limit to 32KB.
Cc Ben Widawsky <[email protected]>Cc Jason Ekstrand <[email protected]>Cc Daniel Stone <[email protected]>Signed-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/intel_sprite.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/intel_sprite.c +1
-0@@ -865,6 +865,7 @@ intel_check_sprite_plane(struct intel_plane *plane,struct drm_rect *src = &state->base.src;struct drm_rect *dst = &state->base.dst;const struct drm_rect *clip = &state->clip; +int max_stride =INTEL_GEN (dev_priv) >=9 ?32768 :16384 ;int hscale, vscale;int max_scale, min_scale;bool can_scale;
drivers/gpu/drm/i915/intel_sprite.c intel_check_sprite_plane(struct intel_plane *plane, · line 891
Quoted 7 lines
drivers/gpu/drm/i915/intel_sprite.c +1
-1@@ -885,7 +886,7 @@ intel_check_sprite_plane(struct intel_plane *plane, }/* FIXME check all gen limits */ -if (fb->width <3 || fb->height <3 || fb->pitches[0 ] >16384 ) { +if (fb->width <3 || fb->height <3 || fb->pitches[0 ] > max_stride) {DRM_DEBUG_KMS ("Unsuitable framebuffer for plane\n" );return -EINVAL ;
Since pre-gen9 sprites are special, and since we're already validating the overall sprite limits in intel_fb_pitch_limit I'd push this into a new if condition like
if (gen < 9 && pichtes[0] > KB(16)) {
DRM_DEBUG_KMS("Invalid stride\n");
return -EINVAL;
}With or without that bikeshed:
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 6/8] drm/i915: Allow up to 32KB stride on SKL+ "sprites"
Quoted 39 lines · Daniel Vetter
Quoted 26 lines · Ville Syrjala
From: Ville Syrjälä <[email protected]>
SKL+ "sprites" no longer have 16KB max stride limit that earlier platforms had. Bump up the limit to 32KB.
Cc Ben Widawsky <[email protected]>Cc Jason Ekstrand <[email protected]>Cc Daniel Stone <[email protected]>Signed-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/intel_sprite.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/intel_sprite.c +1
-0@@ -865,6 +865,7 @@ intel_check_sprite_plane(struct intel_plane *plane,struct drm_rect *src = &state->base.src;struct drm_rect *dst = &state->base.dst;const struct drm_rect *clip = &state->clip; +int max_stride =INTEL_GEN (dev_priv) >=9 ?32768 :16384 ;int hscale, vscale;int max_scale, min_scale;bool can_scale;drivers/gpu/drm/i915/intel_sprite.c intel_check_sprite_plane(struct intel_plane *plane, · line 891
Quoted 7 lines
drivers/gpu/drm/i915/intel_sprite.c +1
-1@@ -885,7 +886,7 @@ intel_check_sprite_plane(struct intel_plane *plane, }/* FIXME check all gen limits */ -if (fb->width <3 || fb->height <3 || fb->pitches[0 ] >16384 ) { +if (fb->width <3 || fb->height <3 || fb->pitches[0 ] > max_stride) {DRM_DEBUG_KMS ("Unsuitable framebuffer for plane\n" );return -EINVAL ;Since pre-gen9 sprites are special, and since we're already validating the overall sprite limits in
intel_fb_pitch_limitI'd push this into a new if condition like
Quoted 4 lines
if (gen < 9 && pichtes[0] > KB(16)) {
DRM_DEBUG_KMS("Invalid stride\n");
return -EINVAL;
}I think we'll want to clean up this mess by moving a lot of these checks into platform specific code. We're also missing a bunch of checks we should be doing (eg. cdclk vs. scaling limits on ilk-ivb).
Quoted 8 lines
With or without that bikeshed:
Reviewed-by Daniel Vetter <[email protected]>Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 7/8 drm: Check that the plane supports the request format+modifier combo
In reply to Ville SyrjalaFrom: Ville Syrjälä <[email protected]>
Currently we only check that the plane supports the pixel format of the fb we're about to feed to it. Extend it to check also the modifier, and more specifically that the combination of the format and modifier is supported.
--- drivers/gpu/drm/drm_atomic.c | 10 ++++++---- drivers/gpu/drm/drm_crtc.c | 10 ++++++---- drivers/gpu/drm/drm_crtc_internal.h | 4 ++-- drivers/gpu/drm/drm_plane.c | 33 ++++++++++++++++++++++++++------- 4 files changed, 40 insertions(+), 17 deletions(-)
drivers/gpu/drm/drm_atomic.c +6 -4
@@ -882,12 +882,14 @@ static int drm_atomic_plane_check(struct drm_plane *plane, }/* Check whether this plane supports the fb pixel format. */ - ret =drm_plane_check_pixel_format (plane, state->fb->format->format); + ret =drm_plane_check_pixel_format (plane, state->fb->format->format, + state->fb->modifier);if (ret) {struct drm_format_name_buf format_name; -DRM_DEBUG_ATOMIC ("Invalid pixel format %s\n" , -drm_get_format_name (state->fb->format->format, - &format_name)); +DRM_DEBUG_ATOMIC ("Invalid pixel format %s, modifier 0x%llx\n" , +drm_get_format_name (state->fb->format->format, + &format_name), + state->fb->modifier);return ret; }
drivers/gpu/drm/drm_crtc.c +6 -4
@@ -625,12 +625,14 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data,*/ if (!crtc->primary->format_default) { ret =drm_plane_check_pixel_format (crtc->primary, - fb->format->format); + fb->format->format, + fb->modifier);if (ret) {struct drm_format_name_buf format_name; -DRM_DEBUG_KMS ("Invalid pixel format %s\n" , -drm_get_format_name (fb->format->format, - &format_name)); +DRM_DEBUG_KMS ("Invalid pixel format %s, modifier 0x%llx\n" , +drm_get_format_name (fb->format->format, + &format_name), + fb->modifier); goto out; } }
drivers/gpu/drm/drm_crtc_internal.h +2 -2
@@ -196,8 +196,8 @@ int drm_mode_atomic_ioctl(struct drm_device *dev,/* drm_plane.c */ int drm_plane_register_all (struct drm_device *dev);void drm_plane_unregister_all (struct drm_device *dev); -int drm_plane_check_pixel_format (const struct drm_plane *plane, -u32 format); +int drm_plane_check_pixel_format (struct drm_plane *plane, +u32 format,u64 modifier);/* drm_bridge.c */ void drm_bridge_detach (struct drm_bridge *bridge);
drivers/gpu/drm/drm_plane.c +26 -7
@@ -545,16 +545,33 @@ int drm_mode_getplane(struct drm_device *dev, void *data,return 0 ; } -int drm_plane_check_pixel_format (const struct drm_plane *plane,u32 format) +int drm_plane_check_pixel_format (struct drm_plane *plane, +u32 format,u64 modifier) {unsigned int i;for (i =0 ; i < plane->format_count; i++) {if (format == plane->format_types[i]) -return 0 ; +break ; + } +if (i == plane->format_count) +return -EINVAL ; + +if (!plane->modifier_count) +return 0 ; + +for (i =0 ; i < plane->modifier_count; i++) { +if (modifier == plane->modifiers[i]) +break ; } +if (i == plane->modifier_count) +return -EINVAL ; -return -EINVAL ; +if (plane->funcs->format_mod_supported && + !plane->funcs->format_mod_supported (plane, format, modifier)) +return -EINVAL ; + +return 0 ; }/*
@@ -598,12 +615,14 @@ static int __setplane_internal(struct drm_plane *plane, }/* Check whether this plane supports the fb pixel format. */ - ret =drm_plane_check_pixel_format (plane, fb->format->format); + ret =drm_plane_check_pixel_format (plane, fb->format->format, + fb->modifier);if (ret) {struct drm_format_name_buf format_name; -DRM_DEBUG_KMS ("Invalid pixel format %s\n" , -drm_get_format_name (fb->format->format, - &format_name)); +DRM_DEBUG_KMS ("Invalid pixel format %s, modifier 0x%llx\n" , +drm_get_format_name (fb->format->format, + &format_name), + fb->modifier); goto out; }
Signature · 6 lines
2.13.6 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 7/8] drm: Check that the plane supports the request format+modifier combo
Quoted 7 lines · Ville Syrjala
From: Ville Syrjälä <[email protected]>
Currently we only check that the plane supports the pixel format of the fb we're about to feed to it. Extend it to check also the modifier, and more specifically that the combination of the format and modifier is supported.
Quoted 5 lines
Cc Ben Widawsky <[email protected]>Cc Jason Ekstrand <[email protected]>Cc Daniel Stone <[email protected]>Signed-off-by Ville Syrjälä <[email protected]>
Quoted 135 lines
--- drivers/gpu/drm/drm_atomic.c | 10 ++++++---- drivers/gpu/drm/drm_crtc.c | 10 ++++++---- drivers/gpu/drm/drm_crtc_internal.h | 4 ++-- drivers/gpu/drm/drm_plane.c | 33 ++++++++++++++++++++++++++------- 4 files changed, 40 insertions(+), 17 deletions(-)drivers/gpu/drm/drm_atomic.c +6
-4@@ -882,12 +882,14 @@ static int drm_atomic_plane_check(struct drm_plane *plane, }/* Check whether this plane supports the fb pixel format. */ - ret =drm_plane_check_pixel_format (plane, state->fb->format->format); + ret =drm_plane_check_pixel_format (plane, state->fb->format->format, + state->fb->modifier);if (ret) {struct drm_format_name_buf format_name; -DRM_DEBUG_ATOMIC ("Invalid pixel format %s\n" , -drm_get_format_name (state->fb->format->format, - &format_name)); +DRM_DEBUG_ATOMIC ("Invalid pixel format %s, modifier 0x%llx\n" , +drm_get_format_name (state->fb->format->format, + &format_name), + state->fb->modifier);return ret; }drivers/gpu/drm/drm_crtc.c +6
-4@@ -625,12 +625,14 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data,*/ if (!crtc->primary->format_default) { ret =drm_plane_check_pixel_format (crtc->primary, - fb->format->format); + fb->format->format, + fb->modifier);if (ret) {struct drm_format_name_buf format_name; -DRM_DEBUG_KMS ("Invalid pixel format %s\n" , -drm_get_format_name (fb->format->format, - &format_name)); +DRM_DEBUG_KMS ("Invalid pixel format %s, modifier 0x%llx\n" , +drm_get_format_name (fb->format->format, + &format_name), + fb->modifier); goto out; } }drivers/gpu/drm/drm_crtc_internal.h +2
-2@@ -196,8 +196,8 @@ int drm_mode_atomic_ioctl(struct drm_device *dev,/* drm_plane.c */ int drm_plane_register_all (struct drm_device *dev);void drm_plane_unregister_all (struct drm_device *dev); -int drm_plane_check_pixel_format (const struct drm_plane *plane, -u32 format); +int drm_plane_check_pixel_format (struct drm_plane *plane, +u32 format,u64 modifier);/* drm_bridge.c */ void drm_bridge_detach (struct drm_bridge *bridge);drivers/gpu/drm/drm_plane.c +26
-7@@ -545,16 +545,33 @@ int drm_mode_getplane(struct drm_device *dev, void *data,return 0 ; } -int drm_plane_check_pixel_format (const struct drm_plane *plane,u32 format) +int drm_plane_check_pixel_format (struct drm_plane *plane, +u32 format,u64 modifier) {unsigned int i;for (i =0 ; i < plane->format_count; i++) {if (format == plane->format_types[i]) -return 0 ; +break ; + } +if (i == plane->format_count) +return -EINVAL ; + +if (!plane->modifier_count) +return 0 ; + +for (i =0 ; i < plane->modifier_count; i++) { +if (modifier == plane->modifiers[i]) +break ; } +if (i == plane->modifier_count) +return -EINVAL ; -return -EINVAL ; +if (plane->funcs->format_mod_supported && + !plane->funcs->format_mod_supported (plane, format, modifier)) +return -EINVAL ; + +return 0 ; }/* @@ -598,12 +615,14 @@ static int __setplane_internal(struct drm_plane *plane, }/* Check whether this plane supports the fb pixel format. */ - ret =drm_plane_check_pixel_format (plane, fb->format->format); + ret =drm_plane_check_pixel_format (plane, fb->format->format, + fb->modifier);if (ret) {struct drm_format_name_buf format_name; -DRM_DEBUG_KMS ("Invalid pixel format %s\n" , -drm_get_format_name (fb->format->format, - &format_name)); +DRM_DEBUG_KMS ("Invalid pixel format %s, modifier 0x%llx\n" , +drm_get_format_name (fb->format->format, + &format_name), + fb->modifier); goto out; }Signature · 6 lines
2.13.6 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 7/8] drm: Check that the plane supports the request format+modifier combo
Quoted 8 lines · Daniel Vetter
Quoted 7 lines · Ville Syrjala
From: Ville Syrjälä <[email protected]>
Currently we only check that the plane supports the pixel format of the fb we're about to feed to it. Extend it to check also the modifier, and more specifically that the combination of the format and modifier is supported.
Quoted 7 lines
Quoted 5 lines
Cc Ben Widawsky <[email protected]>Cc Jason Ekstrand <[email protected]>Cc Daniel Stone <[email protected]>Signed-off-by Ville Syrjälä <[email protected]>Reviewed-by Daniel Vetter <[email protected]>
Finally pushed this (and the followup i915 patch) to drm-misc-next. Thanks for the reviews.
Quoted 141 lines
Quoted 136 lines
--- drivers/gpu/drm/drm_atomic.c | 10 ++++++---- drivers/gpu/drm/drm_crtc.c | 10 ++++++---- drivers/gpu/drm/drm_crtc_internal.h | 4 ++-- drivers/gpu/drm/drm_plane.c | 33 ++++++++++++++++++++++++++------- 4 files changed, 40 insertions(+), 17 deletions(-)drivers/gpu/drm/drm_atomic.c +6
-4@@ -882,12 +882,14 @@ static int drm_atomic_plane_check(struct drm_plane *plane, }/* Check whether this plane supports the fb pixel format. */ - ret =drm_plane_check_pixel_format (plane, state->fb->format->format); + ret =drm_plane_check_pixel_format (plane, state->fb->format->format, + state->fb->modifier);if (ret) {struct drm_format_name_buf format_name; -DRM_DEBUG_ATOMIC ("Invalid pixel format %s\n" , -drm_get_format_name (state->fb->format->format, - &format_name)); +DRM_DEBUG_ATOMIC ("Invalid pixel format %s, modifier 0x%llx\n" , +drm_get_format_name (state->fb->format->format, + &format_name), + state->fb->modifier);return ret; }drivers/gpu/drm/drm_crtc.c +6
-4@@ -625,12 +625,14 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data,*/ if (!crtc->primary->format_default) { ret =drm_plane_check_pixel_format (crtc->primary, - fb->format->format); + fb->format->format, + fb->modifier);if (ret) {struct drm_format_name_buf format_name; -DRM_DEBUG_KMS ("Invalid pixel format %s\n" , -drm_get_format_name (fb->format->format, - &format_name)); +DRM_DEBUG_KMS ("Invalid pixel format %s, modifier 0x%llx\n" , +drm_get_format_name (fb->format->format, + &format_name), + fb->modifier); goto out; } }drivers/gpu/drm/drm_crtc_internal.h +2
-2@@ -196,8 +196,8 @@ int drm_mode_atomic_ioctl(struct drm_device *dev,/* drm_plane.c */ int drm_plane_register_all (struct drm_device *dev);void drm_plane_unregister_all (struct drm_device *dev); -int drm_plane_check_pixel_format (const struct drm_plane *plane, -u32 format); +int drm_plane_check_pixel_format (struct drm_plane *plane, +u32 format,u64 modifier);/* drm_bridge.c */ void drm_bridge_detach (struct drm_bridge *bridge);drivers/gpu/drm/drm_plane.c +26
-7@@ -545,16 +545,33 @@ int drm_mode_getplane(struct drm_device *dev, void *data,return 0 ; } -int drm_plane_check_pixel_format (const struct drm_plane *plane,u32 format) +int drm_plane_check_pixel_format (struct drm_plane *plane, +u32 format,u64 modifier) {unsigned int i;for (i =0 ; i < plane->format_count; i++) {if (format == plane->format_types[i]) -return 0 ; +break ; + } +if (i == plane->format_count) +return -EINVAL ; + +if (!plane->modifier_count) +return 0 ; + +for (i =0 ; i < plane->modifier_count; i++) { +if (modifier == plane->modifiers[i]) +break ; } +if (i == plane->modifier_count) +return -EINVAL ; -return -EINVAL ; +if (plane->funcs->format_mod_supported && + !plane->funcs->format_mod_supported (plane, format, modifier)) +return -EINVAL ; + +return 0 ; }/* @@ -598,12 +615,14 @@ static int __setplane_internal(struct drm_plane *plane, }/* Check whether this plane supports the fb pixel format. */ - ret =drm_plane_check_pixel_format (plane, fb->format->format); + ret =drm_plane_check_pixel_format (plane, fb->format->format, + fb->modifier);if (ret) {struct drm_format_name_buf format_name; -DRM_DEBUG_KMS ("Invalid pixel format %s\n" , -drm_get_format_name (fb->format->format, - &format_name)); +DRM_DEBUG_KMS ("Invalid pixel format %s, modifier 0x%llx\n" , +drm_get_format_name (fb->format->format, + &format_name), + fb->modifier); goto out; }Signature · 6 lines
2.13.6 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfxSignature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 8/8 drm/i915: Remove the pipe/plane ID checks from skl_check_ccs_aux_surface()
In reply to Ville SyrjalaFrom: Ville Syrjälä <[email protected]>
The core now checks that the plane supports the fb's format+modifier combination, so we can drop the related checks from skl_check_ccs_aux_surface(). These checks were specific to SKL/KBL/BXT anyway.
--- drivers/gpu/drm/i915/intel_display.c | 8 -------- 1 file changed, 8 deletions(-)
drivers/gpu/drm/i915/intel_display.c +0 -8
@@ -3033,9 +3033,6 @@ static int skl_check_nv12_aux_surface(struct intel_plane_state *plane_state)static int skl_check_ccs_aux_surface (struct intel_plane_state *plane_state) { -struct intel_plane *plane =to_intel_plane (plane_state->base.plane); -struct drm_i915_private *dev_priv =to_i915 (plane->base.dev); -struct intel_crtc *crtc =to_intel_crtc (plane_state->base.crtc);const struct drm_framebuffer *fb = plane_state->base.fb;int src_x = plane_state->base.src.x1 >>16 ;int src_y = plane_state->base.src.y1 >>16 ;
@@ -3045,11 +3042,6 @@ static int skl_check_ccs_aux_surface(struct intel_plane_state *plane_state)int y = src_y / vsub;u32 offset; -if (!skl_plane_has_ccs (dev_priv, crtc->pipe, plane->id)) { -DRM_DEBUG_KMS ("No RC support on %s\n" , plane->base.name); -return -EINVAL ; - } -if (plane_state->base.rotation & ~(DRM_MODE_ROTATE_0 |DRM_MODE_ROTATE_180 )) {DRM_DEBUG_KMS ("RC support only with 0/180 degree rotation %x\n" , plane_state->base.rotation);
Signature · 6 lines
2.13.6 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 8/8] drm/i915: Remove the pipe/plane ID checks from skl_check_ccs_aux_surface()
Quoted 10 lines · Ville Syrjala
From: Ville Syrjälä <[email protected]>
The core now checks that the plane supports the fb's format+modifier combination, so we can drop the related checks from
skl_check_ccs_aux_surface(). These checks were specific to SKL/KBL/BXT anyway.Cc Ben Widawsky <[email protected]>Cc Jason Ekstrand <[email protected]>Cc Daniel Stone <[email protected]>
Quoted 41 lines
Signed-off-by Ville Syrjälä <[email protected]>---
drivers/gpu/drm/i915/intel_display.c | 8 --------1 file changed, 8 deletions(-)drivers/gpu/drm/i915/intel_display.c +0
-0@@ -3033,9 +3033,6 @@ static int skl_check_nv12_aux_surface(struct intel_plane_state *plane_state)
static intskl_check_ccs_aux_surface(struct intel_plane_state *plane_state)
{drivers/gpu/drm/i915/intel_display.c +0
-1- struct intel_plane *plane = to_intel_plane(plane_state-Quoted 1 line
base.plane);
drivers/gpu/drm/i915/intel_display.c +0
-1- struct drm_i915_private *dev_priv = to_i915(plane-Quoted 1 line
base.dev);
drivers/gpu/drm/i915/intel_display.c +0
-1- struct intel_crtc *crtc = to_intel_crtc(plane_state-Quoted 1 line
base.crtc);
const struct
drm_framebuffer*fb =plane_state->base.fb; intsrc_x=plane_state->base.src.x1>> 16; intsrc_y=plane_state->base.src.y1>> 16;drivers/gpu/drm/i915/intel_display.c +0
-0@@ -3045,11 +3042,6 @@ static int skl_check_ccs_aux_surface(struct intel_plane_state *plane_state) int y = src_y / vsub; u32 offset;drivers/gpu/drm/i915/intel_display.c +0
-2-if (!skl_plane_has_ccs (dev_priv, crtc->pipe, plane->id)) { - DRM_DEBUG_KMS("No RC support on %s\n", plane-Quoted 1 line
base.name);
drivers/gpu/drm/i915/intel_display.c +0
-3-return -EINVAL ; - } -if (
plane_state->base.rotation& ~(DRM_MODE_ROTATE_0 |DRM_MODE_ROTATE_180)) {
DRM_DEBUG_KMS("RC support only with 0/180 degree rotation %x\n",
plane_state->base.rotation);
Signature · 6 lines
Mika Kahola - Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915: Fix up the CCS code (rev2)
In reply to Ville Syrjala== Series Details ==
== Series Details ==
Series: drm/i915: Fix up the CCS code (rev2)
URL : https://patchwork.freedesktop.org/series/29308/
State : success
== Summary ==
Series 29308v2 drm/i915: Fix up the CCS code
https://patchwork.freedesktop.org/api/1.0/series/29308/revisions/2/mbox/
Test gem_mmap_gtt:
Subgroup basic-small-bo-tiledx:
fail -> PASS (fi-gdg-551) fdo#102575
Test kms_psr_sink_crc:
Subgroup psr_basic:
dmesg-warn -> PASS (fi-skl-6700hq) fdo#101144fdo#102575 https://bugs.freedesktop.org/show_bug.cgi?id=102575
fdo#101144 https://bugs.freedesktop.org/show_bug.cgi?id=101144
fi-bdw-5557u total:288 pass:267 dwarn:0 dfail:0 fail:0 skip:21 time:434s fi-bdw-gvtdvm total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:439s fi-blb-e6850 total:288 pass:223 dwarn:1 dfail:0 fail:0 skip:64 time:386s fi-bsw-n3050 total:288 pass:242 dwarn:0 dfail:0 fail:0 skip:46 time:499s fi-bwr-2160 total:288 pass:183 dwarn:0 dfail:0 fail:0 skip:105 time:277s fi-bxt-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:488s fi-bxt-j4205 total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:496s fi-byt-j1900 total:288 pass:253 dwarn:0 dfail:0 fail:0 skip:35 time:476s fi-byt-n2820 total:288 pass:249 dwarn:0 dfail:0 fail:0 skip:39 time:470s fi-elk-e7500 total:224 pass:163 dwarn:15 dfail:0 fail:0 skip:45 fi-gdg-551 total:288 pass:180 dwarn:0 dfail:0 fail:0 skip:108 time:260s fi-glk-1 total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:528s fi-hsw-4770 total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:406s fi-hsw-4770r total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:419s fi-ilk-650 total:288 pass:228 dwarn:0 dfail:0 fail:0 skip:60 time:425s fi-ivb-3520m total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:475s fi-ivb-3770 total:288 pass:255 dwarn:0 dfail:0 fail:0 skip:33 time:431s fi-kbl-7500u total:288 pass:263 dwarn:1 dfail:0 fail:0 skip:24 time:479s fi-kbl-7560u total:288 pass:268 dwarn:1 dfail:0 fail:0 skip:19 time:518s fi-kbl-7567u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:464s fi-kbl-r total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:532s fi-skl-6260u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:441s fi-skl-6600u total:288 pass:260 dwarn:1 dfail:0 fail:0 skip:27 time:531s fi-skl-6700hq total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:556s fi-skl-6700k2 total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:504s fi-skl-6770hq total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:492s fi-skl-gvtdvm total:288 pass:265 dwarn:0 dfail:0 fail:0 skip:23 time:445s fi-snb-2520m total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:546s fi-snb-2600 total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:408s Blacklisted hosts: fi-cfl-s2 total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:595s fi-cnl-y total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:635s fi-glk-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:482s
bd13c6b3b9bc8c5ec725ad7fe773a83d270145c0 drm-tip: 2017y-12m-22d-19h-41m-40s UTC integration manifest a34bbb4ca18b drm/i915: Remove the pipe/plane ID checks from skl_check_ccs_aux_surface() 283a23e47f0b drm: Check that the plane supports the request format+modifier combo 684bcae393c7 drm/i915: Allow up to 32KB stride on SKL+ "sprites"a58eefb83cc3 drm/i915: Add CCS capability for sprites8670cd77dd9d drm/i915: Clean up the sprite modifier checks75b9e7ea7a6e drm/i915: Add the missing Y/Yf modifiers for SKL+ sprites493e8d3adfd7 drm/i915: Nuke a pointless unreachable()0e7bd3ce9e82 drm/i915: Add a comment exlaining CCS hsub/vsub
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7573/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.IGT: warning for drm/i915: Fix up the CCS code (rev2)
In reply to Ville Syrjala== Series Details ==
== Series Details ==
Series: drm/i915: Fix up the CCS code (rev2)
URL : https://patchwork.freedesktop.org/series/29308/
State : warning
== Summary ==
Test perf:
Subgroup polling:
fail -> PASS (shard-hsw) fdo#102252
Test kms_plane:
Subgroup plane-panning-bottom-right-suspend-pipe-c-planes:
fail -> INCOMPLETE (shard-hsw) fdo#103375 +1
Test pm_rc6_residency:
Subgroup rc6-accuracy:
pass -> SKIP (shard-snb)
Test kms_frontbuffer_tracking:
Subgroup fbc-1p-offscren-pri-shrfb-draw-blt:
pass -> FAIL (shard-snb) fdo#101623 +1
Subgroup fbc-2p-primscrn-pri-indfb-draw-blt:
notrun -> INCOMPLETE (shard-hsw)
Test gem_tiled_swapping:
Subgroup non-threaded:
incomplete -> PASS (shard-hsw) fdo#104218fdo#102252 https://bugs.freedesktop.org/show_bug.cgi?id=102252
fdo#103375 https://bugs.freedesktop.org/show_bug.cgi?id=103375
fdo#101623 https://bugs.freedesktop.org/show_bug.cgi?id=101623
fdo#104218 https://bugs.freedesktop.org/show_bug.cgi?id=104218
shard-hsw total:2576 pass:1459 dwarn:1 dfail:0 fail:10 skip:1104 time:8754s shard-snb total:2713 pass:1310 dwarn:1 dfail:0 fail:11 skip:1391 time:8042s Blacklisted hosts: shard-apl total:2713 pass:1687 dwarn:1 dfail:0 fail:25 skip:999 time:13703s shard-kbl total:2560 pass:1705 dwarn:1 dfail:0 fail:27 skip:827 time:10521s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7573/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for drm/i915: Fix up the CCS code (rev3)
In reply to Ville Syrjala== Series Details ==
== Series Details ==
Series: drm/i915: Fix up the CCS code (rev3)
URL : https://patchwork.freedesktop.org/series/29308/
State : failure
== Summary ==
Applying: drm/i915: Add a comment exlaining CCS hsub/vsub
Applying: drm/i915: Nuke a pointless unreachable()
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/intel_display.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: drm/i915: Add the missing Y/Yf modifiers for SKL+ sprites
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/intel_sprite.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_sprite.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_sprite.c Patch failed at 0003 drm/i915: Add the missing Y/Yf modifiers for SKL+ sprites The copy of the patch that failed is found in: .git/rebase-apply/patch When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx