dri-devel March 2012

dri-devel@lists.freedesktop.org

114 participants
646 discussions

[Bug 46796] [X800SE] Mouse cursor corruption when switching users
by bugzilla-daemon＠freedesktop.org 07 Mar '12

07 Mar '12

https://bugs.freedesktop.org/show_bug.cgi?id=46796 --- Comment #7 from jonathan <jonathan.voss(a)gmail.com> 2012-03-06 19:41:29 PST --- This is a bit above my head I think. I got the source for xserver-xorg-video-ati from the Ubuntu repositories and tried to apply the patch to it. It looks like a lot of the right files are there, but there's no radeon_gem.c. The package version is 6.14.99~git20111219.aacbd629-0ubuntu2, which includes a date that I think indicates that it's not TOO old, … [View More]

1 0

drm: i915 hangcheck/GPU errors
by Randy Dunlap 06 Mar '12

06 Mar '12

Hi, My Toshiba Portege (Intel Core i5) hangs every few days. Sometimes I can see no log messages/reasons for it. Sometimes there are messages about X receiving potentially fatal signals. Today's hang appears to have some useful info (maybe). Mar 6 09:01:45 dragon kernel: [137308.704424] [drm:i915_hangcheck_elapsed] *ERROR* Hangcheck timer elapsed... GPU hung Mar 6 09:01:45 dragon kernel: [137308.704552] [drm] capturing error event; look for more information in /debug/dri/0/i915_error_state … [View More]Mar 6 09:01:45 dragon kernel: [137308.718950] [drm:i915_wait_request] *ERROR* i915_wait_request returns -11 (awaiting 16513584 at 16513581, next 16513585) Mar 6 09:02:13 dragon kernel: [137336.754647] [drm:i915_hangcheck_elapsed] *ERROR* Hangcheck timer elapsed... GPU hung Mar 6 09:02:13 dragon kernel: [137336.754698] [drm:i915_wait_request] *ERROR* i915_wait_request returns -11 (awaiting 16517081 at 16517078, next 16517082) ... Mar 6 09:05:44 dragon kernel: [137548.071904] [drm:i915_hangcheck_elapsed] *ERROR* Hangcheck timer elapsed... GPU hung Mar 6 09:05:44 dragon kernel: [137548.071951] [drm:i915_wait_request] *ERROR* i915_wait_request returns -11 (awaiting 16550939 at 16550936, next 16550940) Mar 6 09:05:57 dragon kernel: [137560.924459] X/1399: potentially unexpected fatal signal 6. Mar 6 09:05:57 dragon kernel: [137560.924463] Mar 6 09:05:57 dragon kernel: [137560.924466] CPU 1 Mar 6 09:05:57 dragon kernel: [137560.924468] Modules linked in: usblp snd_hda_intel snd_seq_dummy snd_seq_oss snd_seq_midi_event snd_seq snd_seq_device snd_pcm_oss snd_mixer_oss ipv6 af_packet acpi_cpufreq mperf lp ppdev parport_pc parport snd_hda_codec_hdmi snd_hda_codec_realtek uvcvideo videobuf2_core videobuf2_vmalloc videobuf2_memops usbhid hid mousedev snd_hda_codec arc4 snd_hwdep iwlwifi toshiba_acpi psmouse snd_pcm snd_timer sparse_keymap ehci_hcd battery serio_raw mac80211 evdev thermal ac xhci_hcd snd_page_alloc wmi power_supply e1000e mei(C) sdhci_pci sdhci mmc_core firmware_class cfg80211 rfkill processor sg rtc_cmos loop unix [last unloaded: snd_hda_intel] Mar 6 09:05:57 dragon kernel: [137560.924560] Mar 6 09:05:58 dragon kernel: [137560.924564] Pid: 1399, comm: X Tainted: G C 3.3.0-rc5 #2 TOSHIBA PORTEGE R835/Portable PC Mar 6 09:05:58 dragon kernel: [137560.924572] RIP: 0033:[<00007f57463c7035>] [<00007f57463c7035>] 0x7f57463c7034 Mar 6 09:05:58 dragon kernel: [137560.924581] RSP: 002b:00007fff0ac33758 EFLAGS: 00003206 Mar 6 09:05:58 dragon kernel: [137560.924585] RAX: 0000000000000000 RBX: 0000000000000000 RCX: ffffffffffffffff Mar 6 09:05:58 dragon kernel: [137560.924589] RDX: 0000000000000006 RSI: 0000000000000577 RDI: 0000000000000577 Mar 6 09:05:58 dragon kernel: [137560.924593] RBP: 00007fff0ac341a0 R08: 00007f57464ee8e0 R09: 0000000000411e40 Mar 6 09:05:59 dragon kernel: [137560.924597] R10: 0000000000000008 R11: 0000000000003206 R12: 0000000000000037 Mar 6 09:06:00 dragon kernel: [137560.924600] R13: 00007fff0ac33a80 R14: 000000000000004f R15: 0000000000000007 Mar 6 09:06:00 dragon kernel: [137560.924604] FS: 00007f57487a18a0(0000) GS:ffff88014a600000(0000) knlGS:0000000000000000 Mar 6 09:06:02 dragon kernel: [137560.924609] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 Mar 6 09:06:02 dragon kernel: [137560.924612] CR2: 0000000000418ff0 CR3: 000000013d059000 CR4: 00000000000406e0 Mar 6 09:06:02 dragon kernel: [137560.924616] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 Mar 6 09:06:02 dragon kernel: [137560.924620] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 Mar 6 09:06:03 dragon kernel: [137560.924624] Process X (pid: 1399, threadinfo ffff88013e9cc000, task ffff880124120000) Mar 6 09:06:03 dragon kernel: [137560.924627] Mar 6 09:06:03 dragon kernel: [137560.924630] Call Trace: </end> Any ideas/suggestions? "look for more information in /debug/dri/0/i915_error_state" Where is that file? in debugfs or somewhere else? thanks, -- ~Randy [View Less]

2 1

[Bug 46796] [X800SE] Mouse cursor corruption when switching users
by bugzilla-daemon＠freedesktop.org 06 Mar '12

06 Mar '12

https://bugs.freedesktop.org/show_bug.cgi?id=46796 --- Comment #6 from Michel Dänzer <michel(a)daenzer.net> 2012-03-06 09:30:19 PST --- Created attachment 58066 --> https://bugs.freedesktop.org/attachment.cgi?id=58066 Verbose test patch In order to facilitate testing, here's another version of the fix which prints a message [drm] Fixing large cursor offset 0xXXXXXXXX >= 0x08000000 when the suspected problem would have occurred. So if such a message appears in dmesg but the … [View More]

1 0

[PATCH] drm: cope with platformdev->id == -1
by Rob Clark 06 Mar '12

06 Mar '12

From: Rob Clark <rob(a)ti.com> If there are not multiple instances of a platform device, the id should apparently be set to -1. Which results in a odd looking bus-id like "platform:foodrm:-1". Probably we should just treat this case as id 0. Signed-off-by: Rob Clark <rob(a)ti.com> --- drivers/gpu/drm/drm_platform.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_platform.c b/drivers/gpu/drm/drm_platform.c index ae9db5e..… [View More]

1 0

Test application for DMABUF sharing between V4L2 and DRM
by Tomasz Stanislawski 06 Mar '12

06 Mar '12

Hi Everyone, This email contains a test application showing DMABUF sharing between DRM/KMS display and camera capture node. It show simple camera preview on LCD display. The similar application showing DMABUF sharing between two V4L devices is available at link: http://thread.gmane.org/gmane.linux.drivers.video-input-infrastructure/4379… The program is written in C99 and it was tested using Exynos/DRM and FIMC capture for M5MOLS and S5K6AAFX sensors on UniversalC210 board. This application … [View More]shows how buffer sharing between V4L2/DRM may look like. Please let me know if/where I use DRM/V4L2 incorrectly. The application was tested against 3.3-rc5 kernel with patches: http://thread.gmane.org/gmane.linux.kernel.cross-arch/12819 [redesign of DMA mapping] http://thread.gmane.org/gmane.linux.drivers.video-input-infrastructure/4379… [support for dma_get_pages, PoC generic API for transforming DMA object into list of pages] http://thread.gmane.org/gmane.comp.video.dri.devel/65583/focus=65703 [DRM prime support] http://git.infradead.org/users/kmpark/linux-samsung/shortlog/refs/heads/exy… [DRM prime support for Exynos DRM] http://thread.gmane.org/gmane.comp.video.dri.devel/65992 [fix to DRM prime in Exynos DRM] http://thread.gmane.org/gmane.linux.drivers.video-input-infrastructure/4296… [support for DMABUF importing in V4L2] http://thread.gmane.org/gmane.linux.drivers.video-input-infrastructure/45394 [integrate V4L2 with DMABUF] Regards, Tomasz Stanislawski --- #include <errno.h> #include <fcntl.h> #include <linux/videodev2.h> #include <math.h> #include <poll.h> #include <stdio.h> #include <stdint.h> #include <stdlib.h> #include <string.h> #include <sys/ioctl.h> #include <sys/mman.h> #include <sys/stat.h> #include <sys/types.h> #include <unistd.h> #include <xf86drm.h> #include <xf86drmMode.h> #include <exynos_drm.h> #define ERRSTR strerror(errno) #define BYE_ON(cond, ...) \ do { \ if (cond) { \ int errsv = errno; \ fprintf(stderr, "ERROR(%s:%d) : ", \ __FILE__, __LINE__); \ errno = errsv; \ fprintf(stderr, __VA_ARGS__); \ abort(); \ } \ } while(0) static inline int warn(const char *file, int line, const char *fmt, ...) { int errsv = errno; va_list va; va_start(va, fmt); fprintf(stderr, "WARN(%s:%d): ", file, line); vfprintf(stderr, fmt, va); va_end(va); errno = errsv; return 1; } #define WARN_ON(cond, ...) \ ((cond) ? warn(__FILE__, __LINE__, __VA_ARGS__) : 0) struct setup { char module[32]; uint32_t conId; uint32_t crtId; char modestr[32]; char video[32]; unsigned int w, h; unsigned int use_wh : 1; unsigned int in_fourcc; unsigned int out_fourcc; unsigned int buffer_count; unsigned int use_crop : 1; unsigned int use_compose : 1; struct v4l2_rect crop; struct v4l2_rect compose; }; struct buffer { unsigned int bo_handle; unsigned int fb_handle; int dbuf_fd; }; struct stream { int v4lfd; int current_buffer; int buffer_count; struct buffer *buffer; } stream; static void usage(char *name) { fprintf(stderr, "usage: %s [-Moisth]\n", name); fprintf(stderr, "\t-M <drm-module>\tset DRM module\n"); fprintf(stderr, "\t-o <connector_id>:<crtc_id>:<mode>\tset a mode\n"); fprintf(stderr, "\t-i <video-node>\tset video node like /dev/video*\n"); fprintf(stderr, "\t-S <width,height>\tset input resolution\n"); fprintf(stderr, "\t-f <fourcc>\tset input format using 4cc\n"); fprintf(stderr, "\t-F <fourcc>\tset output format using 4cc\n"); fprintf(stderr, "\t-s <width,height>@<left,top>\tset crop area\n"); fprintf(stderr, "\t-t <width,height>@<left,top>\tset compose area\n"); fprintf(stderr, "\t-b buffer_count\tset number of buffers\n"); fprintf(stderr, "\t-h\tshow this help\n"); fprintf(stderr, "\n\tDefault is to dump all info.\n"); } static inline int parse_rect(char *s, struct v4l2_rect *r) { return sscanf(s, "%d,%d@%d,%d", &r->width, &r->height, &r->top, &r->left) != 4; } static int parse_args(int argc, char *argv[], struct setup *s) { if (argc <= 1) usage(argv[0]); int c, ret; memset(s, 0, sizeof(*s)); while ((c = getopt(argc, argv, "M:o:i:S:f:F:s:t:b:h")) != -1) { switch (c) { case 'M': strncpy(s->module, optarg, 31); break; case 'o': ret = sscanf(optarg, "%u:%u:%31s", &s->conId, &s->crtId, s->modestr); if (WARN_ON(ret != 3, "incorrect mode description\n")) return -1; break; case 'i': strncpy(s->video, optarg, 31); break; case 'S': ret = sscanf(optarg, "%u,%u", &s->w, &s->h); if (WARN_ON(ret != 2, "incorrect input size\n")) return -1; s->use_wh = 1; break; case 'f': if (WARN_ON(strlen(optarg) != 4, "invalid fourcc\n")) return -1; s->in_fourcc = ((unsigned)optarg[0] << 0) | ((unsigned)optarg[1] << 8) | ((unsigned)optarg[2] << 16) | ((unsigned)optarg[3] << 24); break; case 'F': if (WARN_ON(strlen(optarg) != 4, "invalid fourcc\n")) return -1; s->out_fourcc = ((unsigned)optarg[0] << 0) | ((unsigned)optarg[1] << 8) | ((unsigned)optarg[2] << 16) | ((unsigned)optarg[3] << 24); break; case 's': ret = parse_rect(optarg, &s->crop); if (WARN_ON(ret, "incorrect crop area\n")) return -1; s->use_crop = 1; break; case 't': ret = parse_rect(optarg, &s->compose); if (WARN_ON(ret, "incorrect compose area\n")) return -1; s->use_compose = 1; break; case 'b': ret = sscanf(optarg, "%u", &s->buffer_count); if (WARN_ON(ret != 1, "incorrect buffer count\n")) return -1; break; case '?': case 'h': usage(argv[0]); return -1; } } return 0; } static int buffer_create(struct buffer *b, int drmfd, struct setup *s, uint64_t size, uint32_t pitch) { int ret = strncmp(s->module, "exynos", 6); if (WARN_ON(ret, "drm: only exynos GEM is supported\n")) return -1; struct drm_exynos_gem_create gem; struct drm_gem_close gem_close; memset(&gem, 0, sizeof gem); gem.size = size; ret = ioctl(drmfd, DRM_IOCTL_EXYNOS_GEM_CREATE, &gem); if (WARN_ON(ret, "EXYNOS_GEM_CREATE failed: %s\n", ERRSTR)) return -1; b->bo_handle = gem.handle; struct drm_prime_handle prime; memset(&prime, 0, sizeof prime); prime.handle = b->bo_handle; ret = ioctl(drmfd, DRM_IOCTL_PRIME_HANDLE_TO_FD, &prime); if (WARN_ON(ret, "PRIME_HANDLE_TO_FD failed: %s\n", ERRSTR)) goto fail_gem; printf("dbuf_fd = %d\n", prime.fd); b->dbuf_fd = prime.fd; uint32_t offsets[4] = { 0 }; uint32_t pitches[4] = { pitch }; uint32_t bo_handles[4] = { b->bo_handle }; unsigned int fourcc = s->out_fourcc; if (!fourcc) fourcc = s->in_fourcc; ret = drmModeAddFB2(drmfd, s->w, s->h, fourcc, bo_handles, pitches, offsets, &b->fb_handle, 0); if (WARN_ON(ret, "drmModeAddFB2 failed: %s\n", ERRSTR)) goto fail_prime; return 0; fail_prime: close(b->dbuf_fd); fail_gem: memset(&gem_close, 0, sizeof gem_close); gem_close.handle = b->bo_handle, ret = ioctl(drmfd, DRM_IOCTL_GEM_CLOSE, gem_close); WARN_ON(ret, "GEM_CLOSE failed: %s\n", ERRSTR); return -1; } static int find_mode(drmModeModeInfo *m, int drmfd, struct setup *s, uint32_t *con) { int ret = -1; drmModeRes *res = drmModeGetResources(drmfd); if (WARN_ON(!res, "drmModeGetResources failed: %s\n", ERRSTR)) return -1; if (WARN_ON(res->count_crtcs <= 0, "drm: no crts\n")) goto fail_res; if (WARN_ON(res->count_connectors <= 0, "drm: no connectors\n")) goto fail_res; if (WARN_ON(s->conId >= res->count_connectors, "connector %d " "is not supported\n", s->conId)) goto fail_res; drmModeConnector *c; c = drmModeGetConnector(drmfd, res->connectors[s->conId]); if (WARN_ON(!c, "drmModeGetConnector failed: %s\n", ERRSTR)) goto fail_res; if (WARN_ON(!c->count_modes, "connector supports no mode\n")) goto fail_conn; drmModeModeInfo *found = NULL; for (int i = 0; i < c->count_modes; ++i) if (strcmp(c->modes[i].name, s->modestr) == 0) found = &c->modes[i]; if (WARN_ON(!found, "mode %s not supported\n", s->modestr)) { fprintf(stderr, "Valid modes:"); for (int i = 0; i < c->count_modes; ++i) fprintf(stderr, " %s", c->modes[i].name); fprintf(stderr, "\n"); goto fail_conn; } memcpy(m, found, sizeof *found); if (con) *con = c->connector_id; ret = 0; fail_conn: drmModeFreeConnector(c); fail_res: drmModeFreeResources(res); return ret; } static void page_flip_handler(int fd, unsigned int frame, unsigned int sec, unsigned int usec, void *data) { int index = stream.current_buffer; struct v4l2_buffer buf; struct v4l2_plane plane; int ret; stream.current_buffer = (int)data; if (index < 0) return; memset(&buf, 0, sizeof buf); memset(&plane, 0, sizeof plane); buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE; buf.memory = V4L2_MEMORY_DMABUF; buf.index = index; buf.m.planes = &plane; buf.length = 1; plane.m.fd = stream.buffer[index].dbuf_fd; ret = ioctl(stream.v4lfd, VIDIOC_QBUF, &buf); BYE_ON(ret, "VIDIOC_QBUF(index = %d) failed: %s\n", index, ERRSTR); } int main(int argc, char *argv[]) { int ret; struct setup s; ret = parse_args(argc, argv, &s); BYE_ON(ret, "failed to parse arguments\n"); BYE_ON(s.module[0] == 0, "DRM module is missing\n"); BYE_ON(s.video[0] == 0, "video node is missing\n"); int drmfd = drmOpen(s.module, NULL); BYE_ON(drmfd < 0, "drmOpen(%s) failed: %s\n", s.module, ERRSTR); int v4lfd = open(s.video, O_RDWR); BYE_ON(v4lfd < 0, "failed to open %s: %s\n", s.video, ERRSTR); struct v4l2_capability caps; memset(&caps, 0, sizeof caps); ret = ioctl(v4lfd, VIDIOC_QUERYCAP, &caps); BYE_ON(ret, "VIDIOC_QUERYCAP failed: %s\n", ERRSTR); /* TODO: add single plane support */ BYE_ON(~caps.capabilities & V4L2_CAP_VIDEO_CAPTURE_MPLANE, "video: multiplanar capture is not supported\n"); struct v4l2_format fmt; memset(&fmt, 0, sizeof fmt); fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE; ret = ioctl(v4lfd, VIDIOC_G_FMT, &fmt); BYE_ON(ret < 0, "VIDIOC_G_FMT failed: %s\n", ERRSTR); printf("G_FMT(start): width = %u, height = %u, 4cc = %.4s\n", fmt.fmt.pix_mp.width, fmt.fmt.pix_mp.height, (char*)&fmt.fmt.pix_mp.pixelformat); if (s.use_wh) { fmt.fmt.pix_mp.width = s.w; fmt.fmt.pix_mp.height = s.h; } if (s.in_fourcc) fmt.fmt.pix_mp.pixelformat = s.in_fourcc; ret = ioctl(v4lfd, VIDIOC_S_FMT, &fmt); BYE_ON(ret < 0, "VIDIOC_S_FMT failed: %s\n", ERRSTR); ret = ioctl(v4lfd, VIDIOC_G_FMT, &fmt); BYE_ON(ret < 0, "VIDIOC_G_FMT failed: %s\n", ERRSTR); printf("G_FMT(final): width = %u, height = %u, 4cc = %.4s\n", fmt.fmt.pix_mp.width, fmt.fmt.pix_mp.height, (char*)&fmt.fmt.pix_mp.pixelformat); BYE_ON(fmt.fmt.pix_mp.num_planes > 1, "multiplanar formats are not supported\n"); struct v4l2_requestbuffers rqbufs; memset(&rqbufs, 0, sizeof(rqbufs)); rqbufs.count = s.buffer_count; rqbufs.type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE; rqbufs.memory = V4L2_MEMORY_DMABUF; ret = ioctl(v4lfd, VIDIOC_REQBUFS, &rqbufs); BYE_ON(ret < 0, "VIDIOC_REQBUFS failed: %s\n", ERRSTR); BYE_ON(rqbufs.count < s.buffer_count, "video node allocated only " "%u of %u buffers\n", rqbufs.count, s.buffer_count); s.in_fourcc = fmt.fmt.pix_mp.pixelformat; s.w = fmt.fmt.pix_mp.width; s.h = fmt.fmt.pix_mp.height; /* TODO: add support for multiplanar formats */ struct buffer buffer[s.buffer_count]; uint64_t size = fmt.fmt.pix_mp.plane_fmt[0].sizeimage; uint32_t pitch = fmt.fmt.pix_mp.plane_fmt[0].bytesperline; printf("size = %llu pitch = %u\n", size, pitch); for (int i = 0; i < s.buffer_count; ++i) { ret = buffer_create(&buffer[i], drmfd, &s, size, pitch); BYE_ON(ret, "failed to create buffer%d\n", i); } printf("buffers ready\n"); drmModeModeInfo drmmode; uint32_t con; ret = find_mode(&drmmode, drmfd, &s, &con); BYE_ON(ret, "failed to find valid mode\n"); ret = drmModeSetCrtc(drmfd, s.crtId, buffer[0].fb_handle, 0, 0, &con, 1, &drmmode); BYE_ON(ret, "drmModeSetCrtc failed: %s\n", ERRSTR); /* enqueueing first buffer to DRM */ ret = drmModePageFlip(drmfd, s.crtId, buffer[0].fb_handle, DRM_MODE_PAGE_FLIP_EVENT, 0); BYE_ON(ret, "drmModePageFlip failed: %s\n", ERRSTR); for (int i = 1; i < s.buffer_count; ++i) { struct v4l2_plane plane; memset(&plane, 0, sizeof plane); struct v4l2_buffer buf; memset(&buf, 0, sizeof buf); buf.index = i; buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE; buf.memory = V4L2_MEMORY_DMABUF; buf.m.planes = &plane; buf.length = 1; plane.m.fd = buffer[i].dbuf_fd; ret = ioctl(v4lfd, VIDIOC_QBUF, &buf); BYE_ON(ret < 0, "VIDIOC_QBUF for buffer %d failed: %s\n", buf.index, ERRSTR); } int type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE; ret = ioctl(v4lfd, VIDIOC_STREAMON, &type); BYE_ON(ret < 0, "STREAMON failed: %s\n", ERRSTR); struct pollfd fds[] = { { .fd = v4lfd, .events = POLLIN }, { .fd = drmfd, .events = POLLIN }, }; /* buffer currently used by drm */ stream.v4lfd = v4lfd; stream.current_buffer = -1; stream.buffer = buffer; while ((ret = poll(fds, 2, 5000)) > 0) { if (fds[0].revents & POLLIN) { struct v4l2_buffer buf; memset(&buf, 0, sizeof buf); /* dequeue buffer */ buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE; buf.memory = V4L2_MEMORY_DMABUF; ret = ioctl(v4lfd, VIDIOC_DQBUF, &buf); BYE_ON(ret, "VIDIOC_DQBUF failed: %s\n", ERRSTR); ret = drmModePageFlip(drmfd, s.crtId, buffer[buf.index].fb_handle, DRM_MODE_PAGE_FLIP_EVENT, (void*)buf.index); BYE_ON(ret, "drmModePageFlip failed: %s\n", ERRSTR); } if (fds[1].revents & POLLIN) { drmEventContext evctx; memset(&evctx, 0, sizeof evctx); evctx.version = DRM_EVENT_CONTEXT_VERSION; evctx.page_flip_handler = page_flip_handler; ret = drmHandleEvent(drmfd, &evctx); BYE_ON(ret, "drmHandleEvent failed: %s\n", ERRSTR); } } return 0; } [View Less]

1 0

[PATCH] xf86-video-modesetting generic colormap handling
by James Simmons 06 Mar '12

06 Mar '12

This patch replaces drmmode_load_palette with a very generic function that removes the need of drmmode_crtc_private_rec to carry around color indexes. Also have the xorg driver actually call the xf86HandleColormaps function. Signed-off-by: James Simmons <jsimmons(a)infradead.org> diff --git a/src/driver.c b/src/driver.c index 87431ff..a825f35 100644 --- a/src/driver.c +++ b/src/driver.c @@ -42,6 +42,7 @@ #include "xf86Pci.h" #include "mipointer.h" #include "micmap.h" +#include "… [View More]xf86cmap.h" #include <X11/extensions/randr.h> #include "fb.h" #include "edid.h" @@ -540,6 +541,62 @@ PreInit(ScrnInfoPtr pScrn, int flags) return FALSE; } +static void +LoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices, + LOCO * colors, VisualPtr pVisual) +{ + xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn); + CARD16 lut_r[256], lut_g[256], lut_b[256]; + int i, j, k, index; + + for (k = 0; k < xf86_config->num_crtc; k++) { + xf86CrtcPtr crtc = xf86_config->crtc[k]; + + switch (pScrn->depth) { + case 15: + for (i = 0; i < numColors; i++) { + index = indices[i]; + for (j = 0; j < 8; j++) { + lut_r[index * 8 + j] = colors[index].red << 8; + lut_g[index * 8 + j] = colors[index].green << 8; + lut_b[index * 8 + j] = colors[index].blue << 8; + } + } + break; + case 16: + for (i = 0; i < numColors; i++) { + index = indices[i]; + + if (index <= 31) { + for (j = 0; j < 8; j++) { + lut_r[index * 8 + j] = colors[index].red << 8; + lut_b[index * 8 + j] = colors[index].blue << 8; + } + } + + for (j = 0; j < 4; j++) + lut_g[index * 4 + j] = colors[index].green << 8; + } + break; + default: + for (i = 0; i < numColors; i++) { + index = indices[i]; + lut_r[index] = colors[index].red << 8; + lut_g[index] = colors[index].green << 8; + lut_b[index] = colors[index].blue << 8; + } + break; + } + + /* Make the change through RandR */ +#ifdef RANDR_12_INTERFACE + RRCrtcGammaSet(crtc->randr_crtc, lut_r, lut_g, lut_b); +#else /*RANDR_12_INTERFACE*/ + crtc->funcs->gamma_set(crtc, lut_r, lut_g, lut_b, 256); +#endif + } +} + static void * msShadowWindow(ScreenPtr screen, CARD32 row, CARD32 offset, int mode, CARD32 *size, void *closure) @@ -716,7 +773,12 @@ ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) return FALSE; if (!miCreateDefColormap(pScreen)) - return FALSE; + return FALSE; + + if (!xf86HandleColormaps(pScreen, 256, 8, LoadPalette, NULL, + CMAP_RELOAD_ON_MODE_SWITCH + | CMAP_PALETTED_TRUECOLOR)) + return FALSE; xf86DPMSInit(pScreen, xf86DPMSSet, 0); diff --git a/src/drmmode_display.c b/src/drmmode_display.c index 7fa933a..d1da19a 100644 --- a/src/drmmode_display.c +++ b/src/drmmode_display.c @@ -1134,89 +1132,6 @@ Bool drmmode_set_desired_modes(ScrnInfoPtr pScrn, drmmode_ptr drmmode) return TRUE; } -static void drmmode_load_palette(ScrnInfoPtr pScrn, int numColors, - int *indices, LOCO *colors, VisualPtr pVisual) -{ - xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn); - uint16_t lut_r[256], lut_g[256], lut_b[256]; - int index, j, i; - int c; - - for (c = 0; c < xf86_config->num_crtc; c++) { - xf86CrtcPtr crtc = xf86_config->crtc[c]; - drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private; - - for (i = 0 ; i < 256; i++) { - lut_r[i] = drmmode_crtc->lut_r[i] << 6; - lut_g[i] = drmmode_crtc->lut_g[i] << 6; - lut_b[i] = drmmode_crtc->lut_b[i] << 6; - } - - switch(pScrn->depth) { - case 15: - for (i = 0; i < numColors; i++) { - index = indices[i]; - for (j = 0; j < 8; j++) { - lut_r[index * 8 + j] = colors[index].red << 6; - lut_g[index * 8 + j] = colors[index].green << 6; - lut_b[index * 8 + j] = colors[index].blue << 6; - } - } - break; - case 16: - for (i = 0; i < numColors; i++) { - index = indices[i]; - - if (i <= 31) { - for (j = 0; j < 8; j++) { - lut_r[index * 8 + j] = colors[index].red << 6; - lut_b[index * 8 + j] = colors[index].blue << 6; - } - } - - for (j = 0; j < 4; j++) { - lut_g[index * 4 + j] = colors[index].green << 6; - } - } - break; - default: - for (i = 0; i < numColors; i++) { - index = indices[i]; - lut_r[index] = colors[index].red << 6; - lut_g[index] = colors[index].green << 6; - lut_b[index] = colors[index].blue << 6; - } - break; - } - - /* Make the change through RandR */ -#ifdef RANDR_12_INTERFACE - if (crtc->randr_crtc) - RRCrtcGammaSet(crtc->randr_crtc, lut_r, lut_g, lut_b); - else -#endif - crtc->funcs->gamma_set(crtc, lut_r, lut_g, lut_b, 256); - } -} - -Bool drmmode_setup_colormap(ScreenPtr pScreen, ScrnInfoPtr pScrn) -{ - xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 0, - "Initializing kms color map\n"); - if (!miCreateDefColormap(pScreen)) - return FALSE; - /* all radeons support 10 bit CLUTs */ - if (!xf86HandleColormaps(pScreen, 256, 10, - drmmode_load_palette, NULL, - CMAP_PALETTED_TRUECOLOR -#if 0 /* This option messes up text mode! (eich(a)suse.de) */ - | CMAP_LOAD_EVEN_IF_OFFSCREEN -#endif - | CMAP_RELOAD_ON_MODE_SWITCH)) - return FALSE; - return TRUE; -} - #ifdef HAVE_UDEV static void drmmode_handle_uevents(int fd, void *closure) diff --git a/src/drmmode_display.h b/src/drmmode_display.h index e83167b..3b6cfff 100644 --- a/src/drmmode_display.h +++ b/src/drmmode_display.h @@ -66,7 +66,6 @@ typedef struct { int hw_id; struct dumb_bo *cursor_bo; unsigned rotate_fb_id; - uint16_t lut_r[256], lut_g[256], lut_b[256]; } drmmode_crtc_private_rec, *drmmode_crtc_private_ptr; typedef struct { [View Less]

