Merge tag 'drm-for-v4.15-amd-dc' of git://people.freedesktop.org/~airlied/linux (f6705bf9) · Commits · e / devices / android_kernel_fairphone_FP5

Documentation/gpu/todo.rst

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -409,5 +409,15 @@ those drivers as simple as possible, so lots of room for refactoring:

	Contact: Noralf Trønnes, Daniel Vetter		Contact: Noralf Trønnes, Daniel Vetter

			AMD DC Display Driver
			---------------------

			AMD DC is the display driver for AMD devices starting with Vega. There has been
			a bunch of progress cleaning it up but there's still plenty of work to be done.

			See drivers/gpu/drm/amd/display/TODO for tasks.

			Contact: Harry Wentland, Alex Deucher

	Outside DRM		Outside DRM
	===========		===========

drivers/gpu/drm/amd/amdgpu/Kconfig

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -41,3 +41,4 @@ config DRM_AMDGPU_GART_DEBUGFS
	pages. Uses more memory for housekeeping, enable only for debugging.		pages. Uses more memory for housekeeping, enable only for debugging.

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

drivers/gpu/drm/amd/amdgpu/Makefile

+16 −1

Original line number	Original line	Diff line number	Diff line
	@@ -4,13 +4,19 @@
	# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.		# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.

	FULL_AMD_PATH=$(src)/..		FULL_AMD_PATH=$(src)/..
			DISPLAY_FOLDER_NAME=display
			FULL_AMD_DISPLAY_PATH = $(FULL_AMD_PATH)/$(DISPLAY_FOLDER_NAME)

	ccflags-y := -I$(FULL_AMD_PATH)/include/asic_reg \		ccflags-y := -I$(FULL_AMD_PATH)/include/asic_reg \
	-I$(FULL_AMD_PATH)/include \		-I$(FULL_AMD_PATH)/include \
	-I$(FULL_AMD_PATH)/amdgpu \		-I$(FULL_AMD_PATH)/amdgpu \
	-I$(FULL_AMD_PATH)/scheduler \		-I$(FULL_AMD_PATH)/scheduler \
	-I$(FULL_AMD_PATH)/powerplay/inc \		-I$(FULL_AMD_PATH)/powerplay/inc \
	-I$(FULL_AMD_PATH)/acp/include		-I$(FULL_AMD_PATH)/acp/include \
			-I$(FULL_AMD_DISPLAY_PATH) \
			-I$(FULL_AMD_DISPLAY_PATH)/include \
			-I$(FULL_AMD_DISPLAY_PATH)/dc \
			-I$(FULL_AMD_DISPLAY_PATH)/amdgpu_dm

	amdgpu-y := amdgpu_drv.o		amdgpu-y := amdgpu_drv.o

	@@ -133,4 +139,13 @@ include $(FULL_AMD_PATH)/powerplay/Makefile

	amdgpu-y += $(AMD_POWERPLAY_FILES)		amdgpu-y += $(AMD_POWERPLAY_FILES)

			ifneq ($(CONFIG_DRM_AMD_DC),)

			RELATIVE_AMD_DISPLAY_PATH = ../$(DISPLAY_FOLDER_NAME)
			include $(FULL_AMD_DISPLAY_PATH)/Makefile

			amdgpu-y += $(AMD_DISPLAY_FILES)

			endif

	obj-$(CONFIG_DRM_AMDGPU)+= amdgpu.o		obj-$(CONFIG_DRM_AMDGPU)+= amdgpu.o

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

+16 −0

