瀏覽代碼

Merge tag 'drm/tegra/for-4.7-rc1' of git://anongit.freedesktop.org/tegra/linux into drm-next

drm/tegra: Changes for v4.7-rc1

Two small changes, one getting rid of the bogus gamma table size and
another removing Terje from the MAINTAINERS file since he no longer does
any work on host1x or display.

* tag 'drm/tegra/for-4.7-rc1' of git://anongit.freedesktop.org/tegra/linux:
  MAINTAINERS: Remove Terje Bergström as Tegra DRM maintainer
  drm/tegra: Don't set a gamma table size
Dave Airlie 9 年之前
父節點
當前提交
95306975e9
共有 2 個文件被更改,包括 0 次插入2 次删除
  1. 0 1
      MAINTAINERS
  2. 0 1
      drivers/gpu/drm/tegra/dc.c

+ 0 - 1
MAINTAINERS

@@ -3906,7 +3906,6 @@ F:	include/uapi/drm/nouveau_drm.h
 
 
 DRM DRIVERS FOR NVIDIA TEGRA
 DRM DRIVERS FOR NVIDIA TEGRA
 M:	Thierry Reding <thierry.reding@gmail.com>
 M:	Thierry Reding <thierry.reding@gmail.com>
-M:	Terje Bergström <tbergstrom@nvidia.com>
 L:	dri-devel@lists.freedesktop.org
 L:	dri-devel@lists.freedesktop.org
 L:	linux-tegra@vger.kernel.org
 L:	linux-tegra@vger.kernel.org
 T:	git git://anongit.freedesktop.org/tegra/linux.git
 T:	git git://anongit.freedesktop.org/tegra/linux.git

+ 0 - 1
drivers/gpu/drm/tegra/dc.c

@@ -1722,7 +1722,6 @@ static int tegra_dc_init(struct host1x_client *client)
 	if (err < 0)
 	if (err < 0)
 		goto cleanup;
 		goto cleanup;
 
 
-	drm_mode_crtc_set_gamma_size(&dc->base, 256);
 	drm_crtc_helper_add(&dc->base, &tegra_crtc_helper_funcs);
 	drm_crtc_helper_add(&dc->base, &tegra_crtc_helper_funcs);
 
 
 	/*
 	/*