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
256 lines
6 KiB
C
256 lines
6 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* Copyright (C) 2013 Red Hat
|
|
* Author: Rob Clark <robdclark@gmail.com>
|
|
*/
|
|
|
|
#include <linux/fb.h>
|
|
|
|
#include <drm/drm_drv.h>
|
|
#include <drm/drm_crtc_helper.h>
|
|
#include <drm/drm_fb_helper.h>
|
|
#include <drm/drm_fourcc.h>
|
|
#include <drm/drm_framebuffer.h>
|
|
#include <drm/drm_prime.h>
|
|
|
|
#include "msm_drv.h"
|
|
#include "msm_gem.h"
|
|
#include "msm_kms.h"
|
|
|
|
static bool fbdev = true;
|
|
MODULE_PARM_DESC(fbdev, "Enable fbdev compat layer");
|
|
module_param(fbdev, bool, 0600);
|
|
|
|
/*
|
|
* fbdev funcs, to implement legacy fbdev interface on top of drm driver
|
|
*/
|
|
|
|
FB_GEN_DEFAULT_DEFERRED_SYS_OPS(msm_fbdev,
|
|
drm_fb_helper_damage_range,
|
|
drm_fb_helper_damage_area)
|
|
|
|
static int msm_fbdev_mmap(struct fb_info *info, struct vm_area_struct *vma)
|
|
{
|
|
struct drm_fb_helper *helper = (struct drm_fb_helper *)info->par;
|
|
struct drm_gem_object *bo = msm_framebuffer_bo(helper->fb, 0);
|
|
|
|
return drm_gem_prime_mmap(bo, vma);
|
|
}
|
|
|
|
static void msm_fbdev_fb_destroy(struct fb_info *info)
|
|
{
|
|
struct drm_fb_helper *helper = (struct drm_fb_helper *)info->par;
|
|
struct drm_framebuffer *fb = helper->fb;
|
|
struct drm_gem_object *bo = msm_framebuffer_bo(fb, 0);
|
|
|
|
DBG();
|
|
|
|
drm_fb_helper_fini(helper);
|
|
|
|
/* this will free the backing object */
|
|
msm_gem_put_vaddr(bo);
|
|
drm_framebuffer_remove(fb);
|
|
|
|
drm_client_release(&helper->client);
|
|
drm_fb_helper_unprepare(helper);
|
|
kfree(helper);
|
|
}
|
|
|
|
static const struct fb_ops msm_fb_ops = {
|
|
.owner = THIS_MODULE,
|
|
__FB_DEFAULT_DEFERRED_OPS_RDWR(msm_fbdev),
|
|
DRM_FB_HELPER_DEFAULT_OPS,
|
|
__FB_DEFAULT_DEFERRED_OPS_DRAW(msm_fbdev),
|
|
.fb_mmap = msm_fbdev_mmap,
|
|
.fb_destroy = msm_fbdev_fb_destroy,
|
|
};
|
|
|
|
static int msm_fbdev_create(struct drm_fb_helper *helper,
|
|
struct drm_fb_helper_surface_size *sizes)
|
|
{
|
|
struct drm_device *dev = helper->dev;
|
|
struct msm_drm_private *priv = dev->dev_private;
|
|
struct drm_framebuffer *fb = NULL;
|
|
struct drm_gem_object *bo;
|
|
struct fb_info *fbi = NULL;
|
|
uint64_t paddr;
|
|
uint32_t format;
|
|
int ret, pitch;
|
|
|
|
format = drm_mode_legacy_fb_format(sizes->surface_bpp, sizes->surface_depth);
|
|
|
|
DBG("create fbdev: %dx%d@%d (%dx%d)", sizes->surface_width,
|
|
sizes->surface_height, sizes->surface_bpp,
|
|
sizes->fb_width, sizes->fb_height);
|
|
|
|
pitch = align_pitch(sizes->surface_width, sizes->surface_bpp);
|
|
fb = msm_alloc_stolen_fb(dev, sizes->surface_width,
|
|
sizes->surface_height, pitch, format);
|
|
|
|
if (IS_ERR(fb)) {
|
|
DRM_DEV_ERROR(dev->dev, "failed to allocate fb\n");
|
|
return PTR_ERR(fb);
|
|
}
|
|
|
|
bo = msm_framebuffer_bo(fb, 0);
|
|
|
|
/*
|
|
* NOTE: if we can be guaranteed to be able to map buffer
|
|
* in panic (ie. lock-safe, etc) we could avoid pinning the
|
|
* buffer now:
|
|
*/
|
|
ret = msm_gem_get_and_pin_iova(bo, priv->kms->aspace, &paddr);
|
|
if (ret) {
|
|
DRM_DEV_ERROR(dev->dev, "failed to get buffer obj iova: %d\n", ret);
|
|
goto fail;
|
|
}
|
|
|
|
fbi = drm_fb_helper_alloc_info(helper);
|
|
if (IS_ERR(fbi)) {
|
|
DRM_DEV_ERROR(dev->dev, "failed to allocate fb info\n");
|
|
ret = PTR_ERR(fbi);
|
|
goto fail;
|
|
}
|
|
|
|
DBG("fbi=%p, dev=%p", fbi, dev);
|
|
|
|
helper->fb = fb;
|
|
|
|
fbi->fbops = &msm_fb_ops;
|
|
|
|
drm_fb_helper_fill_info(fbi, helper, sizes);
|
|
|
|
fbi->screen_buffer = msm_gem_get_vaddr(bo);
|
|
if (IS_ERR(fbi->screen_buffer)) {
|
|
ret = PTR_ERR(fbi->screen_buffer);
|
|
goto fail;
|
|
}
|
|
fbi->screen_size = bo->size;
|
|
fbi->fix.smem_start = paddr;
|
|
fbi->fix.smem_len = bo->size;
|
|
|
|
DBG("par=%p, %dx%d", fbi->par, fbi->var.xres, fbi->var.yres);
|
|
DBG("allocated %dx%d fb", fb->width, fb->height);
|
|
|
|
return 0;
|
|
|
|
fail:
|
|
drm_framebuffer_remove(fb);
|
|
return ret;
|
|
}
|
|
|
|
static int msm_fbdev_fb_dirty(struct drm_fb_helper *helper,
|
|
struct drm_clip_rect *clip)
|
|
{
|
|
struct drm_device *dev = helper->dev;
|
|
int ret;
|
|
|
|
/* Call damage handlers only if necessary */
|
|
if (!(clip->x1 < clip->x2 && clip->y1 < clip->y2))
|
|
return 0;
|
|
|
|
if (helper->fb->funcs->dirty) {
|
|
ret = helper->fb->funcs->dirty(helper->fb, NULL, 0, 0, clip, 1);
|
|
if (drm_WARN_ONCE(dev, ret, "Dirty helper failed: ret=%d\n", ret))
|
|
return ret;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct drm_fb_helper_funcs msm_fb_helper_funcs = {
|
|
.fb_probe = msm_fbdev_create,
|
|
.fb_dirty = msm_fbdev_fb_dirty,
|
|
};
|
|
|
|
/*
|
|
* struct drm_client
|
|
*/
|
|
|
|
static void msm_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_client_release(&fb_helper->client);
|
|
drm_fb_helper_unprepare(fb_helper);
|
|
kfree(fb_helper);
|
|
}
|
|
}
|
|
|
|
static int msm_fbdev_client_restore(struct drm_client_dev *client)
|
|
{
|
|
drm_fb_helper_lastclose(client->dev);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int msm_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 fbdev emulation (ret=%d)\n", ret);
|
|
return ret;
|
|
}
|
|
|
|
static const struct drm_client_funcs msm_fbdev_client_funcs = {
|
|
.owner = THIS_MODULE,
|
|
.unregister = msm_fbdev_client_unregister,
|
|
.restore = msm_fbdev_client_restore,
|
|
.hotplug = msm_fbdev_client_hotplug,
|
|
};
|
|
|
|
/* initialize fbdev helper */
|
|
void msm_fbdev_setup(struct drm_device *dev)
|
|
{
|
|
struct drm_fb_helper *helper;
|
|
int ret;
|
|
|
|
if (!fbdev)
|
|
return;
|
|
|
|
drm_WARN(dev, !dev->registered, "Device has not been registered.\n");
|
|
drm_WARN(dev, dev->fb_helper, "fb_helper is already set!\n");
|
|
|
|
helper = kzalloc(sizeof(*helper), GFP_KERNEL);
|
|
if (!helper)
|
|
return;
|
|
drm_fb_helper_prepare(dev, helper, 32, &msm_fb_helper_funcs);
|
|
|
|
ret = drm_client_init(dev, &helper->client, "fbdev", &msm_fbdev_client_funcs);
|
|
if (ret) {
|
|
drm_err(dev, "Failed to register client: %d\n", ret);
|
|
goto err_drm_fb_helper_unprepare;
|
|
}
|
|
|
|
drm_client_register(&helper->client);
|
|
|
|
return;
|
|
|
|
err_drm_fb_helper_unprepare:
|
|
drm_fb_helper_unprepare(helper);
|
|
kfree(helper);
|
|
}
|