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

Commit 560591f1 authored by Dave Airlie's avatar Dave Airlie
Browse files

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

Fix for 128x128 cursors, along with some misc fixes.

* 'drm-fixes-3.14' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon/ni: fix typo in dpm sq ramping setup
  drm/radeon/si: fix typo in dpm sq ramping setup
  drm/radeon: fix CP semaphores on CIK
  drm/radeon: delete a stray tab
  drm/radeon: fix display tiling setup on SI
  drm/radeon/dpm: reduce r7xx vblank mclk threshold to 200
  drm/radeon: fill in DRM_CAPs for cursor size
  drm: add DRM_CAPs for cursor size
  drm/radeon: unify bpc handling
parents c2288d4d 21ed4947

drivers/gpu/drm/drm_ioctl.c

+12 −0
Original line number Diff line number Diff line
@@ -296,6 +296,18 @@ int drm_getcap(struct drm_device *dev, void *data, struct drm_file *file_priv) 
	case DRM_CAP_ASYNC_PAGE_FLIP:

		req->value = dev->mode_config.async_page_flip;

		break;

	case DRM_CAP_CURSOR_WIDTH:

		if (dev->mode_config.cursor_width)

			req->value = dev->mode_config.cursor_width;

		else

			req->value = 64;

		break;

	case DRM_CAP_CURSOR_HEIGHT:

		if (dev->mode_config.cursor_height)

			req->value = dev->mode_config.cursor_height;

		else

			req->value = 64;

		break;

	default:

		return -EINVAL;

	}

drivers/gpu/drm/radeon/atombios_crtc.c

+8 −7
Original line number Diff line number Diff line
@@ -559,7 +559,7 @@ static u32 atombios_adjust_pll(struct drm_crtc *crtc, 
	u32 adjusted_clock = mode->clock;

	int encoder_mode = atombios_get_encoder_mode(encoder);

	u32 dp_clock = mode->clock;

	int bpc = radeon_get_monitor_bpc(connector);

	int bpc = radeon_crtc->bpc;

	bool is_duallink = radeon_dig_monitor_is_duallink(encoder, mode->clock);



	/* reset the pll flags */
@@ -1176,7 +1176,7 @@ static int dce4_crtc_do_set_base(struct drm_crtc *crtc, 
		evergreen_tiling_fields(tiling_flags, &bankw, &bankh, &mtaspect, &tile_split);



		/* Set NUM_BANKS. */

		if (rdev->family >= CHIP_BONAIRE) {

		if (rdev->family >= CHIP_TAHITI) {

			unsigned tileb, index, num_banks, tile_split_bytes;



			/* Calculate the macrotile mode index. */
@@ -1194,13 +1194,14 @@ static int dce4_crtc_do_set_base(struct drm_crtc *crtc, 
				return -EINVAL;

			}



			if (rdev->family >= CHIP_BONAIRE)

				num_banks = (rdev->config.cik.macrotile_mode_array[index] >> 6) & 0x3;

			else

				num_banks = (rdev->config.si.tile_mode_array[index] >> 20) & 0x3;

			fb_format |= EVERGREEN_GRPH_NUM_BANKS(num_banks);

		} else {

			/* SI and older. */

			if (rdev->family >= CHIP_TAHITI)

				tmp = rdev->config.si.tile_config;

			else if (rdev->family >= CHIP_CAYMAN)

			/* NI and older. */

			if (rdev->family >= CHIP_CAYMAN)

				tmp = rdev->config.cayman.tile_config;

			else

				tmp = rdev->config.evergreen.tile_config;

drivers/gpu/drm/radeon/atombios_encoders.c

+4 −3
Original line number Diff line number Diff line
@@ -464,11 +464,12 @@ atombios_tv_setup(struct drm_encoder *encoder, int action) 


static u8 radeon_atom_get_bpc(struct drm_encoder *encoder)

{

	struct drm_connector *connector = radeon_get_connector_for_encoder(encoder);

	int bpc = 8;



	if (connector)

		bpc = radeon_get_monitor_bpc(connector);

	if (encoder->crtc) {

		struct radeon_crtc *radeon_crtc = to_radeon_crtc(encoder->crtc);

		bpc = radeon_crtc->bpc;

	}



	switch (bpc) {

	case 0:

drivers/gpu/drm/radeon/ni_dpm.c

+1 −1
Original line number Diff line number Diff line
@@ -2588,7 +2588,7 @@ static int ni_populate_sq_ramping_values(struct radeon_device *rdev, 
	if (NISLANDS_DPM2_SQ_RAMP_STI_SIZE > (STI_SIZE_MASK >> STI_SIZE_SHIFT))

		enable_sq_ramping = false;



	if (NISLANDS_DPM2_SQ_RAMP_LTI_RATIO <= (LTI_RATIO_MASK >> LTI_RATIO_SHIFT))

	if (NISLANDS_DPM2_SQ_RAMP_LTI_RATIO > (LTI_RATIO_MASK >> LTI_RATIO_SHIFT))

		enable_sq_ramping = false;



	for (i = 0; i < state->performance_level_count; i++) {

drivers/gpu/drm/radeon/radeon.h

+3 −1
Original line number Diff line number Diff line
@@ -135,6 +135,9 @@ extern int radeon_hard_reset; 
/* R600+ */

#define R600_RING_TYPE_UVD_INDEX	5



/* number of hw syncs before falling back on blocking */

#define RADEON_NUM_SYNCS			4



/* hardcode those limit for now */

#define RADEON_VA_IB_OFFSET			(1 << 20)

#define RADEON_VA_RESERVED_SIZE			(8 << 20)
@@ -554,7 +557,6 @@ int radeon_mode_dumb_mmap(struct drm_file *filp, 
/*

 * Semaphores.

 */

/* everything here is constant */

struct radeon_semaphore {

	struct radeon_sa_bo		*sa_bo;

	signed				waiters;