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

Commit a3f28efa authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2014-01-08' of... 

Merge tag 'drm-intel-fixes-2014-01-08' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes

Just a revert (gen4 backlight seems a lost cause) and a tlb coherency fix
for bdw, plus the patch to sign up Jani for co-maintainer. Thanks to Ben
for taking care of -fixes while I've enjoyed a bit of vacation.

* tag 'drm-intel-fixes-2014-01-08' of git://people.freedesktop.org/~danvet/drm-intel:
  MAINTAINERS: Updates for drm/i915
  Revert "drm/i915: assume all GM45 Acer laptops use inverted backlight PWM"
  drm/i915/bdw: Flush system agent on gen8 also
parents ef350bb7 47f95647

MAINTAINERS

+2 −0
Original line number Original line Diff line number Diff line
@@ -2828,8 +2828,10 @@ F: include/uapi/drm/ 




INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets)

INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets)

M:	Daniel Vetter <daniel.vetter@ffwll.ch>

M:	Daniel Vetter <daniel.vetter@ffwll.ch>

M:	Jani Nikula <jani.nikula@linux.intel.com>

L:	intel-gfx@lists.freedesktop.org

L:	intel-gfx@lists.freedesktop.org

L:	dri-devel@lists.freedesktop.org

L:	dri-devel@lists.freedesktop.org

Q:	http://patchwork.freedesktop.org/project/intel-gfx/

T:	git git://people.freedesktop.org/~danvet/drm-intel

T:	git git://people.freedesktop.org/~danvet/drm-intel

S:	Supported

S:	Supported

F:	drivers/gpu/drm/i915/

F:	drivers/gpu/drm/i915/

drivers/gpu/drm/i915/i915_gem_gtt.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -906,14 +906,12 @@ static void gen8_ggtt_insert_entries(struct i915_address_space *vm, 
		WARN_ON(readq(&gtt_entries[i-1])

		WARN_ON(readq(&gtt_entries[i-1])

			!= gen8_pte_encode(addr, level, true));

			!= gen8_pte_encode(addr, level, true));





#if 0 /* TODO: Still needed on GEN8? */

	/* This next bit makes the above posting read even more important. We

	/* This next bit makes the above posting read even more important. We

	 * want to flush the TLBs only after we're certain all the PTE updates

	 * want to flush the TLBs only after we're certain all the PTE updates

	 * have finished.

	 * have finished.

	 */

	 */

	I915_WRITE(GFX_FLSH_CNTL_GEN6, GFX_FLSH_CNTL_EN);

	I915_WRITE(GFX_FLSH_CNTL_GEN6, GFX_FLSH_CNTL_EN);

	POSTING_READ(GFX_FLSH_CNTL_GEN6);

	POSTING_READ(GFX_FLSH_CNTL_GEN6);

#endif

}

}





/*

/*

drivers/gpu/drm/i915/intel_display.c

+14 −5
Original line number Original line Diff line number Diff line
@@ -10541,11 +10541,20 @@ static struct intel_quirk intel_quirks[] = { 
	/* Sony Vaio Y cannot use SSC on LVDS */

	/* Sony Vaio Y cannot use SSC on LVDS */

	{ 0x0046, 0x104d, 0x9076, quirk_ssc_force_disable },

	{ 0x0046, 0x104d, 0x9076, quirk_ssc_force_disable },





	/*

	/* Acer Aspire 5734Z must invert backlight brightness */

	 * All GM45 Acer (and its brands eMachines and Packard Bell) laptops

	{ 0x2a42, 0x1025, 0x0459, quirk_invert_brightness },

	 * seem to use inverted backlight PWM.



	 */

	/* Acer/eMachines G725 */

	{ 0x2a42, 0x1025, PCI_ANY_ID, quirk_invert_brightness },

	{ 0x2a42, 0x1025, 0x0210, quirk_invert_brightness },



	/* Acer/eMachines e725 */

	{ 0x2a42, 0x1025, 0x0212, quirk_invert_brightness },



	/* Acer/Packard Bell NCL20 */

	{ 0x2a42, 0x1025, 0x034b, quirk_invert_brightness },



	/* Acer Aspire 4736Z */

	{ 0x2a42, 0x1025, 0x0260, quirk_invert_brightness },





	/* Dell XPS13 HD Sandy Bridge */

	/* Dell XPS13 HD Sandy Bridge */

	{ 0x0116, 0x1028, 0x052e, quirk_no_pcm_pwm_enable },

	{ 0x0116, 0x1028, 0x052e, quirk_no_pcm_pwm_enable },