Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Tesarik <ptesarik@suse.cz>2019-09-17 16:22:10 +0200
committerPetr Tesarik <ptesarik@suse.cz>2019-09-17 16:26:49 +0200
commit650651baa93d5c7770bbc94dcfbd2c4079c8b277 (patch)
treec5ef764d891e241235388226e1a78f65d5772123
parent7fcae858a5d6cfbf608ab0eb5fa0d1ddecf348a1 (diff)
parente37d750a4bf65350a6cd91110068aec19af22b7b (diff)
- Refresh patches.suse/0001-drm-i915-Restore-relaxed-padding-OCL_OOB_SUPPRES_ENA.patch suse-commit: d75059b7eb91d6e60addfcec7d1e96f4190a62c2
-rw-r--r--drivers/gpu/drm/i915/intel_workarounds.c5
-rw-r--r--drivers/vhost/vhost.c4
2 files changed, 2 insertions, 7 deletions
diff --git a/drivers/gpu/drm/i915/intel_workarounds.c b/drivers/gpu/drm/i915/intel_workarounds.c
index aa7bd9cd490a..be7e87fa4a19 100644
--- a/drivers/gpu/drm/i915/intel_workarounds.c
+++ b/drivers/gpu/drm/i915/intel_workarounds.c
@@ -241,11 +241,6 @@ static int gen9_ctx_workarounds_init(struct drm_i915_private *dev_priv)
FLOW_CONTROL_ENABLE |
PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE);
- /* Syncing dependencies between camera and graphics:skl,bxt,kbl */
- if (!IS_COFFEELAKE(dev_priv))
- WA_SET_BIT_MASKED(HALF_SLICE_CHICKEN3,
- GEN9_DISABLE_OCL_OOB_SUPPRESS_LOGIC);
-
/* WaEnableYV12BugFixInHalfSliceChicken7:skl,bxt,kbl,glk,cfl */
/* WaEnableSamplerGPGPUPreemptionSupport:skl,bxt,kbl,cfl */
WA_SET_BIT_MASKED(GEN9_HALF_SLICE_CHICKEN7,
diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
index 9fd44d2b7562..48579d6801c8 100644
--- a/drivers/vhost/vhost.c
+++ b/drivers/vhost/vhost.c
@@ -2091,7 +2091,7 @@ static int get_indirect(struct vhost_virtqueue *vq,
/* If this is an input descriptor, increment that count. */
if (access == VHOST_ACCESS_WO) {
*in_num += ret;
- if (unlikely(log)) {
+ if (unlikely(log && ret)) {
log[*log_num].addr = vhost64_to_cpu(vq, desc.addr);
log[*log_num].len = vhost32_to_cpu(vq, desc.len);
++*log_num;
@@ -2234,7 +2234,7 @@ int vhost_get_vq_desc(struct vhost_virtqueue *vq,
/* If this is an input descriptor,
* increment that count. */
*in_num += ret;
- if (unlikely(log)) {
+ if (unlikely(log && ret)) {
log[*log_num].addr = vhost64_to_cpu(vq, desc.addr);
log[*log_num].len = vhost32_to_cpu(vq, desc.len);
++*log_num;