dri-devel July 2011

dri-devel@lists.freedesktop.org

76 participants
443 discussions

[PATCH V2 RESEND] drm/i915: gracefully bail out when init_clock_gating-pointer is not set
by Wolfram Sang 04 Jul '11

04 Jul '11

Commit 6067aa (drm/i915: split clock gating init into per-chipset functions) introduces an init_clock_gating-pointer. There is one case, however, where it does not get set, so that caused an OOPS. Change the code to return -ENODEV in this case and propagate it to the upper layers. Signed-off-by: Wolfram Sang <w.sang(a)pengutronix.de> Reviewed-by: Jesse Barnes <jbarnes(a)virtuousgeek.org> Cc: Keith Packard <keithp(a)keithp.com> --- Based on v3.0-rc5. Change since V1: changed … [View More]error-message per Chris' suggestion. Note: used %04x instead of %lx to fix compile warning. drivers/gpu/drm/i915/i915_dma.c | 4 +++- drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/intel_display.c | 20 ++++++++++++++------ 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 2b79588..2ada4e7 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -1258,7 +1258,9 @@ static int i915_load_modeset_init(struct drm_device *dev) if (IS_GEN3(dev) && (I915_READ(ECOSKPD) & ECO_FLIP_DONE)) dev_priv->flip_pending_is_done = true; - intel_modeset_init(dev); + ret = intel_modeset_init(dev); + if (ret) + goto cleanup_vga_switcheroo; ret = i915_load_gem_init(dev); if (ret) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index f63ee16..90ce405 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -1303,7 +1303,7 @@ static inline void intel_unregister_dsm_handler(void) { return; } #endif /* CONFIG_ACPI */ /* modesetting */ -extern void intel_modeset_init(struct drm_device *dev); +extern int intel_modeset_init(struct drm_device *dev); extern void intel_modeset_gem_init(struct drm_device *dev); extern void intel_modeset_cleanup(struct drm_device *dev); extern int intel_modeset_vga_set_state(struct drm_device *dev, bool state); diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index aa43e7b..98b9180 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -7517,7 +7517,7 @@ void intel_init_clock_gating(struct drm_device *dev) } /* Set up chip specific display functions */ -static void intel_init_display(struct drm_device *dev) +static int intel_init_display(struct drm_device *dev) { struct drm_i915_private *dev_priv = dev->dev_private; @@ -7609,8 +7609,10 @@ static void intel_init_display(struct drm_device *dev) } dev_priv->display.init_clock_gating = ivybridge_init_clock_gating; - } else - dev_priv->display.update_wm = NULL; + } else { + DRM_ERROR("Unknown chipset: %04x\n", dev->pci_device); + return -ENODEV; + } } else if (IS_PINEVIEW(dev)) { if (!intel_get_cxsr_latency(IS_PINEVIEW_G(dev), dev_priv->is_ddr3, @@ -7656,6 +7658,8 @@ static void intel_init_display(struct drm_device *dev) else dev_priv->display.get_fifo_size = i830_get_fifo_size; } + + return 0; } /* @@ -7741,10 +7745,10 @@ static void i915_disable_vga(struct drm_device *dev) POSTING_READ(vga_reg); } -void intel_modeset_init(struct drm_device *dev) +int intel_modeset_init(struct drm_device *dev) { struct drm_i915_private *dev_priv = dev->dev_private; - int i; + int i, ret; drm_mode_config_init(dev); @@ -7755,7 +7759,9 @@ void intel_modeset_init(struct drm_device *dev) intel_init_quirks(dev); - intel_init_display(dev); + ret = intel_init_display(dev); + if (ret) + return ret; if (IS_GEN2(dev)) { dev->mode_config.max_width = 2048; @@ -7793,6 +7799,8 @@ void intel_modeset_init(struct drm_device *dev) INIT_WORK(&dev_priv->idle_work, intel_idle_update); setup_timer(&dev_priv->idle_timer, intel_gpu_idle_timer, (unsigned long)dev); + + return 0; } void intel_modeset_gem_init(struct drm_device *dev) -- 1.7.5.4 [View Less]

2 1

[PATCH] drm/kms: allow drm_mode_group with no objects
by skeggsb＠gmail.com 04 Jul '11

04 Jul '11

From: Ben Skeggs <bskeggs(a)redhat.com> Sometimes we could be controlling a device (such as an NVIDIA Tesla) that has no crtcs/encoders/connectors. One could argue that the driver should unset DRIVER_MODESET in this case, but that changes a whole heap of the DRM's other behaviours, and it's much easier to just be a modesetting driver without any outputs. Signed-off-by: Ben Skeggs <bskeggs(a)redhat.com> --- drivers/gpu/drm/drm_crtc.c | 3 --- 1 files changed, 0 insertions(+), … [View More]

1 0

[PATCH 1/2] drm/nouveau: fixup init/fini sequence to deal with no CRTCs
by skeggsb＠gmail.com 04 Jul '11

04 Jul '11

From: Ben Skeggs <bskeggs(a)redhat.com> Signed-off-by: Ben Skeggs <bskeggs(a)redhat.com> --- drivers/gpu/drm/nouveau/nouveau_object.c | 4 +- drivers/gpu/drm/nouveau/nouveau_state.c | 64 +++++++++++++----------------- 2 files changed, 30 insertions(+), 38 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_object.c b/drivers/gpu/drm/nouveau/nouveau_object.c index 363379c..4406c175 100644 --- a/drivers/gpu/drm/nouveau/nouveau_object.c +++ b/drivers/gpu/drm/nouveau/… [View More]nouveau_object.c @@ -793,7 +793,7 @@ nouveau_gpuobj_channel_init(struct nouveau_channel *chan, return ret; /* dma objects for display sync channel semaphore blocks */ - for (i = 0; i < 2; i++) { + for (i = 0; i < dev->mode_config.num_crtc; i++) { struct nouveau_gpuobj *sem = NULL; struct nv50_display_crtc *dispc = &nv50_display(dev)->crtc[i]; @@ -878,7 +878,7 @@ nouveau_gpuobj_channel_takedown(struct nouveau_channel *chan) if (dev_priv->card_type >= NV_50) { struct nv50_display *disp = nv50_display(dev); - for (i = 0; i < 2; i++) { + for (i = 0; i < dev->mode_config.num_crtc; i++) { struct nv50_display_crtc *dispc = &disp->crtc[i]; nouveau_bo_vma_del(dispc->sem.bo, &chan->dispc_vma[i]); } diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c index a5619a4..a7df8ea 100644 --- a/drivers/gpu/drm/nouveau/nouveau_state.c +++ b/drivers/gpu/drm/nouveau/nouveau_state.c @@ -452,21 +452,6 @@ nouveau_vga_set_decode(void *priv, bool state) return VGA_RSRC_NORMAL_IO | VGA_RSRC_NORMAL_MEM; } -static int -nouveau_card_init_channel(struct drm_device *dev) -{ - struct drm_nouveau_private *dev_priv = dev->dev_private; - int ret; - - ret = nouveau_channel_alloc(dev, &dev_priv->channel, NULL, - NvDmaFB, NvDmaTT); - if (ret) - return ret; - - mutex_unlock(&dev_priv->channel->mutex); - return 0; -} - static void nouveau_switcheroo_set_state(struct pci_dev *pdev, enum vga_switcheroo_state state) { @@ -657,6 +642,10 @@ nouveau_card_init(struct drm_device *dev) goto out_engine; } + ret = nouveau_irq_init(dev); + if (ret) + goto out_fifo; + /* initialise general modesetting */ drm_mode_config_init(dev); drm_mode_create_scaling_mode_property(dev); @@ -679,39 +668,40 @@ nouveau_card_init(struct drm_device *dev) ret = engine->display.create(dev); if (ret) - goto out_fifo; - - ret = drm_vblank_init(dev, nv_two_heads(dev) ? 2 : 1); - if (ret) - goto out_vblank; - - ret = nouveau_irq_init(dev); - if (ret) - goto out_vblank; - - /* what about PVIDEO/PCRTC/PRAMDAC etc? */ + goto out_irq; if (dev_priv->eng[NVOBJ_ENGINE_GR]) { ret = nouveau_fence_init(dev); if (ret) - goto out_irq; + goto out_disp; - ret = nouveau_card_init_channel(dev); + ret = nouveau_channel_alloc(dev, &dev_priv->channel, NULL, + NvDmaFB, NvDmaTT); if (ret) goto out_fence; + + mutex_unlock(&dev_priv->channel->mutex); + } + + if (dev->mode_config.num_crtc) { + ret = drm_vblank_init(dev, dev->mode_config.num_crtc); + if (ret) + goto out_chan; + + nouveau_fbcon_init(dev); + drm_kms_helper_poll_init(dev); } - nouveau_fbcon_init(dev); - drm_kms_helper_poll_init(dev); return 0; +out_chan: + nouveau_channel_put_unlocked(&dev_priv->channel); out_fence: nouveau_fence_fini(dev); +out_disp: + engine->display.destroy(dev); out_irq: nouveau_irq_fini(dev); -out_vblank: - drm_vblank_cleanup(dev); - engine->display.destroy(dev); out_fifo: if (!dev_priv->noaccel) engine->fifo.takedown(dev); @@ -758,8 +748,11 @@ static void nouveau_card_takedown(struct drm_device *dev) struct nouveau_engine *engine = &dev_priv->engine; int e; - drm_kms_helper_poll_fini(dev); - nouveau_fbcon_fini(dev); + if (dev->mode_config.num_crtc) { + drm_kms_helper_poll_fini(dev); + nouveau_fbcon_fini(dev); + drm_vblank_cleanup(dev); + } if (dev_priv->channel) { nouveau_channel_put_unlocked(&dev_priv->channel); @@ -801,7 +794,6 @@ static void nouveau_card_takedown(struct drm_device *dev) engine->vram.takedown(dev); nouveau_irq_fini(dev); - drm_vblank_cleanup(dev); nouveau_pm_fini(dev); nouveau_bios_takedown(dev); -- 1.7.5.4 [View Less]

2 1

[PATCH] nouveau: Do not leak in nv20_graph_create
by Jesper Juhl 03 Jul '11

03 Jul '11

If we return due to an unknown chipset in drivers/gpu/drm/nouveau/nv20_graph.c:nv20_graph_create() we'll leak the memory allocated to 'pgraph'. This patch should fix the leak and it also disambiguates the "PGRAPH: unknown chipset\n" error message - it's nice to be able to tell which branch created the error which is impossible if the error messages are 100% identical. Signed-off-by: Jesper Juhl <jj(a)chaosbits.net> --- drivers/gpu/drm/nouveau/nv20_graph.c | 4 +++- 1 files changed,… [View More]

4 5

[PATCH] nouveau: Don't leak in nva3_pm_clock_pre()
by Jesper Juhl 03 Jul '11

03 Jul '11

If nva3_calc_pll() returns less than 0 in drivers/gpu/drm/nouveau/nva3_pm.c:nva3_pm_clock_pre() we'll return without freeing 'pll'. This patch should fix the leak. Signed-off-by: Jesper Juhl <jj(a)chaosbits.net> --- drivers/gpu/drm/nouveau/nva3_pm.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) Compile tested only - no hardware to test for real. diff --git a/drivers/gpu/drm/nouveau/nva3_pm.c b/drivers/gpu/drm/nouveau/nva3_pm.c index e4b2b9e..80443d2 100644 --- a/… [View More]

2 1

[Bug 38921] New: Heroes of Newerth fails to start
by bugzilla-daemon＠freedesktop.org 03 Jul '11

03 Jul '11

https://bugs.freedesktop.org/show_bug.cgi?id=38921 Summary: Heroes of Newerth fails to start Product: Mesa Version: git Platform: x86 (IA32) OS/Version: Linux (All) Status: NEW Severity: normal Priority: medium Component: Drivers/Gallium/r600 AssignedTo: dri-devel(a)lists.freedesktop.org ReportedBy: g.galwas(a)highantdev.de When trying to start Heroes of Newerth the game reports K2 - … [View More]

1 5

[Bug 33171] New: [r600g, wine] kernel crash when loading level in FEAR
by bugzilla-daemon＠freedesktop.org 03 Jul '11

03 Jul '11

https://bugs.freedesktop.org/show_bug.cgi?id=33171 Summary: [r600g, wine] kernel crash when loading level in FEAR Product: DRI Version: DRI CVS Platform: x86-64 (AMD64) OS/Version: Linux (All) Status: NEW Severity: critical Priority: medium Component: DRM/Radeon AssignedTo: dri-devel(a)lists.freedesktop.org ReportedBy: liquid.acid(a)gmx.net Created an attachment (id=42087) --> (… [View More]

1 7

[PATCH] drm/i915: add check for valid init_clock_gating-pointer
by Wolfram Sang 02 Jul '11

02 Jul '11

Commit 6067aa (drm/i915: split clock gating init into per-chipset functions) unconditionally calls the newly created init_clock_gating-pointer. There is one case, however, where it does not get set: if (HAS_PCH_SPLIT(dev)) { ... } else dev_priv->display.update_wm = NULL; } This can lead to a NULL-pointer exception as in https://bugzilla.kernel.org/show_bug.cgi?id=37252 Fix it by checking if the pointer is valid before using it. Signed-off-by: Wolfram Sang <w.sang(a)pengutronix.de&… [View More]

3 12

[git pull] drm radeon/nouveau fixes
by Dave Airlie 02 Jul '11

02 Jul '11

Hi Linus, Ben was a bit hopeful that NVidia didn't redesign half the gpu for a new series, apparantly they did, so the 0xd0 series needs some more work, and another couple of minor radeon fixes from Alex. Dave. The following changes since commit daf54f1f363a61c618662ef66d4bf09d2b090941: drm/radeon/kms: Fix chremap setup on RV770 CE (2011-07-01 07:29:46 +1000) are available in the git repository at: ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git drm-fixes Alex … [View More]

1 0

[PULL] drm-intel-fixes (drm/i915 driver)
by Keith Packard 01 Jul '11

01 Jul '11

Another forcewake fix, a NULL pointer oops, some error-path cleanups, a UMS for IRL fix and another IVB fix. The UMS for IRL fix (from Jesse) contains a bunch of code motion, hence the fairly large diffstat. Otherwise, these are all tiny fixes. The following changes since commit 0d72c6fcb5cd215eeab824fac216ea42c5b574aa: Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6 (2011-06-28 11:15:57 -0700) are available in the git repository at: ssh:/… [View More]

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel July 2011