drm/i915: Continuation of future readiness series
Subsystems (2)
PATCH 1/1 drm/i915: Continuation of future readiness series
From: Sonika Jindal <[email protected]>
Removing the check for HAS_PCH_SPLIT, it looks redundant here. Anyways all the platforms are checked separately.
--- drivers/gpu/drm/i915/intel_display.c | 40 ++++++++++++++++------------------ 1 file changed, 19 insertions(+), 21 deletions(-)
drivers/gpu/drm/i915/intel_display.c +19 -21
@@ -12421,27 +12421,25 @@ static void intel_init_display(struct drm_device *dev) dev_priv->display.get_display_clock_speed = i830_get_display_clock_speed; -if (HAS_PCH_SPLIT (dev)) { -if (IS_GEN5 (dev)) { - dev_priv->display.fdi_link_train = ironlake_fdi_link_train; - dev_priv->display.write_eld = ironlake_write_eld; - }else if (IS_GEN6 (dev)) { - dev_priv->display.fdi_link_train = gen6_fdi_link_train; - dev_priv->display.write_eld = ironlake_write_eld; - dev_priv->display.modeset_global_resources = - snb_modeset_global_resources; - }else if (IS_IVYBRIDGE (dev)) { -/* FIXME: detect B0+ stepping and use auto training */ - dev_priv->display.fdi_link_train = ivb_manual_fdi_link_train; - dev_priv->display.write_eld = ironlake_write_eld; - dev_priv->display.modeset_global_resources = - ivb_modeset_global_resources; - }else if (IS_HASWELL (dev) ||IS_GEN8 (dev)) { - dev_priv->display.fdi_link_train = hsw_fdi_link_train; - dev_priv->display.write_eld = haswell_write_eld; - dev_priv->display.modeset_global_resources = - haswell_modeset_global_resources; - } +if (IS_GEN5 (dev)) { + dev_priv->display.fdi_link_train = ironlake_fdi_link_train; + dev_priv->display.write_eld = ironlake_write_eld; + }else if (IS_GEN6 (dev)) { + dev_priv->display.fdi_link_train = gen6_fdi_link_train; + dev_priv->display.write_eld = ironlake_write_eld; + dev_priv->display.modeset_global_resources = + snb_modeset_global_resources; + }else if (IS_IVYBRIDGE (dev)) { +/* FIXME: detect B0+ stepping and use auto training */ + dev_priv->display.fdi_link_train = ivb_manual_fdi_link_train; + dev_priv->display.write_eld = ironlake_write_eld; + dev_priv->display.modeset_global_resources = + ivb_modeset_global_resources; + }else if (IS_HASWELL (dev) ||IS_GEN8 (dev)) { + dev_priv->display.fdi_link_train = hsw_fdi_link_train; + dev_priv->display.write_eld = haswell_write_eld; + dev_priv->display.modeset_global_resources = + haswell_modeset_global_resources; }else if (IS_G4X (dev)) { dev_priv->display.write_eld = g4x_write_eld; }else if (IS_VALLEYVIEW (dev)) {
Signature · 1 line
1.7.10.4
Quoted 48 lines · On Fri, Aug 08, 2014 at 05:09:14PM +0530, [email protected] wrote:
From: Sonika Jindal <[email protected]>
Removing the check for
HAS_PCH_SPLIT, it looks redundant here. Anyways all the platforms are checked separately.Signed-off-by Sonika Jindal <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 40 ++++++++++++++++------------------ 1 file changed, 19 insertions(+), 21 deletions(-)drivers/gpu/drm/i915/intel_display.c +9
-21@@ -12421,27 +12421,25 @@ static void intel_init_display(struct drm_device *dev) dev_priv->display.get_display_clock_speed = i830_get_display_clock_speed; -if (HAS_PCH_SPLIT (dev)) { -if (IS_GEN5 (dev)) { - dev_priv->display.fdi_link_train = ironlake_fdi_link_train; - dev_priv->display.write_eld = ironlake_write_eld; - }else if (IS_GEN6 (dev)) { - dev_priv->display.fdi_link_train = gen6_fdi_link_train; - dev_priv->display.write_eld = ironlake_write_eld; - dev_priv->display.modeset_global_resources = - snb_modeset_global_resources; - }else if (IS_IVYBRIDGE (dev)) { -/* FIXME: detect B0+ stepping and use auto training */ - dev_priv->display.fdi_link_train = ivb_manual_fdi_link_train; - dev_priv->display.write_eld = ironlake_write_eld; - dev_priv->display.modeset_global_resources = - ivb_modeset_global_resources; - }else if (IS_HASWELL (dev) ||IS_GEN8 (dev)) { - dev_priv->display.fdi_link_train = hsw_fdi_link_train; - dev_priv->display.write_eld = haswell_write_eld; - dev_priv->display.modeset_global_resources = - haswell_modeset_global_resources; - } +if (IS_GEN5 (dev)) { + dev_priv->display.fdi_link_train = ironlake_fdi_link_train; + dev_priv->display.write_eld = ironlake_write_eld; + }else if (IS_GEN6 (dev)) { + dev_priv->display.fdi_link_train = gen6_fdi_link_train; + dev_priv->display.write_eld = ironlake_write_eld; + dev_priv->display.modeset_global_resources = + snb_modeset_global_resources; + }else if (IS_IVYBRIDGE (dev)) {
drivers/gpu/drm/i915/intel_display.c static void intel_init_display(struct drm_device *dev) · line 12442
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +10
-0+/* FIXME: detect B0+ stepping and use auto training */ + dev_priv->display.fdi_link_train = ivb_manual_fdi_link_train; + dev_priv->display.write_eld = ironlake_write_eld; + dev_priv->display.modeset_global_resources = + ivb_modeset_global_resources; + }else if (IS_HASWELL (dev) ||IS_GEN8 (dev)) { + dev_priv->display.fdi_link_train = hsw_fdi_link_train; + dev_priv->display.write_eld = haswell_write_eld; + dev_priv->display.modeset_global_resources = + haswell_modeset_global_resources;
Maybe shuffle these around a bit while you're at it so that the checks would be roughly in gen order.
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +0
-0}else if (IS_G4X (dev)) { dev_priv->display.write_eld = g4x_write_eld; }else if (IS_VALLEYVIEW (dev)) {Signature · 6 lines
1.7.10.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 2 lines
Ville Syrjälä Intel OTC
Quoted 54 lines · Ville Syrjälä
Quoted 53 lines · On Fri, Aug 08, 2014 at 05:09:14PM +0530, [email protected] wrote:
From: Sonika Jindal <[email protected]>
Removing the check for
HAS_PCH_SPLIT, it looks redundant here. Anyways all the platforms are checked separately.Signed-off-by Sonika Jindal <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 40 ++++++++++++++++------------------ 1 file changed, 19 insertions(+), 21 deletions(-)drivers/gpu/drm/i915/intel_display.c +14
-21@@ -12421,27 +12421,25 @@ static void intel_init_display(struct drm_device *dev) dev_priv->display.get_display_clock_speed = i830_get_display_clock_speed; -if (HAS_PCH_SPLIT (dev)) { -if (IS_GEN5 (dev)) { - dev_priv->display.fdi_link_train = ironlake_fdi_link_train; - dev_priv->display.write_eld = ironlake_write_eld; - }else if (IS_GEN6 (dev)) { - dev_priv->display.fdi_link_train = gen6_fdi_link_train; - dev_priv->display.write_eld = ironlake_write_eld; - dev_priv->display.modeset_global_resources = - snb_modeset_global_resources; - }else if (IS_IVYBRIDGE (dev)) { -/* FIXME: detect B0+ stepping and use auto training */ - dev_priv->display.fdi_link_train = ivb_manual_fdi_link_train; - dev_priv->display.write_eld = ironlake_write_eld; - dev_priv->display.modeset_global_resources = - ivb_modeset_global_resources; - }else if (IS_HASWELL (dev) ||IS_GEN8 (dev)) { - dev_priv->display.fdi_link_train = hsw_fdi_link_train; - dev_priv->display.write_eld = haswell_write_eld; - dev_priv->display.modeset_global_resources = - haswell_modeset_global_resources; - } +if (IS_GEN5 (dev)) { + dev_priv->display.fdi_link_train = ironlake_fdi_link_train; + dev_priv->display.write_eld = ironlake_write_eld; + }else if (IS_GEN6 (dev)) { + dev_priv->display.fdi_link_train = gen6_fdi_link_train; + dev_priv->display.write_eld = ironlake_write_eld; + dev_priv->display.modeset_global_resources = + snb_modeset_global_resources; + }else if (IS_IVYBRIDGE (dev)) { +/* FIXME: detect B0+ stepping and use auto training */ + dev_priv->display.fdi_link_train = ivb_manual_fdi_link_train; + dev_priv->display.write_eld = ironlake_write_eld; + dev_priv->display.modeset_global_resources = + ivb_modeset_global_resources;
Quoted 8 lines
drivers/gpu/drm/i915/intel_display.c static void intel_init_display(struct drm_device *dev) · line 12442
Quoted 5 lines
drivers/gpu/drm/i915/intel_display.c +5
-0+ }else if (IS_HASWELL (dev) ||IS_GEN8 (dev)) { + dev_priv->display.fdi_link_train = hsw_fdi_link_train; + dev_priv->display.write_eld = haswell_write_eld; + dev_priv->display.modeset_global_resources = + haswell_modeset_global_resources;Maybe shuffle these around a bit while you're at it so that the checks would be roughly in gen order.
Agreed, that might be useful while we touch the code. There's no preference over newer-first or older-first ordering, so you can pick what you like. G4X = gen4.5, so oldest platform that supports DP. -Daniel
Quoted 19 lines
Quoted 11 lines
drivers/gpu/drm/i915/intel_display.c +0
-0}else if (IS_G4X (dev)) { dev_priv->display.write_eld = g4x_write_eld; }else if (IS_VALLEYVIEW (dev)) {Signature · 6 lines
1.7.10.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfxSignature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
PATCH v2 1/1 drm/i915: Continuation of future readiness series
From: Sonika Jindal <[email protected]>
Removing the check for HAS_PCH_SPLIT, it looks redundant here. Anyways all the platforms are checked separately.
v2: Reordering as per the gen (Ville)
--- drivers/gpu/drm/i915/intel_display.c | 42 ++++++++++++++++------------------ 1 file changed, 20 insertions(+), 22 deletions(-)
drivers/gpu/drm/i915/intel_display.c +20 -22
@@ -12421,29 +12421,27 @@ static void intel_init_display(struct drm_device *dev) dev_priv->display.get_display_clock_speed = i830_get_display_clock_speed; -if (HAS_PCH_SPLIT (dev)) { -if (IS_GEN5 (dev)) { - dev_priv->display.fdi_link_train = ironlake_fdi_link_train; - dev_priv->display.write_eld = ironlake_write_eld; - }else if (IS_GEN6 (dev)) { - dev_priv->display.fdi_link_train = gen6_fdi_link_train; - dev_priv->display.write_eld = ironlake_write_eld; - dev_priv->display.modeset_global_resources = - snb_modeset_global_resources; - }else if (IS_IVYBRIDGE (dev)) { -/* FIXME: detect B0+ stepping and use auto training */ - dev_priv->display.fdi_link_train = ivb_manual_fdi_link_train; - dev_priv->display.write_eld = ironlake_write_eld; - dev_priv->display.modeset_global_resources = - ivb_modeset_global_resources; - }else if (IS_HASWELL (dev) ||IS_GEN8 (dev)) { - dev_priv->display.fdi_link_train = hsw_fdi_link_train; - dev_priv->display.write_eld = haswell_write_eld; - dev_priv->display.modeset_global_resources = - haswell_modeset_global_resources; - } - }else if (IS_G4X (dev)) { +if (IS_G4X (dev)) { dev_priv->display.write_eld = g4x_write_eld; + }else if (IS_GEN5 (dev)) { + dev_priv->display.fdi_link_train = ironlake_fdi_link_train; + dev_priv->display.write_eld = ironlake_write_eld; + }else if (IS_GEN6 (dev)) { + dev_priv->display.fdi_link_train = gen6_fdi_link_train; + dev_priv->display.write_eld = ironlake_write_eld; + dev_priv->display.modeset_global_resources = + snb_modeset_global_resources; + }else if (IS_IVYBRIDGE (dev)) { +/* FIXME: detect B0+ stepping and use auto training */ + dev_priv->display.fdi_link_train = ivb_manual_fdi_link_train; + dev_priv->display.write_eld = ironlake_write_eld; + dev_priv->display.modeset_global_resources = + ivb_modeset_global_resources; + }else if (IS_HASWELL (dev) ||IS_GEN8 (dev)) { + dev_priv->display.fdi_link_train = hsw_fdi_link_train; + dev_priv->display.write_eld = haswell_write_eld; + dev_priv->display.modeset_global_resources = + haswell_modeset_global_resources; }else if (IS_VALLEYVIEW (dev)) { dev_priv->display.modeset_global_resources = valleyview_modeset_global_resources;
Signature · 1 line
1.7.10.4
Daniel Vetter
AppliedQuoted 8 lines · On Mon, Aug 11, 2014 at 09:06:39AM +0530, [email protected] wrote:
From: Sonika Jindal <[email protected]>
Removing the check for
HAS_PCH_SPLIT, it looks redundant here. Anyways all the platforms are checked separately.v2: Reordering as per the gen (Ville)
Signed-off-by Sonika Jindal <[email protected]>
Queued for -next, thanks for the patch.
-Daniel
Quoted 65 lines
--- drivers/gpu/drm/i915/intel_display.c | 42 ++++++++++++++++------------------ 1 file changed, 20 insertions(+), 22 deletions(-)drivers/gpu/drm/i915/intel_display.c +20
-22@@ -12421,29 +12421,27 @@ static void intel_init_display(struct drm_device *dev) dev_priv->display.get_display_clock_speed = i830_get_display_clock_speed; -if (HAS_PCH_SPLIT (dev)) { -if (IS_GEN5 (dev)) { - dev_priv->display.fdi_link_train = ironlake_fdi_link_train; - dev_priv->display.write_eld = ironlake_write_eld; - }else if (IS_GEN6 (dev)) { - dev_priv->display.fdi_link_train = gen6_fdi_link_train; - dev_priv->display.write_eld = ironlake_write_eld; - dev_priv->display.modeset_global_resources = - snb_modeset_global_resources; - }else if (IS_IVYBRIDGE (dev)) { -/* FIXME: detect B0+ stepping and use auto training */ - dev_priv->display.fdi_link_train = ivb_manual_fdi_link_train; - dev_priv->display.write_eld = ironlake_write_eld; - dev_priv->display.modeset_global_resources = - ivb_modeset_global_resources; - }else if (IS_HASWELL (dev) ||IS_GEN8 (dev)) { - dev_priv->display.fdi_link_train = hsw_fdi_link_train; - dev_priv->display.write_eld = haswell_write_eld; - dev_priv->display.modeset_global_resources = - haswell_modeset_global_resources; - } - }else if (IS_G4X (dev)) { +if (IS_G4X (dev)) { dev_priv->display.write_eld = g4x_write_eld; + }else if (IS_GEN5 (dev)) { + dev_priv->display.fdi_link_train = ironlake_fdi_link_train; + dev_priv->display.write_eld = ironlake_write_eld; + }else if (IS_GEN6 (dev)) { + dev_priv->display.fdi_link_train = gen6_fdi_link_train; + dev_priv->display.write_eld = ironlake_write_eld; + dev_priv->display.modeset_global_resources = + snb_modeset_global_resources; + }else if (IS_IVYBRIDGE (dev)) { +/* FIXME: detect B0+ stepping and use auto training */ + dev_priv->display.fdi_link_train = ivb_manual_fdi_link_train; + dev_priv->display.write_eld = ironlake_write_eld; + dev_priv->display.modeset_global_resources = + ivb_modeset_global_resources; + }else if (IS_HASWELL (dev) ||IS_GEN8 (dev)) { + dev_priv->display.fdi_link_train = hsw_fdi_link_train; + dev_priv->display.write_eld = haswell_write_eld; + dev_priv->display.modeset_global_resources = + haswell_modeset_global_resources; }else if (IS_VALLEYVIEW (dev)) { dev_priv->display.modeset_global_resources = valleyview_modeset_global_resources;Signature · 6 lines
1.7.10.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch