drm/amdgpu: modernize virtual display feature
Subsystems (2)
cover drm/amdgpu: modernize virtual display feature
The amdgpu vkms interface provides a virtual KMS interface for several use
cases: devices without display hardware, platforms where the actual display hardware is not useful (e.g., servers), SR-IOV virtual functions, device emulation/simulation, and device bring up prior to display hardware being usable. We previously emulated a legacy KMS interface, but there was a desire to move to the atomic KMS interface. The vkms driver did everything we needed, but we wanted KMS support natively in the driver without buffer sharing and the ability to support an instance of VKMS per device. We first looked at splitting vkms into a stub driver and a helper module that other drivers could use to implement a virtual display, but this strategy ended up being messy due to driver specific callbacks needed for buffer management. Ultimately, it proved easier to import the vkms code as it mostly used core drm helpers anyway.
Ryan Taylor (3):
drm/amdgpu: create amdgpu_vkms (v4) drm/amdgpu: cleanup dce_virtual
drm/amdgpu: replace dce_virtual with amdgpu_vkms (v3)
drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 641 +++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.h | 26 + drivers/gpu/drm/amd/amdgpu/cik.c | 10 +- drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 780 ----------------------- drivers/gpu/drm/amd/amdgpu/dce_virtual.h | 30 - drivers/gpu/drm/amd/amdgpu/nv.c | 22 +- drivers/gpu/drm/amd/amdgpu/si.c | 8 +- drivers/gpu/drm/amd/amdgpu/soc15.c | 10 +- drivers/gpu/drm/amd/amdgpu/vi.c | 14 +- 13 files changed, 703 insertions(+), 845 deletions(-) create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.h delete mode 100644 drivers/gpu/drm/amd/amdgpu/dce_virtual.c delete mode 100644 drivers/gpu/drm/amd/amdgpu/dce_virtual.h
base-commit: e0186426a7efeb506164da7d4a56cfdaea38b380
Signature · 6 lines
2.32.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 1/3 drm/amdgpu: create amdgpu_vkms (v4)
Modify the VKMS driver into an api that dce_virtual can use to create virtual displays that obey drm's atomic modesetting api.
v2: Made local functions static.
v3: Switched vkms_output kzalloc for kcalloc.
Cleanup patches by moving display mode fixes to this patch.
v4: Update atomic_check and atomic_update to comply with new kms api.
--- drivers/gpu/drm/amd/amdgpu/Makefile | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 446 +++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.h | 29 ++ drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 23 +- 7 files changed, 493 insertions(+), 11 deletions(-) create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.h
drivers/gpu/drm/amd/amdgpu/Makefile +1 -0
@@ -120,6 +120,7 @@ amdgpu-y += \ amdgpu-y += \ dce_v10_0.o \ dce_v11_0.o \ + amdgpu_vkms.o \ dce_virtual.o # add GFX block
drivers/gpu/drm/amd/amdgpu/amdgpu.h +1 -0
@@ -916,6 +916,7 @@ struct amdgpu_device {/* display */ bool enable_virtual_display; +struct amdgpu_vkms_output *amdgpu_vkms_output;struct amdgpu_mode_info mode_info;/* For pre-DCE11. DCE11 and later are in "struct amdgpu_device->dm" */ struct work_struct hotplug_work;
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +1 -1
@@ -1230,7 +1230,7 @@ static int amdgpu_pci_probe(struct pci_dev *pdev,int ret, retry =0 ;bool supports_atomic = false; -if (!amdgpu_virtual_display && +if (amdgpu_virtual_display ||amdgpu_device_asic_has_dc_support (flags &AMD_ASIC_MASK )) supports_atomic = true;
drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c +1 -1
@@ -344,7 +344,7 @@ int amdgpu_fbdev_init(struct amdgpu_device *adev) }/* disable all the possible outputs/crtcs before entering KMS mode */ -if (!amdgpu_device_has_dc_support (adev)) +if (!amdgpu_device_has_dc_support (adev) && !amdgpu_virtual_display)drm_helper_disable_unused_functions (adev_to_drm (adev));drm_fb_helper_initial_config (&rfbdev->helper, bpp_sel);
drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c new file +446 -0
446 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.h new file +29 -0
@@ -0,0 +1,29 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ + +#ifndef _AMDGPU_VKMS_H_ +#define _AMDGPU_VKMS_H_ + +#define XRES_DEF 1024 +#define YRES_DEF 768 + +#define XRES_MAX 16384 +#define YRES_MAX 16384 + +#define drm_crtc_to_amdgpu_vkms_output (target) \ + container_of(target, struct amdgpu_vkms_output, crtc) + +extern const struct amdgpu_ip_block_version amdgpu_vkms_ip_block; + +struct amdgpu_vkms_output { +struct drm_crtc crtc; +struct drm_encoder encoder; +struct drm_connector connector; +struct hrtimer vblank_hrtimer; +ktime_t period_ns; +struct drm_pending_vblank_event *event; +}; + +int amdgpu_vkms_output_init (struct drm_device *dev, +struct amdgpu_vkms_output *output,int index); + +#endif /* _AMDGPU_VKMS_H_ */
drivers/gpu/drm/amd/amdgpu/dce_virtual.c +14 -9
@@ -22,6 +22,7 @@*/ #include <drm/drm_vblank.h> +#include <drm/drm_atomic_helper.h> #include "amdgpu.h" #include "amdgpu_pm.h"
@@ -40,6 +41,7 @@#include "dce_virtual.h" #include "ivsrcid/ivsrcid_vislands30.h" #include "amdgpu_display.h" +#include "amdgpu_vkms.h" #define DCE_VIRTUAL_VBLANK_PERIOD 16666666
@@ -374,6 +376,12 @@ static const struct drm_connector_funcs dce_virtual_connector_funcs = { .force = dce_virtual_force, }; +const struct drm_mode_config_funcs dce_virtual_mode_funcs = { + .fb_create = amdgpu_display_user_framebuffer_create, + .atomic_check = drm_atomic_helper_check, + .atomic_commit = drm_atomic_helper_commit, +}; +static int dce_virtual_sw_init (void *handle) {int r, i;
@@ -385,10 +393,10 @@ static int dce_virtual_sw_init(void *handle)adev_to_drm (adev)->max_vblank_count =0 ; -adev_to_drm (adev)->mode_config.funcs = &amdgpu_mode_funcs; +adev_to_drm (adev)->mode_config.funcs = &dce_virtual_mode_funcs; -adev_to_drm (adev)->mode_config.max_width =16384 ; -adev_to_drm (adev)->mode_config.max_height =16384 ; +adev_to_drm (adev)->mode_config.max_width =XRES_MAX ; +adev_to_drm (adev)->mode_config.max_height =YRES_MAX ;adev_to_drm (adev)->mode_config.preferred_depth =24 ;adev_to_drm (adev)->mode_config.prefer_shadow =1 ;
@@ -399,15 +407,11 @@ static int dce_virtual_sw_init(void *handle)if (r)return r; -adev_to_drm (adev)->mode_config.max_width =16384 ; -adev_to_drm (adev)->mode_config.max_height =16384 ; + adev->amdgpu_vkms_output =kcalloc (adev->mode_info.num_crtc,sizeof (struct amdgpu_vkms_output ),GFP_KERNEL );/* allocate crtcs, encoders, connectors */ for (i =0 ; i < adev->mode_info.num_crtc; i++) { - r =dce_virtual_crtc_init (adev, i); -if (r) -return r; - r =dce_virtual_connector_encoder_init (adev, i); + r =amdgpu_vkms_output_init (adev_to_drm (adev), &adev->amdgpu_vkms_output[i], i);if (r)return r; }
@@ -428,6 +432,7 @@ static int dce_virtual_sw_fini(void *handle)hrtimer_cancel (&adev->mode_info.crtcs[i]->vblank_timer);kfree (adev->mode_info.bios_hardcoded_edid); +kfree (adev->amdgpu_vkms_output);drm_kms_helper_poll_fini (adev_to_drm (adev));
Signature · 6 lines
2.32.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/3 drm/amdgpu: cleanup dce_virtual
In reply to Ryan TaylorRemove obsolete functions and variables from dce_virtual.
--- drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 568 +---------------------- 1 file changed, 3 insertions(+), 565 deletions(-)
drivers/gpu/drm/amd/amdgpu/dce_virtual.c +3 -565
@@ -21,15 +21,9 @@* */ -#include <drm/drm_vblank.h> #include <drm/drm_atomic_helper.h> #include "amdgpu.h" -#include "amdgpu_pm.h" -#include "amdgpu_i2c.h" -#include "atom.h" -#include "amdgpu_pll.h" -#include "amdgpu_connectors.h" #ifdef CONFIG_DRM_AMDGPU_SI #include "dce_v6_0.h" #endif
@@ -43,339 +37,6 @@#include "amdgpu_display.h" #include "amdgpu_vkms.h" -#define DCE_VIRTUAL_VBLANK_PERIOD 16666666 - - -static void dce_virtual_set_display_funcs (struct amdgpu_device *adev); -static void dce_virtual_set_irq_funcs (struct amdgpu_device *adev); -static int dce_virtual_connector_encoder_init (struct amdgpu_device *adev, -int index); -static int dce_virtual_pageflip (struct amdgpu_device *adev, -unsigned crtc_id); -static enum hrtimer_restart dce_virtual_vblank_timer_handle (struct hrtimer *vblank_timer); -static void dce_virtual_set_crtc_vblank_interrupt_state (struct amdgpu_device *adev, -int crtc, -enum amdgpu_interrupt_state state); - -static u32 dce_virtual_vblank_get_counter (struct amdgpu_device *adev,int crtc) -{ -return 0 ; -} - -static void dce_virtual_page_flip (struct amdgpu_device *adev, -int crtc_id,u64 crtc_base,bool async) -{ -return ; -} - -static int dce_virtual_crtc_get_scanoutpos (struct amdgpu_device *adev,int crtc, -u32 *vbl,u32 *position) -{ - *vbl =0 ; - *position =0 ; - -return -EINVAL ; -} - -static bool dce_virtual_hpd_sense (struct amdgpu_device *adev, -enum amdgpu_hpd_id hpd) -{ -return true; -} - -static void dce_virtual_hpd_set_polarity (struct amdgpu_device *adev, -enum amdgpu_hpd_id hpd) -{ -return ; -} - -static u32 dce_virtual_hpd_get_gpio_reg (struct amdgpu_device *adev) -{ -return 0 ; -} - -/** -* dce_virtual_bandwidth_update - program display watermarks -* -* @adev: amdgpu_device pointer -* -* Calculate and program the display watermarks and line -* buffer allocation (CIK). -*/ -static void dce_virtual_bandwidth_update (struct amdgpu_device *adev) -{ -return ; -} - -static int dce_virtual_crtc_gamma_set (struct drm_crtc *crtc,u16 *red, -u16 *green,u16 *blue,uint32_t size, -struct drm_modeset_acquire_ctx *ctx) -{ -return 0 ; -} - -static void dce_virtual_crtc_destroy (struct drm_crtc *crtc) -{ -struct amdgpu_crtc *amdgpu_crtc =to_amdgpu_crtc (crtc); - -drm_crtc_cleanup (crtc); -kfree (amdgpu_crtc); -} - -static const struct drm_crtc_funcs dce_virtual_crtc_funcs = { - .cursor_set2 =NULL , - .cursor_move =NULL , - .gamma_set = dce_virtual_crtc_gamma_set, - .set_config = amdgpu_display_crtc_set_config, - .destroy = dce_virtual_crtc_destroy, - .page_flip_target = amdgpu_display_crtc_page_flip_target, - .get_vblank_counter = amdgpu_get_vblank_counter_kms, - .enable_vblank = amdgpu_enable_vblank_kms, - .disable_vblank = amdgpu_disable_vblank_kms, - .get_vblank_timestamp = drm_crtc_vblank_helper_get_vblank_timestamp, -}; - -static void dce_virtual_crtc_dpms (struct drm_crtc *crtc,int mode) -{ -struct drm_device *dev = crtc->dev; -struct amdgpu_device *adev =drm_to_adev (dev); -struct amdgpu_crtc *amdgpu_crtc =to_amdgpu_crtc (crtc); -unsigned type; - -switch (mode) { -case DRM_MODE_DPMS_ON : - amdgpu_crtc->enabled = true; -/* Make sure VBLANK interrupts are still enabled */ - type =amdgpu_display_crtc_idx_to_irq_type (adev, - amdgpu_crtc->crtc_id); -amdgpu_irq_update (adev, &adev->crtc_irq, type); -drm_crtc_vblank_on (crtc); -break ; -case DRM_MODE_DPMS_STANDBY : -case DRM_MODE_DPMS_SUSPEND : -case DRM_MODE_DPMS_OFF : -drm_crtc_vblank_off (crtc); - amdgpu_crtc->enabled = false; -break ; - } -} - - -static void dce_virtual_crtc_prepare (struct drm_crtc *crtc) -{ -dce_virtual_crtc_dpms (crtc,DRM_MODE_DPMS_OFF ); -} - -static void dce_virtual_crtc_commit (struct drm_crtc *crtc) -{ -dce_virtual_crtc_dpms (crtc,DRM_MODE_DPMS_ON ); -} - -static void dce_virtual_crtc_disable (struct drm_crtc *crtc) -{ -struct amdgpu_crtc *amdgpu_crtc =to_amdgpu_crtc (crtc); -struct drm_device *dev = crtc->dev; - -if (dev->num_crtcs) -drm_crtc_vblank_off (crtc); - - amdgpu_crtc->enabled = false; - amdgpu_crtc->pll_id =ATOM_PPLL_INVALID ; - amdgpu_crtc->encoder =NULL ; - amdgpu_crtc->connector =NULL ; -} - -static int dce_virtual_crtc_mode_set (struct drm_crtc *crtc, -struct drm_display_mode *mode, -struct drm_display_mode *adjusted_mode, -int x,int y,struct drm_framebuffer *old_fb) -{ -struct amdgpu_crtc *amdgpu_crtc =to_amdgpu_crtc (crtc); - -/* update the hw version fpr dpm */ - amdgpu_crtc->hw_mode = *adjusted_mode; - -return 0 ; -} - -static bool dce_virtual_crtc_mode_fixup (struct drm_crtc *crtc, -const struct drm_display_mode *mode, -struct drm_display_mode *adjusted_mode) -{ -return true; -} - - -static int dce_virtual_crtc_set_base (struct drm_crtc *crtc,int x,int y, -struct drm_framebuffer *old_fb) -{ -return 0 ; -} - -static int dce_virtual_crtc_set_base_atomic (struct drm_crtc *crtc, -struct drm_framebuffer *fb, -int x,int y,enum mode_set_atomic state) -{ -return 0 ; -} - -static const struct drm_crtc_helper_funcs dce_virtual_crtc_helper_funcs = { - .dpms = dce_virtual_crtc_dpms, - .mode_fixup = dce_virtual_crtc_mode_fixup, - .mode_set = dce_virtual_crtc_mode_set, - .mode_set_base = dce_virtual_crtc_set_base, - .mode_set_base_atomic = dce_virtual_crtc_set_base_atomic, - .prepare = dce_virtual_crtc_prepare, - .commit = dce_virtual_crtc_commit, - .disable = dce_virtual_crtc_disable, - .get_scanout_position = amdgpu_crtc_get_scanout_position, -}; - -static int dce_virtual_crtc_init (struct amdgpu_device *adev,int index) -{ -struct amdgpu_crtc *amdgpu_crtc; - - amdgpu_crtc =kzalloc (sizeof (struct amdgpu_crtc ) + - (AMDGPUFB_CONN_LIMIT *sizeof (struct drm_connector *)),GFP_KERNEL ); -if (amdgpu_crtc ==NULL ) -return -ENOMEM ; - -drm_crtc_init (adev_to_drm (adev), &amdgpu_crtc->base, &dce_virtual_crtc_funcs); - -drm_mode_crtc_set_gamma_size (&amdgpu_crtc->base,256 ); - amdgpu_crtc->crtc_id = index; - adev->mode_info.crtcs[index] = amdgpu_crtc; - - amdgpu_crtc->pll_id =ATOM_PPLL_INVALID ; - amdgpu_crtc->encoder =NULL ; - amdgpu_crtc->connector =NULL ; - amdgpu_crtc->vsync_timer_enabled =AMDGPU_IRQ_STATE_DISABLE ; -drm_crtc_helper_add (&amdgpu_crtc->base, &dce_virtual_crtc_helper_funcs); - -hrtimer_init (&amdgpu_crtc->vblank_timer,CLOCK_MONOTONIC ,HRTIMER_MODE_REL ); -hrtimer_set_expires (&amdgpu_crtc->vblank_timer,DCE_VIRTUAL_VBLANK_PERIOD ); - amdgpu_crtc->vblank_timer.function = dce_virtual_vblank_timer_handle; -hrtimer_start (&amdgpu_crtc->vblank_timer, -DCE_VIRTUAL_VBLANK_PERIOD ,HRTIMER_MODE_REL ); -return 0 ; -} - -static int dce_virtual_early_init (void *handle) -{ -struct amdgpu_device *adev = (struct amdgpu_device *)handle; - -dce_virtual_set_display_funcs (adev); -dce_virtual_set_irq_funcs (adev); - - adev->mode_info.num_hpd =1 ; - adev->mode_info.num_dig =1 ; -return 0 ; -} - -static struct drm_encoder * -dce_virtual_encoder (struct drm_connector *connector) -{ -struct drm_encoder *encoder; - -drm_connector_for_each_possible_encoder (connector, encoder) { -if (encoder->encoder_type ==DRM_MODE_ENCODER_VIRTUAL ) -return encoder; - } - -/* pick the first one */ -drm_connector_for_each_possible_encoder (connector, encoder) -return encoder; - -return NULL ; -} - -static int dce_virtual_get_modes (struct drm_connector *connector) -{ -struct drm_device *dev = connector->dev; -struct drm_display_mode *mode =NULL ; -unsigned i; -static const struct mode_size { -int w; -int h; - } common_modes[] = { - {640 ,480 }, - {720 ,480 }, - {800 ,600 }, - {848 ,480 }, - {1024 ,768 }, - {1152 ,768 }, - {1280 ,720 }, - {1280 ,800 }, - {1280 ,854 }, - {1280 ,960 }, - {1280 ,1024 }, - {1440 ,900 }, - {1400 ,1050 }, - {1680 ,1050 }, - {1600 ,1200 }, - {1920 ,1080 }, - {1920 ,1200 }, - {2560 ,1440 }, - {4096 ,3112 }, - {3656 ,2664 }, - {3840 ,2160 }, - {4096 ,2160 }, - }; - -for (i =0 ; i <ARRAY_SIZE (common_modes); i++) { - mode =drm_cvt_mode (dev, common_modes[i].w, common_modes[i].h,60 , false, false, false); -drm_mode_probed_add (connector, mode); - } - -return 0 ; -} - -static enum drm_mode_status dce_virtual_mode_valid (struct drm_connector *connector, -struct drm_display_mode *mode) -{ -return MODE_OK ; -} - -static int -dce_virtual_dpms (struct drm_connector *connector,int mode) -{ -return 0 ; -} - -static int -dce_virtual_set_property (struct drm_connector *connector, -struct drm_property *property, -uint64_t val) -{ -return 0 ; -} - -static void dce_virtual_destroy (struct drm_connector *connector) -{ -drm_connector_unregister (connector); -drm_connector_cleanup (connector); -kfree (connector); -} - -static void dce_virtual_force (struct drm_connector *connector) -{ -return ; -} - -static const struct drm_connector_helper_funcs dce_virtual_connector_helper_funcs = { - .get_modes = dce_virtual_get_modes, - .mode_valid = dce_virtual_mode_valid, - .best_encoder = dce_virtual_encoder, -}; - -static const struct drm_connector_funcs dce_virtual_connector_funcs = { - .dpms = dce_virtual_dpms, - .fill_modes = drm_helper_probe_single_connector_modes, - .set_property = dce_virtual_set_property, - .destroy = dce_virtual_destroy, - .force = dce_virtual_force, -}; -const struct drm_mode_config_funcs dce_virtual_mode_funcs = { .fb_create = amdgpu_display_user_framebuffer_create, .atomic_check = drm_atomic_helper_check,
@@ -387,10 +48,6 @@ static int dce_virtual_sw_init(void *handle)int r, i;struct amdgpu_device *adev = (struct amdgpu_device *)handle; - r =amdgpu_irq_add_id (adev,AMDGPU_IRQ_CLIENTID_LEGACY ,VISLANDS30_IV_SRCID_SMU_DISP_TIMER2_TRIGGER , &adev->crtc_irq); -if (r) -return r; -adev_to_drm (adev)->max_vblank_count =0 ;adev_to_drm (adev)->mode_config.funcs = &dce_virtual_mode_funcs;
@@ -436,9 +93,6 @@ static int dce_virtual_sw_fini(void *handle)drm_kms_helper_poll_fini (adev_to_drm (adev)); -drm_mode_config_cleanup (adev_to_drm (adev)); -/* clear crtcs pointer to avoid dce irq finish routine access freed data */ -memset (adev->mode_info.crtcs,0 ,sizeof (adev->mode_info.crtcs[0 ]) *AMDGPU_MAX_CRTCS ); adev->mode_info.mode_config_initialized = false;return 0 ; }
@@ -498,7 +152,7 @@ static int dce_virtual_suspend(void *handle)struct amdgpu_device *adev = (struct amdgpu_device *)handle;int r; - r =amdgpu_display_suspend_helper (adev); + r =drm_mode_config_helper_suspend (adev_to_drm (adev));if (r)return r;return dce_virtual_hw_fini (handle);
@@ -512,7 +166,7 @@ static int dce_virtual_resume(void *handle) r =dce_virtual_hw_init (handle);if (r)return r; -return amdgpu_display_resume_helper (adev); +return drm_mode_config_helper_resume (adev_to_drm (adev)); }static bool dce_virtual_is_idle (void *handle)
@@ -544,7 +198,7 @@ static int dce_virtual_set_powergating_state(void *handle,static const struct amd_ip_funcs dce_virtual_ip_funcs = { .name ="dce_virtual" , - .early_init = dce_virtual_early_init, + .early_init =NULL , .late_init =NULL , .sw_init = dce_virtual_sw_init, .sw_fini = dce_virtual_sw_fini,
@@ -559,222 +213,6 @@ static const struct amd_ip_funcs dce_virtual_ip_funcs = { .set_powergating_state = dce_virtual_set_powergating_state, }; -/* these are handled by the primary encoders */ -static void dce_virtual_encoder_prepare (struct drm_encoder *encoder) -{ -return ; -} - -static void dce_virtual_encoder_commit (struct drm_encoder *encoder) -{ -return ; -} - -static void -dce_virtual_encoder_mode_set (struct drm_encoder *encoder, -struct drm_display_mode *mode, -struct drm_display_mode *adjusted_mode) -{ -return ; -} - -static void dce_virtual_encoder_disable (struct drm_encoder *encoder) -{ -return ; -} - -static void -dce_virtual_encoder_dpms (struct drm_encoder *encoder,int mode) -{ -return ; -} - -static bool dce_virtual_encoder_mode_fixup (struct drm_encoder *encoder, -const struct drm_display_mode *mode, -struct drm_display_mode *adjusted_mode) -{ -return true; -} - -static const struct drm_encoder_helper_funcs dce_virtual_encoder_helper_funcs = { - .dpms = dce_virtual_encoder_dpms, - .mode_fixup = dce_virtual_encoder_mode_fixup, - .prepare = dce_virtual_encoder_prepare, - .mode_set = dce_virtual_encoder_mode_set, - .commit = dce_virtual_encoder_commit, - .disable = dce_virtual_encoder_disable, -}; - -static void dce_virtual_encoder_destroy (struct drm_encoder *encoder) -{ -drm_encoder_cleanup (encoder); -kfree (encoder); -} - -static const struct drm_encoder_funcs dce_virtual_encoder_funcs = { - .destroy = dce_virtual_encoder_destroy, -}; - -static int dce_virtual_connector_encoder_init (struct amdgpu_device *adev, -int index) -{ -struct drm_encoder *encoder; -struct drm_connector *connector; - -/* add a new encoder */ - encoder =kzalloc (sizeof (struct drm_encoder ),GFP_KERNEL ); -if (!encoder) -return -ENOMEM ; - encoder->possible_crtcs =1 << index; -drm_encoder_init (adev_to_drm (adev), encoder, &dce_virtual_encoder_funcs, -DRM_MODE_ENCODER_VIRTUAL ,NULL ); -drm_encoder_helper_add (encoder, &dce_virtual_encoder_helper_funcs); - - connector =kzalloc (sizeof (struct drm_connector ),GFP_KERNEL ); -if (!connector) { -kfree (encoder); -return -ENOMEM ; - } - -/* add a new connector */ -drm_connector_init (adev_to_drm (adev), connector, &dce_virtual_connector_funcs, -DRM_MODE_CONNECTOR_VIRTUAL ); -drm_connector_helper_add (connector, &dce_virtual_connector_helper_funcs); - connector->display_info.subpixel_order = SubPixelHorizontalRGB; - connector->interlace_allowed = false; - connector->doublescan_allowed = false; - -/* link them */ -drm_connector_attach_encoder (connector, encoder); - -return 0 ; -} - -static const struct amdgpu_display_funcs dce_virtual_display_funcs = { - .bandwidth_update = &dce_virtual_bandwidth_update, - .vblank_get_counter = &dce_virtual_vblank_get_counter, - .backlight_set_level =NULL , - .backlight_get_level =NULL , - .hpd_sense = &dce_virtual_hpd_sense, - .hpd_set_polarity = &dce_virtual_hpd_set_polarity, - .hpd_get_gpio_reg = &dce_virtual_hpd_get_gpio_reg, - .page_flip = &dce_virtual_page_flip, - .page_flip_get_scanoutpos = &dce_virtual_crtc_get_scanoutpos, - .add_encoder =NULL , - .add_connector =NULL , -}; - -static void dce_virtual_set_display_funcs (struct amdgpu_device *adev) -{ - adev->mode_info.funcs = &dce_virtual_display_funcs; -} - -static int dce_virtual_pageflip (struct amdgpu_device *adev, -unsigned crtc_id) -{ -unsigned long flags; -struct amdgpu_crtc *amdgpu_crtc; -struct amdgpu_flip_work *works; - - amdgpu_crtc = adev->mode_info.crtcs[crtc_id]; - -if (crtc_id >= adev->mode_info.num_crtc) { -DRM_ERROR ("invalid pageflip crtc %d\n" , crtc_id); -return -EINVAL ; - } - -/* IRQ could occur when in initial stage */ -if (amdgpu_crtc ==NULL ) -return 0 ; - -spin_lock_irqsave (&adev_to_drm (adev)->event_lock, flags); - works = amdgpu_crtc->pflip_works; -if (amdgpu_crtc->pflip_status !=AMDGPU_FLIP_SUBMITTED ) { -DRM_DEBUG_DRIVER ("amdgpu_crtc->pflip_status = %d != " -"AMDGPU_FLIP_SUBMITTED(%d)\n" , - amdgpu_crtc->pflip_status, -AMDGPU_FLIP_SUBMITTED ); -spin_unlock_irqrestore (&adev_to_drm (adev)->event_lock, flags); -return 0 ; - } - -/* page flip completed. clean up */ - amdgpu_crtc->pflip_status =AMDGPU_FLIP_NONE ; - amdgpu_crtc->pflip_works =NULL ; - -/* wakeup usersapce */ -if (works->event) -drm_crtc_send_vblank_event (&amdgpu_crtc->base, works->event); - -spin_unlock_irqrestore (&adev_to_drm (adev)->event_lock, flags); - -drm_crtc_vblank_put (&amdgpu_crtc->base); -amdgpu_bo_unref (&works->old_abo); -kfree (works->shared); -kfree (works); - -return 0 ; -} - -static enum hrtimer_restart dce_virtual_vblank_timer_handle (struct hrtimer *vblank_timer) -{ -struct amdgpu_crtc *amdgpu_crtc =container_of (vblank_timer, - struct amdgpu_crtc, vblank_timer); -struct drm_device *ddev = amdgpu_crtc->base.dev; -struct amdgpu_device *adev =drm_to_adev (ddev); -struct amdgpu_irq_src *source = adev->irq.client[AMDGPU_IRQ_CLIENTID_LEGACY ].sources - [VISLANDS30_IV_SRCID_SMU_DISP_TIMER2_TRIGGER ]; -int irq_type =amdgpu_display_crtc_idx_to_irq_type (adev, - amdgpu_crtc->crtc_id); - -if (amdgpu_irq_enabled (adev, source, irq_type)) { -drm_handle_vblank (ddev, amdgpu_crtc->crtc_id); -dce_virtual_pageflip (adev, amdgpu_crtc->crtc_id); - } -hrtimer_start (vblank_timer,DCE_VIRTUAL_VBLANK_PERIOD , -HRTIMER_MODE_REL ); - -return HRTIMER_NORESTART ; -} - -static void dce_virtual_set_crtc_vblank_interrupt_state (struct amdgpu_device *adev, -int crtc, -enum amdgpu_interrupt_state state) -{ -if (crtc >= adev->mode_info.num_crtc || !adev->mode_info.crtcs[crtc]) { -DRM_DEBUG ("invalid crtc %d\n" , crtc); -return ; - } - - adev->mode_info.crtcs[crtc]->vsync_timer_enabled = state; -DRM_DEBUG ("[FM]set crtc %d vblank interrupt state %d\n" , crtc, state); -} - - -static int dce_virtual_set_crtc_irq_state (struct amdgpu_device *adev, -struct amdgpu_irq_src *source, -unsigned type, -enum amdgpu_interrupt_state state) -{ -if (type >AMDGPU_CRTC_IRQ_VBLANK6 ) -return -EINVAL ; - -dce_virtual_set_crtc_vblank_interrupt_state (adev, type, state); - -return 0 ; -} - -static const struct amdgpu_irq_src_funcs dce_virtual_crtc_irq_funcs = { - .set = dce_virtual_set_crtc_irq_state, - .process =NULL , -}; - -static void dce_virtual_set_irq_funcs (struct amdgpu_device *adev) -{ - adev->crtc_irq.num_types = adev->mode_info.num_crtc; - adev->crtc_irq.funcs = &dce_virtual_crtc_irq_funcs; -} -const struct amdgpu_ip_block_version dce_virtual_ip_block = { .type =AMD_IP_BLOCK_TYPE_DCE ,
Signature · 6 lines
2.32.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/3 drm/amdgpu: replace dce_virtual with amdgpu_vkms (v3)
In reply to Ryan TaylorMove dce_virtual into amdgpu_vkms and update all references to dce_virtual with amdgpu_vkms.
v2: Removed more references to dce_virtual.
v3: Restored display modes from previous implementation.
--- drivers/gpu/drm/amd/amdgpu/Makefile | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 195 ++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.h | 3 - drivers/gpu/drm/amd/amdgpu/cik.c | 10 +- drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 223 ----------------------- drivers/gpu/drm/amd/amdgpu/dce_virtual.h | 30 --- drivers/gpu/drm/amd/amdgpu/nv.c | 22 +-- drivers/gpu/drm/amd/amdgpu/si.c | 8 +- drivers/gpu/drm/amd/amdgpu/soc15.c | 10 +- drivers/gpu/drm/amd/amdgpu/vi.c | 14 +- 10 files changed, 228 insertions(+), 290 deletions(-) delete mode 100644 drivers/gpu/drm/amd/amdgpu/dce_virtual.c delete mode 100644 drivers/gpu/drm/amd/amdgpu/dce_virtual.h
drivers/gpu/drm/amd/amdgpu/Makefile +1 -2
@@ -120,8 +120,7 @@ amdgpu-y += \ amdgpu-y += \ dce_v10_0.o \ dce_v11_0.o \ - amdgpu_vkms.o \ - dce_virtual.o + amdgpu_vkms.o # add GFX block amdgpu-y += \
drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c +195 -0
204 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.h +0 -3
@@ -23,7 +23,4 @@ struct amdgpu_vkms_output { struct drm_pending_vblank_event *event; }; -int amdgpu_vkms_output_init (struct drm_device *dev, -struct amdgpu_vkms_output *output,int index); -#endif /* _AMDGPU_VKMS_H_ */
drivers/gpu/drm/amd/amdgpu/cik.c +5 -5
@@ -70,7 +70,7 @@#include "amdgpu_dm.h" #include "amdgpu_amdkfd.h" -#include "dce_virtual.h" +#include "amdgpu_vkms.h" static const struct amdgpu_video_codec_info cik_video_codecs_encode_array[] = {
@@ -2259,7 +2259,7 @@ int cik_set_ip_blocks(struct amdgpu_device *adev)amdgpu_device_ip_block_add (adev, &cik_sdma_ip_block);amdgpu_device_ip_block_add (adev, &pp_smu_ip_block);if (adev->enable_virtual_display) -amdgpu_device_ip_block_add (adev, &dce_virtual_ip_block); +amdgpu_device_ip_block_add (adev, &amdgpu_vkms_ip_block);#if defined(CONFIG_DRM_AMD_DC ) else if (amdgpu_device_has_dc_support(adev)) amdgpu_device_ip_block_add(adev, &dm_ip_block);
@@ -2277,7 +2277,7 @@ int cik_set_ip_blocks(struct amdgpu_device *adev)amdgpu_device_ip_block_add (adev, &cik_sdma_ip_block);amdgpu_device_ip_block_add (adev, &pp_smu_ip_block);if (adev->enable_virtual_display) -amdgpu_device_ip_block_add (adev, &dce_virtual_ip_block); +amdgpu_device_ip_block_add (adev, &amdgpu_vkms_ip_block);#if defined(CONFIG_DRM_AMD_DC ) else if (amdgpu_device_has_dc_support(adev)) amdgpu_device_ip_block_add(adev, &dm_ip_block);
@@ -2295,7 +2295,7 @@ int cik_set_ip_blocks(struct amdgpu_device *adev)amdgpu_device_ip_block_add (adev, &cik_sdma_ip_block);amdgpu_device_ip_block_add (adev, &kv_smu_ip_block);if (adev->enable_virtual_display) -amdgpu_device_ip_block_add (adev, &dce_virtual_ip_block); +amdgpu_device_ip_block_add (adev, &amdgpu_vkms_ip_block);#if defined(CONFIG_DRM_AMD_DC ) else if (amdgpu_device_has_dc_support(adev)) amdgpu_device_ip_block_add(adev, &dm_ip_block);
@@ -2315,7 +2315,7 @@ int cik_set_ip_blocks(struct amdgpu_device *adev)amdgpu_device_ip_block_add (adev, &cik_sdma_ip_block);amdgpu_device_ip_block_add (adev, &kv_smu_ip_block);if (adev->enable_virtual_display) -amdgpu_device_ip_block_add (adev, &dce_virtual_ip_block); +amdgpu_device_ip_block_add (adev, &amdgpu_vkms_ip_block);#if defined(CONFIG_DRM_AMD_DC ) else if (amdgpu_device_has_dc_support(adev)) amdgpu_device_ip_block_add(adev, &dm_ip_block);
drivers/gpu/drm/amd/amdgpu/dce_virtual.c deleted +0 -223
223 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/dce_virtual.h deleted +0 -30
@@ -1,30 +0,0 @@ -/* -* Copyright 2014 Advanced Micro Devices, Inc. -* -* Permission is hereby granted, free of charge, to any person obtaining a -* copy of this software and associated documentation files (the "Software"), -* to deal in the Software without restriction, including without limitation -* the rights to use, copy, modify, merge, publish, distribute, sublicense, -* and/or sell copies of the Software, and to permit persons to whom the -* Software is furnished to do so, subject to the following conditions: -* -* The above copyright notice and this permission notice shall be included in -* all copies or substantial portions of the Software. -* -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR -* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -* OTHER DEALINGS IN THE SOFTWARE. -* -*/ - -#ifndef __DCE_VIRTUAL_H__ -#define __DCE_VIRTUAL_H__ - -extern const struct amdgpu_ip_block_version dce_virtual_ip_block; - -#endif -
drivers/gpu/drm/amd/amdgpu/nv.c +11 -11
@@ -58,7 +58,7 @@#include "jpeg_v2_0.h" #include "vcn_v3_0.h" #include "jpeg_v3_0.h" -#include "dce_virtual.h" +#include "amdgpu_vkms.h" #include "mes_v10_1.h" #include "mxgpu_nv.h" #include "smuio_v11_0.h"
@@ -721,7 +721,7 @@ int nv_set_ip_blocks(struct amdgpu_device *adev) !amdgpu_sriov_vf(adev))amdgpu_device_ip_block_add (adev, &smu_v11_0_ip_block);if (adev->enable_virtual_display ||amdgpu_sriov_vf (adev)) -amdgpu_device_ip_block_add (adev, &dce_virtual_ip_block); +amdgpu_device_ip_block_add (adev, &amdgpu_vkms_ip_block);#if defined(CONFIG_DRM_AMD_DC ) else if (amdgpu_device_has_dc_support(adev)) amdgpu_device_ip_block_add(adev, &dm_ip_block);
@@ -749,7 +749,7 @@ int nv_set_ip_blocks(struct amdgpu_device *adev)if (adev->firmware.load_type ==AMDGPU_FW_LOAD_PSP )amdgpu_device_ip_block_add (adev, &smu_v11_0_ip_block);if (adev->enable_virtual_display ||amdgpu_sriov_vf (adev)) -amdgpu_device_ip_block_add (adev, &dce_virtual_ip_block); +amdgpu_device_ip_block_add (adev, &amdgpu_vkms_ip_block);#if defined(CONFIG_DRM_AMD_DC ) else if (amdgpu_device_has_dc_support(adev)) amdgpu_device_ip_block_add(adev, &dm_ip_block);
@@ -779,7 +779,7 @@ int nv_set_ip_blocks(struct amdgpu_device *adev) is_support_sw_smu(adev))amdgpu_device_ip_block_add (adev, &smu_v11_0_ip_block);if (adev->enable_virtual_display ||amdgpu_sriov_vf (adev)) -amdgpu_device_ip_block_add (adev, &dce_virtual_ip_block); +amdgpu_device_ip_block_add (adev, &amdgpu_vkms_ip_block);#if defined(CONFIG_DRM_AMD_DC ) else if (amdgpu_device_has_dc_support(adev)) amdgpu_device_ip_block_add(adev, &dm_ip_block);
@@ -802,7 +802,7 @@ int nv_set_ip_blocks(struct amdgpu_device *adev) is_support_sw_smu(adev))amdgpu_device_ip_block_add (adev, &smu_v11_0_ip_block);if (adev->enable_virtual_display ||amdgpu_sriov_vf (adev)) -amdgpu_device_ip_block_add (adev, &dce_virtual_ip_block); +amdgpu_device_ip_block_add (adev, &amdgpu_vkms_ip_block);#if defined(CONFIG_DRM_AMD_DC ) else if (amdgpu_device_has_dc_support(adev)) amdgpu_device_ip_block_add(adev, &dm_ip_block);
@@ -823,7 +823,7 @@ int nv_set_ip_blocks(struct amdgpu_device *adev)amdgpu_device_ip_block_add (adev, &psp_v11_0_ip_block);amdgpu_device_ip_block_add (adev, &smu_v11_0_ip_block);if (adev->enable_virtual_display ||amdgpu_sriov_vf (adev)) -amdgpu_device_ip_block_add (adev, &dce_virtual_ip_block); +amdgpu_device_ip_block_add (adev, &amdgpu_vkms_ip_block);#if defined(CONFIG_DRM_AMD_DC ) else if (amdgpu_device_has_dc_support(adev)) amdgpu_device_ip_block_add(adev, &dm_ip_block);
@@ -843,7 +843,7 @@ int nv_set_ip_blocks(struct amdgpu_device *adev) is_support_sw_smu(adev))amdgpu_device_ip_block_add (adev, &smu_v11_0_ip_block);if (adev->enable_virtual_display ||amdgpu_sriov_vf (adev)) -amdgpu_device_ip_block_add (adev, &dce_virtual_ip_block); +amdgpu_device_ip_block_add (adev, &amdgpu_vkms_ip_block);#if defined(CONFIG_DRM_AMD_DC ) else if (amdgpu_device_has_dc_support(adev)) amdgpu_device_ip_block_add(adev, &dm_ip_block);
@@ -865,7 +865,7 @@ int nv_set_ip_blocks(struct amdgpu_device *adev)amdgpu_device_ip_block_add (adev, &gfx_v10_0_ip_block);amdgpu_device_ip_block_add (adev, &sdma_v5_2_ip_block);if (adev->enable_virtual_display ||amdgpu_sriov_vf (adev)) -amdgpu_device_ip_block_add (adev, &dce_virtual_ip_block); +amdgpu_device_ip_block_add (adev, &amdgpu_vkms_ip_block);#if defined(CONFIG_DRM_AMD_DC ) else if (amdgpu_device_has_dc_support(adev)) amdgpu_device_ip_block_add(adev, &dm_ip_block);
@@ -883,11 +883,11 @@ int nv_set_ip_blocks(struct amdgpu_device *adev)amdgpu_device_ip_block_add (adev, &psp_v13_0_ip_block);amdgpu_device_ip_block_add (adev, &smu_v13_0_ip_block);if (adev->enable_virtual_display ||amdgpu_sriov_vf (adev)) -amdgpu_device_ip_block_add (adev, &dce_virtual_ip_block); +amdgpu_device_ip_block_add (adev, &amdgpu_vkms_ip_block);amdgpu_device_ip_block_add (adev, &gfx_v10_0_ip_block);amdgpu_device_ip_block_add (adev, &sdma_v5_2_ip_block);if (adev->enable_virtual_display ||amdgpu_sriov_vf (adev)) -amdgpu_device_ip_block_add (adev, &dce_virtual_ip_block); +amdgpu_device_ip_block_add (adev, &amdgpu_vkms_ip_block);#if defined(CONFIG_DRM_AMD_DC ) else if (amdgpu_device_has_dc_support(adev)) amdgpu_device_ip_block_add(adev, &dm_ip_block);
@@ -905,7 +905,7 @@ int nv_set_ip_blocks(struct amdgpu_device *adev)amdgpu_device_ip_block_add (adev, &smu_v11_0_ip_block); }if (adev->enable_virtual_display ||amdgpu_sriov_vf (adev)) -amdgpu_device_ip_block_add (adev, &dce_virtual_ip_block); +amdgpu_device_ip_block_add (adev, &amdgpu_vkms_ip_block);amdgpu_device_ip_block_add (adev, &gfx_v10_0_ip_block);amdgpu_device_ip_block_add (adev, &sdma_v5_0_ip_block);break ;
drivers/gpu/drm/amd/amdgpu/si.c +4 -4
@@ -44,7 +44,7 @@#include "dce_v6_0.h" #include "si.h" #include "uvd_v3_1.h" -#include "dce_virtual.h" +#include "amdgpu_vkms.h" #include "gca/gfx_6_0_d.h" #include "oss/oss_1_0_d.h" #include "oss/oss_1_0_sh_mask.h"
@@ -2759,7 +2759,7 @@ int si_set_ip_blocks(struct amdgpu_device *adev)amdgpu_device_ip_block_add (adev, &si_dma_ip_block);amdgpu_device_ip_block_add (adev, &si_smu_ip_block);if (adev->enable_virtual_display) -amdgpu_device_ip_block_add (adev, &dce_virtual_ip_block); +amdgpu_device_ip_block_add (adev, &amdgpu_vkms_ip_block);#if defined(CONFIG_DRM_AMD_DC ) && defined(CONFIG_DRM_AMD_DC_SI ) else if (amdgpu_device_has_dc_support(adev)) amdgpu_device_ip_block_add(adev, &dm_ip_block);
@@ -2777,7 +2777,7 @@ int si_set_ip_blocks(struct amdgpu_device *adev)amdgpu_device_ip_block_add (adev, &si_dma_ip_block);amdgpu_device_ip_block_add (adev, &si_smu_ip_block);if (adev->enable_virtual_display) -amdgpu_device_ip_block_add (adev, &dce_virtual_ip_block); +amdgpu_device_ip_block_add (adev, &amdgpu_vkms_ip_block);#if defined(CONFIG_DRM_AMD_DC ) && defined(CONFIG_DRM_AMD_DC_SI ) else if (amdgpu_device_has_dc_support(adev)) amdgpu_device_ip_block_add(adev, &dm_ip_block);
@@ -2795,7 +2795,7 @@ int si_set_ip_blocks(struct amdgpu_device *adev)amdgpu_device_ip_block_add (adev, &si_dma_ip_block);amdgpu_device_ip_block_add (adev, &si_smu_ip_block);if (adev->enable_virtual_display) -amdgpu_device_ip_block_add (adev, &dce_virtual_ip_block); +amdgpu_device_ip_block_add (adev, &amdgpu_vkms_ip_block);break ;default :BUG ();
drivers/gpu/drm/amd/amdgpu/soc15.c +5 -5
@@ -74,7 +74,7 @@#include "smuio_v9_0.h" #include "smuio_v11_0.h" #include "smuio_v13_0.h" -#include "dce_virtual.h" +#include "amdgpu_vkms.h" #include "mxgpu_ai.h" #include "amdgpu_ras.h" #include "amdgpu_xgmi.h"
@@ -843,7 +843,7 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)amdgpu_device_ip_block_add (adev, &pp_smu_ip_block); }if (adev->enable_virtual_display ||amdgpu_sriov_vf (adev)) -amdgpu_device_ip_block_add (adev, &dce_virtual_ip_block); +amdgpu_device_ip_block_add (adev, &amdgpu_vkms_ip_block);#if defined(CONFIG_DRM_AMD_DC ) else if (amdgpu_device_has_dc_support(adev)) amdgpu_device_ip_block_add(adev, &dm_ip_block);
@@ -863,7 +863,7 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)amdgpu_device_ip_block_add (adev, &sdma_v4_0_ip_block);amdgpu_device_ip_block_add (adev, &pp_smu_ip_block);if (adev->enable_virtual_display ||amdgpu_sriov_vf (adev)) -amdgpu_device_ip_block_add (adev, &dce_virtual_ip_block); +amdgpu_device_ip_block_add (adev, &amdgpu_vkms_ip_block);#if defined(CONFIG_DRM_AMD_DC ) else if (amdgpu_device_has_dc_support(adev)) amdgpu_device_ip_block_add(adev, &dm_ip_block);
@@ -885,7 +885,7 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev) }if (adev->enable_virtual_display ||amdgpu_sriov_vf (adev)) -amdgpu_device_ip_block_add (adev, &dce_virtual_ip_block); +amdgpu_device_ip_block_add (adev, &amdgpu_vkms_ip_block);amdgpu_device_ip_block_add (adev, &gfx_v9_0_ip_block);amdgpu_device_ip_block_add (adev, &sdma_v4_0_ip_block);amdgpu_device_ip_block_add (adev, &smu_v11_0_ip_block);
@@ -909,7 +909,7 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)amdgpu_device_ip_block_add (adev, &gfx_v9_0_ip_block);amdgpu_device_ip_block_add (adev, &sdma_v4_0_ip_block);if (adev->enable_virtual_display ||amdgpu_sriov_vf (adev)) -amdgpu_device_ip_block_add (adev, &dce_virtual_ip_block); +amdgpu_device_ip_block_add (adev, &amdgpu_vkms_ip_block);#if defined(CONFIG_DRM_AMD_DC ) else if (amdgpu_device_has_dc_support(adev)) amdgpu_device_ip_block_add(adev, &dm_ip_block);
drivers/gpu/drm/amd/amdgpu/vi.c +7 -7
@@ -77,7 +77,7 @@#if defined(CONFIG_DRM_AMD_ACP )#include "amdgpu_acp.h" #endif -#include "dce_virtual.h" +#include "amdgpu_vkms.h" #include "mxgpu_vi.h" #include "amdgpu_dm.h"
@@ -2102,7 +2102,7 @@ int vi_set_ip_blocks(struct amdgpu_device *adev)amdgpu_device_ip_block_add (adev, &sdma_v2_4_ip_block);amdgpu_device_ip_block_add (adev, &pp_smu_ip_block);if (adev->enable_virtual_display) -amdgpu_device_ip_block_add (adev, &dce_virtual_ip_block); +amdgpu_device_ip_block_add (adev, &amdgpu_vkms_ip_block);break ;case CHIP_FIJI :amdgpu_device_ip_block_add (adev, &vi_common_ip_block);
@@ -2112,7 +2112,7 @@ int vi_set_ip_blocks(struct amdgpu_device *adev)amdgpu_device_ip_block_add (adev, &sdma_v3_0_ip_block);amdgpu_device_ip_block_add (adev, &pp_smu_ip_block);if (adev->enable_virtual_display ||amdgpu_sriov_vf (adev)) -amdgpu_device_ip_block_add (adev, &dce_virtual_ip_block); +amdgpu_device_ip_block_add (adev, &amdgpu_vkms_ip_block);#if defined(CONFIG_DRM_AMD_DC ) else if (amdgpu_device_has_dc_support(adev)) amdgpu_device_ip_block_add(adev, &dm_ip_block);
@@ -2132,7 +2132,7 @@ int vi_set_ip_blocks(struct amdgpu_device *adev)amdgpu_device_ip_block_add (adev, &sdma_v3_0_ip_block);amdgpu_device_ip_block_add (adev, &pp_smu_ip_block);if (adev->enable_virtual_display ||amdgpu_sriov_vf (adev)) -amdgpu_device_ip_block_add (adev, &dce_virtual_ip_block); +amdgpu_device_ip_block_add (adev, &amdgpu_vkms_ip_block);#if defined(CONFIG_DRM_AMD_DC ) else if (amdgpu_device_has_dc_support(adev)) amdgpu_device_ip_block_add(adev, &dm_ip_block);
@@ -2155,7 +2155,7 @@ int vi_set_ip_blocks(struct amdgpu_device *adev)amdgpu_device_ip_block_add (adev, &sdma_v3_1_ip_block);amdgpu_device_ip_block_add (adev, &pp_smu_ip_block);if (adev->enable_virtual_display) -amdgpu_device_ip_block_add (adev, &dce_virtual_ip_block); +amdgpu_device_ip_block_add (adev, &amdgpu_vkms_ip_block);#if defined(CONFIG_DRM_AMD_DC ) else if (amdgpu_device_has_dc_support(adev)) amdgpu_device_ip_block_add(adev, &dm_ip_block);
@@ -2173,7 +2173,7 @@ int vi_set_ip_blocks(struct amdgpu_device *adev)amdgpu_device_ip_block_add (adev, &sdma_v3_0_ip_block);amdgpu_device_ip_block_add (adev, &pp_smu_ip_block);if (adev->enable_virtual_display) -amdgpu_device_ip_block_add (adev, &dce_virtual_ip_block); +amdgpu_device_ip_block_add (adev, &amdgpu_vkms_ip_block);#if defined(CONFIG_DRM_AMD_DC ) else if (amdgpu_device_has_dc_support(adev)) amdgpu_device_ip_block_add(adev, &dm_ip_block);
@@ -2194,7 +2194,7 @@ int vi_set_ip_blocks(struct amdgpu_device *adev)amdgpu_device_ip_block_add (adev, &sdma_v3_0_ip_block);amdgpu_device_ip_block_add (adev, &pp_smu_ip_block);if (adev->enable_virtual_display) -amdgpu_device_ip_block_add (adev, &dce_virtual_ip_block); +amdgpu_device_ip_block_add (adev, &amdgpu_vkms_ip_block);#if defined(CONFIG_DRM_AMD_DC ) else if (amdgpu_device_has_dc_support(adev)) amdgpu_device_ip_block_add(adev, &dm_ip_block);
Signature · 1 line
2.32.0
Quoted 14 lines · Ryan Taylor
The amdgpu vkms interface provides a virtual KMS interface for several use
cases: devices without display hardware, platforms where the actual display hardware is not useful (e.g., servers), SR-IOV virtual functions, device emulation/simulation, and device bring up prior to display hardware being usable. We previously emulated a legacy KMS interface, but there was a desire to move to the atomic KMS interface. The vkms driver did everything we needed, but we wanted KMS support natively in the driver without buffer sharing and the ability to support an instance of VKMS per device. We first looked at splitting vkms into a stub driver and a helper module that other drivers could use to implement a virtual display, but this strategy ended up being messy due to driver specific callbacks needed for buffer management. Ultimately, it proved easier to import the vkms code as it mostly used core drm helpers anyway.
Series is:
Quoted 34 lines
Ryan Taylor (3):
drm/amdgpu: createamdgpu_vkms(v4) drm/amdgpu: cleanupdce_virtual
drm/amdgpu: replacedce_virtualwithamdgpu_vkms(v3)drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 641 +++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.h | 26 + drivers/gpu/drm/amd/amdgpu/cik.c | 10 +- drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 780 ----------------------- drivers/gpu/drm/amd/amdgpu/dce_virtual.h | 30 - drivers/gpu/drm/amd/amdgpu/nv.c | 22 +- drivers/gpu/drm/amd/amdgpu/si.c | 8 +- drivers/gpu/drm/amd/amdgpu/soc15.c | 10 +- drivers/gpu/drm/amd/amdgpu/vi.c | 14 +- 13 files changed, 703 insertions(+), 845 deletions(-) create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.h delete mode 100644 drivers/gpu/drm/amd/amdgpu/dce_virtual.c delete mode 100644 drivers/gpu/drm/amd/amdgpu/dce_virtual.hbase-commit:
e0186426a7efeb506164da7d4a56cfdaea38b380--
2.32.0_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx