dri-devel February 2012

dri-devel@lists.freedesktop.org

114 participants
627 discussions

[Bug 45719] Game Shank is unplayable
by bugzilla-daemon＠freedesktop.org 06 Feb '12

06 Feb '12

1 0

[PATCH] drm/modes: do not enforce an odd vtotal for interlaced modes
by Daniel Vetter 06 Feb '12

06 Feb '12

CEA actually specifies an interlaced mode with even vtotal and supplies a diagram showing how this is supposed to work. Note that interlaced modes with an even vtotal seem to be a fairly recent invention. All modelines lore I could dig up with googling says that vtotal for interlaced modes _needs_ to be odd. But the even modelines in CEA are not a spec-bug, there's a figure in CEA-861-E called "Figure 5 Special Interlaced Video Format Timing (Even Vtotal)" that explains how it's supposed to work. Furthermore intel Bspec explicitly mentions that both odd and even interlaced vtotal are supported (VTOTAL register in the south display engine of PCH split chips). Cc: Adam Jackson <ajax(a)redhat.com> Signed-Off-by: Daniel Vetter <daniel.vetter(a)ffwll.ch> --- drivers/gpu/drm/drm_modes.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c index fb8e46b..7ff13bc 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c @@ -686,8 +686,6 @@ void drm_mode_set_crtcinfo(struct drm_display_mode *p, int adjust_flags) p->crtc_vsync_end /= 2; p->crtc_vtotal /= 2; } - - p->crtc_vtotal |= 1; } if (p->flags & DRM_MODE_FLAG_DBLSCAN) { -- 1.7.7.5

3 2

[PATCH] drm cleanup patches
by Sascha Hauer 06 Feb '12

06 Feb '12

The following patches contain some fixes and cleanups for the drm core. - fix memory holes - make some initialization / deinitialization more symmetric - add convenience functions for creating properties - remove DRM_CONNECTOR_MAX_PROPERTY limitation All patches tested on a GeForce 6200 LE with the nouveau driver and a DELL E6220 Laptop using the intel driver. Please review and consider applying Sascha Sascha Hauer (20): drm crtc: use drm_mode_destroy instead of kfree in drm_mode_remove drm crtc: add forgotten idr cleanup functions drm drm_edit: drm modes have to be free with drm_mode_destroy drm drm_fb_helper: destroy modes drm: add proper return value for drm_mode_crtc_set_gamma_size drm fb helper: use drm_helper_connector_dpms to do dpms drm fb helper: remove unused variable conn_limit drm fb helper: remove unused variable crtc_id drm fb_helper: use lists for crtcs. drm: remove now unused crtc_count parameter from drm_fb_helper_init drm fb helper: add the connectors inside drm_fb_helper_initial_config drm crtc_helper: use list_for_each_entry drm crtc: Fix locking comments drm: add convenience function to create an enum property drm: add convenience function to create an range property drm: store connector properties in list drm: remove checks for same value in set_prop drm: do not call drm_connector_property_set_value from drivers drm exynos: use drm_fb_helper_set_par directly drm: do not set fb_info->pixmap fields drivers/gpu/drm/drm_crtc.c | 315 +++++++++++++-------------- drivers/gpu/drm/drm_crtc_helper.c | 12 +- drivers/gpu/drm/drm_edid.c | 2 +- drivers/gpu/drm/drm_fb_helper.c | 216 +++++++------------ drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 49 +---- drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 4 - drivers/gpu/drm/gma500/cdv_intel_lvds.c | 33 +--- drivers/gpu/drm/gma500/framebuffer.c | 15 +- drivers/gpu/drm/gma500/psb_intel_lvds.c | 36 +--- drivers/gpu/drm/gma500/psb_intel_sdvo.c | 45 +---- drivers/gpu/drm/i2c/ch7006_drv.c | 5 +- drivers/gpu/drm/i915/intel_dp.c | 11 - drivers/gpu/drm/i915/intel_fb.c | 11 +- drivers/gpu/drm/i915/intel_hdmi.c | 5 - drivers/gpu/drm/i915/intel_modes.c | 28 +-- drivers/gpu/drm/i915/intel_sdvo.c | 35 +--- drivers/gpu/drm/i915/intel_tv.c | 31 +--- drivers/gpu/drm/nouveau/nouveau_connector.c | 32 +-- drivers/gpu/drm/nouveau/nouveau_display.c | 20 +- drivers/gpu/drm/nouveau/nouveau_fbcon.c | 11 +- drivers/gpu/drm/radeon/radeon_connectors.c | 24 +-- drivers/gpu/drm/radeon/radeon_display.c | 70 ++----- drivers/gpu/drm/radeon/radeon_fb.c | 11 +- drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 14 -- drivers/video/nvidia/nvidia.c | 6 - include/drm/drm_crtc.h | 24 ++- include/drm/drm_fb_helper.h | 9 +- 27 files changed, 356 insertions(+), 718 deletions(-)

6 39

[PATCH v2] drm property helper patches
by Sascha Hauer 06 Feb '12

06 Feb '12

These are some of the remaining patches from my previous cleanup series with the comments from Chris Wilson integrated. The still remaining patches require some more work and I will send them later. Sascha Sascha Hauer (3): drm: add convenience function to create an enum property drm: add convenience function to create an range property drm: do not set fb_info->pixmap fields drivers/gpu/drm/drm_crtc.c | 169 +++++++++++++---------------- drivers/gpu/drm/gma500/framebuffer.c | 11 +-- drivers/gpu/drm/gma500/psb_intel_sdvo.c | 28 +---- drivers/gpu/drm/i2c/ch7006_drv.c | 5 +- drivers/gpu/drm/i915/intel_fb.c | 6 +- drivers/gpu/drm/i915/intel_modes.c | 28 ++--- drivers/gpu/drm/i915/intel_sdvo.c | 30 ++---- drivers/gpu/drm/nouveau/nouveau_display.c | 20 ++--- drivers/gpu/drm/nouveau/nouveau_fbcon.c | 6 +- drivers/gpu/drm/radeon/radeon_display.c | 70 +++--------- drivers/gpu/drm/radeon/radeon_fb.c | 6 +- drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 14 +--- drivers/video/nvidia/nvidia.c | 6 +- include/drm/drm_crtc.h | 11 ++ 14 files changed, 142 insertions(+), 268 deletions(-)

1 3

[PATCH 1/2] libdrm: update drm headers from kernel, including new overlay ioctls & structs
by Jesse Barnes 06 Feb '12

06 Feb '12

Add structs and functions necessary for the new plane and fb handling code, including a new header, drm_fourcc.h, that includes the surface formats supported by various DRM drivers. Signed-off-by: Jesse Barnes <jbarnes(a)virtuousgeek.org> --- include/drm/Makefile.am | 1 + include/drm/drm.h | 13 ++++- include/drm/drm_fourcc.h | 130 +++++++++++++++++++++++++++++++++++++++ include/drm/drm_mode.h | 100 ++++++++++++++++++++++++------ xf86drmMode.c | 153 ++++++++++++++++++++++++++++++++++++++++++++++ xf86drmMode.h | 33 ++++++++++ 6 files changed, 411 insertions(+), 19 deletions(-) create mode 100644 include/drm/drm_fourcc.h diff --git a/include/drm/Makefile.am b/include/drm/Makefile.am index 43695bd..2923ab4 100644 --- a/include/drm/Makefile.am +++ b/include/drm/Makefile.am @@ -26,6 +26,7 @@ klibdrmincludedir = ${includedir}/libdrm klibdrminclude_HEADERS = \ drm.h \ drm_mode.h \ + drm_fourcc.h \ drm_sarea.h \ i915_drm.h \ mga_drm.h \ diff --git a/include/drm/drm.h b/include/drm/drm.h index 5fd24fc..bb2dea8 100644 --- a/include/drm/drm.h +++ b/include/drm/drm.h @@ -467,12 +467,15 @@ struct drm_irq_busid { enum drm_vblank_seq_type { _DRM_VBLANK_ABSOLUTE = 0x0, /**< Wait for specific vblank sequence number */ _DRM_VBLANK_RELATIVE = 0x1, /**< Wait for given number of vblanks */ + /* bits 1-6 are reserved for high crtcs */ + _DRM_VBLANK_HIGH_CRTC_MASK = 0x0000003e, _DRM_VBLANK_EVENT = 0x4000000, /**< Send event instead of blocking */ _DRM_VBLANK_FLIP = 0x8000000, /**< Scheduled buffer swap should flip */ _DRM_VBLANK_NEXTONMISS = 0x10000000, /**< If missed, wait for next vblank */ _DRM_VBLANK_SECONDARY = 0x20000000, /**< Secondary display controller */ _DRM_VBLANK_SIGNAL = 0x40000000 /**< Send signal instead of blocking, unsupported */ }; +#define _DRM_VBLANK_HIGH_CRTC_SHIFT 1 #define _DRM_VBLANK_TYPES_MASK (_DRM_VBLANK_ABSOLUTE | _DRM_VBLANK_RELATIVE) #define _DRM_VBLANK_FLAGS_MASK (_DRM_VBLANK_EVENT | _DRM_VBLANK_SIGNAL | \ @@ -674,6 +677,8 @@ struct drm_get_cap { #define DRM_IOCTL_UNLOCK DRM_IOW( 0x2b, struct drm_lock) #define DRM_IOCTL_FINISH DRM_IOW( 0x2c, struct drm_lock) +#define DRM_IOCTL_GEM_PRIME_OPEN DRM_IOWR(0x2e, struct drm_gem_open) + #define DRM_IOCTL_AGP_ACQUIRE DRM_IO( 0x30) #define DRM_IOCTL_AGP_RELEASE DRM_IO( 0x31) #define DRM_IOCTL_AGP_ENABLE DRM_IOW( 0x32, struct drm_agp_mode) @@ -713,6 +718,10 @@ 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) +#define DRM_IOCTL_MODE_ADDFB2 DRM_IOWR(0xB8, struct drm_mode_fb_cmd2) /** * Device specific ioctls should only be in their respective headers @@ -755,9 +764,10 @@ struct drm_event_vblank { }; #define DRM_CAP_DUMB_BUFFER 0x1 -#define DRM_CAP_VBLANK_HIGH_CRTC 0x2 +#define DRM_CAP_VBLANK_HIGH_CRTC 0x2 /* typedef area */ +#ifndef __KERNEL__ typedef struct drm_clip_rect drm_clip_rect_t; typedef struct drm_drawable_info drm_drawable_info_t; typedef struct drm_tex_region drm_tex_region_t; @@ -799,5 +809,6 @@ typedef struct drm_agp_binding drm_agp_binding_t; typedef struct drm_agp_info drm_agp_info_t; typedef struct drm_scatter_gather drm_scatter_gather_t; typedef struct drm_set_version drm_set_version_t; +#endif #endif diff --git a/include/drm/drm_fourcc.h b/include/drm/drm_fourcc.h new file mode 100644 index 0000000..b1107cb --- /dev/null +++ b/include/drm/drm_fourcc.h @@ -0,0 +1,130 @@ +/* + * Copyright 2011 Intel Corporation + * + * 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 + * VA LINUX SYSTEMS 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 DRM_FOURCC_H +#define DRM_FOURCC_H + +#include <linux/types.h> + +#define fourcc_code(a,b,c,d) ((__u32)(a) | ((__u32)(b) << 8) | \ + ((__u32)(c) << 16) | ((__u32)(d) << 24)) + +#define DRM_FORMAT_BIG_ENDIAN (1<<31) /* format is big endian instead of little endian */ + +/* color index */ +#define DRM_FORMAT_C8 fourcc_code('C', '8', ' ', ' ') /* [7:0] C */ + +/* 8 bpp RGB */ +#define DRM_FORMAT_RGB332 fourcc_code('R', 'G', 'B', '8') /* [7:0] R:G:B 3:3:2 */ +#define DRM_FORMAT_BGR233 fourcc_code('B', 'G', 'R', '8') /* [7:0] B:G:R 2:3:3 */ + +/* 16 bpp RGB */ +#define DRM_FORMAT_XRGB4444 fourcc_code('X', 'R', '1', '2') /* [15:0] x:R:G:B 4:4:4:4 little endian */ +#define DRM_FORMAT_XBGR4444 fourcc_code('X', 'B', '1', '2') /* [15:0] x:B:G:R 4:4:4:4 little endian */ +#define DRM_FORMAT_RGBX4444 fourcc_code('R', 'X', '1', '2') /* [15:0] R:G:B:x 4:4:4:4 little endian */ +#define DRM_FORMAT_BGRX4444 fourcc_code('B', 'X', '1', '2') /* [15:0] B:G:R:x 4:4:4:4 little endian */ + +#define DRM_FORMAT_ARGB4444 fourcc_code('A', 'R', '1', '2') /* [15:0] A:R:G:B 4:4:4:4 little endian */ +#define DRM_FORMAT_ABGR4444 fourcc_code('A', 'B', '1', '2') /* [15:0] A:B:G:R 4:4:4:4 little endian */ +#define DRM_FORMAT_RGBA4444 fourcc_code('R', 'A', '1', '2') /* [15:0] R:G:B:A 4:4:4:4 little endian */ +#define DRM_FORMAT_BGRA4444 fourcc_code('B', 'A', '1', '2') /* [15:0] B:G:R:A 4:4:4:4 little endian */ + +#define DRM_FORMAT_XRGB1555 fourcc_code('X', 'R', '1', '5') /* [15:0] x:R:G:B 1:5:5:5 little endian */ +#define DRM_FORMAT_XBGR1555 fourcc_code('X', 'B', '1', '5') /* [15:0] x:B:G:R 1:5:5:5 little endian */ +#define DRM_FORMAT_RGBX5551 fourcc_code('R', 'X', '1', '5') /* [15:0] R:G:B:x 5:5:5:1 little endian */ +#define DRM_FORMAT_BGRX5551 fourcc_code('B', 'X', '1', '5') /* [15:0] B:G:R:x 5:5:5:1 little endian */ + +#define DRM_FORMAT_ARGB1555 fourcc_code('A', 'R', '1', '5') /* [15:0] A:R:G:B 1:5:5:5 little endian */ +#define DRM_FORMAT_ABGR1555 fourcc_code('A', 'B', '1', '5') /* [15:0] A:B:G:R 1:5:5:5 little endian */ +#define DRM_FORMAT_RGBA5551 fourcc_code('R', 'A', '1', '5') /* [15:0] R:G:B:A 5:5:5:1 little endian */ +#define DRM_FORMAT_BGRA5551 fourcc_code('B', 'A', '1', '5') /* [15:0] B:G:R:A 5:5:5:1 little endian */ + +#define DRM_FORMAT_RGB565 fourcc_code('R', 'G', '1', '6') /* [15:0] R:G:B 5:6:5 little endian */ +#define DRM_FORMAT_BGR565 fourcc_code('B', 'G', '1', '6') /* [15:0] B:G:R 5:6:5 little endian */ + +/* 24 bpp RGB */ +#define DRM_FORMAT_RGB888 fourcc_code('R', 'G', '2', '4') /* [23:0] R:G:B little endian */ +#define DRM_FORMAT_BGR888 fourcc_code('B', 'G', '2', '4') /* [23:0] B:G:R little endian */ + +/* 32 bpp RGB */ +#define DRM_FORMAT_XRGB8888 fourcc_code('X', 'R', '2', '4') /* [31:0] x:R:G:B 8:8:8:8 little endian */ +#define DRM_FORMAT_XBGR8888 fourcc_code('X', 'B', '2', '4') /* [31:0] x:B:G:R 8:8:8:8 little endian */ +#define DRM_FORMAT_RGBX8888 fourcc_code('R', 'X', '2', '4') /* [31:0] R:G:B:x 8:8:8:8 little endian */ +#define DRM_FORMAT_BGRX8888 fourcc_code('B', 'X', '2', '4') /* [31:0] B:G:R:x 8:8:8:8 little endian */ + +#define DRM_FORMAT_ARGB8888 fourcc_code('A', 'R', '2', '4') /* [31:0] A:R:G:B 8:8:8:8 little endian */ +#define DRM_FORMAT_ABGR8888 fourcc_code('A', 'B', '2', '4') /* [31:0] A:B:G:R 8:8:8:8 little endian */ +#define DRM_FORMAT_RGBA8888 fourcc_code('R', 'A', '2', '4') /* [31:0] R:G:B:A 8:8:8:8 little endian */ +#define DRM_FORMAT_BGRA8888 fourcc_code('B', 'A', '2', '4') /* [31:0] B:G:R:A 8:8:8:8 little endian */ + +#define DRM_FORMAT_XRGB2101010 fourcc_code('X', 'R', '3', '0') /* [31:0] x:R:G:B 2:10:10:10 little endian */ +#define DRM_FORMAT_XBGR2101010 fourcc_code('X', 'B', '3', '0') /* [31:0] x:B:G:R 2:10:10:10 little endian */ +#define DRM_FORMAT_RGBX1010102 fourcc_code('R', 'X', '3', '0') /* [31:0] R:G:B:x 10:10:10:2 little endian */ +#define DRM_FORMAT_BGRX1010102 fourcc_code('B', 'X', '3', '0') /* [31:0] B:G:R:x 10:10:10:2 little endian */ + +#define DRM_FORMAT_ARGB2101010 fourcc_code('A', 'R', '3', '0') /* [31:0] A:R:G:B 2:10:10:10 little endian */ +#define DRM_FORMAT_ABGR2101010 fourcc_code('A', 'B', '3', '0') /* [31:0] A:B:G:R 2:10:10:10 little endian */ +#define DRM_FORMAT_RGBA1010102 fourcc_code('R', 'A', '3', '0') /* [31:0] R:G:B:A 10:10:10:2 little endian */ +#define DRM_FORMAT_BGRA1010102 fourcc_code('B', 'A', '3', '0') /* [31:0] B:G:R:A 10:10:10:2 little endian */ + +/* packed YCbCr */ +#define DRM_FORMAT_YUYV fourcc_code('Y', 'U', 'Y', 'V') /* [31:0] Cr0:Y1:Cb0:Y0 8:8:8:8 little endian */ +#define DRM_FORMAT_YVYU fourcc_code('Y', 'V', 'Y', 'U') /* [31:0] Cb0:Y1:Cr0:Y0 8:8:8:8 little endian */ +#define DRM_FORMAT_UYVY fourcc_code('U', 'Y', 'V', 'Y') /* [31:0] Y1:Cr0:Y0:Cb0 8:8:8:8 little endian */ +#define DRM_FORMAT_VYUY fourcc_code('V', 'Y', 'U', 'Y') /* [31:0] Y1:Cb0:Y0:Cr0 8:8:8:8 little endian */ + +#define DRM_FORMAT_AYUV fourcc_code('A', 'Y', 'U', 'V') /* [31:0] A:Y:Cb:Cr 8:8:8:8 little endian */ + +/* + * 2 plane YCbCr + * index 0 = Y plane, [7:0] Y + * index 1 = Cr:Cb plane, [15:0] Cr:Cb little endian + * or + * index 1 = Cb:Cr plane, [15:0] Cb:Cr little endian + */ +#define DRM_FORMAT_NV12 fourcc_code('N', 'V', '1', '2') /* 2x2 subsampled Cr:Cb plane */ +#define DRM_FORMAT_NV21 fourcc_code('N', 'V', '2', '1') /* 2x2 subsampled Cb:Cr plane */ +#define DRM_FORMAT_NV16 fourcc_code('N', 'V', '1', '6') /* 2x1 subsampled Cr:Cb plane */ +#define DRM_FORMAT_NV61 fourcc_code('N', 'V', '6', '1') /* 2x1 subsampled Cb:Cr plane */ + +/* + * 3 plane YCbCr + * index 0: Y plane, [7:0] Y + * index 1: Cb plane, [7:0] Cb + * index 2: Cr plane, [7:0] Cr + * or + * index 1: Cr plane, [7:0] Cr + * index 2: Cb plane, [7:0] Cb + */ +#define DRM_FORMAT_YUV410 fourcc_code('Y', 'U', 'V', '9') /* 4x4 subsampled Cb (1) and Cr (2) planes */ +#define DRM_FORMAT_YVU410 fourcc_code('Y', 'V', 'U', '9') /* 4x4 subsampled Cr (1) and Cb (2) planes */ +#define DRM_FORMAT_YUV411 fourcc_code('Y', 'U', '1', '1') /* 4x1 subsampled Cb (1) and Cr (2) planes */ +#define DRM_FORMAT_YVU411 fourcc_code('Y', 'V', '1', '1') /* 4x1 subsampled Cr (1) and Cb (2) planes */ +#define DRM_FORMAT_YUV420 fourcc_code('Y', 'U', '1', '2') /* 2x2 subsampled Cb (1) and Cr (2) planes */ +#define DRM_FORMAT_YVU420 fourcc_code('Y', 'V', '1', '2') /* 2x2 subsampled Cr (1) and Cb (2) planes */ +#define DRM_FORMAT_YUV422 fourcc_code('Y', 'U', '1', '6') /* 2x1 subsampled Cb (1) and Cr (2) planes */ +#define DRM_FORMAT_YVU422 fourcc_code('Y', 'V', '1', '6') /* 2x1 subsampled Cr (1) and Cb (2) planes */ +#define DRM_FORMAT_YUV444 fourcc_code('Y', 'U', '2', '4') /* non-subsampled Cb (1) and Cr (2) planes */ +#define DRM_FORMAT_YVU444 fourcc_code('Y', 'V', '2', '4') /* non-subsampled Cr (1) and Cb (2) planes */ + +#endif /* DRM_FOURCC_H */ diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h index c7c1fbe..6c32c22 100644 --- a/include/drm/drm_mode.h +++ b/include/drm/drm_mode.h @@ -120,6 +120,43 @@ struct drm_mode_crtc { struct drm_mode_modeinfo mode; }; +#define DRM_MODE_PRESENT_TOP_FIELD (1<<0) +#define DRM_MODE_PRESENT_BOTTOM_FIELD (1<<1) + +/* 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 */ + __u32 flags; + + /* 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 @@ -229,6 +266,33 @@ struct drm_mode_fb_cmd { __u32 handle; }; +#define DRM_MODE_FB_INTERLACED (1<<0) /* for interlaced framebuffers */ + +struct drm_mode_fb_cmd2 { + __u32 fb_id; + __u32 width, height; + __u32 pixel_format; /* fourcc code from drm_fourcc.h */ + __u32 flags; + + /* + * In case of planar formats, this ioctl allows up to 4 + * buffer objects with offets and pitches per plane. + * The pitch and offset order is dictated by the fourcc, + * e.g. NV12 (http://fourcc.org/yuv.php#NV12) is described as: + * + * YUV 4:2:0 image with a plane of 8 bit Y samples + * followed by an interleaved U/V plane containing + * 8 bit 2x2 subsampled colour difference samples. + * + * So it would consist of Y as offset[0] and UV as + * offeset[1]. Note that offset[0] will generally + * be 0. + */ + __u32 handles[4]; + __u32 pitches[4]; /* pitch for each plane */ + __u32 offsets[4]; /* offset of each plane */ +}; + #define DRM_MODE_FB_DIRTY_ANNOTATE_COPY 0x01 #define DRM_MODE_FB_DIRTY_ANNOTATE_FILL 0x02 #define DRM_MODE_FB_DIRTY_FLAGS 0x03 @@ -346,31 +410,31 @@ struct drm_mode_crtc_page_flip { /* create a dumb scanout buffer */ struct drm_mode_create_dumb { - __u32 height; - __u32 width; - __u32 bpp; - __u32 flags; - /* handle, pitch, size will be returned */ - __u32 handle; - __u32 pitch; - __u64 size; + uint32_t height; + uint32_t width; + uint32_t bpp; + uint32_t flags; + /* handle, pitch, size will be returned */ + uint32_t handle; + uint32_t pitch; + uint64_t size; }; /* set up for mmap of a dumb scanout buffer */ struct drm_mode_map_dumb { - /** Handle for the object being mapped. */ - __u32 handle; - __u32 pad; - /** - * Fake offset to use for subsequent mmap call - * - * This is a fixed-size type for 32/64 compatibility. - */ - __u64 offset; + /** Handle for the object being mapped. */ + __u32 handle; + __u32 pad; + /** + * Fake offset to use for subsequent mmap call + * + * This is a fixed-size type for 32/64 compatibility. + */ + __u64 offset; }; struct drm_mode_destroy_dumb { - __u32 handle; + uint32_t handle; }; #endif diff --git a/xf86drmMode.c b/xf86drmMode.c index f08e648..da7b462 100644 --- a/xf86drmMode.c +++ b/xf86drmMode.c @@ -255,6 +255,29 @@ int drmModeAddFB(int fd, uint32_t width, uint32_t height, uint8_t depth, return 0; } +int drmModeAddFB2(int fd, uint32_t width, uint32_t height, + uint32_t pixel_format, uint32_t bo_handles[4], + uint32_t pitches[4], uint32_t offsets[4], + uint32_t *buf_id, uint32_t flags) +{ + struct drm_mode_fb_cmd2 f; + int ret; + + f.width = width; + f.height = height; + f.pixel_format = pixel_format; + f.flags = flags; + memcpy(f.handles, bo_handles, sizeof(bo_handles)); + memcpy(f.pitches, pitches, sizeof(pitches)); + memcpy(f.offsets, offsets, sizeof(offsets)); + + if ((ret = DRM_IOCTL(fd, DRM_IOCTL_MODE_ADDFB2, &f))) + return ret; + + *buf_id = f.fb_id; + return 0; +} + int drmModeRmFB(int fd, uint32_t bufferId) { return DRM_IOCTL(fd, DRM_IOCTL_MODE_RMFB, &bufferId); @@ -806,3 +829,133 @@ int drmModePageFlip(int fd, uint32_t crtc_id, uint32_t fb_id, return DRM_IOCTL(fd, DRM_IOCTL_MODE_PAGE_FLIP, &flip); } + +int drmModeSetPlane(int fd, uint32_t plane_id, uint32_t crtc_id, + uint32_t fb_id, uint32_t flags, + uint32_t crtc_x, uint32_t crtc_y, + uint32_t crtc_w, uint32_t crtc_h, + uint32_t src_x, uint32_t src_y, + uint32_t src_w, uint32_t src_h) + +{ + struct drm_mode_set_plane s; + + s.plane_id = plane_id; + s.crtc_id = crtc_id; + s.fb_id = fb_id; + s.flags = flags; + s.crtc_x = crtc_x; + s.crtc_y = crtc_y; + s.crtc_w = crtc_w; + s.crtc_h = crtc_h; + s.src_x = src_x; + s.src_y = src_y; + s.src_w = src_w; + s.src_h = src_h; + + return DRM_IOCTL(fd, DRM_IOCTL_MODE_SETPLANE, &s); +} + + +drmModePlanePtr drmModeGetPlane(int fd, uint32_t plane_id) +{ + struct drm_mode_get_plane ovr, counts; + drmModePlanePtr r = 0; + +retry: + memset(&ovr, 0, sizeof(struct drm_mode_get_plane)); + ovr.plane_id = plane_id; + if (drmIoctl(fd, DRM_IOCTL_MODE_GETPLANE, &ovr)) + return 0; + + counts = ovr; + + if (ovr.count_format_types) { + ovr.format_type_ptr = VOID2U64(drmMalloc(ovr.count_format_types * + sizeof(uint32_t))); + if (!ovr.format_type_ptr) + goto err_allocs; + } + + if (drmIoctl(fd, DRM_IOCTL_MODE_GETPLANE, &ovr)) + goto err_allocs; + + if (counts.count_format_types < ovr.count_format_types) { + drmFree(U642VOID(ovr.format_type_ptr)); + goto retry; + } + + if (!(r = drmMalloc(sizeof(*r)))) + goto err_allocs; + + r->count_formats = ovr.count_format_types; + r->plane_id = ovr.plane_id; + r->crtc_id = ovr.crtc_id; + r->fb_id = ovr.fb_id; + r->possible_crtcs = ovr.possible_crtcs; + r->gamma_size = ovr.gamma_size; + r->formats = drmAllocCpy(U642VOID(ovr.format_type_ptr), + ovr.count_format_types, sizeof(uint32_t)); + if (ovr.count_format_types && !r->formats) { + drmFree(r->formats); + r = 0; + } + +err_allocs: + drmFree(U642VOID(ovr.format_type_ptr)); + + return r; +} + +void drmModeFreePlane(drmModePlanePtr ptr) +{ + if (!ptr) + return; + + drmFree(ptr->formats); + drmFree(ptr); +} + +drmModePlaneResPtr drmModeGetPlaneResources(int fd) +{ + struct drm_mode_get_plane_res res, counts; + drmModePlaneResPtr r = 0; + +retry: + memset(&res, 0, sizeof(struct drm_mode_get_plane_res)); + if (drmIoctl(fd, DRM_IOCTL_MODE_GETPLANERESOURCES, &res)) + return 0; + + counts = res; + + if (res.count_planes) { + res.plane_id_ptr = VOID2U64(drmMalloc(res.count_planes * + sizeof(uint32_t))); + if (!res.plane_id_ptr) + goto err_allocs; + } + + if (drmIoctl(fd, DRM_IOCTL_MODE_GETPLANERESOURCES, &res)) + goto err_allocs; + + if (counts.count_planes < res.count_planes) { + drmFree(U642VOID(res.plane_id_ptr)); + goto retry; + } + + if (!(r = drmMalloc(sizeof(*r)))) + goto err_allocs; + + r->count_planes = res.count_planes; + r->planes = drmAllocCpy(U642VOID(res.plane_id_ptr), + res.count_planes, sizeof(uint32_t)); + if (res.count_planes && !r->planes) { + drmFree(r->planes); + r = 0; + } + +err_allocs: + drmFree(U642VOID(res.plane_id_ptr)); + + return r; +} diff --git a/xf86drmMode.h b/xf86drmMode.h index 1b1e3e2..c0fc2ef 100644 --- a/xf86drmMode.h +++ b/xf86drmMode.h @@ -278,7 +278,25 @@ typedef struct _drmModeConnector { uint32_t *encoders; /**< List of encoder ids */ } drmModeConnector, *drmModeConnectorPtr; +typedef struct _drmModePlane { + uint32_t count_formats; + uint32_t *formats; + uint32_t plane_id; + uint32_t crtc_id; + uint32_t fb_id; + + uint32_t crtc_x, crtc_y; + uint32_t x, y; + + uint32_t possible_crtcs; + uint32_t gamma_size; +} drmModePlane, *drmModePlanePtr; + +typedef struct _drmModePlaneRes { + uint32_t count_planes; + uint32_t *planes; +} drmModePlaneRes, *drmModePlaneResPtr; extern void drmModeFreeModeInfo( drmModeModeInfoPtr ptr ); extern void drmModeFreeResources( drmModeResPtr ptr ); @@ -286,6 +304,7 @@ extern void drmModeFreeFB( drmModeFBPtr ptr ); extern void drmModeFreeCrtc( drmModeCrtcPtr ptr ); extern void drmModeFreeConnector( drmModeConnectorPtr ptr ); extern void drmModeFreeEncoder( drmModeEncoderPtr ptr ); +extern void drmModeFreePlane( drmModePlanePtr ptr ); /** * Retrives all of the resources associated with a card. @@ -307,6 +326,11 @@ extern drmModeFBPtr drmModeGetFB(int fd, uint32_t bufferId); extern int drmModeAddFB(int fd, uint32_t width, uint32_t height, uint8_t depth, uint8_t bpp, uint32_t pitch, uint32_t bo_handle, uint32_t *buf_id); +/* ...with a specific pixel format */ +extern int drmModeAddFB2(int fd, uint32_t width, uint32_t height, + uint32_t pixel_format, uint32_t bo_handles[4], + uint32_t pitches[4], uint32_t offsets[4], + uint32_t *buf_id, uint32_t flags); /** * Destroies the given framebuffer. */ @@ -391,6 +415,15 @@ extern int drmModeCrtcGetGamma(int fd, uint32_t crtc_id, uint32_t size, extern int drmModePageFlip(int fd, uint32_t crtc_id, uint32_t fb_id, uint32_t flags, void *user_data); +extern drmModePlaneResPtr drmModeGetPlaneResources(int fd); +extern drmModePlanePtr drmModeGetPlane(int fd, uint32_t plane_id); +extern int drmModeSetPlane(int fd, uint32_t plane_id, uint32_t crtc_id, + uint32_t fb_id, uint32_t flags, + uint32_t crtc_x, uint32_t crtc_y, + uint32_t crtc_w, uint32_t crtc_h, + uint32_t src_x, uint32_t src_y, + uint32_t src_w, uint32_t src_h); + #if defined(__cplusplus) || defined(c_plusplus) } #endif -- 1.7.4.1

2 2

[PATCH] [trivial] drm: Fix typo in vmwgfx_drv.c
by Masanari Iida 05 Feb '12

05 Feb '12

Correct spelling "unsuported" to "unsupported" in drivers/gpu/drm/vmwgfx/vmwgfx_drv.c Signed-off-by: Masanari Iida <standby24x7(a)gmail.com> --- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c index f390f5f..2d6f573 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c @@ -430,7 +430,7 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset) svga_id = vmw_read(dev_priv, SVGA_REG_ID); if (svga_id != SVGA_ID_2) { ret = -ENOSYS; - DRM_ERROR("Unsuported SVGA ID 0x%x\n", svga_id); + DRM_ERROR("Unsupported SVGA ID 0x%x\n", svga_id); mutex_unlock(&dev_priv->hw_mutex); goto out_err0; } -- 1.7.6.5

3 2

Re: Fwd: Brightness on HP EliteBook 8460p
by Joey Lee 05 Feb '12

05 Feb '12

Hi Artur, 於六，2012-02-04 於 20:19 -0700，Joey Lee 提到： > Add Cc. to dri mail > > Hi Pali, > > 於五，2012-02-03 於 16:24 +0100，Pali Rohár 提到： > > On Friday 20 January 2012 17:55:57 Pali Rohár wrote: > > > On Friday 20 January 2012 11:28:59 joeyli wrote: > > > > 於五，2012-01-20 於 11:12 +0800，joeyli 提到： > > > > > > > > > Hi Pali, > > > > > > > > > > Sorry for I am late reply you. > > > > > > > > > > 於二，2012-01-17 於 19:10 +0100，Pali Rohár 提到： > > > > > > > > > > > On Wednesday 21 December 2011 12:45:07 Pali Rohár wrote: > > > > > > > Hello, > > > > > > > > > > > > > > I tried to boot with all 3 strings in acpi_os_name, but nothing was > > > > > > > changed. I'm attaching dmesg outputs, one from BIOS mode, one from > > > > > > > UEFI mode. Both are with "Microsoft Windows NT". > > > > > > > > > > > > Did you looked at my logs? > > > > > > > > > > I checked your dmesg log, found the acpi_os_name kernel parameter is : > > > > > > > > > > [ 0.000000] Command line: BOOT_IMAGE=/vmlinuz-3.2.0-4-generic > > > > > root=UUID=4ec6272a-8551-40f3-a1b1-3e10984f3e69 ro pcie_aspm=force > > > > > acpi.debug_level=0x2 acpi.debug_layer=0xFFFFFFFF "acpi_os_name=Microsoft > > > > > Windows NT" splash vt.handoff=7 > > > > > > > > > > We still need by-pass the os name check in DSDT when test function key, > > > > > > > > > > please help to feed: > > > > > acpi_os_name="Windows 2009" > > > > > > > > > > And, > > > > > looks like the acpi debug level not enough, please kindly change acpi > > > > > > > > > > debug parameter to: > > > > > acpi.debug_level=0xF acpi.debug_layer=0xFFFFFFFF log_buf_len=5M > > > > > > > > > > summary: > > > > > acpi.debug_level=0xF acpi.debug_layer=0xFFFFFFFF log_buf_len=5M > > > > > acpi_os_name="Windows 2009" > > > > > > > > Forgot remind, > > > > please remember press brightness function key a couple of times before > > > > you dump the dmesg and messages log. > > > > > > > > > > > > Thanks a lot! > > > > Joey Lee > > > > > > Hello, > > > > > > there was no acpi log, so I recompiled ubuntu kernel with > > > CONFIG_ACPI_DEBUG=y and CONFIG_ACPI_DEBUG_FUNC_TRACE. Then I started kernel > > > with your params. > > > > > > Now I'm attaching very long debug output. I belive it will be now usefull. > > > > > > Pressing brightness keys did not show anything in log. > > > > > > After writing 0 to /sys/class/backlight/acpi_video0/brightness in log > > > appear: [ 57.675070] [ACPI Debug] Integer 0x000000000000000B > > > ... > > > > > > And after writing 10: > > > [ 99.865208] [ACPI Debug] Integer 0x0000000000000048 > > > [ 99.865295] evmisc-0120 [4294967289] ev_queue_notify_reques: > > > Dispatching Notify on [DGFX] Node ffff880136246c80 Value 0xD0 (**Device > > > Specific**) [ 99.865350] video-1474 [4294967289] video_bus_notify > > > : Unsupported event [0xd0] > > > > Do you need more logs? Or is this enought? > > > > Yes, as you point out, this is a doubt for video bus received 0xD0 event > but nobody take care it. > > Traced dsdt of EliteBook 8460p from you, the _BCM like this: > > Method (_BCM, 1, Serialized) /* ATI _BCM, per log, run this _BCM */ > { > Store (\_SB.BCM (Arg0), Local0) /* set next level, normally return 0x1 if XP sp2 or later */ > If (Local0) /* if XP sp2 or later */ > { > Store (BRID, Local1) > If (LEqual (SBRV (), 0x00)) /* normally SBRV return 1, will not emit SMI */ > { > \_SB.SSMI (0xEA74, 0x04, Local1, 0x00, 0x00) > } > > Signal (\_SB.BEVT) /* emit BEVT event, HKFR (HotkeyFunctionResponse) waiting it, but why? */ > } > } > > _BCM call SBRV to setup brightness value to variable ABRI: > > Method (SBRV, 0, Serialized) /* call by ATI _BCM */ > { > Store (\_SB.SBRC (), ABRI) /* SBRC() return the brightness value, why store to ABRI? only used in PEGP.DGFX.AFN2 */ > Or (PSBR, 0x80, PSBR) > Notify (^, 0xD0) /* notify method's parent: PEGP.DGFX by 0xD0 */ > Return (0x01) /* normally return 1 */ > }The PEGP.DGFX acpi device was binding to acpi/video driver, the above > ASL code emit a 0xD0 bus event to video.c but cann't process it. Even we > add a new bus event in video.c and generate a acpi event, there still > need another acpi driver should take care it. > > I thought this acpi event might need take care by radeon drm, but I am > not good for radeon, need more help. > > Per your acpi debug log, the brightness value was changed normally when > you access _BCM: > > 83133 Jan 20 17:17:51 Pali-EliteBook kernel: [ 57.674669] ACPI: Execute Method [\_SB_.PCI0.PEGP.DGFX.LCD_._BCM] (Node ffff8 801362472a8) # start test _BCM manually > 83134 Jan 20 17:17:51 Pali-EliteBook kernel: [ 57.674736] exregion-0199 [01] ex_system_memory_space: System-Memory (width 8 ) R/W 0 Address=00000000BF7ACE1C > 83135 Jan 20 17:17:51 Pali-EliteBook kernel: [ 57.674748] exregion-0199 [02] ex_system_memory_space: System-Memory (width 8 ) R/W 1 Address=00000000BF7ACE1C > ... > 83179 Jan 20 17:17:51 Pali-EliteBook kernel: [ 57.675070] [ACPI Debug] Integer 0x000000000000000B # brightness value is 11 > 83180 Jan 20 17:17:51 Pali-EliteBook kernel: [ 57.675090] evmisc-0120 [4294967289] ev_queue_notify_reques: Dispatching No tify on [DGFX] Node ffff880136246c80 Value 0xD0 (**Device Specific**) > 83181 Jan 20 17:17:51 Pali-EliteBook kernel: [ 57.675099] video-1474 [4294967288] video_bus_notify : Unsupported event [0xd0] > ... > 83197 Jan 20 17:18:33 Pali-EliteBook kernel: [ 99.863593] ACPI: Execute Method [\_SB_.PCI0.PEGP.DGFX.LCD_._BCM] (Node ffff8 801362472a8) > 83198 Jan 20 17:18:33 Pali-EliteBook kernel: [ 99.863817] exregion-0199 [01] ex_system_memory_space: System-Memory (width 8 ) R/W 0 Address=00000000BF7ACE1C > 83243 Jan 20 17:18:33 Pali-EliteBook kernel: [ 99.865208] [ACPI Debug] Integer 0x0000000000000048 # brightness value is 72 > 83244 Jan 20 17:18:33 Pali-EliteBook kernel: [ 99.865295] evmisc-0120 [4294967289] ev_queue_notify_reques: Dispatching Notify on [DGFX] Node ffff880136246c80 Value 0xD0 (**Device Specific**) > 83245 Jan 20 17:18:33 Pali-EliteBook kernel: [ 99.865350] video-1474 [4294967289] video_bus_notify : Unsupported event [0xd0] > > The brightness values are 11(0x0B) and 72(0x48), that means the BCM > method return a good value and set to ABRI, ABRI waiting the guy who > take the 0xD0 event to read then change brightness. > > Another doubt is the latest statement in _BCM, it emit a BEVT event: > > Signal (\_SB.BEVT) > > Only HKFR(HotkeyFunctionResponse) method is waiting this event, it > should related to how the HP implement brightness function key on > Windows through wmi. > > Of course this issue really close related to video driver, even more, > we might need to know hp wmi for how to implement on Windows. > > Unfortunately, sorry for I don't have any solution to you, now, I will > continue to trace and find any support from other experts. > > > Thanks a lot! > Joey Lee After traced the acpidump of HP EliteBook 8560w from you, I added Cc. to you on this mailing loop because your HP EliteBook 8560w has the same situation with HP EliteBook 8460p. Pali Rohár reported the same brightness control issue on 8460p. The only difference between 8560w with 8460p is HP's ODM put _BCM and SBRV in SSDT3 table on 8560w. Please kindly read the above my description. Sorry for I don't have any solution, now. Thanks a lot! Joey Lee

2 1

[PATCH] [trivial] drm: Fix typo in rv515.c
by Masanari Iida 05 Feb '12

05 Feb '12

Correct spelling "reseting" to "resetting" in drivers/gpu/drm/radeon/rv515.c Signed-off-by: Masanari Iida <standby24x7(a)gmail.com> --- drivers/gpu/drm/radeon/rv515.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/radeon/rv515.c b/drivers/gpu/drm/radeon/rv515.c index 880637f..8787b18 100644 --- a/drivers/gpu/drm/radeon/rv515.c +++ b/drivers/gpu/drm/radeon/rv515.c @@ -150,7 +150,7 @@ void rv515_gpu_init(struct radeon_device *rdev) if (r100_gui_wait_for_idle(rdev)) { printk(KERN_WARNING "Failed to wait GUI idle while " - "reseting GPU. Bad things might happen.\n"); + "resetting GPU. Bad things might happen.\n"); } rv515_vga_render_disable(rdev); r420_pipes_init(rdev); @@ -162,7 +162,7 @@ void rv515_gpu_init(struct radeon_device *rdev) WREG32_PLL(0x000D, tmp); if (r100_gui_wait_for_idle(rdev)) { printk(KERN_WARNING "Failed to wait GUI idle while " - "reseting GPU. Bad things might happen.\n"); + "resetting GPU. Bad things might happen.\n"); } if (rv515_mc_wait_for_idle(rdev)) { printk(KERN_WARNING "Failed to wait MC idle while " -- 1.7.6.5

1 0

[Bug 26891] Radeon KMS on Macs with EFI boot
by bugzilla-daemon＠freedesktop.org 05 Feb '12

05 Feb '12

https://bugs.freedesktop.org/show_bug.cgi?id=26891 --- Comment #15 from Stefan Dösinger <stefandoesinger(a)gmx.at> 2012-02-05 02:28:21 PST --- Created attachment 56620 --> https://bugs.freedesktop.org/attachment.cgi?id=56620 dmesg output -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug.

1 0

[Bug 26891] Radeon KMS on Macs with EFI boot
by bugzilla-daemon＠freedesktop.org 05 Feb '12

05 Feb '12

https://bugs.freedesktop.org/show_bug.cgi?id=26891 --- Comment #14 from Stefan Dösinger <stefandoesinger(a)gmx.at> 2012-02-05 02:27:54 PST --- Created attachment 56619 --> https://bugs.freedesktop.org/attachment.cgi?id=56619 lspci output after standby -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug.

1 0

← Newer
1
...
56
57
58
59
60
61
62
63
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel February 2012