drm/mgag200: Remove unused fields from struct mga_device

The fields mode_info, num_crtcs and mode in struct mga_device serve
no purpose. Remove them.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Tested-by: John Donnelly <John.p.donnelly@oracle.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200507090315.21274-6-tzimmermann@suse.de

diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.h b/drivers/gpu/drm/mgag200/mgag200_drv.h
index 65d7096cad88994b7711a6ccdd608f0b1332c7bd..40e6ffbe97949b5231f6afa73ba9f623c5515698 100644 (file)
--- a/drivers/gpu/drm/mgag200/mgag200_drv.h
+++ b/drivers/gpu/drm/mgag200/mgag200_drv.h
@@ -104,11 +104,6 @@ struct mga_crtc {
        bool enabled;
 };
 
-struct mga_mode_info {
-       bool mode_config_initialized;
-       struct mga_crtc *crtc;
-};
-
 struct mga_i2c_chan {
        struct i2c_adapter adapter;
        struct drm_device *dev;
@@ -160,17 +155,14 @@ struct mga_device {
        void __iomem                    *rmmio;
 
        struct mga_mc                   mc;
-       struct mga_mode_info            mode_info;
 
        struct mga_cursor cursor;
 
        size_t vram_fb_available;
 
        bool                            suspended;
-       int                             num_crtc;
        enum mga_type                   type;
        int                             has_sdram;
-       struct drm_display_mode         mode;
 
        int bpp_shifts[4];
 

diff --git a/drivers/gpu/drm/mgag200/mgag200_main.c b/drivers/gpu/drm/mgag200/mgag200_main.c
index fd651eda6f012d0904ba41032f3eacf2738a6656..86df799fd38c51c3fc406e9690f7520536eb83fc 100644 (file)
--- a/drivers/gpu/drm/mgag200/mgag200_main.c
+++ b/drivers/gpu/drm/mgag200/mgag200_main.c
@@ -97,9 +97,6 @@ int mgag200_driver_load(struct drm_device *dev, unsigned long flags)
        mdev->flags = mgag200_flags_from_driver_data(flags);
        mdev->type = mgag200_type_from_driver_data(flags);
 
-       /* Hardcode the number of CRTCs to 1 */
-       mdev->num_crtc = 1;
-
        pci_read_config_dword(dev->pdev, PCI_MGA_OPTION, &option);
        mdev->has_sdram = !(option & (1 << 14));
 

diff --git a/drivers/gpu/drm/mgag200/mgag200_mode.c b/drivers/gpu/drm/mgag200/mgag200_mode.c
index 7dad386913261d27d30c1921ef17cc4bc33c56cb..1d1e937203fa7c140c4599dc3086e6444ba4a8ad 100644 (file)
--- a/drivers/gpu/drm/mgag200/mgag200_mode.c
+++ b/drivers/gpu/drm/mgag200/mgag200_mode.c
@@ -1136,9 +1136,6 @@ static int mga_crtc_mode_set(struct drm_crtc *crtc,
 
        WREG8(MGA_MISC_OUT, misc);
 
-       if (adjusted_mode)
-               memcpy(&mdev->mode, mode, sizeof(struct drm_display_mode));
-
        mga_crtc_do_set_base(crtc, old_fb, x, y, 0);
 
        /* reset tagfifo */
@@ -1447,7 +1444,6 @@ static void mga_crtc_init(struct mga_device *mdev)
        drm_crtc_init(dev, &mga_crtc->base, &mga_crtc_funcs);
 
        drm_mode_crtc_set_gamma_size(&mga_crtc->base, MGAG200_LUT_SIZE);
-       mdev->mode_info.crtc = mga_crtc;
 
        drm_crtc_helper_add(&mga_crtc->base, &mga_helper_funcs);
 }
@@ -1647,8 +1643,6 @@ int mgag200_modeset_init(struct mga_device *mdev)
                return ret;
        }
 
-       mdev->mode_info.mode_config_initialized = true;
-
        dev->mode_config.max_width = MGAG200_MAX_FB_WIDTH;
        dev->mode_config.max_height = MGAG200_MAX_FB_HEIGHT;