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

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

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



- Fix an HDMI 2.0 4k@60 regression
- Hotplug fixes for PX/HG laptops
- Fixes for vbios changes in vega12
- Fix a race in the user fence code
- Fix a couple of misc typos

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180705155206.2752-1-alexander.deucher@amd.com
parents 0581a5cb 413ff0b9

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

+8 −38
Original line number Diff line number Diff line
@@ -190,6 +190,7 @@ struct amdgpu_job; 
struct amdgpu_irq_src;

struct amdgpu_fpriv;

struct amdgpu_bo_va_mapping;

struct amdgpu_atif;



enum amdgpu_cp_irq {

	AMDGPU_CP_IRQ_GFX_EOP = 0,
@@ -1269,43 +1270,6 @@ struct amdgpu_vram_scratch { 
/*

 * ACPI

 */

struct amdgpu_atif_notification_cfg {

	bool enabled;

	int command_code;

};



struct amdgpu_atif_notifications {

	bool display_switch;

	bool expansion_mode_change;

	bool thermal_state;

	bool forced_power_state;

	bool system_power_state;

	bool display_conf_change;

	bool px_gfx_switch;

	bool brightness_change;

	bool dgpu_display_event;

};



struct amdgpu_atif_functions {

	bool system_params;

	bool sbios_requests;

	bool select_active_disp;

	bool lid_state;

	bool get_tv_standard;

	bool set_tv_standard;

	bool get_panel_expansion_mode;

	bool set_panel_expansion_mode;

	bool temperature_change;

	bool graphics_device_types;

};



struct amdgpu_atif {

	struct amdgpu_atif_notifications notifications;

	struct amdgpu_atif_functions functions;

	struct amdgpu_atif_notification_cfg notification_cfg;

	struct amdgpu_encoder *encoder_for_bl;

};



struct amdgpu_atcs_functions {

	bool get_ext_state;

	bool pcie_perf_req;
@@ -1466,7 +1430,7 @@ struct amdgpu_device { 
#if defined(CONFIG_DEBUG_FS)

	struct dentry			*debugfs_regs[AMDGPU_DEBUGFS_MAX_COMPONENTS];

#endif

	struct amdgpu_atif		atif;

	struct amdgpu_atif		*atif;

	struct amdgpu_atcs		atcs;

	struct mutex			srbm_mutex;

	/* GRBM index mutex. Protects concurrent access to GRBM index */
@@ -1894,6 +1858,12 @@ static inline bool amdgpu_atpx_dgpu_req_power_for_displays(void) { return false; 
static inline bool amdgpu_has_atpx(void) { return false; }

#endif



#if defined(CONFIG_VGA_SWITCHEROO) && defined(CONFIG_ACPI)

void *amdgpu_atpx_get_dhandle(void);

#else

static inline void *amdgpu_atpx_get_dhandle(void) { return NULL; }

#endif



/*

 * KMS

 */

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

+108 −23
Original line number Diff line number Diff line
@@ -34,6 +34,45 @@ 
#include "amd_acpi.h"

#include "atom.h"



struct amdgpu_atif_notification_cfg {

	bool enabled;

	int command_code;

};



struct amdgpu_atif_notifications {

	bool display_switch;

	bool expansion_mode_change;

	bool thermal_state;

	bool forced_power_state;

	bool system_power_state;

	bool display_conf_change;

	bool px_gfx_switch;

	bool brightness_change;

	bool dgpu_display_event;

};



struct amdgpu_atif_functions {

	bool system_params;

	bool sbios_requests;

	bool select_active_disp;

	bool lid_state;

	bool get_tv_standard;

	bool set_tv_standard;

	bool get_panel_expansion_mode;

	bool set_panel_expansion_mode;

	bool temperature_change;

	bool graphics_device_types;

};



struct amdgpu_atif {

	acpi_handle handle;



	struct amdgpu_atif_notifications notifications;

	struct amdgpu_atif_functions functions;

	struct amdgpu_atif_notification_cfg notification_cfg;

	struct amdgpu_encoder *encoder_for_bl;

};



/* Call the ATIF method

 */

/**
@@ -46,7 +85,8 @@ 
 * Executes the requested ATIF function (all asics).

 * Returns a pointer to the acpi output buffer.

 */

static union acpi_object *amdgpu_atif_call(acpi_handle handle, int function,

static union acpi_object *amdgpu_atif_call(struct amdgpu_atif *atif,

					   int function,

					   struct acpi_buffer *params)

{

	acpi_status status;
@@ -70,7 +110,8 @@ static union acpi_object *amdgpu_atif_call(acpi_handle handle, int function, 
		atif_arg_elements[1].integer.value = 0;

	}



	status = acpi_evaluate_object(handle, "ATIF", &atif_arg, &buffer);

	status = acpi_evaluate_object(atif->handle, NULL, &atif_arg,

				      &buffer);



	/* Fail only if calling the method fails and ATIF is supported */

	if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
@@ -141,15 +182,14 @@ static void amdgpu_atif_parse_functions(struct amdgpu_atif_functions *f, u32 mas 
 * (all asics).

 * returns 0 on success, error on failure.

 */

static int amdgpu_atif_verify_interface(acpi_handle handle,

		struct amdgpu_atif *atif)

static int amdgpu_atif_verify_interface(struct amdgpu_atif *atif)

{

	union acpi_object *info;

	struct atif_verify_interface output;

	size_t size;

	int err = 0;



	info = amdgpu_atif_call(handle, ATIF_FUNCTION_VERIFY_INTERFACE, NULL);

	info = amdgpu_atif_call(atif, ATIF_FUNCTION_VERIFY_INTERFACE, NULL);

	if (!info)

		return -EIO;
@@ -176,6 +216,35 @@ static int amdgpu_atif_verify_interface(acpi_handle handle, 
	return err;

}



static acpi_handle amdgpu_atif_probe_handle(acpi_handle dhandle)

{

	acpi_handle handle = NULL;

	char acpi_method_name[255] = { 0 };

	struct acpi_buffer buffer = { sizeof(acpi_method_name), acpi_method_name };

	acpi_status status;



	/* For PX/HG systems, ATIF and ATPX are in the iGPU's namespace, on dGPU only

	 * systems, ATIF is in the dGPU's namespace.

	 */

	status = acpi_get_handle(dhandle, "ATIF", &handle);

	if (ACPI_SUCCESS(status))

		goto out;



	if (amdgpu_has_atpx()) {

		status = acpi_get_handle(amdgpu_atpx_get_dhandle(), "ATIF",

					 &handle);

		if (ACPI_SUCCESS(status))

			goto out;

	}



	DRM_DEBUG_DRIVER("No ATIF handle found\n");

	return NULL;

out:

	acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer);

	DRM_DEBUG_DRIVER("Found ATIF handle %s\n", acpi_method_name);

	return handle;

}



/**

 * amdgpu_atif_get_notification_params - determine notify configuration

 *
@@ -188,15 +257,16 @@ static int amdgpu_atif_verify_interface(acpi_handle handle, 
 * where n is specified in the result if a notifier is used.

 * Returns 0 on success, error on failure.

 */

static int amdgpu_atif_get_notification_params(acpi_handle handle,

		struct amdgpu_atif_notification_cfg *n)

static int amdgpu_atif_get_notification_params(struct amdgpu_atif *atif)

{

	union acpi_object *info;

	struct amdgpu_atif_notification_cfg *n = &atif->notification_cfg;

	struct atif_system_params params;

	size_t size;

	int err = 0;



	info = amdgpu_atif_call(handle, ATIF_FUNCTION_GET_SYSTEM_PARAMETERS, NULL);

	info = amdgpu_atif_call(atif, ATIF_FUNCTION_GET_SYSTEM_PARAMETERS,

				NULL);

	if (!info) {

		err = -EIO;

		goto out;
@@ -250,14 +320,15 @@ static int amdgpu_atif_get_notification_params(acpi_handle handle, 
 * (all asics).

 * Returns 0 on success, error on failure.

 */

static int amdgpu_atif_get_sbios_requests(acpi_handle handle,

static int amdgpu_atif_get_sbios_requests(struct amdgpu_atif *atif,

					  struct atif_sbios_requests *req)

{

	union acpi_object *info;

	size_t size;

	int count = 0;



	info = amdgpu_atif_call(handle, ATIF_FUNCTION_GET_SYSTEM_BIOS_REQUESTS, NULL);

	info = amdgpu_atif_call(atif, ATIF_FUNCTION_GET_SYSTEM_BIOS_REQUESTS,

				NULL);

	if (!info)

		return -EIO;
@@ -292,9 +363,8 @@ static int amdgpu_atif_get_sbios_requests(acpi_handle handle, 
static int amdgpu_atif_handler(struct amdgpu_device *adev,

			       struct acpi_bus_event *event)

{

	struct amdgpu_atif *atif = &adev->atif;

	struct amdgpu_atif *atif = adev->atif;

	struct atif_sbios_requests req;

	acpi_handle handle;

	int count;



	DRM_DEBUG_DRIVER("event, device_class = %s, type = %#x\n",
@@ -303,14 +373,14 @@ static int amdgpu_atif_handler(struct amdgpu_device *adev, 
	if (strcmp(event->device_class, ACPI_VIDEO_CLASS) != 0)

		return NOTIFY_DONE;



	if (!atif->notification_cfg.enabled ||

	if (!atif ||

	    !atif->notification_cfg.enabled ||

	    event->type != atif->notification_cfg.command_code)

		/* Not our event */

		return NOTIFY_DONE;



	/* Check pending SBIOS requests */

	handle = ACPI_HANDLE(&adev->pdev->dev);

	count = amdgpu_atif_get_sbios_requests(handle, &req);

	count = amdgpu_atif_get_sbios_requests(atif, &req);



	if (count <= 0)

		return NOTIFY_DONE;
@@ -641,8 +711,8 @@ static int amdgpu_acpi_event(struct notifier_block *nb, 
 */

int amdgpu_acpi_init(struct amdgpu_device *adev)

{

	acpi_handle handle;

	struct amdgpu_atif *atif = &adev->atif;

	acpi_handle handle, atif_handle;

	struct amdgpu_atif *atif;

	struct amdgpu_atcs *atcs = &adev->atcs;

	int ret;
@@ -658,12 +728,26 @@ int amdgpu_acpi_init(struct amdgpu_device *adev) 
		DRM_DEBUG_DRIVER("Call to ATCS verify_interface failed: %d\n", ret);

	}



	/* Probe for ATIF, and initialize it if found */

	atif_handle = amdgpu_atif_probe_handle(handle);

	if (!atif_handle)

		goto out;



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

	if (!atif) {

		DRM_WARN("Not enough memory to initialize ATIF\n");

		goto out;

	}

	atif->handle = atif_handle;



	/* Call the ATIF method */

	ret = amdgpu_atif_verify_interface(handle, atif);

	ret = amdgpu_atif_verify_interface(atif);

	if (ret) {

		DRM_DEBUG_DRIVER("Call to ATIF verify_interface failed: %d\n", ret);

		kfree(atif);

		goto out;

	}

	adev->atif = atif;



	if (atif->notifications.brightness_change) {

		struct drm_encoder *tmp;
@@ -693,8 +777,7 @@ int amdgpu_acpi_init(struct amdgpu_device *adev) 
	}



	if (atif->functions.system_params) {

		ret = amdgpu_atif_get_notification_params(handle,

				&atif->notification_cfg);

		ret = amdgpu_atif_get_notification_params(atif);

		if (ret) {

			DRM_DEBUG_DRIVER("Call to GET_SYSTEM_PARAMS failed: %d\n",

					ret);
@@ -720,4 +803,6 @@ int amdgpu_acpi_init(struct amdgpu_device *adev) 
void amdgpu_acpi_fini(struct amdgpu_device *adev)

{

	unregister_acpi_notifier(&adev->acpi_nb);

	if (adev->atif)

		kfree(adev->atif);

}

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

+6 −0
Original line number Diff line number Diff line
@@ -90,6 +90,12 @@ bool amdgpu_atpx_dgpu_req_power_for_displays(void) { 
	return amdgpu_atpx_priv.atpx.dgpu_req_power_for_displays;

}



#if defined(CONFIG_ACPI)

void *amdgpu_atpx_get_dhandle(void) {

	return amdgpu_atpx_priv.dhandle;

}

#endif



/**

 * amdgpu_atpx_call - call an ATPX method

 *

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

+6 −6
Original line number Diff line number Diff line
@@ -231,6 +231,12 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs, 
	if (ib->flags & AMDGPU_IB_FLAG_TC_WB_NOT_INVALIDATE)

		fence_flags |= AMDGPU_FENCE_FLAG_TC_WB_ONLY;



	/* wrap the last IB with fence */

	if (job && job->uf_addr) {

		amdgpu_ring_emit_fence(ring, job->uf_addr, job->uf_sequence,

				       fence_flags | AMDGPU_FENCE_FLAG_64BIT);

	}



	r = amdgpu_fence_emit(ring, f, fence_flags);

	if (r) {

		dev_err(adev->dev, "failed to emit fence (%d)\n", r);
@@ -243,12 +249,6 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs, 
	if (ring->funcs->insert_end)

		ring->funcs->insert_end(ring);



	/* wrap the last IB with fence */

	if (job && job->uf_addr) {

		amdgpu_ring_emit_fence(ring, job->uf_addr, job->uf_sequence,

				       fence_flags | AMDGPU_FENCE_FLAG_64BIT);

	}



	if (patch_offset != ~0 && ring->funcs->patch_cond_exec)

		amdgpu_ring_patch_cond_exec(ring, patch_offset);

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

+1 −1
Original line number Diff line number Diff line
@@ -1882,7 +1882,7 @@ void amdgpu_pm_compute_clocks(struct amdgpu_device *adev) 
		if (!amdgpu_device_has_dc_support(adev)) {

			mutex_lock(&adev->pm.mutex);

			amdgpu_dpm_get_active_displays(adev);

			adev->pm.pm_display_cfg.num_display = adev->pm.dpm.new_active_crtcs;

			adev->pm.pm_display_cfg.num_display = adev->pm.dpm.new_active_crtc_count;

			adev->pm.pm_display_cfg.vrefresh = amdgpu_dpm_get_vrefresh(adev);

			adev->pm.pm_display_cfg.min_vblank_time = amdgpu_dpm_get_vblank_time(adev);

			/* we have issues with mclk switching with refresh rates over 120 hz on the non-DC code. */