1 0

[PATCH] drm: exynos: fix gem-prime support
by Tomasz Stanislawski 06 Mar '12

06 Mar '12

From: Tomasz Stanislawski <t.stanislaws(a)samsung.com> Fix error handling of dma_buf_export in exynos-drm driver. Signed-off-by: Tomasz Stanislawski <t.stanislaws(a)samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park(a)samsung.com> --- drivers/gpu/drm/exynos/exynos_drm_dmabuf.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c b/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c index cbb6ad4..5f41de5 100644 --… [View More]

1 0

[PATCH] xf86-video-modesetting cursor reload
by James Simmons 06 Mar '12

06 Mar '12

Enable after a resolution change reload the cursor image. Signed-off-by: James Simmons <jsimmons(a)infradead.org> diff --git a/src/drmmode_display.c b/src/drmmode_display.c index 7fa933a..8a49103 100644 --- a/src/drmmode_display.c +++ b/src/drmmode_display.c @@ -361,11 +361,9 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode, } } -#if 0 - if (pScrn->pScreen && - !xf86ReturnOptValBool(info->Options, OPTION_SW_CURSOR, FALSE)) + if (pScrn->pScreen &… [View More]

2 1

[PATCH] drm/radeon: deal with errors from framebuffer init path.
by Dave Airlie 06 Mar '12

06 Mar '12

From: Dave Airlie <airlied(a)redhat.com> We've been seeing a very occasional oops on a 32-bit rn50 platform running EL6 kernels at boot. It seems to be due to one of these functions failing and us then accessing a NULL-300 pointer. This should prevent the oops and give some info in the logs as to what is going on. Signed-off-by: Dave Airlie <airlied(a)redhat.com> --- drivers/gpu/drm/radeon/radeon_display.c | 18 +++++++++++++++--- drivers/gpu/drm/radeon/radeon_fb.c | 11 … [View More]++++++++++- drivers/gpu/drm/radeon/radeon_mode.h | 2 +- 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c index 8c49fef..3d31433 100644 --- a/drivers/gpu/drm/radeon/radeon_display.c +++ b/drivers/gpu/drm/radeon/radeon_display.c @@ -1078,15 +1078,21 @@ static const struct drm_framebuffer_funcs radeon_fb_funcs = { .create_handle = radeon_user_framebuffer_create_handle, }; -void +int radeon_framebuffer_init(struct drm_device *dev, struct radeon_framebuffer *rfb, struct drm_mode_fb_cmd2 *mode_cmd, struct drm_gem_object *obj) { + int ret; rfb->obj = obj; - drm_framebuffer_init(dev, &rfb->base, &radeon_fb_funcs); + ret = drm_framebuffer_init(dev, &rfb->base, &radeon_fb_funcs); + if (ret) { + rfb->obj = NULL; + return ret; + } drm_helper_mode_fill_fb_struct(&rfb->base, mode_cmd); + return 0; } static struct drm_framebuffer * @@ -1096,6 +1102,7 @@ radeon_user_framebuffer_create(struct drm_device *dev, { struct drm_gem_object *obj; struct radeon_framebuffer *radeon_fb; + int ret; obj = drm_gem_object_lookup(dev, file_priv, mode_cmd->handles[0]); if (obj == NULL) { @@ -1108,7 +1115,12 @@ radeon_user_framebuffer_create(struct drm_device *dev, if (radeon_fb == NULL) return ERR_PTR(-ENOMEM); - radeon_framebuffer_init(dev, radeon_fb, mode_cmd, obj); + ret = radeon_framebuffer_init(dev, radeon_fb, mode_cmd, obj); + if (ret) { + kfree(radeon_fb); + drm_gem_object_unreference_unlocked(obj); + return NULL; + } return &radeon_fb->base; } diff --git a/drivers/gpu/drm/radeon/radeon_fb.c b/drivers/gpu/drm/radeon/radeon_fb.c index cf2bf35..195471c 100644 --- a/drivers/gpu/drm/radeon/radeon_fb.c +++ b/drivers/gpu/drm/radeon/radeon_fb.c @@ -209,6 +209,11 @@ static int radeonfb_create(struct radeon_fbdev *rfbdev, sizes->surface_depth); ret = radeonfb_create_pinned_object(rfbdev, &mode_cmd, &gobj); + if (ret) { + DRM_ERROR("failed to create fbcon object %d\n", ret); + return ret; + } + rbo = gem_to_radeon_bo(gobj); /* okay we have an object now allocate the framebuffer */ @@ -220,7 +225,11 @@ static int radeonfb_create(struct radeon_fbdev *rfbdev, info->par = rfbdev; - radeon_framebuffer_init(rdev->ddev, &rfbdev->rfb, &mode_cmd, gobj); + ret = radeon_framebuffer_init(rdev->ddev, &rfbdev->rfb, &mode_cmd, gobj); + if (ret) { + DRM_ERROR("failed to initalise framebuffer %d\n", ret); + goto out_unref; + } fb = &rfbdev->rfb.base; diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h index 4330e32..8a85598 100644 --- a/drivers/gpu/drm/radeon/radeon_mode.h +++ b/drivers/gpu/drm/radeon/radeon_mode.h @@ -649,7 +649,7 @@ extern void radeon_crtc_fb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green, u16 blue, int regno); extern void radeon_crtc_fb_gamma_get(struct drm_crtc *crtc, u16 *red, u16 *green, u16 *blue, int regno); -void radeon_framebuffer_init(struct drm_device *dev, +int radeon_framebuffer_init(struct drm_device *dev, struct radeon_framebuffer *rfb, struct drm_mode_fb_cmd2 *mode_cmd, struct drm_gem_object *obj); -- 1.7.7.6 [View Less]

2 1

[PATCH 0/3] [RFC] kernel cpu access support for dma_buf
by Daniel Vetter 06 Mar '12

06 Mar '12

Hi all, This series here implements an interface to enable cpu access from the kernel context to dma_buf objects. The main design goal of this interface proposal is to enable buffer objects that reside in highmem. Comments, flames, ideas and questions highly welcome. Althouhg I might be a bit slow in responding - I'm on conferences and vacation the next 2 weeks. Cheers, Daniel Daniel Vetter (3): dma-buf: don't hold the mutex around map/unmap calls dma-buf: add support for kernel cpu … [View More]

7 14

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel March 2012