xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/i915/skl+: Remove minimum block allocation from crtc state.

Browse Source 
This is not required any more now that we get fresh state from
drm_atomic_crtc_state_for_each_plane_state. Zero all state
in advance.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1477489299-25777-6-git-send-email-maarten.lankhorst@linux.intel.com
This commit is contained in:
Maarten Lankhorst
2016-10-26 15:41:33 +02:00
parent 1e6ee54226
commit fefdd8104d
2 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/i915/intel_drv.h
View File

@@ -500,10 +500,6 @@ struct intel_crtc_wm_state {
/* gen9+ only needs 1-step wm programming */ /* gen9+ only needs 1-step wm programming */
struct skl_pipe_wm optimal; struct skl_pipe_wm optimal;
struct skl_ddb_entry ddb; struct skl_ddb_entry ddb;
/* minimum block allocation */
uint16_t minimum_blocks[I915_MAX_PLANES];
uint16_t minimum_y_blocks[I915_MAX_PLANES];
} skl; } skl;
}; };

15
drivers/gpu/drm/i915/intel_pm.c
View File

@@ -3378,8 +3378,8 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *cstate,
enum pipe pipe = intel_crtc->pipe; enum pipe pipe = intel_crtc->pipe;
struct skl_ddb_entry *alloc = &cstate->wm.skl.ddb; struct skl_ddb_entry *alloc = &cstate->wm.skl.ddb;
uint16_t alloc_size, start, cursor_blocks; uint16_t alloc_size, start, cursor_blocks;
uint16_t *minimum = cstate->wm.skl.minimum_blocks; uint16_t minimum[I915_MAX_PLANES] = {};
uint16_t *y_minimum = cstate->wm.skl.minimum_y_blocks; uint16_t y_minimum[I915_MAX_PLANES] = {};
unsigned int total_data_rate; unsigned int total_data_rate;
int num_active; int num_active;
int id, i; int id, i;
@@ -3416,16 +3416,11 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *cstate,
intel_plane = to_intel_plane(plane); intel_plane = to_intel_plane(plane);
id = skl_wm_plane_id(intel_plane); id = skl_wm_plane_id(intel_plane);
if (!pstate->visible) { if (!pstate->visible)
minimum[id] = 0;
y_minimum[id] = 0;
continue; continue;
}
if (plane->type == DRM_PLANE_TYPE_CURSOR) { if (plane->type == DRM_PLANE_TYPE_CURSOR)
minimum[id] = 0;
y_minimum[id] = 0;
continue; continue;
}
minimum[id] = skl_ddb_min_alloc(pstate, 0); minimum[id] = skl_ddb_min_alloc(pstate, 0);
y_minimum[id] = skl_ddb_min_alloc(pstate, 1); y_minimum[id] = skl_ddb_min_alloc(pstate, 1);