From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 15 Nov 2013 05:19:54 +0000 (+0900)
Subject: Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
X-Git-Tag: v3.13-rc1~76
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=049ffa8ab33a63b3bff672d1a0ee6a35ad253fe8

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

Pull drm updates from Dave Airlie:
 "This is a combo of -next and some -fixes that came in in the
  intervening time.

  Highlights:

  New drivers:
    ARM Armada driver for Marvell Armada 510 SOCs

  Intel:
    Broadwell initial support under a default off switch,
    Stereo/3D HDMI mode support
    Valleyview improvements
    Displayport improvements
    Haswell fixes
    initial mipi dsi panel support
    CRC support for debugging
    build with CONFIG_FB=n

  Radeon:
    enable DPM on a number of GPUs by default
    secondary GPU powerdown support
    enable HDMI audio by default
    Hawaii support

  Nouveau:
    dynamic pm code infrastructure reworked, does nothing major yet
    GK208 modesetting support
    MSI fixes, on by default again
    PMPEG improvements
    pageflipping fixes

  GMA500:
    minnowboard SDVO support

  VMware:
    misc fixes

  MSM:
    prime, plane and rendernodes support

  Tegra:
    rearchitected to put the drm driver into the drm subsystem.
    HDMI and gr2d support for tegra 114 SoC

  QXL:
    oops fix, and multi-head fixes

  DRM core:
    sysfs lifetime fixes
    client capability ioctl
    further cleanups to device midlayer
    more vblank timestamp fixes"

* 'drm-next' of git://people.freedesktop.org/~airlied/linux: (789 commits)
  drm/nouveau: do not map evicted vram buffers in nouveau_bo_vma_add
  drm/nvc0-/gr: shift wrapping bug in nvc0_grctx_generate_r406800
  drm/nouveau/pwr: fix missing mutex unlock in a failure path
  drm/nv40/therm: fix slowing down fan when pstate undefined
  drm/nv11-: synchronise flips to vblank, unless async flip requested
  drm/nvc0-: remove nasty fifo swmthd hack for flip completion method
  drm/nv10-: we no longer need to create nvsw object on user channels
  drm/nouveau: always queue flips relative to kernel channel activity
  drm/nouveau: there is no need to reserve/fence the new fb when flipping
  drm/nouveau: when bailing out of a pushbuf ioctl, do not remove previous fence
  drm/nouveau: allow nouveau_fence_ref() to be a noop
  drm/nvc8/mc: msi rearm is via the nvc0 method
  drm/ttm: Fix vma page_prot bit manipulation
  drm/vmwgfx: Fix a couple of compile / sparse warnings and errors
  drm/vmwgfx: Resource evict fixes
  drm/edid: compare actual vrefresh for all modes for quirks
  drm: shmob_drm: Convert to clk_prepare/unprepare
  drm/nouveau: fix 32-bit build
  drm/i915/opregion: fix build error on CONFIG_ACPI=n
  Revert "drm/radeon/audio: don't set speaker allocation on DCE4+"
  ...
---

049ffa8ab33a63b3bff672d1a0ee6a35ad253fe8
diff --cc drivers/gpu/drm/radeon/evergreen.c
index 56f6bec34af5,52f1ae16f653..9702e55e924e
--- a/drivers/gpu/drm/radeon/evergreen.c
+++ b/drivers/gpu/drm/radeon/evergreen.c
@@@ -1182,10 -1186,69 +1182,66 @@@ void evergreen_fix_pci_max_read_req_siz
  	/* if bios or OS sets MAX_READ_REQUEST_SIZE to an invalid value, fix it
  	 * to avoid hangs or perfomance issues
  	 */
 -	if ((v == 0) || (v == 6) || (v == 7)) {
 -		ctl &= ~PCI_EXP_DEVCTL_READRQ;
 -		ctl |= (2 << 12);
 -		pcie_capability_write_word(rdev->pdev, PCI_EXP_DEVCTL, ctl);
 -	}
 +	if ((v == 0) || (v == 6) || (v == 7))
 +		pcie_set_readrq(rdev->pdev, 512);
  }
  
+ void dce4_program_fmt(struct drm_encoder *encoder)
+ {
+ 	struct drm_device *dev = encoder->dev;
+ 	struct radeon_device *rdev = dev->dev_private;
+ 	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
+ 	struct radeon_crtc *radeon_crtc = to_radeon_crtc(encoder->crtc);
+ 	struct drm_connector *connector = radeon_get_connector_for_encoder(encoder);
+ 	int bpc = 0;
+ 	u32 tmp = 0;
+ 	enum radeon_connector_dither dither = RADEON_FMT_DITHER_DISABLE;
+ 
+ 	if (connector) {
+ 		struct radeon_connector *radeon_connector = to_radeon_connector(connector);
+ 		bpc = radeon_get_monitor_bpc(connector);
+ 		dither = radeon_connector->dither;
+ 	}
+ 
+ 	/* LVDS/eDP FMT is set up by atom */
+ 	if (radeon_encoder->devices & ATOM_DEVICE_LCD_SUPPORT)
+ 		return;
+ 
+ 	/* not needed for analog */
+ 	if ((radeon_encoder->encoder_id == ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1) ||
+ 	    (radeon_encoder->encoder_id == ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC2))
+ 		return;
+ 
+ 	if (bpc == 0)
+ 		return;
+ 
+ 	switch (bpc) {
+ 	case 6:
+ 		if (dither == RADEON_FMT_DITHER_ENABLE)
+ 			/* XXX sort out optimal dither settings */
+ 			tmp |= (FMT_FRAME_RANDOM_ENABLE | FMT_HIGHPASS_RANDOM_ENABLE |
+ 				FMT_SPATIAL_DITHER_EN);
+ 		else
+ 			tmp |= FMT_TRUNCATE_EN;
+ 		break;
+ 	case 8:
+ 		if (dither == RADEON_FMT_DITHER_ENABLE)
+ 			/* XXX sort out optimal dither settings */
+ 			tmp |= (FMT_FRAME_RANDOM_ENABLE | FMT_HIGHPASS_RANDOM_ENABLE |
+ 				FMT_RGB_RANDOM_ENABLE |
+ 				FMT_SPATIAL_DITHER_EN | FMT_SPATIAL_DITHER_DEPTH);
+ 		else
+ 			tmp |= (FMT_TRUNCATE_EN | FMT_TRUNCATE_DEPTH);
+ 		break;
+ 	case 10:
+ 	default:
+ 		/* not needed */
+ 		break;
+ 	}
+ 
+ 	WREG32(FMT_BIT_DEPTH_CONTROL + radeon_crtc->crtc_offset, tmp);
+ }
+ 
  static bool dce4_is_in_vblank(struct radeon_device *rdev, int crtc)
  {
  	if (RREG32(EVERGREEN_CRTC_STATUS + crtc_offsets[crtc]) & EVERGREEN_CRTC_V_BLANK)