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

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

Merge tag 'drm-intel-next-2017-03-20' of git://anongit.freedesktop.org/git/drm-intel into drm-next 

More in i915 for 4.12:

- designware i2c fixes from Hans de Goede, in a topic branch shared
  with other subsystems (maybe, they didn't confirm, but requested the
  pull)
- drop drm_panel usage from the intel dsi vbt panel (Jani)
- vblank evasion improvements and tracing (Maarten and Ville)
- clarify spinlock irq semantics again a bit (Tvrtko)
- new ->pwrite backend hook (right now just for shmem pageche writes),
  from Chris
- more planar/ccs work from Ville
- hotplug safe connector iterators everywhere
- userptr fixes (Chris)
- selftests for cache coloring eviction (Matthew Auld)
- extend debugfs drop_caches interface for shrinker testing (Chris)
- baytrail "the rps kills the machine" fix (Chris)
- use new atomic state iterators, a lot (Maarten)
- refactor guc/huc code some (Arkadiusz Hiler)
- tighten breadcrumbs rbtree a bit (Chris)
- improve wrap-around and time handling in rps residency counters
  (Mika)
- split reset-in-progress in two flags, backoff and handoff (Chris)
- other misc reset improvements from a few people
- bunch of vgpu interaction fixes with recent code changes
- misc stuff all over, as usual

* tag 'drm-intel-next-2017-03-20' of git://anongit.freedesktop.org/git/drm-intel: (144 commits)
  drm/i915: Update DRIVER_DATE to 20170320
  drm/i915: Initialise i915_gem_object_create_from_data() directly
  drm/i915: Correct error handling for i915_gem_object_create_from_data()
  drm/i915: i915_gem_object_create_from_data() doesn't require struct_mutex
  drm/i915: Retire an active batch pool object rather than allocate new
  drm/i915: Add i810/i815 pci-ids for completeness
  drm/i915: Skip execlists_dequeue() early if the list is empty
  drm/i915: Stop using obj->obj_exec_link outside of execbuf
  drm/i915: Squelch WARN for VLV_COUNTER_CONTROL
  drm/i915/glk: Enable pooled EUs for Geminilake
  drm/i915: Remove superfluous i915_add_request_no_flush() helper
  drm/i915/vgpu: Neuter forcewakes for VGPU more thoroughly
  drm/i915: Fix vGPU balloon for ggtt guard page
  drm/i915: Avoid use-after-free of ctx in request tracepoints
  drm/i915: Assert that the context pin_counts do not overflow
  drm/i915: Wait for reset to complete before returning from debugfs/i915_wedged
  drm/i915: Restore engine->submit_request before unwedging
  drm/i915: Move engine->submit_request selection to a vfunc
  drm/i915: Split I915_RESET_IN_PROGRESS into two flags
  drm/i915: make context status notifier head be per engine
  ...
parents 33d5f513 c5bd2e14

arch/x86/include/asm/iosf_mbi.h

+87 −0
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ 
#ifndef IOSF_MBI_SYMS_H

#define IOSF_MBI_SYMS_H



#include <linux/notifier.h>



#define MBI_MCR_OFFSET		0xD0

#define MBI_MDR_OFFSET		0xD4

#define MBI_MCRX_OFFSET		0xD8
@@ -47,6 +49,10 @@ 
#define QRK_MBI_UNIT_MM		0x05

#define QRK_MBI_UNIT_SOC	0x31



/* Action values for the pmic_bus_access_notifier functions */

#define MBI_PMIC_BUS_ACCESS_BEGIN	1

#define MBI_PMIC_BUS_ACCESS_END		2



#if IS_ENABLED(CONFIG_IOSF_MBI)



bool iosf_mbi_available(void);
@@ -88,6 +94,65 @@ int iosf_mbi_write(u8 port, u8 opcode, u32 offset, u32 mdr); 
 */

int iosf_mbi_modify(u8 port, u8 opcode, u32 offset, u32 mdr, u32 mask);



/**

 * iosf_mbi_punit_acquire() - Acquire access to the P-Unit

 *

 * One some systems the P-Unit accesses the PMIC to change various voltages

 * through the same bus as other kernel drivers use for e.g. battery monitoring.

 *

 * If a driver sends requests to the P-Unit which require the P-Unit to access

 * the PMIC bus while another driver is also accessing the PMIC bus various bad

 * things happen.

 *

 * To avoid these problems this function must be called before accessing the

 * P-Unit or the PMIC, be it through iosf_mbi* functions or through other means.

 *

 * Note on these systems the i2c-bus driver will request a sempahore from the

 * P-Unit for exclusive access to the PMIC bus when i2c drivers are accessing

 * it, but this does not appear to be sufficient, we still need to avoid making

 * certain P-Unit requests during the access window to avoid problems.

 *

 * This function locks a mutex, as such it may sleep.

 */

void iosf_mbi_punit_acquire(void);



/**

 * iosf_mbi_punit_release() - Release access to the P-Unit

 */

void iosf_mbi_punit_release(void);



/**

 * iosf_mbi_register_pmic_bus_access_notifier - Register PMIC bus notifier

 *

 * This function can be used by drivers which may need to acquire P-Unit

 * managed resources from interrupt context, where iosf_mbi_punit_acquire()

 * can not be used.

 *

 * This function allows a driver to register a notifier to get notified (in a

 * process context) before other drivers start accessing the PMIC bus.

 *

 * This allows the driver to acquire any resources, which it may need during

 * the window the other driver is accessing the PMIC, before hand.

 *

 * @nb: notifier_block to register

 */

int iosf_mbi_register_pmic_bus_access_notifier(struct notifier_block *nb);



