* [PATCH 1/2] drm/i915: allow dev_priv for HAS_PCH_* macros too
@ 2014-10-10 14:53 Jani Nikula
2014-10-10 14:53 ` [PATCH 2/2] drm/i915: spt does not have pch backlight override bit Jani Nikula
2014-10-10 14:58 ` [PATCH 1/2] drm/i915: allow dev_priv for HAS_PCH_* macros too Chris Wilson
0 siblings, 2 replies; 7+ messages in thread
From: Jani Nikula @ 2014-10-10 14:53 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula, shuang.he
Follow-up to
commit dbbe91279511d6a18a521b953a3c139e4787e660
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sat Aug 9 19:18:43 2014 +0100
drm/i915: Agnostic INTEL_INFO
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/i915_drv.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index ac6232bc1341..48da10e3c6fb 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2196,7 +2196,7 @@ struct drm_i915_cmd_table {
#define INTEL_PCH_SPT_DEVICE_ID_TYPE 0xA100
#define INTEL_PCH_SPT_LP_DEVICE_ID_TYPE 0x9D00
-#define INTEL_PCH_TYPE(dev) (to_i915(dev)->pch_type)
+#define INTEL_PCH_TYPE(dev) (__I915__(dev)->pch_type)
#define HAS_PCH_SPT(dev) (INTEL_PCH_TYPE(dev) == PCH_SPT)
#define HAS_PCH_LPT(dev) (INTEL_PCH_TYPE(dev) == PCH_LPT)
#define HAS_PCH_CPT(dev) (INTEL_PCH_TYPE(dev) == PCH_CPT)
--
2.1.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 2/2] drm/i915: spt does not have pch backlight override bit
2014-10-10 14:53 [PATCH 1/2] drm/i915: allow dev_priv for HAS_PCH_* macros too Jani Nikula
@ 2014-10-10 14:53 ` Jani Nikula
2014-10-11 8:28 ` [PATCH 2/2] drm/i915: spt does not have pch backlight shuang.he
2014-10-20 11:28 ` [PATCH 2/2] drm/i915: spt does not have pch backlight override bit Ville Syrjälä
2014-10-10 14:58 ` [PATCH 1/2] drm/i915: allow dev_priv for HAS_PCH_* macros too Chris Wilson
1 sibling, 2 replies; 7+ messages in thread
From: Jani Nikula @ 2014-10-10 14:53 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula, shuang.he
SPT is always in the PCH override mode, and the bit MBZ. Only set
override on LPT.
v2: check for PCH version (Ville)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/intel_panel.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
index e3def5ad4a77..e18b3f49074c 100644
--- a/drivers/gpu/drm/i915/intel_panel.c
+++ b/drivers/gpu/drm/i915/intel_panel.c
@@ -775,8 +775,9 @@ static void bdw_enable_backlight(struct intel_connector *connector)
if (panel->backlight.active_low_pwm)
pch_ctl1 |= BLM_PCH_POLARITY;
- /* BDW always uses the pch pwm controls. */
- pch_ctl1 |= BLM_PCH_OVERRIDE_ENABLE;
+ /* After LPT, override is the default. */
+ if (HAS_PCH_LPT(dev_priv))
+ pch_ctl1 |= BLM_PCH_OVERRIDE_ENABLE;
I915_WRITE(BLC_PWM_PCH_CTL1, pch_ctl1);
POSTING_READ(BLC_PWM_PCH_CTL1);
--
2.1.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] drm/i915: spt does not have pch backlight
2014-10-10 14:53 ` [PATCH 2/2] drm/i915: spt does not have pch backlight override bit Jani Nikula
@ 2014-10-11 8:28 ` shuang.he
2014-10-20 11:28 ` [PATCH 2/2] drm/i915: spt does not have pch backlight override bit Ville Syrjälä
1 sibling, 0 replies; 7+ messages in thread
From: shuang.he @ 2014-10-11 8:28 UTC (permalink / raw)
To: shuang.he, intel-gfx, jani.nikula
Tested-By: PRC QA PRTS (Patch Regression Test System Contact: shuang.he@intel.com)
-------------------------------------Summary-------------------------------------
Platform: baseline_drm_intel_nightly_pass_rate->patch_applied_pass_rate
BYT: pass/total=271/271->271/271
PNV: pass/total=269/271->271/271
ILK: pass/total=269/271->271/271
IVB: pass/total=271/271->271/271
SNB: pass/total=271/271->271/271
HSW: pass/total=271/271->271/271
BDW: pass/total=270/271->271/271
-------------------------------------Detailed-------------------------------------
test_platform: test_suite, test_case, result_with_drm_intel_nightly->result_with_patch_applied
PNV: Intel_gpu_tools, igt_gem_concurrent_blit_gtt-bcs-gpu-read-after-write-forked, TIMEOUT->PASS
PNV: Intel_gpu_tools, igt_gem_concurrent_blit_gttX-bcs-gpu-read-after-write-forked, TIMEOUT->PASS
ILK: Intel_gpu_tools, igt_kms_pipe_crc_basic_bad-nb-words-3, DMESG_WARN->PASS
ILK: Intel_gpu_tools, igt_kms_setmode_invalid-clone-single-crtc, DMESG_WARN->PASS
BDW: Intel_gpu_tools, igt_drv_missed_irq_hang, DMESG_WARN->PASS
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] drm/i915: spt does not have pch backlight override bit
2014-10-10 14:53 ` [PATCH 2/2] drm/i915: spt does not have pch backlight override bit Jani Nikula
2014-10-11 8:28 ` [PATCH 2/2] drm/i915: spt does not have pch backlight shuang.he
@ 2014-10-20 11:28 ` Ville Syrjälä
1 sibling, 0 replies; 7+ messages in thread
From: Ville Syrjälä @ 2014-10-20 11:28 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx, shuang.he
On Fri, Oct 10, 2014 at 05:53:33PM +0300, Jani Nikula wrote:
> SPT is always in the PCH override mode, and the bit MBZ. Only set
> override on LPT.
>
> v2: check for PCH version (Ville)
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/intel_panel.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
> index e3def5ad4a77..e18b3f49074c 100644
> --- a/drivers/gpu/drm/i915/intel_panel.c
> +++ b/drivers/gpu/drm/i915/intel_panel.c
> @@ -775,8 +775,9 @@ static void bdw_enable_backlight(struct intel_connector *connector)
> if (panel->backlight.active_low_pwm)
> pch_ctl1 |= BLM_PCH_POLARITY;
>
> - /* BDW always uses the pch pwm controls. */
> - pch_ctl1 |= BLM_PCH_OVERRIDE_ENABLE;
> + /* After LPT, override is the default. */
> + if (HAS_PCH_LPT(dev_priv))
> + pch_ctl1 |= BLM_PCH_OVERRIDE_ENABLE;
>
> I915_WRITE(BLC_PWM_PCH_CTL1, pch_ctl1);
> POSTING_READ(BLC_PWM_PCH_CTL1);
> --
> 2.1.0
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ville Syrjälä
Intel OTC
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] drm/i915: allow dev_priv for HAS_PCH_* macros too
2014-10-10 14:53 [PATCH 1/2] drm/i915: allow dev_priv for HAS_PCH_* macros too Jani Nikula
2014-10-10 14:53 ` [PATCH 2/2] drm/i915: spt does not have pch backlight override bit Jani Nikula
@ 2014-10-10 14:58 ` Chris Wilson
2014-10-10 15:10 ` Jani Nikula
1 sibling, 1 reply; 7+ messages in thread
From: Chris Wilson @ 2014-10-10 14:58 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx, shuang.he
On Fri, Oct 10, 2014 at 05:53:32PM +0300, Jani Nikula wrote:
> Follow-up to
> commit dbbe91279511d6a18a521b953a3c139e4787e660
> Author: Chris Wilson <chris@chris-wilson.co.uk>
> Date: Sat Aug 9 19:18:43 2014 +0100
>
> drm/i915: Agnostic INTEL_INFO
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
If you look at
1408905331-22455-1-git-send-email-chris@chris-wilson.co.uk
you will find another one suitable for conversion as well
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] drm/i915: allow dev_priv for HAS_PCH_* macros too
2014-10-10 14:58 ` [PATCH 1/2] drm/i915: allow dev_priv for HAS_PCH_* macros too Chris Wilson
@ 2014-10-10 15:10 ` Jani Nikula
2014-10-21 14:57 ` Daniel Vetter
0 siblings, 1 reply; 7+ messages in thread
From: Jani Nikula @ 2014-10-10 15:10 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx, shuang.he
On Fri, 10 Oct 2014, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> On Fri, Oct 10, 2014 at 05:53:32PM +0300, Jani Nikula wrote:
>> Follow-up to
>> commit dbbe91279511d6a18a521b953a3c139e4787e660
>> Author: Chris Wilson <chris@chris-wilson.co.uk>
>> Date: Sat Aug 9 19:18:43 2014 +0100
>>
>> drm/i915: Agnostic INTEL_INFO
>>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>
> If you look at
>
> 1408905331-22455-1-git-send-email-chris@chris-wilson.co.uk
>
> you will find another one suitable for conversion as well
Thanks, I missed that. I just added my r-b.
Daniel, please pick that one up instead of 1/2 as a prerequisite for
2/2.
BR,
Jani.
> -Chris
>
> --
> Chris Wilson, Intel Open Source Technology Centre
--
Jani Nikula, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] drm/i915: allow dev_priv for HAS_PCH_* macros too
2014-10-10 15:10 ` Jani Nikula
@ 2014-10-21 14:57 ` Daniel Vetter
0 siblings, 0 replies; 7+ messages in thread
From: Daniel Vetter @ 2014-10-21 14:57 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx, shuang.he
On Fri, Oct 10, 2014 at 06:10:41PM +0300, Jani Nikula wrote:
> On Fri, 10 Oct 2014, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> > On Fri, Oct 10, 2014 at 05:53:32PM +0300, Jani Nikula wrote:
> >> Follow-up to
> >> commit dbbe91279511d6a18a521b953a3c139e4787e660
> >> Author: Chris Wilson <chris@chris-wilson.co.uk>
> >> Date: Sat Aug 9 19:18:43 2014 +0100
> >>
> >> drm/i915: Agnostic INTEL_INFO
> >>
> >> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> >
> > If you look at
> >
> > 1408905331-22455-1-git-send-email-chris@chris-wilson.co.uk
> >
> > you will find another one suitable for conversion as well
>
> Thanks, I missed that. I just added my r-b.
>
> Daniel, please pick that one up instead of 1/2 as a prerequisite for
> 2/2.
Done. Well I didn't find that mail in my inbox, but I think I've picked
the right one. Otherwise please scream.
Thanks, Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2014-10-21 14:57 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-10 14:53 [PATCH 1/2] drm/i915: allow dev_priv for HAS_PCH_* macros too Jani Nikula
2014-10-10 14:53 ` [PATCH 2/2] drm/i915: spt does not have pch backlight override bit Jani Nikula
2014-10-11 8:28 ` [PATCH 2/2] drm/i915: spt does not have pch backlight shuang.he
2014-10-20 11:28 ` [PATCH 2/2] drm/i915: spt does not have pch backlight override bit Ville Syrjälä
2014-10-10 14:58 ` [PATCH 1/2] drm/i915: allow dev_priv for HAS_PCH_* macros too Chris Wilson
2014-10-10 15:10 ` Jani Nikula
2014-10-21 14:57 ` Daniel Vetter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox