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

Commit 12392a74 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: extract intel_atomic.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.

v2: fix sparse warnings on undeclared global functions

Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190429125331.32499-1-jani.nikula@intel.com
parent b9d0baaa

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

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

	i915_scheduler_types.h \

	i915_timeline_types.h \

	intel_atomic.h \

	intel_atomic_plane.h \

	intel_audio.h \

	intel_bios.h \

drivers/gpu/drm/i915/i915_gpu_error.c

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


#include "i915_drv.h"

#include "i915_gpu_error.h"

#include "intel_atomic.h"

#include "intel_overlay.h"



static inline const struct intel_engine_cs *

drivers/gpu/drm/i915/icl_dsi.c

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <drm/drm_atomic_helper.h>

#include <drm/drm_mipi_dsi.h>



#include "intel_atomic.h"

#include "intel_connector.h"

#include "intel_ddi.h"

#include "intel_dsi.h"

drivers/gpu/drm/i915/intel_atomic.c

+13 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <drm/drm_fourcc.h>

#include <drm/drm_plane_helper.h>



#include "intel_atomic.h"

#include "intel_drv.h"

#include "intel_hdcp.h"

#include "intel_sprite.h"
@@ -411,3 +412,15 @@ void intel_atomic_state_clear(struct drm_atomic_state *s) 
	drm_atomic_state_default_clear(&state->base);

	state->dpll_set = state->modeset = false;

}



struct intel_crtc_state *

intel_atomic_get_crtc_state(struct drm_atomic_state *state,

			    struct intel_crtc *crtc)

{

	struct drm_crtc_state *crtc_state;

	crtc_state = drm_atomic_get_crtc_state(state, &crtc->base);

	if (IS_ERR(crtc_state))

		return ERR_CAST(crtc_state);



	return to_intel_crtc_state(crtc_state);

}

drivers/gpu/drm/i915/intel_atomic.h

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

/*

 * Copyright © 2019 Intel Corporation

 */



#ifndef __INTEL_ATOMIC_H__

#define __INTEL_ATOMIC_H__



#include <linux/types.h>



struct drm_atomic_state;

struct drm_connector;

struct drm_connector_state;

struct drm_crtc;

struct drm_crtc_state;

struct drm_device;

struct drm_i915_private;

struct drm_property;

struct intel_crtc;

struct intel_crtc_state;



int intel_digital_connector_atomic_get_property(struct drm_connector *connector,

						const struct drm_connector_state *state,

						struct drm_property *property,

						u64 *val);

int intel_digital_connector_atomic_set_property(struct drm_connector *connector,

						struct drm_connector_state *state,

						struct drm_property *property,

						u64 val);

int intel_digital_connector_atomic_check(struct drm_connector *conn,

					 struct drm_connector_state *new_state);

struct drm_connector_state *

intel_digital_connector_duplicate_state(struct drm_connector *connector);



struct drm_crtc_state *intel_crtc_duplicate_state(struct drm_crtc *crtc);

void intel_crtc_destroy_state(struct drm_crtc *crtc,

			       struct drm_crtc_state *state);

struct drm_atomic_state *intel_atomic_state_alloc(struct drm_device *dev);

void intel_atomic_state_clear(struct drm_atomic_state *state);



struct intel_crtc_state *

intel_atomic_get_crtc_state(struct drm_atomic_state *state,

			    struct intel_crtc *crtc);



int intel_atomic_setup_scalers(struct drm_i915_private *dev_priv,

			       struct intel_crtc *intel_crtc,

			       struct intel_crtc_state *crtc_state);



#endif /* __INTEL_ATOMIC_H__ */