From: Marek Olšák Date: Wed, 16 Feb 2011 01:26:08 +0000 (+0100) Subject: drm/radeon/kms: do not reject X16 and Y16X16 floating-point formats on r300 X-Git-Tag: v2.6.38-rc6~25^2~2 X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=16e4b8a6e44b8c736c37af370afaa428c3239fb6;p=cascardo%2Flinux.git drm/radeon/kms: do not reject X16 and Y16X16 floating-point formats on r300 Signed-off-by: Marek Olšák Signed-off-by: Dave Airlie --- diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c index 768c60ee4ab6..069efa8c8ecf 100644 --- a/drivers/gpu/drm/radeon/r300.c +++ b/drivers/gpu/drm/radeon/r300.c @@ -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: