diff options
| author | Maarten Lankhorst | 2016-01-04 12:53:15 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2016-01-05 09:35:53 +0100 |
| commit | 5350a031247680590724a1badc112d1217f721d6 (patch) | |
| tree | b434b8856e5f61774649f153c67adbbbd5cf6e4c /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm: Use a normal idr allocation for the obj->name (diff) | |
| download | kernel-qcow2-linux-5350a031247680590724a1badc112d1217f721d6.tar.gz kernel-qcow2-linux-5350a031247680590724a1badc112d1217f721d6.tar.xz kernel-qcow2-linux-5350a031247680590724a1badc112d1217f721d6.zip | |
drm/i915: Set connector_state->connector using the helper.
The atomic helper sets connector_state->connector, which the i915
code didn't. This will become a problem when we start using it.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Acked-by: Thierry Reding <treding@nvidia.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1451908400-25147-1-git-send-email-maarten.lankhorst@linux.intel.com
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index bda6b9c82e66..e8f76be555df 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -6475,13 +6475,11 @@ static void intel_connector_check_state(struct intel_connector *connector) int intel_connector_init(struct intel_connector *connector) { - struct drm_connector_state *connector_state; + drm_atomic_helper_connector_reset(&connector->base); - connector_state = kzalloc(sizeof *connector_state, GFP_KERNEL); - if (!connector_state) + if (!connector->base.state) return -ENOMEM; - connector->base.state = connector_state; return 0; } |