drm/radeon/radeon_display: Decrease the size of allocated memory

From Erick Archer
41e58607a57c4c9963e2c736e1a8c90141207b69 in linux-6.6.y/6.6.37
ae6a233092747e9652eb793d92f79d0820e01c6a in mainline linux

diff --git a/sys/dev/pci/drm/radeon/radeon.h b/sys/dev/pci/drm/radeon/radeon.h
index ff6a5ed..afa0c18 100644 (file)
--- a/sys/dev/pci/drm/radeon/radeon.h
+++ b/sys/dev/pci/drm/radeon/radeon.h
@@ -143,7 +143,6 @@ extern int radeon_cik_support;
 /* RADEON_IB_POOL_SIZE must be a power of 2 */
 #define RADEON_IB_POOL_SIZE                    16
 #define RADEON_DEBUGFS_MAX_COMPONENTS          32
-#define RADEONFB_CONN_LIMIT                    4
 #define RADEON_BIOS_NUM_SCRATCH                        8
 
 /* internal ring indices */

diff --git a/sys/dev/pci/drm/radeon/radeon_display.c b/sys/dev/pci/drm/radeon/radeon_display.c
index 94132c3..d12805c 100644 (file)
--- a/sys/dev/pci/drm/radeon/radeon_display.c
+++ b/sys/dev/pci/drm/radeon/radeon_display.c
@@ -683,7 +683,7 @@ static void radeon_crtc_init(struct drm_device *dev, int index)
        struct radeon_device *rdev = dev->dev_private;
        struct radeon_crtc *radeon_crtc;
 
-       radeon_crtc = kzalloc(sizeof(struct radeon_crtc) + (RADEONFB_CONN_LIMIT * sizeof(struct drm_connector *)), GFP_KERNEL);
+       radeon_crtc = kzalloc(sizeof(*radeon_crtc), GFP_KERNEL);
        if (radeon_crtc == NULL)
                return;
 
@@ -709,12 +709,6 @@ static void radeon_crtc_init(struct drm_device *dev, int index)
        dev->mode_config.cursor_width = radeon_crtc->max_cursor_width;
        dev->mode_config.cursor_height = radeon_crtc->max_cursor_height;
 
-#if 0
-       radeon_crtc->mode_set.crtc = &radeon_crtc->base;
-       radeon_crtc->mode_set.connectors = (struct drm_connector **)(radeon_crtc + 1);
-       radeon_crtc->mode_set.num_connectors = 0;
-#endif
-
        if (rdev->is_atom_bios && (ASIC_IS_AVIVO(rdev) || radeon_r4xx_atom))
                radeon_atombios_init_crtc(dev, radeon_crtc);
        else