Commit daefb5da authored by Alex Deucher's avatar Alex Deucher Committed by Greg Kroah-Hartman

drm/radeon: rework fbdev handling on chips with no connectors

commit e5f243bd upstream.

Move all the logic to radeon_fb.c and add checks to functions
called frome elsewhere.

bug:
https://bugzilla.kernel.org/show_bug.cgi?id=112781Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2ed9f0a8
...@@ -1683,10 +1683,8 @@ int radeon_modeset_init(struct radeon_device *rdev) ...@@ -1683,10 +1683,8 @@ int radeon_modeset_init(struct radeon_device *rdev)
/* setup afmt */ /* setup afmt */
radeon_afmt_init(rdev); radeon_afmt_init(rdev);
if (!list_empty(&rdev->ddev->mode_config.connector_list)) { radeon_fbdev_init(rdev);
radeon_fbdev_init(rdev); drm_kms_helper_poll_init(rdev->ddev);
drm_kms_helper_poll_init(rdev->ddev);
}
/* do pm late init */ /* do pm late init */
ret = radeon_pm_late_init(rdev); ret = radeon_pm_late_init(rdev);
......
...@@ -292,7 +292,8 @@ static int radeonfb_create(struct drm_fb_helper *helper, ...@@ -292,7 +292,8 @@ static int radeonfb_create(struct drm_fb_helper *helper,
void radeon_fb_output_poll_changed(struct radeon_device *rdev) void radeon_fb_output_poll_changed(struct radeon_device *rdev)
{ {
drm_fb_helper_hotplug_event(&rdev->mode_info.rfbdev->helper); if (rdev->mode_info.rfbdev)
drm_fb_helper_hotplug_event(&rdev->mode_info.rfbdev->helper);
} }
static int radeon_fbdev_destroy(struct drm_device *dev, struct radeon_fbdev *rfbdev) static int radeon_fbdev_destroy(struct drm_device *dev, struct radeon_fbdev *rfbdev)
...@@ -325,6 +326,10 @@ int radeon_fbdev_init(struct radeon_device *rdev) ...@@ -325,6 +326,10 @@ int radeon_fbdev_init(struct radeon_device *rdev)
int bpp_sel = 32; int bpp_sel = 32;
int ret; int ret;
/* don't enable fbdev if no connectors */
if (list_empty(&rdev->ddev->mode_config.connector_list))
return 0;
/* select 8 bpp console on RN50 or 16MB cards */ /* select 8 bpp console on RN50 or 16MB cards */
if (ASIC_IS_RN50(rdev) || rdev->mc.real_vram_size <= (32*1024*1024)) if (ASIC_IS_RN50(rdev) || rdev->mc.real_vram_size <= (32*1024*1024))
bpp_sel = 8; bpp_sel = 8;
...@@ -377,11 +382,15 @@ void radeon_fbdev_fini(struct radeon_device *rdev) ...@@ -377,11 +382,15 @@ void radeon_fbdev_fini(struct radeon_device *rdev)
void radeon_fbdev_set_suspend(struct radeon_device *rdev, int state) void radeon_fbdev_set_suspend(struct radeon_device *rdev, int state)
{ {
fb_set_suspend(rdev->mode_info.rfbdev->helper.fbdev, state); if (rdev->mode_info.rfbdev)
fb_set_suspend(rdev->mode_info.rfbdev->helper.fbdev, state);
} }
bool radeon_fbdev_robj_is_fb(struct radeon_device *rdev, struct radeon_bo *robj) bool radeon_fbdev_robj_is_fb(struct radeon_device *rdev, struct radeon_bo *robj)
{ {
if (!rdev->mode_info.rfbdev)
return false;
if (robj == gem_to_radeon_bo(rdev->mode_info.rfbdev->rfb.obj)) if (robj == gem_to_radeon_bo(rdev->mode_info.rfbdev->rfb.obj))
return true; return true;
return false; return false;
...@@ -389,12 +398,14 @@ bool radeon_fbdev_robj_is_fb(struct radeon_device *rdev, struct radeon_bo *robj) ...@@ -389,12 +398,14 @@ bool radeon_fbdev_robj_is_fb(struct radeon_device *rdev, struct radeon_bo *robj)
void radeon_fb_add_connector(struct radeon_device *rdev, struct drm_connector *connector) void radeon_fb_add_connector(struct radeon_device *rdev, struct drm_connector *connector)
{ {
drm_fb_helper_add_one_connector(&rdev->mode_info.rfbdev->helper, connector); if (rdev->mode_info.rfbdev)
drm_fb_helper_add_one_connector(&rdev->mode_info.rfbdev->helper, connector);
} }
void radeon_fb_remove_connector(struct radeon_device *rdev, struct drm_connector *connector) void radeon_fb_remove_connector(struct radeon_device *rdev, struct drm_connector *connector)
{ {
drm_fb_helper_remove_one_connector(&rdev->mode_info.rfbdev->helper, connector); if (rdev->mode_info.rfbdev)
drm_fb_helper_remove_one_connector(&rdev->mode_info.rfbdev->helper, connector);
} }
void radeon_fbdev_restore_mode(struct radeon_device *rdev) void radeon_fbdev_restore_mode(struct radeon_device *rdev)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment