public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm/i915: Plop vlv wm state into crtc_state

Browse source 
Relocate the vlv/chv wm state to live under intel_crtc_state. Note
that for now this just behaves as a temporary storage. But it'll be
easier to conver the thing over to properly pre-computing the state
when it's already in the right place.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170302171508.1666-5-ville.syrjala@linux.intel.com
This commit is contained in:
Ville Syrjälä 2017-03-02 19:14:54 +02:00
parent 7eb4941f04
commit 855c79f521
2 changed files with 37 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
drivers/gpu/drm/i915/intel_drv.h
View file

@ -492,6 +492,22 @@ struct skl_pipe_wm {
uint32_t linetime; uint32_t linetime;
}; };
enum vlv_wm_level {
VLV_WM_LEVEL_PM2,
VLV_WM_LEVEL_PM5,
VLV_WM_LEVEL_DDR_DVFS,
NUM_VLV_WM_LEVELS,
};
struct vlv_wm_state {
struct vlv_pipe_wm wm[NUM_VLV_WM_LEVELS];
struct vlv_sr_wm sr[NUM_VLV_WM_LEVELS];
uint8_t num_active_planes;
uint8_t num_levels;
uint8_t level;
bool cxsr;
};
struct intel_crtc_wm_state { struct intel_crtc_wm_state {
union { union {
struct { struct {
@ -516,6 +532,11 @@ struct intel_crtc_wm_state {
struct skl_pipe_wm optimal; struct skl_pipe_wm optimal;
struct skl_ddb_entry ddb; struct skl_ddb_entry ddb;
} skl; } skl;
struct {
/* optimal watermarks (inverted) */
struct vlv_wm_state optimal;
} vlv;
}; };
/* /*
@ -700,15 +721,6 @@ struct intel_crtc_state {
u8 active_planes; u8 active_planes;
}; };
struct vlv_wm_state {
struct vlv_pipe_wm wm[3];
struct vlv_sr_wm sr[3];
uint8_t num_active_planes;
uint8_t num_levels;
uint8_t level;
bool cxsr;
};
struct vlv_fifo_state { struct vlv_fifo_state {
uint16_t plane[I915_MAX_PLANES]; uint16_t plane[I915_MAX_PLANES];
}; };

32
drivers/gpu/drm/i915/intel_pm.c
View file

@ -957,12 +957,6 @@ static void vlv_write_wm_values(struct drm_i915_private *dev_priv,
#undef FW_WM_VLV #undef FW_WM_VLV
enum vlv_wm_level {
VLV_WM_LEVEL_PM2,
VLV_WM_LEVEL_PM5,
VLV_WM_LEVEL_DDR_DVFS,
};
/* latency must be in 0.1us units. */ /* latency must be in 0.1us units. */
static unsigned int vlv_wm_method2(unsigned int pixel_rate, static unsigned int vlv_wm_method2(unsigned int pixel_rate,
unsigned int pipe_htotal, unsigned int pipe_htotal,
@ -1033,9 +1027,10 @@ static uint16_t vlv_compute_wm_level(const struct intel_crtc_state *crtc_state,
return min_t(int, wm, USHRT_MAX); return min_t(int, wm, USHRT_MAX);
} }
static void vlv_compute_fifo(struct intel_crtc *crtc) static void vlv_compute_fifo(struct intel_crtc_state *crtc_state)
{ {
struct vlv_wm_state *wm_state = &crtc->wm.active.vlv; struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc);
struct vlv_wm_state *wm_state = &crtc_state->wm.vlv.optimal;
struct vlv_fifo_state *fifo_state = &crtc->wm.fifo_state; struct vlv_fifo_state *fifo_state = &crtc->wm.fifo_state;
struct drm_device *dev = crtc->base.dev; struct drm_device *dev = crtc->base.dev;
struct intel_plane *plane; struct intel_plane *plane;
@ -1109,9 +1104,10 @@ static u16 vlv_invert_wm_value(u16 wm, u16 fifo_size)
return fifo_size - wm; return fifo_size - wm;
} }
static void vlv_invert_wms(struct intel_crtc *crtc) static void vlv_invert_wms(struct intel_crtc_state *crtc_state)
{ {
struct vlv_wm_state *wm_state = &crtc->wm.active.vlv; struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc);
struct vlv_wm_state *wm_state = &crtc_state->wm.vlv.optimal;
int level; int level;
for (level = 0; level < wm_state->num_levels; level++) { for (level = 0; level < wm_state->num_levels; level++) {
@ -1136,10 +1132,11 @@ static void vlv_invert_wms(struct intel_crtc *crtc)
} }
} }
static void vlv_compute_wm(struct intel_crtc *crtc) static void vlv_compute_wm(struct intel_crtc_state *crtc_state)
{ {
struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc);
struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
struct vlv_wm_state *wm_state = &crtc->wm.active.vlv; struct vlv_wm_state *wm_state = &crtc_state->wm.vlv.optimal;
const struct vlv_fifo_state *fifo_state = &crtc->wm.fifo_state; const struct vlv_fifo_state *fifo_state = &crtc->wm.fifo_state;
struct intel_plane *plane; struct intel_plane *plane;
int level; int level;
@ -1151,7 +1148,7 @@ static void vlv_compute_wm(struct intel_crtc *crtc)
wm_state->num_active_planes = 0; wm_state->num_active_planes = 0;
vlv_compute_fifo(crtc); vlv_compute_fifo(crtc_state);
if (wm_state->num_active_planes != 1) if (wm_state->num_active_planes != 1)
wm_state->cxsr = false; wm_state->cxsr = false;
@ -1166,7 +1163,7 @@ static void vlv_compute_wm(struct intel_crtc *crtc)
/* normal watermarks */ /* normal watermarks */
for (level = 0; level < wm_state->num_levels; level++) { for (level = 0; level < wm_state->num_levels; level++) {
int wm = vlv_compute_wm_level(crtc->config, state, level); int wm = vlv_compute_wm_level(crtc_state, state, level);
int max_wm = fifo_state->plane[plane->id]; int max_wm = fifo_state->plane[plane->id];
/* hack */ /* hack */
@ -1203,7 +1200,7 @@ static void vlv_compute_wm(struct intel_crtc *crtc)
memset(&wm_state->sr[level], 0, sizeof(wm_state->sr[level])); memset(&wm_state->sr[level], 0, sizeof(wm_state->sr[level]));
} }
vlv_invert_wms(crtc); vlv_invert_wms(crtc_state);
} }
#define VLV_FIFO(plane, value) \ #define VLV_FIFO(plane, value) \
@ -1351,11 +1348,14 @@ static bool is_enabling(int old, int new, int threshold)
static void vlv_update_wm(struct intel_crtc *crtc) static void vlv_update_wm(struct intel_crtc *crtc)
{ {
struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
struct intel_crtc_state *crtc_state =
to_intel_crtc_state(crtc->base.state);
enum pipe pipe = crtc->pipe; enum pipe pipe = crtc->pipe;
struct vlv_wm_values *old_wm = &dev_priv->wm.vlv; struct vlv_wm_values *old_wm = &dev_priv->wm.vlv;
struct vlv_wm_values new_wm = {}; struct vlv_wm_values new_wm = {};
vlv_compute_wm(crtc); vlv_compute_wm(crtc_state);
crtc->wm.active.vlv = crtc_state->wm.vlv.optimal;
vlv_merge_wm(dev_priv, &new_wm); vlv_merge_wm(dev_priv, &new_wm);
if (memcmp(old_wm, &new_wm, sizeof(new_wm)) == 0) { if (memcmp(old_wm, &new_wm, sizeof(new_wm)) == 0) {