dri-devel November 2011

dri-devel@lists.freedesktop.org

110 participants
555 discussions

[PATCH 01/12] gma500: Move the basic driver out of staging
by Alan Cox 16 Nov '11

16 Nov '11

From: Alan Cox <alan(a)linux.intel.com> This driver supports unaccelerated KMS display, and accelerated console handling on the Intel Poulsbo, Oaktrail, Cedarview and Medfield hardware. For the initial merge Medfield will be left out as it needs considerable further work to reach a decent standard Begin by adding the Makefiles and Kconfig. These are not yet plumbed into the DRM layer so will have no effect on their own Signed-off-by: Alan Cox <alan(a)linux.intel.com> --- drivers/gpu/drm/gma500/Kconfig | 26 ++++++++++++++++++++++++++ drivers/gpu/drm/gma500/Makefile | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 0 deletions(-) create mode 100644 drivers/gpu/drm/gma500/Kconfig create mode 100644 drivers/gpu/drm/gma500/Makefile diff --git a/drivers/gpu/drm/gma500/Kconfig b/drivers/gpu/drm/gma500/Kconfig new file mode 100644 index 0000000..78e46e8 --- /dev/null +++ b/drivers/gpu/drm/gma500/Kconfig @@ -0,0 +1,26 @@ +config DRM_GMA500 + tristate "Intel GMA5/600 KMS Framebuffer" + depends on DRM && PCI && X86 && EXPERIMENTAL + select FB_CFB_COPYAREA + select FB_CFB_FILLRECT + select FB_CFB_IMAGEBLIT + select DRM_KMS_HELPER + select DRM_TTM + help + Say yes for an experimental 2D KMS framebuffer driver for the + Intel GMA500 ('Poulsbo') and other Intel IMG based graphics + devices. + +config DRM_GMA600 + bool "Intel GMA600 support (Experimental)" + depends on DRM_GMA500 + help + Say yes to include support for GMA600 (Intel Moorestown/Oaktrail) + platforms with LVDS ports. HDMI and MIPI are not currently + supported. + +config DRM_CEDARVIEW + bool "Intel Cedarview support (Experimental)" + depends on DRM_GMA500 + help + Say yes to include support for Intel Cedarview platforms diff --git a/drivers/gpu/drm/gma500/Makefile b/drivers/gpu/drm/gma500/Makefile new file mode 100644 index 0000000..613c74f --- /dev/null +++ b/drivers/gpu/drm/gma500/Makefile @@ -0,0 +1,39 @@ +# +# KMS driver for the GMA500 +# +ccflags-y += -Iinclude/drm + +gma500_gfx-y += gem_glue.o \ + accel_2d.o \ + backlight.o \ + framebuffer.o \ + gem.o \ + gtt.o \ + intel_bios.o \ + intel_i2c.o \ + intel_opregion.o \ + mmu.o \ + power.o \ + psb_drv.o \ + psb_intel_display.o \ + psb_intel_lvds.o \ + psb_intel_modes.o \ + psb_intel_sdvo.o \ + psb_lid.o \ + psb_irq.o \ + psb_device.o \ + mid_bios.o + +gma500_gfx-$(CONFIG_DRM_CEDARVIEW) += cdv_device.o \ + cdv_intel_crt.o \ + cdv_intel_display.o \ + cdv_intel_hdmi.o \ + cdv_intel_lvds.o + +gma500_gfx-$(CONFIG_DRM_GMA600) += oaktrail_device.o \ + oaktrail_crtc.o \ + oaktrail_lvds.o \ + oaktrail_hdmi.o \ + oaktrail_hdmi_i2c.o + +obj-$(CONFIG_DRM_GMA500) += gma500_gfx.o

4 19

[patch 2/2] drm: avoid switching to text console if there is no panic timeout
by akpm＠linux-foundation.org 15 Nov '11

15 Nov '11

From: Hugh Dickins <hughd(a)chromium.org> Subject: drm: avoid switching to text console if there is no panic timeout Add a check for panic_timeout in the drm_fb_helper_panic() notifier: if we're going to reboot immediately, the user will not be able to see the messages anyway, and messing with the video mode may display artifacts, and certainly get into several layers of complexity (including mutexes and memory allocations) which we shall be much safer to avoid. [msb(a)chromium.org: edited commit message and modified to short-circuit panic_timeout < 0 instead of testing panic_timeout >= 0] Signed-off-by: Hugh Dickins <hughd(a)google.com> Signed-off-by: Mandeep Singh Baines <msb(a)chromium.org> Cc: Dave Airlie <airlied(a)redhat.com> Acked-by: David Rientjes <rientjes(a)google.com> Acked-by: Stéphane Marchesin <marcheu(a)chromium.org> Cc: Dave Young <hidave.darkstar(a)gmail.com> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> --- drivers/gpu/drm/drm_fb_helper.c | 7 +++++++ 1 file changed, 7 insertions(+) diff -puN drivers/gpu/drm/drm_fb_helper.c~drm-avoid-switching-to-text-console-if-there-is-no-panic-timeout drivers/gpu/drm/drm_fb_helper.c --- a/drivers/gpu/drm/drm_fb_helper.c~drm-avoid-switching-to-text-console-if-there-is-no-panic-timeout +++ a/drivers/gpu/drm/drm_fb_helper.c @@ -255,6 +255,13 @@ bool drm_fb_helper_force_kernel_mode(voi int drm_fb_helper_panic(struct notifier_block *n, unsigned long ununsed, void *panic_str) { + /* + * It's a waste of time and effort to switch back to text console + * if the kernel should reboot before panic messages can be seen. + */ + if (panic_timeout < 0) + return 0; + printk(KERN_ERR "panic occurred, switching back to text console\n"); return drm_fb_helper_force_kernel_mode(); } _

1 0

[patch 1/2] drivers/gpu/vga/vgaarb.c: add missing kfree
by akpm＠linux-foundation.org 15 Nov '11

15 Nov '11

From: Julia Lawall <julia(a)diku.dk> Subject: drivers/gpu/vga/vgaarb.c: add missing kfree kbuf is a buffer that is local to this function, so all of the error paths leaving the function should release it. Signed-off-by: Julia Lawall <julia(a)diku.dk> Cc: Dave Airlie <airlied(a)redhat.com> Cc: Jesper Juhl <jj(a)chaosbits.net> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> --- drivers/gpu/vga/vgaarb.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff -puN drivers/gpu/vga/vgaarb.c~drivers-gpu-vga-vgaarbc-add-missing-kfree drivers/gpu/vga/vgaarb.c --- a/drivers/gpu/vga/vgaarb.c~drivers-gpu-vga-vgaarbc-add-missing-kfree +++ a/drivers/gpu/vga/vgaarb.c @@ -993,14 +993,20 @@ static ssize_t vga_arb_write(struct file uc = &priv->cards[i]; } - if (!uc) - return -EINVAL; + if (!uc) { + ret_val = -EINVAL; + goto done; + } - if (io_state & VGA_RSRC_LEGACY_IO && uc->io_cnt == 0) - return -EINVAL; + if (io_state & VGA_RSRC_LEGACY_IO && uc->io_cnt == 0) { + ret_val = -EINVAL; + goto done; + } - if (io_state & VGA_RSRC_LEGACY_MEM && uc->mem_cnt == 0) - return -EINVAL; + if (io_state & VGA_RSRC_LEGACY_MEM && uc->mem_cnt == 0) { + ret_val = -EINVAL; + goto done; + } vga_put(pdev, io_state); _

1 0

[PATCH 1/2] drm: add plane support v2
by Jesse Barnes 15 Nov '11

15 Nov '11

