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

Commit 74a7f6a0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/ttm: fix two regressions since move_notify changes
  drm/radeon: avoid deadlock if GPU lockup is detected in ib_pool_get
  drm/radeon: silence out possible lock dependency warning
  drm: Fix authentication kernel crash
  gma500: Fix shmem mapping
  drm/radeon/kms: refine TMDS dual link checks
  drm/radeon/kms: use drm_detect_hdmi_monitor for picking encoder mode
  drm/radeon/kms: rework modeset sequence for DCE41 and DCE5
  drm/radeon/kms: move panel mode setup into encoder mode set
  drm/radeon/kms: move disp eng pll setup to init path
  drm/radeon: finish getting bios earlier
  drm/radeon: fix invalid memory access in radeon_atrm_get_bios()
  drm/radeon/kms: add some missing semaphore init
  drm/radeon/kms: Add an MSI quirk for Dell RS690
  gpu, drm, sis: Don't return uninitialized variable from sis_driver_load()
parents 486bc794 9f1feed2

drivers/gpu/drm/drm_auth.c

+5 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ static int drm_add_magic(struct drm_master *master, struct drm_file *priv, 
 * Searches and unlinks the entry in drm_device::magiclist with the magic

 * number hash key, while holding the drm_device::struct_mutex lock.

 */

static int drm_remove_magic(struct drm_master *master, drm_magic_t magic)

int drm_remove_magic(struct drm_master *master, drm_magic_t magic)

{

	struct drm_magic_entry *pt;

	struct drm_hash_item *hash;
@@ -136,6 +136,8 @@ static int drm_remove_magic(struct drm_master *master, drm_magic_t magic) 
 * If there is a magic number in drm_file::magic then use it, otherwise

 * searches an unique non-zero magic number and add it associating it with \p

 * file_priv.

 * This ioctl needs protection by the drm_global_mutex, which protects

 * struct drm_file::magic and struct drm_magic_entry::priv.

 */

int drm_getmagic(struct drm_device *dev, void *data, struct drm_file *file_priv)

{
@@ -173,6 +175,8 @@ int drm_getmagic(struct drm_device *dev, void *data, struct drm_file *file_priv) 
 * \return zero if authentication successed, or a negative number otherwise.

 *

 * Checks if \p file_priv is associated with the magic number passed in \arg.

 * This ioctl needs protection by the drm_global_mutex, which protects

 * struct drm_file::magic and struct drm_magic_entry::priv.

 */

int drm_authmagic(struct drm_device *dev, void *data,

		  struct drm_file *file_priv)

drivers/gpu/drm/drm_fops.c

+5 −0
Original line number Diff line number Diff line
@@ -487,6 +487,11 @@ int drm_release(struct inode *inode, struct file *filp) 
		  (long)old_encode_dev(file_priv->minor->device),

		  dev->open_count);



	/* Release any auth tokens that might point to this file_priv,

	   (do that under the drm_global_mutex) */

	if (file_priv->magic)

		(void) drm_remove_magic(file_priv->master, file_priv->magic);



	/* if the master has gone away we can't do anything with the lock */

	if (file_priv->minor->master)

		drm_master_release(dev, filp);

drivers/gpu/drm/nouveau/nouveau_bo.c

+4 −0
Original line number Diff line number Diff line
@@ -812,6 +812,10 @@ nouveau_bo_move_ntfy(struct ttm_buffer_object *bo, struct ttm_mem_reg *new_mem) 
	struct nouveau_bo *nvbo = nouveau_bo(bo);

	struct nouveau_vma *vma;



	/* ttm can now (stupidly) pass the driver bos it didn't create... */

	if (bo->destroy != nouveau_bo_del_ttm)

		return;



	list_for_each_entry(vma, &nvbo->vma_list, head) {

		if (new_mem && new_mem->mem_type == TTM_PL_VRAM) {

			nouveau_vm_map(vma, new_mem->mm_node);

drivers/gpu/drm/radeon/atombios_crtc.c

+30 −30
Original line number Diff line number Diff line
@@ -355,15 +355,12 @@ static void atombios_crtc_set_timing(struct drm_crtc *crtc, 
	atom_execute_table(rdev->mode_info.atom_context, index, (uint32_t *)&args);

}



static void atombios_disable_ss(struct drm_crtc *crtc)

static void atombios_disable_ss(struct radeon_device *rdev, int pll_id)

{

	struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc);

	struct drm_device *dev = crtc->dev;

	struct radeon_device *rdev = dev->dev_private;

	u32 ss_cntl;



	if (ASIC_IS_DCE4(rdev)) {

		switch (radeon_crtc->pll_id) {

		switch (pll_id) {

		case ATOM_PPLL1:

			ss_cntl = RREG32(EVERGREEN_P1PLL_SS_CNTL);

			ss_cntl &= ~EVERGREEN_PxPLL_SS_EN;
@@ -379,7 +376,7 @@ static void atombios_disable_ss(struct drm_crtc *crtc) 
			return;

		}

	} else if (ASIC_IS_AVIVO(rdev)) {

		switch (radeon_crtc->pll_id) {

		switch (pll_id) {

		case ATOM_PPLL1:

			ss_cntl = RREG32(AVIVO_P1PLL_INT_SS_CNTL);

			ss_cntl &= ~1;
@@ -406,13 +403,11 @@ union atom_enable_ss { 
	ENABLE_SPREAD_SPECTRUM_ON_PPLL_V3 v3;

};



static void atombios_crtc_program_ss(struct drm_crtc *crtc,

static void atombios_crtc_program_ss(struct radeon_device *rdev,

				     int enable,

				     int pll_id,

				     struct radeon_atom_ss *ss)

{

	struct drm_device *dev = crtc->dev;

	struct radeon_device *rdev = dev->dev_private;

	int index = GetIndexIntoMasterTable(COMMAND, EnableSpreadSpectrumOnPPLL);

	union atom_enable_ss args;
@@ -479,7 +474,7 @@ static void atombios_crtc_program_ss(struct drm_crtc *crtc, 
	} else if (ASIC_IS_AVIVO(rdev)) {

		if ((enable == ATOM_DISABLE) || (ss->percentage == 0) ||

		    (ss->type & ATOM_EXTERNAL_SS_MASK)) {

			atombios_disable_ss(crtc);

			atombios_disable_ss(rdev, pll_id);

			return;

		}

		args.lvds_ss_2.usSpreadSpectrumPercentage = cpu_to_le16(ss->percentage);
@@ -491,7 +486,7 @@ static void atombios_crtc_program_ss(struct drm_crtc *crtc, 
	} else {

		if ((enable == ATOM_DISABLE) || (ss->percentage == 0) ||

		    (ss->type & ATOM_EXTERNAL_SS_MASK)) {

			atombios_disable_ss(crtc);

			atombios_disable_ss(rdev, pll_id);

			return;

		}

		args.lvds_ss.usSpreadSpectrumPercentage = cpu_to_le16(ss->percentage);
@@ -523,6 +518,7 @@ static u32 atombios_adjust_pll(struct drm_crtc *crtc, 
	int encoder_mode = 0;

	u32 dp_clock = mode->clock;

	int bpc = 8;

	bool is_duallink = false;



	/* reset the pll flags */

	pll->flags = 0;
@@ -557,6 +553,7 @@ static u32 atombios_adjust_pll(struct drm_crtc *crtc, 
			if (connector && connector->display_info.bpc)

				bpc = connector->display_info.bpc;

			encoder_mode = atombios_get_encoder_mode(encoder);

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

			if ((radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT | ATOM_DEVICE_DFP_SUPPORT)) ||

			    (radeon_encoder_get_dp_bridge_encoder_id(encoder) != ENCODER_OBJECT_ID_NONE)) {

				if (connector) {
@@ -652,7 +649,7 @@ static u32 atombios_adjust_pll(struct drm_crtc *crtc, 
					if (dig->coherent_mode)

						args.v3.sInput.ucDispPllConfig |=

							DISPPLL_CONFIG_COHERENT_MODE;

					if (mode->clock > 165000)

					if (is_duallink)

						args.v3.sInput.ucDispPllConfig |=

							DISPPLL_CONFIG_DUAL_LINK;

				}
@@ -702,11 +699,9 @@ union set_pixel_clock { 
/* on DCE5, make sure the voltage is high enough to support the

 * required disp clk.

 */

static void atombios_crtc_set_dcpll(struct drm_crtc *crtc,

static void atombios_crtc_set_dcpll(struct radeon_device *rdev,

				    u32 dispclk)

{

	struct drm_device *dev = crtc->dev;

	struct radeon_device *rdev = dev->dev_private;

	u8 frev, crev;

	int index;

	union set_pixel_clock args;
@@ -996,7 +991,7 @@ static void atombios_crtc_set_pll(struct drm_crtc *crtc, struct drm_display_mode 
		radeon_compute_pll_legacy(pll, adjusted_clock, &pll_clock, &fb_div, &frac_fb_div,

					  &ref_div, &post_div);



	atombios_crtc_program_ss(crtc, ATOM_DISABLE, radeon_crtc->pll_id, &ss);

	atombios_crtc_program_ss(rdev, ATOM_DISABLE, radeon_crtc->pll_id, &ss);



	atombios_crtc_program_pll(crtc, radeon_crtc->crtc_id, radeon_crtc->pll_id,

				  encoder_mode, radeon_encoder->encoder_id, mode->clock,
@@ -1019,7 +1014,7 @@ static void atombios_crtc_set_pll(struct drm_crtc *crtc, struct drm_display_mode 
			ss.step = step_size;

		}



		atombios_crtc_program_ss(crtc, ATOM_ENABLE, radeon_crtc->pll_id, &ss);

		atombios_crtc_program_ss(rdev, ATOM_ENABLE, radeon_crtc->pll_id, &ss);

	}

}
@@ -1494,6 +1489,24 @@ static int radeon_atom_pick_pll(struct drm_crtc *crtc) 


}



void radeon_atom_dcpll_init(struct radeon_device *rdev)

{

	/* always set DCPLL */

	if (ASIC_IS_DCE4(rdev)) {

		struct radeon_atom_ss ss;

		bool ss_enabled = radeon_atombios_get_asic_ss_info(rdev, &ss,

								   ASIC_INTERNAL_SS_ON_DCPLL,

								   rdev->clock.default_dispclk);

		if (ss_enabled)

			atombios_crtc_program_ss(rdev, ATOM_DISABLE, ATOM_DCPLL, &ss);

		/* XXX: DCE5, make sure voltage, dispclk is high enough */

		atombios_crtc_set_dcpll(rdev, rdev->clock.default_dispclk);

		if (ss_enabled)

			atombios_crtc_program_ss(rdev, ATOM_ENABLE, ATOM_DCPLL, &ss);

	}



}



int atombios_crtc_mode_set(struct drm_crtc *crtc,

			   struct drm_display_mode *mode,

			   struct drm_display_mode *adjusted_mode,
@@ -1515,19 +1528,6 @@ int atombios_crtc_mode_set(struct drm_crtc *crtc, 
		}

	}



	/* always set DCPLL */

	if (ASIC_IS_DCE4(rdev)) {

		struct radeon_atom_ss ss;

		bool ss_enabled = radeon_atombios_get_asic_ss_info(rdev, &ss,

								   ASIC_INTERNAL_SS_ON_DCPLL,

								   rdev->clock.default_dispclk);

		if (ss_enabled)

			atombios_crtc_program_ss(crtc, ATOM_DISABLE, ATOM_DCPLL, &ss);

		/* XXX: DCE5, make sure voltage, dispclk is high enough */

		atombios_crtc_set_dcpll(crtc, rdev->clock.default_dispclk);

		if (ss_enabled)

			atombios_crtc_program_ss(crtc, ATOM_ENABLE, ATOM_DCPLL, &ss);

	}

	atombios_crtc_set_pll(crtc, adjusted_mode);



	if (ASIC_IS_DCE4(rdev))

drivers/gpu/drm/radeon/atombios_dp.c

+10 −12
Original line number Diff line number Diff line
@@ -549,7 +549,7 @@ bool radeon_dp_getdpcd(struct radeon_connector *radeon_connector) 
	return false;

}



static void radeon_dp_set_panel_mode(struct drm_encoder *encoder,

int radeon_dp_get_panel_mode(struct drm_encoder *encoder,

			     struct drm_connector *connector)

{

	struct drm_device *dev = encoder->dev;
@@ -558,7 +558,7 @@ static void radeon_dp_set_panel_mode(struct drm_encoder *encoder, 
	int panel_mode = DP_PANEL_MODE_EXTERNAL_DP_MODE;



	if (!ASIC_IS_DCE4(rdev))

		return;

		return panel_mode;



	if (radeon_connector_encoder_get_dp_bridge_encoder_id(connector) ==

	    ENCODER_OBJECT_ID_NUTMEG)
@@ -572,14 +572,7 @@ static void radeon_dp_set_panel_mode(struct drm_encoder *encoder, 
			panel_mode = DP_PANEL_MODE_INTERNAL_DP2_MODE;

	}



	atombios_dig_encoder_setup(encoder,

				   ATOM_ENCODER_CMD_SETUP_PANEL_MODE,

				   panel_mode);



	if ((connector->connector_type == DRM_MODE_CONNECTOR_eDP) &&

	    (panel_mode == DP_PANEL_MODE_INTERNAL_DP2_MODE)) {

		radeon_write_dpcd_reg(radeon_connector, DP_EDP_CONFIGURATION_SET, 1);

	}

	return panel_mode;

}



void radeon_dp_set_link_config(struct drm_connector *connector,
@@ -717,6 +710,8 @@ static void radeon_dp_set_tp(struct radeon_dp_link_train_info *dp_info, int tp) 


static int radeon_dp_link_train_init(struct radeon_dp_link_train_info *dp_info)

{

	struct radeon_encoder *radeon_encoder = to_radeon_encoder(dp_info->encoder);

	struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;

	u8 tmp;



	/* power up the sink */
@@ -732,7 +727,10 @@ static int radeon_dp_link_train_init(struct radeon_dp_link_train_info *dp_info) 
		radeon_write_dpcd_reg(dp_info->radeon_connector,

				      DP_DOWNSPREAD_CTRL, 0);



	radeon_dp_set_panel_mode(dp_info->encoder, dp_info->connector);

	if ((dp_info->connector->connector_type == DRM_MODE_CONNECTOR_eDP) &&

	    (dig->panel_mode == DP_PANEL_MODE_INTERNAL_DP2_MODE)) {

		radeon_write_dpcd_reg(dp_info->radeon_connector, DP_EDP_CONFIGURATION_SET, 1);

	}



	/* set the lane count on the sink */

	tmp = dp_info->dp_lane_count;