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

Commit 6ea31c56 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:
 "Regression fixers for the big 3:

   - nouveau: hdmi audio, dac load detect, s/r regressions fixed
   - radeon: long standing system hang fixed, hdmi audio and rs780 fast
     fb fixes
   - intel: one old regression, a WARN removal, and a stop X dying fix

  Otherwise one mgag200 fix, a couple of arm build fixes, and a core use
  after free fix."

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/nv50/kms: use dac loadval from vbios, where it's available
  drm/nv50/disp: force dac power state during load detect
  drm/nv50-nv84/fifo: fix resume regression introduced by playlist race fix
  drm/nv84/disp: Fix HDMI audio regression
  drm/i915/sdvo: Use &intel_sdvo->ddc instead of intel_sdvo->i2c for DDC.
  drm/radeon: don't allow audio on DCE6
  drm/radeon: Use direct mapping for fast fb access on RS780/RS880 (v2)
  radeon: Fix system hang issue when using KMS with older cards
  drm/i915: no lvds quirk for hp t5740
  drm/i915: Quirk the pipe A quirk in the modeset state checker
  drm/i915: Fix spurious -EIO/SIGBUS on wedged gpus
  drm/mgag200: Add missing write to index before accessing data register
  drm/nouveau: use mdelay instead of large udelay constants
  drm/tilcd: select BACKLIGHT_LCD_SUPPORT
  drm: fix a use-after-free when GPU acceleration disabled
parents d7a39e30 0e32fde9

drivers/gpu/drm/drm_irq.c

+5 −1
Original line number Diff line number Diff line
@@ -1054,7 +1054,7 @@ EXPORT_SYMBOL(drm_vblank_off); 
 */

void drm_vblank_pre_modeset(struct drm_device *dev, int crtc)

{

	/* vblank is not initialized (IRQ not installed ?) */

	/* vblank is not initialized (IRQ not installed ?), or has been freed */

	if (!dev->num_crtcs)

		return;

	/*
@@ -1076,6 +1076,10 @@ void drm_vblank_post_modeset(struct drm_device *dev, int crtc) 
{

	unsigned long irqflags;



	/* vblank is not initialized (IRQ not installed ?), or has been freed */

	if (!dev->num_crtcs)

		return;



	if (dev->vblank_inmodeset[crtc]) {

		spin_lock_irqsave(&dev->vbl_lock, irqflags);

		dev->vblank_disable_allowed = 1;

drivers/gpu/drm/i915/i915_gem.c

+2 −5
Original line number Diff line number Diff line
@@ -91,14 +91,11 @@ i915_gem_wait_for_error(struct i915_gpu_error *error) 
{

	int ret;



#define EXIT_COND (!i915_reset_in_progress(error))

#define EXIT_COND (!i915_reset_in_progress(error) || \

		   i915_terminally_wedged(error))

	if (EXIT_COND)

		return 0;



	/* GPU is already declared terminally dead, give up. */

	if (i915_terminally_wedged(error))

		return -EIO;



	/*

	 * Only wait 10 seconds for the gpu reset to complete to avoid hanging

	 * userspace. If it takes that long something really bad is going on and

drivers/gpu/drm/i915/intel_display.c

+5 −0
Original line number Diff line number Diff line
@@ -7937,6 +7937,11 @@ intel_modeset_check_state(struct drm_device *dev) 
		memset(&pipe_config, 0, sizeof(pipe_config));

		active = dev_priv->display.get_pipe_config(crtc,

							   &pipe_config);



		/* hw state is inconsistent with the pipe A quirk */

		if (crtc->pipe == PIPE_A && dev_priv->quirks & QUIRK_PIPEA_FORCE)

			active = crtc->active;



		WARN(crtc->active != active,

		     "crtc active state doesn't match with hw state "

		     "(expected %i, found %i)\n", crtc->active, active);

drivers/gpu/drm/i915/intel_lvds.c

+2 −2
Original line number Diff line number Diff line
@@ -815,10 +815,10 @@ static const struct dmi_system_id intel_no_lvds[] = { 
	},

	{

		.callback = intel_no_lvds_dmi_callback,

		.ident = "Hewlett-Packard HP t5740e Thin Client",

		.ident = "Hewlett-Packard HP t5740",

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "Hewlett-Packard"),

			DMI_MATCH(DMI_PRODUCT_NAME, "HP t5740e Thin Client"),

			DMI_MATCH(DMI_PRODUCT_NAME, " t5740"),

		},

	},

	{

drivers/gpu/drm/i915/intel_sdvo.c

+1 −1
Original line number Diff line number Diff line
@@ -1776,7 +1776,7 @@ static void intel_sdvo_get_lvds_modes(struct drm_connector *connector) 
	 * Assume that the preferred modes are

	 * arranged in priority order.

	 */

	intel_ddc_get_modes(connector, intel_sdvo->i2c);

	intel_ddc_get_modes(connector, &intel_sdvo->ddc);

	if (list_empty(&connector->probed_modes) == false)

		goto end;