drm/mgag200: Move PCI-option setup into model-specific code

Split the PCI code into a single call for each model. G200 and G200SE
each contain a dedicated helper with additional instructions. Noteably,
the G200ER has no code for PCI setup.

In a later patch, the magic numbers should be replaced by descriptive
constants.

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

diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.c b/drivers/gpu/drm/mgag200/mgag200_drv.c
index e5f06f44ec90996ceeaeb2fd688d530d3eca93ff..ea765c1abcc1eb52899216e72550eee3434b3411 100644 (file)
--- a/drivers/gpu/drm/mgag200/mgag200_drv.c
+++ b/drivers/gpu/drm/mgag200/mgag200_drv.c
@@ -24,6 +24,32 @@ int mgag200_modeset = -1;
 MODULE_PARM_DESC(modeset, "Disable/Enable modesetting");
 module_param_named(modeset, mgag200_modeset, int, 0400);
 
+int mgag200_init_pci_options(struct pci_dev *pdev, u32 option, u32 option2)
+{
+       struct device *dev = &pdev->dev;
+       int err;
+
+       err = pci_read_config_dword(pdev, PCI_MGA_OPTION, &option);
+       if (err != PCIBIOS_SUCCESSFUL) {
+               dev_err(dev, "pci_read_config_dword(PCI_MGA_OPTION) failed: %d\n", err);
+               return pcibios_err_to_errno(err);
+       }
+
+       err = pci_write_config_dword(pdev, PCI_MGA_OPTION, option);
+       if (err != PCIBIOS_SUCCESSFUL) {
+               dev_err(dev, "pci_write_config_dword(PCI_MGA_OPTION) failed: %d\n", err);
+               return pcibios_err_to_errno(err);
+       }
+
+       err = pci_write_config_dword(pdev, PCI_MGA_OPTION2, option2);
+       if (err != PCIBIOS_SUCCESSFUL) {
+               dev_err(dev, "pci_write_config_dword(PCI_MGA_OPTION2) failed: %d\n", err);
+               return pcibios_err_to_errno(err);
+       }
+
+       return 0;
+}
+
 /*
  * DRM driver
  */