Original line number	Original line	Diff line number	Diff line
	@@ -66,6 +66,7 @@
	#include "amdgpu_vce.h"		#include "amdgpu_vce.h"
	#include "amdgpu_vcn.h"		#include "amdgpu_vcn.h"
	#include "amdgpu_mn.h"		#include "amdgpu_mn.h"
			#include "amdgpu_dm.h"

	#include "gpu_scheduler.h"		#include "gpu_scheduler.h"
	#include "amdgpu_virt.h"		#include "amdgpu_virt.h"
	@@ -101,6 +102,8 @@ extern int amdgpu_vm_fragment_size;
	extern int amdgpu_vm_fault_stop;		extern int amdgpu_vm_fault_stop;
	extern int amdgpu_vm_debug;		extern int amdgpu_vm_debug;
	extern int amdgpu_vm_update_mode;		extern int amdgpu_vm_update_mode;
			extern int amdgpu_dc;
			extern int amdgpu_dc_log;
	extern int amdgpu_sched_jobs;		extern int amdgpu_sched_jobs;
	extern int amdgpu_sched_hw_submission;		extern int amdgpu_sched_hw_submission;
	extern int amdgpu_no_evict;		extern int amdgpu_no_evict;
	@@ -1535,6 +1538,7 @@ struct amdgpu_device {
	/* display */		/* display */
	bool enable_virtual_display;		bool enable_virtual_display;
	struct amdgpu_mode_info mode_info;		struct amdgpu_mode_info mode_info;
			/* For pre-DCE11. DCE11 and later are in "struct amdgpu_device->dm" */
	struct work_struct hotplug_work;		struct work_struct hotplug_work;
	struct amdgpu_irq_src crtc_irq;		struct amdgpu_irq_src crtc_irq;
	struct amdgpu_irq_src pageflip_irq;		struct amdgpu_irq_src pageflip_irq;
	@@ -1590,6 +1594,9 @@ struct amdgpu_device {
	/* GDS */		/* GDS */
	struct amdgpu_gds gds;		struct amdgpu_gds gds;

			/* display related functionality */
			struct amdgpu_display_manager dm;

	struct amdgpu_ip_block ip_blocks[AMDGPU_MAX_IP_NUM];		struct amdgpu_ip_block ip_blocks[AMDGPU_MAX_IP_NUM];
	int num_ip_blocks;		int num_ip_blocks;
	struct mutex mn_lock;		struct mutex mn_lock;
	@@ -1653,6 +1660,9 @@ void amdgpu_mm_wdoorbell(struct amdgpu_device *adev, u32 index, u32 v);
	u64 amdgpu_mm_rdoorbell64(struct amdgpu_device *adev, u32 index);		u64 amdgpu_mm_rdoorbell64(struct amdgpu_device *adev, u32 index);
	void amdgpu_mm_wdoorbell64(struct amdgpu_device *adev, u32 index, u64 v);		void amdgpu_mm_wdoorbell64(struct amdgpu_device *adev, u32 index, u64 v);

			bool amdgpu_device_asic_has_dc_support(enum amd_asic_type asic_type);
			bool amdgpu_device_has_dc_support(struct amdgpu_device *adev);

	/*		/*
	* Registers read & write functions.		* Registers read & write functions.
	*/		*/
	@@ -1911,5 +1921,11 @@ int amdgpu_cs_find_mapping(struct amdgpu_cs_parser *parser,
	uint64_t addr, struct amdgpu_bo **bo,		uint64_t addr, struct amdgpu_bo **bo,
	struct amdgpu_bo_va_mapping **mapping);		struct amdgpu_bo_va_mapping **mapping);

			#if defined(CONFIG_DRM_AMD_DC)
			int amdgpu_dm_display_resume(struct amdgpu_device *adev );
			#else
			static inline int amdgpu_dm_display_resume(struct amdgpu_device *adev) { return 0; }
			#endif

	#include "amdgpu_object.h"		#include "amdgpu_object.h"
	#endif		#endif

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

+34 −25

Original line number	Original line	Diff line number	Diff line
	@@ -911,10 +911,6 @@ static int amdgpu_cgs_get_active_displays_info(struct cgs_device *cgs_device,
	struct cgs_display_info *info)		struct cgs_display_info *info)
	{		{
	CGS_FUNC_ADEV;		CGS_FUNC_ADEV;
	struct amdgpu_crtc *amdgpu_crtc;
	struct drm_device *ddev = adev->ddev;
	struct drm_crtc *crtc;
	uint32_t line_time_us, vblank_lines;
	struct cgs_mode_info *mode_info;		struct cgs_mode_info *mode_info;

	if (info == NULL)		if (info == NULL)
	@@ -928,6 +924,12 @@ static int amdgpu_cgs_get_active_displays_info(struct cgs_device *cgs_device,
	mode_info->ref_clock = adev->clock.spll.reference_freq;		mode_info->ref_clock = adev->clock.spll.reference_freq;
	}		}

			if (!amdgpu_device_has_dc_support(adev)) {
			struct amdgpu_crtc *amdgpu_crtc;
			struct drm_device *ddev = adev->ddev;
			struct drm_crtc *crtc;
			uint32_t line_time_us, vblank_lines;

	if (adev->mode_info.num_crtc && adev->mode_info.mode_config_initialized) {		if (adev->mode_info.num_crtc && adev->mode_info.mode_config_initialized) {
	list_for_each_entry(crtc,		list_for_each_entry(crtc,
	&ddev->mode_config.crtc_list, head) {		&ddev->mode_config.crtc_list, head) {
	@@ -951,7 +953,14 @@ static int amdgpu_cgs_get_active_displays_info(struct cgs_device *cgs_device,
	}		}
	}		}
	}		}
			} else {
			info->display_count = adev->pm.pm_display_cfg.num_display;
			if (mode_info != NULL) {
			mode_info->vblank_time_us = adev->pm.pm_display_cfg.min_vblank_time;
			mode_info->refresh_rate = adev->pm.pm_display_cfg.vrefresh;
			mode_info->ref_clock = adev->clock.spll.reference_freq;
			}
			}
	return 0;		return 0;
	}		}