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

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

Merge branch 'drm-next-4.9' of git://people.freedesktop.org/~agd5f/linux into drm-next 

Just some misc bug fixes for 4.9.

* 'drm-next-4.9' of git://people.freedesktop.org/~agd5f/linux:
  drm/amdgpu: revert "use more than 64KB fragment size if possible"
  drm/amdgpu: warn if dp aux is still attached on free
  drm/amdgpu/dce11: add missing drm_mode_config_cleanup call
  drm/amdgpu: also track late init state
  drm/amdgpu/virtual_dce: adjust config ifdef
  drm/amdgpu/vce: add support for hw config packet (v2)
  drm/amdgpu: clean up to set fw_offset as 0 twice
  drm/amdgpu: remove DRM_AMD_POWERPLAY
  drm/radeon: Prevent races on pre DCE4 between flip submission and completion.
  drm/radeon: Slightly more robust flip completion handling for < DCE-4
parents 9c704d14 8036617e

drivers/gpu/drm/amd/amdgpu/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -32,5 +32,4 @@ config DRM_AMDGPU_GART_DEBUGFS 
	  Selecting this option creates a debugfs file to inspect the mapped

	  pages. Uses more memory for housekeeping, enable only for debugging.



source "drivers/gpu/drm/amd/powerplay/Kconfig"

source "drivers/gpu/drm/amd/acp/Kconfig"

drivers/gpu/drm/amd/amdgpu/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -111,14 +111,10 @@ amdgpu-$(CONFIG_VGA_SWITCHEROO) += amdgpu_atpx_handler.o 
amdgpu-$(CONFIG_ACPI) += amdgpu_acpi.o

amdgpu-$(CONFIG_MMU_NOTIFIER) += amdgpu_mn.o



ifneq ($(CONFIG_DRM_AMD_POWERPLAY),)



include $(FULL_AMD_PATH)/powerplay/Makefile



amdgpu-y += $(AMD_POWERPLAY_FILES)



endif



obj-$(CONFIG_DRM_AMDGPU)+= amdgpu.o



CFLAGS_amdgpu_trace_points.o := -I$(src)

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+1 −0
Original line number Diff line number Diff line
@@ -1943,6 +1943,7 @@ struct amdgpu_ip_block_status { 
	bool valid;

	bool sw;

	bool hw;

	bool late_initialized;

	bool hang;

};

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

+3 −1
Original line number Diff line number Diff line
@@ -769,8 +769,10 @@ static void amdgpu_connector_destroy(struct drm_connector *connector) 
{

	struct amdgpu_connector *amdgpu_connector = to_amdgpu_connector(connector);



	if (amdgpu_connector->ddc_bus->has_aux)

	if (amdgpu_connector->ddc_bus->has_aux) {

		drm_dp_aux_unregister(&amdgpu_connector->ddc_bus->aux);

		amdgpu_connector->ddc_bus->has_aux = false;

	}

	amdgpu_connector_free_edid(connector);

	kfree(amdgpu_connector->con_priv);

	drm_connector_unregister(connector);

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

+4 −0
Original line number Diff line number Diff line
@@ -1424,6 +1424,7 @@ static int amdgpu_late_init(struct amdgpu_device *adev) 
				DRM_ERROR("late_init of IP block <%s> failed %d\n", adev->ip_blocks[i].funcs->name, r);

				return r;

			}

			adev->ip_block_status[i].late_initialized = true;

		}

	}
@@ -1469,8 +1470,11 @@ static int amdgpu_fini(struct amdgpu_device *adev) 
	}



	for (i = adev->num_ip_blocks - 1; i >= 0; i--) {

		if (!adev->ip_block_status[i].late_initialized)

			continue;

		if (adev->ip_blocks[i].funcs->late_fini)

			adev->ip_blocks[i].funcs->late_fini((void *)adev);

		adev->ip_block_status[i].late_initialized = false;

	}



	return 0;