Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dfe63bb0 authored by James Simmons's avatar James Simmons Committed by Dave Airlie
Browse files

drm: Update fbdev fb_fix_screeninfo 



If you change the color depth via fbset or some other framebuffer aware
userland application struct fb_fix_screeninfo is not updated to this new
information. This patch fixes this issue. Also the function is changed to
just pass in struct drm_framebuffer so in the future we could use more
fields. I'm hoping some day fix->smem* could be set here :-)

Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent f598aa75

drivers/gpu/drm/drm_fb_helper.c

+21 −20
Original line number Diff line number Diff line
@@ -607,6 +607,25 @@ void drm_fb_helper_fini(struct drm_fb_helper *fb_helper) 
}

EXPORT_SYMBOL(drm_fb_helper_fini);



void drm_fb_helper_fill_fix(struct fb_info *info, struct drm_framebuffer *fb)

{

	info->fix.type = FB_TYPE_PACKED_PIXELS;

	info->fix.visual = fb->depth == 8 ? FB_VISUAL_PSEUDOCOLOR :

		FB_VISUAL_TRUECOLOR;

	info->fix.mmio_start = 0;

	info->fix.mmio_len = 0;

	info->fix.type_aux = 0;

	info->fix.xpanstep = 1; /* doing it in hw */

	info->fix.ypanstep = 1; /* doing it in hw */

	info->fix.ywrapstep = 0;

	info->fix.accel = FB_ACCEL_NONE;

	info->fix.type_aux = 0;



	info->fix.line_length = fb->pitch;

	return;

}

EXPORT_SYMBOL(drm_fb_helper_fill_fix);



static int setcolreg(struct drm_crtc *crtc, u16 red, u16 green,

		     u16 blue, u16 regno, struct fb_info *info)

{
@@ -816,6 +835,7 @@ int drm_fb_helper_set_par(struct fb_info *info) 
			mutex_unlock(&dev->mode_config.mutex);

			return ret;

		}

		drm_fb_helper_fill_fix(info, fb_helper->fb);

	}

	mutex_unlock(&dev->mode_config.mutex);
@@ -953,6 +973,7 @@ int drm_fb_helper_single_fb_probe(struct drm_fb_helper *fb_helper, 


	if (new_fb) {

		info->var.pixclock = 0;

		drm_fb_helper_fill_fix(info, fb_helper->fb);

		if (register_framebuffer(info) < 0) {

			return -EINVAL;

		}
@@ -979,26 +1000,6 @@ int drm_fb_helper_single_fb_probe(struct drm_fb_helper *fb_helper, 
}

EXPORT_SYMBOL(drm_fb_helper_single_fb_probe);



void drm_fb_helper_fill_fix(struct fb_info *info, uint32_t pitch,

			    uint32_t depth)

{

	info->fix.type = FB_TYPE_PACKED_PIXELS;

	info->fix.visual = depth == 8 ? FB_VISUAL_PSEUDOCOLOR :

		FB_VISUAL_TRUECOLOR;

	info->fix.mmio_start = 0;

	info->fix.mmio_len = 0;

	info->fix.type_aux = 0;

	info->fix.xpanstep = 1; /* doing it in hw */

	info->fix.ypanstep = 1; /* doing it in hw */

	info->fix.ywrapstep = 0;

	info->fix.accel = FB_ACCEL_NONE;

	info->fix.type_aux = 0;



	info->fix.line_length = pitch;

	return;

}

EXPORT_SYMBOL(drm_fb_helper_fill_fix);



void drm_fb_helper_fill_var(struct fb_info *info, struct drm_fb_helper *fb_helper,

			    uint32_t fb_width, uint32_t fb_height)

{

drivers/gpu/drm/i915/intel_fb.c

+0 −1
Original line number Diff line number Diff line
@@ -150,7 +150,6 @@ static int intelfb_create(struct intel_fbdev *ifbdev, 


//	memset(info->screen_base, 0, size);



	drm_fb_helper_fill_fix(info, fb->pitch, fb->depth);

	drm_fb_helper_fill_var(info, &ifbdev->helper, sizes->fb_width, sizes->fb_height);



	info->pixmap.size = 64*1024;

drivers/gpu/drm/nouveau/nouveau_fbcon.c

+0 −1
Original line number Diff line number Diff line
@@ -359,7 +359,6 @@ nouveau_fbcon_create(struct nouveau_fbdev *nfbdev, 
	info->screen_base = nvbo_kmap_obj_iovirtual(nouveau_fb->nvbo);

	info->screen_size = size;



	drm_fb_helper_fill_fix(info, fb->pitch, fb->depth);

	drm_fb_helper_fill_var(info, &nfbdev->helper, sizes->fb_width, sizes->fb_height);



	/* Set aperture base/size for vesafb takeover */

drivers/gpu/drm/radeon/radeon_fb.c

+0 −2
Original line number Diff line number Diff line
@@ -225,8 +225,6 @@ static int radeonfb_create(struct radeon_fbdev *rfbdev, 


	strcpy(info->fix.id, "radeondrmfb");



	drm_fb_helper_fill_fix(info, fb->pitch, fb->depth);



	info->flags = FBINFO_DEFAULT | FBINFO_CAN_FORCE_OUTPUT;

	info->fbops = &radeonfb_ops;

include/drm/drm_fb_helper.h

+0 −3
Original line number Diff line number Diff line
@@ -121,9 +121,6 @@ int drm_fb_helper_setcolreg(unsigned regno, 
void drm_fb_helper_restore(void);

void drm_fb_helper_fill_var(struct fb_info *info, struct drm_fb_helper *fb_helper,

			    uint32_t fb_width, uint32_t fb_height);

void drm_fb_helper_fill_fix(struct fb_info *info, uint32_t pitch,

			    uint32_t depth);



int drm_fb_helper_setcmap(struct fb_cmap *cmap, struct fb_info *info);



bool drm_fb_helper_hotplug_event(struct drm_fb_helper *fb_helper);