dri-devel June 2016

dri-devel@lists.freedesktop.org

231 participants
1446 discussions

[Bug 96498] AMD PITCAIRN only OpenGL 4.2
by bugzilla-daemon＠freedesktop.org 12 Jun '16

12 Jun '16

https://bugs.freedesktop.org/show_bug.cgi?id=96498 Bug ID: 96498 Summary: AMD PITCAIRN only OpenGL 4.2 Product: Mesa Version: git Hardware: x86-64 (AMD64) OS: Linux (All) Status: NEW Severity: minor Priority: medium Component: Drivers/Gallium/radeonsi Assignee: dri-devel(a)lists.freedesktop.org Reporter: gringo(a)slonko.net QA Contact: dri-devel(a)lists.freedesktop.org Created attachment 124485 --> https://bugs.freedesktop.org/attachment.cgi?id=124485&action=edit glxinfo output According to docs/GL3.txt radeonsi should support OpenGL 4.3, but on my hardware (PITCAIRN which is OpenGl 4.5 capable) it does not even though I have LLVM and mesa latest git. According to glxinfo output (see attachment) I do not have ARB_compute_shader for whatever reason. Any clue why ? BTW: When running with fglrx I have OpenGL 4.5 as expected. -- You are receiving this mail because: You are the assignee for the bug.

1 2

[PATCH] drm/nouveau/iccsense: fix memory leak
by Sudip Mukherjee 12 Jun '16

12 Jun '16

In the for loop we are allocating the memory for rail everytime but in some cases we use "continue" and in those cases the memory already allocated for rail is leaked and we again allocate new memory for it. Lets free the memory before continuing with the loop. Signed-off-by: Sudip Mukherjee <sudip.mukherjee(a)codethink.co.uk> --- drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/base.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/base.c index 323c79a..756ff07 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/base.c @@ -290,21 +290,28 @@ nvkm_iccsense_oneinit(struct nvkm_subdev *subdev) switch (sensor->type) { case NVBIOS_EXTDEV_INA209: - if (r->rail != 0) + if (r->rail != 0) { + kfree(rail); continue; + } rail->read = nvkm_iccsense_ina209_read; break; case NVBIOS_EXTDEV_INA219: - if (r->rail != 0) + if (r->rail != 0) { + kfree(rail); continue; + } rail->read = nvkm_iccsense_ina219_read; break; case NVBIOS_EXTDEV_INA3221: - if (r->rail >= 3) + if (r->rail >= 3) { + kfree(rail); continue; + } rail->read = nvkm_iccsense_ina3221_read; break; default: + kfree(rail); continue; } -- 1.9.1

1 0

[Bug 103561] New: unable to handle kernel paging request with csgo in wine+nine, ttm_bo_del_from_lru
by bugzilla-daemon＠bugzilla.kernel.org 12 Jun '16

12 Jun '16

https://bugzilla.kernel.org/show_bug.cgi?id=103561 Bug ID: 103561 Summary: unable to handle kernel paging request with csgo in wine+nine, ttm_bo_del_from_lru Product: Drivers Version: 2.5 Kernel Version: 4.2-rc8 Hardware: All OS: Linux Tree: Mainline Status: NEW Severity: normal Priority: P1 Component: Video(DRI - non Intel) Assignee: drivers_video-dri(a)kernel-bugs.osdl.org Reporter: haagch.christoph(a)googlemail.com Regression: No Created attachment 185951 --> https://bugzilla.kernel.org/attachment.cgi?id=185951&action=edit dmesg Playing with PRIME on 00:02.0 VGA compatible controller: Intel Corporation 3rd Gen Core processor Graphics Controller (rev 09) 01:00.0 VGA compatible controller: Advanced Micro Devices, Inc. [AMD/ATI] Wimbledon XT [Radeon HD 7970M] (rev ff) mesa git, llvm svn with si scheduler patch from axel davy, but I'm pretty sure I have seen the exact same thing with pure mainline too. It takes a while of gameplay to provoke, 20-60 minutes or so. -- You are receiving this mail because: You are watching the assignee of the bug.

1 8

[PATCH 00/27] locklesss gem BO free driver patches
by Daniel Vetter 12 Jun '16

12 Jun '16

HI all, Here's the pile of lockless gem BO free conversion patches. Assuming I didn't botch it these are all the ones that didn't yet get an ack. Since this is all pretty boring stuff I'll just send a pull request to Dave later this week if no one pipes. Thanks, Daniel Benjamin Gaignard (1): drm: sti: remove useless call to dev->struct_mutex Daniel Vetter (26): drm/armada: Use lockless gem BO free callback drm/ast: Use lockless gem BO free callback drm/atmel: Use lockless gem BO free callback drm/bochs: Use lockless gem BO free callback drm/cirrus: Use lockless gem BO free callback drm/fls-dcu: Use lockless gem BO free callback drm/mga200g: Use lockless gem BO free callback drm/nouveau: Use lockless gem BO free callback drm/qxl: Use lockless gem BO free callback drm/rcar-du: Use lockless gem BO free callback drm/rockchip: Use lockless gem BO free callback drm/shmob: Use lockless gem BO free callback drm/tilcdc: Use lockless gem BO free callback drm/vc4: Use drm_gem_object_unreference_unlocked drm/vc4: Use lockless gem BO free callback drm/vgem: Use lockless gem BO free callback drm/virtio: Use lockless gem BO free callback drm/virtio: Use lockless gem BO free callback drm/rockchip: Use cma gem vm ops drm/msm: Nuke dummy fb->dirty callback drm/omapdrm: Nuke dummy fb->dirty callback drm/sun4i: Use lockless gem BO free callback drm/arcpgu: Use lockless gem BO free callback drm/hlcd: Use lockless gem BO free callback drm/hisilicon: Use lockless gem BO free callback drm/mediatek: Use lockless gem BO free callback drivers/gpu/drm/arc/arcpgu_drv.c | 2 +- drivers/gpu/drm/arm/hdlcd_drv.c | 2 +- drivers/gpu/drm/armada/armada_drv.c | 2 +- drivers/gpu/drm/ast/ast_drv.c | 2 +- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 2 +- drivers/gpu/drm/bochs/bochs_drv.c | 2 +- drivers/gpu/drm/cirrus/cirrus_drv.c | 2 +- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 2 +- drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 2 +- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 2 +- drivers/gpu/drm/mgag200/mgag200_drv.c | 2 +- drivers/gpu/drm/msm/msm_fb.c | 8 -------- drivers/gpu/drm/nouveau/nouveau_drm.c | 2 +- drivers/gpu/drm/omapdrm/omap_fb.c | 8 -------- drivers/gpu/drm/qxl/qxl_drv.c | 2 +- drivers/gpu/drm/rcar-du/rcar_du_drv.c | 2 +- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 10 +++------- drivers/gpu/drm/shmobile/shmob_drm_drv.c | 2 +- drivers/gpu/drm/sti/sti_cursor.c | 7 ------- drivers/gpu/drm/sti/sti_drv.c | 8 +------- drivers/gpu/drm/sti/sti_dvo.c | 7 ------- drivers/gpu/drm/sti/sti_gdp.c | 14 -------------- drivers/gpu/drm/sti/sti_hda.c | 7 ------- drivers/gpu/drm/sti/sti_hdmi.c | 7 ------- drivers/gpu/drm/sti/sti_hqvdp.c | 7 ------- drivers/gpu/drm/sti/sti_mixer.c | 7 ------- drivers/gpu/drm/sti/sti_tvout.c | 7 ------- drivers/gpu/drm/sti/sti_vid.c | 7 ------- drivers/gpu/drm/sun4i/sun4i_drv.c | 2 +- drivers/gpu/drm/tilcdc/tilcdc_drv.c | 2 +- drivers/gpu/drm/vc4/vc4_bo.c | 2 -- drivers/gpu/drm/vc4/vc4_drv.c | 2 +- drivers/gpu/drm/vc4/vc4_gem.c | 11 +++-------- drivers/gpu/drm/vgem/vgem_drv.c | 2 +- drivers/gpu/drm/virtio/virtgpu_drv.c | 2 +- 35 files changed, 27 insertions(+), 130 deletions(-) -- 2.8.1

12 43

Re: [PATCH] fbcon: warn on invalid cursor blink intervals
by Henrique de Moraes Holschuh 12 Jun '16

12 Jun '16

