diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-04-15 18:34:51 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-04-15 18:34:51 -0400 |
| commit | aa219a0dd7774e2454a5687e7d38e947a131cdee (patch) | |
| tree | fd9d8f167944a47aaa6bbdea188a5ca802200c3e /drivers/gpu/drm/i915/intel_dp_mst.c | |
| parent | 4a11248856933f33ca061ed55470ea7e1783b40b (diff) | |
| parent | 37ef01ab5d24d1d520dc79f6a98099d451c2a901 (diff) | |
Merge tag 'drm-intel-next-fixes-2015-04-15' of git://anongit.freedesktop.org/drm-intel into drm-next
Misc i915 fixes.
* tag 'drm-intel-next-fixes-2015-04-15' of git://anongit.freedesktop.org/drm-intel:
drm/i915: Dont enable CS_PARSER_ERROR interrupts at all
drm/i915: Move drm_framebuffer_unreference out of struct_mutex for takeover
drm/i915: Allocate connector state together with the connectors
drm/i915/chv: Remove DPIO force latency causing interpair skew issue
drm/i915: Don't cancel DRRS worker synchronously for flush/invalidate
drm/i915: Fix locking in DRRS flush/invalidate hooks
Diffstat (limited to 'drivers/gpu/drm/i915/intel_dp_mst.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_dp_mst.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c index 5329c855acce..5cb47482d29f 100644 --- a/drivers/gpu/drm/i915/intel_dp_mst.c +++ b/drivers/gpu/drm/i915/intel_dp_mst.c | |||
| @@ -415,7 +415,7 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolo | |||
| 415 | struct drm_connector *connector; | 415 | struct drm_connector *connector; |
| 416 | int i; | 416 | int i; |
| 417 | 417 | ||
| 418 | intel_connector = kzalloc(sizeof(*intel_connector), GFP_KERNEL); | 418 | intel_connector = intel_connector_alloc(); |
| 419 | if (!intel_connector) | 419 | if (!intel_connector) |
| 420 | return NULL; | 420 | return NULL; |
| 421 | 421 | ||