diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-06-09 06:34:39 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-06-09 06:34:51 +1000 |
| commit | 33ce21d6a2491ef9adb8dc395e3f5bbbfcdc95b5 (patch) | |
| tree | 84774c44e71aca62178c7f2a8e2d096c1c729939 /drivers/gpu/drm/i915/intel_pm.c | |
| parent | 68a14137fa68b798766c43b25d3e4de5e8d27a0f (diff) | |
| parent | 807cba6559cf333a74df1fbd74f0597e8e7fa020 (diff) | |
Merge tag 'drm-intel-next-fixes-2018-06-08-2' of git://anongit.freedesktop.org/drm/drm-intel into drm-next
First batch of i915 fixes for v4.18:
- gvt fixes that missed v4.17, potentially need to be backported
- eDP resolution regression revert
- remove broken nv12 special casing
- remove stale asserts from find active requests
Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/87y3fp4h15.fsf@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_pm.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_pm.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index b85229e153c4..53aaaa3e6886 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -5150,7 +5150,6 @@ skl_copy_ddb_for_pipe(struct skl_ddb_values *dst, sizeof(dst->ddb.uv_plane[pipe])); memcpy(dst->ddb.plane[pipe], src->ddb.plane[pipe], sizeof(dst->ddb.plane[pipe])); - dst->ddb.enabled_slices = src->ddb.enabled_slices; } static void |