diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-03-18 12:36:25 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-03-18 12:36:25 +1000 |
| commit | a0683be5cc082bdbdd3bc4e9b52f39f423650946 (patch) | |
| tree | d15067bb08c5359cb8310110178e1bc967552224 /src/drmmode_display.c | |
| parent | 080a5414593e9b59ed923f26aa6057747b0c868f (diff) | |
radeon: avoid using DRI1 init path on DRI2 driver.
I was playing with multi-seat and found this code, fixed
it up to be sane and more DRI2 like.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'src/drmmode_display.c')
| -rw-r--r-- | src/drmmode_display.c | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/src/drmmode_display.c b/src/drmmode_display.c index 11210444..399a6a73 100644 --- a/src/drmmode_display.c +++ b/src/drmmode_display.c @@ -1151,31 +1151,11 @@ static const xf86CrtcConfigFuncsRec drmmode_xf86crtc_config_funcs = { }; -Bool drmmode_pre_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, char *busId, char *driver_name, int cpp) +Bool drmmode_pre_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int cpp) { xf86CrtcConfigPtr xf86_config; - RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn); int i; - Bool ret; - - /* Create a bus Id */ - /* Low level DRM open */ - if (!pRADEONEnt->fd) { - ret = DRIOpenDRMMaster(pScrn, SAREA_MAX, busId, driver_name); - if (!ret) { - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "[dri] DRIGetVersion failed to open the DRM\n" - "[dri] Disabling DRI.\n"); - return FALSE; - } - drmmode->fd = DRIMasterFD(pScrn); - pRADEONEnt->fd = drmmode->fd; - } else { - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - " reusing fd for second head\n"); - drmmode->fd = pRADEONEnt->fd; - } xf86CrtcConfigInit(pScrn, &drmmode_xf86crtc_config_funcs); xf86_config = XF86_CRTC_CONFIG_PTR(pScrn); |