From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH] drm/i915: Ditch INTELFB_CONN_LIMIT Date: Thu, 19 Sep 2013 16:32:24 +0300 Message-ID: <87ob7p6ion.fsf@intel.com> References: <87zjr96q21.fsf@intel.com> <1379592345-20161-1-git-send-email-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id C19F0E627A for ; Thu, 19 Sep 2013 06:30:09 -0700 (PDT) In-Reply-To: <1379592345-20161-1-git-send-email-daniel.vetter@ffwll.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Intel Graphics Development Cc: Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org On Thu, 19 Sep 2013, Daniel Vetter wrote: > 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 Reviewed-by: Jani Nikula > Signed-off-by: Daniel Vetter > --- > drivers/gpu/drm/i915/intel_display.c | 2 +- > drivers/gpu/drm/i915/intel_drv.h | 1 - > drivers/gpu/drm/i915/intel_fb.c | 2 +- > 3 files changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index 6b8a107..1c5c2c1 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -9570,7 +9570,7 @@ static void intel_crtc_init(struct drm_device *dev, int pipe) > struct intel_crtc *intel_crtc; > 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) > return; > > diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h > index b85354f..c052bcf 100644 > --- a/drivers/gpu/drm/i915/intel_drv.h > +++ b/drivers/gpu/drm/i915/intel_drv.h > @@ -77,7 +77,6 @@ > /* the i915, i945 have a single sDVO i2c bus - which is different */ > #define MAX_OUTPUTS 6 > /* maximum connectors per crtcs in the mode set */ > -#define INTELFB_CONN_LIMIT 4 > > #define INTEL_I2C_BUS_DVO 1 > #define INTEL_I2C_BUS_SDVO 2 > diff --git a/drivers/gpu/drm/i915/intel_fb.c b/drivers/gpu/drm/i915/intel_fb.c > index 6aa66aa..7ceb69b 100644 > --- a/drivers/gpu/drm/i915/intel_fb.c > +++ b/drivers/gpu/drm/i915/intel_fb.c > @@ -225,7 +225,7 @@ int intel_fbdev_init(struct drm_device *dev) > > ret = drm_fb_helper_init(dev, &ifbdev->helper, > INTEL_INFO(dev)->num_pipes, > - INTELFB_CONN_LIMIT); > + 4); > if (ret) { > kfree(ifbdev); > return ret; > -- > 1.8.4.rc3 > -- Jani Nikula, Intel Open Source Technology Center