summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-02-22Bump version for the 23.0.0 releasexf86-video-amdgpu-23.0.0Shashank Sharma
This release includes some bug fixes. Signed-off-by: Shashank Sharma <shashank.sharma@amd.com>
2022-12-05config: Add hotplug driver nameShashank Sharma
This patch adds the PCI-hotplug handler driver name in the DDX config file with respect to Xorg commit:82bf391c Cc: Alexander Deucher <alexander.deucher@amd.com> Signed-off-by: Shashank Sharma <shashank.sharma@amd.com>
2022-11-11Fix primary output handling in amdgpu_crtc_covering_box().Mario Kleiner
Commit e39a3ee07c9dea73b0452b71b1ef633b6cd6f389 tries to reintroduce the RandR primary output as a tie breaker in amdgpu_crtc_covering_box(), but that function wrongly assigns a void* devPrivate, which is actually a xf86CrtcPtr, to the RRCrtcPtr primary_crtc, a pointer target type mismatch! This causes a later pointer comparison of primary_crtc with RRCrtcPtr crtc to always fail, so that the user selected primary output can not ever successfully act as a tie-breaker when multiple candidate crtcs cover the same box area, defeating the whole purpose of that commit! Not sure how this failure could have ever evaded any basic testing. Fix this trivially by assigning the right variable. Successfully tested on a multi-display setup, verifying that the primary output now works as tie breaker as intended. Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com> Fixes: e39a3ee07c9d ("Prefer crtc of primary output for synchronization when screen has to crtcs with the same coverage")
2022-09-29Use DRM_CAP_CURSOR_WIDTH/HEIGHT if possiblePierre-Eric Pelloux-Prayer
There's no need to hardcode the cursor size if the kernel can report the value it wants.
2022-08-18gitlab CI: enable gitlab's builtin static analysisAlan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2022-08-18Fix screen corruption on secondary GPUtiancyin
[why] On RHEL9+, xorg-server.pc shows that the Xorg no longer depends on dri, and dri.pc provides "/opt/amdgpu/include" path for pkg-config, this cause pkg-config no longer output "-I/opt/amdgpu/include", consequently the configure can't find gbm.h and HAVE_GBM_BO_USE_LINEAR is not declared, that cause the corruption. [how] Since the gbm.pc also provides the "/opt/amdgpu/include" path, in module dependence checking, GBM_CFLAGS get this path, so just explicitly add GBM_CFLAGS into CPPFLAGS can fix this issue. Signed-off-by: tiancyin <tianci.yin@amd.com>
2022-08-08Initialize present extension for GPU screenKai-Heng Feng
Some laptops have the external outputs routed to dGPU, when the external output over dGPU is the only display in reverse prime mode, we need present extension so fake CRTC won't be used.
2022-04-20Do not consider disabled crtc anymore when looking for xf86crtc covering ↵Lukasz Spintzyk
drawable. This is commit is removing obsolete switch done in xf86-video-ati at sha 61d0aec40e2521488c2fe43e7a6823e5c87d94d7: video: add option to include disabled CRTCs in best CRTC search This is not required anymore as with commit done in xorg-server at sha 5c5c1b77982a9af7279a90bc3c2be48adaa9c778: present: Add Present extension That in case of lack of crtc is using fake_crtc with render 1Hz frequency When consider_disabled is removed then amdgpu_pick_best_crtc is doing the same what rr_crtc_covering_box is doing so it can be reimplemented to reuse that function. Signed-off-by: Łukasz Spintzyk <lukasz.spintzyk@synaptics.com> Signed-off-by: Shashank Sharma <contactshashanksharma@gmail.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2022-04-20Prefer crtc of primary output for synchronization when screen has to crtcs ↵Lukasz Spintzyk
with the same coverage This is adjusting randr_crtc_covering_drawable to cover scenario fixed in 9151f3b1c2ebcc34e63195888ba696f2183ba5e2 Signed-off-by: Łukasz Spintzyk <lukasz.spintzyk@synaptics.com> Signed-off-by: Shashank Sharma <contactshashanksharma@gmail.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2022-04-20Use randr_crtc_covering_drawable used in modesettingLukasz Spintzyk
Use implementation from modesetting driver that is fixing issue: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1028 Instead of returning primary crtc as fallback we can now find and return crtc that belongs to secondary outputs. v2: restore original naming scheme for amdgpu_crtc_is_enabled, amdgpu_box_intersect, amdgpu_box_area functions Signed-off-by: Łukasz Spintzyk <lukasz.spintzyk@synaptics.com> Signed-off-by: Emilia Majewska <emilia.majewska@synaptics.com> Signed-off-by: Shashank Sharma <contactshashanksharma@gmail.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2022-04-20amdgpu: fixup driver for new X server ABIŁukasz Spintzyk
Signed-off-by: Łukasz Spintzyk <lukasz.spintzyk@synaptics.com> Signed-off-by: Shashank Sharma <contactshashanksharma@gmail.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2022-02-22Update URLs to reflect gitlab migrationAlan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2022-02-22Bump version for the 22.0.0 releasexf86-video-amdgpu-22.0.0Shashank Sharma
This release includes some bug fixes and one minor feature. Signed-off-by: Shashank Sharma <shashank.sharma@amd.com>
2022-02-16Build xz tarballs instead of bzip2Alan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2022-02-16glamor: unset AMDGPU_CREATE_PIXMAP_SCANOUT on shared pixmapJesse Zhang
While running multi-display test(for both APUs and DGPUs), if the screen setting mode is changed from "single mode" to "share mode", the screen shows tiled distortion, due to wrongly created pixmap. This is a regression. Fixes: 0732f81a2c67 ("glamor: Make pixmap scanout compatible if its dimensions are") Closes: https://gitlab.freedesktop.org/xorg/driver/xf86-video-amdgpu/-/issues/48 Acked-by: Shashank Sharma <shashank.sharma@amd.com> Signed-off-by: Jesse Zhang <jesse.zhang@amd.com> Signed-off-by: Shashank Sharma <shashank.sharma@amd.com>
2022-02-14Fix spelling/wording issuesAlan Coopersmith
Found by using: codespell --builtin clear,rare,usage,informal,code,names Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2022-01-25Add option for non-vsynced flips for "secondary" outputs.Mario Kleiner
This is a straightforward port of a patch with the same name "modesetting: Add option for non-vsynced flips for "secondary" outputs." from X-Server master / X-Server 21.1. See server MR 742. The description below is therefore identical to that X-Server commit: Whenever an unredirected fullscreen window uses pageflipping for a DRI3/Present PresentPixmap() operation and the X-Screen has more than one active output, multiple crtc's need to execute pageflips. Only after the last flip has completed can the PresentPixmap operation as a whole complete. If a sync_flip is requested for the present, then the current implementation will synchronize each pageflip to the vblank of its associated crtc. This provides tear-free image presentation across all outputs, but introduces a different artifact, if not all outputs run at the same refresh rate with perfect synchrony: The slowest output throttles the presentation rate, and present completion is delayed to flip completion of the "latest" output to complete. This means degraded performance, e.g., a dual-display setup with a 144 Hz monitor and a 60 Hz monitor will always be throttled to at most 60 fps. It also means non-constant present rate if refresh cycles drift against each other, creating complex "beat patterns", tremors, stutters and periodic slowdowns - quite irritating! Such a scenario will be especially annoying if one uses multiple outputs in "mirror mode" aka "clone mode". One output will usually be the "production output" with the highest quality and fastest display attached, whereas a secondary mirror output just has a cheaper display for monitoring attached. Users care about perfect and perfectly timed tear-free presentation on the "production output", but cares less about quality on the secondary "mirror output". They are willing to trade quality on secondary outputs away in exchange for better presentation timing on the "production output". One example use case for such production + monitoring displays are neuroscience / medical science applications where one high quality display device is used to present visual animations to test subjects or patients in a fMRI scanner room (production display), whereas an operator monitors the same visual animations from a control room on a lower quality display. Presentation timing needs to be perfect, and animations high-speed and tear-free for the production display, whereas quality and timing don't matter for the monitoring display. This commit gives users the option to choose such a trade-off as opt-in: It adds a new boolean option "AsyncFlipSecondaries" to the device section of xorg.conf. If this option is specified as true, then DRI3 pageflip behaviour changes as follows: 1. The "reference crtc" for a windows PresentPixmap operation does a vblank synced flip, or a DRM_MODE_PAGE_FLIP_ASYNC non-synchronized flip, as requested by the caller, just as in the past. Typically flips will be requested to be vblank synchronized for tear-free presentation. The "reference crtc" is the one chosen by the caller to drive presentation timing (as specified by PresentPixmap()'s "target_msc", "divisor", "remainder" parameters and implemented by vblank events) and to deliver Present completion timestamps (msc and ust) extracted from its pageflip completion event. 2. All other crtc's, which also page-flip in a multi-display configuration, will try to flip with DRM_MODE_PAGE_FLIP_ASYNC, ie. immediately and not synchronized to vblank. This allows the PresentPixmap operation to complete with little delay compared to a single-display present, especially if the different crtc's run at different video refresh rates or their refresh cycles are not perfectly synchronized, but drift against each other. The downside is potential tearing artifacts on all outputs apart from the one of the "reference crtc". Successfully tested on a AMD gpu with single-display and dual-display setups, and with single-X-Screen as well as dual-X-Screen "ZaphodHeads" configurations. Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
2021-08-27glamor: Set AMDGPU_CREATE_PIXMAP_SCANOUT on DRI2 and shared pixmapsDor Askayo
The scanout usage flag wasn't applied for DRI2 and shared pixmaps in 0732f81a2c67, resulting in GPU artifacts in some scenarios. Fixes: 0732f81a2c67 ("glamor: Make pixmap scanout compatible if its dimensions are") Closes: https://gitlab.freedesktop.org/xorg/driver/xf86-video-amdgpu/-/issues/41 Signed-off-by: Dor Askayo <dor.askayo@gmail.com> Signed-off-by: Michel Dänzer <mdaenzer@redhat.com> Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
2021-07-30Bump version for the 21.0.0 releasexf86-video-amdgpu-21.0.0Alex Deucher
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
2021-04-27Include xf86drm.h instead of sarea.hMichel Dänzer
Fixes build against current xorg-x11-server-devel from Fedora 34/35/rawhide. Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2021-02-02Drop dri.h includesMichel Dänzer
Not needed anymore. Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2020-12-14Fix drmmode_crtc_scanout_create logicLikun Gao
If crtc scanout create successfully, the function of drmmode_crtc_scanout_create should return TURE. This will fix the regression caused by commit: "Make drmmode_crtc_scanout_create/destroy static" (442efe73), as it will result to some function (such as drmmode_set_scanout_pixmap) go to wrong code path and result to NULL pointer. Fixes: 442efe73 ("Make drmmode_crtc_scanout_create/destroy static") Signed-off-by: Likun Gao <Likun.Gao@amd.com> Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
2020-08-28Check for AMDGPU_CREATE_PIXMAP_SCANOUT in amdgpu_glamor_create_pixmapMichel Dänzer
We must not call glamor_create_pixmap or fbCreatePixmap when it's set. Closes: https://gitlab.freedesktop.org/xorg/driver/xf86-video-amdgpu/-/issues/21
2020-07-17Replace a few more instances of "master"Michel Dänzer
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2020-07-10Fix build against ABI_VIDEODRV_VERSION 25.2Michel Dänzer
Use primary/secondary instead of master/slave where applicable. Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2020-05-27Make drmmode_crtc_scanout_create/destroy staticMichel Dänzer
And the latter inline.
2020-05-27Drop struct drmmode_scanout altogether in favour of PixmapPtrsMichel Dänzer
2020-05-27Drop bo/width/height members from struct drmmode_scanoutMichel Dänzer
The pixmap is all we really need.
2020-05-27Fix return value check of drmIoctl()Niclas Zeising
When the drmModeSetCursor2() call was replaced with bare drmIoctl() call in b344e155, a bug was introduced. With the use of drmModeSetCursor2(), the return value from drmIoctl() (which calls ioctl()) were mangled, if they were negative, they were replaced by -errno by a wrapper function in xf86drMode.c in libdrm. After replacing drmModeSetCursor2() with the call to drmIoctl(), this mangling no longer happens, and we need to explicitly check if the call to drmIoctl() fails, which is indicated by returning -1, and then why it failed, by checking errno. If the error indicated by errno is EINVAL, then we can't use the DRM_IOCTL_MODE_CURSOR2 ioctl(), and need to fall back to the DRM_IOCTL_MODE_CURSOR ioctl(). This bug can manifest itself by an invisible hw cursor on systems where the DRM_IOCTL_MODE_CURSOR2 is not implemented by the graphics driver. Signed-off-by: Niclas Zeising <zeising@daemonic.se>
2020-05-27gitlab CI: update to use the latest CI templatesPeter Hutterer
Repository was moved there from wayland/ci-templates, and let's update to the most recent version.. No real functional changes, we're just making use of the various CI template bits and bobs now, specifically the FDO_* variables and the .fdo.container-build and .fdo.distribution-image templates. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-04-21glamor: Make pixmap scanout compatible if its dimensions areMichel Dänzer
Namely, if its dimensions match those of the screen pixmap (enough that it could stand in for it). When that's the case, the pixmap may end up being scanned out directly due to page flipping via the Present extension, e.g. with xfwm4 --vblank=xpresent . v2: * Use AMDGPU_CREATE_PIXMAP_SCANOUT instead of second-guessing in amdgpu_alloc_pixmap_bo, fixes corruption when resizing from smaller to larger virtual size via RandR. Closes: https://gitlab.freedesktop.org/xorg/driver/xf86-video-amdgpu/-/issues/10
2020-03-18Handle NULL fb_ptr in pixmap_get_fbMichel Dänzer
This can happen when HW acceleration is disabled. Fixes https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati/issues/188 (ported from radeon commit 4d84cf438e7f1bebf0053035ef0292e9fed257d1) Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2020-03-16Bail from amdgpu_pixmap_get_handle with ShadowFBMichel Dänzer
There's no pixmap private in that case. The callers handle this gracefully. Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2020-03-16Factor out common code to amdgpu_probe()Emil Velikov
Keep the distinct pci/platform screen management in the separate probe entry point and fold the rest into a single function. v2: Rebase Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> Acked-by: Alex Deucher <alexander.deucher@amd.com>
2020-03-16Introduce amdgpu_device_setup helperEmil Velikov
It folds the device specifics (open fd, device init) into a single place. v2: - Rebase - Pass pAMDGPUEnt to amdgpu_device_setup (Michel) Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> Acked-by: Alex Deucher <alexander.deucher@amd.com>
2020-03-16Kill off drmOpen/Close/drmSetInterfaceVersion in favour of drmDevicesEmil Velikov
The former has very subtle semantics (see the implementation in libdrm for details) which were required in the UMS days. With drmDevices around, we have enough information to build our heuristics and avoid drmOpen all together. In the odd case drmGetDevices2() can take a few extra cycles, so use a reasonably sized local array. v2: - Rebase - Rework now that amdgpu_kernel_mode_enabled() is staying - Keep amdgpu_bus_id() - Use local drmDevice array. v3: - Correct error handling (Michel) - Preserve the "am I master" check (Michel) - Always initialise the fd variable v4: - Don't print "-1" on drmGetDevices2 failure (Michel) - Use uppercase DRM (Michel) v5: - Rebase on top of amdgpu_bus_id() rework - Pass both pci and platform dev to amdgpu_kernel_open_fd() (Michel) - Indent local_drmIsMaster() with tabs (Michel) Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Acked-by: Alex Deucher <alexander.deucher@amd.com>
2020-03-16Use the device_id straight from gpu_infoEmil Velikov
This way we can remove the PciInfo and Chipset from the AMDGPUInfoRec. Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> Acked-by: Alex Deucher <alexander.deucher@amd.com>
2020-03-16Reuse the existing busid stringEmil Velikov
Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> Acked-by: Alex Deucher <alexander.deucher@amd.com>
2020-03-16Store the busid string in AMDGPUEntEmil Velikov
This way we can reuse it, instead of redoing it later on. v2: Pass the AMDGPUEnt as argument. v3: free() the string at AMDGPUFreeRec (Michel) v4: Inline amdgpu_bus_id, move at top of mdgpu_kernel_open_fd (Michel) Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> (v3) Acked-by: Alex Deucher <alexander.deucher@amd.com>
2020-03-16Remove NULL check after a "cannot fail" functionEmil Velikov
XNFasprintf cannot fail - aka busid cannot be NULL. Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> Acked-by: Alex Deucher <alexander.deucher@amd.com>
2020-03-16Fixup the amdgpu_bus_id() string formatEmil Velikov
The func is a u, instead of a signed int. v2: Drop the precision - s/1u/u/ (Michel) Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> Acked-by: Alex Deucher <alexander.deucher@amd.com>
2020-03-16Remove drmCheckModesettingSupported and kernel module loading, on LinuxEmil Velikov
The former of these is a UMS artefact which gives incorrect and misleading promise whether KMS is supported. Not to mention that AMDGPU is a only KMS driver. In a similar fashion xf86LoadKernelModule() is a relic of the times, where platforms had no scheme of detecting and loading the appropriate kernel module. Notes: - Since there is no reply from Robert the code is still around, behind a FreeBSD guard. - If FreeBSD still needs this they should look and fix it ASAP, as: - wayland itself or compositors do _not_ load kernel modules - the kernel module should be loaded early to control the clocks/fan, hence temperature of the card v2: Keep the code as FreeBSD only, add 'Notes' in the commit message. Cc: Robert Millan <rmh@freebsd.org> Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> Acked-by: Alex Deucher <alexander.deucher@amd.com>
2020-03-16Use ODEV_ATTRIB_PATH where possible for the device node.Emil Velikov
Use the device node path, if the server knows it. Note: ODEV_ATTRIB_PATH was introduced with xserver 1.13 - the minimum version required to build amdgpu. Yet it's defined in xf86platformBus.h. With the header included only when XSERVER_PLATFORM_BUS is set. Keep things obvious and use a ODEV_ATTRIB_PATH guard. v2: Rebase, add commit message Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> Acked-by: Alex Deucher <alexander.deucher@amd.com>
2020-02-05Fix link failure with gcc 10Adam Jackson
Without the 'extern' this looks like a definition not just a declaration, in every file that includes the header. gcc 10 is stricter about this kind of multiple definition.
2019-11-22kms: Handle changes to SourceValidate call chain in xserver 19Adam Jackson
xserver 19 expects the SourceValidate hook to always be filled in with something valid. For earlier servers it's harmless to simply fill this in with a do-nothing function instead of NULL. Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
2019-10-11Bump version for the 19.1.0 releasexf86-video-amdgpu-19.1.0Michel Dänzer
2019-09-26Don't unreference FBs of pixmaps from different screens in LeaveVTMichel Dänzer
FindClientResourcesByType finds pixmaps from all screens, but trying to process ones from other screens here makes no sense and likely results in a crash or memory corruption. Fixes: c16ff42f927d ("Make all active CRTCs scan out an all-black framebuffer in LeaveVT") (Ported from radeon commit 2faaecc69b127248718e759c6c98c84d56dd1b6b)
2019-09-18Don't set up black scanout buffer if LeaveVT is called from CloseScreenMichel Dänzer
Avoids a crash described in https://gitlab.freedesktop.org/xorg/driver/xf86-video-amdgpu/merge_requests/43#note_223718 Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2019-08-07present: Don't check pixmap pitch in check_flip with non-DC >= 3.34Michel Dänzer
The current non-DC kernel driver also handles flipping between different pitches correctly. Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
2019-08-07present: Don't check pixmap pitch in check_flip with current DCMichel Dänzer
Current DC handles flipping between different pitches correctly. Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>