dri-devel January 2013

dri-devel@lists.freedesktop.org

147 participants
795 discussions

[RFC,libdrm 0/3] NVIDIA Tegra support
by Arto Meriläinen 02 Jan '13

02 Jan '13

From: Arto Merilainen <amerilainen(a)nvidia.com> This patch series adds application level support for 2d hardware acceleration on Tegra SoCs. The patch series consists of three patches: Host1x stream library, 2d library and a test application for the 2d library. The first patch introduces stream library that is used for doing buffer management, synchronization and command stream management. The second patch adds support for doing simple 2d operations (fill, copy, stretch). The third … [View More]patch adds a test application for the 2d functions. Currently, both stream and 2d libraries are placed under libdrm. The current goal is to introduce the code and move it later into its own library (or merge it to Tegra DDX). Memory management code is not compatible with the patches Thierry sent previously. However, synchronizing the code should not be hard as they both add the same functionality. Arto Merilainen (1): tegra: Add stream library Francis Hart (2): tegra: Add 2d library tests: tegra: Add 2d tests Makefile.am | 6 +- configure.ac | 14 + tegra/2d/hw_gr2d.h | 2614 ++++++++++++++++++++++++++++++++++++++++ tegra/2d/tegra_2d_api.c | 235 ++++ tegra/2d/tegra_2d_color.c | 412 +++++++ tegra/2d/tegra_2d_color.h | 51 + tegra/2d/tegra_2d_context.c | 140 +++ tegra/2d/tegra_2d_context.h | 67 + tegra/2d/tegra_2d_copy.c | 209 ++++ tegra/2d/tegra_2d_copy.h | 38 + tegra/2d/tegra_2d_fill.c | 136 +++ tegra/2d/tegra_2d_fill.h | 36 + tegra/2d/tegra_2d_frcopy.c | 274 +++++ tegra/2d/tegra_2d_frcopy.h | 85 ++ tegra/2d/tegra_2d_g2copy.c | 272 +++++ tegra/2d/tegra_2d_g2copy.h | 88 ++ tegra/2d/tegra_2d_g2fill.c | 192 +++ tegra/2d/tegra_2d_g2fill.h | 80 ++ tegra/2d/tegra_2d_reg_g2sb.h | 89 ++ tegra/2d/tegra_2d_reg_host.h | 119 ++ tegra/2d/tegra_2d_sbcopy.c | 388 ++++++ tegra/2d/tegra_2d_sbcopy.h | 94 ++ tegra/2d/tegra_2d_surface.c | 280 +++++ tegra/2d/tegra_2d_surface.h | 57 + tegra/2d/tegra_2d_util.c | 145 +++ tegra/2d/tegra_2d_util.h | 89 ++ tegra/Makefile.am | 36 + tegra/class_ids.h | 35 + tegra/host1x01_hardware.h | 122 ++ tegra/hw_host1x01_uclass.h | 143 +++ tegra/libdrm_tegra.pc.in | 10 + tegra/tegra_2d.h | 223 ++++ tegra/tegra_drm.c | 876 ++++++++++++++ tegra/tegra_drm.h | 142 +++ tegra/tegra_drmif.h | 107 ++ tests/tegra/2d/Makefile.am | 13 + tests/tegra/2d/tegra_2d_test.c | 413 +++++++ 37 files changed, 8329 insertions(+), 1 deletion(-) create mode 100644 tegra/2d/hw_gr2d.h create mode 100644 tegra/2d/tegra_2d_api.c create mode 100644 tegra/2d/tegra_2d_color.c create mode 100644 tegra/2d/tegra_2d_color.h create mode 100644 tegra/2d/tegra_2d_context.c create mode 100644 tegra/2d/tegra_2d_context.h create mode 100644 tegra/2d/tegra_2d_copy.c create mode 100644 tegra/2d/tegra_2d_copy.h create mode 100644 tegra/2d/tegra_2d_fill.c create mode 100644 tegra/2d/tegra_2d_fill.h create mode 100644 tegra/2d/tegra_2d_frcopy.c create mode 100644 tegra/2d/tegra_2d_frcopy.h create mode 100644 tegra/2d/tegra_2d_g2copy.c create mode 100644 tegra/2d/tegra_2d_g2copy.h create mode 100644 tegra/2d/tegra_2d_g2fill.c create mode 100644 tegra/2d/tegra_2d_g2fill.h create mode 100644 tegra/2d/tegra_2d_reg_g2sb.h create mode 100644 tegra/2d/tegra_2d_reg_host.h create mode 100644 tegra/2d/tegra_2d_sbcopy.c create mode 100644 tegra/2d/tegra_2d_sbcopy.h create mode 100644 tegra/2d/tegra_2d_surface.c create mode 100644 tegra/2d/tegra_2d_surface.h create mode 100644 tegra/2d/tegra_2d_util.c create mode 100644 tegra/2d/tegra_2d_util.h create mode 100644 tegra/Makefile.am create mode 100644 tegra/class_ids.h create mode 100644 tegra/host1x01_hardware.h create mode 100644 tegra/hw_host1x01_uclass.h create mode 100644 tegra/libdrm_tegra.pc.in create mode 100644 tegra/tegra_2d.h create mode 100644 tegra/tegra_drm.c create mode 100644 tegra/tegra_drm.h create mode 100644 tegra/tegra_drmif.h create mode 100644 tests/tegra/2d/Makefile.am create mode 100644 tests/tegra/2d/tegra_2d_test.c -- 1.7.9.5 [View Less]

5 15

[PATCH] drm/exynos: let drm handle edid allocations
by Rahul Sharma 02 Jan '13

02 Jan '13

There's no need to allocate edid twice and do a memcpy when drm helpers exist to do just that. This patch cleans that interaction up, and doesn't keep the edid hanging around in the connector. Signed-off-by: Sean Paul <seanpaul(a)chromium.org> Signed-off-by: Rahul Sharma <rahul.sharma(a)samsung.com> --- This patch is based on branch "exynos-drm-next" at http://git.kernel.org/?p=linux/kernel/git/daeinki/drm-exynos.git drivers/gpu/drm/exynos/exynos_drm_connector.c | 36 ++++++++++++… [View More]++------------- drivers/gpu/drm/exynos/exynos_drm_drv.h | 4 +-- drivers/gpu/drm/exynos/exynos_drm_hdmi.c | 9 +++---- drivers/gpu/drm/exynos/exynos_drm_hdmi.h | 4 +-- drivers/gpu/drm/exynos/exynos_hdmi.c | 25 ++++++++----------- 5 files changed, 37 insertions(+), 41 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_connector.c b/drivers/gpu/drm/exynos/exynos_drm_connector.c index ab37437..7ee43aa 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_connector.c +++ b/drivers/gpu/drm/exynos/exynos_drm_connector.c @@ -96,7 +96,9 @@ static int exynos_drm_connector_get_modes(struct drm_connector *connector) to_exynos_connector(connector); struct exynos_drm_manager *manager = exynos_connector->manager; struct exynos_drm_display_ops *display_ops = manager->display_ops; - unsigned int count; + unsigned int count = 0; + struct edid *edid = NULL; + int ret; DRM_DEBUG_KMS("%s\n", __FILE__); @@ -114,27 +116,25 @@ static int exynos_drm_connector_get_modes(struct drm_connector *connector) * because lcd panel has only one mode. */ if (display_ops->get_edid) { - int ret; - void *edid; - - edid = kzalloc(MAX_EDID, GFP_KERNEL); - if (!edid) { - DRM_ERROR("failed to allocate edid\n"); - return 0; + edid = display_ops->get_edid(manager->dev, connector); + if (IS_ERR_OR_NULL(edid)) { + ret = PTR_ERR(edid); + edid = NULL; + DRM_ERROR("Panel operation get_edid failed %d\n", ret); + goto out; } - ret = display_ops->get_edid(manager->dev, connector, - edid, MAX_EDID); - if (ret < 0) { - DRM_ERROR("failed to get edid data.\n"); - kfree(edid); - edid = NULL; - return 0; + ret = drm_mode_connector_update_edid_property(connector, edid); + if (ret) { + DRM_ERROR("update edid property failed(%d)\n", ret); + goto out; } - drm_mode_connector_update_edid_property(connector, edid); count = drm_add_edid_modes(connector, edid); - kfree(edid); + if (count < 0) { + DRM_ERROR("Add edid modes failed %d\n", count); + goto out; + } } else { struct exynos_drm_panel_info *panel; struct drm_display_mode *mode = drm_mode_create(connector->dev); @@ -161,6 +161,8 @@ static int exynos_drm_connector_get_modes(struct drm_connector *connector) count = 1; } +out: + kfree(edid); return count; } diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.h b/drivers/gpu/drm/exynos/exynos_drm_drv.h index b9e51bc..4606fac 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_drv.h +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.h @@ -148,8 +148,8 @@ struct exynos_drm_overlay { struct exynos_drm_display_ops { enum exynos_drm_output_type type; bool (*is_connected)(struct device *dev); - int (*get_edid)(struct device *dev, struct drm_connector *connector, - u8 *edid, int len); + struct edid *(*get_edid)(struct device *dev, + struct drm_connector *connector); void *(*get_panel)(struct device *dev); int (*check_timing)(struct device *dev, void *timing); int (*power_on)(struct device *dev, int mode); diff --git a/drivers/gpu/drm/exynos/exynos_drm_hdmi.c b/drivers/gpu/drm/exynos/exynos_drm_hdmi.c index 3a8eea6..681a4cb 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_hdmi.c +++ b/drivers/gpu/drm/exynos/exynos_drm_hdmi.c @@ -108,18 +108,17 @@ static bool drm_hdmi_is_connected(struct device *dev) return false; } -static int drm_hdmi_get_edid(struct device *dev, - struct drm_connector *connector, u8 *edid, int len) +struct edid *drm_hdmi_get_edid(struct device *dev, + struct drm_connector *connector) { struct drm_hdmi_context *ctx = to_context(dev); DRM_DEBUG_KMS("%s\n", __FILE__); if (hdmi_ops && hdmi_ops->get_edid) - return hdmi_ops->get_edid(ctx->hdmi_ctx->ctx, connector, edid, - len); + return hdmi_ops->get_edid(ctx->hdmi_ctx->ctx, connector); - return 0; + return NULL; } static int drm_hdmi_check_timing(struct device *dev, void *timing) diff --git a/drivers/gpu/drm/exynos/exynos_drm_hdmi.h b/drivers/gpu/drm/exynos/exynos_drm_hdmi.h index ae4b6ae..45b2ce0 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_hdmi.h +++ b/drivers/gpu/drm/exynos/exynos_drm_hdmi.h @@ -30,8 +30,8 @@ struct exynos_drm_hdmi_context { struct exynos_hdmi_ops { /* display */ bool (*is_connected)(void *ctx); - int (*get_edid)(void *ctx, struct drm_connector *connector, - u8 *edid, int len); + struct edid *(*get_edid)(void *ctx, + struct drm_connector *connector); int (*check_timing)(void *ctx, void *timing); int (*power_on)(void *ctx, int mode); diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c index 8cb42ad..708108b 100644 --- a/drivers/gpu/drm/exynos/exynos_hdmi.c +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c @@ -980,8 +980,7 @@ static bool hdmi_is_connected(void *ctx) return hdata->hpd; } -static int hdmi_get_edid(void *ctx, struct drm_connector *connector, - u8 *edid, int len) +static struct edid *hdmi_get_edid(void *ctx, struct drm_connector *connector) { struct edid *raw_edid; struct hdmi_context *hdata = ctx; @@ -989,22 +988,18 @@ static int hdmi_get_edid(void *ctx, struct drm_connector *connector, DRM_DEBUG_KMS("[%d] %s\n", __LINE__, __func__); if (!hdata->ddc_port) - return -ENODEV; + return ERR_PTR(-ENODEV); raw_edid = drm_get_edid(connector, hdata->ddc_port->adapter); - if (raw_edid) { - hdata->dvi_mode = !drm_detect_hdmi_monitor(raw_edid); - memcpy(edid, raw_edid, min((1 + raw_edid->extensions) - * EDID_LENGTH, len)); - DRM_DEBUG_KMS("%s : width[%d] x height[%d]\n", - (hdata->dvi_mode ? "dvi monitor" : "hdmi monitor"), - raw_edid->width_cm, raw_edid->height_cm); - kfree(raw_edid); - } else { - return -ENODEV; - } + if (!raw_edid) + return ERR_PTR(-ENODEV); - return 0; + hdata->dvi_mode = !drm_detect_hdmi_monitor(raw_edid); + DRM_DEBUG_KMS("%s : width[%d] x height[%d]\n", + (hdata->dvi_mode ? "dvi monitor" : "hdmi monitor"), + raw_edid->width_cm, raw_edid->height_cm); + + return raw_edid; } static int hdmi_v13_check_timing(struct fb_videomode *check_timing) -- 1.8.0 [View Less]

3 2

nouveau v3.8-rc1: evo_wait crash
by Daniel J Blueman 01 Jan '13

01 Jan '13

When formalising a reproducer for another noveau bug, simply switching between integrated and discrete GPUs a few times reproduces an oops in 3.8-rc1 [1,2]. Let me know if it helps to log it into bugs.freedesktop.org. Thanks and Happy New Year! Daniel --- [1] while :; do bash -c "echo IGD >/sys/kernel/debug/vgaswitcheroo/switch"; bash -c "echo DIS >/sys/kernel/debug/vgaswitcheroo/switch"; done --- [2] ... VGA switcheroo: switched nouveau off nouveau [ DRM] suspending fbcon... … [View More]nouveau [ DRM] suspending display... nouveau [ DRM] unpinning framebuffer(s)... nouveau [ DRM] evicting buffers... nouveau [ DRM] suspending client object trees... nouveau E[ PDISP][0000:01:00.0][0xc000917e][ffff8802647d8300] fini: 0xc0080088 nouveau E[ PDISP][0000:01:00.0][0xc000917e][ffff8802647d8300] failed suspend, -16 nouveau E[ DRM] 0xd1500000:0xd15c7e00 suspend failed with -16 nouveau E[ DRM] 0xdddddddd:0xd1500000 suspend failed with -16 nouveau E[ DRM] 0xffffffff:0xdddddddd suspend failed with -16 nouveau E[ DRM] 0xffffffff:0xffffffff suspend failed with -16 nouveau [ DRM] resuming display... VGA switcheroo: switched nouveau on nouveau [ DRM] re-enabling device... nouveau [ DRM] resuming client object trees... nouveau [ DRM] resuming display... BUG: unable to handle kernel paging request at ffff880364785ffc IP: [<ffffffffa01012b6>] evo_wait+0x46/0xa0 [nouveau] PGD 180d063 PUD 0 Oops: 0002 [#1] SMP Modules linked in: snd_hda_codec_hdmi joydev hid_apple bcm5974 coretemp kvm_intel kvm rfcomm ghash_clmulni_intel bnep b43 ssb uvcvideo smsc75xx usbnet snd_hda_codec_cirrus mii videobuf2_core i915 videobuf2_vmalloc videobuf2_memops applesmc input_polldev snd_hda_intel snd_hda_codec microcode bcma snd_hwdep lpc_ich mfd_core snd_pcm nouveau apple_gmux snd_timer ttm drm_kms_helper snd hwmon mxm_wmi snd_page_alloc apple_bl video nls_iso8859_1 CPU 5 Pid: 1627, comm: bash Not tainted 3.8.0-rc1-expert+ #55 Apple Inc. MacBookPro10,1/Mac-C3EC7CD22292981F RIP: 0010:[<ffffffffa01012b6>] [<ffffffffa01012b6>] evo_wait+0x46/0xa0 [nouveau] RSP: 0018:ffff88025eec1d38 EFLAGS: 00010246 RAX: 000000003fffffff RBX: ffff880264700708 RCX: ffff880263c03d20 RDX: ffff880264786000 RSI: 0000000000000000 RDI: ffffc9000c840000 RBP: ffff88025eec1d48 R08: 0000000000008000 R09: 0000000000000000 R10: 0000000000008000 R11: ffffc9000f5ffff8 R12: 000000004000001f R13: ffff880264986800 R14: ffff880263c1f000 R15: 0000000000000000 FS: 00007f1b7fea5700(0000) GS:ffff88026f340000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: ffff880364785ffc CR3: 000000025fa77000 CR4: 00000000001407e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 Process bash (pid: 1627, threadinfo ffff88025eec0000, task ffff88025f834680) Stack: ffff880264986800 ffff880264986c38 ffff88025eec1d68 ffffffffa0101bab ffff88025eec1d88 ffff88025ec5f900 ffff88025eec1d98 ffffffffa00eb003 ffff880264986c30 ffff880264986c38 ffff880264986800 ffff880263c1f000 Call Trace: [<ffffffffa0101bab>] nv50_display_init+0x2b/0x90 [nouveau] [<ffffffffa00eb003>] nouveau_display_init+0x43/0x110 [nouveau] [<ffffffffa00eba36>] nouveau_display_resume+0xe6/0x180 [nouveau] [<ffffffffa00db856>] nouveau_do_resume+0x106/0x120 [nouveau] [<ffffffffa00db8f8>] nouveau_pmops_resume+0x68/0x80 [nouveau] [<ffffffffa00dd298>] nouveau_switcheroo_set_state+0x98/0xc0 [nouveau] [<ffffffff812c0684>] vga_switchon+0x34/0x50 [<ffffffff812c0b18>] vga_switchto_stage1+0x38/0x40 [<ffffffff812c0ebb>] vga_switcheroo_debugfs_write+0x22b/0x380 [<ffffffff8110bcb2>] ? __alloc_fd+0x42/0x110 [<ffffffff810ef511>] ? filp_close+0x61/0x90 [<ffffffff810f14f3>] vfs_write+0xa3/0x160 [<ffffffff810f17fd>] sys_write+0x4d/0xa0 [<ffffffff81028689>] ? do_page_fault+0x9/0x10 [<ffffffff814c9a96>] system_call_fastpath+0x1a/0x1f Code: 30 c1 e8 02 48 8d 14 85 00 00 00 00 41 01 c4 41 81 fc f7 03 00 00 77 0d 48 8b 43 18 48 01 d0 5b 41 5c 5d c3 90 48 8b 53 18 31 f6 <c7> 04 82 00 00 00 20 31 d2 48 8b 3b 48 8b 07 48 8b 40 08 ff 50 RIP [<ffffffffa01012b6>] evo_wait+0x46/0xa0 [nouveau] RSP <ffff88025eec1d38> CR2: ffff880364785ffc -- Daniel J Blueman [View Less]

1 0

[PATCH v2/RESEND] drm: nouveau: Fix build warning seen if HWMON is undefined
by Guenter Roeck 01 Jan '13

01 Jan '13

Fix: nouveau_pm.c: In function ‘nouveau_hwmon_init’: nouveau_pm.c:703:24: warning: unused variable ‘therm’ [-Wunused-variable] Introduced by commit 095f979a (drm/nouveau/pm: fix build with HWMON off) which fixed a build error but introduced a build warning. Cc: Dave Airlie <airlied(a)redhat.com> Cc: Randy Dunlap <rdunlap(a)xenotime.net> Signed-off-by: Guenter Roeck <linux(a)roeck-us.net> --- v2: Improved explanation Added Cc: drivers/gpu/drm/nouveau/nouveau_pm.c | … [View More]

1 0

[Bug 49981] On HD6850, Power Profile doesn't change if 2 screen is attached.
by bugzilla-daemon＠freedesktop.org 01 Jan '13

01 Jan '13

https://bugs.freedesktop.org/show_bug.cgi?id=49981 Anthony Waters <awaters1(a)gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |cuu508(a)gmail.com --- Comment #25 from Anthony Waters <awaters1(a)gmail.com> --- *** Bug 42854 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are the … [View More]

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel January 2013