Skip to contentSkip to conversation

sna/video/sprite: Fix colorkey setup for depth != 24

PATCH In review Ville Syrjala 2 participants 8 messages Oct 22, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/4 sna/video/sprite: Fix colorkey setup for depth != 24

From: Ville Syrjälä <[email protected]>

Set up the colorkey correctly for depth != 24. For 8bpc we need to replicate the same key value into each channel, for depth 15/16 we need to mask off the unused low bits in each channel, and for depth 30 we just use the 8 msbs of each channel as the colorkey register can't hold the full 10 bits.

---
 src/sna/sna_video_sprite.c | 52 +++++++++++++++++++++++++++++++++++---
 1 file changed, 49 insertions(+), 3 deletions(-)
src/sna/sna_video_sprite.c +49 -3
index 8b7ae8ae9e75..bb7b200b4dcc 100644
@@ -228,6 +228,52 @@ update_dst_box_to_crtc_coords(struct sna *sna, xf86CrtcPtr crtc, BoxPtr dstBox)
 	}
 }
 
+static uint32_t ckey_chan(uint32_t value, int weight)
+{
+	return value << 8 >> weight;
+}
+
+static uint32_t ckey_value_chan(uint32_t value, uint32_t mask,
+				int offset, int weight)
+{
+	return ckey_chan((value & mask) >> offset, weight);
+}
+
+static uint32_t ckey_value(struct sna *sna,
+			   struct sna_video *video)
+{
+	ScrnInfoPtr scrn = sna->scrn;
+	uint32_t r, g ,b;
+
+	if (scrn->depth == 8) {
+		r = g = b = video->color_key & 0xff;
+	} else {
+		r = ckey_value_chan(video->color_key, scrn->mask.red,
+				    scrn->offset.red, scrn->weight.red);
+		g = ckey_value_chan(video->color_key, scrn->mask.green,
+				    scrn->offset.green, scrn->weight.green);
+		b = ckey_value_chan(video->color_key, scrn->mask.blue,
+				    scrn->offset.blue, scrn->weight.blue);
+	}
+
+	return r << 16 | g << 8 | b;
+}
+
+static uint32_t ckey_mask_chan(int weight)
+{
+	return ckey_chan((1 << weight) - 1, weight);
+}
+
+static uint32_t ckey_mask(struct sna *sna)
+{
+	ScrnInfoPtr scrn = sna->scrn;
+	uint32_t r = ckey_mask_chan(scrn->weight.red);
+	uint32_t g = ckey_mask_chan(scrn->weight.green);
+	uint32_t b = ckey_mask_chan(scrn->weight.blue);
+
+	return 0x7 << 24 | r << 16 | g << 8 | b;
+}
+
 static bool
 sna_video_sprite_show(struct sna *sna,
 		      struct sna_video *video,
@@ -260,9 +306,9 @@ sna_video_sprite_show(struct sna *sna,
 		     __FUNCTION__, video->color_key));
 
 		set.plane_id = s.plane_id;
-		set.min_value = video->color_key;
-		set.max_value = video->color_key; /* not used for destkey */
-		set.channel_mask = 0x7 << 24 | 0xff << 16 | 0xff << 8 | 0xff << 0;
+		set.min_value = ckey_value(sna, video);
+		set.max_value = 0; /* not used for destkey */
+		set.channel_mask = ckey_mask(sna);
 		set.flags = 0;
 		if (!video->AlwaysOnTop)
 			set.flags |= 1 << 1; /* COLORKEY_DESTINATION */
Signature · 6 lines
2.18.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

PATCH 2/4 sna/video/sprite: Allow sprite Xv with depth 8 and depth 30

From: Ville Syrjälä <[email protected]>

With the colorkey setup fixed the sprite Xv adaptor works just fine with depth 30.

With depth 8 there is one remaining problem with the usage of the LUT for gamma vs. C8, but that is purely a kernel issue.

Let's allow both depth 8 and depth 30 with the sprite Xv adaptor.

---
 src/sna/sna_video_sprite.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
