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

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

Initial pull request for DC support.  We've completed a substantial amount of
the cleanup and restructuring in our TODO.  There are a few additional
cleanups that we are continuing to work on, but I don't think there are any
showstoppers remaining. We've tried to maintain most of the history for bisect
purposes.  Harry made sure all the commits build.  We've enabled DC for vega10
and Raven.  Pre-vega10 parts can be enabled via module parameter (amdgpu.dc=1),
but are not enabled by default at this point until we get further testing
upstream.

This code provides atomic modesetting support for DCE8 (CIK), DCE10 (Tonga,
Fiji), DCE11 (CZ, ST, Polaris), DCE12 (vega10), and DCN1 (RV) including
HDMI and DP audio, DP MST, and many other advanced display features.

+

Latest cleanups for DC from you and Harry.  Note that there is some
flickering on some older asics with this branch due to a regression in powerplay
that has already been fixed and will be included in my next non-DC pull request
next week.

* 'drm-next-4.15-dc' of git://people.freedesktop.org/~agd5f/linux: (897 commits)
  amdgpu/dc: use kref for dc_state.
  amdgpu/dc: convert dc_sink to kref.
  amdgpu/dc: convert dc_stream_state to kref.
  amdgpu/dc: use kref for dc_plane_state.
  amdgpu/dc: convert dc_gamma to kref reference counting.
  amdgpu/dc: convert dc_transfer to use a kref.
  amdgpu/dc: kill a bunch of dead code.
  amdgpu/dc: set a bunch of functions to static.
  amdgpu/dc: kill some deadcode in dc core.
  amdgpu/dc: fix indentation on a couple of returns.
  amdgpu/dm: don't use after free.
  amdgpu/dc: kfree already checks for NULL.
  amdgpu/dc: fix a bunch of misc whitespace.
  amdgpu/dc: drop hw_sequencer_types.h
  amdgpu/dc: drop dce110_types.h
  amdgpu/dc: use kernel ilog2 for log_2.
  amdgpu/dc: don't memset after kzalloc.
  amdgpu/dc: inline dal grph object id functions.
  amdgpu/dc: inline dml_round_to_multiple
  amdgpu/dc: rename bios get_image symbol to something more searchable.
  ...
parents bb7a9c8d 8ee5702a

Documentation/gpu/todo.rst

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


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

===========

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

+16 −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,8 @@ 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_dc_log;

extern int amdgpu_sched_jobs;

extern int amdgpu_sched_hw_submission;

extern int amdgpu_no_evict;
@@ -1510,6 +1513,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;
@@ -1565,6 +1569,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;
@@ -1626,6 +1633,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.

 */
@@ -1886,5 +1896,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_cgs.c

+34 −25
Original line number 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)

{

	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;



	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;

	}



	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) {

			list_for_each_entry(crtc,

					&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;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE