drm/radeon/kms: do not reject X16 and Y16X16 floating-point formats on r300
authorMarek Olšák <maraeo@gmail.com>
Wed, 16 Feb 2011 01:26:08 +0000 (02:26 +0100)
committerDave Airlie <airlied@redhat.com>
Thu, 17 Feb 2011 03:55:30 +0000 (13:55 +1000)
Signed-off-by: Marek Olšák <maraeo@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/radeon/r300.c

index 768c60ee4ab6de88730bff3d4fdd8fda31c0d29a..069efa8c8ecfd88caa3343a4b877ded50adccb0c 100644 (file)
@@ -910,6 +910,7 @@ static int r300_packet0_check(struct radeon_cs_parser *p,
                        track->textures[i].compress_format = R100_TRACK_COMP_NONE;
                        break;
                case R300_TX_FORMAT_X16:
+               case R300_TX_FORMAT_FL_I16:
                case R300_TX_FORMAT_Y8X8:
                case R300_TX_FORMAT_Z5Y6X5:
                case R300_TX_FORMAT_Z6Y5X5:
@@ -922,6 +923,7 @@ static int r300_packet0_check(struct radeon_cs_parser *p,
                        track->textures[i].compress_format = R100_TRACK_COMP_NONE;
                        break;
                case R300_TX_FORMAT_Y16X16:
+               case R300_TX_FORMAT_FL_I16A16:
                case R300_TX_FORMAT_Z11Y11X10:
                case R300_TX_FORMAT_Z10Y11X11:
                case R300_TX_FORMAT_W8Z8Y8X8: