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

Commit 6e86e041 authored by Francisco Jerez's avatar Francisco Jerez Committed by Ben Skeggs
Browse files

drm/nouveau: Fix a couple of sparse warnings. 



Signed-off-by: default avatarFrancisco Jerez <currojerez@riseup.net>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 2ed06b7d

drivers/gpu/drm/nouveau/nouveau_acpi.c

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ static const char nouveau_dsm_muid[] = { 
	0xB3, 0x4D, 0x7E, 0x5F, 0xEA, 0x12, 0x9F, 0xD4,

};



static int nouveau_dsm(acpi_handle handle, int func, int arg, int *result)

static int nouveau_dsm(acpi_handle handle, int func, int arg, uint32_t *result)

{

	struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL };

	struct acpi_object_list input;

drivers/gpu/drm/nouveau/nouveau_connector.c

+3 −4
Original line number Diff line number Diff line
@@ -585,7 +585,6 @@ nouveau_connector_get_modes(struct drm_connector *connector) 
	struct drm_nouveau_private *dev_priv = dev->dev_private;

	struct nouveau_connector *nv_connector = nouveau_connector(connector);

	struct nouveau_encoder *nv_encoder = nv_connector->detected_encoder;

	struct drm_display_mode mode;

	int ret = 0;



	/* destroy the native mode, the attached monitor could have changed.
@@ -600,9 +599,9 @@ nouveau_connector_get_modes(struct drm_connector *connector) 
	else

	if (nv_encoder->dcb->type == OUTPUT_LVDS &&

	    (nv_encoder->dcb->lvdsconf.use_straps_for_mode ||

	     dev_priv->vbios.fp_no_ddc) &&

	    nouveau_bios_fp_mode(dev, &mode)) {

		nv_connector->native_mode = drm_mode_duplicate(dev, &mode);

	     dev_priv->vbios.fp_no_ddc) && nouveau_bios_fp_mode(dev, NULL)) {

		nv_connector->native_mode = drm_mode_create(dev);

		nouveau_bios_fp_mode(dev, nv_connector->native_mode);

	}



	/* Find the native mode if this is a digital panel, if we didn't

drivers/gpu/drm/nouveau/nouveau_drv.c

+0 −1
Original line number Diff line number Diff line
@@ -317,7 +317,6 @@ nouveau_pci_resume(struct pci_dev *pdev) 


	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {

		struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);

		int ret;



		ret = nouveau_bo_pin(nv_crtc->cursor.nvbo, TTM_PL_FLAG_VRAM);

		if (!ret)

drivers/gpu/drm/nouveau/nouveau_fbcon.c

+1 −1
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ nouveau_fbcon_output_poll_changed(struct drm_device *dev) 
	drm_fb_helper_hotplug_event(&dev_priv->nfbdev->helper);

}



int

static int

nouveau_fbcon_destroy(struct drm_device *dev, struct nouveau_fbdev *nfbdev)

{

	struct nouveau_framebuffer *nouveau_fb = &nfbdev->nouveau_fb;

drivers/gpu/drm/nouveau/nouveau_gem.c

+1 −1
Original line number Diff line number Diff line
@@ -577,7 +577,7 @@ nouveau_gem_ioctl_pushbuf(struct drm_device *dev, void *data, 
	struct drm_nouveau_gem_pushbuf_bo *bo;

	struct nouveau_channel *chan;

	struct validate_op op;

	struct nouveau_fence *fence = 0;

	struct nouveau_fence *fence = NULL;

	int i, j, ret = 0, do_reloc = 0;



	NOUVEAU_CHECK_INITIALISED_WITH_RETURN;