frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modesetting: Load on GPU-s with 0 outputs 

In newer laptops with switchable graphics, the GPU may have 0 outputs,
in this case the modesetting driver should still load if the GPU is
SourceOffload capable, so that it can be used as an offload source provider.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
This commit is contained in:
Hans de Goede 2016-06-14 11:58:01 +02:00
parent 94a1c77259
commit 60ad701a6a
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
hw/xfree86/drivers/modesetting/driver.c
View File

@ -216,14 +216,26 @@ open_hw(const char *dev)
} }
static int static int
check_outputs(int fd) check_outputs(int fd, int *count)
{ {
drmModeResPtr res = drmModeGetResources(fd); drmModeResPtr res = drmModeGetResources(fd);
int ret; int ret;
if (!res) if (!res)
return FALSE; return FALSE;
if (count)
*count = res->count_connectors;
ret = res->count_connectors > 0; ret = res->count_connectors > 0;
#if defined DRM_CAP_PRIME && GLAMOR_HAS_GBM_LINEAR
if (ret == FALSE) {
uint64_t value = 0;
if (drmGetCap(fd, DRM_CAP_PRIME, &value) == 0 &&
(value & DRM_PRIME_CAP_EXPORT))
ret = TRUE;
}
#endif
drmModeFreeResources(res); drmModeFreeResources(res);
return ret; return ret;
} }
@ -238,13 +250,13 @@ probe_hw(const char *dev, struct xf86_platform_device *platform_dev)
fd = xf86_platform_device_odev_attributes(platform_dev)->fd; fd = xf86_platform_device_odev_attributes(platform_dev)->fd;
if (fd == -1) if (fd == -1)
return FALSE; return FALSE;
return check_outputs(fd); return check_outputs(fd, NULL);
} }
#endif #endif
fd = open_hw(dev); fd = open_hw(dev);
if (fd != -1) { if (fd != -1) {
int ret = check_outputs(fd); int ret = check_outputs(fd, NULL);
close(fd); close(fd);
return ret; return ret;
@ -287,7 +299,7 @@ probe_hw_pci(const char *dev, struct pci_device *pdev)
devid = ms_DRICreatePCIBusID(pdev); devid = ms_DRICreatePCIBusID(pdev);
if (id && devid && !strcmp(id, devid)) if (id && devid && !strcmp(id, devid))
ret = check_outputs(fd); ret = check_outputs(fd, NULL);
close(fd); close(fd);
free(id); free(id);
@ -847,7 +859,7 @@ PreInit(ScrnInfoPtr pScrn, int flags)
EntityInfoPtr pEnt; EntityInfoPtr pEnt;
uint64_t value = 0; uint64_t value = 0;
int ret; int ret;
int bppflags; int bppflags, connector_count;
int defaultdepth, defaultbpp; int defaultdepth, defaultbpp;
if (pScrn->numEntities != 1) if (pScrn->numEntities != 1)
@ -884,6 +896,9 @@ PreInit(ScrnInfoPtr pScrn, int flags)
return FALSE; return FALSE;
ms->drmmode.fd = ms->fd; ms->drmmode.fd = ms->fd;
if (!check_outputs(ms->fd, &connector_count))
return FALSE;
drmmode_get_default_bpp(pScrn, &ms->drmmode, &defaultdepth, &defaultbpp); drmmode_get_default_bpp(pScrn, &ms->drmmode, &defaultdepth, &defaultbpp);
if (defaultdepth == 24 && defaultbpp == 24) { if (defaultdepth == 24 && defaultbpp == 24) {
ms->drmmode.force_24_32 = TRUE; ms->drmmode.force_24_32 = TRUE;
@ -975,7 +990,7 @@ PreInit(ScrnInfoPtr pScrn, int flags)
#ifdef DRM_CAP_PRIME #ifdef DRM_CAP_PRIME
ret = drmGetCap(ms->fd, DRM_CAP_PRIME, &value); ret = drmGetCap(ms->fd, DRM_CAP_PRIME, &value);
if (ret == 0) { if (ret == 0) {
if (value & DRM_PRIME_CAP_IMPORT) { if (connector_count && (value & DRM_PRIME_CAP_IMPORT)) {
pScrn->capabilities |= RR_Capability_SinkOutput; pScrn->capabilities |= RR_Capability_SinkOutput;
if (ms->drmmode.glamor) if (ms->drmmode.glamor)
pScrn->capabilities |= RR_Capability_SinkOffload; pScrn->capabilities |= RR_Capability_SinkOffload;
@ -1003,7 +1018,7 @@ PreInit(ScrnInfoPtr pScrn, int flags)
} }
} }
if (pScrn->modes == NULL) { if (!(pScrn->is_gpu && connector_count == 0) && pScrn->modes == NULL) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "No modes.\n"); xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "No modes.\n");
return FALSE; return FALSE;
} }

6
hw/xfree86/drivers/modesetting/drmmode_display.c
View File

@ -1976,10 +1976,8 @@ static Bool
drmmode_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height) drmmode_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height)
{ {
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
modesettingPtr ms = modesettingPTR(scrn);
drmmode_crtc_private_ptr drmmode_ptr drmmode = &ms->drmmode;
drmmode_crtc = xf86_config->crtc[0]->driver_private;
drmmode_ptr drmmode = drmmode_crtc->drmmode;
drmmode_bo old_front; drmmode_bo old_front;
ScreenPtr screen = xf86ScrnToScreen(scrn); ScreenPtr screen = xf86ScrnToScreen(scrn);
uint32_t old_fb_id; uint32_t old_fb_id;