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

Commit 0c9bc275 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:
 "This looks bigger than it is, as one of the nouveau firmware fixes
  ("drm/gf100-/gr: report class data to host on fwmthd failure")
  regenerates a bunch of the firmware files after changing the assembly
  by a few lines, without that, its more of a

    36 files changed, 370 insertions(+), 129 deletions(-)

  It contains some vt.c fixes acked by Greg, for rare hard hangs on i915
  loading, that also fixes hangs on reload and spurious register write
  errors.

  drm core: one fix for uninit memory

  nouveau: displayport rework caused a few regressions, Ben has been
     fixing them as the appear, along with some other fixes

  radeon: pageflipping regression fix, deep color fix, mode validation
     fixes

  i915: fbc disable, vga console kick off, backlight fix, divide-by-zero
     fix"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (33 commits)
  drm: fix uninitialized acquire_ctx fields (v2)
  drm/radeon: Fix radeon_irq_kms_pflip_irq_get/put() imbalance
  Revert "drm/radeon: remove drm_vblank_get|put from pflip handling"
  drm/radeon: improve dvi_mode_valid
  drm/radeon: update mode_valid testing for DP
  drm/radeon: Use dce5/6 hdmi deep color clock setup also on dce8+
  drm/nouveau/disp: fix oops in destructor with headless cards
  drm/gf117/i2c: no aux channels on this chipset
  drm/nouveau/doc: update the thermal documentation
  drm/nouveau/pwr: fix typo in fifo wrap handling
  drm/nv50/disp: fix a potential oops in supervisor handling
  drm/nouveau/disp/dp: don't touch link config after success
  drm/nouveau/kms: reference vblank for crtc during pageflip.
  drm/gk104/fb/ram: fixups from an earlier search+replace
  drm/nv50/gr: remove an unneeded write while initialising PGRAPH
  drm/nv50/gr: fix overlap while zeroing zcull regions
  drm/gf100-/gr: report class data to host on fwmthd failure
  drm/gk104/ibus: increase various random timeouts
  drm/gk104/clk: only touch divider for mode we'll be using
  drm/radeon: Bypass hw lut's for > 8 bpc framebuffer scanout.
  ...
parents f1d70248 884d6147

Documentation/thermal/nouveau_thermal

+4 −3
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ Kernel driver nouveau 
Supported chips:

* NV43+



Authors: Martin Peres (mupuf) <martin.peres@labri.fr>

Authors: Martin Peres (mupuf) <martin.peres@free.fr>



Description

---------
@@ -68,8 +68,9 @@ Your fan can be driven in different modes: 


NOTE: Be sure to use the manual mode if you want to drive the fan speed manually



NOTE2: Not all fan management modes may be supported on all chipsets. We are

working on it.

NOTE2: When operating in manual mode outside the vbios-defined

[PWM_min, PWM_max] range, the reported fan speed (RPM) may not be accurate

depending on your hardware.



Bug reports

---------

drivers/gpu/drm/drm_modeset_lock.c

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ 
void drm_modeset_acquire_init(struct drm_modeset_acquire_ctx *ctx,

		uint32_t flags)

{

	memset(ctx, 0, sizeof(*ctx));

	ww_acquire_init(&ctx->ww_ctx, &crtc_ww_class);

	INIT_LIST_HEAD(&ctx->locked);

}

drivers/gpu/drm/i915/i915_dma.c

+42 −5
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ 
#include "i915_drv.h"

#include "i915_trace.h"

#include <linux/pci.h>

#include <linux/console.h>

#include <linux/vt.h>

#include <linux/vgaarb.h>

#include <linux/acpi.h>

#include <linux/pnp.h>
@@ -1386,7 +1388,6 @@ cleanup_gem: 
	i915_gem_context_fini(dev);

	mutex_unlock(&dev->struct_mutex);

	WARN_ON(dev_priv->mm.aliasing_ppgtt);

	drm_mm_takedown(&dev_priv->gtt.base.mm);

cleanup_irq:

	drm_irq_uninstall(dev);

