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

Commit 9f4ef05b 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 

Last set of radeon and amdgpu changes for 4.9.  This is
mostly just the powerplay cleanup for dGPUs.  Beyond that,
just misc code cleanups and bug fixes.

* 'drm-next-4.9' of git://people.freedesktop.org/~agd5f/linux: (49 commits)
  drm/amd/amdgpu: Clean up afmt allocation in DCEv6. (v2)
  drm/amd/amdgpu: Remove division from vblank_wait
  drm/radeon/atif: Send a hotplug event when we get dgpu display request
  drm/radeon/atpx: check for ATIF dGPU wake for display events support
  drm/amdgpu/atif: Send a hotplug event when we get dgpu display request
  drm/amdgpu/atpx: check for ATIF dGPU wake for display events support
  drm/amdgpu: bump version for new vce packet support
  drm/amdgpu/vce: allow the clock table packet
  drm/amdgpu:cleanup virt related define
  drm/amdgpu: use powerplay module for dgpu in Vi.
  drm/amdgpu: set gfx clock gating for tonga/polaris.
  drm/amdgpu: set system clock gating for tonga/polaris.
  drm/amd/powerplay: export function to help to set cg by smu.
  drm/amdgpu: avoid out of bounds access on array interrupt_status_offsets
  drm/amdgpu: mark symbols static where possible
  drm/amdgpu: remove unused functions
  drm/amd/powerplay:  Replace per-asic print_performance with generic
  drm/radeon: narrow asic_init for virtualization
  drm/amdgpu:add fw version entry to info
  drm/amdgpu:determine if vPost is needed indeed
  ...
parents 81c5d6aa beb86f29

drivers/gpu/drm/amd/amdgpu/Makefile

+1 −4
Original line number Diff line number Diff line
@@ -52,10 +52,7 @@ amdgpu-y += \ 
amdgpu-y += \

	amdgpu_dpm.o \

	amdgpu_powerplay.o \

	cz_smc.o cz_dpm.o \

	tonga_smc.o tonga_dpm.o \

	fiji_smc.o fiji_dpm.o \

	iceland_smc.o iceland_dpm.o

	cz_smc.o cz_dpm.o



# add DCE block

amdgpu-y += \

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

+10 −18
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ 
#include "amdgpu_acp.h"



#include "gpu_scheduler.h"

#include "amdgpu_virt.h"



/*

 * Modules parameters.
@@ -1827,6 +1828,7 @@ struct amdgpu_asic_funcs { 
	bool (*read_disabled_bios)(struct amdgpu_device *adev);

	bool (*read_bios_from_rom)(struct amdgpu_device *adev,

				   u8 *bios, u32 length_bytes);

	void (*detect_hw_virtualization) (struct amdgpu_device *adev);

	int (*read_register)(struct amdgpu_device *adev, u32 se_num,

			     u32 sh_num, u32 reg_offset, u32 *value);

	void (*set_vga_state)(struct amdgpu_device *adev, bool state);
@@ -1836,8 +1838,6 @@ struct amdgpu_asic_funcs { 
	/* MM block clocks */

	int (*set_uvd_clocks)(struct amdgpu_device *adev, u32 vclk, u32 dclk);

	int (*set_vce_clocks)(struct amdgpu_device *adev, u32 evclk, u32 ecclk);

	/* query virtual capabilities */

	u32 (*get_virtual_caps)(struct amdgpu_device *adev);

	/* static power management */

	int (*get_pcie_lanes)(struct amdgpu_device *adev);

	void (*set_pcie_lanes)(struct amdgpu_device *adev, int lanes);
