]> git.baikalelectronics.ru Git - kernel.git/commit
drm/i915: Determine type before initialising connector
authorJonas Bonn <jonas@southpole.se>
Fri, 15 May 2009 07:10:41 +0000 (09:10 +0200)
committerEric Anholt <eric@anholt.net>
Fri, 22 May 2009 19:59:29 +0000 (12:59 -0700)
commit15f3113f45b0179df5b95a36c671708ff98f5348
tree27dfd0914e2d1704a53de795d53c27bba79e79f7
parentd779aaa90c3433f796c64f217b4730b8ce23406c
drm/i915: Determine type before initialising connector

drm_connector_init sets both the connector type and the connector type_id
on the newly initialised connector.  As the connector type_id is coupled to
the connector type, the connector type cannot simply be modified on an
initialised connector.

This patch changes the order of operations on intel_sdvo_init so that the
type is determined before the connector is intialised.

This fixes a bug whereby the name card0-VGA-1 would be allocted to both a
CRT and an SDVO connector since the SDVO connector would be initialised
with type 'unknown' and hence have its type_id assigned from the wrong pool.

Signed-off-by: Jonas Bonn <jonas@southpole.se>
Signed-off-by: Eric Anholt <eric@anholt.net>
drivers/gpu/drm/i915/intel_sdvo.c