Commit 78c61320 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: extract intel_color.h from intel_drv.h 



It used to be handy that we only had a couple of headers, but over time
intel_drv.h has become unwieldy. Extract declarations to a separate
header file corresponding to the implementation module, clarifying the
modularity of the driver.

Ensure the new header is self-contained, and do so with minimal further
includes, using forward declarations as needed. Include the new header
only where needed, and sort the modified include directives while at it
and as needed.

No functional changes.

Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Acked-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/fe5928586b4ca538cc4bc99212c5b699e891c75e.1554461791.git.jani.nikula@intel.com
parent 55367a27

drivers/gpu/drm/i915/Makefile.header-test

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ header_test := \ 
	i915_scheduler_types.h \

	i915_timeline_types.h \

	intel_audio.h \

	intel_color.h \

	intel_connector.h \

	intel_context_types.h \

	intel_crt.h \

drivers/gpu/drm/i915/intel_color.c

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
 *

 */



#include "intel_color.h"

#include "intel_drv.h"



#define CTM_COEFF_SIGN	(1ULL << 63)

drivers/gpu/drm/i915/intel_color.h

0 → 100644
+17 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: MIT */

/*

 * Copyright © 2019 Intel Corporation

 */



#ifndef __INTEL_COLOR_H__

#define __INTEL_COLOR_H__



struct intel_crtc_state;

struct intel_crtc;



void intel_color_init(struct intel_crtc *crtc);

int intel_color_check(struct intel_crtc_state *crtc_state);

void intel_color_commit(const struct intel_crtc_state *crtc_state);

void intel_color_load_luts(const struct intel_crtc_state *crtc_state);



#endif /* __INTEL_COLOR_H__ */

drivers/gpu/drm/i915/intel_display.c

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 
#include "i915_gem_clflush.h"

#include "i915_reset.h"

#include "i915_trace.h"

#include "intel_color.h"

#include "intel_crt.h"

#include "intel_ddi.h"

#include "intel_drv.h"

drivers/gpu/drm/i915/intel_drv.h

+0 −6
Original line number Diff line number Diff line
@@ -2419,12 +2419,6 @@ int intel_plane_atomic_check_with_state(const struct intel_crtc_state *old_crtc_ 
					const struct intel_plane_state *old_plane_state,

					struct intel_plane_state *intel_state);



/* intel_color.c */

void intel_color_init(struct intel_crtc *crtc);

int intel_color_check(struct intel_crtc_state *crtc_state);

void intel_color_commit(const struct intel_crtc_state *crtc_state);

void intel_color_load_luts(const struct intel_crtc_state *crtc_state);



/* intel_lspcon.c */

bool lspcon_init(struct intel_digital_port *intel_dig_port);

void lspcon_resume(struct intel_lspcon *lspcon);

CRA Git | Maintained and supported by SUSTech CRA and CCSE