Commit 2c7676b6 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/display: split out hw state readout and sanitize 



Split out the modeset hardware state readout and sanitize, or state
setup, to a separate file.

Do some drive-by checkpatch fixes while at it.

v2: Rebase

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220617094817.3466584-1-jani.nikula@intel.com
parent d5929835

drivers/gpu/drm/i915/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -234,6 +234,7 @@ i915-y += \ 
	display/intel_hotplug.o \

	display/intel_lpe_audio.o \

	display/intel_modeset_verify.o \

	display/intel_modeset_setup.o \

	display/intel_overlay.o \

	display/intel_pch_display.o \

	display/intel_pch_refclk.o \

drivers/gpu/drm/i915/display/intel_display.c

+14 −725

File changed.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/i915/display/intel_display.h

+12 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ struct intel_initial_plane_config; 
struct intel_load_detect_pipe;

struct intel_plane;

struct intel_plane_state;

struct intel_power_domain_mask;

struct intel_remapped_info;

struct intel_rotation_info;

struct pci_dev;
@@ -563,6 +564,7 @@ bool intel_crtc_get_pipe_config(struct intel_crtc_state *crtc_state); 
bool intel_pipe_config_compare(const struct intel_crtc_state *current_config,

			       const struct intel_crtc_state *pipe_config,

			       bool fastset);

void intel_crtc_update_active_timings(const struct intel_crtc_state *crtc_state);



void intel_plane_destroy(struct drm_plane *plane);

void intel_enable_transcoder(const struct intel_crtc_state *new_crtc_state);
@@ -659,10 +661,16 @@ intel_get_crtc_new_encoder(const struct intel_atomic_state *state, 
			   const struct intel_crtc_state *crtc_state);

void intel_plane_disable_noatomic(struct intel_crtc *crtc,

				  struct intel_plane *plane);

void intel_set_plane_visible(struct intel_crtc_state *crtc_state,

			     struct intel_plane_state *plane_state,

			     bool visible);

void intel_plane_fixup_bitmasks(struct intel_crtc_state *crtc_state);



void intel_display_driver_register(struct drm_i915_private *i915);

void intel_display_driver_unregister(struct drm_i915_private *i915);



void intel_update_watermarks(struct drm_i915_private *i915);



/* modesetting */

bool intel_modeset_probe_defer(struct pci_dev *pdev);

void intel_modeset_init_hw(struct drm_i915_private *i915);
@@ -674,6 +682,10 @@ void intel_modeset_driver_remove_noirq(struct drm_i915_private *i915); 
void intel_modeset_driver_remove_nogem(struct drm_i915_private *i915);

void intel_display_resume(struct drm_device *dev);

int intel_modeset_all_pipes(struct intel_atomic_state *state);

void intel_modeset_get_crtc_power_domains(struct intel_crtc_state *crtc_state,

					  struct intel_power_domain_mask *old_domains);

void intel_modeset_put_crtc_power_domains(struct intel_crtc *crtc,

					  struct intel_power_domain_mask *domains);



/* modesetting asserts */

void assert_transcoder(struct drm_i915_private *dev_priv,

drivers/gpu/drm/i915/display/intel_modeset_setup.c

0 → 100644
+736 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/i915/display/intel_modeset_setup.h

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

/*

 * Copyright © 2022 Intel Corporation

 */



#ifndef __INTEL_MODESET_SETUP_H__

#define __INTEL_MODESET_SETUP_H__



struct drm_device;

struct drm_modeset_acquire_ctx;



void intel_modeset_setup_hw_state(struct drm_device *dev,

				  struct drm_modeset_acquire_ctx *ctx);



#endif /* __INTEL_MODESET_SETUP_H__ */