All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jani Nikula <jani.nikula@linux.intel.com>
To: Intel Graphics Development <intel-gfx@lists.freedesktop.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Subject: Re: [PATCH 3/5] drm/i915: Ditch INTELFB_CONN_LIMIT
Date: Thu, 19 Sep 2013 13:53:10 +0300	[thread overview]
Message-ID: <87zjr96q21.fsf@intel.com> (raw)
In-Reply-To: <1379585916-6521-3-git-send-email-daniel.vetter@ffwll.ch>

On Thu, 19 Sep 2013, Daniel Vetter <daniel.vetter@ffwll.ch> 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.
>
> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
>  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..52695cd 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(struct intel_crtc), GFP_KERNEL);

*cough* sizeof(*intel_crtc) *cough*

Cheers,
Jani.

>  	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
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Jani Nikula, Intel Open Source Technology Center

  reply	other threads:[~2013-09-19 10:50 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-19 10:18 [PATCH 1/5] drm/i915: use pointer = k[cmz...]alloc(sizeof(*pointer), ...) pattern Daniel Vetter
2013-09-19 10:18 ` [PATCH 2/5] drm/i915: Use kcalloc more Daniel Vetter
2013-09-19 10:38   ` Jani Nikula
2013-09-19 10:50     ` Chris Wilson
2013-09-19 11:00       ` Jani Nikula
2013-09-19 11:12         ` Chris Wilson
2013-09-19 10:46   ` Chris Wilson
2013-09-19 11:53     ` Daniel Vetter
2013-09-19 12:06     ` [PATCH] " Daniel Vetter
2013-09-19 12:30       ` Chris Wilson
2013-09-19 12:35         ` Daniel Vetter
2013-09-19 12:41           ` Chris Wilson
2013-09-19 12:51             ` Daniel Vetter
2013-09-19 12:58               ` Chris Wilson
2013-09-20 22:37                 ` Daniel Vetter
2013-09-19 13:40       ` Jani Nikula
2013-09-19 10:18 ` [PATCH 3/5] drm/i915: Ditch INTELFB_CONN_LIMIT Daniel Vetter
2013-09-19 10:53   ` Jani Nikula [this message]
2013-09-19 12:05     ` [PATCH] " Daniel Vetter
2013-09-19 13:32       ` Jani Nikula
2013-09-19 10:18 ` [PATCH 4/5] drm/i915: check for allocation overflow in error state capture Daniel Vetter
2013-09-20 23:39   ` Ben Widawsky
2013-09-19 10:18 ` [PATCH 5/5] drm/i915: Use unsigned for overflow checks in execbuf Daniel Vetter
2013-09-19 10:44   ` Chris Wilson
2013-09-19 12:00     ` [PATCH] " Daniel Vetter
2013-09-19 12:53       ` Daniel Vetter
2013-09-19 13:05         ` Chris Wilson
2013-09-19 10:46   ` [PATCH 5/5] " Jani Nikula
2013-09-19 10:34 ` [PATCH 1/5] drm/i915: use pointer = k[cmz...]alloc(sizeof(*pointer), ...) pattern Jani Nikula

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87zjr96q21.fsf@intel.com \
    --to=jani.nikula@linux.intel.com \
    --cc=daniel.vetter@ffwll.ch \
    --cc=intel-gfx@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.