diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-05-12 01:15:18 (GMT) |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-05-12 01:15:18 (GMT) |
| commit | 95306975e9dd38ba2775dd96cb29987ecc7d9360 (patch) | |
| tree | a310067485cfd22f93eccb8ba00715b8907b138e | |
| parent | 93f517c4a76ffba270c42c9bf0bc32801572c077 (diff) | |
| parent | 057eab2013ecbba2e772293acc177e2e3210f05d (diff) | |
| download | linux-95306975e9dd38ba2775dd96cb29987ecc7d9360.tar.xz | |
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
| -rw-r--r-- | MAINTAINERS | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/tegra/dc.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index b81c719..216d447 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3906,7 +3906,6 @@ F: include/uapi/drm/nouveau_drm.h DRM DRIVERS FOR NVIDIA TEGRA M: Thierry Reding <thierry.reding@gmail.com> -M: Terje Bergström <tbergstrom@nvidia.com> L: dri-devel@lists.freedesktop.org L: linux-tegra@vger.kernel.org T: git git://anongit.freedesktop.org/tegra/linux.git diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c index fb2b4b0..3b85a31 100644 --- a/drivers/gpu/drm/tegra/dc.c +++ b/drivers/gpu/drm/tegra/dc.c @@ -1722,7 +1722,6 @@ static int tegra_dc_init(struct host1x_client *client) if (err < 0) goto cleanup; - drm_mode_crtc_set_gamma_size(&dc->base, 256); drm_crtc_helper_add(&dc->base, &tegra_crtc_helper_funcs); /* |