@@ -1933,16 +1933,6 @@ struct amdgpu_atcs { 
struct cgs_device *amdgpu_cgs_create_device(struct amdgpu_device *adev);

void amdgpu_cgs_destroy_device(struct cgs_device *cgs_device);





/* GPU virtualization */

#define AMDGPU_VIRT_CAPS_SRIOV_EN       (1 << 0)

#define AMDGPU_VIRT_CAPS_IS_VF          (1 << 1)

struct amdgpu_virtualization {

	bool supports_sr_iov;

	bool is_virtual;

	u32 caps;

};



/*

 * Core structure, functions and helpers.

 */
@@ -2260,12 +2250,12 @@ amdgpu_get_sdma_instance(struct amdgpu_ring *ring) 
#define amdgpu_asic_get_xclk(adev) (adev)->asic_funcs->get_xclk((adev))

#define amdgpu_asic_set_uvd_clocks(adev, v, d) (adev)->asic_funcs->set_uvd_clocks((adev), (v), (d))

#define amdgpu_asic_set_vce_clocks(adev, ev, ec) (adev)->asic_funcs->set_vce_clocks((adev), (ev), (ec))

#define amdgpu_asic_get_virtual_caps(adev) ((adev)->asic_funcs->get_virtual_caps((adev)))

#define amdgpu_get_pcie_lanes(adev) (adev)->asic_funcs->get_pcie_lanes((adev))

#define amdgpu_set_pcie_lanes(adev, l) (adev)->asic_funcs->set_pcie_lanes((adev), (l))

#define amdgpu_asic_get_gpu_clock_counter(adev) (adev)->asic_funcs->get_gpu_clock_counter((adev))

#define amdgpu_asic_read_disabled_bios(adev) (adev)->asic_funcs->read_disabled_bios((adev))

#define amdgpu_asic_read_bios_from_rom(adev, b, l) (adev)->asic_funcs->read_bios_from_rom((adev), (b), (l))

#define amdgpu_asic_detect_hw_virtualization(adev) (adev)->asic_funcs->detect_hw_virtualization((adev))

#define amdgpu_asic_read_register(adev, se, sh, offset, v)((adev)->asic_funcs->read_register((adev), (se), (sh), (offset), (v)))

#define amdgpu_gart_flush_gpu_tlb(adev, vmid) (adev)->gart.gart_funcs->flush_gpu_tlb((adev), (vmid))

#define amdgpu_gart_set_pte_pde(adev, pt, idx, addr, flags) (adev)->gart.gart_funcs->set_pte_pde((adev), (pt), (idx), (addr), (flags))
@@ -2323,6 +2313,11 @@ amdgpu_get_sdma_instance(struct amdgpu_ring *ring) 
#define amdgpu_gfx_get_gpu_clock_counter(adev) (adev)->gfx.funcs->get_gpu_clock_counter((adev))

#define amdgpu_gfx_select_se_sh(adev, se, sh, instance) (adev)->gfx.funcs->select_se_sh((adev), (se), (sh), (instance))



#define amdgpu_dpm_read_sensor(adev, idx, value) \

	((adev)->pp_enabled ? \

		(adev)->powerplay.pp_funcs->read_sensor(adev->powerplay.pp_handle, (idx), (value)) : \

		-EINVAL)



#define amdgpu_dpm_get_temperature(adev) \

	((adev)->pp_enabled ?						\

	      (adev)->powerplay.pp_funcs->get_temperature((adev)->powerplay.pp_handle) : \
@@ -2374,11 +2369,6 @@ amdgpu_get_sdma_instance(struct amdgpu_ring *ring) 
	      (adev)->powerplay.pp_funcs->powergate_vce((adev)->powerplay.pp_handle, (g)) : \

	      (adev)->pm.funcs->powergate_vce((adev), (g)))



#define amdgpu_dpm_debugfs_print_current_performance_level(adev, m) \

	((adev)->pp_enabled ?						\

	      (adev)->powerplay.pp_funcs->print_current_performance_level((adev)->powerplay.pp_handle, (m)) : \

	      (adev)->pm.funcs->debugfs_print_current_performance_level((adev), (m)))



#define amdgpu_dpm_get_current_power_state(adev) \

	(adev)->powerplay.pp_funcs->get_current_power_state((adev)->powerplay.pp_handle)
@@ -2460,11 +2450,13 @@ void amdgpu_register_atpx_handler(void); 
void amdgpu_unregister_atpx_handler(void);

bool amdgpu_has_atpx_dgpu_power_cntl(void);

bool amdgpu_is_atpx_hybrid(void);

bool amdgpu_atpx_dgpu_req_power_for_displays(void);

#else

static inline void amdgpu_register_atpx_handler(void) {}

static inline void amdgpu_unregister_atpx_handler(void) {}

static inline bool amdgpu_has_atpx_dgpu_power_cntl(void) { return false; }

static inline bool amdgpu_is_atpx_hybrid(void) { return false; }

static inline bool amdgpu_atpx_dgpu_req_power_for_displays(void) { return false; }

#endif



/*

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

+11 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/acpi.h>

#include <linux/slab.h>

#include <linux/power_supply.h>

#include <linux/pm_runtime.h>

#include <acpi/video.h>

#include <drm/drmP.h>

#include <drm/drm_crtc_helper.h>
@@ -333,6 +334,16 @@ int amdgpu_atif_handler(struct amdgpu_device *adev, 
#endif

		}

	}

	if (req.pending & ATIF_DGPU_DISPLAY_EVENT) {

		if ((adev->flags & AMD_IS_PX) &&

		    amdgpu_atpx_dgpu_req_power_for_displays()) {

			pm_runtime_get_sync(adev->ddev->dev);

			/* Just fire off a uevent and let userspace tell us what to do */

			drm_helper_hpd_irq_event(adev->ddev);

			pm_runtime_mark_last_busy(adev->ddev->dev);

			pm_runtime_put_autosuspend(adev->ddev->dev);

		}

	}

	/* TODO: check other events */



	/* We've handled the event, stop the notifier chain. The ACPI interface

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

+0 −8
Original line number Diff line number Diff line
@@ -143,14 +143,6 @@ int amdgpu_amdkfd_resume(struct amdgpu_device *rdev) 
	return r;

}



u32 pool_to_domain(enum kgd_memory_pool p)

{

	switch (p) {

	case KGD_POOL_FRAMEBUFFER: return AMDGPU_GEM_DOMAIN_VRAM;

	default: return AMDGPU_GEM_DOMAIN_GTT;

	}

}



int alloc_gtt_mem(struct kgd_dev *kgd, size_t size,

			void **mem_obj, uint64_t *gpu_addr,

			void **cpu_ptr)

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

+9 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ struct amdgpu_atpx { 
	acpi_handle handle;

	struct amdgpu_atpx_functions functions;

	bool is_hybrid;

	bool dgpu_req_power_for_displays;

};



static struct amdgpu_atpx_priv {
@@ -73,6 +74,10 @@ bool amdgpu_is_atpx_hybrid(void) { 
	return amdgpu_atpx_priv.atpx.is_hybrid;

}



bool amdgpu_atpx_dgpu_req_power_for_displays(void) {

	return amdgpu_atpx_priv.atpx.dgpu_req_power_for_displays;

}



/**

 * amdgpu_atpx_call - call an ATPX method

 *
@@ -213,6 +218,10 @@ static int amdgpu_atpx_validate(struct amdgpu_atpx *atpx) 
		atpx->is_hybrid = true;

	}



	atpx->dgpu_req_power_for_displays = false;

	if (valid_bits & ATPX_DGPU_REQ_POWER_FOR_DISPLAYS)

		atpx->dgpu_req_power_for_displays = true;



	return 0;

}