Commit e1898f99 authored by Dave Airlie's avatar Dave Airlie

Merge tag 'drm-misc-fixes-2018-04-18-1' of git://anongit.freedesktop.org/drm/drm-misc into drm-next

drm-misc-fixes:

stable: vc4: Fix memory leak during BO teardown (Daniel)
dp: Add i2c retry for LSPCON adapters (Imre)
hdcp: Fix device count mask (Ramalingam)

Cc: Daniel J Blueman <daniel@quora.org
Cc: Imre Deak <imre.deak@intel.com>
Cc: Ramalingam C <ramalingam.c@intel.com>

* tag 'drm-misc-fixes-2018-04-18-1' of git://anongit.freedesktop.org/drm/drm-misc:
  drm/i915: Fix LSPCON TMDS output buffer enabling from low-power state
  drm: Fix HDCP downstream dev count read
  drm/vc4: Fix memory leak during BO teardown
parents a10beabb 7eb2c4dd
...@@ -350,19 +350,44 @@ int drm_dp_dual_mode_set_tmds_output(enum drm_dp_dual_mode_type type, ...@@ -350,19 +350,44 @@ int drm_dp_dual_mode_set_tmds_output(enum drm_dp_dual_mode_type type,
{ {
uint8_t tmds_oen = enable ? 0 : DP_DUAL_MODE_TMDS_DISABLE; uint8_t tmds_oen = enable ? 0 : DP_DUAL_MODE_TMDS_DISABLE;
ssize_t ret; ssize_t ret;
int retry;
if (type < DRM_DP_DUAL_MODE_TYPE2_DVI) if (type < DRM_DP_DUAL_MODE_TYPE2_DVI)
return 0; return 0;
ret = drm_dp_dual_mode_write(adapter, DP_DUAL_MODE_TMDS_OEN, /*
&tmds_oen, sizeof(tmds_oen)); * LSPCON adapters in low-power state may ignore the first write, so
if (ret) { * read back and verify the written value a few times.
DRM_DEBUG_KMS("Failed to %s TMDS output buffers\n", */
enable ? "enable" : "disable"); for (retry = 0; retry < 3; retry++) {
return ret; uint8_t tmp;
ret = drm_dp_dual_mode_write(adapter, DP_DUAL_MODE_TMDS_OEN,
&tmds_oen, sizeof(tmds_oen));
if (ret) {
DRM_DEBUG_KMS("Failed to %s TMDS output buffers (%d attempts)\n",
enable ? "enable" : "disable",
retry + 1);
return ret;
}
ret = drm_dp_dual_mode_read(adapter, DP_DUAL_MODE_TMDS_OEN,
&tmp, sizeof(tmp));
if (ret) {
DRM_DEBUG_KMS("I2C read failed during TMDS output buffer %s (%d attempts)\n",
enable ? "enabling" : "disabling",
retry + 1);
return ret;
}
if (tmp == tmds_oen)
return 0;
} }
return 0; DRM_DEBUG_KMS("I2C write value mismatch during TMDS output buffer %s\n",
enable ? "enabling" : "disabling");
return -EIO;
} }
EXPORT_SYMBOL(drm_dp_dual_mode_set_tmds_output); EXPORT_SYMBOL(drm_dp_dual_mode_set_tmds_output);
......
...@@ -195,6 +195,7 @@ static void vc4_bo_destroy(struct vc4_bo *bo) ...@@ -195,6 +195,7 @@ static void vc4_bo_destroy(struct vc4_bo *bo)
vc4_bo_set_label(obj, -1); vc4_bo_set_label(obj, -1);
if (bo->validated_shader) { if (bo->validated_shader) {
kfree(bo->validated_shader->uniform_addr_offsets);
kfree(bo->validated_shader->texture_samples); kfree(bo->validated_shader->texture_samples);
kfree(bo->validated_shader); kfree(bo->validated_shader);
bo->validated_shader = NULL; bo->validated_shader = NULL;
...@@ -591,6 +592,7 @@ void vc4_free_object(struct drm_gem_object *gem_bo) ...@@ -591,6 +592,7 @@ void vc4_free_object(struct drm_gem_object *gem_bo)
} }
if (bo->validated_shader) { if (bo->validated_shader) {
kfree(bo->validated_shader->uniform_addr_offsets);
kfree(bo->validated_shader->texture_samples); kfree(bo->validated_shader->texture_samples);
kfree(bo->validated_shader); kfree(bo->validated_shader);
bo->validated_shader = NULL; bo->validated_shader = NULL;
......
...@@ -942,6 +942,7 @@ vc4_validate_shader(struct drm_gem_cma_object *shader_obj) ...@@ -942,6 +942,7 @@ vc4_validate_shader(struct drm_gem_cma_object *shader_obj)
fail: fail:
kfree(validation_state.branch_targets); kfree(validation_state.branch_targets);
if (validated_shader) { if (validated_shader) {
kfree(validated_shader->uniform_addr_offsets);
kfree(validated_shader->texture_samples); kfree(validated_shader->texture_samples);
kfree(validated_shader); kfree(validated_shader);
} }
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#define DRM_HDCP_RI_LEN 2 #define DRM_HDCP_RI_LEN 2
#define DRM_HDCP_V_PRIME_PART_LEN 4 #define DRM_HDCP_V_PRIME_PART_LEN 4
#define DRM_HDCP_V_PRIME_NUM_PARTS 5 #define DRM_HDCP_V_PRIME_NUM_PARTS 5
#define DRM_HDCP_NUM_DOWNSTREAM(x) (x & 0x3f) #define DRM_HDCP_NUM_DOWNSTREAM(x) (x & 0x7f)
#define DRM_HDCP_MAX_CASCADE_EXCEEDED(x) (x & BIT(3)) #define DRM_HDCP_MAX_CASCADE_EXCEEDED(x) (x & BIT(3))
#define DRM_HDCP_MAX_DEVICE_EXCEEDED(x) (x & BIT(7)) #define DRM_HDCP_MAX_DEVICE_EXCEEDED(x) (x & BIT(7))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment