![Daniel Vetter](/assets/img/avatar_default.png)
Having the probe helper stuff (which pretty much everyone needs) in the drm_crtc_helper.h file (which atomic drivers should never need) is confusing. Split them out. To make sure I actually achieved the goal here I went through all drivers. And indeed, all atomic drivers are now free of drm_crtc_helper.h includes. v2: Make it compile. There was so much compile fail on arm drivers that I figured I'll better not include any of the acks on v1. v3: Massive rebase because i915 has lost a lot of drmP.h includes, but not all: Through drm_crtc_helper.h > drm_modeset_helper.h -> drmP.h there was still one, which this patch largely removes. Which means rolling out lots more includes all over. This will also conflict with ongoing drmP.h cleanup by others I expect. v3: Rebase on top of atomic bochs. v4: Review from Laurent for bridge/rcar/omap/shmob/core bits: - (re)move some of the added includes, use the better include files in other places (all suggested from Laurent adopted unchanged). - sort alphabetically v5: Actually try to sort them, and while at it, sort all the ones I touch. v6: Rebase onto i915 changes. v7: Rebase once more. Acked-by: Harry Wentland <harry.wentland@amd.com> Acked-by: Sam Ravnborg <sam@ravnborg.org> Cc: Sam Ravnborg <sam@ravnborg.org> Cc: Jani Nikula <jani.nikula@linux.intel.com> Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Acked-by: Benjamin Gaignard <benjamin.gaignard@linaro.org> Acked-by: Jani Nikula <jani.nikula@intel.com> Acked-by: Neil Armstrong <narmstrong@baylibre.com> Acked-by: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com> Acked-by: CK Hu <ck.hu@mediatek.com> Acked-by: Alex Deucher <alexander.deucher@amd.com> Acked-by: Sam Ravnborg <sam@ravnborg.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Acked-by: Liviu Dudau <liviu.dudau@arm.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Cc: linux-arm-kernel@lists.infradead.org Cc: virtualization@lists.linux-foundation.org Cc: etnaviv@lists.freedesktop.org Cc: linux-samsung-soc@vger.kernel.org Cc: intel-gfx@lists.freedesktop.org Cc: linux-mediatek@lists.infradead.org Cc: linux-amlogic@lists.infradead.org Cc: linux-arm-msm@vger.kernel.org Cc: freedreno@lists.freedesktop.org Cc: nouveau@lists.freedesktop.org Cc: spice-devel@lists.freedesktop.org Cc: amd-gfx@lists.freedesktop.org Cc: linux-renesas-soc@vger.kernel.org Cc: linux-rockchip@lists.infradead.org Cc: linux-stm32@st-md-mailman.stormreply.com Cc: linux-tegra@vger.kernel.org Cc: xen-devel@lists.xen.org Link: https://patchwork.freedesktop.org/patch/msgid/20190117210334.13234-1-daniel.vetter@ffwll.ch
390 lines
12 KiB
C
390 lines
12 KiB
C
/*
|
|
* Copyright (C) 2015 Red Hat, Inc.
|
|
* All Rights Reserved.
|
|
*
|
|
* Authors:
|
|
* Dave Airlie
|
|
* Alon Levy
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
|
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
|
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
* OTHER DEALINGS IN THE SOFTWARE.
|
|
*/
|
|
|
|
#include "virtgpu_drv.h"
|
|
#include <drm/drm_atomic_helper.h>
|
|
#include <drm/drm_gem_framebuffer_helper.h>
|
|
#include <drm/drm_probe_helper.h>
|
|
|
|
#define XRES_MIN 32
|
|
#define YRES_MIN 32
|
|
|
|
#define XRES_DEF 1024
|
|
#define YRES_DEF 768
|
|
|
|
#define XRES_MAX 8192
|
|
#define YRES_MAX 8192
|
|
|
|
static const struct drm_crtc_funcs virtio_gpu_crtc_funcs = {
|
|
.set_config = drm_atomic_helper_set_config,
|
|
.destroy = drm_crtc_cleanup,
|
|
|
|
.page_flip = drm_atomic_helper_page_flip,
|
|
.reset = drm_atomic_helper_crtc_reset,
|
|
.atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state,
|
|
.atomic_destroy_state = drm_atomic_helper_crtc_destroy_state,
|
|
};
|
|
|
|
static int
|
|
virtio_gpu_framebuffer_surface_dirty(struct drm_framebuffer *fb,
|
|
struct drm_file *file_priv,
|
|
unsigned int flags, unsigned int color,
|
|
struct drm_clip_rect *clips,
|
|
unsigned int num_clips)
|
|
{
|
|
struct virtio_gpu_framebuffer *virtio_gpu_fb
|
|
= to_virtio_gpu_framebuffer(fb);
|
|
|
|
return virtio_gpu_surface_dirty(virtio_gpu_fb, clips, num_clips);
|
|
}
|
|
|
|
static const struct drm_framebuffer_funcs virtio_gpu_fb_funcs = {
|
|
.create_handle = drm_gem_fb_create_handle,
|
|
.destroy = drm_gem_fb_destroy,
|
|
.dirty = virtio_gpu_framebuffer_surface_dirty,
|
|
};
|
|
|
|
int
|
|
virtio_gpu_framebuffer_init(struct drm_device *dev,
|
|
struct virtio_gpu_framebuffer *vgfb,
|
|
const struct drm_mode_fb_cmd2 *mode_cmd,
|
|
struct drm_gem_object *obj)
|
|
{
|
|
int ret;
|
|
|
|
vgfb->base.obj[0] = obj;
|
|
|
|
drm_helper_mode_fill_fb_struct(dev, &vgfb->base, mode_cmd);
|
|
|
|
ret = drm_framebuffer_init(dev, &vgfb->base, &virtio_gpu_fb_funcs);
|
|
if (ret) {
|
|
vgfb->base.obj[0] = NULL;
|
|
return ret;
|
|
}
|
|
|
|
spin_lock_init(&vgfb->dirty_lock);
|
|
vgfb->x1 = vgfb->y1 = INT_MAX;
|
|
vgfb->x2 = vgfb->y2 = 0;
|
|
return 0;
|
|
}
|
|
|
|
static void virtio_gpu_crtc_mode_set_nofb(struct drm_crtc *crtc)
|
|
{
|
|
struct drm_device *dev = crtc->dev;
|
|
struct virtio_gpu_device *vgdev = dev->dev_private;
|
|
struct virtio_gpu_output *output = drm_crtc_to_virtio_gpu_output(crtc);
|
|
|
|
virtio_gpu_cmd_set_scanout(vgdev, output->index, 0,
|
|
crtc->mode.hdisplay,
|
|
crtc->mode.vdisplay, 0, 0);
|
|
}
|
|
|
|
static void virtio_gpu_crtc_atomic_enable(struct drm_crtc *crtc,
|
|
struct drm_crtc_state *old_state)
|
|
{
|
|
struct virtio_gpu_output *output = drm_crtc_to_virtio_gpu_output(crtc);
|
|
|
|
output->enabled = true;
|
|
}
|
|
|
|
static void virtio_gpu_crtc_atomic_disable(struct drm_crtc *crtc,
|
|
struct drm_crtc_state *old_state)
|
|
{
|
|
struct drm_device *dev = crtc->dev;
|
|
struct virtio_gpu_device *vgdev = dev->dev_private;
|
|
struct virtio_gpu_output *output = drm_crtc_to_virtio_gpu_output(crtc);
|
|
|
|
virtio_gpu_cmd_set_scanout(vgdev, output->index, 0, 0, 0, 0, 0);
|
|
output->enabled = false;
|
|
}
|
|
|
|
static int virtio_gpu_crtc_atomic_check(struct drm_crtc *crtc,
|
|
struct drm_crtc_state *state)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static void virtio_gpu_crtc_atomic_flush(struct drm_crtc *crtc,
|
|
struct drm_crtc_state *old_state)
|
|
{
|
|
unsigned long flags;
|
|
|
|
spin_lock_irqsave(&crtc->dev->event_lock, flags);
|
|
if (crtc->state->event)
|
|
drm_crtc_send_vblank_event(crtc, crtc->state->event);
|
|
crtc->state->event = NULL;
|
|
spin_unlock_irqrestore(&crtc->dev->event_lock, flags);
|
|
}
|
|
|
|
static const struct drm_crtc_helper_funcs virtio_gpu_crtc_helper_funcs = {
|
|
.mode_set_nofb = virtio_gpu_crtc_mode_set_nofb,
|
|
.atomic_check = virtio_gpu_crtc_atomic_check,
|
|
.atomic_flush = virtio_gpu_crtc_atomic_flush,
|
|
.atomic_enable = virtio_gpu_crtc_atomic_enable,
|
|
.atomic_disable = virtio_gpu_crtc_atomic_disable,
|
|
};
|
|
|
|
static void virtio_gpu_enc_mode_set(struct drm_encoder *encoder,
|
|
struct drm_display_mode *mode,
|
|
struct drm_display_mode *adjusted_mode)
|
|
{
|
|
}
|
|
|
|
static void virtio_gpu_enc_enable(struct drm_encoder *encoder)
|
|
{
|
|
}
|
|
|
|
static void virtio_gpu_enc_disable(struct drm_encoder *encoder)
|
|
{
|
|
}
|
|
|
|
static int virtio_gpu_conn_get_modes(struct drm_connector *connector)
|
|
{
|
|
struct virtio_gpu_output *output =
|
|
drm_connector_to_virtio_gpu_output(connector);
|
|
struct drm_display_mode *mode = NULL;
|
|
int count, width, height;
|
|
|
|
if (output->edid) {
|
|
count = drm_add_edid_modes(connector, output->edid);
|
|
if (count)
|
|
return count;
|
|
}
|
|
|
|
width = le32_to_cpu(output->info.r.width);
|
|
height = le32_to_cpu(output->info.r.height);
|
|
count = drm_add_modes_noedid(connector, XRES_MAX, YRES_MAX);
|
|
|
|
if (width == 0 || height == 0) {
|
|
width = XRES_DEF;
|
|
height = YRES_DEF;
|
|
drm_set_preferred_mode(connector, XRES_DEF, YRES_DEF);
|
|
} else {
|
|
DRM_DEBUG("add mode: %dx%d\n", width, height);
|
|
mode = drm_cvt_mode(connector->dev, width, height, 60,
|
|
false, false, false);
|
|
mode->type |= DRM_MODE_TYPE_PREFERRED;
|
|
drm_mode_probed_add(connector, mode);
|
|
count++;
|
|
}
|
|
|
|
return count;
|
|
}
|
|
|
|
static enum drm_mode_status virtio_gpu_conn_mode_valid(struct drm_connector *connector,
|
|
struct drm_display_mode *mode)
|
|
{
|
|
struct virtio_gpu_output *output =
|
|
drm_connector_to_virtio_gpu_output(connector);
|
|
int width, height;
|
|
|
|
width = le32_to_cpu(output->info.r.width);
|
|
height = le32_to_cpu(output->info.r.height);
|
|
|
|
if (!(mode->type & DRM_MODE_TYPE_PREFERRED))
|
|
return MODE_OK;
|
|
if (mode->hdisplay == XRES_DEF && mode->vdisplay == YRES_DEF)
|
|
return MODE_OK;
|
|
if (mode->hdisplay <= width && mode->hdisplay >= width - 16 &&
|
|
mode->vdisplay <= height && mode->vdisplay >= height - 16)
|
|
return MODE_OK;
|
|
|
|
DRM_DEBUG("del mode: %dx%d\n", mode->hdisplay, mode->vdisplay);
|
|
return MODE_BAD;
|
|
}
|
|
|
|
static const struct drm_encoder_helper_funcs virtio_gpu_enc_helper_funcs = {
|
|
.mode_set = virtio_gpu_enc_mode_set,
|
|
.enable = virtio_gpu_enc_enable,
|
|
.disable = virtio_gpu_enc_disable,
|
|
};
|
|
|
|
static const struct drm_connector_helper_funcs virtio_gpu_conn_helper_funcs = {
|
|
.get_modes = virtio_gpu_conn_get_modes,
|
|
.mode_valid = virtio_gpu_conn_mode_valid,
|
|
};
|
|
|
|
static enum drm_connector_status virtio_gpu_conn_detect(
|
|
struct drm_connector *connector,
|
|
bool force)
|
|
{
|
|
struct virtio_gpu_output *output =
|
|
drm_connector_to_virtio_gpu_output(connector);
|
|
|
|
if (output->info.enabled)
|
|
return connector_status_connected;
|
|
else
|
|
return connector_status_disconnected;
|
|
}
|
|
|
|
static void virtio_gpu_conn_destroy(struct drm_connector *connector)
|
|
{
|
|
drm_connector_unregister(connector);
|
|
drm_connector_cleanup(connector);
|
|
}
|
|
|
|
static const struct drm_connector_funcs virtio_gpu_connector_funcs = {
|
|
.detect = virtio_gpu_conn_detect,
|
|
.fill_modes = drm_helper_probe_single_connector_modes,
|
|
.destroy = virtio_gpu_conn_destroy,
|
|
.reset = drm_atomic_helper_connector_reset,
|
|
.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
|
|
.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
|
|
};
|
|
|
|
static const struct drm_encoder_funcs virtio_gpu_enc_funcs = {
|
|
.destroy = drm_encoder_cleanup,
|
|
};
|
|
|
|
static int vgdev_output_init(struct virtio_gpu_device *vgdev, int index)
|
|
{
|
|
struct drm_device *dev = vgdev->ddev;
|
|
struct virtio_gpu_output *output = vgdev->outputs + index;
|
|
struct drm_connector *connector = &output->conn;
|
|
struct drm_encoder *encoder = &output->enc;
|
|
struct drm_crtc *crtc = &output->crtc;
|
|
struct drm_plane *primary, *cursor;
|
|
|
|
output->index = index;
|
|
if (index == 0) {
|
|
output->info.enabled = cpu_to_le32(true);
|
|
output->info.r.width = cpu_to_le32(XRES_DEF);
|
|
output->info.r.height = cpu_to_le32(YRES_DEF);
|
|
}
|
|
|
|
primary = virtio_gpu_plane_init(vgdev, DRM_PLANE_TYPE_PRIMARY, index);
|
|
if (IS_ERR(primary))
|
|
return PTR_ERR(primary);
|
|
cursor = virtio_gpu_plane_init(vgdev, DRM_PLANE_TYPE_CURSOR, index);
|
|
if (IS_ERR(cursor))
|
|
return PTR_ERR(cursor);
|
|
drm_crtc_init_with_planes(dev, crtc, primary, cursor,
|
|
&virtio_gpu_crtc_funcs, NULL);
|
|
drm_crtc_helper_add(crtc, &virtio_gpu_crtc_helper_funcs);
|
|
|
|
drm_connector_init(dev, connector, &virtio_gpu_connector_funcs,
|
|
DRM_MODE_CONNECTOR_VIRTUAL);
|
|
drm_connector_helper_add(connector, &virtio_gpu_conn_helper_funcs);
|
|
if (vgdev->has_edid)
|
|
drm_connector_attach_edid_property(connector);
|
|
|
|
drm_encoder_init(dev, encoder, &virtio_gpu_enc_funcs,
|
|
DRM_MODE_ENCODER_VIRTUAL, NULL);
|
|
drm_encoder_helper_add(encoder, &virtio_gpu_enc_helper_funcs);
|
|
encoder->possible_crtcs = 1 << index;
|
|
|
|
drm_connector_attach_encoder(connector, encoder);
|
|
drm_connector_register(connector);
|
|
return 0;
|
|
}
|
|
|
|
static struct drm_framebuffer *
|
|
virtio_gpu_user_framebuffer_create(struct drm_device *dev,
|
|
struct drm_file *file_priv,
|
|
const struct drm_mode_fb_cmd2 *mode_cmd)
|
|
{
|
|
struct drm_gem_object *obj = NULL;
|
|
struct virtio_gpu_framebuffer *virtio_gpu_fb;
|
|
int ret;
|
|
|
|
if (mode_cmd->pixel_format != DRM_FORMAT_HOST_XRGB8888 &&
|
|
mode_cmd->pixel_format != DRM_FORMAT_HOST_ARGB8888)
|
|
return ERR_PTR(-ENOENT);
|
|
|
|
/* lookup object associated with res handle */
|
|
obj = drm_gem_object_lookup(file_priv, mode_cmd->handles[0]);
|
|
if (!obj)
|
|
return ERR_PTR(-EINVAL);
|
|
|
|
virtio_gpu_fb = kzalloc(sizeof(*virtio_gpu_fb), GFP_KERNEL);
|
|
if (virtio_gpu_fb == NULL)
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
ret = virtio_gpu_framebuffer_init(dev, virtio_gpu_fb, mode_cmd, obj);
|
|
if (ret) {
|
|
kfree(virtio_gpu_fb);
|
|
drm_gem_object_put_unlocked(obj);
|
|
return NULL;
|
|
}
|
|
|
|
return &virtio_gpu_fb->base;
|
|
}
|
|
|
|
static void vgdev_atomic_commit_tail(struct drm_atomic_state *state)
|
|
{
|
|
struct drm_device *dev = state->dev;
|
|
|
|
drm_atomic_helper_commit_modeset_disables(dev, state);
|
|
drm_atomic_helper_commit_modeset_enables(dev, state);
|
|
drm_atomic_helper_commit_planes(dev, state, 0);
|
|
|
|
drm_atomic_helper_commit_hw_done(state);
|
|
|
|
drm_atomic_helper_wait_for_vblanks(dev, state);
|
|
drm_atomic_helper_cleanup_planes(dev, state);
|
|
}
|
|
|
|
static const struct drm_mode_config_helper_funcs virtio_mode_config_helpers = {
|
|
.atomic_commit_tail = vgdev_atomic_commit_tail,
|
|
};
|
|
|
|
static const struct drm_mode_config_funcs virtio_gpu_mode_funcs = {
|
|
.fb_create = virtio_gpu_user_framebuffer_create,
|
|
.atomic_check = drm_atomic_helper_check,
|
|
.atomic_commit = drm_atomic_helper_commit,
|
|
};
|
|
|
|
void virtio_gpu_modeset_init(struct virtio_gpu_device *vgdev)
|
|
{
|
|
int i;
|
|
|
|
drm_mode_config_init(vgdev->ddev);
|
|
vgdev->ddev->mode_config.quirk_addfb_prefer_host_byte_order = true;
|
|
vgdev->ddev->mode_config.funcs = &virtio_gpu_mode_funcs;
|
|
vgdev->ddev->mode_config.helper_private = &virtio_mode_config_helpers;
|
|
|
|
/* modes will be validated against the framebuffer size */
|
|
vgdev->ddev->mode_config.min_width = XRES_MIN;
|
|
vgdev->ddev->mode_config.min_height = YRES_MIN;
|
|
vgdev->ddev->mode_config.max_width = XRES_MAX;
|
|
vgdev->ddev->mode_config.max_height = YRES_MAX;
|
|
|
|
for (i = 0 ; i < vgdev->num_scanouts; ++i)
|
|
vgdev_output_init(vgdev, i);
|
|
|
|
drm_mode_config_reset(vgdev->ddev);
|
|
}
|
|
|
|
void virtio_gpu_modeset_fini(struct virtio_gpu_device *vgdev)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0 ; i < vgdev->num_scanouts; ++i)
|
|
kfree(vgdev->outputs[i].edid);
|
|
drm_mode_config_cleanup(vgdev->ddev);
|
|
}
|