Generate a hotplug event after registering a client to allow the client to configure its display. Remove the hotplug calls from the existing clients for fbdev emulation. This change fixes a concurrency bug between registering a client and receiving events from the DRM core. The bug is present in the fbdev emulation of all drivers. The fbdev emulation currently generates a hotplug event before registering the client to the device. For each new output, the DRM core sends an additional hotplug event to each registered client. If the DRM core detects first output between sending the artificial hotplug and registering the device, the output's hotplug event gets lost. If this is the first output, the fbdev console display remains dark. This has been observed with amdgpu and fbdev-generic. Fix this by adding hotplug generation directly to the client's register helper drm_client_register(). Registering the client and receiving events are serialized by struct drm_device.clientlist_mutex. So an output is either configured by the initial hotplug event, or the client has already been registered. The bug was originally added in commit6e3f17ee73
("drm/fb-helper: generic: Call drm_client_add() after setup is done"), in which adding a client and receiving a hotplug event switched order. It was hidden, as most hardware and drivers have at least on static output configured. Other drivers didn't use the internal DRM client or still had struct drm_mode_config_funcs.output_poll_changed set. That callback handled hotplug events as well. After not setting the callback in amdgpu in commit0e3172bac3
("drm/amdgpu: Don't set struct drm_driver.output_poll_changed"), amdgpu did not show a framebuffer console if output events got lost. The bug got copy-pasted from fbdev-generic into the other fbdev emulation. Reported-by: Moritz Duge <MoritzDuge@kolahilft.de> Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/2649 Fixes:6e3f17ee73
("drm/fb-helper: generic: Call drm_client_add() after setup is done") Fixes:8ab59da26b
("drm/fb-helper: Move generic fbdev emulation into separate source file") Fixes:b79fe9abd5
("drm/fbdev-dma: Implement fbdev emulation for GEM DMA helpers") Fixes:63c381552f
("drm/armada: Implement fbdev emulation as in-kernel client") Fixes:49953b70e7
("drm/exynos: Implement fbdev emulation as in-kernel client") Fixes:8f1aaccb04
("drm/gma500: Implement client-based fbdev emulation") Fixes:940b869c2f
("drm/msm: Implement fbdev emulation as in-kernel client") Fixes:9e69bcd88e
("drm/omapdrm: Implement fbdev emulation as in-kernel client") Fixes:e317a69fe8
("drm/radeon: Implement client-based fbdev emulation") Fixes:71ec16f45e
("drm/tegra: Implement fbdev emulation as in-kernel client") Fixes:0e3172bac3
("drm/amdgpu: Don't set struct drm_driver.output_poll_changed") Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> Tested-by: Moritz Duge <MoritzDuge@kolahilft.de> Tested-by: Torsten Krah <krah.tm@gmail.com> Tested-by: Paul Schyska <pschyska@gmail.com> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: David Airlie <airlied@gmail.com> Cc: Noralf Trønnes <noralf@tronnes.org> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: Maxime Ripard <mripard@kernel.org> Cc: Javier Martinez Canillas <javierm@redhat.com> Cc: Russell King <linux@armlinux.org.uk> Cc: Inki Dae <inki.dae@samsung.com> Cc: Seung-Woo Kim <sw0312.kim@samsung.com> Cc: Kyungmin Park <kyungmin.park@samsung.com> Cc: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Cc: Patrik Jakobsson <patrik.r.jakobsson@gmail.com> Cc: Rob Clark <robdclark@gmail.com> Cc: Abhinav Kumar <quic_abhinavk@quicinc.com> Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Cc: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com> Cc: Alex Deucher <alexander.deucher@amd.com> Cc: "Christian König" <christian.koenig@amd.com> Cc: "Pan, Xinhui" <Xinhui.Pan@amd.com> Cc: Thierry Reding <thierry.reding@gmail.com> Cc: Mikko Perttunen <mperttunen@nvidia.com> Cc: dri-devel@lists.freedesktop.org Cc: linux-kernel@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-samsung-soc@vger.kernel.org Cc: linux-arm-msm@vger.kernel.org Cc: freedreno@lists.freedesktop.org Cc: amd-gfx@lists.freedesktop.org Cc: linux-tegra@vger.kernel.org Cc: dri-devel@lists.freedesktop.org Cc: <stable@vger.kernel.org> # v5.2+ Reviewed-by: Javier Martinez Canillas <javierm@redhat.com> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> # msm Link: https://patchwork.freedesktop.org/patch/msgid/20230710091029.27503-1-tzimmermann@suse.de
338 lines
8.3 KiB
C
338 lines
8.3 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/**************************************************************************
|
|
* Copyright (c) 2007-2011, Intel Corporation.
|
|
* All Rights Reserved.
|
|
*
|
|
**************************************************************************/
|
|
|
|
#include <linux/fb.h>
|
|
#include <linux/pfn_t.h>
|
|
|
|
#include <drm/drm_crtc_helper.h>
|
|
#include <drm/drm_drv.h>
|
|
#include <drm/drm_fb_helper.h>
|
|
#include <drm/drm_framebuffer.h>
|
|
|
|
#include "gem.h"
|
|
#include "psb_drv.h"
|
|
|
|
/*
|
|
* VM area struct
|
|
*/
|
|
|
|
static vm_fault_t psb_fbdev_vm_fault(struct vm_fault *vmf)
|
|
{
|
|
struct vm_area_struct *vma = vmf->vma;
|
|
struct fb_info *info = vma->vm_private_data;
|
|
unsigned long address = vmf->address - (vmf->pgoff << PAGE_SHIFT);
|
|
unsigned long pfn = info->fix.smem_start >> PAGE_SHIFT;
|
|
vm_fault_t err = VM_FAULT_SIGBUS;
|
|
unsigned long page_num = vma_pages(vma);
|
|
unsigned long i;
|
|
|
|
vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
|
|
|
|
for (i = 0; i < page_num; ++i) {
|
|
err = vmf_insert_mixed(vma, address, __pfn_to_pfn_t(pfn, PFN_DEV));
|
|
if (unlikely(err & VM_FAULT_ERROR))
|
|
break;
|
|
address += PAGE_SIZE;
|
|
++pfn;
|
|
}
|
|
|
|
return err;
|
|
}
|
|
|
|
static const struct vm_operations_struct psb_fbdev_vm_ops = {
|
|
.fault = psb_fbdev_vm_fault,
|
|
};
|
|
|
|
/*
|
|
* struct fb_ops
|
|
*/
|
|
|
|
#define CMAP_TOHW(_val, _width) ((((_val) << (_width)) + 0x7FFF - (_val)) >> 16)
|
|
|
|
static int psb_fbdev_fb_setcolreg(unsigned int regno,
|
|
unsigned int red, unsigned int green,
|
|
unsigned int blue, unsigned int transp,
|
|
struct fb_info *info)
|
|
{
|
|
struct drm_fb_helper *fb_helper = info->par;
|
|
struct drm_framebuffer *fb = fb_helper->fb;
|
|
uint32_t v;
|
|
|
|
if (!fb)
|
|
return -ENOMEM;
|
|
|
|
if (regno > 255)
|
|
return 1;
|
|
|
|
red = CMAP_TOHW(red, info->var.red.length);
|
|
blue = CMAP_TOHW(blue, info->var.blue.length);
|
|
green = CMAP_TOHW(green, info->var.green.length);
|
|
transp = CMAP_TOHW(transp, info->var.transp.length);
|
|
|
|
v = (red << info->var.red.offset) |
|
|
(green << info->var.green.offset) |
|
|
(blue << info->var.blue.offset) |
|
|
(transp << info->var.transp.offset);
|
|
|
|
if (regno < 16) {
|
|
switch (fb->format->cpp[0] * 8) {
|
|
case 16:
|
|
((uint32_t *) info->pseudo_palette)[regno] = v;
|
|
break;
|
|
case 24:
|
|
case 32:
|
|
((uint32_t *) info->pseudo_palette)[regno] = v;
|
|
break;
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int psb_fbdev_fb_mmap(struct fb_info *info, struct vm_area_struct *vma)
|
|
{
|
|
if (vma->vm_pgoff != 0)
|
|
return -EINVAL;
|
|
if (vma->vm_pgoff > (~0UL >> PAGE_SHIFT))
|
|
return -EINVAL;
|
|
|
|
/*
|
|
* If this is a GEM object then info->screen_base is the virtual
|
|
* kernel remapping of the object. FIXME: Review if this is
|
|
* suitable for our mmap work
|
|
*/
|
|
vma->vm_ops = &psb_fbdev_vm_ops;
|
|
vma->vm_private_data = info;
|
|
vm_flags_set(vma, VM_IO | VM_MIXEDMAP | VM_DONTEXPAND | VM_DONTDUMP);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void psb_fbdev_fb_destroy(struct fb_info *info)
|
|
{
|
|
struct drm_fb_helper *fb_helper = info->par;
|
|
struct drm_framebuffer *fb = fb_helper->fb;
|
|
struct drm_gem_object *obj = fb->obj[0];
|
|
|
|
drm_fb_helper_fini(fb_helper);
|
|
|
|
drm_framebuffer_unregister_private(fb);
|
|
fb->obj[0] = NULL;
|
|
drm_framebuffer_cleanup(fb);
|
|
kfree(fb);
|
|
|
|
drm_gem_object_put(obj);
|
|
|
|
drm_client_release(&fb_helper->client);
|
|
|
|
drm_fb_helper_unprepare(fb_helper);
|
|
kfree(fb_helper);
|
|
}
|
|
|
|
static const struct fb_ops psb_fbdev_fb_ops = {
|
|
.owner = THIS_MODULE,
|
|
__FB_DEFAULT_IO_OPS_RDWR,
|
|
DRM_FB_HELPER_DEFAULT_OPS,
|
|
.fb_setcolreg = psb_fbdev_fb_setcolreg,
|
|
__FB_DEFAULT_IO_OPS_DRAW,
|
|
.fb_mmap = psb_fbdev_fb_mmap,
|
|
.fb_destroy = psb_fbdev_fb_destroy,
|
|
};
|
|
|
|
/*
|
|
* struct drm_fb_helper_funcs
|
|
*/
|
|
|
|
static int psb_fbdev_fb_probe(struct drm_fb_helper *fb_helper,
|
|
struct drm_fb_helper_surface_size *sizes)
|
|
{
|
|
struct drm_device *dev = fb_helper->dev;
|
|
struct drm_psb_private *dev_priv = to_drm_psb_private(dev);
|
|
struct pci_dev *pdev = to_pci_dev(dev->dev);
|
|
struct fb_info *info;
|
|
struct drm_framebuffer *fb;
|
|
struct drm_mode_fb_cmd2 mode_cmd = { };
|
|
int size;
|
|
int ret;
|
|
struct psb_gem_object *backing;
|
|
struct drm_gem_object *obj;
|
|
u32 bpp, depth;
|
|
|
|
/* No 24-bit packed mode */
|
|
if (sizes->surface_bpp == 24) {
|
|
sizes->surface_bpp = 32;
|
|
sizes->surface_depth = 24;
|
|
}
|
|
bpp = sizes->surface_bpp;
|
|
depth = sizes->surface_depth;
|
|
|
|
/*
|
|
* If the mode does not fit in 32 bit then switch to 16 bit to get
|
|
* a console on full resolution. The X mode setting server will
|
|
* allocate its own 32-bit GEM framebuffer.
|
|
*/
|
|
size = ALIGN(sizes->surface_width * DIV_ROUND_UP(bpp, 8), 64) *
|
|
sizes->surface_height;
|
|
size = ALIGN(size, PAGE_SIZE);
|
|
|
|
if (size > dev_priv->vram_stolen_size) {
|
|
sizes->surface_bpp = 16;
|
|
sizes->surface_depth = 16;
|
|
}
|
|
bpp = sizes->surface_bpp;
|
|
depth = sizes->surface_depth;
|
|
|
|
mode_cmd.width = sizes->surface_width;
|
|
mode_cmd.height = sizes->surface_height;
|
|
mode_cmd.pitches[0] = ALIGN(mode_cmd.width * DIV_ROUND_UP(bpp, 8), 64);
|
|
mode_cmd.pixel_format = drm_mode_legacy_fb_format(bpp, depth);
|
|
|
|
size = mode_cmd.pitches[0] * mode_cmd.height;
|
|
size = ALIGN(size, PAGE_SIZE);
|
|
|
|
/* Allocate the framebuffer in the GTT with stolen page backing */
|
|
backing = psb_gem_create(dev, size, "fb", true, PAGE_SIZE);
|
|
if (IS_ERR(backing))
|
|
return PTR_ERR(backing);
|
|
obj = &backing->base;
|
|
|
|
fb = psb_framebuffer_create(dev, &mode_cmd, obj);
|
|
if (IS_ERR(fb)) {
|
|
ret = PTR_ERR(fb);
|
|
goto err_drm_gem_object_put;
|
|
}
|
|
|
|
fb_helper->fb = fb;
|
|
|
|
info = drm_fb_helper_alloc_info(fb_helper);
|
|
if (IS_ERR(info)) {
|
|
ret = PTR_ERR(info);
|
|
goto err_drm_framebuffer_unregister_private;
|
|
}
|
|
|
|
info->fbops = &psb_fbdev_fb_ops;
|
|
info->flags = FBINFO_DEFAULT;
|
|
/* Accessed stolen memory directly */
|
|
info->screen_base = dev_priv->vram_addr + backing->offset;
|
|
info->screen_size = size;
|
|
|
|
drm_fb_helper_fill_info(info, fb_helper, sizes);
|
|
|
|
info->fix.smem_start = dev_priv->stolen_base + backing->offset;
|
|
info->fix.smem_len = size;
|
|
info->fix.ywrapstep = 0;
|
|
info->fix.ypanstep = 0;
|
|
info->fix.mmio_start = pci_resource_start(pdev, 0);
|
|
info->fix.mmio_len = pci_resource_len(pdev, 0);
|
|
|
|
fb_memset_io(info->screen_base, 0, info->screen_size);
|
|
|
|
/* Use default scratch pixmap (info->pixmap.flags = FB_PIXMAP_SYSTEM) */
|
|
|
|
dev_dbg(dev->dev, "allocated %dx%d fb\n", fb->width, fb->height);
|
|
|
|
return 0;
|
|
|
|
err_drm_framebuffer_unregister_private:
|
|
drm_framebuffer_unregister_private(fb);
|
|
fb->obj[0] = NULL;
|
|
drm_framebuffer_cleanup(fb);
|
|
kfree(fb);
|
|
err_drm_gem_object_put:
|
|
drm_gem_object_put(obj);
|
|
return ret;
|
|
}
|
|
|
|
static const struct drm_fb_helper_funcs psb_fbdev_fb_helper_funcs = {
|
|
.fb_probe = psb_fbdev_fb_probe,
|
|
};
|
|
|
|
/*
|
|
* struct drm_client_funcs and setup code
|
|
*/
|
|
|
|
static void psb_fbdev_client_unregister(struct drm_client_dev *client)
|
|
{
|
|
struct drm_fb_helper *fb_helper = drm_fb_helper_from_client(client);
|
|
|
|
if (fb_helper->info) {
|
|
drm_fb_helper_unregister_info(fb_helper);
|
|
} else {
|
|
drm_fb_helper_unprepare(fb_helper);
|
|
drm_client_release(&fb_helper->client);
|
|
kfree(fb_helper);
|
|
}
|
|
}
|
|
|
|
static int psb_fbdev_client_restore(struct drm_client_dev *client)
|
|
{
|
|
drm_fb_helper_lastclose(client->dev);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int psb_fbdev_client_hotplug(struct drm_client_dev *client)
|
|
{
|
|
struct drm_fb_helper *fb_helper = drm_fb_helper_from_client(client);
|
|
struct drm_device *dev = client->dev;
|
|
int ret;
|
|
|
|
if (dev->fb_helper)
|
|
return drm_fb_helper_hotplug_event(dev->fb_helper);
|
|
|
|
ret = drm_fb_helper_init(dev, fb_helper);
|
|
if (ret)
|
|
goto err_drm_err;
|
|
|
|
if (!drm_drv_uses_atomic_modeset(dev))
|
|
drm_helper_disable_unused_functions(dev);
|
|
|
|
ret = drm_fb_helper_initial_config(fb_helper);
|
|
if (ret)
|
|
goto err_drm_fb_helper_fini;
|
|
|
|
return 0;
|
|
|
|
err_drm_fb_helper_fini:
|
|
drm_fb_helper_fini(fb_helper);
|
|
err_drm_err:
|
|
drm_err(dev, "Failed to setup gma500 fbdev emulation (ret=%d)\n", ret);
|
|
return ret;
|
|
}
|
|
|
|
static const struct drm_client_funcs psb_fbdev_client_funcs = {
|
|
.owner = THIS_MODULE,
|
|
.unregister = psb_fbdev_client_unregister,
|
|
.restore = psb_fbdev_client_restore,
|
|
.hotplug = psb_fbdev_client_hotplug,
|
|
};
|
|
|
|
void psb_fbdev_setup(struct drm_psb_private *dev_priv)
|
|
{
|
|
struct drm_device *dev = &dev_priv->dev;
|
|
struct drm_fb_helper *fb_helper;
|
|
int ret;
|
|
|
|
fb_helper = kzalloc(sizeof(*fb_helper), GFP_KERNEL);
|
|
if (!fb_helper)
|
|
return;
|
|
drm_fb_helper_prepare(dev, fb_helper, 32, &psb_fbdev_fb_helper_funcs);
|
|
|
|
ret = drm_client_init(dev, &fb_helper->client, "fbdev-gma500", &psb_fbdev_client_funcs);
|
|
if (ret) {
|
|
drm_err(dev, "Failed to register client: %d\n", ret);
|
|
goto err_drm_fb_helper_unprepare;
|
|
}
|
|
|
|
drm_client_register(&fb_helper->client);
|
|
|
|
return;
|
|
|
|
err_drm_fb_helper_unprepare:
|
|
drm_fb_helper_unprepare(fb_helper);
|
|
kfree(fb_helper);
|
|
}
|