Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d01f1f5 authored by Dave Airlie's avatar Dave Airlie
Browse files

drm/qxl: make lots of things static. 



/usr/lib/gcc/x86_64-linux-gnu/4.7/include/stddef.h:414:9: sparse: preprocessor token offsetof redefined
include/linux/stddef.h:17:9: this was the original definition
>> drivers/gpu/drm/qxl/qxl_drv.c:49:5: sparse: symbol 'qxl_modeset' was not declared. Should it be static?

Reported-by: kbuild test robot.
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent dea14dfa

drivers/gpu/drm/qxl/qxl_cmd.c

+3 −20
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ int qxl_ring_push(struct qxl_ring *ring, 
	return 0;

}



bool qxl_ring_pop(struct qxl_ring *ring,

static bool qxl_ring_pop(struct qxl_ring *ring,

			 void *element)

{

	volatile struct qxl_ring_header *header = &(ring->ring->header);
@@ -169,23 +169,6 @@ bool qxl_ring_pop(struct qxl_ring *ring, 
	return true;

}



void qxl_ring_wait_idle(struct qxl_ring *ring)

{

	struct qxl_ring_header *header = &(ring->ring->header);

	unsigned long flags;



	spin_lock_irqsave(&ring->lock, flags);

	if (ring->ring->header.cons < ring->ring->header.prod) {

		header->notify_on_cons = header->prod;

		mb();

		spin_unlock_irqrestore(&ring->lock, flags);

		wait_event_interruptible(*ring->push_event,

					 qxl_check_idle(ring));

		spin_lock_irqsave(&ring->lock, flags);

	}

	spin_unlock_irqrestore(&ring->lock, flags);

}



int

qxl_push_command_ring_release(struct qxl_device *qdev, struct qxl_release *release,

			      uint32_t type, bool interruptible)
@@ -609,7 +592,7 @@ retry: 
	return ret;

}



void qxl_surface_evict_locked(struct qxl_device *qdev, struct qxl_bo *surf, bool do_update_area)

static void qxl_surface_evict_locked(struct qxl_device *qdev, struct qxl_bo *surf, bool do_update_area)

{

	/* no need to update area if we are just freeing the surface normally */

	if (do_update_area)

drivers/gpu/drm/qxl/qxl_display.c

+9 −9
Original line number Diff line number Diff line
@@ -413,7 +413,7 @@ static void qxl_user_framebuffer_destroy(struct drm_framebuffer *fb) 
	kfree(qxl_fb);

}



int qxl_framebuffer_surface_dirty(struct drm_framebuffer *fb,

static int qxl_framebuffer_surface_dirty(struct drm_framebuffer *fb,

					 struct drm_file *file_priv,

					 unsigned flags, unsigned color,

					 struct drm_clip_rect *clips,
@@ -619,7 +619,7 @@ static void qxl_crtc_commit(struct drm_crtc *crtc) 
	DRM_DEBUG("\n");

}



void qxl_crtc_load_lut(struct drm_crtc *crtc)

static void qxl_crtc_load_lut(struct drm_crtc *crtc)

{

	DRM_DEBUG("\n");

}
@@ -633,7 +633,7 @@ static const struct drm_crtc_helper_funcs qxl_crtc_helper_funcs = { 
	.load_lut = qxl_crtc_load_lut,

};



int qdev_crtc_init(struct drm_device *dev, int num_crtc)

static int qdev_crtc_init(struct drm_device *dev, int num_crtc)

{

	struct qxl_crtc *qxl_crtc;
@@ -764,7 +764,7 @@ static int qxl_conn_mode_valid(struct drm_connector *connector, 
	return MODE_OK;

}



struct drm_encoder *qxl_best_encoder(struct drm_connector *connector)

static struct drm_encoder *qxl_best_encoder(struct drm_connector *connector)

{

	struct qxl_output *qxl_output =

		drm_connector_to_qxl_output(connector);
@@ -855,7 +855,7 @@ static const struct drm_encoder_funcs qxl_enc_funcs = { 
	.destroy = qxl_enc_destroy,

};



int qdev_output_init(struct drm_device *dev, int num_output)

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

{

	struct qxl_output *qxl_output;

	struct drm_connector *connector;

drivers/gpu/drm/qxl/qxl_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ static DEFINE_PCI_DEVICE_TABLE(pciidlist) = { 
};

MODULE_DEVICE_TABLE(pci, pciidlist);



int qxl_modeset = -1;

static int qxl_modeset = -1;



MODULE_PARM_DESC(modeset, "Disable/Enable modesetting");

module_param_named(modeset, qxl_modeset, int, 0400);

drivers/gpu/drm/qxl/qxl_fb.c

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ static void qxl_deferred_io(struct fb_info *info, 
};





struct fb_deferred_io qxl_defio = {

static struct fb_deferred_io qxl_defio = {

	.delay		= QXL_DIRTY_DELAY,

	.deferred_io	= qxl_deferred_io,

};

drivers/gpu/drm/qxl/qxl_gem.c

+0 −29
Original line number Diff line number Diff line
@@ -127,35 +127,6 @@ void qxl_gem_object_unpin(struct drm_gem_object *obj) 
	}

}



int qxl_gem_set_domain(struct drm_gem_object *gobj,

			  uint32_t rdomain, uint32_t wdomain)

{

	struct qxl_bo *qobj;

	uint32_t domain;

	int r;



	/* FIXME: reeimplement */

	qobj = gobj->driver_private;

	/* work out where to validate the buffer to */

	domain = wdomain;

	if (!domain)

		domain = rdomain;

	if (!domain) {

		/* Do nothings */

		pr_warn("Set domain withou domain !\n");

		return 0;

	}

	if (domain == QXL_GEM_DOMAIN_CPU) {

		/* Asking for cpu access wait for object idle */

		r = qxl_bo_wait(qobj, NULL, false);

		if (r) {

			pr_err("Failed to wait for object !\n");

			return r;

		}

	}

	return 0;

}



int qxl_gem_object_open(struct drm_gem_object *obj, struct drm_file *file_priv)

{

	return 0;