| Message ID | 1355868794-3708-2-git-send-email-chris@chris-wilson.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Dec 18, 2012 at 10:13:13PM +0000, Chris Wilson wrote: > This fixes a regression from > > commit 57779d06367a915ee03e6cb918d7575f0a46e419 > Author: Ville Syrjälä <ville.syrjala@linux.intel.com> > Date: Wed Oct 31 17:50:14 2012 +0200 > > drm/i915: Fix display pixel format handling > > (which even says that they are supported on Ironlake, and then promptly > rejects then...) Sorry about that. I do remember changing the condition when changing the commit message, but I must have made an error when resolving conflicts during one of the rebases the patch went through. > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> > --- > drivers/gpu/drm/i915/intel_display.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index de09f47..211a097 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -8332,7 +8332,7 @@ int intel_framebuffer_init(struct drm_device *dev, > case DRM_FORMAT_UYVY: > case DRM_FORMAT_YVYU: > case DRM_FORMAT_VYUY: > - if (INTEL_INFO(dev)->gen < 6) > + if (INTEL_INFO(dev)->gen < 5) > return -EINVAL; > break; > default: > -- > 1.7.10.4 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Wed, Dec 19, 2012 at 02:00:59PM +0200, Ville Syrjälä wrote: > On Tue, Dec 18, 2012 at 10:13:13PM +0000, Chris Wilson wrote: > > This fixes a regression from > > > > commit 57779d06367a915ee03e6cb918d7575f0a46e419 > > Author: Ville Syrjälä <ville.syrjala@linux.intel.com> > > Date: Wed Oct 31 17:50:14 2012 +0200 > > > > drm/i915: Fix display pixel format handling > > > > (which even says that they are supported on Ironlake, and then promptly > > rejects then...) > > Sorry about that. I do remember changing the condition when changing the > commit message, but I must have made an error when resolving conflicts > during one of the rebases the patch went through. > > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Applied this one to -fixes. Still in limbo about all the other ones ... -Daniel
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index de09f47..211a097 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -8332,7 +8332,7 @@ int intel_framebuffer_init(struct drm_device *dev, case DRM_FORMAT_UYVY: case DRM_FORMAT_YVYU: case DRM_FORMAT_VYUY: - if (INTEL_INFO(dev)->gen < 6) + if (INTEL_INFO(dev)->gen < 5) return -EINVAL; break; default:
This fixes a regression from commit 57779d06367a915ee03e6cb918d7575f0a46e419 Author: Ville Syrjälä <ville.syrjala@linux.intel.com> Date: Wed Oct 31 17:50:14 2012 +0200 drm/i915: Fix display pixel format handling (which even says that they are supported on Ironlake, and then promptly rejects then...) Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> --- drivers/gpu/drm/i915/intel_display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)