Looks like I accidentally broke 8bpp support in i915.
This series fixes the regression, as verified in the bug report: https://bugs.freedesktop.org/show_bug.cgi?id=59572#c18
There should be no negative effect on other drivers since they either don't support 8bpp, or they don't bother with checking the pixel format.
From: Ville Syrjälä ville.syrjala@linux.intel.com
Set depth/bits_per_pixel to 8 for C8 format.
Signed-off-by: Ville Syrjälä ville.syrjala@linux.intel.com --- drivers/gpu/drm/drm_crtc.c | 1 + 1 file changed, 1 insertion(+)
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 9c797f6..ff7344c 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -3856,6 +3856,7 @@ void drm_fb_get_bpp_depth(uint32_t format, unsigned int *depth, int *bpp) { switch (format) { + case DRM_FORMAT_C8: case DRM_FORMAT_RGB332: case DRM_FORMAT_BGR233: *depth = 8;
From: Ville Syrjälä ville.syrjala@linux.intel.com
Support for real RGB332 is a rarity, most hardware only really support C8. So use C8 instead of RGB332 when determining the format based on depth/bpp.
This fixes 8bpp fbcon on i915, since i915 will only accept C8 and not RGB332.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=59572 Signed-off-by: Ville Syrjälä ville.syrjala@linux.intel.com --- drivers/gpu/drm/drm_crtc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index ff7344c..826a5ca 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -2253,7 +2253,7 @@ uint32_t drm_mode_legacy_fb_format(uint32_t bpp, uint32_t depth)
switch (bpp) { case 8: - fmt = DRM_FORMAT_RGB332; + fmt = DRM_FORMAT_C8; break; case 16: if (depth == 15)
On Thu, Jan 31, 2013 at 07:43:38PM +0200, ville.syrjala@linux.intel.com wrote:
From: Ville Syrjälä ville.syrjala@linux.intel.com
Support for real RGB332 is a rarity, most hardware only really support C8. So use C8 instead of RGB332 when determining the format based on depth/bpp.
This fixes 8bpp fbcon on i915, since i915 will only accept C8 and not RGB332.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=59572 Signed-off-by: Ville Syrjälä ville.syrjala@linux.intel.com
Tested-by: mlsemon35@gmail.com
Dave, can you please consider including these two patches into -fixes? The fix a black screen regression when users opt for 8bpp console ... -Daniel
drivers/gpu/drm/drm_crtc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index ff7344c..826a5ca 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -2253,7 +2253,7 @@ uint32_t drm_mode_legacy_fb_format(uint32_t bpp, uint32_t depth)
switch (bpp) { case 8:
fmt = DRM_FORMAT_RGB332;
fmt = DRM_FORMAT_C8;-- 1.7.12.4
dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel
On Tue, Feb 5, 2013 at 12:55 AM, Daniel Vetter daniel@ffwll.ch wrote:
On Thu, Jan 31, 2013 at 07:43:38PM +0200, ville.syrjala@linux.intel.com wrote:
From: Ville Syrjälä ville.syrjala@linux.intel.com
Support for real RGB332 is a rarity, most hardware only really support C8. So use C8 instead of RGB332 when determining the format based on depth/bpp.
This fixes 8bpp fbcon on i915, since i915 will only accept C8 and not RGB332.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=59572 Signed-off-by: Ville Syrjälä ville.syrjala@linux.intel.com
Tested-by: mlsemon35@gmail.com
Dave, can you please consider including these two patches into -fixes? The fix a black screen regression when users opt for 8bpp console ...
These are for next, considering what Linus said about -fixes not unless they are big.
so I'll stick a stable cc onto it in next.
Dave.
On Tue, Feb 05, 2013 at 01:07:01PM +1000, Dave Airlie wrote:
On Tue, Feb 5, 2013 at 12:55 AM, Daniel Vetter daniel@ffwll.ch wrote:
On Thu, Jan 31, 2013 at 07:43:38PM +0200, ville.syrjala@linux.intel.com wrote:
From: Ville Syrjälä ville.syrjala@linux.intel.com
Support for real RGB332 is a rarity, most hardware only really support C8. So use C8 instead of RGB332 when determining the format based on depth/bpp.
This fixes 8bpp fbcon on i915, since i915 will only accept C8 and not RGB332.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=59572 Signed-off-by: Ville Syrjälä ville.syrjala@linux.intel.com
Tested-by: mlsemon35@gmail.com
Dave, can you please consider including these two patches into -fixes? The fix a black screen regression when users opt for 8bpp console ...
These are for next, considering what Linus said about -fixes not unless they are big.
so I'll stick a stable cc onto it in next.
Ping for merging into drm-next or acking for merging through drm-intel-next ... -Daniel
On Wed, Feb 13, 2013 at 01:40:56PM +0100, Daniel Vetter wrote:
On Tue, Feb 05, 2013 at 01:07:01PM +1000, Dave Airlie wrote:
On Tue, Feb 5, 2013 at 12:55 AM, Daniel Vetter daniel@ffwll.ch wrote:
On Thu, Jan 31, 2013 at 07:43:38PM +0200, ville.syrjala@linux.intel.com wrote:
From: Ville Syrjälä ville.syrjala@linux.intel.com
Support for real RGB332 is a rarity, most hardware only really support C8. So use C8 instead of RGB332 when determining the format based on depth/bpp.
This fixes 8bpp fbcon on i915, since i915 will only accept C8 and not RGB332.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=59572 Signed-off-by: Ville Syrjälä ville.syrjala@linux.intel.com
Tested-by: mlsemon35@gmail.com
Dave, can you please consider including these two patches into -fixes? The fix a black screen regression when users opt for 8bpp console ...
These are for next, considering what Linus said about -fixes not unless they are big.
so I'll stick a stable cc onto it in next.
Ping for merging into drm-next or acking for merging through drm-intel-next ...
Merged both into drm-intel trees for 3.9 with Dave's irc-ack. -Daniel
dri-devel@lists.freedesktop.org
-
Daniel Vetter -
Dave Airlie -
ville.syrjala＠linux.intel.com