drm/mgag200: Detect connector status
Subsystems (3)
Thomas Zimmermann
maintainerv2 cover drm/mgag200: Detect connector status
Detect the connector status by polling the DDC. Update the status at runtime. Add a dedicated BMC output to still display to the BMC while the VGA connector is not attached.
This patchset fixes a long-standing problem where attaching the VGA display a runtime resulted in incorrect display modes.
Tested on various Matrox hardware.
v2:
- move the DDC clean up into a separate patchset [1]
- add dedicated BMC support (Jocelyn)
[1] https://patchwork.freedesktop.org/series/133537/
Thomas Zimmermann (3):
drm/mgag200: Consolidate VGA output
drm/mgag200: Add BMC output
drm/mgag200: Set .detect_ctx() and enable connector polling
drivers/gpu/drm/mgag200/Makefile | 3 +- drivers/gpu/drm/mgag200/mgag200_bmc.c | 107 ++++++++++++++++++++++ drivers/gpu/drm/mgag200/mgag200_drv.h | 34 ++++--- drivers/gpu/drm/mgag200/mgag200_g200.c | 47 +--------- drivers/gpu/drm/mgag200/mgag200_g200eh.c | 47 +--------- drivers/gpu/drm/mgag200/mgag200_g200eh3.c | 47 +--------- drivers/gpu/drm/mgag200/mgag200_g200er.c | 47 +--------- drivers/gpu/drm/mgag200/mgag200_g200ev.c | 47 +--------- drivers/gpu/drm/mgag200/mgag200_g200ew3.c | 47 +--------- drivers/gpu/drm/mgag200/mgag200_g200se.c | 47 +--------- drivers/gpu/drm/mgag200/mgag200_g200wb.c | 47 +--------- drivers/gpu/drm/mgag200/mgag200_vga.c | 72 +++++++++++++++ 12 files changed, 238 insertions(+), 354 deletions(-) create mode 100644 drivers/gpu/drm/mgag200/mgag200_vga.c
base-commit: 2bea08bd31298d60d416b2a6ed346bb53dd28037
Signature · 1 line
2.45.2
Thomas Zimmermann
maintainerPATCH v2 1/3 drm/mgag200: Consolidate VGA output
The various models have common code for the VGA output's encoder and connector. Move everything into a single shared source file. Remove some obsolete initializer macros. No functional changes.
--- drivers/gpu/drm/mgag200/Makefile | 3 +- drivers/gpu/drm/mgag200/mgag200_drv.h | 24 +++----- drivers/gpu/drm/mgag200/mgag200_g200.c | 46 +-------------- drivers/gpu/drm/mgag200/mgag200_g200eh.c | 46 +-------------- drivers/gpu/drm/mgag200/mgag200_g200eh3.c | 46 +-------------- drivers/gpu/drm/mgag200/mgag200_g200er.c | 46 +-------------- drivers/gpu/drm/mgag200/mgag200_g200ev.c | 46 +-------------- drivers/gpu/drm/mgag200/mgag200_g200ew3.c | 46 +-------------- drivers/gpu/drm/mgag200/mgag200_g200se.c | 46 +-------------- drivers/gpu/drm/mgag200/mgag200_g200wb.c | 46 +-------------- drivers/gpu/drm/mgag200/mgag200_vga.c | 68 +++++++++++++++++++++++ 11 files changed, 95 insertions(+), 368 deletions(-) create mode 100644 drivers/gpu/drm/mgag200/mgag200_vga.c
drivers/gpu/drm/mgag200/Makefile +2 -1
@@ -11,6 +11,7 @@ mgag200-y := \ mgag200_g200ew3.o \ mgag200_g200se.o \ mgag200_g200wb.o \ - mgag200_mode.o + mgag200_mode.o \ + mgag200_vga.o obj-$(CONFIG_DRM_MGAG200) += mgag200.o
drivers/gpu/drm/mgag200/mgag200_drv.h +9 -15
@@ -283,8 +283,12 @@ struct mga_device {struct drm_plane primary_plane;struct drm_crtc crtc; -struct drm_encoder encoder; -struct drm_connector connector; +struct { +struct { +struct drm_encoder encoder; +struct drm_connector connector; + } vga; + } output; };static inline struct mga_device *to_mga_device (struct drm_device *dev)
@@ -417,25 +421,15 @@ void mgag200_crtc_atomic_destroy_state(struct drm_crtc *crtc, struct drm_crtc_st .atomic_duplicate_state = mgag200_crtc_atomic_duplicate_state, \ .atomic_destroy_state = mgag200_crtc_atomic_destroy_state -#define MGAG200_DAC_ENCODER_FUNCS \ - .destroy = drm_encoder_cleanup - -#define MGAG200_VGA_CONNECTOR_HELPER_FUNCS \ - .get_modes = drm_connector_helper_get_modes - -#define MGAG200_VGA_CONNECTOR_FUNCS \ - .reset = drm_atomic_helper_connector_reset, \ - .fill_modes = drm_helper_probe_single_connector_modes, \ - .destroy = drm_connector_cleanup, \ - .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, \ - .atomic_destroy_state = drm_atomic_helper_connector_destroy_state -void mgag200_set_mode_regs (struct mga_device *mdev,const struct drm_display_mode *mode);void mgag200_set_format_regs (struct mga_device *mdev,const struct drm_format_info *format);void mgag200_enable_display (struct mga_device *mdev);void mgag200_init_registers (struct mga_device *mdev);int mgag200_mode_config_init (struct mga_device *mdev,resource_size_t vram_available); +/* mgag200_vga.c */ +int mgag200_vga_output_init (struct mga_device *mdev); +/* mgag200_bmc.c */ void mgag200_bmc_disable_vidrst (struct mga_device *mdev);void mgag200_bmc_enable_vidrst (struct mga_device *mdev);
drivers/gpu/drm/mgag200/mgag200_g200.c +2 -44
70 lines not on this page · raw message
drivers/gpu/drm/mgag200/mgag200_g200eh.c +2 -44
70 lines not on this page · raw message
drivers/gpu/drm/mgag200/mgag200_g200eh3.c +2 -44
70 lines not on this page · raw message
drivers/gpu/drm/mgag200/mgag200_g200er.c +2 -44
70 lines not on this page · raw message
drivers/gpu/drm/mgag200/mgag200_g200ev.c +2 -44
70 lines not on this page · raw message
drivers/gpu/drm/mgag200/mgag200_g200ew3.c +2 -44
70 lines not on this page · raw message
drivers/gpu/drm/mgag200/mgag200_g200se.c +2 -44
70 lines not on this page · raw message
drivers/gpu/drm/mgag200/mgag200_g200wb.c +2 -44
70 lines not on this page · raw message
drivers/gpu/drm/mgag200/mgag200_vga.c new file +68 -0
68 lines not on this page · raw message
Signature · 1 line
2.45.2
Re: [PATCH v2 1/3] drm/mgag200: Consolidate VGA output
Quoted 3 lines · Thomas Zimmermann
The various models have common code for the VGA output's encoder and connector. Move everything into a single shared source file. Remove some obsolete initializer macros. No functional changes.
Thanks for this patch, it removes some duplication, as vga code is the same for all variant.
Quoted 768 lines
Signed-off-by Thomas Zimmermann <[email protected]>--- drivers/gpu/drm/mgag200/Makefile | 3 +- drivers/gpu/drm/mgag200/mgag200_drv.h | 24 +++----- drivers/gpu/drm/mgag200/mgag200_g200.c | 46 +-------------- drivers/gpu/drm/mgag200/mgag200_g200eh.c | 46 +-------------- drivers/gpu/drm/mgag200/mgag200_g200eh3.c | 46 +-------------- drivers/gpu/drm/mgag200/mgag200_g200er.c | 46 +-------------- drivers/gpu/drm/mgag200/mgag200_g200ev.c | 46 +-------------- drivers/gpu/drm/mgag200/mgag200_g200ew3.c | 46 +-------------- drivers/gpu/drm/mgag200/mgag200_g200se.c | 46 +-------------- drivers/gpu/drm/mgag200/mgag200_g200wb.c | 46 +-------------- drivers/gpu/drm/mgag200/mgag200_vga.c | 68 +++++++++++++++++++++++ 11 files changed, 95 insertions(+), 368 deletions(-)create mode 100644
drivers/gpu/drm/mgag200/mgag200_vga.cdrivers/gpu/drm/mgag200/Makefile +2
-1@@ -11,6 +11,7 @@ mgag200-y := \ mgag200_g200ew3.o \ mgag200_g200se.o \ mgag200_g200wb.o \ - mgag200_mode.o + mgag200_mode.o \ + mgag200_vga.o obj-$(CONFIG_DRM_MGAG200) += mgag200.odrivers/gpu/drm/mgag200/mgag200_drv.h +9
-15@@ -283,8 +283,12 @@ struct mga_device {struct drm_plane primary_plane;struct drm_crtc crtc; -struct drm_encoder encoder; -struct drm_connector connector; +struct { +struct { +struct drm_encoder encoder; +struct drm_connector connector; + } vga; + } output; };static inline struct mga_device *to_mga_device (struct drm_device *dev)@@ -417,25 +421,15 @@ void mgag200_crtc_atomic_destroy_state(struct drm_crtc *crtc, struct drm_crtc_st .atomic_duplicate_state = mgag200_crtc_atomic_duplicate_state, \ .atomic_destroy_state = mgag200_crtc_atomic_destroy_state -#define MGAG200_DAC_ENCODER_FUNCS \ - .destroy = drm_encoder_cleanup - -#define MGAG200_VGA_CONNECTOR_HELPER_FUNCS \ - .get_modes = drm_connector_helper_get_modes - -#define MGAG200_VGA_CONNECTOR_FUNCS \ - .reset = drm_atomic_helper_connector_reset, \ - .fill_modes = drm_helper_probe_single_connector_modes, \ - .destroy = drm_connector_cleanup, \ - .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, \ - .atomic_destroy_state = drm_atomic_helper_connector_destroy_state -void mgag200_set_mode_regs (struct mga_device *mdev,const struct drm_display_mode *mode);void mgag200_set_format_regs (struct mga_device *mdev,const struct drm_format_info *format);void mgag200_enable_display (struct mga_device *mdev);void mgag200_init_registers (struct mga_device *mdev);int mgag200_mode_config_init (struct mga_device *mdev,resource_size_t vram_available); +/* mgag200_vga.c */ +int mgag200_vga_output_init (struct mga_device *mdev); +/* mgag200_bmc.c */ void mgag200_bmc_disable_vidrst (struct mga_device *mdev);void mgag200_bmc_enable_vidrst (struct mga_device *mdev);drivers/gpu/drm/mgag200/mgag200_g200.c +2
-44@@ -9,7 +9,6 @@#include <drm/drm_gem_atomic_helper.h> #include <drm/drm_probe_helper.h> -#include "mgag200_ddc.h" #include "mgag200_drv.h" static int mgag200_g200_init_pci_options (struct pci_dev *pdev)@@ -184,26 +183,11 @@ static const struct drm_crtc_funcs mgag200_g200_crtc_funcs = { MGAG200_CRTC_FUNCS, }; -static const struct drm_encoder_funcs mgag200_g200_dac_encoder_funcs = { -MGAG200_DAC_ENCODER_FUNCS , -}; - -static const struct drm_connector_helper_funcs mgag200_g200_vga_connector_helper_funcs = { -MGAG200_VGA_CONNECTOR_HELPER_FUNCS , -}; - -static const struct drm_connector_funcs mgag200_g200_vga_connector_funcs = { -MGAG200_VGA_CONNECTOR_FUNCS , -}; -static int mgag200_g200_pipeline_init (struct mga_device *mdev) {struct drm_device *dev = &mdev->base;struct drm_plane *primary_plane = &mdev->primary_plane;struct drm_crtc *crtc = &mdev->crtc; -struct drm_encoder *encoder = &mdev->encoder; -struct drm_connector *connector = &mdev->connector; -struct i2c_adapter *ddc;int ret; ret = drm_universal_plane_init(dev, primary_plane, 0,@@ -231,35 +215,9 @@ static int mgag200_g200_pipeline_init(struct mga_device *mdev)drm_mode_crtc_set_gamma_size (crtc,MGAG200_LUT_SIZE );drm_crtc_enable_color_mgmt (crtc,0 , false,MGAG200_LUT_SIZE ); - encoder->possible_crtcs =drm_crtc_mask (crtc); - ret =drm_encoder_init (dev, encoder, &mgag200_g200_dac_encoder_funcs, -DRM_MODE_ENCODER_DAC ,NULL ); -if (ret) { -drm_err (dev,"drm_encoder_init() failed: %d\n" , ret); -return ret; - } - - ddc =mgag200_ddc_create (mdev); -if (IS_ERR (ddc)) { - ret =PTR_ERR (ddc); -drm_err (dev,"failed to add DDC bus: %d\n" , ret); -return ret; - } - - ret =drm_connector_init_with_ddc (dev, connector, - &mgag200_g200_vga_connector_funcs, -DRM_MODE_CONNECTOR_VGA , ddc); -if (ret) { -drm_err (dev,"drm_connector_init_with_ddc() failed: %d\n" , ret); -return ret; - } -drm_connector_helper_add (connector, &mgag200_g200_vga_connector_helper_funcs); - - ret =drm_connector_attach_encoder (connector, encoder); -if (ret) { -drm_err (dev,"drm_connector_attach_encoder() failed: %d\n" , ret); + ret =mgag200_vga_output_init (mdev); +if (ret)return ret; - }return 0 ; }drivers/gpu/drm/mgag200/mgag200_g200eh.c +2
-44@@ -9,7 +9,6 @@#include <drm/drm_gem_atomic_helper.h> #include <drm/drm_probe_helper.h> -#include "mgag200_ddc.h" #include "mgag200_drv.h" void mgag200_g200eh_init_registers (struct mga_device *mdev)@@ -183,26 +182,11 @@ static const struct drm_crtc_funcs mgag200_g200eh_crtc_funcs = { MGAG200_CRTC_FUNCS, }; -static const struct drm_encoder_funcs mgag200_g200eh_dac_encoder_funcs = { -MGAG200_DAC_ENCODER_FUNCS , -}; - -static const struct drm_connector_helper_funcs mgag200_g200eh_vga_connector_helper_funcs = { -MGAG200_VGA_CONNECTOR_HELPER_FUNCS , -}; - -static const struct drm_connector_funcs mgag200_g200eh_vga_connector_funcs = { -MGAG200_VGA_CONNECTOR_FUNCS , -}; -static int mgag200_g200eh_pipeline_init (struct mga_device *mdev) {struct drm_device *dev = &mdev->base;struct drm_plane *primary_plane = &mdev->primary_plane;struct drm_crtc *crtc = &mdev->crtc; -struct drm_encoder *encoder = &mdev->encoder; -struct drm_connector *connector = &mdev->connector; -struct i2c_adapter *ddc;int ret; ret = drm_universal_plane_init(dev, primary_plane, 0,@@ -230,35 +214,9 @@ static int mgag200_g200eh_pipeline_init(struct mga_device *mdev)drm_mode_crtc_set_gamma_size (crtc,MGAG200_LUT_SIZE );drm_crtc_enable_color_mgmt (crtc,0 , false,MGAG200_LUT_SIZE ); - encoder->possible_crtcs =drm_crtc_mask (crtc); - ret =drm_encoder_init (dev, encoder, &mgag200_g200eh_dac_encoder_funcs, -DRM_MODE_ENCODER_DAC ,NULL ); -if (ret) { -drm_err (dev,"drm_encoder_init() failed: %d\n" , ret); -return ret; - } - - ddc =mgag200_ddc_create (mdev); -if (IS_ERR (ddc)) { - ret =PTR_ERR (ddc); -drm_err (dev,"failed to add DDC bus: %d\n" , ret); -return ret; - } - - ret =drm_connector_init_with_ddc (dev, connector, - &mgag200_g200eh_vga_connector_funcs, -DRM_MODE_CONNECTOR_VGA , ddc); -if (ret) { -drm_err (dev,"drm_connector_init_with_ddc() failed: %d\n" , ret); -return ret; - } -drm_connector_helper_add (connector, &mgag200_g200eh_vga_connector_helper_funcs); - - ret =drm_connector_attach_encoder (connector, encoder); -if (ret) { -drm_err (dev,"drm_connector_attach_encoder() failed: %d\n" , ret); + ret =mgag200_vga_output_init (mdev); +if (ret)return ret; - }return 0 ; }drivers/gpu/drm/mgag200/mgag200_g200eh3.c +2
-44@@ -8,7 +8,6 @@#include <drm/drm_gem_atomic_helper.h> #include <drm/drm_probe_helper.h> -#include "mgag200_ddc.h" #include "mgag200_drv.h" /* @@ -87,26 +86,11 @@ static const struct drm_crtc_funcs mgag200_g200eh3_crtc_funcs = { MGAG200_CRTC_FUNCS, }; -static const struct drm_encoder_funcs mgag200_g200eh3_dac_encoder_funcs = { -MGAG200_DAC_ENCODER_FUNCS , -}; - -static const struct drm_connector_helper_funcs mgag200_g200eh3_vga_connector_helper_funcs = { -MGAG200_VGA_CONNECTOR_HELPER_FUNCS , -}; - -static const struct drm_connector_funcs mgag200_g200eh3_vga_connector_funcs = { -MGAG200_VGA_CONNECTOR_FUNCS , -}; -static int mgag200_g200eh3_pipeline_init (struct mga_device *mdev) {struct drm_device *dev = &mdev->base;struct drm_plane *primary_plane = &mdev->primary_plane;struct drm_crtc *crtc = &mdev->crtc; -struct drm_encoder *encoder = &mdev->encoder; -struct drm_connector *connector = &mdev->connector; -struct i2c_adapter *ddc;int ret; ret = drm_universal_plane_init(dev, primary_plane, 0,@@ -134,35 +118,9 @@ static int mgag200_g200eh3_pipeline_init(struct mga_device *mdev)drm_mode_crtc_set_gamma_size (crtc,MGAG200_LUT_SIZE );drm_crtc_enable_color_mgmt (crtc,0 , false,MGAG200_LUT_SIZE ); - encoder->possible_crtcs =drm_crtc_mask (crtc); - ret =drm_encoder_init (dev, encoder, &mgag200_g200eh3_dac_encoder_funcs, -DRM_MODE_ENCODER_DAC ,NULL ); -if (ret) { -drm_err (dev,"drm_encoder_init() failed: %d\n" , ret); -return ret; - } - - ddc =mgag200_ddc_create (mdev); -if (IS_ERR (ddc)) { - ret =PTR_ERR (ddc); -drm_err (dev,"failed to add DDC bus: %d\n" , ret); -return ret; - } - - ret =drm_connector_init_with_ddc (dev, connector, - &mgag200_g200eh3_vga_connector_funcs, -DRM_MODE_CONNECTOR_VGA , ddc); -if (ret) { -drm_err (dev,"drm_connector_init_with_ddc() failed: %d\n" , ret); -return ret; - } -drm_connector_helper_add (connector, &mgag200_g200eh3_vga_connector_helper_funcs); - - ret =drm_connector_attach_encoder (connector, encoder); -if (ret) { -drm_err (dev,"drm_connector_attach_encoder() failed: %d\n" , ret); + ret =mgag200_vga_output_init (mdev); +if (ret)return ret; - }return 0 ; }drivers/gpu/drm/mgag200/mgag200_g200er.c +2
-44@@ -9,7 +9,6 @@#include <drm/drm_gem_atomic_helper.h> #include <drm/drm_probe_helper.h> -#include "mgag200_ddc.h" #include "mgag200_drv.h" static void mgag200_g200er_init_registers (struct mga_device *mdev)@@ -226,26 +225,11 @@ static const struct drm_crtc_funcs mgag200_g200er_crtc_funcs = { MGAG200_CRTC_FUNCS, }; -static const struct drm_encoder_funcs mgag200_g200er_dac_encoder_funcs = { -MGAG200_DAC_ENCODER_FUNCS , -}; - -static const struct drm_connector_helper_funcs mgag200_g200er_vga_connector_helper_funcs = { -MGAG200_VGA_CONNECTOR_HELPER_FUNCS , -}; - -static const struct drm_connector_funcs mgag200_g200er_vga_connector_funcs = { -MGAG200_VGA_CONNECTOR_FUNCS , -}; -static int mgag200_g200er_pipeline_init (struct mga_device *mdev) {struct drm_device *dev = &mdev->base;struct drm_plane *primary_plane = &mdev->primary_plane;struct drm_crtc *crtc = &mdev->crtc; -struct drm_encoder *encoder = &mdev->encoder; -struct drm_connector *connector = &mdev->connector; -struct i2c_adapter *ddc;int ret; ret = drm_universal_plane_init(dev, primary_plane, 0,@@ -273,35 +257,9 @@ static int mgag200_g200er_pipeline_init(struct mga_device *mdev)drm_mode_crtc_set_gamma_size (crtc,MGAG200_LUT_SIZE );drm_crtc_enable_color_mgmt (crtc,0 , false,MGAG200_LUT_SIZE ); - encoder->possible_crtcs =drm_crtc_mask (crtc); - ret =drm_encoder_init (dev, encoder, &mgag200_g200er_dac_encoder_funcs, -DRM_MODE_ENCODER_DAC ,NULL ); -if (ret) { -drm_err (dev,"drm_encoder_init() failed: %d\n" , ret); -return ret; - } - - ddc =mgag200_ddc_create (mdev); -if (IS_ERR (ddc)) { - ret =PTR_ERR (ddc); -drm_err (dev,"failed to add DDC bus: %d\n" , ret); -return ret; - } - - ret =drm_connector_init_with_ddc (dev, connector, - &mgag200_g200er_vga_connector_funcs, -DRM_MODE_CONNECTOR_VGA , ddc); -if (ret) { -drm_err (dev,"drm_connector_init_with_ddc() failed: %d\n" , ret); -return ret; - } -drm_connector_helper_add (connector, &mgag200_g200er_vga_connector_helper_funcs); - - ret =drm_connector_attach_encoder (connector, encoder); -if (ret) { -drm_err (dev,"drm_connector_attach_encoder() failed: %d\n" , ret); + ret =mgag200_vga_output_init (mdev); +if (ret)return ret; - }return 0 ; }drivers/gpu/drm/mgag200/mgag200_g200ev.c +2
-44@@ -9,7 +9,6 @@#include <drm/drm_gem_atomic_helper.h> #include <drm/drm_probe_helper.h> -#include "mgag200_ddc.h" #include "mgag200_drv.h" static void mgag200_g200ev_init_registers (struct mga_device *mdev)@@ -227,26 +226,11 @@ static const struct drm_crtc_funcs mgag200_g200ev_crtc_funcs = { MGAG200_CRTC_FUNCS, }; -static const struct drm_encoder_funcs mgag200_g200ev_dac_encoder_funcs = { -MGAG200_DAC_ENCODER_FUNCS , -}; - -static const struct drm_connector_helper_funcs mgag200_g200ev_vga_connector_helper_funcs = { -MGAG200_VGA_CONNECTOR_HELPER_FUNCS , -}; - -static const struct drm_connector_funcs mgag200_g200ev_vga_connector_funcs = { -MGAG200_VGA_CONNECTOR_FUNCS , -}; -static int mgag200_g200ev_pipeline_init (struct mga_device *mdev) {struct drm_device *dev = &mdev->base;struct drm_plane *primary_plane = &mdev->primary_plane;struct drm_crtc *crtc = &mdev->crtc; -struct drm_encoder *encoder = &mdev->encoder; -struct drm_connector *connector = &mdev->connector; -struct i2c_adapter *ddc;int ret; ret = drm_universal_plane_init(dev, primary_plane, 0,@@ -274,35 +258,9 @@ static int mgag200_g200ev_pipeline_init(struct mga_device *mdev)drm_mode_crtc_set_gamma_size (crtc,MGAG200_LUT_SIZE );drm_crtc_enable_color_mgmt (crtc,0 , false,MGAG200_LUT_SIZE ); - encoder->possible_crtcs =drm_crtc_mask (crtc); - ret =drm_encoder_init (dev, encoder, &mgag200_g200ev_dac_encoder_funcs, -DRM_MODE_ENCODER_DAC ,NULL ); -if (ret) { -drm_err (dev,"drm_encoder_init() failed: %d\n" , ret); -return ret; - } - - ddc =mgag200_ddc_create (mdev); -if (IS_ERR (ddc)) { - ret =PTR_ERR (ddc); -drm_err (dev,"failed to add DDC bus: %d\n" , ret); -return ret; - } - - ret =drm_connector_init_with_ddc (dev, connector, - &mgag200_g200ev_vga_connector_funcs, -DRM_MODE_CONNECTOR_VGA , ddc); -if (ret) { -drm_err (dev,"drm_connector_init_with_ddc() failed: %d\n" , ret); -return ret; - } -drm_connector_helper_add (connector, &mgag200_g200ev_vga_connector_helper_funcs); - - ret =drm_connector_attach_encoder (connector, encoder); -if (ret) { -drm_err (dev,"drm_connector_attach_encoder() failed: %d\n" , ret); + ret =mgag200_vga_output_init (mdev); +if (ret)return ret; - }return 0 ; }drivers/gpu/drm/mgag200/mgag200_g200ew3.c +2
-44@@ -8,7 +8,6 @@#include <drm/drm_gem_atomic_helper.h> #include <drm/drm_probe_helper.h> -#include "mgag200_ddc.h" #include "mgag200_drv.h" static void mgag200_g200ew3_init_registers (struct mga_device *mdev)@@ -96,26 +95,11 @@ static const struct drm_crtc_funcs mgag200_g200ew3_crtc_funcs = { MGAG200_CRTC_FUNCS, }; -static const struct drm_encoder_funcs mgag200_g200ew3_dac_encoder_funcs = { -MGAG200_DAC_ENCODER_FUNCS , -}; - -static const struct drm_connector_helper_funcs mgag200_g200ew3_vga_connector_helper_funcs = { -MGAG200_VGA_CONNECTOR_HELPER_FUNCS , -}; - -static const struct drm_connector_funcs mgag200_g200ew3_vga_connector_funcs = { -MGAG200_VGA_CONNECTOR_FUNCS , -}; -static int mgag200_g200ew3_pipeline_init (struct mga_device *mdev) {struct drm_device *dev = &mdev->base;struct drm_plane *primary_plane = &mdev->primary_plane;struct drm_crtc *crtc = &mdev->crtc; -struct drm_encoder *encoder = &mdev->encoder; -struct drm_connector *connector = &mdev->connector; -struct i2c_adapter *ddc;int ret; ret = drm_universal_plane_init(dev, primary_plane, 0,@@ -143,35 +127,9 @@ static int mgag200_g200ew3_pipeline_init(struct mga_device *mdev)drm_mode_crtc_set_gamma_size (crtc,MGAG200_LUT_SIZE );drm_crtc_enable_color_mgmt (crtc,0 , false,MGAG200_LUT_SIZE ); - encoder->possible_crtcs =drm_crtc_mask (crtc); - ret =drm_encoder_init (dev, encoder, &mgag200_g200ew3_dac_encoder_funcs, -DRM_MODE_ENCODER_DAC ,NULL ); -if (ret) { -drm_err (dev,"drm_encoder_init() failed: %d\n" , ret); -return ret; - } - - ddc =mgag200_ddc_create (mdev); -if (IS_ERR (ddc)) { - ret =PTR_ERR (ddc); -drm_err (dev,"failed to add DDC bus: %d\n" , ret); -return ret; - } - - ret =drm_connector_init_with_ddc (dev, connector, - &mgag200_g200ew3_vga_connector_funcs, -DRM_MODE_CONNECTOR_VGA , ddc); -if (ret) { -drm_err (dev,"drm_connector_init_with_ddc() failed: %d\n" , ret); -return ret; - } -drm_connector_helper_add (connector, &mgag200_g200ew3_vga_connector_helper_funcs); - - ret =drm_connector_attach_encoder (connector, encoder); -if (ret) { -drm_err (dev,"drm_connector_attach_encoder() failed: %d\n" , ret); + ret =mgag200_vga_output_init (mdev); +if (ret)return ret; - }return 0 ; }drivers/gpu/drm/mgag200/mgag200_g200se.c +2
-44@@ -9,7 +9,6 @@#include <drm/drm_gem_atomic_helper.h> #include <drm/drm_probe_helper.h> -#include "mgag200_ddc.h" #include "mgag200_drv.h" static int mgag200_g200se_init_pci_options (struct pci_dev *pdev)@@ -358,26 +357,11 @@ static const struct drm_crtc_funcs mgag200_g200se_crtc_funcs = { MGAG200_CRTC_FUNCS, }; -static const struct drm_encoder_funcs mgag200_g200se_dac_encoder_funcs = { -MGAG200_DAC_ENCODER_FUNCS , -}; - -static const struct drm_connector_helper_funcs mgag200_g200se_vga_connector_helper_funcs = { -MGAG200_VGA_CONNECTOR_HELPER_FUNCS , -}; - -static const struct drm_connector_funcs mgag200_g200se_vga_connector_funcs = { -MGAG200_VGA_CONNECTOR_FUNCS , -}; -static int mgag200_g200se_pipeline_init (struct mga_device *mdev) {struct drm_device *dev = &mdev->base;struct drm_plane *primary_plane = &mdev->primary_plane;struct drm_crtc *crtc = &mdev->crtc; -struct drm_encoder *encoder = &mdev->encoder; -struct drm_connector *connector = &mdev->connector; -struct i2c_adapter *ddc;int ret; ret = drm_universal_plane_init(dev, primary_plane, 0,@@ -405,35 +389,9 @@ static int mgag200_g200se_pipeline_init(struct mga_device *mdev)drm_mode_crtc_set_gamma_size (crtc,MGAG200_LUT_SIZE );drm_crtc_enable_color_mgmt (crtc,0 , false,MGAG200_LUT_SIZE ); - encoder->possible_crtcs =drm_crtc_mask (crtc); - ret =drm_encoder_init (dev, encoder, &mgag200_g200se_dac_encoder_funcs, -DRM_MODE_ENCODER_DAC ,NULL ); -if (ret) { -drm_err (dev,"drm_encoder_init() failed: %d\n" , ret); -return ret; - } - - ddc =mgag200_ddc_create (mdev); -if (IS_ERR (ddc)) { - ret =PTR_ERR (ddc); -drm_err (dev,"failed to add DDC bus: %d\n" , ret); -return ret; - } - - ret =drm_connector_init_with_ddc (dev, connector, - &mgag200_g200se_vga_connector_funcs, -DRM_MODE_CONNECTOR_VGA , ddc); -if (ret) { -drm_err (dev,"drm_connector_init_with_ddc() failed: %d\n" , ret); -return ret; - } -drm_connector_helper_add (connector, &mgag200_g200se_vga_connector_helper_funcs); - - ret =drm_connector_attach_encoder (connector, encoder); -if (ret) { -drm_err (dev,"drm_connector_attach_encoder() failed: %d\n" , ret); + ret =mgag200_vga_output_init (mdev); +if (ret)return ret; - }return 0 ; }drivers/gpu/drm/mgag200/mgag200_g200wb.c +2
-44@@ -9,7 +9,6 @@#include <drm/drm_gem_atomic_helper.h> #include <drm/drm_probe_helper.h> -#include "mgag200_ddc.h" #include "mgag200_drv.h" void mgag200_g200wb_init_registers (struct mga_device *mdev)@@ -230,26 +229,11 @@ static const struct drm_crtc_funcs mgag200_g200wb_crtc_funcs = { MGAG200_CRTC_FUNCS, }; -static const struct drm_encoder_funcs mgag200_g200wb_dac_encoder_funcs = { -MGAG200_DAC_ENCODER_FUNCS , -}; - -static const struct drm_connector_helper_funcs mgag200_g200wb_vga_connector_helper_funcs = { -MGAG200_VGA_CONNECTOR_HELPER_FUNCS , -}; - -static const struct drm_connector_funcs mgag200_g200wb_vga_connector_funcs = { -MGAG200_VGA_CONNECTOR_FUNCS , -}; -static int mgag200_g200wb_pipeline_init (struct mga_device *mdev) {struct drm_device *dev = &mdev->base;struct drm_plane *primary_plane = &mdev->primary_plane;struct drm_crtc *crtc = &mdev->crtc; -struct drm_encoder *encoder = &mdev->encoder; -struct drm_connector *connector = &mdev->connector; -struct i2c_adapter *ddc;int ret; ret = drm_universal_plane_init(dev, primary_plane, 0,@@ -277,35 +261,9 @@ static int mgag200_g200wb_pipeline_init(struct mga_device *mdev)drm_mode_crtc_set_gamma_size (crtc,MGAG200_LUT_SIZE );drm_crtc_enable_color_mgmt (crtc,0 , false,MGAG200_LUT_SIZE ); - encoder->possible_crtcs =drm_crtc_mask (crtc); - ret =drm_encoder_init (dev, encoder, &mgag200_g200wb_dac_encoder_funcs, -DRM_MODE_ENCODER_DAC ,NULL ); -if (ret) { -drm_err (dev,"drm_encoder_init() failed: %d\n" , ret); -return ret; - } - - ddc =mgag200_ddc_create (mdev); -if (IS_ERR (ddc)) { - ret =PTR_ERR (ddc); -drm_err (dev,"failed to add DDC bus: %d\n" , ret); -return ret; - } - - ret =drm_connector_init_with_ddc (dev, connector, - &mgag200_g200wb_vga_connector_funcs, -DRM_MODE_CONNECTOR_VGA , ddc); -if (ret) { -drm_err (dev,"drm_connector_init_with_ddc() failed: %d\n" , ret); -return ret; - } -drm_connector_helper_add (connector, &mgag200_g200wb_vga_connector_helper_funcs); - - ret =drm_connector_attach_encoder (connector, encoder); -if (ret) { -drm_err (dev,"drm_connector_attach_encoder() failed: %d\n" , ret); + ret =mgag200_vga_output_init (mdev); +if (ret)return ret; - }return 0 ; }drivers/gpu/drm/mgag200/mgag200_vga.c new file +68
-0@@ -0,0 +1,68 @@ +// SPDX-License-Identifier: GPL-2.0-only + +#include <drm/drm_atomic_helper.h> +#include <drm/drm_modeset_helper_vtables.h> +#include <drm/drm_probe_helper.h> + +#include "mgag200_ddc.h" +#include "mgag200_drv.h" + +static const struct drm_encoder_funcs mgag200_dac_encoder_funcs = { + .destroy = drm_encoder_cleanup +}; + +static const struct drm_connector_helper_funcs mgag200_vga_connector_helper_funcs = { + .get_modes = drm_connector_helper_get_modes +}; + +static const struct drm_connector_funcs mgag200_vga_connector_funcs = { + .reset = drm_atomic_helper_connector_reset, + .fill_modes = drm_helper_probe_single_connector_modes, + .destroy = drm_connector_cleanup, + .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state +}; + +int mgag200_vga_output_init (struct mga_device *mdev) +{ +struct drm_device *dev = &mdev->base; +struct drm_crtc *crtc = &mdev->crtc; +struct drm_encoder *encoder; +struct drm_connector *connector; +struct i2c_adapter *ddc; +int ret; + + encoder = &mdev->output.vga.encoder; + ret =drm_encoder_init (dev, encoder, &mgag200_dac_encoder_funcs, +DRM_MODE_ENCODER_DAC ,NULL ); +if (ret) { +drm_err (dev,"drm_encoder_init() failed: %d\n" , ret); +return ret; + } + encoder->possible_crtcs =drm_crtc_mask (crtc); + + ddc =mgag200_ddc_create (mdev); +if (IS_ERR (ddc)) { + ret =PTR_ERR (ddc); +drm_err (dev,"failed to add DDC bus: %d\n" , ret); +return ret; + } + + connector = &mdev->output.vga.connector; + ret =drm_connector_init_with_ddc (dev, connector, + &mgag200_vga_connector_funcs, +DRM_MODE_CONNECTOR_VGA , ddc); +if (ret) { +drm_err (dev,"drm_connector_init_with_ddc() failed: %d\n" , ret); +return ret; + } +drm_connector_helper_add (connector, &mgag200_vga_connector_helper_funcs); + + ret =drm_connector_attach_encoder (connector, encoder); +if (ret) { +drm_err (dev,"drm_connector_attach_encoder() failed: %d\n" , ret); +return ret; + } + +return 0 ; +}
Thomas Zimmermann
maintainerPATCH v2 2/3 drm/mgag200: Add BMC output
In reply to Thomas ZimmermannThe BMC output can be viewed via the BMC's web interface or a similar client. Represent it as virtual encoder and connector. It's attached to the same CRTC as the VGA connector.
The connector's status depends on the physical connector's status. The BMC is only connected if the physical connector is not. This is necessary to support userspace clients that can only handle a single output per CRTC.
The BMC is a server feature. Add a BMC output for all server chips, but not the desktop models.
--- drivers/gpu/drm/mgag200/mgag200_bmc.c | 107 ++++++++++++++++++++++ drivers/gpu/drm/mgag200/mgag200_drv.h | 10 ++ drivers/gpu/drm/mgag200/mgag200_g200eh.c | 4 + drivers/gpu/drm/mgag200/mgag200_g200eh3.c | 4 + drivers/gpu/drm/mgag200/mgag200_g200er.c | 4 + drivers/gpu/drm/mgag200/mgag200_g200ev.c | 4 + drivers/gpu/drm/mgag200/mgag200_g200ew3.c | 4 + drivers/gpu/drm/mgag200/mgag200_g200se.c | 4 + drivers/gpu/drm/mgag200/mgag200_g200wb.c | 4 + 9 files changed, 145 insertions(+)
drivers/gpu/drm/mgag200/mgag200_bmc.c +107 -0
@@ -2,8 +2,18 @@#include <linux/delay.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_edid.h> +#include <drm/drm_managed.h> +#include <drm/drm_probe_helper.h> +#include "mgag200_drv.h" +static struct mgag200_bmc_connector *to_mgag200_bmc_connector (struct drm_connector *connector) +{ + return container_of(connector, struct mgag200_bmc_connector, base); +} +void mgag200_bmc_disable_vidrst (struct mga_device *mdev) {u8 tmp;
@@ -97,3 +107,100 @@ void mgag200_bmc_enable_vidrst(struct mga_device *mdev) tmp &= ~0x10 ;WREG_DAC (MGA1064_GEN_IO_DATA , tmp); } + +static const struct drm_encoder_funcs mgag200_bmc_encoder_funcs = { + .destroy = drm_encoder_cleanup, +}; + +static int mgag200_bmc_connector_helper_detect_ctx (struct drm_connector *connector, +struct drm_modeset_acquire_ctx *ctx, +bool force) +{ +struct mgag200_bmc_connector *bmc_connector =to_mgag200_bmc_connector (connector); +struct drm_connector *physical_connector = bmc_connector->physical_connector; + +/* +* Most user-space compositors cannot handle more than one connected +* connector per CRTC. Hence, we only mark the BMC as connected if the +* physical connector is disconnected. If the physical connector's status +* is connected or unknown, the BMC remains disconnected. This has no +* effect on the output of the BMC. +* +* FIXME: Remove this logic once user-space compositors can handle more +* than one connector per CRTC. The BMC should always be connected. +*/ + +if (physical_connector && physical_connector->status == connector_status_disconnected) +return connector_status_connected; + +return connector_status_disconnected; +} + +static int mgag200_bmc_connector_helper_get_modes (struct drm_connector *connector) +{ +struct drm_device *dev = connector->dev; +struct mga_device *mdev =to_mga_device (dev); +const struct mgag200_device_info *minfo = mdev->info; + +return drm_add_modes_noedid (connector, minfo->max_hdisplay, minfo->max_vdisplay); +} + +static const struct drm_connector_helper_funcs mgag200_bmc_connector_helper_funcs = { + .get_modes = mgag200_bmc_connector_helper_get_modes, + .detect_ctx = mgag200_bmc_connector_helper_detect_ctx, +}; + +static const struct drm_connector_funcs mgag200_bmc_connector_funcs = { + .reset = drm_atomic_helper_connector_reset, + .fill_modes = drm_helper_probe_single_connector_modes, + .destroy = drm_connector_cleanup, + .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, +}; + +static int mgag200_bmc_connector_init (struct drm_device *dev, +struct mgag200_bmc_connector *bmc_connector, +struct drm_connector *physical_connector) +{ +struct drm_connector *connector = &bmc_connector->base; +int ret; + + ret =drm_connector_init (dev, connector, &mgag200_bmc_connector_funcs, +DRM_MODE_CONNECTOR_VIRTUAL ); +if (ret) +return ret; +drm_connector_helper_add (connector, &mgag200_bmc_connector_helper_funcs); + + bmc_connector->physical_connector = physical_connector; + +return 0 ; +} + +int mgag200_bmc_output_init (struct mga_device *mdev,struct drm_connector *physical_connector) +{ +struct drm_device *dev = &mdev->base; +struct drm_crtc *crtc = &mdev->crtc; +struct drm_encoder *encoder; +struct mgag200_bmc_connector *bmc_connector; +struct drm_connector *connector; +int ret; + + encoder = &mdev->output.bmc.encoder; + ret =drm_encoder_init (dev, encoder, &mgag200_bmc_encoder_funcs, +DRM_MODE_ENCODER_VIRTUAL ,NULL ); +if (ret) +return ret; + encoder->possible_crtcs =drm_crtc_mask (crtc); + + bmc_connector = &mdev->output.bmc.bmc_connector; + ret =mgag200_bmc_connector_init (dev, bmc_connector, physical_connector); +if (ret) +return ret; + connector = &bmc_connector->base; + + ret =drm_connector_attach_encoder (connector, encoder); +if (ret) +return ret; + +return 0 ; +}
drivers/gpu/drm/mgag200/mgag200_drv.h +10 -0
@@ -186,6 +186,11 @@ static inline struct mgag200_crtc_state *to_mgag200_crtc_state(struct drm_crtc_s return container_of(base, struct mgag200_crtc_state, base); } +struct mgag200_bmc_connector { +struct drm_connector base; +struct drm_connector *physical_connector; +}; +enum mga_type {G200_PCI ,G200_AGP ,
@@ -288,6 +293,10 @@ struct mga_device {struct drm_encoder encoder;struct drm_connector connector; } vga; +struct { +struct drm_encoder encoder; +struct mgag200_bmc_connector bmc_connector; + } bmc; } output; };
@@ -433,5 +442,6 @@ int mgag200_vga_output_init(struct mga_device *mdev);/* mgag200_bmc.c */ void mgag200_bmc_disable_vidrst (struct mga_device *mdev);void mgag200_bmc_enable_vidrst (struct mga_device *mdev); +int mgag200_bmc_output_init (struct mga_device *mdev,struct drm_connector *physical_connector);#endif /* __MGAG200_DRV_H__ */
drivers/gpu/drm/mgag200/mgag200_g200eh.c +4 -0
@@ -218,6 +218,10 @@ static int mgag200_g200eh_pipeline_init(struct mga_device *mdev)if (ret)return ret; + ret =mgag200_bmc_output_init (mdev, &mdev->output.vga.connector); +if (ret) +return ret; +return 0 ; }
drivers/gpu/drm/mgag200/mgag200_g200eh3.c +4 -0
@@ -122,6 +122,10 @@ static int mgag200_g200eh3_pipeline_init(struct mga_device *mdev)if (ret)return ret; + ret =mgag200_bmc_output_init (mdev, &mdev->output.vga.connector); +if (ret) +return ret; +return 0 ; }
drivers/gpu/drm/mgag200/mgag200_g200er.c +4 -0
@@ -261,6 +261,10 @@ static int mgag200_g200er_pipeline_init(struct mga_device *mdev)if (ret)return ret; + ret =mgag200_bmc_output_init (mdev, &mdev->output.vga.connector); +if (ret) +return ret; +return 0 ; }
drivers/gpu/drm/mgag200/mgag200_g200ev.c +4 -0
@@ -262,6 +262,10 @@ static int mgag200_g200ev_pipeline_init(struct mga_device *mdev)if (ret)return ret; + ret =mgag200_bmc_output_init (mdev, &mdev->output.vga.connector); +if (ret) +return ret; +return 0 ; }
drivers/gpu/drm/mgag200/mgag200_g200ew3.c +4 -0
@@ -131,6 +131,10 @@ static int mgag200_g200ew3_pipeline_init(struct mga_device *mdev)if (ret)return ret; + ret =mgag200_bmc_output_init (mdev, &mdev->output.vga.connector); +if (ret) +return ret; +return 0 ; }
drivers/gpu/drm/mgag200/mgag200_g200se.c +4 -0
@@ -393,6 +393,10 @@ static int mgag200_g200se_pipeline_init(struct mga_device *mdev)if (ret)return ret; + ret =mgag200_bmc_output_init (mdev, &mdev->output.vga.connector); +if (ret) +return ret; +return 0 ; }
drivers/gpu/drm/mgag200/mgag200_g200wb.c +4 -0
@@ -265,6 +265,10 @@ static int mgag200_g200wb_pipeline_init(struct mga_device *mdev)if (ret)return ret; + ret =mgag200_bmc_output_init (mdev, &mdev->output.vga.connector); +if (ret) +return ret; +return 0 ; }
Signature · 1 line
2.45.2
Re: [PATCH v2 2/3] drm/mgag200: Add BMC output
Quoted 11 lines · Thomas Zimmermann
The BMC output can be viewed via the BMC's web interface or a similar client. Represent it as virtual encoder and connector. It's attached to the same CRTC as the VGA connector.
The connector's status depends on the physical connector's status. The BMC is only connected if the physical connector is not. This is necessary to support userspace clients that can only handle a single output per CRTC.
The BMC is a server feature. Add a BMC output for all server chips, but not the desktop models.
Thanks, I think it makes thing clearer for userspace, even if it's not perfect yet. It also allows to have bigger resolution when no vga monitor are connected.
Quoted 277 lines
Signed-off-by Thomas Zimmermann <[email protected]>--- drivers/gpu/drm/mgag200/mgag200_bmc.c | 107 ++++++++++++++++++++++ drivers/gpu/drm/mgag200/mgag200_drv.h | 10 ++ drivers/gpu/drm/mgag200/mgag200_g200eh.c | 4 + drivers/gpu/drm/mgag200/mgag200_g200eh3.c | 4 + drivers/gpu/drm/mgag200/mgag200_g200er.c | 4 + drivers/gpu/drm/mgag200/mgag200_g200ev.c | 4 + drivers/gpu/drm/mgag200/mgag200_g200ew3.c | 4 + drivers/gpu/drm/mgag200/mgag200_g200se.c | 4 + drivers/gpu/drm/mgag200/mgag200_g200wb.c | 4 + 9 files changed, 145 insertions(+)drivers/gpu/drm/mgag200/mgag200_bmc.c +107
-0@@ -2,8 +2,18 @@#include <linux/delay.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_edid.h> +#include <drm/drm_managed.h> +#include <drm/drm_probe_helper.h> +#include "mgag200_drv.h" +static struct mgag200_bmc_connector *to_mgag200_bmc_connector (struct drm_connector *connector) +{ + return container_of(connector, struct mgag200_bmc_connector, base); +} +void mgag200_bmc_disable_vidrst (struct mga_device *mdev) {u8 tmp;@@ -97,3 +107,100 @@ void mgag200_bmc_enable_vidrst(struct mga_device *mdev) tmp &= ~0x10 ;WREG_DAC (MGA1064_GEN_IO_DATA , tmp); } + +static const struct drm_encoder_funcs mgag200_bmc_encoder_funcs = { + .destroy = drm_encoder_cleanup, +}; + +static int mgag200_bmc_connector_helper_detect_ctx (struct drm_connector *connector, +struct drm_modeset_acquire_ctx *ctx, +bool force) +{ +struct mgag200_bmc_connector *bmc_connector =to_mgag200_bmc_connector (connector); +struct drm_connector *physical_connector = bmc_connector->physical_connector; + +/* +* Most user-space compositors cannot handle more than one connected +* connector per CRTC. Hence, we only mark the BMC as connected if the +* physical connector is disconnected. If the physical connector's status +* is connected or unknown, the BMC remains disconnected. This has no +* effect on the output of the BMC. +* +* FIXME: Remove this logic once user-space compositors can handle more +* than one connector per CRTC. The BMC should always be connected. +*/ + +if (physical_connector && physical_connector->status == connector_status_disconnected) +return connector_status_connected; + +return connector_status_disconnected; +} + +static int mgag200_bmc_connector_helper_get_modes (struct drm_connector *connector) +{ +struct drm_device *dev = connector->dev; +struct mga_device *mdev =to_mga_device (dev); +const struct mgag200_device_info *minfo = mdev->info; + +return drm_add_modes_noedid (connector, minfo->max_hdisplay, minfo->max_vdisplay); +} + +static const struct drm_connector_helper_funcs mgag200_bmc_connector_helper_funcs = { + .get_modes = mgag200_bmc_connector_helper_get_modes, + .detect_ctx = mgag200_bmc_connector_helper_detect_ctx, +}; + +static const struct drm_connector_funcs mgag200_bmc_connector_funcs = { + .reset = drm_atomic_helper_connector_reset, + .fill_modes = drm_helper_probe_single_connector_modes, + .destroy = drm_connector_cleanup, + .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, +}; + +static int mgag200_bmc_connector_init (struct drm_device *dev, +struct mgag200_bmc_connector *bmc_connector, +struct drm_connector *physical_connector) +{ +struct drm_connector *connector = &bmc_connector->base; +int ret; + + ret =drm_connector_init (dev, connector, &mgag200_bmc_connector_funcs, +DRM_MODE_CONNECTOR_VIRTUAL ); +if (ret) +return ret; +drm_connector_helper_add (connector, &mgag200_bmc_connector_helper_funcs); + + bmc_connector->physical_connector = physical_connector; + +return 0 ; +} + +int mgag200_bmc_output_init (struct mga_device *mdev,struct drm_connector *physical_connector) +{ +struct drm_device *dev = &mdev->base; +struct drm_crtc *crtc = &mdev->crtc; +struct drm_encoder *encoder; +struct mgag200_bmc_connector *bmc_connector; +struct drm_connector *connector; +int ret; + + encoder = &mdev->output.bmc.encoder; + ret =drm_encoder_init (dev, encoder, &mgag200_bmc_encoder_funcs, +DRM_MODE_ENCODER_VIRTUAL ,NULL ); +if (ret) +return ret; + encoder->possible_crtcs =drm_crtc_mask (crtc); + + bmc_connector = &mdev->output.bmc.bmc_connector; + ret =mgag200_bmc_connector_init (dev, bmc_connector, physical_connector); +if (ret) +return ret; + connector = &bmc_connector->base; + + ret =drm_connector_attach_encoder (connector, encoder); +if (ret) +return ret; + +return 0 ; +}drivers/gpu/drm/mgag200/mgag200_drv.h +10
-0@@ -186,6 +186,11 @@ static inline struct mgag200_crtc_state *to_mgag200_crtc_state(struct drm_crtc_s return container_of(base, struct mgag200_crtc_state, base); } +struct mgag200_bmc_connector { +struct drm_connector base; +struct drm_connector *physical_connector; +}; +enum mga_type {G200_PCI ,G200_AGP ,@@ -288,6 +293,10 @@ struct mga_device {struct drm_encoder encoder;struct drm_connector connector; } vga; +struct { +struct drm_encoder encoder; +struct mgag200_bmc_connector bmc_connector; + } bmc; } output; };@@ -433,5 +442,6 @@ int mgag200_vga_output_init(struct mga_device *mdev);/* mgag200_bmc.c */ void mgag200_bmc_disable_vidrst (struct mga_device *mdev);void mgag200_bmc_enable_vidrst (struct mga_device *mdev); +int mgag200_bmc_output_init (struct mga_device *mdev,struct drm_connector *physical_connector);#endif /* __MGAG200_DRV_H__ */ drivers/gpu/drm/mgag200/mgag200_g200eh.c +4
-0@@ -218,6 +218,10 @@ static int mgag200_g200eh_pipeline_init(struct mga_device *mdev)if (ret)return ret; + ret =mgag200_bmc_output_init (mdev, &mdev->output.vga.connector); +if (ret) +return ret; +return 0 ; }drivers/gpu/drm/mgag200/mgag200_g200eh3.c +4
-0@@ -122,6 +122,10 @@ static int mgag200_g200eh3_pipeline_init(struct mga_device *mdev)if (ret)return ret; + ret =mgag200_bmc_output_init (mdev, &mdev->output.vga.connector); +if (ret) +return ret; +return 0 ; }drivers/gpu/drm/mgag200/mgag200_g200er.c +4
-0@@ -261,6 +261,10 @@ static int mgag200_g200er_pipeline_init(struct mga_device *mdev)if (ret)return ret; + ret =mgag200_bmc_output_init (mdev, &mdev->output.vga.connector); +if (ret) +return ret; +return 0 ; }drivers/gpu/drm/mgag200/mgag200_g200ev.c +4
-0@@ -262,6 +262,10 @@ static int mgag200_g200ev_pipeline_init(struct mga_device *mdev)if (ret)return ret; + ret =mgag200_bmc_output_init (mdev, &mdev->output.vga.connector); +if (ret) +return ret; +return 0 ; }drivers/gpu/drm/mgag200/mgag200_g200ew3.c +4
-0@@ -131,6 +131,10 @@ static int mgag200_g200ew3_pipeline_init(struct mga_device *mdev)if (ret)return ret; + ret =mgag200_bmc_output_init (mdev, &mdev->output.vga.connector); +if (ret) +return ret; +return 0 ; }drivers/gpu/drm/mgag200/mgag200_g200se.c +4
-0@@ -393,6 +393,10 @@ static int mgag200_g200se_pipeline_init(struct mga_device *mdev)if (ret)return ret; + ret =mgag200_bmc_output_init (mdev, &mdev->output.vga.connector); +if (ret) +return ret; +return 0 ; }drivers/gpu/drm/mgag200/mgag200_g200wb.c +4
-0@@ -265,6 +265,10 @@ static int mgag200_g200wb_pipeline_init(struct mga_device *mdev)if (ret)return ret; + ret =mgag200_bmc_output_init (mdev, &mdev->output.vga.connector); +if (ret) +return ret; +return 0 ; }
Thomas Zimmermann
maintainerPATCH v2 3/3 drm/mgag200: Set .detect_ctx() and enable connector polling
In reply to Thomas ZimmermannSet .detect_ctx() in struct drm_connector_helper_funcs to the common helper drm_connector_helper_detect_from_ddc() and enable polling for the connector. Mgag200 will now test for the monitor's presence by probing the DDC in regular intervals.
--- drivers/gpu/drm/mgag200/mgag200_g200.c | 1 + drivers/gpu/drm/mgag200/mgag200_g200eh.c | 1 + drivers/gpu/drm/mgag200/mgag200_g200eh3.c | 1 + drivers/gpu/drm/mgag200/mgag200_g200er.c | 1 + drivers/gpu/drm/mgag200/mgag200_g200ev.c | 1 + drivers/gpu/drm/mgag200/mgag200_g200ew3.c | 1 + drivers/gpu/drm/mgag200/mgag200_g200se.c | 1 + drivers/gpu/drm/mgag200/mgag200_g200wb.c | 1 + drivers/gpu/drm/mgag200/mgag200_vga.c | 6 +++++- 9 files changed, 13 insertions(+), 1 deletion(-)
drivers/gpu/drm/mgag200/mgag200_g200.c +1 -0
@@ -401,6 +401,7 @@ struct mga_device *mgag200_g200_device_create(struct pci_dev *pdev, const structreturn ERR_PTR (ret);drm_mode_config_reset (dev); +drm_kms_helper_poll_init (dev);return mdev; }
drivers/gpu/drm/mgag200/mgag200_g200eh.c +1 -0
@@ -277,6 +277,7 @@ struct mga_device *mgag200_g200eh_device_create(struct pci_dev *pdev, const strureturn ERR_PTR (ret);drm_mode_config_reset (dev); +drm_kms_helper_poll_init (dev);return mdev; }
drivers/gpu/drm/mgag200/mgag200_g200eh3.c +1 -0
@@ -182,6 +182,7 @@ struct mga_device *mgag200_g200eh3_device_create(struct pci_dev *pdev,return ERR_PTR (ret);drm_mode_config_reset (dev); +drm_kms_helper_poll_init (dev);return mdev; }
drivers/gpu/drm/mgag200/mgag200_g200er.c +1 -0
@@ -316,6 +316,7 @@ struct mga_device *mgag200_g200er_device_create(struct pci_dev *pdev, const strureturn ERR_PTR (ret);drm_mode_config_reset (dev); +drm_kms_helper_poll_init (dev);return mdev; }
drivers/gpu/drm/mgag200/mgag200_g200ev.c +1 -0
@@ -321,6 +321,7 @@ struct mga_device *mgag200_g200ev_device_create(struct pci_dev *pdev, const strureturn ERR_PTR (ret);drm_mode_config_reset (dev); +drm_kms_helper_poll_init (dev);return mdev; }
drivers/gpu/drm/mgag200/mgag200_g200ew3.c +1 -0
@@ -202,6 +202,7 @@ struct mga_device *mgag200_g200ew3_device_create(struct pci_dev *pdev,return ERR_PTR (ret);drm_mode_config_reset (dev); +drm_kms_helper_poll_init (dev);return mdev; }
drivers/gpu/drm/mgag200/mgag200_g200se.c +1 -0
@@ -521,6 +521,7 @@ struct mga_device *mgag200_g200se_device_create(struct pci_dev *pdev, const strureturn ERR_PTR (ret);drm_mode_config_reset (dev); +drm_kms_helper_poll_init (dev);return mdev; }
drivers/gpu/drm/mgag200/mgag200_g200wb.c +1 -0
@@ -326,6 +326,7 @@ struct mga_device *mgag200_g200wb_device_create(struct pci_dev *pdev, const strureturn ERR_PTR (ret);drm_mode_config_reset (dev); +drm_kms_helper_poll_init (dev);return mdev; }
drivers/gpu/drm/mgag200/mgag200_vga.c +5 -1
@@ -12,7 +12,8 @@ static const struct drm_encoder_funcs mgag200_dac_encoder_funcs = { };static const struct drm_connector_helper_funcs mgag200_vga_connector_helper_funcs = { - .get_modes = drm_connector_helper_get_modes + .get_modes = drm_connector_helper_get_modes, + .detect_ctx = drm_connector_helper_detect_from_ddc };static const struct drm_connector_funcs mgag200_vga_connector_funcs = {
@@ -58,6 +59,9 @@ int mgag200_vga_output_init(struct mga_device *mdev) }drm_connector_helper_add (connector, &mgag200_vga_connector_helper_funcs); + connector->polled =DRM_CONNECTOR_POLL_CONNECT | +DRM_CONNECTOR_POLL_DISCONNECT ; + ret =drm_connector_attach_encoder (connector, encoder);if (ret) {drm_err (dev,"drm_connector_attach_encoder() failed: %d\n" , ret);
Signature · 1 line
2.45.2
Re: [PATCH v2 3/3] drm/mgag200: Set .detect_ctx() and enable connector polling
Quoted 5 lines · Thomas Zimmermann
Set .detect_ctx() in struct
drm_connector_helper_funcsto the common helperdrm_connector_helper_detect_from_ddc()and enable polling for the connector. Mgag200 will now test for the monitor's presence by probing the DDC in regular intervals.
I've tested this series on two servers, one with physical VGA plugged, and one remote system, and it works as intended.
Thanks a lot for this work.
Quoted 133 lines
Signed-off-by Thomas Zimmermann <[email protected]>--- drivers/gpu/drm/mgag200/mgag200_g200.c | 1 + drivers/gpu/drm/mgag200/mgag200_g200eh.c | 1 + drivers/gpu/drm/mgag200/mgag200_g200eh3.c | 1 + drivers/gpu/drm/mgag200/mgag200_g200er.c | 1 + drivers/gpu/drm/mgag200/mgag200_g200ev.c | 1 + drivers/gpu/drm/mgag200/mgag200_g200ew3.c | 1 + drivers/gpu/drm/mgag200/mgag200_g200se.c | 1 + drivers/gpu/drm/mgag200/mgag200_g200wb.c | 1 + drivers/gpu/drm/mgag200/mgag200_vga.c | 6 +++++- 9 files changed, 13 insertions(+), 1 deletion(-)drivers/gpu/drm/mgag200/mgag200_g200.c +1
-0@@ -401,6 +401,7 @@ struct mga_device *mgag200_g200_device_create(struct pci_dev *pdev, const structreturn ERR_PTR (ret);drm_mode_config_reset (dev); +drm_kms_helper_poll_init (dev);return mdev; }drivers/gpu/drm/mgag200/mgag200_g200eh.c +1
-0@@ -277,6 +277,7 @@ struct mga_device *mgag200_g200eh_device_create(struct pci_dev *pdev, const strureturn ERR_PTR (ret);drm_mode_config_reset (dev); +drm_kms_helper_poll_init (dev);return mdev; }drivers/gpu/drm/mgag200/mgag200_g200eh3.c +1
-0@@ -182,6 +182,7 @@ struct mga_device *mgag200_g200eh3_device_create(struct pci_dev *pdev,return ERR_PTR (ret);drm_mode_config_reset (dev); +drm_kms_helper_poll_init (dev);return mdev; }drivers/gpu/drm/mgag200/mgag200_g200er.c +1
-0@@ -316,6 +316,7 @@ struct mga_device *mgag200_g200er_device_create(struct pci_dev *pdev, const strureturn ERR_PTR (ret);drm_mode_config_reset (dev); +drm_kms_helper_poll_init (dev);return mdev; }drivers/gpu/drm/mgag200/mgag200_g200ev.c +1
-0@@ -321,6 +321,7 @@ struct mga_device *mgag200_g200ev_device_create(struct pci_dev *pdev, const strureturn ERR_PTR (ret);drm_mode_config_reset (dev); +drm_kms_helper_poll_init (dev);return mdev; }drivers/gpu/drm/mgag200/mgag200_g200ew3.c +1
-0@@ -202,6 +202,7 @@ struct mga_device *mgag200_g200ew3_device_create(struct pci_dev *pdev,return ERR_PTR (ret);drm_mode_config_reset (dev); +drm_kms_helper_poll_init (dev);return mdev; }drivers/gpu/drm/mgag200/mgag200_g200se.c +1
-0@@ -521,6 +521,7 @@ struct mga_device *mgag200_g200se_device_create(struct pci_dev *pdev, const strureturn ERR_PTR (ret);drm_mode_config_reset (dev); +drm_kms_helper_poll_init (dev);return mdev; }drivers/gpu/drm/mgag200/mgag200_g200wb.c +1
-0@@ -326,6 +326,7 @@ struct mga_device *mgag200_g200wb_device_create(struct pci_dev *pdev, const strureturn ERR_PTR (ret);drm_mode_config_reset (dev); +drm_kms_helper_poll_init (dev);return mdev; }drivers/gpu/drm/mgag200/mgag200_vga.c +5
-1@@ -12,7 +12,8 @@ static const struct drm_encoder_funcs mgag200_dac_encoder_funcs = { };static const struct drm_connector_helper_funcs mgag200_vga_connector_helper_funcs = { - .get_modes = drm_connector_helper_get_modes + .get_modes = drm_connector_helper_get_modes, + .detect_ctx = drm_connector_helper_detect_from_ddc };static const struct drm_connector_funcs mgag200_vga_connector_funcs = {@@ -58,6 +59,9 @@ int mgag200_vga_output_init(struct mga_device *mdev) }drm_connector_helper_add (connector, &mgag200_vga_connector_helper_funcs); + connector->polled =DRM_CONNECTOR_POLL_CONNECT | +DRM_CONNECTOR_POLL_DISCONNECT ; + ret =drm_connector_attach_encoder (connector, encoder);if (ret) {drm_err (dev,"drm_connector_attach_encoder() failed: %d\n" , ret);
Thomas Zimmermann
maintainerRe: [PATCH v2 3/3] drm/mgag200: Set .detect_ctx() and enable connector polling
Hi Jocelyn
Am 11.06.24 um 16:41 schrieb Jocelyn Falempe:
Quoted 8 lines · Thomas Zimmermann
Quoted 5 lines
Set .detect_ctx() in struct
drm_connector_helper_funcsto the common helperdrm_connector_helper_detect_from_ddc()and enable polling for the connector. Mgag200 will now test for the monitor's presence by probing the DDC in regular intervals.
Quoted 5 lines
I've tested this series on two servers, one with physical VGA plugged, and one remote system, and it works as intended.
Thanks a lot for this work.
Reviewed-by Jocelyn Falempe <[email protected]>
Great, thanks a lot for reviewing and testing quickly.
Best regards
Thomas
Quoted 125 lines
Quoted 124 lines
Signed-off-by Thomas Zimmermann <[email protected]>---
drivers/gpu/drm/mgag200/mgag200_g200.c | 1 + drivers/gpu/drm/mgag200/mgag200_g200eh.c | 1 +drivers/gpu/drm/mgag200/mgag200_g200eh3.c| 1 + drivers/gpu/drm/mgag200/mgag200_g200er.c | 1 + drivers/gpu/drm/mgag200/mgag200_g200ev.c | 1 +drivers/gpu/drm/mgag200/mgag200_g200ew3.c| 1 + drivers/gpu/drm/mgag200/mgag200_g200se.c | 1 + drivers/gpu/drm/mgag200/mgag200_g200wb.c | 1 + drivers/gpu/drm/mgag200/mgag200_vga.c | 6 +++++-9 files changed, 13 insertions(+), 1 deletion(-)drivers/gpu/drm/mgag200/mgag200_g200.c +1
-0@@ -401,6 +401,7 @@ struct mga_device *mgag200_g200_device_create(struct pci_dev *pdev, const struct return ERR_PTR(ret); drm_mode_config_reset(dev); + drm_kms_helper_poll_init(dev); return mdev; }drivers/gpu/drm/mgag200/mgag200_g200eh.c +1
-0@@ -277,6 +277,7 @@ struct mga_device *mgag200_g200eh_device_create(struct pci_dev *pdev, const stru return ERR_PTR(ret); drm_mode_config_reset(dev); + drm_kms_helper_poll_init(dev); return mdev; }drivers/gpu/drm/mgag200/mgag200_g200eh3.c +1
-0@@ -182,6 +182,7 @@ struct mga_device *mgag200_g200eh3_device_create(struct pci_dev *pdev, return ERR_PTR(ret); drm_mode_config_reset(dev); + drm_kms_helper_poll_init(dev); return mdev; }drivers/gpu/drm/mgag200/mgag200_g200er.c +1
-0@@ -316,6 +316,7 @@ struct mga_device *mgag200_g200er_device_create(struct pci_dev *pdev, const stru return ERR_PTR(ret); drm_mode_config_reset(dev); + drm_kms_helper_poll_init(dev); return mdev; }drivers/gpu/drm/mgag200/mgag200_g200ev.c +1
-0@@ -321,6 +321,7 @@ struct mga_device *mgag200_g200ev_device_create(struct pci_dev *pdev, const stru return ERR_PTR(ret); drm_mode_config_reset(dev); + drm_kms_helper_poll_init(dev); return mdev; }drivers/gpu/drm/mgag200/mgag200_g200ew3.c +1
-0@@ -202,6 +202,7 @@ struct mga_device *mgag200_g200ew3_device_create(struct pci_dev *pdev, return ERR_PTR(ret); drm_mode_config_reset(dev); + drm_kms_helper_poll_init(dev); return mdev; }drivers/gpu/drm/mgag200/mgag200_g200se.c +1
-0@@ -521,6 +521,7 @@ struct mga_device *mgag200_g200se_device_create(struct pci_dev *pdev, const stru return ERR_PTR(ret); drm_mode_config_reset(dev); + drm_kms_helper_poll_init(dev); return mdev; }drivers/gpu/drm/mgag200/mgag200_g200wb.c +1
-0@@ -326,6 +326,7 @@ struct mga_device *mgag200_g200wb_device_create(struct pci_dev *pdev, const stru return ERR_PTR(ret); drm_mode_config_reset(dev); + drm_kms_helper_poll_init(dev); return mdev; }drivers/gpu/drm/mgag200/mgag200_vga.c +2
-1@@ -12,7 +12,8 @@ static const struct drm_encoder_funcs mgag200_dac_encoder_funcs = { }; static const struct drm_connector_helper_funcs mgag200_vga_connector_helper_funcs = { - .get_modes = drm_connector_helper_get_modes + .get_modes = drm_connector_helper_get_modes, + .detect_ctx = drm_connector_helper_detect_from_ddc }; static const struct drm_connector_funcs mgag200_vga_connector_funcs = {@@ -58,6 +59,9 @@ int mgag200_vga_output_init(struct mga_device *mdev) } drm_connector_helper_add(connector, &mgag200_vga_connector_helper_funcs);+
connector->polled=DRM_CONNECTOR_POLL_CONNECT|
+DRM_CONNECTOR_POLL_DISCONNECT;
+
ret =drm_connector_attach_encoder(connector, encoder); if (ret) {
drm_err(dev, "drm_connector_attach_encoder() failed: %d\n", ret);
Signature · 7 lines
-- Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Frankenstrasse 146, 90461 Nuernberg, Germany GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman HRB 36809 (AG Nuernberg)