Commit b5893ffc authored by Janusz Krzysztofik's avatar Janusz Krzysztofik Committed by Chris Wilson
Browse files

drm/i915: Drop extern qualifiers from header function prototypes 



Follow dim checkpatch recommendation so it doesn't complain on that now
and again on header file modifications.

v2: drop testing leftover (Chris)

Signed-off-by: default avatarJanusz Krzysztofik <janusz.krzysztofik@linux.intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190712112429.740-2-janusz.krzysztofik@linux.intel.com
parent 6239901c

drivers/gpu/drm/i915/gem/i915_gem_object.h

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ i915_gem_object_lookup(struct drm_file *file, u32 handle) 
}



__deprecated

extern struct drm_gem_object *

struct drm_gem_object *

drm_gem_object_lookup(struct drm_file *file, u32 handle);



__attribute__((nonnull))

drivers/gpu/drm/i915/gvt/gtt.h

+7 −6
Original line number Diff line number Diff line
@@ -205,17 +205,18 @@ struct intel_vgpu_gtt { 
	struct intel_vgpu_scratch_pt scratch_pt[GTT_TYPE_MAX];

};



extern int intel_vgpu_init_gtt(struct intel_vgpu *vgpu);

extern void intel_vgpu_clean_gtt(struct intel_vgpu *vgpu);

int intel_vgpu_init_gtt(struct intel_vgpu *vgpu);

void intel_vgpu_clean_gtt(struct intel_vgpu *vgpu);

void intel_vgpu_reset_ggtt(struct intel_vgpu *vgpu, bool invalidate_old);

void intel_vgpu_invalidate_ppgtt(struct intel_vgpu *vgpu);



extern int intel_gvt_init_gtt(struct intel_gvt *gvt);

int intel_gvt_init_gtt(struct intel_gvt *gvt);

void intel_vgpu_reset_gtt(struct intel_vgpu *vgpu);

extern void intel_gvt_clean_gtt(struct intel_gvt *gvt);

void intel_gvt_clean_gtt(struct intel_gvt *gvt);



extern struct intel_vgpu_mm *intel_gvt_find_ppgtt_mm(struct intel_vgpu *vgpu,

		int page_table_level, void *root_entry);

struct intel_vgpu_mm *intel_gvt_find_ppgtt_mm(struct intel_vgpu *vgpu,

					      int page_table_level,

					      void *root_entry);



struct intel_vgpu_oos_page {

	struct intel_vgpu_ppgtt_spt *spt;

drivers/gpu/drm/i915/i915_drv.h

+22 −25
Original line number Diff line number Diff line
@@ -2390,19 +2390,17 @@ __i915_printk(struct drm_i915_private *dev_priv, const char *level, 
	__i915_printk(dev_priv, KERN_ERR, fmt, ##__VA_ARGS__)



#ifdef CONFIG_COMPAT

extern long i915_compat_ioctl(struct file *filp, unsigned int cmd,

			      unsigned long arg);

long i915_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg);

#else

#define i915_compat_ioctl NULL

#endif

extern const struct dev_pm_ops i915_pm_ops;



extern int i915_driver_load(struct pci_dev *pdev,

			    const struct pci_device_id *ent);

extern void i915_driver_unload(struct drm_device *dev);

int i915_driver_load(struct pci_dev *pdev, const struct pci_device_id *ent);

void i915_driver_unload(struct drm_device *dev);



extern void intel_engine_init_hangcheck(struct intel_engine_cs *engine);

extern void intel_hangcheck_init(struct drm_i915_private *dev_priv);

void intel_engine_init_hangcheck(struct intel_engine_cs *engine);

void intel_hangcheck_init(struct drm_i915_private *dev_priv);

int vlv_force_gfx_clock(struct drm_i915_private *dev_priv, bool on);



u32 intel_calculate_mcr_s_ss_select(struct drm_i915_private *dev_priv);
@@ -2672,14 +2670,14 @@ int intel_engine_cmd_parser(struct intel_engine_cs *engine, 
			    bool is_master);



/* i915_perf.c */

extern void i915_perf_init(struct drm_i915_private *dev_priv);

extern void i915_perf_fini(struct drm_i915_private *dev_priv);

extern void i915_perf_register(struct drm_i915_private *dev_priv);

extern void i915_perf_unregister(struct drm_i915_private *dev_priv);

void i915_perf_init(struct drm_i915_private *dev_priv);

void i915_perf_fini(struct drm_i915_private *dev_priv);

void i915_perf_register(struct drm_i915_private *dev_priv);

void i915_perf_unregister(struct drm_i915_private *dev_priv);



/* i915_suspend.c */

extern int i915_save_state(struct drm_i915_private *dev_priv);

extern int i915_restore_state(struct drm_i915_private *dev_priv);

int i915_save_state(struct drm_i915_private *dev_priv);

int i915_restore_state(struct drm_i915_private *dev_priv);



/* i915_sysfs.c */

void i915_setup_sysfs(struct drm_i915_private *dev_priv);
@@ -2693,22 +2691,21 @@ mkwrite_device_info(struct drm_i915_private *dev_priv) 
}



/* modesetting */

extern void intel_modeset_init_hw(struct drm_device *dev);

extern int intel_modeset_init(struct drm_device *dev);

extern void intel_modeset_cleanup(struct drm_device *dev);

extern int intel_modeset_vga_set_state(struct drm_i915_private *dev_priv,

				       bool state);

extern void intel_display_resume(struct drm_device *dev);

extern void i915_redisable_vga(struct drm_i915_private *dev_priv);

extern void i915_redisable_vga_power_on(struct drm_i915_private *dev_priv);

extern void intel_init_pch_refclk(struct drm_i915_private *dev_priv);

void intel_modeset_init_hw(struct drm_device *dev);

int intel_modeset_init(struct drm_device *dev);

void intel_modeset_cleanup(struct drm_device *dev);

int intel_modeset_vga_set_state(struct drm_i915_private *dev_priv, bool state);

void intel_display_resume(struct drm_device *dev);

void i915_redisable_vga(struct drm_i915_private *dev_priv);

void i915_redisable_vga_power_on(struct drm_i915_private *dev_priv);

void intel_init_pch_refclk(struct drm_i915_private *dev_priv);



int i915_reg_read_ioctl(struct drm_device *dev, void *data,

			struct drm_file *file);



extern struct intel_display_error_state *

struct intel_display_error_state *

intel_display_capture_error_state(struct drm_i915_private *dev_priv);

extern void intel_display_print_error_state(struct drm_i915_error_state_buf *e,

void intel_display_print_error_state(struct drm_i915_error_state_buf *e,

				     struct intel_display_error_state *error);



#define __I915_REG_OP(op__, dev_priv__, ...) \

drivers/gpu/drm/i915/i915_irq.h

+2 −2
Original line number Diff line number Diff line
@@ -13,8 +13,8 @@ 
struct drm_i915_private;

struct intel_crtc;



extern void intel_irq_init(struct drm_i915_private *dev_priv);

extern void intel_irq_fini(struct drm_i915_private *dev_priv);

void intel_irq_init(struct drm_i915_private *dev_priv);

void intel_irq_fini(struct drm_i915_private *dev_priv);

int intel_irq_install(struct drm_i915_private *dev_priv);

void intel_irq_uninstall(struct drm_i915_private *dev_priv);

drivers/gpu/drm/i915/oa/i915_oa_bdw.h

+1 −1
Original line number Diff line number Diff line
@@ -10,6 +10,6 @@ 
#ifndef __I915_OA_BDW_H__

#define __I915_OA_BDW_H__



extern void i915_perf_load_test_config_bdw(struct drm_i915_private *dev_priv);

void i915_perf_load_test_config_bdw(struct drm_i915_private *dev_priv);



#endif