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

Commit 1092a94f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-2019-01-18' of git://anongit.freedesktop.org/drm/drm 

Pull drm fixes from Dave Airlie:
 "The rc3 fixes are a bit scattered:

   - meson, sun4i and rockchip all had missing of_node_put.

   - qxl and virtio both were advertising dma-buf to userspace when they
     really shouldn't have.

  Otherwise:

  meson:
   - modesetting regression fix

  i915 GVT:
   - one cmd parser failure fix
   - region cleanup fix in vGPU destroy

  amdgpu:
   - KFD fixes for arm64 mixed APU/DGPU
   - vega12 powerplay fix
   - raven DC fixes
   - freesync fix"

* tag 'drm-fixes-2019-01-18' of git://anongit.freedesktop.org/drm/drm:
  drm/amd/display: Detach backlight from stream
  drm/sun4i: backend: add missing of_node_puts
  Revert "drm/amdgpu: validate user pitch alignment"
  Revert "drm/amdgpu: validate user GEM object size"
  drm/meson: Fix atomic mode switching regression
  drm/i915/gvt: Fix mmap range check
  drm/i915/gvt: free VFIO region space in vgpu detach
  drm/amd/display: Fix disabled cursor on top screen edge
  drm/amd/display: fix warning on raven hotplug
  drm/amd/display: fix PME notification not working in RV desktop
  drm/amd/display: Only get the connector state for VRR when toggled
  drm/amd/display: Pack DMCU iRAM alignment
  drm/amd/powerplay: run acg btc for Vega12
  drm/amdkfd: Don't assign dGPUs to APU topology devices
  drm/amdkfd: Allow building KFD on ARM64 (v2)
  drm/meson: add missing of_node_put
  drm/virtio: drop prime import/export callbacks
  drm/qxl: drop prime import/export callbacks
  drm/i915/gvt: Allow F_CMD_ACCESS on mmio 0x21f0
  drm/rockchip: add missing of_node_put
parents 2451f371 df0219b4

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

+0 −18
Original line number Diff line number Diff line
@@ -531,17 +531,6 @@ amdgpu_display_user_framebuffer_create(struct drm_device *dev, 
	struct drm_gem_object *obj;

	struct amdgpu_framebuffer *amdgpu_fb;

	int ret;

	int height;

	struct amdgpu_device *adev = dev->dev_private;

	int cpp = drm_format_plane_cpp(mode_cmd->pixel_format, 0);

	int pitch = mode_cmd->pitches[0] / cpp;



	pitch = amdgpu_align_pitch(adev, pitch, cpp, false);

	if (mode_cmd->pitches[0] != pitch) {

		DRM_DEBUG_KMS("Invalid pitch: expecting %d but got %d\n",

			      pitch, mode_cmd->pitches[0]);

		return ERR_PTR(-EINVAL);

	}



	obj = drm_gem_object_lookup(file_priv, mode_cmd->handles[0]);

	if (obj ==  NULL) {
@@ -556,13 +545,6 @@ amdgpu_display_user_framebuffer_create(struct drm_device *dev, 
		return ERR_PTR(-EINVAL);

	}



	height = ALIGN(mode_cmd->height, 8);

	if (obj->size < pitch * height) {

		DRM_DEBUG_KMS("Invalid GEM size: expecting >= %d but got %zu\n",

			      pitch * height, obj->size);

		return ERR_PTR(-EINVAL);

	}



	amdgpu_fb = kzalloc(sizeof(*amdgpu_fb), GFP_KERNEL);

	if (amdgpu_fb == NULL) {

		drm_gem_object_put_unlocked(obj);

drivers/gpu/drm/amd/amdkfd/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ 


config HSA_AMD

	bool "HSA kernel driver for AMD GPU devices"

	depends on DRM_AMDGPU && X86_64

	imply AMD_IOMMU_V2

	depends on DRM_AMDGPU && (X86_64 || ARM64)

	imply AMD_IOMMU_V2 if X86_64

	select MMU_NOTIFIER

	help

	  Enable this if you want to use HSA features on AMD GPU devices.

drivers/gpu/drm/amd/amdkfd/kfd_crat.c

+8 −0
Original line number Diff line number Diff line
@@ -863,6 +863,7 @@ static int kfd_fill_mem_info_for_cpu(int numa_node_id, int *avail_size, 
	return 0;

}



#if CONFIG_X86_64

static int kfd_fill_iolink_info_for_cpu(int numa_node_id, int *avail_size,

				uint32_t *num_entries,

				struct crat_subtype_iolink *sub_type_hdr)
@@ -905,6 +906,7 @@ static int kfd_fill_iolink_info_for_cpu(int numa_node_id, int *avail_size, 


	return 0;

}

#endif



/* kfd_create_vcrat_image_cpu - Create Virtual CRAT for CPU

 *
@@ -920,7 +922,9 @@ static int kfd_create_vcrat_image_cpu(void *pcrat_image, size_t *size) 
	struct crat_subtype_generic *sub_type_hdr;

	int avail_size = *size;

	int numa_node_id;

#ifdef CONFIG_X86_64

	uint32_t entries = 0;

#endif

	int ret = 0;



	if (!pcrat_image || avail_size < VCRAT_SIZE_FOR_CPU)
@@ -982,6 +986,7 @@ static int kfd_create_vcrat_image_cpu(void *pcrat_image, size_t *size) 
			sub_type_hdr->length);



		/* Fill in Subtype: IO Link */

#ifdef CONFIG_X86_64

		ret = kfd_fill_iolink_info_for_cpu(numa_node_id, &avail_size,

				&entries,

				(struct crat_subtype_iolink *)sub_type_hdr);
@@ -992,6 +997,9 @@ static int kfd_create_vcrat_image_cpu(void *pcrat_image, size_t *size) 


		sub_type_hdr = (typeof(sub_type_hdr))((char *)sub_type_hdr +

				sub_type_hdr->length * entries);

#else

		pr_info("IO link not available for non x86 platforms\n");

#endif



		crat_table->num_domains++;

	}

drivers/gpu/drm/amd/amdkfd/kfd_topology.c

+14 −7
Original line number Diff line number Diff line
@@ -1093,8 +1093,6 @@ static uint32_t kfd_generate_gpu_id(struct kfd_dev *gpu) 
 *		the GPU device is not already present in the topology device

 *		list then return NULL. This means a new topology device has to

 *		be created for this GPU.

 * TODO: Rather than assiging @gpu to first topology device withtout

 *		gpu attached, it will better to have more stringent check.

 */

static struct kfd_topology_device *kfd_assign_gpu(struct kfd_dev *gpu)

{
@@ -1102,12 +1100,20 @@ static struct kfd_topology_device *kfd_assign_gpu(struct kfd_dev *gpu) 
	struct kfd_topology_device *out_dev = NULL;



	down_write(&topology_lock);

	list_for_each_entry(dev, &topology_device_list, list)

	list_for_each_entry(dev, &topology_device_list, list) {

		/* Discrete GPUs need their own topology device list

		 * entries. Don't assign them to CPU/APU nodes.

		 */

		if (!gpu->device_info->needs_iommu_device &&

		    dev->node_props.cpu_cores_count)

			continue;



		if (!dev->gpu && (dev->node_props.simd_count > 0)) {

			dev->gpu = gpu;

			out_dev = dev;

			break;

		}

	}

	up_write(&topology_lock);

	return out_dev;

}
@@ -1392,7 +1398,6 @@ int kfd_topology_enum_kfd_devices(uint8_t idx, struct kfd_dev **kdev) 


static int kfd_cpumask_to_apic_id(const struct cpumask *cpumask)

{

	const struct cpuinfo_x86 *cpuinfo;

	int first_cpu_of_numa_node;



	if (!cpumask || cpumask == cpu_none_mask)
@@ -1400,9 +1405,11 @@ static int kfd_cpumask_to_apic_id(const struct cpumask *cpumask) 
	first_cpu_of_numa_node = cpumask_first(cpumask);

	if (first_cpu_of_numa_node >= nr_cpu_ids)

		return -1;

	cpuinfo = &cpu_data(first_cpu_of_numa_node);



	return cpuinfo->apicid;

#ifdef CONFIG_X86_64

	return cpu_data(first_cpu_of_numa_node).apicid;

#else

	return first_cpu_of_numa_node;

#endif

}



/* kfd_numa_node_to_apic_id - Returns the APIC ID of the first logical processor

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

+2 −2
Original line number Diff line number Diff line
@@ -1772,7 +1772,7 @@ static int amdgpu_dm_backlight_update_status(struct backlight_device *bd) 
		+ caps.min_input_signal * 0x101;



	if (dc_link_set_backlight_level(dm->backlight_link,

			brightness, 0, 0))

			brightness, 0))

		return 0;

	else

		return 1;
@@ -5933,7 +5933,7 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev, 
	for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state, i) {

		if (!drm_atomic_crtc_needs_modeset(new_crtc_state) &&

		    !new_crtc_state->color_mgmt_changed &&

		    !new_crtc_state->vrr_enabled)

		    old_crtc_state->vrr_enabled == new_crtc_state->vrr_enabled)

			continue;



		if (!new_crtc_state->enable)