Commit 46d12f91 authored by Dave Airlie's avatar Dave Airlie Committed by Jani Nikula
Browse files

drm/i915: migrate skl planes code new file (v5) 



Rework the plane init calls to do the gen test one level higher.

Rework some of the plane helpers so they can live in new file,
there is still some scope to clean up the plane/fb interactions
later.

v2: drop atomic code back, rename file to Ville suggestions,
add header file.
v3: move scaler bits back
v4: drop wrong new includes (Ville)
v5: integrate the ccs gen12 changes
v6: fix unrelated code movement (Ville)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
[Jani: fixed up sparse warnings.]
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reported-by: default avatarkernel test robot <lkp@intel.com>
Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/4e88a5c6b9ab3b93cc2b6c7d78c26ae86f6abbd0.1612536383.git.jani.nikula@intel.com
parent 3c4442aa

drivers/gpu/drm/i915/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -223,7 +223,8 @@ i915-y += \ 
	display/intel_sprite.o \

	display/intel_tc.o \

	display/intel_vga.o \

	display/i9xx_plane.o

	display/i9xx_plane.o \

	display/skl_universal_plane.o

i915-$(CONFIG_ACPI) += \

	display/intel_acpi.o \

	display/intel_opregion.o

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

+0 −4
Original line number Diff line number Diff line
@@ -743,10 +743,6 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe) 
	int num_formats;

	int ret, zpos;



	if (INTEL_GEN(dev_priv) >= 9)

		return skl_universal_plane_create(dev_priv, pipe,

						  PLANE_PRIMARY);



	plane = intel_plane_alloc();

	if (IS_ERR(plane))

		return plane;

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

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

#include "intel_panel.h"

#include "intel_vdsc.h"

#include "skl_universal_plane.h"



static int header_credits_available(struct drm_i915_private *dev_priv,

				    enum transcoder dsi_trans)

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

+11 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include "intel_pipe_crc.h"

#include "intel_sprite.h"

#include "i9xx_plane.h"

#include "skl_universal_plane.h"



static void assert_vblank_disabled(struct drm_crtc *crtc)

{
@@ -243,6 +244,10 @@ int intel_crtc_init(struct drm_i915_private *dev_priv, enum pipe pipe) 
	crtc->pipe = pipe;

	crtc->num_scalers = RUNTIME_INFO(dev_priv)->num_scalers[pipe];



	if (INTEL_GEN(dev_priv) >= 9)

		primary = skl_universal_plane_create(dev_priv, pipe,

						     PLANE_PRIMARY);

	else

		primary = intel_primary_plane_create(dev_priv, pipe);

	if (IS_ERR(primary)) {

		ret = PTR_ERR(primary);
@@ -253,6 +258,10 @@ int intel_crtc_init(struct drm_i915_private *dev_priv, enum pipe pipe) 
	for_each_sprite(dev_priv, pipe, sprite) {

		struct intel_plane *plane;



		if (INTEL_GEN(dev_priv) >= 9)

			plane = skl_universal_plane_create(dev_priv, pipe,

							   PLANE_SPRITE0 + sprite);

		else

			plane = intel_sprite_plane_create(dev_priv, pipe, sprite);

		if (IS_ERR(plane)) {

			ret = PTR_ERR(plane);

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

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

#include "intel_vdsc.h"

#include "intel_vrr.h"

#include "skl_universal_plane.h"



static const u8 index_to_dp_signal_levels[] = {

	[0] = DP_TRAIN_VOLTAGE_SWING_LEVEL_0 | DP_TRAIN_PRE_EMPH_LEVEL_0,