@@ -46,25 +72,10 @@ static const struct drm_driver mgag200_driver = {
  * DRM device
  */
 
-static bool mgag200_has_sgram(struct mga_device *mdev)
-{
-       struct drm_device *dev = &mdev->base;
-       struct pci_dev *pdev = to_pci_dev(dev->dev);
-       u32 option;
-       int ret;
-
-       ret = pci_read_config_dword(pdev, PCI_MGA_OPTION, &option);
-       if (drm_WARN(dev, ret, "failed to read PCI config dword: %d\n", ret))
-               return false;
-
-       return !!(option & PCI_MGA_OPTION_HARDPWMSK);
-}
-
 int mgag200_regs_init(struct mga_device *mdev)
 {
        struct drm_device *dev = &mdev->base;
        struct pci_dev *pdev = to_pci_dev(dev->dev);
-       u32 option, option2;
        u8 crtcext3;
        int ret;
 
@@ -72,46 +83,6 @@ int mgag200_regs_init(struct mga_device *mdev)
        if (ret)
                return ret;
 
-       switch (mdev->type) {
-       case G200_PCI:
-       case G200_AGP:
-               if (mgag200_has_sgram(mdev))
-                       option = 0x4049cd21;
-               else
-                       option = 0x40499121;
-               option2 = 0x00008000;
-               break;
-       case G200_SE_A:
-       case G200_SE_B:
-               option = 0x40049120;
-               if (mgag200_has_sgram(mdev))
-                       option |= PCI_MGA_OPTION_HARDPWMSK;
-               option2 = 0x00008000;
-               break;
-       case G200_WB:
-       case G200_EW3:
-               option = 0x41049120;
-               option2 = 0x0000b000;
-               break;
-       case G200_EV:
-               option = 0x00000120;
-               option2 = 0x0000b000;
-               break;
-       case G200_EH:
-       case G200_EH3:
-               option = 0x00000120;
-               option2 = 0x0000b000;
-               break;
-       default:
-               option = 0;
-               option2 = 0;
-       }
-
-       if (option)
-               pci_write_config_dword(pdev, PCI_MGA_OPTION, option);
-       if (option2)
-               pci_write_config_dword(pdev, PCI_MGA_OPTION2, option2);
-
        /* BAR 1 contains registers */
        mdev->rmmio_base = pci_resource_start(pdev, 1);
        mdev->rmmio_size = pci_resource_len(pdev, 1);

diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.h b/drivers/gpu/drm/mgag200/mgag200_drv.h
index 99a9446b7df5c8d985be1f87ac140d21d5bf0487..d188382d60cab6784739397f6a3386d42de39d01 100644 (file)
--- a/drivers/gpu/drm/mgag200/mgag200_drv.h
+++ b/drivers/gpu/drm/mgag200/mgag200_drv.h
@@ -256,6 +256,7 @@ static inline struct mgag200_g200se_device *to_mgag200_g200se_device(struct drm_
 }
 
                                /* mgag200_drv.c */
+int mgag200_init_pci_options(struct pci_dev *pdev, u32 option, u32 option2);
 int mgag200_regs_init(struct mga_device *mdev);
 
                                /* mgag200_<device type>.c */

diff --git a/drivers/gpu/drm/mgag200/mgag200_g200.c b/drivers/gpu/drm/mgag200/mgag200_g200.c
index ca9522daf6e12ac29f88feb3ab785cd4044acd0a..b9ec6367719c918761d56ada440588b4e7888172 100644 (file)
--- a/drivers/gpu/drm/mgag200/mgag200_g200.c
+++ b/drivers/gpu/drm/mgag200/mgag200_g200.c
@@ -6,6 +6,29 @@
 
 #include "mgag200_drv.h"
 
+static int mgag200_g200_init_pci_options(struct pci_dev *pdev)
+{
+       struct device *dev = &pdev->dev;
+       bool has_sgram;
+       u32 option;
+       int err;
+
+       err = pci_read_config_dword(pdev, PCI_MGA_OPTION, &option);
+       if (err != PCIBIOS_SUCCESSFUL) {
+               dev_err(dev, "pci_read_config_dword(PCI_MGA_OPTION) failed: %d\n", err);
+               return pcibios_err_to_errno(err);
+       }
+
+       has_sgram = !!(option & PCI_MGA_OPTION_HARDPWMSK);
+
+       if (has_sgram)
+               option = 0x4049cd21;
+       else
+               option = 0x40499121;
+
+       return mgag200_init_pci_options(pdev, option, 0x00008000);
+}
+
 /*
  * DRM Device
  */
@@ -149,6 +172,10 @@ struct mga_device *mgag200_g200_device_create(struct pci_dev *pdev, const struct
 
        pci_set_drvdata(pdev, dev);
 
+       ret = mgag200_g200_init_pci_options(pdev);
+       if (ret)
+               return ERR_PTR(ret);
+
        mdev->flags = flags;
        mdev->type = type;
 

diff --git a/drivers/gpu/drm/mgag200/mgag200_g200eh.c b/drivers/gpu/drm/mgag200/mgag200_g200eh.c
index 67c7c75ea791ded63085f258c5a15a89b162dad9..3a531148c52379ba779f97007d89f2891b3f2c3e 100644 (file)
--- a/drivers/gpu/drm/mgag200/mgag200_g200eh.c
+++ b/drivers/gpu/drm/mgag200/mgag200_g200eh.c
@@ -27,6 +27,10 @@ struct mga_device *mgag200_g200eh_device_create(struct pci_dev *pdev, const stru
        mdev->flags = flags;
        mdev->type = type;
 
+       ret = mgag200_init_pci_options(pdev, 0x00000120, 0x0000b000);
+       if (ret)
+               return ERR_PTR(ret);
+
        ret = mgag200_regs_init(mdev);
        if (ret)
                return ERR_PTR(ret);

diff --git a/drivers/gpu/drm/mgag200/mgag200_g200eh3.c b/drivers/gpu/drm/mgag200/mgag200_g200eh3.c
index b7a3f9551bfd5f0aba1000cf7a7bbb583850551b..fbb53e624d90096aa02875b7435aa54d74af936c 100644 (file)
--- a/drivers/gpu/drm/mgag200/mgag200_g200eh3.c
+++ b/drivers/gpu/drm/mgag200/mgag200_g200eh3.c
@@ -28,6 +28,10 @@ struct mga_device *mgag200_g200eh3_device_create(struct pci_dev *pdev,
        mdev->flags = flags;
        mdev->type = type;
 
+       ret = mgag200_init_pci_options(pdev, 0x00000120, 0x0000b000);
+       if (ret)
+               return ERR_PTR(ret);
+
        ret = mgag200_regs_init(mdev);
        if (ret)
                return ERR_PTR(ret);

diff --git a/drivers/gpu/drm/mgag200/mgag200_g200ev.c b/drivers/gpu/drm/mgag200/mgag200_g200ev.c
index f8afd05913fd9d243d7e5a1200a4f655300f19b7..e55dd01ed42eb056838e25a5b7006d23cc1145b4 100644 (file)
--- a/drivers/gpu/drm/mgag200/mgag200_g200ev.c
+++ b/drivers/gpu/drm/mgag200/mgag200_g200ev.c
@@ -24,6 +24,10 @@ struct mga_device *mgag200_g200ev_device_create(struct pci_dev *pdev, const stru
 
        pci_set_drvdata(pdev, dev);
 
+       ret = mgag200_init_pci_options(pdev, 0x00000120, 0x0000b000);
+       if (ret)
+               return ERR_PTR(ret);
+
        mdev->flags = flags;
        mdev->type = type;
 

diff --git a/drivers/gpu/drm/mgag200/mgag200_g200ew3.c b/drivers/gpu/drm/mgag200/mgag200_g200ew3.c
index f65bb94e0b3d172ff42596d2833571d7de368942..6dd62135f0b21187a2ead989d64b5a2af9799224 100644 (file)
--- a/drivers/gpu/drm/mgag200/mgag200_g200ew3.c
+++ b/drivers/gpu/drm/mgag200/mgag200_g200ew3.c
@@ -25,6 +25,10 @@ struct mga_device *mgag200_g200ew3_device_create(struct pci_dev *pdev,
 
        pci_set_drvdata(pdev, dev);
 
+       ret = mgag200_init_pci_options(pdev, 0x41049120, 0x0000b000);
+       if (ret)
+               return ERR_PTR(ret);
+
        mdev->flags = flags;
        mdev->type = type;
 

diff --git a/drivers/gpu/drm/mgag200/mgag200_g200se.c b/drivers/gpu/drm/mgag200/mgag200_g200se.c
index d809cc680024527cd246d4bd13185fda3fa04b2a..75d284abb2a2d58748eacae2ed90379fc9ff0676 100644 (file)
--- a/drivers/gpu/drm/mgag200/mgag200_g200se.c
+++ b/drivers/gpu/drm/mgag200/mgag200_g200se.c
@@ -6,6 +6,28 @@
 
 #include "mgag200_drv.h"
 
+static int mgag200_g200se_init_pci_options(struct pci_dev *pdev)
+{
+       struct device *dev = &pdev->dev;
+       bool has_sgram;
+       u32 option;
+       int err;
+
+       err = pci_read_config_dword(pdev, PCI_MGA_OPTION, &option);
+       if (err != PCIBIOS_SUCCESSFUL) {
+               dev_err(dev, "pci_read_config_dword(PCI_MGA_OPTION) failed: %d\n", err);
+               return pcibios_err_to_errno(err);
+       }
+
+       has_sgram = !!(option & PCI_MGA_OPTION_HARDPWMSK);
+
+       option = 0x40049120;
+       if (has_sgram)
+               option |= PCI_MGA_OPTION_HARDPWMSK;
+
+       return mgag200_init_pci_options(pdev, option, 0x00008000);
+}
+
 /*
  * DRM device
  */
@@ -37,6 +59,10 @@ struct mga_device *mgag200_g200se_device_create(struct pci_dev *pdev, const stru
 
        pci_set_drvdata(pdev, dev);
 
+       ret = mgag200_g200se_init_pci_options(pdev);
+       if (ret)
+               return ERR_PTR(ret);
+
        mdev->flags = flags;
        mdev->type = type;
 

diff --git a/drivers/gpu/drm/mgag200/mgag200_g200wb.c b/drivers/gpu/drm/mgag200/mgag200_g200wb.c
index 67b28646386d91f2995a5e6f400f29347cccb9cb..c622d5418731216698dfad47eab20362ea72b224 100644 (file)
--- a/drivers/gpu/drm/mgag200/mgag200_g200wb.c
+++ b/drivers/gpu/drm/mgag200/mgag200_g200wb.c
@@ -24,6 +24,10 @@ struct mga_device *mgag200_g200wb_device_create(struct pci_dev *pdev, const stru
 
        pci_set_drvdata(pdev, dev);
 
+       ret = mgag200_init_pci_options(pdev, 0x41049120, 0x0000b000);
+       if (ret)
+               return ERR_PTR(ret);
+
        mdev->flags = flags;
        mdev->type = type;