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

Merge tag 'drm-intel-next-2018-07-19' of git://anongit.freedesktop.org/drm/drm-intel into drm-next 



On GEM side:

- GuC related fixes (Chris, Michal)
- GTT read-only pages support (Jon, Chris)
- More selftests fixes (Chris)
- More GPU reset improvements (Chris)
- Flush caches after GGTT writes (Chris)
- Handle recursive shrinker for vma->last_active allocation (Chris)
- Other execlists fixes (Chris)

On Display side:

- GLK HDMI fix (Clint)
- Rework and cleanup around HPD pin (Ville)
- Preparation work for Display Stream Compression support coming on ICL (Anusha)
- Nuke LVDS lid notification (Ville)
- Assume eDP is always connected (Ville)
- Kill intel panel detection (Ville)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

# gpg: Signature made Fri 20 Jul 2018 01:51:45 AM AEST
# gpg:                using RSA key FA625F640EEB13CA
# gpg: Good signature from "Rodrigo Vivi <rodrigo.vivi@intel.com>"
# gpg:                 aka "Rodrigo Vivi <rodrigo.vivi@gmail.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 6D20 7068 EEDD 6509 1C2C  E2A3 FA62 5F64 0EEB 13CA

# Conflicts:
#	drivers/gpu/drm/i915/intel_lrc.c
Link: https://patchwork.freedesktop.org/patch/msgid/20180719171257.GA12199@intel.com
parents 294f96ae ef821e3f

arch/x86/kernel/early-quirks.c

+18 −0
Original line number Diff line number Diff line
@@ -338,6 +338,18 @@ static resource_size_t __init gen3_stolen_base(int num, int slot, int func, 
	return bsm & INTEL_BSM_MASK;

}



static resource_size_t __init gen11_stolen_base(int num, int slot, int func,

						resource_size_t stolen_size)

{

	u64 bsm;



	bsm = read_pci_config(num, slot, func, INTEL_GEN11_BSM_DW0);

	bsm &= INTEL_BSM_MASK;

	bsm |= (u64)read_pci_config(num, slot, func, INTEL_GEN11_BSM_DW1) << 32;



	return bsm;

}



static resource_size_t __init i830_stolen_size(int num, int slot, int func)

{

	u16 gmch_ctrl;
@@ -498,6 +510,11 @@ static const struct intel_early_ops chv_early_ops __initconst = { 
	.stolen_size = chv_stolen_size,

};



static const struct intel_early_ops gen11_early_ops __initconst = {

	.stolen_base = gen11_stolen_base,

	.stolen_size = gen9_stolen_size,

};



static const struct pci_device_id intel_early_ids[] __initconst = {

	INTEL_I830_IDS(&i830_early_ops),

	INTEL_I845G_IDS(&i845_early_ops),
@@ -529,6 +546,7 @@ static const struct pci_device_id intel_early_ids[] __initconst = { 
	INTEL_CFL_IDS(&gen9_early_ops),

	INTEL_GLK_IDS(&gen9_early_ops),

	INTEL_CNL_IDS(&gen9_early_ops),

	INTEL_ICL_11_IDS(&gen11_early_ops),

};



struct resource intel_graphics_stolen_res __ro_after_init = DEFINE_RES_MEM(0, 0);

drivers/gpu/drm/drm_gem.c

+9 −0
Original line number Diff line number Diff line
@@ -1036,6 +1036,15 @@ int drm_gem_mmap(struct file *filp, struct vm_area_struct *vma) 
		return -EACCES;

	}



	if (node->readonly) {

		if (vma->vm_flags & VM_WRITE) {

			drm_gem_object_put_unlocked(obj);

			return -EINVAL;

		}



		vma->vm_flags &= ~VM_MAYWRITE;

	}



	ret = drm_gem_mmap_obj(obj, drm_vma_node_size(node) << PAGE_SHIFT,

			       vma);

drivers/gpu/drm/i915/gvt/gtt.c

+366 −57

File changed.

Preview size limit exceeded, changes collapsed.

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

+9 −0
Original line number Diff line number Diff line
@@ -63,6 +63,12 @@ struct intel_gvt_gtt_pte_ops { 
	void (*clear_present)(struct intel_gvt_gtt_entry *e);

	void (*set_present)(struct intel_gvt_gtt_entry *e);

	bool (*test_pse)(struct intel_gvt_gtt_entry *e);

	void (*clear_pse)(struct intel_gvt_gtt_entry *e);

	bool (*test_ips)(struct intel_gvt_gtt_entry *e);

	void (*clear_ips)(struct intel_gvt_gtt_entry *e);

	bool (*test_64k_splited)(struct intel_gvt_gtt_entry *e);

	void (*clear_64k_splited)(struct intel_gvt_gtt_entry *e);

	void (*set_64k_splited)(struct intel_gvt_gtt_entry *e);

	void (*set_pfn)(struct intel_gvt_gtt_entry *e, unsigned long pfn);

	unsigned long (*get_pfn)(struct intel_gvt_gtt_entry *e);

};
@@ -95,6 +101,7 @@ typedef enum { 
	GTT_TYPE_GGTT_PTE,



	GTT_TYPE_PPGTT_PTE_4K_ENTRY,

	GTT_TYPE_PPGTT_PTE_64K_ENTRY,

	GTT_TYPE_PPGTT_PTE_2M_ENTRY,

	GTT_TYPE_PPGTT_PTE_1G_ENTRY,
@@ -220,6 +227,7 @@ struct intel_vgpu_ppgtt_spt { 


	struct {

		intel_gvt_gtt_type_t type;

		bool pde_ips; /* for 64KB PTEs */

		void *vaddr;

		struct page *page;

		unsigned long mfn;
@@ -227,6 +235,7 @@ struct intel_vgpu_ppgtt_spt { 


	struct {

		intel_gvt_gtt_type_t type;

		bool pde_ips; /* for 64KB PTEs */

		unsigned long gfn;

		unsigned long write_cnt;

		struct intel_vgpu_oos_page *oos_page;

drivers/gpu/drm/i915/gvt/gvt.c

+4 −0
Original line number Diff line number Diff line
@@ -468,3 +468,7 @@ out_clean_idr: 
	kfree(gvt);

	return ret;

}



#if IS_ENABLED(CONFIG_DRM_I915_GVT_KVMGT)

MODULE_SOFTDEP("pre: kvmgt");

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE