]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drm/cirrus: Move to drm/tiny
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 15 Apr 2020 07:40:12 +0000 (09:40 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 28 Apr 2020 14:05:15 +0000 (16:05 +0200)
Because it is. Huge congrats to everyone who made this kind of
refactoring happen!

Acked-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Dave Airlie <airlied@redhat.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: virtualization@lists.linux-foundation.org
Link: https://patchwork.freedesktop.org/patch/msgid/20200415074034.175360-38-daniel.vetter@ffwll.ch
MAINTAINERS
drivers/gpu/drm/Kconfig
drivers/gpu/drm/Makefile
drivers/gpu/drm/cirrus/Kconfig [deleted file]
drivers/gpu/drm/cirrus/Makefile [deleted file]
drivers/gpu/drm/cirrus/cirrus.c [deleted file]
drivers/gpu/drm/tiny/Kconfig
drivers/gpu/drm/tiny/Makefile
drivers/gpu/drm/tiny/cirrus.c [new file with mode: 0644]

index ad29107786fe35f1ebff6a773eb58e43a8cebd18..4e4883dfdd55a7caf46bb0b271044248a8a328bd 100644 (file)
@@ -5422,7 +5422,7 @@ L:        virtualization@lists.linux-foundation.org
 S:     Obsolete
 W:     https://www.kraxel.org/blog/2014/10/qemu-using-cirrus-considered-harmful/
 T:     git git://anongit.freedesktop.org/drm/drm-misc
-F:     drivers/gpu/drm/cirrus/
+F:     drivers/gpu/drm/tiny/cirrus.c
 
 DRM DRIVER FOR QXL VIRTUAL GPU
 M:     Dave Airlie <airlied@redhat.com>
index 43594978958e804807a3d681869ca4963100570c..4f4e7fa001c15b0b47272772096a8d7865b1b31e 100644 (file)
@@ -310,8 +310,6 @@ source "drivers/gpu/drm/ast/Kconfig"
 
 source "drivers/gpu/drm/mgag200/Kconfig"
 
-source "drivers/gpu/drm/cirrus/Kconfig"
-
 source "drivers/gpu/drm/armada/Kconfig"
 
 source "drivers/gpu/drm/atmel-hlcdc/Kconfig"
index f34d08c834851287edbd8b0a19c41c7dfdd2ae6d..2c0e5a7e595362a5176a148d6d8d2770fd891804 100644 (file)
@@ -74,7 +74,6 @@ obj-$(CONFIG_DRM_I915)        += i915/
 obj-$(CONFIG_DRM_MGAG200) += mgag200/
 obj-$(CONFIG_DRM_V3D)  += v3d/
 obj-$(CONFIG_DRM_VC4)  += vc4/
-obj-$(CONFIG_DRM_CIRRUS_QEMU) += cirrus/
 obj-$(CONFIG_DRM_SIS)   += sis/
 obj-$(CONFIG_DRM_SAVAGE)+= savage/
 obj-$(CONFIG_DRM_VMWGFX)+= vmwgfx/
diff --git a/drivers/gpu/drm/cirrus/Kconfig b/drivers/gpu/drm/cirrus/Kconfig
deleted file mode 100644 (file)
index c6bbd98..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-config DRM_CIRRUS_QEMU
-       tristate "Cirrus driver for QEMU emulated device"
-       depends on DRM && PCI && MMU
-       select DRM_KMS_HELPER
-       select DRM_GEM_SHMEM_HELPER
-       help
-        This is a KMS driver for emulated cirrus device in qemu.
-        It is *NOT* intended for real cirrus devices. This requires
-        the modesetting userspace X.org driver.
-
-        Cirrus is obsolete, the hardware was designed in the 90ies
-        and can't keep up with todays needs.  More background:
-        https://www.kraxel.org/blog/2014/10/qemu-using-cirrus-considered-harmful/
-
-        Better alternatives are:
-          - stdvga (DRM_BOCHS, qemu -vga std, default in qemu 2.2+)
-          - qxl (DRM_QXL, qemu -vga qxl, works best with spice)
-          - virtio (DRM_VIRTIO_GPU), qemu -vga virtio)
diff --git a/drivers/gpu/drm/cirrus/Makefile b/drivers/gpu/drm/cirrus/Makefile
deleted file mode 100644 (file)
index 0c1ed3f..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-obj-$(CONFIG_DRM_CIRRUS_QEMU) += cirrus.o
diff --git a/drivers/gpu/drm/cirrus/cirrus.c b/drivers/gpu/drm/cirrus/cirrus.c
deleted file mode 100644 (file)
index 744a8e3..0000000
+++ /dev/null
@@ -1,660 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * Copyright 2012-2019 Red Hat
- *
- * This file is subject to the terms and conditions of the GNU General
- * Public License version 2. See the file COPYING in the main
- * directory of this archive for more details.
- *
- * Authors: Matthew Garrett
- *         Dave Airlie
- *         Gerd Hoffmann
- *
- * Portions of this code derived from cirrusfb.c:
- * drivers/video/cirrusfb.c - driver for Cirrus Logic chipsets
- *
- * Copyright 1999-2001 Jeff Garzik <jgarzik@pobox.com>
- */
-
-#include <linux/console.h>
-#include <linux/module.h>
-#include <linux/pci.h>
-
-#include <video/cirrus.h>
-#include <video/vga.h>
-
-#include <drm/drm_atomic_helper.h>
-#include <drm/drm_atomic_state_helper.h>
-#include <drm/drm_connector.h>
-#include <drm/drm_damage_helper.h>
-#include <drm/drm_drv.h>
-#include <drm/drm_fb_helper.h>
-#include <drm/drm_file.h>
-#include <drm/drm_format_helper.h>
-#include <drm/drm_fourcc.h>
-#include <drm/drm_gem_shmem_helper.h>
-#include <drm/drm_gem_framebuffer_helper.h>
-#include <drm/drm_ioctl.h>
-#include <drm/drm_managed.h>
-#include <drm/drm_modeset_helper_vtables.h>
-#include <drm/drm_probe_helper.h>
-#include <drm/drm_simple_kms_helper.h>
-
-#define DRIVER_NAME "cirrus"
-#define DRIVER_DESC "qemu cirrus vga"
-#define DRIVER_DATE "2019"
-#define DRIVER_MAJOR 2
-#define DRIVER_MINOR 0
-
-#define CIRRUS_MAX_PITCH (0x1FF << 3)      /* (4096 - 1) & ~111b bytes */
-#define CIRRUS_VRAM_SIZE (4 * 1024 * 1024) /* 4 MB */
-
-struct cirrus_device {
-       struct drm_device              dev;
-       struct drm_simple_display_pipe pipe;
-       struct drm_connector           conn;
-       unsigned int                   cpp;
-       unsigned int                   pitch;
-       void __iomem                   *vram;
-       void __iomem                   *mmio;
-};
-
-#define to_cirrus(_dev) container_of(_dev, struct cirrus_device, dev)
-
-/* ------------------------------------------------------------------ */
-/*
- * The meat of this driver. The core passes us a mode and we have to program
- * it. The modesetting here is the bare minimum required to satisfy the qemu
- * emulation of this hardware, and running this against a real device is
- * likely to result in an inadequately programmed mode. We've already had
- * the opportunity to modify the mode, so whatever we receive here should
- * be something that can be correctly programmed and displayed
- */
-
-#define SEQ_INDEX 4
-#define SEQ_DATA 5
-
-static u8 rreg_seq(struct cirrus_device *cirrus, u8 reg)
-{
-       iowrite8(reg, cirrus->mmio + SEQ_INDEX);
-       return ioread8(cirrus->mmio + SEQ_DATA);
-}
-
-static void wreg_seq(struct cirrus_device *cirrus, u8 reg, u8 val)
-{
-       iowrite8(reg, cirrus->mmio + SEQ_INDEX);
-       iowrite8(val, cirrus->mmio + SEQ_DATA);
-}
-
-#define CRT_INDEX 0x14
-#define CRT_DATA 0x15
-
-static u8 rreg_crt(struct cirrus_device *cirrus, u8 reg)
-{
-       iowrite8(reg, cirrus->mmio + CRT_INDEX);
-       return ioread8(cirrus->mmio + CRT_DATA);
-}
-
-static void wreg_crt(struct cirrus_device *cirrus, u8 reg, u8 val)
-{
-       iowrite8(reg, cirrus->mmio + CRT_INDEX);
-       iowrite8(val, cirrus->mmio + CRT_DATA);
-}
-
-#define GFX_INDEX 0xe
-#define GFX_DATA 0xf
-
-static void wreg_gfx(struct cirrus_device *cirrus, u8 reg, u8 val)
-{
-       iowrite8(reg, cirrus->mmio + GFX_INDEX);
-       iowrite8(val, cirrus->mmio + GFX_DATA);
-}
-
-#define VGA_DAC_MASK  0x06
-
-static void wreg_hdr(struct cirrus_device *cirrus, u8 val)
-{
-       ioread8(cirrus->mmio + VGA_DAC_MASK);
-       ioread8(cirrus->mmio + VGA_DAC_MASK);
-       ioread8(cirrus->mmio + VGA_DAC_MASK);
-       ioread8(cirrus->mmio + VGA_DAC_MASK);
-       iowrite8(val, cirrus->mmio + VGA_DAC_MASK);
-}
-
-static int cirrus_convert_to(struct drm_framebuffer *fb)
-{
-       if (fb->format->cpp[0] == 4 && fb->pitches[0] > CIRRUS_MAX_PITCH) {
-               if (fb->width * 3 <= CIRRUS_MAX_PITCH)
-                       /* convert from XR24 to RG24 */
-                       return 3;
-               else
-                       /* convert from XR24 to RG16 */
-                       return 2;
-       }
-       return 0;
-}
-
-static int cirrus_cpp(struct drm_framebuffer *fb)
-{
-       int convert_cpp = cirrus_convert_to(fb);
-
-       if (convert_cpp)
-               return convert_cpp;
-       return fb->format->cpp[0];
-}
-
-static int cirrus_pitch(struct drm_framebuffer *fb)
-{
-       int convert_cpp = cirrus_convert_to(fb);
-
-       if (convert_cpp)
-               return convert_cpp * fb->width;
-       return fb->pitches[0];
-}
-
-static void cirrus_set_start_address(struct cirrus_device *cirrus, u32 offset)
-{
-       int idx;
-       u32 addr;
-       u8 tmp;
-
-       if (!drm_dev_enter(&cirrus->dev, &idx))
-               return;
-
-       addr = offset >> 2;
-       wreg_crt(cirrus, 0x0c, (u8)((addr >> 8) & 0xff));
-       wreg_crt(cirrus, 0x0d, (u8)(addr & 0xff));
-
-       tmp = rreg_crt(cirrus, 0x1b);
-       tmp &= 0xf2;
-       tmp |= (addr >> 16) & 0x01;
-       tmp |= (addr >> 15) & 0x0c;
-       wreg_crt(cirrus, 0x1b, tmp);
-
-       tmp = rreg_crt(cirrus, 0x1d);
-       tmp &= 0x7f;
-       tmp |= (addr >> 12) & 0x80;
-       wreg_crt(cirrus, 0x1d, tmp);
-
-       drm_dev_exit(idx);
-}
-
-static int cirrus_mode_set(struct cirrus_device *cirrus,
-                          struct drm_display_mode *mode,
-                          struct drm_framebuffer *fb)
-{
-       int hsyncstart, hsyncend, htotal, hdispend;
-       int vtotal, vdispend;
-       int tmp, idx;
-       int sr07 = 0, hdr = 0;
-
-       if (!drm_dev_enter(&cirrus->dev, &idx))
-               return -1;
-
-       htotal = mode->htotal / 8;
-       hsyncend = mode->hsync_end / 8;
-       hsyncstart = mode->hsync_start / 8;
-       hdispend = mode->hdisplay / 8;
-
-       vtotal = mode->vtotal;
-       vdispend = mode->vdisplay;
-
-       vdispend -= 1;
-       vtotal -= 2;
-
-       htotal -= 5;
-       hdispend -= 1;
-       hsyncstart += 1;
-       hsyncend += 1;
-
-       wreg_crt(cirrus, VGA_CRTC_V_SYNC_END, 0x20);
-       wreg_crt(cirrus, VGA_CRTC_H_TOTAL, htotal);
-       wreg_crt(cirrus, VGA_CRTC_H_DISP, hdispend);
-       wreg_crt(cirrus, VGA_CRTC_H_SYNC_START, hsyncstart);
-       wreg_crt(cirrus, VGA_CRTC_H_SYNC_END, hsyncend);
-       wreg_crt(cirrus, VGA_CRTC_V_TOTAL, vtotal & 0xff);
-       wreg_crt(cirrus, VGA_CRTC_V_DISP_END, vdispend & 0xff);
-
-       tmp = 0x40;
-       if ((vdispend + 1) & 512)
-               tmp |= 0x20;
-       wreg_crt(cirrus, VGA_CRTC_MAX_SCAN, tmp);
-
-       /*
-        * Overflow bits for values that don't fit in the standard registers
-        */
-       tmp = 0x10;
-       if (vtotal & 0x100)
-               tmp |= 0x01;
-       if (vdispend & 0x100)
-               tmp |= 0x02;
-       if ((vdispend + 1) & 0x100)
-               tmp |= 0x08;
-       if (vtotal & 0x200)
-               tmp |= 0x20;
-       if (vdispend & 0x200)
-               tmp |= 0x40;
-       wreg_crt(cirrus, VGA_CRTC_OVERFLOW, tmp);
-
-       tmp = 0;
-
-       /* More overflow bits */
-
-       if ((htotal + 5) & 0x40)
-               tmp |= 0x10;
-       if ((htotal + 5) & 0x80)
-               tmp |= 0x20;
-       if (vtotal & 0x100)
-               tmp |= 0x40;
-       if (vtotal & 0x200)
-               tmp |= 0x80;
-
-       wreg_crt(cirrus, CL_CRT1A, tmp);
-
-       /* Disable Hercules/CGA compatibility */
-       wreg_crt(cirrus, VGA_CRTC_MODE, 0x03);
-
-       sr07 = rreg_seq(cirrus, 0x07);
-       sr07 &= 0xe0;
-       hdr = 0;
-
-       cirrus->cpp = cirrus_cpp(fb);
-       switch (cirrus->cpp * 8) {
-       case 8:
-               sr07 |= 0x11;
-               break;
-       case 16:
-               sr07 |= 0x17;
-               hdr = 0xc1;
-               break;
-       case 24:
-               sr07 |= 0x15;
-               hdr = 0xc5;
-               break;
-       case 32:
-               sr07 |= 0x19;
-               hdr = 0xc5;
-               break;
-       default:
-               drm_dev_exit(idx);
-               return -1;
-       }
-
-       wreg_seq(cirrus, 0x7, sr07);
-
-       /* Program the pitch */
-       cirrus->pitch = cirrus_pitch(fb);
-       tmp = cirrus->pitch / 8;
-       wreg_crt(cirrus, VGA_CRTC_OFFSET, tmp);
-
-       /* Enable extended blanking and pitch bits, and enable full memory */
-       tmp = 0x22;
-       tmp |= (cirrus->pitch >> 7) & 0x10;
-       tmp |= (cirrus->pitch >> 6) & 0x40;
-       wreg_crt(cirrus, 0x1b, tmp);
-
-       /* Enable high-colour modes */
-       wreg_gfx(cirrus, VGA_GFX_MODE, 0x40);
-
-       /* And set graphics mode */
-       wreg_gfx(cirrus, VGA_GFX_MISC, 0x01);
-
-       wreg_hdr(cirrus, hdr);
-
-       cirrus_set_start_address(cirrus, 0);
-
-       /* Unblank (needed on S3 resume, vgabios doesn't do it then) */
-       outb(0x20, 0x3c0);
-
-       drm_dev_exit(idx);
-       return 0;
-}
-
-static int cirrus_fb_blit_rect(struct drm_framebuffer *fb,
-                              struct drm_rect *rect)
-{
-       struct cirrus_device *cirrus = to_cirrus(fb->dev);
-       void *vmap;
-       int idx, ret;
-
-       ret = -ENODEV;
-       if (!drm_dev_enter(&cirrus->dev, &idx))
-               goto out;
-
-       ret = -ENOMEM;
-       vmap = drm_gem_shmem_vmap(fb->obj[0]);
-       if (!vmap)
-               goto out_dev_exit;
-
-       if (cirrus->cpp == fb->format->cpp[0])
-               drm_fb_memcpy_dstclip(cirrus->vram,
-                                     vmap, fb, rect);
-
-       else if (fb->format->cpp[0] == 4 && cirrus->cpp == 2)
-               drm_fb_xrgb8888_to_rgb565_dstclip(cirrus->vram,
-                                                 cirrus->pitch,
-                                                 vmap, fb, rect, false);
-
-       else if (fb->format->cpp[0] == 4 && cirrus->cpp == 3)
-               drm_fb_xrgb8888_to_rgb888_dstclip(cirrus->vram,
-                                                 cirrus->pitch,
-                                                 vmap, fb, rect);
-
-       else
-               WARN_ON_ONCE("cpp mismatch");
-
-       drm_gem_shmem_vunmap(fb->obj[0], vmap);
-       ret = 0;
-
-out_dev_exit:
-       drm_dev_exit(idx);
-out:
-       return ret;
-}
-
-static int cirrus_fb_blit_fullscreen(struct drm_framebuffer *fb)
-{
-       struct drm_rect fullscreen = {
-               .x1 = 0,
-               .x2 = fb->width,
-               .y1 = 0,
-               .y2 = fb->height,
-       };
-       return cirrus_fb_blit_rect(fb, &fullscreen);
-}
-
-static int cirrus_check_size(int width, int height,
-                            struct drm_framebuffer *fb)
-{
-       int pitch = width * 2;
-
-       if (fb)
-               pitch = cirrus_pitch(fb);
-
-       if (pitch > CIRRUS_MAX_PITCH)
-               return -EINVAL;
-       if (pitch * height > CIRRUS_VRAM_SIZE)
-               return -EINVAL;
-       return 0;
-}
-
-/* ------------------------------------------------------------------ */
-/* cirrus connector                                                  */
-
-static int cirrus_conn_get_modes(struct drm_connector *conn)
-{
-       int count;
-
-       count = drm_add_modes_noedid(conn,
-                                    conn->dev->mode_config.max_width,
-                                    conn->dev->mode_config.max_height);
-       drm_set_preferred_mode(conn, 1024, 768);
-       return count;
-}
-
-static const struct drm_connector_helper_funcs cirrus_conn_helper_funcs = {
-       .get_modes = cirrus_conn_get_modes,
-};
-
-static const struct drm_connector_funcs cirrus_conn_funcs = {
-       .fill_modes = drm_helper_probe_single_connector_modes,
-       .destroy = drm_connector_cleanup,
-       .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 int cirrus_conn_init(struct cirrus_device *cirrus)
-{
-       drm_connector_helper_add(&cirrus->conn, &cirrus_conn_helper_funcs);
-       return drm_connector_init(&cirrus->dev, &cirrus->conn,
-                                 &cirrus_conn_funcs, DRM_MODE_CONNECTOR_VGA);
-
-}
-
-/* ------------------------------------------------------------------ */
-/* cirrus (simple) display pipe                                              */
-
-static enum drm_mode_status cirrus_pipe_mode_valid(struct drm_simple_display_pipe *pipe,
-                                                  const struct drm_display_mode *mode)
-{
-       if (cirrus_check_size(mode->hdisplay, mode->vdisplay, NULL) < 0)
-               return MODE_BAD;
-       return MODE_OK;
-}
-
-static int cirrus_pipe_check(struct drm_simple_display_pipe *pipe,
-                            struct drm_plane_state *plane_state,
-                            struct drm_crtc_state *crtc_state)
-{
-       struct drm_framebuffer *fb = plane_state->fb;
-
-       if (!fb)
-               return 0;
-       return cirrus_check_size(fb->width, fb->height, fb);
-}
-
-static void cirrus_pipe_enable(struct drm_simple_display_pipe *pipe,
-                              struct drm_crtc_state *crtc_state,
-                              struct drm_plane_state *plane_state)
-{
-       struct cirrus_device *cirrus = to_cirrus(pipe->crtc.dev);
-
-       cirrus_mode_set(cirrus, &crtc_state->mode, plane_state->fb);
-       cirrus_fb_blit_fullscreen(plane_state->fb);
-}
-
-static void cirrus_pipe_update(struct drm_simple_display_pipe *pipe,
-                              struct drm_plane_state *old_state)
-{
-       struct cirrus_device *cirrus = to_cirrus(pipe->crtc.dev);
-       struct drm_plane_state *state = pipe->plane.state;
-       struct drm_crtc *crtc = &pipe->crtc;
-       struct drm_rect rect;
-
-       if (pipe->plane.state->fb &&
-           cirrus->cpp != cirrus_cpp(pipe->plane.state->fb))
-               cirrus_mode_set(cirrus, &crtc->mode,
-                               pipe->plane.state->fb);
-
-       if (drm_atomic_helper_damage_merged(old_state, state, &rect))
-               cirrus_fb_blit_rect(pipe->plane.state->fb, &rect);
-}
-
-static const struct drm_simple_display_pipe_funcs cirrus_pipe_funcs = {
-       .mode_valid = cirrus_pipe_mode_valid,
-       .check      = cirrus_pipe_check,
-       .enable     = cirrus_pipe_enable,
-       .update     = cirrus_pipe_update,
-};
-
-static const uint32_t cirrus_formats[] = {
-       DRM_FORMAT_RGB565,
-       DRM_FORMAT_RGB888,
-       DRM_FORMAT_XRGB8888,
-};
-
-static const uint64_t cirrus_modifiers[] = {
-       DRM_FORMAT_MOD_LINEAR,
-       DRM_FORMAT_MOD_INVALID
-};
-
-static int cirrus_pipe_init(struct cirrus_device *cirrus)
-{
-       return drm_simple_display_pipe_init(&cirrus->dev,
-                                           &cirrus->pipe,
-                                           &cirrus_pipe_funcs,
-                                           cirrus_formats,
-                                           ARRAY_SIZE(cirrus_formats),
-                                           cirrus_modifiers,
-                                           &cirrus->conn);
-}
-
-/* ------------------------------------------------------------------ */
-/* cirrus framebuffers & mode config                                 */
-
-static struct drm_framebuffer*
-cirrus_fb_create(struct drm_device *dev, struct drm_file *file_priv,
-                const struct drm_mode_fb_cmd2 *mode_cmd)
-{
-       if (mode_cmd->pixel_format != DRM_FORMAT_RGB565 &&
-           mode_cmd->pixel_format != DRM_FORMAT_RGB888 &&
-           mode_cmd->pixel_format != DRM_FORMAT_XRGB8888)
-               return ERR_PTR(-EINVAL);
-       if (cirrus_check_size(mode_cmd->width, mode_cmd->height, NULL) < 0)
-               return ERR_PTR(-EINVAL);
-       return drm_gem_fb_create_with_dirty(dev, file_priv, mode_cmd);
-}
-
-static const struct drm_mode_config_funcs cirrus_mode_config_funcs = {
-       .fb_create = cirrus_fb_create,
-       .atomic_check = drm_atomic_helper_check,
-       .atomic_commit = drm_atomic_helper_commit,
-};
-
-static int cirrus_mode_config_init(struct cirrus_device *cirrus)
-{
-       struct drm_device *dev = &cirrus->dev;
-       int ret;
-
-       ret = drmm_mode_config_init(dev);
-       if (ret)
-               return ret;
-
-       dev->mode_config.min_width = 0;
-       dev->mode_config.min_height = 0;
-       dev->mode_config.max_width = CIRRUS_MAX_PITCH / 2;
-       dev->mode_config.max_height = 1024;
-       dev->mode_config.preferred_depth = 16;
-       dev->mode_config.prefer_shadow = 0;
-       dev->mode_config.funcs = &cirrus_mode_config_funcs;
-
-       return 0;
-}
-
-/* ------------------------------------------------------------------ */
-
-DEFINE_DRM_GEM_FOPS(cirrus_fops);
-
-static struct drm_driver cirrus_driver = {
-       .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC,
-
-       .name            = DRIVER_NAME,
-       .desc            = DRIVER_DESC,
-       .date            = DRIVER_DATE,
-       .major           = DRIVER_MAJOR,
-       .minor           = DRIVER_MINOR,
-
-       .fops            = &cirrus_fops,
-       DRM_GEM_SHMEM_DRIVER_OPS,
-};
-
-static int cirrus_pci_probe(struct pci_dev *pdev,
-                           const struct pci_device_id *ent)
-{
-       struct drm_device *dev;
-       struct cirrus_device *cirrus;
-       int ret;
-
-       ret = drm_fb_helper_remove_conflicting_pci_framebuffers(pdev, "cirrusdrmfb");
-       if (ret)
-               return ret;
-
-       ret = pcim_enable_device(pdev);
-       if (ret)
-               return ret;
-
-       ret = pci_request_regions(pdev, DRIVER_NAME);
-       if (ret)
-               return ret;
-
-       ret = -ENOMEM;
-       cirrus = devm_drm_dev_alloc(&pdev->dev, &cirrus_driver,
-                                   struct cirrus_device, dev);
-       if (IS_ERR(cirrus))
-               return PTR_ERR(cirrus);
-
-       dev = &cirrus->dev;
-
-       cirrus->vram = devm_ioremap(&pdev->dev, pci_resource_start(pdev, 0),
-                                   pci_resource_len(pdev, 0));
-       if (cirrus->vram == NULL)
-               return -ENOMEM;
-
-       cirrus->mmio = devm_ioremap(&pdev->dev, pci_resource_start(pdev, 1),
-                                   pci_resource_len(pdev, 1));
-       if (cirrus->mmio == NULL)
-               return -ENOMEM;
-
-       ret = cirrus_mode_config_init(cirrus);
-       if (ret)
-               return ret;
-
-       ret = cirrus_conn_init(cirrus);
-       if (ret < 0)
-               return ret;
-
-       ret = cirrus_pipe_init(cirrus);
-       if (ret < 0)
-               return ret;
-
-       drm_mode_config_reset(dev);
-
-       dev->pdev = pdev;
-       pci_set_drvdata(pdev, dev);
-       ret = drm_dev_register(dev, 0);
-       if (ret)
-               return ret;
-
-       drm_fbdev_generic_setup(dev, dev->mode_config.preferred_depth);
-       return 0;
-}
-
-static void cirrus_pci_remove(struct pci_dev *pdev)
-{
-       struct drm_device *dev = pci_get_drvdata(pdev);
-
-       drm_dev_unplug(dev);
-       drm_atomic_helper_shutdown(dev);
-}
-
-static const struct pci_device_id pciidlist[] = {
-       {
-               .vendor    = PCI_VENDOR_ID_CIRRUS,
-               .device    = PCI_DEVICE_ID_CIRRUS_5446,
-               /* only bind to the cirrus chip in qemu */
-               .subvendor = PCI_SUBVENDOR_ID_REDHAT_QUMRANET,
-               .subdevice = PCI_SUBDEVICE_ID_QEMU,
-       }, {
-               .vendor    = PCI_VENDOR_ID_CIRRUS,
-               .device    = PCI_DEVICE_ID_CIRRUS_5446,
-               .subvendor = PCI_VENDOR_ID_XEN,
-               .subdevice = 0x0001,
-       },
-       { /* end if list */ }
-};
-
-static struct pci_driver cirrus_pci_driver = {
-       .name = DRIVER_NAME,
-       .id_table = pciidlist,
-       .probe = cirrus_pci_probe,
-       .remove = cirrus_pci_remove,
-};
-
-static int __init cirrus_init(void)
-{
-       if (vgacon_text_force())
-               return -EINVAL;
-       return pci_register_driver(&cirrus_pci_driver);
-}
-
-static void __exit cirrus_exit(void)
-{
-       pci_unregister_driver(&cirrus_pci_driver);
-}
-
-module_init(cirrus_init);
-module_exit(cirrus_exit);
-
-MODULE_DEVICE_TABLE(pci, pciidlist);
-MODULE_LICENSE("GPL");
index 4160e74e4751d8908a6e84ef0a9e3f56fc364eec..2b6414f0fa75957e0ce70065625993cc81cd2ff6 100644 (file)
@@ -1,5 +1,24 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
+config DRM_CIRRUS_QEMU
+       tristate "Cirrus driver for QEMU emulated device"
+       depends on DRM && PCI && MMU
+       select DRM_KMS_HELPER
+       select DRM_GEM_SHMEM_HELPER
+       help
+        This is a KMS driver for emulated cirrus device in qemu.
+        It is *NOT* intended for real cirrus devices. This requires
+        the modesetting userspace X.org driver.
+
+        Cirrus is obsolete, the hardware was designed in the 90ies
+        and can't keep up with todays needs.  More background:
+        https://www.kraxel.org/blog/2014/10/qemu-using-cirrus-considered-harmful/
+
+        Better alternatives are:
+          - stdvga (DRM_BOCHS, qemu -vga std, default in qemu 2.2+)
+          - qxl (DRM_QXL, qemu -vga qxl, works best with spice)
+          - virtio (DRM_VIRTIO_GPU), qemu -vga virtio)
+
 config DRM_GM12U320
        tristate "GM12U320 driver for USB projectors"
        depends on DRM && USB
index c96ceee71453b3b56a4850922023c2cef15d8eae..6ae4e9e5a35fbd883dda1777fd4941f27bef3dd8 100644 (file)
@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
+obj-$(CONFIG_DRM_CIRRUS_QEMU)          += cirrus.o
 obj-$(CONFIG_DRM_GM12U320)             += gm12u320.o
 obj-$(CONFIG_TINYDRM_HX8357D)          += hx8357d.o
 obj-$(CONFIG_TINYDRM_ILI9225)          += ili9225.o
diff --git a/drivers/gpu/drm/tiny/cirrus.c b/drivers/gpu/drm/tiny/cirrus.c
new file mode 100644 (file)
index 0000000..744a8e3
--- /dev/null
@@ -0,0 +1,660 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright 2012-2019 Red Hat
+ *
+ * This file is subject to the terms and conditions of the GNU General
+ * Public License version 2. See the file COPYING in the main
+ * directory of this archive for more details.
+ *
+ * Authors: Matthew Garrett
+ *         Dave Airlie
+ *         Gerd Hoffmann
+ *
+ * Portions of this code derived from cirrusfb.c:
+ * drivers/video/cirrusfb.c - driver for Cirrus Logic chipsets
+ *
+ * Copyright 1999-2001 Jeff Garzik <jgarzik@pobox.com>
+ */
+
+#include <linux/console.h>
+#include <linux/module.h>
+#include <linux/pci.h>
+
+#include <video/cirrus.h>
+#include <video/vga.h>
+
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_atomic_state_helper.h>
+#include <drm/drm_connector.h>
+#include <drm/drm_damage_helper.h>
+#include <drm/drm_drv.h>
+#include <drm/drm_fb_helper.h>
+#include <drm/drm_file.h>
+#include <drm/drm_format_helper.h>
+#include <drm/drm_fourcc.h>
+#include <drm/drm_gem_shmem_helper.h>
+#include <drm/drm_gem_framebuffer_helper.h>
+#include <drm/drm_ioctl.h>
+#include <drm/drm_managed.h>
+#include <drm/drm_modeset_helper_vtables.h>
+#include <drm/drm_probe_helper.h>
+#include <drm/drm_simple_kms_helper.h>
+
+#define DRIVER_NAME "cirrus"
+#define DRIVER_DESC "qemu cirrus vga"
+#define DRIVER_DATE "2019"
+#define DRIVER_MAJOR 2
+#define DRIVER_MINOR 0
+
+#define CIRRUS_MAX_PITCH (0x1FF << 3)      /* (4096 - 1) & ~111b bytes */
+#define CIRRUS_VRAM_SIZE (4 * 1024 * 1024) /* 4 MB */
+
+struct cirrus_device {
+       struct drm_device              dev;
+       struct drm_simple_display_pipe pipe;
+       struct drm_connector           conn;
+       unsigned int                   cpp;
+       unsigned int                   pitch;
+       void __iomem                   *vram;
+       void __iomem                   *mmio;
+};
+
+#define to_cirrus(_dev) container_of(_dev, struct cirrus_device, dev)
+
+/* ------------------------------------------------------------------ */
+/*
+ * The meat of this driver. The core passes us a mode and we have to program
+ * it. The modesetting here is the bare minimum required to satisfy the qemu
+ * emulation of this hardware, and running this against a real device is
+ * likely to result in an inadequately programmed mode. We've already had
+ * the opportunity to modify the mode, so whatever we receive here should
+ * be something that can be correctly programmed and displayed
+ */
+
+#define SEQ_INDEX 4
+#define SEQ_DATA 5
+
+static u8 rreg_seq(struct cirrus_device *cirrus, u8 reg)
+{
+       iowrite8(reg, cirrus->mmio + SEQ_INDEX);
+       return ioread8(cirrus->mmio + SEQ_DATA);
+}
+
+static void wreg_seq(struct cirrus_device *cirrus, u8 reg, u8 val)
+{
+       iowrite8(reg, cirrus->mmio + SEQ_INDEX);
+       iowrite8(val, cirrus->mmio + SEQ_DATA);
+}
+
+#define CRT_INDEX 0x14
+#define CRT_DATA 0x15
+
+static u8 rreg_crt(struct cirrus_device *cirrus, u8 reg)
+{
+       iowrite8(reg, cirrus->mmio + CRT_INDEX);
+       return ioread8(cirrus->mmio + CRT_DATA);
+}
+
+static void wreg_crt(struct cirrus_device *cirrus, u8 reg, u8 val)
+{
+       iowrite8(reg, cirrus->mmio + CRT_INDEX);
+       iowrite8(val, cirrus->mmio + CRT_DATA);
+}
+
+#define GFX_INDEX 0xe
+#define GFX_DATA 0xf
+
+static void wreg_gfx(struct cirrus_device *cirrus, u8 reg, u8 val)
+{
+       iowrite8(reg, cirrus->mmio + GFX_INDEX);
+       iowrite8(val, cirrus->mmio + GFX_DATA);
+}
+
+#define VGA_DAC_MASK  0x06
+
+static void wreg_hdr(struct cirrus_device *cirrus, u8 val)
+{
+       ioread8(cirrus->mmio + VGA_DAC_MASK);
+       ioread8(cirrus->mmio + VGA_DAC_MASK);
+       ioread8(cirrus->mmio + VGA_DAC_MASK);
+       ioread8(cirrus->mmio + VGA_DAC_MASK);
+       iowrite8(val, cirrus->mmio + VGA_DAC_MASK);
+}
+
+static int cirrus_convert_to(struct drm_framebuffer *fb)
+{
+       if (fb->format->cpp[0] == 4 && fb->pitches[0] > CIRRUS_MAX_PITCH) {
+               if (fb->width * 3 <= CIRRUS_MAX_PITCH)
+                       /* convert from XR24 to RG24 */
+                       return 3;
+               else
+                       /* convert from XR24 to RG16 */
+                       return 2;
+       }
+       return 0;
+}
+
+static int cirrus_cpp(struct drm_framebuffer *fb)
+{
+       int convert_cpp = cirrus_convert_to(fb);
+
+       if (convert_cpp)
+               return convert_cpp;
+       return fb->format->cpp[0];
+}
+
+static int cirrus_pitch(struct drm_framebuffer *fb)
+{
+       int convert_cpp = cirrus_convert_to(fb);
+
+       if (convert_cpp)
+               return convert_cpp * fb->width;
+       return fb->pitches[0];
+}
+
+static void cirrus_set_start_address(struct cirrus_device *cirrus, u32 offset)
+{
+       int idx;
+       u32 addr;
+       u8 tmp;
+
+       if (!drm_dev_enter(&cirrus->dev, &idx))
+               return;
+
+       addr = offset >> 2;
+       wreg_crt(cirrus, 0x0c, (u8)((addr >> 8) & 0xff));
+       wreg_crt(cirrus, 0x0d, (u8)(addr & 0xff));
+
+       tmp = rreg_crt(cirrus, 0x1b);
+       tmp &= 0xf2;
+       tmp |= (addr >> 16) & 0x01;
+       tmp |= (addr >> 15) & 0x0c;
+       wreg_crt(cirrus, 0x1b, tmp);
+
+       tmp = rreg_crt(cirrus, 0x1d);
+       tmp &= 0x7f;
+       tmp |= (addr >> 12) & 0x80;
+       wreg_crt(cirrus, 0x1d, tmp);
+
+       drm_dev_exit(idx);
+}
+
+static int cirrus_mode_set(struct cirrus_device *cirrus,
+                          struct drm_display_mode *mode,
+                          struct drm_framebuffer *fb)
+{
+       int hsyncstart, hsyncend, htotal, hdispend;
+       int vtotal, vdispend;
+       int tmp, idx;
+       int sr07 = 0, hdr = 0;
+
+       if (!drm_dev_enter(&cirrus->dev, &idx))
+               return -1;
+
+       htotal = mode->htotal / 8;
+       hsyncend = mode->hsync_end / 8;
+       hsyncstart = mode->hsync_start / 8;
+       hdispend = mode->hdisplay / 8;
+
+       vtotal = mode->vtotal;
+       vdispend = mode->vdisplay;
+
+       vdispend -= 1;
+       vtotal -= 2;
+
+       htotal -= 5;
+       hdispend -= 1;
+       hsyncstart += 1;
+       hsyncend += 1;
+
+       wreg_crt(cirrus, VGA_CRTC_V_SYNC_END, 0x20);
+       wreg_crt(cirrus, VGA_CRTC_H_TOTAL, htotal);
+       wreg_crt(cirrus, VGA_CRTC_H_DISP, hdispend);
+       wreg_crt(cirrus, VGA_CRTC_H_SYNC_START, hsyncstart);
+       wreg_crt(cirrus, VGA_CRTC_H_SYNC_END, hsyncend);
+       wreg_crt(cirrus, VGA_CRTC_V_TOTAL, vtotal & 0xff);
+       wreg_crt(cirrus, VGA_CRTC_V_DISP_END, vdispend & 0xff);
+
+       tmp = 0x40;
+       if ((vdispend + 1) & 512)
+               tmp |= 0x20;
+       wreg_crt(cirrus, VGA_CRTC_MAX_SCAN, tmp);
+
+       /*
+        * Overflow bits for values that don't fit in the standard registers
+        */
+       tmp = 0x10;
+       if (vtotal & 0x100)
+               tmp |= 0x01;
+       if (vdispend & 0x100)
+               tmp |= 0x02;
+       if ((vdispend + 1) & 0x100)
+               tmp |= 0x08;
+       if (vtotal & 0x200)
+               tmp |= 0x20;
+       if (vdispend & 0x200)
+               tmp |= 0x40;
+       wreg_crt(cirrus, VGA_CRTC_OVERFLOW, tmp);
+
+       tmp = 0;
+
+       /* More overflow bits */
+
+       if ((htotal + 5) & 0x40)
+               tmp |= 0x10;
+       if ((htotal + 5) & 0x80)
+               tmp |= 0x20;
+       if (vtotal & 0x100)
+               tmp |= 0x40;
+       if (vtotal & 0x200)
+               tmp |= 0x80;
+
+       wreg_crt(cirrus, CL_CRT1A, tmp);
+
+       /* Disable Hercules/CGA compatibility */
+       wreg_crt(cirrus, VGA_CRTC_MODE, 0x03);
+
+       sr07 = rreg_seq(cirrus, 0x07);
+       sr07 &= 0xe0;
+       hdr = 0;
+
+       cirrus->cpp = cirrus_cpp(fb);
+       switch (cirrus->cpp * 8) {
+       case 8:
+               sr07 |= 0x11;
+               break;
+       case 16:
+               sr07 |= 0x17;
+               hdr = 0xc1;
+               break;
+       case 24:
+               sr07 |= 0x15;
+               hdr = 0xc5;
+               break;
+       case 32:
+               sr07 |= 0x19;
+               hdr = 0xc5;
+               break;
+       default:
+               drm_dev_exit(idx);
+               return -1;
+       }
+
+       wreg_seq(cirrus, 0x7, sr07);
+
+       /* Program the pitch */
+       cirrus->pitch = cirrus_pitch(fb);
+       tmp = cirrus->pitch / 8;
+       wreg_crt(cirrus, VGA_CRTC_OFFSET, tmp);
+
+       /* Enable extended blanking and pitch bits, and enable full memory */
+       tmp = 0x22;
+       tmp |= (cirrus->pitch >> 7) & 0x10;
+       tmp |= (cirrus->pitch >> 6) & 0x40;
+       wreg_crt(cirrus, 0x1b, tmp);
+
+       /* Enable high-colour modes */
+       wreg_gfx(cirrus, VGA_GFX_MODE, 0x40);
+
+       /* And set graphics mode */
+       wreg_gfx(cirrus, VGA_GFX_MISC, 0x01);
+
+       wreg_hdr(cirrus, hdr);
+
+       cirrus_set_start_address(cirrus, 0);
+
+       /* Unblank (needed on S3 resume, vgabios doesn't do it then) */
+       outb(0x20, 0x3c0);
+
+       drm_dev_exit(idx);
+       return 0;
+}
+
+static int cirrus_fb_blit_rect(struct drm_framebuffer *fb,
+                              struct drm_rect *rect)
+{
+       struct cirrus_device *cirrus = to_cirrus(fb->dev);
+       void *vmap;
+       int idx, ret;
+
+       ret = -ENODEV;
+       if (!drm_dev_enter(&cirrus->dev, &idx))
+               goto out;
+
+       ret = -ENOMEM;
+       vmap = drm_gem_shmem_vmap(fb->obj[0]);
+       if (!vmap)
+               goto out_dev_exit;
+
+       if (cirrus->cpp == fb->format->cpp[0])
+               drm_fb_memcpy_dstclip(cirrus->vram,
+                                     vmap, fb, rect);
+
+       else if (fb->format->cpp[0] == 4 && cirrus->cpp == 2)
+               drm_fb_xrgb8888_to_rgb565_dstclip(cirrus->vram,
+                                                 cirrus->pitch,
+                                                 vmap, fb, rect, false);
+
+       else if (fb->format->cpp[0] == 4 && cirrus->cpp == 3)
+               drm_fb_xrgb8888_to_rgb888_dstclip(cirrus->vram,
+                                                 cirrus->pitch,
+                                                 vmap, fb, rect);
+
+       else
+               WARN_ON_ONCE("cpp mismatch");
+
+       drm_gem_shmem_vunmap(fb->obj[0], vmap);
+       ret = 0;
+
+out_dev_exit:
+       drm_dev_exit(idx);
+out:
+       return ret;
+}
+
+static int cirrus_fb_blit_fullscreen(struct drm_framebuffer *fb)
+{
+       struct drm_rect fullscreen = {
+               .x1 = 0,
+               .x2 = fb->width,
+               .y1 = 0,
+               .y2 = fb->height,
+       };
+       return cirrus_fb_blit_rect(fb, &fullscreen);
+}
+
+static int cirrus_check_size(int width, int height,
+                            struct drm_framebuffer *fb)
+{
+       int pitch = width * 2;
+
+       if (fb)
+               pitch = cirrus_pitch(fb);
+
+       if (pitch > CIRRUS_MAX_PITCH)
+               return -EINVAL;
+       if (pitch * height > CIRRUS_VRAM_SIZE)
+               return -EINVAL;
+       return 0;
+}
+
+/* ------------------------------------------------------------------ */
+/* cirrus connector                                                  */
+
+static int cirrus_conn_get_modes(struct drm_connector *conn)
+{
+       int count;
+
+       count = drm_add_modes_noedid(conn,
+                                    conn->dev->mode_config.max_width,
+                                    conn->dev->mode_config.max_height);
+       drm_set_preferred_mode(conn, 1024, 768);
+       return count;
+}
+
+static const struct drm_connector_helper_funcs cirrus_conn_helper_funcs = {
+       .get_modes = cirrus_conn_get_modes,
+};
+
+static const struct drm_connector_funcs cirrus_conn_funcs = {
+       .fill_modes = drm_helper_probe_single_connector_modes,
+       .destroy = drm_connector_cleanup,
+       .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 int cirrus_conn_init(struct cirrus_device *cirrus)
+{
+       drm_connector_helper_add(&cirrus->conn, &cirrus_conn_helper_funcs);
+       return drm_connector_init(&cirrus->dev, &cirrus->conn,
+                                 &cirrus_conn_funcs, DRM_MODE_CONNECTOR_VGA);
+
+}
+
+/* ------------------------------------------------------------------ */
+/* cirrus (simple) display pipe                                              */
+
+static enum drm_mode_status cirrus_pipe_mode_valid(struct drm_simple_display_pipe *pipe,
+                                                  const struct drm_display_mode *mode)
+{
+       if (cirrus_check_size(mode->hdisplay, mode->vdisplay, NULL) < 0)
+               return MODE_BAD;
+       return MODE_OK;
+}
+
+static int cirrus_pipe_check(struct drm_simple_display_pipe *pipe,
+                            struct drm_plane_state *plane_state,
+                            struct drm_crtc_state *crtc_state)
+{
+       struct drm_framebuffer *fb = plane_state->fb;
+
+       if (!fb)
+               return 0;
+       return cirrus_check_size(fb->width, fb->height, fb);
+}
+
+static void cirrus_pipe_enable(struct drm_simple_display_pipe *pipe,
+                              struct drm_crtc_state *crtc_state,
+                              struct drm_plane_state *plane_state)
+{
+       struct cirrus_device *cirrus = to_cirrus(pipe->crtc.dev);
+
+       cirrus_mode_set(cirrus, &crtc_state->mode, plane_state->fb);
+       cirrus_fb_blit_fullscreen(plane_state->fb);
+}
+
+static void cirrus_pipe_update(struct drm_simple_display_pipe *pipe,
+                              struct drm_plane_state *old_state)
+{
+       struct cirrus_device *cirrus = to_cirrus(pipe->crtc.dev);
+       struct drm_plane_state *state = pipe->plane.state;
+       struct drm_crtc *crtc = &pipe->crtc;
+       struct drm_rect rect;
+
+       if (pipe->plane.state->fb &&
+           cirrus->cpp != cirrus_cpp(pipe->plane.state->fb))
+               cirrus_mode_set(cirrus, &crtc->mode,
+                               pipe->plane.state->fb);
+
+       if (drm_atomic_helper_damage_merged(old_state, state, &rect))
+               cirrus_fb_blit_rect(pipe->plane.state->fb, &rect);
+}
+
+static const struct drm_simple_display_pipe_funcs cirrus_pipe_funcs = {
+       .mode_valid = cirrus_pipe_mode_valid,
+       .check      = cirrus_pipe_check,
+       .enable     = cirrus_pipe_enable,
+       .update     = cirrus_pipe_update,
+};
+
+static const uint32_t cirrus_formats[] = {
+       DRM_FORMAT_RGB565,
+       DRM_FORMAT_RGB888,
+       DRM_FORMAT_XRGB8888,
+};
+
+static const uint64_t cirrus_modifiers[] = {
+       DRM_FORMAT_MOD_LINEAR,
+       DRM_FORMAT_MOD_INVALID
+};
+
+static int cirrus_pipe_init(struct cirrus_device *cirrus)
+{
+       return drm_simple_display_pipe_init(&cirrus->dev,
+                                           &cirrus->pipe,
+                                           &cirrus_pipe_funcs,
+                                           cirrus_formats,
+                                           ARRAY_SIZE(cirrus_formats),
+                                           cirrus_modifiers,
+                                           &cirrus->conn);
+}
+
+/* ------------------------------------------------------------------ */
+/* cirrus framebuffers & mode config                                 */
+
+static struct drm_framebuffer*
+cirrus_fb_create(struct drm_device *dev, struct drm_file *file_priv,
+                const struct drm_mode_fb_cmd2 *mode_cmd)
+{
+       if (mode_cmd->pixel_format != DRM_FORMAT_RGB565 &&
+           mode_cmd->pixel_format != DRM_FORMAT_RGB888 &&
+           mode_cmd->pixel_format != DRM_FORMAT_XRGB8888)
+               return ERR_PTR(-EINVAL);
+       if (cirrus_check_size(mode_cmd->width, mode_cmd->height, NULL) < 0)
+               return ERR_PTR(-EINVAL);
+       return drm_gem_fb_create_with_dirty(dev, file_priv, mode_cmd);
+}
+
+static const struct drm_mode_config_funcs cirrus_mode_config_funcs = {
+       .fb_create = cirrus_fb_create,
+       .atomic_check = drm_atomic_helper_check,
+       .atomic_commit = drm_atomic_helper_commit,
+};
+
+static int cirrus_mode_config_init(struct cirrus_device *cirrus)
+{
+       struct drm_device *dev = &cirrus->dev;
+       int ret;
+
+       ret = drmm_mode_config_init(dev);
+       if (ret)
+               return ret;
+
+       dev->mode_config.min_width = 0;
+       dev->mode_config.min_height = 0;
+       dev->mode_config.max_width = CIRRUS_MAX_PITCH / 2;
+       dev->mode_config.max_height = 1024;
+       dev->mode_config.preferred_depth = 16;
+       dev->mode_config.prefer_shadow = 0;
+       dev->mode_config.funcs = &cirrus_mode_config_funcs;
+
+       return 0;
+}
+
+/* ------------------------------------------------------------------ */
+
+DEFINE_DRM_GEM_FOPS(cirrus_fops);
+
+static struct drm_driver cirrus_driver = {
+       .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC,
+
+       .name            = DRIVER_NAME,
+       .desc            = DRIVER_DESC,
+       .date            = DRIVER_DATE,
+       .major           = DRIVER_MAJOR,
+       .minor           = DRIVER_MINOR,
+
+       .fops            = &cirrus_fops,
+       DRM_GEM_SHMEM_DRIVER_OPS,
+};
+
+static int cirrus_pci_probe(struct pci_dev *pdev,
+                           const struct pci_device_id *ent)
+{
+       struct drm_device *dev;
+       struct cirrus_device *cirrus;
+       int ret;
+
+       ret = drm_fb_helper_remove_conflicting_pci_framebuffers(pdev, "cirrusdrmfb");
+       if (ret)
+               return ret;
+
+       ret = pcim_enable_device(pdev);
+       if (ret)
+               return ret;
+
+       ret = pci_request_regions(pdev, DRIVER_NAME);
+       if (ret)
+               return ret;
+
+       ret = -ENOMEM;
+       cirrus = devm_drm_dev_alloc(&pdev->dev, &cirrus_driver,
+                                   struct cirrus_device, dev);
+       if (IS_ERR(cirrus))
+               return PTR_ERR(cirrus);
+
+       dev = &cirrus->dev;
+
+       cirrus->vram = devm_ioremap(&pdev->dev, pci_resource_start(pdev, 0),
+                                   pci_resource_len(pdev, 0));
+       if (cirrus->vram == NULL)
+               return -ENOMEM;
+
+       cirrus->mmio = devm_ioremap(&pdev->dev, pci_resource_start(pdev, 1),
+                                   pci_resource_len(pdev, 1));
+       if (cirrus->mmio == NULL)
+               return -ENOMEM;
+
+       ret = cirrus_mode_config_init(cirrus);
+       if (ret)
+               return ret;
+
+       ret = cirrus_conn_init(cirrus);
+       if (ret < 0)
+               return ret;
+
+       ret = cirrus_pipe_init(cirrus);
+       if (ret < 0)
+               return ret;
+
+       drm_mode_config_reset(dev);
+
+       dev->pdev = pdev;
+       pci_set_drvdata(pdev, dev);
+       ret = drm_dev_register(dev, 0);
+       if (ret)
+               return ret;
+
+       drm_fbdev_generic_setup(dev, dev->mode_config.preferred_depth);
+       return 0;
+}
+
+static void cirrus_pci_remove(struct pci_dev *pdev)
+{
+       struct drm_device *dev = pci_get_drvdata(pdev);
+
+       drm_dev_unplug(dev);
+       drm_atomic_helper_shutdown(dev);
+}
+
+static const struct pci_device_id pciidlist[] = {
+       {
+               .vendor    = PCI_VENDOR_ID_CIRRUS,
+               .device    = PCI_DEVICE_ID_CIRRUS_5446,
+               /* only bind to the cirrus chip in qemu */
+               .subvendor = PCI_SUBVENDOR_ID_REDHAT_QUMRANET,
+               .subdevice = PCI_SUBDEVICE_ID_QEMU,
+       }, {
+               .vendor    = PCI_VENDOR_ID_CIRRUS,
+               .device    = PCI_DEVICE_ID_CIRRUS_5446,
+               .subvendor = PCI_VENDOR_ID_XEN,
+               .subdevice = 0x0001,
+       },
+       { /* end if list */ }
+};
+
+static struct pci_driver cirrus_pci_driver = {
+       .name = DRIVER_NAME,
+       .id_table = pciidlist,
+       .probe = cirrus_pci_probe,
+       .remove = cirrus_pci_remove,
+};
+
+static int __init cirrus_init(void)
+{
+       if (vgacon_text_force())
+               return -EINVAL;
+       return pci_register_driver(&cirrus_pci_driver);
+}
+
+static void __exit cirrus_exit(void)
+{
+       pci_unregister_driver(&cirrus_pci_driver);
+}
+
+module_init(cirrus_init);
+module_exit(cirrus_exit);
+
+MODULE_DEVICE_TABLE(pci, pciidlist);
+MODULE_LICENSE("GPL");