Commit 101a6fd3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull drm fixes from Dave Airlie:
 "One intel fix, one rockchip fix, and a bunch of radeon fixes for some
  regressions from audio rework and vm stability"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/i915/chv: Implement WaDisableShadowRegForCpd
  drm/radeon: fix userptr return value checking (v2)
  drm/radeon: check new address before removing old one
  drm/radeon: reset BOs address after clearing it.
  drm/radeon: fix lockup when BOs aren't part of the VM on release
  drm/radeon: add SI DPM quirk for Sapphire R9 270 Dual-X 2G GDDR5
  drm/radeon: adjust pll when audio is not enabled
  drm/radeon: only enable audio streams if the monitor supports it
  drm/radeon: only mark audio as connected if the monitor supports it (v3)
  drm/radeon/audio: don't enable packets until the end
  drm/radeon: drop dce6_dp_enable
  drm/radeon: fix ordering of AVI packet setup
  drm/radeon: Use drm_calloc_ab for CS relocs
  drm/rockchip: fix error check when getting irq
  MAINTAINERS: add entry for Rockchip drm drivers
parents 61f06db0 71aee819

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -3413,6 +3413,13 @@ F: drivers/gpu/drm/rcar-du/ 
F:	drivers/gpu/drm/shmobile/

F:	include/linux/platform_data/shmob_drm.h



DRM DRIVERS FOR ROCKCHIP

M:	Mark Yao <mark.yao@rock-chips.com>

L:	dri-devel@lists.freedesktop.org

S:	Maintained

F:	drivers/gpu/drm/rockchip/

F:	Documentation/devicetree/bindings/video/rockchip*



DSBR100 USB FM RADIO DRIVER

M:	Alexey Klimov <klimov.linux@gmail.com>

L:	linux-media@vger.kernel.org

drivers/gpu/drm/i915/i915_reg.h

+2 −0
Original line number Diff line number Diff line
@@ -6074,6 +6074,8 @@ enum skl_disp_power_wells { 
#define  GTFIFOCTL				0x120008

#define    GT_FIFO_FREE_ENTRIES_MASK		0x7f

#define    GT_FIFO_NUM_RESERVED_ENTRIES		20

#define    GT_FIFO_CTL_BLOCK_ALL_POLICY_STALL	(1 << 12)

#define    GT_FIFO_CTL_RC6_POLICY_STALL		(1 << 11)



#define  HSW_IDICR				0x9008

#define    IDIHASHMSK(x)			(((x) & 0x3f) << 16)

drivers/gpu/drm/i915/intel_uncore.c

+8 −0
Original line number Diff line number Diff line
@@ -360,6 +360,14 @@ static void __intel_uncore_early_sanitize(struct drm_device *dev, 
		__raw_i915_write32(dev_priv, GTFIFODBG,

				   __raw_i915_read32(dev_priv, GTFIFODBG));



	/* WaDisableShadowRegForCpd:chv */

	if (IS_CHERRYVIEW(dev)) {

		__raw_i915_write32(dev_priv, GTFIFOCTL,

				   __raw_i915_read32(dev_priv, GTFIFOCTL) |

				   GT_FIFO_CTL_BLOCK_ALL_POLICY_STALL |

				   GT_FIFO_CTL_RC6_POLICY_STALL);

	}



	intel_uncore_forcewake_reset(dev, restore_forcewake);

}

drivers/gpu/drm/radeon/atombios_crtc.c

+3 −0
Original line number Diff line number Diff line
@@ -580,6 +580,9 @@ static u32 atombios_adjust_pll(struct drm_crtc *crtc, 
		else

			radeon_crtc->pll_flags |= RADEON_PLL_PREFER_LOW_REF_DIV;



		/* if there is no audio, set MINM_OVER_MAXP  */

		if (!drm_detect_monitor_audio(radeon_connector_edid(connector)))

			radeon_crtc->pll_flags |= RADEON_PLL_PREFER_MINM_OVER_MAXP;

		if (rdev->family < CHIP_RV770)

			radeon_crtc->pll_flags |= RADEON_PLL_PREFER_MINM_OVER_MAXP;

		/* use frac fb div on APUs */

drivers/gpu/drm/radeon/atombios_encoders.c

+2 −4
Original line number Diff line number Diff line
@@ -1761,17 +1761,15 @@ radeon_atom_encoder_dpms(struct drm_encoder *encoder, int mode) 
	struct drm_device *dev = encoder->dev;

	struct radeon_device *rdev = dev->dev_private;

	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);

	struct drm_connector *connector = radeon_get_connector_for_encoder(encoder);

	int encoder_mode = atombios_get_encoder_mode(encoder);



	DRM_DEBUG_KMS("encoder dpms %d to mode %d, devices %08x, active_devices %08x\n",

		  radeon_encoder->encoder_id, mode, radeon_encoder->devices,

		  radeon_encoder->active_device);



	if (connector && (radeon_audio != 0) &&

	if ((radeon_audio != 0) &&

	    ((encoder_mode == ATOM_ENCODER_MODE_HDMI) ||

	     (ENCODER_MODE_IS_DP(encoder_mode) &&

	      drm_detect_monitor_audio(radeon_connector_edid(connector)))))

	     ENCODER_MODE_IS_DP(encoder_mode)))

		radeon_audio_dpms(encoder, mode);



	switch (radeon_encoder->encoder_id) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE