drm/mgag200: Add VGA-BMC output

Duplicate VGA output to VGA-BMC output and update all code for Matrox
server chips. The new output represents a VGA output that has a BMC
attached to it. No functional changes so far.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Jocelyn Falempe <jfalempe@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240805130622.63458-2-tzimmermann@suse.de

diff --git a/drivers/gpu/drm/mgag200/Makefile b/drivers/gpu/drm/mgag200/Makefile
index d1b25f9f6586edbf01e8db9689670ac31ce53bc3..5a02203fad12914b85299fbd0eaccae95d7eaac6 100644 (file)
--- a/drivers/gpu/drm/mgag200/Makefile
+++ b/drivers/gpu/drm/mgag200/Makefile
@@ -12,6 +12,7 @@ mgag200-y := \
        mgag200_g200se.o \
        mgag200_g200wb.o \
        mgag200_mode.o \
+       mgag200_vga_bmc.o \
        mgag200_vga.o
 
 obj-$(CONFIG_DRM_MGAG200) += mgag200.o

diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.h b/drivers/gpu/drm/mgag200/mgag200_drv.h
index 8df3c84d2405e7dc42a326fee36f7cecbac18d00..1301d3066a49aadf1b17817d6d9d5a869acb090a 100644 (file)
--- a/drivers/gpu/drm/mgag200/mgag200_drv.h
+++ b/drivers/gpu/drm/mgag200/mgag200_drv.h
@@ -437,6 +437,9 @@ 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_bmc.c */
+int mgag200_vga_bmc_output_init(struct mga_device *mdev);
+
 /* mgag200_vga.c */
 int mgag200_vga_output_init(struct mga_device *mdev);
 

diff --git a/drivers/gpu/drm/mgag200/mgag200_g200eh.c b/drivers/gpu/drm/mgag200/mgag200_g200eh.c
index 72bd8e3421c254bfdf4cdd910c94a8c43d1c83a5..1824c0e59c030ea93b04c17b3f6ba256daf8fdd0 100644 (file)
--- a/drivers/gpu/drm/mgag200/mgag200_g200eh.c
+++ b/drivers/gpu/drm/mgag200/mgag200_g200eh.c
@@ -215,7 +215,7 @@ 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);
 
-       ret = mgag200_vga_output_init(mdev);
+       ret = mgag200_vga_bmc_output_init(mdev);
        if (ret)
                return ret;
 

diff --git a/drivers/gpu/drm/mgag200/mgag200_g200eh3.c b/drivers/gpu/drm/mgag200/mgag200_g200eh3.c
index 1bbb0745b84a22139781888b534fa3a66a462e6d..9cb2a165e4607b15bb313db75dbac231b996647c 100644 (file)
--- a/drivers/gpu/drm/mgag200/mgag200_g200eh3.c
+++ b/drivers/gpu/drm/mgag200/mgag200_g200eh3.c
@@ -119,7 +119,7 @@ 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);
 
-       ret = mgag200_vga_output_init(mdev);
+       ret = mgag200_vga_bmc_output_init(mdev);
        if (ret)
                return ret;
 

diff --git a/drivers/gpu/drm/mgag200/mgag200_g200er.c b/drivers/gpu/drm/mgag200/mgag200_g200er.c
index e65d591739399cccb203a4cd794e9623d484cdb8..e0f7816ad87a86f4ad8226686ca1ceb95f179ebd 100644 (file)
--- a/drivers/gpu/drm/mgag200/mgag200_g200er.c
+++ b/drivers/gpu/drm/mgag200/mgag200_g200er.c
@@ -258,7 +258,7 @@ 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);
 
-       ret = mgag200_vga_output_init(mdev);
+       ret = mgag200_vga_bmc_output_init(mdev);
        if (ret)
                return ret;
 

diff --git a/drivers/gpu/drm/mgag200/mgag200_g200ev.c b/drivers/gpu/drm/mgag200/mgag200_g200ev.c
index a4890b496050c7546948903c6e0ad5994c9d2837..a2c683f82127eef347e2c9a2f2ea925ab9eee169 100644 (file)
--- a/drivers/gpu/drm/mgag200/mgag200_g200ev.c
+++ b/drivers/gpu/drm/mgag200/mgag200_g200ev.c
@@ -259,7 +259,7 @@ 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);
 
-       ret = mgag200_vga_output_init(mdev);
+       ret = mgag200_vga_bmc_output_init(mdev);
        if (ret)
                return ret;
 

diff --git a/drivers/gpu/drm/mgag200/mgag200_g200ew3.c b/drivers/gpu/drm/mgag200/mgag200_g200ew3.c
index fbaa97c7e0daa0c3bb0b9f6e84b4062f2b9d9fbb..7a2806be2d2ef38cda282239931d9744a0c3632f 100644 (file)
--- a/drivers/gpu/drm/mgag200/mgag200_g200ew3.c
+++ b/drivers/gpu/drm/mgag200/mgag200_g200ew3.c
@@ -128,7 +128,7 @@ 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);
 
-       ret = mgag200_vga_output_init(mdev);
+       ret = mgag200_vga_bmc_output_init(mdev);
        if (ret)
                return ret;
 

diff --git a/drivers/gpu/drm/mgag200/mgag200_g200se.c b/drivers/gpu/drm/mgag200/mgag200_g200se.c
index fcb97e4253c4d8197f4f6b9d315d4a55c1941264..b83f3f31ed0e6335d2b63f8b3c916642f3afa7db 100644 (file)
--- a/drivers/gpu/drm/mgag200/mgag200_g200se.c
+++ b/drivers/gpu/drm/mgag200/mgag200_g200se.c
@@ -390,7 +390,7 @@ 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);
 
-       ret = mgag200_vga_output_init(mdev);
+       ret = mgag200_vga_bmc_output_init(mdev);
        if (ret)
                return ret;
 

diff --git a/drivers/gpu/drm/mgag200/mgag200_g200wb.c b/drivers/gpu/drm/mgag200/mgag200_g200wb.c
index 33ef35c95acbb33f5a7a5f91a7564cf5b8eab7b1..cb971ca5e3064f0920cc43f04cca23f299467210 100644 (file)
--- a/drivers/gpu/drm/mgag200/mgag200_g200wb.c
+++ b/drivers/gpu/drm/mgag200/mgag200_g200wb.c
@@ -262,7 +262,7 @@ 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);
 
-       ret = mgag200_vga_output_init(mdev);
+       ret = mgag200_vga_bmc_output_init(mdev);
        if (ret)
                return ret;
 

diff --git a/drivers/gpu/drm/mgag200/mgag200_vga_bmc.c b/drivers/gpu/drm/mgag200/mgag200_vga_bmc.c
new file mode 100644 (file)
index 0000000..b6b9063
--- /dev/null
+++ b/drivers/gpu/drm/mgag200/mgag200_vga_bmc.c
@@ -0,0 +1,72 @@
+// 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,
+       .detect_ctx = drm_connector_helper_detect_from_ddc
+};
+
+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_bmc_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);
+
+       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);
+               return ret;
+       }
+
+       return 0;
+}