Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie:
"Final drm fixes: one core locking imbalance regression, and a bunch of
i915 baytrail s/r fixes"
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm: fix drm_mode_getconnector() locking imbalance regression
drm/i915/vlv: remove wait for previous GFX clk disable request
drm/i915/chv: Remove Wait for a previous gfx force-off
drm/i915/vlv: save/restore the power context base reg
+6
-13
+3
-1
drivers/gpu/drm/drm_crtc.c
+3
-1
drivers/gpu/drm/drm_crtc.c
···
2121
2121
connector = drm_connector_find(dev, out_resp->connector_id);
2122
2122
if (!connector) {
2123
2123
ret = -ENOENT;
2124
-
goto out;
2124
+
goto out_unlock;
2125
2125
}
2126
2126
2127
2127
for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++)
···
2201
2201
2202
2202
out:
2203
2203
drm_modeset_unlock(&dev->mode_config.connection_mutex);
2204
+
2205
+
out_unlock:
2204
2206
mutex_unlock(&dev->mode_config.mutex);
2205
2207
2206
2208
return ret;
+2
-12
drivers/gpu/drm/i915/i915_drv.c
+2
-12
drivers/gpu/drm/i915/i915_drv.c
···
1095
1095
/* Gunit-Display CZ domain, 0x182028-0x1821CF */
1096
1096
s->gu_ctl0 = I915_READ(VLV_GU_CTL0);
1097
1097
s->gu_ctl1 = I915_READ(VLV_GU_CTL1);
1098
+
s->pcbr = I915_READ(VLV_PCBR);
1098
1099
s->clock_gate_dis2 = I915_READ(VLV_GUNIT_CLOCK_GATE2);
1099
1100
1100
1101
/*
···
1190
1189
/* Gunit-Display CZ domain, 0x182028-0x1821CF */
1191
1190
I915_WRITE(VLV_GU_CTL0, s->gu_ctl0);
1192
1191
I915_WRITE(VLV_GU_CTL1, s->gu_ctl1);
1192
+
I915_WRITE(VLV_PCBR, s->pcbr);
1193
1193
I915_WRITE(VLV_GUNIT_CLOCK_GATE2, s->clock_gate_dis2);
1194
1194
}
1195
1195
···
1199
1197
u32 val;
1200
1198
int err;
1201
1199
1202
-
val = I915_READ(VLV_GTLC_SURVIVABILITY_REG);
1203
-
WARN_ON(!!(val & VLV_GFX_CLK_FORCE_ON_BIT) == force_on);
1204
-
1205
1200
#define COND (I915_READ(VLV_GTLC_SURVIVABILITY_REG) & VLV_GFX_CLK_STATUS_BIT)
1206
-
/* Wait for a previous force-off to settle */
1207
-
if (force_on) {
1208
-
err = wait_for(!COND, 20);
1209
-
if (err) {
1210
-
DRM_ERROR("timeout waiting for GFX clock force-off (%08x)\n",
1211
-
I915_READ(VLV_GTLC_SURVIVABILITY_REG));
1212
-
return err;
1213
-
}
1214
-
}
1215
1201
1216
1202
val = I915_READ(VLV_GTLC_SURVIVABILITY_REG);
1217
1203
val &= ~VLV_GFX_CLK_FORCE_ON_BIT;