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

Commit 67437680 authored by Paulo Zanoni's avatar Paulo Zanoni Committed by Daniel Vetter
Browse files

drm/i915: make intel_crtc_fb_gamma_{set, get} static 



By moving them to intel_fb.c.

Signed-off-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent d77e4531

drivers/gpu/drm/i915/intel_display.c

+0 −21
Original line number Original line Diff line number Diff line
@@ -7102,27 +7102,6 @@ static int intel_crtc_cursor_move(struct drm_crtc *crtc, int x, int y) 
	return 0;

	return 0;

}

}





/** Sets the color ramps on behalf of RandR */

void intel_crtc_fb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green,

				 u16 blue, int regno)

{

	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);



	intel_crtc->lut_r[regno] = red >> 8;

	intel_crtc->lut_g[regno] = green >> 8;

	intel_crtc->lut_b[regno] = blue >> 8;

}



void intel_crtc_fb_gamma_get(struct drm_crtc *crtc, u16 *red, u16 *green,

			     u16 *blue, int regno)

{

	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);



	*red = intel_crtc->lut_r[regno] << 8;

	*green = intel_crtc->lut_g[regno] << 8;

	*blue = intel_crtc->lut_b[regno] << 8;

}



static void intel_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,

static void intel_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,

				 u16 *blue, uint32_t start, uint32_t size)

				 u16 *blue, uint32_t start, uint32_t size)

{

{

drivers/gpu/drm/i915/intel_drv.h

+0 −4
Original line number Original line Diff line number Diff line
@@ -638,10 +638,6 @@ extern bool intel_get_load_detect_pipe(struct drm_connector *connector, 
				       struct intel_load_detect_pipe *old);

				       struct intel_load_detect_pipe *old);

extern void intel_release_load_detect_pipe(struct drm_connector *connector,

extern void intel_release_load_detect_pipe(struct drm_connector *connector,

					   struct intel_load_detect_pipe *old);

					   struct intel_load_detect_pipe *old);

extern void intel_crtc_fb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green,

				    u16 blue, int regno);

extern void intel_crtc_fb_gamma_get(struct drm_crtc *crtc, u16 *red, u16 *green,

				    u16 *blue, int regno);

extern int intel_pin_and_fence_fb_obj(struct drm_device *dev,

extern int intel_pin_and_fence_fb_obj(struct drm_device *dev,

				      struct drm_i915_gem_object *obj,

				      struct drm_i915_gem_object *obj,

				      struct intel_ring_buffer *pipelined);

				      struct intel_ring_buffer *pipelined);

drivers/gpu/drm/i915/intel_fb.c

+21 −0
Original line number Original line Diff line number Diff line
@@ -184,6 +184,27 @@ static int intelfb_create(struct drm_fb_helper *helper, 
	return ret;

	return ret;

}

}





/** Sets the color ramps on behalf of RandR */

static void intel_crtc_fb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green,

				    u16 blue, int regno)

{

	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);



	intel_crtc->lut_r[regno] = red >> 8;

	intel_crtc->lut_g[regno] = green >> 8;

	intel_crtc->lut_b[regno] = blue >> 8;

}



static void intel_crtc_fb_gamma_get(struct drm_crtc *crtc, u16 *red, u16 *green,

				    u16 *blue, int regno)

{

	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);



	*red = intel_crtc->lut_r[regno] << 8;

	*green = intel_crtc->lut_g[regno] << 8;

	*blue = intel_crtc->lut_b[regno] << 8;

}



static struct drm_fb_helper_funcs intel_fb_helper_funcs = {

static struct drm_fb_helper_funcs intel_fb_helper_funcs = {

	.gamma_set = intel_crtc_fb_gamma_set,

	.gamma_set = intel_crtc_fb_gamma_set,

	.gamma_get = intel_crtc_fb_gamma_get,

	.gamma_get = intel_crtc_fb_gamma_get,