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

Commit 031fea43 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-fixes-4.1' of git://people.freedesktop.org/~deathsimple/linux into drm-fixes 

two radeon fixes
	one MST fix,
	one query addition, destined for stable, and to fix a regression
* 'drm-fixes-4.1' of git://people.freedesktop.org/~deathsimple/linux:
  drm/radeon: don't probe MST on hw we don't support it on
  drm/radeon: Add RADEON_INFO_VA_UNMAP_WORKING query
parents 25161084 7f017e56

drivers/gpu/drm/radeon/radeon_dp_mst.c

+5 −0
Original line number Diff line number Diff line
@@ -663,12 +663,17 @@ int 
radeon_dp_mst_probe(struct radeon_connector *radeon_connector)

{

	struct radeon_connector_atom_dig *dig_connector = radeon_connector->con_priv;

	struct drm_device *dev = radeon_connector->base.dev;

	struct radeon_device *rdev = dev->dev_private;

	int ret;

	u8 msg[1];



	if (!radeon_mst)

		return 0;



	if (!ASIC_IS_DCE5(rdev))

		return 0;



	if (dig_connector->dpcd[DP_DPCD_REV] < 0x12)

		return 0;

drivers/gpu/drm/radeon/radeon_kms.c

+3 −0
Original line number Diff line number Diff line
@@ -576,6 +576,9 @@ static int radeon_info_ioctl(struct drm_device *dev, void *data, struct drm_file 
		if (radeon_get_allowed_info_register(rdev, *value, value))

			return -EINVAL;

		break;

	case RADEON_INFO_VA_UNMAP_WORKING:

		*value = true;

		break;

	default:

		DRM_DEBUG_KMS("Invalid request %d\n", info->request);

		return -EINVAL;

include/uapi/drm/radeon_drm.h

+1 −0
Original line number Diff line number Diff line
@@ -1038,6 +1038,7 @@ struct drm_radeon_cs { 
#define RADEON_INFO_CURRENT_GPU_SCLK	0x22

#define RADEON_INFO_CURRENT_GPU_MCLK	0x23

#define RADEON_INFO_READ_REG		0x24

#define RADEON_INFO_VA_UNMAP_WORKING	0x25



struct drm_radeon_info {

	uint32_t		request;