Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'drm-fixes-2019-09-13' of git://anongit.freedesktop.org/drm/drm
Pull drm fixes from Dave Airlie:
"From the maintainer summit, just some last minute fixes for final:
lima:
- fix gem_wait ioctl
core:
- constify modes list
i915:
- DP MST high color depth regression
- GPU hangs on vulkan compute workloads"
* tag 'drm-fixes-2019-09-13' of git://anongit.freedesktop.org/drm/drm:
drm/lima: fix lima_gem_wait() return value
drm/i915: Restore relaxed padding (OCL_OOB_SUPPRES_ENABLE) for skl+
drm/i915: Limit MST to <= 8bpc once again
drm/modes: Make the whitelist more const
+11
-8
+1
-1
drivers/gpu/drm/drm_modes.c
+1
-1
drivers/gpu/drm/drm_modes.c
+9
-1
drivers/gpu/drm/i915/display/intel_dp_mst.c
+9
-1
drivers/gpu/drm/i915/display/intel_dp_mst.c
···
128
128
limits.max_lane_count = intel_dp_max_lane_count(intel_dp);
129
129
130
130
limits.min_bpp = intel_dp_min_bpp(pipe_config);
131
-
limits.max_bpp = pipe_config->pipe_bpp;
131
+
/*
132
+
* FIXME: If all the streams can't fit into the link with
133
+
* their current pipe_bpp we should reduce pipe_bpp across
134
+
* the board until things start to fit. Until then we
135
+
* limit to <= 8bpc since that's what was hardcoded for all
136
+
* MST streams previously. This hack should be removed once
137
+
* we have the proper retry logic in place.
138
+
*/
139
+
limits.max_bpp = min(pipe_config->pipe_bpp, 24);
132
140
133
141
intel_dp_adjust_compliance_config(intel_dp, pipe_config, &limits);
134
142
-5
drivers/gpu/drm/i915/gt/intel_workarounds.c
-5
drivers/gpu/drm/i915/gt/intel_workarounds.c
···
308
308
FLOW_CONTROL_ENABLE |
309
309
PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE);
310
310
311
-
/* Syncing dependencies between camera and graphics:skl,bxt,kbl */
312
-
if (!IS_COFFEELAKE(i915))
313
-
WA_SET_BIT_MASKED(HALF_SLICE_CHICKEN3,
314
-
GEN9_DISABLE_OCL_OOB_SUPPRESS_LOGIC);
315
-
316
311
/* WaEnableYV12BugFixInHalfSliceChicken7:skl,bxt,kbl,glk,cfl */
317
312
/* WaEnableSamplerGPGPUPreemptionSupport:skl,bxt,kbl,cfl */
318
313
WA_SET_BIT_MASKED(GEN9_HALF_SLICE_CHICKEN7,
+1
-1
drivers/gpu/drm/lima/lima_gem.c
+1
-1
drivers/gpu/drm/lima/lima_gem.c