On Fri, 20 May 2016, Scot Doyle wrote: > On Fri, 20 May 2016, Jeremy Kerr wrote: > > >Then looks there are two fix patches acked & tested: > > > > > > - the patch in this thread > > > - another one "[PATCH] tty: vt: Fix soft lockup in fbcon cursor > > >blink timer." > > > https://lkml.org/lkml/2016/5/17/455 > > > > > >So which one will be pushed to linus? > > > > Not that it's my call, but we may want both; the first as a safety > > measure to prevent an invalid cur_blink_jiffies ever being set, and the > > second one to actually fix the initialisation of vc_cur_blink_ms (and > > address the warning introduced by the first). > > Tomi / Greg, > > I'd suggest > - applying "tty: vt: Fix soft lockup in fbcon cursor blink timer." to 4.7 and stable[4.2] > - applying "fbcon: warn on invalid cursor blink intervals" to 4.7 > - ignoring "fbcon: use default if cursor blink interval is not valid" > > Note: the patches don't depend on each other I applied both recommended patches on top of 4.4.11 for testing, and they made things a lot better here. I suggest the second patch should be backported to stable too, might as well fix this thing for good *and keep the door closed*. -- "One disk to rule them all, One disk to find them. One disk to bring them all and in the darkness grind them. In the Land of Redmond where the shadows lie." -- The Silicon Valley Tarot Henrique Holschuh

2 1

[PATCH v2 1/6] dt-bindings: add LG LP097QX1-SPA1 panel binding
by Yakir Yang 12 Jun '16

12 Jun '16

The LG LP097QX1-SPA1 is an 9.7", 2048x1536 (QXGA) TFT-LCD panel connected using eDP interfaces. Signed-off-by: Yakir Yang <ykk(a)rock-chips.com> Acked-by: Rob Herring <robh(a)kernel.org> --- Changes in v2: - Add Rob's acked for dt-bindings of LG LP097QX1-SPA1 panel .../devicetree/bindings/display/panel/lg,lp097qx1-spa1.txt | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 Documentation/devicetree/bindings/display/panel/lg,lp097qx1-spa1.txt diff --git a/Documentation/devicetree/bindings/display/panel/lg,lp097qx1-spa1.txt b/Documentation/devicetree/bindings/display/panel/lg,lp097qx1-spa1.txt new file mode 100644 index 0000000..4214151 --- /dev/null +++ b/Documentation/devicetree/bindings/display/panel/lg,lp097qx1-spa1.txt @@ -0,0 +1,7 @@ +LG 9.7" (2048x1536 pixels) TFT LCD panel + +Required properties: +- compatible: should be "lg,lp097qx1-spa1" + +This binding is compatible with the simple-panel binding, which is specified +in simple-panel.txt in this directory. -- 1.9.1

6 19

[PATCH v2 00/10] imx drm atomic mode setting conversion
by Liu Ying 11 Jun '16

11 Jun '16

Hi, This patch set converts imx drm into atomic mode setting. It takes 3 phases to achieve the goal as recommended. v1->v2: * Rebase onto Philipp Zabel's open git branch imx-drm/next as Philipp required. * Drop patch 05/14 and 10/14 in v1 which touch drm core to disable plane in transitional helper drm_helper_crtc_mode_set and in drm_atomic_helper_disable_all, because we won't get ipu plane resource in v2 when updating plane and failure won't happen. * Wait for pending commit on each CRTC for both block and nonblock atomic mode settings. This way, a block commit will not overwrite the hardware setting when a nonblock page flip is about to finish, so that the page flip may wait for vblank successfully. * See changelogs in each patch for other trivial updates. Liu Ying (10): drm/imx: ipuv3 plane: Check different types of plane separately gpu: ipu-v3: ipu-dmfc: Use static DMFC FIFO allocation mechanism drm/imx: atomic phase 1: Use transitional atomic CRTC and plane helpers drm/imx: atomic phase 2 step 1: Wire up state ->reset, ->duplicate and ->destroy drm/imx: atomic phase 2 step 2: Track plane_state->fb correctly in ->page_flip drm/imx: atomic phase 3 step 1: Atomic updates for planes drm/imx: atomic phase 3 step 2: Use atomic configuration drm/imx: atomic phase 3 step 3: Legacy callback fixups drm/imx: atomic phase 3 step 4: Use generic atomic page flip drm/imx: atomic phase 3 step 5: Advertise DRIVER_ATOMIC drivers/gpu/drm/bridge/dw-hdmi.c | 19 +- drivers/gpu/drm/imx/dw_hdmi-imx.c | 22 +- drivers/gpu/drm/imx/imx-drm-core.c | 194 +++++++++--- drivers/gpu/drm/imx/imx-drm.h | 18 +- drivers/gpu/drm/imx/imx-ldb.c | 129 ++++---- drivers/gpu/drm/imx/imx-tve.c | 85 ++---- drivers/gpu/drm/imx/ipuv3-crtc.c | 359 ++++++---------------- drivers/gpu/drm/imx/ipuv3-plane.c | 539 +++++++++++++++++++-------------- drivers/gpu/drm/imx/ipuv3-plane.h | 16 +- drivers/gpu/drm/imx/parallel-display.c | 74 +++-- drivers/gpu/ipu-v3/ipu-dc.c | 5 +- drivers/gpu/ipu-v3/ipu-di.c | 3 - drivers/gpu/ipu-v3/ipu-dmfc.c | 213 +------------ include/video/imx-ipu-v3.h | 3 - 14 files changed, 716 insertions(+), 963 deletions(-) -- 2.7.4

