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

Commit 85d90fae 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:
 "Nothing too scary, we have one outstanding i915 regression but Daniel
  has promised the fix as soon as he's finished testing it a bit.

  Fixes for the main x86 drivers:
   - radeon: dpm fixes, displayport regression fix
   - i915: quirks for backlight regression, edp reboot fix, valleyview
     black screen fixes
   - nouveau: display port regression fixes, fix for memory reclocking"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/radeon/dpm: Reenabling SS on Cayman
  drm/radeon: fix typo in ci_stop_dpm()
  drm/radeon: fix typo in golden register setup on evergreen
  drm/radeon: only print meaningful VM faults
  drm/radeon/dp: return -EIO for flags not zero case
  drm/i915/vlv: T12 eDP panel timing enforcement during reboot
  drm/i915: Only unbind vgacon, not other console drivers
  drm/i915: Don't clobber the GTT when it's within stolen memory
  drm/i915/vlv: Update the DSI ULPS entry/exit sequence
  drm/i915/vlv: DPI FIFO empty check is not needed
  drm/i915: Toshiba CB35 has a controllable backlight
  drm/i915: Acer C720 and C720P have controllable backlights
  drm/i915: quirk asserts controllable backlight presence, overriding VBT
  drm/nouveau/ram: fix test for gpio presence
  drm/nouveau/dp: workaround broken display
  drm/nouveau/dp: fix required link bandwidth calculations
  drm/nouveau/kms: restore fbcon after display has been resumed
  drm/nv50-/kms: pass a non-zero value for head to sor dpms methods
  drm/nouveau/fb: Prevent inlining of ramfuc_reg
  drm/gk104/ram: bash mpll bit 31 on
parents fe5aa8a6 bf38b025

drivers/gpu/drm/i915/i915_dma.c

+3 −2
Original line number Diff line number Diff line
@@ -1464,11 +1464,12 @@ static int i915_kick_out_vgacon(struct drm_i915_private *dev_priv) 
#else

static int i915_kick_out_vgacon(struct drm_i915_private *dev_priv)

{

	int ret;

	int ret = 0;



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



	console_lock();

	if (con_is_bound(&vga_con))

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

	if (ret == 0) {

		ret = do_unregister_con_driver(&vga_con);

drivers/gpu/drm/i915/i915_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -656,6 +656,7 @@ enum intel_sbi_destination { 
#define QUIRK_PIPEA_FORCE (1<<0)

#define QUIRK_LVDS_SSC_DISABLE (1<<1)

#define QUIRK_INVERT_BRIGHTNESS (1<<2)

#define QUIRK_BACKLIGHT_PRESENT (1<<3)



struct intel_fbdev;

struct intel_fbc_work;

drivers/gpu/drm/i915/i915_gem_stolen.c

+44 −0
Original line number Diff line number Diff line
@@ -74,6 +74,50 @@ static unsigned long i915_stolen_to_physical(struct drm_device *dev) 
	if (base == 0)

		return 0;



	/* make sure we don't clobber the GTT if it's within stolen memory */

	if (INTEL_INFO(dev)->gen <= 4 && !IS_G33(dev) && !IS_G4X(dev)) {

		struct {

			u32 start, end;

		} stolen[2] = {

			{ .start = base, .end = base + dev_priv->gtt.stolen_size, },

			{ .start = base, .end = base + dev_priv->gtt.stolen_size, },

		};

		u64 gtt_start, gtt_end;



		gtt_start = I915_READ(PGTBL_CTL);

		if (IS_GEN4(dev))

			gtt_start = (gtt_start & PGTBL_ADDRESS_LO_MASK) |

				(gtt_start & PGTBL_ADDRESS_HI_MASK) << 28;

		else

			gtt_start &= PGTBL_ADDRESS_LO_MASK;

		gtt_end = gtt_start + gtt_total_entries(dev_priv->gtt) * 4;



		if (gtt_start >= stolen[0].start && gtt_start < stolen[0].end)

			stolen[0].end = gtt_start;

		if (gtt_end > stolen[1].start && gtt_end <= stolen[1].end)

			stolen[1].start = gtt_end;



		/* pick the larger of the two chunks */

		if (stolen[0].end - stolen[0].start >

		    stolen[1].end - stolen[1].start) {

			base = stolen[0].start;

			dev_priv->gtt.stolen_size = stolen[0].end - stolen[0].start;

		} else {

			base = stolen[1].start;

			dev_priv->gtt.stolen_size = stolen[1].end - stolen[1].start;

		}



		if (stolen[0].start != stolen[1].start ||

		    stolen[0].end != stolen[1].end) {

			DRM_DEBUG_KMS("GTT within stolen memory at 0x%llx-0x%llx\n",

				      (unsigned long long) gtt_start,

				      (unsigned long long) gtt_end - 1);

			DRM_DEBUG_KMS("Stolen memory adjusted to 0x%x-0x%x\n",

				      base, base + (u32) dev_priv->gtt.stolen_size - 1);

		}

	}





	/* Verify that nothing else uses this physical address. Stolen

	 * memory should be reserved by the BIOS and hidden from the

	 * kernel. So if the region is already marked as busy, something

drivers/gpu/drm/i915/i915_reg.h

+3 −0
Original line number Diff line number Diff line
@@ -942,6 +942,9 @@ enum punit_power_well { 
/*

 * Instruction and interrupt control regs

 */

#define PGTBL_CTL	0x02020

#define   PGTBL_ADDRESS_LO_MASK	0xfffff000 /* bits [31:12] */

#define   PGTBL_ADDRESS_HI_MASK	0x000000f0 /* bits [35:32] (gen4) */

#define PGTBL_ER	0x02024

#define RENDER_RING_BASE	0x02000

#define BSD_RING_BASE		0x04000

drivers/gpu/drm/i915/intel_display.c

+14 −0
Original line number Diff line number Diff line
@@ -11591,6 +11591,14 @@ static void quirk_invert_brightness(struct drm_device *dev) 
	DRM_INFO("applying inverted panel brightness quirk\n");

}



/* Some VBT's incorrectly indicate no backlight is present */

static void quirk_backlight_present(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	dev_priv->quirks |= QUIRK_BACKLIGHT_PRESENT;

	DRM_INFO("applying backlight present quirk\n");

}



struct intel_quirk {

	int device;

	int subsystem_vendor;
@@ -11659,6 +11667,12 @@ static struct intel_quirk intel_quirks[] = { 


	/* Acer Aspire 5336 */

	{ 0x2a42, 0x1025, 0x048a, quirk_invert_brightness },



	/* Acer C720 and C720P Chromebooks (Celeron 2955U) have backlights */

	{ 0x0a06, 0x1025, 0x0a11, quirk_backlight_present },



	/* Toshiba CB35 Chromebook (Celeron 2955U) */

	{ 0x0a06, 0x1179, 0x0a88, quirk_backlight_present },

};



static void intel_init_quirks(struct drm_device *dev)