Planes are a bit like half-CRTCs. They have a location and fb, but don't drive outputs directly. Add support for handling them to the core KMS code. v2: fix ABI of get_plane - move format_type_ptr to the end Acked-by: Alan Cox <alan(a)lxorguk.ukuu.org.uk> Reviewed-by: Rob Clark <rob.clark(a)linaro.org> Reviewed-by: Daniel Vetter <daniel.vetter(a)ffwll.ch> Signed-off-by: Jesse Barnes <jbarnes(a)virtuousgeek.org> --- drivers/gpu/drm/drm_crtc.c | 257 +++++++++++++++++++++++++++++++++++++++++++- drivers/gpu/drm/drm_drv.c | 3 + include/drm/drm.h | 3 + include/drm/drm_crtc.h | 75 +++++++++++++- include/drm/drm_mode.h | 33 ++++++ 5 files changed, 368 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index fe738f0..804ef12 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -321,6 +321,7 @@ void drm_framebuffer_cleanup(struct drm_framebuffer *fb) { struct drm_device *dev = fb->dev; struct drm_crtc *crtc; + struct drm_plane *plane; struct drm_mode_set set; int ret; @@ -337,6 +338,15 @@ void drm_framebuffer_cleanup(struct drm_framebuffer *fb) } } + list_for_each_entry(plane, &dev->mode_config.plane_list, head) { + if (plane->fb == fb) { + /* should turn off the crtc */ + ret = plane->funcs->disable_plane(plane); + if (ret) + DRM_ERROR("failed to disable plane with busy fb\n"); + } + } + drm_mode_object_put(dev, &fb->base); list_del(&fb->head); dev->mode_config.num_fb--; @@ -535,6 +545,50 @@ void drm_encoder_cleanup(struct drm_encoder *encoder) } EXPORT_SYMBOL(drm_encoder_cleanup); +int drm_plane_init(struct drm_device *dev, struct drm_plane *plane, + unsigned long possible_crtcs, + const struct drm_plane_funcs *funcs, + uint32_t *formats, uint32_t format_count) +{ + mutex_lock(&dev->mode_config.mutex); + + plane->dev = dev; + drm_mode_object_get(dev, &plane->base, DRM_MODE_OBJECT_PLANE); + plane->funcs = funcs; + plane->format_types = kmalloc(sizeof(uint32_t) * format_count, + GFP_KERNEL); + if (!plane->format_types) { + DRM_DEBUG_KMS("out of memory when allocating plane\n"); + drm_mode_object_put(dev, &plane->base); + return -ENOMEM; + } + + memcpy(plane->format_types, formats, format_count); + plane->format_count = format_count; + plane->possible_crtcs = possible_crtcs; + + list_add_tail(&plane->head, &dev->mode_config.plane_list); + dev->mode_config.num_plane++; + + mutex_unlock(&dev->mode_config.mutex); + + return 0; +} +EXPORT_SYMBOL(drm_plane_init); + +void drm_plane_cleanup(struct drm_plane *plane) +{ + struct drm_device *dev = plane->dev; + + mutex_lock(&dev->mode_config.mutex); + kfree(plane->format_types); + drm_mode_object_put(dev, &plane->base); + list_del(&plane->head); + dev->mode_config.num_plane--; + mutex_unlock(&dev->mode_config.mutex); +} +EXPORT_SYMBOL(drm_plane_cleanup); + /** * drm_mode_create - create a new display mode * @dev: DRM device @@ -866,6 +920,7 @@ void drm_mode_config_init(struct drm_device *dev) INIT_LIST_HEAD(&dev->mode_config.encoder_list); INIT_LIST_HEAD(&dev->mode_config.property_list); INIT_LIST_HEAD(&dev->mode_config.property_blob_list); + INIT_LIST_HEAD(&dev->mode_config.plane_list); idr_init(&dev->mode_config.crtc_idr); mutex_lock(&dev->mode_config.mutex); @@ -942,6 +997,7 @@ void drm_mode_config_cleanup(struct drm_device *dev) struct drm_encoder *encoder, *enct; struct drm_framebuffer *fb, *fbt; struct drm_property *property, *pt; + struct drm_plane *plane, *plt; list_for_each_entry_safe(encoder, enct, &dev->mode_config.encoder_list, head) { @@ -966,6 +1022,10 @@ void drm_mode_config_cleanup(struct drm_device *dev) crtc->funcs->destroy(crtc); } + list_for_each_entry_safe(plane, plt, &dev->mode_config.plane_list, + head) { + plane->funcs->destroy(plane); + } } EXPORT_SYMBOL(drm_mode_config_cleanup); @@ -1466,6 +1526,197 @@ out: } /** + * drm_mode_getplane_res - get plane info + * @dev: DRM device + * @data: ioctl data + * @file_priv: DRM file info + * + * Return an plane count and set of IDs. + */ +int drm_mode_getplane_res(struct drm_device *dev, void *data, + struct drm_file *file_priv) +{ + struct drm_mode_get_plane_res *plane_resp = data; + struct drm_mode_config *config; + struct drm_plane *plane; + uint32_t __user *plane_ptr; + int copied = 0, ret = 0; + + if (!drm_core_check_feature(dev, DRIVER_MODESET)) + return -EINVAL; + + mutex_lock(&dev->mode_config.mutex); + config = &dev->mode_config; + + /* + * This ioctl is called twice, once to determine how much space is + * needed, and the 2nd time to fill it. + */ + if (config->num_plane && + (plane_resp->count_planes >= config->num_plane)) { + plane_ptr = (uint32_t *)(unsigned long)plane_resp->plane_id_ptr; + + list_for_each_entry(plane, &config->plane_list, head) { + if (put_user(plane->base.id, plane_ptr + copied)) { + ret = -EFAULT; + goto out; + } + copied++; + } + } + plane_resp->count_planes = config->num_plane; + +out: + mutex_unlock(&dev->mode_config.mutex); + return ret; +} + +/** + * drm_mode_getplane - get plane info + * @dev: DRM device + * @data: ioctl data + * @file_priv: DRM file info + * + * Return plane info, including formats supported, gamma size, any + * current fb, etc. + */ +int drm_mode_getplane(struct drm_device *dev, void *data, + struct drm_file *file_priv) +{ + struct drm_mode_get_plane *plane_resp = data; + struct drm_mode_object *obj; + struct drm_plane *plane; + uint32_t __user *format_ptr; + int ret = 0; + + if (!drm_core_check_feature(dev, DRIVER_MODESET)) + return -EINVAL; + + mutex_lock(&dev->mode_config.mutex); + obj = drm_mode_object_find(dev, plane_resp->plane_id, + DRM_MODE_OBJECT_PLANE); + if (!obj) { + ret = -ENOENT; + goto out; + } + plane = obj_to_plane(obj); + + if (plane->crtc) + plane_resp->crtc_id = plane->crtc->base.id; + else + plane_resp->crtc_id = 0; + + if (plane->fb) + plane_resp->fb_id = plane->fb->base.id; + else + plane_resp->fb_id = 0; + + plane_resp->plane_id = plane->base.id; + plane_resp->possible_crtcs = plane->possible_crtcs; + plane_resp->gamma_size = plane->gamma_size; + + /* + * This ioctl is called twice, once to determine how much space is + * needed, and the 2nd time to fill it. + */ + if (plane->format_count && + (plane_resp->count_format_types >= plane->format_count)) { + format_ptr = (uint32_t *)(unsigned long)plane_resp->format_type_ptr; + if (copy_to_user(format_ptr, + plane->format_types, + sizeof(uint32_t) * plane->format_count)) { + ret = -EFAULT; + goto out; + } + } + plane_resp->count_format_types = plane->format_count; + +out: + mutex_unlock(&dev->mode_config.mutex); + return ret; +} + +/** + * drm_mode_setplane - set up or tear down an plane + * @dev: DRM device + * @data: ioctl data* + * @file_prive: DRM file info + * + * Set plane info, including placement, fb, scaling, and other factors. + * Or pass a NULL fb to disable. + */ +int drm_mode_setplane(struct drm_device *dev, void *data, + struct drm_file *file_priv) +{ + struct drm_mode_set_plane *plane_req = data; + struct drm_mode_object *obj; + struct drm_plane *plane; + struct drm_crtc *crtc; + struct drm_framebuffer *fb; + int ret = 0; + + if (!drm_core_check_feature(dev, DRIVER_MODESET)) + return -EINVAL; + + mutex_lock(&dev->mode_config.mutex); + + /* + * First, find the plane, crtc, and fb objects. If not available, + * we don't bother to call the driver. + */ + obj = drm_mode_object_find(dev, plane_req->plane_id, + DRM_MODE_OBJECT_PLANE); + if (!obj) { + DRM_DEBUG_KMS("Unknown plane ID %d\n", + plane_req->plane_id); + ret = -ENOENT; + goto out; + } + plane = obj_to_plane(obj); + + /* No fb means shut it down */ + if (!plane_req->fb_id) { + plane->funcs->disable_plane(plane); + goto out; + } + + obj = drm_mode_object_find(dev, plane_req->crtc_id, + DRM_MODE_OBJECT_CRTC); + if (!obj) { + DRM_DEBUG_KMS("Unknown crtc ID %d\n", + plane_req->crtc_id); + ret = -ENOENT; + goto out; + } + crtc = obj_to_crtc(obj); + + obj = drm_mode_object_find(dev, plane_req->fb_id, + DRM_MODE_OBJECT_FB); + if (!obj) { + DRM_DEBUG_KMS("Unknown framebuffer ID %d\n", + plane_req->fb_id); + ret = -ENOENT; + goto out; + } + fb = obj_to_fb(obj); + + ret = plane->funcs->update_plane(plane, crtc, fb, + plane_req->crtc_x, plane_req->crtc_y, + plane_req->crtc_w, plane_req->crtc_h, + plane_req->src_x, plane_req->src_y, + plane_req->src_w, plane_req->src_h); + if (!ret) { + plane->crtc = crtc; + plane->fb = fb; + } + +out: + mutex_unlock(&dev->mode_config.mutex); + + return ret; +} + +/** * drm_mode_setcrtc - set CRTC configuration * @inode: inode from the ioctl * @filp: file * from the ioctl @@ -1688,11 +1939,13 @@ int drm_mode_addfb(struct drm_device *dev, return -EINVAL; if ((config->min_width > r->width) || (r->width > config->max_width)) { - DRM_ERROR("mode new framebuffer width not within limits\n"); + DRM_ERROR("bad framebuffer width %d, should be >= %d && <= %d\n", + r->width, config->min_width, config->max_width); return -EINVAL; } if ((config->min_height > r->height) || (r->height > config->max_height)) { - DRM_ERROR("mode new framebuffer height not within limits\n"); + DRM_ERROR("bad framebuffer height %d, should be >= %d && <= %d\n", + r->height, config->min_height, config->max_height); return -EINVAL; } diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c index 7a87e08..d782bd1 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c @@ -135,8 +135,11 @@ static struct drm_ioctl_desc drm_ioctls[] = { DRM_IOCTL_DEF(DRM_IOCTL_GEM_OPEN, drm_gem_open_ioctl, DRM_AUTH|DRM_UNLOCKED), DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETRESOURCES, drm_mode_getresources, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED), + DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETPLANERESOURCES, drm_mode_getplane_res, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED), DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETCRTC, drm_mode_getcrtc, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED), DRM_IOCTL_DEF(DRM_IOCTL_MODE_SETCRTC, drm_mode_setcrtc, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED), + DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETPLANE, drm_mode_getplane, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED), + DRM_IOCTL_DEF(DRM_IOCTL_MODE_SETPLANE, drm_mode_setplane, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED), DRM_IOCTL_DEF(DRM_IOCTL_MODE_CURSOR, drm_mode_cursor_ioctl, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED), DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETGAMMA, drm_mode_gamma_get_ioctl, DRM_MASTER|DRM_UNLOCKED), DRM_IOCTL_DEF(DRM_IOCTL_MODE_SETGAMMA, drm_mode_gamma_set_ioctl, DRM_MASTER|DRM_UNLOCKED), diff --git a/include/drm/drm.h b/include/drm/drm.h index 4be33b4..2897967 100644 --- a/include/drm/drm.h +++ b/include/drm/drm.h @@ -714,6 +714,9 @@ struct drm_get_cap { #define DRM_IOCTL_MODE_CREATE_DUMB DRM_IOWR(0xB2, struct drm_mode_create_dumb) #define DRM_IOCTL_MODE_MAP_DUMB DRM_IOWR(0xB3, struct drm_mode_map_dumb) #define DRM_IOCTL_MODE_DESTROY_DUMB DRM_IOWR(0xB4, struct drm_mode_destroy_dumb) +#define DRM_IOCTL_MODE_GETPLANERESOURCES DRM_IOWR(0xB5, struct drm_mode_get_plane_res) +#define DRM_IOCTL_MODE_GETPLANE DRM_IOWR(0xB6, struct drm_mode_get_plane) +#define DRM_IOCTL_MODE_SETPLANE DRM_IOWR(0xB7, struct drm_mode_set_plane) /** * Device specific ioctls should only be in their respective headers diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index 8020798..e20867e 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h @@ -44,6 +44,7 @@ struct drm_framebuffer; #define DRM_MODE_OBJECT_PROPERTY 0xb0b0b0b0 #define DRM_MODE_OBJECT_FB 0xfbfbfbfb #define DRM_MODE_OBJECT_BLOB 0xbbbbbbbb +#define DRM_MODE_OBJECT_PLANE 0xeeeeeeee struct drm_mode_object { uint32_t id; @@ -278,6 +279,7 @@ struct drm_crtc; struct drm_connector; struct drm_encoder; struct drm_pending_vblank_event; +struct drm_plane; /** * drm_crtc_funcs - control CRTCs for a given device @@ -536,6 +538,62 @@ struct drm_connector { }; /** + * drm_plane_funcs - driver plane control functions + * @update_plane: update the plane configuration + * @disable_plane: shut down the plane + * @destroy: clean up plane resources + */ +struct drm_plane_funcs { + int (*update_plane)(struct drm_plane *plane, + struct drm_crtc *crtc, struct drm_framebuffer *fb, + int crtc_x, int crtc_y, + unsigned int crtc_w, unsigned int crtc_h, + uint32_t src_x, uint32_t src_y, + uint32_t src_w, uint32_t src_h); + int (*disable_plane)(struct drm_plane *plane); + void (*destroy)(struct drm_plane *plane); +}; + +/** + * drm_plane - central DRM plane control structure + * @dev: DRM device this plane belongs to + * @head: for list management + * @base: base mode object + * @possible_crtcs: pipes this plane can be bound to + * @format_types: array of formats supported by this plane + * @format_count: number of formats supported + * @crtc: currently bound CRTC + * @fb: currently bound fb + * @gamma_size: size of gamma table + * @gamma_store: gamma correction table + * @enabled: enabled flag + * @funcs: helper functions + * @helper_private: storage for drver layer + */ +struct drm_plane { + struct drm_device *dev; + struct list_head head; + + struct drm_mode_object base; + + uint32_t possible_crtcs; + uint32_t *format_types; + uint32_t format_count; + + struct drm_crtc *crtc; + struct drm_framebuffer *fb; + + /* CRTC gamma size for reporting to userspace */ + uint32_t gamma_size; + uint16_t *gamma_store; + + bool enabled; + + const struct drm_plane_funcs *funcs; + void *helper_private; +}; + +/** * struct drm_mode_set * * Represents a single crtc the connectors that it drives with what mode @@ -589,6 +647,8 @@ struct drm_mode_config { struct list_head connector_list; int num_encoder; struct list_head encoder_list; + int num_plane; + struct list_head plane_list; int num_crtc; struct list_head crtc_list; @@ -641,6 +701,7 @@ struct drm_mode_config { #define obj_to_fb(x) container_of(x, struct drm_framebuffer, base) #define obj_to_property(x) container_of(x, struct drm_property, base) #define obj_to_blob(x) container_of(x, struct drm_property_blob, base) +#define obj_to_plane(x) container_of(x, struct drm_plane, base) extern void drm_crtc_init(struct drm_device *dev, @@ -660,6 +721,13 @@ extern void drm_encoder_init(struct drm_device *dev, const struct drm_encoder_funcs *funcs, int encoder_type); +extern int drm_plane_init(struct drm_device *dev, + struct drm_plane *plane, + unsigned long possible_crtcs, + const struct drm_plane_funcs *funcs, + uint32_t *formats, uint32_t format_count); +extern void drm_plane_cleanup(struct drm_plane *plane); + extern void drm_encoder_cleanup(struct drm_encoder *encoder); extern char *drm_get_connector_name(struct drm_connector *connector); @@ -753,13 +821,18 @@ extern struct drm_mode_object *drm_mode_object_find(struct drm_device *dev, /* IOCTLs */ extern int drm_mode_getresources(struct drm_device *dev, void *data, struct drm_file *file_priv); - +extern int drm_mode_getplane_res(struct drm_device *dev, void *data, + struct drm_file *file_priv); extern int drm_mode_getcrtc(struct drm_device *dev, void *data, struct drm_file *file_priv); extern int drm_mode_getconnector(struct drm_device *dev, void *data, struct drm_file *file_priv); extern int drm_mode_setcrtc(struct drm_device *dev, void *data, struct drm_file *file_priv); +extern int drm_mode_getplane(struct drm_device *dev, + void *data, struct drm_file *file_priv); +extern int drm_mode_setplane(struct drm_device *dev, + void *data, struct drm_file *file_priv); extern int drm_mode_cursor_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv); extern int drm_mode_addfb(struct drm_device *dev, diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h index c4961ea..1e4747c 100644 --- a/include/drm/drm_mode.h +++ b/include/drm/drm_mode.h @@ -120,6 +120,39 @@ struct drm_mode_crtc { struct drm_mode_modeinfo mode; }; +/* Planes blend with or override other bits on the CRTC */ +struct drm_mode_set_plane { + __u32 plane_id; + __u32 crtc_id; + __u32 fb_id; /* fb object contains surface format type */ + + /* Signed dest location allows it to be partially off screen */ + __s32 crtc_x, crtc_y; + __u32 crtc_w, crtc_h; + + /* Source values are 16.16 fixed point */ + __u32 src_x, src_y; + __u32 src_h, src_w; +}; + +struct drm_mode_get_plane { + __u32 plane_id; + + __u32 crtc_id; + __u32 fb_id; + + __u32 possible_crtcs; + __u32 gamma_size; + + __u32 count_format_types; + __u64 format_type_ptr; +}; + +struct drm_mode_get_plane_res { + __u64 plane_id_ptr; + __u32 count_planes; +}; + #define DRM_MODE_ENCODER_NONE 0 #define DRM_MODE_ENCODER_DAC 1 #define DRM_MODE_ENCODER_TMDS 2 -- 1.7.4.1

4 15

[git pull] drm/vgaarb fixes
by Dave Airlie 15 Nov '11

15 Nov '11

Hi Linus, Fix for a vgaarb bridge detect problem I found playing in qemu, a radeon oops fix, missing PCI IDs, and a fix from the -rt guys that I've forgotten to send 2 or 3 times now. Dave. The following changes since commit a7c36fd8c5ee6dcca584137cb81aeefd785a0721: drm/radeon/kms/combios: fix dynamic allocation of PM clock modes (2011-11-12 17:46:40 +0000) are available in the git repository at: git://people.freedesktop.org/~airlied/linux drm-fixes Alex Deucher (3): drm/radeon: add some missing FireMV pci ids drm/radeon/kms: fix up gpio i2c mask bits for r4xx drm/radeon/kms: fix segfault in pm rework Dave Airlie (1): vgaarb: a NULL bridge is acceptable for root devices. Thomas Gleixner (1): drm: Remove utterly bogus preempt_disable() sections drivers/gpu/drm/drm_irq.c | 9 ------ drivers/gpu/drm/radeon/radeon_atombios.c | 32 +++++++++++---------- drivers/gpu/vga/vgaarb.c | 44 ++++++++++++++--------------- include/drm/drm_pciids.h | 2 + 4 files changed, 40 insertions(+), 47 deletions(-)

1 0

radeon/kms: black screen when loading radeon with modeset=1
by Sergey V. 15 Nov '11

15 Nov '11

Kernel from Linus tree, HEAD at 7f80850d3f9fd8fda23a317044aef3a6bafab06b Loading radeon module with modeset=1 causes black screen. Usually it happens at boot time, but if run kernel with radeon.modeset=0 then `rmmod radeon; modprobe radeon modeset=1` I can get dmesg over ssh (thanks to glisse from #radeon for help). Backtrace below: [ 89.905890] BUG: unable to handle kernel NULL pointer dereference at 0000000000000008 [ 89.906016] IP: [<ffffffffa05998ed>] radeon_atombios_parse_power_table_1_3+0x13d/0x810 [radeon] [ 89.906016] PGD 6a0e1067 PUD 6a09d067 PMD 0 [ 89.906016] Oops: 0002 [#1] SMP [ 89.906016] CPU 0 [ 89.906016] Modules linked in: radeon(+) snd_seq_dummy snd_seq_oss snd_seq_midi_event snd_seq snd_seq_device snd_pcm_oss snd_mixer_oss ipv6 btrfs cpufreq_ondemand powernow_k8 freq_table mperf lp ppdev parport_pc parport fuse snd_hda_codec_hdmi snd_hda_codec_realtek processor ttm drm_kms_helper drm thermal i2c_piix4 joydev agpgart video snd_hda_intel r8169 thermal_sys i2c_algo_bit i2c_core k8temp battery sdhci_pci snd_hda_codec evdev hwmon mii button ac shpchp sdhci snd_hwdep snd_pcm psmouse serio_raw mmc_core snd_timer sg snd soundcore snd_page_alloc [last unloaded: radeon] [ 89.906016] [ 89.906016] Pid: 2189, comm: modprobe Tainted: G W 3.2.0-rc1+ #4 Micro-Star International PR210/MS-1222 [ 89.906016] RIP: 0010:[<ffffffffa05998ed>] [<ffffffffa05998ed>] radeon_atombios_parse_power_table_1_3+0x13d/0x810 [radeon] [ 89.906016] RSP: 0018:ffff880075959948 EFLAGS: 00010246 [ 89.906016] RAX: 0000000000000000 RBX: ffff880075b72000 RCX: 0000000000000000 [ 89.906016] RDX: 0000000000000000 RSI: 0000000000000000 RDI: ffff880076c73c00 [ 89.906016] RBP: ffff880075959a98 R08: 0000000000000000 R09: ffff880076c73a00 [ 89.906016] R10: ffff8800758a0000 R11: 0000000000000006 R12: ffff8800758aadde [ 89.906016] R13: ffff8800758aadde R14: 0000000000000000 R15: 0000000000000000 [ 89.906016] FS: 00007f57d0b27720(0000) GS:ffff88007bc00000(0000) knlGS:00000000f702a6d0 [ 89.906016] CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b [ 89.906016] CR2: 0000000000000008 CR3: 000000006a0a6000 CR4: 00000000000006f0 [ 89.906016] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 89.906016] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 [ 89.906016] Process modprobe (pid: 2189, threadinfo ffff880075958000, task ffff880075abc6d0) [ 89.906016] Stack: [ 89.906016] ffff88000000ffff ffff8800768f400a ffff880000000000 00ffffff00000000 [ 89.906016] ffff880037653663 ffff880075b73158 ffff880075b73174 0000000675959acf [ 89.906016] ffffffff81b6112c ffff880075959a38 ffffffff81b6112e ffff880075959ad5 [ 89.906016] Call Trace: [ 89.906016] [<ffffffff81289dce>] ? vsnprintf+0x31e/0x5d0 [ 89.906016] [<ffffffff81289dce>] ? vsnprintf+0x31e/0x5d0 [ 89.906016] [<ffffffff81076511>] ? up+0x31/0x50 [ 89.906016] [<ffffffff81050494>] ? console_unlock+0x1c4/0x230 [ 89.906016] [<ffffffffa059cb98>] radeon_atombios_get_power_modes+0x228/0x8e0 [radeon] [ 89.906016] [<ffffffffa05e7e01>] radeon_pm_init+0x3b1/0x590 [radeon] [ 89.906016] [<ffffffffa05d0039>] ? rs600_irq_set+0x109/0x180 [radeon] [ 89.906016] [<ffffffffa05b7ca9>] radeon_modeset_init+0x4c9/0x8a0 [radeon] [ 89.906016] [<ffffffffa05fb3dc>] ? radeon_acpi_init+0x8c/0xbc [radeon] [ 89.906016] [<ffffffffa0598760>] radeon_driver_load_kms+0x120/0x170 [radeon] [ 89.906016] [<ffffffffa024d82e>] drm_get_pci_dev+0x18e/0x2c0 [drm] [ 89.906016] [<ffffffffa05fb4b9>] radeon_pci_probe+0xad/0xb5 [radeon] [ 89.906016] [<ffffffff812a8edf>] local_pci_probe+0x5f/0xd0 [ 89.906016] [<ffffffff812a97b8>] pci_device_probe+0x88/0xb0 [ 89.906016] [<ffffffff81331bca>] ? driver_sysfs_add+0x7a/0xb0 [ 89.906016] [<ffffffff81331ed6>] driver_probe_device+0x96/0x1b0 [ 89.906016] [<ffffffff81332093>] __driver_attach+0xa3/0xb0 [ 89.906016] [<ffffffff81331ff0>] ? driver_probe_device+0x1b0/0x1b0 [ 89.906016] [<ffffffff81330e9e>] bus_for_each_dev+0x5e/0x90 [ 89.906016] [<ffffffff81331b4e>] driver_attach+0x1e/0x20 [ 89.906016] [<ffffffff81331745>] bus_add_driver+0x155/0x280 [ 89.906016] [<ffffffff81332676>] driver_register+0x76/0x140 [ 89.906016] [<ffffffff812a9a45>] __pci_register_driver+0x55/0xd0 [ 89.906016] [<ffffffffa024da71>] drm_pci_init+0x111/0x120 [drm] [ 89.906016] [<ffffffffa0639000>] ? 0xffffffffa0638fff [ 89.906016] [<ffffffffa0639000>] ? 0xffffffffa0638fff [ 89.906016] [<ffffffffa06390ec>] radeon_init+0xec/0xee [radeon] [ 89.906016] [<ffffffff810002d4>] do_one_initcall+0x44/0x170 [ 89.906016] [<ffffffff8108c332>] sys_init_module+0x92/0x1e0 [ 89.906016] [<ffffffff817fba6b>] system_call_fastpath+0x16/0x1b [ 89.906016] Code: 16 44 3b b5 ec fe ff ff 0f 8d 40 01 00 00 48 8b 83 58 11 00 00 49 63 cf 48 89 ca 48 c1 e1 06 48 c1 e2 04 48 29 d1 48 8b 44 08 08 <c7> 40 08 00 00 00 00 0f b6 45 8f 3c 02 75 ac 4c 8b 83 58 11 00 [ 89.906016] RIP [<ffffffffa05998ed>] radeon_atombios_parse_power_table_1_3+0x13d/0x810 [radeon] [ 89.906016] RSP <ffff880075959948> [ 89.906016] CR2: 0000000000000008 [ 89.918682] ---[ end trace 758728fd12807b58 ]--- Whole dmesg output attached.

3 3

[PATCH] drm/fb: don't call driver set_config if display isn't panned
by Jesse Barnes 15 Nov '11

15 Nov '11

This is just a minor optimization to the fb panning code. In debugging some other issues, I noticed a lot of no-op calls to the set_config routine with all the same parameters and tracked down the source to the fb helper pan routine. So add an additional check for actual panning relative to the current crtc config to avoid unnecessary set_config calls. Signed-off-by: Jesse Barnes <jbarnes(a)virtuousgeek.org> diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index f7c6854..4dd81f3 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -739,7 +739,8 @@ int drm_fb_helper_pan_display(struct fb_var_screeninfo *var, modeset->x = var->xoffset; modeset->y = var->yoffset; - if (modeset->num_connectors) { + if (((modeset->x != crtc->x) || (modeset->y != crtc->y)) && + modeset->num_connectors) { ret = crtc->funcs->set_config(modeset); if (!ret) { info->var.xoffset = var->xoffset;

1 0

Fwd: [PATCH] i915: Fix bug where screen brightness is not restored
by Linus Torvalds 15 Nov '11

15 Nov '11

Email sent to wrong people/list, Linus ---------- Forwarded message ---------- From: Alex Davis <alex14641(a)yahoo.com> Date: Tue, Nov 15, 2011 at 12:42 AM Subject: [PATCH] i915: Fix bug where screen brightness is not restored To: "linux-kernel(a)vger.kernel.org" <linux-kernel(a)vger.kernel.org>, "torvalds(a)linux-foundation.org" <torvalds(a)linux-foundation.org> From: Alex Davis<alex14641(a)yahoo.com> This patch fixes an issue where the screen would remain dark when a key was pressed when the laptop lid was reopened or after the laptop had gone into power-save mode. It seems that there are a number of people with different machines that have this problem: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/872652 https://launchpad.net/~kamalmostafa/+archive/stuck-backlight and https://bugs.freedesktop.org/show_bug.cgi?id=41926 This patch is against Linux 3.1 Putting printk's in ./drivers/gpu/drm/i915/intel_panel.c showed that intel_get_brightness was being called after the panel was disabled, which caused a 0 to be saved as the value to restore the brightness. intel_panel_disable_backlight merely sets the brightness to 0. Commenting out this call allows the correct brightness value to be saved. Signed-off-by: Alex Davis <alex14641(a)yahoo.com> Tested-by: Kamal Mostafa <kamal(a)canonical.com> ----- diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c index a9e0c7b..6f56676 100644 --- a/drivers/gpu/drm/i915/intel_panel.c +++ b/drivers/gpu/drm/i915/intel_panel.c @@ -262,8 +262,6 @@ void intel_panel_disable_backlight(struct drm_device *dev) dev_priv->backlight_level = intel_panel_get_backlight(dev); dev_priv->backlight_enabled = false; } - - intel_panel_set_backlight(dev, 0); } void intel_panel_enable_backlight(struct drm_device *dev) I code, therefore I am

1 0

[Bug 42908] New: r600g: glx-shader-sharing causes segfault
by bugzilla-daemon＠freedesktop.org 15 Nov '11

15 Nov '11

https://bugs.freedesktop.org/show_bug.cgi?id=42908 Bug #: 42908 Summary: r600g: glx-shader-sharing causes segfault Classification: Unclassified Product: Mesa Version: git Platform: Other OS/Version: All Status: NEW Severity: normal Priority: medium Component: Drivers/Gallium/r600 AssignedTo: dri-devel(a)lists.freedesktop.org ReportedBy: debian(a)carbon-project.org Created attachment 53511 --> https://bugs.freedesktop.org/attachment.cgi?id=53511 GDB ouput for the crash I'm currently trying to find the Piglit test (it's one of the GLX tests run by r600.tests), that causes screen corruption. In the process I hit a segfault in r600_dri.so, which I can cause repeatedly with glx-shader-sharing. Used stack: Mesa: Git/9ae10e9c libdrm: 2.4.27-1 Kernel: 3.1.1 X.org: 1.11.1.902-1 The attachment shows a backtrace and a register dump. Let me know, if you need more. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug.

1 2

[PATCH] Fix wrong assumptions in cea_for_each_detailed_block v2
by Christian Schmidt 15 Nov '11

15 Nov '11

The current logic misunderstands the spec about CEA 18byte descriptors. First, the spec doesn't state "detailed timing descriptors" but "18 byte descriptors", so any data record could be stored, mixed timings and other data, just as in the standard EDID. Second, the lower four bit of byte 3 of the CEA record do not contain the number of descriptors, but "the total number of DTDs defining native formats in the whole EDID [...], starting with the first DTD in the DTD list (which starts in the base EDID block)." A device can of course support non-native formats. As such the number can't be used to determine n, and the existing code will filter non-timing 18byte descriptors anyway. V2 removes an unused variable warning. Signed-off-by: Christian Schmidt <schmidt@digadd,de>

4 3

← Newer
1
...
43
44
45
46
47
48
49
...
56
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel November 2011