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

Commit 706bf68b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-2018-07-16-1' of git://anongit.freedesktop.org/drm/drm 

Pull drm fixes from Dave Airlie:

 - two AGP fixes in here

 - a bunch of mostly amdgpu fixes

 - sun4i build fix

 - two armada fixes

 - some tegra fixes

 - one i915 core and one i915 gvt fix

* tag 'drm-fixes-2018-07-16-1' of git://anongit.freedesktop.org/drm/drm:
  drm/amdgpu/pp/smu7: use a local variable for toc indexing
  amd/dc/dce100: On dce100, set clocks to 0 on suspend
  drm/amd/display: Convert 10kHz clks from PPLib into kHz for Vega
  drm/amdgpu: Verify root PD is mapped into kernel address space (v4)
  drm/amd/display: fix invalid function table override
  drm/amdgpu: Reserve VM root shared fence slot for command submission (v3)
  Revert "drm/amd/display: Don't return ddc result and read_bytes in same return value"
  char: amd64-agp: Use 64-bit arithmetic instead of 32-bit
  char: agp: Change return type to vm_fault_t
  drm/i915: Fix hotplug irq ack on i965/g4x
  drm/armada: fix irq handling
  drm/armada: fix colorkey mode property
  drm/tegra: Fix comparison operator for buffer size
  gpu: host1x: Check whether size of unpin isn't 0
  gpu: host1x: Skip IOMMU initialization if firewall is enabled
  drm/sun4i: link in front-end code if needed
  drm/i915/gvt: update vreg on inhibit context lri command
parents d1b47a7c bf642e3a

drivers/char/agp/alpha-agp.c

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 


#include "agp.h"



static int alpha_core_agp_vm_fault(struct vm_fault *vmf)

static vm_fault_t alpha_core_agp_vm_fault(struct vm_fault *vmf)

{

	alpha_agp_info *agp = agp_bridge->dev_private_data;

	dma_addr_t dma_addr;

drivers/char/agp/amd64-agp.c

+2 −2
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ static u64 amd64_configure(struct pci_dev *hammer, u64 gatt_table) 


	/* Address to map to */

	pci_read_config_dword(hammer, AMD64_GARTAPERTUREBASE, &tmp);

	aperturebase = tmp << 25;

	aperturebase = (u64)tmp << 25;

	aper_base = (aperturebase & PCI_BASE_ADDRESS_MEM_MASK);



	enable_gart_translation(hammer, gatt_table);
@@ -277,7 +277,7 @@ static int fix_northbridge(struct pci_dev *nb, struct pci_dev *agp, u16 cap) 
	pci_read_config_dword(nb, AMD64_GARTAPERTURECTL, &nb_order);

	nb_order = (nb_order >> 1) & 7;

	pci_read_config_dword(nb, AMD64_GARTAPERTUREBASE, &nb_base);

	nb_aper = nb_base << 25;

	nb_aper = (u64)nb_base << 25;



	/* Northbridge seems to contain crap. Try the AGP bridge. */

drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c

+4 −0
Original line number Diff line number Diff line
@@ -927,6 +927,10 @@ static int amdgpu_cs_ib_vm_chunk(struct amdgpu_device *adev, 
		r = amdgpu_bo_vm_update_pte(p);

		if (r)

			return r;



		r = reservation_object_reserve_shared(vm->root.base.bo->tbo.resv);

		if (r)

			return r;

	}



	return amdgpu_cs_sync_rings(p);

drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c

+3 −1
Original line number Diff line number Diff line
@@ -107,6 +107,9 @@ static void amdgpu_vm_bo_base_init(struct amdgpu_vm_bo_base *base, 
		return;

	list_add_tail(&base->bo_list, &bo->va);



	if (bo->tbo.type == ttm_bo_type_kernel)

		list_move(&base->vm_status, &vm->relocated);



	if (bo->tbo.resv != vm->root.base.bo->tbo.resv)

		return;
@@ -468,7 +471,6 @@ static int amdgpu_vm_alloc_levels(struct amdgpu_device *adev, 
			pt->parent = amdgpu_bo_ref(parent->base.bo);



			amdgpu_vm_bo_base_init(&entry->base, vm, pt);

			list_move(&entry->base.vm_status, &vm->relocated);

		}



		if (level < AMDGPU_VM_PTB) {

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c

+8 −12
Original line number Diff line number Diff line
@@ -83,22 +83,21 @@ static ssize_t dm_dp_aux_transfer(struct drm_dp_aux *aux, 
	enum i2c_mot_mode mot = (msg->request & DP_AUX_I2C_MOT) ?

		I2C_MOT_TRUE : I2C_MOT_FALSE;

	enum ddc_result res;

	uint32_t read_bytes = msg->size;

	ssize_t read_bytes;



	if (WARN_ON(msg->size > 16))

		return -E2BIG;



	switch (msg->request & ~DP_AUX_I2C_MOT) {

	case DP_AUX_NATIVE_READ:

		res = dal_ddc_service_read_dpcd_data(

		read_bytes = dal_ddc_service_read_dpcd_data(

				TO_DM_AUX(aux)->ddc_service,

				false,

				I2C_MOT_UNDEF,

				msg->address,

				msg->buffer,

				msg->size,

				&read_bytes);

		break;

				msg->size);

		return read_bytes;

	case DP_AUX_NATIVE_WRITE:

		res = dal_ddc_service_write_dpcd_data(

				TO_DM_AUX(aux)->ddc_service,
@@ -109,15 +108,14 @@ static ssize_t dm_dp_aux_transfer(struct drm_dp_aux *aux, 
				msg->size);

		break;

	case DP_AUX_I2C_READ:

		res = dal_ddc_service_read_dpcd_data(

		read_bytes = dal_ddc_service_read_dpcd_data(

				TO_DM_AUX(aux)->ddc_service,

				true,

				mot,

				msg->address,

				msg->buffer,

				msg->size,

				&read_bytes);

		break;

				msg->size);

		return read_bytes;

	case DP_AUX_I2C_WRITE:

		res = dal_ddc_service_write_dpcd_data(

				TO_DM_AUX(aux)->ddc_service,
@@ -139,9 +137,7 @@ static ssize_t dm_dp_aux_transfer(struct drm_dp_aux *aux, 
		 r == DDC_RESULT_SUCESSFULL);

#endif



	if (res != DDC_RESULT_SUCESSFULL)

		return -EIO;

	return read_bytes;

	return msg->size;

}



static enum drm_connector_status