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

Commit a55ecbe3 authored by Damien Lespiau's avatar Damien Lespiau Committed by Daniel Vetter
Browse files

drm/i915: Make intel_format_to_fourcc() static 



v2: Fix conflict caused by the introduction of struct intel_crtc_state

Reviewed-By: Tvrtko Ursulin <tvrtko.ursulin@intel.com> (v1)
Signed-off-by: default avatarDamien Lespiau <damien.lespiau@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 2844a921

drivers/gpu/drm/i915/intel_display.c

+1 −1
Original line number Diff line number Diff line
@@ -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:

drivers/gpu/drm/i915/intel_drv.h

+0 −1
Original line number Diff line number Diff line
@@ -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);