From: <dar...@ke...> - 2009-03-09 11:25:28
|
linux-core/Makefile.kernel | 6 linux-core/nouveau_connector.h | 52 ++ linux-core/nouveau_crtc.h | 59 ++ linux-core/nouveau_display.c | 108 ++++ linux-core/nouveau_dma.h | 2 linux-core/nouveau_drv.c | 5 linux-core/nouveau_encoder.h | 44 + linux-core/nouveau_fb.h | 44 + linux-core/nouveau_fbcon.c | 945 +++++++++++++++++++++++++++++++++++++ linux-core/nouveau_fbcon.h | 48 + linux-core/nouveau_gem.c | 22 linux-core/nv50_connector.c | 615 ++++++++++-------------- linux-core/nv50_crtc.c | 1038 +++++++++++++++-------------------------- linux-core/nv50_cursor.c | 93 ++- linux-core/nv50_cursor.h | 21 linux-core/nv50_dac.c | 270 ++++++---- linux-core/nv50_display.c | 302 ++++++----- linux-core/nv50_display.h | 24 linux-core/nv50_fbcon.c | 752 ++++++----------------------- linux-core/nv50_fbcon.h | 41 - linux-core/nv50_fbcon_accel.c | 216 -------- linux-core/nv50_i2c.c | 2 linux-core/nv50_sor.c | 258 ++++++---- shared-core/nouveau_drv.h | 1 shared-core/nouveau_irq.c | 73 -- shared-core/nouveau_mem.c | 28 - shared-core/nouveau_state.c | 10 27 files changed, 2713 insertions(+), 2366 deletions(-) New commits: commit cbbbc9a1fce02237bbfe326a2b9ad255e39afd6f Author: Ben Skeggs <bs...@re...> Date: Mon Mar 9 21:14:18 2009 +1000 nv50: remove division from nv50_vm_bind_linear diff --git a/shared-core/nouveau_mem.c b/shared-core/nouveau_mem.c index 4d1d3b3..45fb35c 100644 --- a/shared-core/nouveau_mem.c +++ b/shared-core/nouveau_mem.c @@ -282,18 +282,18 @@ nv50_mem_vm_bind_linear(struct drm_device *dev, uint64_t virt, uint32_t size, { struct drm_nouveau_private *dev_priv = dev->dev_private; struct nouveau_gpuobj **pgt; - unsigned psz, pfl; + unsigned psz, pfl, pages; if (virt >= dev_priv->vm_gart_base && (virt + size) < (dev_priv->vm_gart_base + dev_priv->vm_gart_size)) { - psz = 4096; + psz = 12; pgt = &dev_priv->gart_info.sg_ctxdma; pfl = 0x21; virt -= dev_priv->vm_gart_base; } else if (virt >= dev_priv->vm_vram_base && (virt + size) < (dev_priv->vm_vram_base + dev_priv->vm_vram_size)) { - psz = 65536; + psz = 16; pgt = dev_priv->vm_vram_pt; pfl = 0x01; virt -= dev_priv->vm_vram_base; @@ -303,31 +303,29 @@ nv50_mem_vm_bind_linear(struct drm_device *dev, uint64_t virt, uint32_t size, return -EINVAL; } - size &= ~(psz - 1); + pages = size >> psz; dev_priv->engine.instmem.prepare_access(dev, true); if (flags & 0x80000000) { - while (size) { - struct nouveau_gpuobj *pt = pgt[virt / (512*1024*1024)]; - int pte = ((virt % (512*1024*1024)) / psz) * 2; + while (pages--) { + struct nouveau_gpuobj *pt = pgt[virt >> 29]; + unsigned pte = ((virt & 0x1fffffffULL) >> psz) << 1; INSTANCE_WR(pt, pte++, 0x00000000); INSTANCE_WR(pt, pte++, 0x00000000); - size -= psz; - virt += psz; + virt += (1 << psz); } } else { - while (size) { - struct nouveau_gpuobj *pt = pgt[virt / (512*1024*1024)]; - int pte = ((virt % (512*1024*1024)) / psz) * 2; + while (pages--) { + struct nouveau_gpuobj *pt = pgt[virt >> 29]; + unsigned pte = ((virt & 0x1fffffffULL) >> psz) << 1; INSTANCE_WR(pt, pte++, phys | pfl); INSTANCE_WR(pt, pte++, flags); - size -= psz; - phys += psz; - virt += psz; + phys += (1 << psz); + virt += (1 << psz); } } dev_priv->engine.instmem.finish_access(dev); commit 15e2184f742c21bd852bd970c7a71c77e082c9f5 Author: Ben Skeggs <bs...@re...> Date: Mon Mar 9 11:04:49 2009 +1000 nouveau: respect the nomap flag for gem objects diff --git a/linux-core/nouveau_gem.c b/linux-core/nouveau_gem.c index 62d68a1..0956825 100644 --- a/linux-core/nouveau_gem.c +++ b/linux-core/nouveau_gem.c @@ -93,6 +93,7 @@ nouveau_gem_new(struct drm_device *dev, struct nouveau_channel *chan, if (!gem) return -ENOMEM; ngem = gem->driver_private; + ngem->mappable = true; ret = drm_buffer_object_create(dev, size, drm_bo_type_device, flags, 0, align, 0, &ngem->bo); @@ -102,8 +103,13 @@ nouveau_gem_new(struct drm_device *dev, struct nouveau_channel *chan, if (chan && (domain & (NOUVEAU_GEM_DOMAIN_VRAM | NOUVEAU_GEM_DOMAIN_GART))) { flags = 0; - if (domain & NOUVEAU_GEM_DOMAIN_VRAM) - flags |= DRM_BO_FLAG_MEM_VRAM | DRM_BO_FLAG_MEM_PRIV0; + if (domain & NOUVEAU_GEM_DOMAIN_VRAM) { + flags |= DRM_BO_FLAG_MEM_VRAM; + if (flags & NOUVEAU_GEM_DOMAIN_NOMAP) { + flags |= DRM_BO_FLAG_MEM_PRIV0; + ngem->mappable = false; + } + } if (domain & NOUVEAU_GEM_DOMAIN_GART) flags |= DRM_BO_FLAG_MEM_TT; @@ -207,7 +213,7 @@ nouveau_gem_set_domain(struct nouveau_channel *chan, struct drm_gem_object *gem, if (write_domains) { if ((valid_domains & NOUVEAU_GEM_DOMAIN_VRAM) && (write_domains & NOUVEAU_GEM_DOMAIN_VRAM)) - flags = (DRM_BO_FLAG_MEM_VRAM | DRM_BO_FLAG_MEM_PRIV0); + flags = DRM_BO_FLAG_MEM_VRAM; else if ((valid_domains & NOUVEAU_GEM_DOMAIN_GART) && (write_domains & NOUVEAU_GEM_DOMAIN_GART)) @@ -219,7 +225,7 @@ nouveau_gem_set_domain(struct nouveau_channel *chan, struct drm_gem_object *gem, (read_domains & NOUVEAU_GEM_DOMAIN_VRAM) && (bo->mem.mem_type == DRM_BO_MEM_VRAM || bo->mem.mem_type == DRM_BO_MEM_PRIV0)) - flags = (DRM_BO_FLAG_MEM_VRAM | DRM_BO_FLAG_MEM_PRIV0); + flags = DRM_BO_FLAG_MEM_VRAM; else if ((valid_domains & NOUVEAU_GEM_DOMAIN_GART) && (read_domains & NOUVEAU_GEM_DOMAIN_GART) && @@ -228,11 +234,14 @@ nouveau_gem_set_domain(struct nouveau_channel *chan, struct drm_gem_object *gem, else if ((valid_domains & NOUVEAU_GEM_DOMAIN_VRAM) && (read_domains & NOUVEAU_GEM_DOMAIN_VRAM)) - flags = (DRM_BO_FLAG_MEM_VRAM | DRM_BO_FLAG_MEM_PRIV0); + flags = DRM_BO_FLAG_MEM_VRAM; else flags = DRM_BO_FLAG_MEM_TT; } + if ((flags & (DRM_BO_FLAG_MEM_VRAM)) && !ngem->mappable) + flags |= DRM_BO_FLAG_MEM_PRIV0; + if (read_domains) flags |= DRM_BO_FLAG_READ; @@ -591,6 +600,9 @@ nouveau_gem_ioctl_mmap(struct drm_device *dev, void *data, return -EINVAL; ngem = gem->driver_private; + if (!ngem->mappable) + return -EINVAL; + if (ngem->bo->mem.mem_type == DRM_BO_MEM_LOCAL) { ret = drm_bo_do_validate(ngem->bo, DRM_BO_FLAG_MEM_TT, DRM_BO_MASK_MEMTYPE, diff --git a/shared-core/nouveau_drv.h b/shared-core/nouveau_drv.h index c6d258a..eb99ce5 100644 --- a/shared-core/nouveau_drv.h +++ b/shared-core/nouveau_drv.h @@ -54,6 +54,7 @@ struct nouveau_gem_object { struct drm_gem_object *gem; struct drm_buffer_object *bo; + bool mappable; }; static inline struct nouveau_gem_object * commit fa73fa68896b2c2656dd9bee1a818afc294232f0 Author: Ben Skeggs <bs...@re...> Date: Mon Mar 9 10:56:01 2009 +1000 nouveau: big rewrite of nv50 kms code This is a essentially a big squash merge from the kernel tree I've been working in, sorry about the loss of history, but commiting each patch individually would've taken quite a while to do. The nv50 kms code now uses the helpers in the drm, simplifying the code greatly. The code is far more stable than previously on all the G8x cards I've been able to test on, but there's likely still bugs to be ironed out! diff --git a/linux-core/Makefile.kernel b/linux-core/Makefile.kernel index c25ae7c..4fd21f5 100644 --- a/linux-core/Makefile.kernel +++ b/linux-core/Makefile.kernel @@ -38,9 +38,9 @@ nouveau-objs := nouveau_drv.o nouveau_state.o nouveau_fifo.o nouveau_mem.o \ nv04_graph.o nv10_graph.o nv20_graph.o \ nv40_graph.o nv50_graph.o \ nv04_instmem.o nv50_instmem.o \ - nouveau_bios.o \ - nv50_crtc.o nv50_cursor.o nv50_lut.o nv50_sor.o nv50_dac.o nv50_connector.o nv50_i2c.o nv50_display.o \ - nv50_fbcon.o nv50_fbcon_accel.o + nouveau_bios.o nouveau_display.o nouveau_fbcon.o \ + nv50_display.o nv50_connector.o nv50_sor.o nv50_dac.o \ + nv50_crtc.o nv50_cursor.o nv50_i2c.o nv50_fbcon.o radeon-objs := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o radeon_irq.o r300_cmdbuf.o radeon_gem.o \ radeon_buffer.o radeon_fence.o atom.o radeon_display.o radeon_atombios.o radeon_i2c.o radeon_connectors.o radeon_cs.o \ atombios_crtc.o radeon_encoders.o radeon_fb.o radeon_combios.o radeon_legacy_crtc.o radeon_legacy_encoders.o \ diff --git a/linux-core/nouveau_connector.h b/linux-core/nouveau_connector.h new file mode 100644 index 0000000..4259eb3 --- /dev/null +++ b/linux-core/nouveau_connector.h @@ -0,0 +1,52 @@ +/* + * Copyright (C) 2008 Maarten Maathuis. + * All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice (including the + * next paragraph) shall be included in all copies or substantial + * portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + */ + +#ifndef __NOUVEAU_CONNECTOR_H__ +#define __NOUVEAU_CONNECTOR_H__ + +#include "nv50_i2c.h" + +struct nouveau_connector { + struct drm_connector base; + + struct drm_display_mode *native_mode; + bool digital; + + int bus; + struct nv50_i2c_channel *i2c_chan; + + int scaling_mode; + + bool use_dithering; + + struct nouveau_encoder *(*to_encoder) (struct nouveau_connector *connector, bool digital); +}; +#define to_nouveau_connector(x) container_of((x), struct nouveau_connector, base) + +int nv50_connector_create(struct drm_device *dev, int bus, int i2c_index, int type); +void nv50_connector_detect_all(struct drm_device *dev); + +#endif /* __NOUVEAU_CONNECTOR_H__ */ diff --git a/linux-core/nouveau_crtc.h b/linux-core/nouveau_crtc.h new file mode 100644 index 0000000..0ba9475 --- /dev/null +++ b/linux-core/nouveau_crtc.h @@ -0,0 +1,59 @@ +/* + * Copyright (C) 2008 Maarten Maathuis. + * All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice (including the + * next paragraph) shall be included in all copies or substantial + * portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + */ + +#ifndef __NOUVEAU_CRTC_H__ +#define __NOUVEAU_CRTC_H__ + +struct nouveau_crtc { + struct drm_crtc base; + + int index; + + struct drm_mode_set mode_set; + + struct drm_display_mode *mode; + bool use_dithering; + + struct nv50_cursor *cursor; + struct { + struct mem_block *mem; + uint16_t r[256]; + uint16_t g[256]; + uint16_t b[256]; + int depth; + } lut; + + int (*set_dither) (struct nouveau_crtc *crtc); + int (*set_scale) (struct nouveau_crtc *crtc, int mode, bool update); + int (*set_clock) (struct nouveau_crtc *crtc, struct drm_display_mode *); + int (*set_clock_mode) (struct nouveau_crtc *crtc); + int (*destroy) (struct nouveau_crtc *crtc); +}; +#define to_nouveau_crtc(x) container_of((x), struct nouveau_crtc, base) + +int nv50_crtc_create(struct drm_device *dev, int index); + +#endif /* __NOUVEAU_CRTC_H__ */ diff --git a/linux-core/nouveau_display.c b/linux-core/nouveau_display.c new file mode 100644 index 0000000..5636bdd --- /dev/null +++ b/linux-core/nouveau_display.c @@ -0,0 +1,108 @@ +/* + * Copyright (C) 2008 Maarten Maathuis. + * All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice (including the + * next paragraph) shall be included in all copies or substantial + * portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + */ + +#include "drmP.h" +#include "drm_crtc_helper.h" +#include "nouveau_fb.h" +#include "nouveau_fbcon.h" + +static void +nouveau_user_framebuffer_destroy(struct drm_framebuffer *drm_fb) +{ + struct nouveau_framebuffer *fb = to_nouveau_framebuffer(drm_fb); + struct drm_device *dev = drm_fb->dev; + + if (drm_fb->fbdev) + nouveau_fbcon_remove(dev, drm_fb); + + if (fb->gem) { + mutex_lock(&dev->struct_mutex); + drm_gem_object_unreference(fb->gem); + mutex_unlock(&dev->struct_mutex); + } + + drm_framebuffer_cleanup(drm_fb); + kfree(fb); +} + +static int +nouveau_user_framebuffer_create_handle(struct drm_framebuffer *drm_fb, + struct drm_file *file_priv, + unsigned int *handle) +{ + struct nouveau_framebuffer *fb = to_nouveau_framebuffer(drm_fb); + + return drm_gem_handle_create(file_priv, fb->gem, handle); +} + +static const struct drm_framebuffer_funcs nouveau_framebuffer_funcs = { + .destroy = nouveau_user_framebuffer_destroy, + .create_handle = nouveau_user_framebuffer_create_handle, +}; + +struct drm_framebuffer * +nouveau_framebuffer_create(struct drm_device *dev, struct drm_gem_object *gem, + struct drm_mode_fb_cmd *mode_cmd) +{ + struct nouveau_framebuffer *fb; + + fb = kzalloc(sizeof(struct nouveau_framebuffer), GFP_KERNEL); + if (!fb) + return NULL; + + drm_framebuffer_init(dev, &fb->base, &nouveau_framebuffer_funcs); + drm_helper_mode_fill_fb_struct(&fb->base, mode_cmd); + + fb->gem = gem; + return &fb->base; +} + +static struct drm_framebuffer * +nouveau_user_framebuffer_create(struct drm_device *dev, + struct drm_file *file_priv, + struct drm_mode_fb_cmd *mode_cmd) +{ + struct drm_framebuffer *fb; + struct drm_gem_object *gem; + + gem = drm_gem_object_lookup(dev, file_priv, mode_cmd->handle); + if (!gem) + return NULL; + + fb = nouveau_framebuffer_create(dev, gem, mode_cmd); + if (!fb) { + drm_gem_object_unreference(gem); + return NULL; + } + + return fb; +} + +const struct drm_mode_config_funcs nouveau_mode_config_funcs = { + .fb_create = nouveau_user_framebuffer_create, + .fb_changed = nouveau_fbcon_probe, +}; + diff --git a/linux-core/nouveau_dma.h b/linux-core/nouveau_dma.h index 0d21609..66d567f 100644 --- a/linux-core/nouveau_dma.h +++ b/linux-core/nouveau_dma.h @@ -99,7 +99,7 @@ FIRE_RING(struct nouveau_channel *chan) /* This should allow easy switching to a real fifo in the future. */ #define OUT_MODE(mthd, val) do { \ - nv50_display_command(dev_priv, mthd, val); \ + nv50_display_command(dev, mthd, val); \ } while(0) #endif diff --git a/linux-core/nouveau_drv.c b/linux-core/nouveau_drv.c index 2aca753..8b0abf0 100644 --- a/linux-core/nouveau_drv.c +++ b/linux-core/nouveau_drv.c @@ -31,9 +31,12 @@ int nouveau_mm_enabled = 0; module_param_named(mm_enabled, nouveau_mm_enabled, int, 0400); -unsigned int nouveau_modeset = 0; /* kms */ +int nouveau_modeset = 0; /* kms */ module_param_named(modeset, nouveau_modeset, int, 0400); +int nouveau_fbpercrtc = 0; +module_param_named(fbpercrtc, nouveau_fbpercrtc, int, 0400); + static struct pci_device_id pciidlist[] = { { PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID), diff --git a/linux-core/nouveau_encoder.h b/linux-core/nouveau_encoder.h new file mode 100644 index 0000000..36fcf3f --- /dev/null +++ b/linux-core/nouveau_encoder.h @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2008 Maarten Maathuis. + * All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice (including the + * next paragraph) shall be included in all copies or substantial + * portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + */ + +#ifndef __NOUVEAU_OUTPUT_H__ +#define __NOUVEAU_OUTPUT_H__ + +struct nouveau_encoder { + struct drm_encoder base; + + struct dcb_entry *dcb_entry; + int or; + + int (*set_clock_mode) (struct nouveau_encoder *encoder, + struct drm_display_mode *mode); +}; +#define to_nouveau_encoder(x) container_of((x), struct nouveau_encoder, base) + +int nv50_sor_create(struct drm_device *dev, struct dcb_entry *entry); +int nv50_dac_create(struct drm_device *dev, struct dcb_entry *entry); + +#endif /* __NOUVEAU_OUTPUT_H__ */ diff --git a/linux-core/nouveau_fb.h b/linux-core/nouveau_fb.h new file mode 100644 index 0000000..88ffdc0 --- /dev/null +++ b/linux-core/nouveau_fb.h @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2008 Maarten Maathuis. + * All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice (including the + * next paragraph) shall be included in all copies or substantial + * portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + */ + +#ifndef __NOUVEAU_FB_H__ +#define __NOUVEAU_FB_H__ + +struct nouveau_framebuffer { + struct drm_framebuffer base; + struct drm_gem_object *gem; + struct drm_bo_kmap_obj kmap; +}; + +#define to_nouveau_framebuffer(x) container_of((x), struct nouveau_framebuffer, base) + +extern const struct drm_mode_config_funcs nouveau_mode_config_funcs; + +struct drm_framebuffer * +nouveau_framebuffer_create(struct drm_device *, struct drm_gem_object *, + struct drm_mode_fb_cmd *); + +#endif /* __NOUVEAU_FB_H__ */ diff --git a/linux-core/nouveau_fbcon.c b/linux-core/nouveau_fbcon.c new file mode 100644 index 0000000..6c9db9e --- /dev/null +++ b/linux-core/nouveau_fbcon.c @@ -0,0 +1,945 @@ +/* + * Copyright © 2007 David Airlie + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * Authors: + * David Airlie + */ + +#include <linux/module.h> +#include <linux/kernel.h> +#include <linux/errno.h> +#include <linux/string.h> +#include <linux/mm.h> +#include <linux/tty.h> +#include <linux/slab.h> +#include <linux/sysrq.h> +#include <linux/delay.h> +#include <linux/fb.h> +#include <linux/init.h> + +#include "drmP.h" +#include "drm.h" +#include "drm_crtc.h" +#include "drm_crtc_helper.h" +#include "nouveau_drv.h" +#include "nouveau_drm.h" +#include "nouveau_crtc.h" +#include "nouveau_fb.h" +#include "nouveau_fbcon.h" + +extern int nouveau_fbpercrtc; + +static int nouveau_fbcon_setcolreg(unsigned regno, unsigned red, unsigned green, + unsigned blue, unsigned transp, + struct fb_info *info) +{ + struct nouveau_fbcon_par *par = info->par; + struct drm_device *dev = par->dev; + struct drm_crtc *crtc; + int i; + + list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { + struct nouveau_crtc *nouveau_crtc = to_nouveau_crtc(crtc); + struct drm_mode_set *modeset = &nouveau_crtc->mode_set; + struct drm_framebuffer *fb = modeset->fb; + + for (i = 0; i < par->crtc_count; i++) + if (crtc->base.id == par->crtc_ids[i]) + break; + + if (i == par->crtc_count) + continue; + + + if (regno > 255) + return 1; + + if (fb->depth == 8) { + /* TODO */ + } + + if (regno < 16) { + switch (fb->depth) { + case 15: + fb->pseudo_palette[regno] = ((red & 0xf800) >> 1) | + ((green & 0xf800) >> 6) | + ((blue & 0xf800) >> 11); + break; + case 16: + fb->pseudo_palette[regno] = (red & 0xf800) | + ((green & 0xfc00) >> 5) | + ((blue & 0xf800) >> 11); + break; + case 24: + case 32: + fb->pseudo_palette[regno] = ((red & 0xff00) << 8) | + (green & 0xff00) | + ((blue & 0xff00) >> 8); + break; + } + } + } + return 0; +} + +static int nouveau_fbcon_check_var(struct fb_var_screeninfo *var, + struct fb_info *info) +{ + struct nouveau_fbcon_par *par = info->par; + struct nouveau_framebuffer *nouveau_fb = par->nouveau_fb; + struct drm_framebuffer *fb = &nouveau_fb->base; + int depth; + + if (var->pixclock == -1 || !var->pixclock) + return -EINVAL; + + /* Need to resize the fb object !!! */ + if (var->xres > fb->width || var->yres > fb->height) { + DRM_ERROR("Requested width/height is greater than current fb object %dx%d > %dx%d\n",var->xres,var->yres,fb->width,fb->height); + DRM_ERROR("Need resizing code.\n"); + return -EINVAL; + } + + switch (var->bits_per_pixel) { + case 16: + depth = (var->green.length == 6) ? 16 : 15; + break; + case 32: + depth = (var->transp.length > 0) ? 32 : 24; + break; + default: + depth = var->bits_per_pixel; + break; + } + + switch (depth) { + case 8: + var->red.offset = 0; + var->green.offset = 0; + var->blue.offset = 0; + var->red.length = 8; + var->green.length = 8; + var->blue.length = 8; + var->transp.length = 0; + var->transp.offset = 0; + break; + case 15: + var->red.offset = 10; + var->green.offset = 5; + var->blue.offset = 0; + var->red.length = 5; + var->green.length = 5; + var->blue.length = 5; + var->transp.length = 1; + var->transp.offset = 15; + break; + case 16: + var->red.offset = 11; + var->green.offset = 5; + var->blue.offset = 0; + var->red.length = 5; + var->green.length = 6; + var->blue.length = 5; + var->transp.length = 0; + var->transp.offset = 0; + break; + case 24: + var->red.offset = 16; + var->green.offset = 8; + var->blue.offset = 0; + var->red.length = 8; + var->green.length = 8; + var->blue.length = 8; + var->transp.length = 0; + var->transp.offset = 0; + break; + case 32: + var->red.offset = 16; + var->green.offset = 8; + var->blue.offset = 0; + var->red.length = 8; + var->green.length = 8; + var->blue.length = 8; + var->transp.length = 8; + var->transp.offset = 24; + break; + default: + return -EINVAL; + } + + return 0; +} + +/* this will let fbcon do the mode init */ +/* FIXME: take mode config lock? */ +static int nouveau_fbcon_set_par(struct fb_info *info) +{ + struct nouveau_fbcon_par *par = info->par; + struct drm_device *dev = par->dev; + struct fb_var_screeninfo *var = &info->var; + int i; + + DRM_DEBUG("%d %d\n", var->xres, var->pixclock); + + if (var->pixclock != -1) { + + DRM_ERROR("PIXEL CLCOK SET\n"); + return -EINVAL; + } else { + struct drm_crtc *crtc; + int ret; + + list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { + struct nouveau_crtc *nouveau_crtc = to_nouveau_crtc(crtc); + + for (i = 0; i < par->crtc_count; i++) + if (crtc->base.id == par->crtc_ids[i]) + break; + + if (i == par->crtc_count) + continue; + + if (crtc->fb == nouveau_crtc->mode_set.fb) { + mutex_lock(&dev->mode_config.mutex); + ret = crtc->funcs->set_config(&nouveau_crtc->mode_set); + mutex_unlock(&dev->mode_config.mutex); + if (ret) + return ret; + } + } + return 0; + } +} + +static int nouveau_fbcon_pan_display(struct fb_var_screeninfo *var, + struct fb_info *info) +{ + struct nouveau_fbcon_par *par = info->par; + struct drm_device *dev = par->dev; + struct drm_mode_set *modeset; + struct drm_crtc *crtc; + struct nouveau_crtc *nouveau_crtc; + int ret = 0; + int i; + + list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { + for (i = 0; i < par->crtc_count; i++) + if (crtc->base.id == par->crtc_ids[i]) + break; + + if (i == par->crtc_count) + continue; + + nouveau_crtc = to_nouveau_crtc(crtc); + modeset = &nouveau_crtc->mode_set; + + modeset->x = var->xoffset; + modeset->y = var->yoffset; + + if (modeset->num_connectors) { + mutex_lock(&dev->mode_config.mutex); + ret = crtc->funcs->set_config(modeset); + mutex_unlock(&dev->mode_config.mutex); + if (!ret) { + info->var.xoffset = var->xoffset; + info->var.yoffset = var->yoffset; + } + } + } + + return ret; +} + +static void nouveau_fbcon_on(struct fb_info *info) +{ + struct nouveau_fbcon_par *par = info->par; + struct drm_device *dev = par->dev; + struct drm_crtc *crtc; + struct drm_encoder *encoder; + int i; + + /* + * For each CRTC in this fb, find all associated encoders + * and turn them off, then turn off the CRTC. + */ + list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { + struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private; + + for (i = 0; i < par->crtc_count; i++) + if (crtc->base.id == par->crtc_ids[i]) + break; + + crtc_funcs->dpms(crtc, DRM_MODE_DPMS_ON); + + /* Found a CRTC on this fb, now find encoders */ + list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) { + if (encoder->crtc == crtc) { + struct drm_encoder_helper_funcs *encoder_funcs; + encoder_funcs = encoder->helper_private; + encoder_funcs->dpms(encoder, DRM_MODE_DPMS_ON); + } + } + } +} + +static void nouveau_fbcon_off(struct fb_info *info, int dpms_mode) +{ + struct nouveau_fbcon_par *par = info->par; + struct drm_device *dev = par->dev; + struct drm_crtc *crtc; + struct drm_encoder *encoder; + int i; + + /* + * For each CRTC in this fb, find all associated encoders + * and turn them off, then turn off the CRTC. + */ + list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { + struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private; + + for (i = 0; i < par->crtc_count; i++) + if (crtc->base.id == par->crtc_ids[i]) + break; + + /* Found a CRTC on this fb, now find encoders */ + list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) { + if (encoder->crtc == crtc) { + struct drm_encoder_helper_funcs *encoder_funcs; + encoder_funcs = encoder->helper_private; + encoder_funcs->dpms(encoder, dpms_mode); + } + } + if (dpms_mode == DRM_MODE_DPMS_OFF) + crtc_funcs->dpms(crtc, dpms_mode); + } +} + +static int nouveau_fbcon_blank(int blank, struct fb_info *info) +{ + switch (blank) { + case FB_BLANK_UNBLANK: + nouveau_fbcon_on(info); + break; + case FB_BLANK_NORMAL: + nouveau_fbcon_off(info, DRM_MODE_DPMS_STANDBY); + break; + case FB_BLANK_HSYNC_SUSPEND: + nouveau_fbcon_off(info, DRM_MODE_DPMS_STANDBY); + break; + case FB_BLANK_VSYNC_SUSPEND: + nouveau_fbcon_off(info, DRM_MODE_DPMS_SUSPEND); + break; + case FB_BLANK_POWERDOWN: + nouveau_fbcon_off(info, DRM_MODE_DPMS_OFF); + break; + } + return 0; +} + +static struct fb_ops nouveau_fbcon_ops = { + .owner = THIS_MODULE, + .fb_check_var = nouveau_fbcon_check_var, + .fb_set_par = nouveau_fbcon_set_par, + .fb_setcolreg = nouveau_fbcon_setcolreg, + .fb_fillrect = cfb_fillrect, + .fb_copyarea = cfb_copyarea, + .fb_imageblit = cfb_imageblit, + .fb_pan_display = nouveau_fbcon_pan_display, + .fb_blank = nouveau_fbcon_blank, +}; + +/** + * Curretly it is assumed that the old framebuffer is reused. + * + * LOCKING + * caller should hold the mode config lock. + * + */ +int nouveau_fbcon_resize(struct drm_device *dev, struct drm_crtc *crtc) +{ + struct fb_info *info; + struct drm_framebuffer *fb; + struct drm_display_mode *mode = crtc->desired_mode; + + fb = crtc->fb; + if (!fb) + return 1; + + info = fb->fbdev; + if (!info) + return 1; + + if (!mode) + return 1; + + info->var.xres = mode->hdisplay; + info->var.right_margin = mode->hsync_start - mode->hdisplay; + info->var.hsync_len = mode->hsync_end - mode->hsync_start; + info->var.left_margin = mode->htotal - mode->hsync_end; + info->var.yres = mode->vdisplay; + info->var.lower_margin = mode->vsync_start - mode->vdisplay; + info->var.vsync_len = mode->vsync_end - mode->vsync_start; + info->var.upper_margin = mode->vtotal - mode->vsync_end; + info->var.pixclock = 10000000 / mode->htotal * 1000 / mode->vtotal * 100; + /* avoid overflow */ + info->var.pixclock = info->var.pixclock * 1000 / mode->vrefresh; + + return 0; +} +EXPORT_SYMBOL(nouveau_fbcon_resize); + +static struct drm_mode_set kernelfb_mode; + +static int nouveau_fbcon_panic(struct notifier_block *n, unsigned long ununsed, + void *panic_str) +{ + DRM_ERROR("panic occurred, switching back to text console\n"); + + nouveau_fbcon_restore(); + return 0; +} + +static struct notifier_block paniced = { + .notifier_call = nouveau_fbcon_panic, +}; + +static int nouveau_fbcon_create(struct drm_device *dev, uint32_t fb_width, + uint32_t fb_height, uint32_t surface_width, + uint32_t surface_height, + struct nouveau_framebuffer **nouveau_fb_p) +{ + struct drm_nouveau_private *dev_priv = dev->dev_private; + struct fb_info *info; + struct nouveau_fbcon_par *par; + struct drm_framebuffer *fb; + struct nouveau_framebuffer *nouveau_fb; + struct drm_mode_fb_cmd mode_cmd; + struct drm_gem_object *gem = NULL; + struct nouveau_gem_object *ngem; + struct device *device = &dev->pdev->dev; + struct fb_fillrect rect; + int size, ret; + + mode_cmd.width = surface_width; + mode_cmd.height = surface_height; + + mode_cmd.bpp = 32; + mode_cmd.pitch = ALIGN(mode_cmd.width, 64) * ((mode_cmd.bpp + 1) / 8); + mode_cmd.depth = 24; + + size = mode_cmd.pitch * mode_cmd.height; + size = ALIGN(size, PAGE_SIZE); + + ret = nouveau_gem_new(dev, NULL, size, 0, NOUVEAU_GEM_DOMAIN_VRAM, &gem); + if (ret) { + printk(KERN_ERR "failed to allocate framebuffer\n"); + ret = -ENOMEM; + goto out; + } + ngem = gem->driver_private; + + ret = nouveau_gem_pin(gem, NOUVEAU_GEM_DOMAIN_VRAM); + mutex_lock(&dev->struct_mutex); + if (ret) { + DRM_ERROR("failed to pin fb: %d\n", ret); + goto out_unref; + } + + fb = nouveau_framebuffer_create(dev, gem, &mode_cmd); + if (!fb) { + ret = -ENOMEM; + DRM_ERROR("failed to allocate fb.\n"); + goto out_unref; + } + + list_add(&fb->filp_head, &dev->mode_config.fb_kernel_list); + + nouveau_fb = to_nouveau_framebuffer(fb); + *nouveau_fb_p = nouveau_fb; + + ret = drm_bo_kmap(ngem->bo, 0, ngem->bo->mem.num_pages, + &nouveau_fb->kmap); + if (ret) { + DRM_ERROR("failed to kmap fb: %d\n", ret); + goto out_unref; + } + + info = framebuffer_alloc(sizeof(struct nouveau_fbcon_par), device); + if (!info) { + ret = -ENOMEM; + goto out_unref; + } + + par = info->par; + + strcpy(info->fix.id, "nouveaudrmfb"); + info->fix.type = FB_TYPE_PACKED_PIXELS; + info->fix.visual = FB_VISUAL_TRUECOLOR; + info->fix.type_aux = 0; + info->fix.xpanstep = 1; /* doing it in hw */ + info->fix.ypanstep = 1; /* doing it in hw */ + info->fix.ywrapstep = 0; + info->fix.accel = FB_ACCEL_I830; + info->fix.type_aux = 0; + + info->flags = FBINFO_DEFAULT; + + info->fbops = &nouveau_fbcon_ops; + + info->fix.line_length = fb->pitch; + info->fix.smem_start = dev->mode_config.fb_base + ngem->bo->offset - + dev_priv->vm_vram_base; + info->fix.smem_len = size; + + info->flags = FBINFO_DEFAULT; + + info->screen_base = nouveau_fb->kmap.virtual; + info->screen_size = size; + +// memset(info->screen_base, 0, size); + + info->pseudo_palette = fb->pseudo_palette; + info->var.xres_virtual = fb->width; + info->var.yres_virtual = fb->height; + info->var.bits_per_pixel = fb->bits_per_pixel; + info->var.xoffset = 0; + info->var.yoffset = 0; + info->var.activate = FB_ACTIVATE_NOW; + info->var.height = -1; + info->var.width = -1; + + info->var.xres = fb_width; + info->var.yres = fb_height; + + /* FIXME: we really shouldn't expose mmio space at all */ + info->fix.mmio_start = pci_resource_start(dev->pdev, 1); + info->fix.mmio_len = pci_resource_len(dev->pdev, 1); + + info->pixmap.size = 64*1024; + info->pixmap.buf_align = 8; + info->pixmap.access_align = 32; + info->pixmap.flags = FB_PIXMAP_SYSTEM; + info->pixmap.scan_align = 1; + + switch(fb->depth) { + case 8: + info->var.red.offset = 0; + info->var.green.offset = 0; + info->var.blue.offset = 0; + info->var.red.length = 8; /* 8bit DAC */ + info->var.green.length = 8; + info->var.blue.length = 8; + info->var.transp.offset = 0; + info->var.transp.length = 0; + break; + case 15: + info->var.red.offset = 10; + info->var.green.offset = 5; + info->var.blue.offset = 0; + info->var.red.length = 5; + info->var.green.length = 5; + info->var.blue.length = 5; + info->var.transp.offset = 15; + info->var.transp.length = 1; + break; + case 16: + info->var.red.offset = 11; + info->var.green.offset = 5; + info->var.blue.offset = 0; + info->var.red.length = 5; + info->var.green.length = 6; + info->var.blue.length = 5; + info->var.transp.offset = 0; + break; + case 24: + info->var.red.offset = 16; + info->var.green.offset = 8; + info->var.blue.offset = 0; + info->var.red.length = 8; + info->var.green.length = 8; + info->var.blue.length = 8; + info->var.transp.offset = 0; + info->var.transp.length = 0; + break; + case 32: + info->var.red.offset = 16; + info->var.green.offset = 8; + info->var.blue.offset = 0; + info->var.red.length = 8; + info->var.green.length = 8; + info->var.blue.length = 8; + info->var.transp.offset = 24; + info->var.transp.length = 8; + break; + default: + break; + } + + fb->fbdev = info; + + par->nouveau_fb = nouveau_fb; + par->dev = dev; + + switch (dev_priv->card_type) { + case NV_50: + nv50_fbcon_accel_init(info); + break; + default: + break; + }; + + /* Clear the entire fbcon. The drm will program every connector + * with it's preferred mode. If the sizes differ, one display will + * quite likely have garbage around the console. + */ + rect.dx = rect.dy = 0; + rect.width = surface_width; + rect.height = surface_height; + rect.color = 0; + rect.rop = ROP_COPY; + info->fbops->fb_fillrect(info, &rect); + + /* To allow resizeing without swapping buffers */ + printk("allocated %dx%d fb: 0x%lx, bo %p\n", nouveau_fb->base.width, + nouveau_fb->base.height, ngem->bo->offset, gem); + + mutex_unlock(&dev->struct_mutex); + return 0; + +out_unref: + drm_gem_object_unreference(gem); + mutex_unlock(&dev->struct_mutex); +out: + return ret; +} + +static int nouveau_fbcon_multi_fb_probe_crtc(struct drm_device *dev, + struct drm_crtc *crtc) +{ + struct nouveau_crtc *nouveau_crtc = to_nouveau_crtc(crtc); + struct nouveau_framebuffer *nouveau_fb; + struct drm_framebuffer *fb; + struct drm_connector *connector; + struct fb_info *info; + struct nouveau_fbcon_par *par; + struct drm_mode_set *modeset; + unsigned int width, height; + int new_fb = 0; + int ret, i, conn_count; + + if (!drm_helper_crtc_in_use(crtc)) + return 0; + + if (!crtc->desired_mode) + return 0; + + width = crtc->desired_mode->hdisplay; + height = crtc->desired_mode->vdisplay; + + /* is there an fb bound to this crtc already */ + if (!nouveau_crtc->mode_set.fb) { + ret = nouveau_fbcon_create(dev, width, height, width, height, &nouveau_fb); + if (ret) + return -EINVAL; + new_fb = 1; + } else { + fb = nouveau_crtc->mode_set.fb; + nouveau_fb = to_nouveau_framebuffer(fb); + if ((nouveau_fb->base.width < width) || (nouveau_fb->base.height < height)) + return -EINVAL; + } + + info = nouveau_fb->base.fbdev; + par = info->par; + + modeset = &nouveau_crtc->mode_set; + modeset->fb = &nouveau_fb->base; + conn_count = 0; + list_for_each_entry(connector, &dev->mode_config.connector_list, head) { + if (connector->encoder) { + if (connector->encoder->crtc == modeset->crtc) { + modeset->connectors[conn_count] = connector; + conn_count++; + if (conn_count > NOUVEAUFB_CONN_LIMIT) + BUG(); + } + } + } + + for (i = conn_count; i < NOUVEAUFB_CONN_LIMIT; i++) + modeset->connectors[i] = NULL; + + par->crtc_ids[0] = crtc->base.id; + + modeset->num_connectors = conn_count; + if (modeset->mode != modeset->crtc->desired_mode) + modeset->mode = modeset->crtc->desired_mode; + + par->crtc_count = 1; + + if (new_fb) { + info->var.pixclock = -1; + if (register_framebuffer(info) < 0) + return -EINVAL; + } else + nouveau_fbcon_set_par(info); + + printk(KERN_INFO "fb%d: %s frame buffer device\n", info->node, + info->fix.id); + + /* Switch back to kernel console on panic */ + kernelfb_mode = *modeset; + atomic_notifier_chain_register(&panic_notifier_list, &paniced); + printk(KERN_INFO "registered panic notifier\n"); + + return 0; +} + +static int nouveau_fbcon_multi_fb_probe(struct drm_device *dev) +{ + + struct drm_crtc *crtc; + int ret = 0; + + list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { + ret = nouveau_fbcon_multi_fb_probe_crtc(dev, crtc); + if (ret) + return ret; + } + return ret; +} + +static int nouveau_fbcon_single_fb_probe(struct drm_device *dev) +{ + struct drm_crtc *crtc; + struct drm_connector *connector; + unsigned int fb_width = (unsigned)-1, fb_height = (unsigned)-1; + unsigned int surface_width = 0, surface_height = 0; + int new_fb = 0; + int crtc_count = 0; + int ret, i, conn_count = 0; + struct nouveau_framebuffer *nouveau_fb; + struct fb_info *info; + struct nouveau_fbcon_par *par; + struct drm_mode_set *modeset = NULL; + + DRM_DEBUG("\n"); + + /* Get a count of crtcs now in use and new min/maxes width/heights */ + list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { + if (!drm_helper_crtc_in_use(crtc)) + continue; + + crtc_count++; + if (!crtc->desired_mode) + continue; + + /* Smallest mode determines console size... */ + if (crtc->desired_mode->hdisplay < fb_width) + fb_width = crtc->desired_mode->hdisplay; + + if (crtc->desired_mode->vdisplay < fb_height) + fb_height = crtc->desired_mode->vdisplay; + + /* ... but largest for memory allocation dimensions */ + if (crtc->desired_mode->hdisplay > surface_width) + surface_width = crtc->desired_mode->hdisplay; + + if (crtc->desired_mode->vdisplay > surface_height) + surface_height = crtc->desired_mode->vdisplay; + } + + if (crtc_count == 0 || fb_width == -1 || fb_height == -1) { + /* hmm everyone went away - assume VGA cable just fell out + and will come back later. */ + DRM_DEBUG("no CRTCs available?\n"); + return 0; + } + +//fail + /* Find the fb for our new config */ + if (list_empty(&dev->mode_config.fb_kernel_list)) { + DRM_DEBUG("creating new fb (console size %dx%d, " + "buffer size %dx%d)\n", fb_width, fb_height, + surface_width, surface_height); + ret = nouveau_fbcon_create(dev, fb_width, fb_height, surface_width, + surface_height, &nouveau_fb); + if (ret) + return -EINVAL; + new_fb = 1; + } else { + struct drm_framebuffer *fb; + + fb = list_first_entry(&dev->mode_config.fb_kernel_list, + struct drm_framebuffer, filp_head); + nouveau_fb = to_nouveau_framebuffer(fb); + + /* if someone hotplugs something bigger than we have already + * allocated, we are pwned. As really we can't resize an + * fbdev that is in the wild currently due to fbdev not really + * being designed for the lower layers moving stuff around + * under it. + * - so in the grand style of things - punt. + */ + if ((fb->width < surface_width) || + (fb->height < surface_height)) { + DRM_ERROR("fb not large enough for console\n"); + return -EINVAL; + } + } +// fail + + info = nouveau_fb->base.fbdev; + par = info->par; + + crtc_count = 0; + /* + * For each CRTC, set up the connector list for the CRTC's mode + * set configuration. + */ + list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { + struct nouveau_crtc *nouveau_crtc = to_nouveau_crtc(crtc); + + modeset = &nouveau_crtc->mode_set; + modeset->fb = &nouveau_fb->base; + conn_count = 0; + list_for_each_entry(connector, &dev->mode_config.connector_list, + head) { + if (!connector->encoder) + continue; + + if(connector->encoder->crtc == modeset->crtc) { + modeset->connectors[conn_count++] = connector; + if (conn_count > NOUVEAUFB_CONN_LIMIT) + BUG(); + } + } + + /* Zero out remaining connector pointers */ + for (i = conn_count; i < NOUVEAUFB_CONN_LIMIT; i++) + modeset->connectors[i] = NULL; + + par->crtc_ids[crtc_count++] = crtc->base.id; + + modeset->num_connectors = conn_count; + if (modeset->mode != modeset->crtc->desired_mode) + modeset->mode = modeset->crtc->desired_mode; + } + par->crtc_count = crtc_count; + + if (new_fb) { + info->var.pixclock = -1; + if (register_framebuffer(info) < 0) + return -EINVAL; + } else + nouveau_fbcon_set_par(info); + + printk(KERN_INFO "fb%d: %s frame buffer device\n", info->node, + info->fix.id); + + /* Switch back to kernel console on panic */ + kernelfb_mode = *modeset; + atomic_notifier_chain_register(&panic_notifier_list, &paniced); + printk(KERN_INFO "registered panic notifier\n"); + + return 0; +} + +/** + * nouveau_fbcon_restore - restore the framebuffer console (kernel) config + * + * Restore's the kernel's fbcon mode, used for lastclose & panic paths. + */ +void nouveau_fbcon_restore(void) +{ + drm_crtc_helper_set_config(&kernelfb_mode); +} + +static void nouveau_fbcon_sysrq(int dummy1, struct tty_struct *dummy3) +{ + nouveau_fbcon_restore(); +} + +static struct sysrq_key_op sysrq_nouveau_fbcon_restore_op = { + .handler = nouveau_fbcon_sysrq, + .help_msg = "force fb", + .action_msg = "force restore of fb console", +}; + +int nouveau_fbcon_probe(struct drm_device *dev) +{ + int ret; + + DRM_DEBUG("\n"); + + /* something has changed in the lower levels of hell - deal with it + here */ + + /* two modes : a) 1 fb to rule all crtcs. + b) one fb per crtc. + two actions 1) new connected device + 2) device removed. + case a/1 : if the fb surface isn't big enough - resize the surface fb. + if the fb size isn't big enough - resize fb into surface. + if everything big enough configure the new crtc/etc. + case a/2 : undo the configuration + possibly resize down the fb to fit the new configuration. + case b/1 : see if it is on a new crtc - setup a new fb and add it. + case b/2 : teardown the new fb. + */ + + /* mode a first */ + /* search for an fb */ + if (nouveau_fbpercrtc) { + ret = nouveau_fbcon_multi_fb_probe(dev); + } else { + ret = nouveau_fbcon_single_fb_probe(dev); + } + + register_sysrq_key('g', &sysrq_nouveau_fbcon_restore_op); + + return ret; +} +EXPORT_SYMBOL(nouveau_fbcon_probe); + +int nouveau_fbcon_remove(struct drm_device *dev, struct drm_framebuffer *fb) +{ + struct nouveau_framebuffer *nouveau_fb = to_nouveau_framebuffer(fb); + struct fb_info *info; + + if (!fb) + return -EINVAL; + + info = fb->fbdev; + + if (info) { + unregister_framebuffer(info); + drm_bo_kunmap(&nouveau_fb->kmap); + framebuffer_release(info); + } + + atomic_notifier_chain_unregister(&panic_notifier_list, &paniced); + memset(&kernelfb_mode, 0, sizeof(struct drm_mode_set)); + return 0; +} +EXPORT_SYMBOL(nouveau_fbcon_remove); +MODULE_LICENSE("GPL and additional rights"); diff --git a/linux-core/nouveau_fbcon.h b/linux-core/nouveau_fbcon.h new file mode 100644 index 0000000..471d2e8 --- /dev/null +++ b/linux-core/nouveau_fbcon.h @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2008 Maarten Maathuis. + * All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice (including the + * next paragraph) shall be included in all copies or substantial + * portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + */ + +#ifndef __NOUVEAU_FBCON_H__ +#define __NOUVEAU_FBCON_H__ + +#define NOUVEAUFB_CONN_LIMIT 4 + +struct nouveau_fbcon_par { + struct drm_device *dev; + struct drm_display_mode *our_mode; + struct nouveau_framebuffer *nouveau_fb; + int crtc_count; + /* crtc currently bound to this */ + uint32_t crtc_ids[2]; +}; + +int nouveau_fbcon_probe(struct drm_device *dev); +int nouveau_fbcon_remove(struct drm_device *dev, struct drm_framebuffer *fb); +void nouveau_fbcon_restore(void); + +int nv50_fbcon_accel_init(struct fb_info *info); + +#endif /* __NV50_FBCON_H__ */ + diff --git a/linux-core/nv50_connector.c b/linux-core/nv50_connector.c index 16ab7fb..dd40473 100644 --- a/linux-core/nv50_connector.c +++ b/linux-core/nv50_connector.c @@ -24,10 +24,62 @@ * */ +#include "drmP.h" #include "drm_edid.h" -#include "nv50_connector.h" +#include "drm_crtc_helper.h" +#include "nouveau_reg.h" +#include "nouveau_drv.h" +#include "nouveau_encoder.h" +#include "nouveau_crtc.h" +#include "nouveau_connector.h" +#include "nv50_display_commands.h" + +static struct drm_display_mode * +nv50_connector_lvds_native_mode(struct drm_device *dev) +{ + struct drm_nouveau_private *dev_priv = dev->dev_private; + struct drm_display_mode *mode; + uint32_t output, tmp; + + output = nv_rd32(0x610050); + if ((output & 0x00000003) == 0x00000002) + output = 0x00000000; + else + if ((output & 0x00000300) == 0x00000200) + output = 0x000000540; + else { + DRM_ERROR("Unable to determine LVDS head: 0x%08x\n", output); + return NULL; + } -static struct nv50_output *nv50_connector_to_output(struct nv50_connector *connector, bool digital) + mode = drm_mode_create(dev); + if (!mode) + return NULL; + + mode->clock = nv_rd32(0x610ad4 + output) & 0x003fffff; + tmp = nv_rd32(0x610b4c + output); + mode->hdisplay = (tmp & 0x00003fff); + mode->vdisplay = (tmp & 0x3fff0000) >> 16; + tmp = nv_rd32(0x610afc + output); + mode->htotal = tmp & 0x3fff; + mode->vtotal = tmp >> 16; + tmp = nv_rd32(0x610ae8 + output); + mode->hsync_start = mode->htotal - (tmp & 0x3fff) - 1; + mode->vsync_start = mode->vtotal - (tmp >> 16) - 1; + tmp = nv_rd32(0x610b00 + output); + mode->hsync_end = mode->hsync_start + (tmp & 0x3fff) + 1; + mode->vsync_end = mode->vsync_start + (tmp >> 16) + 1; + mode->flags = 0; + mode->type = DRM_MODE_TYPE_PREFERRED | DRM_MODE_TYPE_DRIVER; + mode->vrefresh = drm_mode_vrefresh(mode); + + DRM_DEBUG("Probed current LVDS mode:\n"); + drm_mode_debug_printmodeline(mode); + return mode; +} + +static struct nouveau_encoder * +nv50_connector_to_encoder(struct nouveau_connector *connector, bool digital) { struct drm_device *dev = connector->base.dev; struct drm_encoder *drm_encoder; @@ -59,24 +111,24 @@ static struct nv50_output *nv50_connector_to_output(struct nv50_connector *conne return NULL; list_for_each_entry(drm_encoder, &dev->mode_config.encoder_list, head) { - struct nv50_output *output = to_nv50_output(drm_encoder); + struct nouveau_encoder *encoder = to_nouveau_encoder(drm_encoder); - if (connector->bus != output->dcb_entry->bus) + if (connector->bus != encoder->dcb_entry->bus) continue; if (digital) { - switch (output->base.encoder_type) { + switch (encoder->base.encoder_type) { case DRM_MODE_ENCODER_TMDS: case DRM_MODE_ENCODER_LVDS: - return output; + return encoder; default: break; } } else { - switch (output->base.encoder_type) { + switch (encoder->base.encoder_type) { case DRM_MODE_ENCODER_DAC: case DRM_MODE_ENCODER_TVDAC: - return output; + return encoder; default: break; } @@ -86,49 +138,27 @@ static struct nv50_output *nv50_connector_to_output(struct nv50_connector *conne return NULL; } -static int nv50_connector_hpd_detect(struct nv50_connector *connector) +static bool nv50_connector_hpd_detect(struct nouveau_connector *connector) { struct drm_nouveau_private *dev_priv = connector->base.dev->dev_private; - bool present = 0; - uint32_t reg = 0; + uint32_t bus = connector->bus, reg; + bool present = false; - /* Assume connected for the moment. */ - if (connector->base.connector_type == DRM_MODE_CONNECTOR_LVDS) { - DRM_DEBUG("LVDS is defaulting to connected for the moment.\n"); - return 1; - } - - /* No i2c port, no idea what to do for hotplug. */ - if (connector->i2c_chan->index == 15) { - DRM_ERROR("You have a non-LVDS SOR with no i2c port, please report\n"); - return -EINVAL; - } - - if (connector->i2c_chan->index > 3) { - DRM_ERROR("You have an unusual configuration, index is %d\n", connector->i2c_chan->index); - DRM_ERROR("Please report.\n"); - return -EINVAL; - } - - /* Check hotplug pins. */ reg = nv_rd32(NV50_PCONNECTOR_HOTPLUG_STATE); - if (reg & (NV50_PCONNECTOR_HOTPLUG_STATE_PIN_CONNECTED_I2C0 << (4 * connector->i2c_chan->index))) - present = 1; - - if (present) - DRM_DEBUG("Hotplug detect returned positive for bus %d\n", connector->bus); - else - DRM_DEBUG("Hotplug detect returned negative for bus %d\n", connector->bus); + if (reg & (NV50_PCONNECTOR_HOTPLUG_STATE_PIN_CONNECTED_I2C0 << (4 * bus))) + present = true; + DRM_DEBUG("hpd_detect: bus=%d reg=0x%08x present=%d\n", + connector->bus, reg, present); return present; } -static int nv50_connector_i2c_detect(struct nv50_connector *connector) +static bool nv50_connector_i2c_detect(struct nouveau_connector *connector) { /* kindly borrrowed from the intel driver, hope it works. */ uint8_t out_buf[] = { 0x0, 0x0}; uint8_t buf[2]; - int ret; + bool ret; struct i2c_msg msgs[] = { { .addr = 0x50, @@ -145,20 +175,17 @@ static int nv50_connector_i2c_detect(struct nv50_connector *connector) }; if (!connector->i2c_chan) - return -EINVAL; - - ret = i2c_transfer(&connector->i2c_chan->adapter, msgs, 2); - DRM_DEBUG("I2C detect returned %d\n", ret); + return false; - if (ret == 2) - return true; + ret = (i2c_transfer(&connector->i2c_chan->adapter, msgs, 2) == 2); - return false; + DRM_DEBUG("i2c_detect: bus=%d present=%d\n", connector->bus, ret); + return ret; } static void nv50_connector_destroy(struct drm_connector *drm_connector) { - struct nv50_connector *connector = to_nv50_connector(drm_connector); + struct nouveau_connector *connector = to_nouveau_connector(drm_connector); struct drm_device *dev = connector->base.dev; struct nv50_display *display = nv50_get_display(dev); @@ -175,89 +202,25 @@ static void nv50_connector_destroy(struct drm_connector *drm_connector) kfree(drm_connector); } -/* These 2 functions wrap the connector properties that deal with multiple encoders per connector. */ -bool nv50_connector_get_digital(struct drm_connector *drm_connector) +static void +nv50_connector_set_digital(struct nouveau_connector *connector, bool digital) { - struct drm_device *dev = drm_connector->dev; - - switch (drm_connector->connector_type) { - case DRM_MODE_CONNECTOR_VGA: - case DRM_MODE_CONNECTOR_SVIDEO: - return false; - case DRM_MODE_CONNECTOR_DVID: - case DRM_MODE_CONNECTOR_LVDS: - return true; - default: - break; - } - - if (drm_connector->connector_type == DRM_MODE_CONNECTOR_DVII) { - int rval; - uint64_t prop_val; - - rval = drm_connector_property_get_value(drm_connector, dev->mode_config.dvi_i_select_subconnector_property, &prop_val); - if (rval) { - DRM_ERROR("Unable to find select subconnector property, defaulting to DVI-D\n"); - return true; - } + struct drm_device *dev = connector->base.dev; - /* Is a subconnector explicitly selected? */ - switch (prop_val) { - case DRM_MODE_SUBCONNECTOR_DVID: - return true; - case DRM_MODE_SUBCONNECTOR_DVIA: - return false; - default: - break; - } + if (connector->base.connector_type == DRM_MODE_CONNECTOR_DVII) { + struct drm_property *prop = + dev->mode_config.dvi_i_subconnector_property; + uint64_t val; - rval = drm_connector_property_get_value(drm_connector, dev->mode_config.dvi_i_subconnector_property, &prop_val); - if (rval) { - DRM_ERROR("Unable to find subconnector property, defaulting to DVI-D\n"); - return true; - } + if (digital) + val = DRM_MODE_SUBCONNECTOR_DVID; + else + val = DRM_MODE_SUBCONNECTOR_DVIA; - /* Do we know what subconnector we currently have connected? */ - switch (prop_val) { - case DRM_MODE_SUBCONNECTOR_DVID: - return true; - case DRM_MODE_SUBCONNECTOR_DVIA: - return false; - default: - DRM_ERROR("Unknown subconnector value, defaulting to DVI-D\n"); - return true; - } + drm_connector_property_set_value(&connector->base, prop, val); } - DRM_ERROR("Unknown connector type, defaulting to analog\n"); - return false; -} - -static void nv50_connector_set_digital(struct drm_connector *drm_connector, int digital, bool force) -{ - struct drm_device *dev = drm_connector->dev; - - if (drm_connector->connector_type == DRM_MODE_CONNECTOR_DVII) { - uint64_t cur_value, new_value; - - int rval = drm_connector_property_get_value(drm_connector, dev->mode_config.dvi_i_subconnector_property, &cur_value); - if (rval) { - DRM_ERROR("Unable to find subconnector property\n"); - return; - } - - /* Only set when unknown or when forced to do so. */ - if (cur_value != DRM_MODE_SUBCONNECTOR_Unknown && !force) - return; - - if (digital == 1) - new_value = DRM_MODE_SUBCONNECTOR_DVID; - else if (digital == 0) - new_value = DRM_MODE_SUBCONNECTOR_DVIA; - else - new_value = DRM_MODE_SUBCONNECTOR_Unknown; - drm_connector_property_set_value(drm_connector, dev->mode_config.dvi_i_subconnector_property, new_value); - } + connector->digital = digital; } void nv50_connector_detect_all(struct drm_device *dev) @@ -269,177 +232,51 @@ void nv50_connector_detect_all(struct drm_device *dev) } } -static enum drm_connector_status nv50_connector_detect(struct drm_connector *drm_connector) -{ - struct drm_device *dev = drm_connector->dev; - struct nv50_connector *connector = to_nv50_connector(drm_connector); - struct nv50_output *output = NULL; - int hpd_detect = 0, load_detect = 0, i2c_detect = 0; - int old_status = drm_connector->status; - - /* hotplug detect */ - hpd_detect = connector->hpd_detect(connector); - - /* load detect */ - output = connector->to_output(connector, false); /* analog */ - if (output && output->detect) - load_detect = output->detect(output); - - if (hpd_detect < 0 || load_detect < 0) /* did an error occur? */ - i2c_detect = connector->i2c_detect(connector); - - if (load_detect == 1) { - nv50_connector_set_digital(drm_connector, 0, true); /* analog, forced */ - } else if (hpd_detect == 1 && load_detect == 0) { - nv50_connector_set_digital(drm_connector, 1, true); /* digital, forced */ - } else { - nv50_connector_set_digital(drm_connector, -1, true); /* unknown, forced */ - } - - if (hpd_detect == 1 || load_detect == 1 || i2c_detect == 1) - drm_connector->status = connector_status_connected; - else - drm_connector->status = connector_status_disconnected; - - /* update our modes whenever there is reason to */ - if (old_status != drm_connector->status) { - drm_connector->funcs->fill_modes(drm_connector, 0, 0); - - /* notify fb of changes */ - dev->mode_config.funcs->fb_changed(dev); - - /* sent a hotplug event when appropriate. */ - drm_sysfs_hotplug_event(dev); - } - - return drm_connector->status; -} - -/* - * Detailed mode info for a standard 640x480@60Hz monitor - */ -static struct drm_display_mode std_mode[] = { - /*{ DRM_MODE("640x480", DRM_MODE_TYPE_DEFAULT, 25200, 640, 656, - 752, 800, 0, 480, 490, 492, 525, 0, - DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },*/ /* 640x480@60Hz */ - { DRM_MODE("1280x1024", DRM_MODE_TYPE_DEFAULT, 135000, 1280, 1296, - 1440, 1688, 0, 1024, 1025, 1028, 1066, 0, - DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, /* 1280x1024@75Hz */ -}; - -static void nv50_connector_fill_modes(struct drm_connector *drm_connector, uint32_t maxX, uint32_t maxY) +static enum drm_connector_status +nv50_connector_detect(struct drm_connector *drm_connector) { - struct nv50_connector *connector = to_nv50_connector(drm_connector); - struct drm_device *dev = drm_connector->dev; - int rval = 0; - bool connected = false; - struct drm_display_mode *mode, *t; - struct edid *edid = NULL; - - DRM_DEBUG("%s\n", drm_get_connector_name(drm_connector)); - /* set all modes to the unverified state */ - list_for_each_entry_safe(mode, t, &drm_connector->modes, head) - mode->status = MODE_UN... [truncated message content] |