Commit 955382f3 authored by Daniel Vetter's avatar Daniel Vetter

drm/i915: Ditch INTELFB_CONN_LIMIT

And the gratious overallocation of crtcs. Seems to go back to the ums
days of yonder ...

We also still need it to make the fbdev emulation happy, but I don't
think there's really a need. Especially since the current fbdev
emulation doesn't actually support cloning.

v2: Use sizeof(*pointer) pattern (Jani).

Cc: Jani Nikula <jani.nikula@linux.intel.com>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent a1e22653
...@@ -9591,7 +9591,7 @@ static void intel_crtc_init(struct drm_device *dev, int pipe) ...@@ -9591,7 +9591,7 @@ static void intel_crtc_init(struct drm_device *dev, int pipe)
struct intel_crtc *intel_crtc; struct intel_crtc *intel_crtc;
int i; int i;
intel_crtc = kzalloc(sizeof(struct intel_crtc) + (INTELFB_CONN_LIMIT * sizeof(struct drm_connector *)), GFP_KERNEL); intel_crtc = kzalloc(sizeof(*intel_crtc), GFP_KERNEL);
if (intel_crtc == NULL) if (intel_crtc == NULL)
return; return;
......
...@@ -77,7 +77,6 @@ ...@@ -77,7 +77,6 @@
/* the i915, i945 have a single sDVO i2c bus - which is different */ /* the i915, i945 have a single sDVO i2c bus - which is different */
#define MAX_OUTPUTS 6 #define MAX_OUTPUTS 6
/* maximum connectors per crtcs in the mode set */ /* maximum connectors per crtcs in the mode set */
#define INTELFB_CONN_LIMIT 4
#define INTEL_I2C_BUS_DVO 1 #define INTEL_I2C_BUS_DVO 1
#define INTEL_I2C_BUS_SDVO 2 #define INTEL_I2C_BUS_SDVO 2
......
...@@ -225,7 +225,7 @@ int intel_fbdev_init(struct drm_device *dev) ...@@ -225,7 +225,7 @@ int intel_fbdev_init(struct drm_device *dev)
ret = drm_fb_helper_init(dev, &ifbdev->helper, ret = drm_fb_helper_init(dev, &ifbdev->helper,
INTEL_INFO(dev)->num_pipes, INTEL_INFO(dev)->num_pipes,
INTELFB_CONN_LIMIT); 4);
if (ret) { if (ret) {
kfree(ifbdev); kfree(ifbdev);
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment