diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-04-16 00:34:51 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-04-16 00:34:51 +0200 |
| commit | aa219a0dd7774e2454a5687e7d38e947a131cdee (patch) | |
| tree | fd9d8f167944a47aaa6bbdea188a5ca802200c3e /drivers/gpu/drm/i915/intel_dvo.c | |
| parent | Merge tag 'topic/drm-misc-2015-04-15' of git://anongit.freedesktop.org/drm-in... (diff) | |
| parent | drm/i915: Dont enable CS_PARSER_ERROR interrupts at all (diff) | |
| download | linux-aa219a0dd7774e2454a5687e7d38e947a131cdee.tar.xz linux-aa219a0dd7774e2454a5687e7d38e947a131cdee.zip | |
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_dvo.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_dvo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c index 4ccd6c3f133d..770040ff486e 100644 --- a/drivers/gpu/drm/i915/intel_dvo.c +++ b/drivers/gpu/drm/i915/intel_dvo.c @@ -469,7 +469,7 @@ void intel_dvo_init(struct drm_device *dev) if (!intel_dvo) return; - intel_connector = kzalloc(sizeof(*intel_connector), GFP_KERNEL); + intel_connector = intel_connector_alloc(); if (!intel_connector) { kfree(intel_dvo); return; |