src/sna/sna_video_sprite.c +1 -1
index bb7b200b4dcc..d3d722d4d77c 100644
@@ -72,7 +72,7 @@ struct local_mode_set_plane {
 
 static Atom xvColorKey, xvAlwaysOnTop, xvSyncToVblank, xvColorspace;
 
-static XvFormatRec formats[] = { {15}, {16}, {24} };
+static XvFormatRec formats[] = { {8}, {15}, {16}, {24}, {30} };
 static const XvImageRec images[] = { XVIMAGE_YUY2, XVIMAGE_UYVY,
 				     XVMC_RGB888 };
 static const XvImageRec images_rgb565[] = { XVIMAGE_YUY2, XVIMAGE_UYVY,
Signature · 6 lines
2.18.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v1 2/4
#2 lore raw

Re: [PATCH xf86-video-intel 2/4] sna/video/sprite: Allow sprite Xv with depth 8 and depth 30

Quoting Ville Syrjala (2018-10-22 14:59:27)

Quoted 5 lines

From: Ville Syrjälä <[email protected]>

With the colorkey setup fixed the sprite Xv adaptor works just fine with depth 30.

Quoted 7 lines

With depth 8 there is one remaining problem with the usage of the LUT for gamma vs. C8, but that is purely a kernel issue.

Let's allow both depth 8 and depth 30 with the sprite Xv adaptor.

-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#3 lore raw

PATCH 3/4 sna/video/textured: Enable textured Xv wih depth 30

In reply to Ville Syrjala

From: Ville Syrjälä <[email protected]>

Texured Xv works just fine with depth 30. Allow it.

---
 src/sna/sna_video_textured.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
src/sna/sna_video_textured.c +1 -1
index a784fe2ec0f4..dd38d4d4e3e7 100644
@@ -39,7 +39,7 @@
 static Atom xvBrightness, xvContrast, xvSyncToVblank, xvColorspace;
 
 static XvFormatRec Formats[] = {
-	{15}, {16}, {24}
+	{15}, {16}, {24}, {30}
 };
 
 static const XvAttributeRec Attributes[] = {
Signature · 6 lines
2.18.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v1 3/4
#4 lore raw

Re: [PATCH xf86-video-intel 3/4] sna/video/textured: Enable textured Xv wih depth 30

Quoting Ville Syrjala (2018-10-22 14:59:28)

Quoted 5 lines

From: Ville Syrjälä <[email protected]>

Texured Xv works just fine with depth 30. Allow it.

-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#5 lore raw

PATCH 4/4 sna/video/textured: Disable textured Xv for depth 8

In reply to Ville Syrjala

From: Ville Syrjälä <[email protected]>

We can't output color index formats with the render engine, so let's disable the textured Xv adaptor for depth 8.

---
 src/sna/sna_video_textured.c | 6 ++++++
 1 file changed, 6 insertions(+)
src/sna/sna_video_textured.c +6 -0
index dd38d4d4e3e7..115cbea42c24 100644
@@ -354,6 +354,12 @@ void sna_video_textured_setup(struct sna *sna, ScreenPtr screen)
 	struct sna_video *video;
 	int nports, i;
 
+	if (sna->scrn->depth == 8) {
+		xf86DrvMsg(sna->scrn->scrnIndex, X_INFO,
+			   "Textured video not supported in 8bpp mode\n");
+		return;
+	}
+
 	if (!sna->render.video) {
 		xf86DrvMsg(sna->scrn->scrnIndex, X_INFO,
 			   "Textured video not supported on this hardware or backend\n");
Signature · 6 lines
2.18.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v1 4/4
#6 lore raw

Re: [PATCH xf86-video-intel 4/4] sna/video/textured: Disable textured Xv for depth 8

Quoting Ville Syrjala (2018-10-22 14:59:29)

Quoted 4 lines

From: Ville Syrjälä <[email protected]>

We can't output color index formats with the render engine, so let's disable the textured Xv adaptor for depth 8.

Fair enough, there's probably lots more breakage around the place.

Quoted 1 line

-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reviewed-by on v1 1/4
#7 lore raw
In reply to Ville Syrjala

Quoting Ville Syrjala (2018-10-22 14:59:26)

Quoted 18 lines

From: Ville Syrjälä <[email protected]>

Set up the colorkey correctly for depth != 24. For 8bpc we need to replicate the same key value into each channel, for depth 15/16 we need to mask off the unused low bits in each channel, and for depth 30 we just use the 8 msbs of each channel as the colorkey register can't hold the full 10 bits.

---
 src/sna/sna_video_sprite.c | 52 +++++++++++++++++++++++++++++++++++---
 1 file changed, 49 insertions(+), 3 deletions(-)
src/sna/sna_video_sprite.c +0 -0
index 8b7ae8ae9e75..bb7b200b4dcc 100644

src/sna/sna_video_sprite.c update_dst_box_to_crtc_coords(struct sna *sna, xf86CrtcPtr crtc, BoxPtr dstBox) · line 233

Quoted 6 lines
src/sna/sna_video_sprite.c +3 -0
@@ -228,6 +228,52 @@ update_dst_box_to_crtc_coords(struct sna *sna, xf86CrtcPtr crtc, BoxPtr dstBox)
        }
 }
 
+static uint32_t ckey_chan(uint32_t value, int weight)
+{
+       return value << 8 >> weight;

Ok, making an 8bit value out of whatever input.

Quoted 13 lines
src/sna/sna_video_sprite.c +13 -0
+}
+
+static uint32_t ckey_value_chan(uint32_t value, uint32_t mask,
+                               int offset, int weight)
+{
+       return ckey_chan((value & mask) >> offset, weight);
+}
+
+static uint32_t ckey_value(struct sna *sna,
+                          struct sna_video *video)
+{
+       ScrnInfoPtr scrn = sna->scrn;
+       uint32_t r, g ,b;

src/sna/sna_video_sprite.c update_dst_box_to_crtc_coords(struct sna *sna, xf86CrtcPtr crtc, BoxPtr dstBox) · line 256

Quoted 10 lines
src/sna/sna_video_sprite.c +10 -0
+
+       if (scrn->depth == 8) {
+               r = g = b = video->color_key & 0xff;
+       } else {
+               r = ckey_value_chan(video->color_key, scrn->mask.red,
+                                   scrn->offset.red, scrn->weight.red);
+               g = ckey_value_chan(video->color_key, scrn->mask.green,
+                                   scrn->offset.green, scrn->weight.green);
+               b = ckey_value_chan(video->color_key, scrn->mask.blue,
+                                   scrn->offset.blue, scrn->weight.blue);

Makes sense.

-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx