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

Commit 69f44d3b authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: move ranges to intel_display.c 



Reduce clutter from intel_drv.h with the minimal change.

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/2c9248b50e620e95d85b8b9252d020a547c9474a.1556809195.git.jani.nikula@intel.com
parent 2162e103

drivers/gpu/drm/i915/intel_display.c

+15 −0
Original line number Diff line number Diff line
@@ -5062,6 +5062,21 @@ u16 skl_scaler_calc_phase(int sub, int scale, bool chroma_cosited) 
	return ((phase >> 2) & PS_PHASE_MASK) | trip;

}



#define SKL_MIN_SRC_W 8

#define SKL_MAX_SRC_W 4096

#define SKL_MIN_SRC_H 8

#define SKL_MAX_SRC_H 4096

#define SKL_MIN_DST_W 8

#define SKL_MAX_DST_W 4096

#define SKL_MIN_DST_H 8

#define SKL_MAX_DST_H 4096

#define ICL_MAX_SRC_W 5120

#define ICL_MAX_SRC_H 4096

#define ICL_MAX_DST_W 5120

#define ICL_MAX_DST_H 4096

#define SKL_MIN_YUV_420_SRC_W 16

#define SKL_MIN_YUV_420_SRC_H 16



static int

skl_update_scaler(struct intel_crtc_state *crtc_state, bool force_detach,

		  unsigned int scaler_user, int *scaler_id,

drivers/gpu/drm/i915/intel_drv.h

+0 −15
Original line number Diff line number Diff line
@@ -668,21 +668,6 @@ struct intel_initial_plane_config { 
	u8 rotation;

};



#define SKL_MIN_SRC_W 8

#define SKL_MAX_SRC_W 4096

#define SKL_MIN_SRC_H 8

#define SKL_MAX_SRC_H 4096

#define SKL_MIN_DST_W 8

#define SKL_MAX_DST_W 4096

#define SKL_MIN_DST_H 8

#define SKL_MAX_DST_H 4096

#define ICL_MAX_SRC_W 5120

#define ICL_MAX_SRC_H 4096

#define ICL_MAX_DST_W 5120

#define ICL_MAX_DST_H 4096

#define SKL_MIN_YUV_420_SRC_W 16

#define SKL_MIN_YUV_420_SRC_H 16



struct intel_scaler {

	int in_use;

	u32 mode;