redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

drm/i915: [sparse] trivial sparse fixes 

This should contain all the changes which require no thought to make
sparse happy.

Signed-off-by: Ben Widawsky <benjamin.widawsky@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
wifi-calibration
Ben Widawsky 2012-04-16 14:07:40 -07:00 committed by Daniel Vetter
parent df0323c42a
commit c43b563403
9 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/i915/i915_debugfs.c
View File

@ -1832,7 +1832,7 @@ static int i915_forcewake_open(struct inode *inode, struct file *file)
return 0; return 0;
} }
int i915_forcewake_release(struct inode *inode, struct file *file) static int i915_forcewake_release(struct inode *inode, struct file *file)
{ {
struct drm_device *dev = inode->i_private; struct drm_device *dev = inode->i_private;
struct drm_i915_private *dev_priv = dev->dev_private; struct drm_i915_private *dev_priv = dev->dev_private;

2
drivers/gpu/drm/i915/i915_drv.h
View File

@ -1128,8 +1128,10 @@ extern void i915_driver_preclose(struct drm_device *dev,
extern void i915_driver_postclose(struct drm_device *dev, extern void i915_driver_postclose(struct drm_device *dev,
struct drm_file *file_priv); struct drm_file *file_priv);
extern int i915_driver_device_is_agp(struct drm_device * dev); extern int i915_driver_device_is_agp(struct drm_device * dev);
#ifdef CONFIG_COMPAT
extern long i915_compat_ioctl(struct file *filp, unsigned int cmd, extern long i915_compat_ioctl(struct file *filp, unsigned int cmd,
unsigned long arg); unsigned long arg);
#endif
extern int i915_emit_box(struct drm_device *dev, extern int i915_emit_box(struct drm_device *dev,
struct drm_clip_rect *box, struct drm_clip_rect *box,
int DR1, int DR4); int DR1, int DR4);

5
drivers/gpu/drm/i915/i915_ioc32.c
View File

@ -34,6 +34,7 @@
#include "drmP.h" #include "drmP.h"
#include "drm.h" #include "drm.h"
#include "i915_drm.h" #include "i915_drm.h"
#include "i915_drv.h"
typedef struct _drm_i915_batchbuffer32 { typedef struct _drm_i915_batchbuffer32 {
int start; /* agp offset */ int start; /* agp offset */
@ -181,7 +182,7 @@ static int compat_i915_alloc(struct file *file, unsigned int cmd,
(unsigned long)request); (unsigned long)request);
} }
drm_ioctl_compat_t *i915_compat_ioctls[] = { static drm_ioctl_compat_t *i915_compat_ioctls[] = {
[DRM_I915_BATCHBUFFER] = compat_i915_batchbuffer, [DRM_I915_BATCHBUFFER] = compat_i915_batchbuffer,
[DRM_I915_CMDBUFFER] = compat_i915_cmdbuffer, [DRM_I915_CMDBUFFER] = compat_i915_cmdbuffer,
[DRM_I915_GETPARAM] = compat_i915_getparam, [DRM_I915_GETPARAM] = compat_i915_getparam,
@ -189,6 +190,7 @@ drm_ioctl_compat_t *i915_compat_ioctls[] = {
[DRM_I915_ALLOC] = compat_i915_alloc [DRM_I915_ALLOC] = compat_i915_alloc
}; };
#ifdef CONFIG_COMPAT
/** /**
* Called whenever a 32-bit process running under a 64-bit kernel * Called whenever a 32-bit process running under a 64-bit kernel
* performs an ioctl on /dev/dri/card<n>. * performs an ioctl on /dev/dri/card<n>.
@ -217,3 +219,4 @@ long i915_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
return ret; return ret;
} }
#endif

2
drivers/gpu/drm/i915/i915_trace_points.c
View File

@ -7,5 +7,7 @@
#include "i915_drv.h" #include "i915_drv.h"
#ifndef __CHECKER__
#define CREATE_TRACE_POINTS #define CREATE_TRACE_POINTS
#include "i915_trace.h" #include "i915_trace.h"
#endif

1
drivers/gpu/drm/i915/intel_acpi.c
View File

@ -9,6 +9,7 @@
#include <acpi/acpi_drivers.h> #include <acpi/acpi_drivers.h>
#include "drmP.h" #include "drmP.h"
#include "i915_drv.h"
#define INTEL_DSM_REVISION_ID 1 /* For Calpella anyway... */ #define INTEL_DSM_REVISION_ID 1 /* For Calpella anyway... */

2
drivers/gpu/drm/i915/intel_display.c
View File

@ -9503,7 +9503,7 @@ struct intel_quirk {
void (*hook)(struct drm_device *dev); void (*hook)(struct drm_device *dev);
}; };
struct intel_quirk intel_quirks[] = { static struct intel_quirk intel_quirks[] = {
/* HP Mini needs pipe A force quirk (LP: #322104) */ /* HP Mini needs pipe A force quirk (LP: #322104) */
{ 0x27ae, 0x103c, 0x361a, quirk_pipea_force }, { 0x27ae, 0x103c, 0x361a, quirk_pipea_force },

2
drivers/gpu/drm/i915/intel_fb.c
View File

@ -94,7 +94,7 @@ static int intelfb_create(struct intel_fbdev *ifbdev,
mutex_lock(&dev->struct_mutex); mutex_lock(&dev->struct_mutex);
/* Flush everything out, we'll be doing GTT only from now on */ /* Flush everything out, we'll be doing GTT only from now on */
ret = intel_pin_and_fence_fb_obj(dev, obj, false); ret = intel_pin_and_fence_fb_obj(dev, obj, NULL);
if (ret) { if (ret) {
DRM_ERROR("failed to pin fb: %d\n", ret); DRM_ERROR("failed to pin fb: %d\n", ret);
goto out_unref; goto out_unref;

4
drivers/gpu/drm/i915/intel_ringbuffer.c
View File

@ -891,8 +891,8 @@ err:
return ret; return ret;
} }
int intel_init_ring_buffer(struct drm_device *dev, static int intel_init_ring_buffer(struct drm_device *dev,
struct intel_ring_buffer *ring) struct intel_ring_buffer *ring)
{ {
struct drm_i915_gem_object *obj; struct drm_i915_gem_object *obj;
int ret; int ret;

2
drivers/gpu/drm/i915/intel_sdvo.c
View File

@ -1258,7 +1258,7 @@ intel_sdvo_get_analog_edid(struct drm_connector *connector)
dev_priv->crt_ddc_pin)); dev_priv->crt_ddc_pin));
} }
enum drm_connector_status static enum drm_connector_status
intel_sdvo_tmds_sink_detect(struct drm_connector *connector) intel_sdvo_tmds_sink_detect(struct drm_connector *connector)
{ {
struct intel_sdvo *intel_sdvo = intel_attached_sdvo(connector); struct intel_sdvo *intel_sdvo = intel_attached_sdvo(connector);