ws/i965: pull in the rest of the i915 winsys tree.
The intel_xorg file looks like it's got quite a bit of code that could be lifted up into the xorg state tracker -- should really just have a list of pci ids and a pointer to a screen create func.
This commit is contained in:
Keith Whitwell
@@ -0,0 +1,12 @@
|
||||
# src/gallium/winsys/drm/intel/Makefile
|
||||
TOP = ../../../../..
|
||||
include $(TOP)/configs/current
|
||||
|
||||
SUBDIRS = gem $(GALLIUM_STATE_TRACKERS_DIRS)
|
||||
|
||||
default install clean:
|
||||
@for dir in $(SUBDIRS) ; do \
|
||||
if [ -d $$dir ] ; then \
|
||||
(cd $$dir && $(MAKE) $@) || exit 1; \
|
||||
fi \
|
||||
done
|
||||
@@ -0,0 +1,7 @@
|
||||
Import('*')
|
||||
|
||||
SConscript(['gem/SConscript',])
|
||||
|
||||
if 'mesa' in env['statetrackers']:
|
||||
|
||||
SConscript(['dri/SConscript'])
|
||||
@@ -0,0 +1,27 @@
|
||||
TOP = ../../../../../..
|
||||
include $(TOP)/configs/current
|
||||
|
||||
LIBNAME = i915_dri.so
|
||||
|
||||
PIPE_DRIVERS = \
|
||||
$(TOP)/src/gallium/state_trackers/dri/libdridrm.a \
|
||||
$(TOP)/src/gallium/winsys/drm/intel/gem/libinteldrm.a \
|
||||
$(TOP)/src/gallium/drivers/trace/libtrace.a \
|
||||
$(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
|
||||
$(TOP)/src/gallium/drivers/identity/libidentity.a \
|
||||
$(TOP)/src/gallium/drivers/i915/libi915.a
|
||||
|
||||
|
||||
DRIVER_SOURCES =
|
||||
|
||||
C_SOURCES = \
|
||||
$(COMMON_GALLIUM_SOURCES) \
|
||||
$(DRIVER_SOURCES)
|
||||
|
||||
include ../../Makefile.template
|
||||
|
||||
DRI_LIB_DEPS += -ldrm_intel
|
||||
|
||||
symlinks: $(TOP)/$(LIB_DIR)/gallium
|
||||
@rm -f $(TOP)/$(LIB_DIR)/gallium/i965_dri.so
|
||||
ln -s i915_dri.so $(TOP)/$(LIB_DIR)/gallium/i965_dri.so
|
||||
@@ -0,0 +1,20 @@
|
||||
Import('*')
|
||||
|
||||
env = drienv.Clone()
|
||||
|
||||
env.ParseConfig('pkg-config --cflags --libs libdrm_intel')
|
||||
|
||||
drivers = [
|
||||
st_dri,
|
||||
inteldrm,
|
||||
softpipe,
|
||||
i915,
|
||||
trace,
|
||||
]
|
||||
|
||||
env.LoadableModule(
|
||||
target ='i915_dri.so',
|
||||
source = COMMON_GALLIUM_SOURCES,
|
||||
LIBS = drivers + mesa + auxiliaries + env['LIBS'],
|
||||
SHLIBPREFIX = '',
|
||||
)
|
||||
@@ -0,0 +1,29 @@
|
||||
TOP = ../../../../../..
|
||||
GALLIUMDIR = ../../../..
|
||||
include $(TOP)/configs/current
|
||||
|
||||
LIBNAME = EGL_i915.so
|
||||
|
||||
PIPE_DRIVERS = \
|
||||
$(TOP)/src/gallium/state_trackers/egl/libegldrm.a \
|
||||
$(GALLIUMDIR)/winsys/drm/intel/gem/libinteldrm.a \
|
||||
$(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
|
||||
$(TOP)/src/gallium/drivers/trace/libtrace.a \
|
||||
$(TOP)/src/gallium/drivers/i915/libi915.a
|
||||
|
||||
DRIVER_SOURCES =
|
||||
|
||||
C_SOURCES = \
|
||||
$(COMMON_GALLIUM_SOURCES) \
|
||||
$(DRIVER_SOURCES)
|
||||
|
||||
DRIVER_EXTRAS = -ldrm_intel
|
||||
|
||||
ASM_SOURCES =
|
||||
|
||||
DRIVER_DEFINES = -I../gem $(shell pkg-config libdrm --atleast-version=2.3.1 \
|
||||
&& echo "-DDRM_VBLANK_FLIP=DRM_VBLANK_FLIP")
|
||||
|
||||
include ../../Makefile.template
|
||||
|
||||
symlinks:
|
||||
@@ -0,0 +1,57 @@
|
||||
TARGET = modesetting_drv.so
|
||||
CFILES = $(wildcard ./*.c)
|
||||
OBJECTS = $(patsubst ./%.c,./%.o,$(CFILES))
|
||||
TOP = ../../../../../..
|
||||
|
||||
include $(TOP)/configs/current
|
||||
|
||||
INCLUDES = \
|
||||
$(shell pkg-config --cflags-only-I pixman-1 xorg-server libdrm xproto) \
|
||||
-I../gem \
|
||||
-I$(TOP)/src/gallium/include \
|
||||
-I$(TOP)/src/gallium/drivers \
|
||||
-I$(TOP)/src/gallium/auxiliary \
|
||||
-I$(TOP)/src/mesa \
|
||||
-I$(TOP)/include \
|
||||
-I$(TOP)/src/egl/main
|
||||
|
||||
LIBS = \
|
||||
$(TOP)/src/gallium/state_trackers/xorg/libxorgtracker.a \
|
||||
$(TOP)/src/gallium/winsys/drm/intel/gem/libinteldrm.a \
|
||||
$(TOP)/src/gallium/drivers/i915/libi915.a \
|
||||
$(TOP)/src/gallium/drivers/trace/libtrace.a \
|
||||
$(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
|
||||
$(GALLIUM_AUXILIARIES)
|
||||
|
||||
DRIVER_DEFINES = \
|
||||
-DHAVE_CONFIG_H
|
||||
|
||||
|
||||
#############################################
|
||||
|
||||
|
||||
|
||||
all default: $(TARGET)
|
||||
|
||||
$(TARGET): $(OBJECTS) Makefile $(TOP)/src/gallium/state_trackers/xorg/libxorgtracker.a $(LIBS)
|
||||
$(TOP)/bin/mklib -noprefix -o $@ \
|
||||
$(OBJECTS) $(LIBS) $(shell pkg-config --libs libdrm) -ldrm_intel
|
||||
|
||||
clean:
|
||||
rm -rf $(OBJECTS) $(TARGET)
|
||||
|
||||
install:
|
||||
$(INSTALL) -d $(DESTDIR)/$(XORG_DRIVER_INSTALL_DIR)
|
||||
$(MINSTALL) -m 755 $(TARGET) $(DESTDIR)/$(XORG_DRIVER_INSTALL_DIR)
|
||||
|
||||
|
||||
##############################################
|
||||
|
||||
|
||||
.c.o:
|
||||
$(CC) -c $(CFLAGS) $(INCLUDES) $(DRIVER_DEFINES) $< -o $@
|
||||
|
||||
|
||||
##############################################
|
||||
|
||||
.PHONY = all clean install
|
||||
@@ -0,0 +1,147 @@
|
||||
/*
|
||||
* Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.
|
||||
* All Rights Reserved.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the
|
||||
* "Software"), to deal in the Software without restriction, including
|
||||
* without limitation the rights to use, copy, modify, merge, publish,
|
||||
* distribute, sub license, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice (including the
|
||||
* next paragraph) shall be included in all copies or substantial portions
|
||||
* of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
||||
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
|
||||
* IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
|
||||
* ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
|
||||
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
||||
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*
|
||||
*
|
||||
* Author: Alan Hourihane <alanh@tungstengraphics.com>
|
||||
* Author: Jakob Bornecrantz <wallbraker@gmail.com>
|
||||
*
|
||||
*/
|
||||
|
||||
#include "../../../../state_trackers/xorg/xorg_winsys.h"
|
||||
|
||||
static void intel_xorg_identify(int flags);
|
||||
static Bool intel_xorg_pci_probe(DriverPtr driver,
|
||||
int entity_num,
|
||||
struct pci_device *device,
|
||||
intptr_t match_data);
|
||||
|
||||
static const struct pci_id_match intel_xorg_device_match[] = {
|
||||
{0x8086, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, 0, 0, 0},
|
||||
{0, 0, 0},
|
||||
};
|
||||
|
||||
static SymTabRec intel_xorg_chipsets[] = {
|
||||
{PCI_MATCH_ANY, "Intel Graphics Device"},
|
||||
{-1, NULL}
|
||||
};
|
||||
|
||||
static PciChipsets intel_xorg_pci_devices[] = {
|
||||
{PCI_MATCH_ANY, PCI_MATCH_ANY, NULL},
|
||||
{-1, -1, NULL}
|
||||
};
|
||||
|
||||
static XF86ModuleVersionInfo intel_xorg_version = {
|
||||
"modesetting",
|
||||
MODULEVENDORSTRING,
|
||||
MODINFOSTRING1,
|
||||
MODINFOSTRING2,
|
||||
XORG_VERSION_CURRENT,
|
||||
0, 1, 0, /* major, minor, patch */
|
||||
ABI_CLASS_VIDEODRV,
|
||||
ABI_VIDEODRV_VERSION,
|
||||
MOD_CLASS_VIDEODRV,
|
||||
{0, 0, 0, 0}
|
||||
};
|
||||
|
||||
/*
|
||||
* Xorg driver exported structures
|
||||
*/
|
||||
|
||||
_X_EXPORT DriverRec modesetting = {
|
||||
1,
|
||||
"modesetting",
|
||||
intel_xorg_identify,
|
||||
NULL,
|
||||
xorg_tracker_available_options,
|
||||
NULL,
|
||||
0,
|
||||
NULL,
|
||||
intel_xorg_device_match,
|
||||
intel_xorg_pci_probe
|
||||
};
|
||||
|
||||
static MODULESETUPPROTO(intel_xorg_setup);
|
||||
|
||||
_X_EXPORT XF86ModuleData modesettingModuleData = {
|
||||
&intel_xorg_version,
|
||||
intel_xorg_setup,
|
||||
NULL
|
||||
};
|
||||
|
||||
/*
|
||||
* Xorg driver functions
|
||||
*/
|
||||
|
||||
static pointer
|
||||
intel_xorg_setup(pointer module, pointer opts, int *errmaj, int *errmin)
|
||||
{
|
||||
static Bool setupDone = 0;
|
||||
|
||||
/* This module should be loaded only once, but check to be sure.
|
||||
*/
|
||||
if (!setupDone) {
|
||||
setupDone = 1;
|
||||
xf86AddDriver(&modesetting, module, HaveDriverFuncs);
|
||||
|
||||
/*
|
||||
* The return value must be non-NULL on success even though there
|
||||
* is no TearDownProc.
|
||||
*/
|
||||
return (pointer) 1;
|
||||
} else {
|
||||
if (errmaj)
|
||||
*errmaj = LDR_ONCEONLY;
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
intel_xorg_identify(int flags)
|
||||
{
|
||||
xf86PrintChipsets("modesetting", "Driver for Modesetting Kernel Drivers",
|
||||
intel_xorg_chipsets);
|
||||
}
|
||||
|
||||
static Bool
|
||||
intel_xorg_pci_probe(DriverPtr driver,
|
||||
int entity_num, struct pci_device *device, intptr_t match_data)
|
||||
{
|
||||
ScrnInfoPtr scrn = NULL;
|
||||
EntityInfoPtr entity;
|
||||
|
||||
scrn = xf86ConfigPciEntity(scrn, 0, entity_num, intel_xorg_pci_devices,
|
||||
NULL, NULL, NULL, NULL, NULL);
|
||||
if (scrn != NULL) {
|
||||
scrn->driverVersion = 1;
|
||||
scrn->driverName = "i965";
|
||||
scrn->name = "modesetting";
|
||||
scrn->Probe = NULL;
|
||||
|
||||
entity = xf86GetEntityInfo(entity_num);
|
||||
|
||||
/* Use all the functions from the xorg tracker */
|
||||
xorg_tracker_set_functions(scrn);
|
||||
}
|
||||
return scrn != NULL;
|
||||
}
|
||||
Reference in New Issue
Block a user