cleanup_gem_stolen:
@@ -1450,6 +1451,38 @@ static void i915_kick_out_firmware_fb(struct drm_i915_private *dev_priv) 
}

#endif



#if !defined(CONFIG_VGA_CONSOLE)

static int i915_kick_out_vgacon(struct drm_i915_private *dev_priv)

{

	return 0;

}

#elif !defined(CONFIG_DUMMY_CONSOLE)

static int i915_kick_out_vgacon(struct drm_i915_private *dev_priv)

{

	return -ENODEV;

}

#else

static int i915_kick_out_vgacon(struct drm_i915_private *dev_priv)

{

	int ret;



	DRM_INFO("Replacing VGA console driver\n");



	console_lock();

	ret = do_take_over_console(&dummy_con, 0, MAX_NR_CONSOLES - 1, 1);

	if (ret == 0) {

		ret = do_unregister_con_driver(&vga_con);



		/* Ignore "already unregistered". */

		if (ret == -ENODEV)

			ret = 0;

	}

	console_unlock();



	return ret;

}

#endif



static void i915_dump_device_info(struct drm_i915_private *dev_priv)

{

	const struct intel_device_info *info = &dev_priv->info;
@@ -1623,8 +1656,15 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) 
	if (ret)

		goto out_regs;



	if (drm_core_check_feature(dev, DRIVER_MODESET))

	if (drm_core_check_feature(dev, DRIVER_MODESET)) {

		ret = i915_kick_out_vgacon(dev_priv);

		if (ret) {

			DRM_ERROR("failed to remove conflicting VGA console\n");

			goto out_gtt;

		}



		i915_kick_out_firmware_fb(dev_priv);

	}



	pci_set_master(dev->pdev);
@@ -1756,8 +1796,6 @@ out_mtrrfree: 
	arch_phys_wc_del(dev_priv->gtt.mtrr);

	io_mapping_free(dev_priv->gtt.mappable);

out_gtt:

	list_del(&dev_priv->gtt.base.global_link);

	drm_mm_takedown(&dev_priv->gtt.base.mm);

	dev_priv->gtt.base.cleanup(&dev_priv->gtt.base);

out_regs:

	intel_uncore_fini(dev);
@@ -1846,7 +1884,6 @@ int i915_driver_unload(struct drm_device *dev) 
			i915_free_hws(dev);

	}



	list_del(&dev_priv->gtt.base.global_link);

	WARN_ON(!list_empty(&dev_priv->vm_list));



	drm_vblank_cleanup(dev);

drivers/gpu/drm/i915/i915_gem_gtt.c

+8 −1
Original line number Diff line number Diff line
@@ -1992,7 +1992,10 @@ static void gen6_gmch_remove(struct i915_address_space *vm) 


	struct i915_gtt *gtt = container_of(vm, struct i915_gtt, base);



	if (drm_mm_initialized(&vm->mm)) {

		drm_mm_takedown(&vm->mm);

		list_del(&vm->global_link);

	}

	iounmap(gtt->gsm);

	teardown_scratch_page(vm->dev);

}
@@ -2025,6 +2028,10 @@ static int i915_gmch_probe(struct drm_device *dev, 


static void i915_gmch_remove(struct i915_address_space *vm)

{

	if (drm_mm_initialized(&vm->mm)) {

		drm_mm_takedown(&vm->mm);

		list_del(&vm->global_link);

	}

	intel_gmch_remove();

}

drivers/gpu/drm/i915/i915_gpu_error.c

+2 −1
Original line number Diff line number Diff line
@@ -888,6 +888,8 @@ static void i915_gem_record_rings(struct drm_device *dev, 
	for (i = 0; i < I915_NUM_RINGS; i++) {

		struct intel_engine_cs *ring = &dev_priv->ring[i];



		error->ring[i].pid = -1;



		if (ring->dev == NULL)

			continue;
@@ -895,7 +897,6 @@ static void i915_gem_record_rings(struct drm_device *dev, 


		i915_record_ring_state(dev, ring, &error->ring[i]);



		error->ring[i].pid = -1;

		request = i915_gem_find_active_request(ring);

		if (request) {

			/* We need to copy these to an anonymous buffer