drm/i915: Make intel_format_to_fourcc() static

Damien Lespiau · danvet · commit a55ecbe33984 · 2015-01-27T09:51:03.000+01:00
v2: Fix conflict caused by the introduction of struct intel_crtc_state

Reviewed-By: Tvrtko Ursulin &lt;tvrtko.ursulin@intel.com&gt; (v1)
Signed-off-by: Damien Lespiau &lt;damien.lespiau@intel.com&gt;
Signed-off-by: Daniel Vetter &lt;daniel.vetter@ffwll.ch&gt;
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
@@ -2316,7 +2316,7 @@ unsigned long intel_gen4_compute_page_offset(int *x, int *y,
 	}
 }
 
-int intel_format_to_fourcc(int format)
+static int intel_format_to_fourcc(int format)
 {
 	switch (format) {
 	case DISPPLANE_8BPP:
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
@@ -991,7 +991,6 @@ enum intel_display_power_domain
 intel_display_port_power_domain(struct intel_encoder *intel_encoder);
 void intel_mode_from_pipe_config(struct drm_display_mode *mode,
 				 struct intel_crtc_state *pipe_config);
-int intel_format_to_fourcc(int format);
 void intel_crtc_wait_for_pending_flips(struct drm_crtc *crtc);
 void intel_modeset_preclose(struct drm_device *dev, struct drm_file *file);
 

Original file line number	Diff line number	Diff line change
`@@ -2316,7 +2316,7 @@ unsigned long intel_gen4_compute_page_offset(int x, int y,`
`2316`	`2316`	`}`
`2317`	`2317`	`}`
`2318`	`2318`
`2319`		`-int intel_format_to_fourcc(int format)`
	`2319`	`+static int intel_format_to_fourcc(int format)`
`2320`	`2320`	`{`
`2321`	`2321`	`switch (format) {`
`2322`	`2322`	`case DISPPLANE_8BPP:`