Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b51ad12a authored by Marek Olšák's avatar Marek Olšák Committed by Alex Deucher
Browse files

drm/radeon/kms: add MSAA texture support for r600-evergreen 



Most of the checking seems to be in place already. As you can see,
log2(number of samples) resides in LAST_LEVEL.

This is required for MSAA support (namely for depth-stencil resolve and
blitting between MSAA resources).

Signed-off-by: default avatarMarek Olšák <maraeo@gmail.com>
Reviewed-by: default avatarJerome Glisse <jglisse@redhat.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent f00245f1

drivers/gpu/drm/radeon/evergreen_cs.c

+7 −0
Original line number Diff line number Diff line
@@ -788,6 +788,13 @@ static int evergreen_cs_track_validate_texture(struct radeon_cs_parser *p, 
	case V_030000_SQ_TEX_DIM_1D_ARRAY:

	case V_030000_SQ_TEX_DIM_2D_ARRAY:

		depth = 1;

		break;

	case V_030000_SQ_TEX_DIM_2D_MSAA:

	case V_030000_SQ_TEX_DIM_2D_ARRAY_MSAA:

		surf.nsamples = 1 << llevel;

		llevel = 0;

		depth = 1;

		break;

	case V_030000_SQ_TEX_DIM_3D:

		break;

	default:

drivers/gpu/drm/radeon/r600_cs.c

+6 −1
Original line number Diff line number Diff line
@@ -1620,8 +1620,13 @@ static int r600_check_texture_resource(struct radeon_cs_parser *p, u32 idx, 
	case V_038000_SQ_TEX_DIM_2D_ARRAY:

		is_array = true;

		break;

	case V_038000_SQ_TEX_DIM_2D_MSAA:

	case V_038000_SQ_TEX_DIM_2D_ARRAY_MSAA:

		is_array = true;

		/* fall through */

	case V_038000_SQ_TEX_DIM_2D_MSAA:

		array_check.nsamples = 1 << llevel;

		llevel = 0;

		break;

	default:

		dev_warn(p->dev, "this kernel doesn't support %d texture dim\n", G_038000_DIM(word0));

		return -EINVAL;

drivers/gpu/drm/radeon/radeon_drv.c

+2 −1
Original line number Diff line number Diff line
@@ -60,9 +60,10 @@ 
 *   2.16.0 - fix evergreen 2D tiled surface calculation

 *   2.17.0 - add STRMOUT_BASE_UPDATE for r7xx

 *   2.18.0 - r600-eg: allow "invalid" DB formats

 *   2.19.0 - r600-eg: MSAA textures

 */

#define KMS_DRIVER_MAJOR	2

#define KMS_DRIVER_MINOR	18

#define KMS_DRIVER_MINOR	19

#define KMS_DRIVER_PATCHLEVEL	0

int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags);

int radeon_driver_unload_kms(struct drm_device *dev);