3 12

[Bug 96435] [bisected: 3b4486] Alien: Isolation, shader problems on characters show flickering colors.
by bugzilla-daemon＠freedesktop.org 11 Jun '16

11 Jun '16

https://bugs.freedesktop.org/show_bug.cgi?id=96435 Bug ID: 96435 Summary: [bisected: 3b4486] Alien: Isolation, shader problems on characters show flickering colors. Product: Mesa Version: git Hardware: Other OS: All Status: NEW Severity: normal Priority: medium Component: Drivers/Gallium/radeonsi Assignee: dri-devel(a)lists.freedesktop.org Reporter: alexandre.f.demers(a)gmail.com QA Contact: dri-devel(a)lists.freedesktop.org "Alien: Isolation" began showing some problems related to compute shaders today. Alien, Ripley and any other characters (droids...) have their appearance flickering and showing strange colors. Bisecting gave the following. 3b44864ab794ea487d22499e7e2c42565aaac085 is the first bad commit commit 3b44864ab794ea487d22499e7e2c42565aaac085 Author: Marek Olšák <marek.olsak(a)amd.com> Date: Fri Jun 3 19:17:46 2016 +0200 radeonsi: fix images with level > 0 This should fix spec@arb_shader_image_load_store@level. Broken by: Commit: 95c5bbae66af3ca1f805d94f6fe8d8e4ba2c9c43 radeonsi: set some image descriptor fields at bind time Reviewed-by: Bas Nieuwenhuizen <bas(a)basnieuwenhuizen.nl> :040000 040000 48196e8b6f41a823b3ec07e9aa21dd3c01ac7edc e6524187d496af18187effda79adad6b84774f2d M src Using latest ddx and drm from git repository, kernel 4.7-rc2 on ArchLinux 64. -- You are receiving this mail because: You are the assignee for the bug.

1 5

drm/dp/mst: Always clear proposed vcpi table for port. reminder.
by Grodzovsky, Andrey 11 Jun '16

11 Jun '16

Hi. Just a reminder with regard to this patch. Please comment if any changes are required. Thanks. -----Original Message----- From: dri-devel [mailto:dri-devel-bounces@lists.freedesktop.org] On Behalf Of dri-devel-request(a)lists.freedesktop.org Sent: Wednesday, May 25, 2016 5:05 PM To: dri-devel(a)lists.freedesktop.org Subject: dri-devel Digest, Vol 74, Issue 400 Send dri-devel mailing list submissions to dri-devel(a)lists.freedesktop.org To subscribe or unsubscribe via the World Wide Web, visit https://lists.freedesktop.org/mailman/listinfo/dri-devel or, via email, send a message with subject or body 'help' to dri-devel-request(a)lists.freedesktop.org You can reach the person managing the list at dri-devel-owner(a)lists.freedesktop.org When replying, please edit your Subject line so it is more specific than "Re: Contents of dri-devel digest..." Today's Topics: 1. [PATCH] drm/dp/mst: Always clear proposed vcpi table for port. (Andrey Grodzovsky) 2. [pull] amdgpu drm-next-4.7 (Alex Deucher) 3. [PATCH 0/8] scheduler code cleanup (Alex Deucher) 4. [PATCH 6/8] drm/amdgpu: properly abstract scheduler timeout handling (Alex Deucher) 5. [PATCH 2/8] drm/amdgpu: remove begin_job/finish_job (Alex Deucher) ---------------------------------------------------------------------- Message: 1 Date: Wed, 25 May 2016 16:45:43 -0400 From: Andrey Grodzovsky <Andrey.Grodzovsky(a)amd.com> To: <dri-devel(a)lists.freedesktop.org> Cc: Alex Deucher <alexander.deucher(a)amd.com>, Andrey Grodzovsky <Andrey.Grodzovsky(a)amd.com>, Mykola Lysenko <Mykola.Lysenko(a)amd.com>, stable(a)vger.kernel.org Subject: [PATCH] drm/dp/mst: Always clear proposed vcpi table for port. Message-ID: <1464209143-2148-1-git-send-email-Andrey.Grodzovsky(a)amd.com> Content-Type: text/plain Not clearing mst manager's proposed vcpis table for destroyed connectors when the manager is stopped leaves it pointing to unrefernced memory, this causes pagefault when the manager is restarted when plugging back a branch. Fixes: 91a25e463130 ("drm/dp/mst: deallocate payload on port destruction") Signed-off-by: Andrey Grodzovsky <Andrey.Grodzovsky(a)amd.com> Reviewed-by: Lyude <cpaul(a)redhat.com> Cc: stable(a)vger.kernel.org Cc: Mykola Lysenko <Mykola.Lysenko(a)amd.com> Cc: Alex Deucher <alexander.deucher(a)amd.com> --- drivers/gpu/drm/drm_dp_mst_topology.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index 9971c46..cd6014b 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -2881,11 +2881,9 @@ static void drm_dp_destroy_connector_work(struct work_struct *work) drm_dp_port_teardown_pdt(port, port->pdt); if (!port->input && port->vcpi.vcpi > 0) { - if (mgr->mst_state) { - drm_dp_mst_reset_vcpi_slots(mgr, port); - drm_dp_update_payload_part1(mgr); - drm_dp_mst_put_payload_id(mgr, port->vcpi.vcpi); - } + drm_dp_mst_reset_vcpi_slots(mgr, port); + drm_dp_update_payload_part1(mgr); + drm_dp_mst_put_payload_id(mgr, port->vcpi.vcpi); } kref_put(&port->kref, drm_dp_free_mst_port); -- 1.9.1 ------------------------------ Message: 2 Date: Wed, 25 May 2016 17:01:13 -0400 From: Alex Deucher <alexdeucher(a)gmail.com> To: airlied(a)gmail.com, dri-devel(a)lists.freedesktop.org Cc: Alex Deucher <alexander.deucher(a)amd.com> Subject: [pull] amdgpu drm-next-4.7 Message-ID: <1464210073-2816-1-git-send-email-alexander.deucher(a)amd.com> Hi Dave, A few fixes and cleanups for amdgpu for 4.7 The following changes since commit 3b59c344ab6e2d00b0f4ad946024572618c87502: drm/amd/powerplay: fix bugs of checking if dpm is running on Tonga (2016-05-18 09:22:30 -0400) are available in the git repository at: git://people.freedesktop.org/~agd5f/linux drm-next-4.7 for you to fetch changes up to 425c452b547622fb728c9ed4fe99c3f2f51d816d: drm/amd: add Kconfig dependency for ACP on DRM_AMDGPU (2016-05-25 09:44:15 -0400) ---------------------------------------------------------------- Jeff Mahoney (1): drm/amd: add Kconfig dependency for ACP on DRM_AMDGPU Mario Kleiner (1): drm/amdgpu: Fix hdmi deep color support. Monk Liu (1): drm/amdgpu: fix bug in fence driver fini Muhammad Falak R Wani (3): drm/amd/powerplay/hwmgr: use kmemdup drm/amd/powerplay/hwmgr: use kmemdup drm/amd/powerplay/hwmgr: use kmemdup drivers/gpu/drm/amd/acp/Kconfig | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 10 +++++----- drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 2 +- drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.c | 6 +++--- drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c | 6 +++--- drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c | 6 +++--- 6 files changed, 16 insertions(+), 15 deletions(-) ------------------------------ Message: 3 Date: Wed, 25 May 2016 17:04:14 -0400 From: Alex Deucher <alexdeucher(a)gmail.com> To: dri-devel(a)lists.freedesktop.org Cc: Alex Deucher <alexander.deucher(a)amd.com> Subject: [PATCH 0/8] scheduler code cleanup Message-ID: <1464210262-2912-1-git-send-email-alexander.deucher(a)amd.com> Content-Type: text/plain; charset=UTF-8 Just some general cleanup in the GPU scheduler. Christian König (8): drm/amdgpu: fix coding style in the scheduler v2 drm/amdgpu: remove begin_job/finish_job drm/amdgpu: remove duplicated timeout callback drm/amdgpu: fix coding style in amdgpu_job_free drm/amdgpu: remove use_shed hack in job cleanup drm/amdgpu: properly abstract scheduler timeout handling drm/amdgpu: move locking into the functions who need it drm/amdgpu: fix and cleanup job destruction drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 - drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 49 +++++++-------- drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 89 ++++++++++++++------------- drivers/gpu/drm/amd/scheduler/gpu_scheduler.h | 42 ++++--------- drivers/gpu/drm/amd/scheduler/sched_fence.c | 19 ++---- 6 files changed, 86 insertions(+), 119 deletions(-) -- 2.5.5 ------------------------------ Message: 4 Date: Wed, 25 May 2016 17:04:20 -0400 From: Alex Deucher <alexdeucher(a)gmail.com> To: dri-devel(a)lists.freedesktop.org Cc: Alex Deucher <alexander.deucher(a)amd.com>, Christian König <christian.koenig(a)amd.com> Subject: [PATCH 6/8] drm/amdgpu: properly abstract scheduler timeout handling Message-ID: <1464210262-2912-7-git-send-email-alexander.deucher(a)amd.com> Content-Type: text/plain; charset=UTF-8 From: Christian König <christian.koenig(a)amd.com> The driver shouldn't mess with the scheduler internals. Signed-off-by: Christian König <christian.koenig(a)amd.com> Reviewed-by: Monk.Liu <monk.liu(a)amd.com> Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com> --- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 3 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 15 ++++++++------- drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 11 +++++++++-- drivers/gpu/drm/amd/scheduler/gpu_scheduler.h | 2 +- 5 files changed, 19 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index 6c5ec32..ec42dd5 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h @@ -759,7 +759,6 @@ void amdgpu_job_free_func(struct kref *refcount); int amdgpu_job_submit(struct amdgpu_job *job, struct amdgpu_ring *ring, struct amd_sched_entity *entity, void *owner, struct fence **f); -void amdgpu_job_timeout_func(struct work_struct *work); struct amdgpu_ring { struct amdgpu_device *adev; diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c index 2bbeeb0..d8cac31 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c @@ -839,8 +839,7 @@ static int amdgpu_cs_submit(struct amdgpu_cs_parser *p, p->job = NULL; r = amd_sched_job_init(&job->base, &ring->sched, - entity, amdgpu_job_timeout_func, - amdgpu_job_free_func, + entity, amdgpu_job_free_func, p->filp, &fence); if (r) { amdgpu_job_free(job); diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c index be4698b..32132f2 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c @@ -34,13 +34,14 @@ static void amdgpu_job_free_handler(struct work_struct *ws) amd_sched_job_put(&job->base); } -void amdgpu_job_timeout_func(struct work_struct *work) +static void amdgpu_job_timedout(struct amd_sched_job *s_job) { - struct amdgpu_job *job = container_of(work, struct amdgpu_job, base.work_tdr.work); + struct amdgpu_job *job = container_of(s_job, struct amdgpu_job, base); + DRM_ERROR("ring %s timeout, last signaled seq=%u, last emitted seq=%u\n", - job->base.sched->name, - (uint32_t)atomic_read(&job->ring->fence_drv.last_seq), - job->ring->fence_drv.sync_seq); + job->base.sched->name, + atomic_read(&job->ring->fence_drv.last_seq), + job->ring->fence_drv.sync_seq); amd_sched_job_put(&job->base); } @@ -126,8 +127,7 @@ int amdgpu_job_submit(struct amdgpu_job *job, struct amdgpu_ring *ring, return -EINVAL; r = amd_sched_job_init(&job->base, &ring->sched, - entity, amdgpu_job_timeout_func, - amdgpu_job_free_func, owner, &fence); + entity, amdgpu_job_free_func, owner, &fence); if (r) return r; @@ -197,4 +197,5 @@ err: const struct amd_sched_backend_ops amdgpu_sched_ops = { .dependency = amdgpu_job_dependency, .run_job = amdgpu_job_run, + .timedout_job = amdgpu_job_timedout, }; diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c index e8ee90f..f2ed8c5 100644 --- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c +++ b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c @@ -362,6 +362,14 @@ static void amd_sched_job_begin(struct amd_sched_job *s_job) } } +static void amd_sched_job_timedout(struct work_struct *work) +{ + struct amd_sched_job *job = container_of(work, struct amd_sched_job, + work_tdr.work); + + job->sched->ops->timedout_job(job); +} + /** * Submit a job to the job queue * @@ -384,7 +392,6 @@ void amd_sched_entity_push_job(struct amd_sched_job *sched_job) int amd_sched_job_init(struct amd_sched_job *job, struct amd_gpu_scheduler *sched, struct amd_sched_entity *entity, - void (*timeout_cb)(struct work_struct *work), void (*free_cb)(struct kref *refcount), void *owner, struct fence **fence) { @@ -397,7 +404,7 @@ int amd_sched_job_init(struct amd_sched_job *job, return -ENOMEM; job->s_fence->s_job = job; - INIT_DELAYED_WORK(&job->work_tdr, timeout_cb); + INIT_DELAYED_WORK(&job->work_tdr, amd_sched_job_timedout); job->free_callback = free_cb; if (fence) diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h index 7e333fa..f0de46c 100644 --- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h +++ b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h @@ -108,6 +108,7 @@ static inline struct amd_sched_fence *to_amd_sched_fence(struct fence *f) struct amd_sched_backend_ops { struct fence *(*dependency)(struct amd_sched_job *sched_job); struct fence *(*run_job)(struct amd_sched_job *sched_job); + void (*timedout_job)(struct amd_sched_job *sched_job); }; enum amd_sched_priority { @@ -153,7 +154,6 @@ void amd_sched_fence_signal(struct amd_sched_fence *fence); int amd_sched_job_init(struct amd_sched_job *job, struct amd_gpu_scheduler *sched, struct amd_sched_entity *entity, - void (*timeout_cb)(struct work_struct *work), void (*free_cb)(struct kref* refcount), void *owner, struct fence **fence); static inline void amd_sched_job_get(struct amd_sched_job *job) -- 2.5.5 ------------------------------ Message: 5 Date: Wed, 25 May 2016 17:04:16 -0400 From: Alex Deucher <alexdeucher(a)gmail.com> To: dri-devel(a)lists.freedesktop.org Cc: Alex Deucher <alexander.deucher(a)amd.com>, Christian König <christian.koenig(a)amd.com> Subject: [PATCH 2/8] drm/amdgpu: remove begin_job/finish_job Message-ID: <1464210262-2912-3-git-send-email-alexander.deucher(a)amd.com> Content-Type: text/plain; charset=UTF-8 From: Christian König <christian.koenig(a)amd.com> Completely pointless and confusing to use a callback to call into the same code file. Signed-off-by: Christian König <christian.koenig(a)amd.com> Reviewed-by: Monk.Liu <monk.liu(a)amd.com> Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com> --- drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 2 -- drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 13 +++++++++---- drivers/gpu/drm/amd/scheduler/gpu_scheduler.h | 6 ------ drivers/gpu/drm/amd/scheduler/sched_fence.c | 10 ---------- 4 files changed, 9 insertions(+), 22 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c index f0dafa5..001030b 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c @@ -193,6 +193,4 @@ err: const struct amd_sched_backend_ops amdgpu_sched_ops = { .dependency = amdgpu_job_dependency, .run_job = amdgpu_job_run, - .begin_job = amd_sched_job_begin, - .finish_job = amd_sched_job_finish, }; diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c index f5ac01db2..821bc89 100644 --- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c +++ b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c @@ -329,7 +329,7 @@ static void amd_sched_free_job(struct fence *f, struct fence_cb *cb) { /* job_finish is called after hw fence signaled, and * the job had already been deleted from ring_mirror_list */ -void amd_sched_job_finish(struct amd_sched_job *s_job) +static void amd_sched_job_finish(struct amd_sched_job *s_job) { struct amd_sched_job *next; struct amd_gpu_scheduler *sched = s_job->sched; @@ -351,7 +351,7 @@ void amd_sched_job_finish(struct amd_sched_job *s_job) } } -void amd_sched_job_begin(struct amd_sched_job *s_job) +static void amd_sched_job_begin(struct amd_sched_job *s_job) { struct amd_gpu_scheduler *sched = s_job->sched; @@ -461,7 +461,7 @@ static void amd_sched_process_job(struct fence *f, struct fence_cb *cb) /* remove job from ring_mirror_list */ spin_lock_irqsave(&sched->job_list_lock, flags); list_del_init(&s_fence->s_job->node); - sched->ops->finish_job(s_fence->s_job); + amd_sched_job_finish(s_fence->s_job); spin_unlock_irqrestore(&sched->job_list_lock, flags); amd_sched_fence_signal(s_fence); @@ -475,6 +475,7 @@ static int amd_sched_main(void *param) { struct sched_param sparam = {.sched_priority = 1}; struct amd_gpu_scheduler *sched = (struct amd_gpu_scheduler *)param; + unsigned long flags; int r, count; sched_setscheduler(current, SCHED_FIFO, &sparam); @@ -499,7 +500,11 @@ static int amd_sched_main(void *param) s_fence = sched_job->s_fence; atomic_inc(&sched->hw_rq_count); - amd_sched_job_pre_schedule(sched, sched_job); + spin_lock_irqsave(&sched->job_list_lock, flags); + list_add_tail(&sched_job->node, &sched->ring_mirror_list); + amd_sched_job_begin(sched_job); + spin_unlock_irqrestore(&sched->job_list_lock, flags); + fence = sched->ops->run_job(sched_job); amd_sched_fence_scheduled(s_fence); if (fence) { diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h index 690ae4b..69840d7 100644 --- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h +++ b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h @@ -110,8 +110,6 @@ static inline struct amd_sched_fence *to_amd_sched_fence(struct fence *f) struct amd_sched_backend_ops { struct fence *(*dependency)(struct amd_sched_job *sched_job); struct fence *(*run_job)(struct amd_sched_job *sched_job); - void (*begin_job)(struct amd_sched_job *sched_job); - void (*finish_job)(struct amd_sched_job *sched_job); }; enum amd_sched_priority { @@ -160,10 +158,6 @@ int amd_sched_job_init(struct amd_sched_job *job, void (*timeout_cb)(struct work_struct *work), void (*free_cb)(struct kref* refcount), void *owner, struct fence **fence); -void amd_sched_job_pre_schedule(struct amd_gpu_scheduler *sched , - struct amd_sched_job *s_job); -void amd_sched_job_finish(struct amd_sched_job *s_job); -void amd_sched_job_begin(struct amd_sched_job *s_job); static inline void amd_sched_job_get(struct amd_sched_job *job) { if (job) diff --git a/drivers/gpu/drm/amd/scheduler/sched_fence.c b/drivers/gpu/drm/amd/scheduler/sched_fence.c index 6bdc9b7..71931bc 100644 --- a/drivers/gpu/drm/amd/scheduler/sched_fence.c +++ b/drivers/gpu/drm/amd/scheduler/sched_fence.c @@ -58,16 +58,6 @@ void amd_sched_fence_signal(struct amd_sched_fence *fence) FENCE_TRACE(&fence->base, "was already signaled\n"); } -void amd_sched_job_pre_schedule(struct amd_gpu_scheduler *sched , - struct amd_sched_job *s_job) -{ - unsigned long flags; - spin_lock_irqsave(&sched->job_list_lock, flags); - list_add_tail(&s_job->node, &sched->ring_mirror_list); - sched->ops->begin_job(s_job); - spin_unlock_irqrestore(&sched->job_list_lock, flags); -} - void amd_sched_fence_scheduled(struct amd_sched_fence *s_fence) { struct fence_cb *cur, *tmp; -- 2.5.5 ------------------------------ Subject: Digest Footer _______________________________________________ dri-devel mailing list dri-devel(a)lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ------------------------------ End of dri-devel Digest, Vol 74, Issue 400 ******************************************

1 0

[Bug 96493] hr DIPTI 4587
by bugzilla-daemon＠freedesktop.org 11 Jun '16

11 Jun '16

https://bugs.freedesktop.org/show_bug.cgi?id=96493 Bug ID: 96493 Summary: hr DIPTI 4587 Product: DRI Version: XOrg git Hardware: Other OS: All Status: NEW Severity: normal Priority: medium Component: DRM/other Assignee: dri-devel(a)lists.freedesktop.org Reporter: techhariom748(a)gmail.com WHO IS HR DIPTI -- You are receiving this mail because: You are the assignee for the bug.

1 1

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel June 2016