/**

 * iosf_mbi_register_pmic_bus_access_notifier - Unregister PMIC bus notifier

 *

 * @nb: notifier_block to unregister

 */

int iosf_mbi_unregister_pmic_bus_access_notifier(struct notifier_block *nb);



/**

 * iosf_mbi_call_pmic_bus_access_notifier_chain - Call PMIC bus notifier chain

 *

 * @val: action to pass into listener's notifier_call function

 * @v: data pointer to pass into listener's notifier_call function

 */

int iosf_mbi_call_pmic_bus_access_notifier_chain(unsigned long val, void *v);



#else /* CONFIG_IOSF_MBI is not enabled */

static inline

bool iosf_mbi_available(void)
@@ -115,6 +180,28 @@ int iosf_mbi_modify(u8 port, u8 opcode, u32 offset, u32 mdr, u32 mask) 
	WARN(1, "IOSF_MBI driver not available");

	return -EPERM;

}



static inline void iosf_mbi_punit_acquire(void) {}

static inline void iosf_mbi_punit_release(void) {}



static inline

int iosf_mbi_register_pmic_bus_access_notifier(struct notifier_block *nb)

{

	return 0;

}



static inline

int iosf_mbi_unregister_pmic_bus_access_notifier(struct notifier_block *nb)

{

	return 0;

}



static inline

int iosf_mbi_call_pmic_bus_access_notifier_chain(unsigned long val, void *v)

{

	return 0;

}



#endif /* CONFIG_IOSF_MBI */



#endif /* IOSF_MBI_SYMS_H */

arch/x86/platform/intel/iosf_mbi.c

+49 −0
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ 


static struct pci_dev *mbi_pdev;

static DEFINE_SPINLOCK(iosf_mbi_lock);

static DEFINE_MUTEX(iosf_mbi_punit_mutex);

static BLOCKING_NOTIFIER_HEAD(iosf_mbi_pmic_bus_access_notifier);



static inline u32 iosf_mbi_form_mcr(u8 op, u8 port, u8 offset)

{
@@ -190,6 +192,53 @@ bool iosf_mbi_available(void) 
}

EXPORT_SYMBOL(iosf_mbi_available);



void iosf_mbi_punit_acquire(void)

{

	mutex_lock(&iosf_mbi_punit_mutex);

}

EXPORT_SYMBOL(iosf_mbi_punit_acquire);



void iosf_mbi_punit_release(void)

{

	mutex_unlock(&iosf_mbi_punit_mutex);

}

EXPORT_SYMBOL(iosf_mbi_punit_release);



int iosf_mbi_register_pmic_bus_access_notifier(struct notifier_block *nb)

{

	int ret;



	/* Wait for the bus to go inactive before registering */

	mutex_lock(&iosf_mbi_punit_mutex);

	ret = blocking_notifier_chain_register(

				&iosf_mbi_pmic_bus_access_notifier, nb);

	mutex_unlock(&iosf_mbi_punit_mutex);



	return ret;

}

EXPORT_SYMBOL(iosf_mbi_register_pmic_bus_access_notifier);



int iosf_mbi_unregister_pmic_bus_access_notifier(struct notifier_block *nb)

{

	int ret;



	/* Wait for the bus to go inactive before unregistering */

	mutex_lock(&iosf_mbi_punit_mutex);

	ret = blocking_notifier_chain_unregister(

				&iosf_mbi_pmic_bus_access_notifier, nb);

	mutex_unlock(&iosf_mbi_punit_mutex);



	return ret;

}

EXPORT_SYMBOL(iosf_mbi_unregister_pmic_bus_access_notifier);



int iosf_mbi_call_pmic_bus_access_notifier_chain(unsigned long val, void *v)

{

	return blocking_notifier_call_chain(

				&iosf_mbi_pmic_bus_access_notifier, val, v);

}

EXPORT_SYMBOL(iosf_mbi_call_pmic_bus_access_notifier_chain);



#ifdef CONFIG_IOSF_MBI_DEBUG

static u32	dbg_mdr;

static u32	dbg_mcr;

drivers/gpu/drm/i915/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ config DRM_I915 
	select ACPI_VIDEO if ACPI

	select ACPI_BUTTON if ACPI

	select SYNC_FILE

	select IOSF_MBI

	help

	  Choose this option if you have a system that has "Intel Graphics

	  Media Accelerator" or "HD Graphics" integrated graphics,

drivers/gpu/drm/i915/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -105,8 +105,8 @@ i915-y += dvo_ch7017.o \ 
	  intel_dp.o \

	  intel_dsi.o \

	  intel_dsi_dcs_backlight.o \

	  intel_dsi_panel_vbt.o \

	  intel_dsi_pll.o \

	  intel_dsi_vbt.o \

	  intel_dvo.o \

	  intel_hdmi.o \

	  intel_i2c.o \

drivers/gpu/drm/i915/gvt/gvt.h

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,6 @@ struct intel_vgpu { 
	atomic_t running_workload_num;

	DECLARE_BITMAP(tlb_handle_pending, I915_NUM_ENGINES);

	struct i915_gem_context *shadow_ctx;

	struct notifier_block shadow_ctx_notifier_block;



#if IS_ENABLED(CONFIG_DRM_I915_GVT_KVMGT)

	struct {
@@ -231,6 +230,7 @@ struct intel_gvt { 
	struct intel_gvt_gtt gtt;

	struct intel_gvt_opregion opregion;

	struct intel_gvt_workload_scheduler scheduler;

	struct notifier_block shadow_ctx_notifier_block[I915_NUM_ENGINES];

	DECLARE_HASHTABLE(cmd_table, GVT_CMD_HASH_BITS);

	struct intel_vgpu_type *types;

	unsigned int num_types;