From 4871930451215fd8673f7e213a88aa48e5ecaad3 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Fri, 27 Jan 2017 12:31:40 -0800 Subject: [PATCH] isl/formats: Only advertise sampling for A4B4G4R4 on Broadwell This causes hangs on Broadwell if you try to render to it. I have no idea how we managed to not hit this earlier. Tested-by: Mark Janes Reviewed-by: Kenneth Graunke Cc: "13.0 17.0" --- src/intel/isl/isl_format.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/intel/isl/isl_format.c b/src/intel/isl/isl_format.c index c8daece9b16..bc157d59372 100644 --- a/src/intel/isl/isl_format.c +++ b/src/intel/isl/isl_format.c @@ -218,9 +218,10 @@ static const struct surface_format_info format_info[] = { SF(50, 50, x, x, x, x, x, x, x, x, P8A8_UNORM_PALETTE1) SF( x, x, x, x, x, x, x, x, x, x, A1B5G5R5_UNORM) /* According to the PRM, A4B4G4R4_UNORM isn't supported until Sky Lake - * but empirical testing indicates that it works just fine on Broadwell. + * but empirical testing indicates that at least sampling works just fine + * on Broadwell. */ - SF(80, 80, x, x, 80, x, x, x, x, x, A4B4G4R4_UNORM) + SF(80, 80, x, x, 90, x, x, x, x, x, A4B4G4R4_UNORM) SF(90, x, x, x, x, x, x, x, x, x, L8A8_UINT) SF(90, x, x, x, x, x, x, x, x, x, L8A8_SINT) SF( Y, Y, x, 45, Y, Y, Y, x, x, x, R8_UNORM) -- 2.30.2