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

Commit cd4edf7a 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:
 "All over the map..

   - nouveau:
     disable MSI, needs more work, will try again next merge window
   - radeon:
      audio + uvd regression fixes, dpm fixes, reset fixes
   - i915:
     the dpms fix might fix your haswell

  And one pain in the ass revert, so we have VGA arbitration that when
  implemented 4-5 years ago really hoped that GPUs could remove
  themselves from arbitration completely once they had a kernel driver.

  It seems Intel hw designers decided that was too nice a facility to
  allow us to have so they removed it when they went on-die (so since
  Ironlake at least).  Now Alex Williamson added support for VGA
  arbitration for newer GPUs however this now exposes itself to
  userspace as requireing arbitration of GPU VGA regions and the X
  server gets involved and disables things that it can't handle when VGA
  access is possibly required around every operation.

  So in order to not break userspace we just reverted things back to the
  old known broken status so maybe we can try and design out way out.

  Ville also had a patch to use stop machine for the two times Intel
  needs to access VGA space, that might be acceptable with some rework,
  but for now myself and Daniel agreed to just go back"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (23 commits)
  Revert "i915: Update VGA arbiter support for newer devices"
  Revert "drm/i915: Delay disabling of VGA memory until vgacon->fbcon handoff is done"
  drm/radeon: re-enable sw ACR support on pre-DCE4
  drm/radeon/dpm: disable bapm on TN asics
  drm/radeon: improve soft reset on CIK
  drm/radeon: improve soft reset on SI
  drm/radeon/dpm: off by one in si_set_mc_special_registers()
  drm/radeon/dpm/btc: off by one in btc_set_mc_special_registers()
  drm/radeon: forever loop on error in radeon_do_test_moves()
  drm/radeon: fix hw contexts for SUMO2 asics
  drm/radeon: fix typo in CP DMA register headers
  drm/radeon/dpm: disable multiple UVD states
  drm/radeon: use hw generated CTS/N values for audio
  drm/radeon: fix N/CTS clock matching for audio
  drm/radeon: use 64-bit math to calculate CTS values for audio (v2)
  drm/edid: catch kmalloc failure in drm_edid_to_speaker_allocation
  Revert "drm/fb-helper: don't sleep for screen unblank when an oops is in progress"
  drm/gma500: fix things after get/put page helpers
  drm/nouveau/mc: disable msi support by default, it's busted in tons of places
  drm/i915: Only apply DPMS to the encoder if enabled
  ...
parents 2fe80d3b ebff5fa9

drivers/gpu/drm/drm_edid.c

+2 −0
Original line number Diff line number Diff line
@@ -2925,6 +2925,8 @@ int drm_edid_to_speaker_allocation(struct edid *edid, u8 **sadb) 
			/* Speaker Allocation Data Block */

			if (dbl == 3) {

				*sadb = kmalloc(dbl, GFP_KERNEL);

				if (!*sadb)

					return -ENOMEM;

				memcpy(*sadb, &db[1], dbl);

				count = dbl;

				break;

drivers/gpu/drm/drm_fb_helper.c

+0 −8
Original line number Diff line number Diff line
@@ -407,14 +407,6 @@ static void drm_fb_helper_dpms(struct fb_info *info, int dpms_mode) 
	struct drm_connector *connector;

	int i, j;



	/*

	 * fbdev->blank can be called from irq context in case of a panic.

	 * Since we already have our own special panic handler which will

	 * restore the fbdev console mode completely, just bail out early.

	 */

	if (oops_in_progress)

		return;



	/*

	 * fbdev->blank can be called from irq context in case of a panic.

	 * Since we already have our own special panic handler which will

drivers/gpu/drm/gma500/gtt.c

+1 −0
Original line number Diff line number Diff line
@@ -204,6 +204,7 @@ static int psb_gtt_attach_pages(struct gtt_range *gt) 
	if (IS_ERR(pages))

		return PTR_ERR(pages);



	gt->npage = gt->gem.size / PAGE_SIZE;

	gt->pages = pages;



	return 0;

drivers/gpu/drm/i915/i915_dma.c

+3 −12
Original line number Diff line number Diff line
@@ -1290,12 +1290,9 @@ static int i915_load_modeset_init(struct drm_device *dev) 
	 * then we do not take part in VGA arbitration and the

	 * vga_client_register() fails with -ENODEV.

	 */

	if (!HAS_PCH_SPLIT(dev)) {

		ret = vga_client_register(dev->pdev, dev, NULL,

					  i915_vga_set_decode);

	ret = vga_client_register(dev->pdev, dev, NULL, i915_vga_set_decode);

	if (ret && ret != -ENODEV)

		goto out;

	}



	intel_register_dsm_handler();
@@ -1351,12 +1348,6 @@ static int i915_load_modeset_init(struct drm_device *dev) 
	 */

	intel_fbdev_initial_config(dev);



	/*

	 * Must do this after fbcon init so that

	 * vgacon_save_screen() works during the handover.

	 */

	i915_disable_vga_mem(dev);



	/* Only enable hotplug handling once the fbdev is fully set up. */

	dev_priv->enable_hotplug_processing = true;

drivers/gpu/drm/i915/i915_reg.h

+6 −0
Original line number Diff line number Diff line
@@ -3881,6 +3881,9 @@ 
#define GEN7_SQ_CHICKEN_MBCUNIT_CONFIG		0x9030

#define  GEN7_SQ_CHICKEN_MBCUNIT_SQINTMOB	(1<<11)



#define HSW_SCRATCH1				0xb038

#define  HSW_SCRATCH1_L3_DATA_ATOMICS_DISABLE	(1<<27)



#define HSW_FUSE_STRAP		0x42014

#define  HSW_CDCLK_LIMIT	(1 << 24)
@@ -4728,6 +4731,9 @@ 
#define GEN7_ROW_CHICKEN2_GT2		0xf4f4

#define   DOP_CLOCK_GATING_DISABLE	(1<<0)



#define HSW_ROW_CHICKEN3		0xe49c

#define  HSW_ROW_CHICKEN3_L3_GLOBAL_ATOMICS_DISABLE    (1 << 6)



#define G4X_AUD_VID_DID			(dev_priv->info->display_mmio_offset + 0x62020)

#define INTEL_AUDIO_DEVCL		0x808629FB

#define INTEL_AUDIO_DEVBLC		0x80862801