* [PATCH 1/3] drm/i915: Future proof interrupt handler.
@ 2015-09-02 22:19 Rodrigo Vivi
2015-09-02 22:19 ` [PATCH 2/3] drm/i915: Future proof uncore_init Rodrigo Vivi
2015-09-02 22:19 ` [PATCH 3/3] drm/i915: Future proof panel fitter Rodrigo Vivi
0 siblings, 2 replies; 6+ messages in thread
From: Rodrigo Vivi @ 2015-09-02 22:19 UTC (permalink / raw)
To: intel-gfx; +Cc: Rodrigo Vivi
These functions are already being called for gen >= 9,
so let's be sure when this happens we use whatever is
there already for the latest platform.
No functional change.
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
drivers/gpu/drm/i915/i915_irq.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 2063279..90bc6c2 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -2154,7 +2154,7 @@ static irqreturn_t gen8_irq_handler(int irq, void *arg)
if (!intel_irqs_enabled(dev_priv))
return IRQ_NONE;
- if (IS_GEN9(dev))
+ if (INTEL_INFO(dev_priv)->gen >= 9)
aux_mask |= GEN9_AUX_CHANNEL_B | GEN9_AUX_CHANNEL_C |
GEN9_AUX_CHANNEL_D;
@@ -2237,7 +2237,7 @@ static irqreturn_t gen8_irq_handler(int irq, void *arg)
intel_pipe_handle_vblank(dev, pipe))
intel_check_page_flip(dev, pipe);
- if (IS_GEN9(dev))
+ if (INTEL_INFO(dev_priv)->gen >= 9)
flip_done = pipe_iir & GEN9_PIPE_PLANE1_FLIP_DONE;
else
flip_done = pipe_iir & GEN8_PIPE_PRIMARY_FLIP_DONE;
@@ -2255,7 +2255,7 @@ static irqreturn_t gen8_irq_handler(int irq, void *arg)
pipe);
- if (IS_GEN9(dev))
+ if (INTEL_INFO(dev_priv)->gen >= 9)
fault_errors = pipe_iir & GEN9_DE_PIPE_IRQ_FAULT_ERRORS;
else
fault_errors = pipe_iir & GEN8_DE_PIPE_IRQ_FAULT_ERRORS;
@@ -3538,7 +3538,7 @@ static void gen8_de_irq_postinstall(struct drm_i915_private *dev_priv)
u32 de_port_enables;
enum pipe pipe;
- if (IS_GEN9(dev_priv)) {
+ if (INTEL_INFO(dev_priv)->gen >= 9) {
de_pipe_masked |= GEN9_PIPE_PLANE1_FLIP_DONE |
GEN9_DE_PIPE_IRQ_FAULT_ERRORS;
de_port_masked |= GEN9_AUX_CHANNEL_B | GEN9_AUX_CHANNEL_C |
--
2.4.3
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/3] drm/i915: Future proof uncore_init.
2015-09-02 22:19 [PATCH 1/3] drm/i915: Future proof interrupt handler Rodrigo Vivi
@ 2015-09-02 22:19 ` Rodrigo Vivi
2015-09-03 11:06 ` Ville Syrjälä
2015-09-02 22:19 ` [PATCH 3/3] drm/i915: Future proof panel fitter Rodrigo Vivi
1 sibling, 1 reply; 6+ messages in thread
From: Rodrigo Vivi @ 2015-09-02 22:19 UTC (permalink / raw)
To: intel-gfx; +Cc: Rodrigo Vivi
Unless future specs tells otherwise we can assume future gens
inherit some stuff from the previous so let's handle
missed cases when we know tehy should't be there and assume
default equals newest one.
No functional changes.
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
drivers/gpu/drm/i915/intel_uncore.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
index dec20d6..e633d36 100644
--- a/drivers/gpu/drm/i915/intel_uncore.c
+++ b/drivers/gpu/drm/i915/intel_uncore.c
@@ -1202,8 +1202,6 @@ void intel_uncore_init(struct drm_device *dev)
switch (INTEL_INFO(dev)->gen) {
default:
- MISSING_CASE(INTEL_INFO(dev)->gen);
- return;
case 9:
ASSIGN_WRITE_MMIO_VFUNCS(gen9);
ASSIGN_READ_MMIO_VFUNCS(gen9);
@@ -1242,6 +1240,10 @@ void intel_uncore_init(struct drm_device *dev)
ASSIGN_WRITE_MMIO_VFUNCS(gen2);
ASSIGN_READ_MMIO_VFUNCS(gen2);
break;
+ case 1:
+ case 0:
+ MISSING_CASE(INTEL_INFO(dev)->gen);
+ return;
}
if (intel_vgpu_active(dev)) {
--
2.4.3
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 2/3] drm/i915: Future proof uncore_init.
2015-09-02 22:19 ` [PATCH 2/3] drm/i915: Future proof uncore_init Rodrigo Vivi
@ 2015-09-03 11:06 ` Ville Syrjälä
2015-09-03 21:38 ` [PATCH] " Rodrigo Vivi
0 siblings, 1 reply; 6+ messages in thread
From: Ville Syrjälä @ 2015-09-03 11:06 UTC (permalink / raw)
To: Rodrigo Vivi; +Cc: intel-gfx
On Wed, Sep 02, 2015 at 03:19:25PM -0700, Rodrigo Vivi wrote:
> Unless future specs tells otherwise we can assume future gens
> inherit some stuff from the previous so let's handle
> missed cases when we know tehy should't be there and assume
> default equals newest one.
>
> No functional changes.
>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
> drivers/gpu/drm/i915/intel_uncore.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
> index dec20d6..e633d36 100644
> --- a/drivers/gpu/drm/i915/intel_uncore.c
> +++ b/drivers/gpu/drm/i915/intel_uncore.c
> @@ -1202,8 +1202,6 @@ void intel_uncore_init(struct drm_device *dev)
>
> switch (INTEL_INFO(dev)->gen) {
> default:
> - MISSING_CASE(INTEL_INFO(dev)->gen);
> - return;
> case 9:
> ASSIGN_WRITE_MMIO_VFUNCS(gen9);
> ASSIGN_READ_MMIO_VFUNCS(gen9);
> @@ -1242,6 +1240,10 @@ void intel_uncore_init(struct drm_device *dev)
> ASSIGN_WRITE_MMIO_VFUNCS(gen2);
> ASSIGN_READ_MMIO_VFUNCS(gen2);
> break;
> + case 1:
> + case 0:
> + MISSING_CASE(INTEL_INFO(dev)->gen);
> + return;
Seems pointless, and confusing since we don't support gen0-1.
> }
>
> if (intel_vgpu_active(dev)) {
> --
> 2.4.3
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH] drm/i915: Future proof uncore_init.
2015-09-03 11:06 ` Ville Syrjälä
@ 2015-09-03 21:38 ` Rodrigo Vivi
2015-09-04 8:10 ` Daniel Vetter
0 siblings, 1 reply; 6+ messages in thread
From: Rodrigo Vivi @ 2015-09-03 21:38 UTC (permalink / raw)
To: intel-gfx; +Cc: Rodrigo Vivi
Unless future specs tells otherwise we can assume future gens
inherit some stuff from the previous so let's handle
missed cases when we know tehy should't be there and assume
default equals newest one.
No functional changes.
v2: Remove useless case as pointed out by Ville.
Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
drivers/gpu/drm/i915/intel_uncore.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
index dec20d6..440e2a5 100644
--- a/drivers/gpu/drm/i915/intel_uncore.c
+++ b/drivers/gpu/drm/i915/intel_uncore.c
@@ -1202,8 +1202,6 @@ void intel_uncore_init(struct drm_device *dev)
switch (INTEL_INFO(dev)->gen) {
default:
- MISSING_CASE(INTEL_INFO(dev)->gen);
- return;
case 9:
ASSIGN_WRITE_MMIO_VFUNCS(gen9);
ASSIGN_READ_MMIO_VFUNCS(gen9);
--
2.4.3
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] drm/i915: Future proof uncore_init.
2015-09-03 21:38 ` [PATCH] " Rodrigo Vivi
@ 2015-09-04 8:10 ` Daniel Vetter
0 siblings, 0 replies; 6+ messages in thread
From: Daniel Vetter @ 2015-09-04 8:10 UTC (permalink / raw)
To: Rodrigo Vivi; +Cc: intel-gfx
On Thu, Sep 03, 2015 at 02:38:00PM -0700, Rodrigo Vivi wrote:
> Unless future specs tells otherwise we can assume future gens
> inherit some stuff from the previous so let's handle
> missed cases when we know tehy should't be there and assume
> default equals newest one.
>
> No functional changes.
>
> v2: Remove useless case as pointed out by Ville.
>
> Ville Syrjälä <ville.syrjala@linux.intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
All three applied to dinq, thanks.
-Daniel
> ---
> drivers/gpu/drm/i915/intel_uncore.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
> index dec20d6..440e2a5 100644
> --- a/drivers/gpu/drm/i915/intel_uncore.c
> +++ b/drivers/gpu/drm/i915/intel_uncore.c
> @@ -1202,8 +1202,6 @@ void intel_uncore_init(struct drm_device *dev)
>
> switch (INTEL_INFO(dev)->gen) {
> default:
> - MISSING_CASE(INTEL_INFO(dev)->gen);
> - return;
> case 9:
> ASSIGN_WRITE_MMIO_VFUNCS(gen9);
> ASSIGN_READ_MMIO_VFUNCS(gen9);
> --
> 2.4.3
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 3/3] drm/i915: Future proof panel fitter.
2015-09-02 22:19 [PATCH 1/3] drm/i915: Future proof interrupt handler Rodrigo Vivi
2015-09-02 22:19 ` [PATCH 2/3] drm/i915: Future proof uncore_init Rodrigo Vivi
@ 2015-09-02 22:19 ` Rodrigo Vivi
1 sibling, 0 replies; 6+ messages in thread
From: Rodrigo Vivi @ 2015-09-02 22:19 UTC (permalink / raw)
To: intel-gfx; +Cc: Rodrigo Vivi
This is another case where we can consider the default is the
newest available and not actually a missed case.
No functional change.
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
drivers/gpu/drm/i915/intel_display.c | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 0377520..5c62511 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -4915,12 +4915,10 @@ static void haswell_crtc_enable(struct drm_crtc *crtc)
intel_ddi_enable_pipe_clock(intel_crtc);
- if (INTEL_INFO(dev)->gen == 9)
+ if (INTEL_INFO(dev)->gen >= 9)
skylake_pfit_enable(intel_crtc);
- else if (INTEL_INFO(dev)->gen < 9)
- ironlake_pfit_enable(intel_crtc);
else
- MISSING_CASE(INTEL_INFO(dev)->gen);
+ ironlake_pfit_enable(intel_crtc);
/*
* On ILK+ LUT must be loaded before the pipe is running but with
@@ -5052,12 +5050,10 @@ static void haswell_crtc_disable(struct drm_crtc *crtc)
intel_ddi_disable_transcoder_func(dev_priv, cpu_transcoder);
- if (INTEL_INFO(dev)->gen == 9)
+ if (INTEL_INFO(dev)->gen >= 9)
skylake_scaler_disable(intel_crtc);
- else if (INTEL_INFO(dev)->gen < 9)
- ironlake_pfit_disable(intel_crtc);
else
- MISSING_CASE(INTEL_INFO(dev)->gen);
+ ironlake_pfit_disable(intel_crtc);
intel_ddi_disable_pipe_clock(intel_crtc);
@@ -9780,12 +9776,10 @@ static bool haswell_get_pipe_config(struct intel_crtc *crtc,
}
if (intel_display_power_is_enabled(dev_priv, pfit_domain)) {
- if (INTEL_INFO(dev)->gen == 9)
+ if (INTEL_INFO(dev)->gen >= 9)
skylake_get_pfit_config(crtc, pipe_config);
- else if (INTEL_INFO(dev)->gen < 9)
- ironlake_get_pfit_config(crtc, pipe_config);
else
- MISSING_CASE(INTEL_INFO(dev)->gen);
+ ironlake_get_pfit_config(crtc, pipe_config);
}
if (IS_HASWELL(dev))
--
2.4.3
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-09-04 8:07 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-02 22:19 [PATCH 1/3] drm/i915: Future proof interrupt handler Rodrigo Vivi
2015-09-02 22:19 ` [PATCH 2/3] drm/i915: Future proof uncore_init Rodrigo Vivi
2015-09-03 11:06 ` Ville Syrjälä
2015-09-03 21:38 ` [PATCH] " Rodrigo Vivi
2015-09-04 8:10 ` Daniel Vetter
2015-09-02 22:19 ` [PATCH 3/3] drm/i915: Future proof panel fitter Rodrigo Vivi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox