Re: [PULL] drm-misc-next
On Fri, 16 Jul 2021 at 21:07, Maarten Lankhorst wrote: > > Hi Dave & Daniel, > > Lots of stuff this time around. > > Enjoy! I've pulled this but there is an outstanding warning /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c: In function ‘hibmc_unload’: /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c:252:28: warning: unused variable ‘priv’ [-Wunused-variable] 252 | struct hibmc_drm_private *priv = to_hibmc_drm_private(dev); |^~~~ Probably due to Thomas irq patches. Dave.
[git pull] drm fixes for 5.14-rc3
Hi Linus, Regular fixes pull request, a bunch of amdgpu fixes are the main thing mostly for the new gpus. There is also some i915 reverts for older changes that were having some unwanted side effects. One nouveau fix for a report regressions, and otherwise just some misc fixes. Dave. drm-fixes-2021-07-23: drm fixes for 5.14-rc3 core: - fix for non-drm ioctls on drm fd panel: - avoid double free ttm: - refcounting fix - NULL checks amdgpu: - Yellow Carp updates - Add some Yellow Carp DIDs - Beige Goby updates - CIK 10bit 4K regression fix - GFX10 golden settings updates - eDP panel regression fix - Misc display fixes - Aldebaran fix - fix COW checks nouveau: - init BO GEM fields i915: - revert async command parsing - revert fence error propagation - GVT fix for shadow ppgtt vc4: - fix interrupt handling The following changes since commit 2734d6c1b1a089fb593ef6a23d4b70903526fe0c: Linux 5.14-rc2 (2021-07-18 14:13:49 -0700) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2021-07-23 for you to fetch changes up to 2e41a6696bf828a7b06f520d147f6911c947a7af: Merge tag 'drm-misc-fixes-2021-07-22' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes (2021-07-23 11:17:03 +1000) drm fixes for 5.14-rc3 core: - fix for non-drm ioctls on drm fd panel: - avoid double free ttm: - refcounting fix - NULL checks amdgpu: - Yellow Carp updates - Add some Yellow Carp DIDs - Beige Goby updates - CIK 10bit 4K regression fix - GFX10 golden settings updates - eDP panel regression fix - Misc display fixes - Aldebaran fix - fix COW checks nouveau: - init BO GEM fields i915: - revert async command parsing - revert fence error propogation - GVT fix for shadow ppgtt vc4: - fix interrupt handling Aaron Liu (2): drm/amdgpu: update yellow carp external rev_id handling drm/amdgpu: add yellow carp pci id (v2) Bindu Ramamurthy (2): drm/amd/display: Populate socclk entries for dcn3.02/3.03 drm/amd/display: Populate dtbclk entries for dcn3.02/3.03 Camille Cho (1): drm/amd/display: Only set default brightness for OLED Charles Baylis (1): drm: Return -ENOTTY for non-drm ioctls Christian König (1): drm/nouveau: init the base GEM fields for internal BOs Colin Xu (1): drm/i915/gvt: Clear d3_entered on elsp cmd submission. Dave Airlie (3): Merge tag 'amd-drm-fixes-5.14-2021-07-21' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes Merge tag 'drm-intel-fixes-2021-07-22' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes Merge tag 'drm-misc-fixes-2021-07-22' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes Eric Yang (2): drm/amd/display: implement workaround for riommu related hang drm/amd/display: change zstate allow msg condition Felix Kuehling (1): drm/amdgpu: workaround failed COW checks for Thunk VMAs Jason Ekstrand (4): drm/i915: Revert "drm/i915/gem: Asynchronous cmdparser" Revert "drm/i915: Propagate errors on awaiting already signaled fences" drm/ttm: Force re-init if ttm_global_init() fails drm/i915: Correct the docs for intel_engine_cmd_parser Lijo Lazar (1): drm/amd/pm: Support board calibration on aldebaran Likun Gao (1): drm/amdgpu: update golden setting for sienna_cichlid Liviu Dudau (1): drm/amd/display: Fix 10bit 4K display on CIK GPUs Maxime Ripard (2): drm/vc4: hdmi: Drop devm interrupt handler for CEC interrupts drm/panel: raspberrypi-touchscreen: Prevent double-free Mikita Lipski (1): drm/amd/display: Remove MALL function from DCN3.1 Nevenko Stupar (1): drm/amd/display: Line Buffer changes Nicholas Kazlauskas (3): drm/amd/display: Fix max vstartup calculation for modes with borders drm/amd/display: Query VCO frequency from register for DCN3.1 drm/amd/display: Update bounding box for DCN3.1 Pavel Skripkin (1): drm/ttm: add missing NULL checks Rodrigo Vivi (1): Merge tag 'gvt-fixes-2021-07-15' of https://github.com/intel/gvt-linux into drm-intel-fixes Stylon Wang (1): drm/amd/display: Fix ASSR regression on embedded panels Tao Zhou (2): drm/amdgpu: update gc golden setting for dimgrey_cavefish drm/amd/pm: update DRIVER_IF_VERSION for beige_goby Veerabadhran Gopalakrishnan (3): amdgpu/nv.c - Added video codec support for Yellow Carp amdgpu/nv.c - Optimize code for video codec support structure drm/amdgpu - Corrected the video codecs array name for yellow carp Victor Lu (1): drm/amd/display: Fix comparison error in dcn21 DML Xiaojian Du (1): drm/amdgpu: update the golden setting for vangogh drivers/gpu/drm/amd/amdgpu/amdgpu.h| 7 + drivers/gpu/drm/amd/amdgpu/am
Re: [PATCH 1/5] drm/vmwgfx: unbind in vmw_ttm_unpopulate
On Fri, 23 Jul 2021 at 19:40, Christian König wrote: > > Am 23.07.21 um 11:21 schrieb Daniel Vetter: > > On Fri, Jul 23, 2021 at 11:13 AM Christian König > > wrote: > >> Am 23.07.21 um 10:47 schrieb Daniel Vetter: > >>> On Thu, Jul 22, 2021 at 02:41:23PM +0200, Christian König wrote: > >>>> Doing this in vmw_ttm_destroy() is to late. > >>>> > >>>> It turned out that this is not a good idea at all because it leaves > >>>> pointers > >>>> to freed up system memory pages in the GART tables of the drivers. > >>> So I wanted to review this series, and I can't reconcile your claim here > >>> with the demidlayering Dave has done. The driver patches here don't > >>> ouright undo what Dave has done, but that means the bug has been > >>> preexisting since forever (or is due to some other change?), and your > >>> commit message is a bit confusing here. > >>> > >>> The final patch just undoes the demidlayering from Dave, and I really > >>> don't see where there's even a functional change there. > >>> > >>> And even these patches here don't really change a hole lot with the > >>> calling sequence for at least final teardown: ttm_tt_destroy_common calls > >>> ttm_tt_unpopulate as the first thing, so at least there there's no change. > >>> > >>> Can you pls elaborate more clearly what exactly you're fixing and what > >>> exactly needs to be reordered and where this bug is from (commit sha1)? As > >>> is I'm playing detective and the evidence presented is extremely since and > >>> I can't reconcile it at all. > >>> > >>> I mean I know you don't like typing commit message and documentation, but > >>> it does get occasionally rather frustrating on the reviewer side if I have > >>> to interpolate between some very sparse hints for this stuff :-/ > >> Yeah, when have seen the history it's rather obvious what's wrong here > >> and I expected Dave to review it himself. > >> > >> Previously we had three states in TTM for a tt object: Allocated -> > >> Populated -> Bound which on destruction where done in the order unbind > >> -> unpopulate -> free. > >> > >> Dave moved handling of the bound state into the drivers since it is > >> basically a driver decision and not a TTM decision what should be bound > >> and what not (that part perfectly makes sense). > > I haven't reviewed all the patches from Dave, only the one you pointed > > at (in the last patch). And that one I still can't match up with your > > description. If there's other commits relevant, can you pls dig them > > out? > > > > Like it all makes sense what you're saying and matches the code, I > > just can't match it up with the commit you're referencing. > > That is the patch directly following the one I've mentioned: > > commit 37bff6542c4e140a11657406c1bab50a40329cc1 > Author: Dave Airlie > Date: Thu Sep 17 13:24:50 2020 +1000 > > drm/ttm: move unbind into the tt destroy. > > This moves unbind into the driver side on destroy paths. > > I will add a Fixes tag to make that clear. > > But this patch also just moves the undbind from the TTM destroy path to > the driver destroy path. > > To be honest I'm not 100% sure either when the when the unbind moved > from the unpopulate path into the destroy path, but I think that this > wasn't always the case. Let me try to dig that up. > > >> The problem is that he also moved doing the unbind into the free > >> callback instead of the unpopulate callback. This result in stale page > >> pointers in the GART if that unpopulate operation isn't immediately > >> followed by a free. > >> > >> Thinking more about it if we do populated->unpopulated->populated then > >> we would also have stale pointers to the old pages which is even worse. > >> > >> This is also not de-midlayering since we already have a proper > >> ttm_tt_init()/ttm_tt_fini() functions which should work nicely for the > >> tt object. > > Well you're last patch moves the ttm_tt_destroy_common stuff back into > > ttm, which kinda is de-demidlayering. So I'm confused. > > Ah, yes that is correct. I've also considered to move this in > ttm_tt_fini instead of there. > > But that would be a larger change and I wanted to fix the problem at > ha
Re: [PATCH 1/5] drm/vmwgfx: unbind in vmw_ttm_unpopulate
On Tue, 27 Jul 2021 at 05:35, Christian König wrote: > > Am 26.07.21 um 02:03 schrieb Dave Airlie: > > [SNIP] > >> But you know, normal human: Only equipped with one head and two hands > >> and not cloneable. > > I'm the same, but I'm not seeing where this problem happens at all, do > > we have any backtraces or demos for this? > > I've stumbled over this while working on some patches which accidentally > broke delayed delete and caused random memory corruption and was > wondering how that even happened in the first place. > > Having stale PTEs in the GART isn't a problem unless you break other > things. Which is also the reason why I haven't added a CC stable yet. > > > I split bind/unbind into the driver, but the driver should still > > always be moving things to unbound states before an unpopulate is > > called, is there a driver doing something unexpected here? > > Possible, I was only testing with amdgpu and the GART handling is rather > special there (which was one of the reasons why we did that in the first > place). > > > at worst I'd like to see a WARN_ON put in first and a test in igt that > > triggers it, because right now I'm not see that path through the > > drivers/ttm that leads to unpopulated pages ending up happening while > > bound. > > > > From 5.14-rc3 unpopulate is called from ttm_bo_pipeline_gutting in > > non-ghost path and there is no unbind, > > pipeline gutting is called from evict/validate, when there is no > > placement suggested for the object, is this case getting hit somewhere > > without the driver having previously unbound things? > > Yes, that will hit absolutely. Most likely with VM page tables for > amdgpu which uses this. My thing is here we moved binding/unbinding to the driver, if the driver has a bug I'd expect the fix to be in the driver side here. I think giving drivers control over something and enforcing it in the core/helpers is fine, but I don't think we should be adding back the midlayering. > > ttm_tt_destroy_common: calls unpopulate, everyone calls this directly > > after unbinding > > ttm_tt_swapout: calls unpopulate, we don't swapout objects from TT > > directly, we should always unbind first, this used to have an assert > > against that, > > ttm_tt_populate: call unpopulate in failure path > > unbinding was moved into the driver, so ttm_tt_swapout() won't unbind > anything before calling unpopulate as far as I can see. But we won't call swapout on BOs that aren't in SYSTEM and to be in SYSTEM, the bo would have to go through the driver move function which will unbind it. > > > So any place I can see unpopulate getting called with a bound TT > > should be a bug, and fixed, we could protect against it better but I'm > > not seeing the need for this series to outright revert things back as > > helping. > > I'm not reverting this because it is offhand wrong, but making sure the > GART is clear before unpopulating the TT object sounds like the much > more natural thing to do and the state machine is something I certainly > don't see in the backend. > I don't think that's the core's responsibility anymore, I'm fine with adding code and even an flag that says if the the TT is bound/unbound that unpopulate can WARN_ON() against so we get a backtrace and track down where something is getting unpopulated without going through the driver move function to be unbound. Dave.
[git pull] drm fixes for 5.14-rc4
Hi Linus, Regular drm fixes pull, seems about the right size, lots of small fixes across the board, mostly amdgpu, but msm and i915 are in there along with panel and ttm. There is an rc3 backmerge due to some patches ending up in the gap between last and this week. Dave. drm-fixes-2021-07-30: drm fixes for 5.14-rc4 amdgpu: - Fix resource leak in an error path - Avoid stack contents exposure in error path - pmops check fix for S0ix vs S3 - DCN 2.1 display fixes - DCN 2.0 display fix - Backlight control fix for laptops with HDR panels - Maintainers updates i915: - Fix vbt port mask - Fix around reading the right DSC disable fuse in display_ver 10 - Split display version 9 and 10 in intel_setup_outputs msm: - iommu fault display fix - misc dp compliance fixes - dpu reg sizing fix panel: - Fix bpc for ytc700tlag_05_201c ttm: - debugfs init fixes The following changes since commit ff1176468d368232b684f75e82563369208bc371: Linux 5.14-rc3 (2021-07-25 15:35:14 -0700) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2021-07-30 for you to fetch changes up to d28e2568ac26fff351c846bf74ba6ca5dded733e: Merge tag 'amd-drm-fixes-5.14-2021-07-28' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes (2021-07-29 17:20:29 +1000) drm fixes for 5.14-rc4 amdgpu: - Fix resource leak in an error path - Avoid stack contents exposure in error path - pmops check fix for S0ix vs S3 - DCN 2.1 display fixes - DCN 2.0 display fix - Backlight control fix for laptops with HDR panels - Maintainers updates i915: - Fix vbt port mask - Fix around reading the right DSC disable fuse in display_ver 10 - Split display version 9 and 10 in intel_setup_outputs msm: - iommu fault display fix - misc dp compliance fixes - dpu reg sizing fix panel: - Fix bpc for ytc700tlag_05_201c ttm: - debugfs init fixes Alex Deucher (1): drm/amdgpu/display: only enable aux backlight control for OLED panels Bjorn Andersson (1): drm/msm/dp: Initialize the INTF_CONFIG register Dale Zhao (1): drm/amd/display: ensure dentist display clock update finished in DCN20 Dave Airlie (4): Merge tag 'drm-msm-fixes-2021-07-27' of https://gitlab.freedesktop.org/drm/msm into drm-fixes Merge tag 'drm-misc-fixes-2021-07-28' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes Merge tag 'drm-intel-fixes-2021-07-28' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes Merge tag 'amd-drm-fixes-5.14-2021-07-28' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes Jagan Teki (1): drm/panel: panel-simple: Fix proper bpc for ytc700tlag_05_201c Jason Ekstrand (1): drm/ttm: Initialize debugfs from ttm_global_init() Jiri Kosina (2): drm/amdgpu: Fix resource leak on probe error path drm/amdgpu: Avoid printing of stack contents on firmware load error Kuogee Hsieh (2): drm/msm/dp: use dp_ctrl_off_link_stream during PHY compliance test run drm/msm/dp: signal audio plugged change at dp_pm_resume Lucas De Marchi (2): drm/i915: fix not reading DSC disable fuse in GLK drm/i915/display: split DISPLAY_VER 9 and 10 in intel_setup_outputs() Pratik Vishwakarma (1): drm/amdgpu: Check pmops for desired suspend state Rob Clark (1): drm/msm: Fix display fault handling Robert Foss (1): drm/msm/dpu: Fix sm8250_mdp register length Rodrigo Vivi (1): drm/i915/bios: Fix ports mask Sean Paul (1): drm/msm/dp: Initialize dp->aux->drm_dev before registration Simon Ser (1): maintainers: add bugs and chat URLs for amdgpu Thomas Zimmermann (1): Merge drm/drm-fixes into drm-misc-fixes Victor Lu (2): drm/amd/display: Guard DST_Y_PREFETCH register overflow in DCN21 drm/amd/display: Add missing DCN21 IP parameter MAINTAINERS | 2 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 3 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 8 ++-- drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 7 +++ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c| 4 ++-- .../gpu/drm/amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 2 +- drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c| 1 + .../drm/amd/display/dc/dml/dcn21/display_mode_vba_21.c | 3 +++ drivers/gpu/drm/i915/display/intel_bios.c| 3 ++- drivers/gpu/drm/i915/display/intel_display.c | 8 +++- drivers/gpu/drm/i915/intel_device_info.c | 9 + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 2 +- drivers/gpu/drm/msm/dp/dp_catalog.c | 1 + drivers/gpu/drm/msm/dp/dp_ctrl.c | 2 +- drivers/gpu/drm/msm/dp/dp_displa
Re: [pull] amdgpu, radeon, ttm, sched drm-next-5.13
On Wed, 7 Apr 2021 at 06:54, Alex Deucher wrote: > > On Fri, Apr 2, 2021 at 12:22 PM Christian König > wrote: > > > > Hey Alex, > > > > the TTM and scheduler changes should already be in the drm-misc-next > > branch (not 100% sure about the TTM patch, need to double check next week). > > > > The TTM change is not in drm-misc yet. > > > Could that cause problems when both are merged into drm-next? > > Dave, Daniel, how do you want to handle this? The duplicated patch is this > one: > https://cgit.freedesktop.org/drm/drm-misc/commit/?id=ac4eb83ab255de9c31184df51fd1534ba36fd212 > amdgpu has changes which depend on it. The same patch is included in this PR. Ouch not sure how best to sync up here, maybe get misc-next into my tree then rebase your tree on top of it? Dave. ___ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
[git pull] drm fixes for 5.12-rc7
Hey Linus, Was relatively quiet this week, but still a few pulls came in, pretty much small fixes across the board, a couple of regression fixes in the amdgpu/radeon code, msm has a few minor fixes across the board, a panel regression fix also. I'm out all next week, so Daniel will do any last minute fixes for the final release, assuming things stick to schedule. I'll be back for the merge window but might towards the end of the first week before I get my MR lined up. Dave. drm-fixes-2021-04-10: drm fixes for 5.12-rc7 amdgpu: - DCN3 fix - Fix CAC setting regression for TOPAZ - Fix ttm regression radeon: - Fix ttm regression msm: - a5xx/a6xx timestamp fix - microcode version check - fail path fix - block programming fix - error removal fix. i915: - Fix invalid access to ACPI _DSM objects xen: - Fix use-after-free in xen. - minor duplicate definition cleanup vc4: - Reduce fifo threshold on hvs4 to fix a fifo full error. - minor redundant assignment cleanup panel: - Disable TE support for Droid4 and N950. The following changes since commit e49d033bddf5b565044e2abe4241353959bc9120: Linux 5.12-rc6 (2021-04-04 14:15:36 -0700) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2021-04-10 for you to fetch changes up to bd119f471299c8692a00b2f5e9bba8e3b81c3466: Merge tag 'drm-intel-fixes-2021-04-09' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes (2021-04-10 05:18:35 +1000) drm fixes for 5.12-rc7 amdgpu: - DCN3 fix - Fix CAC setting regression for TOPAZ - Fix ttm regression radeon: - Fix ttm regression msm: - a5xx/a6xx timestamp fix - microcode version check - fail path fix - block programming fix - error removal fix. i915: - Fix invalid access to ACPI _DSM objects xen: - Fix use-after-free in xen. - minor duplicate defintion cleanup vc4: - Reduce fifo threshold on hvs4 to fix a fifo full error. - minor redunantant assignment cleanup panel: - Disable TE support for Droid4 and N950. Alex Deucher (1): drm/amdgpu/smu7: fix CAC setting on TOPAZ Dave Airlie (4): Merge tag 'amd-drm-fixes-5.12-2021-04-08' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes Merge tag 'drm-msm-fixes-2021-04-02' of https://gitlab.freedesktop.org/drm/msm into drm-fixes Merge tag 'drm-misc-fixes-2021-04-09' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes Merge tag 'drm-intel-fixes-2021-04-09' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes Dmitry Baryshkov (1): drm/msm: a6xx: fix version check for the A650 SQE microcode Dom Cobley (1): drm/vc4: crtc: Reduce PV fifo threshold on hvs4 John Stultz (1): drm/msm: Fix removal of valid error case when checking speed_bin Kalyan Thota (1): drm/msm/disp/dpu1: program 3d_merge only if block is attached Lv Yunlong (1): gpu/xen: Fix a use after free in xen_drm_drv_init Maxime Ripard (1): drm/vc4: plane: Remove redundant assignment Qingqing Zhuo (1): drm/amd/display: Add missing mask for DCN3 Rob Clark (1): drm/msm: Fix a5xx/a6xx timestamps Sebastian Reichel (1): drm/panel: panel-dsi-cm: disable TE for now Stephen Boyd (1): drm/msm: Set drvdata to NULL when msm_drm_init() fails Takashi Iwai (1): drm/i915: Fix invalid access to ACPI _DSM objects Wan Jiabing (1): drivers: gpu: drm: xen_drm_front_drm_info is declared twice xinhui pan (2): drm/amdgpu: Fix size overflow drm/radeon: Fix size overflow drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c| 2 +- drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.h | 1 + .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c| 3 ++- drivers/gpu/drm/i915/display/intel_acpi.c | 22 -- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 4 ++-- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 18 -- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 4 +++- drivers/gpu/drm/msm/msm_drv.c | 1 + drivers/gpu/drm/panel/panel-dsi-cm.c | 12 +--- drivers/gpu/drm/radeon/radeon_ttm.c| 4 ++-- drivers/gpu/drm/vc4/vc4_crtc.c | 17 + drivers/gpu/drm/vc4/vc4_plane.c| 1 - drivers/gpu/drm/xen/xen_drm_front.c| 6 -- drivers/gpu/drm/xen/xen_drm_front_conn.h | 1 - 14 files changed, 74 insertions(+), 22 deletions(-) ___ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [pull] amdgpu, radeon, ttm, sched drm-next-5.13
On Fri, 9 Apr 2021 at 19:07, Christian König wrote: > > Am 08.04.21 um 15:03 schrieb Alex Deucher: > > On Thu, Apr 8, 2021 at 6:28 AM Christian König > > wrote: > >> Am 08.04.21 um 09:13 schrieb Christian König: > >>> Am 07.04.21 um 21:04 schrieb Alex Deucher: > >>>> On Wed, Apr 7, 2021 at 3:23 AM Dave Airlie wrote: > >>>>> On Wed, 7 Apr 2021 at 06:54, Alex Deucher > >>>>> wrote: > >>>>>> On Fri, Apr 2, 2021 at 12:22 PM Christian König > >>>>>> wrote: > >>>>>>> Hey Alex, > >>>>>>> > >>>>>>> the TTM and scheduler changes should already be in the drm-misc-next > >>>>>>> branch (not 100% sure about the TTM patch, need to double check > >>>>>>> next week). > >>>>>>> > >>>>>> The TTM change is not in drm-misc yet. > >>>>>> > >>>>>>> Could that cause problems when both are merged into drm-next? > >>>>>> Dave, Daniel, how do you want to handle this? The duplicated patch > >>>>>> is this one: > >>>>>> https://cgit.freedesktop.org/drm/drm-misc/commit/?id=ac4eb83ab255de9c31184df51fd1534ba36fd212 > >>>>>> > >>>>>> amdgpu has changes which depend on it. The same patch is included > >>>>>> in this PR. > >>>>> Ouch not sure how best to sync up here, maybe get misc-next into my > >>>>> tree then rebase your tree on top of it? > >>>> I can do that. > >>> Please let me double check later today that we have everything we need > >>> in drm-misc-next. > >> There where two patch for TTM (one from Felix and one from Oak) which > >> still needed to be pushed to drm-misc-next. I've done that just a minute > >> ago. > >> > > They were included in this PR. > > > >> Then we have this patch which fixes a bug in code removed on > >> drm-misc-next. I think it should be dropped when amd-staging-drm-next is > >> based on drm-next/drm-misc-next. > >> > >> Author: xinhui pan > >> Date: Wed Feb 24 11:28:08 2021 +0800 > >> > >> drm/ttm: Do not add non-system domain BO into swap list > >> > > Ok. > > > >> I've also found the following patch which is problematic as well: > >> > >> commit c8a921d49443025e10794342d4433b3f29616409 > >> Author: Jack Zhang > >> Date: Mon Mar 8 12:41:27 2021 +0800 > >> > >> drm/amd/amdgpu implement tdr advanced mode > >> > >> [Why] > >> Previous tdr design treats the first job in job_timeout as the bad > >> job. > >> But sometimes a later bad compute job can block a good gfx job and > >> cause an unexpected gfx job timeout because gfx and compute ring > >> share > >> internal GC HW mutually. > >> > >> [How] > >> This patch implements an advanced tdr mode.It involves an additinal > >> synchronous pre-resubmit step(Step0 Resubmit) before normal resubmit > >> step in order to find the real bad job. > >> > >> 1. At Step0 Resubmit stage, it synchronously submits and pends for > >> the > >> first job being signaled. If it gets timeout, we identify it as > >> guilty > >> and do hw reset. After that, we would do the normal resubmit step to > >> resubmit left jobs. > >> > >> 2. For whole gpu reset(vram lost), do resubmit as the old way. > >> > >> Signed-off-by: Jack Zhang > >> Reviewed-by: Andrey Grodzovsky > >> > >> That one is modifying both amdgpu as well as the scheduler code. IIRC I > >> actually requested that the patch is split into two, but that was > >> somehow not done. > >> > >> How should we proceed here? Should I separate the patch, push the > >> changes to drm-misc-next and then we merge with drm-next and rebase > >> amd-staging-drm-next on top of that? > >> > >> That's most likely the cleanest option approach as far as I can see. > > That's fine with me. We could have included them in my PR. Now we > > have wait for drm-misc-next to be merged again before we can merge the > > amdgpu code. > > Well I'm not sure, but the patches are identical on both branches. > > As far as I can see git then just ignores that it gets the patches from > both sides of the merge. No this is one of the biggest no-nos. Don't ever merge a patch via multiple trees, it ends badly. (you might get away with it once or twice depending, but longer term bad things result, esp around merge conflicts with other trees). If we have patches we need in multiple trees, we have to create a stable topic branch and pull that into both trees. drm-misc-next is backmerged into drm-next now. Dave. ___ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [git pull] drm/vmwgfx fixes for 5.12-rc8
Hi Zack, Please make sure to always cc dri-devel and/or Daniel on these so if I'm away they don't get lost, but also so that they make it into patchwork for processing. If you have a chance can you resend it, I'll see if we can process this out of band and get it to Linus before release. Dave. On Thu, 15 Apr 2021 at 07:14, Zack Rusin wrote: > > The following changes since commit d434405aaab7d0ebc516b68a8fc4100922d7f5ef: > >Linux 5.12-rc7 (2021-04-11 15:16:13 -0700) > > are available in the Git repository at: > >g...@gitlab.freedesktop.org:zack/vmwgfx.git tags/vmwgfx-fixes-2021-04-14 > > for you to fetch changes up to 2ef4fb92363c44e8a6f93fd0877b6a7dee6f874d: > >drm/vmwgfx: Make sure bo's are unpinned before putting them back > (2021-04-14 16:41:31 -0400) > > > vmwgfx fixes for regressions in 5.12 > > Here's a set of 3 patches fixing ugly regressions > in the vmwgfx driver. We broke lock initialization > code and ended up using spinlocks before initialization > breaking lockdep. > Also there was a bit of a fallout from drm changes > which made the core validate that unreferenced buffers > have been unpinned. vmwgfx pinning code predates a lot > of the core drm and wasn't written to account for those > semantics. Fortunately changes required to fix it > are not too intrusive. > The changes have been validated by our internal ci. > > Signed-off-by: Zack Rusin > > > Zack Rusin (3): >drm/vmwgfx: Make sure we unpin no longer needed buffers >drm/vmwgfx: Fix the lockdep breakage >drm/vmwgfx: Make sure bo's are unpinned before putting them back > > drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 4 > drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 17 - > drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 5 + > drivers/gpu/drm/vmwgfx/vmwgfx_mob.c | 14 ++ > 4 files changed, 27 insertions(+), 13 deletions(-) ___ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
[git pull] drm/vmwgfx fixes for 5.12-rc8
Hi Linus, Back from holidays and this was in the cracks (Zack forgot to cc Daniel/lists), I've just piled it onto drm fixes. It contains two regression fixes for vmwgfx, one due to a refactor which meant locks were being used before initialisation, and the other in fixing up some warnings from the core when destroying pinned buffers. Dave. drm-fixes-2021-04-18: drm/vmwgfx fixes for 5.12-rc7 vmwgfx: - fixed unpinning before destruction - lockdep init reordering The following changes since commit 4d2e1288372ccc5ac60290bc10cace49c9bfa6d0: Merge tag 'drm-intel-fixes-2021-04-15' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes (2021-04-15 15:24:17 +0200) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2021-04-18 for you to fetch changes up to 796b556cbfdbe0d65b9793e63653ad24f9fa033c: Merge tag 'vmwgfx-fixes-2021-04-14' of gitlab.freedesktop.org:zack/vmwgfx into drm-fixes (2021-04-18 09:27:00 +1000) drm/vmwgfx fixes for 5.12-rc7 vmwgfx: - fixed unpinning before destruction - lockdep init reordering ---- Dave Airlie (1): Merge tag 'vmwgfx-fixes-2021-04-14' of gitlab.freedesktop.org:zack/vmwgfx into drm-fixes Zack Rusin (3): drm/vmwgfx: Make sure we unpin no longer needed buffers drm/vmwgfx: Fix the lockdep breakage drm/vmwgfx: Make sure bo's are unpinned before putting them back drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 4 drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 17 - drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 5 + drivers/gpu/drm/vmwgfx/vmwgfx_mob.c | 14 ++ 4 files changed, 27 insertions(+), 13 deletions(-) ___ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
umn experiment patches fallout in drm
Looking at the umn.edu patches for drm in the last while, all the refcount ones look bogus, 2020-06-13 20:48 -0500 Aditya Pakki o drm/nouveau: fix reference count leak in nouveau_debugfs_strap_peek 2020-06-13 20:22 -0500 Aditya Pakki o drm/nouveau: Fix reference count leak in nouveau_connector_detect 2020-06-13 20:29 -0500 Aditya Pakki o drm/nouveau: fix reference count leak in nv50_disp_atomic_commit 2020-06-13 20:41 -0500 Aditya Pakki o drm/nouveau: fix multiple instances of reference count leaks 2020-06-13 20:33 -0500 Aditya Pakki o drm/nouveau/drm/noveau: fix reference count leak in nouveau_fbcon_open 2020-06-13 21:21 -0500 Aditya Pakki │ o drm/radeon: Fix reference count leaks caused by pm_runtime_get_sync 2020-06-13 20:55 -0500 Aditya Pakki │ │ o drm/radeon: fix multiple reference count leak 2020-06-13 14:32 -0500 Qiushi Wu│ │ │ o drm/amdkfd: Fix reference count leaks. These ones look sane but maybe we should revert them all anyways. 2019-12-15 13:43 -0600 Aditya Pakki │ │ │ │ o drm: remove duplicate check on parent and avoid BUG_ON 2019-10-17 23:41 -0500 Kangjie Lu │ │ │ │ │ o drm/gma500: fix memory disclosures due to uninitialized bytes 2019-10-17 23:29 -0500 Kangjie Lu │ │ │ │ │ o gma/gma500: fix a memory disclosure bug due to uninitialized bytes 2019-03-24 18:16 -0500 Kangjie Lu │ │ │ │ │ │ o drm/v3d: fix a missing check of pm_runtime_get_sync 2019-03-08 22:36 -0600 Kangjie Lu │ │ │ │ │ │ │ o drm: vkms: check status of alloc_ordered_workqueue Ben, Alex can you line up reverts for next for all of the nouveau/amdgpu/radeon ones? Dave. ___ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
[git pull] drm fixes for 5.12 final
Hi Linus, Just some small i915 and amdgpu fixes this week, Should be all until you open the merge window. Regards, Dave. drm-fixes-2021-04-23: drm fixes for 5.12 final amdgpu: - Fix gpuvm page table update issue - Modifier fixes - Register fix for dimgrey cavefish i915: - GVT's BDW regression fix for cmd parser - Fix modesetting in case of unexpected AUX timeouts The following changes since commit bf05bf16c76bb44ab5156223e1e58e26dfe30a88: Linux 5.12-rc8 (2021-04-18 14:45:32 -0700) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2021-04-23 for you to fetch changes up to aca38735ae624b93c71c055b68d5802b8f356ea5: Merge tag 'drm-intel-fixes-2021-04-22' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes (2021-04-23 12:18:21 +1000) drm fixes for 5.12 final amdgpu: - Fix gpuvm page table update issue - Modifier fixes - Register fix for dimgrey cavefish i915: - GVT's BDW regression fix for cmd parser - Fix modesetting in case of unexpected AUX timeouts ---- Dave Airlie (2): Merge tag 'amd-drm-fixes-5.12-2021-04-21' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes Merge tag 'drm-intel-fixes-2021-04-22' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes Imre Deak (1): drm/i915: Fix modesetting in case of unexpected AUX timeouts Jiansong Chen (1): drm/amdgpu: fix GCR_GENERAL_CNTL offset for dimgrey_cavefish Philip Yang (1): drm/amdgpu: reserve fence slot to update page table Qingqing Zhuo (1): drm/amd/display: Update modifier list for gfx10_3 Rodrigo Vivi (1): Merge tag 'gvt-fixes-2021-04-20' of https://github.com/intel/gvt-linux into drm-intel-fixes Simon Ser (1): amd/display: allow non-linear multi-planar formats Zhenyu Wang (1): drm/i915/gvt: Fix BDW command parser regression drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c| 10 -- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c| 2 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 15 ++- drivers/gpu/drm/i915/display/intel_dp_link_training.c | 3 ++- drivers/gpu/drm/i915/gvt/cmd_parser.c | 19 +-- 5 files changed, 30 insertions(+), 19 deletions(-) ___ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v4] drm/doc/rfc: i915 DG1 uAPI
On Tue, 20 Apr 2021 at 02:45, Matthew Auld wrote: > > Add an entry for the new uAPI needed for DG1. Also add the overall > upstream plan, including some notes for the TTM conversion. > > v2(Daniel): > - include the overall upstreaming plan > - add a note for mmap, there are differences here for TTM vs i915 > - bunch of other suggestions from Daniel > v3: > (Daniel) > - add a note for set/get caching stuff > - add some more docs for existing query and extensions stuff > - add an actual code example for regions query > - bunch of other stuff > (Jason) > - uAPI change(!): > - try a simpler design with the placements extension > - rather than have a generic setparam which can cover multiple > use cases, have each extension be responsible for one thing > only > v4: > (Daniel) > - add some more notes for ttm conversion > - bunch of other stuff > (Jason) > - uAPI change(!): > - drop all the extra rsvd members for the region_query and > region_info, just keep the bare minimum needed for padding Staying out of the ioctl's being over engineering, I hope they have a good future use case. The plan seems like a good plan. Acked-by: Dave Airlie Dave. ___ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [Nouveau] [PATCH v4 00/17] drm: Use new DRM printk funcs (like drm_dbg_*()) in DP helpers
On Sat, 24 Apr 2021 at 04:43, Lyude Paul wrote: > > Since it's been asked quite a few times on some of the various DP > related patch series I've submitted to use the new DRM printk helpers, > and it technically wasn't really trivial to do this before due to the > lack of a consistent way to find a drm_device for an AUX channel, this > patch series aims to address this. In this series we: > > * (NEW! starting from V3) Make sure drm_dbg_*() and friends can handle > NULL drm device pointers > * Clean-up potentially erroneous usages of drm_dp_aux_init() and > drm_dp_aux_register() so that actual AUX registration doesn't happen > until we have an associated DRM device > * Clean-up any obvious errors in drivers we find along the way > * Add a backpointer to the respective drm_device for an AUX channel in > drm_dp_aux.drm_dev, and hook it up in every driver with an AUX channel > across the tree > * Add a new ratelimited print helper we'll need for converting the DP > helpers over to using the new DRM printk helpers > * Fix any inconsistencies with logging in drm_dp_helper.c so we always > have the aux channel name printed > * Prepare the various DP helpers so they can find the correct drm_device > to use for logging > * And finally, convert all of the DP helpers over to using drm_dbg_*() > and drm_err(). > > Major changes in v4: > * Don't move i2c aux init into drm_dp_aux_init(), since I think I've > found a much better solution to tegra's issues: > https://patchwork.freedesktop.org/series/89420/ I've given this a general once over, seems like a good plan and since it's mostly mechanical. for the series: Reviewed-by: Dave Airlie Dave. ___ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [Mesa-dev] [RFC] Linux Graphics Next: Explicit fences everywhere and no BO fences - initial proposal
On Tue, 27 Apr 2021 at 22:06, Christian König wrote: > > Correct, we wouldn't have synchronization between device with and without > user queues any more. > > That could only be a problem for A+I Laptops. Since I think you mentioned you'd only be enabling this on newer chipsets, won't it be a problem for A+A where one A is a generation behind the other? I'm not really liking where this is going btw, seems like a ill thought out concept, if AMD is really going down the road of designing hw that is currently Linux incompatible, you are going to have to accept a big part of the burden in bringing this support in to more than just amd drivers for upcoming generations of gpu. Dave. ___ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
[git pull] drm tegra-next + fixes for 5.13-rc1
Hi Linus, Looks like I missed a tegra feature request for next, but should still be fine since it's pretty self contained. It does contain one fixes->next merge with no merge justification so I've pushed back on Thierry about not doing that in the future, but let it go now as rebasing might be worse. Apart from that got a set of i915 and amdgpu fixes as per usual along with a few misc fixes. Dave. drm-next-2021-04-30: drm tegra-next + fixes for 5.13-rc1 tegra: - Tegra186 hardware cursor support - better capability reporting for different SoC - better framebuffer modifier support - host1x fixes ttm: - fix unswappable BO handling efifb: - check for PCI before using it amdgpu: - Fixes for Aldebaran - Display LTTPR fixes - eDP fixes - Fixes for Vangogh - RAS fixes - ASPM support - Renoir SMU fixes - Modifier fixes - Misc code cleanups - Freesync fixes i915: - Several fixes to GLK handling in recent display refactoring - Rare watchdog timer race fix - Cppcheck redundant condition fix - Overlay error code propagation fix - Documentation fix - gvt: Remove one unused function warning - gvt: Fix intel_gvt_init_device() return type - gvt: Remove one duplicated register accessible check The following changes since commit a1a1ca70deb3ec600eeabb21de7f3f48aaae5695: Merge tag 'drm-misc-next-fixes-2021-04-22' of git://anongit.freedesktop.org/drm/drm-misc into drm-next (2021-04-23 13:53:07 +1000) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/drm-next-2021-04-30 for you to fetch changes up to 1cd6b4a04f038eb24fd18c8010e763d1140a9c7a: Merge tag 'drm-intel-next-fixes-2021-04-27' of git://anongit.freedesktop.org/drm/drm-intel into drm-next (2021-04-30 10:42:03 +1000) drm tegra-next + fixes for 5.13-rc1 tegra: - Tegra186 hardware cursor support - better capability reporting for different SoC - better framebuffer modifier support - host1x fixes ttm: - fix unswappable BO handling efifb: - check for PCI before using it amdgpu: - Fixes for Aldebaran - Display LTTPR fixes - eDP fixes - Fixes for Vangogh - RAS fixes - ASPM support - Renoir SMU fixes - Modifier fixes - Misc code cleanups - Freesync fixes i915: - Several fixes to GLK handling in recent display refactoring - Rare watchdog timer race fix - Cppcheck redundant condition fix - Overlay error code propagation fix - Documentation fix - gvt: Remove one unused function warning - gvt: Fix intel_gvt_init_device() return type - gvt: Remove one duplicated register accessible check Alex Deucher (1): drm/amdgpu/gmc9: remove dummy read workaround for newer chips Anthony Koo (3): drm/amd/display: [FW Promotion] Release 0.0.60 drm/amd/display: [FW Promotion] Release 0.0.61 drm/amd/display: [FW Promotion] Release 0.0.62 Anthony Wang (3): drm/amd/display: Force vsync flip when reconfiguring MPCC drm/amd/display: Add DSC check to seamless boot validation drm/amd/display: disable seamless boot for external DP Aric Cyr (3): drm/amd/display: 3.2.131 drm/amd/display: Fix FreeSync when RGB MPO in use drm/amd/display: 3.2.132 Bing Guo (1): drm/amd/display: add helper for enabling mst stream features Dan Carpenter (4): drm/i915/gvt: Fix error code in intel_gvt_init_device() drm/amdgpu: fix an error code in init_pmu_entry_by_type_and_add() drm/amd/pm: fix error code in smu_set_power_limit() drm/i915: fix an error code in intel_overlay_do_put_image() Dave Airlie (4): Merge tag 'drm/tegra/for-5.13-rc1' of ssh://git.freedesktop.org/git/tegra/linux into drm-next Merge tag 'drm-misc-next-fixes-2021-04-29' of git://anongit.freedesktop.org/drm/drm-misc into drm-next Merge tag 'amd-drm-next-5.13-2021-04-23' of https://gitlab.freedesktop.org/agd5f/linux into drm-next Merge tag 'drm-intel-next-fixes-2021-04-27' of git://anongit.freedesktop.org/drm/drm-intel into drm-next David Galiffi (1): drm/amd/display: Fixed typo in function name. Dennis Li (2): drm/amdkfd: add edc error interrupt handle for poison propogate mode drm/amdgpu: fix a error injection failed issue Dillon Varone (2): drm/amd/display: Fix call to pass bpp in 16ths of a bit drm/amd/display: Report Proper Quantization Range in AVI Infoframe Dingchen (David) Zhang (2): drm/amd/display: update hdcp display using correct CP type. drm/amd/display: add handling for hdcp2 rx id list validation Eric Huang (1): drm/amdkfd: change MTYPEs for Aldebaran's HW requirement Felix Kuehling (1): drm/amdkfd: Remove legacy code not acquiring VMs Harry Wentland (1): drm/amd/display: Add debugfs to repress HPD and HPR_RX IRQs Hawking Zhang (3): drm/amdgpu: correct default gfx wdt timeout setting drm/
[git pull] drm fixes for 5.14-rc5
Hi Linus, Regular weekly fixes pull, live from a Brisbane lockdown with kids at home. A big bunch of scattered amdgpu fixes, but they are all pretty small, minor i915 fixes, kmb, and one vmwgfx regression fixes, all pretty quiet for this time. Dave. drm-fixes-2021-08-06: drm fixes for 5.14-rc5 amdgpu: - Fix potential out-of-bounds read when updating GPUVM mapping - Renoir powergating fix - Yellow Carp updates - 8K fix for navi1x - Beige Goby updates and new DIDs - Fix DMUB firmware version output - EDP fix - pmops config fix i915: - Call i915_globals_exit if pci_register_device fails - (follow on fix for section mismatch) - Correct SFC_DONE register offset kmb: - DMA fix - driver date/version macros vmwgfx: - Fix I/O memory access on 64-bit systems The following changes since commit c500bee1c5b2f1d59b1081ac879d73268ab0ff17: Linux 5.14-rc4 (2021-08-01 17:04:17 -0700) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2021-08-06 for you to fetch changes up to d186f9c28008810d8f984d6bdd1c07757048ed63: Merge tag 'amd-drm-fixes-5.14-2021-08-05' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes (2021-08-06 11:22:09 +1000) drm fixes for 5.14-rc5 amdgpu: - Fix potential out-of-bounds read when updating GPUVM mapping - Renoir powergating fix - Yellow Carp updates - 8K fix for navi1x - Beige Goby updates and new DIDs - Fix DMUB firmware version output - EDP fix - pmops config fix i915: - Call i915_globals_exit if pci_register_device fails - (follow on fix for section mismatch) - Correct SFC_DONE register offset kmb: - DMA fix - driver date/version macros vmwgfx: - Fix I/O memory access on 64-bit systems Bing Guo (2): drm/amd/display: Fix Dynamic bpp issue with 8K30 with Navi 1X drm/amd/display: Increase stutter watermark for dcn303 Chengming Gui (1): drm/amdgpu: add DID for beige goby Dave Airlie (3): Merge tag 'drm-misc-fixes-2021-08-04' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes Merge tag 'drm-intel-fixes-2021-08-04' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes Merge tag 'amd-drm-fixes-5.14-2021-08-05' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes Edmund Dea (2): drm/kmb: Enable LCD DMA for low TVDDCV drm/kmb: Define driver date and major/minor version Jason Ekstrand (1): drm/i915: Call i915_globals_exit() if pci_register_device() fails Jude Shih (1): drm/amd/display: Fix resetting DCN3.1 HW when resuming from S4 Matt Roper (1): drm/i915: Correct SFC_DONE register offset Qingqing Zhuo (1): drm/amd/display: workaround for hard hang on HPD on native DP Randy Dunlap (2): drm/i915: fix i915_globals_exit() section mismatch error drm/amdgpu: fix checking pmops when PM_SLEEP is not enabled Shirish S (1): drm/amdgpu/display: fix DMUB firmware version info Wesley Chalmers (1): drm/amd/display: Assume LTTPR interop for DCN31+ Xiaomeng Hou (1): drm/amd/pm: update yellow carp pmfw interface version Yifan Zhang (1): drm/amdgpu: fix the doorbell missing when in CGPG issue for renoir. Zack Rusin (1): drm/vmwgfx: Fix a 64bit regression on svga3 xinhui pan (1): drm/amdgpu: Fix out-of-bounds read when update mapping drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c| 7 +++ drivers/gpu/drm/amd/amdgpu/amdgpu_res_cursor.h | 3 ++- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 21 - drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +- .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 4 +++- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 21 ++--- drivers/gpu/drm/amd/display/dc/dc.h| 2 ++ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c | 2 +- .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 20 .../drm/amd/display/dc/dcn303/dcn303_resource.c| 4 ++-- .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 16 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c | 8 +--- drivers/gpu/drm/amd/pm/inc/smu_v13_0.h | 2 +- drivers/gpu/drm/i915/i915_globals.c| 4 ++-- drivers/gpu/drm/i915/i915_pci.c| 1 + drivers/gpu/drm/i915/i915_reg.h| 2 +- drivers/gpu/drm/kmb/kmb_drv.c | 22 ++ drivers/gpu/drm/kmb/kmb_drv.h | 5 + drivers/gpu/drm/kmb/kmb_plane.c| 15 +-- drivers/gpu/drm/vmwgfx/vmwgfx_drv.h| 2 +- 21 files changed, 124 insertions(+), 41 deletions(-)
missing signoff on drm-intel-gt-next pull
dim: db47fe727e1f ("drm/i915/step:
s/_revid_tbl/_revids"): committer Signed-off-by
missing.
I'm not sure how much pain it is to fix that up, but
commit db47fe727e1fc516cf60fc9ab8299605ef3c2d54
Author: Anusha Srivatsa
Commit: Matt Roper
drm/i915/step: s/_revid_tbl/_revids
Simplify the stepping info array name.
Cc: Jani Nikula
Signed-off-by: Anusha Srivatsa
Reviewed-by: Jani Nikula
Link:
https://patchwork.freedesktop.org/patch/msgid/20210713193635.3390052-2-matthew.d.ro...@intel.com
It's definitely missing an S-o-b by anyone who handled the patch.
Let me know if it's insanely painful to fix that.
Dave.
Re: missing signoff on drm-intel-gt-next pull
On Wed, 11 Aug 2021 at 17:11, Jani Nikula wrote:
>
> On Wed, 11 Aug 2021, Joonas Lahtinen wrote:
> > Quoting Dave Airlie (2021-08-11 06:48:39)
> >> dim: db47fe727e1f ("drm/i915/step:
> >> s/_revid_tbl/_revids"): committer Signed-off-by
> >> missing.
> >>
> >> I'm not sure how much pain it is to fix that up, but
> >> commit db47fe727e1fc516cf60fc9ab8299605ef3c2d54
> >> Author: Anusha Srivatsa
> >> Commit: Matt Roper
> >>
> >> drm/i915/step: s/_revid_tbl/_revids
> >>
> >> Simplify the stepping info array name.
> >>
> >> Cc: Jani Nikula
> >> Signed-off-by: Anusha Srivatsa
> >> Reviewed-by: Jani Nikula
> >> Link:
> >> https://patchwork.freedesktop.org/patch/msgid/20210713193635.3390052-2-matthew.d.ro...@intel.com
> >>
> >> It's definitely missing an S-o-b by anyone who handled the patch.
> >>
> >> Let me know if it's insanely painful to fix that.
> >
> > Added you to the earlier mail thread that discussed the incident.
> >
> > There are now 277 patches on top of that patch, so means rebasing all of
> > those and changing the hashes and trying to fixup all the Fixes:.
> >
> > So it's painful but not insanely so. Let me know if you want the tree
> > rebased.
> >
> > Regards, Joonas
>
> The commit came in via a topic branch also to drm-intel-next, so that's
> another 168 commits to rebase. There's a lot of people working on top of
> those trees, so I'm leaning on the very painful side.
Okay I think we can let that one slide. Having an S-o-b by someone in
the org on it is also technically enough for legal purposes anyways.
I'll finish the pulls from both trees tomorrow.
Thanks,
Dave.
[git pull] drm fixes for 5.14-rc6
Hey Linus, Another week, another set of pretty regular fixes, nothing really stands out too much. Dave. drm-fixes-2021-08-13: drm fixes for 5.14-rc6 amdgpu: - Yellow carp update - RAS EEPROM fixes - BACO/BOCO fixes - Fix a memory leak in an error path - Freesync fix - VCN harvesting fix - Display fixes i915: - GVT fix for Windows VM hang. - Display fix of 12 BPC bits for display 12 and newer. - Don't try to access some media register for fused off domains. - Fix kerneldoc build warnings. mediatek: - Fix dpi bridge bug. - Fix cursor plane no update. meson: - Fix colors when booting with HDR The following changes since commit 36a21d51725af2ce0700c6ebcb6b9594aac658a6: Linux 5.14-rc5 (2021-08-08 13:49:31 -0700) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2021-08-13 for you to fetch changes up to a1fa72683166b3c69511d5f2ffb37b9f49f48fea: Merge tag 'drm-misc-fixes-2021-08-12' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes (2021-08-13 06:37:40 +1000) drm fixes for 5.14-rc6 amdgpu: - Yellow carp update - RAS EEPROM fixes - BACO/BOCO fixes - Fix a memory leak in an error path - Freesync fix - VCN harvesting fix - Display fixes i915: - GVT fix for Windows VM hang. - Display fix of 12 BPC bits for display 12 and newer. - Don't try to access some media register for fused off domains. - Fix kerneldoc build warnings. mediatek: - Fix dpi bridge bug. - Fix cursor plane no update. meson: - Fix colors when booting with HDR Alex Deucher (2): drm/amdgpu: don't enable baco on boco platforms in runpm drm/amdgpu: handle VCN instances when harvesting (v2) Ankit Nautiyal (1): drm/i915/display: Fix the 12 BPC bits for PIPE_MISC reg Anson Jacob (1): drm/amd/display: use GFP_ATOMIC in amdgpu_dm_irq_schedule_work Christian Hewitt (1): drm/meson: fix colour distortion from HDR set during vendor u-boot Christophe JAILLET (1): drm/amd/pm: Fix a memory leak in an error handling path in 'vangogh_tables_init()' Daniel Vetter (1): drm/doc/rfc: drop lmem uapi section Dave Airlie (4): Merge tag 'mediatek-drm-fixes-5.14' of https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux into drm-fixes Merge tag 'amd-drm-fixes-5.14-2021-08-11' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes Merge tag 'drm-intel-fixes-2021-08-12' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes Merge tag 'drm-misc-fixes-2021-08-12' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes Eric Bernstein (1): drm/amd/display: Remove invalid assert for ODM + MPC case Frank Wunderlich (1): drm/mediatek: dpi: Fix NULL dereference in mtk_dpi_bridge_atomic_check Hsin-Yi Wang (1): drm/mediatek: mtk-dpi: Set out_fmt from config if not the last bridge John Clements (1): drm/amdgpu: set RAS EEPROM address from VBIOS Kenneth Feng (1): drm/amd/pm: bug fix for the runtime pm BACO Matt Roper (1): drm/i915: Only access SFC_DONE when media domain is not fused off Rodrigo Vivi (1): Merge tag 'gvt-fixes-2021-08-10' of https://github.com/intel/gvt-linux into drm-intel-fixes Solomon Chiu (1): drm/amdgpu: Add preferred mode in modeset when freesync video mode's enabled. Xiaomeng Hou (1): drm/amd/pm: update smu v13.0.1 firmware header Zhenyu Wang (1): drm/i915/gvt: Fix cached atomics setting for Windows VM jason-jh.lin (1): drm/mediatek: Fix cursor plane no update Documentation/gpu/rfc/i915_gem_lmem.rst| 109 - drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 40 drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 12 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c| 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 4 + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 7 +- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 2 +- .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 1 - drivers/gpu/drm/amd/include/atomfirmware.h | 2 +- drivers/gpu/drm/amd/pm/inc/smu_v13_0_1_pmfw.h | 4 +- .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c| 3 +- drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 2 +- drivers/gpu/drm/i915/display/intel_display.c | 34 +-- drivers/gpu/drm/i915/gvt/handlers.c| 1 + drivers/gpu/drm/i915/gvt/mmio_context.c| 2 + drivers/gpu/drm/i915/i915_gpu_error.c | 19 +++- drivers/gpu/drm/i915/i915_reg.h| 16 ++- drivers/gpu/drm/mediatek/mtk_dpi.c | 6 +- drivers/gpu/drm/mediatek/mtk_drm_crtc.c| 3 - dr
Re: [GIT PULL] mediatek drm next for 5.15
CC [M] drivers/gpu/drm/mediatek/mtk_disp_aal.o /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/mediatek/mtk_drm_crtc.c:257:13: warning: ‘mtk_drm_cmdq_pkt_destroy’ defined but not used [-Wunused-function] 257 | static void mtk_drm_cmdq_pkt_destroy(struct mbox_chan *chan, struct cmdq_pkt *pkt) | ^~~~ /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/mediatek/mtk_drm_crtc.c:229:12: warning: ‘mtk_drm_cmdq_pkt_create’ defined but not used [-Wunused-function] 229 | static int mtk_drm_cmdq_pkt_create(struct mbox_chan *chan, struct cmdq_pkt *pkt, |^~~ LD [M] drivers/gpu/drm/mediatek/mediatek-drm.o Warning when built with CONFIG_MTK_CMDQ turned off. Can you please fix that and resend? Dave. On Mon, 16 Aug 2021 at 09:55, Chun-Kuang Hu wrote: > > Hi, Dave & Daniel: > > This includes: > > 1. MT8133 AAL support, adjust rdma fifo threshold formula. > 2. Implement mmap as GEM object function. > 3. Add support for MT8167. > 4. Test component initialization earlier in the function mtk_drm_crtc_create. > 5. CMDQ refinement. > > Regards, > Chun-Kuang. > > > The following changes since commit e73f0f0ee7541171d89f2e2491130c7771ba58d3: > > Linux 5.14-rc1 (2021-07-11 15:07:40 -0700) > > are available in the Git repository at: > > https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux.git > tags/mediatek-drm-next-5.15 > > for you to fetch changes up to 6e7dcd92644baebdb137e3af900064ceebcaca23: > > drm/mediatek: Clear pending flag when cmdq packet is done (2021-08-12 > 08:16:24 +0800) > > > Mediatek DRM Next for Linux 5.15 > > 1. MT8133 AAL support, adjust rdma fifo threshold formula. > 2. Implement mmap as GEM object function. > 3. Add support for MT8167. > 4. Test component initialization earlier in the function mtk_drm_crtc_create. > 5. CMDQ refinement. > > > Chun-Kuang Hu (4): > drm/mediatek: Use mailbox rx_callback instead of cmdq_task_cb > drm/mediatek: Remove struct cmdq_client > drm/mediatek: Detect CMDQ execution timeout > drm/mediatek: Add cmdq_handle in mtk_crtc > > Dafna Hirschfeld (1): > drm/mediatek: Test component initialization earlier in the function > mtk_drm_crtc_create > > Fabien Parent (2): > dt-bindings: display: mediatek: dsi: add documentation for MT8167 SoC > drm/mediatek: Add support for main DDP path on MT8167 > > Thomas Zimmermann (1): > drm/mediatek: Implement mmap as GEM object function > > Yongqiang Niu (4): > drm/mediatek: Adjust rdma fifo threshold calculate formula > drm/mediatek: Separate aal sub driver > drm/mediatek: Add mt8183 aal support > drm/mediatek: Clear pending flag when cmdq packet is done > > .../bindings/display/mediatek/mediatek,dsi.txt | 2 +- > drivers/gpu/drm/mediatek/Makefile | 3 +- > drivers/gpu/drm/mediatek/mtk_disp_aal.c| 167 > drivers/gpu/drm/mediatek/mtk_disp_drv.h| 9 ++ > drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 6 +- > drivers/gpu/drm/mediatek/mtk_drm_crtc.c| 173 > + > drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c| 42 + > drivers/gpu/drm/mediatek/mtk_drm_drv.c | 59 +-- > drivers/gpu/drm/mediatek/mtk_drm_drv.h | 1 + > drivers/gpu/drm/mediatek/mtk_drm_gem.c | 44 ++ > drivers/gpu/drm/mediatek/mtk_drm_gem.h | 3 - > 11 files changed, 386 insertions(+), 123 deletions(-) > create mode 100644 drivers/gpu/drm/mediatek/mtk_disp_aal.c
[git pull] drm fixes for 5.14-rc7
Hi Linus, Regularly scheduled fixes. The ttm one solves a problem of GPU drivers failing to load if debugfs is off in Kconfig, otherwise the i915 and mediatek, and amdgpu fixes all fairly normal. nouveau has a couple of display fixes, but it has a fix for a longstanding race condition in it's memory manager code, and the fix mostly removes some code that wasn't working properly and has no userspace users. This fix makes the diffstat kinda larger but in a negative way. Let me know if any problems, Dave. drm-fixes-2021-08-20-3: drm fixes for 5.14-rc7 core: - fix drm_wait_vblank uapi copying bug ttm: - fix debugfs init when debugfs is off amdgpu: - vega10 SMU workload fix - DCN VM fix - DCN 3.01 watermark fix amdkfd: - SVM fix nouveau: - ampere display fixes - remove MM misfeature to fix a longstanding race condition i915: - tweaked display workaround for all PCHs - eDP MSO pipe sanity for ADL-P fix - remove unused symbol export mediatek: - AAL output size setting - Delete component in remove function The following changes since commit 7c60610d476766e128cc4284bb6349732cbd6606: Linux 5.14-rc6 (2021-08-15 13:40:53 -1000) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2021-08-20-3 for you to fetch changes up to daa7772d477ec658dc1fd9127549a7996d8e0c2b: Merge tag 'amd-drm-fixes-5.14-2021-08-18' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes (2021-08-20 15:13:56 +1000) drm fixes for 5.14-rc7 core: - fix drm_wait_vblank uapi copying bug ttm: - fix debugfs init when debugfs is off amdgpu: - vega10 SMU workload fix - DCN VM fix - DCN 3.01 watermark fix amdkfd: - SVM fix nouveau: - ampere display fixes - remove MM misfeature to fix a longstanding race condition i915: - tweaked display workaround for all PCHs - eDP MSO pipe sanity for ADL-P fix - remove unused symbol export mediatek: - AAL output size setting - Delete component in remove function Anshuman Gupta (1): drm/i915: Tweaked Wa_14010685332 for all PCHs Ben Skeggs (6): drm/nouveau: recognise GA107 drm/nouveau/disp: power down unused DP links during init drm/nouveau/kms/nv50: workaround EFI GOP window channel format differences drm/nouveau/fifo/nv50-: rip out dma channels drm/nouveau: block a bunch of classes from userspace drm/nouveau: rip out nvkm_client.super Dan Moulding (1): drm: ttm: Don't bail from ttm_global_init if debugfs_create_dir fails Dave Airlie (5): Merge tag 'drm-misc-fixes-2021-08-18' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes Merge branch 'linux-5.14' of git://github.com/skeggsb/linux into drm-fixes Merge tag 'drm-intel-fixes-2021-08-18' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes Merge tag 'mediatek-drm-fixes-5.14-2' of https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux into drm-fixes Merge tag 'amd-drm-fixes-5.14-2021-08-18' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes Jake Wang (1): drm/amd/display: Ensure DCN save after VM setup Jani Nikula (2): drm/i915/edp: fix eDP MSO pipe sanity checks for ADL-P drm/i915/dp: remove superfluous EXPORT_SYMBOL() Kenneth Feng (2): Revert "drm/amd/pm: fix workload mismatch on vega10" drm/amd/pm: change the workload type for some cards Mark Yacoub (1): drm: Copy drm_wait_vblank to user before returning Yifan Zhang (1): drm/amdkfd: fix random KFDSVMRangeTest.SetGetAttributesTest test failure Zhan Liu (1): drm/amd/display: Use DCN30 watermark calc for DCN301 jason-jh.lin (2): drm/mediatek: Add AAL output size configuration drm/mediatek: Add component_del in OVL and COLOR remove function drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 8 ++ drivers/gpu/drm/amd/display/dc/core/dc.c | 6 ++ drivers/gpu/drm/amd/display/dc/core/dc_vm_helper.c | 3 + drivers/gpu/drm/amd/display/dc/dc.h| 1 + .../drm/amd/display/dc/dcn301/dcn301_resource.c| 96 +- drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c | 12 +++ drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.h | 1 + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_init.c | 1 + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 1 + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h| 5 ++ .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 15 +++- drivers/gpu/drm/drm_ioc32.c| 4 +- drivers/gpu/drm/i915/display/intel_ddi.c | 24 +++--- drivers/gpu/drm/i915/display/intel_display_power.c | 16 ++-- .../gpu/drm/i915/display/intel_dp_link_training.c | 1 - drivers/gpu/drm/i915/i915_irq.c| 21 - drivers/gpu/drm/mediatek/mtk_disp_color.
Re: [RFC] Make use of non-dynamic dmabuf in RDMA
On Wed, 25 Aug 2021 at 03:36, John Hubbard wrote: > > On 8/24/21 10:32 AM, Jason Gunthorpe wrote: > ... > >>> And yes at least for the amdgpu driver we migrate the memory to host > >>> memory as soon as it is pinned and I would expect that other GPU drivers > >>> do something similar. > >> > >> Well...for many topologies, migrating to host memory will result in a > >> dramatically slower p2p setup. For that reason, some GPU drivers may > >> want to allow pinning of video memory in some situations. > >> > >> Ideally, you've got modern ODP devices and you don't even need to pin. > >> But if not, and you still hope to do high performance p2p between a GPU > >> and a non-ODP Infiniband device, then you would need to leave the pinned > >> memory in vidmem. > >> > >> So I think we don't want to rule out that behavior, right? Or is the > >> thinking more like, "you're lucky that this old non-ODP setup works at > >> all, and we'll make it work by routing through host/cpu memory, but it > >> will be slow"? > > > > I think it depends on the user, if the user creates memory which is > > permanently located on the GPU then it should be pinnable in this way > > without force migration. But if the memory is inherently migratable > > then it just cannot be pinned in the GPU at all as we can't > > indefinately block migration from happening eg if the CPU touches it > > later or something. > > > > OK. I just want to avoid creating any API-level assumptions that dma_buf_pin() > necessarily implies or requires migrating to host memory. I'm not sure we should be allowing dma_buf_pin at all on non-migratable memory, what's to stop someone just pinning all the VRAM and making the GPU unuseable? I understand not considering more than a single user in these situations is enterprise thinking, but I do worry about pinning is always fine type of thinking when things are shared or multi-user. My impression from this is we've designed hardware that didn't consider the problem, and now to let us use that hardware in horrible ways we should just allow it to pin all the things. Dave.
[git pull] drm fixes for 5.14-rc8/final
Hi Linus, Last set of fixes for 5.14, nothing major a couple of i915, couple of imx and a few amdgpu. All pretty small. Dave. drm-fixes-2021-08-27: drm fixes for 5.14-rc8/final i915: - Fix syncmap memory leak - Drop redundant display port debug print amdgpu: - Fix for pinning display buffers multiple times - Fix delayed work handling for GFXOFF - Fix build when CONFIG_SUSPEND is not set imx: - fix planar offset calculations - fix accidental partial revert The following changes since commit e22ce8eb631bdc47a4a4ea7ecf4e4ba499db4f93: Linux 5.14-rc7 (2021-08-22 14:24:56 -0700) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2021-08-27 for you to fetch changes up to 9fe4f5a24fdac99c484daf29eded9c6685fa2020: Merge tag 'imx-drm-fixes-2021-08-18' of git://git.pengutronix.de/pza/linux into drm-fixes (2021-08-27 10:49:53 +1000) drm fixes for 5.14-rc8/final i915: - Fix syncmap memory leak - Drop redundant display port debug print amdgpu: - Fix for pinning display buffers multiple times - Fix delayed work handling for GFXOFF - Fix build when CONFIG_SUSPEND is not set imx: - fix planar offset calculations - fix accidental partial revert Borislav Petkov (1): drm/amdgpu: Fix build with missing pm_suspend_target_state module export Christian König (1): drm/amdgpu: use the preferred pin domain after the check Dave Airlie (3): Merge tag 'drm-intel-fixes-2021-08-26' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes Merge tag 'amd-drm-fixes-5.14-2021-08-25' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes Merge tag 'imx-drm-fixes-2021-08-18' of git://git.pengutronix.de/pza/linux into drm-fixes Krzysztof Hałasa (1): gpu: ipu-v3: Fix i.MX IPU-v3 offset calculations for (semi)planar U/V formats Matthew Brost (1): drm/i915: Fix syncmap memory leak Michel Dänzer (1): drm/amdgpu: Cancel delayed work when GFXOFF is disabled Philipp Zabel (1): drm/imx: ipuv3-plane: fix accidental partial revert of 8 pixel alignment fix Swati Sharma (1): drm/i915/dp: Drop redundant debug print drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 11 + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c| 36 +- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 10 - drivers/gpu/drm/i915/display/intel_dp.c| 9 ++-- drivers/gpu/drm/i915/gt/intel_timeline.c | 9 drivers/gpu/drm/imx/ipuv3-plane.c | 2 +- drivers/gpu/ipu-v3/ipu-cpmem.c | 30 - 8 files changed, 63 insertions(+), 46 deletions(-)
[git pull] drm fixes for 5.12-rc4
Hi Linus, Regular fixes pull, pretty small set of fixes, a couple of i915 and amdgpu, one ttm, one nouveau and one omap. Probably smaller than usual for this time, so we'll see if something pops up next week or if this will continue to stay small. Dave. drm-fixes-2021-03-19: drm fixes for 5.12-rc4 ttm: - Make ttm_bo_unpin() not wraparound on too many unpins. omap: - Fix coccicheck warning in omap. amdgpu: - DCN 3.0 gamma fixes - DCN 2.1 corrupt screen fix i915: - Workaround async flip + VT-d frame corruption on HSW/BDW - Fix NMI watchdog crash due to uninitialized OA buffer use on gen12+ nouveau: - workaround oops with bo syncing The following changes since commit 1e28eed17697bcf343c6743f0028cc3b5dd88bf0: Linux 5.12-rc3 (2021-03-14 14:41:02 -0700) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2021-03-19 for you to fetch changes up to e94c55b8e0a0bbe9a026250cf31e2fa45957d776: nouveau: Skip unvailable ttm page entries (2021-03-19 10:38:31 +1000) drm fixes for 5.12-rc4 ttm: - Make ttm_bo_unpin() not wraparound on too many unpins. omap: - Fix coccicheck warning in omap. amdgpu: - DCN 3.0 gamma fixes - DCN 2.1 corrupt screen fix i915: - Workaround async flip + VT-d frame corruption on HSW/BDW - Fix NMI watchdog crash due to uninitialized OA buffer use on gen12+ nouveau: - workaround oops with bo syncing Calvin Hou (1): drm/amd/display: Correct algorithm for reversed gamma Christian König (1): drm/ttm: make ttm_bo_unpin more defensive Dave Airlie (3): Merge tag 'drm-misc-fixes-2021-03-18' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes Merge tag 'amd-drm-fixes-5.12-2021-03-18' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes Merge tag 'drm-intel-fixes-2021-03-18' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes Dillon Varone (1): drm/amd/display: Remove MPC gamut remap logic for DCN30 Junlin Yang (1): drm/omap: dsi: fix unsigned expression compared with zero Sung Lee (1): drm/amd/display: Copy over soc values before bounding box creation Tobias Klausmann (1): nouveau: Skip unvailable ttm page entries Umesh Nerlige Ramappa (1): i915/perf: Start hrtimer only if sampling the OA buffer Ville Syrjälä (1): drm/i915: Workaround async flip + VT-d corruption on HSW/BDW drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 34 ++ .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 5 .../gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.c | 26 - drivers/gpu/drm/i915/i915_perf.c | 13 - drivers/gpu/drm/i915/i915_reg.h| 23 ++- drivers/gpu/drm/i915/intel_pm.c| 16 +- drivers/gpu/drm/nouveau/nouveau_bo.c | 8 + drivers/gpu/drm/omapdrm/dss/dsi.c | 7 +++-- include/drm/ttm/ttm_bo_api.h | 6 ++-- 9 files changed, 83 insertions(+), 55 deletions(-) ___ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [Intel-gfx] [PATCH 1/2] drm/i915: add gem/gt TODO
On Tue, 23 Mar 2021 at 23:17, Daniel Vetter wrote: > > On Tue, Mar 23, 2021 at 09:44:52AM +0100, Daniel Vetter wrote: > > We've discussed a bit how to get the gem/gt team better integrated > > and collaborate more with the wider community and agreed to the > > following: > > > > - all gem/gt patches are reviewed on dri-devel for now. That's > > overkill, but in the past there was definitely too little of that. > > > > - i915-gem folks are encouraged to cross review core patches from > > other teams > > > > - big features (especially uapi changes) need to be discussed in an > > rfc patch that documents the interface and big picture design, > > before we get lost in the details of the code > > > > - Also a rough TODO (can be refined as we go ofc) to get gem/gt back > > on track, like we've e.g. done with DAL/DC to get that in shape. I think we mentioned in the past about having better annotations for dma_fence critical sections, Otherwise I think this is a great list to get us out of the woods and seeing how to move forward again. Dave. ___ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [Intel-gfx] [PATCH 2/2] drm/doc: Add RFC section
On Tue, 23 Mar 2021 at 18:45, Daniel Vetter wrote: > > Motivated by the pre-review process for i915 gem/gt features, but > probably useful in general for complex stuff. > > Cc: Jani Nikula > Cc: Joonas Lahtinen > Cc: Rodrigo Vivi > Cc: Jason Ekstrand > Cc: Dave Airlie > Signed-off-by: Daniel Vetter Let's give it a try, I do like the future ideas of doing things with gitlab issues as well. Acked-by: Dave Airlie > --- > Documentation/gpu/index.rst | 1 + > Documentation/gpu/rfc.rst | 16 > 2 files changed, 17 insertions(+) > create mode 100644 Documentation/gpu/rfc.rst > > diff --git a/Documentation/gpu/index.rst b/Documentation/gpu/index.rst > index c9a51e3bfb5a..df58cb826d68 100644 > --- a/Documentation/gpu/index.rst > +++ b/Documentation/gpu/index.rst > @@ -16,6 +16,7 @@ Linux GPU Driver Developer's Guide > vga-switcheroo > vgaarbiter > todo > + rfc > > .. only:: subproject and html > > diff --git a/Documentation/gpu/rfc.rst b/Documentation/gpu/rfc.rst > new file mode 100644 > index ..9d0ff2921af8 > --- /dev/null > +++ b/Documentation/gpu/rfc.rst > @@ -0,0 +1,16 @@ > +=== > +GPU RFC Section > +=== > + > +For complex work, especially new uapi, it is often good to nail the high > level > +design issues before getting lost in the code details. This section is meant > to > +host such documentation: > + > +* Each RFC should be a section in this file, explaining the goal and main > design > + considerations. > + > +* For uapi structures add a file to this directory with and then pull the > + kerneldoc in like with real uapi headers. > + > +* Once the code has landed move all the documentation to the right places in > + the main core, helper or driver sections. > -- > 2.31.0 > > ___ > Intel-gfx mailing list > intel-...@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx ___ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
[git pull] drm fixes for 5.12-rc5
Hi Linus, As expected last week things were overly quiet so this week things seem to have caught up. It still isn't too major. msm and amdgpu lead the size here, the msm fixes are pretty varied across the driver, the amdgpu one is mostly the S0ix fixes with some other minor ones. Otherwise there are a few i915 fixes and one each for nouveau, etnaviv and rcar-du. Dave. drm-fixes-2021-03-26: drm fixes for 5.12-rc5 msm: - pll fixes - shutdown hook fix - runtime resume fix - clear_oob fix - kms locking fix - display aux retry fix rcar-du: - warn_on in encoder init fix etnaviv: - Use FOLL_FORCE and FOLL_LONGTERM i915: - DisplayPort LTTPR fixes around link training and limiting it according to supported spec version. - Fix enabled_planes bitmask to really represent only logically enabled planes. - Fix DSS CTL registers for ICL DSI transcoders - Fix the GT fence revocation runtime PM logic. nouveau: - cursor size regression fix amdgpu: - S0ix fixes - Add PCI ID - Polaris PCIe DPM fix - Display fix for high refresh rate monitors The following changes since commit 0d02ec6b3136c73c09e7859f0d0e4e2c4c07b49b: Linux 5.12-rc4 (2021-03-21 14:56:43 -0700) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2021-03-26 for you to fetch changes up to 09d78dde88ef95a27b54a6e450ee700ccabdf39d: Merge tag 'drm-msm-fixes-2021-02-25' of https://gitlab.freedesktop.org/drm/msm into drm-fixes (2021-03-26 13:04:17 +1000) drm fixes for 5.12-rc5 msm: - pll fixes - shutdown hook fix - runtime resume fix - clear_oob fix - kms locking fix - display aux retry fix rcar-du: - warn_on in encoder init fix etnaviv: - Use FOLL_FORCE and FOLL_LONGTERM i915: - DisplayPort LTTPR fixes around link training and limiting it according to supported spec version. - Fix enabled_planes bitmask to really represent only logically enabled planes. - Fix DSS CTL registers for ICL DSI transcoders - Fix the GT fence revocation runtime PM logic. nouveau: - cursor size regression fix amdgpu: - S0ix fixes - Add PCI ID - Polaris PCIe DPM fix - Display fix for high refresh rate monitors Alex Deucher (11): drm/amdgpu: rework S3/S4/S0ix state handling drm/amdgpu: don't evict vram on APUs for suspend to ram (v4) drm/amdgpu: clean up non-DC suspend/resume handling drm/amdgpu: move s0ix check into amdgpu_device_ip_suspend_phase2 (v3) drm/amdgpu: re-enable suspend phase 2 for S0ix drm/amdgpu/swsmu: skip gfx cgpg on s0ix suspend drm/amdgpu: update comments about s0ix suspend/resume drm/amdgpu: drop S0ix checks around CG/PG in suspend drm/amdgpu: skip kfd suspend/resume for S0ix drm/amdgpu: Add additional Sienna Cichlid PCI ID drm/amdgpu/display: restore AUX_DPHY_TX_CONTROL for DCN2.x Daniel Vetter (2): drm/etnaviv: Use FOLL_FORCE for userptr drm/etnaviv: User FOLL_LONGTERM in userptr Dave Airlie (6): Merge tag 'du-fixes-20210316' of git://linuxtv.org/pinchartl/media into drm-fixes Merge tag 'drm-misc-fixes-2021-03-25' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes Merge tag 'drm-intel-fixes-2021-03-25-1' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes Merge branch 'linux-5.12' of git://github.com/skeggsb/linux into drm-fixes Merge tag 'amd-drm-fixes-5.12-2021-03-24' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes Merge tag 'drm-msm-fixes-2021-02-25' of https://gitlab.freedesktop.org/drm/msm into drm-fixes Dmitry Baryshkov (4): drm/msm/dsi: fix check-before-set in the 7nm dsi_pll code drm/msm/dsi_pll_7nm: Solve TODO for multiplier frac_bits assignment drm/msm/dsi_pll_7nm: Fix variable usage for pll_lockdet_rate drm/msm: fix shutdown hook in case GPU components failed to bind Douglas Anderson (1): drm/msm: Fix speed-bin support not to access outside valid memory Fabio Estevam (1): drm/msm: Fix suspend/resume on i.MX5 Imre Deak (4): drm/i915/ilk-glk: Fix link training on links with LTTPRs drm/i915: Disable LTTPR support when the DPCD rev < 1.4 drm/i915: Disable LTTPR support when the LTTPR rev < 1.4 drm/i915: Fix the GT fence revocation runtime PM logic Jani Nikula (1): drm/i915/dsc: fix DSS CTL register usage for ICL DSI transcoders Jonathan Marek (1): drm/msm: fix a6xx_gmu_clear_oob Jordan Crouse (1): drm/msm: a6xx: Make sure the SQE microcode is safe Kalyan Thota (1): drm/msm/disp/dpu1: icc path needs to be set before dpu runtime resume Kenneth Feng (1): drm/amd/pm: workaround for audio noise issue Kieran Bingham (1): drm: rcar-du: Use drmm_encoder_alloc() to manage encoder Konrad Dybcio (1): drm/msm/adreno: a5xx_powe
Re: [pull] amdgpu, amdkfd, radeon drm-next-5.12
I think this is due to this pull, on arm32. /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../display/dmub/src/dmub_srv.c: In function ‘dmub_srv_hw_init’: /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../display/dmub/src/dmub_srv.c:519:44: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] outbox0_rb_params.base_address = (void *)((uint64_t)(tracebuff_fb->cpu_addr) + TRACE_BUFFER_ENTRY_OFFSET); ^ /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../display/dmub/src/dmub_srv.c:519:35: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] outbox0_rb_params.base_address = (void *)((uint64_t)(tracebuff_fb->cpu_addr) + TRACE_BUFFER_ENTRY_OFFSET); Dave. On Sat, 27 Mar 2021 at 05:16, Zhuo, Qingqing wrote: > > [AMD Public Use] > > On Thu, Feb 18, 2021 at 11:15 PM Alex Deucher wrote: > >> > >> Hi Dave, Daniel, > >> > >> Fixes for 5.12. > >> > >> The following changes since commit > >> 4c3a3292730c56591472717d8c5c0faf74f6c6bb: > >> > >> drm/amd/display: fix unused variable warning (2021-02-05 09:49:44 > >> +1000) > >> > >> are available in the Git repository at: > >> > >> > >> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgitl > >> ab.freedesktop.org%2Fagd5f%2Flinux.git&data=04%7C01%7Cqingqing.zhu > >> o%40amd.com%7Cce0d1ee6a18b4a95366008d8f082048e%7C3dd8961fe4884e608e11a > >> 82d994e183d%7C0%7C0%7C637523789263486288%7CUnknown%7CTWFpbGZsb3d8eyJWI > >> joiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&a > >> mp;sdata=Ig3OkPN0X8OtCOHDJqV%2FZSEOsL7gPs8OMh9sXDniR2w%3D&reserved > >> =0 tags/amd-drm-next-5.12-2021-02-18 > >> > >> for you to fetch changes up to 6e80fb8ab04f6c4f377e2fd422bdd1855beb7371: > >> > >> drm/amdgpu: Set reference clock to 100Mhz on Renoir (v2) (2021-02-18 > >> 16:43:09 -0500) > > > Pulled into drm-next, with some conflicts, please double-check. > > > I also spotted > > > commit ea3b4242bc9ca197762119382b37e125815bd67f > > Author: Qingqing Zhuo > > Date: Tue Feb 9 16:36:41 2021 -0500 > > > drm/amd/display: Fix system hang after multiple hotplugs (v3) > > > I think it would be good if that could use the drm_vblank_work stuff from > > Lyude instead of hand-rolling your own. > > -Daniel > > Hi Daniel, > > Thank you for the suggestion! I need to look into further and will do so as > soon as I have bandwidth. > > Thanks, > Lillian > > >> > >> > >> amd-drm-next-5.12-2021-02-18: > >> > >> amdgpu: > >> - Prefer Bhawan's unused variable fix > >> - Fixes for high priority queues on gfx8,9 > >> - swSMU fixes for sienna cichlid > >> - swSMU fixes for renoir > >> - mmhub client id fixes for arcturus > >> - SMUIO fixes for navi family > >> - swSMU fixes for vangogh > >> - GPU reset cleanup > >> - Display fixes > >> - GFX harvesting fix for sienna cichlid > >> - Fix reference clock on Renoir > >> - Misc fixes and cleanups > >> > >> amdkfd: > >> - Fix for unique id query > >> - Fix recursive lock warnings > >> > >> radeon: > >> - Remove confusing VCE messages on Oland > >> > >> > >> Alex Deucher (16): > >> Revert "drm/amd/display: fix unused variable warning" > >> drm/amdgpu/smu12: fix power reporting on renoir > >> drm/amdgpu/gmc9: fix mmhub client mapping for arcturus > >> drm/amdgpu/si: minor clean up of reset code > >> drm/amdgpu/cik: minor clean up of reset code > >> drm/amdgpu/vi: minor clean up of reset code > >> drm/amdgpu: add generic pci reset as an option > >> drm/amdgpu/si: add PCI reset support > >> drm/amdgpu/soc15: add PCI reset support > >> drm/amdgpu/nv: add PCI reset support > >> drm/amdgpu: drop extra drm_kms_helper_poll_enable/disable calls > >> drm/amdgpu: use runpm flag rather than fbcon for kfd runtime suspend > >> (v2) > >> drm/amdgpu: reset runpm flag if device suspend fails > >> Revert "drm/amd/display: Update NV1x SR latency values" > >> drm/radeon: OLAND boards don't have VCE > >> drm/amdgpu: Set reference clock to 100Mhz on Renoir (v2) > >> > >> Anthony Koo (1): > >> drm/amd/display: [FW Promotion] Release 0.0.51 > >> > >> Aric Cyr (1): > >> drm/amd/display: 3.2.122 > >> > >> Bhawanpreet Lakha (1): > >> drm/amd/display: Fix unused variable warning > >> > >> Dale Zhao (1): > >> drm/amd/display: fix type mismatch error for return variable > >> > >> Derek Lai (1): > >> drm/amd/display: Add DIG_CLOCK_PATTERN in the transmitter > >> control > >> > >> Eric Yang (1): > >> drm/amd/display: move edp sink present detection to hw init > >> > >> Fangzhi Zuo (1): > >> drm/amd/display: Add return code instead of boolean for future > >> use > >> > >> Felix Kuehling (1): > >> drm/amdkfd: Fix recursive lock warnings > >> > >> Gustavo A
[git pull] drm fixes for 5.12-rc6
Hi Linus, Things have settled down in time for Easter, a random smattering of small fixes across a few drivers. I'm guessing though there might be some i915 and misc fixes out there I haven't gotten yet, but since today is a public holiday here, I'm sending this early so I can have the day off, I'll see if more requests come in and decide what to do with them later. Dave. drm-fixes-2021-04-02: drm fixes for 5.12-rc6 amdgpu: - Polaris idle power fix - VM fix - Vangogh S3 fix - Fixes for non-4K page sizes amdkfd: - dqm fence memory corruption fix tegra: - lockdep warning fix - runtine PM reference fix - display controller fix - PLL Fix imx: - memory leak in error path fix - LDB driver channel registration fix - oob array warning in LDB driver exynos - unused header file removal The following changes since commit a5e13c6df0e41702d2b2c77c8ad41677ebb065b3: Linux 5.12-rc5 (2021-03-28 15:48:16 -0700) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2021-04-02 for you to fetch changes up to 6fdb8e5aba6a33fe5f1a0bd1bcf0cf2884437ead: Merge tag 'imx-drm-fixes-2021-04-01' of git://git.pengutronix.de/git/pza/linux into drm-fixes (2021-04-02 04:53:16 +1000) drm fixes for 5.12-rc6 amdgpu: - Polaris idle power fix - VM fix - Vangogh S3 fix - Fixes for non-4K page sizes amdkfd: - dqm fence memory corruption fix tegra: - lockdep warning fix - runtine PM reference fix - display controller fix - PLL Fix imx: - memory leak in error path fix - LDB driver channel registration fix - oob array warning in LDB driver exynos - unused header file removal Alex Deucher (1): drm/amdgpu/vangogh: don't check for dpm in is_dpm_running when in suspend Arnd Bergmann (1): drm/imx: imx-ldb: fix out of bounds array access warning Dave Airlie (4): Merge tag 'exynos-drm-fixes-for-v5.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-fixes Merge tag 'amd-drm-fixes-5.12-2021-03-31' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes Merge tag 'drm/tegra/for-5.12-rc6' of ssh://git.freedesktop.org/git/tegra/linux into drm-fixes Merge tag 'imx-drm-fixes-2021-04-01' of git://git.pengutronix.de/git/pza/linux into drm-fixes Dmitry Osipenko (1): drm/tegra: dc: Don't set PLL clock to 0Hz Evan Quan (1): drm/amd/pm: no need to force MCLK to highest when no display connected Huacai Chen (1): drm/amdgpu: Set a suitable dev_info.gart_page_size Liu Ying (1): drm/imx: imx-ldb: Register LDB channel1 when it is the only channel to be used Mikko Perttunen (1): gpu: host1x: Use different lock classes for each client Nirmoy Das (1): drm/amdgpu: fix offset calculation in amdgpu_vm_bo_clear_mappings() Pan Bian (1): drm/imx: fix memory leak when fails to init Qu Huang (1): drm/amdkfd: dqm fence memory corruption Thierry Reding (2): drm/tegra: dc: Restore coupling of display controllers drm/tegra: sor: Grab runtime PM reference across reset Tian Tao (1): drm/exynos/decon5433: Remove the unused include statements Xℹ Ruoyao (1): drm/amdgpu: check alignment on CPU page for bo map drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c| 4 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 10 drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c| 2 +- .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 6 ++--- .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c| 2 +- drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_vi.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 8 +++--- .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c| 3 ++- drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 5 drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 1 - drivers/gpu/drm/imx/imx-drm-core.c | 2 +- drivers/gpu/drm/imx/imx-ldb.c | 12 - drivers/gpu/drm/tegra/dc.c | 30 ++ drivers/gpu/drm/tegra/sor.c| 7 + drivers/gpu/host1x/bus.c | 10 +--- include/linux/host1x.h | 9 ++- 18 files changed, 72 insertions(+), 45 deletions(-) ___ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
[git pull] drm fixes for 5.11-rc4
Hey Linus, Back to mostly regular scheduling for me. Big thanks to Daniel for stepping into my duties for the last few turns. Regular fixes for rc4, a bunch of fixes across i915, amdgpu and nouveau here, along with a couple of TTM fixes, and dma-buf and one core pageflip/modifier interaction fix. One notable i915 fix is a HSW GT1 regression fix that has been outstanding for quite a while. (Thanks to Matt Turner for kicking Intel into getting it fixed). Ben Skeggs has asked about the possibility of pulling nvidia ampere basic display support into fixes as new hardware with nothing outside touched, I'll queue up a separate pull after this one and you can decide if it's appropriate. Dave. drm-fixes-2021-01-15: drm fixes for 5.11-rc4 dma-buf: - Fix a memory leak in CMAV heap core: - Fix format check for legacy pageflips ttm: - Pass correct address to dma_mapping_error() - Use mutex in pool shrinker i915: - Allow the sysadmin to override security mitigations - Restore clear-residual mitigations for ivb/byt - Limit VFE threads based on GT - GVT: fix vfio edid and full display detection - Fix DSI DSC power refcounting - Fix LPT CPU mode backlight takeover - Disable RPM wakeref assertions during driver shutdown - Fix DSI sequence sleeps amdgpu: - Update repo location in MAINTAINERS - Add some new renoir PCI IDs - Revert CRC UAPI changes - Revert OLED display fix which cases clocking problems for some systems - Misc vangogh fixes - GFX fix for sienna cichlid - DCN1.0 fix for pipe split - Fix incorrect PSP command amdkfd: - Fix possible out of bounds read in vcrat creation nouveau: - irq handling fix - expansion ROM fix - hw init dpcd disable - aux semaphore owner field fix - vram heap sizing fix - notifier at 0 is valid fix The following changes since commit 7c53f6b671f4aba70ff15e1b05148b10d58c2837: Linux 5.11-rc3 (2021-01-10 14:34:50 -0800) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2021-01-15 for you to fetch changes up to c8f6364f35f32786dd40336cfa35b9166d91b8ab: Merge branch '04.00-ampere-lite-fixes' of git://github.com/skeggsb/linux into drm-fixes (2021-01-15 13:26:44 +1000) drm fixes for 5.11-rc4 dma-buf: - Fix a memory leak in CMAV heap core: - Fix format check for legacy pageflips ttm: - Pass correct address to dma_mapping_error() - Use mutex in pool shrinker i915: - Allow the sysadmin to override security mitigations - Restore clear-residual mitigations for ivb/byt - Limit VFE threads based on GT - GVT: fix vfio edid and full display detection - Fix DSI DSC power refcounting - Fix LPT CPU mode backlight takeover - Disable RPM wakeref assertions during driver shutdown - Fix DSI sequence sleeps amdgpu: - Update repo location in MAINTAINERS - Add some new renoir PCI IDs - Revert CRC UAPI changes - Revert OLED display fix which cases clocking problems for some systems - Misc vangogh fixes - GFX fix for sienna cichlid - DCN1.0 fix for pipe split - Fix incorrect PSP command amdkfd: - Fix possible out of bounds read in vcrat creation nouveau: - irq handling fix - expansion ROM fix - hw init dpcd disable - aux semaphore owner field fix - vram heap sizing fix - notifier at 0 is valid fix Alex Deucher (1): MAINTAINERS: update radeon/amdgpu/amdkfd git trees Alexandre Demers (1): drm/amdgpu: fix DRM_INFO flood if display core is not supported (bug 210921) Bas Nieuwenhuizen (1): drm: Check actual format for legacy pageflip. Ben Skeggs (7): drm/nouveau/bios: fix issue shadowing expansion ROMs drm/nouveau/privring: ack interrupts the same way as RM drm/nouveau/i2c/gk110: split out from i2c/gk104 drm/nouveau/i2c/gk110-: disable hw-initiated dpcd reads drm/nouveau/i2c/gm200: increase width of aux semaphore owner fields drm/nouveau/mmu: fix vram heap sizing drm/nouveau/kms/nv50-: fix case where notifier buffer is at offset 0 Chris Wilson (4): drm/i915: Disable RPM wakeref assertions during driver shutdown drm/i915/gt: Limit VFE threads based on GT drm/i915/gt: Restore clear-residual mitigations for Ivybridge, Baytrail drm/i915: Allow the sysadmin to override security mitigations Christian König (1): drm/ttm: make the pool shrinker lock a mutex Colin Xu (1): drm/i915/gvt: Fix vfio_edid issue for BXT/APL Dave Airlie (4): Merge tag 'drm-misc-fixes-2021-01-12' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes Merge tag 'drm-intel-fixes-2021-01-14' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes Merge tag 'amd-drm-fixes-5.11-2021-01-14' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes Merge branch '04.00-ampere-lite-fixes' of git://github.com/skeggsb/linux into drm-fixes Hans de Goede (1): d
[git pull] drm nouveau ampere modesetting support
Hi Linus, As mentioned in the previous pull, Ben has requested if we can include Ampere modesetting support under fixes, it's for new GPUs and shouldn't affect existing hardware. It's a bit bigger than just adding a PCI ID, and I'm fine if you think we should hold it off until later. Dave. topic/nouveau-ampere-modeset-2021-01-15: drm nouveau ampere display support. This is a pull request to add display support for new Ampere hardware. It has no effect on older GPUs. The following changes since commit c8f6364f35f32786dd40336cfa35b9166d91b8ab: Merge branch '04.00-ampere-lite-fixes' of git://github.com/skeggsb/linux into drm-fixes (2021-01-15 13:26:44 +1000) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/topic/nouveau-ampere-modeset-2021-01-15 for you to fetch changes up to 584265dfec70e78ce2085b82ed389f27e06fbca0: Merge branch '04.01-ampere-lite' of git://github.com/skeggsb/linux into topic/nouveau-ampere-modeset (2021-01-15 14:48:18 +1000) drm nouveau ampere display support. This is a pull request to add display support for new Ampere hardware. It has no effect on older GPUs. Ben Skeggs (15): drm/nouveau/core: recognise GA10[024] drm/nouveau/pci/ga10[024]: initial support drm/nouveau/bios/ga10[024]: initial support drm/nouveau/devinit/ga10[024]: initial support drm/nouveau/mc/ga10[024]: initial support drm/nouveau/privring/ga10[024]: initial support drm/nouveau/imem/ga10[024]: initial support drm/nouveau/fb/ga10[024]: initial support drm/nouveau/timer/ga10[024]: initial support drm/nouveau/mmu/ga10[024]: initial support drm/nouveau/bar/ga10[024]: initial support drm/nouveau/gpio/ga10[024]: initial support drm/nouveau/i2c/ga10[024]: initial support drm/nouveau/dmaobj/ga10[24]: initial support drm/nouveau/disp/ga10[24]: initial support Dave Airlie (1): Merge branch '04.01-ampere-lite' of git://github.com/skeggsb/linux into topic/nouveau-ampere-modeset drivers/gpu/drm/nouveau/dispnv50/Kbuild| 1 + drivers/gpu/drm/nouveau/dispnv50/core.c| 1 + drivers/gpu/drm/nouveau/dispnv50/curs.c| 1 + drivers/gpu/drm/nouveau/dispnv50/wimm.c| 1 + drivers/gpu/drm/nouveau/dispnv50/wndw.c| 1 + drivers/gpu/drm/nouveau/dispnv50/wndw.h| 8 ++ drivers/gpu/drm/nouveau/dispnv50/wndwc57e.c| 10 +- drivers/gpu/drm/nouveau/dispnv50/wndwc67e.c| 106 drivers/gpu/drm/nouveau/include/nvif/cl0080.h | 1 + drivers/gpu/drm/nouveau/include/nvif/class.h | 5 + drivers/gpu/drm/nouveau/include/nvkm/core/device.h | 1 + drivers/gpu/drm/nouveau/include/nvkm/engine/disp.h | 1 + .../gpu/drm/nouveau/include/nvkm/subdev/devinit.h | 1 + drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h | 2 + drivers/gpu/drm/nouveau/include/nvkm/subdev/gpio.h | 1 + drivers/gpu/drm/nouveau/include/nvkm/subdev/mc.h | 1 + drivers/gpu/drm/nouveau/nouveau_backlight.c| 1 + drivers/gpu/drm/nouveau/nvif/disp.c| 1 + drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 75 ++- drivers/gpu/drm/nouveau/nvkm/engine/device/user.c | 1 + drivers/gpu/drm/nouveau/nvkm/engine/disp/Kbuild| 3 + drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c | 33 - drivers/gpu/drm/nouveau/nvkm/engine/disp/ga102.c | 46 +++ drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h | 4 + drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.h| 2 + .../gpu/drm/nouveau/nvkm/engine/disp/rootga102.c | 52 .../gpu/drm/nouveau/nvkm/engine/disp/rootnv50.h| 1 + .../gpu/drm/nouveau/nvkm/engine/disp/sorga102.c| 140 + .../gpu/drm/nouveau/nvkm/engine/disp/sortu102.c| 2 +- drivers/gpu/drm/nouveau/nvkm/engine/disp/tu102.c | 2 +- .../gpu/drm/nouveau/nvkm/subdev/bios/shadowramin.c | 3 + drivers/gpu/drm/nouveau/nvkm/subdev/devinit/Kbuild | 1 + .../gpu/drm/nouveau/nvkm/subdev/devinit/ga100.c| 76 +++ drivers/gpu/drm/nouveau/nvkm/subdev/devinit/priv.h | 1 + .../gpu/drm/nouveau/nvkm/subdev/devinit/tu102.c| 2 +- drivers/gpu/drm/nouveau/nvkm/subdev/fb/Kbuild | 3 + drivers/gpu/drm/nouveau/nvkm/subdev/fb/ga100.c | 40 ++ drivers/gpu/drm/nouveau/nvkm/subdev/fb/ga102.c | 40 ++ drivers/gpu/drm/nouveau/nvkm/subdev/fb/gv100.c | 2 +- drivers/gpu/drm/nouveau/nvkm/subdev/fb/priv.h | 2 + drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.h | 1 + drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramga102.c | 40 ++ drivers/gpu/drm/nouveau/nvkm/subdev/gpio/Kbuild| 1 + drivers/gpu/drm/nouveau/nvkm/subdev/gpio/ga102.c | 118 + drivers/gpu/drm/nouveau/nvkm/subd
Re: [pull] amdgpu drm-next-5.12
On Fri, 15 Jan 2021 at 07:22, Alex Deucher wrote:
>
> Hi Dave, Daniel,
>
> More new stuff for 5.12.
>
> The following changes since commit 044a48f420b9d3c19a135b821c34de5b2bee4075:
>
> drm/amdgpu: fix DRM_INFO flood if display core is not supported (bug
> 210921) (2021-01-08 15:18:57 -0500)
>
> are available in the Git repository at:
>
> https://gitlab.freedesktop.org/agd5f/linux.git
> tags/amd-drm-next-5.12-2021-01-14
>
> for you to fetch changes up to df1f0560d28f4895e2d61af826728efb61976f9f:
>
> drm/amd/display: Simplify bool comparison (2021-01-14 13:20:21 -0500)
arm 32/64 builds say no.
CC [M] drivers/gpu/drm/nouveau/nvkm/subdev/instmem/gk20a.o
/home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c:
In function ‘vangogh_get_smu_metrics_data’:
/home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c:300:10:
error: ‘boot_cpu_data’ undeclared (first use in this function); did
you mean ‘bl_get_data’?
boot_cpu_data.x86_max_cores * sizeof(uint16_t));
^
bl_get_data
/home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c:300:10:
note: each undeclared identifier is reported only once for each
function it appears in
/home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c:
In function ‘vangogh_read_sensor’:
/home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c:1320:11:
error: ‘boot_cpu_data’ undeclared (first use in this function); did
you mean ‘bl_get_data’?
*size = boot_cpu_data.x86_max_cores * sizeof(uint16_t);
^
bl_get_data
/home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c:
In function ‘vangogh_od_edit_dpm_table’:
/home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c:1460:19:
error: ‘boot_cpu_data’ undeclared (first use in this function); did
you mean ‘bl_get_data’?
if (input[0] >= boot_cpu_data.x86_max_cores) {
^
bl_get_data
make[5]: *** [/home/airlied/devel/kernel/dim/src/scripts/Makefile.build:279:
drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.o] Error 1
Not sure using boot_cpu_data in a driver is that good an idea, maybe
there is a better interface to get that sort of information, but even
so it should build on arm.
Dave.
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: linux-next: build failure after merge of the drm tree
On Mon, 18 Jan 2021 at 10:59, Stephen Rothwell wrote:
>
> Hi all,
>
> On Mon, 11 Jan 2021 10:56:54 +1100 Stephen Rothwell
> wrote:
> >
> > On Fri, 8 Jan 2021 12:25:40 +1100 Stephen Rothwell
> > wrote:
> > >
> > > On Fri, 8 Jan 2021 11:55:18 +1100 Stephen Rothwell
> > > wrote:
> > > >
> > > > After merging the drm tree, today's linux-next build (x86_64
> > > > allmodconfig)
> > > > failed like this:
> > > >
> > > > error: the following would cause module name conflict:
> > > > drivers/video/fbdev/omap2/omapfb/displays/panel-dsi-cm.ko
> > > > drivers/gpu/drm/panel/panel-dsi-cm.ko
> > > >
> > > > Maybe caused by commit
> > > >
> > > > cf64148abcfd ("drm/panel: Move OMAP's DSI command mode panel driver")
> > > >
> > > > I have used the drm tree from next-20210107 for today.
> > >
> > > This has affected the drm-misc tree as well (since it merged in the drm
> > > tree).
> > >
> > > I have used the drm-misc tree from next-20210107 for today.
> >
> > And now the drm-intel tree.
> >
> > I have used the drm-intel tree from next-20210108 for today.
>
> This is still affecting the drm and drm-intel trees.
I think the fix for this is in drm-misc-next, Maarten can you send me
a -next PR to fix this?
Dave.
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
[git pull] drm fixes for 5.11-rc5
Hi Linus,
Regular fixes pull, nothing too major in here, just some core fixes,
one vc4, bunch of i915 and a bunch of amdgpu.
Dave.
drm-fixes-2021-01-22:
drm fixes for 5.11-rc5
core:
- atomic: Release state on error
- syncobj: Fix use-after-free
- ttm: Don't use GFP_TRANSHUGE_LIGTH
- vram-helper: Fix memory leak in vmap
vc4:
- Unify driver naming for PCM
i915:
- HDCP fixes
- PMU wakeref fix
- Fix HWSP validity race
- Fix DP protocol converter accidental 4:4:4->4:2:0 conversion for RGB
amdgpu:
- Green Sardine fixes
- Vangogh fixes
- Renoir fixes
- Misc display fixes
The following changes since commit 19c329f6808995b142b3966301f217c831e7cf31:
Linux 5.11-rc4 (2021-01-17 16:37:05 -0800)
are available in the Git repository at:
git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2021-01-22
for you to fetch changes up to 06ee38dc2aab3b5a09feb74128cf7326a490b788:
Merge tag 'amd-drm-fixes-5.11-2021-01-21' of
https://gitlab.freedesktop.org/agd5f/linux into drm-fixes (2021-01-22
09:43:21 +1000)
drm fixes for 5.11-rc5
core:
- atomic: Release state on error
- syncobj: Fix use-after-free
- ttm: Don't use GFP_TRANSHUGE_LIGTH
- vram-helper: Fix memory leak in vmap
vc4:
- Unify driver naming for PCM
i915:
- HDCP fixes
- PMU wakeref fix
- Fix HWSP validity race
- Fix DP protocol converter accidental 4:4:4->4:2:0 conversion for RGB
amdgpu:
- Green Sardine fixes
- Vangogh fixes
- Renoir fixes
- Misc display fixes
Aaron Liu (1):
drm/amdgpu: update mmhub mgcg&ls for mmhub_v2_3
Anshuman Gupta (2):
drm/i915/hdcp: Update CP property in update_pipe
drm/i915/hdcp: Get conn while content_type changed
Aric Cyr (1):
drm/amd/display: Allow PSTATE chnage when no displays are enabled
Bing Guo (1):
drm/amd/display: Change function decide_dp_link_settings to
avoid infinite looping
Chris Wilson (2):
drm/i915/gt: Prevent use of engine->wa_ctx after error
drm/i915: Check for rq->hwsp validity after acquiring RCU lock
Christian König (1):
drm/ttm: stop using GFP_TRANSHUGE_LIGHT
Daniel Vetter (1):
drm/syncobj: Fix use-after-free
Dave Airlie (3):
Merge tag 'drm-misc-fixes-2021-01-20' of
git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
Merge tag 'drm-intel-fixes-2021-01-21' of
git://anongit.freedesktop.org/drm/drm-intel into drm-fixes
Merge tag 'amd-drm-fixes-5.11-2021-01-21' of
https://gitlab.freedesktop.org/agd5f/linux into drm-fixes
Huang Rui (1):
drm/amdgpu: remove gpu info firmware of green sardine
Jake Wang (1):
drm/amd/display: Update dram_clock_change_latency for DCN2.1
Jinzhou Su (1):
drm/amdgpu: modify GCR_GENERAL_CNTL for Vangogh
Nicholas Kazlauskas (1):
drm/amd/display: Use hardware sequencer functions for PG control
Nicolas Saenz Julienne (1):
drm/vc4: Unify PCM card's driver_name
Pan Bian (1):
drm/atomic: put state on error path
Prike Liang (1):
drm/amdgpu/pm: no need GPU status set since
mmnbif_gpu_BIF_DOORBELL_FENCE_CNTL added in FSDL
Sung Lee (1):
drm/amd/display: DCN2X Find Secondary Pipe properly in MPO + ODM Case
Thomas Zimmermann (1):
drm/vram-helper: Reuse existing page mappings in vmap
Tvrtko Ursulin (1):
drm/i915/pmu: Don't grab wakeref when enabling events
Ville Syrjälä (1):
drm/i915: Only enable DFP 4:4:4->4:2:0 conversion when
outputting YCbCr 4:4:4
Vladimir Stempen (1):
drm/amd/display: Fixed corruptions on HPDRX link loss restore
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 1 -
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 4 +-
drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c| 84 --
.../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 6 +-
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 7 +-
.../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 18 +++--
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 9 ++-
.../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 7 +-
.../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 2 +-
drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c| 2 +-
drivers/gpu/drm/drm_atomic_helper.c| 2 +-
drivers/gpu/drm/drm_gem_vram_helper.c | 14 +++-
drivers/gpu/drm/drm_syncobj.c | 8 ++-
drivers/gpu/drm/i915/display/intel_ddi.c | 2 +-
drivers/gpu/drm/i915/display/intel_dp.c| 9 +--
drivers/gpu/drm/i915/display/intel_dp.h| 3 +-
drivers/gpu/drm/i915/display/intel_hdcp.c | 9 +++
drivers/gpu/drm/i915/gt/intel_breadcrumbs.c| 9 +--
drivers/gpu/drm/i915/gt/intel_lrc.c| 3 +
drivers/gpu/drm/i915/gt/intel_timeline.c | 10 ++-
drivers/gpu/drm/i915/i915_pmu.c| 30
drivers/gpu/drm/i91
[git pull] drm fixes for 5.11-rc6
Hey Linus, Weekly fixes for graphics, nothing too major, nouveau has a few regression fixes for various fallout from header changes previously, vc4 has two fixes, two amdgpu, and a smattering of i915 fixes. All seems on course for a quieter rc7, fingers crossed. Dave. drm-fixes-2021-01-29: drm fixes for 5.11-rc6 nouveau: - fix svm init conditions - fix nv50 modesetting regression - fix cursor plane modifiers - fix > 64x64 cursor regression vc4: - Fix LBM size calculation - Fix high resolutions for hvs5 i915: - Fix ICL MG PHY vswing - Fix subplatform handling - Fix selftest memleak - Clear CACHE_MODE prior to clearing residuals - Always flush the active worker before returning from the wait - Always try to reserve GGTT address 0x0 amdgpu: - Fix a fan control regression on some boards - Fix clang warning The following changes since commit 6ee1d745b7c9fd573fba142a2efdad76a9f1cb04: Linux 5.11-rc5 (2021-01-24 16:47:14 -0800) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2021-01-29 for you to fetch changes up to e0ecafede87eb1a3d1e708f0365fad0d59489285: Merge tag 'amd-drm-fixes-5.11-2021-01-28' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes (2021-01-29 11:36:38 +1000) drm fixes for 5.11-rc6 nouveau: - fix svm init conditions - fix nv50 modesetting regression - fix cursor plane modifiers - fix > 64x64 cursor regression vc4: - Fix LBM size calculation - Fix high resolutions for hvs5 i915: - Fix ICL MG PHY vswing - Fix subplatform handling - Fix selftest memleak - Clear CACHE_MODE prior to clearing residuals - Always flush the active worker before returning from the wait - Always try to reserve GGTT address 0x0 amdgpu: - Fix a fan control regression on some boards - Fix clang warning Alex Deucher (1): Revert "drm/amdgpu/swsmu: drop set_fan_speed_percent (v2)" Arnd Bergmann (1): amdgpu: fix clang build warning Bastian Beranek (1): drm/nouveau/dispnv50: Restore pushing of all data. Ben Skeggs (1): drm/nouveau/nvif: fix method count when pushing an array Chris Wilson (3): drm/i915/gt: Clear CACHE_MODE prior to clearing residuals drm/i915: Always flush the active worker before returning from the wait drm/i915/gt: Always try to reserve GGTT address 0x0 Dave Airlie (4): Merge branch '04.01-ampere-lite' of git://github.com/skeggsb/linux into drm-fixes Merge tag 'drm-misc-fixes-2021-01-27' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes Merge tag 'drm-intel-fixes-2021-01-28' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes Merge tag 'amd-drm-fixes-5.11-2021-01-28' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes Dom Cobley (2): drm/vc4: Correct lbm size and calculation drm/vc4: Correct POS1_SCL for hvs5 Karol Herbst (1): drm/nouveau/svm: fail NOUVEAU_SVM_INIT ioctl on unsupported devices Lyude Paul (3): drivers/nouveau/kms/nv50-: Reject format modifiers for cursor planes drm/nouveau/kms/nv50-: Report max cursor size to userspace drm/nouveau/kms/gk104-gp1xx: Fix > 64x64 cursors Pan Bian (1): drm/i915/selftest: Fix potential memory leak Umesh Nerlige Ramappa (1): drm/i915: Check for all subplatform bits Ville Syrjälä (1): drm/i915: Fix ICL MG PHY vswing handling drivers/gpu/drm/amd/display/dc/dcn30/Makefile | 6 +- drivers/gpu/drm/amd/display/dc/dcn301/Makefile | 3 +- drivers/gpu/drm/amd/display/dc/dcn302/Makefile | 3 +- drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h| 1 + drivers/gpu/drm/amd/pm/inc/smu_v11_0.h | 3 + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 9 +- drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 1 + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c| 1 + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c| 1 + drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 31 ++- drivers/gpu/drm/i915/display/intel_ddi.c | 7 +- drivers/gpu/drm/i915/gt/gen7_renderclear.c | 12 ++ drivers/gpu/drm/i915/gt/intel_ggtt.c | 47 +++-- drivers/gpu/drm/i915/i915_active.c | 28 +-- drivers/gpu/drm/i915/i915_drv.h| 2 +- drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 2 +- drivers/gpu/drm/nouveau/dispnv50/base507c.c| 6 +- drivers/gpu/drm/nouveau/dispnv50/base827c.c| 6 +- drivers/gpu/drm/nouveau/dispnv50/disp.c| 8 + drivers/gpu/drm/nouveau/dispnv50/head917d.c| 28 ++- drivers/gpu/drm/nouveau/dispnv50/wndw.c| 17 +- .../gpu/drm/nouveau/include/nvhw/class/cl917d.h| 4 + drivers/gpu/drm/nouveau/include/nvif/push.h| 216 ++--- drivers/gpu/drm/nouv
[PATCH] drm/nouveau: fix dma syncing warning with debugging on.
From: Dave Airlie
Since I wrote the below patch if you run a debug kernel you can a
dma debug warning like:
nouveau :1f:00.0: DMA-API: device driver tries to sync DMA memory it has
not allocated [device address=0x00016e012000] [size=4096 bytes]
The old nouveau code wasn't consolidate the pages like the ttm code,
but the dma-debug expects the sync code to give it the same base/range
pairs as the allocator.
Fix the nouveau sync code to consolidate pages before calling the
sync code.
Fixes: bd549d35b4be0 ("nouveau: use ttm populate mapping functions. (v2)")
Reported-by: Lyude Paul
Reviewed-by: Ben Skeggs
Signed-off-by: Dave Airlie
---
drivers/gpu/drm/nouveau/nouveau_bo.c | 35 +++-
1 file changed, 29 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c
b/drivers/gpu/drm/nouveau/nouveau_bo.c
index 33dc886d1d6d..2375711877cf 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -547,7 +547,7 @@ nouveau_bo_sync_for_device(struct nouveau_bo *nvbo)
{
struct nouveau_drm *drm = nouveau_bdev(nvbo->bo.bdev);
struct ttm_tt *ttm_dma = (struct ttm_tt *)nvbo->bo.ttm;
- int i;
+ int i, j;
if (!ttm_dma)
return;
@@ -556,10 +556,21 @@ nouveau_bo_sync_for_device(struct nouveau_bo *nvbo)
if (nvbo->force_coherent)
return;
- for (i = 0; i < ttm_dma->num_pages; i++)
+ for (i = 0; i < ttm_dma->num_pages; ++i) {
+ struct page *p = ttm_dma->pages[i];
+ size_t num_pages = 1;
+
+ for (j = i + 1; j < ttm_dma->num_pages; ++j) {
+ if (++p != ttm_dma->pages[j])
+ break;
+
+ ++num_pages;
+ }
dma_sync_single_for_device(drm->dev->dev,
ttm_dma->dma_address[i],
- PAGE_SIZE, DMA_TO_DEVICE);
+ num_pages * PAGE_SIZE,
DMA_TO_DEVICE);
+ i += num_pages;
+ }
}
void
@@ -567,7 +578,7 @@ nouveau_bo_sync_for_cpu(struct nouveau_bo *nvbo)
{
struct nouveau_drm *drm = nouveau_bdev(nvbo->bo.bdev);
struct ttm_tt *ttm_dma = (struct ttm_tt *)nvbo->bo.ttm;
- int i;
+ int i, j;
if (!ttm_dma)
return;
@@ -576,9 +587,21 @@ nouveau_bo_sync_for_cpu(struct nouveau_bo *nvbo)
if (nvbo->force_coherent)
return;
- for (i = 0; i < ttm_dma->num_pages; i++)
+ for (i = 0; i < ttm_dma->num_pages; ++i) {
+ struct page *p = ttm_dma->pages[i];
+ size_t num_pages = 1;
+
+ for (j = i + 1; j < ttm_dma->num_pages; ++j) {
+ if (++p != ttm_dma->pages[j])
+ break;
+
+ ++num_pages;
+ }
+
dma_sync_single_for_cpu(drm->dev->dev, ttm_dma->dma_address[i],
- PAGE_SIZE, DMA_FROM_DEVICE);
+ num_pages * PAGE_SIZE, DMA_FROM_DEVICE);
+ i += num_pages;
+ }
}
void nouveau_bo_add_io_reserve_lru(struct ttm_buffer_object *bo)
--
2.20.1
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [GIT PULL] mediatek drm next for 5.12
On Thu, 4 Feb 2021 at 09:22, Chun-Kuang Hu wrote:
>
> Hi, Dave & Daniel:
>
> This includes:
>
> 1. Decouple Mediatek DRM sub driver
> 2. Share mtk mutex driver for both DRM and MDP
> 3. Add support for SoC MT8183
Hi Chun-Kuang,
dim: e83421b9acad ("drm/mediatek: Fix aal size config"): Subject in
fixes line doesn't match referenced commit:
dim: 0664d1392c26 (drm/mediatek: Add AAL engine basic function)
dim: de945f3098af ("drm/mediatek: Check if fb is null"): Subject in
fixes line doesn't match referenced commit:
dim: b6b1bb980ec4 ( drm/mediatek: Turn off Alpha bit when plane
format has no alpha)
Can you fix the Fixes tags, it should have sha1 ("commit") they are
missing the quotations.
Thanks,
Dave.
>
> Regards,
> Chun-Kuang.
>
> The following changes since commit 5c8fe583cce542aa0b84adc939ce85293de36e5e:
>
> Linux 5.11-rc1 (2020-12-27 15:30:22 -0800)
>
> are available in the Git repository at:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux.git
> tags/mediatek-drm-next-5.12
>
> for you to fetch changes up to f289eb1db7d7e6132c3ecf5049435ace2967b0fc:
>
> drm/mediatek: Add matrix_bits private data for ccorr (2021-02-03 23:54:07
> +0800)
>
>
> Mediatek DRM Next for Linux 5.12
>
> 1. Decouple Mediatek DRM sub driver
> 2. Share mtk mutex driver for both DRM and MDP
> 3. Add support for SoC MT8183
>
>
> CK Hu (15):
> drm/mediatek: Separate getting larb device to a function
> drm/mediatek: Move clk info from struct mtk_ddp_comp to sub driver
> private data
> drm/mediatek: Move regs info from struct mtk_ddp_comp to sub driver
> private data
> drm/mediatek: Remove irq in struct mtk_ddp_comp
> drm/mediatek: Use struct cmdq_client_reg to gather cmdq variable
> drm/mediatek: Move cmdq_reg info from struct mtk_ddp_comp to sub driver
> private data
> drm/mediatek: Change sub driver interface from mtk_ddp_comp to device
> drm/mediatek: Register vblank callback function
> drm/mediatek: DRM driver directly refer to sub driver's function
> drm/mediatek: Move mtk_ddp_comp_init() from sub driver to DRM driver
> drm/mediatek: Remove redundant file including
> drm/mediatek: Rename file mtk_drm_ddp to mtk_mutex
> drm/mediatek: Change disp/ddp term to mutex in mtk mutex driver
> drm/mediatek: Automatically search unclaimed mtk mutex in
> mtk_mutex_get()
> soc / drm: mediatek: Move mtk mutex driver to soc folder
>
> Chun-Kuang Hu (2):
> drm/mediatek: Get CMDQ client register for all ddp component
> drm/mediatek: Use correct device pointer to get CMDQ client register
>
> Hsin-Yi Wang (2):
> drm/mediatek: mtk_dpi: Create connector for bridges
> drm/mediatek: Add mtk_dither_set_common() function
>
> Jitao Shi (1):
> drm/mediatek: dsi: Use IRQF_TRIGGER_NONE for dsi irq trigger type
>
> Yongqiang Niu (15):
> dt-bindings: mediatek: add description for mt8183 display
> dt-bindings: mediatek: add description for mt8192 display
> drm/mediatek: Check if fb is null
> dt-bindings: mediatek: add rdma-fifo-size description for mt8183 display
> dt-bindings: mediatek: add description for postmask
> drm/mediatek: Fix aal size config
> drm/mediatek: Add fifo_size into rdma private data
> drm/mediatek: Separate gamma module
> drm/mediatek: Add has_dither private data for gamma
> drm/mediatek: Add support for SoC MT8183
> drm/mediatek: Enable OVL_LAYER_SMI_ID_EN for multi-layer usecase
> drm/mediatek: Enable dither function
> drm/mediatek: Separate ccorr module
> drm/mediatek: Fix ccorr size config
> drm/mediatek: Add matrix_bits private data for ccorr
>
> .../bindings/display/mediatek/mediatek,disp.txt| 12 +-
> drivers/gpu/drm/mediatek/Makefile | 5 +-
> drivers/gpu/drm/mediatek/mtk_disp_ccorr.c | 223 +
> drivers/gpu/drm/mediatek/mtk_disp_color.c | 89 ++--
> drivers/gpu/drm/mediatek/mtk_disp_drv.h| 92
> drivers/gpu/drm/mediatek/mtk_disp_gamma.c | 197
> drivers/gpu/drm/mediatek/mtk_disp_ovl.c| 254 ++-
> drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 194
> drivers/gpu/drm/mediatek/mtk_dpi.c | 57 +--
> drivers/gpu/drm/mediatek/mtk_drm_crtc.c| 107 ++---
> drivers/gpu/drm/mediatek/mtk_drm_crtc.h| 1 -
> drivers/gpu/drm/mediatek/mtk_drm_ddp.h | 28 --
> drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c| 503
> ++---
> drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h| 100 ++--
> drivers/gpu/drm/mediatek/mtk_drm_drv.c | 88 ++--
> drivers/gpu/drm/mediatek/mtk_drm_drv.h | 5 +-
> drivers/gpu/drm/mediatek/mtk_dsi.c | 50 +-
> d
Re: [pull] amdgpu, amdkfd drm-next-5.12
On Thu, 4 Feb 2021 at 14:57, Alex Deucher wrote: > > Hi Dave, Daniel, > > More fixes for 5.12. Same PR from last week with the issue Felix reported > fixed and a few more additional fixes on top. > > The following changes since commit a6b8720c2f85143561c3453e1cf928a2f8586ac0: > > Merge tag 'amd-drm-next-5.12-2021-01-20' of > https://gitlab.freedesktop.org/agd5f/linux into drm-next (2021-01-20 13:08:18 > +0100) > This brought an arm32 warning with it, I've applied Arnd's patch to drm-next to fix it. https://patchwork.freedesktop.org/patch/msgid/20210125124849.102037-1-a...@kernel.org However that function has an ifdef around an ifdef that probably could do with cleaning up. Dave. ___ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
[git pull] drm fixes for 5.11-rc7
Hi Linus, Fixes for rc7, bit bigger than I'd like at this stage, but most of the i915 stuff and some amdgpu is destined for staging and I'd rather not hold it up, the i915 changes also pulled in a few precusor code movement patches to make things cleaner, but nothing seems that horrible, and I've checked over all of it. Otherwise there is a nouveau dma-api warning regression, and a ttm page allocation warning fix, and some fixes for a bridge chip, Dave. drm-fixes-2021-02-05-1: drm fixes for 5.11-rc7 ttm: - fix huge page warning regression i915: - Skip vswing programming for TBT - Power up combo PHY lanes for HDMI - Fix double YUV range correction on HDR planes - Fix the MST PBN divider calculation - Fix LTTPR vswing/pre-emp setting in non-transparent mode - Move the breadcrumb to the signaler if completed upon cancel - Close race between enable_breadcrumbs and cancel_breadcrumbs - Drop lru bumping on display unpinning amdgpu: - Fix retry in gem create - Vangogh fixes - Fix for display from shared buffers - Various display fixes amdkfd: - Fix regression in buffer free nouveau: - fix DMA API warning regression drm/bridge/lontium-lt9611uxc: - EDID fixes - Don't handle hotplug events in IRQ handler The following changes since commit 1048ba83fb1c00cd24172e23e8263972f6b5d9ac: Linux 5.11-rc6 (2021-01-31 13:50:09 -0800) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2021-02-05-1 for you to fetch changes up to 59854811c08cfbdf52d79231666e7c07c46ff338: Merge tag 'drm-intel-fixes-2021-02-04' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes (2021-02-05 11:03:28 +1000) drm fixes for 5.11-rc7 ttm: - fix huge page warning regression i915: - Skip vswing programming for TBT - Power up combo PHY lanes for HDMI - Fix double YUV range correction on HDR planes - Fix the MST PBN divider calculation - Fix LTTPR vswing/pre-emp setting in non-transparent mode - Move the breadcrumb to the signaler if completed upon cancel - Close race between enable_breadcrumbs and cancel_breadcrumbs - Drop lru bumping on display unpinning amdgpu: - Fix retry in gem create - Vangogh fixes - Fix for display from shared buffers - Various display fixes amdkfd: - Fix regression in buffer free nouveau: - fix DMA API warning regression drm/bridge/lontium-lt9611uxc: - EDID fixes - Don't handle hotplug events in IRQ handler Andres Calderon Jaramillo (1): drm/i915/display: Prevent double YUV range correction on HDR planes Bhawanpreet Lakha (1): drm/amd/display: reuse current context instead of recreating one Chris Wilson (3): drm/i915/gt: Move the breadcrumb to the signaler if completed upon cancel drm/i915/gt: Close race between enable_breadcrumbs and cancel_breadcrumbs drm/i915/gem: Drop lru bumping on display unpinning Christian König (1): drm/amdgpu: enable freesync for A+A configs Dave Airlie (4): drm/nouveau: fix dma syncing warning with debugging on. Merge tag 'drm-misc-fixes-2021-02-02' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes Merge tag 'amd-drm-fixes-5.11-2021-02-03' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes Merge tag 'drm-intel-fixes-2021-02-04' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes Dmitry Baryshkov (3): drm/bridge/lontium-lt9611uxc: fix waiting for EDID to become available drm/bridge/lontium-lt9611uxc: fix get_edid return code drm/bridge/lontium-lt9611uxc: move HPD notification out of IRQ handler George Shen (1): drm/amd/display: Fix DPCD translation for LTTPR AUX_RD_INTERVAL Huang Rui (2): drm/amdgpu: fix the issue that retry constantly once the buffer is oversize drm/amdkfd: fix null pointer panic while free buffer in kfd Imre Deak (4): drm/dp/mst: Export drm_dp_get_vc_payload_bw() drm/i915: Fix the MST PBN divider calculation drm/i915/dp: Move intel_dp_set_signal_levels() to intel_dp_link_training.c drm/i915/dp: Fix LTTPR vswing/pre-emp setting in non-transparent mode Michel Dänzer (1): drm/ttm: Use __GFP_NOWARN for huge pages in ttm_pool_alloc_page Mikita Lipski (1): drm/amd/display: Release DSC before acquiring Stylon Wang (1): drm/amd/display: Revert "Fix EDID parsing after resume from suspend" Sung Lee (1): drm/amd/display: Add more Clock Sources to DCN2.1 Victor Lu (3): drm/amd/display: Fix dc_sink kref count in emulated_link_detect drm/amd/display: Free atomic state after drm_atomic_commit drm/amd/display: Decrement refcount of dc_sink before reassignment Ville Syrjälä (3): drm/i915: Skip vswing programming for TBT drm/i915: Extract intel_ddi_power_up_lanes() drm/i915: Power up combo PHY lane
[no subject]
Hi Linus, Regular fixes for final, there is a ttm regression fix, dp-mst fix, one amdgpu revert, two i915 fixes, and some misc fixes for sun4i, xlnx, and vc4. All pretty quiet and don't think we have any known outstanding regressions. Dave. drm-fixes-2021-02-12: drm fixes for 5.11-rc8 ttm: - page pool regression fix. dp_mst: - Don't report un-attached ports as connected amdgpu: - Blank screen fix i915: - Ensure Type-C FIA is powered when initializing - Fix overlay frontbuffer tracking sun4i: - tcon1 sync polarity fix - Always set HDMI clock rate - Fix H6 HDMI PHY config - Fix H6 max frequency vc4: - Fix buffer overflow xlnx: - Fix memory leak The following changes since commit 92bf22614b21a2706f4993b278017e437f7785b3: Linux 5.11-rc7 (2021-02-07 13:57:38 -0800) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2021-02-12 for you to fetch changes up to 551c81853d6d3ff016269d62612e7cd0a53104ab: Merge branch 'drm-misc-fixes' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes (2021-02-12 13:38:51 +1000) drm fixes for 5.11-rc8 ttm: - page pool regression fix. dp_mst: - Don't report un-attached ports as connected amdgpu: - Blank screen fix i915: - Ensure Type-C FIA is powered when initializing - Fix overlay frontbuffer tracking sun4i: - tcon1 sync polarity fix - Always set HDMI clock rate - Fix H6 HDMI PHY config - Fix H6 max frequency vc4: - Fix buffer overflow xlnx: - Fix memory leak Alex Deucher (1): Revert "drm/amd/display: Update NV1x SR latency values" Christian König (1): drm/ttm: make sure pool pages are cleared Dave Airlie (3): Merge tag 'amd-drm-fixes-5.11-2021-02-10' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes Merge tag 'drm-intel-fixes-2021-02-11' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes Merge branch 'drm-misc-fixes' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes Imre Deak (2): drm/dp_mst: Don't report ports connected if nothing is attached to them drm/i915/tgl+: Make sure TypeC FIA is powered up when initializing it Jernej Skrabec (4): drm/sun4i: tcon: set sync polarity for tcon1 channel drm/sun4i: dw-hdmi: always set clock rate drm/sun4i: Fix H6 HDMI PHY configuration drm/sun4i: dw-hdmi: Fix max. frequency for H6 Maxime Ripard (1): drm/vc4: hvs: Fix buffer overflow with the dlist handling Quanyang Wang (1): drm/xlnx: fix kmemleak by sending vblank_event in atomic_disable Ville Syrjälä (1): drm/i915: Fix overlay frontbuffer tracking .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 4 +- drivers/gpu/drm/drm_dp_mst_topology.c | 1 + drivers/gpu/drm/i915/display/intel_overlay.c | 17 +++--- drivers/gpu/drm/i915/display/intel_tc.c| 67 -- drivers/gpu/drm/sun4i/sun4i_tcon.c | 25 drivers/gpu/drm/sun4i/sun4i_tcon.h | 6 ++ drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 10 +--- drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h | 1 - drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c | 26 +++-- drivers/gpu/drm/ttm/ttm_pool.c | 10 drivers/gpu/drm/vc4/vc4_plane.c| 18 -- drivers/gpu/drm/xlnx/zynqmp_disp.c | 15 +++-- 12 files changed, 122 insertions(+), 78 deletions(-) ___ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
[git pull] drm fixes for 5.11 final
(resent with a subject this time) Hi Linus, Regular fixes for final, there is a ttm regression fix, dp-mst fix, one amdgpu revert, two i915 fixes, and some misc fixes for sun4i, xlnx, and vc4. All pretty quiet and don't think we have any known outstanding regressions. Dave. drm-fixes-2021-02-12: drm fixes for 5.11-rc8 ttm: - page pool regression fix. dp_mst: - Don't report un-attached ports as connected amdgpu: - Blank screen fix i915: - Ensure Type-C FIA is powered when initializing - Fix overlay frontbuffer tracking sun4i: - tcon1 sync polarity fix - Always set HDMI clock rate - Fix H6 HDMI PHY config - Fix H6 max frequency vc4: - Fix buffer overflow xlnx: - Fix memory leak The following changes since commit 92bf22614b21a2706f4993b278017e437f7785b3: Linux 5.11-rc7 (2021-02-07 13:57:38 -0800) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2021-02-12 for you to fetch changes up to 551c81853d6d3ff016269d62612e7cd0a53104ab: Merge branch 'drm-misc-fixes' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes (2021-02-12 13:38:51 +1000) drm fixes for 5.11-rc8 ttm: - page pool regression fix. dp_mst: - Don't report un-attached ports as connected amdgpu: - Blank screen fix i915: - Ensure Type-C FIA is powered when initializing - Fix overlay frontbuffer tracking sun4i: - tcon1 sync polarity fix - Always set HDMI clock rate - Fix H6 HDMI PHY config - Fix H6 max frequency vc4: - Fix buffer overflow xlnx: - Fix memory leak Alex Deucher (1): Revert "drm/amd/display: Update NV1x SR latency values" Christian König (1): drm/ttm: make sure pool pages are cleared Dave Airlie (3): Merge tag 'amd-drm-fixes-5.11-2021-02-10' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes Merge tag 'drm-intel-fixes-2021-02-11' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes Merge branch 'drm-misc-fixes' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes Imre Deak (2): drm/dp_mst: Don't report ports connected if nothing is attached to them drm/i915/tgl+: Make sure TypeC FIA is powered up when initializing it Jernej Skrabec (4): drm/sun4i: tcon: set sync polarity for tcon1 channel drm/sun4i: dw-hdmi: always set clock rate drm/sun4i: Fix H6 HDMI PHY configuration drm/sun4i: dw-hdmi: Fix max. frequency for H6 Maxime Ripard (1): drm/vc4: hvs: Fix buffer overflow with the dlist handling Quanyang Wang (1): drm/xlnx: fix kmemleak by sending vblank_event in atomic_disable Ville Syrjälä (1): drm/i915: Fix overlay frontbuffer tracking .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 4 +- drivers/gpu/drm/drm_dp_mst_topology.c | 1 + drivers/gpu/drm/i915/display/intel_overlay.c | 17 +++--- drivers/gpu/drm/i915/display/intel_tc.c| 67 -- drivers/gpu/drm/sun4i/sun4i_tcon.c | 25 drivers/gpu/drm/sun4i/sun4i_tcon.h | 6 ++ drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 10 +--- drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h | 1 - drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c | 26 +++-- drivers/gpu/drm/ttm/ttm_pool.c | 10 drivers/gpu/drm/vc4/vc4_plane.c| 18 -- drivers/gpu/drm/xlnx/zynqmp_disp.c | 15 +++-- 12 files changed, 122 insertions(+), 78 deletions(-) ___ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PULL] drm-misc-fixes
On Wed, 24 Feb 2021 at 20:27, Thomas Zimmermann wrote: > > Hi Dave and Daniel, > > here's this week's PR for drm-misc-fixes. One of the patches is a memory > leak; the rest is for hardware issues. > This is based on 5.11 and I'm not currently in the market for a backmege now before rc1 so can you just top this up next week? Though maybe the ttm fix should be fast tracked, will contemplate it. Dave. > Best regards > Thomas > > drm-misc-fixes-2021-02-24: > * drm/panel: kd35t133: Work with non-continuous DSI clock > * drm/rockchip: Require YTR modifier for AFBC > * drm/ttm: Fix a memory leak in error handling > The following changes since commit f40ddce88593482919761f74910f42f4b84c004b: > > Linux 5.11 (2021-02-14 14:32:24 -0800) > > are available in the Git repository at: > > git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-fixes-2021-02-24 > > for you to fetch changes up to 54dab3a718f7094532daf7d25cd14121a0e00e34: > > drm/panel: kd35t133: allow using non-continuous dsi clock (2021-02-23 > 22:44:58 +0100) > > > * drm/panel: kd35t133: Work with non-continuous DSI clock > * drm/rockchip: Require YTR modifier for AFBC > * drm/ttm: Fix a memory leak in error handling > > > Alyssa Rosenzweig (1): > drm/rockchip: Require the YTR modifier for AFBC > > Heiko Stuebner (1): > drm/panel: kd35t133: allow using non-continuous dsi clock > > xinhui pan (1): > drm/ttm: Fix a memory leak > > drivers/gpu/drm/panel/panel-elida-kd35t133.c | 3 ++- > drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 11 +++ > drivers/gpu/drm/ttm/ttm_bo.c | 9 ++--- > 3 files changed, 19 insertions(+), 4 deletions(-) > > -- > Thomas Zimmermann > Graphics Driver Developer > SUSE Software Solutions Germany GmbH > Maxfeldstr. 5, 90409 Nürnberg, Germany > (HRB 36809, AG Nürnberg) > Geschäftsführer: Felix Imendörffer ___ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
[git pull] drm fixes + msm-next for 5.12-rc1
Hi Linus, Hope power/internet are back on fully! This is fixes but I missed msm-next pull last week. It's been in drm-next anyways so shouldn't be a problem. Otherwise it's a selection of i915, amdgpu and misc fixes, one TTM memory leak, nothing really major stands out otherwise. Dave. drm-next-2021-02-26: drm fixes for 5.12-rc1 + msm-next core: - vblank fence timing improvements dma-buf: - improve error handling ttm: - memory leak fix msm: - a6xx speedbin support - a508, a509, a512 support - various a5xx fixes - various dpu fixes - qseed3lite support for sm8250 - dsi fix for msm8994 - mdp5 fix for framerate bug with cmd mode panels - a6xx GMU OOB race fixes that were showing up in CI - various addition and removal of semicolons - gem submit fix for legacy userspace relocs path amdgpu: - Clang warning fix - S0ix platform shutdown/poweroff fix - Misc display fixes i915: - color format fix - -Wuninitialised reenabled - GVT ww locking, cmd parser fixes atyfb: - fix build rockchip: - AFBC modifier fix The following changes since commit f730f39eb981af249d57336b47cfe3925632a7fd: Merge tag 'drm-intel-next-fixes-2021-02-18' of git://anongit.freedesktop.org/drm/drm-intel into drm-next (2021-02-19 13:55:07 +1000) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/drm-next-2021-02-26 for you to fetch changes up to d153e8c156dafeb847fd655f416cf81c007e8706: Merge tag 'drm-intel-next-fixes-2021-02-25' of git://anongit.freedesktop.org/drm/drm-intel into drm-next (2021-02-26 05:08:51 +1000) drm fixes for 5.12-rc1 + msm-next core: - vblank fence timing improvements dma-buf: - improve error handling ttm: - memory leak fix msm: - a6xx speedbin support - a508, a509, a512 support - various a5xx fixes - various dpu fixes - qseed3lite support for sm8250 - dsi fix for msm8994 - mdp5 fix for framerate bug with cmd mode panels - a6xx GMU OOB race fixes that were showing up in CI - various addition and removal of semicolons - gem submit fix for legacy userspace relocs path amdgpu: - Clang warning fix - S0ix platform shutdown/poweroff fix - Misc display fixes i915: - color format fix - -Wuninitialised reenabled - GVT ww locking, cmd parser fixes atyfb: - fix build rockchip: - AFBC modifier fix Akhil P Oommen (1): drm/msm: Add speed-bin support to a618 gpu Alyssa Rosenzweig (1): drm/rockchip: Require the YTR modifier for AFBC AngeloGioacchino Del Regno (16): drm/msm/a5xx: Allow all patchid for A540 chip drm/msm/a5xx: Remove overwriting A5XX_PC_DBG_ECO_CNTL register drm/msm/a5xx: Separate A5XX_PC_DBG_ECO_CNTL write from main branch drm/msm/a5xx: Add support for Adreno 508, 509, 512 GPUs drm/msm/a5xx: Reset VBIF before PC only on A510 and A530 drm/msm/dpu: Fix VBIF_XINL_QOS_LVL_REMAP_000 register offset drm/msm/dpu: Move DPU_SSPP_QOS_8LVL bit to SDM845 and SC7180 masks drm/msm/dpu: Add prog_fetch_lines_worst_case to INTF_BLK macro drm/msm/dpu: Allow specifying features and sblk in DSPP_BLK macro drm/msm/dpu: Disable autorefresh in command mode drm/msm/dpu: Correctly configure vsync tearcheck for command mode drm/msm/dpu: Remove unused call in wait_for_commit_done drm/msm/dsi_pll_10nm: Fix dividing the same numbers twice drm/msm/dsi_pll_10nm: Solve TODO for multiplier frac_bits assignment drm/msm/dsi_pll_10nm: Fix variable usage for pll_lockdet_rate drm/msm/dsi_pll_10nm: Convert pr_err prints to DRM_DEV_ERROR Anson Jacob (1): Revert "drm/amd/display: reuse current context instead of recreating one" Bernard Zhao (1): drm/msm: remove unneeded variable: "rc" Bjorn Andersson (1): dt-bindings: dp-connector: Drop maxItems from -supply Chris Wilson (2): drm/i915/gvt: Parse default state to update reg whitelist drm/i915/gvt: Purge dev_priv->gt Dave Airlie (4): Merge tag 'drm-msm-next-2021-02-07' of https://gitlab.freedesktop.org/drm/msm into drm-next Merge tag 'drm-misc-next-fixes-2021-02-25' of git://anongit.freedesktop.org/drm/drm-misc into drm-next Merge tag 'amd-drm-fixes-5.12-2021-02-24' of https://gitlab.freedesktop.org/agd5f/linux into drm-next Merge tag 'drm-intel-next-fixes-2021-02-25' of git://anongit.freedesktop.org/drm/drm-intel into drm-next Dmitry Baryshkov (1): drm/msm/dpu1: add support for qseed3lite used on sm8250 Eric Anholt (3): drm/msm: Fix race of GPU init vs timestamp power management. drm/msm: Fix races managing the OOB state for timestamp vs timestamps. drm/msm: Clean up GMU OOB set/clear handling. Eric Bernstein (1): drm/amd/display: Remove Assert from dcn10_get_dig_frontend Heiko Stuebner (1): drm/panel: kd35t133: allow usin
Re: [PATCH] drm/ttm: ioremap buffer according to TTM mem caching setting
On Wed, 3 Mar 2021 at 08:45, Zeng, Oak wrote: > > [AMD Official Use Only - Internal Distribution Only] > > > Hi Daniel, Thomas, Dan, > > > > Does below message mean the calling ioremap_cache failed intel’s driver > build? I can see both ioremap_cache and ioremap_wc are defined in > arch/x86/mm/ioremap.c – why ioremap_wc doesn’t break intel driver’s build? Just to clear up confusion here, the linux kernel robot is hosted by Intel it does not test intel driver builds exclusively, it tests a lot of different builds across lots of different architectures,. If the robot complains it's because your patch breaks in the configuration it describes, take the time to read that configuration info and realise it's nothing to do with Intel at all. Dave. ___ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
[git pull] drm fixes for 5.12-rc2
Hi Linus, More may show up but this is what I have at this staged. These are based on the commit in your tree where the swapfile issue is fixed, and neither of the merged trees are in the bad area. Otherwise just a single nouveau regression fix, and a bunch of amdgpu fixes. Dave. drm-fixes-2021-03-05: drm fixes for 5.12-rc2 amdgpu: - S0ix fix - Handle new NV12 SKU - Misc power fixes - Display uninitialized value fix - PCIE debugfs register access fix nouveau: - regression fix for gk104 The following changes since commit f69d02e37a85645aa90d18cacfff36dba370f797: Merge tag 'misc-5.12-2021-03-02' of git://git.kernel.dk/linux-block (2021-03-02 18:18:17 -0800) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2021-03-05 for you to fetch changes up to a1f1054124936c717a64e47862e3d0d820f67a87: Merge tag 'amd-drm-fixes-5.12-2021-03-03' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes (2021-03-05 11:13:22 +1000) drm fixes for 5.12-rc2 amdgpu: - S0ix fix - Handle new NV12 SKU - Misc power fixes - Display uninitialized value fix - PCIE debugfs register access fix nouveau: - regression fix for gk104 Alex Deucher (4): drm/amdgpu: Only check for S0ix if AMD_PMC is configured drm/amdgpu/pm: make unsupported power profile messages debug drm/amdgpu/swsmu/vangogh: Only use RLCPowerNotify msg for disable drm/amdgpu: enable BACO runpm by default on sienna cichlid and navy flounder Asher.Song (1): drm/amdgpu:disable VCN for Navi12 SKU Ben Skeggs (1): drm/nouveau/fifo/gk104-gp1xx: fix creation of sw class Colin Ian King (1): drm/amd/display: fix the return of the uninitialized value in ret Dave Airlie (2): Merge branch '00.00-inst' of git://github.com/skeggsb/linux into drm-fixes Merge tag 'amd-drm-fixes-5.12-2021-03-03' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes Evan Quan (1): drm/amd/pm: correct Arcturus mmTHM_BACO_CNTL register address Kevin Wang (1): drm/amdgpu: fix parameter error of RREG32_PCIE() in amdgpu_regs_pcie drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 3 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 2 -- drivers/gpu/drm/amd/amdgpu/nv.c | 6 -- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 2 +- drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 2 +- drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c| 15 --- drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 6 +++--- drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 2 +- drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c | 3 +++ 10 files changed, 29 insertions(+), 16 deletions(-) ___ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
[PATCH] drm/nouveau: fix dma syncing for loops
From: Dave Airlie
The index variable should only be increased in one place.
Noticed this while trying to track down another oops.
Fixes: f295c8cfec83 ("drm/nouveau: fix dma syncing warning with debugging on.")
Signed-off-by: Dave Airlie
---
drivers/gpu/drm/nouveau/nouveau_bo.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c
b/drivers/gpu/drm/nouveau/nouveau_bo.c
index 2375711877cf..4f693843def5 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -556,7 +556,7 @@ nouveau_bo_sync_for_device(struct nouveau_bo *nvbo)
if (nvbo->force_coherent)
return;
- for (i = 0; i < ttm_dma->num_pages; ++i) {
+ for (i = 0; i < ttm_dma->num_pages;) {
struct page *p = ttm_dma->pages[i];
size_t num_pages = 1;
@@ -587,7 +587,7 @@ nouveau_bo_sync_for_cpu(struct nouveau_bo *nvbo)
if (nvbo->force_coherent)
return;
- for (i = 0; i < ttm_dma->num_pages; ++i) {
+ for (i = 0; i < ttm_dma->num_pages;) {
struct page *p = ttm_dma->pages[i];
size_t num_pages = 1;
--
2.27.0
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
don't base trees on 5.12-rc1
Hey maintainers, I'm mostly sending this to the -misc maintainers because drm-misc-fixes is based on rc1 at present. This needs to be *rebased* not merged up to 5.12-rc2. Merging will still have the bad landmine commits in the bisect history. This is a very special case. But otherwise to any other maintainers reading this, please avoid 5.12-rc1 as the base for any trees for this cycle. Dave. ___ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: don't base trees on 5.12-rc1
On Wed, 10 Mar 2021 at 17:48, Maxime Ripard wrote: > > Hi Dave, > > On Wed, Mar 10, 2021 at 09:50:29AM +1000, Dave Airlie wrote: > > I'm mostly sending this to the -misc maintainers because > > drm-misc-fixes is based on rc1 at present. > > > > This needs to be *rebased* not merged up to 5.12-rc2. Merging will > > still have the bad landmine commits in the bisect history. This is a > > very special case. > > I'm sorry, I'm not entirely sure I get this. -rc1 is still in the -rc2 > history, so how would that change anything in the bisect history? > We can't get rid of the bad commit range, we can reduce the amount of times someone accidentally bisects into it, by not using it as a base commit for future changes. If in the future a bisect happens to want to test one of the patches in drm-misc-fixes that is based on rc1, it will land the user with an rc1 test kernel and could eat their swapfile/disk. We can avoid that problem by not using rc1 as a base for drm-misc-fixes. We can't avoid them bisecting into the broken commits between when this landed and was fixed, but rebasing trees can minimise the chances of this when bisecting other changesets. Dave. ___ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
[PATCH] drm/nouveau: fix dma syncing for loops (v2)
From: Dave Airlie
The index variable should only be increased in one place.
Noticed this while trying to track down another oops.
v2: use while loop.
Fixes: f295c8cfec83 ("drm/nouveau: fix dma syncing warning with debugging on.")
Signed-off-by: Dave Airlie
---
drivers/gpu/drm/nouveau/nouveau_bo.c | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c
b/drivers/gpu/drm/nouveau/nouveau_bo.c
index 2375711877cf..fabb314a0b2f 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -556,7 +556,8 @@ nouveau_bo_sync_for_device(struct nouveau_bo *nvbo)
if (nvbo->force_coherent)
return;
- for (i = 0; i < ttm_dma->num_pages; ++i) {
+ i = 0;
+ while (i < ttm_dma->num_pages) {
struct page *p = ttm_dma->pages[i];
size_t num_pages = 1;
@@ -587,7 +588,8 @@ nouveau_bo_sync_for_cpu(struct nouveau_bo *nvbo)
if (nvbo->force_coherent)
return;
- for (i = 0; i < ttm_dma->num_pages; ++i) {
+ i = 0;
+ while (i < ttm_dma->num_pages) {
struct page *p = ttm_dma->pages[i];
size_t num_pages = 1;
--
2.27.0
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [Intel-gfx] [PATCH] i915: Drop legacy execbuffer support
On Thu, 11 Mar 2021 at 08:04, Keith Packard wrote: > > Jason Ekstrand writes: > > > libdrm has supported the newer execbuffer2 ioctl and using it by default > > when it exists since libdrm commit b50964027bef249a0cc3d511de05c2464e0a1e22 > > which landed Mar 2, 2010. The i915 and i965 drivers in Mesa at the time > > both used libdrm and so did the Intel X11 back-end. The SNA back-end > > for X11 has always used execbuffer2. > > All execbuffer users in the past that I'm aware of used libdrm, which > now uses the execbuffer2 ioctl for this API. That means these > applications will remain ABI compatible through this change. > > Acked-by: Keith Packard Acked-by: Dave Airlie Dave. ___ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
[git pull] drm fixes for 5.12-rc3
Hi Linus,
Regular fixes for rc3. The i915 pull was based on the rc1 tag so I
just cherry-picked the single fix from there to avoid it. The misc and
amd trees seem to be on okay bases.
It's a bunch of fixes across the tree, amdgpu has most of them a few
ttm fixes around qxl, and nouveau.
Dave.
drm-fixes-2021-03-12-1:
drm fixes for 5.12-rc3
core:
- Clear holes when converting compat ioctl's between 32-bits and 64-bits.
docs:
- Use gitlab for drm bugzilla now.
ttm:
- Fix ttm page pool accounting.
fbdev:
- Fix oops in drm_fbdev_cleanup()
shmem:
- Assorted fixes for shmem helpers.
qxl:
- unpin qxl bos created as pinned when freeing them,
and make ttm only warn once on this behavior.
- Zero head.surface_id correctly in qxl.
atyfb:
- Use LCD management for atyfb on PPC_MAC.
meson:
- Shutdown kms poll helper in meson correctly.
nouveau:
- fix regression in bo syncing
i915:
- Wedge the GPU if command parser setup fails
amdgpu:
- Fix aux backlight control
- Add a backlight override parameter
- Various display fixes
- PCIe DPM fix for vega
- Polaris watermark fixes
- Additional S0ix fix
radeon:
- Fix GEM regression
- Fix AGP dependency handling
The following changes since commit a38fd8748464831584a19438cbb3082b5a2dab15:
Linux 5.12-rc2 (2021-03-05 17:33:41 -0800)
are available in the Git repository at:
git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2021-03-12-1
for you to fetch changes up to 4042160c2e5433e0759782c402292a90b5bf458d:
drm/nouveau: fix dma syncing for loops (v2) (2021-03-12 11:21:47 +1000)
drm fixes for 5.12-rc3
core:
- Clear holes when converting compat ioctl's between 32-bits and 64-bits.
docs:
- Use gitlab for drm bugzilla now.
ttm:
- Fix ttm page pool accounting.
fbdev:
- Fix oops in drm_fbdev_cleanup()
shmem:
- Assorted fixes for shmem helpers.
qxl:
- unpin qxl bos created as pinned when freeing them,
and make ttm only warn once on this behavior.
- Zero head.surface_id correctly in qxl.
atyfb:
- Use LCD management for atyfb on PPC_MAC.
meson:
- Shutdown kms poll helper in meson correctly.
nouveau:
- fix regression in bo syncing
i915:
- Wedge the GPU if command parser setup fails
amdgpu:
- Fix aux backlight control
- Add a backlight override parameter
- Various display fixes
- PCIe DPM fix for vega
- Polaris watermark fixes
- Additional S0ix fix
radeon:
- Fix GEM regression
- Fix AGP dependency handling
Alex Deucher (4):
drm/amdgpu/display: simplify backlight setting
drm/amdgpu/display: don't assert in set backlight function
drm/amdgpu/display: handle aux backlight in backlight_get_brightness
drm/amdgpu: fix S0ix handling when the CONFIG_AMD_PMC=m
Anthony DeRossi (1):
drm/ttm: Fix TTM page pool accounting
Artem Lapkin (1):
drm: meson_drv add shutdown function
Christian König (3):
drm/radeon: also init GEM funcs in radeon_gem_prime_import_sg_table
drm/radeon: fix AGP dependency
drm/ttm: soften TTM warnings
Colin Ian King (1):
qxl: Fix uninitialised struct field head.surface_id
Daniel Vetter (1):
drm/compat: Clear bounce structures
Dave Airlie (3):
Merge tag 'drm-misc-fixes-2021-03-11' of
git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
Merge tag 'amd-drm-fixes-5.12-2021-03-10' of
https://gitlab.freedesktop.org/agd5f/linux into drm-fixes
drm/nouveau: fix dma syncing for loops (v2)
Dillon Varone (1):
drm/amd/display: Enabled pipe harvesting in dcn30
Evan Quan (1):
drm/amd/pm: correct the watermark settings for Polaris
Gerd Hoffmann (2):
drm/qxl: unpin release objects
drm/qxl: fix lockdep issue in qxl_alloc_release_reserved
Holger Hoffstätte (2):
drm/amd/display: Fix nested FPU context in dcn21_validate_bandwidth()
drm/amdgpu/display: use GFP_ATOMIC in dcn21_validate_bandwidth_fp()
Kenneth Feng (1):
drm/amd/pm: bug fix for pcie dpm
Neil Roberts (2):
drm/shmem-helper: Check for purged buffers in fault handler
drm/shmem-helper: Don't remove the offset in vm_area_struct pgoff
Nirmoy Das (1):
drm/amdgpu: fb BO should be ttm_bo_type_device
Noralf Trønnes (1):
drm/shmem-helpers: vunmap: Don't put pages for dma-buf
Pavel Turinský (1):
MAINTAINERS: update drm bug reporting URL
Qingqing Zhuo (1):
drm/amd/display: Enable pflip interrupt upon pipe enable
Randy Dunlap (2):
fbdev: atyfb: always declare aty_{ld,st}_lcd()
fbdev: atyfb: use LCD management functions for PPC_PMAC also
Sung Lee (1):
drm/amd/display: Revert dram_clock_change_latency for DCN2.1
Takashi Iwai (1):
drm/amd/display: Add a backlight module option
Thomas Zimmermann (1):
drm: Use USB controller's DMA mask when importing dmabufs
Tong Zhang (1):
drm/fb-helper: only unmap if buffer not nul
Re: [PULL] drm-intel-fixes
On Thu, 11 Mar 2021 at 21:28, Rodrigo Vivi wrote: > > Hi Dave and Daniel, > > Things are very quiet. Only 1 fix this round. > Since I will be out next week, if this trend continues I will > accumulate 2 weeks and send when in -rc4. > > Here goes drm-intel-fixes-2021-03-11: > > - Wedge the GPU if command parser setup fails (Tvrtko) > > Thanks, > Rodrigo. > > The following changes since commit fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8: > > Linux 5.12-rc1 (2021-02-28 16:05:19 -0800) This was based on 5.12-rc1 against my request earlier in the week to not do that. but since it was a single patch I just cherry-picked it across. Can we make sure no fixes or next based on rc1 arrive please. Dave. ___ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
[git pull] drm fixes round two for 5.13-rc1
Hey Linus, Bit later than usual, I queued them all up on Friday then promptly forgot to write the pull request email. This is mainly amdgpu fixes, with some radeon/msm/fbdev and one i915 gvt fix thrown in. Hopefully I get you before you drop rc1, but nothing insanely urgent if not. Dave. drm-next-2021-05-10: drm fixes for 5.13-rc1 amdgpu: - MPO hang workaround - Fix for concurrent VM flushes on vega/navi - dcefclk is not adjustable on navi1x and newer - MST HPD debugfs fix - Suspend/resumes fixes - Register VGA clients late in case driver fails to load - Fix GEM leak in user framebuffer create - Add support for polaris12 with 32 bit memory interface - Fix duplicate cursor issue when using overlay - Fix corruption with tiled surfaces on VCN3 - Add BO size and stride check to fix BO size verification radeon: - Fix off-by-one in power state parsing - Fix possible memory leak in power state parsing msm: - NULL ptr dereference fix fbdev: - procfs disabled warning fix i915: - gvt: Fix a possible division by zero in vgpu display rate calculation The following changes since commit 1cd6b4a04f038eb24fd18c8010e763d1140a9c7a: Merge tag 'drm-intel-next-fixes-2021-04-27' of git://anongit.freedesktop.org/drm/drm-intel into drm-next (2021-04-30 10:42:03 +1000) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/drm-next-2021-05-10 for you to fetch changes up to 0844708ac3d2dbdace70f4a6020669d56958697f: Merge tag 'amd-drm-fixes-5.13-2021-05-05' of https://gitlab.freedesktop.org/agd5f/linux into drm-next (2021-05-07 12:44:51 +1000) drm fixes for 5.13-rc1 amdgpu: - MPO hang workaround - Fix for concurrent VM flushes on vega/navi - dcefclk is not adjustable on navi1x and newer - MST HPD debugfs fix - Suspend/resumes fixes - Register VGA clients late in case driver fails to load - Fix GEM leak in user framebuffer create - Add support for polaris12 with 32 bit memory interface - Fix duplicate cursor issue when using overlay - Fix corruption with tiled surfaces on VCN3 - Add BO size and stride check to fix BO size verification radeon: - Fix off-by-one in power state parsing - Fix possible memory leak in power state parsing msm: - NULL ptr dereference fix fbdev: - procfs disabled warning fix i915: - gvt: Fix a possible division by zero in vgpu display rate calculation Bas Nieuwenhuizen (2): drm/amdgpu: Init GFX10_ADDR_CONFIG for VCN v3 in DPG mode. drm/amdgpu: Use device specific BO size & stride check. Christian König (1): drm/amdgpu: fix concurrent VM flushes on Vega/Navi v2 Colin Xu (1): drm/i915/gvt: Prevent divided by zero when calculating refresh rate Darren Powell (2): amdgpu/pm: Prevent force of DCEFCLK on NAVI10 and SIENNA_CICHLID amdgpu/pm: set pp_dpm_dcefclk to readonly on NAVI10 and newer gpus Dave Airlie (3): Merge tag 'drm-intel-next-fixes-2021-04-30' of git://anongit.freedesktop.org/drm/drm-intel into drm-next Merge tag 'drm-misc-next-fixes-2021-05-06' of git://anongit.freedesktop.org/drm/drm-misc into drm-next Merge tag 'amd-drm-fixes-5.13-2021-05-05' of https://gitlab.freedesktop.org/agd5f/linux into drm-next Evan Quan (1): drm/amdgpu: add new MC firmware for Polaris12 32bit ASIC Guenter Roeck (1): fbmem: Mark proc_fb_seq_ops as __maybe_unused Harry Wentland (1): drm/amd/display: Reject non-zero src_y and src_x for video planes Jani Nikula (1): Merge tag 'gvt-next-fixes-2021-04-29' of https://github.com/intel/gvt-linux into drm-intel-next-fixes Kai-Heng Feng (1): drm/amdgpu: Register VGA clients after init can no longer fail Kees Cook (2): drm/radeon: Fix off-by-one power_state index heap overwrite drm/radeon: Avoid power table parsing memory leaks Mikita Lipski (1): drm/amd/display: fix wrong statement in mst hpd debugfs Pavan Kumar Ramayanam (1): drm/amdgpu: Handling of amdgpu_device_resume return value for graceful teardown Rob Clark (1): drm/msm/dpu: Delete bonkers code Rodrigo Siqueira (1): drm/amd/display: Fix two cursor duplication when using overlay Simon Ser (1): amdgpu: fix GEM obj leak in amdgpu_display_user_framebuffer_create Tom Rix (1): drm/amd/pm: initialize variable Victor Zhao (1): drm/amdgpu: fix r initial values drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 28 ++-- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c| 184 - drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c| 3 + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c| 19 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 6 + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 1 + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 13 +- drivers/gpu/drm/amd/amdgpu/vcn_v3
Re: [git pull] drm fixes round two for 5.13-rc1
On Mon, 10 May 2021 at 07:08, Linus Torvalds
wrote:
>
> On Sun, May 9, 2021 at 11:16 AM Dave Airlie wrote:
> >
> > Bit later than usual, I queued them all up on Friday then promptly
> > forgot to write the pull request email. This is mainly amdgpu fixes,
> > with some radeon/msm/fbdev and one i915 gvt fix thrown in.
>
> Hmm. Gcc seems ok with this, but clang complains:
>
>drivers/video/fbdev/core/fbmem.c:736:21: warning: attribute
> declaration must precede definition [-Wignored-attributes]
>static const struct __maybe_unused seq_operations proc_fb_seq_ops = {
>^
>
> but I noticed it only after I had already pushed out the pull.
>
> I'm actually surprised that gcc accepted that horrid mess: putting
> "__maybe_unused" between the "struct" and the struct name is very very
> wrong.
>
> I fixed it up after the merge due to not noticing earlier..
>
> Maybe the drm test robots should start testing with clang too?
My current build, test + sign machine " 09:23:22 up 419 days", running
fc29, has clang 7 which is my current blocker on implementing a clang
bit in my build cycles.
The machine is in an office, that due to RH not being able to fathom a
country where COVID isn't rampant, I have to fill insane amounts of
paperwork and high management intervention to visit, I'm afraid to
remote upgrade or reboot it unless I really have to.
I've some rough ideas to update it to f33/34 which would give me a
good enough clang, I suppose I could just build my own llvm/clang I've
done so for years for other reasons, if I can't come up with an update
plan soon I might consider it.
Dave.
Re: [PATCH] drm/nouveau: Remove invalid reference to struct drm_device.pdev
On Thu, 13 May 2021 at 04:55, Thomas Zimmermann wrote:
>
> The pdev field got removed from struct drm_device recently. Replace
> the invalid reference with an upcast from the struct's dev field.
>
> Signed-off-by: Thomas Zimmermann
> Reported-by: Stephen Rothwell
> Fixes: b347e04452ff ("drm: Remove pdev field from struct drm_device")
> Cc: Thomas Zimmermann
> Cc: Maxime Ripard
> Cc: Maarten Lankhorst
> Cc: Maxime Ripard
> Cc: David Airlie
> Cc: Daniel Vetter
> Cc: dri-devel@lists.freedesktop.org
Reviewed-by: Dave Airlie
> ---
> This patch should be merged through drm-misc-next.
please land asap.
Thanks,
Dave.
> ---
> drivers/gpu/drm/nouveau/nouveau_connector.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c
> b/drivers/gpu/drm/nouveau/nouveau_connector.c
> index 7f38788a6c2b..2a298c171d4d 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_connector.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
> @@ -460,7 +460,8 @@ nouveau_connector_of_detect(struct drm_connector
> *connector)
> struct drm_device *dev = connector->dev;
> struct nouveau_connector *nv_connector = nouveau_connector(connector);
> struct nouveau_encoder *nv_encoder;
> - struct device_node *cn, *dn = pci_device_to_OF_node(dev->pdev);
> + struct pci_dev *pdev = to_pci_dev(dev->dev);
> + struct device_node *cn, *dn = pci_device_to_OF_node(pdev);
>
> if (!dn ||
> !((nv_encoder = find_encoder(connector, DCB_OUTPUT_TMDS)) ||
> --
> 2.31.1
>
[git pull] drm fixes for 5.13-rc2
Hi Linus, Just realised I got the tag header wrong, these are the rc2 fixes. Not much here, mostly amdgpu fixes, with a couple of radeon, and a cosmetic vc4. Two MAINTAINER file updates also. Dave. drm-fixes-2021-05-14: drm fixes for 5.13-rc1 two MAINTAINERS updates. amdgpu: - Fixes for flexible array conversions - Fix sysfs attribute init - Harvesting fixes - VCN CG/PG fixes for Picasso radeon: - Fixes for flexible array conversions - Fix for flickering on Oland with multiple 4K displays vc4: - drop unused function The following changes since commit 6efb943b8616ec53a5e444193dccf1af9ad627b5: Linux 5.13-rc1 (2021-05-09 14:17:44 -0700) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2021-05-14 for you to fetch changes up to 08f0cfbf739a5086995f0779bbcb607163128a9a: Merge tag 'amd-drm-fixes-5.13-2021-05-13' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes (2021-05-14 09:20:04 +1000) drm fixes for 5.13-rc1 two MAINTAINERS updates. amdgpu: - Fixes for flexible array conversions - Fix sysfs attribute init - Harvesting fixes - VCN CG/PG fixes for Picasso radeon: - Fixes for flexible array conversions - Fix for flickering on Oland with multiple 4K displays vc4: - drop an used function Daniel Vetter (1): MAINTAINERS: Update address for Emma Anholt Dave Airlie (2): Merge tag 'drm-misc-fixes-2021-05-13' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes Merge tag 'amd-drm-fixes-5.13-2021-05-13' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes David Ward (1): drm/amd/display: Initialize attribute for hdcp_srm sysfs file Gustavo A. R. Silva (3): drm/radeon/ni_dpm: Fix booting bug drm/radeon/si_dpm: Fix SMU power state load drm/amd/pm: Fix out-of-bounds bug Jernej Skrabec (1): MAINTAINERS: Update my e-mail Jiapeng Chong (1): drm/vc4: remove unused function Kai-Heng Feng (1): drm/radeon/dpm: Disable sclk switching on Oland when two 4K 60Hz monitors are connected Likun GAO (1): drm/amdgpu: add judgement when add ip blocks (v2) Likun Gao (1): drm/amdgpu: update the method for harvest IP for specific SKU Maxime Ripard (1): Merge drm/drm-fixes into drm-misc-fixes Sathishkumar S (2): drm/amdgpu: set vcn mgcg flag for picasso drm/amdgpu: update vcn1.0 Non-DPG suspend sequence xinhui pan (1): drm/ttm: Do not add non-system domain BO into swap list .mailmap | 1 + MAINTAINERS| 18 +-- drivers/gpu/drm/amd/amdgpu/amdgpu.h| 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 15 +- drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 28 drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h | 1 + drivers/gpu/drm/amd/amdgpu/nv.c| 38 +++-- drivers/gpu/drm/amd/amdgpu/soc15.c | 3 +- drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 13 +- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 1 + drivers/gpu/drm/amd/include/amd_shared.h | 6 + drivers/gpu/drm/amd/pm/powerplay/si_dpm.c | 174 ++-- drivers/gpu/drm/amd/pm/powerplay/sislands_smc.h| 34 ++-- drivers/gpu/drm/radeon/ni_dpm.c| 144 - drivers/gpu/drm/radeon/nislands_smc.h | 34 ++-- drivers/gpu/drm/radeon/radeon.h| 1 + drivers/gpu/drm/radeon/radeon_pm.c | 8 + drivers/gpu/drm/radeon/si_dpm.c| 177 +++-- drivers/gpu/drm/radeon/sislands_smc.h | 34 ++-- drivers/gpu/drm/vc4/vc4_vec.c | 6 - 20 files changed, 419 insertions(+), 318 deletions(-)
[git pull] drm fixes for 5.13-rc2 (part two)
Hey, Looks like I wasn't the only one not fully switched on this week, the msm pull has a missing tag so I missed it, and i915 team were a bit late. In my defence I did have a day with the roof of my home office removed, so was sitting at my kids desk. Dave. drm-fixes-2021-05-15: drm fixes for 5.13-rc2 (part two) msm: - dsi regression fix - dma-buf pinning fix - displayport fixes - llc fix i915: - Fix active callback alignment annotations and subsequent crashes - Retract link training strategy to slow and wide, again - Avoid division by zero on gen2 - Use correct width reads for C0DRB3/C1DRB3 registers - Fix double free in pdp allocation failure path - Fix HDMI 2.1 PCON downstream caps check The following changes since commit 08f0cfbf739a5086995f0779bbcb607163128a9a: Merge tag 'amd-drm-fixes-5.13-2021-05-13' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes (2021-05-14 09:20:04 +1000) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2021-05-15 for you to fetch changes up to 5dce58de4be8a4c9f2af3beed3ee9813933a0583: Merge tag 'drm-msm-fixes-2021-05-09' of https://gitlab.freedesktop.org/drm/msm into drm-fixes (2021-05-15 06:52:15 +1000) drm fixes for 5.13-rc2 (part two) msm: - dsi regression fix - dma-buf pinning fix - displayport fixes - llc fix i915: - Fix active callback alignment annotations and subsequent crashes - Retract link training strategy to slow and wide, again - Avoid division by zero on gen2 - Use correct width reads for C0DRB3/C1DRB3 registers - Fix double free in pdp allocation failure path - Fix HDMI 2.1 PCON downstream caps check Ankit Nautiyal (1): drm/i915: Use correct downstream caps for check Src-Ctl mode for PCON Dave Airlie (2): Merge tag 'drm-intel-fixes-2021-05-14' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes Merge tag 'drm-msm-fixes-2021-05-09' of https://gitlab.freedesktop.org/drm/msm into drm-fixes Dmitry Baryshkov (2): drm/msm/dsi: dsi_phy_28nm_8960: fix uninitialized variable access drm/msm/dsi: fix msm_dsi_phy_get_clk_provider return code Jonathan Marek (2): drm/msm: fix LLC not being enabled for mmu500 targets drm/msm: fix minor version to indicate MSM_PARAM_SUSPENDS support Kai-Heng Feng (1): drm/i915/dp: Use slow and wide link training for everything Kuogee Hsieh (2): drm/msm/dp: check sink_count before update is_connected status drm/msm/dp: initialize audio_comp when audio starts Lv Yunlong (1): drm/i915/gt: Fix a double free in gen8_preallocate_top_level_pdp Rob Clark (1): drm/msm: Do not unpin/evict exported dma-buf's Stéphane Marchesin (1): drm/i915: Fix crash in auto_retire Tvrtko Ursulin (1): drm/i915/overlay: Fix active retire callback alignment Ville Syrjälä (2): drm/i915: Avoid div-by-zero on gen2 drm/i915: Read C0DRB3/C1DRB3 as 16 bits again drivers/gpu/drm/i915/display/intel_dp.c | 61 +++-- drivers/gpu/drm/i915/display/intel_overlay.c| 2 +- drivers/gpu/drm/i915/gem/i915_gem_mman.c| 2 +- drivers/gpu/drm/i915/gt/gen8_ppgtt.c| 1 - drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c| 4 +- drivers/gpu/drm/i915/i915_active.c | 3 +- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 9 ++-- drivers/gpu/drm/msm/dp/dp_audio.c | 1 + drivers/gpu/drm/msm/dp/dp_display.c | 26 +++ drivers/gpu/drm/msm/dp/dp_display.h | 1 + drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 2 +- drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c | 4 ++ drivers/gpu/drm/msm/msm_drv.c | 2 +- drivers/gpu/drm/msm/msm_gem.c | 16 ++- drivers/gpu/drm/msm/msm_gem.h | 4 +- 15 files changed, 59 insertions(+), 79 deletions(-)
Re: [PATCH v3 00/14] Driver of Intel(R) Gaussian & Neural Accelerator
On Mon, 17 May 2021 at 19:12, Daniel Vetter wrote: > > On Mon, May 17, 2021 at 10:55 AM Greg Kroah-Hartman > wrote: > > > > On Mon, May 17, 2021 at 10:49:09AM +0200, Daniel Vetter wrote: > > > On Mon, May 17, 2021 at 10:00 AM Greg Kroah-Hartman > > > wrote: > > > > > > > > On Mon, May 17, 2021 at 09:40:53AM +0200, Daniel Vetter wrote: > > > > > On Fri, May 14, 2021 at 11:00:38AM +0200, Arnd Bergmann wrote: > > > > > > On Fri, May 14, 2021 at 10:34 AM Greg Kroah-Hartman > > > > > > wrote: > > > > > > > On Thu, May 13, 2021 at 01:00:26PM +0200, Maciej Kwapulinski > > > > > > > wrote: > > > > > > > > Dear kernel maintainers, > > > > > > > > > > > > > > > > This submission is a kernel driver to support Intel(R) Gaussian > > > > > > > > & Neural > > > > > > > > Accelerator (Intel(R) GNA). Intel(R) GNA is a PCI-based neural > > > > > > > > co-processor > > > > > > > > available on multiple Intel platforms. AI developers and users > > > > > > > > can offload > > > > > > > > continuous inference workloads to an Intel(R) GNA device in > > > > > > > > order to free > > > > > > > > processor resources and save power. Noise reduction and speech > > > > > > > > recognition > > > > > > > > are the examples of the workloads Intel(R) GNA deals with while > > > > > > > > its usage > > > > > > > > is not limited to the two. > > > > > > > > > > > > > > How does this compare with the "nnpi" driver being proposed here: > > > > > > > > > > > > > > https://lore.kernel.org/r/20210513085725.45528-1-guy.zadica...@intel.com > > > > > > > > > > > > > > Please work with those developers to share code and userspace api > > > > > > > and > > > > > > > tools. Having the community review two totally different apis and > > > > > > > drivers for the same type of functionality from the same company > > > > > > > is > > > > > > > totally wasteful of our time and energy. > > > > > > > > > > > > Agreed, but I think we should go further than this and work towards > > > > > > a > > > > > > subsystem across companies for machine learning and neural networks > > > > > > accelerators for both inferencing and training. > > > > > > > > > > We have, it's called drivers/gpu. Feel free to rename to drivers/xpu > > > > > or > > > > > think G as in General, not Graphisc. > > > > > > > > > > > We have support for Intel habanalabs hardware in drivers/misc, and > > > > > > there are > > > > > > countless hardware solutions out of tree that would hopefully go > > > > > > the same > > > > > > way with an upstream submission and open source user space, > > > > > > including > > > > > > > > > > > > - Intel/Mobileye EyeQ > > > > > > - Intel/Movidius Keembay > > > > > > - Nvidia NVDLA > > > > > > - Gyrfalcon Lightspeeur > > > > > > - Apple Neural Engine > > > > > > - Google TPU > > > > > > - Arm Ethos > > > > > > > > > > > > plus many more that are somewhat less likely to gain fully open > > > > > > source > > > > > > driver stacks. > > > > > > > > > > We also had this entire discussion 2 years ago with habanalabs. The > > > > > hang-up is that drivers/gpu folks require fully open source userspace, > > > > > including compiler and anything else you need to actually use the > > > > > chip. > > > > > Greg doesn't, he's happy if all he has is the runtime library with > > > > > some > > > > > tests. > > > > > > I guess we're really going to beat this horse into pulp ... oh well. > > > > > > > All you need is a library, what you write on top of that is always > > > > application-specific, so how can I ask for "more"? > > > > > > This is like accepting a new cpu port, where all you require is that > > > the libc port is open source, but the cpu compiler is totally fine as > > > a blob (doable with llvm now being supported). It makes no sense at > > > all, at least to people who have worked with accelerators like this > > > before. > > > > > > We are not requiring that applications are open. We're only requiring > > > that at least one of the compilers you need (no need to open the fully > > > optimized one with all the magic sauce) to create any kind of > > > applications is open, because without that you can't use the device, > > > you can't analyze the stack, and you have no idea at all about what > > > exactly it is you're merging. With these devices, the uapi visible in > > > include/uapi is the smallest part of the interface exposed to > > > userspace. > > > > Ok, sorry, I was not aware that the habanalabs compiler was not > > available to all under an open source license. All I was trying to > > enforce was that the library to use the kernel api was open so that > > anyone could use it. Trying to enforce compiler requirements like this > > might feel to be a bit of a reach as the CPU on the hardware really > > doesn't fall under the license of the operating system running on this > > CPU over here :) > > Experience says if you don't, forget about supporting your > drivers/subsystem long-term. At best you're stuck with a per-device >
Re: [PATCH v3 00/14] Driver of Intel(R) Gaussian & Neural Accelerator
On Tue, 18 May 2021 at 06:10, Thomas Zimmermann wrote: > > Hi > > Am 17.05.21 um 21:32 schrieb Daniel Stone: > > Hi, > > > > On Mon, 17 May 2021 at 20:12, Thomas Zimmermann wrote: > >> Am 17.05.21 um 09:40 schrieb Daniel Vetter: > >>> We have, it's called drivers/gpu. Feel free to rename to drivers/xpu or > >>> think G as in General, not Graphisc. > >> > >> I hope this was a joke. > >> > >> Just some thoughts: > >> > >> AFAICT AI first came as an application of GPUs, but has now > >> evolved/specialized into something of its own. I can imagine sharing > >> some code among the various subsystems, say GEM/TTM internals for memory > >> management. Besides that there's probably little that can be shared in > >> the userspace interfaces. A GPU is device that puts an image onto the > >> screen and an AI accelerator isn't. > > > > But it isn't. A GPU is a device that has a kernel-arbitrated MMU > > hosting kernel-managed buffers, executes user-supplied compiled > > programs with reference to those buffers and other jobs, and informs > > the kernel about progress. > > > > KMS lies under the same third-level directory, but even when GPU and > > display are on the same die, they're totally different IP blocks > > developed on different schedules which are just periodically glued > > together. > > I mentioned this elsewhere: it's not about the chip architecture, it's > about the UAPI. In the end, the GPU is about displaying things on a > screen. Even if the rendering and the scanout engines are on different > IP blocks. (Or different devices.) > > The fact that one can do general purpose computing on a GPU is a > byproduct of the evolution of graphics hardware. It never was the goal. But then we would have a subsystem for AI accelerators excluding GPUs, do we then start to layer that subsystem onto drivers/gpu? at which point why bother. The thing is UAPI and stack architecture are important, but what is more important than any of that is that there is a place where the people invested in the area can come together outside of company boundaries and discuss ideas and bounce designs around each other to come to an agreement without the overheads of company interactions. dri-devel + mesa have managed this for graphics but it's taken years and we are still fighting that battle within major companies who even when they know it produces good results can't drag themselves to give up control over anything unless given no other choice. I expect the accel teams in these companies need to step outside their productization timelines and powerpoints and start discussing uAPI designs with the other companies in the area. Until that happens I expect upstreaming any of these should be a default no. Dave.
[ANNOUNCE] libdrm 2.4.106
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Some nouveau debug, amdgpu tests, and a regression fix from 105. Releasing so 105 doesn't end up being used a lot with a regression. Bas Nieuwenhuizen (1): Revert "xf86drmMode: set FB_MODIFIERS flag when modifiers are supplied" Dave Airlie (1): Bump version to 2.4.106 Eric Engestrom (2): ci: use archlinux/archlinux docker image instead of deprecated and now removed archlinux/base ci: use `base-devel` tag of archlinux image instead of `base` and then installing `base-devel` after Feifei Xu (2): tests/amdgpu: update gfx9 BufferCopy/BufferClear tests/amdgpu:retire asic_id check on unsupported cases Huang Rui (1): test/amdgpu: use tmz ids to check whether enable security tests James Zhu (1): tests/amdgpu/vcn: update to support aldebaran Jinzhou Su (1): test/amdgpu: Add emit mem sync flag for test IB Karol Herbst (6): nouveau: fix crash in pushbuf_dump with an unmapped bo nouveau: mask push buffer length pushbuf_dump nouveau: make debug features accessible in normal builds nouveau: rework debugging so we can also dump into a file novueau: document debug flags nouveau: add debug option to sync pushbuffer submissions git tag: libdrm-2.4.106 https://dri.freedesktop.org/libdrm/libdrm-2.4.106.tar.xz SHA256: 92d8ac54429b171e087e61c2894dc5399fe6a549b1fbba09fa6a3cb9d4e57bd4 libdrm-2.4.106.tar.xz SHA512: 33140e579906ab54b716149056af500c628ce41cd9ae3b0c33496693d2f5903fbcfccee8a942dd1560e159ed240da42612d5af5e75558db6f6a85d14617d libdrm-2.4.106.tar.xz PGP: https://dri.freedesktop.org/libdrm/libdrm-2.4.106.tar.xz.sig -BEGIN PGP SIGNATURE- iQIzBAEBCAAdFiEEEKbZHaGwW9KfbeusDHTzWXnEhr4FAmCjOB0ACgkQDHTzWXnE hr7Gjw//WPSK/f0t/hw2dTHhAA+rJ0A61RnhrWtvAK923usK2IxgeKD9mgDrXXX4 T6eXoUIvOUNB1EYfaiXMhS/G7gbL+C4/BDF+Hqu55luZklgLxALy86rDH2nMw+4c vgd7AyYVF78oiYKsI5ULiexFWl85ZnBjJHlyvyk7axOMQx6P26ioI05wjP9SSs5N mwPZ218jZy29dk2h82lp6SBHIvMZSnRW9EE0G2jmZZMJGIP4f//owa8Ugxu/PsjX VkTZ8tF47YRwzGINRzLkSmOgXR8ACLNrIs+n6SoMXPNpMwQAgKcqjDd3iHhM30PJ 7wHbk6xfiywpRsZBymkDvtPl4vYLZFcskfd1fb72X5YRM6LSHY4GBHz1/i8ye2hc JX786aajPU0MNq5i14VmCE36pHHARMbSV7WqQXwQsxv8AjpRiwf07qJaRYbZFZZw kdQPMPKZqh+Tn/4aCv4yL0rVfIQk7cpQ/wrsEiKyNlt+iotWSnb6oHTMq/uGZgou kpClMEwOeDTieU8V9ET0JAQAdKGK5CVCcVAffTbzGx0pT2lhKub0CBRvUiB5Q5ZW sFq2UNjFZ2BwPDoZKhOD87EkdtQJyPRf9DmTwVBatFfmX/bSG8ikricgC6lF7LNL EBeVV5eqCPIMFiUBwEhLwSbu5CCy/X6JIIv30JzcMzNb1QZWOj8= =Ybbd -END PGP SIGNATURE-
Re: [RFC] Add DMA_RESV_USAGE flags
> > We basically don't know during CS if a BO is shared or not. Who doesn't know? We should be able to track this quite easily, userspace either imports or exports buffers, it can surely keep track of these and flag them. Is this a userspace might lie to use worry or do you have some really broken userspace we don't know about? Dave.
Re: [GIT PULL] drm/imx: fixes, dma-fence annotation, and color encoding/range plane properties
On Wed, 12 May 2021 at 23:33, Philipp Zabel wrote: > > Hi Dave, Daniel, > > The following changes since commit 6efb943b8616ec53a5e444193dccf1af9ad627b5: > > Linux 5.13-rc1 (2021-05-09 14:17:44 -0700) > > are available in the Git repository at: > > git://git.pengutronix.de/git/pza/linux.git tags/imx-drm-next-2021-05-12 Is this for 5.14 or 5.13-rc3? Dave.
[git pull] drm fixes for 5.13-rc3
Hi Linus, Usual collection, mostly amdgpu and some i915 regression fixes. I nearly managed to hose my build/sign machine this week, but I recovered it just in time, and I even got clang12 built. Dave. drm-fixes-2021-05-21-1: drm fixes for 5.13-rc3 dma-buf: - WARN fix amdgpu: - Fix downscaling ratio on DCN3.x - Fix for non-4K pages - PCO/RV compute hang fix - Dongle fix - Aldebaran codec query support - Refcount leak fix - Use after free fix - Navi12 golden settings updates - GPU reset fixes radeon: - Fix for imported BO handling i915: - Pin the L-shape quirked object as unshrinkable to fix crashes - Disable HiZ Raw Stall Optimization on broken gen7 to fix glitches, gfx corruption - GVT: Move mdev attribute groups into kvmgt module to fix kconfig deps issue exynos: - Correct kerneldoc of fimd_shadow_protect_win function. - Drop redundant error messages. The following changes since commit d07f6ca923ea0927a1024dfccafc5b53b61cfecc: Linux 5.13-rc2 (2021-05-16 15:27:44 -0700) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2021-05-21-1 for you to fetch changes up to dd6ad0516ee38112321e99ce368fddd49ee3b9db: Merge tag 'amd-drm-fixes-5.13-2021-05-19' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes (2021-05-21 14:08:04 +1000) drm fixes for 5.13-rc3 dma-buf: - WARN fix amdgpu: - Fix downscaling ratio on DCN3.x - Fix for non-4K pages - PCO/RV compute hang fix - Dongle fix - Aldebaran codec query support - Refcount leak fix - Use after free fix - Navi12 golden settings updates - GPU reset fixes radeon: - Fix for imported BO handling i915: - Pin the L-shape quirked object as unshrinkable to fix crashes - Disable HiZ Raw Stall Optimization on broken gen7 to fix glitches, gfx corruption - GVT: Move mdev attribute groups into kvmgt module to fix kconfig deps issue exynos: - Correct kerneldoc of fimd_shadow_protect_win function. - Drop redundant error messages. Changfeng (1): drm/amdgpu: disable 3DCGCG on picasso/raven1 to avoid compute hang Chris Park (1): drm/amd/display: Disconnect non-DP with no EDID Chris Wilson (1): drm/i915/gem: Pin the L-shape quirked object as unshrinkable Christian König (3): drm/radeon: use the dummy page for GART if needed drm/amdgpu: stop touching sched.ready in the backend dma-buf: fix unintended pin/unpin warnings Dave Airlie (4): Merge tag 'exynos-drm-fixes-for-v5.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-fixes Merge tag 'drm-misc-fixes-2021-05-20' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes Merge tag 'drm-intel-fixes-2021-05-20' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes Merge tag 'amd-drm-fixes-5.13-2021-05-19' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes Guchun Chen (2): drm/amdgpu: update gc golden setting for Navi12 drm/amdgpu: update sdma golden setting for Navi12 James Zhu (1): drm/amdgpu: add video_codecs query support for aldebaran Jani Nikula (1): Merge tag 'gvt-fixes-2021-05-19' of https://github.com/intel/gvt-linux into drm-intel-fixes Jingwen Chen (1): drm/amd/amdgpu: fix refcount leak Krzysztof Kozlowski (1): drm/exynos: correct exynos_drm_fimd kerneldoc Lang Yu (1): drm/amd/amdgpu: fix a potential deadlock in gpu reset Nikola Cornij (1): drm/amd/display: Use the correct max downscaling value for DCN3.x family Simon Rettberg (1): drm/i915/gt: Disable HiZ Raw Stall Optimization on broken gen7 Yi Li (1): drm/amdgpu: Fix GPU TLB update error when PAGE_SIZE > AMDGPU_PAGE_SIZE Zhen Lei (2): drm/exynos: Remove redundant error printing in exynos_dsi_probe() drm/exynos/decon5433: Remove redundant error printing in exynos5433_decon_probe() Zhenyu Wang (1): drm/i915/gvt: Move mdev attribute groups into kvmgt module xinhui pan (1): drm/amdgpu: Fix a use-after-free drivers/dma-buf/dma-buf.c | 10 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 3 + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c| 3 +- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 6 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 10 +- drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 2 - drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 2 - drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 4 + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 5 - drivers/gpu/drm/amd/amdgpu/soc15.c | 3 +- drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 8 +- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 18 +++ .../gpu/drm/amd/disp
Re: [Intel-gfx] [RFC v2 3/8] drm/i915: Keep track of pwm-related backlight hooks separately
On Thu, 17 Sept 2020 at 03:19, Lyude Paul wrote:
>
> Currently, every different type of backlight hook that i915 supports is
> pretty straight forward - you have a backlight, probably through PWM
> (but maybe DPCD), with a single set of platform-specific hooks that are
> used for controlling it.
>
> HDR backlights, in particular VESA and Intel's HDR backlight
> implementations, can end up being more complicated. With Intel's
> proprietary interface, HDR backlight controls always run through the
> DPCD. When the backlight is in SDR backlight mode however, the driver
> may need to bypass the TCON and control the backlight directly through
> PWM.
>
> So, in order to support this we'll need to split our backlight callbacks
> into two groups: a set of high-level backlight control callbacks in
> intel_panel, and an additional set of pwm-specific backlight control
> callbacks. This also implies a functional changes for how these
> callbacks are used:
>
> * We now keep track of two separate backlight level ranges, one for the
> high-level backlight, and one for the pwm backlight range
> * We also keep track of backlight enablement and PWM backlight
> enablement separately
> * Since the currently set backlight level might not be the same as the
> currently programmed PWM backlight level, we stop setting
> panel->backlight.level with the currently programmed PWM backlight
> level in panel->backlight.pwm_funcs.setup(). Instead, we rely
> on the higher level backlight control functions to retrieve the
> current PWM backlight level (in this case, intel_pwm_get_backlight()).
> Note that there are still a few PWM backlight setup callbacks that
> do actually need to retrieve the current PWM backlight level, although
> we no longer save this value in panel->backlight.level like before.
> * panel->backlight.pwm_funcs.enable()/disable() both accept a PWM
> brightness level, unlike their siblings
> panel->backlight.enable()/disable(). This is so we can calculate the
> actual PWM brightness level we want to set on disable/enable in the
> higher level backlight enable()/disable() functions, since this value
> might be scaled from a brightness level that doesn't come from PWM.
Oh this patch is a handful, I can see why people stall out here.
I'm going to be annoying maintainer and see if you can clean this up a
bit in advance
of this patch.
1) move the callbacks out of struct intel_panel.backlight into a separate struct
and use const static object tables, having fn ptrs and data co-located
in a struct
isn't great.
strcut intel_panel_backlight_funcs {
};
struct intel_panel {
struct {
struct intel_panel_backlight_funcs *funcs;
};
};
type of thing.
I think you could reuse the backlight funcs struct for the pwm stuff
as well. (maybe with an assert on hz_to_pwm for the old hooks).
2) change the apis to pass 0 down in a separate patch, this modifies a
bunch of apis to pass in an extra level parameter, do that
first in a separate patch that doesn't change anything but hands 0
down the chain. Then switch over in another patch.
3) One comment in passing below.
>
>
> - if (cpu_mode)
> - val = pch_get_backlight(connector);
> - else
> - val = lpt_get_backlight(connector);
> - val = intel_panel_compute_brightness(connector, val);
> - panel->backlight.level = clamp(val, panel->backlight.min,
> - panel->backlight.max);
>
> if (cpu_mode) {
> + val = intel_panel_sanitize_pwm_level(connector,
> pch_get_backlight(connector));
> +
> drm_dbg_kms(&dev_priv->drm,
> "CPU backlight register was enabled, switching to
> PCH override\n");
>
> /* Write converted CPU PWM value to PCH override register */
> - lpt_set_backlight(connector->base.state,
> panel->backlight.level);
> + lpt_set_backlight(connector->base.state, val);
> intel_de_write(dev_priv, BLC_PWM_PCH_CTL1,
>pch_ctl1 | BLM_PCH_OVERRIDE_ENABLE);
>
The change here confused me since it no longer calls lpt_get_backlight
in this path, the commit msg might explain this, but it didn't explain
is so I could figure out if that was a mistake or intentional.
Dave.
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH] drm/radeon: fix check order in radeon_bo_move
Oops sorry for delay LGTM
Reviewed-by: Dave Airlie
On Fri, 27 Nov 2020 at 02:34, Daniel Vetter wrote:
>
> On Wed, Nov 25, 2020 at 3:34 PM Christian König
> wrote:
> >
> > Reorder the code to fix checking if blitting is available.
>
> Might be good to explain why blitting might not be available, e.g.
> suspend/resume and or chip death and stuff like that.
>
> > Signed-off-by: Christian König
>
> Needs Fixes: 28a68f828266 ("drm/radeon/ttm: use multihop")
>
> Btw
>
> $ dim fixes [sha1]
>
> generates that for you plus nice cc list of offenders. With the Fixes
> line added:
>
> Reviewed-by: Daniel Vetter
>
> At least I'm hanging onto the illusion that I understand what you did here :-)
> -Daniel
> > ---
> > drivers/gpu/drm/radeon/radeon_ttm.c | 54 +
> > 1 file changed, 24 insertions(+), 30 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c
> > b/drivers/gpu/drm/radeon/radeon_ttm.c
> > index 0ca381b95d3d..2b598141225f 100644
> > --- a/drivers/gpu/drm/radeon/radeon_ttm.c
> > +++ b/drivers/gpu/drm/radeon/radeon_ttm.c
> > @@ -216,27 +216,15 @@ static int radeon_bo_move(struct ttm_buffer_object
> > *bo, bool evict,
> > struct ttm_resource *old_mem = &bo->mem;
> > int r;
> >
> > - if ((old_mem->mem_type == TTM_PL_SYSTEM &&
> > -new_mem->mem_type == TTM_PL_VRAM) ||
> > - (old_mem->mem_type == TTM_PL_VRAM &&
> > -new_mem->mem_type == TTM_PL_SYSTEM)) {
> > - hop->fpfn = 0;
> > - hop->lpfn = 0;
> > - hop->mem_type = TTM_PL_TT;
> > - hop->flags = 0;
> > - return -EMULTIHOP;
> > - }
> > -
> > if (new_mem->mem_type == TTM_PL_TT) {
> > r = radeon_ttm_tt_bind(bo->bdev, bo->ttm, new_mem);
> > if (r)
> > return r;
> > }
> > - radeon_bo_move_notify(bo, evict, new_mem);
> >
> > r = ttm_bo_wait_ctx(bo, ctx);
> > if (r)
> > - goto fail;
> > + return r;
> >
> > /* Can't move a pinned BO */
> > rbo = container_of(bo, struct radeon_bo, tbo);
> > @@ -246,12 +234,12 @@ static int radeon_bo_move(struct ttm_buffer_object
> > *bo, bool evict,
> > rdev = radeon_get_rdev(bo->bdev);
> > if (old_mem->mem_type == TTM_PL_SYSTEM && bo->ttm == NULL) {
> > ttm_bo_move_null(bo, new_mem);
> > - return 0;
> > + goto out;
> > }
> > if (old_mem->mem_type == TTM_PL_SYSTEM &&
> > new_mem->mem_type == TTM_PL_TT) {
> > ttm_bo_move_null(bo, new_mem);
> > - return 0;
> > + goto out;
> > }
> >
> > if (old_mem->mem_type == TTM_PL_TT &&
> > @@ -259,31 +247,37 @@ static int radeon_bo_move(struct ttm_buffer_object
> > *bo, bool evict,
> > radeon_ttm_tt_unbind(bo->bdev, bo->ttm);
> > ttm_resource_free(bo, &bo->mem);
> > ttm_bo_assign_mem(bo, new_mem);
> > - return 0;
> > + goto out;
> > }
> > - if (!rdev->ring[radeon_copy_ring_index(rdev)].ready ||
> > - rdev->asic->copy.copy == NULL) {
> > - /* use memcpy */
> > - goto memcpy;
> > + if (rdev->ring[radeon_copy_ring_index(rdev)].ready &&
> > + rdev->asic->copy.copy != NULL) {
> > + if ((old_mem->mem_type == TTM_PL_SYSTEM &&
> > +new_mem->mem_type == TTM_PL_VRAM) ||
> > + (old_mem->mem_type == TTM_PL_VRAM &&
> > +new_mem->mem_type == TTM_PL_SYSTEM)) {
> > + hop->fpfn = 0;
> > + hop->lpfn = 0;
> > + hop->mem_type = TTM_PL_TT;
> > + hop->flags = 0;
> > + return -EMULTIHOP;
> > + }
> > +
> > + r = radeon_move_blit(bo, evict, new_mem, old_mem);
> > + } else {
> > + r = -ENODEV;
> > }
> >
> > - r = radeon_move_blit(bo, evict, new_mem, old_mem);
> > if (r) {
> > -memcpy:
&g
[git pull] drm fixes for 5.10-rc6
Hi Linus, Bit of a delay as fd.o anongit was acting up a bit today, hopefully it stays up this time. Unfortunately this has a bit of thanksgiving stuffing in it, as it a bit larger (at least the vc4 patches) than I like at this point in time. The main thing is it has a bunch of regressions fixes for reports in the last couple of weeks, ast, nouveau and the amdgpu ttm init fix, along with the usual selection of amdgpu and i915 fixes. The vc4 fixes are a few but they are fixes and the nastiest one is a fix for when you have a 2.4Ghz Wifi and a HDMI signal with a clock in that range and there isn't enough shielding and interference happen between the two, the fix adjusts the mode clock to try and avoid the wifi channels in that case. Hopefully you can merge this between turkey slices, and next week should be quieter. Dave. drm-fixes-2020-11-27-1: drm fixes for 5.10-rc6 ast: - LUT loading regression fix nouveau: - relocations regression fix amdgpu: - ttm init oops fix - Runtime pm fix - SI UVD suspend/resume fix - HDCP fix for headless cards - Sienna Cichlid golden register update i915: - Fix Perf/OA workaround register corruption (Lionel) - Correct a comment statement in GVT (Yan) - Fix GT enable/disable iterrupts, including a race condition that prevented GPU to go idle (Chris) - Free stale request on destroying the virtual engine (Chris) exynos: - config dependency fix mediatek: - unused var removal - horizonal front/back porch formula fix vc4: - wifi and hdmi interference fix - mode rejection fixes - use after free fix - cleanup some code The following changes since commit 418baf2c28f3473039f2f7377760bd8f6897ae18: Linux 5.10-rc5 (2020-11-22 15:36:08 -0800) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2020-11-27-1 for you to fetch changes up to 9595930db4bb91433607441a5f26d90e9c6e34eb: Merge tag 'drm-misc-fixes-2020-11-26' of ssh://git.freedesktop.org/git/drm/drm-misc into drm-fixes (2020-11-27 09:39:51 +1000) drm fixes for 5.10-rc6 ast: - LUT loading regression fix nouveau: - relocations regression fix amdgpu: - ttm init oops fix - Runtime pm fix - SI UVD suspend/resume fix - HDCP fix for headless cards - Sienna Cichlid golden register update i915: - Fix Perf/OA workaround register corruption (Lionel) - Correct a comment statement in GVT (Yan) - Fix GT enable/disable iterrupts, including a race condition that prevented GPU to go idle (Chris) - Free stale request on destroying the virtual engine (Chris) exynos: - config dependency fix mediatek: - unused var removal - horizonal front/back porch formula fix vc4: - wifi and hdmi interference fix - mode rejection fixes - use after free fix - cleanup some code CK Hu (1): drm/mediatek: dsi: Modify horizontal front/back porch byte formula Chris Wilson (4): drm/i915/gt: Defer enabling the breadcrumb interrupt to after submission drm/i915/gt: Track signaled breadcrumbs outside of the breadcrumb spinlock drm/i915/gt: Don't cancel the interrupt shadow too early drm/i915/gt: Free stale request on destroying the virtual engine Dave Airlie (5): Merge tag 'amd-drm-fixes-5.10-2020-11-25' of git://people.freedesktop.org/~agd5f/linux into drm-fixes Merge tag 'drm-intel-fixes-2020-11-25' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes Merge tag 'exynos-drm-fixes-for-v5.10-rc6' of git://git.kernel.org/.../daeinki/drm-exynos into drm-fixes Merge tag 'mediatek-drm-fixes-5.10' of https://git.kernel.org/.../chunkuang.hu/linux into drm-fixes Merge tag 'drm-misc-fixes-2020-11-26' of ssh://git.freedesktop.org/git/drm/drm-misc into drm-fixes Enric Balletbo i Serra (1): drm/mediatek: mtk_dpi: Fix unused variable 'mtk_dpi_encoder_funcs' Kenneth Feng (1): drm/amd/amdgpu: fix null pointer in runtime pm Krzysztof Kozlowski (1): drm/exynos: depend on COMMON_CLK to fix compile tests Likun Gao (1): drm/amdgpu: update golden setting for sienna_cichlid Lionel Landwerlin (1): drm/i915/perf: workaround register corruption in OATAILPTR Matti Hamalainen (1): drm/nouveau: fix relocations applying logic and a double-free Maxime Ripard (11): drm/vc4: hdmi: Make sure our clock rate is within limits drm/vc4: hdmi: Block odd horizontal timings drm/vc4: kms: Switch to drmm_add_action_or_reset drm/vc4: kms: Remove useless define drm/vc4: kms: Rename NUM_CHANNELS drm/vc4: kms: Split the HVS muxing check in a separate function drm/vc4: kms: Document the muxing corner cases dt-bindings: display: Add a property to deal with WiFi coexistence drm/vc4: hdmi: Disable Wifi Frequencies drm/vc4: kms: Store the unassigned channel list in the state
Re: Nouveau video --- [ cut here ] ----- crash dump 5.10.0-rc6
cc'ing Ben + nouveau On Thu, 3 Dec 2020 at 14:59, bob wrote: > > Hello. I have a crash dump for: > > $ uname -a > Linux freedom 5.10.0-rc6 #1 SMP Sun Nov 29 17:26:13 MST 2020 x86_64 > x86_64 x86_64 GNU/Linux > > Occasionally when this dumps it likes to lock up the computer, but I > caught it this time. > > Also video likes to flicker a lot. Nouveau has been iffy since kernel > 5.8.0. > > This isn't the only dump, it dumped probably 50 times. If you are > really desperate for all of it, > > reply to me directly as I'm not on the mailing list. Here is one of them. > > [39019.426580] [ cut here ] > [39019.426589] WARNING: CPU: 6 PID: 14136 at > drivers/gpu/drm/nouveau/dispnv50/disp.c:211 nv50_dmac_wait+0x1e1/0x230 > [39019.426590] Modules linked in: mt2131 s5h1409 fuse tda8290 tuner > cx25840 rt2800usb rt2x00usb rt2800lib snd_hda_codec_analog > snd_hda_codec_generic ledtrig_audio rt2x00lib binfmt_misc > intel_powerclamp coretemp cx23885 mac80211 tda18271 altera_stapl > videobuf2_dvb m88ds3103 tveeprom cx2341x dvb_core rc_core i2c_mux > snd_hda_codec_hdmi videobuf2_dma_sg videobuf2_memops videobuf2_v4l2 > snd_hda_intel videobuf2_common snd_intel_dspcfg kvm_intel snd_hda_codec > videodev snd_hda_core kvm mc snd_hwdep snd_pcm_oss snd_mixer_oss > irqbypass snd_pcm cfg80211 snd_seq_dummy snd_seq_midi snd_seq_oss > snd_seq_midi_event snd_rawmidi snd_seq intel_cstate snd_seq_device > serio_raw snd_timer input_leds nfsd libarc4 snd asus_atk0110 i7core_edac > soundcore i5500_temp auth_rpcgss nfs_acl lockd grace sch_fq_codel sunrpc > parport_pc ppdev lp parport ip_tables x_tables btrfs blake2b_generic > libcrc32c xor zstd_compress raid6_pq dm_mirror dm_region_hash dm_log > pata_acpi pata_marvell hid_generic usbhid hid psmouse firewire_ohci > [39019.426650] firewire_core crc_itu_t i2c_i801 ahci sky2 libahci > i2c_smbus lpc_ich > [39019.426658] CPU: 6 PID: 14136 Comm: kworker/u16:0 Tainted: GW > I 5.10.0-rc6 #1 > [39019.426659] Hardware name: System manufacturer System Product > Name/P6T DELUXE, BIOS 220909/21/2010 > [39019.426662] Workqueue: events_unbound nv50_disp_atomic_commit_work > [39019.426665] RIP: 0010:nv50_dmac_wait+0x1e1/0x230 > [39019.426667] Code: 8d 48 04 48 89 4a 68 c7 00 00 00 00 20 49 8b 46 38 > 41 c7 86 20 01 00 00 00 00 00 00 49 89 46 68 e8 e4 fc ff ff e9 76 fe ff > ff <0f> 0b b8 92 ff ff ff e9 ed fe ff ff 49 8b be 80 00 00 00 e8 c7 fc > [39019.426668] RSP: 0018:b79d028ebd48 EFLAGS: 00010282 > [39019.426670] RAX: ff92 RBX: 000d RCX: > > [39019.426671] RDX: ff92 RSI: b79d028ebc88 RDI: > b79d028ebd28 > [39019.426671] RBP: b79d028ebd48 R08: R09: > b79d028ebc58 > [39019.426672] R10: 0030 R11: 11c4 R12: > fffb > [39019.426673] R13: a05fc1ebd368 R14: a05fc1ebd3a8 R15: > a05fc2425000 > [39019.426675] FS: () GS:a061f3d8() > knlGS: > [39019.426676] CS: 0010 DS: ES: CR0: 80050033 > [39019.426677] CR2: 7fb2d58e CR3: 00026280a000 CR4: > 06e0 > [39019.426678] Call Trace: > [39019.426685] base827c_image_set+0x2f/0x1d0 > [39019.426687] nv50_wndw_flush_set+0x89/0x1c0 > [39019.426688] nv50_disp_atomic_commit_tail+0x4e7/0x7e0 > [39019.426693] process_one_work+0x1d4/0x370 > [39019.426695] worker_thread+0x4a/0x3b0 > [39019.426697] ? process_one_work+0x370/0x370 > [39019.426699] kthread+0xfe/0x140 > [39019.426701] ? kthread_park+0x90/0x90 > [39019.426704] ret_from_fork+0x22/0x30 > [39019.426706] ---[ end trace d512d675211c738c ]--- > [39021.426751] [ cut here ] > > > Thanks in advance, > > Bob > ___ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
[git pull] drm fixes for 5.10-rc7
Hi Linus, This week's regular fixes. i915 has fixes for a few races, use-after-free, gpu hangs, tegra just has some minor fixes that I didn't see much point in hanging on to. The nouveau fix is for all pre-nv50 cards and was reported a few times. Otherwise it's just some amdgpu, and a few misc fixes. Regards, Dave. drm-fixes-2020-12-04: drm fixes for 5.10-rc7 amdgpu: - SMU11 manual fan fix - Renoir display clock fix - VCN3 dynamic powergating fix i915: - Program mocs:63 for cache eviction on gen9 - Protect context lifetime with RCU - Split the breadcrumb spinlock between global and contexts - Retain default context state across shrinking - Limit frequency drop to RPe on parking - Return earlier from intel_modeset_init() without display - Defer initial modeset until after GGTT is initialized nouveau: - pre-nv50 regression fix rockchip: - uninitialised LVDS property fix omap: - bridge fix panel: - race fix mxsfb: - fence sync fix - modifiers fix tegra: - idr init fix - sor fixes - output/of cleanup fix The following changes since commit b65054597872ce3aefbc6a666385eabdf9e288da: Linux 5.10-rc6 (2020-11-29 15:50:50 -0800) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2020-12-04 for you to fetch changes up to de9b485d1dc993f1fb579b5d15a8176284627f4a: Merge tag 'drm-misc-fixes-2020-12-03' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes (2020-12-04 11:53:50 +1000) drm fixes for 5.10-rc7 amdgpu: - SMU11 manual fan fix - Renoir display clock fix - VCN3 dynamic powergating fix i915: - Program mocs:63 for cache eviction on gen9 (Chris) - Protect context lifetime with RCU (Chris) - Split the breadcrumb spinlock between global and contexts (Chris) - Retain default context state across shrinking (Venkata) - Limit frequency drop to RPe on parking (Chris) - Return earlier from intel_modeset_init() without display (Jani) - Defer initial modeset until after GGTT is initialized (Chris) nouveau: - pre-nv50 regression fix rockchip: - uninitialised LVDS property fix omap: - bridge fix panel: - race fix mxsfb: - fence sync fix - modifiers fix tegra: - idr init fix - sor fixes - output/of cleanup fix Arunpravin (1): drm/amdgpu/pm/smu11: Fix fan set speed bug Boyuan Zhang (2): drm/amdgpu/vcn3.0: stall DPG when WPTR/RPTR reset drm/amdgpu/vcn3.0: remove old DPG workaround Brandon Syu (1): drm/amd/display: Init clock value by current vbios CLKs Chris Wilson (5): drm/i915/gt: Program mocs:63 for cache eviction on gen9 drm/i915/gt: Protect context lifetime with RCU drm/i915/gt: Split the breadcrumb spinlock between global and contexts drm/i915/gt: Limit frequency drop to RPe on parking drm/i915/display: Defer initial modeset until after GGTT is initialised Christian König (1): drm/nouveau: make sure ret is initialized in nouveau_ttm_io_mem_reserve Daniel Abrecht (1): drm: mxsfb: Implement .format_mod_supported Dave Airlie (4): Merge tag 'drm/tegra/for-5.10-rc7' of ssh://git.freedesktop.org/git/tegra/linux into drm-fixes Merge tag 'drm-intel-fixes-2020-12-03' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes Merge tag 'amd-drm-fixes-5.10-2020-12-02' of git://people.freedesktop.org/~agd5f/linux into drm-fixes Merge tag 'drm-misc-fixes-2020-12-03' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes Deepak R Varma (1): drm/tegra: replace idr_init() by idr_init_base() Jani Nikula (1): drm/i915/display: return earlier from intel_modeset_init() without display Jon Hunter (1): drm/tegra: sor: Don't warn on probe deferral Lucas Stach (1): drm: mxsfb: fix fence synchronization Marc Zyngier (1): drm/tegra: sor: Ensure regulators are disabled on teardown Paul Kocialkowski (1): drm/rockchip: Avoid uninitialized use of endpoint id in LVDS Qinglang Miao (1): drm/tegra: sor: Disable clocks on error in tegra_sor_init() Sebastian Reichel (1): drm/panel: sony-acx565akm: Fix race condition in probe Thierry Reding (1): drm/tegra: output: Do not put OF node twice Tomi Valkeinen (1): drm/omap: sdi: fix bridge enable/disable Venkata Ramana Nayana (1): drm/i915/gt: Retain default context state across shrinking drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 25 ++- .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 13 +- drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 7 +- drivers/gpu/drm/i915/display/intel_display.c | 24 +-- drivers/gpu/drm/i915/gt/intel_breadcrumbs.c| 168 + drivers/gpu/drm/i915/gt/intel_breadcrumbs_types.h | 6 +- drivers/gpu/drm/i915/gt/intel_context.c| 15 +- drivers/gpu/drm/i915/gt/inte
[git pull] drm fixes for 5.10 final
Hi Linus, Last week of fixes, just amdgpu and i915 collections. We had a i915 regression reported by HJ Lu reported this morning, and this contains a fix for that he has tested. There are a fair few other fixes, but they are spread across the two drivers, and all fairly self contained. I'm going to send you out drm-next for next week in a few hours as I'm going on holidays until next Friday, I likely won't be checking email too closely, but Daniel should be available for any emergency. Dave. drm-fixes-2020-12-11: drm fixes for 5.10 final amdgpu: - Fan fix for CI asics - Fix a warning in possible_crtcs - Build fix for when debugfs is disabled - Display overflow fix - Display watermark fixes for Renoir - SDMA 5.2 fix - Stolen vga memory regression fix - Power profile fixes - Fix a regression from removal of GEM and PRIME callbacks amdkfd: - Fix a memory leak in dmabuf import i915: - rc7 regression fix for modesetting - vdsc/dp slice fixes - gen9 mocs entries fix - preemption timeout fix - unsigned compare against 0 fix - selftest fix - submission error propogating fix - request flow suspend fix The following changes since commit 0477e92881850d44910a7e94fc2c46f96faa131f: Linux 5.10-rc7 (2020-12-06 14:25:12 -0800) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2020-12-11 for you to fetch changes up to b1f195fc49812359296a901e26cc7c0b761d8a70: drm/i915/display: Go softly softly on initial modeset failure (2020-12-11 09:54:30 +1000) drm fixes for 5.10 final amdgpu: - Fan fix for CI asics - Fix a warning in possible_crtcs - Build fix for when debugfs is disabled - Display overflow fix - Display watermark fixes for Renoir - SDMA 5.2 fix - Stolen vga memory regression fix - Power profile fixes - Fix a regression from removal of GEM and PRIME callbacks amdkfd: - Fix a memory leak in dmabuf import i915: - rc7 regression fix for modesetting - vdsc/dp slice fixes - gen9 mocs entries fix - preemption timeout fix - unsigned compare against 0 fix - selftest fix - submission error propogatig fix - request flow suspend fix Alex Deucher (3): drm/amdgpu/powerplay: parse fan table for CI asics drm/amdgpu/disply: set num_crtc earlier drm/amdgpu: fix size calculation with stolen vga memory Andrey Grodzovsky (1): drm/amdgpu: Initialise drm_gem_object_funcs for imported BOs Arnd Bergmann (1): drm/amdgpu: fix debugfs creation/removal, again Changfeng (1): drm/amd/pm: update smu10.h WORKLOAD_PPLIB setting for raven Chris Park (1): drm/amd/display: Prevent bandwidth overflow Chris Wilson (5): drm/i915/gem: Propagate error from cancelled submit due to context closure drm/i915/gt: Ignore repeated attempts to suspend request flow across reset drm/i915/gt: Cancel the preemption timeout on responding to it drm/i915/gt: Declare gen9 has 64 mocs entries! drm/i915/display: Go softly softly on initial modeset failure Colin Ian King (1): drm/i915: fix size_t greater or equal to zero comparison Dan Carpenter (1): drm/i915/gem: Check the correct variable in selftest Dave Airlie (2): Merge tag 'amd-drm-fixes-5.10-2020-12-09' of git://people.freedesktop.org/~agd5f/linux into drm-fixes Merge tag 'drm-intel-fixes-2020-12-09' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes Evan Quan (1): drm/amd/pm: typo fix (CUSTOM -> COMPUTE) Felix Kuehling (1): drm/amdkfd: Fix leak in dmabuf import Manasi Navare (1): drm/i915/display/dp: Compute the correct slice count for VDSC on DP Stanley.Yang (1): drm/amdgpu: fix sdma instance fw version and feature version init Sung Lee (1): drm/amd/display: Add wm table for Renoir drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c| 8 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c| 41 drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c| 3 + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c| 13 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h| 6 -- drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 2 + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 9 +- .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 93 ++- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 7 +- drivers/gpu/drm/amd/pm/inc/smu10.h | 14 ++- .../drm/amd/pm/powerplay/hwmgr/processpptables.c | 103 - .../gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 9 +- .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c| 2 +- drivers/gpu/drm/i915/display/intel_display.c | 2 +- drivers/gpu/drm/i915/display/intel_dp.c| 2 +- drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 7 +
[git pull] drm fixes for 5.14-rc1
Hi Linus, Some fixes for rc1 that came in the past weeks, mainly a bunch of amdgpu fixes, some i915 and the rest are misc around the place. I'm sending this a bit early so some more stuff may show up, but I'll probably take tomorrow off. Dave. drm-next-2021-07-08-1: drm fixes for 5.14-rc1 dma-buf: - doc fixes amdgpu: - Misc Navi fixes - Powergating fix - Yellow Carp updates - Beige Goby updates - S0ix fix - Revert overlay validation fix - GPU reset fix for DC - PPC64 fix - Add new dimgrey cavefish DID - RAS fix - TTM fixes amdkfd: - SVM fixes radeon: - Fix missing drm_gem_object_put in error path - NULL ptr deref fix i915: - display DP VSC fix - DG1 display fix - IRQ fixes - IRQ demidlayering gma500: - bo leaks in error paths fixed The following changes since commit 8a02ea42bc1d4c448caf1bab0e05899dad503f74: Merge tag 'drm-intel-next-fixes-2021-06-29' of git://anongit.freedesktop.org/drm/drm-intel into drm-next (2021-06-30 15:42:05 +1000) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/drm-next-2021-07-08-1 for you to fetch changes up to 21c355b09711e95f8f0e7c1890b343c6cd350042: Merge tag 'drm-misc-next-fixes-2021-07-01' of git://anongit.freedesktop.org/drm/drm-misc into drm-next (2021-07-08 11:17:32 +1000) drm fixes for 5.14-rc1 dma-buf: - doc fixes amdgpu: - Misc Navi fixes - Powergating fix - Yellow Carp updates - Beige Goby updates - S0ix fix - Revert overlay validation fix - GPU reset fix for DC - PPC64 fix - Add new dimgrey cavefish DID - RAS fix - TTM fixes amdkfd: - SVM fixes radeon: - Fix missing drm_gem_object_put in error path - NULL ptr deref fix i915: - display DP VSC fix - DG1 display fix - IRQ fixes - IRQ demidlayering gma500: - bo leaks in error paths fixed Aaron Liu (2): drm/amdgpu: enable tmz on yellow carp drm/amdgpu: enable sdma0 tmz for Raven/Renoir(V2) Alex Deucher (2): drm/amdgpu/display: drop unused variable drm/amdgpu: add new dimgrey cavefish DID Alex Sierra (11): drm/amdkfd: inc counter on child ranges with xnack off drm/amdkfd: device pgmap owner at the svm migrate init drm/amdkfd: add owner ref param to get hmm pages drm/amdkfd: set owner ref to svm range prefault drm/amdgpu: get owner ref in validate and map drm/amdkfd: use hmm range fault to get both domain pfns drm/amdkfd: classify and map mixed svm range pages in GPU drm/amdkfd: skip invalid pages during migrations drm/amdkfd: skip migration for pages already in VRAM drm/amdkfd: add invalid pages debug at vram migration drm/amdkfd: Maintain svm_bo reference in page->zone_device_data Chengming Gui (1): drm/amd/amdgpu: enable gpu recovery for beige_goby Chengzhe Liu (1): drm/amdgpu: Power down VCN and JPEG before disabling SMU features Darren Powell (1): amdgpu/pm: remove code duplication in show_power_cap calls Dave Airlie (3): Merge tag 'amd-drm-next-5.14-2021-07-01' of https://gitlab.freedesktop.org/agd5f/linux into drm-next Merge tag 'drm-intel-next-fixes-2021-07-07' of git://anongit.freedesktop.org/drm/drm-intel into drm-next Merge tag 'drm-misc-next-fixes-2021-07-01' of git://anongit.freedesktop.org/drm/drm-misc into drm-next Evan Quan (7): drm/amdgpu: correct tcp harvest setting drm/amdgpu: fix Navi1x tcp power gating hang when issuing lightweight invalidaiton drm/amdgpu: fix NAK-G generation during PCI-e link width switch drm/amdgpu: fix the hang caused by PCIe link width switch drm/amdgpu: correct clock gating settings on feature unsupported drm/amdgpu: update GFX MGCG settings drm/amdgpu: update HDP LS settings Guchun Chen (2): drm/amd/display: fix incorrrect valid irq check drm/amd/display: fix null pointer access in gpu reset Huang Rui (1): drm/amdgpu: move apu flags initialization to the start of device init Jing Xiangfeng (2): drm/gma500: Add the missed drm_gem_object_put() in psb_user_framebuffer_create() drm/radeon: Add the missed drm_gem_object_put() in radeon_user_framebuffer_create() Joseph Greathouse (1): drm/amdgpu: Update NV SIMD-per-CU to 2 José Roberto de Souza (1): drm/i915/display/dg1: Correctly map DPLLs during state readout Kees Cook (1): drm/i915/display: Do not zero past infoframes.vsc Michal Suchanek (1): drm/amdgpu/dc: Really fix DCN3.1 Makefile for PPC64 Mikel Rychliski (1): drm/radeon: Fix NULL dereference when updating memory stats Mukul Joshi (1): drm/amdgpu: Conditionally reset SDMA RAS error counts Nicholas Kazlauskas (1): drm/amd/display: Extend DMUB diagnostic logging to DCN3.1 Nirmoy Das (1): drm/amdgpu: return early for non-TTM_PL_TT type BOs Oak Zeng (1): drm/amd
Re: [PATCH v1] fix vmwgfx compilation error due to a missing include
cc'ing Christian to fix this I assume it was ttm refactor? > > This patch fixes vmwgfx driver compilation error due to a missing include > > drivers/gpu/drm/vmwgfx/vmwgfx_drv.c: In function ‘vmw_vram_manager_init’: > drivers/gpu/drm/vmwgfx/vmwgfx_drv.c:678:8: error: implicit declaration of > function ‘ttm_range_man_init’ [-Werror=implicit-function-declaration] > 678 | ret = ttm_range_man_init(&dev_priv->bdev, TTM_PL_VRAM, false, > |^~ > drivers/gpu/drm/vmwgfx/vmwgfx_drv.c: In function ‘vmw_vram_manager_fini’: > drivers/gpu/drm/vmwgfx/vmwgfx_drv.c:690:2: error: implicit declaration of > function ‘ttm_range_man_fini’ [-Werror=implicit-function-declaration] > 690 | ttm_range_man_fini(&dev_priv->bdev, TTM_PL_VRAM); > | ^~ > cc1: some warnings being treated as errors > > Signed-off-by: Tong Zhang > --- > drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c > b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c > index 6f5ea00973e0..6eb93aa2f311 100644 > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c > @@ -37,6 +37,7 @@ > #include > #include > #include > +#include > #include > > #include "ttm_object.h" > -- > 2.25.1 >
[git pull] drm fixes for 5.14-rc2
Hi Linus, Regular rc2 fixes though a bit more than usual at rc2 stage, people must have been testing early or else some fixes from last week got a bit laggy. There is one larger change in the amd fixes to amalgamate some power management code on the newer chips with the code from the older chips, it should only affects chips where support was introduced in rc1 and it should make future fixes easier to maintain probably a good idea to merge it now. Otherwise it's mostly fixes across the board. Dave. drm-fixes-2021-07-16: drm fixes for 5.14-rc2 dma-buf: - Fix fence leak in sync_file_merge() error code drm/panel: - nt35510: Don't fail on DSI reads fbdev: - Avoid use-after-free by not deleting current video mode ttm: - Avoid NULL-ptr deref in ttm_range_man_fini() vmwgfx: - Fix a merge commit qxl: - fix a TTM regression amdgpu: - SR-IOV fixes - RAS fixes - eDP fixes - SMU13 code unification to facilitate fixes in the future - Add new renoir DID - Yellow Carp fixes - Beige Goby fixes - Revert a bunch of TLB fixes that caused regressions - Revert an LTTPR display regression amdkfd - Fix VRAM access regression - SVM fixes i915: - Fix -EDEADLK handling regression - Drop the page table optimisation The following changes since commit e73f0f0ee7541171d89f2e2491130c7771ba58d3: Linux 5.14-rc1 (2021-07-11 15:07:40 -0700) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2021-07-16 for you to fetch changes up to 876d98e5511d8cfd12fc617a6717e7a8ea07be17: Merge tag 'drm-intel-fixes-2021-07-15' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes (2021-07-16 10:53:02 +1000) drm fixes for 5.14-rc2 dma-buf: - Fix fence leak in sync_file_merge() error code drm/panel: - nt35510: Don't fail on DSI reads fbdev: - Avoid use-after-free by not deleting current video mode ttm: - Avoid NULL-ptr deref in ttm_range_man_fini() vmwgfx: - Fix a merge commit qxl: - fix a TTM regression amdgpu: - SR-IOV fixes - RAS fixes - eDP fixes - SMU13 code unification to facilitate fixes in the future - Add new renoir DID - Yellow Carp fixes - Beige Goby fixes - Revert a bunch of TLB fixes that caused regressions - Revert an LTTPR display regression amdkfd - Fix VRAM access regression - SVM fixes i915: - Fix -EDEADLK handling regression - Drop the page table optimisation Aaron Liu (1): drm/amd/pm: Add waiting for response of mode-reset message for yellow carp Chengming Gui (1): drm/amd/pm: Fix BACO state setting for Beige_Goby Christian König (1): drm/qxl: add NULL check for bo->resource Daniel Vetter (1): Merge tag 'drm-misc-fixes-2021-07-13' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes Dave Airlie (3): Merge tag 'amd-drm-fixes-5.14-2021-07-14' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes Merge tag 'drm-misc-fixes-2021-07-15' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes Merge tag 'drm-intel-fixes-2021-07-15' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes Dmytro Laktyushkin (1): drm/amd/display: remove faulty assert Emily Deng (1): drm/amdgpu: Correct the irq numbers for virtual crtc Emily.Deng (1): drm/amdgpu: Restore msix after FLR Eric Huang (5): Revert "drm/amdkfd: Add memory sync before TLB flush on unmap" Revert "drm/amdgpu: Fix warning of Function parameter or member not described" Revert "drm/amdkfd: Make TLB flush conditional on mapping" Revert "drm/amdgpu: Add table_freed parameter to amdgpu_vm_bo_update" Revert "drm/amdkfd: Add heavy-weight TLB flush after unmapping" Felix Kuehling (1): drm/amdkfd: Allow CPU access for all VRAM BOs Jason Ekstrand (1): dma-buf/sync_file: Don't leak fences on merge failure Jingwen Chen (1): drm/amdgpu: SRIOV flr_work should take write_lock Jinzhou Su (1): drm/amdgpu: add another Renoir DID Linus Walleij (1): drm/panel: nt35510: Do not fail if DSI read fails Luben Tuikov (1): drm/amdgpu: Return error if no RAS Matthew Auld (1): drm/i915/gtt: drop the page table optimisation Nicholas Kazlauskas (1): drm/amd/display: Fix updating infoframe for DCN3.1 eDP Philip Yang (1): drm/amdkfd: handle fault counters on invalid address Thomas Zimmermann (1): Merge remote-tracking branch 'drm-misc/drm-misc-next-fixes' into drm-misc-fixes Ville Syrjälä (1): drm/i915/gt: Fix -EDEADLK handling regression Wesley Chalmers (1): Revert "drm/amd/display: Always write repeater mode regardless of LTTPR" Xiaomeng Hou (2): drm/amd/pm: drop smu_v13_0_1.c|h files for yellow carp drm/amd/display: update header file name Zack Rusin (
Re: [PATCH v3 0/2] allow simple{fb, drm} drivers to be used on non-x86 EFI platforms
On Thu, 15 Jul 2021 at 18:11, Thomas Zimmermann wrote:
>
> Hi
>
> Am 13.07.21 um 18:59 schrieb Javier Martinez Canillas:
> > On 6/25/21 3:09 PM, Javier Martinez Canillas wrote:
> >> The simplefb and simpledrm drivers match against a "simple-framebuffer"
> >> device, but for aarch64 this is only registered when using Device Trees
> >> and there's a node with a "simple-framebuffer" compatible string.
> >>
> >> There is no code to register a "simple-framebuffer" platform device when
> >> using EFI instead. In fact, the only platform device that's registered in
> >> this case is an "efi-framebuffer", which means that the efifb driver is
> >> the only driver supported to have an early console with EFI on aarch64.
> >>
> >> The x86 architecture platform has a Generic System Framebuffers (sysfb)
> >> support, that register a system frambuffer platform device. It either
> >> registers a "simple-framebuffer" for the simple{fb,drm} drivers or legacy
> >> VGA/EFI FB devices for the vgafb/efifb drivers.
> >>
> >> The sysfb is generic enough to be reused by other architectures and can be
> >> moved out of the arch/x86 directory to drivers/firmware, allowing the EFI
> >> logic used by non-x86 architectures to be folded into sysfb as well.
> >>
> >
> > Any more comments on this series? It would be nice for this to land so the
> > simpledrm driver could be used on aarch64 EFI systems as well.
> >
> > The patches have already been acked by x86 and DRM folks.
>
> Time to get this merged, I'd say. People are asking for these patches
> already.
Can we just merge via drm-misc and make sure the acks are present and
I'll deal with the fallout if any.
Dave.
[ANNOUNCE] libdrm 2.4.103
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 libdrm mostly for new hw and ame names. Aaron Liu (7): tests/amdgpu: expand secure param for exec_cs_helper (v2) tests/amdgpu: add atomic_mem cp_packet to verify the secure buffer tests/amdgpu: add test to submit a gfx command with secure context tests/amdgpu: add atomic dma command to verify the secure buffer (v2) tests/amdgpu: add test to submit a sdma command with secure context test/amdgpu: add drm version checking for security suite test/amdgpu: enable security suite tests Adam Miszczak (1): intel: sync i915_pciids.h with kernel Alex Deucher (4): amdgpu: add marketing names from 20.10 amdgpu: add marketing names from 20.40 amdgpu: sync up amdgpu_drm.h with latest from kernel amdgpu: only enable security tests on raven family Carsten Haitzler (1): tests: add komeda to list of modules to look for for testing Dave Airlie (1): Bump version to 2.4.103 Eric Engestrom (1): core: use `O_RDONLY` instead of ambiguous `0` flag Heiko Thiery (1): xf86drm.c: fix build failure Huang Rui (5): tests/amdgpu: add security test suite (v2) tests/amdgpu: add secure buffer allocation test for system memory tests/amdgpu: add secure buffer allocation test for invisible VRAM tests/amdgpu: expand write linear helper for security (v3) tests/amdgpu: add device handle as input param for exec_cs_helper and write_linear_helper (v4) James Zhu (1): tests/amdgpu/vcn: add Arcturus decode test support Jeremy Cline (1): man: Update the bug URL to gitlab.freedesktop.org José Roberto de Souza (1): intel: sync i915_pciids.h with kernel Le Ma (5): tests/amdgpu: add function to check Asic is Arcturus tests/amdgpu: create Active function for basic test suite tests/amdgpu: disable gfx engine basic test cases for Arcturus tests/amdgpu: move arcturus asic check function to common place tests/amdgpu: disable unsupported test cases for Arcturus Leo Liu (3): tests/amdgpu: add VCN3.0 regs support tests/amdgpu: clear msg decode flag tests/amdgpu: clear the extension flag Luben Tuikov (2): tests/amdgpu: Remove forward declarations tests/amdgpu: Secure bounce test (v4) Lucas Stach (1): tests/util: Add imx-dcss driver Paul Gofman (1): xf86drm.c: Use integer logarithm. Pavan Kumar Ramayanam (1): amdgpu: Add Device IDs for Embedded Raven2 platforms Tapani Pälli (1): intel: add INTEL_DG1_IDS to the pciids list Tianci.Yin (1): tests/amdgpu: disable VCN test if no VCN ring available(v2) sitanliu (1): amdgpu: add device IDs for Raven, Picasso and Renoir sunil kumar dora sermsity (1): intel: Add PCI ID support to RKL platform git tag: libdrm-2.4.103 https://dri.freedesktop.org/libdrm/libdrm-2.4.103.tar.xz SHA256: 3fe0affdba6460166a7323290c18cf68e9b59edcb520722826cb244e9cb50222 libdrm-2.4.103.tar.xz SHA512: 15b098b962008271400692b6b15ecb7e22676f8698e0220ad969735ac2315ccc737d19558afb6abda82bae15117e5f306c048184a2369f434b85ecaa670ca885 libdrm-2.4.103.tar.xz PGP: https://dri.freedesktop.org/libdrm/libdrm-2.4.103.tar.xz.sig -BEGIN PGP SIGNATURE- iQIzBAEBCAAdFiEEEKbZHaGwW9KfbeusDHTzWXnEhr4FAl+iH0kACgkQDHTzWXnE hr6HjRAAlxmfXbpDl5+aNH5NdcwEiEQ63Y4szehQ+lEcqwBEYt/aek/+xVmvNslc ctqycv+F61O82g81Wcs+ElO7OhnhNH/L4vgPpnx+EN3E+5LLmeN2J/z7l//Exq0F ta5AesHJCTSButXIyPvgX9GFqbhydLCJetsBK8SLH6AELbeNZ+Gx9lnZVGEUncyV wZeJYy3gYim0+SuT3Exbh4/qvYkMHLxuZkZN41tRAyAcpVp1tKrqrddVNVYszYVP AHxGryEdmdbJ4dW24o2m9umsQmLFOxvzm1rhcIuNVwFrTYFzJbaoEy83POrnWEGh TFYyg/XtYbD8rfXvTOo8GpSejjffg6hwAkUOzMQMLbhEvb+PszQimIrQtyeBRrEm 1TiPyCXIzE8KQWCILLH1kOvefl069pdIna6tcdEEbqoP2NpltrERU3GAIKjuls/Y OsX36NswUM+RYXO/nk8Qtqf1jrL38xvUwa/lrlOibF9NumrgFC9eJ/mhYkRoHOOH 5JxHlgzp0PMmZuGSsA71vGjL+7nKnfEaUC5dgxxlhqXmFlAnKom7TKF1UVSWahl5 TRY9HoeJWz4nHTi/Qznvpmtl06wemS2DWTbxbGxieVxmdmxtktxrecehTq3CR896 xJZ7OujPh4Lw3qIHwvMflFgXu0qOSeO99eKmena4+rqZs/PsEbI= =ucD2 -END PGP SIGNATURE- ___ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
[git pull] drm fixes for 5.10-rc3
Hey Linus, It's Friday here so that means another installment of drm fixes to distract you from the counting process. Changes all over the place, the amdgpu changes contain support for a new GPU that is close to current one already in the tree (Green Sardine) so it shouldn't have much side effects. Otherwise imx has a few cleanup patches and fixes, amdgpu and i915 have around the usual smattering of fixes, fonts got constified, and vc4/panfrost has some minor fixes. All in all a fairly regular rc3. I think we have an outstanding nouveau regression, but the author is looking into the fix, so should be here next week. I now return you to counting. Dave. drm-fixes-2020-11-06-1: drm fixes for 5.10-rc3 fonts: - constify font structures. MAINTAINERS: - Fix path for amdgpu power management amdgpu: - Add support for more navi1x SKUs - Fix for suspend on CI dGPUs - VCN DPG fix for Picasso - Sienna Cichlid fixes - Polaris DPM fix - Add support for Green Sardine amdkfd: - Fix an allocation failure check i915: - Fix set domain's cache coherency - Fixes around breadcrumbs - Fix encoder lookup during PSR atomic - Hold onto an explicit ref to i915_vma_work.pinned - gvt: HWSP reset handling fix - gvt: flush workaround - gvt: vGPU context pin/unpin - gvt: mmio cmd access fix for bxt/apl imx: - drop unused functions and callbacks - reuse imx_drm_encoder_parse_of - spinlock rework - memory leak fix - minor cleanups vc4: - resource cleanup fix panfrost: - madvise/shrinker fix The following changes since commit 3cea11cd5e3b00d91caf0b4730194039b45c5891: Linux 5.10-rc2 (2020-11-01 14:43:51 -0800) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2020-11-06-1 for you to fetch changes up to 356583b956e620a7ef8086f14bfe971986a320b3: Merge tag 'drm-misc-fixes-2020-11-05' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes (2020-11-06 13:32:12 +1000) drm fixes for 5.10-rc3 fonts: - constify font structures. MAINTAINERS: - Fix path for amdgpu power management amdgpu: - Add support for more navi1x SKUs - Fix for suspend on CI dGPUs - VCN DPG fix for Picasso - Sienna Cichlid fixes - Polaris DPM fix - Add support for Green Sardine amdkfd: - Fix an allocation failure check i915: - Fix set domain's cache coherency - Fixes around breadcrumbs - Fix encoder lookup during PSR atomic - Hold onto an explicit ref to i915_vma_work.pinned - gvt: HWSP reset handling fix - gvt: flush workaround - gvt: vGPU context pin/unpin - gvt: mmio cmd access fix for bxt/apl imx: - drop unused functions and callbacks - reuse imx_drm_encoder_parse_of - spinlock rework - memory leak fix - minor cleanups vc4: - resource cleanup fix panfrost: - madvise/shrinker fix Aaron Liu (1): drm/amdgpu: enable green_sardine_asd.bin loading (v2) Alex Deucher (4): drm/amdgpu/powerplay: Only apply optimized mclk dpm policy on polaris drm/amdgpu/swsmu: remove duplicate call to smu_set_default_dpm_table drm/amdgpu: add Green_Sardine APU flag drm/amdgpu/display: remove DRM_AMD_DC_GREEN_SARDINE Arnd Bergmann (1): drm/imx: tve remove extraneous type qualifier Boris Brezillon (1): drm/panfrost: Fix a deadlock between the shrinker and madvise path Chris Wilson (5): drm/i915/gem: Flush coherency domains on first set-domain-ioctl drm/i915/gt: Use the local HWSP offset during submission drm/i915/gt: Expose more parameters for emitting writes into the ring drm/i915/gt: Flush xcs before tgl breadcrumbs drm/i915: Hold onto an explicit ref to i915_vma_work.pinned Colin Xu (4): drm/i915/gvt: Allow zero out HWSP addr on hws_pga_write drm/i915/gvt: Set SNOOP for PAT3 on BXT/APL to workaround GPU BB hang drm/i915/gvt: Only pin/unpin intel_context along with workload drm/i915/gvt: Fix mmio handler break on BXT/APL. Dave Airlie (4): Merge tag 'imx-drm-next-2020-10-30' of git://git.pengutronix.de/git/pza/linux into drm-fixes Merge tag 'drm-intel-fixes-2020-11-05' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes Merge tag 'amd-drm-fixes-5.10-2020-11-04' of git://people.freedesktop.org/~agd5f/linux into drm-fixes Merge tag 'drm-misc-fixes-2020-11-05' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes Evan Quan (5): drm/amdgpu: perform srbm soft reset always on SDMA resume drm/amd/pm: correct the baco reset sequence for CI ASICs drm/amd/pm: enable baco reset for Hawaii drm/amd/pm: perform SMC reset on suspend/hibernation drm/amd/pm: do not use ixFEATURE_STATUS for checking smc running Flora Cui (2): drm/amdgpu: disable DCN and VCN for Navi14 0x7340/C9 SKU drm/amdgpu: rename nv_is_headless_sku() Imre Deak (1):
ttm multihop split out v2
This is the multhop patch split out per driver, and with the changes Daniel requested. Sorry it took a while, got distracted with other things. Dave. ___ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
[PATCH 2/4] drm/amdgpu/ttm: use multihop
From: Dave Airlie
This removes the code to move resources directly between
SYSTEM and VRAM in favour of using the core ttm mulithop code.
Signed-off-by: Dave Airlie
---
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 136 +++-
1 file changed, 13 insertions(+), 123 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index ce0d82802333..e1458d575aa9 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -512,119 +512,6 @@ static int amdgpu_move_blit(struct ttm_buffer_object *bo,
return r;
}
-/**
- * amdgpu_move_vram_ram - Copy VRAM buffer to RAM buffer
- *
- * Called by amdgpu_bo_move().
- */
-static int amdgpu_move_vram_ram(struct ttm_buffer_object *bo, bool evict,
- struct ttm_operation_ctx *ctx,
- struct ttm_resource *new_mem)
-{
- struct ttm_resource *old_mem = &bo->mem;
- struct ttm_resource tmp_mem;
- struct ttm_place placements;
- struct ttm_placement placement;
- int r;
-
- /* create space/pages for new_mem in GTT space */
- tmp_mem = *new_mem;
- tmp_mem.mm_node = NULL;
- placement.num_placement = 1;
- placement.placement = &placements;
- placement.num_busy_placement = 1;
- placement.busy_placement = &placements;
- placements.fpfn = 0;
- placements.lpfn = 0;
- placements.mem_type = TTM_PL_TT;
- placements.flags = 0;
- r = ttm_bo_mem_space(bo, &placement, &tmp_mem, ctx);
- if (unlikely(r)) {
- pr_err("Failed to find GTT space for blit from VRAM\n");
- return r;
- }
-
- r = ttm_tt_populate(bo->bdev, bo->ttm, ctx);
- if (unlikely(r))
- goto out_cleanup;
-
- /* Bind the memory to the GTT space */
- r = amdgpu_ttm_backend_bind(bo->bdev, bo->ttm, &tmp_mem);
- if (unlikely(r)) {
- goto out_cleanup;
- }
-
- /* blit VRAM to GTT */
- r = amdgpu_move_blit(bo, evict, &tmp_mem, old_mem);
- if (unlikely(r)) {
- goto out_cleanup;
- }
-
- r = ttm_bo_wait_ctx(bo, ctx);
- if (unlikely(r))
- goto out_cleanup;
-
- amdgpu_ttm_backend_unbind(bo->bdev, bo->ttm);
- ttm_resource_free(bo, &bo->mem);
- ttm_bo_assign_mem(bo, new_mem);
-out_cleanup:
- ttm_resource_free(bo, &tmp_mem);
- return r;
-}
-
-/**
- * amdgpu_move_ram_vram - Copy buffer from RAM to VRAM
- *
- * Called by amdgpu_bo_move().
- */
-static int amdgpu_move_ram_vram(struct ttm_buffer_object *bo, bool evict,
- struct ttm_operation_ctx *ctx,
- struct ttm_resource *new_mem)
-{
- struct ttm_resource *old_mem = &bo->mem;
- struct ttm_resource tmp_mem;
- struct ttm_placement placement;
- struct ttm_place placements;
- int r;
-
- /* make space in GTT for old_mem buffer */
- tmp_mem = *new_mem;
- tmp_mem.mm_node = NULL;
- placement.num_placement = 1;
- placement.placement = &placements;
- placement.num_busy_placement = 1;
- placement.busy_placement = &placements;
- placements.fpfn = 0;
- placements.lpfn = 0;
- placements.mem_type = TTM_PL_TT;
- placements.flags = 0;
- r = ttm_bo_mem_space(bo, &placement, &tmp_mem, ctx);
- if (unlikely(r)) {
- pr_err("Failed to find GTT space for blit to VRAM\n");
- return r;
- }
-
- /* move/bind old memory to GTT space */
- r = ttm_tt_populate(bo->bdev, bo->ttm, ctx);
- if (unlikely(r))
- return r;
-
- r = amdgpu_ttm_backend_bind(bo->bdev, bo->ttm, &tmp_mem);
- if (unlikely(r)) {
- goto out_cleanup;
- }
-
- ttm_bo_assign_mem(bo, &tmp_mem);
- /* copy to VRAM */
- r = amdgpu_move_blit(bo, evict, new_mem, old_mem);
- if (unlikely(r)) {
- goto out_cleanup;
- }
-out_cleanup:
- ttm_resource_free(bo, &tmp_mem);
- return r;
-}
-
/**
* amdgpu_mem_visible - Check that memory can be accessed by ttm_bo_move_memcpy
*
@@ -664,6 +551,17 @@ static int amdgpu_bo_move(struct ttm_buffer_object *bo,
bool evict,
struct ttm_resource *old_mem = &bo->mem;
int r;
+ if ((old_mem->mem_type == TTM_PL_SYSTEM &&
+new_mem->mem_type == TTM_PL_VRAM) ||
+ (old_mem->mem_type == TTM_PL_VRAM &&
+new_mem->mem_type == TTM_PL_SYSTEM)) {
+ hop->fpfn = 0;
+ hop->lpfn = 0;
+ hop->mem_type = TTM_PL_TT;
+ hop->flags = 0;
+ return -EMULTIHOP;
+ }
+
if (new_mem-&
[PATCH 4/4] drm/radeon/ttm: use multihop
From: Dave Airlie
This removes the code to move resources directly between
SYSTEM and VRAM in favour of using the core ttm mulithop code.
Signed-off-by: Dave Airlie
---
drivers/gpu/drm/radeon/radeon_ttm.c | 119 +++-
1 file changed, 13 insertions(+), 106 deletions(-)
diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c
b/drivers/gpu/drm/radeon/radeon_ttm.c
index 29062dbea299..788655ebafdb 100644
--- a/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
@@ -206,101 +206,6 @@ static int radeon_move_blit(struct ttm_buffer_object *bo,
return r;
}
-static int radeon_move_vram_ram(struct ttm_buffer_object *bo,
- bool evict,
- struct ttm_operation_ctx *ctx,
- struct ttm_resource *new_mem)
-{
- struct ttm_resource *old_mem = &bo->mem;
- struct ttm_resource tmp_mem;
- struct ttm_place placements;
- struct ttm_placement placement;
- int r;
-
- tmp_mem = *new_mem;
- tmp_mem.mm_node = NULL;
- placement.num_placement = 1;
- placement.placement = &placements;
- placement.num_busy_placement = 1;
- placement.busy_placement = &placements;
- placements.fpfn = 0;
- placements.lpfn = 0;
- placements.mem_type = TTM_PL_TT;
- placements.flags = 0;
- r = ttm_bo_mem_space(bo, &placement, &tmp_mem, ctx);
- if (unlikely(r)) {
- return r;
- }
-
- r = ttm_tt_populate(bo->bdev, bo->ttm, ctx);
- if (unlikely(r)) {
- goto out_cleanup;
- }
-
- r = radeon_ttm_tt_bind(bo->bdev, bo->ttm, &tmp_mem);
- if (unlikely(r)) {
- goto out_cleanup;
- }
- r = radeon_move_blit(bo, true, &tmp_mem, old_mem);
- if (unlikely(r)) {
- goto out_cleanup;
- }
- r = ttm_bo_wait_ctx(bo, ctx);
- if (unlikely(r))
- goto out_cleanup;
-
- radeon_ttm_tt_unbind(bo->bdev, bo->ttm);
- ttm_resource_free(bo, &bo->mem);
- ttm_bo_assign_mem(bo, new_mem);
-out_cleanup:
- ttm_resource_free(bo, &tmp_mem);
- return r;
-}
-
-static int radeon_move_ram_vram(struct ttm_buffer_object *bo,
- bool evict,
- struct ttm_operation_ctx *ctx,
- struct ttm_resource *new_mem)
-{
- struct ttm_resource *old_mem = &bo->mem;
- struct ttm_resource tmp_mem;
- struct ttm_placement placement;
- struct ttm_place placements;
- int r;
-
- tmp_mem = *new_mem;
- tmp_mem.mm_node = NULL;
- placement.num_placement = 1;
- placement.placement = &placements;
- placement.num_busy_placement = 1;
- placement.busy_placement = &placements;
- placements.fpfn = 0;
- placements.lpfn = 0;
- placements.mem_type = TTM_PL_TT;
- placements.flags = 0;
- r = ttm_bo_mem_space(bo, &placement, &tmp_mem, ctx);
- if (unlikely(r)) {
- return r;
- }
-
- r = ttm_tt_populate(bo->bdev, bo->ttm, ctx);
- if (unlikely(r))
- goto out_cleanup;
-
- r = radeon_ttm_tt_bind(bo->bdev, bo->ttm, &tmp_mem);
- if (unlikely(r))
- goto out_cleanup;
-
- ttm_bo_assign_mem(bo, &tmp_mem);
- r = radeon_move_blit(bo, true, new_mem, old_mem);
- if (unlikely(r)) {
- goto out_cleanup;
- }
-out_cleanup:
- ttm_resource_free(bo, &tmp_mem);
- return r;
-}
-
static int radeon_bo_move(struct ttm_buffer_object *bo, bool evict,
struct ttm_operation_ctx *ctx,
struct ttm_resource *new_mem,
@@ -311,6 +216,17 @@ static int radeon_bo_move(struct ttm_buffer_object *bo,
bool evict,
struct ttm_resource *old_mem = &bo->mem;
int r;
+ if ((old_mem->mem_type == TTM_PL_SYSTEM &&
+new_mem->mem_type == TTM_PL_VRAM) ||
+ (old_mem->mem_type == TTM_PL_VRAM &&
+new_mem->mem_type == TTM_PL_SYSTEM)) {
+ hop->fpfn = 0;
+ hop->lpfn = 0;
+ hop->mem_type = TTM_PL_TT;
+ hop->flags = 0;
+ return -EMULTIHOP;
+ }
+
if (new_mem->mem_type == TTM_PL_TT) {
r = radeon_ttm_tt_bind(bo->bdev, bo->ttm, new_mem);
if (r)
@@ -351,17 +267,8 @@ static int radeon_bo_move(struct ttm_buffer_object *bo,
bool evict,
goto memcpy;
}
- if (old_mem->mem_type == TTM_PL_VRAM &&
- new_mem->mem_type == TTM_PL_SYSTEM) {
- r = radeon_move_vram_ram(bo, evict, ctx, new_mem);
- } else if (old_mem->mem_type == TTM_PL_SYSTEM &&am
[PATCH 1/4] drm/ttm: add multihop infrastrucutre (v2)
From: Dave Airlie
Currently drivers get called to move a buffer, but if they have to
move it temporarily through another space (SYSTEM->VRAM via TT)
then they can end up with a lot of ttm->driver->ttm call stacks,
if the temprorary space moves requires eviction.
Instead of letting the driver do all the placement/space for the
temporary, allow it to report back (-EMULTIHOP) and a placement (hop)
to the move code, which will then do the temporary move, and the
correct placement move afterwards.
This removes a lot of code from drivers, at the expense of
adding some midlayering. I've some further ideas on how to turn
it inside out, but I think this is a good solution to the call
stack problems.
v2: separate out the driver patches, add WARN for getting
MULTHOP in paths we shouldn't (Daniel)
Signed-off-by: Dave Airlie
---
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c| 3 +-
drivers/gpu/drm/drm_gem_vram_helper.c | 3 +-
drivers/gpu/drm/nouveau/nouveau_bo.c | 3 +-
drivers/gpu/drm/qxl/qxl_ttm.c | 3 +-
drivers/gpu/drm/radeon/radeon_ttm.c| 3 +-
drivers/gpu/drm/ttm/ttm_bo.c | 68 +++---
drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 3 +-
include/drm/ttm/ttm_bo_driver.h| 7 ++-
8 files changed, 77 insertions(+), 16 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index c01c060e4ac5..ce0d82802333 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -656,7 +656,8 @@ static bool amdgpu_mem_visible(struct amdgpu_device *adev,
*/
static int amdgpu_bo_move(struct ttm_buffer_object *bo, bool evict,
struct ttm_operation_ctx *ctx,
- struct ttm_resource *new_mem)
+ struct ttm_resource *new_mem,
+ struct ttm_place *hop)
{
struct amdgpu_device *adev;
struct amdgpu_bo *abo;
diff --git a/drivers/gpu/drm/drm_gem_vram_helper.c
b/drivers/gpu/drm/drm_gem_vram_helper.c
index 16d68c04ea5d..2cec7b1482b8 100644
--- a/drivers/gpu/drm/drm_gem_vram_helper.c
+++ b/drivers/gpu/drm/drm_gem_vram_helper.c
@@ -964,7 +964,8 @@ static void bo_driver_delete_mem_notify(struct
ttm_buffer_object *bo)
static int bo_driver_move(struct ttm_buffer_object *bo,
bool evict,
struct ttm_operation_ctx *ctx,
- struct ttm_resource *new_mem)
+ struct ttm_resource *new_mem,
+ struct ttm_place *hop)
{
struct drm_gem_vram_object *gbo;
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c
b/drivers/gpu/drm/nouveau/nouveau_bo.c
index 8133377d865d..fee07b9d19ed 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -1023,7 +1023,8 @@ nouveau_bo_vm_cleanup(struct ttm_buffer_object *bo,
static int
nouveau_bo_move(struct ttm_buffer_object *bo, bool evict,
struct ttm_operation_ctx *ctx,
- struct ttm_resource *new_reg)
+ struct ttm_resource *new_reg,
+ struct ttm_place *hop)
{
struct nouveau_drm *drm = nouveau_bdev(bo->bdev);
struct nouveau_bo *nvbo = nouveau_bo(bo);
diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c
index a80d59634143..128c38c8a837 100644
--- a/drivers/gpu/drm/qxl/qxl_ttm.c
+++ b/drivers/gpu/drm/qxl/qxl_ttm.c
@@ -140,7 +140,8 @@ static void qxl_bo_move_notify(struct ttm_buffer_object *bo,
static int qxl_bo_move(struct ttm_buffer_object *bo, bool evict,
struct ttm_operation_ctx *ctx,
- struct ttm_resource *new_mem)
+ struct ttm_resource *new_mem,
+ struct ttm_place *hop)
{
struct ttm_resource *old_mem = &bo->mem;
int ret;
diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c
b/drivers/gpu/drm/radeon/radeon_ttm.c
index 95038ac3382e..29062dbea299 100644
--- a/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
@@ -303,7 +303,8 @@ static int radeon_move_ram_vram(struct ttm_buffer_object
*bo,
static int radeon_bo_move(struct ttm_buffer_object *bo, bool evict,
struct ttm_operation_ctx *ctx,
- struct ttm_resource *new_mem)
+ struct ttm_resource *new_mem,
+ struct ttm_place *hop)
{
struct radeon_device *rdev;
struct radeon_bo *rbo;
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index e2a124b3affb..9f840f2a7836 100644
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -231,7 +231,8 @@ EXPORT_SYMBOL(ttm_bo_bulk_move_lru_tail);
static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo,
struct
[PATCH 3/4] drm/nouveau/ttm: use multihop
From: Dave Airlie
This removes the code to move resources directly between
SYSTEM and VRAM in favour of using the core ttm mulithop code.
Signed-off-by: Dave Airlie
---
drivers/gpu/drm/nouveau/nouveau_bo.c | 112 ---
1 file changed, 13 insertions(+), 99 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c
b/drivers/gpu/drm/nouveau/nouveau_bo.c
index fee07b9d19ed..2b7720f412c1 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -861,96 +861,6 @@ nouveau_bo_move_init(struct nouveau_drm *drm)
NV_INFO(drm, "MM: using %s for buffer copies\n", name);
}
-static int
-nouveau_bo_move_flipd(struct ttm_buffer_object *bo, bool evict,
- struct ttm_operation_ctx *ctx,
- struct ttm_resource *new_reg)
-{
- struct ttm_place placement_memtype = {
- .fpfn = 0,
- .lpfn = 0,
- .mem_type = TTM_PL_TT,
- .flags = 0
- };
- struct ttm_placement placement;
- struct ttm_resource tmp_reg;
- int ret;
-
- placement.num_placement = placement.num_busy_placement = 1;
- placement.placement = placement.busy_placement = &placement_memtype;
-
- tmp_reg = *new_reg;
- tmp_reg.mm_node = NULL;
- ret = ttm_bo_mem_space(bo, &placement, &tmp_reg, ctx);
- if (ret)
- return ret;
-
- ret = ttm_tt_populate(bo->bdev, bo->ttm, ctx);
- if (ret)
- goto out;
-
- ret = nouveau_ttm_tt_bind(bo->bdev, bo->ttm, &tmp_reg);
- if (ret)
- goto out;
-
- ret = nouveau_bo_move_m2mf(bo, true, ctx, &tmp_reg);
- if (ret)
- goto out;
-
- ret = ttm_bo_wait_ctx(bo, ctx);
- if (ret)
- goto out;
-
- nouveau_ttm_tt_unbind(bo->bdev, bo->ttm);
- ttm_resource_free(bo, &bo->mem);
- ttm_bo_assign_mem(bo, &tmp_reg);
-out:
- ttm_resource_free(bo, &tmp_reg);
- return ret;
-}
-
-static int
-nouveau_bo_move_flips(struct ttm_buffer_object *bo, bool evict,
- struct ttm_operation_ctx *ctx,
- struct ttm_resource *new_reg)
-{
- struct ttm_place placement_memtype = {
- .fpfn = 0,
- .lpfn = 0,
- .mem_type = TTM_PL_TT,
- .flags = 0
- };
- struct ttm_placement placement;
- struct ttm_resource tmp_reg;
- int ret;
-
- placement.num_placement = placement.num_busy_placement = 1;
- placement.placement = placement.busy_placement = &placement_memtype;
-
- tmp_reg = *new_reg;
- tmp_reg.mm_node = NULL;
- ret = ttm_bo_mem_space(bo, &placement, &tmp_reg, ctx);
- if (ret)
- return ret;
-
- ret = ttm_tt_populate(bo->bdev, bo->ttm, ctx);
- if (unlikely(ret != 0))
- return ret;
-
- ret = nouveau_ttm_tt_bind(bo->bdev, bo->ttm, &tmp_reg);
- if (unlikely(ret != 0))
- return ret;
-
- ttm_bo_assign_mem(bo, &tmp_reg);
- ret = nouveau_bo_move_m2mf(bo, true, ctx, new_reg);
- if (ret)
- goto out;
-
-out:
- ttm_resource_free(bo, &tmp_reg);
- return ret;
-}
-
static void
nouveau_bo_move_ntfy(struct ttm_buffer_object *bo, bool evict,
struct ttm_resource *new_reg)
@@ -1032,6 +942,17 @@ nouveau_bo_move(struct ttm_buffer_object *bo, bool evict,
struct nouveau_drm_tile *new_tile = NULL;
int ret = 0;
+ if ((old_reg->mem_type == TTM_PL_SYSTEM &&
+new_reg->mem_type == TTM_PL_VRAM) ||
+ (old_reg->mem_type == TTM_PL_VRAM &&
+new_reg->mem_type == TTM_PL_SYSTEM)) {
+ hop->fpfn = 0;
+ hop->lpfn = 0;
+ hop->mem_type = TTM_PL_TT;
+ hop->flags = 0;
+ return -EMULTIHOP;
+ }
+
if (new_reg->mem_type == TTM_PL_TT) {
ret = nouveau_ttm_tt_bind(bo->bdev, bo->ttm, new_reg);
if (ret)
@@ -1074,15 +995,8 @@ nouveau_bo_move(struct ttm_buffer_object *bo, bool evict,
/* Hardware assisted copy. */
if (drm->ttm.move) {
- if (new_reg->mem_type == TTM_PL_SYSTEM)
- ret = nouveau_bo_move_flipd(bo, evict, ctx,
- new_reg);
- else if (old_reg->mem_type == TTM_PL_SYSTEM)
- ret = nouveau_bo_move_flips(bo, evict, ctx,
- new_reg);
- else
- ret = nouveau_bo_move_m2mf(bo, evict, ctx,
- new_reg);
+ ret = nouveau_bo_move_m2mf(bo, evict, ctx,
+
Re: [PATCH 1/4] drm/ttm: add multihop infrastrucutre (v2)
On Tue, 10 Nov 2020 at 07:27, Ville Syrjälä
wrote:
>
> On Mon, Nov 09, 2020 at 09:48:04PM +0100, Christian König wrote:
> > Am 09.11.20 um 17:43 schrieb Ville Syrjälä:
> > > On Mon, Nov 09, 2020 at 05:20:17PM +0100, Christian König wrote:
> > >> Am 09.11.20 um 17:18 schrieb Ville Syrjälä:
> > >>> On Mon, Nov 09, 2020 at 04:57:29PM +0100, Christian König wrote:
> > >>>> Am 09.11.20 um 16:16 schrieb Ville Syrjälä:
> > >>>>> On Wed, Nov 11, 2020 at 06:13:02PM +0100, Christian König wrote:
> > >>>>>> Am 09.11.20 um 01:54 schrieb Dave Airlie:
> > >>>>>>> @@ -1432,15 +1479,18 @@ int ttm_bo_swapout(struct ttm_operation_ctx
> > >>>>>>> *ctx)
> > >>>>>>> if (bo->mem.mem_type != TTM_PL_SYSTEM) {
> > >>>>>>> struct ttm_operation_ctx ctx = { false, false };
> > >>>>>>> struct ttm_resource evict_mem;
> > >>>>>>> + struct ttm_place hop = {};
> > >>>>>> Please always use memset() if you want to zero initialize something
> > >>>>>> in
> > >>>>>> the kernel, we had enough trouble with that.
> > >>>>> What trouble is that? I've not heard of anything, and we use
> > >>>>> ={} quite extensively in drm land.
> > >>>> ={} initializes only named fields, not padding.
> > >>> Has that actually happened?
> > >> YES! Numerous times!
> > > You wouldn't happen to have links/etc. to the discussion?
> > > I'd like to check them out.
> >
> > Uff, that was years ago. Just google for something like "mesa memset
> > hash", there was recently (~ the last year) another discussion because
> > somebody ran into exactly that problem once more.
>
> Found this:
> https://gitlab.freedesktop.org/mesa/mesa/-/issues/2071
> which does suprise me a bit. Though I suspect ={} might
> behave differently since the compiler might treat it
> more like a memset().
It doesn't there's a bit of info out there on what happens, it really
only matters for structs we are passing to userspace, but it's
unlikely to matter here,
but I've changed this to memset in my local tree, because why not.
Dave
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PULL] drm-intel-fixes
On Fri, 13 Nov 2020 at 09:08, Rodrigo Vivi wrote: > > Hi Dave and Daniel, > > This is the same set as last week + couple new fixes targeting stable. > But I merged last weeks set and it's in rc3, maybe you can generate the pull request relative to origin/master or drm/drm-fixes because I'm not sure which bits to edit out here. Dave. > Thanks, > Rodrigo. > > drm-intel-fixes-2020-11-12-1: > - GVT fixes including vGPU suspend/resume fixes and workaround for APL guest > GPU hang. > - Fix set domain's cache coherency (Chris) > - Fixes around breadcrumbs (Chris) > - Fix encoder lookup during PSR atomic (Imre) > - Hold onto an explicit ref to i915_vma_work.pinned (Chris) > - Pull phys pread/pwrite implementations to the backend (Chris) > - Correctly set SFC capability for video engines > The following changes since commit 3cea11cd5e3b00d91caf0b4730194039b45c5891: > > Linux 5.10-rc2 (2020-11-01 14:43:51 -0800) > > are available in the Git repository at: > > git://anongit.freedesktop.org/drm/drm-intel > tags/drm-intel-fixes-2020-11-12-1 > > for you to fetch changes up to a4264790f4c2f0062d27d8173344c914bc7884e0: > > drm/i915: Correctly set SFC capability for video engines (2020-11-12 > 16:41:54 -0500) > > > - GVT fixes including vGPU suspend/resume fixes and workaround for APL guest > GPU hang. > - Fix set domain's cache coherency (Chris) > - Fixes around breadcrumbs (Chris) > - Fix encoder lookup during PSR atomic (Imre) > - Hold onto an explicit ref to i915_vma_work.pinned (Chris) > - Pull phys pread/pwrite implementations to the backend (Chris) > - Correctly set SFC capability for video engines > > > Chris Wilson (6): > drm/i915/gem: Flush coherency domains on first set-domain-ioctl > drm/i915/gt: Use the local HWSP offset during submission > drm/i915/gt: Expose more parameters for emitting writes into the ring > drm/i915/gt: Flush xcs before tgl breadcrumbs > drm/i915: Hold onto an explicit ref to i915_vma_work.pinned > drm/i915/gem: Pull phys pread/pwrite implementations to the backend > > Colin Xu (4): > drm/i915/gvt: Allow zero out HWSP addr on hws_pga_write > drm/i915/gvt: Set SNOOP for PAT3 on BXT/APL to workaround GPU BB hang > drm/i915/gvt: Only pin/unpin intel_context along with workload > drm/i915/gvt: Fix mmio handler break on BXT/APL. > > Imre Deak (1): > drm/i915: Fix encoder lookup during PSR atomic check > > Matthew Auld (1): > drm/i915/gem: Allow backends to override pread implementation > > Venkata Sandeep Dhanalakota (1): > drm/i915: Correctly set SFC capability for video engines > > drivers/gpu/drm/i915/display/intel_psr.c | 2 +- > drivers/gpu/drm/i915/gem/i915_gem_domain.c | 28 ++-- > drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 2 + > drivers/gpu/drm/i915/gem/i915_gem_phys.c | 55 > > drivers/gpu/drm/i915/gt/intel_engine.h | 55 > +++- > drivers/gpu/drm/i915/gt/intel_engine_cs.c| 3 +- > drivers/gpu/drm/i915/gt/intel_lrc.c | 31 + > drivers/gpu/drm/i915/gt/intel_timeline.c | 18 > drivers/gpu/drm/i915/gt/intel_timeline_types.h | 2 + > drivers/gpu/drm/i915/gvt/handlers.c | 47 ++-- > drivers/gpu/drm/i915/gvt/scheduler.c | 15 --- > drivers/gpu/drm/i915/i915_gem.c | 32 +++--- > drivers/gpu/drm/i915/i915_vma.c | 6 ++- > 13 files changed, 204 insertions(+), 92 deletions(-) ___ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PULL] nouveau-fixes 5.10
On Thu, 12 Nov 2020 at 14:12, Ben Skeggs wrote: > > The following changes since commit 512bce50a41c528fa15c4c014293e7bebf018658: > > Merge v5.10-rc3 into drm-next (2020-11-10 14:36:36 +0100) > > are available in the Git repository at: > > git://github.com/skeggsb/linux linux-5.10 > > for you to fetch changes up to f67e5ecab785631cf7f776533432ba5aba06615a: > > drm/nouveau/ttm: avoid using nouveau_drm.ttm.type_vram prior to nv50 > (2020-11-12 14:09:45 +1000) Are these fixes for next or for fixes, since they are on a next base, I didn't want to assume anything, if they are for v5.10 please base them on v5.10-rc3 directly. Dave. ___ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
[git pull] drm fixes for 5.10-rc4
Hi Linus, Nearly didn't send you a PR this week at all, but a few things trickled in over the day, not a huge amount here, some i915, amdgpu and a bunch of misc fixes. I have a couple of nouveau fixes outstanding due to the PR having the wrong base, I'll figure it out next week. Dave. drm-fixes-2020-11-13: drm fixes for 5.10-rc4 amdgpu: - Pageflip fix for DCN3 - Declare TA firmware for green sardine - Headless navi fix i915: - Pull phys pread/pwrite implementations to the backend - Correctly set SFC capability for video engines bridge: - cdns Kconfig fix hyperv_fb: - fix missing include gma500: - oob access fix mcde: - unbalanced regulator fix The following changes since commit f8394f232b1eab649ce2df5c5f15b0e528c92091: Linux 5.10-rc3 (2020-11-08 16:10:16 -0800) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2020-11-13 for you to fetch changes up to 41f3ed2cac86ba533ce6a334a2e7fae5c7082946: Merge tag 'amd-drm-fixes-5.10-2020-11-12' of git://people.freedesktop.org/~agd5f/linux into drm-fixes (2020-11-13 16:05:31 +1000) drm fixes for 5.10-rc4 amdgpu: - Pageflip fix for DCN3 - Declare TA firmware for green sardine - Headless navi fix i915: - Pull phys pread/pwrite implementations to the backend - Correctly set SFC capability for video engines bridge: - cdns Kconfig fix hyperv_fb: - fix missing include gma500: - oob access fix mcde: - unbalanced regulator fix Bhawanpreet Lakha (1): drm/amd/display: Add missing pflip irq Chris Wilson (1): drm/i915/gem: Pull phys pread/pwrite implementations to the backend Dave Airlie (3): Merge tag 'drm-misc-fixes-2020-11-12' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes Merge tag 'drm-intel-fixes-2020-11-13' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes Merge tag 'amd-drm-fixes-5.10-2020-11-12' of git://people.freedesktop.org/~agd5f/linux into drm-fixes Linus Walleij (1): drm/mcde: Fix unbalanced regulator Matthew Auld (1): drm/i915/gem: Allow backends to override pread implementation Nishanth Menon (1): drm: bridge: cdns: Kconfig: Switch over dependency to ARCH_K3 Olaf Hering (1): video: hyperv_fb: include vmalloc.h Roman Li (1): drm/amdgpu: add ta firmware load for green-sardine Thomas Zimmermann (1): drm/gma500: Fix out-of-bounds access to struct drm_device.vblank[] Tianci.Yin (1): drm/amdgpu: enable DCN for navi10 headless SKU Venkata Sandeep Dhanalakota (1): drm/i915: Correctly set SFC capability for video engines drivers/gpu/drm/amd/amdgpu/nv.c| 3 +- drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 1 + .../amd/display/dc/irq/dcn30/irq_service_dcn30.c | 4 +- drivers/gpu/drm/bridge/cadence/Kconfig | 2 +- drivers/gpu/drm/gma500/psb_irq.c | 34 + drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 2 + drivers/gpu/drm/i915/gem/i915_gem_phys.c | 55 ++ drivers/gpu/drm/i915/gt/intel_engine_cs.c | 3 +- drivers/gpu/drm/i915/i915_gem.c| 32 +++-- drivers/gpu/drm/mcde/mcde_drv.c| 8 +++- drivers/video/fbdev/hyperv_fb.c| 1 + 11 files changed, 90 insertions(+), 55 deletions(-) ___ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [git pull] drm next pull for 5.10-rc1
On Mon, 16 Nov 2020 at 03:57, Linus Torvalds
wrote:
>
> On Tue, Nov 3, 2020 at 2:20 PM Kirill A. Shutemov
> wrote:
> >
> > On Thu, Oct 15, 2020 at 11:33:08AM +1000, Dave Airlie wrote:
> > > drm/nouveau/kms: Search for encoders' connectors properly
> >
> > This commit (09838c4efe9a) broke boot for me. These two hunks in
> > particular:
>
> Christ. It's been two weeks. I'm doing -rc4 today, and I still don't
> have the fix.
>
> The problem seems entirely obvious, as reported by Kirill: the nv50
> code unconditionally calls the "atomic_{dis,en}able()" functions, even
> when not everybody was converted.
>
> The fix seems to be to either just do the conversion of the remaining
> cases (which looks like just adding an argument to the remaining
> functions, and using that for the "atomic" callback), or the trivial
> suggestion by Kirill from two weeks ago:
>
> > I hacked up patch to use help->disable/help->enable if atomic_ versions
> > are NULL. It worked.
>
> Kirill, since the nouveau people aren't fixing this, can you just send
> me your tested patch?
>
> Lyude/Ben - let me just say that I think this is all a huge disgrace.
>
> You had a problem report with a bisected commit, a suggested fix, and
> two weeks later there's absolutely _nothing_.
I do have a fixes pull from Ben from Saturday in my inbox, I can send
it on this morning.
Dave.
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
[git pull] drm nouveau urgent fixes for 5.10-rc4
Hi Linus, As mentioned I did have a fixes pull from Ben from after I'd sent you out stuff, it contains the fix for the regression reported in the rc1 thread along with two others. Dave. drm-fixes-2020-11-16: drm nouveau fixes for 5.10-rc4 nouveau: - atomic modesetting regression fix - ttm pre-nv50 fix - connector NULL ptr deref fix The following changes since commit 41f3ed2cac86ba533ce6a334a2e7fae5c7082946: Merge tag 'amd-drm-fixes-5.10-2020-11-12' of git://people.freedesktop.org/~agd5f/linux into drm-fixes (2020-11-13 16:05:31 +1000) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2020-11-16 for you to fetch changes up to 8f598d15ee6577a56d6617d9e4151591db34d8fa: Merge branch 'linux-5.10' of git://github.com/skeggsb/linux into drm-fixes (2020-11-16 06:36:31 +1000) drm nouveau fixes for 5.10-rc4 nouveau: - atomic modesetting regression fix - ttm pre-nv50 fix - connector NULL ptr deref fix Alexander Kapshuk (1): drm/nouveau/kms: Fix NULL pointer dereference in nouveau_connector_detect_depth Ben Skeggs (1): drm/nouveau/ttm: avoid using nouveau_drm.ttm.type_vram prior to nv50 Dave Airlie (1): Merge branch 'linux-5.10' of git://github.com/skeggsb/linux into drm-fixes Lyude Paul (1): drm/nouveau/kms/nv50-: Use atomic encoder callbacks everywhere drivers/gpu/drm/nouveau/dispnv50/disp.c | 29 ++--- drivers/gpu/drm/nouveau/nouveau_bo.c| 3 +-- drivers/gpu/drm/nouveau/nouveau_connector.c | 14 +- 3 files changed, 24 insertions(+), 22 deletions(-) ___ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [git pull] drm next pull for 5.10-rc1
>
> Christ. It's been two weeks. I'm doing -rc4 today, and I still don't
> have the fix.
>
> The problem seems entirely obvious, as reported by Kirill: the nv50
> code unconditionally calls the "atomic_{dis,en}able()" functions, even
> when not everybody was converted.
>
> The fix seems to be to either just do the conversion of the remaining
> cases (which looks like just adding an argument to the remaining
> functions, and using that for the "atomic" callback), or the trivial
> suggestion by Kirill from two weeks ago:
>
> > I hacked up patch to use help->disable/help->enable if atomic_ versions
> > are NULL. It worked.
>
> Kirill, since the nouveau people aren't fixing this, can you just send
> me your tested patch?
>
> Lyude/Ben - let me just say that I think this is all a huge disgrace.
>
> You had a problem report with a bisected commit, a suggested fix, and
> two weeks later there's absolutely _nothing_.
I would like to say when you sent this, there was patches on the
mailing lists with Kirill cc'ed, a pull request outstanding to me on
the mailing list from Ben, with the patches reviewed in it.
Maybe you weren't cc'ed on it, but stuff has certainly happened, in
the timeframe, and I was keeping track of it from falling down a hole.
_nothing_ is a lot more a reflection on your research than the ongoing
process, there was some delays here and maybe we need to communicate
when we are flat out dealing with other more urgent tasks that pay the
actual wages.
Dave.
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: Linux 5.10-rc4
On Thu, 19 Nov 2020 at 08:15, Daniel Vetter wrote:
>
> On Wed, Nov 18, 2020 at 11:01 PM David Laight wrote:
> >
> > From: Thomas Zimmermann
> > > Sent: 18 November 2020 19:37
> > >
> > > Hi
> > >
> > > Am 18.11.20 um 19:10 schrieb Linus Torvalds:
> > > > On Wed, Nov 18, 2020 at 4:12 AM David Laight
> > > > wrote:
> > > >>
> > > >> I've got the 'splat' below during boot.
> > > >> This is an 8-core C2758 Atom cpu using the on-board/cpu graphics.
> > > >> User space is Ubuntu 20.04.
> > > >>
> > > >> Additionally the X display has all the colours and alignment slightly
> > > >> messed up.
> > > >> 5.9.0 was ok.
> > > >> I'm just guessing the two issues are related.
> > > >
> > > > Sounds likely. But it would be lovely if you could bisect when
> > > > exactly the problem(s) started to both verify that, and just to
> > > > pinpoint the exact change..
> >
> > I don't quite understand what 'git bisect' did.
> > I was bisecting between v5.9 and v5.10-rc1 but it suddenly started
> > generating v5.9.0-rc5+ kernels.
>
> We queue up patches for -rc1 way before the previous kernel is
> released, so this is normal.
>
> > The identified commit was 13a8f46d803 drm/ttm: move ghost object created.
> > (retyped - hope it is right).
> > But the diff to that last 'good' commit is massive.
>
> Yeah that's also normal for non-linear history. If you want to
> double-check, re-test the parent of that commit (which is 2ee476f77ffe
> ("drm/ttm: add a simple assign mem to bo wrapper")), which should
> work, and then the bad commit.
>
> Also is this the first bad commit for both the splat and the screen
> corruption issues?
>
> > So I don't know if that is anywhere near right.
>
> Thomas guessed it could be a ttm change, you hit one, and it looks
> like it could be the culprit. Now I guess it's up to Dave. Also adding
> Christian, in case he has an idea.
I'd be mildly surprised if it's that commit, since it just refactors
what looks to me to be two identical code pieces into one instance
(within the scope of me screwing that up, but reading it I can't see
it).
I'll dig into this today.
Dave.
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
[PATCH] drm/vram: fix incorrect flag variable usage.
From: Dave Airlie In 7053e0eab473119503f6565b4e398f9a73122481 drm/vram-helper: stop using TTM placement flags it appears the flags got mixed up. This should fix a regression on ast [ 64.782340] WARNING: CPU: 51 PID: 1964 at drivers/gpu/drm/drm_gem_vram_helper.c:284 drm_gem_vram_offset+0x35/0x40 [drm_vram_helper] [ 64.782411] CPU: 51 PID: 1964 Comm: Xorg Not tainted 5.10.0-rc3 #12 [ 64.782413] Hardware name: To be filled. [ 64.782419] RIP: 0010:drm_gem_vram_offset+0x35/0x40 [drm_vram_helper] [ 64.782424] Code: 00 48 89 e5 85 c0 74 17 48 83 bf 78 01 00 00 00 74 18 48 8b 87 80 01 00 00 5d 48 c1 e0 0c c3 0f 0b 48 c7 c0 ed ff ff ff 5d c3 <0f> 0b 31 c0 5d c3 0f 1f 44 00 00 0f 1f 44 00 00 55 48 8b 87 18 06 [ 64.782427] RSP: 0018:a9128909fa68 EFLAGS: 00010246 [ 64.782431] RAX: 0002 RBX: 95a5c25e1ec0 RCX: c02b6600 [ 64.782433] RDX: 959e49824000 RSI: 95a5c25e0b40 RDI: 959e4b1c2c00 [ 64.782434] RBP: a9128909fa68 R08: 0040 R09: 95a9c5dcb688 [ 64.782436] R10: R11: 0001 R12: 959e49824000 [ 64.782437] R13: R14: R15: 95a5c5c56f00 [ 64.782440] FS: 7f485d466a80() GS:95a9afcc() knlGS: [ 64.782442] CS: 0010 DS: ES: CR0: 80050033 [ 64.782444] CR2: 7f485e202000 CR3: 000c82a0e000 CR4: 003506e0 [ 64.782446] Call Trace: [ 64.782455] ast_cursor_page_flip+0x22/0x100 [ast] [ 64.782460] ast_cursor_plane_helper_atomic_update+0x46/0x70 [ast] [ 64.782477] drm_atomic_helper_commit_planes+0xbd/0x220 [drm_kms_helper] [ 64.782493] drm_atomic_helper_commit_tail_rpm+0x3a/0x70 [drm_kms_helper] [ 64.782507] commit_tail+0x99/0x130 [drm_kms_helper] [ 64.782521] drm_atomic_helper_commit+0x123/0x150 [drm_kms_helper] [ 64.782551] drm_atomic_commit+0x4a/0x50 [drm] [ 64.782565] drm_atomic_helper_update_plane+0xe7/0x140 [drm_kms_helper] [ 64.782592] __setplane_atomic+0xcc/0x110 [drm] [ 64.782619] drm_mode_cursor_universal+0x13e/0x260 [drm] [ 64.782647] drm_mode_cursor_common+0xef/0x220 [drm] [ 64.782654] ? tomoyo_path_number_perm+0x6f/0x200 [ 64.782680] ? drm_mode_cursor_ioctl+0x60/0x60 [drm] [ 64.782706] drm_mode_cursor2_ioctl+0xe/0x10 [drm] [ 64.782727] drm_ioctl_kernel+0xae/0xf0 [drm] [ 64.782749] drm_ioctl+0x241/0x3f0 [drm] [ 64.782774] ? drm_mode_cursor_ioctl+0x60/0x60 [drm] [ 64.782781] ? tomoyo_file_ioctl+0x19/0x20 [ 64.782787] __x64_sys_ioctl+0x91/0xc0 [ 64.782792] do_syscall_64+0x38/0x90 [ 64.782797] entry_SYSCALL_64_after_hwframe+0x44/0xa9 Signed-off-by: Dave Airlie Cc: Wen Pu Cc: David Laight Cc: Christian König --- drivers/gpu/drm/drm_gem_vram_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_gem_vram_helper.c b/drivers/gpu/drm/drm_gem_vram_helper.c index 50cad0e4a92e..2896a057b771 100644 --- a/drivers/gpu/drm/drm_gem_vram_helper.c +++ b/drivers/gpu/drm/drm_gem_vram_helper.c @@ -140,7 +140,7 @@ static void drm_gem_vram_placement(struct drm_gem_vram_object *gbo, unsigned int c = 0; if (pl_flag & DRM_GEM_VRAM_PL_FLAG_TOPDOWN) - pl_flag = TTM_PL_FLAG_TOPDOWN; + invariant_flag = TTM_PL_FLAG_TOPDOWN; gbo->placement.placement = gbo->placements; gbo->placement.busy_placement = gbo->placements; -- 2.20.1 ___ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: Linux 5.10-rc4
On Thu, 19 Nov 2020 at 08:25, Dave Airlie wrote:
>
> On Thu, 19 Nov 2020 at 08:15, Daniel Vetter wrote:
> >
> > On Wed, Nov 18, 2020 at 11:01 PM David Laight
> > wrote:
> > >
> > > From: Thomas Zimmermann
> > > > Sent: 18 November 2020 19:37
> > > >
> > > > Hi
> > > >
> > > > Am 18.11.20 um 19:10 schrieb Linus Torvalds:
> > > > > On Wed, Nov 18, 2020 at 4:12 AM David Laight
> > > > > wrote:
> > > > >>
> > > > >> I've got the 'splat' below during boot.
> > > > >> This is an 8-core C2758 Atom cpu using the on-board/cpu graphics.
> > > > >> User space is Ubuntu 20.04.
> > > > >>
> > > > >> Additionally the X display has all the colours and alignment slightly
> > > > >> messed up.
> > > > >> 5.9.0 was ok.
> > > > >> I'm just guessing the two issues are related.
> > > > >
> > > > > Sounds likely. But it would be lovely if you could bisect when
> > > > > exactly the problem(s) started to both verify that, and just to
> > > > > pinpoint the exact change..
> > >
> > > I don't quite understand what 'git bisect' did.
> > > I was bisecting between v5.9 and v5.10-rc1 but it suddenly started
> > > generating v5.9.0-rc5+ kernels.
> >
> > We queue up patches for -rc1 way before the previous kernel is
> > released, so this is normal.
> >
> > > The identified commit was 13a8f46d803 drm/ttm: move ghost object created.
> > > (retyped - hope it is right).
> > > But the diff to that last 'good' commit is massive.
> >
> > Yeah that's also normal for non-linear history. If you want to
> > double-check, re-test the parent of that commit (which is 2ee476f77ffe
> > ("drm/ttm: add a simple assign mem to bo wrapper")), which should
> > work, and then the bad commit.
> >
> > Also is this the first bad commit for both the splat and the screen
> > corruption issues?
> >
> > > So I don't know if that is anywhere near right.
> >
> > Thomas guessed it could be a ttm change, you hit one, and it looks
> > like it could be the culprit. Now I guess it's up to Dave. Also adding
> > Christian, in case he has an idea.
>
> I'd be mildly surprised if it's that commit, since it just refactors
> what looks to me to be two identical code pieces into one instance
> (within the scope of me screwing that up, but reading it I can't see
> it).
>
> I'll dig into this today.
https://patchwork.freedesktop.org/patch/401559/
should fix it.
We had a report in the rc1 thread but it got lost in the nouveau stuff
as well, I've cc that reporter as well.
please test.
Dave.
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v2 2/9] misc: Add Xilinx AI engine device driver
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 5cc595a..40e3351 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -19283,6 +19283,14 @@ T: git https://github.com/Xilinx/linux-xlnx.git
> F: Documentation/devicetree/bindings/phy/xlnx,zynqmp-psgtr.yaml
> F: drivers/phy/xilinx/phy-zynqmp.c
>
> +XILINX AI ENGINE DRIVER
> +M: Wendy Liang
> +S: Supported
> +F: Documentation/devicetree/bindings/soc/xilinx/xlnx,ai-engine.yaml
> +F: drivers/misc/xilinx-ai-engine/
> +F: include/linux/xlnx-ai-engine.h
> +F: include/uapi/linux/xlnx-ai-engine.h
> +
> XILLYBUS DRIVER
> M: Eli Billauer
> L: linux-ker...@vger.kernel.org
> diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
> index fafa8b0..0b8ce4d 100644
> --- a/drivers/misc/Kconfig
> +++ b/drivers/misc/Kconfig
> @@ -444,6 +444,18 @@ config XILINX_SDFEC
>
> If unsure, say N.
>
> +config XILINX_AIE
> + tristate "Xilinx AI engine"
> + depends on ARM64 || COMPILE_TEST
> + help
> + This option enables support for the Xilinx AI engine driver.
> + One Xilinx AI engine device can have multiple partitions (groups of
> + AI engine tiles). Xilinx AI engine device driver instance manages
> + AI engine partitions. User application access its partitions through
> + AI engine partition instance file operations.
> +
> + If unsure, say N
> +
> config MISC_RTSX
> tristate
> default MISC_RTSX_PCI || MISC_RTSX_USB
> diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
> index d23231e..2176b18 100644
> --- a/drivers/misc/Makefile
> +++ b/drivers/misc/Makefile
> @@ -57,3 +57,4 @@ obj-$(CONFIG_HABANA_AI) += habanalabs/
> obj-$(CONFIG_UACCE)+= uacce/
> obj-$(CONFIG_XILINX_SDFEC) += xilinx_sdfec.o
> obj-$(CONFIG_HISI_HIKEY_USB) += hisi_hikey_usb.o
> +obj-$(CONFIG_XILINX_AIE) += xilinx-ai-engine/
> diff --git a/drivers/misc/xilinx-ai-engine/Makefile
> b/drivers/misc/xilinx-ai-engine/Makefile
> new file mode 100644
> index 000..7827a0a
> --- /dev/null
> +++ b/drivers/misc/xilinx-ai-engine/Makefile
> @@ -0,0 +1,11 @@
> +# SPDX-License-Identifier: GPL-2.0-only
> +#
> +# Makefile for Xilinx AI engine device driver
> +#
> +
> +obj-$(CONFIG_XILINX_AIE) += xilinx-aie.o
> +
> +xilinx-aie-$(CONFIG_XILINX_AIE) := ai-engine-aie.o \
> + ai-engine-dev.o \
> + ai-engine-part.o \
> + ai-engine-res.o
> diff --git a/drivers/misc/xilinx-ai-engine/ai-engine-aie.c
> b/drivers/misc/xilinx-ai-engine/ai-engine-aie.c
> new file mode 100644
> index 000..319260f
> --- /dev/null
> +++ b/drivers/misc/xilinx-ai-engine/ai-engine-aie.c
> @@ -0,0 +1,115 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * Xilinx AI Engine driver AIE device specific implementation
> + *
> + * Copyright (C) 2020 Xilinx, Inc.
> + */
> +
> +#include
> +
> +#include "ai-engine-internal.h"
> +
> +#define AIE_ARRAY_SHIFT30U
> +#define AIE_COL_SHIFT 23U
> +#define AIE_ROW_SHIFT 18U
> +
> +/*
> + * Registers offsets
> + */
> +#define AIE_SHIMNOC_L2INTR_MASK_REGOFF 0x00015000U
> +#define AIE_SHIMNOC_L2INTR_INTR_REGOFF 0x00015010U
> +#define AIE_SHIMNOC_DMA_BD0_ADDRLOW_REGOFF 0x0001d000U
> +#define AIE_SHIMNOC_DMA_BD15_PACKET_REGOFF 0x0001d13cU
> +#define AIE_SHIMNOC_AXIMM_REGOFF 0x0001e020U
> +#define AIE_SHIMPL_L1INTR_MASK_A_REGOFF0x00035000U
> +#define AIE_SHIMPL_L1INTR_BLOCK_NORTH_B_REGOFF 0x00035050U
> +#define AIE_SHIMPL_CLKCNTR_REGOFF 0x00036040U
> +#define AIE_SHIMPL_RESET_REGOFF0x0003604cU
> +#define AIE_TILE_CORE_CLKCNTR_REGOFF 0x00036040U
> +
> +static const struct aie_tile_regs aie_kernel_regs[] = {
> + /* SHIM AXI MM Config */
> + {.attribute = AIE_TILE_TYPE_SHIMNOC << AIE_REGS_ATTR_TILE_TYPE_SHIFT,
> +.soff = AIE_SHIMNOC_AXIMM_REGOFF,
> +.eoff = AIE_SHIMNOC_AXIMM_REGOFF,
> + },
> + /* SHIM DMA ADDRESS range */
> + {.attribute = AIE_TILE_TYPE_SHIMNOC << AIE_REGS_ATTR_TILE_TYPE_SHIFT,
> +.soff = AIE_SHIMNOC_DMA_BD0_ADDRLOW_REGOFF,
> +.eoff = AIE_SHIMNOC_DMA_BD15_PACKET_REGOFF,
> + },
> + /* SHIM 2nd level interrupt controller */
> + {.attribute = AIE_TILE_TYPE_SHIMNOC << AIE_REGS_ATTR_TILE_TYPE_SHIFT,
> +.soff = AIE_SHIMNOC_L2INTR_MASK_REGOFF,
> +.eoff = AIE_SHIMNOC_L2INTR_INTR_REGOFF,
> + },
> + /* SHIM 1st level interrupt controller */
> + {.attribute = (AIE_TILE_TYPE_SHIMPL | AIE_TILE_TYPE_SHIMNOC) <<
> + AIE_REGS_ATTR_TILE_TYPE_SHIFT,
> +.soff = AIE_SHIMPL_L1INTR_MASK_A_REGOFF,
> +.eoff = AIE_SHIMPL_L1INTR_BLOCK_NORTH_B_REGOFF,
> + },
> + /* SHIM reset Enable */
> + {.attribute = (AIE_TILE_TYPE_SHIMPL | AIE_TILE_TYPE_SHIMNOC) <<
> +
[git pull] drm fixes for v5.10-rc5
Hi Linus, Weekly fixes pull. This contains some fixes for sun4i/dw-hdmi probing, then amdgpu enables arcturus hw without experimental flag and two other fixes and a group of i915 fixes. It also has a backported from next fix for the warn on reported in ast/drm_gem_vram_helper code in the rc1 pull request thread. The rc4 PR has a thread which initially looked to be the same problem, but I'm going to chase that up next week a bit more as I don't think the bisect landed anywhere useful. Dave. drm-fixes-2020-11-20-2: drm fixes for v5.10-rc5 core: - vram helper TTM regression fix amdgpu: - Pageflip fix for navi1x with 5 or 6 displays - Remove experimental flag for Arcturus - Fix regression in atomic commit tail rework i915: - Fix tgl power gating issue - Memory leak fixes - Selftest fixes - Display bpc fix - Fix TGL MOCS for PTE tracking dw-hdmi: - probing fix sun4i: - probing fix The following changes since commit 09162bc32c880a791c6c0668ce0745cf7958f576: Linux 5.10-rc4 (2020-11-15 16:44:31 -0800) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2020-11-20-2 for you to fetch changes up to 6600f9d52213b5c3455481b5c9e61cf5e305c0e6: Merge tag 'drm-intel-fixes-2020-11-19' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes (2020-11-20 11:21:54 +1000) drm fixes for v5.10-rc5 core: - vram helper TTM regression fix amdgpu: - Pageflip fix for navi1x with 5 or 6 displays - Remove experimental flag for Arcturus - Fix regression in atomic commit tail rework i915: - Fix tgl power gating issue - Memory leak fixes - Selftest fixes - Display bpc fix - Fix TGL MOCS for PTE tracking dw-hdmi: - probing fix sun4i: - probing fix Alex Deucher (2): drm/amd/display: Add missing pflip irq for dcn2.0 drm/amdgpu: remove experimental flag from arcturus Chris Wilson (2): drm/i915/gt: Remember to free the virtual breadcrumbs drm/i915/gt: Fixup tgl mocs for PTE tracking Colin Xu (1): drm/i915/gvt: Temporarily disable vfio_edid for BXT/APL Dave Airlie (3): Merge tag 'amd-drm-fixes-5.10-2020-11-18' of git://people.freedesktop.org/~agd5f/linux into drm-fixes Merge tag 'drm-misc-fixes-2020-11-19' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes Merge tag 'drm-intel-fixes-2020-11-19' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes Jonathan Liu (1): drm: bridge: dw-hdmi: Avoid resetting force in the detect function Maxime Ripard (2): drm/sun4i: backend: Fix probe failure with multiple backends Merge tag 'drm/sun4i-dma-fix-pull-request' of ssh://gitolite.kernel.org/.../mripard/linux into drm-misc-fixes Rodrigo Siqueira (1): drm/amd/display: Always get CRTC updated constant values inside commit tail Rodrigo Vivi (2): drm/i915/tgl: Fix Media power gate sequence. Merge tag 'gvt-fixes-2020-11-17' of https://github.com/intel/gvt-linux into drm-intel-fixes Thomas Zimmermann (1): drm/vram-helper: Fix use of top-down placement Tina Zhang (1): drm/i915/gvt: Set ENHANCED_FRAME_CAP bit Tvrtko Ursulin (1): drm/i915: Avoid memory leak with more than 16 workarounds on a list Ville Syrjälä (1): drm/i915: Handle max_bpc==16 Xiongfeng Wang (2): drm/i915/gvt: return error when failing to take the module reference drm/sun4i: dw-hdmi: fix error return code in sun8i_dw_hdmi_bind() Zhang Xiaoxu (2): drm/i915/selftests: Fix wrong return value of perf_series_engines() drm/i915/selftests: Fix wrong return value of perf_request_latency() drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c| 8 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 ++- .../amd/display/dc/irq/dcn20/irq_service_dcn20.c | 4 ++-- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 6 -- drivers/gpu/drm/drm_gem_vram_helper.c | 2 +- drivers/gpu/drm/i915/display/intel_display.c | 3 ++- drivers/gpu/drm/i915/gt/intel_lrc.c| 1 + drivers/gpu/drm/i915/gt/intel_mocs.c | 5 +++-- drivers/gpu/drm/i915/gt/intel_rc6.c| 22 +- drivers/gpu/drm/i915/gt/intel_workarounds.c| 4 +++- drivers/gpu/drm/i915/gvt/display.c | 2 +- drivers/gpu/drm/i915/gvt/kvmgt.c | 4 +++- drivers/gpu/drm/i915/gvt/vgpu.c| 3 ++- drivers/gpu/drm/i915/i915_reg.h| 12 +--- drivers/gpu/drm/i915/intel_pm.c| 13 - drivers/gpu/drm/i915/selftests/i915_request.c | 8 ++-- drivers/gpu/drm/sun4i/sun4i_backend.c | 8 +++- drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 1 + 18 files changed, 60 insertions(+), 49 deletions(-)
Re: [pull] amdgpu, amdkfd drm-next-5.18
On Tue, 8 Mar 2022 at 06:08, Alex Deucher wrote:
>
> Hi Dave, Daniel,
>
> Same PR as last week, just fixed up a bad Fixes tag.
>
> The following changes since commit 38a15ad9488e21cad8f42d3befca20f91e5b2874:
>
> Merge tag 'amd-drm-next-5.18-2022-02-25' of
> https://gitlab.freedesktop.org/agd5f/linux into drm-next (2022-03-01 16:19:02
> +1000)
>
> are available in the Git repository at:
>
> https://gitlab.freedesktop.org/agd5f/linux.git
> tags/amd-drm-next-5.18-2022-03-07
>
> for you to fetch changes up to 53b97af4a44abd21344cc9f13986ba53051287bb:
>
> drm/amdkfd: Add format attribute to kfd_smi_event_add (2022-03-07 14:59:59
> -0500)
clang says no.
/home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_device_queue_manager.c:508:6:
error: variable 'vmid' is used uninitialized whenever 'if' condition
is false [-Werror,-Wsometimes-uninitialized]
if (dev->kfd2kgd->get_atc_vmid_pasid_mapping_info) {
^
/home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_device_queue_manager.c:521:6:
note: uninitialized use occurs here
if (vmid > last_vmid_to_scan) {
^~~~
/home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_device_queue_manager.c:508:2:
note: remove the 'if' if its condition is always true
if (dev->kfd2kgd->get_atc_vmid_pasid_mapping_info) {
^~~
/home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_device_queue_manager.c:490:19:
note: initialize the variable 'vmid' to silence this warning
unsigned int vmid;
^
= 0
Dave.
>
>
> amd-drm-next-5.18-2022-03-07:
>
> amdgpu:
> - Misc code cleanups
> - Misc display fixes
> - PSR display fixes
> - More RAS cleanup
> - Hotplug fix
> - Bump minor version for hotplug tests
> - SR-IOV fixes
> - GC 10.3.7 updates
> - Remove some firmwares which are no longer used
> - Mode2 reset refactor
> - Aldebaran fixes
> - Add VCN fwlog feature for VCN debugging
> - CS code cleanup
>
> amdkfd:
> - SVM fixes
> - SMI event fixes and cleanups
> - vmid_pasid mapping fix for gfx10.3
>
>
> Alex Deucher (4):
> drm/amdgpu: Use IP versions in convert_tiling_flags_to_modifier()
> drm/amdgpu: remove unused gpu_info firmwares
> drm/amdgpu/gfx10: drop unused cyan skillfish firmware
> drm/amdgpu/sdma5: drop unused cyan skillfish firmware
>
> Andrey Grodzovsky (2):
> drm/amdgpu: Fix sigsev when accessing MMIO on hot unplug.
> drm/amdgpu: Bump minor version for hot plug tests enabling.
>
> Anthony Koo (1):
> drm/amd/display: [FW Promotion] Release 0.0.106.0
>
> Aric Cyr (1):
> drm/amd/display: 3.2.175
>
> Charlene Liu (1):
> drm/amd/display: add verify_link_cap back for hdmi
>
> Chris Park (1):
> drm/amd/display: Reset VIC if HDMI_VIC is present
>
> Christian König (5):
> drm/amdgpu: install ctx entities with cmpxchg
> drm/amdgpu: header cleanup
> drm/amdgpu: use job and ib structures directly in CS parsers
> drm/amdgpu: properly embed the IBs into the job
> drm/amdgpu: initialize the vmid_wait with the stub fence
>
> Danijel Slivka (1):
> drm/amd/pm: new v3 SmuMetrics data structure for Sienna Cichlid
>
> David Yu (1):
> drm/amdgpu: Add DFC CAP support for aldebaran
>
> Dillon Varone (2):
> drm/amd/display: Add frame alternate 3D & restrict HW packed on dongles
> drm/amd/display: Modify plane removal sequence to avoid hangs.
>
> George Shen (1):
> drm/amd/display: Refactor fixed VS w/a for PHY tests
>
> Hansen Dsouza (1):
> drm/amd/display: Remove invalid RDPCS Programming in DAL
>
> Harish Kasiviswanathan (1):
> drm/amdgpu: Set correct DMA mask for aldebaran
>
> Jingwen Chen (1):
> drm/amd/amdgpu: set disabled vcn to no_schduler
>
> Lijo Lazar (1):
> drm/amdgpu: Refactor mode2 reset logic for v13.0.2
>
> Luben Tuikov (1):
> drm/amd/display: Don't fill up the logs
>
> Meng Tang (1):
> gpu/amd: vega10_hwmgr: fix inappropriate private variable name
>
> Michael Strauss (1):
> drm/amd/display: Pass HostVM enable flag into DCN3.1 DML
>
> Nicholas Kazlauskas (1):
> drm/amd/display: Make functional resource functions non-static
>
> Philip Yang (4):
> Revert "drm/amdkfd: process_info lock not needed for svm"
> drm/amdkfd: Correct SMI event read size
> drm/amdkfd: Add SMI add event helper
> drm/amdkfd: Add format attribute to kfd_smi_event_add
>
> Prike Liang (4):
> drm/amdgpu: enable gfx clock gating control for GC 10.3.7
> drm/amdgpu/nv: enable clock gating for GC 10.3.7 subblock
> drm/amdgpu: enable gfx power gating for GC 10.3.7
> drm/amdgpu: enable gfxoff routine f
Re: [pull] amdgpu, amdkfd drm-next-5.18
On Thu, 10 Mar 2022 at 08:16, Alex Deucher wrote:
>
> On Wed, Mar 9, 2022 at 5:12 PM Dave Airlie wrote:
> >
> > On Tue, 8 Mar 2022 at 06:08, Alex Deucher wrote:
> > >
> > > Hi Dave, Daniel,
> > >
> > > Same PR as last week, just fixed up a bad Fixes tag.
> > >
> > > The following changes since commit
> > > 38a15ad9488e21cad8f42d3befca20f91e5b2874:
> > >
> > > Merge tag 'amd-drm-next-5.18-2022-02-25' of
> > > https://gitlab.freedesktop.org/agd5f/linux into drm-next (2022-03-01
> > > 16:19:02 +1000)
> > >
> > > are available in the Git repository at:
> > >
> > > https://gitlab.freedesktop.org/agd5f/linux.git
> > > tags/amd-drm-next-5.18-2022-03-07
> > >
> > > for you to fetch changes up to 53b97af4a44abd21344cc9f13986ba53051287bb:
> > >
> > > drm/amdkfd: Add format attribute to kfd_smi_event_add (2022-03-07
> > > 14:59:59 -0500)
> >
> > clang says no.
> >
> > /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_device_queue_manager.c:508:6:
> > error: variable 'vmid' is used uninitialized whenever 'if' condition
> > is false [-Werror,-Wsometimes-uninitialized]
> > if (dev->kfd2kgd->get_atc_vmid_pasid_mapping_info) {
> > ^
> > /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_device_queue_manager.c:521:6:
> > note: uninitialized use occurs here
> > if (vmid > last_vmid_to_scan) {
> > ^~~~
> > /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_device_queue_manager.c:508:2:
> > note: remove the 'if' if its condition is always true
> > if (dev->kfd2kgd->get_atc_vmid_pasid_mapping_info) {
> > ^~~
> > /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_device_queue_manager.c:490:19:
> > note: initialize the variable 'vmid' to silence this warning
> > unsigned int vmid;
> > ^
> > = 0
> >
>
> Already fixed in:
> https://gitlab.freedesktop.org/agd5f/linux/-/commit/455331caeea5058d6df20f31a414b68ca502ec25
> was going to send that out with additional fixes this week, but I can
> just spin a new PR if you'd prefer.
A respin would be great,
Thanks,
Dave.
[git pull] drm fixes for 5.17-rc8/final
Hi Linus, As expected at this stage its pretty quiet, one sun4i mixer fix and one i915 display flicker fix. Thanks, Dave. drm-fixes-2022-03-11: drm fixes for v5.17-rc8/final i915: - psr fix screen flicker sun4i: - mixer format fix. The following changes since commit ffb217a13a2eaf6d5bd974fc83036a53ca69f1e2: Linux 5.17-rc7 (2022-03-06 14:28:31 -0800) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2022-03-11 for you to fetch changes up to 30eb13a26014ca640b5eb57b6d010114084d5c92: Merge tag 'drm-intel-fixes-2022-03-10' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes (2022-03-11 13:26:19 +1000) drm fixes for v5.17-rc8/final i915: - psr fix screen flicker sun4i: - mixer format fix. ---- Dave Airlie (2): Merge tag 'drm-misc-fixes-2022-03-10' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes Merge tag 'drm-intel-fixes-2022-03-10' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes Jernej Skrabec (1): drm/sun4i: mixer: Fix P010 and P210 format numbers Jouni Högander (1): drm/i915/psr: Set "SF Partial Frame Enable" also on full update drivers/gpu/drm/i915/display/intel_psr.c | 16 ++-- drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/sun4i/sun8i_mixer.h | 8 3 files changed, 19 insertions(+), 6 deletions(-)
[git pull] drm fixes for 5.17-rc8 (kconfig fix)
Hi Linus, Thorsten pointed out this had fallen down the cracks and was in -next only, I've picked it out, fixed up it's Fixes: line. Thanks, Dave. drm-fixes-2022-03-12: drm kconfig fix for 5.17-rc8 - fix regression in Kconfig. The following changes since commit 30eb13a26014ca640b5eb57b6d010114084d5c92: Merge tag 'drm-intel-fixes-2022-03-10' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes (2022-03-11 13:26:19 +1000) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2022-03-12 for you to fetch changes up to 3755d35ee1d2454b20b8a1e20d790e56201678a4: drm/panel: Select DRM_DP_HELPER for DRM_PANEL_EDP (2022-03-12 17:41:30 +1000) drm kconfig fix for 5.17-rc8 - fix regression in Kconfig. Thomas Zimmermann (1): drm/panel: Select DRM_DP_HELPER for DRM_PANEL_EDP drivers/gpu/drm/panel/Kconfig | 1 + 1 file changed, 1 insertion(+)
Re: [git pull] drm fixes for 5.17-rc8/final
On Fri, 11 Mar 2022 at 17:51, Thorsten Leemhuis
wrote:
>
> On 11.03.22 06:15, Dave Airlie wrote:
> >
> > As expected at this stage its pretty quiet, one sun4i mixer fix and
> > one i915 display flicker fix.
> >
> > Thanks,
> > Dave.
> >
> > drm-fixes-2022-03-11:
> > drm fixes for v5.17-rc8/final
> >
> > i915:
> > - psr fix screen flicker
> >
> > sun4i:
> > - mixer format fix.
> > The following changes since commit ffb217a13a2eaf6d5bd974fc83036a53ca69f1e2:
> > [...]
>
> Out of curiosity: I might be missing something, but why wasn't the
> (afaics simple) fix for a build problem caused by 9d6366e743f3 ("drm:
> fb_helper: improve CONFIG_FB dependency") (merged for v5.16-rc1) not
> among these fixes? I mean this one:
> https://lore.kernel.org/lkml/20220203093922.20754-1-tzimmerm...@suse.de/
>
> It's sitting in next for a few days already:
> https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?h=master&id=eea89dff4c39a106f98d1cb5e4d626f8c63908b9
>
> I already asked a few days ago why this fix was not on track for merging
> in this cycle, but I didn't get an answer:
> https://lore.kernel.org/lkml/782a683e-c625-8e68-899b-ce56939af...@leemhuis.info/
>
> Fun fact: It seems the problem and at a rough fix were already kinda
> known mid November when 9d6366e743f3 was still in next:
> https://lore.kernel.org/all/2027062704.14671-1-rdun...@infradead.org/
>
> Then the issue was reported again two times in February:
> https://lore.kernel.org/dri-devel/CA+G9fYvN0NyaVkRQmA1O6rX7H8PPaZrUAD7=rdy33qy9ruu...@mail.gmail.com/
> https://lore.kernel.org/lkml/YhofdlzadzRmy7tj@debian/
>
> And the fix is relative simple, that's why I wonder why merging is
> delayed. What am I missing?
My radar just missed it, though someone else should have realised it
was necessary on fixes earlier, it also had incorrect Fixes: tagging,
so I fixed that and sent it to Linus,
Thanks,
Dave.
Re: [PATCH v2 1/2] drm: Add GPU reset sysfs event
On Tue, 15 Mar 2022 at 00:23, Alex Deucher wrote: > > On Fri, Mar 11, 2022 at 3:30 AM Pekka Paalanen wrote: > > > > On Thu, 10 Mar 2022 11:56:41 -0800 > > Rob Clark wrote: > > > > > For something like just notifying a compositor that a gpu crash > > > happened, perhaps drm_event is more suitable. See > > > virtio_gpu_fence_event_create() for an example of adding new event > > > types. Although maybe you want it to be an event which is not device > > > specific. This isn't so much of a debugging use-case as simply > > > notification. > > > > Hi, > > > > for this particular use case, are we now talking about the display > > device (KMS) crashing or the rendering device (OpenGL/Vulkan) crashing? > > > > If the former, I wasn't aware that display device crashes are a thing. > > How should a userspace display server react to those? > > > > If the latter, don't we have EGL extensions or Vulkan API already to > > deliver that? > > > > The above would be about device crashes that directly affect the > > display server. Is that the use case in mind here, or is it instead > > about notifying the display server that some application has caused a > > driver/hardware crash? If the latter, how should a display server react > > to that? Disconnect the application? > > > > Shashank, what is the actual use case you are developing this for? > > > > I've read all the emails here so far, and I don't recall seeing it > > explained. > > > > The idea is that a support daemon or compositor would listen for GPU > reset notifications and do something useful with them (kill the guilty > app, restart the desktop environment, etc.). Today when the GPU > resets, most applications just continue assuming nothing is wrong, > meanwhile the GPU has stopped accepting work until the apps re-init > their context so all of their command submissions just get rejected. Just one thing comes to mind reading this, racy PID reuse. process 1234 does something bad to GPU. process 1234 dies in parallel to sysfs notification being sent. other process 1234 reuses the pid new process 1234 gets destroyed by receiver of sysfs notification. Dave.
[git pull] drm fixes for 5.17-final
Hi Linus, A few minor changes to finish things off, one mgag200 regression, imx fix and couple of panel changes. Regards, Dave. drm-fixes-2022-03-18: drm fixes for 5.17-rc9/final imx: - Don't test bus flags in atomic check mgag200: - Fix PLL setup on some models panel: - Fix bpp settings on Innolux G070Y2-L01 - Fix DRM_PANEL_EDP Kconfig dependencies The following changes since commit 09688c0166e76ce2fb85e86b9d99be8b0084cdf9: Linux 5.17-rc8 (2022-03-13 13:23:37 -0700) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2022-03-18 for you to fetch changes up to ca5a5761ac542691a6b3520b6c5c047cf63b4b8d: Merge tag 'drm-misc-fixes-2022-03-17' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes (2022-03-18 13:32:54 +1000) drm fixes for 5.17-rc9/final imx: - Don't test bus flags in atomic check mgag200: - Fix PLL setup on some models panel: - Fix bpp settings on Innolux G070Y2-L01 - Fix DRM_PANEL_EDP Kconfig dependencies Christoph Niedermaier (1): drm/imx: parallel-display: Remove bus flags check in imx_pd_bridge_atomic_check() Dave Airlie (1): Merge tag 'drm-misc-fixes-2022-03-17' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes Jocelyn Falempe (1): drm/mgag200: Fix PLL setup for g200wb and g200ew Marek Vasut (1): drm/panel: simple: Fix Innolux G070Y2-L01 BPP settings Thomas Zimmermann (2): Merge drm/drm-fixes into drm-misc-fixes drm: Don't make DRM_PANEL_BRIDGE dependent on DRM_KMS_HELPERS drivers/gpu/drm/bridge/Kconfig | 2 +- drivers/gpu/drm/imx/parallel-display.c | 8 drivers/gpu/drm/mgag200/mgag200_pll.c | 6 +++--- drivers/gpu/drm/panel/Kconfig | 1 + drivers/gpu/drm/panel/panel-simple.c | 2 +- 5 files changed, 6 insertions(+), 13 deletions(-)
