| Message ID | 1348666658-31345-9-git-send-email-vijay.a.purushothaman@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Sep 26, 2012 at 07:07:37PM +0530, Vijay Purushothaman wrote: > Fixed min, max vco limits for VLV HDMI. Also fixed correct register > offset for VLV_VIDEO_DIP_CTL_A > > Signed-off-by: Vijay Purushothaman <vijay.a.purushothaman@intel.com> > Signed-off-by: Gajanan Bhat <gajanan.bhat@intel.com> > Signed-off-by: Ben Widawsky <benjamin.widawsky@intel.com> Patch splitup bikeshed: Either split up the dip reg fix into its own patch, or make the commit headline more generic (e.g "fixup HDMI output on vlv") with the details of the fix ("fixup vco limits and dip ctl reg") in the commit message. I'll bikeshed the headline when applying. -Daniel > --- > drivers/gpu/drm/i915/i915_reg.h | 2 +- > drivers/gpu/drm/i915/intel_display.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h > index e421847..d4ed30e 100644 > --- a/drivers/gpu/drm/i915/i915_reg.h > +++ b/drivers/gpu/drm/i915/i915_reg.h > @@ -3687,7 +3687,7 @@ > #define TVIDEO_DIP_DATA(pipe) _PIPE(pipe, _VIDEO_DIP_DATA_A, _VIDEO_DIP_DATA_B) > #define TVIDEO_DIP_GCP(pipe) _PIPE(pipe, _VIDEO_DIP_GCP_A, _VIDEO_DIP_GCP_B) > > -#define VLV_VIDEO_DIP_CTL_A 0x60220 > +#define VLV_VIDEO_DIP_CTL_A 0x60200 > #define VLV_VIDEO_DIP_DATA_A 0x60208 > #define VLV_VIDEO_DIP_GDCP_PAYLOAD_A 0x60210 > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index aee6151..647e311 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -380,7 +380,7 @@ static const intel_limit_t intel_limits_vlv_dac = { > > static const intel_limit_t intel_limits_vlv_hdmi = { > .dot = { .min = 20000, .max = 165000 }, > - .vco = { .min = 5994000, .max = 4000000 }, > + .vco = { .min = 4000000, .max = 5994000}, > .n = { .min = 1, .max = 7 }, > .m = { .min = 60, .max = 300 }, /* guess */ > .m1 = { .min = 2, .max = 3 }, > -- > 1.7.9.5 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
On 9/26/2012 8:08 PM, Daniel Vetter wrote: > On Wed, Sep 26, 2012 at 07:07:37PM +0530, Vijay Purushothaman wrote: >> Fixed min, max vco limits for VLV HDMI. Also fixed correct register >> offset for VLV_VIDEO_DIP_CTL_A >> >> Signed-off-by: Vijay Purushothaman <vijay.a.purushothaman@intel.com> >> Signed-off-by: Gajanan Bhat <gajanan.bhat@intel.com> >> Signed-off-by: Ben Widawsky <benjamin.widawsky@intel.com> > > Patch splitup bikeshed: Either split up the dip reg fix into its own > patch, or make the commit headline more generic (e.g "fixup HDMI output on > vlv") with the details of the fix ("fixup vco limits and dip ctl reg") in > the commit message. I'll bikeshed the headline when applying. > -Daniel > I will change the commit headline. Thanks. >> --- >> drivers/gpu/drm/i915/i915_reg.h | 2 +- >> drivers/gpu/drm/i915/intel_display.c | 2 +- >> 2 files changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h >> index e421847..d4ed30e 100644 >> --- a/drivers/gpu/drm/i915/i915_reg.h >> +++ b/drivers/gpu/drm/i915/i915_reg.h >> @@ -3687,7 +3687,7 @@ >> #define TVIDEO_DIP_DATA(pipe) _PIPE(pipe, _VIDEO_DIP_DATA_A, _VIDEO_DIP_DATA_B) >> #define TVIDEO_DIP_GCP(pipe) _PIPE(pipe, _VIDEO_DIP_GCP_A, _VIDEO_DIP_GCP_B) >> >> -#define VLV_VIDEO_DIP_CTL_A 0x60220 >> +#define VLV_VIDEO_DIP_CTL_A 0x60200 >> #define VLV_VIDEO_DIP_DATA_A 0x60208 >> #define VLV_VIDEO_DIP_GDCP_PAYLOAD_A 0x60210 >> >> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c >> index aee6151..647e311 100644 >> --- a/drivers/gpu/drm/i915/intel_display.c >> +++ b/drivers/gpu/drm/i915/intel_display.c >> @@ -380,7 +380,7 @@ static const intel_limit_t intel_limits_vlv_dac = { >> >> static const intel_limit_t intel_limits_vlv_hdmi = { >> .dot = { .min = 20000, .max = 165000 }, >> - .vco = { .min = 5994000, .max = 4000000 }, >> + .vco = { .min = 4000000, .max = 5994000}, >> .n = { .min = 1, .max = 7 }, >> .m = { .min = 60, .max = 300 }, /* guess */ >> .m1 = { .min = 2, .max = 3 }, >> -- >> 1.7.9.5 >> >> _______________________________________________ >> Intel-gfx mailing list >> Intel-gfx@lists.freedesktop.org >> http://lists.freedesktop.org/mailman/listinfo/intel-gfx >
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index e421847..d4ed30e 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -3687,7 +3687,7 @@ #define TVIDEO_DIP_DATA(pipe) _PIPE(pipe, _VIDEO_DIP_DATA_A, _VIDEO_DIP_DATA_B) #define TVIDEO_DIP_GCP(pipe) _PIPE(pipe, _VIDEO_DIP_GCP_A, _VIDEO_DIP_GCP_B) -#define VLV_VIDEO_DIP_CTL_A 0x60220 +#define VLV_VIDEO_DIP_CTL_A 0x60200 #define VLV_VIDEO_DIP_DATA_A 0x60208 #define VLV_VIDEO_DIP_GDCP_PAYLOAD_A 0x60210 diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index aee6151..647e311 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -380,7 +380,7 @@ static const intel_limit_t intel_limits_vlv_dac = { static const intel_limit_t intel_limits_vlv_hdmi = { .dot = { .min = 20000, .max = 165000 }, - .vco = { .min = 5994000, .max = 4000000 }, + .vco = { .min = 4000000, .max = 5994000}, .n = { .min = 1, .max = 7 }, .m = { .min = 60, .max = 300 }, /* guess */ .m1 = { .min = 2, .max = 3 },