Commit e304f8a0 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/qxl: Don't use drm_device->dev_private 



Upcasting using a container_of macro is more typesafe, faster and
easier for the compiler to optimize.

Acked-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Cc: Dave Airlie <airlied@redhat.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: virtualization@lists.linux-foundation.org
Cc: spice-devel@lists.freedesktop.org
Link: https://patchwork.freedesktop.org/patch/msgid/20200415074034.175360-28-daniel.vetter@ffwll.ch
parent a9b0b24a

drivers/gpu/drm/qxl/qxl_debugfs.c

+3 −4
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ static int 
qxl_debugfs_irq_received(struct seq_file *m, void *data)

{

	struct drm_info_node *node = (struct drm_info_node *) m->private;

	struct qxl_device *qdev = node->minor->dev->dev_private;

	struct qxl_device *qdev = to_qxl(node->minor->dev);



	seq_printf(m, "%d\n", atomic_read(&qdev->irq_received));

	seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_display));
@@ -53,7 +53,7 @@ static int 
qxl_debugfs_buffers_info(struct seq_file *m, void *data)

{

	struct drm_info_node *node = (struct drm_info_node *) m->private;

	struct qxl_device *qdev = node->minor->dev->dev_private;

	struct qxl_device *qdev = to_qxl(node->minor->dev);

	struct qxl_bo *bo;



	list_for_each_entry(bo, &qdev->gem.objects, list) {
@@ -83,8 +83,7 @@ void 
qxl_debugfs_init(struct drm_minor *minor)

{

#if defined(CONFIG_DEBUG_FS)

	struct qxl_device *dev =

		(struct qxl_device *) minor->dev->dev_private;

	struct qxl_device *dev = to_qxl(minor->dev);



	drm_debugfs_create_files(qxl_debugfs_list, QXL_DEBUGFS_ENTRIES,

				 minor->debugfs_root, minor);

drivers/gpu/drm/qxl/qxl_display.c

+16 −16
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ static int qxl_add_mode(struct drm_connector *connector, 
			bool preferred)

{

	struct drm_device *dev = connector->dev;

	struct qxl_device *qdev = dev->dev_private;

	struct qxl_device *qdev = to_qxl(dev);

	struct drm_display_mode *mode = NULL;

	int rc;
@@ -242,7 +242,7 @@ static int qxl_add_mode(struct drm_connector *connector, 
static int qxl_add_monitors_config_modes(struct drm_connector *connector)

{

	struct drm_device *dev = connector->dev;

	struct qxl_device *qdev = dev->dev_private;

	struct qxl_device *qdev = to_qxl(dev);

	struct qxl_output *output = drm_connector_to_qxl_output(connector);

	int h = output->index;

	struct qxl_head *head;
@@ -310,7 +310,7 @@ static void qxl_crtc_update_monitors_config(struct drm_crtc *crtc, 
					    const char *reason)

{

	struct drm_device *dev = crtc->dev;

	struct qxl_device *qdev = dev->dev_private;

	struct qxl_device *qdev = to_qxl(dev);

	struct qxl_crtc *qcrtc = to_qxl_crtc(crtc);

	struct qxl_head head;

	int oldcount, i = qcrtc->index;
@@ -400,7 +400,7 @@ static int qxl_framebuffer_surface_dirty(struct drm_framebuffer *fb, 
					 unsigned int num_clips)

{

	/* TODO: vmwgfx where this was cribbed from had locking. Why? */

	struct qxl_device *qdev = fb->dev->dev_private;

	struct qxl_device *qdev = to_qxl(fb->dev);

	struct drm_clip_rect norect;

	struct qxl_bo *qobj;

	bool is_primary;
@@ -462,7 +462,7 @@ static const struct drm_crtc_helper_funcs qxl_crtc_helper_funcs = { 
static int qxl_primary_atomic_check(struct drm_plane *plane,

				    struct drm_plane_state *state)

{

	struct qxl_device *qdev = plane->dev->dev_private;

	struct qxl_device *qdev = to_qxl(plane->dev);

	struct qxl_bo *bo;



	if (!state->crtc || !state->fb)
@@ -476,7 +476,7 @@ static int qxl_primary_atomic_check(struct drm_plane *plane, 
static int qxl_primary_apply_cursor(struct drm_plane *plane)

{

	struct drm_device *dev = plane->dev;

	struct qxl_device *qdev = dev->dev_private;

	struct qxl_device *qdev = to_qxl(dev);

	struct drm_framebuffer *fb = plane->state->fb;

	struct qxl_crtc *qcrtc = to_qxl_crtc(plane->state->crtc);

	struct qxl_cursor_cmd *cmd;
@@ -523,7 +523,7 @@ out_free_release: 
static void qxl_primary_atomic_update(struct drm_plane *plane,

				      struct drm_plane_state *old_state)

{

	struct qxl_device *qdev = plane->dev->dev_private;

	struct qxl_device *qdev = to_qxl(plane->dev);

	struct qxl_bo *bo = gem_to_qxl_bo(plane->state->fb->obj[0]);

	struct qxl_bo *primary;

	struct drm_clip_rect norect = {
@@ -554,7 +554,7 @@ static void qxl_primary_atomic_update(struct drm_plane *plane, 
static void qxl_primary_atomic_disable(struct drm_plane *plane,

				       struct drm_plane_state *old_state)

{

	struct qxl_device *qdev = plane->dev->dev_private;

	struct qxl_device *qdev = to_qxl(plane->dev);



	if (old_state->fb) {

		struct qxl_bo *bo = gem_to_qxl_bo(old_state->fb->obj[0]);
@@ -570,7 +570,7 @@ static void qxl_cursor_atomic_update(struct drm_plane *plane, 
				     struct drm_plane_state *old_state)

{

	struct drm_device *dev = plane->dev;

	struct qxl_device *qdev = dev->dev_private;

	struct qxl_device *qdev = to_qxl(dev);

	struct drm_framebuffer *fb = plane->state->fb;

	struct qxl_crtc *qcrtc = to_qxl_crtc(plane->state->crtc);

	struct qxl_release *release;
@@ -679,7 +679,7 @@ out_free_release: 
static void qxl_cursor_atomic_disable(struct drm_plane *plane,

				      struct drm_plane_state *old_state)

{

	struct qxl_device *qdev = plane->dev->dev_private;

	struct qxl_device *qdev = to_qxl(plane->dev);

	struct qxl_release *release;

	struct qxl_cursor_cmd *cmd;

	int ret;
@@ -762,7 +762,7 @@ static void qxl_calc_dumb_shadow(struct qxl_device *qdev, 
static int qxl_plane_prepare_fb(struct drm_plane *plane,

				struct drm_plane_state *new_state)

{

	struct qxl_device *qdev = plane->dev->dev_private;

	struct qxl_device *qdev = to_qxl(plane->dev);

	struct drm_gem_object *obj;

	struct qxl_bo *user_bo;

	struct qxl_surface surf;
@@ -923,7 +923,7 @@ static int qdev_crtc_init(struct drm_device *dev, int crtc_id) 
{

	struct qxl_crtc *qxl_crtc;

	struct drm_plane *primary, *cursor;

	struct qxl_device *qdev = dev->dev_private;

	struct qxl_device *qdev = to_qxl(dev);

	int r;



	qxl_crtc = kzalloc(sizeof(struct qxl_crtc), GFP_KERNEL);
@@ -965,7 +965,7 @@ free_mem: 
static int qxl_conn_get_modes(struct drm_connector *connector)

{

	struct drm_device *dev = connector->dev;

	struct qxl_device *qdev = dev->dev_private;

	struct qxl_device *qdev = to_qxl(dev);

	struct qxl_output *output = drm_connector_to_qxl_output(connector);

	unsigned int pwidth = 1024;

	unsigned int pheight = 768;
@@ -991,7 +991,7 @@ static enum drm_mode_status qxl_conn_mode_valid(struct drm_connector *connector, 
			       struct drm_display_mode *mode)

{

	struct drm_device *ddev = connector->dev;

	struct qxl_device *qdev = ddev->dev_private;

	struct qxl_device *qdev = to_qxl(ddev);



	if (qxl_check_mode(qdev, mode->hdisplay, mode->vdisplay) != 0)

		return MODE_BAD;
@@ -1021,7 +1021,7 @@ static enum drm_connector_status qxl_conn_detect( 
	struct qxl_output *output =

		drm_connector_to_qxl_output(connector);

	struct drm_device *ddev = connector->dev;

	struct qxl_device *qdev = ddev->dev_private;

	struct qxl_device *qdev = to_qxl(ddev);

	bool connected = false;



	/* The first monitor is always connected */
@@ -1071,7 +1071,7 @@ static int qxl_mode_create_hotplug_mode_update_property(struct qxl_device *qdev) 


static int qdev_output_init(struct drm_device *dev, int num_output)

{

	struct qxl_device *qdev = dev->dev_private;

	struct qxl_device *qdev = to_qxl(dev);

	struct qxl_output *qxl_output;

	struct drm_connector *connector;

	struct drm_encoder *encoder;

drivers/gpu/drm/qxl/qxl_drv.c

+4 −4
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ disable_pci: 


static void qxl_drm_release(struct drm_device *dev)

{

	struct qxl_device *qdev = dev->dev_private;

	struct qxl_device *qdev = to_qxl(dev);



	/*

	 * TODO: qxl_device_fini() call should be in qxl_pci_remove(),
@@ -164,7 +164,7 @@ DEFINE_DRM_GEM_FOPS(qxl_fops); 
static int qxl_drm_freeze(struct drm_device *dev)

{

	struct pci_dev *pdev = dev->pdev;

	struct qxl_device *qdev = dev->dev_private;

	struct qxl_device *qdev = to_qxl(dev);

	int ret;



	ret = drm_mode_config_helper_suspend(dev);
@@ -186,7 +186,7 @@ static int qxl_drm_freeze(struct drm_device *dev) 


static int qxl_drm_resume(struct drm_device *dev, bool thaw)

{

	struct qxl_device *qdev = dev->dev_private;

	struct qxl_device *qdev = to_qxl(dev);



	qdev->ram_header->int_mask = QXL_INTERRUPT_MASK;

	if (!thaw) {
@@ -245,7 +245,7 @@ static int qxl_pm_restore(struct device *dev) 
{

	struct pci_dev *pdev = to_pci_dev(dev);

	struct drm_device *drm_dev = pci_get_drvdata(pdev);

	struct qxl_device *qdev = drm_dev->dev_private;

	struct qxl_device *qdev = to_qxl(drm_dev);



	qxl_io_reset(qdev);

	return qxl_drm_resume(drm_dev, false);

drivers/gpu/drm/qxl/qxl_drv.h

+2 −2
Original line number Diff line number Diff line
@@ -192,8 +192,6 @@ struct qxl_debugfs { 


int qxl_debugfs_fence_init(struct qxl_device *rdev);



struct qxl_device;



struct qxl_device {

	struct drm_device ddev;
@@ -273,6 +271,8 @@ struct qxl_device { 
	int monitors_config_height;

};



#define to_qxl(dev) container_of(dev, struct qxl_device, ddev)



extern const struct drm_ioctl_desc qxl_ioctls[];

extern int qxl_max_ioctl;

drivers/gpu/drm/qxl/qxl_dumb.c

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ int qxl_mode_dumb_create(struct drm_file *file_priv, 
			    struct drm_device *dev,

			    struct drm_mode_create_dumb *args)

{

	struct qxl_device *qdev = dev->dev_private;

	struct qxl_device *qdev = to_qxl(dev);

	struct qxl_bo *qobj;

	uint32_t handle;

	int r;

CRA Git | Maintained and supported by SUSTech CRA and CCSE