Revert "drm/nouveau: Run DRM default client setup"
This reverts commit 7fc4fd8bf5 which is
commit ef350898ae22db832ada972476fa2999f8ea978c upstream.
It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.
Bug: 161946584
Change-Id: I378259a47f1b538d10e843dbd5d7a57d8b9dc9c8
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
committed by
Treehugger Robot
parent
44a271f310
commit
af67ce2020
@@ -4,7 +4,6 @@ config DRM_NOUVEAU
|
||||
depends on DRM && PCI && MMU
|
||||
select IOMMU_API
|
||||
select FW_LOADER
|
||||
select DRM_CLIENT_SELECTION
|
||||
select DRM_DISPLAY_DP_HELPER
|
||||
select DRM_DISPLAY_HDMI_HELPER
|
||||
select DRM_DISPLAY_HELPER
|
||||
|
||||
@@ -31,7 +31,6 @@
|
||||
#include <linux/dynamic_debug.h>
|
||||
|
||||
#include <drm/drm_aperture.h>
|
||||
#include <drm/drm_client_setup.h>
|
||||
#include <drm/drm_drv.h>
|
||||
#include <drm/drm_fbdev_ttm.h>
|
||||
#include <drm/drm_gem_ttm_helper.h>
|
||||
@@ -837,7 +836,6 @@ static int nouveau_drm_probe(struct pci_dev *pdev,
|
||||
{
|
||||
struct nvkm_device *device;
|
||||
struct nouveau_drm *drm;
|
||||
const struct drm_format_info *format;
|
||||
int ret;
|
||||
|
||||
if (vga_switcheroo_client_probe_defer(pdev))
|
||||
@@ -875,11 +873,9 @@ static int nouveau_drm_probe(struct pci_dev *pdev,
|
||||
goto fail_pci;
|
||||
|
||||
if (drm->client.device.info.ram_size <= 32 * 1024 * 1024)
|
||||
format = drm_format_info(DRM_FORMAT_C8);
|
||||
drm_fbdev_ttm_setup(drm->dev, 8);
|
||||
else
|
||||
format = NULL;
|
||||
|
||||
drm_client_setup(drm->dev, format);
|
||||
drm_fbdev_ttm_setup(drm->dev, 32);
|
||||
|
||||
quirk_broken_nv_runpm(pdev);
|
||||
return 0;
|
||||
@@ -1322,8 +1318,6 @@ driver_stub = {
|
||||
.dumb_create = nouveau_display_dumb_create,
|
||||
.dumb_map_offset = drm_gem_ttm_dumb_map_offset,
|
||||
|
||||
DRM_FBDEV_TTM_DRIVER_OPS,
|
||||
|
||||
.name = DRIVER_NAME,
|
||||
.desc = DRIVER_DESC,
|
||||
#ifdef GIT_REVISION
|
||||
|
||||
Reference in New Issue
Block a user