summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Deucher <alexdeucher@gmail.com>2011-12-05 09:21:48 -0500
committerAlex Deucher <alexdeucher@gmail.com>2011-12-05 09:23:07 -0500
commit7dcefc69d9fbceae27cd03083c815e01a19b527e (patch)
treedcfd8b823110a5e8913da1d4bfc17f2a392478c3
parent72e386d42516e7cd3c2cbf2fffc9174cd3ec8451 (diff)
Xv: Evergreen+ asics support 16k surfaces
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
-rw-r--r--src/radeon_textured_video.c17
1 files changed, 16 insertions, 1 deletions
diff --git a/src/radeon_textured_video.c b/src/radeon_textured_video.c
index e49575da..ff2bb9f9 100644
--- a/src/radeon_textured_video.c
+++ b/src/radeon_textured_video.c
@@ -66,6 +66,9 @@ R600CopyToVRAM(ScrnInfoPtr pScrn,
#define IMAGE_MAX_WIDTH_R600 8192
#define IMAGE_MAX_HEIGHT_R600 8192
+#define IMAGE_MAX_WIDTH_EG 16384
+#define IMAGE_MAX_HEIGHT_EG 16384
+
static Bool
RADEONTilingEnabled(ScrnInfoPtr pScrn, PixmapPtr pPix)
{
@@ -554,6 +557,16 @@ static XF86VideoEncodingRec DummyEncodingR600[1] =
}
};
+static XF86VideoEncodingRec DummyEncodingEG[1] =
+{
+ {
+ 0,
+ "XV_IMAGE",
+ IMAGE_MAX_WIDTH_EG, IMAGE_MAX_HEIGHT_EG,
+ {1, 1}
+ }
+};
+
#define NUM_FORMATS 3
static XF86VideoFormatRec Formats[NUM_FORMATS] =
@@ -824,7 +837,9 @@ RADEONSetupImageTexturedVideo(ScreenPtr pScreen)
adapt->flags = 0;
adapt->name = "Radeon Textured Video";
adapt->nEncodings = 1;
- if (IS_R600_3D)
+ if (IS_EVERGREEN_3D)
+ adapt->pEncodings = DummyEncodingEG;
+ else if (IS_R600_3D)
adapt->pEncodings = DummyEncodingR600;
else if (IS_R500_3D)
adapt->pEncodings = DummyEncodingR500;