drm/amd/dc: Add dc display driver (v2) (4562236b) · Commits · e / devices / android_kernel_teracube_emerald

drivers/gpu/drm/amd/amdgpu/Kconfig

+1 −0

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

		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	Diff line number	Diff line
		@@ -3,13 +3,19 @@
		# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.

		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 \
		-I$(FULL_AMD_PATH)/include \
		-I$(FULL_AMD_PATH)/amdgpu \
		-I$(FULL_AMD_PATH)/scheduler \
		-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

		@@ -132,4 +138,13 @@ include $(FULL_AMD_PATH)/powerplay/Makefile

		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

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

+15 −0

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

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

		/* display related functionality */
		struct amdgpu_display_manager dm;

		struct amdgpu_ip_block ip_blocks[AMDGPU_MAX_IP_NUM];
		int num_ip_blocks;
		struct mutex mn_lock;
		@@ -1624,6 +1630,9 @@ void amdgpu_mm_wdoorbell(struct amdgpu_device *adev, u32 index, u32 v);
		u64 amdgpu_mm_rdoorbell64(struct amdgpu_device *adev, u32 index);
		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.
		*/
		@@ -1884,5 +1893,11 @@ int amdgpu_cs_find_mapping(struct amdgpu_cs_parser *parser,
		uint64_t addr, struct amdgpu_bo **bo,
		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"
		#endif

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

+78 −15

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@
		#include <linux/debugfs.h>
		#include <drm/drmP.h>
		#include <drm/drm_crtc_helper.h>
		#include <drm/drm_atomic_helper.h>
		#include <drm/amdgpu_drm.h>
		#include <linux/vgaarb.h>
		#include <linux/vga_switcheroo.h>
		@@ -1973,6 +1974,41 @@ static void amdgpu_device_detect_sriov_bios(struct amdgpu_device *adev)
		}
		}

		bool amdgpu_device_asic_has_dc_support(enum amd_asic_type asic_type)
		{
		switch (asic_type) {
		#if defined(CONFIG_DRM_AMD_DC)
		case CHIP_BONAIRE:
		case CHIP_HAWAII:
		case CHIP_CARRIZO:
		case CHIP_STONEY:
		case CHIP_POLARIS11:
		case CHIP_POLARIS10:
		case CHIP_TONGA:
		case CHIP_FIJI:
		#if defined(CONFIG_DRM_AMD_DC_PRE_VEGA)
		return amdgpu_dc != 0;
		#else
		return amdgpu_dc > 0;
		#endif
		#endif
		default:
		return false;
		}
		}

		/**
		* amdgpu_device_has_dc_support - check if dc is supported
		*
		* @adev: amdgpu_device_pointer
		*
		* Returns true for supported, false for not supported
		*/
		bool amdgpu_device_has_dc_support(struct amdgpu_device *adev)
		{
		return amdgpu_device_asic_has_dc_support(adev->asic_type);
		}

		/**
		* amdgpu_device_init - initialize the driver
		*
		@@ -2168,6 +2204,7 @@ int amdgpu_device_init(struct amdgpu_device *adev,
		goto failed;
		}
		/* init i2c buses */
		if (!amdgpu_device_has_dc_support(adev))
		amdgpu_atombios_i2c_init(adev);
		}

		@@ -2296,6 +2333,7 @@ void amdgpu_device_fini(struct amdgpu_device *adev)
		adev->accel_working = false;
		cancel_delayed_work_sync(&adev->late_init_work);
		/* free i2c buses */
		if (!amdgpu_device_has_dc_support(adev))
		amdgpu_i2c_fini(adev);
		amdgpu_atombios_fini(adev);
		kfree(adev->bios);
		@@ -2346,12 +2384,14 @@ int amdgpu_device_suspend(struct drm_device *dev, bool suspend, bool fbcon)

		drm_kms_helper_poll_disable(dev);

		if (!amdgpu_device_has_dc_support(adev)) {
		/* turn off display hw */
		drm_modeset_lock_all(dev);
		list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
		drm_helper_connector_dpms(connector, DRM_MODE_DPMS_OFF);
		}
		drm_modeset_unlock_all(dev);
		}

		amdgpu_amdkfd_suspend(adev);

		@@ -2494,13 +2534,25 @@ int amdgpu_device_resume(struct drm_device *dev, bool resume, bool fbcon)

		/* blat the mode back in */
		if (fbcon) {
		if (!amdgpu_device_has_dc_support(adev)) {
		/* pre DCE11 */
		drm_helper_resume_force_mode(dev);

		/* turn on display hw */
		drm_modeset_lock_all(dev);
		list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
		drm_helper_connector_dpms(connector, DRM_MODE_DPMS_ON);
		}
		drm_modeset_unlock_all(dev);
		} else {
		/*
		* There is no equivalent atomic helper to turn on
		* display, so we defined our own function for this,
		* once suspend resume is supported by the atomic
		* framework this will be reworked
		*/
		amdgpu_dm_display_resume(adev);
		}
		}

		drm_kms_helper_poll_enable(dev);
		@@ -2517,7 +2569,10 @@ int amdgpu_device_resume(struct drm_device *dev, bool resume, bool fbcon)
		#ifdef CONFIG_PM
		dev->dev->power.disable_depth++;
		#endif
		if (!amdgpu_device_has_dc_support(adev))
		drm_helper_hpd_irq_event(dev);
		else
		drm_kms_helper_hotplug_event(dev);
		#ifdef CONFIG_PM
		dev->dev->power.disable_depth--;
		#endif
		@@ -2814,6 +2869,7 @@ int amdgpu_sriov_gpu_reset(struct amdgpu_device adev, struct amdgpu_job job)
		*/
		int amdgpu_gpu_reset(struct amdgpu_device *adev)
		{
		struct drm_atomic_state *state = NULL;
		int i, r;
		int resched;
		bool need_full_reset, vram_lost = false;
		@@ -2827,6 +2883,9 @@ int amdgpu_gpu_reset(struct amdgpu_device *adev)

		/* block TTM */
		resched = ttm_bo_lock_delayed_workqueue(&adev->mman.bdev);
		/* store modesetting */
		if (amdgpu_device_has_dc_support(adev))
		state = drm_atomic_helper_suspend(adev->ddev);

		/* block scheduler */
		for (i = 0; i < AMDGPU_MAX_RINGS; ++i) {
		@@ -2944,6 +3003,10 @@ int amdgpu_gpu_reset(struct amdgpu_device *adev)
		}
		}

		if (amdgpu_device_has_dc_support(adev)) {
		r = drm_atomic_helper_resume(adev->ddev, state);
		amdgpu_dm_display_resume(adev);
		} else
		drm_helper_resume_force_mode(adev->ddev);

		ttm_bo_unlock_delayed_workqueue(&adev->mman.bdev, resched);

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -429,7 +429,7 @@ struct amdgpu_pm {
		uint32_t fw_version;
		uint32_t pcie_gen_mask;
		uint32_t pcie_mlw_mask;
		struct amd_pp_display_configuration pm_display_cfg;/* set by DAL */
		struct amd_pp_display_configuration pm_display_cfg;/* set by dc */
		};

		#define R600_SSTU_DFLT 0